diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:36:06 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:51:38 -0500 |
| commit | 20b8fcfa33feeade5946bc7f3046705da5d164fe (patch) | |
| tree | 5199d13a9f18aa90ce51244c3c3eb6685d7673ab /po/ru.po | |
| parent | dc94a241c30484611688a8bfb5515577f017529e (diff) | |
| parent | d11ac82062d729be5d63c9c40c5c2bb312a8b8f1 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/config.c
openbox/event.c
openbox/extensions.c
openbox/focus_cycle_indicator.c
openbox/focus_cycle_popup.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c
openbox/stacking.c
openbox/startupnotify.c
Diffstat (limited to 'po/ru.po')
| -rw-r--r-- | po/ru.po | 29 |
1 files changed, 18 insertions, 11 deletions
@@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Openbox 3.4.3\n" +"Project-Id-Version: Openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-01-17 22:13+0100\n" -"PO-Revision-Date: 2007-08-17 22:36+0200\n" +"POT-Creation-Date: 2008-01-25 03:51+0100\n" +"PO-Revision-Date: 2008-01-22 07:56+0100\n" "Last-Translator: Nikita Bukhvostov <dragon.djanic@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" @@ -19,25 +19,25 @@ msgstr "" #: openbox/actions.c:149 #, c-format msgid "Invalid action '%s' requested. No such action exists." -msgstr "" +msgstr "Запрошенное действие '%s' не найдено." #: openbox/actions/execute.c:88 #, c-format msgid "Failed to convert the path '%s' from utf8" msgstr "Не удалось сконвертировать путь '%s' из utf8" -#: openbox/actions/execute.c:97 openbox/actions/execute.c:115 +#: openbox/actions/execute.c:97 openbox/actions/execute.c:116 #, c-format msgid "Failed to execute '%s': %s" msgstr "Не удалось запустить '%s': %s" #: openbox/client.c:1973 openbox/client.c:2005 msgid "Killing..." -msgstr "" +msgstr "Завершение..." #: openbox/client.c:1975 openbox/client.c:2007 msgid "Not Responding" -msgstr "" +msgstr "Не отвечает" #: openbox/client_list_combined_menu.c:90 openbox/client_list_menu.c:93 msgid "Go there..." @@ -252,7 +252,7 @@ msgstr " --restart Перезапустить Openbox\n" #: openbox/openbox.c:495 msgid " --exit Exit Openbox\n" -msgstr "" +msgstr " --exit Выход из Openbox\n" #: openbox/openbox.c:496 msgid "" @@ -289,7 +289,7 @@ msgstr "" "\n" "Пожалуйста, сообщайте об ошибках на %s\n" -#: openbox/openbox.c:604 +#: openbox/openbox.c:602 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Некорректный командный параметр '%s'\n" @@ -309,7 +309,14 @@ msgstr "Не могу получить выбор менеджера окон н msgid "The WM on screen %d is not exiting" msgstr "Менеджер окон на экране %d не завершается" -#: openbox/screen.c:1162 +#: openbox/screen.c:407 +#, c-format +msgid "" +"Openbox is configured for %d desktops, but the current session has %d. " +"Overriding the Openbox configuration." +msgstr "" + +#: openbox/screen.c:1168 #, c-format msgid "desktop %i" msgstr "рабочий стол %i" @@ -329,7 +336,7 @@ msgstr "Не могу сохранить сессию в '%s': %s" msgid "Error while saving the session to '%s': %s" msgstr "Ошибка при сохранении сессии в '%s': %s" -#: openbox/startupnotify.c:237 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s\n" msgstr "Запущен %s\n" |