Merge pull request #1050 from panthernet/master

Fix for latest commit and updated russian lang file
NecronomiconCoding · Jul 27, 2016 · bac526f · bac526f
2 parents 4bbc330 + d9bb117
commit bac526f
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 4 deletions.
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.ru_RU.json b/PoGo.NecroBot.CLI/Config/Translations/translation.ru_RU.json
@@ -202,6 +202,86 @@
     {
       "Key": "couldntCopyToClipboard2",
       "Value": "Пройдите по ссылке: {0} и введите {1}"
+    },
+    {
+      "Key": "realisticTravelDetected",
+      "Value": "Обнаружено реалистичное перемещение, используем UserSettings.settings"
+    },
+    {
+      "Key": "notRealisticTravel",
+      "Value": "Не реалистичное перемещение в {0}, используем последний файл Coords.ini"
+    },
+    {
+      "Key": "coordinatesAreInvalid",
+      "Value": "Координаты в файле \"Coords.ini\" неверны, используем координаты по умолчанию"
+    },
+    {
+      "Key": "gotUpToDateVersion",
+      "Value": "Отлично! У вас уже установлена последняя версия {0}"
+    },
+    {
+      "Key": "autoUpdaterDisabled",
+      "Value": "AАвтообновление отключено. Последний релиз можно скачать с: {0}\n "
+    },
+    {
+      "Key": "downloadingUpdate",
+      "Value": "Скачиваем и устанавливаем обновление..."
+    },
+    {
+      "Key": "finishedDownloadingRelease",
+      "Value": "Завершено скачивание нового релиза..."
+    },
+    {
+      "Key": "finishedUnpackingFiles",
+      "Value": "Завершена распаковка файлов..."
+    },
+    {
+      "Key": "updateFinished",
+      "Value": "Обновление завершено, теперь вы можете закрыть это окно."
+    },
+    {
+      "Key": "lookingForIncensePokemon",
+      "Value": "Ищем покемона на пряности..."
+    },
+    {
+      "Key": "lookingForPokemon",
+      "Value": "Ищем покемона..."
+    },
+    {
+      "Key": "lookingForLurePokemon",
+      "Value": "Ищем приманенного покемона..."
+    },
+    {
+      "Key": "pokemonSkipped",
+      "Value": "Пропущен {0}"
+    },
+    {
+      "Key": "invFullTransferring",
+      "Value": "Инвентарь полон. Передаем покемонов профессору..."
+    },
+    {
+      "Key": "invFullTransferManually",
+      "Value": "Инвентарь полон. Вручную передайте покемона профессору или установите настройку TransferDuplicatePokemon в true ..."
+    },
+    {
+      "Key": "encounterProblem",
+      "Value": "Проблема с поимкой: {0}"
+    },
+    {
+      "Key": "encounterProblemLurePokemon",
+      "Value": "Проблема с поимкой: Приманенный покемон {0}"
+    },
+    {
+      "Key": "desiredDestTooFar",
+      "Value": "Указанное местоназначение {0}, {1} слишком далеко от текущей позиции {2}, {3}"
+    },
+    {
+      "Key": "pokemonRename",
+      "Value": "Покемон {0} ({1}) переименован из {2} в {3}."
+    },
+    {
+      "Key": "pokemonIgnoreFilter",
+      "Value": "[Фильтр игнора покемонов] - Игнорируем {0} как указано в настройках"
     }
   ]
 }
diff --git a/PoGo.NecroBot.Logic/Common/Translations.cs b/PoGo.NecroBot.Logic/Common/Translations.cs
@@ -69,7 +69,7 @@ public class Translations
             new KeyValuePair<TranslationString, string>(TranslationString.IncubatorStatusUpdate,
                 "Incubator status update: {0:0.00}km left"),
             new KeyValuePair<TranslationString, string>(TranslationString.IncubatorEggHatched,
-                "Incubated egg has hatched: {0}")
+                "Incubated egg has hatched: {0}"),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.LogEntryError, "ERROR"),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.LogEntryAttention, "ATTENTION"),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.LogEntryInfo, "INFO"),
@@ -95,15 +95,15 @@ public class Translations
             new KeyValuePair<TranslationString, string>(Common.TranslationString.CoordinatesAreInvalid, "Coordinates in \"Coords.ini\" file are invalid, using the default coordinates"),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.GotUpToDateVersion,"Perfect! You already have the newest Version {0}"),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.AutoUpdaterDisabled, "AutoUpdater is disabled. Get the latest release from: {0}\n "),
-            new KeyValuePair<TranslationString, string>(Common.TranslationString.DownloadingUpdate, "Downloading and apply Update...."),
+            new KeyValuePair<TranslationString, string>(Common.TranslationString.DownloadingUpdate, "Downloading and apply Update..."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.FinishedDownloadingRelease, "Finished downloading newest Release..."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.FinishedUnpackingFiles, "Finished unpacking files..."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.UpdateFinished, "Update finished, you can close this window now."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.LookingForIncensePokemon, "Looking for incense pokemon..."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.LookingForPokemon, "Looking for pokemon..."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.LookingForLurePokemon, "Looking for lure pokemon..."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.PokemonSkipped, "Skipped {0}"),
-        new KeyValuePair<TranslationString, string>(Common.TranslationString.InvFullTransferring, "PokemonInventory is Full.Transferring pokemons..."),
+            new KeyValuePair<TranslationString, string>(Common.TranslationString.InvFullTransferring, "PokemonInventory is Full.Transferring pokemons..."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.InvFullTransferManually, "PokemonInventory is Full.Please Transfer pokemon manually or set TransferDuplicatePokemon to true in settings..."),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.EncounterProblem, "Encounter problem: {0}"),
             new KeyValuePair<TranslationString, string>(Common.TranslationString.EncounterProblemLurePokemon, "Encounter problem: Lure pokemon {0}"),

diff --git a/PoGo.NecroBot.Logic/State/VersionCheckState.cs b/PoGo.NecroBot.Logic/State/VersionCheckState.cs
@@ -63,7 +63,7 @@ public async Task<IState> Execute(Context ctx, StateMachine machine)
             var destinationDir = baseDir + Path.DirectorySeparatorChar;
             Console.WriteLine(downloadLink);
             if (!DownloadFile(downloadLink, downloadFilePath)) return new LoginState();
-            machine.Fire(new UpdateEvent {Message = ctx.Translations.GetTranslation(Common.TranslationString.FinishedDownloadingRelease});
+            machine.Fire(new UpdateEvent {Message = ctx.Translations.GetTranslation(Common.TranslationString.FinishedDownloadingRelease)});
             if (!UnpackFile(downloadFilePath, tempPath)) return new LoginState();
             machine.Fire(new UpdateEvent {Message = ctx.Translations.GetTranslation(Common.TranslationString.FinishedUnpackingFiles)});