Merge remote-tracking branch 'upstream/master'

# Conflicts: # PoGo.NecroBot.CLI/Program.cs # PoGo.NecroBot.Logic/Settings.cs
Supergod99 · Jul 31, 2016 · 6a86913 · 6a86913
2 parents 8504a2a + 57588b1
commit 6a86913
Show file tree

Hide file tree

Showing 32 changed files with 415 additions and 239 deletions.
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.de.json b/PoGo.NecroBot.CLI/Config/Translations/translation.de.json
@@ -106,6 +106,14 @@
       "Key": "eventNoPokeballs",
       "Value": "Keine Pokébälle mehr! - Wir haben ein {0} mit {1} WP verpasst!"
     },
+    {
+      "Key": "eventUseBerry",
+      "Value": "{0} benutzt, {1} verbleibend"
+    },
+    {
+      "Key": "itemRazzBerry",
+      "Value": "Himmihbeere"
+    },
     {
       "Key": "catchStatusAttempt",
       "Value": "{0} Versuch #{1}"
@@ -312,7 +320,7 @@
     },
     {
       "Key": "PokeballsToKeepIncorrect",
-      "Value": "TotalAmountOfPokebalsToKeep ist falsch konfiguriert. Die Zahl ist kleiner als 1."
+      "Value": "TotalAmountOfPokeballsToKeep ist falsch konfiguriert. Die Zahl ist kleiner als 1."
     },
     {
       "Key": "PotionsToKeepIncorrect",

diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.es.json b/PoGo.NecroBot.CLI/Config/Translations/translation.es.json
@@ -1,4 +1,4 @@
-{
+{
   "TranslationStrings": [
     {
       "Key": "pokeball",
@@ -290,7 +290,7 @@
     },
     {
       "Key": "pokeballsToKeepIncorrect",
-      "Value": "TotalAmountOfPokebalsToKeep está configurado incorrectamente. El número es más pequeño que 1."
+      "Value": "TotalAmountOfPokeballsToKeep está configurado incorrectamente. El número es más pequeño que 1."
     },
     {
       "Key": "potionsToKeepIncorrect",

diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json b/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json
@@ -1,8 +1,8 @@
-{
+{
   "TranslationStrings": [
     {
       "Key": "pokeball",
-      "Value": "PokeBall"
+      "Value": "PokéBall"
     },
     {
       "Key": "greatPokeball",
@@ -30,23 +30,23 @@
     },
     {
       "Key": "eventFortUsed",
-      "Value": "Nom : {0} | {1}XP, Gems : {2}, Objets : {3}"
+      "Value": "{0} | {1}XP, Objets: {3} | {2}"
     },
     {
       "Key": "eventFortFailed",
       "Value": "Collecte/Capture impossible, tentative dans : {1}/{2}"
     },
     {
       "Key": "eventFortTargeted",
-      "Value": "Arrivée au Pokestop : {0} dans ({1}m)"
+      "Value": "{0} dans {1}m"
     },
     {
       "Key": "eventProfileLogin",
       "Value": "Connecté en tant que {0}"
     },
     {
       "Key": "eventUsedLuckyEgg",
-      "Value": "Utilisation d'un Oeuf Chance, temps restant : {0}"
+      "Value": "Bonus Oeuf Chance : {0}min restant"
     },
     {
       "Key": "eventPokemonEvolvedSuccess",
@@ -58,15 +58,15 @@
     },
     {
       "Key": "eventPokemonTransferred",
-      "Value": "{0}\t- PC: {1} - IV: {2}%   [Maximum PC:{3} IV: {4}%] ({5} Bonbons)"
+      "Value": "{0}\t- {1} / {2}%   [Maximum  {3} / {4}%] ({5} Bonbons)"
     },
     {
       "Key": "eventItemRecycled",
       "Value": "{1} x{0}"
     },
     {
       "Key": "eventPokemonCapture",
-      "Value": "({0}) | ({1}) {2} Lv {3} {6} ({4}/{5}) | {7}% Chance sur {8}m | {10} {9} restant, {11}"
+      "Value": "({0}) |{1}-{2} Lv {3} {6}% {4}/{5} | {7}% Chance sur {8}m | {10} {9} restant, {11}"
     },
     {
       "Key": "eventNoPokeballs",
@@ -82,7 +82,7 @@
     },
     {
       "Key": "candies",
-      "Value": "{0}Bonbons"
+      "Value": "{0} Bonbons"
     },
     {
       "Key": "unhandledGPXData",
@@ -254,19 +254,19 @@
     },
     {
       "Key": "pokemonSkipped",
-      "Value": "{0} ignoré"
+      "Value": "{0} est ignoré"
     },
 	{
       "Key": "zeroPokeballInv",
       "Value": "Vous n'avez plus de pokéballs, capture de pokémons impossible !"
     },
 	{
       "Key": "currentPokeballInv",
-      "Value": "[Inventaire] Pokeballs: {0} | Superballs: {1} | Hyperballs: {2} | Masterballs: {3}"
+      "Value": "[Inventaire] Pokéballs: {0} | Superballs: {1} | Hyperballs: {2} | Masterballs: {3}"
     },
 	{
       "Key": "checkingForBallsToRecycle",
-      "Value": "Recherche de PokeBalls à supprimer. En garder {0}"
+      "Value": "Recherche de PokéBalls à supprimer. En garder {0}"
     },
     {
       "Key": "checkingForPotionsToRecycle",
@@ -278,7 +278,7 @@
     },
 	{
       "Key": "pokeballsToKeepIncorrect",
-      "Value": "TotalAmountOfPokebalsToKeep est mal configuré. Le nombre est inférieur à 1."
+      "Value": "TotalAmountOfPokeballsToKeep est mal configuré. Le nombre est inférieur à 1."
     },
     {
       "Key": "potionsToKeepIncorrect",
@@ -410,11 +410,15 @@
     },
     {
       "Key": "displayHighestMove1Header",
-      "Value": "ATTAQUE1"
+      "Value": "Attaque 1"
     },
     {
       "Key": "displayHighestMove2Header",
-      "Value": "ATTAQUE2"
+      "Value": "Attaque 2"
+    }
+    {
+      "Key": "DisplayHighestCandy",
+      "Value": "Bonbons"
     }
   ]
 }