From 06ef2ffc2e26a28133b9b226335bcd75ae752610 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Fri, 19 Jun 2009 15:01:16 -0500 Subject: [PATCH] * byobu-config: improve the verbage of some of the menus, per review with the Canonical Design Team Signed-off-by: Dustin Kirkland --- byobu-config | 8 ++-- debian/changelog | 6 ++- po/byobu.pot | 101 ++++++++++++++++++++---------------------- po/es.po | 101 ++++++++++++++++++++---------------------- po/fr.po | 101 ++++++++++++++++++++---------------------- po/ru.po | 112 +++++++++++++++++++++++++---------------------- 6 files changed, 209 insertions(+), 220 deletions(-) diff --git a/byobu-config b/byobu-config index d24a5c75..146a26f1 100755 --- a/byobu-config +++ b/byobu-config @@ -72,14 +72,14 @@ def terminal_size(): ### decide on *some* terminal size def menu(screen, size, isInstalled): if isInstalled: - installtext=_("Remove screen by default at login") + installtext=_("Do not launch Byobu by default at login") else: - installtext=_("Install screen by default at login") + installtext=_("Launch Byobu by default at login") li = Listbox(height = 8, width = 60, returnExit = 1) li.append(_("Help"), 1) - li.append(_("Change screen profile"), 2) + li.append(_("Change Byobu's colors"), 2) li.append(_("Toggle status notifications"), 3) li.append(_("Change keybinding set"), 4) li.append(_("Change escape sequence"), 5) @@ -473,7 +473,7 @@ def main(): size = terminal_size() screen = SnackScreen() screen.drawRootText(1,0,_(' Byobu Configuration Menu')) - screen.pushHelpLine(_('/ between elements | Validates')) + screen.pushHelpLine(_('/ between elements | selects | exits')) config = SafeConfigParser() diff --git a/debian/changelog b/debian/changelog index 44bef828..7eae3b83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,11 +2,15 @@ byobu (2.13) unreleased; urgency=low [ Dustin Kirkland ] * bin/updates_available: direct which out to devnull + * screen-launcher-install: no need to check for executability of + screen-launcher + * byobu-config: improve the verbage of some of the menus, per + review with the Canonical Design Team [ Ciemon Dunville ] * byobu.1: reflect the keybinding toggle change to Ctrl-a-! - -- Dustin Kirkland Fri, 19 Jun 2009 08:59:19 -0500 + -- Dustin Kirkland Fri, 19 Jun 2009 14:59:28 -0500 byobu (2.12-0ubuntu1) karmic; urgency=low diff --git a/po/byobu.pot b/po/byobu.pot index 76adfed9..b2dc23e0 100644 --- a/po/byobu.pot +++ b/po/byobu.pot @@ -3,13 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: byobu-config:306 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-16 18:04-0500\n" +"POT-Creation-Date: 2009-06-19 15:01-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,136 +16,130 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: byobu-config:71 -msgid "Remove screen by default at login" -msgstr "" - -#: byobu-config:73 -msgid "Install screen by default at login" +#: byobu-config:75 +msgid "Do not launch Byobu by default at login" msgstr "" #: byobu-config:77 -msgid "Help" -msgstr "" - -#: byobu-config:78 -msgid "Change screen profile" -msgstr "" - -#: byobu-config:79 -msgid "Toggle status notifications" -msgstr "" - -#: byobu-config:80 -msgid "Change keybinding set" +msgid "Launch Byobu by default at login" msgstr "" #: byobu-config:81 -msgid "Change escape sequence" +msgid "Help" msgstr "" #: byobu-config:82 -msgid "Create new window(s)" +msgid "Change Byobu's colors" msgstr "" #: byobu-config:83 -msgid "Manage default windows" +msgid "Toggle status notifications" +msgstr "" + +#: byobu-config:84 +msgid "Change keybinding set" msgstr "" #: byobu-config:85 -msgid "Exit" +msgid "Change escape sequence" msgstr "" -#: byobu-config:87 byobu-config:472 +#: byobu-config:86 +msgid "Create new window(s)" +msgstr "" + +#: byobu-config:87 +msgid "Manage default windows" +msgstr "" + +#: byobu-config:91 byobu-config:475 msgid " Byobu Configuration Menu" msgstr "" -#: byobu-config:98 +#: byobu-config:102 msgid "Okay" msgstr "" -#: byobu-config:98 byobu-config:134 byobu-config:150 -#: byobu-config:185 byobu-config:313 byobu-config:355 -#: byobu-config:433 +#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189 +#: byobu-config:321 byobu-config:363 byobu-config:436 msgid "Cancel" msgstr "" -#: byobu-config:116 byobu-config:143 byobu-config:157 -#: byobu-config:326 byobu-config:380 byobu-config:388 -#: byobu-config:461 +#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334 +#: byobu-config:388 byobu-config:396 byobu-config:464 msgid "Menu" msgstr "" -#: byobu-config:117 +#: byobu-config:122 msgid "Byobu Help" msgstr "" -#: byobu-config:134 byobu-config:150 byobu-config:185 -#: byobu-config:313 byobu-config:355 byobu-config:433 +#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321 +#: byobu-config:363 byobu-config:436 msgid "Apply" msgstr "" -#: byobu-config:136 +#: byobu-config:138 msgid "Which profile would you like to use?" msgstr "" -#: byobu-config:142 byobu-config:156 byobu-config:325 -#: byobu-config:387 byobu-config:459 +#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395 +#: byobu-config:462 msgid "Message" msgstr "" -#: byobu-config:151 +#: byobu-config:155 msgid "Which set of keybindings would you like to use?" msgstr "" -#: byobu-config:165 +#: byobu-config:169 msgid "Title: " msgstr "" -#: byobu-config:167 +#: byobu-config:171 msgid "Command: " msgstr "" -#: byobu-config:169 +#: byobu-config:173 msgid "Presets: " msgstr "" -#: byobu-config:183 +#: byobu-config:187 msgid "Add to default windows" msgstr "" -#: byobu-config:187 +#: byobu-config:191 msgid "Create new window(s):" msgstr "" -#: byobu-config:314 +#: byobu-config:322 msgid "Toggle status notifications:" msgstr "" -#: byobu-config:347 +#: byobu-config:355 msgid "Windows:" msgstr "" -#: byobu-config:357 +#: byobu-config:365 msgid "Select window(s) to create by default:" msgstr "" -#: byobu-config:377 +#: byobu-config:385 msgid "Screen will be launched automatically next time you login." msgstr "" -#: byobu-config:385 +#: byobu-config:393 msgid "Screen will not be used next time you login." msgstr "" -#: byobu-config:432 +#: byobu-config:435 msgid "Escape key: ctrl-" msgstr "" -#: byobu-config:435 +#: byobu-config:438 msgid "Change escape sequence:" msgstr "" -#: byobu-config:473 -msgid "/ between elements | Validates" +#: byobu-config:476 +msgid "/ between elements | selects | exits" msgstr "" diff --git a/po/es.po b/po/es.po index 08369c6f..688e5b74 100644 --- a/po/es.po +++ b/po/es.po @@ -3,13 +3,12 @@ # This file is distributed under the same license as the Byobu package. # Nicolas Valcarcel , 2008. # -#: byobu-config:306 #, fuzzy msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-16 18:04-0500\n" +"POT-Creation-Date: 2009-06-19 15:01-0500\n" "PO-Revision-Date: 2008-12-22 01:01-0500\n" "Last-Translator: Nicolas Valcarcel \n" "Language-Team: LANGUAGE \n" @@ -17,138 +16,132 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: byobu-config:71 -msgid "Remove screen by default at login" -msgstr "" - -#: byobu-config:73 -msgid "Install screen by default at login" +#: byobu-config:75 +msgid "Do not launch Byobu by default at login" msgstr "" #: byobu-config:77 -msgid "Help" -msgstr "" - -#: byobu-config:78 -msgid "Change screen profile" -msgstr "" - -#: byobu-config:79 -msgid "Toggle status notifications" -msgstr "" - -#: byobu-config:80 -msgid "Change keybinding set" +msgid "Launch Byobu by default at login" msgstr "" #: byobu-config:81 -msgid "Change escape sequence" +msgid "Help" msgstr "" #: byobu-config:82 -msgid "Create new window(s)" +msgid "Change Byobu's colors" msgstr "" #: byobu-config:83 -msgid "Manage default windows" +msgid "Toggle status notifications" +msgstr "" + +#: byobu-config:84 +msgid "Change keybinding set" msgstr "" #: byobu-config:85 -msgid "Exit" +msgid "Change escape sequence" msgstr "" -#: byobu-config:87 byobu-config:472 +#: byobu-config:86 +msgid "Create new window(s)" +msgstr "" + +#: byobu-config:87 +msgid "Manage default windows" +msgstr "" + +#: byobu-config:91 byobu-config:475 msgid " Byobu Configuration Menu" msgstr "" -#: byobu-config:98 +#: byobu-config:102 msgid "Okay" msgstr "" -#: byobu-config:98 byobu-config:134 byobu-config:150 -#: byobu-config:185 byobu-config:313 byobu-config:355 -#: byobu-config:433 +#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189 +#: byobu-config:321 byobu-config:363 byobu-config:436 msgid "Cancel" msgstr "" -#: byobu-config:116 byobu-config:143 byobu-config:157 -#: byobu-config:326 byobu-config:380 byobu-config:388 -#: byobu-config:461 +#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334 +#: byobu-config:388 byobu-config:396 byobu-config:464 msgid "Menu" msgstr "" -#: byobu-config:117 +#: byobu-config:122 msgid "Byobu Help" msgstr "" -#: byobu-config:134 byobu-config:150 byobu-config:185 -#: byobu-config:313 byobu-config:355 byobu-config:433 +#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321 +#: byobu-config:363 byobu-config:436 msgid "Apply" msgstr "" -#: byobu-config:136 +#: byobu-config:138 msgid "Which profile would you like to use?" msgstr "" -#: byobu-config:142 byobu-config:156 byobu-config:325 -#: byobu-config:387 byobu-config:459 +#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395 +#: byobu-config:462 msgid "Message" msgstr "" -#: byobu-config:151 +#: byobu-config:155 msgid "Which set of keybindings would you like to use?" msgstr "" -#: byobu-config:165 +#: byobu-config:169 msgid "Title: " msgstr "" -#: byobu-config:167 +#: byobu-config:171 msgid "Command: " msgstr "" -#: byobu-config:169 +#: byobu-config:173 msgid "Presets: " msgstr "" -#: byobu-config:183 +#: byobu-config:187 msgid "Add to default windows" msgstr "" -#: byobu-config:187 +#: byobu-config:191 msgid "Create new window(s):" msgstr "" -#: byobu-config:314 +#: byobu-config:322 msgid "Toggle status notifications:" msgstr "" -#: byobu-config:347 +#: byobu-config:355 msgid "Windows:" msgstr "" -#: byobu-config:357 +#: byobu-config:365 msgid "Select window(s) to create by default:" msgstr "" -#: byobu-config:377 +#: byobu-config:385 msgid "Screen will be launched automatically next time you login." msgstr "" -#: byobu-config:385 +#: byobu-config:393 msgid "Screen will not be used next time you login." msgstr "" -#: byobu-config:432 +#: byobu-config:435 msgid "Escape key: ctrl-" msgstr "" -#: byobu-config:435 +#: byobu-config:438 msgid "Change escape sequence:" msgstr "" -#: byobu-config:473 -msgid "/ between elements | Validates" +#: byobu-config:476 +msgid "/ between elements | selects | exits" msgstr "" #~ msgid "Error:" diff --git a/po/fr.po b/po/fr.po index 1054eb75..f43f907f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,13 +3,12 @@ # This file is distributed under the same license as the Byobu package. # Nicolas Barcet , 2008. # -#: byobu-config:306 #, fuzzy msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-16 18:04-0500\n" +"POT-Creation-Date: 2009-06-19 15:01-0500\n" "PO-Revision-Date: 2008-12-17 23:42+0100\n" "Last-Translator: Nicolas Barcet \n" "Language-Team: LANGUAGE \n" @@ -17,138 +16,132 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: byobu-config:71 -msgid "Remove screen by default at login" -msgstr "" - -#: byobu-config:73 -msgid "Install screen by default at login" +#: byobu-config:75 +msgid "Do not launch Byobu by default at login" msgstr "" #: byobu-config:77 -msgid "Help" -msgstr "" - -#: byobu-config:78 -msgid "Change screen profile" -msgstr "" - -#: byobu-config:79 -msgid "Toggle status notifications" -msgstr "" - -#: byobu-config:80 -msgid "Change keybinding set" +msgid "Launch Byobu by default at login" msgstr "" #: byobu-config:81 -msgid "Change escape sequence" +msgid "Help" msgstr "" #: byobu-config:82 -msgid "Create new window(s)" +msgid "Change Byobu's colors" msgstr "" #: byobu-config:83 -msgid "Manage default windows" +msgid "Toggle status notifications" +msgstr "" + +#: byobu-config:84 +msgid "Change keybinding set" msgstr "" #: byobu-config:85 -msgid "Exit" +msgid "Change escape sequence" msgstr "" -#: byobu-config:87 byobu-config:472 +#: byobu-config:86 +msgid "Create new window(s)" +msgstr "" + +#: byobu-config:87 +msgid "Manage default windows" +msgstr "" + +#: byobu-config:91 byobu-config:475 msgid " Byobu Configuration Menu" msgstr "" -#: byobu-config:98 +#: byobu-config:102 msgid "Okay" msgstr "" -#: byobu-config:98 byobu-config:134 byobu-config:150 -#: byobu-config:185 byobu-config:313 byobu-config:355 -#: byobu-config:433 +#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189 +#: byobu-config:321 byobu-config:363 byobu-config:436 msgid "Cancel" msgstr "" -#: byobu-config:116 byobu-config:143 byobu-config:157 -#: byobu-config:326 byobu-config:380 byobu-config:388 -#: byobu-config:461 +#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334 +#: byobu-config:388 byobu-config:396 byobu-config:464 msgid "Menu" msgstr "" -#: byobu-config:117 +#: byobu-config:122 msgid "Byobu Help" msgstr "" -#: byobu-config:134 byobu-config:150 byobu-config:185 -#: byobu-config:313 byobu-config:355 byobu-config:433 +#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321 +#: byobu-config:363 byobu-config:436 msgid "Apply" msgstr "" -#: byobu-config:136 +#: byobu-config:138 msgid "Which profile would you like to use?" msgstr "" -#: byobu-config:142 byobu-config:156 byobu-config:325 -#: byobu-config:387 byobu-config:459 +#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395 +#: byobu-config:462 msgid "Message" msgstr "" -#: byobu-config:151 +#: byobu-config:155 msgid "Which set of keybindings would you like to use?" msgstr "" -#: byobu-config:165 +#: byobu-config:169 msgid "Title: " msgstr "" -#: byobu-config:167 +#: byobu-config:171 msgid "Command: " msgstr "" -#: byobu-config:169 +#: byobu-config:173 msgid "Presets: " msgstr "" -#: byobu-config:183 +#: byobu-config:187 msgid "Add to default windows" msgstr "" -#: byobu-config:187 +#: byobu-config:191 msgid "Create new window(s):" msgstr "" -#: byobu-config:314 +#: byobu-config:322 msgid "Toggle status notifications:" msgstr "" -#: byobu-config:347 +#: byobu-config:355 msgid "Windows:" msgstr "" -#: byobu-config:357 +#: byobu-config:365 msgid "Select window(s) to create by default:" msgstr "" -#: byobu-config:377 +#: byobu-config:385 msgid "Screen will be launched automatically next time you login." msgstr "" -#: byobu-config:385 +#: byobu-config:393 msgid "Screen will not be used next time you login." msgstr "" -#: byobu-config:432 +#: byobu-config:435 msgid "Escape key: ctrl-" msgstr "" -#: byobu-config:435 +#: byobu-config:438 msgid "Change escape sequence:" msgstr "" -#: byobu-config:473 -msgid "/ between elements | Validates" +#: byobu-config:476 +msgid "/ between elements | selects | exits" msgstr "" #~ msgid "Error:" diff --git a/po/ru.po b/po/ru.po index b2bfac70..1ce8bde75 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,13 +2,12 @@ # translation of byobu.po to # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -#: byobu-config:306 # byobu , 2009. msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-16 18:04-0500\n" +"POT-Creation-Date: 2009-06-19 15:01-0500\n" "PO-Revision-Date: 2009-05-14 16:31+0300\n" "Last-Translator: byobu \n" "Language-Team: \n" @@ -17,137 +16,144 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: byobu-config:71 -msgid "Remove screen by default at login" -msgstr "Убрать screen из загрузки по умолчанию" - -#: byobu-config:73 -msgid "Install screen by default at login" +#: byobu-config:75 +#, fuzzy +msgid "Do not launch Byobu by default at login" msgstr "Установить screen загружаться по умолчанию" #: byobu-config:77 +#, fuzzy +msgid "Launch Byobu by default at login" +msgstr "Установить screen загружаться по умолчанию" + +#: byobu-config:81 msgid "Help" msgstr "Помощь" -#: byobu-config:78 -msgid "Change screen profile" -msgstr "Изменить профайл screen" +#: byobu-config:82 +msgid "Change Byobu's colors" +msgstr "" -#: byobu-config:79 +#: byobu-config:83 msgid "Toggle status notifications" msgstr "Переключатель состояния уведомлений" -#: byobu-config:80 +#: byobu-config:84 msgid "Change keybinding set" msgstr "Изменить привязки клавиш" -#: byobu-config:81 +#: byobu-config:85 msgid "Change escape sequence" msgstr "Изменение Escape-последовательности" -#: byobu-config:82 +#: byobu-config:86 msgid "Create new window(s)" msgstr "Создать новое окно" -#: byobu-config:83 +#: byobu-config:87 msgid "Manage default windows" msgstr "Управление окном по умолчанию" -#: byobu-config:85 -msgid "Exit" -msgstr "Выход" - -#: byobu-config:87 byobu-config:472 +#: byobu-config:91 byobu-config:475 msgid " Byobu Configuration Menu" msgstr "Конфигурационное меню Byobu" -#: byobu-config:98 +#: byobu-config:102 msgid "Okay" msgstr "Ok" -#: byobu-config:98 byobu-config:134 byobu-config:150 -#: byobu-config:185 byobu-config:313 byobu-config:355 -#: byobu-config:433 +#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189 +#: byobu-config:321 byobu-config:363 byobu-config:436 msgid "Cancel" msgstr "Отмена" -#: byobu-config:116 byobu-config:143 byobu-config:157 -#: byobu-config:326 byobu-config:380 byobu-config:388 -#: byobu-config:461 +#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334 +#: byobu-config:388 byobu-config:396 byobu-config:464 msgid "Menu" msgstr "Меню" -#: byobu-config:117 +#: byobu-config:122 msgid "Byobu Help" msgstr "Помощь Byobu" -#: byobu-config:134 byobu-config:150 byobu-config:185 -#: byobu-config:313 byobu-config:355 byobu-config:433 +#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321 +#: byobu-config:363 byobu-config:436 msgid "Apply" msgstr "Применить" -#: byobu-config:136 +#: byobu-config:138 msgid "Which profile would you like to use?" msgstr "Какой профайл вы желаете использовать?" -#: byobu-config:142 byobu-config:156 byobu-config:325 -#: byobu-config:387 byobu-config:459 +#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395 +#: byobu-config:462 msgid "Message" msgstr "Сообщение" -#: byobu-config:151 +#: byobu-config:155 msgid "Which set of keybindings would you like to use?" msgstr "Какой набор привязок к клавишам хотели бы Вы использовать?" -#: byobu-config:165 +#: byobu-config:169 msgid "Title: " msgstr "Заголовок:" -#: byobu-config:167 +#: byobu-config:171 msgid "Command: " msgstr "Команда:" -#: byobu-config:169 +#: byobu-config:173 msgid "Presets: " msgstr "Задает:" -#: byobu-config:183 +#: byobu-config:187 msgid "Add to default windows" msgstr "Добавьте к окнам значения по умолчанию" -#: byobu-config:187 +#: byobu-config:191 msgid "Create new window(s):" msgstr "создать новое окно(а)" -#: byobu-config:314 +#: byobu-config:322 msgid "Toggle status notifications:" msgstr "Переключатель состояния уведомлений:" -#: byobu-config:347 +#: byobu-config:355 msgid "Windows:" msgstr "Окно:" -#: byobu-config:357 +#: byobu-config:365 msgid "Select window(s) to create by default:" msgstr "Выберите окно(на), чтобы создать по умолчанию:" -#: byobu-config:377 -msgid "Screen will be launched automatically next time you login." -msgstr "Screen будет запущен автоматически следующий раз, когда Вы залогинитесь." - #: byobu-config:385 -msgid "Screen will not be used next time you login." -msgstr "Screen не будет запущен автоматически следующий раз, когда Вы залогинитесь." +msgid "Screen will be launched automatically next time you login." +msgstr "" +"Screen будет запущен автоматически следующий раз, когда Вы залогинитесь." -#: byobu-config:432 +#: byobu-config:393 +msgid "Screen will not be used next time you login." +msgstr "" +"Screen не будет запущен автоматически следующий раз, когда Вы залогинитесь." + +#: byobu-config:435 msgid "Escape key: ctrl-" msgstr "" -#: byobu-config:435 +#: byobu-config:438 msgid "Change escape sequence:" msgstr "Изменить Escape-последовательность" -#: byobu-config:473 -msgid "/ between elements | Validates" +#: byobu-config:476 +#, fuzzy +msgid "/ between elements | selects | exits" msgstr "/ между элементами | Приминение" +#~ msgid "Remove screen by default at login" +#~ msgstr "Убрать screen из загрузки по умолчанию" + +#~ msgid "Change screen profile" +#~ msgstr "Изменить профайл screen" + +#~ msgid "Exit" +#~ msgstr "Выход"