From d9bb117f49bf2dabd67c9e30747d0d45075e46f1 Mon Sep 17 00:00:00 2001 From: panthernet Date: Thu, 28 Jul 2016 00:46:38 +0300 Subject: [PATCH] + Fix for lates commit and updated russian lang file --- .../Translations/translation.ru_RU.json | 80 +++++++++++++++++++ PoGo.NecroBot.Logic/Common/Translations.cs | 6 +- .../State/VersionCheckState.cs | 2 +- 3 files changed, 84 insertions(+), 4 deletions(-) diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.ru_RU.json b/PoGo.NecroBot.CLI/Config/Translations/translation.ru_RU.json index 6db687619..fdbf80a6e 100644 --- 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 index c3e3c67d5..d96ac514e 100644 --- a/PoGo.NecroBot.Logic/Common/Translations.cs +++ b/PoGo.NecroBot.Logic/Common/Translations.cs @@ -69,7 +69,7 @@ public class Translations new KeyValuePair(TranslationString.IncubatorStatusUpdate, "Incubator status update: {0:0.00}km left"), new KeyValuePair(TranslationString.IncubatorEggHatched, - "Incubated egg has hatched: {0}") + "Incubated egg has hatched: {0}"), new KeyValuePair(Common.TranslationString.LogEntryError, "ERROR"), new KeyValuePair(Common.TranslationString.LogEntryAttention, "ATTENTION"), new KeyValuePair(Common.TranslationString.LogEntryInfo, "INFO"), @@ -95,7 +95,7 @@ public class Translations new KeyValuePair(Common.TranslationString.CoordinatesAreInvalid, "Coordinates in \"Coords.ini\" file are invalid, using the default coordinates"), new KeyValuePair(Common.TranslationString.GotUpToDateVersion,"Perfect! You already have the newest Version {0}"), new KeyValuePair(Common.TranslationString.AutoUpdaterDisabled, "AutoUpdater is disabled. Get the latest release from: {0}\n "), - new KeyValuePair(Common.TranslationString.DownloadingUpdate, "Downloading and apply Update...."), + new KeyValuePair(Common.TranslationString.DownloadingUpdate, "Downloading and apply Update..."), new KeyValuePair(Common.TranslationString.FinishedDownloadingRelease, "Finished downloading newest Release..."), new KeyValuePair(Common.TranslationString.FinishedUnpackingFiles, "Finished unpacking files..."), new KeyValuePair(Common.TranslationString.UpdateFinished, "Update finished, you can close this window now."), @@ -103,7 +103,7 @@ public class Translations new KeyValuePair(Common.TranslationString.LookingForPokemon, "Looking for pokemon..."), new KeyValuePair(Common.TranslationString.LookingForLurePokemon, "Looking for lure pokemon..."), new KeyValuePair(Common.TranslationString.PokemonSkipped, "Skipped {0}"), - new KeyValuePair(Common.TranslationString.InvFullTransferring, "PokemonInventory is Full.Transferring pokemons..."), + new KeyValuePair(Common.TranslationString.InvFullTransferring, "PokemonInventory is Full.Transferring pokemons..."), new KeyValuePair(Common.TranslationString.InvFullTransferManually, "PokemonInventory is Full.Please Transfer pokemon manually or set TransferDuplicatePokemon to true in settings..."), new KeyValuePair(Common.TranslationString.EncounterProblem, "Encounter problem: {0}"), new KeyValuePair(Common.TranslationString.EncounterProblemLurePokemon, "Encounter problem: Lure pokemon {0}"), diff --git a/PoGo.NecroBot.Logic/State/VersionCheckState.cs b/PoGo.NecroBot.Logic/State/VersionCheckState.cs index 5fd5c15fa..1825c1b0c 100644 --- a/PoGo.NecroBot.Logic/State/VersionCheckState.cs +++ b/PoGo.NecroBot.Logic/State/VersionCheckState.cs @@ -63,7 +63,7 @@ public async Task 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)});