From 1244ff7f17007b277960479570a8ba982211863a Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 22 Jun 2009 11:28:20 -0500 Subject: [PATCH] * debian/postinst: remove set -x debugging * debian/control: create dummy screen-profiles and screen-profiles-extras packages, to handle seamless upgrades from screen-profiles -> byobu Signed-off-by: Dustin Kirkland --- debian/changelog | 4 +- debian/control | 18 +++++--- po/byobu.pot | 110 +++++++++++++++++++++++------------------------ po/es.po | 110 +++++++++++++++++++++++------------------------ po/fr.po | 110 +++++++++++++++++++++++------------------------ po/ru.po | 104 +++++++++++++++++++++++--------------------- 6 files changed, 236 insertions(+), 220 deletions(-) diff --git a/debian/changelog b/debian/changelog index 742f3f9e..7c09a504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ byobu (2.14) unreleased; urgency=low * debian/postinst: remove set -x debugging + * debian/control: create dummy screen-profiles and screen-profiles-extras + packages, to handle seamless upgrades from screen-profiles -> byobu - -- Dustin Kirkland Sun, 21 Jun 2009 21:10:26 -0500 + -- Dustin Kirkland Mon, 22 Jun 2009 11:28:14 -0500 byobu (2.13-0ubuntu1) karmic; urgency=low diff --git a/debian/control b/debian/control index 9f607bf8..853d2867 100644 --- a/debian/control +++ b/debian/control @@ -13,9 +13,6 @@ Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, screen, gettext-base, Recommends: update-notifier-common, lsb-release Suggests: byobu-extras, vim Enhances: screen -Provides: screen-profiles -Replaces: screen-profiles -Conflicts: screen-profiles Description: a set of useful profiles and a profile-switcher for GNU screen byobu includes a set of profiles for the GNU screen window manager. These profiles are quite useful on server machines which are not running @@ -31,10 +28,19 @@ Description: a set of useful profiles and a profile-switcher for GNU screen Package: byobu-extras Architecture: all Depends: ${misc:Depends}, byobu -Provides: screen-profiles-extras -Replaces: screen-profiles-extras -Conflicts: screen-profiles-extras Description: additional colored profiles for the byobu package The byobu contains a basic set of light and dark screen profiles. The byobu-extras package provides additional profiles of various different light and dark colors. + +Package: screen-profiles +Architecture: all +Depends: ${misc:Depends}, byobu +Description: this package has been renamed 'byobu' + The screen-profiles package has been renamed 'byobu'. + +Package: screen-profiles-extras +Architecture: all +Depends: ${misc:Depends}, byobu-extras +Description: this package has been renamed 'byobu-extras' + The screen-profiles-extras package has been renamed 'byobu-extras'. diff --git a/po/byobu.pot b/po/byobu.pot index b2dc23e0..5d29ee4e 100644 --- a/po/byobu.pot +++ b/po/byobu.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-19 15:01-0500\n" +"POT-Creation-Date: 2009-06-22 11:22-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,130 +16,130 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: byobu-config:75 -msgid "Do not launch Byobu by default at login" -msgstr "" - -#: byobu-config:77 -msgid "Launch Byobu by default at login" -msgstr "" - #: byobu-config:81 -msgid "Help" -msgstr "" - -#: byobu-config:82 -msgid "Change Byobu's colors" +msgid "Byobu currently launches at login (toggle)" msgstr "" #: byobu-config:83 -msgid "Toggle status notifications" -msgstr "" - -#: byobu-config:84 -msgid "Change keybinding set" -msgstr "" - -#: byobu-config:85 -msgid "Change escape sequence" -msgstr "" - -#: byobu-config:86 -msgid "Create new window(s)" +msgid "Byobu currently does not launch at login (toggle)" msgstr "" #: byobu-config:87 +msgid "Help" +msgstr "" + +#: byobu-config:88 +msgid "Change Byobu's colors" +msgstr "" + +#: byobu-config:89 +msgid "Toggle status notifications" +msgstr "" + +#: byobu-config:90 +msgid "Change keybinding set" +msgstr "" + +#: byobu-config:91 +msgid "Change escape sequence" +msgstr "" + +#: byobu-config:92 +msgid "Create new window(s)" +msgstr "" + +#: byobu-config:93 msgid "Manage default windows" msgstr "" -#: byobu-config:91 byobu-config:475 +#: byobu-config:97 byobu-config:491 msgid " Byobu Configuration Menu" msgstr "" -#: byobu-config:102 +#: byobu-config:108 msgid "Okay" msgstr "" -#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189 -#: byobu-config:321 byobu-config:363 byobu-config:436 +#: byobu-config:108 byobu-config:142 byobu-config:161 byobu-config:197 +#: byobu-config:335 byobu-config:378 byobu-config:451 msgid "Cancel" msgstr "" -#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334 -#: byobu-config:388 byobu-config:396 byobu-config:464 +#: byobu-config:127 byobu-config:152 byobu-config:169 byobu-config:349 +#: byobu-config:403 byobu-config:411 byobu-config:480 msgid "Menu" msgstr "" -#: byobu-config:122 +#: byobu-config:128 msgid "Byobu Help" msgstr "" -#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321 -#: byobu-config:363 byobu-config:436 +#: byobu-config:142 byobu-config:161 byobu-config:197 byobu-config:335 +#: byobu-config:378 byobu-config:451 msgid "Apply" msgstr "" -#: byobu-config:138 +#: byobu-config:144 msgid "Which profile would you like to use?" msgstr "" -#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395 -#: byobu-config:462 +#: byobu-config:151 byobu-config:168 byobu-config:348 byobu-config:410 +#: byobu-config:478 msgid "Message" msgstr "" -#: byobu-config:155 +#: byobu-config:162 msgid "Which set of keybindings would you like to use?" msgstr "" -#: byobu-config:169 +#: byobu-config:177 msgid "Title: " msgstr "" -#: byobu-config:171 +#: byobu-config:179 msgid "Command: " msgstr "" -#: byobu-config:173 +#: byobu-config:181 msgid "Presets: " msgstr "" -#: byobu-config:187 +#: byobu-config:195 msgid "Add to default windows" msgstr "" -#: byobu-config:191 +#: byobu-config:199 msgid "Create new window(s):" msgstr "" -#: byobu-config:322 +#: byobu-config:336 msgid "Toggle status notifications:" msgstr "" -#: byobu-config:355 +#: byobu-config:370 msgid "Windows:" msgstr "" -#: byobu-config:365 +#: byobu-config:380 msgid "Select window(s) to create by default:" msgstr "" -#: byobu-config:385 -msgid "Screen will be launched automatically next time you login." +#: byobu-config:400 +msgid "Byobu will be launched automatically next time you login." msgstr "" -#: byobu-config:393 -msgid "Screen will not be used next time you login." +#: byobu-config:408 +msgid "Byobu will not be used next time you login." msgstr "" -#: byobu-config:435 +#: byobu-config:450 msgid "Escape key: ctrl-" msgstr "" -#: byobu-config:438 +#: byobu-config:453 msgid "Change escape sequence:" msgstr "" -#: byobu-config:476 +#: byobu-config:492 msgid "/ between elements | selects | exits" msgstr "" diff --git a/po/es.po b/po/es.po index 688e5b74..1f6f476b 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-19 15:01-0500\n" +"POT-Creation-Date: 2009-06-22 11:22-0500\n" "PO-Revision-Date: 2008-12-22 01:01-0500\n" "Last-Translator: Nicolas Valcarcel \n" "Language-Team: LANGUAGE \n" @@ -16,131 +16,131 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: byobu-config:75 -msgid "Do not launch Byobu by default at login" -msgstr "" - -#: byobu-config:77 -msgid "Launch Byobu by default at login" -msgstr "" - #: byobu-config:81 -msgid "Help" -msgstr "" - -#: byobu-config:82 -msgid "Change Byobu's colors" +msgid "Byobu currently launches at login (toggle)" msgstr "" #: byobu-config:83 -msgid "Toggle status notifications" -msgstr "" - -#: byobu-config:84 -msgid "Change keybinding set" -msgstr "" - -#: byobu-config:85 -msgid "Change escape sequence" -msgstr "" - -#: byobu-config:86 -msgid "Create new window(s)" +msgid "Byobu currently does not launch at login (toggle)" msgstr "" #: byobu-config:87 +msgid "Help" +msgstr "" + +#: byobu-config:88 +msgid "Change Byobu's colors" +msgstr "" + +#: byobu-config:89 +msgid "Toggle status notifications" +msgstr "" + +#: byobu-config:90 +msgid "Change keybinding set" +msgstr "" + +#: byobu-config:91 +msgid "Change escape sequence" +msgstr "" + +#: byobu-config:92 +msgid "Create new window(s)" +msgstr "" + +#: byobu-config:93 msgid "Manage default windows" msgstr "" -#: byobu-config:91 byobu-config:475 +#: byobu-config:97 byobu-config:491 msgid " Byobu Configuration Menu" msgstr "" -#: byobu-config:102 +#: byobu-config:108 msgid "Okay" msgstr "" -#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189 -#: byobu-config:321 byobu-config:363 byobu-config:436 +#: byobu-config:108 byobu-config:142 byobu-config:161 byobu-config:197 +#: byobu-config:335 byobu-config:378 byobu-config:451 msgid "Cancel" msgstr "" -#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334 -#: byobu-config:388 byobu-config:396 byobu-config:464 +#: byobu-config:127 byobu-config:152 byobu-config:169 byobu-config:349 +#: byobu-config:403 byobu-config:411 byobu-config:480 msgid "Menu" msgstr "" -#: byobu-config:122 +#: byobu-config:128 msgid "Byobu Help" msgstr "" -#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321 -#: byobu-config:363 byobu-config:436 +#: byobu-config:142 byobu-config:161 byobu-config:197 byobu-config:335 +#: byobu-config:378 byobu-config:451 msgid "Apply" msgstr "" -#: byobu-config:138 +#: byobu-config:144 msgid "Which profile would you like to use?" msgstr "" -#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395 -#: byobu-config:462 +#: byobu-config:151 byobu-config:168 byobu-config:348 byobu-config:410 +#: byobu-config:478 msgid "Message" msgstr "" -#: byobu-config:155 +#: byobu-config:162 msgid "Which set of keybindings would you like to use?" msgstr "" -#: byobu-config:169 +#: byobu-config:177 msgid "Title: " msgstr "" -#: byobu-config:171 +#: byobu-config:179 msgid "Command: " msgstr "" -#: byobu-config:173 +#: byobu-config:181 msgid "Presets: " msgstr "" -#: byobu-config:187 +#: byobu-config:195 msgid "Add to default windows" msgstr "" -#: byobu-config:191 +#: byobu-config:199 msgid "Create new window(s):" msgstr "" -#: byobu-config:322 +#: byobu-config:336 msgid "Toggle status notifications:" msgstr "" -#: byobu-config:355 +#: byobu-config:370 msgid "Windows:" msgstr "" -#: byobu-config:365 +#: byobu-config:380 msgid "Select window(s) to create by default:" msgstr "" -#: byobu-config:385 -msgid "Screen will be launched automatically next time you login." +#: byobu-config:400 +msgid "Byobu will be launched automatically next time you login." msgstr "" -#: byobu-config:393 -msgid "Screen will not be used next time you login." +#: byobu-config:408 +msgid "Byobu will not be used next time you login." msgstr "" -#: byobu-config:435 +#: byobu-config:450 msgid "Escape key: ctrl-" msgstr "" -#: byobu-config:438 +#: byobu-config:453 msgid "Change escape sequence:" msgstr "" -#: byobu-config:476 +#: byobu-config:492 msgid "/ between elements | selects | exits" msgstr "" diff --git a/po/fr.po b/po/fr.po index f43f907f..20b5dcf5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-19 15:01-0500\n" +"POT-Creation-Date: 2009-06-22 11:22-0500\n" "PO-Revision-Date: 2008-12-17 23:42+0100\n" "Last-Translator: Nicolas Barcet \n" "Language-Team: LANGUAGE \n" @@ -16,131 +16,131 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: byobu-config:75 -msgid "Do not launch Byobu by default at login" -msgstr "" - -#: byobu-config:77 -msgid "Launch Byobu by default at login" -msgstr "" - #: byobu-config:81 -msgid "Help" -msgstr "" - -#: byobu-config:82 -msgid "Change Byobu's colors" +msgid "Byobu currently launches at login (toggle)" msgstr "" #: byobu-config:83 -msgid "Toggle status notifications" -msgstr "" - -#: byobu-config:84 -msgid "Change keybinding set" -msgstr "" - -#: byobu-config:85 -msgid "Change escape sequence" -msgstr "" - -#: byobu-config:86 -msgid "Create new window(s)" +msgid "Byobu currently does not launch at login (toggle)" msgstr "" #: byobu-config:87 +msgid "Help" +msgstr "" + +#: byobu-config:88 +msgid "Change Byobu's colors" +msgstr "" + +#: byobu-config:89 +msgid "Toggle status notifications" +msgstr "" + +#: byobu-config:90 +msgid "Change keybinding set" +msgstr "" + +#: byobu-config:91 +msgid "Change escape sequence" +msgstr "" + +#: byobu-config:92 +msgid "Create new window(s)" +msgstr "" + +#: byobu-config:93 msgid "Manage default windows" msgstr "" -#: byobu-config:91 byobu-config:475 +#: byobu-config:97 byobu-config:491 msgid " Byobu Configuration Menu" msgstr "" -#: byobu-config:102 +#: byobu-config:108 msgid "Okay" msgstr "" -#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189 -#: byobu-config:321 byobu-config:363 byobu-config:436 +#: byobu-config:108 byobu-config:142 byobu-config:161 byobu-config:197 +#: byobu-config:335 byobu-config:378 byobu-config:451 msgid "Cancel" msgstr "" -#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334 -#: byobu-config:388 byobu-config:396 byobu-config:464 +#: byobu-config:127 byobu-config:152 byobu-config:169 byobu-config:349 +#: byobu-config:403 byobu-config:411 byobu-config:480 msgid "Menu" msgstr "" -#: byobu-config:122 +#: byobu-config:128 msgid "Byobu Help" msgstr "" -#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321 -#: byobu-config:363 byobu-config:436 +#: byobu-config:142 byobu-config:161 byobu-config:197 byobu-config:335 +#: byobu-config:378 byobu-config:451 msgid "Apply" msgstr "" -#: byobu-config:138 +#: byobu-config:144 msgid "Which profile would you like to use?" msgstr "" -#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395 -#: byobu-config:462 +#: byobu-config:151 byobu-config:168 byobu-config:348 byobu-config:410 +#: byobu-config:478 msgid "Message" msgstr "" -#: byobu-config:155 +#: byobu-config:162 msgid "Which set of keybindings would you like to use?" msgstr "" -#: byobu-config:169 +#: byobu-config:177 msgid "Title: " msgstr "" -#: byobu-config:171 +#: byobu-config:179 msgid "Command: " msgstr "" -#: byobu-config:173 +#: byobu-config:181 msgid "Presets: " msgstr "" -#: byobu-config:187 +#: byobu-config:195 msgid "Add to default windows" msgstr "" -#: byobu-config:191 +#: byobu-config:199 msgid "Create new window(s):" msgstr "" -#: byobu-config:322 +#: byobu-config:336 msgid "Toggle status notifications:" msgstr "" -#: byobu-config:355 +#: byobu-config:370 msgid "Windows:" msgstr "" -#: byobu-config:365 +#: byobu-config:380 msgid "Select window(s) to create by default:" msgstr "" -#: byobu-config:385 -msgid "Screen will be launched automatically next time you login." +#: byobu-config:400 +msgid "Byobu will be launched automatically next time you login." msgstr "" -#: byobu-config:393 -msgid "Screen will not be used next time you login." +#: byobu-config:408 +msgid "Byobu will not be used next time you login." msgstr "" -#: byobu-config:435 +#: byobu-config:450 msgid "Escape key: ctrl-" msgstr "" -#: byobu-config:438 +#: byobu-config:453 msgid "Change escape sequence:" msgstr "" -#: byobu-config:476 +#: byobu-config:492 msgid "/ between elements | selects | exits" msgstr "" diff --git a/po/ru.po b/po/ru.po index 1ce8bde75..c5253c8c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-19 15:01-0500\n" +"POT-Creation-Date: 2009-06-22 11:22-0500\n" "PO-Revision-Date: 2009-05-14 16:31+0300\n" "Last-Translator: byobu \n" "Language-Team: \n" @@ -16,139 +16,147 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: 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:82 -msgid "Change Byobu's colors" +msgid "Byobu currently launches at login (toggle)" msgstr "" #: byobu-config:83 +msgid "Byobu currently does not launch at login (toggle)" +msgstr "" + +#: byobu-config:87 +msgid "Help" +msgstr "Помощь" + +#: byobu-config:88 +msgid "Change Byobu's colors" +msgstr "" + +#: byobu-config:89 msgid "Toggle status notifications" msgstr "Переключатель состояния уведомлений" -#: byobu-config:84 +#: byobu-config:90 msgid "Change keybinding set" msgstr "Изменить привязки клавиш" -#: byobu-config:85 +#: byobu-config:91 msgid "Change escape sequence" msgstr "Изменение Escape-последовательности" -#: byobu-config:86 +#: byobu-config:92 msgid "Create new window(s)" msgstr "Создать новое окно" -#: byobu-config:87 +#: byobu-config:93 msgid "Manage default windows" msgstr "Управление окном по умолчанию" -#: byobu-config:91 byobu-config:475 +#: byobu-config:97 byobu-config:491 msgid " Byobu Configuration Menu" msgstr "Конфигурационное меню Byobu" -#: byobu-config:102 +#: byobu-config:108 msgid "Okay" msgstr "Ok" -#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189 -#: byobu-config:321 byobu-config:363 byobu-config:436 +#: byobu-config:108 byobu-config:142 byobu-config:161 byobu-config:197 +#: byobu-config:335 byobu-config:378 byobu-config:451 msgid "Cancel" msgstr "Отмена" -#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334 -#: byobu-config:388 byobu-config:396 byobu-config:464 +#: byobu-config:127 byobu-config:152 byobu-config:169 byobu-config:349 +#: byobu-config:403 byobu-config:411 byobu-config:480 msgid "Menu" msgstr "Меню" -#: byobu-config:122 +#: byobu-config:128 msgid "Byobu Help" msgstr "Помощь Byobu" -#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321 -#: byobu-config:363 byobu-config:436 +#: byobu-config:142 byobu-config:161 byobu-config:197 byobu-config:335 +#: byobu-config:378 byobu-config:451 msgid "Apply" msgstr "Применить" -#: byobu-config:138 +#: byobu-config:144 msgid "Which profile would you like to use?" msgstr "Какой профайл вы желаете использовать?" -#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395 -#: byobu-config:462 +#: byobu-config:151 byobu-config:168 byobu-config:348 byobu-config:410 +#: byobu-config:478 msgid "Message" msgstr "Сообщение" -#: byobu-config:155 +#: byobu-config:162 msgid "Which set of keybindings would you like to use?" msgstr "Какой набор привязок к клавишам хотели бы Вы использовать?" -#: byobu-config:169 +#: byobu-config:177 msgid "Title: " msgstr "Заголовок:" -#: byobu-config:171 +#: byobu-config:179 msgid "Command: " msgstr "Команда:" -#: byobu-config:173 +#: byobu-config:181 msgid "Presets: " msgstr "Задает:" -#: byobu-config:187 +#: byobu-config:195 msgid "Add to default windows" msgstr "Добавьте к окнам значения по умолчанию" -#: byobu-config:191 +#: byobu-config:199 msgid "Create new window(s):" msgstr "создать новое окно(а)" -#: byobu-config:322 +#: byobu-config:336 msgid "Toggle status notifications:" msgstr "Переключатель состояния уведомлений:" -#: byobu-config:355 +#: byobu-config:370 msgid "Windows:" msgstr "Окно:" -#: byobu-config:365 +#: byobu-config:380 msgid "Select window(s) to create by default:" msgstr "Выберите окно(на), чтобы создать по умолчанию:" -#: byobu-config:385 -msgid "Screen will be launched automatically next time you login." +#: byobu-config:400 +#, fuzzy +msgid "Byobu will be launched automatically next time you login." msgstr "" "Screen будет запущен автоматически следующий раз, когда Вы залогинитесь." -#: byobu-config:393 -msgid "Screen will not be used next time you login." +#: byobu-config:408 +#, fuzzy +msgid "Byobu will not be used next time you login." msgstr "" "Screen не будет запущен автоматически следующий раз, когда Вы залогинитесь." -#: byobu-config:435 +#: byobu-config:450 msgid "Escape key: ctrl-" msgstr "" -#: byobu-config:438 +#: byobu-config:453 msgid "Change escape sequence:" msgstr "Изменить Escape-последовательность" -#: byobu-config:476 +#: byobu-config:492 #, fuzzy msgid "/ between elements | selects | exits" msgstr "/ между элементами | Приминение" +#, fuzzy +#~ msgid "Do not launch Byobu by default at login" +#~ msgstr "Установить screen загружаться по умолчанию" + +#, fuzzy +#~ msgid "Launch Byobu by default at login" +#~ msgstr "Установить screen загружаться по умолчанию" + #~ msgid "Remove screen by default at login" #~ msgstr "Убрать screen из загрузки по умолчанию"