nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 08:12:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge error in russian localization

Browse Source
This commit is contained in:
Michael Starke
2018-06-28 13:45:56 +02:00
parent 92804d6429
commit 21be56bfad
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MacPass/ru.lproj/Localizable.strings
View File

@@ -89,13 +89,13 @@
/* External file change strategy option: Keep local file an ignore external changes */ /* External file change strategy option: Keep local file an ignore external changes */
"FILE_CHANGE_STRATEGY_KEEP_MINE" = "Оставить Мою Версию и Игнорировать Другие Изменения"; "FILE_CHANGE_STRATEGY_KEEP_MINE" = "Оставить Мою Версию и Игнорировать Другие Изменения";
External file change strategy option: Merge external changes into local file. */ /* External file change strategy option: Merge external changes into local file. */
"FILE_CHANGE_STRATEGY_MERGE" = "Слить изменения"; "FILE_CHANGE_STRATEGY_MERGE" = "Слить изменения";
/* External file change strategy option: Use the changed file and discard local changes */ /* External file change strategy option: Use the changed file and discard local changes */
"FILE_CHANGE_STRATEGY_USE_OTHER" = "Загрузить Измененную Версию и Отменить Мои Изменения"; "FILE_CHANGE_STRATEGY_USE_OTHER" = "Загрузить Измененную Версию и Отменить Мои Изменения";
Menu item to toggle display of history count column in entry table */ /* Menu item to toggle display of history count column in entry table */
"HISTORY" = "История"; "HISTORY" = "История";
/* Imports a dragged URL for a new entry */ /* Imports a dragged URL for a new entry */
@@ -212,7 +212,7 @@
/* No comment provided by engineer. */ /* No comment provided by engineer. */
"UNKNOWN_TOOLBAR_ITEM" = "Неизвестный элемент панели инструментов"; "UNKNOWN_TOOLBAR_ITEM" = "Неизвестный элемент панели инструментов";
UUID reference item */ /* UUID reference item */
"UUID" = "UUID"; "UUID" = "UUID";
/* Message text for disabled updates alert! */ /* Message text for disabled updates alert! */