spookje has proposed merging lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot into lp:ubuntu-terminal-app.
Requested reviews: Ubuntu Terminal Developers (ubuntu-terminal-dev) Related bugs: Bug #1417487 in Ubuntu Terminal App: "Long press copy/paste conflicts with long press scroll" https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1417487 For more details, see: https://code.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot/+merge/330877 -- Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot into lp:ubuntu-terminal-app.
=== modified file 'po/ast.po' --- po/ast.po 2017-04-14 05:44:59 +0000 +++ po/ast.po 2017-09-16 02:26:52 +0000 @@ -7,27 +7,60 @@ msgstr "" "Project-Id-Version: ubuntu-terminal-app\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +<<<<<<< TREE "POT-Creation-Date: 2014-10-07 04:16-0700\n" "PO-Revision-Date: 2014-10-12 16:26+0000\n" "Last-Translator: Xuacu Saturio <xuacu...@gmail.com>\n" +======= +"POT-Creation-Date: 2016-02-07 19:27+0100\n" +"PO-Revision-Date: 2016-12-16 01:50+0000\n" +"Last-Translator: enolp <en...@softastur.org>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Asturian <a...@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n" "X-Generator: Launchpad (build 18352)\n" +======= +"X-Launchpad-Export-Date: 2016-12-17 05:38+0000\n" +"X-Generator: Launchpad (build 18298)\n" + +#: ../src/app/qml/AlternateActionPopover.qml:13 +msgid "Select" +msgstr "Esbillar" + +#: ../src/app/qml/AlternateActionPopover.qml:17 +msgid "Copy" +msgstr "Copiar" + +#: ../src/app/qml/AlternateActionPopover.qml:21 +msgid "Paste" +msgstr "Apegar" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/AuthenticationDialog.qml:25 msgid "Authentication required" msgstr "Ríquese l'autenticación" #: ../src/app/qml/AuthenticationDialog.qml:27 +<<<<<<< TREE msgid "Enter password:" msgstr "Introduz la contraseña:" +======= +msgid "Enter passcode or passphrase:" +msgstr "Introduz el códigu o fras de pasu:" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/AuthenticationDialog.qml:40 +<<<<<<< TREE msgid "password" msgstr "contraseña" +======= +msgid "passcode or passphrase" +msgstr "códigu o fras de pasu" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/NotifyDialog.qml:25 msgid "Ok" @@ -128,6 +161,7 @@ msgid "Settings" msgstr "Axustes" +<<<<<<< TREE #: ../src/app/qml/ubuntu-terminal-app.qml:57 msgid "Hide all key panels" msgstr "" @@ -146,6 +180,73 @@ #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320 +======= +#: ../src/app/qml/SettingsPage.qml:57 +msgid "Show Keyboard Bar" +msgstr "Amosar barra de tecláu" + +#: ../src/app/qml/SettingsPage.qml:73 +msgid "Show Keyboard Button" +msgstr "Amosar botón del tecláu" + +#: ../src/app/qml/SettingsPage.qml:96 +msgid "Font Size:" +msgstr "Tamañu de fonte:" + +#: ../src/app/qml/TabsPage.qml:7 +msgid "Tabs" +msgstr "Llingüetes" + +#: ../src/app/qml/TabsPage.qml:13 +msgid "New tab" +msgstr "Llingüeta nueva" + +#: ../src/app/qml/TerminalPage.qml:170 +msgid "Selection Mode" +msgstr "Mou d'esbilla" + +#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Green on black" +msgstr "Verde sobro prietu" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "White on black" +msgstr "Blancu sobro prietu" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on white" +msgstr "Prietu sobro blancu" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on random light" +msgstr "Prietu sobro lluz balera" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Linux" +msgstr "Linux" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Cool retro term" +msgstr "Cool retro term" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Dark pastels / Ubuntu (old)" +msgstr "Pasteles escuros / Ubuntu (vieyu)" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on light yellow" +msgstr "Prietu sobro mariellu claro" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Ubuntu" +msgstr "Ubuntu" + +#: ../src/plugin/konsole/ColorScheme.cpp:276 +#: ../src/plugin/konsole/ColorScheme.cpp:291 +#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277 +#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292 +>>>>>>> MERGE-SOURCE msgid "Un-named Color Scheme" msgstr "Esquema de color ensin nome" === modified file 'po/de.po' --- po/de.po 2017-04-14 05:44:59 +0000 +++ po/de.po 2017-09-16 02:26:52 +0000 @@ -7,15 +7,38 @@ msgstr "" "Project-Id-Version: ubuntu-terminal-app\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +<<<<<<< TREE "POT-Creation-Date: 2014-10-07 04:16-0700\n" "PO-Revision-Date: 2015-05-02 13:34+0000\n" "Last-Translator: Tobias Bannert <tobann...@gmail.com>\n" +======= +"POT-Creation-Date: 2016-02-07 19:27+0100\n" +"PO-Revision-Date: 2016-12-24 15:47+0000\n" +"Last-Translator: Tobias Bannert <tobann...@gmail.com>\n" +>>>>>>> MERGE-SOURCE "Language-Team: German <d...@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n" "X-Generator: Launchpad (build 18352)\n" +======= +"X-Launchpad-Export-Date: 2016-12-25 05:22+0000\n" +"X-Generator: Launchpad (build 18298)\n" + +#: ../src/app/qml/AlternateActionPopover.qml:13 +msgid "Select" +msgstr "Auswählen" + +#: ../src/app/qml/AlternateActionPopover.qml:17 +msgid "Copy" +msgstr "Kopieren" + +#: ../src/app/qml/AlternateActionPopover.qml:21 +msgid "Paste" +msgstr "Einfügen" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/AuthenticationDialog.qml:25 msgid "Authentication required" @@ -42,6 +65,7 @@ msgid "Authentication failed" msgstr "Legitimierung fehlgeschlagen" +<<<<<<< TREE #: ../src/app/qml/ColorDialog.qml:25 msgid "Pick a color" msgstr "Wählen Sie eine Farbe" @@ -89,6 +113,72 @@ #: ../src/app/qml/Configs.qml:280 msgid "Jitter" msgstr "Flimmern" +======= +#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129 +msgid "Color Scheme" +msgstr "Farbschema" + +#: ../src/app/qml/KeyboardBar.qml:174 +msgid "Change Keyboard" +msgstr "Tastatur ändern" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18 +msgid "Control Keys" +msgstr "Steuertasten" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21 +msgid "Function Keys" +msgstr "Funktionstasten" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24 +msgid "Scroll Keys" +msgstr "Rolltasten" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27 +msgid "Command Keys" +msgstr "Befehlstasten" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35 +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61 +msgid "CTRL" +msgstr "STRG" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38 +msgid "FNS" +msgstr "FNS" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41 +msgid "SCR" +msgstr "SCR" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44 +msgid "CMD" +msgstr "CMD" + +#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64 +msgid "ALT" +msgstr "ALT" + +#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67 +msgid "SHIFT" +msgstr "SHIFT" + +#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80 +msgid "ESC" +msgstr "ESC" +>>>>>>> MERGE-SOURCE #. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase! #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100 @@ -128,6 +218,7 @@ msgid "Settings" msgstr "Einstellungen" +<<<<<<< TREE #: ../src/app/qml/ubuntu-terminal-app.qml:57 msgid "Hide all key panels" msgstr "Alle Tastaturbereiche ausblenden" @@ -146,6 +237,73 @@ #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320 +======= +#: ../src/app/qml/SettingsPage.qml:57 +msgid "Show Keyboard Bar" +msgstr "Bildschirmtastatur anzeigen" + +#: ../src/app/qml/SettingsPage.qml:73 +msgid "Show Keyboard Button" +msgstr "Knopf für Tastatur anzeigen" + +#: ../src/app/qml/SettingsPage.qml:96 +msgid "Font Size:" +msgstr "Schriftgröße:" + +#: ../src/app/qml/TabsPage.qml:7 +msgid "Tabs" +msgstr "Reiter" + +#: ../src/app/qml/TabsPage.qml:13 +msgid "New tab" +msgstr "Neuer Reiter" + +#: ../src/app/qml/TerminalPage.qml:170 +msgid "Selection Mode" +msgstr "Auswahlmodus" + +#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Green on black" +msgstr "Grün auf schwarz" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "White on black" +msgstr "Weiß auf schwarz" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on white" +msgstr "Schwarz auf weiß" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on random light" +msgstr "Schwarz auf wahlloser heller Farbe" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Linux" +msgstr "Linux" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Cool retro term" +msgstr "Kühles Retrothema" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Dark pastels / Ubuntu (old)" +msgstr "Dunkle Pastelltöne / Ubuntu (alt)" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on light yellow" +msgstr "Schwarz auf hellem Gelb" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Ubuntu" +msgstr "Ubuntu" + +#: ../src/plugin/konsole/ColorScheme.cpp:276 +#: ../src/plugin/konsole/ColorScheme.cpp:291 +#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277 +#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292 +>>>>>>> MERGE-SOURCE msgid "Un-named Color Scheme" msgstr "Unbenanntes Farbschema" === modified file 'po/fi.po' --- po/fi.po 2017-04-14 05:44:59 +0000 +++ po/fi.po 2017-09-16 02:26:52 +0000 @@ -7,27 +7,60 @@ msgstr "" "Project-Id-Version: ubuntu-terminal-app\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +<<<<<<< TREE "POT-Creation-Date: 2014-10-07 04:16-0700\n" "PO-Revision-Date: 2014-12-16 19:11+0000\n" "Last-Translator: Timo Jyrinki <Unknown>\n" +======= +"POT-Creation-Date: 2016-02-07 19:27+0100\n" +"PO-Revision-Date: 2016-11-23 07:45+0000\n" +"Last-Translator: Jiri Grönroos <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Finnish <f...@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n" "X-Generator: Launchpad (build 18352)\n" +======= +"X-Launchpad-Export-Date: 2016-11-25 06:49+0000\n" +"X-Generator: Launchpad (build 18282)\n" + +#: ../src/app/qml/AlternateActionPopover.qml:13 +msgid "Select" +msgstr "Valitse" + +#: ../src/app/qml/AlternateActionPopover.qml:17 +msgid "Copy" +msgstr "Kopioi" + +#: ../src/app/qml/AlternateActionPopover.qml:21 +msgid "Paste" +msgstr "Liitä" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/AuthenticationDialog.qml:25 msgid "Authentication required" msgstr "Tunnistautuminen vaaditaan" #: ../src/app/qml/AuthenticationDialog.qml:27 +<<<<<<< TREE msgid "Enter password:" msgstr "Anna salasana:" +======= +msgid "Enter passcode or passphrase:" +msgstr "Anna suojakoodi tai tunnuslause:" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/AuthenticationDialog.qml:40 +<<<<<<< TREE msgid "password" msgstr "salasana" +======= +msgid "passcode or passphrase" +msgstr "suojakoodi tai tunnuslause" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/NotifyDialog.qml:25 msgid "Ok" @@ -42,6 +75,7 @@ msgid "Authentication failed" msgstr "Tunnistautuminen epäonnistui" +<<<<<<< TREE #: ../src/app/qml/ColorDialog.qml:25 msgid "Pick a color" msgstr "Valitse väri" @@ -89,6 +123,72 @@ #: ../src/app/qml/Configs.qml:280 msgid "Jitter" msgstr "Värinä" +======= +#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129 +msgid "Color Scheme" +msgstr "Väriteema" + +#: ../src/app/qml/KeyboardBar.qml:174 +msgid "Change Keyboard" +msgstr "Vaihda näppäimistöä" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18 +msgid "Control Keys" +msgstr "" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21 +msgid "Function Keys" +msgstr "" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24 +msgid "Scroll Keys" +msgstr "" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27 +msgid "Command Keys" +msgstr "" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35 +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61 +msgid "CTRL" +msgstr "CTRL" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38 +msgid "FNS" +msgstr "" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41 +msgid "SCR" +msgstr "" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44 +msgid "CMD" +msgstr "" + +#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64 +msgid "ALT" +msgstr "ALT" + +#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67 +msgid "SHIFT" +msgstr "SHIFT" + +#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80 +msgid "ESC" +msgstr "ESC" +>>>>>>> MERGE-SOURCE #. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase! #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100 @@ -120,14 +220,31 @@ msgid "END" msgstr "END" +<<<<<<< TREE #: ubuntu-terminal-app.desktop.in.in.h:1 msgid "Terminal" msgstr "Pääte" +======= +#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:98 +msgid "TAB" +msgstr "TAB" + +#. TRANSLATORS: This is the name of the Enter key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:101 +msgid "ENTER" +msgstr "ENTER" + +#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:41 +msgid "Layouts" +msgstr "Asettelut" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/SettingsPage.qml:26 msgid "Settings" msgstr "Asetukset" +<<<<<<< TREE #: ../src/app/qml/ubuntu-terminal-app.qml:57 msgid "Hide all key panels" msgstr "Piilota kaikki näppäinpaneelit" @@ -146,6 +263,73 @@ #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320 +======= +#: ../src/app/qml/SettingsPage.qml:57 +msgid "Show Keyboard Bar" +msgstr "Näytä näppäimistöpalkki" + +#: ../src/app/qml/SettingsPage.qml:73 +msgid "Show Keyboard Button" +msgstr "Näytä näppäimistöpainike" + +#: ../src/app/qml/SettingsPage.qml:96 +msgid "Font Size:" +msgstr "Fontin koko:" + +#: ../src/app/qml/TabsPage.qml:7 +msgid "Tabs" +msgstr "Välilehdet" + +#: ../src/app/qml/TabsPage.qml:13 +msgid "New tab" +msgstr "Uusi välilehti" + +#: ../src/app/qml/TerminalPage.qml:170 +msgid "Selection Mode" +msgstr "Valintatila" + +#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Green on black" +msgstr "Vihreä mustalla" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "White on black" +msgstr "Valkoinen mustalla" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on white" +msgstr "Musta valkoisella" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on random light" +msgstr "Musta satunnaisella vaalealla" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Linux" +msgstr "Linux" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Cool retro term" +msgstr "Hieno retropääte" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Dark pastels / Ubuntu (old)" +msgstr "" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on light yellow" +msgstr "Musta keltaisella" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Ubuntu" +msgstr "Ubuntu" + +#: ../src/plugin/konsole/ColorScheme.cpp:276 +#: ../src/plugin/konsole/ColorScheme.cpp:291 +#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277 +#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292 +>>>>>>> MERGE-SOURCE msgid "Un-named Color Scheme" msgstr "Nimetön väriteema" === modified file 'po/fr.po' --- po/fr.po 2017-07-15 05:44:16 +0000 +++ po/fr.po 2017-09-16 02:26:52 +0000 @@ -7,15 +7,26 @@ msgstr "" "Project-Id-Version: ubuntu-terminal-app\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +<<<<<<< TREE "POT-Creation-Date: 2017-01-17 21:46+0100\n" "PO-Revision-Date: 2017-07-14 13:34+0000\n" "Last-Translator: Anne017 <anneonyme...@openmailbox.org>\n" +======= +"POT-Creation-Date: 2016-02-07 19:27+0100\n" +"PO-Revision-Date: 2016-11-27 13:09+0000\n" +"Last-Translator: Alberto <albe...@canv.ch>\n" +>>>>>>> MERGE-SOURCE "Language-Team: French <f...@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2017-07-15 05:44+0000\n" "X-Generator: Launchpad (build 18419)\n" +======= +"X-Launchpad-Export-Date: 2016-11-28 05:48+0000\n" +"X-Generator: Launchpad (build 18282)\n" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/AlternateActionPopover.qml:68 msgid "Select" @@ -355,6 +366,7 @@ #: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:49 msgid "Higlight all matches" +<<<<<<< TREE msgstr "Mettre en surbrillance toutes les correspondances" #: ../src/plugin/qmltermwidget/lib/Vt102Emulation.cpp:982 @@ -367,6 +379,11 @@ "sont manquantes." #: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:406 +======= +msgstr "Mettre en surbrillance les correspondances" + +#: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:405 +>>>>>>> MERGE-SOURCE msgid "Color Scheme Error" msgstr "Erreur de thème de couleurs" === modified file 'po/hr.po' --- po/hr.po 2017-04-14 05:44:59 +0000 +++ po/hr.po 2017-09-16 02:26:52 +0000 @@ -7,27 +7,60 @@ msgstr "" "Project-Id-Version: ubuntu-terminal-app\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +<<<<<<< TREE "POT-Creation-Date: 2014-10-07 04:16-0700\n" "PO-Revision-Date: 2015-03-26 15:18+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +======= +"POT-Creation-Date: 2016-02-07 19:27+0100\n" +"PO-Revision-Date: 2016-12-19 11:05+0000\n" +"Last-Translator: Kristijan Žic <kristijan....@gmail.com>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Croatian <h...@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n" "X-Generator: Launchpad (build 18352)\n" +======= +"X-Launchpad-Export-Date: 2016-12-20 05:11+0000\n" +"X-Generator: Launchpad (build 18298)\n" + +#: ../src/app/qml/AlternateActionPopover.qml:13 +msgid "Select" +msgstr "Odaberi" + +#: ../src/app/qml/AlternateActionPopover.qml:17 +msgid "Copy" +msgstr "Kopiraj" + +#: ../src/app/qml/AlternateActionPopover.qml:21 +msgid "Paste" +msgstr "Umetni" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/AuthenticationDialog.qml:25 msgid "Authentication required" msgstr "Potrebna je ovjera" #: ../src/app/qml/AuthenticationDialog.qml:27 +<<<<<<< TREE msgid "Enter password:" msgstr "Upišite lozinku:" +======= +msgid "Enter passcode or passphrase:" +msgstr "Unesite zaporku ili šifru" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/AuthenticationDialog.qml:40 +<<<<<<< TREE msgid "password" msgstr "lozinka" +======= +msgid "passcode or passphrase" +msgstr "zaporka ili šifra" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/NotifyDialog.qml:25 msgid "Ok" @@ -42,6 +75,7 @@ msgid "Authentication failed" msgstr "Neuspješna autentifikacija" +<<<<<<< TREE #: ../src/app/qml/ColorDialog.qml:25 msgid "Pick a color" msgstr "" @@ -89,16 +123,89 @@ #: ../src/app/qml/Configs.qml:280 msgid "Jitter" msgstr "" +======= +#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129 +msgid "Color Scheme" +msgstr "Paleta boja" + +#: ../src/app/qml/KeyboardBar.qml:174 +msgid "Change Keyboard" +msgstr "Promijeni tipkovnicu" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18 +msgid "Control Keys" +msgstr "Kontrolne tipke" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21 +msgid "Function Keys" +msgstr "Funkcijske tipke" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24 +msgid "Scroll Keys" +msgstr "Tipke pomicanja" + +#. TRANSLATORS: This a keyboard layout name +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27 +msgid "Command Keys" +msgstr "Komandne tipke" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35 +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61 +msgid "CTRL" +msgstr "CTRL" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38 +msgid "FNS" +msgstr "FNS" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41 +msgid "SCR" +msgstr "SCR" + +#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44 +msgid "CMD" +msgstr "CMD" + +#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64 +msgid "ALT" +msgstr "ALT" + +#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67 +msgid "SHIFT" +msgstr "SHIFT" + +#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80 +msgid "ESC" +msgstr "ESC" +>>>>>>> MERGE-SOURCE #. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase! #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100 msgid "PG_UP" msgstr "PG_UP" +<<<<<<< TREE #. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase! #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:115 msgid "TAB" msgstr "TAB" +======= +#. TRANSLATORS: This is the name of the Page Down key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:86 +msgid "PG_DN" +msgstr "PG_DN" +>>>>>>> MERGE-SOURCE #. TRANSLATORS: This is the name of the Delete key. All letters should be uppercase! #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:106 @@ -108,26 +215,49 @@ #. TRANSLATORS: This is the name of the Home key. All letters should be uppercase! #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:109 msgid "HOME" +<<<<<<< TREE msgstr "HOME" #. TRANSLATORS: This is the name of the Page Down key. All letters should be uppercase! #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:103 msgid "PG_DN" msgstr "PG_DN" +======= +msgstr "HOME" +>>>>>>> MERGE-SOURCE #. TRANSLATORS: This is the name of the End key. All letters should be uppercase! #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:112 msgid "END" +<<<<<<< TREE msgstr "END" #: ubuntu-terminal-app.desktop.in.in.h:1 msgid "Terminal" msgstr "Terminal" +======= +msgstr "END" + +#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:98 +msgid "TAB" +msgstr "TAB" + +#. TRANSLATORS: This is the name of the Enter key. All letters should be uppercase! +#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:101 +msgid "ENTER" +msgstr "ENTER" + +#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:41 +msgid "Layouts" +msgstr "Rasporedi" +>>>>>>> MERGE-SOURCE #: ../src/app/qml/SettingsPage.qml:26 msgid "Settings" msgstr "Postavke" +<<<<<<< TREE #: ../src/app/qml/ubuntu-terminal-app.qml:57 msgid "Hide all key panels" msgstr "" @@ -146,6 +276,73 @@ #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320 +======= +#: ../src/app/qml/SettingsPage.qml:57 +msgid "Show Keyboard Bar" +msgstr "Prikaži traku tipkovnice" + +#: ../src/app/qml/SettingsPage.qml:73 +msgid "Show Keyboard Button" +msgstr "Prikaži tipku tipkovnice" + +#: ../src/app/qml/SettingsPage.qml:96 +msgid "Font Size:" +msgstr "Veličina fonta:" + +#: ../src/app/qml/TabsPage.qml:7 +msgid "Tabs" +msgstr "Kartice" + +#: ../src/app/qml/TabsPage.qml:13 +msgid "New tab" +msgstr "Nova kartica" + +#: ../src/app/qml/TerminalPage.qml:170 +msgid "Selection Mode" +msgstr "Način odabira" + +#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Green on black" +msgstr "Zeleno na crnom" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "White on black" +msgstr "Bijelo na crnom" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on white" +msgstr "Crno na bijelom" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on random light" +msgstr "Crno na nasumičnom svjetlu" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Linux" +msgstr "Linux" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Cool retro term" +msgstr "Fora retro term" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Dark pastels / Ubuntu (old)" +msgstr "Tamne pastelne / Ubuntu (stari)" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Black on light yellow" +msgstr "Crno na svjetlo-žutom" + +#: ../src/app/qml/ubuntu-terminal-app.qml:128 +msgid "Ubuntu" +msgstr "Ubuntu" + +#: ../src/plugin/konsole/ColorScheme.cpp:276 +#: ../src/plugin/konsole/ColorScheme.cpp:291 +#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277 +#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292 +>>>>>>> MERGE-SOURCE msgid "Un-named Color Scheme" msgstr "Bezimena paleta boja"
-- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp
