Skip to content

Commit

Permalink
Merge pull request #138 from mdziekon/mdziekon/gh-na/lang-en-rephrasing
Browse files Browse the repository at this point in the history
Assorted fixes
  • Loading branch information
mdziekon authored Dec 6, 2020
2 parents 5ab6c0a + 9bd0fbd commit 4848ee2
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions includes/helpers/world/elements.cost.functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ function getElementUserCostBase($elementID) {
switch ($costResource) {
case 'darkEnergy':
if (!isset($_Vars_PremiumBuildingPrices[$elementID])) {
continue;
break;
}

if ($_Vars_PremiumBuildingPrices[$elementID] <= 0) {
continue;
break;
}

$baseCost[$costResource] = $_Vars_PremiumBuildingPrices[$elementID];

continue;
break;
}
}

Expand Down
6 changes: 3 additions & 3 deletions language/en/fleet.lang
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ $_Lang['fl3_ProtectURWeak'] = 'You cannot attack anyone yet
$_Lang['fl3_ProtectAdminCant'] = 'Admins cannot attack anyone!';
$_Lang['fl3_ProtectCantAdmin'] = 'You cannot attack admin\'s account!';
$_Lang['fl3_ProtectPlanetProtect'] = 'This planet is under Game Support protection!';
$_Lang['fl3_ProtectNewTimeYou'] = 'You cannot attack anyone until you are under the newcomer protection!<br/>(You have to wait %s)';
$_Lang['fl3_ProtectNewTimeHe'] = 'This player is under newcomer protection!<br/>(You have to wait %s)';
$_Lang['fl3_ProtectNewTimeHe2'] = 'This player is under newcomer protection!<br/>(They didn\'t log in to the game yet!)';
$_Lang['fl3_ProtectNewTimeYou'] = 'You cannot attack anyone while you are protected by the newcomer protection!<br/>(You have to wait %s)';
$_Lang['fl3_ProtectNewTimeHe'] = 'This player is protected by newcomer protection!<br/>(You have to wait %s)';
$_Lang['fl3_ProtectNewTimeHe2'] = 'This player is protected by newcomer protection!<br/>(They didn\'t log in to the game yet!)';
$_Lang['fl3_SpaceTimeJumpGalaxy'] = 'You cannot make a space jump to another galaxy!';
$_Lang['fl3_QuantumDisallowAttack'] = 'You cannot make a space jump when performing an aggressive flight!';
$_Lang['fl3_NoQuantumGate'] = 'No Quantum gate!';
Expand Down
4 changes: 2 additions & 2 deletions language/en/reftable.lang
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $_Lang['reftable'] = 'Referrals';

$_Lang['reftable_desc'] = 'This page represents the current status of your referrals.';

$_Lang['referring_info'] = 'When you referr our game to a new player using your referral link, they will be added to the list below.<br/>As soon as the player purchases Dark Energy, you\'ll receive a commission from that transaction.<br/><br/>Currently, the commission rate is equal to <b class="lime">%s%%</b> of every Dark Energy purchased.';
$_Lang['referring_info'] = 'When you refer our game to a new player using your referral link, they will be added to the list below.<br/>As soon as the player purchases Dark Energy, you\'ll receive a commission from that transaction.<br/><br/>Currently, the commission rate is equal to <b class="lime">%s%%</b> of every Dark Energy purchased.';

$_Lang['your_referral_link_is'] = 'Your referral link:';

Expand All @@ -16,6 +16,6 @@ $_Lang['Provisions_Granted'] = 'Sum of all commission';
$_Lang['DEUnits'] = 'Dark Energy units';
$_Lang['UserDeleted'] = 'Player deleted';

$_Lang['referred_noone'] = 'You didn\'t invite any friends yet!';
$_Lang['referred_noone'] = 'You haven\'t invited any friends yet!';

?>
2 changes: 1 addition & 1 deletion language/en/resources.lang
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ $_Lang['Missing'] = 'Missing';
$_Lang['no_need_more_transporters'] = '0';

$_Lang['Res_SetThisUsage2All'] = 'Set the same production factors on all planets';
$_Lang['Res_GeologistBonus'] = 'Production bonus of <a href="officers.php" class="skyblue">Geologist</a>';
$_Lang['Res_GeologistBonus'] = 'Production bonus provided by <a href="officers.php" class="skyblue">Geologist</a>';

?>
2 changes: 1 addition & 1 deletion language/en/rocket_simulator.lang
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $_Lang['InterceptMiss'] = 'Anti-ballistic Missiles';
$_Lang['InterplanetMiss'] = 'Interplanetary Missiles';

$_Lang['MainTarget'] = 'Primary target';
$_Lang['Everythink'] = 'Everything';
$_Lang['Everything'] = 'Everything';

$_Lang['Submit'] = 'Simulate';

Expand Down
4 changes: 2 additions & 2 deletions language/en/rules.lang
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ $_Lang['Table_GeneralInfo'] = 'These terms are effective since <b class="re
$_Lang['Table_GeneralInfo'] .= 'All changes introduced to these terms will be announced via in-game <b class="red">Broadcast message</b>, or, in rare occasions (eg. substantial rewrites), via <b class="red">email</b>.';
$_Lang['Table_Index'] = 'Table of content';

$_Lang['AcceptBox_Info'] = 'Before continuing your gameplay, <b>you have to confirm your agreement to the Terms changes</b> (last modification: %s).<br/>If you do not agree with the new or modified rules, you can decline the changes, which means your account will be automatically <b class="red">removed after a period of 7 days</b> (during that period your are free to change your mind), or you can <b class="orange">leave your account unsupervised</b> (as long as you won\'t pick either of options).';
$_Lang['AcceptBox_Info'] = 'Before continuing your gameplay, <b>you have to confirm your agreement to the Terms changes</b> (last modification: %s).<br/>If you do not agree with the new or modified rules, you can decline the changes, which means your account will be automatically <b class="red">removed after a period of 7 days</b> (during that period your are free to change your mind), or you can <b class="orange">leave your account unattended</b> (as long as you won\'t pick either of options).';
$_Lang['AcceptBox_Option_Accept0'] = 'I accept the changed Terms of Service';
$_Lang['AcceptBox_Option_Accept1'] = 'I accept the changed Terms of Service and cancel my account\'s deletion';
$_Lang['AcceptBox_Option_Decline0'] = 'I decline the changed Terms of Service and set my account into deletion mode';
$_Lang['AcceptBox_Option_Decline1'] = 'I decline the changed Terms of Service and maintain my decision about deletion';
$_Lang['AcceptBox_Option_Decline1'] = 'I decline the changed Terms of Service and sustain my decision about deletion';
$_Lang['AcceptBox_DeleteTime'] = '<br/><br/>Your account will be deleted on %s';
$_Lang['AcceptBox_Sure'] = 'Are you sure?';

Expand Down
4 changes: 2 additions & 2 deletions language/en/sfbInfos.lang
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

$_Lang['sfb_Title'] = 'Smart Fleets\' Blockade';
$_Lang['sfb_GlobalText'] = 'Currently, this Universe has an enabled <b class="red">Fleet\'s Blockade</b>, which will remain active until <b class="orange">%s</b>, <b class="orange">%s</b>.<br/>This blockade covers %s. More informations can be found here <a href="redirect.php?id=5" target="_blank"><u>Link</u></a><br/>Reason of the Blockade: %s';
$_Lang['sfb_GlobalText'] = 'Currently, this Universe has an enabled <b class="red">Fleet\'s Blockade</b>, which will remain active until <b class="orange">%s</b>, <b class="orange">%s</b>.<br/>This blockade covers %s. More information can be found here <a href="redirect.php?id=5" target="_blank"><u>Link</u></a><br/>Reason of the Blockade: %s';
$_Lang['sfb_Mission_All'] = '<b class="skyblue">all fleet missions</b>';
$_Lang['sfb_Mission_Aggresive'] = '<b class="skyblue">all aggressive fleet missions</b>';
$_Lang['sfb_Mission_Civil'] = '<b class="skyblue">all civil fleet missions</b>';
Expand All @@ -16,7 +16,7 @@ $_Lang['sfb_Mission__2'] = 'United Attack';
$_Lang['sfb_Mission__3'] = 'Transport';
$_Lang['sfb_Mission__4'] = 'Stay';
$_Lang['sfb_Mission__5'] = 'Hold';
$_Lang['sfb_Mission__6'] = 'SzpieSpygowanie';
$_Lang['sfb_Mission__6'] = 'Spy';
$_Lang['sfb_Mission__7'] = 'Colonise';
$_Lang['sfb_Mission__8'] = 'Harvest';
$_Lang['sfb_Mission__9'] = 'Destroy';
Expand Down
2 changes: 1 addition & 1 deletion language/en/stat.lang
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $_Lang['Alliance'] = "Alliance";
$_Lang['Points'] = "Points";
$_Lang['Members'] = "Members";
$_Lang['PerMember'] = "Per member";
$_Lang['Ecrire'] = "Write a message";
$_Lang['action_writemessage'] = "Write a message";

$_Lang['Fight_Won'] = 'Won';
$_Lang['Fight_Lost'] = 'Lost';
Expand Down
2 changes: 1 addition & 1 deletion language/pl/rocket_simulator.lang
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $_Lang['InterceptMiss'] = 'Przeciwrakiety';
$_Lang['InterplanetMiss'] = 'Rakiety międzyplanetarne';

$_Lang['MainTarget'] = 'Główny cel ataku';
$_Lang['Everythink'] = 'Wszystko';
$_Lang['Everything'] = 'Wszystko';

$_Lang['Submit'] = 'Przeprowadź Symulację!';

Expand Down
2 changes: 1 addition & 1 deletion language/pl/stat.lang
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $_Lang['Alliance'] = "Sojusz";
$_Lang['Points'] = "Punkty";
$_Lang['Members'] = "Członkowie";
$_Lang['PerMember'] = "Na gracza";
$_Lang['Ecrire'] = "Napisz wiadomość";
$_Lang['action_writemessage'] = "Napisz wiadomość";

$_Lang['Fight_Won'] = 'Wygrane';
$_Lang['Fight_Lost'] = 'Przegrane';
Expand Down
2 changes: 1 addition & 1 deletion rocket_simulator.php
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
$_Lang['DefTech']= $_Lang['tech'][111];
$_Lang['AtkTech']= $_Lang['tech'][109];

$PrepareTargetList = '<option value="0">'.$_Lang['Everythink'].'</option>';
$PrepareTargetList = '<option value="0">'.$_Lang['Everything'].'</option>';

if($DefTech > 0)
{
Expand Down
2 changes: 1 addition & 1 deletion stats.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
$parse['Fig_Won'] = prettyNumber($StatRow['ustat_raids_won']);
$parse['Fig_Lost'] = prettyNumber($StatRow['ustat_raids_lost']);
$parse['Fig_Draw'] = prettyNumber($StatRow['ustat_raids_draw']);
$parse['player_mes'] = '<a href="messages.php?mode=write&amp;uid='.$StatRow['id_owner'].'"><img src="'.$_SkinPath.'img/m.gif" border="0" alt="'.$_Lang['Ecrire'].'"/></a>';
$parse['player_mes'] = '<a href="messages.php?mode=write&amp;uid='.$StatRow['id_owner'].'"><img src="'.$_SkinPath.'img/m.gif" border="0" alt="'.$_Lang['action_writemessage'].'"/></a>';
if($StatRow['ally_id'] == $_User['ally_id'] AND $_User['ally_id'] > 0)
{
$parse['player_alliance'] = '<span class="ally">'.$StatRow['ally_name'].'</span>';
Expand Down

0 comments on commit 4848ee2

Please sign in to comment.