{"thread":{"id":"26296","subject":"[PATCH 1/3] fix git-gui russian translation typos","startedAt":"2011-01-17T21:08:24Z","lastAt":"2011-01-27T12:58:05Z","messageCount":21,"participants":["Alex Riesen","Alexey Shumkin","Dmitry Potapov","Pat Thoyts","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"159563","messageId":"20110117210824.GB27029@blimp.localdomain","threadId":"26296","inReplyTo":"cover.1295295897.git.raa.lkml@gmail.com","subject":"[PATCH 1/3] fix git-gui russian translation typos","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-17T21:08:24Z","receivedAt":"2011-01-17T21:08:24Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"From: Serge Ziryukin \n\nSigned-off-by: Serge Ziryukin \nSigned-off-by: Alex Riesen \n---\n\nI rebased your patch onto current git-gui. Hope you don't mind.\n\n po/ru.po | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/po/ru.po b/po/ru.po\nindex 364c074..c15bdfa 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -2292,11 +2292,11 @@ msgstr \"Словарь вернут к %s.\"\n \n #: lib/spellcheck.tcl:73\n msgid \"Spell checker silently failed on startup\"\n-msgstr \"Программа проверки правописания не смогла запустится\"\n+msgstr \"Программа проверки правописания не смогла запуститься\"\n \n #: lib/spellcheck.tcl:80\n msgid \"Unrecognized spell checker\"\n-msgstr \"Нераспознаная программа проверки правописания\"\n+msgstr \"Нераспознанная программа проверки правописания\"\n \n #: lib/spellcheck.tcl:186\n msgid \"No Suggestions\"\n-- \n1.7.3.4.643.g8fb2b\n"},{"id":"159564","messageId":"20110117210828.GC27029@blimp.localdomain","threadId":"26296","inReplyTo":"1c96343bbf6fb30e7453c3df7b49ea31667e0469.1295295897.git.raa.lkml@gmail.com","subject":"[PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-17T21:08:28Z","receivedAt":"2011-01-17T21:08:28Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"From: Skip \n\nSigned-off-by: Skip \nSigned-off-by: Alex Riesen \n---\n po/ru.po | 24 ++++++++++++------------\n 1 files changed, 12 insertions(+), 12 deletions(-)\n\ndiff --git a/po/ru.po b/po/ru.po\nindex c15bdfa..304bb3a 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -1342,7 +1342,7 @@ msgid \"\"\n \"File %s has merge conflicts. You must resolve them and stage the file \"\n \"before committing.\\n\"\n msgstr \"\"\n-\"Нельзя сохранить файлы с незавершённой операцей слияния.\\n\"\n+\"Нельзя сохранить файлы с незавершённой операцией слияния.\\n\"\n \"\\n\"\n \"Для файла %s возник конфликт слияния. Разрешите конфликт и добавьте к \"\n \"подготовленным файлам перед сохранением.\\n\"\n@@ -1440,7 +1440,7 @@ msgstr \"\"\n \n #: lib/commit.tcl:338\n msgid \"No changes to commit.\"\n-msgstr \"Отуствуют измения для сохранения.\"\n+msgstr \"Отсутствуют изменения для сохранения.\"\n \n #: lib/commit.tcl:352\n msgid \"commit-tree failed:\"\n@@ -1540,7 +1540,7 @@ msgid \"\"\n msgstr \"\"\n \"Изменений не обнаружено.\\n\"\n \"\\n\"\n-\"в %s отутствуют изменения.\\n\"\n+\"в %s отсутствуют изменения.\\n\"\n \"\\n\"\n \"Дата изменения файла была обновлена другой программой, но содержимое файла \"\n \"осталось прежним.\\n\"\n@@ -1599,7 +1599,7 @@ msgid \"\"\n \"* Untracked file is %d bytes.\\n\"\n \"* Showing only first %d bytes.\\n\"\n msgstr \"\"\n-\"* Размер неподготовленого файла %d байт.\\n\"\n+\"* Размер неподготовленного файла %d байт.\\n\"\n \"* Показано первых %d байт.\\n\"\n \n #: lib/diff.tcl:228\n@@ -1610,7 +1610,7 @@ msgid \"\"\n \"* To see the entire file, use an external editor.\\n\"\n msgstr \"\"\n \"\\n\"\n-\"* Неподготовленый файл обрезан: %s.\\n\"\n+\"* Неподготовленный файл обрезан: %s.\\n\"\n \"* Чтобы увидеть весь файл, используйте программу-редактор.\\n\"\n \n #: lib/diff.tcl:436\n@@ -1667,7 +1667,7 @@ msgid \"\"\n \"Updating the Git index failed. A rescan will be automatically started to \"\n \"resynchronize git-gui.\"\n msgstr \"\"\n-\"Не удалось обновить индекс Git. Состояние репозитория будетперечитано \"\n+\"Не удалось обновить индекс Git. Состояние репозитория будет перечитано \"\n \"автоматически.\"\n \n #: lib/index.tcl:27\n@@ -1714,7 +1714,7 @@ msgstr \"Ничего не делать\"\n \n #: lib/index.tcl:427\n msgid \"Reverting selected files\"\n-msgstr \"Удаление изменений в выбраных файлах\"\n+msgstr \"Удаление изменений в выбранных файлах\"\n \n #: lib/index.tcl:431\n #, tcl-format\n@@ -1778,7 +1778,7 @@ msgstr \"\"\n \"\\n\"\n \"Файл %s изменен.\\n\"\n \"\\n\"\n-\"Подготовьте и сохраните измения перед началом слияния. В случае \"\n+\"Подготовьте и сохраните изменения перед началом слияния. В случае \"\n \"необходимости это позволит прервать операцию слияния.\\n\"\n \n #: lib/merge.tcl:107\n@@ -1893,7 +1893,7 @@ msgstr \"\"\n #, tcl-format\n msgid \"File %s seems to have unresolved conflicts, still stage?\"\n msgstr \"\"\n-\"Файл %s кажется содержит необработаные конфликты. Продолжить подготовку к \"\n+\"Файл %s кажется содержит необработанные конфликты. Продолжить подготовку к \"\n \"сохранению?\"\n \n #: lib/mergetool.tcl:60\n@@ -2152,7 +2152,7 @@ msgstr \"Получение %s\"\n #: lib/remote_add.tcl:157\n #, tcl-format\n msgid \"Do not know how to initialize repository at location '%s'.\"\n-msgstr \"Невозможно инициалировать репозиторий в '%s'.\"\n+msgstr \"Невозможно инициализировать репозиторий в '%s'.\"\n \n #: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63\n #: lib/transport.tcl:81\n@@ -2179,7 +2179,7 @@ msgstr \"внешний:\"\n \n #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149\n msgid \"Arbitrary Location:\"\n-msgstr \"Указаное положение:\"\n+msgstr \"Указанное положение:\"\n \n #: lib/remote_branch_delete.tcl:84\n msgid \"Branches\"\n@@ -2412,7 +2412,7 @@ msgstr \"Описание вспомогательной операции\"\n \n #: lib/tools_dlg.tcl:48\n msgid \"Use '/' separators to create a submenu tree:\"\n-msgstr \"Испольуйте '/' для создания подменю\"\n+msgstr \"Используйте '/' для создания подменю\"\n \n #: lib/tools_dlg.tcl:61\n msgid \"Command:\"\n-- \n1.7.3.4.643.g8fb2b\n"},{"id":"159565","messageId":"20110117210855.GD27029@blimp.localdomain","threadId":"26296","inReplyTo":"eeaaba6d48de958b374cb06f1b12db3b8e0550ea.1295295897.git.raa.lkml@gmail.com","subject":"[PATCH 3/3] git-gui: update russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-17T21:08:55Z","receivedAt":"2011-01-17T21:08:55Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Signed-off-by: Alex Riesen \n---\n po/ru.po | 595 ++++++++++++++++++++++++++++++++------------------------------\n 1 files changed, 307 insertions(+), 288 deletions(-)\n\ndiff --git a/po/ru.po b/po/ru.po\nindex 304bb3a..7071a8c 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -7,7 +7,7 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: git-gui\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n-\"POT-Creation-Date: 2008-12-08 08:31-0800\\n\"\n+\"POT-Creation-Date: 2010-01-26 15:47-0800\\n\"\n \"PO-Revision-Date: 2007-10-22 22:30-0200\\n\"\n \"Last-Translator: Alex Riesen \\n\"\n \"Language-Team: Russian Translation \\n\"\n@@ -15,33 +15,33 @@ msgstr \"\"\n \"Content-Type: text/plain; charset=UTF-8\\n\"\n \"Content-Transfer-Encoding: 8bit\\n\"\n \n-#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847\n-#: git-gui.sh:866\n+#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903\n+#: git-gui.sh:922\n msgid \"git-gui: fatal error\"\n msgstr \"git-gui: критическая ошибка\"\n \n-#: git-gui.sh:689\n+#: git-gui.sh:743\n #, tcl-format\n msgid \"Invalid font specified in %s:\"\n msgstr \"В %s установлен неверный шрифт:\"\n \n-#: git-gui.sh:723\n+#: git-gui.sh:779\n msgid \"Main Font\"\n msgstr \"Шрифт интерфейса\"\n \n-#: git-gui.sh:724\n+#: git-gui.sh:780\n msgid \"Diff/Console Font\"\n msgstr \"Шрифт консоли и изменений (diff)\"\n \n-#: git-gui.sh:738\n+#: git-gui.sh:794\n msgid \"Cannot find git in PATH.\"\n msgstr \"git не найден в PATH.\"\n \n-#: git-gui.sh:765\n+#: git-gui.sh:821\n msgid \"Cannot parse Git version string:\"\n msgstr \"Невозможно распознать строку версии Git: \"\n \n-#: git-gui.sh:783\n+#: git-gui.sh:839\n #, tcl-format\n msgid \"\"\n \"Git version cannot be determined.\\n\"\n@@ -60,450 +60,474 @@ msgstr \"\"\n \"\\n\"\n \"Принять '%s' как версию 1.5.0?\\n\"\n \n-#: git-gui.sh:1062\n+#: git-gui.sh:1128\n msgid \"Git directory not found:\"\n msgstr \"Каталог Git не найден:\"\n \n-#: git-gui.sh:1069\n+#: git-gui.sh:1146\n msgid \"Cannot move to top of working directory:\"\n msgstr \"Невозможно перейти к корню рабочего каталога репозитория: \"\n \n-#: git-gui.sh:1076\n-msgid \"Cannot use funny .git directory:\"\n-msgstr \"Каталог .git испорчен: \"\n+#: git-gui.sh:1154\n+msgid \"Cannot use bare repository:\"\n+msgstr \"Невозможно использование репозитория без рабочего каталога:\"\n \n-#: git-gui.sh:1081\n+#: git-gui.sh:1162\n msgid \"No working directory\"\n msgstr \"Отсутствует рабочий каталог\"\n \n-#: git-gui.sh:1247 lib/checkout_op.tcl:305\n+#: git-gui.sh:1334 lib/checkout_op.tcl:306\n msgid \"Refreshing file status...\"\n msgstr \"Обновление информации о состоянии файлов...\"\n \n-#: git-gui.sh:1303\n+#: git-gui.sh:1390\n msgid \"Scanning for modified files ...\"\n msgstr \"Поиск измененных файлов...\"\n \n-#: git-gui.sh:1367\n+#: git-gui.sh:1454\n msgid \"Calling prepare-commit-msg hook...\"\n msgstr \"Вызов программы поддержки репозитория prepare-commit-msg...\"\n \n-#: git-gui.sh:1384\n+#: git-gui.sh:1471\n msgid \"Commit declined by prepare-commit-msg hook.\"\n msgstr \"\"\n \"Сохранение прервано программой поддержки репозитория prepare-commit-msg\"\n \n-#: git-gui.sh:1542 lib/browser.tcl:246\n+#: git-gui.sh:1629 lib/browser.tcl:246\n msgid \"Ready.\"\n msgstr \"Готово.\"\n \n-#: git-gui.sh:1726\n+#: git-gui.sh:1787\n #, tcl-format\n msgid \"Displaying only %s of %s files.\"\n msgstr \"Показано %s из %s файлов.\"\n \n-#: git-gui.sh:1819\n+#: git-gui.sh:1913\n msgid \"Unmodified\"\n msgstr \"Не изменено\"\n \n-#: git-gui.sh:1821\n+#: git-gui.sh:1915\n msgid \"Modified, not staged\"\n msgstr \"Изменено, не подготовлено\"\n \n-#: git-gui.sh:1822 git-gui.sh:1830\n+#: git-gui.sh:1916 git-gui.sh:1924\n msgid \"Staged for commit\"\n msgstr \"Подготовлено для сохранения\"\n \n-#: git-gui.sh:1823 git-gui.sh:1831\n+#: git-gui.sh:1917 git-gui.sh:1925\n msgid \"Portions staged for commit\"\n msgstr \"Части, подготовленные для сохранения\"\n \n-#: git-gui.sh:1824 git-gui.sh:1832\n+#: git-gui.sh:1918 git-gui.sh:1926\n msgid \"Staged for commit, missing\"\n msgstr \"Подготовлено для сохранения, отсутствует\"\n \n-#: git-gui.sh:1826\n+#: git-gui.sh:1920\n msgid \"File type changed, not staged\"\n msgstr \"Тип файла изменён, не подготовлено\"\n \n-#: git-gui.sh:1827\n+#: git-gui.sh:1921\n msgid \"File type changed, staged\"\n msgstr \"Тип файла изменён, подготовлено\"\n \n-#: git-gui.sh:1829\n+#: git-gui.sh:1923\n msgid \"Untracked, not staged\"\n msgstr \"Не отслеживается, не подготовлено\"\n \n-#: git-gui.sh:1834\n+#: git-gui.sh:1928\n msgid \"Missing\"\n msgstr \"Отсутствует\"\n \n-#: git-gui.sh:1835\n+#: git-gui.sh:1929\n msgid \"Staged for removal\"\n msgstr \"Подготовлено для удаления\"\n \n-#: git-gui.sh:1836\n+#: git-gui.sh:1930\n msgid \"Staged for removal, still present\"\n msgstr \"Подготовлено для удаления, еще не удалено\"\n \n-#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841\n-#: git-gui.sh:1842 git-gui.sh:1843\n+#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935\n+#: git-gui.sh:1936 git-gui.sh:1937\n msgid \"Requires merge resolution\"\n msgstr \"Требуется разрешение конфликта при слиянии\"\n \n-#: git-gui.sh:1878\n+#: git-gui.sh:1972\n msgid \"Starting gitk... please wait...\"\n msgstr \"Запускается gitk... Подождите, пожалуйста...\"\n \n-#: git-gui.sh:1887\n+#: git-gui.sh:1984\n msgid \"Couldn't find gitk in PATH\"\n msgstr \"gitk не найден в PATH.\"\n \n-#: git-gui.sh:2280 lib/choose_repository.tcl:36\n+#: git-gui.sh:2043\n+msgid \"Couldn't find git gui in PATH\"\n+msgstr \"git gui не найден в PATH.\"\n+\n+#: git-gui.sh:2455 lib/choose_repository.tcl:36\n msgid \"Repository\"\n msgstr \"Репозиторий\"\n \n-#: git-gui.sh:2281\n+#: git-gui.sh:2456\n msgid \"Edit\"\n msgstr \"Редактировать\"\n \n-#: git-gui.sh:2283 lib/choose_rev.tcl:561\n+#: git-gui.sh:2458 lib/choose_rev.tcl:561\n msgid \"Branch\"\n msgstr \"Ветвь\"\n \n-#: git-gui.sh:2286 lib/choose_rev.tcl:548\n+#: git-gui.sh:2461 lib/choose_rev.tcl:548\n msgid \"Commit@@noun\"\n msgstr \"Состояние\"\n \n-#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n+#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n msgid \"Merge\"\n msgstr \"Слияние\"\n \n-#: git-gui.sh:2290 lib/choose_rev.tcl:557\n+#: git-gui.sh:2465 lib/choose_rev.tcl:557\n msgid \"Remote\"\n msgstr \"Внешние репозитории\"\n \n-#: git-gui.sh:2293\n+#: git-gui.sh:2468\n msgid \"Tools\"\n msgstr \"Вспомогательные операции\"\n \n-#: git-gui.sh:2302\n+#: git-gui.sh:2477\n msgid \"Explore Working Copy\"\n msgstr \"Просмотр рабочего каталога\"\n \n-#: git-gui.sh:2307\n+#: git-gui.sh:2483\n msgid \"Browse Current Branch's Files\"\n msgstr \"Просмотреть файлы текущей ветви\"\n \n-#: git-gui.sh:2311\n+#: git-gui.sh:2487\n msgid \"Browse Branch Files...\"\n msgstr \"Показать файлы ветви...\"\n \n-#: git-gui.sh:2316\n+#: git-gui.sh:2492\n msgid \"Visualize Current Branch's History\"\n msgstr \"Показать историю текущей ветви\"\n \n-#: git-gui.sh:2320\n+#: git-gui.sh:2496\n msgid \"Visualize All Branch History\"\n msgstr \"Показать историю всех ветвей\"\n \n-#: git-gui.sh:2327\n+#: git-gui.sh:2503\n #, tcl-format\n msgid \"Browse %s's Files\"\n msgstr \"Показать файлы ветви %s\"\n \n-#: git-gui.sh:2329\n+#: git-gui.sh:2505\n #, tcl-format\n msgid \"Visualize %s's History\"\n msgstr \"Показать историю ветви %s\"\n \n-#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67\n+#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67\n msgid \"Database Statistics\"\n msgstr \"Статистика базы данных\"\n \n-#: git-gui.sh:2337 lib/database.tcl:34\n+#: git-gui.sh:2513 lib/database.tcl:34\n msgid \"Compress Database\"\n msgstr \"Сжать базу данных\"\n \n-#: git-gui.sh:2340\n+#: git-gui.sh:2516\n msgid \"Verify Database\"\n msgstr \"Проверить базу данных\"\n \n-#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7\n-#: lib/shortcut.tcl:39 lib/shortcut.tcl:71\n+#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8\n+#: lib/shortcut.tcl:40 lib/shortcut.tcl:72\n msgid \"Create Desktop Icon\"\n msgstr \"Создать ярлык на рабочем столе\"\n \n-#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191\n+#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191\n msgid \"Quit\"\n msgstr \"Выход\"\n \n-#: git-gui.sh:2371\n+#: git-gui.sh:2547\n msgid \"Undo\"\n msgstr \"Отменить\"\n \n-#: git-gui.sh:2374\n+#: git-gui.sh:2550\n msgid \"Redo\"\n msgstr \"Повторить\"\n \n-#: git-gui.sh:2378 git-gui.sh:2937\n+#: git-gui.sh:2554 git-gui.sh:3109\n msgid \"Cut\"\n msgstr \"Вырезать\"\n \n-#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096\n+#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259\n #: lib/console.tcl:69\n msgid \"Copy\"\n msgstr \"Копировать\"\n \n-#: git-gui.sh:2384 git-gui.sh:2943\n+#: git-gui.sh:2560 git-gui.sh:3115\n msgid \"Paste\"\n msgstr \"Вставить\"\n \n-#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26\n+#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26\n #: lib/remote_branch_delete.tcl:38\n msgid \"Delete\"\n msgstr \"Удалить\"\n \n-#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71\n+#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71\n msgid \"Select All\"\n msgstr \"Выделить все\"\n \n-#: git-gui.sh:2400\n+#: git-gui.sh:2576\n msgid \"Create...\"\n msgstr \"Создать...\"\n \n-#: git-gui.sh:2406\n+#: git-gui.sh:2582\n msgid \"Checkout...\"\n msgstr \"Перейти...\"\n \n-#: git-gui.sh:2412\n+#: git-gui.sh:2588\n msgid \"Rename...\"\n msgstr \"Переименовать...\"\n \n-#: git-gui.sh:2417\n+#: git-gui.sh:2593\n msgid \"Delete...\"\n msgstr \"Удалить...\"\n \n-#: git-gui.sh:2422\n+#: git-gui.sh:2598\n msgid \"Reset...\"\n msgstr \"Сбросить...\"\n \n-#: git-gui.sh:2432\n+#: git-gui.sh:2608\n msgid \"Done\"\n msgstr \"Завершено\"\n \n-#: git-gui.sh:2434\n+#: git-gui.sh:2610\n msgid \"Commit@@verb\"\n msgstr \"Сохранить\"\n \n-#: git-gui.sh:2443 git-gui.sh:2878\n+#: git-gui.sh:2619 git-gui.sh:3050\n msgid \"New Commit\"\n msgstr \"Новое состояние\"\n \n-#: git-gui.sh:2451 git-gui.sh:2885\n+#: git-gui.sh:2627 git-gui.sh:3057\n msgid \"Amend Last Commit\"\n msgstr \"Исправить последнее состояние\"\n \n-#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99\n+#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99\n msgid \"Rescan\"\n msgstr \"Перечитать\"\n \n-#: git-gui.sh:2467\n+#: git-gui.sh:2643\n msgid \"Stage To Commit\"\n msgstr \"Подготовить для сохранения\"\n \n-#: git-gui.sh:2473\n+#: git-gui.sh:2649\n msgid \"Stage Changed Files To Commit\"\n msgstr \"Подготовить измененные файлы для сохранения\"\n \n-#: git-gui.sh:2479\n+#: git-gui.sh:2655\n msgid \"Unstage From Commit\"\n msgstr \"Убрать из подготовленного\"\n \n-#: git-gui.sh:2484 lib/index.tcl:410\n+#: git-gui.sh:2661 lib/index.tcl:412\n msgid \"Revert Changes\"\n msgstr \"Отменить изменения\"\n \n-#: git-gui.sh:2491 git-gui.sh:3083\n+#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341\n msgid \"Show Less Context\"\n msgstr \"Меньше контекста\"\n \n-#: git-gui.sh:2495 git-gui.sh:3087\n+#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345\n msgid \"Show More Context\"\n msgstr \"Больше контекста\"\n \n-#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961\n+#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133\n msgid \"Sign Off\"\n msgstr \"Вставить Signed-off-by\"\n \n-#: git-gui.sh:2518\n+#: git-gui.sh:2696\n msgid \"Local Merge...\"\n msgstr \"Локальное слияние...\"\n \n-#: git-gui.sh:2523\n+#: git-gui.sh:2701\n msgid \"Abort Merge...\"\n msgstr \"Прервать слияние...\"\n \n-#: git-gui.sh:2535 git-gui.sh:2575\n+#: git-gui.sh:2713 git-gui.sh:2741\n msgid \"Add...\"\n msgstr \"Добавить...\"\n \n-#: git-gui.sh:2539\n+#: git-gui.sh:2717\n msgid \"Push...\"\n msgstr \"Отправить...\"\n \n-#: git-gui.sh:2543\n+#: git-gui.sh:2721\n msgid \"Delete Branch...\"\n msgstr \"Удалить ветвь...\"\n \n-#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14\n-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53\n-#, tcl-format\n-msgid \"About %s\"\n-msgstr \"О %s\"\n-\n-#: git-gui.sh:2557\n-msgid \"Preferences...\"\n-msgstr \"Настройки...\"\n-\n-#: git-gui.sh:2565 git-gui.sh:3129\n+#: git-gui.sh:2731 git-gui.sh:3292\n msgid \"Options...\"\n msgstr \"Настройки...\"\n \n-#: git-gui.sh:2576\n+#: git-gui.sh:2742\n msgid \"Remove...\"\n msgstr \"Удалить...\"\n \n-#: git-gui.sh:2585 lib/choose_repository.tcl:50\n+#: git-gui.sh:2751 lib/choose_repository.tcl:50\n msgid \"Help\"\n msgstr \"Помощь\"\n \n-#: git-gui.sh:2611\n+#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14\n+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53\n+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"О %s\"\n+\n+#: git-gui.sh:2783\n msgid \"Online Documentation\"\n msgstr \"Документация в интернете\"\n \n-#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56\n+#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56\n msgid \"Show SSH Key\"\n msgstr \"Показать ключ SSH\"\n \n-#: git-gui.sh:2721\n+#: git-gui.sh:2893\n #, tcl-format\n msgid \"fatal: cannot stat path %s: No such file or directory\"\n msgstr \"критическая ошибка: %s: нет такого файла или каталога\"\n \n-#: git-gui.sh:2754\n+#: git-gui.sh:2926\n msgid \"Current Branch:\"\n msgstr \"Текущая ветвь:\"\n \n-#: git-gui.sh:2775\n+#: git-gui.sh:2947\n msgid \"Staged Changes (Will Commit)\"\n msgstr \"Подготовлено (будет сохранено)\"\n \n-#: git-gui.sh:2795\n+#: git-gui.sh:2967\n msgid \"Unstaged Changes\"\n msgstr \"Изменено (не будет сохранено)\"\n \n-#: git-gui.sh:2845\n+#: git-gui.sh:3017\n msgid \"Stage Changed\"\n msgstr \"Подготовить все\"\n \n-#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193\n+#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193\n msgid \"Push\"\n msgstr \"Отправить\"\n \n-#: git-gui.sh:2899\n+#: git-gui.sh:3071\n msgid \"Initial Commit Message:\"\n msgstr \"Комментарий к первому состоянию:\"\n \n-#: git-gui.sh:2900\n+#: git-gui.sh:3072\n msgid \"Amended Commit Message:\"\n msgstr \"Комментарий к исправленному состоянию:\"\n \n-#: git-gui.sh:2901\n+#: git-gui.sh:3073\n msgid \"Amended Initial Commit Message:\"\n msgstr \"Комментарий к исправленному первоначальному состоянию:\"\n \n-#: git-gui.sh:2902\n+#: git-gui.sh:3074\n msgid \"Amended Merge Commit Message:\"\n msgstr \"Комментарий к исправленному слиянию:\"\n \n-#: git-gui.sh:2903\n+#: git-gui.sh:3075\n msgid \"Merge Commit Message:\"\n msgstr \"Комментарий к слиянию:\"\n \n-#: git-gui.sh:2904\n+#: git-gui.sh:3076\n msgid \"Commit Message:\"\n msgstr \"Комментарий к состоянию:\"\n \n-#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73\n+#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73\n msgid \"Copy All\"\n msgstr \"Копировать все\"\n \n-#: git-gui.sh:2977 lib/blame.tcl:104\n+#: git-gui.sh:3149 lib/blame.tcl:104\n msgid \"File:\"\n msgstr \"Файл:\"\n \n-#: git-gui.sh:3092\n+#: git-gui.sh:3255\n msgid \"Refresh\"\n msgstr \"Обновить\"\n \n-#: git-gui.sh:3113\n+#: git-gui.sh:3276\n msgid \"Decrease Font Size\"\n msgstr \"Уменьшить размер шрифта\"\n \n-#: git-gui.sh:3117\n+#: git-gui.sh:3280\n msgid \"Increase Font Size\"\n msgstr \"Увеличить размер шрифта\"\n \n-#: git-gui.sh:3125 lib/blame.tcl:281\n+#: git-gui.sh:3288 lib/blame.tcl:281\n msgid \"Encoding\"\n msgstr \"Кодировка\"\n \n-#: git-gui.sh:3136\n+#: git-gui.sh:3299\n msgid \"Apply/Reverse Hunk\"\n msgstr \"Применить/Убрать изменение\"\n \n-#: git-gui.sh:3141\n+#: git-gui.sh:3304\n msgid \"Apply/Reverse Line\"\n msgstr \"Применить/Убрать строку\"\n \n-#: git-gui.sh:3151\n+#: git-gui.sh:3323\n msgid \"Run Merge Tool\"\n msgstr \"Запустить программу слияния\"\n \n-#: git-gui.sh:3156\n+#: git-gui.sh:3328\n msgid \"Use Remote Version\"\n msgstr \"Взять внешнюю версию\"\n \n-#: git-gui.sh:3160\n+#: git-gui.sh:3332\n msgid \"Use Local Version\"\n msgstr \"Взять локальную версию\"\n \n-#: git-gui.sh:3164\n+#: git-gui.sh:3336\n msgid \"Revert To Base\"\n msgstr \"Отменить изменения\"\n \n-#: git-gui.sh:3183\n+#: git-gui.sh:3354\n+msgid \"Visualize These Changes In The Submodule\"\n+msgstr \"\"\n+\n+#: git-gui.sh:3358\n+msgid \"Visualize Current Branch History In The Submodule\"\n+msgstr \"Показать историю текущей ветви подмодуля\"\n+\n+#: git-gui.sh:3362\n+msgid \"Visualize All Branch History In The Submodule\"\n+msgstr \"Показать историю всех ветвей подмодуля\"\n+\n+#: git-gui.sh:3367\n+msgid \"Start git gui In The Submodule\"\n+msgstr \"\"\n+\n+#: git-gui.sh:3389\n msgid \"Unstage Hunk From Commit\"\n msgstr \"Не сохранять часть\"\n \n-#: git-gui.sh:3184\n+#: git-gui.sh:3391\n+msgid \"Unstage Lines From Commit\"\n+msgstr \"Убрать строки из подготовленного\"\n+\n+#: git-gui.sh:3393\n msgid \"Unstage Line From Commit\"\n msgstr \"Убрать строку из подготовленного\"\n \n-#: git-gui.sh:3186\n+#: git-gui.sh:3396\n msgid \"Stage Hunk For Commit\"\n msgstr \"Подготовить часть для сохранения\"\n \n-#: git-gui.sh:3187\n+#: git-gui.sh:3398\n+msgid \"Stage Lines For Commit\"\n+msgstr \"Подготовить строки для сохранения\"\n+\n+#: git-gui.sh:3400\n msgid \"Stage Line For Commit\"\n msgstr \"Подготовить строку для сохранения\"\n \n-#: git-gui.sh:3210\n+#: git-gui.sh:3424\n msgid \"Initializing...\"\n msgstr \"Инициализация...\"\n \n-#: git-gui.sh:3315\n+#: git-gui.sh:3541\n #, tcl-format\n msgid \"\"\n \"Possible environment issues exist.\\n\"\n@@ -520,7 +544,7 @@ msgstr \"\"\n \"запущенными из %s\\n\"\n \"\\n\"\n \n-#: git-gui.sh:3345\n+#: git-gui.sh:3570\n msgid \"\"\n \"\\n\"\n \"This is due to a known issue with the\\n\"\n@@ -530,7 +554,7 @@ msgstr \"\"\n \"Это известная проблема с Tcl,\\n\"\n \"распространяемым Cygwin.\"\n \n-#: git-gui.sh:3350\n+#: git-gui.sh:3575\n #, tcl-format\n msgid \"\"\n \"\\n\"\n@@ -640,7 +664,7 @@ msgstr \"Невозможно найти состояние предка:\"\n msgid \"Unable to display parent\"\n msgstr \"Не могу показать предка\"\n \n-#: lib/blame.tcl:1091 lib/diff.tcl:297\n+#: lib/blame.tcl:1091 lib/diff.tcl:320\n msgid \"Error loading diff:\"\n msgstr \"Ошибка загрузки изменений:\"\n \n@@ -666,7 +690,7 @@ msgstr \"Перейти\"\n \n #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35\n #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282\n-#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172\n+#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172\n #: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42\n #: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352\n #: lib/transport.tcl:108\n@@ -697,7 +721,7 @@ msgstr \"Создание ветви\"\n msgid \"Create New Branch\"\n msgstr \"Создать новую ветвь\"\n \n-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377\n+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381\n msgid \"Create\"\n msgstr \"Создать\"\n \n@@ -729,7 +753,7 @@ msgstr \"Нет\"\n msgid \"Fast Forward Only\"\n msgstr \"Только Fast Forward\"\n \n-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571\n msgid \"Reset\"\n msgstr \"Сброс\"\n \n@@ -771,8 +795,8 @@ msgstr \"Локальные ветви\"\n msgid \"Delete Only If Merged Into\"\n msgstr \"Удалить только в случае, если было слияние с\"\n \n-#: lib/branch_delete.tcl:54\n-msgid \"Always (Do not perform merge test.)\"\n+#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119\n+msgid \"Always (Do not perform merge checks)\"\n msgstr \"Всегда (не выполнять проверку на слияние)\"\n \n #: lib/branch_delete.tcl:103\n@@ -780,6 +804,16 @@ msgstr \"Всегда (не выполнять проверку на слияни\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Ветви, которые не полностью сливаются с %s:\"\n \n+#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217\n+msgid \"\"\n+\"Recovering deleted branches is difficult.\\n\"\n+\"\\n\"\n+\"Delete the selected branches?\"\n+msgstr \"\"\n+\"Восстановить удаленные ветви сложно.\\n\"\n+\"\\n\"\n+\"Продолжить?\"\n+\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -809,7 +843,7 @@ msgstr \"Новое название:\"\n msgid \"Please select a branch to rename.\"\n msgstr \"Укажите ветвь для переименования.\"\n \n-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202\n #, tcl-format\n msgid \"Branch '%s' already exists.\"\n msgstr \"Ветвь '%s' уже существует.\"\n@@ -840,38 +874,38 @@ msgstr \"[На уровень выше]\"\n msgid \"Browse Branch Files\"\n msgstr \"Показать файлы ветви\"\n \n-#: lib/browser.tcl:278 lib/choose_repository.tcl:394\n-#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491\n-#: lib/choose_repository.tcl:995\n+#: lib/browser.tcl:278 lib/choose_repository.tcl:398\n+#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497\n+#: lib/choose_repository.tcl:1028\n msgid \"Browse\"\n msgstr \"Показать\"\n \n-#: lib/checkout_op.tcl:84\n+#: lib/checkout_op.tcl:85\n #, tcl-format\n msgid \"Fetching %s from %s\"\n msgstr \"Получение %s из %s \"\n \n-#: lib/checkout_op.tcl:132\n+#: lib/checkout_op.tcl:133\n #, tcl-format\n msgid \"fatal: Cannot resolve %s\"\n msgstr \"критическая ошибка: невозможно разрешить %s\"\n \n-#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31\n+#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31\n #: lib/sshkey.tcl:53\n msgid \"Close\"\n msgstr \"Закрыть\"\n \n-#: lib/checkout_op.tcl:174\n+#: lib/checkout_op.tcl:175\n #, tcl-format\n msgid \"Branch '%s' does not exist.\"\n msgstr \"Ветвь '%s' не существует \"\n \n-#: lib/checkout_op.tcl:193\n+#: lib/checkout_op.tcl:194\n #, tcl-format\n msgid \"Failed to configure simplified git-pull for '%s'.\"\n msgstr \"Ошибка создания упрощённой конфигурации git pull для '%s'.\"\n \n-#: lib/checkout_op.tcl:228\n+#: lib/checkout_op.tcl:229\n #, tcl-format\n msgid \"\"\n \"Branch '%s' already exists.\\n\"\n@@ -884,21 +918,21 @@ msgstr \"\"\n \"Она не может быть прокручена(fast-forward) к %s.\\n\"\n \"Требуется слияние.\"\n \n-#: lib/checkout_op.tcl:242\n+#: lib/checkout_op.tcl:243\n #, tcl-format\n msgid \"Merge strategy '%s' not supported.\"\n msgstr \"Неизвестная стратегия слияния: '%s'.\"\n \n-#: lib/checkout_op.tcl:261\n+#: lib/checkout_op.tcl:262\n #, tcl-format\n msgid \"Failed to update '%s'.\"\n msgstr \"Не удалось обновить '%s'.\"\n \n-#: lib/checkout_op.tcl:273\n+#: lib/checkout_op.tcl:274\n msgid \"Staging area (index) is already locked.\"\n msgstr \"Рабочая область заблокирована другим процессом.\"\n \n-#: lib/checkout_op.tcl:288\n+#: lib/checkout_op.tcl:289\n msgid \"\"\n \"Last scanned state does not match repository state.\\n\"\n \"\\n\"\n@@ -914,30 +948,30 @@ msgstr \"\"\n \"\\n\"\n \"Это будет сделано сейчас автоматически.\\n\"\n \n-#: lib/checkout_op.tcl:344\n+#: lib/checkout_op.tcl:345\n #, tcl-format\n msgid \"Updating working directory to '%s'...\"\n msgstr \"Обновление рабочего каталога из '%s'...\"\n \n-#: lib/checkout_op.tcl:345\n+#: lib/checkout_op.tcl:346\n msgid \"files checked out\"\n msgstr \"файлы извлечены\"\n \n-#: lib/checkout_op.tcl:375\n+#: lib/checkout_op.tcl:376\n #, tcl-format\n msgid \"Aborted checkout of '%s' (file level merging is required).\"\n msgstr \"Прерван переход на '%s' (требуется слияние содержания файлов)\"\n \n-#: lib/checkout_op.tcl:376\n+#: lib/checkout_op.tcl:377\n msgid \"File level merge required.\"\n msgstr \"Требуется слияние содержания файлов.\"\n \n-#: lib/checkout_op.tcl:380\n+#: lib/checkout_op.tcl:381\n #, tcl-format\n msgid \"Staying on branch '%s'.\"\n msgstr \"Ветвь '%s' остается текущей.\"\n \n-#: lib/checkout_op.tcl:451\n+#: lib/checkout_op.tcl:452\n msgid \"\"\n \"You are no longer on a local branch.\\n\"\n \"\\n\"\n@@ -949,30 +983,30 @@ msgstr \"\"\n \"Если вы хотите снова вернуться к какой-нибудь ветви, создайте ее сейчас, \"\n \"начиная с 'Текущего отсоединенного состояния'.\"\n \n-#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472\n+#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507\n #, tcl-format\n msgid \"Checked out '%s'.\"\n msgstr \"Ветвь '%s' сделана текущей.\"\n \n-#: lib/checkout_op.tcl:500\n+#: lib/checkout_op.tcl:535\n #, tcl-format\n msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n msgstr \"Сброс '%s' в '%s' приведет к потере следующих сохраненных состояний: \"\n \n-#: lib/checkout_op.tcl:522\n+#: lib/checkout_op.tcl:557\n msgid \"Recovering lost commits may not be easy.\"\n msgstr \"Восстановить потерянные сохраненные состояния будет сложно.\"\n \n-#: lib/checkout_op.tcl:527\n+#: lib/checkout_op.tcl:562\n #, tcl-format\n msgid \"Reset '%s'?\"\n msgstr \"Сбросить '%s'?\"\n \n-#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343\n+#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343\n msgid \"Visualize\"\n msgstr \"Наглядно\"\n \n-#: lib/checkout_op.tcl:600\n+#: lib/checkout_op.tcl:635\n #, tcl-format\n msgid \"\"\n \"Failed to set current branch.\\n\"\n@@ -1017,7 +1051,7 @@ msgstr \"\"\n msgid \"Git Gui\"\n msgstr \"Git Gui\"\n \n-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382\n+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386\n msgid \"Create New Repository\"\n msgstr \"Создать новый репозиторий\"\n \n@@ -1025,7 +1059,7 @@ msgstr \"Создать новый репозиторий\"\n msgid \"New...\"\n msgstr \"Новый...\"\n \n-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465\n+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471\n msgid \"Clone Existing Repository\"\n msgstr \"Склонировать существующий репозиторий\"\n \n@@ -1033,7 +1067,7 @@ msgstr \"Склонировать существующий репозиторий\n msgid \"Clone...\"\n msgstr \"Склонировать...\"\n \n-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983\n+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016\n msgid \"Open Existing Repository\"\n msgstr \"Выбрать существующий репозиторий\"\n \n@@ -1049,194 +1083,194 @@ msgstr \"Недавние репозитории\"\n msgid \"Open Recent Repository:\"\n msgstr \"Открыть последний репозиторий\"\n \n-#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309\n-#: lib/choose_repository.tcl:316\n+#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313\n+#: lib/choose_repository.tcl:320\n #, tcl-format\n msgid \"Failed to create repository %s:\"\n msgstr \"Не удалось создать репозиторий %s:\"\n \n-#: lib/choose_repository.tcl:387\n+#: lib/choose_repository.tcl:391\n msgid \"Directory:\"\n msgstr \"Каталог:\"\n \n-#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544\n-#: lib/choose_repository.tcl:1017\n+#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550\n+#: lib/choose_repository.tcl:1052\n msgid \"Git Repository\"\n msgstr \"Репозиторий\"\n \n-#: lib/choose_repository.tcl:442\n+#: lib/choose_repository.tcl:448\n #, tcl-format\n msgid \"Directory %s already exists.\"\n msgstr \"Каталог '%s' уже существует.\"\n \n-#: lib/choose_repository.tcl:446\n+#: lib/choose_repository.tcl:452\n #, tcl-format\n msgid \"File %s already exists.\"\n msgstr \"Файл '%s' уже существует.\"\n \n-#: lib/choose_repository.tcl:460\n+#: lib/choose_repository.tcl:466\n msgid \"Clone\"\n msgstr \"Склонировать\"\n \n-#: lib/choose_repository.tcl:473\n+#: lib/choose_repository.tcl:479\n msgid \"Source Location:\"\n msgstr \"Исходное положение:\"\n \n-#: lib/choose_repository.tcl:484\n+#: lib/choose_repository.tcl:490\n msgid \"Target Directory:\"\n msgstr \"Каталог назначения:\"\n \n-#: lib/choose_repository.tcl:496\n+#: lib/choose_repository.tcl:502\n msgid \"Clone Type:\"\n msgstr \"Тип клона:\"\n \n-#: lib/choose_repository.tcl:502\n+#: lib/choose_repository.tcl:508\n msgid \"Standard (Fast, Semi-Redundant, Hardlinks)\"\n msgstr \"Стандартный (Быстрый, полуизбыточный, \\\"жесткие\\\" ссылки)\"\n \n-#: lib/choose_repository.tcl:508\n+#: lib/choose_repository.tcl:514\n msgid \"Full Copy (Slower, Redundant Backup)\"\n msgstr \"Полная копия (Медленный, создает резервную копию)\"\n \n-#: lib/choose_repository.tcl:514\n+#: lib/choose_repository.tcl:520\n msgid \"Shared (Fastest, Not Recommended, No Backup)\"\n msgstr \"Общий (Самый быстрый, не рекомендуется, без резервной копии)\"\n \n-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597\n-#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813\n-#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031\n+#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603\n+#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819\n+#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066\n #, tcl-format\n msgid \"Not a Git repository: %s\"\n msgstr \"Каталог не является репозиторием: %s\"\n \n-#: lib/choose_repository.tcl:586\n+#: lib/choose_repository.tcl:592\n msgid \"Standard only available for local repository.\"\n msgstr \"Стандартный клон возможен только для локального репозитория.\"\n \n-#: lib/choose_repository.tcl:590\n+#: lib/choose_repository.tcl:596\n msgid \"Shared only available for local repository.\"\n msgstr \"Общий клон возможен только для локального репозитория.\"\n \n-#: lib/choose_repository.tcl:611\n+#: lib/choose_repository.tcl:617\n #, tcl-format\n msgid \"Location %s already exists.\"\n msgstr \"Путь '%s' уже существует.\"\n \n-#: lib/choose_repository.tcl:622\n+#: lib/choose_repository.tcl:628\n msgid \"Failed to configure origin\"\n msgstr \"Не могу сконфигурировать исходный репозиторий.\"\n \n-#: lib/choose_repository.tcl:634\n+#: lib/choose_repository.tcl:640\n msgid \"Counting objects\"\n msgstr \"Считаю объекты\"\n \n-#: lib/choose_repository.tcl:635\n+#: lib/choose_repository.tcl:641\n msgid \"buckets\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:659\n+#: lib/choose_repository.tcl:665\n #, tcl-format\n msgid \"Unable to copy objects/info/alternates: %s\"\n msgstr \"Не могу скопировать objects/info/alternates: %s\"\n \n-#: lib/choose_repository.tcl:695\n+#: lib/choose_repository.tcl:701\n #, tcl-format\n msgid \"Nothing to clone from %s.\"\n msgstr \"Нечего клонировать с %s.\"\n \n-#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911\n-#: lib/choose_repository.tcl:923\n+#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917\n+#: lib/choose_repository.tcl:929\n msgid \"The 'master' branch has not been initialized.\"\n msgstr \"Не инициализирована ветвь 'master'.\"\n \n-#: lib/choose_repository.tcl:710\n+#: lib/choose_repository.tcl:716\n msgid \"Hardlinks are unavailable. Falling back to copying.\"\n msgstr \"\\\"Жесткие ссылки\\\" недоступны. Будет использовано копирование.\"\n \n-#: lib/choose_repository.tcl:722\n+#: lib/choose_repository.tcl:728\n #, tcl-format\n msgid \"Cloning from %s\"\n msgstr \"Клонирование %s\"\n \n-#: lib/choose_repository.tcl:753\n+#: lib/choose_repository.tcl:759\n msgid \"Copying objects\"\n msgstr \"Копирование objects\"\n \n-#: lib/choose_repository.tcl:754\n+#: lib/choose_repository.tcl:760\n msgid \"KiB\"\n msgstr \"КБ\"\n \n-#: lib/choose_repository.tcl:778\n+#: lib/choose_repository.tcl:784\n #, tcl-format\n msgid \"Unable to copy object: %s\"\n msgstr \"Не могу скопировать объект: %s\"\n \n-#: lib/choose_repository.tcl:788\n+#: lib/choose_repository.tcl:794\n msgid \"Linking objects\"\n msgstr \"Создание ссылок на objects\"\n \n-#: lib/choose_repository.tcl:789\n+#: lib/choose_repository.tcl:795\n msgid \"objects\"\n msgstr \"объекты\"\n \n-#: lib/choose_repository.tcl:797\n+#: lib/choose_repository.tcl:803\n #, tcl-format\n msgid \"Unable to hardlink object: %s\"\n msgstr \"Не могу \\\"жестко связать\\\" объект: %s\"\n \n-#: lib/choose_repository.tcl:852\n+#: lib/choose_repository.tcl:858\n msgid \"Cannot fetch branches and objects. See console output for details.\"\n msgstr \"\"\n \"Не могу получить ветви и объекты. Дополнительная информация на консоли.\"\n \n-#: lib/choose_repository.tcl:863\n+#: lib/choose_repository.tcl:869\n msgid \"Cannot fetch tags. See console output for details.\"\n msgstr \"Не могу получить метки. Дополнительная информация на консоли.\"\n \n-#: lib/choose_repository.tcl:887\n+#: lib/choose_repository.tcl:893\n msgid \"Cannot determine HEAD. See console output for details.\"\n msgstr \"Не могу определить HEAD. Дополнительная информация на консоли.\"\n \n-#: lib/choose_repository.tcl:896\n+#: lib/choose_repository.tcl:902\n #, tcl-format\n msgid \"Unable to cleanup %s\"\n msgstr \"Не могу очистить %s\"\n \n-#: lib/choose_repository.tcl:902\n+#: lib/choose_repository.tcl:908\n msgid \"Clone failed.\"\n msgstr \"Клонирование не удалось.\"\n \n-#: lib/choose_repository.tcl:909\n+#: lib/choose_repository.tcl:915\n msgid \"No default branch obtained.\"\n msgstr \"Не было получено ветви по умолчанию.\"\n \n-#: lib/choose_repository.tcl:920\n+#: lib/choose_repository.tcl:926\n #, tcl-format\n msgid \"Cannot resolve %s as a commit.\"\n msgstr \"Не могу распознать %s как состояние.\"\n \n-#: lib/choose_repository.tcl:932\n+#: lib/choose_repository.tcl:938\n msgid \"Creating working directory\"\n msgstr \"Создаю рабочий каталог\"\n \n-#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128\n-#: lib/index.tcl:196\n+#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130\n+#: lib/index.tcl:198\n msgid \"files\"\n msgstr \"файлов\"\n \n-#: lib/choose_repository.tcl:962\n+#: lib/choose_repository.tcl:968\n msgid \"Initial file checkout failed.\"\n msgstr \"Не удалось получить начальное состояние файлов репозитория.\"\n \n-#: lib/choose_repository.tcl:978\n+#: lib/choose_repository.tcl:1011\n msgid \"Open\"\n msgstr \"Открыть\"\n \n-#: lib/choose_repository.tcl:988\n+#: lib/choose_repository.tcl:1021\n msgid \"Repository:\"\n msgstr \"Репозиторий:\"\n \n-#: lib/choose_repository.tcl:1037\n+#: lib/choose_repository.tcl:1072\n #, tcl-format\n msgid \"Failed to open repository %s:\"\n msgstr \"Не удалось открыть репозиторий %s:\"\n@@ -1318,7 +1352,12 @@ msgstr \"Невозможно получить информацию об авто\n msgid \"Invalid GIT_COMMITTER_IDENT:\"\n msgstr \"Неверный GIT_COMMITTER_IDENT:\"\n \n-#: lib/commit.tcl:132\n+#: lib/commit.tcl:129\n+#, tcl-format\n+msgid \"warning: Tcl does not support encoding '%s'.\"\n+msgstr \"предупреждение: Tcl не поддерживает кодировку '%s'.\"\n+\n+#: lib/commit.tcl:149\n msgid \"\"\n \"Last scanned state does not match repository state.\\n\"\n \"\\n\"\n@@ -1334,7 +1373,7 @@ msgstr \"\"\n \"\\n\"\n \"Это будет сделано сейчас автоматически.\\n\"\n \n-#: lib/commit.tcl:155\n+#: lib/commit.tcl:172\n #, tcl-format\n msgid \"\"\n \"Unmerged files cannot be committed.\\n\"\n@@ -1347,7 +1386,7 @@ msgstr \"\"\n \"Для файла %s возник конфликт слияния. Разрешите конфликт и добавьте к \"\n \"подготовленным файлам перед сохранением.\\n\"\n \n-#: lib/commit.tcl:163\n+#: lib/commit.tcl:180\n #, tcl-format\n msgid \"\"\n \"Unknown file state %s detected.\\n\"\n@@ -1358,7 +1397,7 @@ msgstr \"\"\n \"\\n\"\n \"Файл %s не может быть сохранен данной программой.\\n\"\n \n-#: lib/commit.tcl:171\n+#: lib/commit.tcl:188\n msgid \"\"\n \"No changes to commit.\\n\"\n \"\\n\"\n@@ -1368,7 +1407,7 @@ msgstr \"\"\n \"\\n\"\n \"Подготовьте хотя бы один файл до создания сохраненного состояния.\\n\"\n \n-#: lib/commit.tcl:186\n+#: lib/commit.tcl:203\n msgid \"\"\n \"Please supply a commit message.\\n\"\n \"\\n\"\n@@ -1386,45 +1425,40 @@ msgstr \"\"\n \"- вторая строка пустая\\n\"\n \"- оставшиеся строки: опишите, что дают ваши изменения.\\n\"\n \n-#: lib/commit.tcl:210\n-#, tcl-format\n-msgid \"warning: Tcl does not support encoding '%s'.\"\n-msgstr \"предупреждение: Tcl не поддерживает кодировку '%s'.\"\n-\n-#: lib/commit.tcl:226\n+#: lib/commit.tcl:234\n msgid \"Calling pre-commit hook...\"\n msgstr \"Вызов программы поддержки репозитория pre-commit...\"\n \n-#: lib/commit.tcl:241\n+#: lib/commit.tcl:249\n msgid \"Commit declined by pre-commit hook.\"\n msgstr \"Сохранение прервано программой поддержки репозитория pre-commit\"\n \n-#: lib/commit.tcl:264\n+#: lib/commit.tcl:272\n msgid \"Calling commit-msg hook...\"\n msgstr \"Вызов программы поддержки репозитория commit-msg...\"\n \n-#: lib/commit.tcl:279\n+#: lib/commit.tcl:287\n msgid \"Commit declined by commit-msg hook.\"\n msgstr \"Сохранение прервано программой поддержки репозитория commit-msg\"\n \n-#: lib/commit.tcl:292\n+#: lib/commit.tcl:300\n msgid \"Committing changes...\"\n msgstr \"Сохранение изменений...\"\n \n-#: lib/commit.tcl:308\n+#: lib/commit.tcl:316\n msgid \"write-tree failed:\"\n msgstr \"Программа write-tree завершилась с ошибкой:\"\n \n-#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373\n+#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382\n msgid \"Commit failed.\"\n msgstr \"Сохранить состояние не удалось.\"\n \n-#: lib/commit.tcl:326\n+#: lib/commit.tcl:334\n #, tcl-format\n msgid \"Commit %s appears to be corrupt\"\n msgstr \"Состояние %s выглядит поврежденным\"\n \n-#: lib/commit.tcl:331\n+#: lib/commit.tcl:339\n msgid \"\"\n \"No changes to commit.\\n\"\n \"\\n\"\n@@ -1438,19 +1472,19 @@ msgstr \"\"\n \"\\n\"\n \"Сейчас автоматически запустится перечитывание репозитория.\\n\"\n \n-#: lib/commit.tcl:338\n+#: lib/commit.tcl:346\n msgid \"No changes to commit.\"\n msgstr \"Отсутствуют изменения для сохранения.\"\n \n-#: lib/commit.tcl:352\n+#: lib/commit.tcl:360\n msgid \"commit-tree failed:\"\n msgstr \"Программа commit-tree завершилась с ошибкой:\"\n \n-#: lib/commit.tcl:372\n+#: lib/commit.tcl:381\n msgid \"update-ref failed:\"\n msgstr \"Программа update-ref завершилась с ошибкой:\"\n \n-#: lib/commit.tcl:460\n+#: lib/commit.tcl:469\n #, tcl-format\n msgid \"Created commit %s: %s\"\n msgstr \"Создано состояние %s: %s \"\n@@ -1503,20 +1537,19 @@ msgstr \"Сжатие базы объектов\"\n msgid \"Verifying the object database with fsck-objects\"\n msgstr \"Проверка базы объектов при помощи fsck\"\n \n-#: lib/database.tcl:108\n+#: lib/database.tcl:107\n #, tcl-format\n msgid \"\"\n \"This repository currently has approximately %i loose objects.\\n\"\n \"\\n\"\n \"To maintain optimal performance it is strongly recommended that you compress \"\n-\"the database when more than %i loose objects exist.\\n\"\n+\"the database.\\n\"\n \"\\n\"\n \"Compress the database now?\"\n msgstr \"\"\n \"Этот репозиторий сейчас содержит примерно %i свободных объектов\\n\"\n \"\\n\"\n-\"Для лучшей производительности рекомендуется сжать базу данных, когда есть \"\n-\"более %i несвязанных объектов.\\n\"\n+\"Для лучшей производительности рекомендуется сжать базу данных.\\n\"\n \"\\n\"\n \"Сжать базу данных сейчас?\"\n \n@@ -1525,7 +1558,7 @@ msgstr \"\"\n msgid \"Invalid date from Git: %s\"\n msgstr \"Неправильная дата в репозитории: %s\"\n \n-#: lib/diff.tcl:59\n+#: lib/diff.tcl:64\n #, tcl-format\n msgid \"\"\n \"No differences detected.\\n\"\n@@ -1547,12 +1580,12 @@ msgstr \"\"\n \"\\n\"\n \"Сейчас будет запущено перечитывание репозитория, чтобы найти подобные файлы.\"\n \n-#: lib/diff.tcl:99\n+#: lib/diff.tcl:104\n #, tcl-format\n msgid \"Loading diff of %s...\"\n msgstr \"Загрузка изменений в %s...\"\n \n-#: lib/diff.tcl:120\n+#: lib/diff.tcl:125\n msgid \"\"\n \"LOCAL: deleted\\n\"\n \"REMOTE:\\n\"\n@@ -1560,7 +1593,7 @@ msgstr \"\"\n \"ЛОКАЛЬНО: удалён\\n\"\n \"ВНЕШНИЙ:\\n\"\n \n-#: lib/diff.tcl:125\n+#: lib/diff.tcl:130\n msgid \"\"\n \"REMOTE: deleted\\n\"\n \"LOCAL:\\n\"\n@@ -1568,32 +1601,32 @@ msgstr \"\"\n \"ВНЕШНИЙ: удалён\\n\"\n \"ЛОКАЛЬНО:\\n\"\n \n-#: lib/diff.tcl:132\n+#: lib/diff.tcl:137\n msgid \"LOCAL:\\n\"\n msgstr \"ЛОКАЛЬНО:\\n\"\n \n-#: lib/diff.tcl:135\n+#: lib/diff.tcl:140\n msgid \"REMOTE:\\n\"\n msgstr \"ВНЕШНИЙ:\\n\"\n \n-#: lib/diff.tcl:197 lib/diff.tcl:296\n+#: lib/diff.tcl:202 lib/diff.tcl:319\n #, tcl-format\n msgid \"Unable to display %s\"\n msgstr \"Не могу показать %s\"\n \n-#: lib/diff.tcl:198\n+#: lib/diff.tcl:203\n msgid \"Error loading file:\"\n msgstr \"Ошибка загрузки файла:\"\n \n-#: lib/diff.tcl:205\n+#: lib/diff.tcl:210\n msgid \"Git Repository (subproject)\"\n msgstr \"Репозиторий Git (подпроект)\"\n \n-#: lib/diff.tcl:217\n+#: lib/diff.tcl:222\n msgid \"* Binary file (not showing content).\"\n msgstr \"* Двоичный файл (содержимое не показано)\"\n \n-#: lib/diff.tcl:222\n+#: lib/diff.tcl:227\n #, tcl-format\n msgid \"\"\n \"* Untracked file is %d bytes.\\n\"\n@@ -1602,7 +1635,7 @@ msgstr \"\"\n \"* Размер неподготовленного файла %d байт.\\n\"\n \"* Показано первых %d байт.\\n\"\n \n-#: lib/diff.tcl:228\n+#: lib/diff.tcl:233\n #, tcl-format\n msgid \"\"\n \"\\n\"\n@@ -1613,19 +1646,19 @@ msgstr \"\"\n \"* Неподготовленный файл обрезан: %s.\\n\"\n \"* Чтобы увидеть весь файл, используйте программу-редактор.\\n\"\n \n-#: lib/diff.tcl:436\n+#: lib/diff.tcl:482\n msgid \"Failed to unstage selected hunk.\"\n msgstr \"Не удалось исключить выбранную часть.\"\n \n-#: lib/diff.tcl:443\n+#: lib/diff.tcl:489\n msgid \"Failed to stage selected hunk.\"\n msgstr \"Не удалось подготовить к сохранению выбранную часть.\"\n \n-#: lib/diff.tcl:509\n+#: lib/diff.tcl:568\n msgid \"Failed to unstage selected line.\"\n msgstr \"Не удалось исключить выбранную строку.\"\n \n-#: lib/diff.tcl:517\n+#: lib/diff.tcl:576\n msgid \"Failed to stage selected line.\"\n msgstr \"Не удалось подготовить к сохранению выбранную строку.\"\n \n@@ -1662,7 +1695,7 @@ msgstr \"Не удалось разблокировать индекс\"\n msgid \"Index Error\"\n msgstr \"Ошибка в индексе\"\n \n-#: lib/index.tcl:21\n+#: lib/index.tcl:17\n msgid \"\"\n \"Updating the Git index failed. A rescan will be automatically started to \"\n \"resynchronize git-gui.\"\n@@ -1670,7 +1703,7 @@ msgstr \"\"\n \"Не удалось обновить индекс Git. Состояние репозитория будет перечитано \"\n \"автоматически.\"\n \n-#: lib/index.tcl:27\n+#: lib/index.tcl:28\n msgid \"Continue\"\n msgstr \"Продолжить\"\n \n@@ -1678,45 +1711,45 @@ msgstr \"Продолжить\"\n msgid \"Unlock Index\"\n msgstr \"Разблокировать индекс\"\n \n-#: lib/index.tcl:287\n+#: lib/index.tcl:289\n #, tcl-format\n msgid \"Unstaging %s from commit\"\n msgstr \"Удаление %s из подготовленного\"\n \n-#: lib/index.tcl:326\n+#: lib/index.tcl:328\n msgid \"Ready to commit.\"\n msgstr \"Подготовлено для сохранения\"\n \n-#: lib/index.tcl:339\n+#: lib/index.tcl:341\n #, tcl-format\n msgid \"Adding %s\"\n msgstr \"Добавление %s...\"\n \n-#: lib/index.tcl:396\n+#: lib/index.tcl:398\n #, tcl-format\n msgid \"Revert changes in file %s?\"\n msgstr \"Отменить изменения в файле %s?\"\n \n-#: lib/index.tcl:398\n+#: lib/index.tcl:400\n #, tcl-format\n msgid \"Revert changes in these %i files?\"\n msgstr \"Отменить изменения в %i файле(-ах)?\"\n \n-#: lib/index.tcl:406\n+#: lib/index.tcl:408\n msgid \"Any unstaged changes will be permanently lost by the revert.\"\n msgstr \"\"\n \"Любые изменения, не подготовленные к сохранению, будут потеряны при данной \"\n \"операции.\"\n \n-#: lib/index.tcl:409\n+#: lib/index.tcl:411\n msgid \"Do Nothing\"\n msgstr \"Ничего не делать\"\n \n-#: lib/index.tcl:427\n+#: lib/index.tcl:429\n msgid \"Reverting selected files\"\n msgstr \"Удаление изменений в выбранных файлах\"\n \n-#: lib/index.tcl:431\n+#: lib/index.tcl:433\n #, tcl-format\n msgid \"Reverting %s\"\n msgstr \"Отмена изменений в %s\"\n@@ -2193,10 +2226,6 @@ msgstr \"Удалить только в случае, если\"\n msgid \"Merged Into:\"\n msgstr \"Слияние с:\"\n \n-#: lib/remote_branch_delete.tcl:119\n-msgid \"Always (Do not perform merge checks)\"\n-msgstr \"Всегда (не выполнять проверку на слияние)\"\n-\n #: lib/remote_branch_delete.tcl:152\n msgid \"A branch is required for 'Merged Into'.\"\n msgstr \"Для опции 'Слияние с' требуется указать ветвь.\"\n@@ -2225,26 +2254,16 @@ msgstr \"\"\n msgid \"Please select one or more branches to delete.\"\n msgstr \"Укажите одну или несколько ветвей для удаления.\"\n \n-#: lib/remote_branch_delete.tcl:216\n-msgid \"\"\n-\"Recovering deleted branches is difficult.\\n\"\n-\"\\n\"\n-\"Delete the selected branches?\"\n-msgstr \"\"\n-\"Восстановить удаленные ветви сложно.\\n\"\n-\"\\n\"\n-\"Продолжить?\"\n-\n #: lib/remote_branch_delete.tcl:226\n #, tcl-format\n msgid \"Deleting branches from %s\"\n msgstr \"Удаление ветвей из %s\"\n \n-#: lib/remote_branch_delete.tcl:286\n+#: lib/remote_branch_delete.tcl:292\n msgid \"No repository selected.\"\n msgstr \"Не указан репозиторий.\"\n \n-#: lib/remote_branch_delete.tcl:291\n+#: lib/remote_branch_delete.tcl:297\n #, tcl-format\n msgid \"Scanning %s...\"\n msgstr \"Перечитывание %s... \"\n@@ -2265,11 +2284,11 @@ msgstr \"Обратно\"\n msgid \"Case-Sensitive\"\n msgstr \"Игн. большие/маленькие\"\n \n-#: lib/shortcut.tcl:20 lib/shortcut.tcl:61\n+#: lib/shortcut.tcl:21 lib/shortcut.tcl:62\n msgid \"Cannot write shortcut:\"\n msgstr \"Невозможно записать ссылку:\"\n \n-#: lib/shortcut.tcl:136\n+#: lib/shortcut.tcl:137\n msgid \"Cannot write icon:\"\n msgstr \"Невозможно записать значок:\"\n \n-- \n1.7.3.4.643.g8fb2b\n"},{"id":"159572","messageId":"loom.20110118T083048-91@post.gmane.org","threadId":"26296","inReplyTo":"20110117210828.GC27029@blimp.localdomain","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Alexey Shumkin","fromEmail":"zapped@mail.ru","sentAt":"2011-01-18T07:40:05Z","receivedAt":"2011-01-18T07:40:05Z","isPatch":true,"sender":{"key":"alex.crezoff@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1183752?v=4"},"body":"change this\n> #, tcl-format\n> msgid \"File %s seems to have unresolved conflicts, still stage?\"\n> msgstr \"\"\n+\"Файл %s кажется содержит необработанные конфликты.\nПродолжить подготовку к \"\n \"сохранению?\"\nto\n+\"Файл %s, кажется, содержит необработанные конфликты.\nПродолжить подготовку к \"\n \"сохранению?\"\n\n\"Кажется\" - вводное слово, обособляется запятыми\nTranslation to English:\n\"Кажется\" - is parenthesis so must be isolated with commas\n"},{"id":"159574","messageId":"AANLkTikpDb_NvQJXGiUgggjx8C9t0nzDitJeseGFpC=b@mail.gmail.com","threadId":"26296","inReplyTo":"loom.20110118T083048-91@post.gmane.org","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-18T07:48:06Z","receivedAt":"2011-01-18T07:48:06Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"2011/1/18 Alexey Shumkin :\n> change this\n>>  #, tcl-format\n>>  msgid \"File %s seems to have unresolved conflicts, still stage?\"\n>>  msgstr \"\"\n> +\"Файл %s кажется содержит необработанные конфликты.\n> Продолжить подготовку к \"\n>  \"сохранению?\"\n> to\n> +\"Файл %s, кажется, содержит необработанные конфликты.\n> Продолжить подготовку к \"\n>  \"сохранению?\"\n\nMaybe you can just submit the patch properly?\nOTOH, I'll do it this evening, unless you do it first, of course.\n"},{"id":"159612","messageId":"20110119000735.GA29212@dpotapov.dyndns.org","threadId":"26296","inReplyTo":"loom.20110118T083048-91@post.gmane.org","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Dmitry Potapov","fromEmail":"dpotapov@gmail.com","sentAt":"2011-01-19T00:07:36Z","receivedAt":"2011-01-19T00:07:36Z","isPatch":true,"sender":{"key":"dpotapov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6568595?v=4"},"body":"On Tue, Jan 18, 2011 at 07:40:05AM +0000, Alexey Shumkin wrote:\n> change this\n> > #, tcl-format\n> > msgid \"File %s seems to have unresolved conflicts, still stage?\"\n> > msgstr \"\"\n> +\"Файл %s кажется содержит необработанные конфликты.\n> Продолжить подготовку к \"\n> \"сохранению?\"\n> to\n> +\"Файл %s, кажется, содержит необработанные конфликты.\n> Продолжить подготовку к \"\n> \"сохранению?\"\n> \n> \"Кажется\" - вводное слово, обособляется запятыми\n\nIn the above sentence, 'кажется' is not an introductory word, and thus\nno comma is required. For details, see #2 at\nhttp://ru.wiktionary.org/wiki/%D0%BA%D0%B0%D0%B6%D0%B5%D1%82%D1%81%D1%8F\n\nHowever, such use of 'кажется' is more appropriate for colloquial speech\nthan for documentation or even computer messages. Also, I have never seen\n'unresolved conflicts' being translated as 'необработанные конфликты'.\nIMHO, the standard term is 'неразрешенные конфликты'. So my suggestion is:\n\nФайл %s может содержать неразрешенные конфликты.\n\n\n\nDmitry\n"},{"id":"159614","messageId":"20110119001644.GB29212@dpotapov.dyndns.org","threadId":"26296","inReplyTo":"20110117210855.GD27029@blimp.localdomain","subject":"Re: [PATCH 3/3] git-gui: update russian translation","fromName":"Dmitry Potapov","fromEmail":"dpotapov@gmail.com","sentAt":"2011-01-19T00:16:44Z","receivedAt":"2011-01-19T00:16:44Z","isPatch":true,"sender":{"key":"dpotapov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6568595?v=4"},"body":"On Mon, Jan 17, 2011 at 10:08:55PM +0100, Alex Riesen wrote:\n> -#: git-gui.sh:1367\n> +#: git-gui.sh:1454\n> msgid \"Calling prepare-commit-msg hook...\"\n> msgstr \"Вызов программы поддержки репозитория prepare-commit-msg...\"\n\n'hook' is usually translated as 'программа перехвата'\n\nDmitry\n"},{"id":"159625","messageId":"loom.20110119T090252-99@post.gmane.org","threadId":"26296","inReplyTo":"20110119000735.GA29212@dpotapov.dyndns.org","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Alexey Shumkin","fromEmail":"zapped@mail.ru","sentAt":"2011-01-19T08:36:32Z","receivedAt":"2011-01-19T08:36:32Z","isPatch":true,"sender":{"key":"alex.crezoff@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1183752?v=4"},"body":"Dmitry Potapov gmail.com> writes:\n\n> \n> On Tue, Jan 18, 2011 at 07:40:05AM +0000, Alexey Shumkin wrote:\n> > change this\n> > > #, tcl-format\n> > > msgid \"File %s seems to have unresolved conflicts, still stage?\"\n> > > msgstr \"\"\n> > +\"Файл %s кажется содержит необработанные конфликты.\n> > Продолжить подготовку к \"\n> > \"сохранению?\"\n> > to\n> > +\"Файл %s, кажется, содержит необработанные конфликты.\n> > Продолжить подготовку к \"\n> > \"сохранению?\"\n> > \n> > \"Кажется\" - вводное слово, обособляется запятыми\n> \n> In the above sentence, 'кажется' is not an introductory word, and thus\n> no comma is required. For details, see #2 at\n> http://ru.wiktionary.org/wiki/%D0%BA%D0%B0%D0%B6%D0%B5%D1%82%D1%81%D1%8F\n> \n> However, such use of 'кажется' is more appropriate for colloquial speech\n> than for documentation or even computer messages. Also, I have never seen\n> 'unresolved conflicts' being translated as 'необработанные конфликты'.\n> IMHO, the standard term is 'неразрешенные конфликты'. So my suggestion is:\n> \n> Файл %s может содержать неразрешенные конфликты.\n> \n> Dmitry\n> \n\nAs I understand exact meaning of phrase \"File %s seems to have unresolved \nconflicts\" (note *seems* word here) is a supposition. It is not\nan equivalent of \"may have\" (but \"may not have\").\nSo, I agree sentence must rephrased but supposition must be retained.\nSomething like \"Файл %s, похоже, содержит неразрешенные конфликты\"\nor \"Файл %s, видимо, содержит неразрешенные конфликты\"\nor better \"Предположительно файл %s содержит неразрешенные конфликты\"\n(stay official but supposing)\n"},{"id":"159631","messageId":"AANLkTimy6C=Ts3FZwm3EMhMssx605u6ubHyPXPfuO_0V@mail.gmail.com","threadId":"26296","inReplyTo":"20110119001644.GB29212@dpotapov.dyndns.org","subject":"Re: [PATCH 3/3] git-gui: update russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-19T09:55:46Z","receivedAt":"2011-01-19T09:55:46Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"2011/1/19 Dmitry Potapov :\n> On Mon, Jan 17, 2011 at 10:08:55PM +0100, Alex Riesen wrote:\n>> -#: git-gui.sh:1367\n>> +#: git-gui.sh:1454\n>>  msgid \"Calling prepare-commit-msg hook...\"\n>>  msgstr \"Вызов программы поддержки репозитория prepare-commit-msg...\"\n>\n> 'hook' is usually translated as 'программа перехвата'\n>\n\nDunno. Does not sound right in this particular case.\nUnless someone else speaks up for this translation, or\ncomes up with a better translation of the whole message,\nI suggest we leave it as is.\n"},{"id":"159633","messageId":"AANLkTimt=H=MWbk7uHTXBudQ94Oqme5Gi+js8NQu0GjW@mail.gmail.com","threadId":"26296","inReplyTo":"loom.20110119T090252-99@post.gmane.org","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-19T10:04:26Z","receivedAt":"2011-01-19T10:04:26Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On Wed, Jan 19, 2011 at 09:36, Alexey Shumkin wrote:\n> Dmitry Potapov gmail.com> writes:\n>>\n>> In the above sentence, 'кажется' is not an introductory word, and thus\n>> no comma is required. For details, see #2 at\n>> http://ru.wiktionary.org/wiki/%D0%BA%D0%B0%D0%B6%D0%B5%D1%82%D1%81%D1%8F\n>>\n>> However, such use of 'кажется' is more appropriate for colloquial speech\n>> than for documentation or even computer messages. Also, I have never seen\n>> 'unresolved conflicts' being translated as 'необработанные конфликты'.\n>> IMHO, the standard term is 'неразрешенные конфликты'. So my suggestion is:\n>>\n>> Файл %s может содержать неразрешенные конфликты.\n>>\n\nBut this would be wrong. It is absolutely not the original\nmessage tried to say. Any file can contain unresolved conflicts\n(markers). The point is: this particular file very likely does.\n\n> As I understand exact meaning of phrase \"File %s seems to have unresolved\n> conflicts\" (note *seems* word here) is a supposition. It is not\n> an equivalent of \"may have\" (but \"may not have\").\n> So, I agree sentence must rephrased but supposition must be retained.\n> Something like \"Файл %s, похоже, содержит неразрешенные конфликты\"\n\nWhile I like this one, it is not much better semantically, than the\nprevious with punctuation corrected. So unless there are more votes\nfor it, I will not resend the translation.\nCannot forbid you from doing this, though (and personally would like\nto see a name of another native russian speaker in the authors of\ntranslations).\n\n> or better \"Предположительно файл %s содержит неразрешенные конфликты\"\n> (stay official but supposing)\n\n\"Supposedly file \"...?\n"},{"id":"159639","messageId":"20110119104856.GA5473@dpotapov.dyndns.org","threadId":"26296","inReplyTo":"loom.20110119T090252-99@post.gmane.org","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Dmitry Potapov","fromEmail":"dpotapov@gmail.com","sentAt":"2011-01-19T10:48:56Z","receivedAt":"2011-01-19T10:48:56Z","isPatch":true,"sender":{"key":"dpotapov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6568595?v=4"},"body":"On Wed, Jan 19, 2011 at 08:36:32AM +0000, Alexey Shumkin wrote:\n> So, I agree sentence must rephrased but supposition must be retained.\n> Something like \"Файл %s, похоже, содержит неразрешенные конфликты\"\n\nI like this one.\n\nThanks,\nDmitry\n"},{"id":"159672","messageId":"20110119210131.GA8184@blimp.localdomain","threadId":"26296","inReplyTo":"20110119104856.GA5473@dpotapov.dyndns.org","subject":"[PATCH] git-gui: update russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-19T21:01:32Z","receivedAt":"2011-01-19T21:01:32Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Improve the translation of warning given by mergetool when staging files with\nconflict markers.\n\nSuggested-by: Alexey Shumkin \nTipping-vote-by: Dmitry Potapov \nSigned-off-by: Alex Riesen \n---\n\nOn Wed, 19 Jan 2011 13:48:56 +0300, Dmitry Potapov wrote:\n> On Wed, Jan 19, 2011 at 08:36:32AM +0000, Alexey Shumkin wrote:\n>> So, I agree sentence must rephrased but supposition must be retained.\n>> Something like \"Файл %s, похоже, содержит неразрешенные конфликты\"\n>\n> I like this one.\n\nSo be it.\n\nPlease, apply on top of the previously sent patches.\n\n po/ru.po | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/po/ru.po b/po/ru.po\nindex 7071a8c..30f4b77 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -1926,7 +1926,7 @@ msgstr \"\"\n #, tcl-format\n msgid \"File %s seems to have unresolved conflicts, still stage?\"\n msgstr \"\"\n-\"Файл %s кажется содержит необработанные конфликты. Продолжить подготовку к \"\n+\"Файл %s, похоже, содержит необработанные конфликты. Продолжить подготовку к \"\n \"сохранению?\"\n \n #: lib/mergetool.tcl:60\n-- \n1.7.4.rc2.25.g62eb\n"},{"id":"159827","messageId":"AANLkTinZCegWW-6uQ++uO9fGQ4SQ34=W4TJXW6ii5jXD@mail.gmail.com","threadId":"26296","inReplyTo":"20110117210828.GC27029@blimp.localdomain","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-24T20:06:41Z","receivedAt":"2011-01-24T20:06:41Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"2011/1/17 Alex Riesen :\n>  po/ru.po |   24 ++++++++++++------------\n>  1 files changed, 12 insertions(+), 12 deletions(-)\n>\n> diff --git a/po/ru.po b/po/ru.po\n> index c15bdfa..304bb3a 100644\n\nBTW, does anyone know what happens to git-gui development?\nIn particular, the i18n patches. The old way of pushing\nto a mob branch seems to stopped working, and anyway, the\nbranch is very out of date.\n\nIs git gui development stalled? Should I perhaps send the\ni18n pull request directly to Junio?\n"},{"id":"159834","messageId":"87wrltnakc.fsf@fox.patthoyts.tk","threadId":"26296","inReplyTo":"AANLkTinZCegWW-6uQ++uO9fGQ4SQ34=W4TJXW6ii5jXD@mail.gmail.com","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2011-01-24T23:31:15Z","receivedAt":"2011-01-24T23:31:15Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Alex Riesen writes:\n\n>2011/1/17 Alex Riesen :\n>>  po/ru.po |   24 ++++++++++++------------\n>>  1 files changed, 12 insertions(+), 12 deletions(-)\n>>\n>> diff --git a/po/ru.po b/po/ru.po\n>> index c15bdfa..304bb3a 100644\n>\n>BTW, does anyone know what happens to git-gui development?\n>In particular, the i18n patches. The old way of pushing\n>to a mob branch seems to stopped working, and anyway, the\n>branch is very out of date.\n>\n>Is git gui development stalled? Should I perhaps send the\n>i18n pull request directly to Junio?\n>\n\nIf you post here they'll get picked up eventually.\nIf you want to use the mob branch, we can use that too but you would\nneed to post here and to me to notify everyone.\n\n-- \nPat Thoyts http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD\n"},{"id":"159835","messageId":"87sjwhn9c3.fsf@fox.patthoyts.tk","threadId":"26296","inReplyTo":"20110119210131.GA8184@blimp.localdomain","subject":"Re: [PATCH] git-gui: update russian translation","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2011-01-24T23:57:48Z","receivedAt":"2011-01-24T23:57:48Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"\nThank you for the patches. I've applied the four patches and pushed them to\nhttp://repo.or.cz/w/git-gui.git master.\n"},{"id":"159836","messageId":"7vr5c1ltj2.fsf@alter.siamese.dyndns.org","threadId":"26296","inReplyTo":"87wrltnakc.fsf@fox.patthoyts.tk","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-01-25T00:24:33Z","receivedAt":"2011-01-25T00:24:33Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pat Thoyts writes:\n\n>>Is git gui development stalled? Should I perhaps send the\n>>i18n pull request directly to Junio?\n>\n> If you post here they'll get picked up eventually.\n> If you want to use the mob branch, we can use that too but you would\n> need to post here and to me to notify everyone.\n\nOops, I probably should have pinged you (and Paulus for gitk, Eric for\ngit-svn) before tagging rc3 today.\n\nIf there are last-minute changes that must go to 1.7.4 final, please let\nme know.\n"},{"id":"159838","messageId":"7vmxmplt2g.fsf@alter.siamese.dyndns.org","threadId":"26296","inReplyTo":"87sjwhn9c3.fsf@fox.patthoyts.tk","subject":"Re: [PATCH] git-gui: update russian translation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-01-25T00:34:31Z","receivedAt":"2011-01-25T00:34:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pat Thoyts writes:\n\n> Thank you for the patches. I've applied the four patches and pushed them to\n> http://repo.or.cz/w/git-gui.git master.\n\nI see a few changes outside po/ru.po in this update:\n\n git-gui.sh | 26 ++-\n lib/browser.tcl | 2 +-\n lib/diff.tcl | 60 ++++--\n po/ru.po | 623 ++++++++++++++++++++++++++++---------------------------\n 4 files changed, 381 insertions(+), 330 deletions(-)\n\nAre they all good to go for 1.7.4 final? My cursory look indicates that\nthey are all minor bugfixes and look sane, but I rarely use git-gui\nmyself, so I am just double checking.\n\n\nAlex Riesen (2):\n git-gui: update russian translation\n git-gui: update russian translation\n\nBert Wesarg (5):\n git-gui: fix ANSI-color parsing\n git-gui: respect conflict marker size\n git-gui: fix browsers [Up To Parent] in sub-sub-directories.\n git-gui: Fix use of renamed tag.\n git-gui: Fix use of hunk tag for non-hunk content.\n\nSerge Ziryukin (1):\n git-gui: fix russian translation typos\n\nSkip (1):\n git-gui: spelling fixes in russian translation\n\nStefan Naewe (1):\n git-gui: use --exclude-standard to check for untracked files\n"},{"id":"159843","messageId":"AANLkTi=A=yD4Oe-meB=ZMFe_Wm8om-hmA_MOU8vyyBNR@mail.gmail.com","threadId":"26296","inReplyTo":"87wrltnakc.fsf@fox.patthoyts.tk","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-25T07:57:03Z","receivedAt":"2011-01-25T07:57:03Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On Tue, Jan 25, 2011 at 00:31, Pat Thoyts\n wrote:\n> Alex Riesen writes:\n>\n>>2011/1/17 Alex Riesen :\n>>>  po/ru.po |   24 ++++++++++++------------\n>>>  1 files changed, 12 insertions(+), 12 deletions(-)\n>>>\n>>> diff --git a/po/ru.po b/po/ru.po\n>>> index c15bdfa..304bb3a 100644\n>>\n>>BTW, does anyone know what happens to git-gui development?\n>>In particular, the i18n patches. The old way of pushing\n>>to a mob branch seems to stopped working, and anyway, the\n>>branch is very out of date.\n>>\n>>Is git gui development stalled? Should I perhaps send the\n>>i18n pull request directly to Junio?\n>>\n>\n> If you post here they'll get picked up eventually.\n> If you want to use the mob branch, we can use that too but you would\n> need to post here and to me to notify everyone.\n\nWhat's with git-gui-i18n/mob branch being out-of-date? Actually,\nit seems to be abandoned, because it does have quite a bit of\nchanges in it which are not in git-gui/master: spanish, bulgarian,\nportugese, romanian, chinese, italian, japan and greek:\n\n $ git cherry -v git-gui-i18n/master git-gui-i18n/mob\n - 0896a7856335cc934328e02b84e1e41b9db2632d Updated Hungarian\ntranslation (e5fba18)\n + c6fb29db5a50df150280b641d3c2a6703589b529 Fixed usage of positional\nparameters in it.po and ja.po\n + a1fdd910cf11837135f8b007dbb1380131f8d107 Started Romanian Translation\n + 2f27eb24bf1dfdbb14dbc44698cb07ed294a10cf Start Spanish translation\n + 4616c11423484f40361466e0f2470d6c4a29e692 More strings for Spanish\ntranslation\n + e51f330c4c94795cb7cfd151df2f2a222bde0d66 Yet more strings translated...\n + 0947a8e1d71ff03fbc2838f4742de8aa6c971083 Translated a few more strings\n - 71438168c673dd644b442a4c3f863456ddf4b13b Update french translation.\n + bb88a426e49b73c6e7f9b0c8c3be6dc1946252a7 More translated strings\nfor Spanish. Close to being there...\n + 1cf3364c33c57f83b214e51a3ee260334ddc7e56 Fixed usage of positional\nparameters in ja.po\n + 3f4263f049b76118ce8f8f35aacc99dc2f958a82 A few more strings\n + 31da610cb074364aa8d6e32c4cf2a3b5c6d16b51 A Bulgarian translation\nhas been added.\n + ad8d6a97f364f4ee3082258aeddb0488652b81d2 git-gui: Update\nsimplified Chinese translation to POT-2008-08-02\n + 6227f5ee3c74078eec37790111242ac3856759da git-gui: Add traditional\nChinese translation\n + de6afb81c44b44722affd8f2f6aa26fece24c401 Started Portuguese translation.\n + 78ae667f948ed29dca3f7abc3ae67996a56fabf7 Cleaned header of\nPortuguese translation and corrects translation of \"Commit@@verb\".\n + c71abd9b3de78db783e8a7af92fb75bdd57bf2a9 Clean messed up header from KBabel\n + 7b89dc573b03e26ef0b620b5f73aaf116f0eaef9 Added Greek translation & glossary\n"},{"id":"159946","messageId":"87k4hqo9t3.fsf@fox.patthoyts.tk","threadId":"26296","inReplyTo":"7vmxmplt2g.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] git-gui: update russian translation","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2011-01-27T11:39:04Z","receivedAt":"2011-01-27T11:39:04Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Junio C Hamano writes:\n\n>Pat Thoyts writes:\n>\n>> Thank you for the patches. I've applied the four patches and pushed them to\n>> http://repo.or.cz/w/git-gui.git master.\n>\n>I see a few changes outside po/ru.po in this update:\n>\n> git-gui.sh | 26 ++-\n> lib/browser.tcl | 2 +-\n> lib/diff.tcl | 60 ++++--\n> po/ru.po | 623 ++++++++++++++++++++++++++++---------------------------\n> 4 files changed, 381 insertions(+), 330 deletions(-)\n>\n>Are they all good to go for 1.7.4 final? My cursory look indicates that\n>they are all minor bugfixes and look sane, but I rarely use git-gui\n>myself, so I am just double checking.\n>\n>\n>Alex Riesen (2):\n> git-gui: update russian translation\n> git-gui: update russian translation\n>\n>Bert Wesarg (5):\n> git-gui: fix ANSI-color parsing\n> git-gui: respect conflict marker size\n> git-gui: fix browsers [Up To Parent] in sub-sub-directories.\n> git-gui: Fix use of renamed tag.\n> git-gui: Fix use of hunk tag for non-hunk content.\n>\n>Serge Ziryukin (1):\n> git-gui: fix russian translation typos\n>\n>Skip (1):\n> git-gui: spelling fixes in russian translation\n>\n>Stefan Naewe (1):\n> git-gui: use --exclude-standard to check for untracked files\n>\n\nYes - these are good to go. Anything going onto master should be\nsuitable for merging to git. Anything that is still being tested I would\nput onto pu if it got pushed at all.\n\nSo please merge git://repo.or.cz/git-gui.git master\n\n-- \nPat Thoyts http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD\n"},{"id":"159944","messageId":"87fwseo9f4.fsf@fox.patthoyts.tk","threadId":"26296","inReplyTo":"AANLkTi=A=yD4Oe-meB=ZMFe_Wm8om-hmA_MOU8vyyBNR@mail.gmail.com","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2011-01-27T11:47:27Z","receivedAt":"2011-01-27T11:47:27Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Alex Riesen writes:\n\n>On Tue, Jan 25, 2011 at 00:31, Pat Thoyts\n> wrote:\n>> Alex Riesen writes:\n>>\n>>>2011/1/17 Alex Riesen :\n>>>>  po/ru.po |   24 ++++++++++++------------\n>>>>  1 files changed, 12 insertions(+), 12 deletions(-)\n>>>>\n>>>> diff --git a/po/ru.po b/po/ru.po\n>>>> index c15bdfa..304bb3a 100644\n>>>\n>>>BTW, does anyone know what happens to git-gui development?\n>>>In particular, the i18n patches. The old way of pushing\n>>>to a mob branch seems to stopped working, and anyway, the\n>>>branch is very out of date.\n>>>\n>>>Is git gui development stalled? Should I perhaps send the\n>>>i18n pull request directly to Junio?\n>>>\n>>\n>> If you post here they'll get picked up eventually.\n>> If you want to use the mob branch, we can use that too but you would\n>> need to post here and to me to notify everyone.\n>\n>What's with git-gui-i18n/mob branch being out-of-date? Actually,\n>it seems to be abandoned, because it does have quite a bit of\n>changes in it which are not in git-gui/master: spanish, bulgarian,\n>portugese, romanian, chinese, italian, japan and greek:\n>\n> $ git cherry -v git-gui-i18n/master git-gui-i18n/mob\n> - 0896a7856335cc934328e02b84e1e41b9db2632d Updated Hungarian\n>translation (e5fba18)\n> + c6fb29db5a50df150280b641d3c2a6703589b529 Fixed usage of positional\n>parameters in it.po and ja.po\n> + a1fdd910cf11837135f8b007dbb1380131f8d107 Started Romanian Translation\n> + 2f27eb24bf1dfdbb14dbc44698cb07ed294a10cf Start Spanish translation\n> + 4616c11423484f40361466e0f2470d6c4a29e692 More strings for Spanish\n>translation\n> + e51f330c4c94795cb7cfd151df2f2a222bde0d66 Yet more strings translated...\n> + 0947a8e1d71ff03fbc2838f4742de8aa6c971083 Translated a few more strings\n> - 71438168c673dd644b442a4c3f863456ddf4b13b Update french translation.\n> + bb88a426e49b73c6e7f9b0c8c3be6dc1946252a7 More translated strings\n>for Spanish. Close to being there...\n> + 1cf3364c33c57f83b214e51a3ee260334ddc7e56 Fixed usage of positional\n>parameters in ja.po\n> + 3f4263f049b76118ce8f8f35aacc99dc2f958a82 A few more strings\n> + 31da610cb074364aa8d6e32c4cf2a3b5c6d16b51 A Bulgarian translation\n>has been added.\n> + ad8d6a97f364f4ee3082258aeddb0488652b81d2 git-gui: Update\n>simplified Chinese translation to POT-2008-08-02\n> + 6227f5ee3c74078eec37790111242ac3856759da git-gui: Add traditional\n>Chinese translation\n> + de6afb81c44b44722affd8f2f6aa26fece24c401 Started Portuguese translation.\n> + 78ae667f948ed29dca3f7abc3ae67996a56fabf7 Cleaned header of\n>Portuguese translation and corrects translation of \"Commit@@verb\".\n> + c71abd9b3de78db783e8a7af92fb75bdd57bf2a9 Clean messed up header from KBabel\n> + 7b89dc573b03e26ef0b620b5f73aaf116f0eaef9 Added Greek translation & glossary\n>\n\nThe git-gui/git-gui-i18n.git repository is a fork that was created to do\nthe initial internationalization of git-gui I believe. It predates my\ninvolvement with this project so I could be wrong.\n\nWe don't provide a mob branch but you could create your own fork on\nrepo.or.cz if you intend to do much development and then post merge\nrequests to this group and myself.\n\nI think I'd prefer to see forks than use a mob branch. Or receive\npatches or course.\n\n-- \nPat Thoyts http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD\n"},{"id":"159948","messageId":"AANLkTikbtN=fx+jVHQAMAD1R2P7o3_KTNif8SMHozWc3@mail.gmail.com","threadId":"26296","inReplyTo":"87fwseo9f4.fsf@fox.patthoyts.tk","subject":"Re: [PATCH 2/3] git-gui: spelling fixes in russian translation","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2011-01-27T12:58:05Z","receivedAt":"2011-01-27T12:58:05Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On Thu, Jan 27, 2011 at 12:47, Pat Thoyts\n wrote:\n>>What's with git-gui-i18n/mob branch being out-of-date? Actually,\n>>it seems to be abandoned, because it does have quite a bit of\n>>changes in it which are not in git-gui/master: spanish, bulgarian,\n>>portugese, romanian, chinese, italian, japan and greek:\n>\n> The git-gui/git-gui-i18n.git repository is a fork that was created to do\n> the initial internationalization of git-gui I believe. It predates my\n> involvement with this project so I could be wrong.\n\nWell, still does not answer the question: why are these spanish, bulgarian,\netc translations not in git-gui/master?\n\n> We don't provide a mob branch but you could create your own fork on\n> repo.or.cz if you intend to do much development and then post merge\n> requests to this group and myself.\n\nNo need. I'll provide a link to pull from next time.\n\n> I think I'd prefer to see forks than use a mob branch. Or receive\n> patches or course.\n\nWith abundance of free Git hosting I too think it is a solution preferable\nto almost everyone (that's why I suggested about a branch to pull from\nin some earlier message).\n"}]}