From 2fe642a338a7ac5183f95283d8b531053a7fcf44 Mon Sep 17 00:00:00 2001 From: panthernet Date: Wed, 27 Jul 2016 14:02:41 +0300 Subject: [PATCH 1/3] + Moved translation files to CLI Translations dir --- PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj | 5 + .../Translations}/translation.es.json | 0 .../Translations/translation.it.json | 166 +++++++++--------- .../Translations/translation.pl.json | 0 4 files changed, 88 insertions(+), 83 deletions(-) rename {Translations => PoGo.NecroBot.CLI/Translations}/translation.es.json (100%) rename translation.it.json => PoGo.NecroBot.CLI/Translations/translation.it.json (96%) rename translation.pl => PoGo.NecroBot.CLI/Translations/translation.pl.json (100%) diff --git a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj index 4132da37f..28d6fe8b8 100644 --- a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj +++ b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj @@ -131,6 +131,10 @@ + + + + @@ -145,6 +149,7 @@ + diff --git a/Translations/translation.es.json b/PoGo.NecroBot.CLI/Translations/translation.es.json similarity index 100% rename from Translations/translation.es.json rename to PoGo.NecroBot.CLI/Translations/translation.es.json diff --git a/translation.it.json b/PoGo.NecroBot.CLI/Translations/translation.it.json similarity index 96% rename from translation.it.json rename to PoGo.NecroBot.CLI/Translations/translation.it.json index 4a980f4c7..30551c2d5 100644 --- a/translation.it.json +++ b/PoGo.NecroBot.CLI/Translations/translation.it.json @@ -1,84 +1,84 @@ -{ - "TranslationStrings": [ - { - "Key": "pokeball", - "Value": "PokeBall" - }, - { - "Key": "greatPokeball", - "Value": "MegaBall" - }, - { - "Key": "ultraPokeball", - "Value": "UltraBall" - }, - { - "Key": "masterPokeball", - "Value": "MasterBall" - }, - { - "Key": "wrongAuthType", - "Value": "AuthType sconosciuto in config.json" - }, - { - "Key": "farmPokestopsOutsideRadius", - "Value": "Sei al di fuori dell'area definita! Ritorno all'inizio (distante {0}m) in 5 secondi. Il file Coords.ini è corretto?" - }, - { - "Key": "farmPokestopsNoUsableFound", - "Value": "Nessun PokeStop disponibile trovato nella tua area. Distanza massima troppo piccola?" - }, - { - "Key": "eventFortUsed", - "Value": "XP: {0}, Gems: {1}, Oggetti: {2}" - }, - { - "Key": "eventFortTargeted", - "Value": "{0} in ({1}m)" - }, - { - "Key": "eventProfileLogin", - "Value": "Giocando come {0}" - }, - { - "Key": "eventUsedLuckyEgg", - "Value": "Usato Fortunuovo, rimanenti: {0}" - }, - { - "Key": "eventPokemonEvolvedSuccess", - "Value": "{0} con successo per {1}xp" - }, - { - "Key": "eventPokemonEvolvedFailed", - "Value": "Fallita {0}. Il risultato è stato {1}, evoluzione di {2} interrotta" - }, - { - "Key": "eventPokemonTransferred", - "Value": "{0}\t- CP: {1} IV: {2}% [Miglior CP: {3} IV: {4}%] (Caramelle: {5})" - }, - { - "Key": "eventItemRecycled", - "Value": "{0}x {1}" - }, - { - "Key": "eventPokemonCapture", - "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Probabilità: {7}% | distanza {8}m | con una {9} ({10} rimanenti). | {11}" - }, - { - "Key": "eventNoPokeballs", - "Value": "Nessuna Pokeball - perso {0} con CP {1}" - }, - { - "Key": "catchStatusAttempt", - "Value": "{0} Tentativo #{1}" - }, - { - "Key": "catchStatus", - "Value": "{0}" - }, - { - "Key": "candies", - "Value": "Caramelle: {0}" - } - ] +{ + "TranslationStrings": [ + { + "Key": "pokeball", + "Value": "PokeBall" + }, + { + "Key": "greatPokeball", + "Value": "MegaBall" + }, + { + "Key": "ultraPokeball", + "Value": "UltraBall" + }, + { + "Key": "masterPokeball", + "Value": "MasterBall" + }, + { + "Key": "wrongAuthType", + "Value": "AuthType sconosciuto in config.json" + }, + { + "Key": "farmPokestopsOutsideRadius", + "Value": "Sei al di fuori dell'area definita! Ritorno all'inizio (distante {0}m) in 5 secondi. Il file Coords.ini è corretto?" + }, + { + "Key": "farmPokestopsNoUsableFound", + "Value": "Nessun PokeStop disponibile trovato nella tua area. Distanza massima troppo piccola?" + }, + { + "Key": "eventFortUsed", + "Value": "XP: {0}, Gems: {1}, Oggetti: {2}" + }, + { + "Key": "eventFortTargeted", + "Value": "{0} in ({1}m)" + }, + { + "Key": "eventProfileLogin", + "Value": "Giocando come {0}" + }, + { + "Key": "eventUsedLuckyEgg", + "Value": "Usato Fortunuovo, rimanenti: {0}" + }, + { + "Key": "eventPokemonEvolvedSuccess", + "Value": "{0} con successo per {1}xp" + }, + { + "Key": "eventPokemonEvolvedFailed", + "Value": "Fallita {0}. Il risultato è stato {1}, evoluzione di {2} interrotta" + }, + { + "Key": "eventPokemonTransferred", + "Value": "{0}\t- CP: {1} IV: {2}% [Miglior CP: {3} IV: {4}%] (Caramelle: {5})" + }, + { + "Key": "eventItemRecycled", + "Value": "{0}x {1}" + }, + { + "Key": "eventPokemonCapture", + "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Probabilità: {7}% | distanza {8}m | con una {9} ({10} rimanenti). | {11}" + }, + { + "Key": "eventNoPokeballs", + "Value": "Nessuna Pokeball - perso {0} con CP {1}" + }, + { + "Key": "catchStatusAttempt", + "Value": "{0} Tentativo #{1}" + }, + { + "Key": "catchStatus", + "Value": "{0}" + }, + { + "Key": "candies", + "Value": "Caramelle: {0}" + } + ] } \ No newline at end of file diff --git a/translation.pl b/PoGo.NecroBot.CLI/Translations/translation.pl.json similarity index 100% rename from translation.pl rename to PoGo.NecroBot.CLI/Translations/translation.pl.json From 4a12260038da252b6b7f040e6b1baf12d65c55e1 Mon Sep 17 00:00:00 2001 From: panthernet Date: Wed, 27 Jul 2016 14:05:46 +0300 Subject: [PATCH 2/3] + Added nl translation to the lang files location --- PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj | 1 + .../Translations/translation.nl.json | 84 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 PoGo.NecroBot.CLI/Translations/translation.nl.json diff --git a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj index 28d6fe8b8..3b9209db1 100644 --- a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj +++ b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj @@ -133,6 +133,7 @@ + diff --git a/PoGo.NecroBot.CLI/Translations/translation.nl.json b/PoGo.NecroBot.CLI/Translations/translation.nl.json new file mode 100644 index 000000000..cb7ac3b34 --- /dev/null +++ b/PoGo.NecroBot.CLI/Translations/translation.nl.json @@ -0,0 +1,84 @@ +{ + "TranslationStrings": [ + { + "Key": "pokeball", + "Value": "PokeBall" + }, + { + "Key": "greatPokeball", + "Value": "GreatBall" + }, + { + "Key": "ultraPokeball", + "Value": "UltraBall" + }, + { + "Key": "masterPokeball", + "Value": "MasterBall" + }, + { + "Key": "wrongAuthType", + "Value": "AuthType in config.json is onbekend." + }, + { + "Key": "farmPokestopsOutsideRadius", + "Value": "Buiten het ingestelde bereik beland! Terug naar beginpunt ({0}m away) in 5 seconden. Klopt je Coords.ini bestand?" + }, + { + "Key": "farmPokestopsNoUsableFound", + "Value": "Geen geschikte PokeStops gevonden in je omgeving. Is je bereik te klein?" + }, + { + "Key": "eventFortUsed", + "Value": "XP: {0}, Gems: {1}, Items: {2}" + }, + { + "Key": "eventFortTargeted", + "Value": "{0} in ({1}m)" + }, + { + "Key": "eventProfileLogin", + "Value": "Ingelogd als: {0}" + }, + { + "Key": "eventUsedLuckyEgg", + "Value": "Lucky Egg gebruikt, resterend: {0}" + }, + { + "Key": "eventPokemonEvolvedSuccess", + "Value": "{0} successvol voor {1}xp" + }, + { + "Key": "eventPokemonEvolvedFailed", + "Value": "Mislukt {0}. Resultaat was {1}, gestopt met evolueren {2}" + }, + { + "Key": "eventPokemonTransferred", + "Value": "{0}\t- CP: {1} IV: {2}% [Beste CP: {3} IV: {4}%] (Candies: {5})" + }, + { + "Key": "eventItemRecycled", + "Value": "{0}x {1}" + }, + { + "Key": "eventPokemonCapture", + "Value": "({0}) | ({1}) {2} Lvl: {3} CP: ({4}/{5}) IV: {6}% | Kans: {7}% | Afstand: {8}m | gevangen met een {9} ({10} resterend). | {11}" + }, + { + "Key": "eventNoPokeballs", + "Value": "Geen Pokeballs resterend - Een {0} misgelopen met CP: {1}" + }, + { + "Key": "catchStatusAttempt", + "Value": "{0} Poging #{1}" + }, + { + "Key": "catchStatus", + "Value": "{0}" + }, + { + "Key": "candies", + "Value": "Candies: {0}" + } + ] +} \ No newline at end of file From a3abc98353e93c6ccae5e2d8a29226c14d2a92d5 Mon Sep 17 00:00:00 2001 From: panthernet Date: Wed, 27 Jul 2016 14:12:56 +0300 Subject: [PATCH 3/3] + Used better place for lang files to be copied to cli usable folder --- .../Translations/translation.es.json | 0 .../Translations/translation.it.json | 0 .../Translations/translation.nl.json | 0 .../Translations/translation.pl.json | 0 .../Translations/translation.zh_CN.json | 0 PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj | 20 ++++++++++++++----- 6 files changed, 15 insertions(+), 5 deletions(-) rename PoGo.NecroBot.CLI/{ => Config}/Translations/translation.es.json (100%) rename PoGo.NecroBot.CLI/{ => Config}/Translations/translation.it.json (100%) rename PoGo.NecroBot.CLI/{ => Config}/Translations/translation.nl.json (100%) rename PoGo.NecroBot.CLI/{ => Config}/Translations/translation.pl.json (100%) rename PoGo.NecroBot.CLI/{ => Config}/Translations/translation.zh_CN.json (100%) diff --git a/PoGo.NecroBot.CLI/Translations/translation.es.json b/PoGo.NecroBot.CLI/Config/Translations/translation.es.json similarity index 100% rename from PoGo.NecroBot.CLI/Translations/translation.es.json rename to PoGo.NecroBot.CLI/Config/Translations/translation.es.json diff --git a/PoGo.NecroBot.CLI/Translations/translation.it.json b/PoGo.NecroBot.CLI/Config/Translations/translation.it.json similarity index 100% rename from PoGo.NecroBot.CLI/Translations/translation.it.json rename to PoGo.NecroBot.CLI/Config/Translations/translation.it.json diff --git a/PoGo.NecroBot.CLI/Translations/translation.nl.json b/PoGo.NecroBot.CLI/Config/Translations/translation.nl.json similarity index 100% rename from PoGo.NecroBot.CLI/Translations/translation.nl.json rename to PoGo.NecroBot.CLI/Config/Translations/translation.nl.json diff --git a/PoGo.NecroBot.CLI/Translations/translation.pl.json b/PoGo.NecroBot.CLI/Config/Translations/translation.pl.json similarity index 100% rename from PoGo.NecroBot.CLI/Translations/translation.pl.json rename to PoGo.NecroBot.CLI/Config/Translations/translation.pl.json diff --git a/PoGo.NecroBot.CLI/Translations/translation.zh_CN.json b/PoGo.NecroBot.CLI/Config/Translations/translation.zh_CN.json similarity index 100% rename from PoGo.NecroBot.CLI/Translations/translation.zh_CN.json rename to PoGo.NecroBot.CLI/Config/Translations/translation.zh_CN.json diff --git a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj index 3b9209db1..12f8c543b 100644 --- a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj +++ b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj @@ -131,11 +131,21 @@ - - - - - + + Always + + + Always + + + Always + + + Always + + + Always +