Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for latest commit and updated russian lang file #1050

Merged
merged 1 commit into from
Jul 27, 2016
Merged

Fix for latest commit and updated russian lang file #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 80 additions & 0 deletions PoGo.NecroBot.CLI/Config/Translations/translation.ru_RU.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} как указано в настройках"
}
]
}
6 changes: 3 additions & 3 deletions PoGo.NecroBot.Logic/Common/Translations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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}"),
Expand Down
2 changes: 1 addition & 1 deletion PoGo.NecroBot.Logic/State/VersionCheckState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)});

Expand Down