From 0c1897bbb3787784d81d6d5df57d4ba6c77ae4b7 Mon Sep 17 00:00:00 2001 From: JulR43 Date: Thu, 29 Jan 2015 16:56:37 +0000 Subject: [PATCH 1/4] Update fr.coffee Several translates --- app/locale/fr.coffee | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index 4fe5a942b..08e98de1d 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -81,7 +81,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t awaiting_levels_adventurer_prefix: "Nous produisons cinq niveaux par semaine." awaiting_levels_adventurer: "S'inscrire comme aventurier" awaiting_levels_adventurer_suffix: "afin d'être le premier à jouer de nouveaux niveaux." -# adjust_volume: "Adjust volume" + adjust_volume: "Ajuster le volume" choose_your_level: "Choisissez votre niveau" # The rest of this section is the old play view at /play-old and isn't very important. adventurer_prefix: "Vous pouvez passer à n'importe quel niveau ci-dessous, ou discuter des niveaux sur " adventurer_forum: "le forum de l'Aventurier" @@ -160,10 +160,10 @@ module.exports = nativeDescription: "français", englishDescription: "French", t date: "Date" body: "Corps" version: "Version" -# pending: "Pending" -# accepted: "Accepted" -# rejected: "Rejected" -# withdrawn: "Withdrawn" + pending: "En attente" + accepted: "Accepté" + rejected: "Rejeté" + withdrawn: "Retiré" submitter: "Soumissionnaire" submitted: "Soumis" commit_msg: "Message de mise à jour" @@ -171,10 +171,10 @@ module.exports = nativeDescription: "français", englishDescription: "French", t version_history: "Historique des versions" version_history_for: "Historique des versions pour : " select_changes: "Sélectionner deux changements plus bas pour voir la différence." -# undo_prefix: "Undo" -# undo_shortcut: "(Ctrl+Z)" -# redo_prefix: "Redo" -# redo_shortcut: "(Ctrl+Shift+Z)" + undo_prefix: "Annuler" + undo_shortcut: "(Ctrl+Z)" + redo_prefix: "Refaire" + redo_shortcut: "(Ctrl+Shift+Z)" play_preview: "Jouer un aperçu du niveau actuel" result: "Résultat" results: "Résultats" @@ -198,9 +198,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t hard: "Difficile" player: "Joueur" player_level: "Niveau" # Like player level 5, not like level: Dungeons of Kithgard -# warrior: "Warrior" -# ranger: "Ranger" -# wizard: "Wizard" + warrior: "Guerrier" + ranger: "Ranger" + wizard: "Magicien" units: second: "seconde" @@ -279,7 +279,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t loading_ready: "Pret!" loading_start: "Démarrer niveau" problem_alert_title: "Corriger votre Code" -# problem_alert_help: "Help" + problem_alert_help: "Aide" time_current: "Maintenant:" time_total: "Max:" time_goto: "Allez a:" @@ -331,8 +331,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t save_load_tab: "Sauvegarder/Charger" options_tab: "Options" guide_tab: "Guide" -# guide_video_tutorial: "Video Tutorial" -# guide_tips: "Tips" + guide_video_tutorial: "Tutoriel vidéo" + guide_tips: "Astuces" multiplayer_tab: "Multijoueur" auth_tab: "S'inscrire" inventory_caption: "Équipez votre héro" @@ -346,7 +346,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t inventory: choose_inventory: "Équiper des Objets" equipped_item: "Equipé" -# required_purchase_title: "Required" + required_purchase_title: "Requis" available_item: "Disponible" restricted_title: "Limité" should_equip: "(double-clic pour s'équiper)" @@ -371,7 +371,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t subscribe: subscribe_title: "Inscription" unsubscribe: "Désinscription" -# confirm_unsubscribe: "Confirm Unsubscribe" + confirm_unsubscribe: "Confirmer la désinscription" # never_mind: "Never Mind, I Still Love You" # thank_you_months_prefix: "Thank you for supporting us these last" # thank_you_months_suffix: "months." From 6e08e5406ef8ba9bdb705c94353bde7614bdb315 Mon Sep 17 00:00:00 2001 From: Jacob Date: Fri, 30 Jan 2015 12:42:27 +0100 Subject: [PATCH 2/4] Update nl-NL.coffee, Submitted reasonably many translations. Did not look how the translations looked on my own server, but I did recognise most texts for which I provided a translation (so that for most options I had a good idea what their purpose was). This is my first edit, so I am not well aware of any unwritten rules about translating. I tried to be reasonable in using comments. For some things like the translation of subscriber (abonnee), running (uitvoeren o.i.d.) and equipment (uitrusting) some discussion might be nice, in order to have consistency. I have however refrained from using very long comments. I am actually not even aware of what the default action is when no translation is present, which I assume is simply to use the English version. I suppose the main purpose of the Dutch translation is to help children, so this is what I mainly had in mind. Feel free to contact me about subjects like this. I will try to learn more by inspecting previous edits. --- app/locale/nl-NL.coffee | 123 ++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 60 deletions(-) diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index 01d6da2c3..73f4eb90c 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -66,24 +66,24 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription settings: "Instellingen" # Tooltip on settings button from /play next: "Volgende" # Go from choose hero to choose inventory before playing a level change_hero: "Verander held" # Go back from choose inventory to choose hero -# choose_inventory: "Equip Items" + choose_inventory: "Uitrusting kiezen" buy_gems: "Edelstenen kopen" subscription_required: "Abonnement nodig" free: "Gratis" subscribed: "Geabbonneerd" -# older_campaigns: "Older Campaigns" + older_campaigns: "Oudere Campaigns" anonymous: "Anonieme Speler" level_difficulty: "Moeilijkheidsgraad: " campaign_beginner: "Beginnercampagne" awaiting_levels_adventurer_prefix: "We brengen 5 nieuwe levels per week uit." awaiting_levels_adventurer: "Schrijf je in als Avonturier" awaiting_levels_adventurer_suffix: "om de eerste te zijn die nieuwe levels speelt." -# adjust_volume: "Adjust volume" +# adjust_volume: "Volume aanpassen" choose_your_level: "Kies Je Level" # The rest of this section is the old play view at /play-old and isn't very important. adventurer_prefix: "Je kunt meteen naar een van de levels hieronder springen, of de levels bespreken op " adventurer_forum: "het Avonturiersforum" adventurer_suffix: "." -# campaign_old_beginner: "Old Beginner Campaign" + campaign_old_beginner: "Oude Beginner Campaign" campaign_old_beginner_description: "... waarin je de toverkunst van het programmeren leert." campaign_dev: "Willekeurige moeilijkere levels" campaign_dev_description: "... waarin je de interface leert kennen terwijl je wat moeilijkers doet." @@ -91,8 +91,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription campaign_multiplayer_description: "... waarin je direct tegen andere spelers speelt." campaign_player_created: "Door-spelers-gemaakt" campaign_player_created_description: "... waarin je ten strijde trekt tegen de creativiteit van andere Ambachtelijke Tovenaars." -# campaign_classic_algorithms: "Classic Algorithms" -# campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science." + campaign_classic_algorithms: "Klassieke Algorithmes" + campaign_classic_algorithms_description: "... Waarin je de meest populaire algorithmes van de informatica leert." login: sign_up: "Account maken" @@ -127,7 +127,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription secondary: "Secundair" armor: "Harnas" accessories: "Accessoires" -# misc: "Misc" + misc: "Anders" #geen letterlijke vertaling. Ook wel: Diversen of Divers books: "Boeken" common: @@ -144,8 +144,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription play: "Spelen" # When used as an action verb, like "Play next level" retry: "Probeer opnieuw" actions: "Acties" -# info: "Info" -# help: "Help" + info: "Info" + help: "Help" watch: "Volgen" unwatch: "Ontvolgen" submit_patch: "Correctie Opsturen" @@ -158,20 +158,20 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription body: "Inhoud" version: "Versie" # pending: "Pending" -# accepted: "Accepted" -# rejected: "Rejected" -# withdrawn: "Withdrawn" -# submitter: "Submitter" -# submitted: "Submitted" + accepted: "Geaccepteerd" + rejected: "Afgewezen" + withdrawn: "Teruggetrokken" + submitter: "Toevoeger" #inzender + submitted: "Toegevoegd" #ingezonden commit_msg: "Commit Bericht" -# review: "Review" + review: "Herzien" version_history: "Versie geschiedenis" version_history_for: "Versie geschiedenis voor: " select_changes: "Selecteer hieronder twee veranderingen om het verschil te zien." -# undo_prefix: "Undo" -# undo_shortcut: "(Ctrl+Z)" -# redo_prefix: "Redo" -# redo_shortcut: "(Ctrl+Shift+Z)" +# undo_prefix: "Undo" #Ongedaan maken + undo_shortcut: "(Ctrl+Z)" +# redo_prefix: "Redo" #Opnieuw (doen). O.i.d + redo_shortcut: "(Ctrl+Shift+Z)" play_preview: "Speel voorproefje van dit level" result: "Resultaat" results: "Resultaten" @@ -196,7 +196,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription player: "Speler" player_level: "Niveau" # Like player level 5, not like level: Dungeons of Kithgard warrior: "Krijger" -# ranger: "Ranger" +# ranger: "Ranger" #misschien doler wizard: "Tovenaar" units: @@ -218,18 +218,18 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription play_level: done: "Klaar" home: "Home" # Not used any more, will be removed soon. -# level: "Level" # Like "Level: Dungeons of Kithgard" + level: "Level" # Like "Level: Dungeons of Kithgard" skip: "Overslaan" -# game_menu: "Game Menu" + game_menu: "Spelmenu" guide: "Handleiding" restart: "Herstarten" goals: "Doelen" goal: "Doel" -# running: "Running..." +# running: "Running..." #misschien "draaiende", "is aan het draaien" of "draaien..." success: "Gelukt!" incomplete: "Incompleet" timed_out: "De tijd is op" -# failing: "Failing" +# failing: "Failing" #is aan het falen, of falende, alletwee niet mooi, misschien meer context nodig. action_timeline: "Actie tijdlijn" click_to_select: "Klik op een eenheid om deze te selecteren." # control_bar_multiplayer: "Multiplayer" @@ -257,26 +257,26 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription tome_minion_spells: "Jouw Minions' Spreuken" # Only in old-style levels. tome_read_only_spells: "Read-Only Spreuken" # Only in old-style levels. tome_other_units: "Andere Eenheden" # Only in old-style levels. -# tome_cast_button_run: "Run" -# tome_cast_button_running: "Running" -# tome_cast_button_ran: "Ran" -# tome_submit_button: "Submit" -# tome_reload_method: "Reload original code for this method" # Title text for individual method reload button. -# tome_select_method: "Select a Method" -# tome_see_all_methods: "See all methods you can edit" # Title text for method list selector (shown when there are multiple programmable methdos). + tome_cast_button_run: "Uitvoeren" +# tome_cast_button_running: "Running" #aan het draaien + tome_cast_button_ran: "Uitgevoerd" + tome_submit_button: "Indienen" #alternatieven: Toevoegen, verzenden/versturen/insturen misschien zelfs afronden + tome_reload_method: "Oorspronkelijke code voor deze methode herladen" # Title text for individual method reload button. + tome_select_method: "Kies een methode" + tome_see_all_methods: "Bekijk alle methoden die je kan aanpassen" # Title text for method list selector (shown when there are multiple programmable methods). tome_select_a_thang: "Selecteer Iemand voor " tome_available_spells: "Beschikbare spreuken" tome_your_skills: "Jouw Vaardigheden" -# tome_help: "Help" -# tome_current_method: "Current Method" + tome_help: "Help" + tome_current_method: "Huidige Methode" hud_continue_short: "Doorgaan" code_saved: "Code Opgeslagen" skip_tutorial: "Overslaan (esc)" # keyboard_shortcuts: "Key Shortcuts" loading_ready: "Klaar!" -# loading_start: "Start Level" + loading_start: "Start Level" problem_alert_title: "Verbeter je Code" -# problem_alert_help: "Help" + problem_alert_help: "Help" time_current: "Nu:" time_total: "Maximum:" time_goto: "Ga naar:" @@ -309,6 +309,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription tip_talk_is_cheap: "Je kunt het goed uitleggen, maar toon me de code. - Linus Torvalds" tip_first_language: "Het ergste dat je kan leren is je eerste programmeertaal. - Alan Kay" # tip_hardware_problem: "Q: How many programmers does it take to change a light bulb? A: None, it's a hardware problem." + tip_hardware_problem: "Q: Hoeveel programmeurs heb je nodig om een lampje te vervangen? A: Nul, het is een a hardware probleem." tip_hofstadters_law: "De Wet van Hofstadter: Het duurt altijd langer dan je verwacht, zelfs wanneer je rekening houdt met de Wet van Hofstadter." # tip_premature_optimization: "Premature optimization is the root of all evil. - Donald Knuth" # tip_brute_force: "When in doubt, use brute force. - Ken Thompson" @@ -328,11 +329,11 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription save_load_tab: "Opslaan/Laden" options_tab: "Opties" guide_tab: "Handleiding" -# guide_video_tutorial: "Video Tutorial" -# guide_tips: "Tips" + guide_video_tutorial: "Video Tutorial" + guide_tips: "Tips" multiplayer_tab: "Multiplayer" auth_tab: "Inschrijven" -# inventory_caption: "Equip your hero" + inventory_caption: "Kies de uitrusting van je held" choose_hero_caption: "Kies held, taal" # save_load_caption: "... and view history" options_caption: "Instellingen" @@ -341,17 +342,17 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription auth_caption: "Bewaar je voortgang." inventory: -# choose_inventory: "Equip Items" -# equipped_item: "Equipped" + choose_inventory: "Kies Uitrusting" + equipped_item: "Gekozen" required_purchase_title: "Verplicht" available_item: "Beschikbaar" -# restricted_title: "Restricted" -# should_equip: "(double-click to equip)" -# equipped: "(equipped)" -# locked: "(locked)" -# restricted: "(restricted in this level)" -# equip: "Equip" -# unequip: "Unequip" + restricted_title: "Onbeschikbaar" #letterlijker: beperkt + should_equip: "(double-click om te kiezen)" + equipped: "(gekozen)" + locked: "(versleuteld)" + restricted: "(onbeschikbaar in dit level)" + equip: "Kies" + unequip: "Verwijder" buy_gems: few_gems: "Een paar edelstenen" @@ -359,29 +360,31 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription chest_gems: "Schatkist met edelstenen" purchasing: "Aan het kopen..." declined: "Je kaart is geweigerd" -# retrying: "Server error, retrying." + retrying: "Server fout, opnieuw aan het proberen." prompt_title: "Niet genoeg edelstenen" -# prompt_body: "Do you want to get more?" + prompt_body: "Wil je meer krijgen?" prompt_button: "Naar de winkel" # recovered: "Previous gems purchase recovered. Please refresh the page." subscribe: -# subscribe_title: "Subscribe" -# unsubscribe: "Unsubscribe" -# confirm_unsubscribe: "Confirm Unsubscribe" -# never_mind: "Never Mind, I Still Love You" -# thank_you_months_prefix: "Thank you for supporting us these last" -# thank_you_months_suffix: "months." -# thank_you: "Thank you for supporting CodeCombat." + subscribe_title: "Abonneren" + unsubscribe: "Abonnement pzeggen" + confirm_unsubscribe: "Opzegging Bevestigen" + never_mind: "Laat Maar, Ik Hou Nog Steeds Van Je" + thank_you_months_prefix: "Bedankt voor je steun in de laatste" + thank_you_months_suffix: "maanden." + thank_you: "Bedankt dat je CodeCombat steunt." # sorry_to_see_you_go: "Sorry to see you go! Please let us know what we could have done better." -# unsubscribe_feedback_placeholder: "O, what have we done?" -# levels: "Get more practice with bonus levels!" -# heroes: "More powerful heroes!" + sorry_to_see_you_go: "Jammer dat je weggaat! Laat ons alsjeblieft weten wat we beter hadden kunnen doen." + unsubscribe_feedback_placeholder: "O, wat hebben we gedaan?" + levels: "Krijg meer ervaring door bonus levels te spelen!" + heroes: "Sterkere helden!" gems: "3500 extra edelstenen elke maand!" items: "Meer dan 250 bonus items!" parents: "Voor ouders" -# parents_title: "Your child will learn to code." + parents_title: "Uw kind leert programmeren." # parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." + parents_blurb1: "Met CodeCombat leert uw kind door echte code te schrijven. Ze beginnen met simpele instructies en naarmate ze verder komen, komen er moeilijkere onderwerpen aan bod." # parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." # subscribe_button: "Subscribe Now" From ad05ddc221ea2f86ea409ab8feff22d521951331 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 30 Jan 2015 15:33:53 +0000 Subject: [PATCH 3/4] Fixed merge issues --- app/locale/nl-NL.coffee | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index 73f4eb90c..eb7d23235 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -78,7 +78,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription awaiting_levels_adventurer_prefix: "We brengen 5 nieuwe levels per week uit." awaiting_levels_adventurer: "Schrijf je in als Avonturier" awaiting_levels_adventurer_suffix: "om de eerste te zijn die nieuwe levels speelt." -# adjust_volume: "Volume aanpassen" + adjust_volume: "Volume aanpassen" choose_your_level: "Kies Je Level" # The rest of this section is the old play view at /play-old and isn't very important. adventurer_prefix: "Je kunt meteen naar een van de levels hieronder springen, of de levels bespreken op " adventurer_forum: "het Avonturiersforum" @@ -169,7 +169,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription version_history_for: "Versie geschiedenis voor: " select_changes: "Selecteer hieronder twee veranderingen om het verschil te zien." # undo_prefix: "Undo" #Ongedaan maken - undo_shortcut: "(Ctrl+Z)" + undo_shortcut: "(Ctrl+Z)" # redo_prefix: "Redo" #Opnieuw (doen). O.i.d redo_shortcut: "(Ctrl+Shift+Z)" play_preview: "Speel voorproefje van dit level" @@ -308,7 +308,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription tip_impossible: "Het lijkt altijd onmogelijk tot het gedaan wordt. - Nelson Mandela" tip_talk_is_cheap: "Je kunt het goed uitleggen, maar toon me de code. - Linus Torvalds" tip_first_language: "Het ergste dat je kan leren is je eerste programmeertaal. - Alan Kay" -# tip_hardware_problem: "Q: How many programmers does it take to change a light bulb? A: None, it's a hardware problem." tip_hardware_problem: "Q: Hoeveel programmeurs heb je nodig om een lampje te vervangen? A: Nul, het is een a hardware probleem." tip_hofstadters_law: "De Wet van Hofstadter: Het duurt altijd langer dan je verwacht, zelfs wanneer je rekening houdt met de Wet van Hofstadter." # tip_premature_optimization: "Premature optimization is the root of all evil. - Donald Knuth" @@ -374,7 +373,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription thank_you_months_prefix: "Bedankt voor je steun in de laatste" thank_you_months_suffix: "maanden." thank_you: "Bedankt dat je CodeCombat steunt." -# sorry_to_see_you_go: "Sorry to see you go! Please let us know what we could have done better." sorry_to_see_you_go: "Jammer dat je weggaat! Laat ons alsjeblieft weten wat we beter hadden kunnen doen." unsubscribe_feedback_placeholder: "O, wat hebben we gedaan?" levels: "Krijg meer ervaring door bonus levels te spelen!" @@ -383,7 +381,6 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription items: "Meer dan 250 bonus items!" parents: "Voor ouders" parents_title: "Uw kind leert programmeren." -# parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics." parents_blurb1: "Met CodeCombat leert uw kind door echte code te schrijven. Ze beginnen met simpele instructies en naarmate ze verder komen, komen er moeilijkere onderwerpen aan bod." # parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers." # parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe." From 9ca2663e0ef831e2630b4176963eb58f845f4fc5 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Fri, 30 Jan 2015 08:12:34 -0800 Subject: [PATCH 4/4] Fixed one more instance of the previous bug. --- app/lib/world/rand.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/world/rand.coffee b/app/lib/world/rand.coffee index 07e87332c..6cb687aa5 100644 --- a/app/lib/world/rand.coffee +++ b/app/lib/world/rand.coffee @@ -7,7 +7,7 @@ class Rand @multiplier = 1664525 @modulo = 4294967296 # 2**32-1 @offset = 1013904223 - unless @seed? and 0 <= seed < @modulo + unless @seed? and 0 <= @seed < @modulo @seed = (new Date().valueOf() * new Date().getMilliseconds()) % @modulo # sets new seed value, even handling negative numbers