Author: minton Date: 2015-08-30 20:09:50 +0200 (Sun, 30 Aug 2015) New Revision: 92422 Modified: trunk/yast/ru/po/online-update.ru.po Log: Merged online-update.pot for ru Modified: trunk/yast/ru/po/online-update.ru.po =================================================================== --- trunk/yast/ru/po/online-update.ru.po 2015-08-30 18:09:48 UTC (rev 92421) +++ trunk/yast/ru/po/online-update.ru.po 2015-08-30 18:09:50 UTC (rev 92422) @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: online-update.ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-07-30 00:09+0400\n" "Last-Translator: Alexander Melentev <minton@opensuse.org>\n" "Language-Team: Russian <opensuse-translation-ru@opensuse.org>\n" @@ -244,9 +244,13 @@ #. popup message #: src/modules/OnlineUpdate.rb:51 +#, fuzzy +#| msgid "" +#| "Packages for package management were updated.\n" +#| "Finishing and restarting now." msgid "" "Packages for package management were updated.\n" -"Finishing and restarting now." +"Finishing and restarting YaST now." msgstr "" "Пакеты для управления пакетами обновлены.\n" "Выполняются завершающие операции и перезапуск." @@ -322,63 +326,48 @@ msgstr "OK" #. Progress log. Leave the space at the end, some other text may follow -#: src/modules/OnlineUpdateCallbacks.rb:233 +#: src/modules/OnlineUpdateCallbacks.rb:230 msgid "Downloading delta RPM %1 " msgstr "Загрузка разностного RPM %1" #. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:239 +#: src/modules/OnlineUpdateCallbacks.rb:236 msgid "Delta RPM Download Progress" msgstr "Выполнение загрузки разностного RPM" #. progress log item (previous action failed(%1 is reason) -#: src/modules/OnlineUpdateCallbacks.rb:265 +#: src/modules/OnlineUpdateCallbacks.rb:262 msgid "Failed to download delta RPM: %1" msgstr "Не удалось загрузить разностный RPM: %1" #. Progress log item (%1 is name of delta RPM). #. Leave the space at the end, some other text may follow. -#: src/modules/OnlineUpdateCallbacks.rb:280 +#: src/modules/OnlineUpdateCallbacks.rb:277 msgid "Applying delta RPM: %1 " msgstr "Применение разностного RPM: %1" #. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:287 +#: src/modules/OnlineUpdateCallbacks.rb:284 msgid "Delta RPM Application Progress" msgstr "Выполнение применения разностного RPM" #. progress log item (previous action failed(%1 is reason) -#: src/modules/OnlineUpdateCallbacks.rb:316 +#: src/modules/OnlineUpdateCallbacks.rb:313 msgid "Failed to apply delta RPM: %1" msgstr "Не удалось применить разностный RPM: %1" -#. Progress log; lave the space at the end, some other text may follow. -#: src/modules/OnlineUpdateCallbacks.rb:331 -msgid "Downloading patch RPM %1 " -msgstr "Загрузка RPM исправления %1" - #. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:337 -msgid "Patch RPM Download Progress" -msgstr "Выполнение загрузки RPM исправления" - -#. progress log item (previous action failed(%1 is reason) -#: src/modules/OnlineUpdateCallbacks.rb:364 -msgid "Failed to download patch RPM: %1" -msgstr "Не удалось загрузить RPM исправления %1" - -#. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:405 +#: src/modules/OnlineUpdateCallbacks.rb:354 msgid "Script Execution Progress" msgstr "Выполнение сценария" #. log entry, %1 is name of the patch which contains the script -#: src/modules/OnlineUpdateCallbacks.rb:411 +#: src/modules/OnlineUpdateCallbacks.rb:360 msgid "Starting script %1" msgstr "Запуск сценария %1" #. label, %1 is patch name with version and architecture -#: src/modules/OnlineUpdateCallbacks.rb:481 +#: src/modules/OnlineUpdateCallbacks.rb:430 msgid "" "Patch %1\n" "\n" @@ -387,7 +376,7 @@ "\n" #. error popoup (detailed info follows) -#: src/modules/OnlineUpdateCallbacks.rb:614 +#: src/modules/OnlineUpdateCallbacks.rb:549 msgid "There was an error in the repository initialization." msgstr "Ошибка при инициализации репозитория." @@ -432,8 +421,7 @@ msgid "Try again" msgstr "Попробовать ещё раз" -#: src/modules/OnlineUpdateDialogs.rb:57 -#: src/modules/OnlineUpdateDialogs.rb:318 +#: src/modules/OnlineUpdateDialogs.rb:57 src/modules/OnlineUpdateDialogs.rb:318 msgid "Skip Patch" msgstr "Пропустить исправление" @@ -554,6 +542,15 @@ "\n" "Для получения дополнительной помощи свяжитесь с нами." +#~ msgid "Downloading patch RPM %1 " +#~ msgstr "Загрузка RPM исправления %1" + +#~ msgid "Patch RPM Download Progress" +#~ msgstr "Выполнение загрузки RPM исправления" + +#~ msgid "Failed to download patch RPM: %1" +#~ msgstr "Не удалось загрузить RPM исправления %1" + #~ msgid "" #~ "If you abort the installation now, SuSEconfig will\n" #~ "not be run. The patches have been installed\n"