import translations, merge, resolve conflicts

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
This commit is contained in:
Dustin Kirkland 2009-10-11 14:54:16 -05:00
commit 986089e14c
2 changed files with 8 additions and 8 deletions

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-09-15 10:05-0500\n"
"POT-Creation-Date: 2009-10-11 14:34-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: bin/menu:22 byobu-config:129 byobu-config:400 byobu-config:408
#: bin/menu:30 byobu-config:129 byobu-config:400 byobu-config:408
msgid "Menu"
msgstr ""
@ -111,7 +111,7 @@ msgstr ""
msgid "Manage default windows"
msgstr ""
#: byobu-config:99 byobu-config:485
#: byobu-config:99 byobu-config:486
msgid " Byobu Configuration Menu"
msgstr ""
@ -193,6 +193,6 @@ msgstr ""
msgid "Change escape sequence:"
msgstr ""
#: byobu-config:486
#: byobu-config:487
msgid "<Tab>/<Alt-Tab> between elements | <Enter> selects | <Esc> exits"
msgstr ""

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-09-15 10:05-0500\n"
"POT-Creation-Date: 2009-10-11 14:34-0500\n"
"PO-Revision-Date: 2009-07-24 14:46+0000\n"
"Last-Translator: byobu <Unknown>\n"
"Language-Team: \n"
@ -17,7 +17,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-09-23 11:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: bin/menu:22 byobu-config:129 byobu-config:400 byobu-config:408
#: bin/menu:30 byobu-config:129 byobu-config:400 byobu-config:408
msgid "Menu"
msgstr "Меню"
@ -112,7 +112,7 @@ msgstr ""
msgid "Manage default windows"
msgstr "Управление окном по умолчанию"
#: byobu-config:99 byobu-config:485
#: byobu-config:99 byobu-config:486
msgid " Byobu Configuration Menu"
msgstr " Конфигурационное меню Byobu"
@ -194,7 +194,7 @@ msgstr ""
msgid "Change escape sequence:"
msgstr "Изменить Escape-последовательность"
#: byobu-config:486
#: byobu-config:487
msgid "<Tab>/<Alt-Tab> between elements | <Enter> selects | <Esc> exits"
msgstr ""