diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
| commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
| tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /libs/gtkmm2ext/po/ru.po | |
| parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
| parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) | |
fix merge conflicts with master
Diffstat (limited to 'libs/gtkmm2ext/po/ru.po')
| -rw-r--r-- | libs/gtkmm2ext/po/ru.po | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/gtkmm2ext/po/ru.po b/libs/gtkmm2ext/po/ru.po index 6e0c91cb5c..6be73a3b88 100644 --- a/libs/gtkmm2ext/po/ru.po +++ b/libs/gtkmm2ext/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gtkmm2ext\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-03 11:35-0500\n" +"POT-Creation-Date: 2013-08-15 15:09-0400\n" "PO-Revision-Date: 2012-12-31 01:38+0300\n" "Last-Translator: Александр Прокудин <alexandre.prokoudine@gmail.com>\n" "Language-Team: русский <>\n" @@ -78,11 +78,11 @@ msgstr "Alt" msgid "Meta" msgstr "Meta" -#: keyboard.cc:134 keyboard.cc:523 +#: keyboard.cc:139 keyboard.cc:531 msgid "Unknown" msgstr "Неизвестно" -#: keyboard.cc:534 +#: keyboard.cc:542 msgid "key bindings file not found at \"%2\" or contains errors." msgstr "" |