diff --git a/l10n/engine/en.po b/l10n/engine/en.po index a85ec5b2c..21a93ef59 100644 --- a/l10n/engine/en.po +++ b/l10n/engine/en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-21 09:29+0200\n" +"POT-Creation-Date: 2015-06-01 16:46+0200\n" "PO-Revision-Date: 2013-09-12 13:06+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -474,32 +474,32 @@ msgid "" "Exception message: {1}\n" msgstr "" -#: src/plm/core/model/Game.java:161 +#: src/plm/core/model/Game.java:160 msgid "Scala is usable on your machine. Congratulations." msgstr "" -#: src/plm/core/model/Game.java:163 +#: src/plm/core/model/Game.java:162 msgid "Please install Scala version 2.11 or higher to use it in the PLM." msgstr "" -#: src/plm/core/model/Game.java:165 +#: src/plm/core/model/Game.java:164 msgid "Jython is usable on your machine. Congratulations." msgstr "" -#: src/plm/core/model/Game.java:167 +#: src/plm/core/model/Game.java:166 msgid "" "Please install jython to use the python programming language in the PLM." msgstr "" -#: src/plm/core/model/Game.java:169 +#: src/plm/core/model/Game.java:168 msgid "C is usable on your machine. Congratulations." msgstr "" -#: src/plm/core/model/Game.java:171 +#: src/plm/core/model/Game.java:170 msgid "Please install gcc to use the C programming language in the PLM." msgstr "" -#: src/plm/core/model/Game.java:178 +#: src/plm/core/model/Game.java:176 #, java-format msgid "" "Warning, the default programming language is neither ''Java'' nor ''python'' " @@ -512,76 +512,76 @@ msgid "" "({2}/plm.properties)" msgstr "" -#: src/plm/core/model/Game.java:184 +#: src/plm/core/model/Game.java:182 msgid "" "The default programming language is Scala, but your scala installation is " "not usable. Switching to Java instead.\n" msgstr "" -#: src/plm/core/model/Game.java:187 +#: src/plm/core/model/Game.java:185 msgid "" "The default programming language is python, but your python installation is " "not usable. Switching to Java instead.\n" msgstr "" -#: src/plm/core/model/Game.java:190 +#: src/plm/core/model/Game.java:188 msgid "" "The default programming language is C, but your C installation is not " "usable. Switching to Java instead.\n" msgstr "" -#: src/plm/core/model/Game.java:211 +#: src/plm/core/model/Game.java:207 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below" msgstr "" -#: src/plm/core/model/Game.java:248 +#: src/plm/core/model/Game.java:244 #, java-format msgid "Error {0} while retrieving the Scala version: {1}" msgstr "" -#: src/plm/core/model/Game.java:257 +#: src/plm/core/model/Game.java:253 #, java-format msgid "Scala is too ancient. Found {0} while I need 2.10 or higher." msgstr "" -#: src/plm/core/model/Game.java:282 +#: src/plm/core/model/Game.java:278 msgid "" "Cannot retrieve the python ScriptEngine. Are jython.jar and its dependencies " "in the classpath?" msgstr "" -#: src/plm/core/model/Game.java:321 +#: src/plm/core/model/Game.java:317 #, java-format msgid "" "Resource {0} not found in the classpath.\n" "Is {1} in your classpath?" msgstr "" -#: src/plm/core/model/Game.java:323 +#: src/plm/core/model/Game.java:319 #, java-format msgid "{0} received while searching for resource {1}: {2}" msgstr "" -#: src/plm/core/model/Game.java:352 +#: src/plm/core/model/Game.java:348 #, java-format msgid "Cannot load lesson {0}: class Main not found." msgstr "" -#: src/plm/core/model/Game.java:389 +#: src/plm/core/model/Game.java:385 #, java-format msgid "" "The lesson {0} encountered an issue while loading its exercises, please " "report the issue and choose another lesson." msgstr "" -#: src/plm/core/model/Game.java:390 +#: src/plm/core/model/Game.java:386 #, fuzzy msgid "Broken lesson" msgstr "Load lesson" -#: src/plm/core/model/Game.java:537 +#: src/plm/core/model/Game.java:532 #, java-format msgid "" "Exercise {0} does not support language {1}. Fallback to {2} instead. Please " @@ -589,61 +589,47 @@ msgid "" "language." msgstr "" -#: src/plm/core/model/Game.java:544 +#: src/plm/core/model/Game.java:539 msgid "Operation cancelled by the user" msgstr "Operation cancelled by the user" -#: src/plm/core/model/Game.java:586 +#: src/plm/core/model/Game.java:581 #, java-format msgid "The lecture {0} has no world that I can select" msgstr "" -#: src/plm/core/model/Game.java:987 +#: src/plm/core/model/Game.java:982 msgid "" "Please install Scala version 2.10 or higher to use it in the PLM.\n" "\n" msgstr "" -#: src/plm/core/model/Game.java:988 +#: src/plm/core/model/Game.java:983 msgid "Scala is missing" msgstr "" -#: src/plm/core/model/Game.java:992 +#: src/plm/core/model/Game.java:987 msgid "" "Please install jython and its dependencies to use the python programming " "language in the PLM.\n" "\n" msgstr "" -#: src/plm/core/model/Game.java:993 +#: src/plm/core/model/Game.java:988 msgid "Python is missing" msgstr "" -#: src/plm/core/model/Game.java:997 +#: src/plm/core/model/Game.java:992 msgid "" "Please install C and its dependencies to use the C programming language in " "the PLM.\n" "\n" msgstr "" -#: src/plm/core/model/Game.java:998 +#: src/plm/core/model/Game.java:993 msgid "C is missing" msgstr "" -#: src/plm/core/model/Users.java:100 -#, java-format -msgid "User {0} exists already; don't add it again." -msgstr "" - -#: src/plm/core/model/Users.java:124 -#, fuzzy, java-format -msgid "Switched to user: {0}" -msgstr "Switch to state view" - -#: src/plm/core/model/Users.java:177 -msgid "A new PLM user has been created for you!" -msgstr "" - #: src/plm/core/model/lesson/ExecutionProgress.java:70 #, fuzzy, java-format msgid "Congratulations, you passed this exercise.
({0} tests passed)" @@ -749,20 +735,20 @@ msgstr "" msgid "Cannot write answer world of {0}. Please check the permissions." msgstr "" -#: src/plm/core/model/lesson/Lecture.java:93 +#: src/plm/core/model/lesson/Lecture.java:97 #: src/plm/core/model/lesson/Lesson.java:103 #, java-format msgid "File {0}.html not found." msgstr "" -#: src/plm/core/model/lesson/Lecture.java:102 +#: src/plm/core/model/lesson/Lecture.java:106 #: src/plm/core/model/lesson/Lesson.java:113 #, java-format msgid "Cannot find the name of mission in {0}.html" msgstr "" #. It should never happen since the session content should be created by the git spy module. -#: src/plm/core/model/session/GitSessionKit.java:89 +#: src/plm/core/model/session/GitSessionKit.java:79 msgid "" "Something weird happened. Your session was not created/reloaded properly. " "Please report this issue." @@ -816,24 +802,24 @@ msgstr "" msgid "Abording on user request" msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:73 +#: src/plm/core/model/tracking/GitSpy.java:67 #, java-format msgid "Your session {0} was automatically retrieved from the servers." msgstr "" #. If no branch can be found remotely, create a new one. #. getGame().getLogger().log(getGame().i18n.tr("Creating a new session locally, as no corresponding session could be retrieved from the servers.",userBranch)); -#: src/plm/core/model/tracking/GitSpy.java:78 +#: src/plm/core/model/tracking/GitSpy.java:72 msgid "Couldn't retrieve a corresponding session from the servers..." msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:87 +#: src/plm/core/model/tracking/GitSpy.java:81 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below)." msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:165 +#: src/plm/core/model/tracking/GitSpy.java:156 msgid "Pushing to the remote repository before exiting" msgstr "" @@ -1443,6 +1429,10 @@ msgstr "" msgid " {0} (got {1} instead of {2})\n" msgstr "" +#, fuzzy +#~ msgid "Switched to user: {0}" +#~ msgstr "Switch to state view" + #~ msgid "Switch to time view" #~ msgstr "Switch to time view" diff --git a/l10n/engine/fr.po b/l10n/engine/fr.po index 772e3bd32..83aaf3b4d 100644 --- a/l10n/engine/fr.po +++ b/l10n/engine/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PLM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-21 09:29+0200\n" +"POT-Creation-Date: 2015-06-01 16:46+0200\n" "PO-Revision-Date: 2015-01-01 23:44+0100\n" "Last-Translator: Martin Quinson\n" "Language-Team: French <>\n" @@ -562,35 +562,35 @@ msgstr "" "nécessaires pour reproduire le problème.\n" "Message de l''exception: {1}\n" -#: src/plm/core/model/Game.java:161 +#: src/plm/core/model/Game.java:160 msgid "Scala is usable on your machine. Congratulations." msgstr "Scala est utilisable sur votre machine. Félicitations." -#: src/plm/core/model/Game.java:163 +#: src/plm/core/model/Game.java:162 msgid "Please install Scala version 2.11 or higher to use it in the PLM." msgstr "" "Veuillez installer Scala version 2.11 ou supérieure pour l'utiliser dans la " "PLM." -#: src/plm/core/model/Game.java:165 +#: src/plm/core/model/Game.java:164 msgid "Jython is usable on your machine. Congratulations." msgstr "Jython est utilisable sur votre machine. Félicitations." -#: src/plm/core/model/Game.java:167 +#: src/plm/core/model/Game.java:166 msgid "" "Please install jython to use the python programming language in the PLM." msgstr "" "Veuillez installer jython afin d'utiliser le langage python dans la PLM." -#: src/plm/core/model/Game.java:169 +#: src/plm/core/model/Game.java:168 msgid "C is usable on your machine. Congratulations." msgstr "C est utilisable sur votre machine. Félicitations." -#: src/plm/core/model/Game.java:171 +#: src/plm/core/model/Game.java:170 msgid "Please install gcc to use the C programming language in the PLM." msgstr "Veuillez installer gcc afin d'utiliser le langage C dans la PLM." -#: src/plm/core/model/Game.java:178 +#: src/plm/core/model/Game.java:176 #, java-format msgid "" "Warning, the default programming language is neither ''Java'' nor ''python'' " @@ -612,7 +612,7 @@ msgstr "" " Vous pouvez également changer la propriété {1} de votre fichier de " "configuration ({2}/plm.properties) pour cela." -#: src/plm/core/model/Game.java:184 +#: src/plm/core/model/Game.java:182 msgid "" "The default programming language is Scala, but your scala installation is " "not usable. Switching to Java instead.\n" @@ -620,7 +620,7 @@ msgstr "" "Vous utilisez Scala par défaut, mais votre installation de Scala est cassée. " "Utilisation de Java à la place.\n" -#: src/plm/core/model/Game.java:187 +#: src/plm/core/model/Game.java:185 msgid "" "The default programming language is python, but your python installation is " "not usable. Switching to Java instead.\n" @@ -628,7 +628,7 @@ msgstr "" "Vous utilisez python par défaut, mais votre installation de python est " "cassée. Utilisation de Java à la place.\n" -#: src/plm/core/model/Game.java:190 +#: src/plm/core/model/Game.java:188 msgid "" "The default programming language is C, but your C installation is not " "usable. Switching to Java instead.\n" @@ -636,7 +636,7 @@ msgstr "" "Vous utilisez C par défaut, mais votre installation de C est cassée. " "Utilisation de Java à la place.\n" -#: src/plm/core/model/Game.java:211 +#: src/plm/core/model/Game.java:207 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below" @@ -644,19 +644,19 @@ msgstr "" "Vous avez trouvé un bogue dans la PLM. Veuillez faire un rapport avec tous " "les détails possibles (y compris la pile d'exécution ci-dessous)." -#: src/plm/core/model/Game.java:248 +#: src/plm/core/model/Game.java:244 #, java-format msgid "Error {0} while retrieving the Scala version: {1}" msgstr "Erreur {0} lors de l''obtention du numéro de version de Scala: {1}" -#: src/plm/core/model/Game.java:257 +#: src/plm/core/model/Game.java:253 #, java-format msgid "Scala is too ancient. Found {0} while I need 2.10 or higher." msgstr "" "Scala est trop vieux. La PLM nécessite la version 2.10 ou supérieure, mais " "la version trouvée est : {0}." -#: src/plm/core/model/Game.java:282 +#: src/plm/core/model/Game.java:278 msgid "" "Cannot retrieve the python ScriptEngine. Are jython.jar and its dependencies " "in the classpath?" @@ -664,7 +664,7 @@ msgstr "" "Impossible de démarrer un engin de script pour python. Est ce que jython.jar " "et ses dépendances sont dans le classpath ?" -#: src/plm/core/model/Game.java:321 +#: src/plm/core/model/Game.java:317 #, java-format msgid "" "Resource {0} not found in the classpath.\n" @@ -673,17 +673,17 @@ msgstr "" "La ressource {0} est introuvable dans le classpath.\n" "Vous devriez peut-être ajouter {1} à votre classpath pour y remédier." -#: src/plm/core/model/Game.java:323 +#: src/plm/core/model/Game.java:319 #, java-format msgid "{0} received while searching for resource {1}: {2}" msgstr "{0} reçue lors de la recherche de la ressource {1}: {2}" -#: src/plm/core/model/Game.java:352 +#: src/plm/core/model/Game.java:348 #, fuzzy, java-format msgid "Cannot load lesson {0}: class Main not found." msgstr "Impossible de passer à la leçon {0} : la classe Main est introuvable." -#: src/plm/core/model/Game.java:389 +#: src/plm/core/model/Game.java:385 #, java-format msgid "" "The lesson {0} encountered an issue while loading its exercises, please " @@ -692,11 +692,11 @@ msgstr "" "La leçon {0} a rencontré un problème lors du chargement de ses exercices. " "Veuillez faire un rapport d'anomalie et choisir une autre leçon." -#: src/plm/core/model/Game.java:390 +#: src/plm/core/model/Game.java:386 msgid "Broken lesson" msgstr "Leçon cassée" -#: src/plm/core/model/Game.java:537 +#: src/plm/core/model/Game.java:532 #, java-format msgid "" "Exercise {0} does not support language {1}. Fallback to {2} instead. Please " @@ -707,16 +707,16 @@ msgstr "" "à la place. Vous pourriez contribuer au projet en ajoutant votre langage à " "cet exercice." -#: src/plm/core/model/Game.java:544 +#: src/plm/core/model/Game.java:539 msgid "Operation cancelled by the user" msgstr "Opération annulée par l'utilisateur" -#: src/plm/core/model/Game.java:586 +#: src/plm/core/model/Game.java:581 #, java-format msgid "The lecture {0} has no world that I can select" msgstr "La lecture {0} n'a aucun monde que je puisse sélectionner." -#: src/plm/core/model/Game.java:987 +#: src/plm/core/model/Game.java:982 msgid "" "Please install Scala version 2.10 or higher to use it in the PLM.\n" "\n" @@ -725,11 +725,11 @@ msgstr "" "PLM.\n" "\n" -#: src/plm/core/model/Game.java:988 +#: src/plm/core/model/Game.java:983 msgid "Scala is missing" msgstr "Scala est manquant" -#: src/plm/core/model/Game.java:992 +#: src/plm/core/model/Game.java:987 msgid "" "Please install jython and its dependencies to use the python programming " "language in the PLM.\n" @@ -739,11 +739,11 @@ msgstr "" "python.\n" "\n" -#: src/plm/core/model/Game.java:993 +#: src/plm/core/model/Game.java:988 msgid "Python is missing" msgstr "Python est manquant" -#: src/plm/core/model/Game.java:997 +#: src/plm/core/model/Game.java:992 msgid "" "Please install C and its dependencies to use the C programming language in " "the PLM.\n" @@ -752,24 +752,10 @@ msgstr "" "Veuillez installer C et ses dépendances pour utiliser la PLM en C.\n" "\n" -#: src/plm/core/model/Game.java:998 +#: src/plm/core/model/Game.java:993 msgid "C is missing" msgstr "C est manquant" -#: src/plm/core/model/Users.java:100 -#, java-format -msgid "User {0} exists already; don't add it again." -msgstr "L''utilisateur {0} existe déjà; il ne sera pas ajouté à nouveau. " - -#: src/plm/core/model/Users.java:124 -#, java-format -msgid "Switched to user: {0}" -msgstr "L''utilisateur est maintenant {0}" - -#: src/plm/core/model/Users.java:177 -msgid "A new PLM user has been created for you!" -msgstr "Un nouvel utilisateur PLM a été créé pour vous !" - #: src/plm/core/model/lesson/ExecutionProgress.java:70 #, fuzzy, java-format msgid "Congratulations, you passed this exercise.
({0} tests passed)" @@ -898,20 +884,20 @@ msgstr "" "Impossible d''écrire le monde de correction de {0}. Veuillez vérifier les " "permissions." -#: src/plm/core/model/lesson/Lecture.java:93 +#: src/plm/core/model/lesson/Lecture.java:97 #: src/plm/core/model/lesson/Lesson.java:103 #, java-format msgid "File {0}.html not found." msgstr "Le fichier {0}.html est introuvable." -#: src/plm/core/model/lesson/Lecture.java:102 +#: src/plm/core/model/lesson/Lecture.java:106 #: src/plm/core/model/lesson/Lesson.java:113 #, java-format msgid "Cannot find the name of mission in {0}.html" msgstr "Impossible de trouver le nom de la mission dans {0}.html" #. It should never happen since the session content should be created by the git spy module. -#: src/plm/core/model/session/GitSessionKit.java:89 +#: src/plm/core/model/session/GitSessionKit.java:79 msgid "" "Something weird happened. Your session was not created/reloaded properly. " "Please report this issue." @@ -974,18 +960,18 @@ msgstr "Erreur lors du chargement de votre session" msgid "Abording on user request" msgstr "Abandon, comme demandé par l'utilisateur" -#: src/plm/core/model/tracking/GitSpy.java:73 +#: src/plm/core/model/tracking/GitSpy.java:67 #, java-format msgid "Your session {0} was automatically retrieved from the servers." msgstr "Votre session {0} a été récupérée automatiquement depuis les serveurs." #. If no branch can be found remotely, create a new one. #. getGame().getLogger().log(getGame().i18n.tr("Creating a new session locally, as no corresponding session could be retrieved from the servers.",userBranch)); -#: src/plm/core/model/tracking/GitSpy.java:78 +#: src/plm/core/model/tracking/GitSpy.java:72 msgid "Couldn't retrieve a corresponding session from the servers..." msgstr "Impossible de récupérer une session adéquate sur les serveurs..." -#: src/plm/core/model/tracking/GitSpy.java:87 +#: src/plm/core/model/tracking/GitSpy.java:81 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below)." @@ -993,7 +979,7 @@ msgstr "" "Vous avez trouvé un bogue dans la PLM. Veuillez faire un rapport avec tous " "les détails possibles (y compris la pile d'exécution ci-dessous)." -#: src/plm/core/model/tracking/GitSpy.java:165 +#: src/plm/core/model/tracking/GitSpy.java:156 msgid "Pushing to the remote repository before exiting" msgstr "Envoi de vos changements sur le serveur avant de quitter." @@ -1668,6 +1654,15 @@ msgstr "Formes manquantes dans votre solution : \n" msgid " {0} (got {1} instead of {2})\n" msgstr " {0} (trouvé {1} au lieu de {2})\n" +#~ msgid "User {0} exists already; don't add it again." +#~ msgstr "L''utilisateur {0} existe déjà; il ne sera pas ajouté à nouveau. " + +#~ msgid "Switched to user: {0}" +#~ msgstr "L''utilisateur est maintenant {0}" + +#~ msgid "A new PLM user has been created for you!" +#~ msgstr "Un nouvel utilisateur PLM a été créé pour vous !" + #~ msgid "Flag sorter" #~ msgstr "Trieur de drapeau" diff --git a/l10n/engine/it.po b/l10n/engine/it.po index 78f85c7a5..13ad4c68f 100644 --- a/l10n/engine/it.po +++ b/l10n/engine/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-21 09:29+0200\n" +"POT-Creation-Date: 2015-06-01 16:46+0200\n" "PO-Revision-Date: 2014-01-19 09:06+100\n" "Last-Translator: vinnie \n" "Language-Team: LANGUAGE \n" @@ -544,20 +544,20 @@ msgstr "" "riprodurlo.\n" "Messaggio di eccezione: {1}\n" -#: src/plm/core/model/Game.java:161 +#: src/plm/core/model/Game.java:160 msgid "Scala is usable on your machine. Congratulations." msgstr "Scala è utilizzabile sul tuo pc. Congratulazioni." -#: src/plm/core/model/Game.java:163 +#: src/plm/core/model/Game.java:162 #, fuzzy msgid "Please install Scala version 2.11 or higher to use it in the PLM." msgstr "Per piacere istalla Scala versione 2.10 o maggiore per usarlo in PLM." -#: src/plm/core/model/Game.java:165 +#: src/plm/core/model/Game.java:164 msgid "Jython is usable on your machine. Congratulations." msgstr "Jython è utilizzabile sul tuo pc. Congratulazioni." -#: src/plm/core/model/Game.java:167 +#: src/plm/core/model/Game.java:166 #, fuzzy msgid "" "Please install jython to use the python programming language in the PLM." @@ -565,19 +565,19 @@ msgstr "" "Per piacere installa jython per usare il linguaggio di programmazione python " "in PLM." -#: src/plm/core/model/Game.java:169 +#: src/plm/core/model/Game.java:168 #, fuzzy msgid "C is usable on your machine. Congratulations." msgstr "Scala è utilizzabile sul tuo pc. Congratulazioni." -#: src/plm/core/model/Game.java:171 +#: src/plm/core/model/Game.java:170 #, fuzzy msgid "Please install gcc to use the C programming language in the PLM." msgstr "" "Per piacere installa jython per usare il linguaggio di programmazione python " "in PLM." -#: src/plm/core/model/Game.java:178 +#: src/plm/core/model/Game.java:176 #, fuzzy, java-format msgid "" "Warning, the default programming language is neither ''Java'' nor ''python'' " @@ -598,7 +598,7 @@ msgstr "" " In alternativa, la proprietà {1} può essere cambiata nel tuo file di " "configurazione ($HOME/.plm/plm.properties)" -#: src/plm/core/model/Game.java:184 +#: src/plm/core/model/Game.java:182 msgid "" "The default programming language is Scala, but your scala installation is " "not usable. Switching to Java instead.\n" @@ -606,7 +606,7 @@ msgstr "" "Il linguaggio di programmazione predefinito è Scala ma la tua installazione " "di scala non è utilizzabile. Seleziona Java invece.\n" -#: src/plm/core/model/Game.java:187 +#: src/plm/core/model/Game.java:185 msgid "" "The default programming language is python, but your python installation is " "not usable. Switching to Java instead.\n" @@ -614,7 +614,7 @@ msgstr "" "Il linguaggio di programmazione predefinito è python ma la tua installazione " "di python non è utilizzabile. Seleziona Java invece.\n" -#: src/plm/core/model/Game.java:190 +#: src/plm/core/model/Game.java:188 #, fuzzy msgid "" "The default programming language is C, but your C installation is not " @@ -623,25 +623,25 @@ msgstr "" "Il linguaggio di programmazione predefinito è Scala ma la tua installazione " "di scala non è utilizzabile. Seleziona Java invece.\n" -#: src/plm/core/model/Game.java:211 +#: src/plm/core/model/Game.java:207 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below" msgstr "" -#: src/plm/core/model/Game.java:248 +#: src/plm/core/model/Game.java:244 #, java-format msgid "Error {0} while retrieving the Scala version: {1}" msgstr "Errore {0} durante il tentativo di conoscere la versione di Scala: {1}" -#: src/plm/core/model/Game.java:257 +#: src/plm/core/model/Game.java:253 #, java-format msgid "Scala is too ancient. Found {0} while I need 2.10 or higher." msgstr "" "Scala è troppo vecchio. È stato trovata la versione {0} mentre occorre la " "2.10 o maggiore." -#: src/plm/core/model/Game.java:282 +#: src/plm/core/model/Game.java:278 msgid "" "Cannot retrieve the python ScriptEngine. Are jython.jar and its dependencies " "in the classpath?" @@ -649,7 +649,7 @@ msgstr "" "Impossibile ottenere lo ScriptEngine di python. jython.jar e le sue " "dipendenze si trovano nel classpath?" -#: src/plm/core/model/Game.java:321 +#: src/plm/core/model/Game.java:317 #, java-format msgid "" "Resource {0} not found in the classpath.\n" @@ -658,30 +658,30 @@ msgstr "" "La risorsa {0} non è stata trovata nel classpath.\n" "{1} è il tuo classpath?" -#: src/plm/core/model/Game.java:323 +#: src/plm/core/model/Game.java:319 #, java-format msgid "{0} received while searching for resource {1}: {2}" msgstr "Ricevuto {0} durante la ricerca della risorsa {1}: {2}:" -#: src/plm/core/model/Game.java:352 +#: src/plm/core/model/Game.java:348 #, fuzzy, java-format msgid "Cannot load lesson {0}: class Main not found." msgstr "" "Impossibile passare alla lezione {0}: la classe Main non è stata trovata." -#: src/plm/core/model/Game.java:389 +#: src/plm/core/model/Game.java:385 #, java-format msgid "" "The lesson {0} encountered an issue while loading its exercises, please " "report the issue and choose another lesson." msgstr "" -#: src/plm/core/model/Game.java:390 +#: src/plm/core/model/Game.java:386 #, fuzzy msgid "Broken lesson" msgstr "Carica lezione" -#: src/plm/core/model/Game.java:537 +#: src/plm/core/model/Game.java:532 #, java-format msgid "" "Exercise {0} does not support language {1}. Fallback to {2} instead. Please " @@ -692,16 +692,16 @@ msgstr "" "piacere considera di contribuire a questo progetto adattando questo " "esercizio a questo linguaggio." -#: src/plm/core/model/Game.java:544 +#: src/plm/core/model/Game.java:539 msgid "Operation cancelled by the user" msgstr "Operazione annullata dall'utente" -#: src/plm/core/model/Game.java:586 +#: src/plm/core/model/Game.java:581 #, java-format msgid "The lecture {0} has no world that I can select" msgstr "La lettura {0} non ha parole che io posso selezionare" -#: src/plm/core/model/Game.java:987 +#: src/plm/core/model/Game.java:982 #, fuzzy msgid "" "Please install Scala version 2.10 or higher to use it in the PLM.\n" @@ -710,11 +710,11 @@ msgstr "" "Per piacere istalla Scala versione 2.10 o maggiore per usarlo in PLM.\n" "\n" -#: src/plm/core/model/Game.java:988 +#: src/plm/core/model/Game.java:983 msgid "Scala is missing" msgstr "Scala è mancante" -#: src/plm/core/model/Game.java:992 +#: src/plm/core/model/Game.java:987 #, fuzzy msgid "" "Please install jython and its dependencies to use the python programming " @@ -725,11 +725,11 @@ msgstr "" "linguaggio python in PLM.\n" "\n" -#: src/plm/core/model/Game.java:993 +#: src/plm/core/model/Game.java:988 msgid "Python is missing" msgstr "Python è mancante" -#: src/plm/core/model/Game.java:997 +#: src/plm/core/model/Game.java:992 #, fuzzy msgid "" "Please install C and its dependencies to use the C programming language in " @@ -740,25 +740,11 @@ msgstr "" "linguaggio python in PLM.\n" "\n" -#: src/plm/core/model/Game.java:998 +#: src/plm/core/model/Game.java:993 #, fuzzy msgid "C is missing" msgstr "Scala è mancante" -#: src/plm/core/model/Users.java:100 -#, java-format -msgid "User {0} exists already; don't add it again." -msgstr "" - -#: src/plm/core/model/Users.java:124 -#, fuzzy, java-format -msgid "Switched to user: {0}" -msgstr "Passa alla visuale dello stato" - -#: src/plm/core/model/Users.java:177 -msgid "A new PLM user has been created for you!" -msgstr "" - #: src/plm/core/model/lesson/ExecutionProgress.java:70 #, fuzzy, java-format msgid "Congratulations, you passed this exercise.
({0} tests passed)" @@ -884,20 +870,20 @@ msgstr "" "Impossibile scrivere il mondo di risposta di {0}. Per piacere controlla i " "permessi." -#: src/plm/core/model/lesson/Lecture.java:93 +#: src/plm/core/model/lesson/Lecture.java:97 #: src/plm/core/model/lesson/Lesson.java:103 #, java-format msgid "File {0}.html not found." msgstr "File {0}.html non trovato." -#: src/plm/core/model/lesson/Lecture.java:102 +#: src/plm/core/model/lesson/Lecture.java:106 #: src/plm/core/model/lesson/Lesson.java:113 #, java-format msgid "Cannot find the name of mission in {0}.html" msgstr "Impossibile trovare il nome della missione in {0}.html" #. It should never happen since the session content should be created by the git spy module. -#: src/plm/core/model/session/GitSessionKit.java:89 +#: src/plm/core/model/session/GitSessionKit.java:79 msgid "" "Something weird happened. Your session was not created/reloaded properly. " "Please report this issue." @@ -960,24 +946,24 @@ msgstr "Errore durante il caricamento della tua sessione" msgid "Abording on user request" msgstr "Interruzione su richiesta dell'utente" -#: src/plm/core/model/tracking/GitSpy.java:73 +#: src/plm/core/model/tracking/GitSpy.java:67 #, java-format msgid "Your session {0} was automatically retrieved from the servers." msgstr "" #. If no branch can be found remotely, create a new one. #. getGame().getLogger().log(getGame().i18n.tr("Creating a new session locally, as no corresponding session could be retrieved from the servers.",userBranch)); -#: src/plm/core/model/tracking/GitSpy.java:78 +#: src/plm/core/model/tracking/GitSpy.java:72 msgid "Couldn't retrieve a corresponding session from the servers..." msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:87 +#: src/plm/core/model/tracking/GitSpy.java:81 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below)." msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:165 +#: src/plm/core/model/tracking/GitSpy.java:156 msgid "Pushing to the remote repository before exiting" msgstr "" @@ -1645,6 +1631,10 @@ msgstr "" msgid " {0} (got {1} instead of {2})\n" msgstr " {0} (ottenuto {1} invece di {2})\n" +#, fuzzy +#~ msgid "Switched to user: {0}" +#~ msgstr "Passa alla visuale dello stato" + #~ msgid "Flag sorter" #~ msgstr "Riordinatore dei Flag" diff --git a/l10n/engine/plm.pot b/l10n/engine/plm.pot index 509bed7da..4053a2870 100644 --- a/l10n/engine/plm.pot +++ b/l10n/engine/plm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-21 10:26+0200\n" +"POT-Creation-Date: 2015-06-01 16:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -471,32 +471,32 @@ msgid "" "Exception message: {1}\n" msgstr "" -#: src/plm/core/model/Game.java:161 +#: src/plm/core/model/Game.java:160 msgid "Scala is usable on your machine. Congratulations." msgstr "" -#: src/plm/core/model/Game.java:163 +#: src/plm/core/model/Game.java:162 msgid "Please install Scala version 2.11 or higher to use it in the PLM." msgstr "" -#: src/plm/core/model/Game.java:165 +#: src/plm/core/model/Game.java:164 msgid "Jython is usable on your machine. Congratulations." msgstr "" -#: src/plm/core/model/Game.java:167 +#: src/plm/core/model/Game.java:166 msgid "" "Please install jython to use the python programming language in the PLM." msgstr "" -#: src/plm/core/model/Game.java:169 +#: src/plm/core/model/Game.java:168 msgid "C is usable on your machine. Congratulations." msgstr "" -#: src/plm/core/model/Game.java:171 +#: src/plm/core/model/Game.java:170 msgid "Please install gcc to use the C programming language in the PLM." msgstr "" -#: src/plm/core/model/Game.java:178 +#: src/plm/core/model/Game.java:176 #, java-format msgid "" "Warning, the default programming language is neither ''Java'' nor ''python'' " @@ -509,75 +509,75 @@ msgid "" "({2}/plm.properties)" msgstr "" -#: src/plm/core/model/Game.java:184 +#: src/plm/core/model/Game.java:182 msgid "" "The default programming language is Scala, but your scala installation is " "not usable. Switching to Java instead.\n" msgstr "" -#: src/plm/core/model/Game.java:187 +#: src/plm/core/model/Game.java:185 msgid "" "The default programming language is python, but your python installation is " "not usable. Switching to Java instead.\n" msgstr "" -#: src/plm/core/model/Game.java:190 +#: src/plm/core/model/Game.java:188 msgid "" "The default programming language is C, but your C installation is not " "usable. Switching to Java instead.\n" msgstr "" -#: src/plm/core/model/Game.java:211 +#: src/plm/core/model/Game.java:207 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below" msgstr "" -#: src/plm/core/model/Game.java:248 +#: src/plm/core/model/Game.java:244 #, java-format msgid "Error {0} while retrieving the Scala version: {1}" msgstr "" -#: src/plm/core/model/Game.java:257 +#: src/plm/core/model/Game.java:253 #, java-format msgid "Scala is too ancient. Found {0} while I need 2.10 or higher." msgstr "" -#: src/plm/core/model/Game.java:282 +#: src/plm/core/model/Game.java:278 msgid "" "Cannot retrieve the python ScriptEngine. Are jython.jar and its dependencies " "in the classpath?" msgstr "" -#: src/plm/core/model/Game.java:321 +#: src/plm/core/model/Game.java:317 #, java-format msgid "" "Resource {0} not found in the classpath.\n" "Is {1} in your classpath?" msgstr "" -#: src/plm/core/model/Game.java:323 +#: src/plm/core/model/Game.java:319 #, java-format msgid "{0} received while searching for resource {1}: {2}" msgstr "" -#: src/plm/core/model/Game.java:352 +#: src/plm/core/model/Game.java:348 #, java-format msgid "Cannot load lesson {0}: class Main not found." msgstr "" -#: src/plm/core/model/Game.java:389 +#: src/plm/core/model/Game.java:385 #, java-format msgid "" "The lesson {0} encountered an issue while loading its exercises, please " "report the issue and choose another lesson." msgstr "" -#: src/plm/core/model/Game.java:390 +#: src/plm/core/model/Game.java:386 msgid "Broken lesson" msgstr "" -#: src/plm/core/model/Game.java:537 +#: src/plm/core/model/Game.java:532 #, java-format msgid "" "Exercise {0} does not support language {1}. Fallback to {2} instead. Please " @@ -585,61 +585,47 @@ msgid "" "language." msgstr "" -#: src/plm/core/model/Game.java:544 +#: src/plm/core/model/Game.java:539 msgid "Operation cancelled by the user" msgstr "" -#: src/plm/core/model/Game.java:586 +#: src/plm/core/model/Game.java:581 #, java-format msgid "The lecture {0} has no world that I can select" msgstr "" -#: src/plm/core/model/Game.java:987 +#: src/plm/core/model/Game.java:982 msgid "" "Please install Scala version 2.10 or higher to use it in the PLM.\n" "\n" msgstr "" -#: src/plm/core/model/Game.java:988 +#: src/plm/core/model/Game.java:983 msgid "Scala is missing" msgstr "" -#: src/plm/core/model/Game.java:992 +#: src/plm/core/model/Game.java:987 msgid "" "Please install jython and its dependencies to use the python programming " "language in the PLM.\n" "\n" msgstr "" -#: src/plm/core/model/Game.java:993 +#: src/plm/core/model/Game.java:988 msgid "Python is missing" msgstr "" -#: src/plm/core/model/Game.java:997 +#: src/plm/core/model/Game.java:992 msgid "" "Please install C and its dependencies to use the C programming language in " "the PLM.\n" "\n" msgstr "" -#: src/plm/core/model/Game.java:998 +#: src/plm/core/model/Game.java:993 msgid "C is missing" msgstr "" -#: src/plm/core/model/Users.java:100 -#, java-format -msgid "User {0} exists already; don't add it again." -msgstr "" - -#: src/plm/core/model/Users.java:124 -#, java-format -msgid "Switched to user: {0}" -msgstr "" - -#: src/plm/core/model/Users.java:177 -msgid "A new PLM user has been created for you!" -msgstr "" - #: src/plm/core/model/lesson/ExecutionProgress.java:70 #, java-format msgid "Congratulations, you passed this exercise.
({0} tests passed)" @@ -743,20 +729,20 @@ msgstr "" msgid "Cannot write answer world of {0}. Please check the permissions." msgstr "" -#: src/plm/core/model/lesson/Lecture.java:93 +#: src/plm/core/model/lesson/Lecture.java:97 #: src/plm/core/model/lesson/Lesson.java:103 #, java-format msgid "File {0}.html not found." msgstr "" -#: src/plm/core/model/lesson/Lecture.java:102 +#: src/plm/core/model/lesson/Lecture.java:106 #: src/plm/core/model/lesson/Lesson.java:113 #, java-format msgid "Cannot find the name of mission in {0}.html" msgstr "" #. It should never happen since the session content should be created by the git spy module. -#: src/plm/core/model/session/GitSessionKit.java:89 +#: src/plm/core/model/session/GitSessionKit.java:79 msgid "" "Something weird happened. Your session was not created/reloaded properly. " "Please report this issue." @@ -810,24 +796,24 @@ msgstr "" msgid "Abording on user request" msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:73 +#: src/plm/core/model/tracking/GitSpy.java:67 #, java-format msgid "Your session {0} was automatically retrieved from the servers." msgstr "" #. If no branch can be found remotely, create a new one. #. getGame().getLogger().log(getGame().i18n.tr("Creating a new session locally, as no corresponding session could be retrieved from the servers.",userBranch)); -#: src/plm/core/model/tracking/GitSpy.java:78 +#: src/plm/core/model/tracking/GitSpy.java:72 msgid "Couldn't retrieve a corresponding session from the servers..." msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:87 +#: src/plm/core/model/tracking/GitSpy.java:81 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below)." msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:165 +#: src/plm/core/model/tracking/GitSpy.java:156 msgid "Pushing to the remote repository before exiting" msgstr "" diff --git a/l10n/engine/pt_BR.po b/l10n/engine/pt_BR.po index 0ba62f4d7..275e36666 100644 --- a/l10n/engine/pt_BR.po +++ b/l10n/engine/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PLM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-21 09:29+0200\n" +"POT-Creation-Date: 2015-06-01 16:46+0200\n" "PO-Revision-Date: 2015-01-22 23:31-0300\n" "Last-Translator: Fred Maranhão \n" "Language-Team: Brazilian\n" @@ -548,33 +548,33 @@ msgstr "" " Favor relatar isto como um erro (bug) do PLM, com todos os detalhes para " "reproduzir o erro. mensagem de exceção: {1}\n" -#: src/plm/core/model/Game.java:161 +#: src/plm/core/model/Game.java:160 msgid "Scala is usable on your machine. Congratulations." msgstr "Scala está funcional na sua máquina. Parabéns." -#: src/plm/core/model/Game.java:163 +#: src/plm/core/model/Game.java:162 msgid "Please install Scala version 2.11 or higher to use it in the PLM." msgstr "Favor instale Scala versão 2.11 ou superior para usá-la no PLM." -#: src/plm/core/model/Game.java:165 +#: src/plm/core/model/Game.java:164 msgid "Jython is usable on your machine. Congratulations." msgstr "Jython está funcional na sua máquina. Parabéns." -#: src/plm/core/model/Game.java:167 +#: src/plm/core/model/Game.java:166 msgid "" "Please install jython to use the python programming language in the PLM." msgstr "" "Por favor instale jython para usar a linguagem de programação python no PLM." -#: src/plm/core/model/Game.java:169 +#: src/plm/core/model/Game.java:168 msgid "C is usable on your machine. Congratulations." msgstr "C está funcional na sua máquina. Parabéns." -#: src/plm/core/model/Game.java:171 +#: src/plm/core/model/Game.java:170 msgid "Please install gcc to use the C programming language in the PLM." msgstr "Por favor instale o gcc para usar a linguagem de programação C no PLM." -#: src/plm/core/model/Game.java:178 +#: src/plm/core/model/Game.java:176 #, java-format msgid "" "Warning, the default programming language is neither ''Java'' nor ''python'' " @@ -594,7 +594,7 @@ msgstr "" " Alternativamente, a propriedade {1} pode ser mudada no seu arquivo de " "configuração ({2}/plm.properties)" -#: src/plm/core/model/Game.java:184 +#: src/plm/core/model/Game.java:182 msgid "" "The default programming language is Scala, but your scala installation is " "not usable. Switching to Java instead.\n" @@ -602,7 +602,7 @@ msgstr "" "A linguagem de programação padrão é Scala, mas sua instalação do scala não " "funciona. Trocando para Java.\n" -#: src/plm/core/model/Game.java:187 +#: src/plm/core/model/Game.java:185 msgid "" "The default programming language is python, but your python installation is " "not usable. Switching to Java instead.\n" @@ -610,7 +610,7 @@ msgstr "" "A linguagem de programação padrão é python, mas sua instalação do python não " "funciona. Trocando para Java.\n" -#: src/plm/core/model/Game.java:190 +#: src/plm/core/model/Game.java:188 msgid "" "The default programming language is C, but your C installation is not " "usable. Switching to Java instead.\n" @@ -618,7 +618,7 @@ msgstr "" "A linguagem de programação padrão é C, mas sua instalação do C não funciona. " "Trocando para Java.\n" -#: src/plm/core/model/Game.java:211 +#: src/plm/core/model/Game.java:207 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below" @@ -626,17 +626,17 @@ msgstr "" "Você encontrou um erro (bug) no PLM. Favor relate isto com todos os detalhes " "possíveis (incluindo a stacktrace abaixo)" -#: src/plm/core/model/Game.java:248 +#: src/plm/core/model/Game.java:244 #, java-format msgid "Error {0} while retrieving the Scala version: {1}" msgstr "Erro {0} enquanto recuperava a versão do Scala: {1}" -#: src/plm/core/model/Game.java:257 +#: src/plm/core/model/Game.java:253 #, java-format msgid "Scala is too ancient. Found {0} while I need 2.10 or higher." msgstr "Scala é muito antigo. Encontrei {0} mas preciso do 2.10 ou mais novo." -#: src/plm/core/model/Game.java:282 +#: src/plm/core/model/Game.java:278 msgid "" "Cannot retrieve the python ScriptEngine. Are jython.jar and its dependencies " "in the classpath?" @@ -644,7 +644,7 @@ msgstr "" "Não consigo recuperar o python ScriptEngine. jython.jar e suas dependências " "estão na classpath?" -#: src/plm/core/model/Game.java:321 +#: src/plm/core/model/Game.java:317 #, java-format msgid "" "Resource {0} not found in the classpath.\n" @@ -653,17 +653,17 @@ msgstr "" "Recurso {0} não encontrado na classpath.\n" "{1} está na classpath?" -#: src/plm/core/model/Game.java:323 +#: src/plm/core/model/Game.java:319 #, java-format msgid "{0} received while searching for resource {1}: {2}" msgstr "{0} recebidos enquanto buscava pelo recurso {1}: {2}" -#: src/plm/core/model/Game.java:352 +#: src/plm/core/model/Game.java:348 #, fuzzy, java-format msgid "Cannot load lesson {0}: class Main not found." msgstr "Não posso alternar para lição {0}: classe Main não encontrada." -#: src/plm/core/model/Game.java:389 +#: src/plm/core/model/Game.java:385 #, java-format msgid "" "The lesson {0} encountered an issue while loading its exercises, please " @@ -672,11 +672,11 @@ msgstr "" "A lição {0} encontrou um problema enquanto carregava seus exercícios, favor " "reportar o problema e escolher outra lição." -#: src/plm/core/model/Game.java:390 +#: src/plm/core/model/Game.java:386 msgid "Broken lesson" msgstr "Lição com defeito" -#: src/plm/core/model/Game.java:537 +#: src/plm/core/model/Game.java:532 #, java-format msgid "" "Exercise {0} does not support language {1}. Fallback to {2} instead. Please " @@ -687,16 +687,16 @@ msgstr "" "considere a possibilidade de contribuir para este projeto adaptando este " "exercício para esta linguagem." -#: src/plm/core/model/Game.java:544 +#: src/plm/core/model/Game.java:539 msgid "Operation cancelled by the user" msgstr "Operação cancelada pelo usuário" -#: src/plm/core/model/Game.java:586 +#: src/plm/core/model/Game.java:581 #, java-format msgid "The lecture {0} has no world that I can select" msgstr "A \"lecture\" {0} não tem um mundo que eu possa selecionar" -#: src/plm/core/model/Game.java:987 +#: src/plm/core/model/Game.java:982 msgid "" "Please install Scala version 2.10 or higher to use it in the PLM.\n" "\n" @@ -704,11 +704,11 @@ msgstr "" "Favor instalar o Scala versão 2.10 ou superior para usar ele no PLM.\n" "\n" -#: src/plm/core/model/Game.java:988 +#: src/plm/core/model/Game.java:983 msgid "Scala is missing" msgstr "Scala está faltando" -#: src/plm/core/model/Game.java:992 +#: src/plm/core/model/Game.java:987 msgid "" "Please install jython and its dependencies to use the python programming " "language in the PLM.\n" @@ -718,11 +718,11 @@ msgstr "" "programação pythonno PLM.\n" "\n" -#: src/plm/core/model/Game.java:993 +#: src/plm/core/model/Game.java:988 msgid "Python is missing" msgstr "Python está faltando" -#: src/plm/core/model/Game.java:997 +#: src/plm/core/model/Game.java:992 msgid "" "Please install C and its dependencies to use the C programming language in " "the PLM.\n" @@ -732,24 +732,10 @@ msgstr "" "programação C no PLM.\n" "\n" -#: src/plm/core/model/Game.java:998 +#: src/plm/core/model/Game.java:993 msgid "C is missing" msgstr "C está faltando" -#: src/plm/core/model/Users.java:100 -#, java-format -msgid "User {0} exists already; don't add it again." -msgstr "Usuário {0} já existe; não vou adicionar de novo." - -#: src/plm/core/model/Users.java:124 -#, java-format -msgid "Switched to user: {0}" -msgstr "Alternando para usuário: {0}" - -#: src/plm/core/model/Users.java:177 -msgid "A new PLM user has been created for you!" -msgstr "Um novo usuário PLM foi criado para você!" - #: src/plm/core/model/lesson/ExecutionProgress.java:70 #, fuzzy, java-format msgid "Congratulations, you passed this exercise.
({0} tests passed)" @@ -864,20 +850,20 @@ msgstr "" msgid "Cannot write answer world of {0}. Please check the permissions." msgstr "" -#: src/plm/core/model/lesson/Lecture.java:93 +#: src/plm/core/model/lesson/Lecture.java:97 #: src/plm/core/model/lesson/Lesson.java:103 #, java-format msgid "File {0}.html not found." msgstr "Arquivo {0}.html não encontrado." -#: src/plm/core/model/lesson/Lecture.java:102 +#: src/plm/core/model/lesson/Lecture.java:106 #: src/plm/core/model/lesson/Lesson.java:113 #, java-format msgid "Cannot find the name of mission in {0}.html" msgstr "Não encontrei o nome da missão em {0}.html" #. It should never happen since the session content should be created by the git spy module. -#: src/plm/core/model/session/GitSessionKit.java:89 +#: src/plm/core/model/session/GitSessionKit.java:79 msgid "" "Something weird happened. Your session was not created/reloaded properly. " "Please report this issue." @@ -931,24 +917,24 @@ msgstr "" msgid "Abording on user request" msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:73 +#: src/plm/core/model/tracking/GitSpy.java:67 #, java-format msgid "Your session {0} was automatically retrieved from the servers." msgstr "" #. If no branch can be found remotely, create a new one. #. getGame().getLogger().log(getGame().i18n.tr("Creating a new session locally, as no corresponding session could be retrieved from the servers.",userBranch)); -#: src/plm/core/model/tracking/GitSpy.java:78 +#: src/plm/core/model/tracking/GitSpy.java:72 msgid "Couldn't retrieve a corresponding session from the servers..." msgstr "Não consegui recuperar uma sessão correspondente dos servidores..." -#: src/plm/core/model/tracking/GitSpy.java:87 +#: src/plm/core/model/tracking/GitSpy.java:81 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below)." msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:165 +#: src/plm/core/model/tracking/GitSpy.java:156 msgid "Pushing to the remote repository before exiting" msgstr "" @@ -1578,6 +1564,15 @@ msgstr "" msgid " {0} (got {1} instead of {2})\n" msgstr "" +#~ msgid "User {0} exists already; don't add it again." +#~ msgstr "Usuário {0} já existe; não vou adicionar de novo." + +#~ msgid "Switched to user: {0}" +#~ msgstr "Alternando para usuário: {0}" + +#~ msgid "A new PLM user has been created for you!" +#~ msgstr "Um novo usuário PLM foi criado para você!" + #~ msgid "Flag sorter" #~ msgstr "Ordenador de bandeira" diff --git a/l10n/engine/zh.po b/l10n/engine/zh.po index d9573a410..2ce904522 100755 --- a/l10n/engine/zh.po +++ b/l10n/engine/zh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PLM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-21 09:29+0200\n" +"POT-Creation-Date: 2015-06-01 16:46+0200\n" "PO-Revision-Date: 2015-02-16 14:12+0100\n" "Last-Translator: Qiaoyang SU \n" "Language-Team: Chinese(中文)\n" @@ -475,32 +475,32 @@ msgid "" "Exception message: {1}\n" msgstr "" -#: src/plm/core/model/Game.java:161 +#: src/plm/core/model/Game.java:160 msgid "Scala is usable on your machine. Congratulations." msgstr "Scala能正常运行。" -#: src/plm/core/model/Game.java:163 +#: src/plm/core/model/Game.java:162 msgid "Please install Scala version 2.11 or higher to use it in the PLM." msgstr "要使用PLM请按装Scala 2.11 或更高的版本" -#: src/plm/core/model/Game.java:165 +#: src/plm/core/model/Game.java:164 msgid "Jython is usable on your machine. Congratulations." msgstr "Jython能正常运行" -#: src/plm/core/model/Game.java:167 +#: src/plm/core/model/Game.java:166 msgid "" "Please install jython to use the python programming language in the PLM." msgstr "PLM需要安装Jython来运行python语言程序" -#: src/plm/core/model/Game.java:169 +#: src/plm/core/model/Game.java:168 msgid "C is usable on your machine. Congratulations." msgstr "C语言能正常运行" -#: src/plm/core/model/Game.java:171 +#: src/plm/core/model/Game.java:170 msgid "Please install gcc to use the C programming language in the PLM." msgstr "PLM需要安装gcc来运行C语言程序" -#: src/plm/core/model/Game.java:178 +#: src/plm/core/model/Game.java:176 #, java-format msgid "" "Warning, the default programming language is neither ''Java'' nor ''python'' " @@ -513,75 +513,75 @@ msgid "" "({2}/plm.properties)" msgstr "" -#: src/plm/core/model/Game.java:184 +#: src/plm/core/model/Game.java:182 msgid "" "The default programming language is Scala, but your scala installation is " "not usable. Switching to Java instead.\n" msgstr "" -#: src/plm/core/model/Game.java:187 +#: src/plm/core/model/Game.java:185 msgid "" "The default programming language is python, but your python installation is " "not usable. Switching to Java instead.\n" msgstr "" -#: src/plm/core/model/Game.java:190 +#: src/plm/core/model/Game.java:188 msgid "" "The default programming language is C, but your C installation is not " "usable. Switching to Java instead.\n" msgstr "" -#: src/plm/core/model/Game.java:211 +#: src/plm/core/model/Game.java:207 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below" msgstr "" -#: src/plm/core/model/Game.java:248 +#: src/plm/core/model/Game.java:244 #, java-format msgid "Error {0} while retrieving the Scala version: {1}" msgstr "" -#: src/plm/core/model/Game.java:257 +#: src/plm/core/model/Game.java:253 #, java-format msgid "Scala is too ancient. Found {0} while I need 2.10 or higher." msgstr "" -#: src/plm/core/model/Game.java:282 +#: src/plm/core/model/Game.java:278 msgid "" "Cannot retrieve the python ScriptEngine. Are jython.jar and its dependencies " "in the classpath?" msgstr "" -#: src/plm/core/model/Game.java:321 +#: src/plm/core/model/Game.java:317 #, java-format msgid "" "Resource {0} not found in the classpath.\n" "Is {1} in your classpath?" msgstr "" -#: src/plm/core/model/Game.java:323 +#: src/plm/core/model/Game.java:319 #, java-format msgid "{0} received while searching for resource {1}: {2}" msgstr "" -#: src/plm/core/model/Game.java:352 +#: src/plm/core/model/Game.java:348 #, fuzzy, java-format msgid "Cannot load lesson {0}: class Main not found." msgstr "无法打开课程{0}: class Main not found" -#: src/plm/core/model/Game.java:389 +#: src/plm/core/model/Game.java:385 #, java-format msgid "" "The lesson {0} encountered an issue while loading its exercises, please " "report the issue and choose another lesson." msgstr "" -#: src/plm/core/model/Game.java:390 +#: src/plm/core/model/Game.java:386 msgid "Broken lesson" msgstr "跳出课程" -#: src/plm/core/model/Game.java:537 +#: src/plm/core/model/Game.java:532 #, java-format msgid "" "Exercise {0} does not support language {1}. Fallback to {2} instead. Please " @@ -589,61 +589,47 @@ msgid "" "language." msgstr "" -#: src/plm/core/model/Game.java:544 +#: src/plm/core/model/Game.java:539 msgid "Operation cancelled by the user" msgstr "" -#: src/plm/core/model/Game.java:586 +#: src/plm/core/model/Game.java:581 #, java-format msgid "The lecture {0} has no world that I can select" msgstr "" -#: src/plm/core/model/Game.java:987 +#: src/plm/core/model/Game.java:982 msgid "" "Please install Scala version 2.10 or higher to use it in the PLM.\n" "\n" msgstr "" -#: src/plm/core/model/Game.java:988 +#: src/plm/core/model/Game.java:983 msgid "Scala is missing" msgstr "" -#: src/plm/core/model/Game.java:992 +#: src/plm/core/model/Game.java:987 msgid "" "Please install jython and its dependencies to use the python programming " "language in the PLM.\n" "\n" msgstr "" -#: src/plm/core/model/Game.java:993 +#: src/plm/core/model/Game.java:988 msgid "Python is missing" msgstr "" -#: src/plm/core/model/Game.java:997 +#: src/plm/core/model/Game.java:992 msgid "" "Please install C and its dependencies to use the C programming language in " "the PLM.\n" "\n" msgstr "" -#: src/plm/core/model/Game.java:998 +#: src/plm/core/model/Game.java:993 msgid "C is missing" msgstr "" -#: src/plm/core/model/Users.java:100 -#, java-format -msgid "User {0} exists already; don't add it again." -msgstr "" - -#: src/plm/core/model/Users.java:124 -#, java-format -msgid "Switched to user: {0}" -msgstr "" - -#: src/plm/core/model/Users.java:177 -msgid "A new PLM user has been created for you!" -msgstr "" - #: src/plm/core/model/lesson/ExecutionProgress.java:70 #, java-format msgid "Congratulations, you passed this exercise.
({0} tests passed)" @@ -747,20 +733,20 @@ msgstr "" msgid "Cannot write answer world of {0}. Please check the permissions." msgstr "" -#: src/plm/core/model/lesson/Lecture.java:93 +#: src/plm/core/model/lesson/Lecture.java:97 #: src/plm/core/model/lesson/Lesson.java:103 #, java-format msgid "File {0}.html not found." msgstr "" -#: src/plm/core/model/lesson/Lecture.java:102 +#: src/plm/core/model/lesson/Lecture.java:106 #: src/plm/core/model/lesson/Lesson.java:113 #, java-format msgid "Cannot find the name of mission in {0}.html" msgstr "" #. It should never happen since the session content should be created by the git spy module. -#: src/plm/core/model/session/GitSessionKit.java:89 +#: src/plm/core/model/session/GitSessionKit.java:79 msgid "" "Something weird happened. Your session was not created/reloaded properly. " "Please report this issue." @@ -814,24 +800,24 @@ msgstr "" msgid "Abording on user request" msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:73 +#: src/plm/core/model/tracking/GitSpy.java:67 #, java-format msgid "Your session {0} was automatically retrieved from the servers." msgstr "" #. If no branch can be found remotely, create a new one. #. getGame().getLogger().log(getGame().i18n.tr("Creating a new session locally, as no corresponding session could be retrieved from the servers.",userBranch)); -#: src/plm/core/model/tracking/GitSpy.java:78 +#: src/plm/core/model/tracking/GitSpy.java:72 msgid "Couldn't retrieve a corresponding session from the servers..." msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:87 +#: src/plm/core/model/tracking/GitSpy.java:81 msgid "" "You found a bug in the PLM. Please report it with all possible details " "(including the stacktrace below)." msgstr "" -#: src/plm/core/model/tracking/GitSpy.java:165 +#: src/plm/core/model/tracking/GitSpy.java:156 msgid "Pushing to the remote repository before exiting" msgstr "" diff --git a/lib/plm-messages.jar b/lib/plm-messages.jar index 064078239..17e401cc1 100644 Binary files a/lib/plm-messages.jar and b/lib/plm-messages.jar differ diff --git a/lib/resources/plm.configuration.properties b/lib/resources/plm.configuration.properties index 453e363a3..9d0857958 100644 --- a/lib/resources/plm.configuration.properties +++ b/lib/resources/plm.configuration.properties @@ -1,4 +1,4 @@ -#Tue, 21 Apr 2015 10:27:30 +0200 +#Mon, 01 Jun 2015 16:47:22 +0200 # PLM default configuration plm.major.version=2.6-pre plm.minor.version=20150202 diff --git a/src/lessons/editor/Main.java b/src/lessons/editor/Main.java new file mode 100644 index 000000000..458b8c477 --- /dev/null +++ b/src/lessons/editor/Main.java @@ -0,0 +1,20 @@ +package lessons.editor; + +import java.io.IOException; + +import lessons.editor.editor.Editor; +import plm.core.model.Game; +import plm.core.model.lesson.Lesson; +import plm.universe.BrokenWorldFileException; + +public class Main extends Lesson { + + public Main(Game game) { + super(game); + } + + @Override + protected void loadExercises() throws IOException, BrokenWorldFileException { + addExercise(new Editor(getGame(), this)); + } +} diff --git a/src/lessons/editor/editor/Editor.html b/src/lessons/editor/editor/Editor.html new file mode 100644 index 000000000..ae2fc8480 --- /dev/null +++ b/src/lessons/editor/editor/Editor.html @@ -0,0 +1,4 @@ + +

Editor

+ +

vacheda

\ No newline at end of file diff --git a/src/lessons/editor/editor/Editor.java b/src/lessons/editor/editor/Editor.java new file mode 100644 index 000000000..e8d5a7d0b --- /dev/null +++ b/src/lessons/editor/editor/Editor.java @@ -0,0 +1,22 @@ +package lessons.editor.editor; + +import java.awt.Color; + +import plm.core.model.Game; +import plm.core.model.lesson.ExerciseTemplated; +import plm.core.model.lesson.Lesson; +import plm.universe.Direction; +import plm.universe.bugglequest.BuggleWorld; +import plm.universe.bugglequest.SimpleBuggle; + +public class Editor extends ExerciseTemplated { + + public Editor(Game game, Lesson lesson) { + super(game, lesson); + + BuggleWorld myWorld = new BuggleWorld(game, "Editor",10,10); + new SimpleBuggle(myWorld, "NDP", 7, 3, Direction.NORTH, Color.GREEN, Color.lightGray); + + setup(myWorld); + } +} diff --git a/src/lessons/editor/editor/EditorEntity.c b/src/lessons/editor/editor/EditorEntity.c new file mode 100644 index 000000000..844953e30 --- /dev/null +++ b/src/lessons/editor/editor/EditorEntity.c @@ -0,0 +1,7 @@ +void run(){ + /* BEGIN TEMPLATE */ + /* BEGIN SOLUTION */ + forward(); + /* END SOLUTION */ + /* END TEMPLATE */ +} diff --git a/src/lessons/editor/editor/EditorEntity.java b/src/lessons/editor/editor/EditorEntity.java new file mode 100644 index 000000000..8305eb717 --- /dev/null +++ b/src/lessons/editor/editor/EditorEntity.java @@ -0,0 +1,14 @@ +package lessons.editor.editor; + +import plm.universe.bugglequest.SimpleBuggle; + +public class EditorEntity extends SimpleBuggle { + @Override + public void run() { + /* BEGIN TEMPLATE */ + /* BEGIN SOLUTION */ + forward(); + /* END SOLUTION */ + /* END TEMPLATE */ + } +} diff --git a/src/lessons/editor/editor/EditorEntity.py b/src/lessons/editor/editor/EditorEntity.py new file mode 100644 index 000000000..ac562d922 --- /dev/null +++ b/src/lessons/editor/editor/EditorEntity.py @@ -0,0 +1,4 @@ +# BEGIN SOLUTION +forward() +# END SOLUTION + diff --git a/src/lessons/editor/editor/ScalaEditorEntity.scala b/src/lessons/editor/editor/ScalaEditorEntity.scala new file mode 100644 index 000000000..3df07e5f0 --- /dev/null +++ b/src/lessons/editor/editor/ScalaEditorEntity.scala @@ -0,0 +1,15 @@ +package lessons.editor.editor + +import plm.universe.bugglequest.SimpleBuggle; + +class ScalaEditorEntity extends SimpleBuggle { + + protected override def run() { + /* BEGIN TEMPLATE */ + /* BEGIN SOLUTION */ + forward(); + /* END SOLUTION */ + /* END TEMPLATE */ + } + +} \ No newline at end of file diff --git a/src/plm/core/model/Game.java b/src/plm/core/model/Game.java index e2b9ef0e2..26d12c378 100644 --- a/src/plm/core/model/Game.java +++ b/src/plm/core/model/Game.java @@ -99,7 +99,7 @@ public enum GameState { "lessons.welcome", "lessons.turmites", "lessons.maze", "lessons.turtleart", "lessons.sort.basic", "lessons.sort.dutchflag", "lessons.sort.baseball", "lessons.sort.pancake", "lessons.recursion.cons", "lessons.recursion.lego", "lessons.recursion.hanoi", - "lessons.lightbot", "lessons.bat.string1", "lessons.lander" + "lessons.lightbot", "lessons.bat.string1", "lessons.lander", "lessons.editor" }; public static final ProgrammingLanguage JAVA = new LangJava(false); public static final ProgrammingLanguage PYTHON = new LangPython(false); diff --git a/src/plm/core/model/lesson/Lecture.java b/src/plm/core/model/lesson/Lecture.java index 4e4d117e7..9415b5253 100644 --- a/src/plm/core/model/lesson/Lecture.java +++ b/src/plm/core/model/lesson/Lecture.java @@ -77,6 +77,9 @@ public Lesson getLesson() { public String getMission(ProgrammingLanguage lang) { return PlmHtmlEditorKit.filterHTML(this.mission, game.isDebugEnabled(), lang); } + public String getRawMission() { + return this.mission; + } public void setMission(String mission) { this.mission=mission; } diff --git a/src/plm/core/ui/PlmHtmlEditorKit.java b/src/plm/core/ui/PlmHtmlEditorKit.java index a942bf80b..44fd7363f 100644 --- a/src/plm/core/ui/PlmHtmlEditorKit.java +++ b/src/plm/core/ui/PlmHtmlEditorKit.java @@ -44,10 +44,10 @@ public class PlmHtmlEditorKit extends HTMLEditorKit { public static String filterHTML(String in, boolean showAll, ProgrammingLanguage language){ - return filterHTML(in, showAll,false, null, language); + return filterHTMLBis(in, showAll,false, null, language); } - public static String filterHTML(String in, boolean showAll, boolean showMulti, ProgrammingLanguage[] currLang, ProgrammingLanguage language) { + public static String filterHTMLBis(String in, boolean showAll, boolean showMulti, ProgrammingLanguage[] currLang, ProgrammingLanguage language) { if (langColors == null) { langColors = new HashMap(); langColors.put("java", "FF0000");