Ubuntu Terminal App

Merge lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot into lp:ubuntu-terminal-app

  1. reboot
  2. Merge into trunk
Proposed by spookje
Status: Merged
Merge reported by: spookje
Merged at revision: not available
Proposed branch: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Merge into: lp:ubuntu-terminal-app
Diff against target: 941 lines (+657/-0) (has conflicts)
5 files modified
po/ast.po (+101/-0)
po/de.po (+158/-0)
po/fi.po (+184/-0)
po/fr.po (+17/-0)
po/hr.po (+197/-0)
Text conflict in po/ast.po
Text conflict in po/de.po
Text conflict in po/fi.po
Text conflict in po/fr.po
Text conflict in po/hr.po
To merge this branch: bzr merge lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Reviewer Review Type Date Requested Status
Ubuntu Terminal Developers Pending
Review via email: mp+330877@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-terminal-app\n"8"Project-Id-Version: ubuntu-terminal-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10<<<<<<< TREE
10"POT-Creation-Date: 2014-10-07 04:16-0700\n"11"POT-Creation-Date: 2014-10-07 04:16-0700\n"
11"PO-Revision-Date: 2014-10-12 16:26+0000\n"12"PO-Revision-Date: 2014-10-12 16:26+0000\n"
12"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"13"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
14=======
15"POT-Creation-Date: 2016-02-07 19:27+0100\n"
16"PO-Revision-Date: 2016-12-16 01:50+0000\n"
17"Last-Translator: enolp <enolp@softastur.org>\n"
18>>>>>>> MERGE-SOURCE
13"Language-Team: Asturian <ast@li.org>\n"19"Language-Team: Asturian <ast@li.org>\n"
14"MIME-Version: 1.0\n"20"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"21"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"22"Content-Transfer-Encoding: 8bit\n"
23<<<<<<< TREE
17"X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"24"X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"
18"X-Generator: Launchpad (build 18352)\n"25"X-Generator: Launchpad (build 18352)\n"
26=======
27"X-Launchpad-Export-Date: 2016-12-17 05:38+0000\n"
28"X-Generator: Launchpad (build 18298)\n"
29
30#: ../src/app/qml/AlternateActionPopover.qml:13
31msgid "Select"
32msgstr "Esbillar"
33
34#: ../src/app/qml/AlternateActionPopover.qml:17
35msgid "Copy"
36msgstr "Copiar"
37
38#: ../src/app/qml/AlternateActionPopover.qml:21
39msgid "Paste"
40msgstr "Apegar"
41>>>>>>> MERGE-SOURCE
1942
20#: ../src/app/qml/AuthenticationDialog.qml:2543#: ../src/app/qml/AuthenticationDialog.qml:25
21msgid "Authentication required"44msgid "Authentication required"
22msgstr "Ríquese l'autenticación"45msgstr "Ríquese l'autenticación"
2346
24#: ../src/app/qml/AuthenticationDialog.qml:2747#: ../src/app/qml/AuthenticationDialog.qml:27
48<<<<<<< TREE
25msgid "Enter password:"49msgid "Enter password:"
26msgstr "Introduz la contraseña:"50msgstr "Introduz la contraseña:"
51=======
52msgid "Enter passcode or passphrase:"
53msgstr "Introduz el códigu o fras de pasu:"
54>>>>>>> MERGE-SOURCE
2755
28#: ../src/app/qml/AuthenticationDialog.qml:4056#: ../src/app/qml/AuthenticationDialog.qml:40
57<<<<<<< TREE
29msgid "password"58msgid "password"
30msgstr "contraseña"59msgstr "contraseña"
60=======
61msgid "passcode or passphrase"
62msgstr "códigu o fras de pasu"
63>>>>>>> MERGE-SOURCE
3164
32#: ../src/app/qml/NotifyDialog.qml:2565#: ../src/app/qml/NotifyDialog.qml:25
33msgid "Ok"66msgid "Ok"
@@ -128,6 +161,7 @@
128msgid "Settings"161msgid "Settings"
129msgstr "Axustes"162msgstr "Axustes"
130163
164<<<<<<< TREE
131#: ../src/app/qml/ubuntu-terminal-app.qml:57165#: ../src/app/qml/ubuntu-terminal-app.qml:57
132msgid "Hide all key panels"166msgid "Hide all key panels"
133msgstr ""167msgstr ""
@@ -146,6 +180,73 @@
146180
147#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291181#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291
148#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320182#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320
183=======
184#: ../src/app/qml/SettingsPage.qml:57
185msgid "Show Keyboard Bar"
186msgstr "Amosar barra de tecláu"
187
188#: ../src/app/qml/SettingsPage.qml:73
189msgid "Show Keyboard Button"
190msgstr "Amosar botón del tecláu"
191
192#: ../src/app/qml/SettingsPage.qml:96
193msgid "Font Size:"
194msgstr "Tamañu de fonte:"
195
196#: ../src/app/qml/TabsPage.qml:7
197msgid "Tabs"
198msgstr "Llingüetes"
199
200#: ../src/app/qml/TabsPage.qml:13
201msgid "New tab"
202msgstr "Llingüeta nueva"
203
204#: ../src/app/qml/TerminalPage.qml:170
205msgid "Selection Mode"
206msgstr "Mou d'esbilla"
207
208#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
209#: ../src/app/qml/ubuntu-terminal-app.qml:128
210msgid "Green on black"
211msgstr "Verde sobro prietu"
212
213#: ../src/app/qml/ubuntu-terminal-app.qml:128
214msgid "White on black"
215msgstr "Blancu sobro prietu"
216
217#: ../src/app/qml/ubuntu-terminal-app.qml:128
218msgid "Black on white"
219msgstr "Prietu sobro blancu"
220
221#: ../src/app/qml/ubuntu-terminal-app.qml:128
222msgid "Black on random light"
223msgstr "Prietu sobro lluz balera"
224
225#: ../src/app/qml/ubuntu-terminal-app.qml:128
226msgid "Linux"
227msgstr "Linux"
228
229#: ../src/app/qml/ubuntu-terminal-app.qml:128
230msgid "Cool retro term"
231msgstr "Cool retro term"
232
233#: ../src/app/qml/ubuntu-terminal-app.qml:128
234msgid "Dark pastels / Ubuntu (old)"
235msgstr "Pasteles escuros / Ubuntu (vieyu)"
236
237#: ../src/app/qml/ubuntu-terminal-app.qml:128
238msgid "Black on light yellow"
239msgstr "Prietu sobro mariellu claro"
240
241#: ../src/app/qml/ubuntu-terminal-app.qml:128
242msgid "Ubuntu"
243msgstr "Ubuntu"
244
245#: ../src/plugin/konsole/ColorScheme.cpp:276
246#: ../src/plugin/konsole/ColorScheme.cpp:291
247#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
248#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
249>>>>>>> MERGE-SOURCE
149msgid "Un-named Color Scheme"250msgid "Un-named Color Scheme"
150msgstr "Esquema de color ensin nome"251msgstr "Esquema de color ensin nome"
151252
152253
=== 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 @@
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-terminal-app\n"8"Project-Id-Version: ubuntu-terminal-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10<<<<<<< TREE
10"POT-Creation-Date: 2014-10-07 04:16-0700\n"11"POT-Creation-Date: 2014-10-07 04:16-0700\n"
11"PO-Revision-Date: 2015-05-02 13:34+0000\n"12"PO-Revision-Date: 2015-05-02 13:34+0000\n"
12"Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"13"Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"
14=======
15"POT-Creation-Date: 2016-02-07 19:27+0100\n"
16"PO-Revision-Date: 2016-12-24 15:47+0000\n"
17"Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"
18>>>>>>> MERGE-SOURCE
13"Language-Team: German <de@li.org>\n"19"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"20"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"21"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"22"Content-Transfer-Encoding: 8bit\n"
23<<<<<<< TREE
17"X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"24"X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"
18"X-Generator: Launchpad (build 18352)\n"25"X-Generator: Launchpad (build 18352)\n"
26=======
27"X-Launchpad-Export-Date: 2016-12-25 05:22+0000\n"
28"X-Generator: Launchpad (build 18298)\n"
29
30#: ../src/app/qml/AlternateActionPopover.qml:13
31msgid "Select"
32msgstr "Auswählen"
33
34#: ../src/app/qml/AlternateActionPopover.qml:17
35msgid "Copy"
36msgstr "Kopieren"
37
38#: ../src/app/qml/AlternateActionPopover.qml:21
39msgid "Paste"
40msgstr "Einfügen"
41>>>>>>> MERGE-SOURCE
1942
20#: ../src/app/qml/AuthenticationDialog.qml:2543#: ../src/app/qml/AuthenticationDialog.qml:25
21msgid "Authentication required"44msgid "Authentication required"
@@ -42,6 +65,7 @@
42msgid "Authentication failed"65msgid "Authentication failed"
43msgstr "Legitimierung fehlgeschlagen"66msgstr "Legitimierung fehlgeschlagen"
4467
68<<<<<<< TREE
45#: ../src/app/qml/ColorDialog.qml:2569#: ../src/app/qml/ColorDialog.qml:25
46msgid "Pick a color"70msgid "Pick a color"
47msgstr "Wählen Sie eine Farbe"71msgstr "Wählen Sie eine Farbe"
@@ -89,6 +113,72 @@
89#: ../src/app/qml/Configs.qml:280113#: ../src/app/qml/Configs.qml:280
90msgid "Jitter"114msgid "Jitter"
91msgstr "Flimmern"115msgstr "Flimmern"
116=======
117#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129
118msgid "Color Scheme"
119msgstr "Farbschema"
120
121#: ../src/app/qml/KeyboardBar.qml:174
122msgid "Change Keyboard"
123msgstr "Tastatur ändern"
124
125#. TRANSLATORS: This a keyboard layout name
126#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18
127msgid "Control Keys"
128msgstr "Steuertasten"
129
130#. TRANSLATORS: This a keyboard layout name
131#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21
132msgid "Function Keys"
133msgstr "Funktionstasten"
134
135#. TRANSLATORS: This a keyboard layout name
136#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24
137msgid "Scroll Keys"
138msgstr "Rolltasten"
139
140#. TRANSLATORS: This a keyboard layout name
141#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27
142msgid "Command Keys"
143msgstr "Befehlstasten"
144
145#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
146#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase!
147#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35
148#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61
149msgid "CTRL"
150msgstr "STRG"
151
152#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
153#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38
154msgid "FNS"
155msgstr "FNS"
156
157#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
158#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41
159msgid "SCR"
160msgstr "SCR"
161
162#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
163#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44
164msgid "CMD"
165msgstr "CMD"
166
167#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase!
168#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64
169msgid "ALT"
170msgstr "ALT"
171
172#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase!
173#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67
174msgid "SHIFT"
175msgstr "SHIFT"
176
177#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase!
178#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80
179msgid "ESC"
180msgstr "ESC"
181>>>>>>> MERGE-SOURCE
92182
93#. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!183#. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!
94#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100184#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100
@@ -128,6 +218,7 @@
128msgid "Settings"218msgid "Settings"
129msgstr "Einstellungen"219msgstr "Einstellungen"
130220
221<<<<<<< TREE
131#: ../src/app/qml/ubuntu-terminal-app.qml:57222#: ../src/app/qml/ubuntu-terminal-app.qml:57
132msgid "Hide all key panels"223msgid "Hide all key panels"
133msgstr "Alle Tastaturbereiche ausblenden"224msgstr "Alle Tastaturbereiche ausblenden"
@@ -146,6 +237,73 @@
146237
147#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291238#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291
148#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320239#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320
240=======
241#: ../src/app/qml/SettingsPage.qml:57
242msgid "Show Keyboard Bar"
243msgstr "Bildschirmtastatur anzeigen"
244
245#: ../src/app/qml/SettingsPage.qml:73
246msgid "Show Keyboard Button"
247msgstr "Knopf für Tastatur anzeigen"
248
249#: ../src/app/qml/SettingsPage.qml:96
250msgid "Font Size:"
251msgstr "Schriftgröße:"
252
253#: ../src/app/qml/TabsPage.qml:7
254msgid "Tabs"
255msgstr "Reiter"
256
257#: ../src/app/qml/TabsPage.qml:13
258msgid "New tab"
259msgstr "Neuer Reiter"
260
261#: ../src/app/qml/TerminalPage.qml:170
262msgid "Selection Mode"
263msgstr "Auswahlmodus"
264
265#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
266#: ../src/app/qml/ubuntu-terminal-app.qml:128
267msgid "Green on black"
268msgstr "Grün auf schwarz"
269
270#: ../src/app/qml/ubuntu-terminal-app.qml:128
271msgid "White on black"
272msgstr "Weiß auf schwarz"
273
274#: ../src/app/qml/ubuntu-terminal-app.qml:128
275msgid "Black on white"
276msgstr "Schwarz auf weiß"
277
278#: ../src/app/qml/ubuntu-terminal-app.qml:128
279msgid "Black on random light"
280msgstr "Schwarz auf wahlloser heller Farbe"
281
282#: ../src/app/qml/ubuntu-terminal-app.qml:128
283msgid "Linux"
284msgstr "Linux"
285
286#: ../src/app/qml/ubuntu-terminal-app.qml:128
287msgid "Cool retro term"
288msgstr "Kühles Retrothema"
289
290#: ../src/app/qml/ubuntu-terminal-app.qml:128
291msgid "Dark pastels / Ubuntu (old)"
292msgstr "Dunkle Pastelltöne / Ubuntu (alt)"
293
294#: ../src/app/qml/ubuntu-terminal-app.qml:128
295msgid "Black on light yellow"
296msgstr "Schwarz auf hellem Gelb"
297
298#: ../src/app/qml/ubuntu-terminal-app.qml:128
299msgid "Ubuntu"
300msgstr "Ubuntu"
301
302#: ../src/plugin/konsole/ColorScheme.cpp:276
303#: ../src/plugin/konsole/ColorScheme.cpp:291
304#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
305#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
306>>>>>>> MERGE-SOURCE
149msgid "Un-named Color Scheme"307msgid "Un-named Color Scheme"
150msgstr "Unbenanntes Farbschema"308msgstr "Unbenanntes Farbschema"
151309
152310
=== 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 @@
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-terminal-app\n"8"Project-Id-Version: ubuntu-terminal-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10<<<<<<< TREE
10"POT-Creation-Date: 2014-10-07 04:16-0700\n"11"POT-Creation-Date: 2014-10-07 04:16-0700\n"
11"PO-Revision-Date: 2014-12-16 19:11+0000\n"12"PO-Revision-Date: 2014-12-16 19:11+0000\n"
12"Last-Translator: Timo Jyrinki <Unknown>\n"13"Last-Translator: Timo Jyrinki <Unknown>\n"
14=======
15"POT-Creation-Date: 2016-02-07 19:27+0100\n"
16"PO-Revision-Date: 2016-11-23 07:45+0000\n"
17"Last-Translator: Jiri Grönroos <Unknown>\n"
18>>>>>>> MERGE-SOURCE
13"Language-Team: Finnish <fi@li.org>\n"19"Language-Team: Finnish <fi@li.org>\n"
14"MIME-Version: 1.0\n"20"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"21"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"22"Content-Transfer-Encoding: 8bit\n"
23<<<<<<< TREE
17"X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"24"X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"
18"X-Generator: Launchpad (build 18352)\n"25"X-Generator: Launchpad (build 18352)\n"
26=======
27"X-Launchpad-Export-Date: 2016-11-25 06:49+0000\n"
28"X-Generator: Launchpad (build 18282)\n"
29
30#: ../src/app/qml/AlternateActionPopover.qml:13
31msgid "Select"
32msgstr "Valitse"
33
34#: ../src/app/qml/AlternateActionPopover.qml:17
35msgid "Copy"
36msgstr "Kopioi"
37
38#: ../src/app/qml/AlternateActionPopover.qml:21
39msgid "Paste"
40msgstr "Liitä"
41>>>>>>> MERGE-SOURCE
1942
20#: ../src/app/qml/AuthenticationDialog.qml:2543#: ../src/app/qml/AuthenticationDialog.qml:25
21msgid "Authentication required"44msgid "Authentication required"
22msgstr "Tunnistautuminen vaaditaan"45msgstr "Tunnistautuminen vaaditaan"
2346
24#: ../src/app/qml/AuthenticationDialog.qml:2747#: ../src/app/qml/AuthenticationDialog.qml:27
48<<<<<<< TREE
25msgid "Enter password:"49msgid "Enter password:"
26msgstr "Anna salasana:"50msgstr "Anna salasana:"
51=======
52msgid "Enter passcode or passphrase:"
53msgstr "Anna suojakoodi tai tunnuslause:"
54>>>>>>> MERGE-SOURCE
2755
28#: ../src/app/qml/AuthenticationDialog.qml:4056#: ../src/app/qml/AuthenticationDialog.qml:40
57<<<<<<< TREE
29msgid "password"58msgid "password"
30msgstr "salasana"59msgstr "salasana"
60=======
61msgid "passcode or passphrase"
62msgstr "suojakoodi tai tunnuslause"
63>>>>>>> MERGE-SOURCE
3164
32#: ../src/app/qml/NotifyDialog.qml:2565#: ../src/app/qml/NotifyDialog.qml:25
33msgid "Ok"66msgid "Ok"
@@ -42,6 +75,7 @@
42msgid "Authentication failed"75msgid "Authentication failed"
43msgstr "Tunnistautuminen epäonnistui"76msgstr "Tunnistautuminen epäonnistui"
4477
78<<<<<<< TREE
45#: ../src/app/qml/ColorDialog.qml:2579#: ../src/app/qml/ColorDialog.qml:25
46msgid "Pick a color"80msgid "Pick a color"
47msgstr "Valitse väri"81msgstr "Valitse väri"
@@ -89,6 +123,72 @@
89#: ../src/app/qml/Configs.qml:280123#: ../src/app/qml/Configs.qml:280
90msgid "Jitter"124msgid "Jitter"
91msgstr "Värinä"125msgstr "Värinä"
126=======
127#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129
128msgid "Color Scheme"
129msgstr "Väriteema"
130
131#: ../src/app/qml/KeyboardBar.qml:174
132msgid "Change Keyboard"
133msgstr "Vaihda näppäimistöä"
134
135#. TRANSLATORS: This a keyboard layout name
136#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18
137msgid "Control Keys"
138msgstr ""
139
140#. TRANSLATORS: This a keyboard layout name
141#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21
142msgid "Function Keys"
143msgstr ""
144
145#. TRANSLATORS: This a keyboard layout name
146#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24
147msgid "Scroll Keys"
148msgstr ""
149
150#. TRANSLATORS: This a keyboard layout name
151#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27
152msgid "Command Keys"
153msgstr ""
154
155#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
156#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase!
157#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35
158#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61
159msgid "CTRL"
160msgstr "CTRL"
161
162#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
163#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38
164msgid "FNS"
165msgstr ""
166
167#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
168#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41
169msgid "SCR"
170msgstr ""
171
172#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
173#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44
174msgid "CMD"
175msgstr ""
176
177#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase!
178#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64
179msgid "ALT"
180msgstr "ALT"
181
182#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase!
183#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67
184msgid "SHIFT"
185msgstr "SHIFT"
186
187#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase!
188#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80
189msgid "ESC"
190msgstr "ESC"
191>>>>>>> MERGE-SOURCE
92192
93#. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!193#. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!
94#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100194#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100
@@ -120,14 +220,31 @@
120msgid "END"220msgid "END"
121msgstr "END"221msgstr "END"
122222
223<<<<<<< TREE
123#: ubuntu-terminal-app.desktop.in.in.h:1224#: ubuntu-terminal-app.desktop.in.in.h:1
124msgid "Terminal"225msgid "Terminal"
125msgstr "Pääte"226msgstr "Pääte"
227=======
228#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase!
229#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:98
230msgid "TAB"
231msgstr "TAB"
232
233#. TRANSLATORS: This is the name of the Enter key. All letters should be uppercase!
234#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:101
235msgid "ENTER"
236msgstr "ENTER"
237
238#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:41
239msgid "Layouts"
240msgstr "Asettelut"
241>>>>>>> MERGE-SOURCE
126242
127#: ../src/app/qml/SettingsPage.qml:26243#: ../src/app/qml/SettingsPage.qml:26
128msgid "Settings"244msgid "Settings"
129msgstr "Asetukset"245msgstr "Asetukset"
130246
247<<<<<<< TREE
131#: ../src/app/qml/ubuntu-terminal-app.qml:57248#: ../src/app/qml/ubuntu-terminal-app.qml:57
132msgid "Hide all key panels"249msgid "Hide all key panels"
133msgstr "Piilota kaikki näppäinpaneelit"250msgstr "Piilota kaikki näppäinpaneelit"
@@ -146,6 +263,73 @@
146263
147#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291264#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291
148#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320265#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320
266=======
267#: ../src/app/qml/SettingsPage.qml:57
268msgid "Show Keyboard Bar"
269msgstr "Näytä näppäimistöpalkki"
270
271#: ../src/app/qml/SettingsPage.qml:73
272msgid "Show Keyboard Button"
273msgstr "Näytä näppäimistöpainike"
274
275#: ../src/app/qml/SettingsPage.qml:96
276msgid "Font Size:"
277msgstr "Fontin koko:"
278
279#: ../src/app/qml/TabsPage.qml:7
280msgid "Tabs"
281msgstr "Välilehdet"
282
283#: ../src/app/qml/TabsPage.qml:13
284msgid "New tab"
285msgstr "Uusi välilehti"
286
287#: ../src/app/qml/TerminalPage.qml:170
288msgid "Selection Mode"
289msgstr "Valintatila"
290
291#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
292#: ../src/app/qml/ubuntu-terminal-app.qml:128
293msgid "Green on black"
294msgstr "Vihreä mustalla"
295
296#: ../src/app/qml/ubuntu-terminal-app.qml:128
297msgid "White on black"
298msgstr "Valkoinen mustalla"
299
300#: ../src/app/qml/ubuntu-terminal-app.qml:128
301msgid "Black on white"
302msgstr "Musta valkoisella"
303
304#: ../src/app/qml/ubuntu-terminal-app.qml:128
305msgid "Black on random light"
306msgstr "Musta satunnaisella vaalealla"
307
308#: ../src/app/qml/ubuntu-terminal-app.qml:128
309msgid "Linux"
310msgstr "Linux"
311
312#: ../src/app/qml/ubuntu-terminal-app.qml:128
313msgid "Cool retro term"
314msgstr "Hieno retropääte"
315
316#: ../src/app/qml/ubuntu-terminal-app.qml:128
317msgid "Dark pastels / Ubuntu (old)"
318msgstr ""
319
320#: ../src/app/qml/ubuntu-terminal-app.qml:128
321msgid "Black on light yellow"
322msgstr "Musta keltaisella"
323
324#: ../src/app/qml/ubuntu-terminal-app.qml:128
325msgid "Ubuntu"
326msgstr "Ubuntu"
327
328#: ../src/plugin/konsole/ColorScheme.cpp:276
329#: ../src/plugin/konsole/ColorScheme.cpp:291
330#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
331#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
332>>>>>>> MERGE-SOURCE
149msgid "Un-named Color Scheme"333msgid "Un-named Color Scheme"
150msgstr "Nimetön väriteema"334msgstr "Nimetön väriteema"
151335
152336
=== 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 @@
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-terminal-app\n"8"Project-Id-Version: ubuntu-terminal-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10<<<<<<< TREE
10"POT-Creation-Date: 2017-01-17 21:46+0100\n"11"POT-Creation-Date: 2017-01-17 21:46+0100\n"
11"PO-Revision-Date: 2017-07-14 13:34+0000\n"12"PO-Revision-Date: 2017-07-14 13:34+0000\n"
12"Last-Translator: Anne017 <anneonyme017@openmailbox.org>\n"13"Last-Translator: Anne017 <anneonyme017@openmailbox.org>\n"
14=======
15"POT-Creation-Date: 2016-02-07 19:27+0100\n"
16"PO-Revision-Date: 2016-11-27 13:09+0000\n"
17"Last-Translator: Alberto <alberto@canv.ch>\n"
18>>>>>>> MERGE-SOURCE
13"Language-Team: French <fr@li.org>\n"19"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"20"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"21"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"22"Content-Transfer-Encoding: 8bit\n"
23<<<<<<< TREE
17"X-Launchpad-Export-Date: 2017-07-15 05:44+0000\n"24"X-Launchpad-Export-Date: 2017-07-15 05:44+0000\n"
18"X-Generator: Launchpad (build 18419)\n"25"X-Generator: Launchpad (build 18419)\n"
26=======
27"X-Launchpad-Export-Date: 2016-11-28 05:48+0000\n"
28"X-Generator: Launchpad (build 18282)\n"
29>>>>>>> MERGE-SOURCE
1930
20#: ../src/app/qml/AlternateActionPopover.qml:6831#: ../src/app/qml/AlternateActionPopover.qml:68
21msgid "Select"32msgid "Select"
@@ -355,6 +366,7 @@
355366
356#: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:49367#: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:49
357msgid "Higlight all matches"368msgid "Higlight all matches"
369<<<<<<< TREE
358msgstr "Mettre en surbrillance toutes les correspondances"370msgstr "Mettre en surbrillance toutes les correspondances"
359371
360#: ../src/plugin/qmltermwidget/lib/Vt102Emulation.cpp:982372#: ../src/plugin/qmltermwidget/lib/Vt102Emulation.cpp:982
@@ -367,6 +379,11 @@
367"sont manquantes."379"sont manquantes."
368380
369#: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:406381#: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:406
382=======
383msgstr "Mettre en surbrillance les correspondances"
384
385#: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:405
386>>>>>>> MERGE-SOURCE
370msgid "Color Scheme Error"387msgid "Color Scheme Error"
371msgstr "Erreur de thème de couleurs"388msgstr "Erreur de thème de couleurs"
372389
373390
=== 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 @@
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-terminal-app\n"8"Project-Id-Version: ubuntu-terminal-app\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10<<<<<<< TREE
10"POT-Creation-Date: 2014-10-07 04:16-0700\n"11"POT-Creation-Date: 2014-10-07 04:16-0700\n"
11"PO-Revision-Date: 2015-03-26 15:18+0000\n"12"PO-Revision-Date: 2015-03-26 15:18+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14=======
15"POT-Creation-Date: 2016-02-07 19:27+0100\n"
16"PO-Revision-Date: 2016-12-19 11:05+0000\n"
17"Last-Translator: Kristijan Žic  <kristijan.zic@gmail.com>\n"
18>>>>>>> MERGE-SOURCE
13"Language-Team: Croatian <hr@li.org>\n"19"Language-Team: Croatian <hr@li.org>\n"
14"MIME-Version: 1.0\n"20"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"21"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"22"Content-Transfer-Encoding: 8bit\n"
23<<<<<<< TREE
17"X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"24"X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"
18"X-Generator: Launchpad (build 18352)\n"25"X-Generator: Launchpad (build 18352)\n"
26=======
27"X-Launchpad-Export-Date: 2016-12-20 05:11+0000\n"
28"X-Generator: Launchpad (build 18298)\n"
29
30#: ../src/app/qml/AlternateActionPopover.qml:13
31msgid "Select"
32msgstr "Odaberi"
33
34#: ../src/app/qml/AlternateActionPopover.qml:17
35msgid "Copy"
36msgstr "Kopiraj"
37
38#: ../src/app/qml/AlternateActionPopover.qml:21
39msgid "Paste"
40msgstr "Umetni"
41>>>>>>> MERGE-SOURCE
1942
20#: ../src/app/qml/AuthenticationDialog.qml:2543#: ../src/app/qml/AuthenticationDialog.qml:25
21msgid "Authentication required"44msgid "Authentication required"
22msgstr "Potrebna je ovjera"45msgstr "Potrebna je ovjera"
2346
24#: ../src/app/qml/AuthenticationDialog.qml:2747#: ../src/app/qml/AuthenticationDialog.qml:27
48<<<<<<< TREE
25msgid "Enter password:"49msgid "Enter password:"
26msgstr "Upišite lozinku:"50msgstr "Upišite lozinku:"
51=======
52msgid "Enter passcode or passphrase:"
53msgstr "Unesite zaporku ili šifru"
54>>>>>>> MERGE-SOURCE
2755
28#: ../src/app/qml/AuthenticationDialog.qml:4056#: ../src/app/qml/AuthenticationDialog.qml:40
57<<<<<<< TREE
29msgid "password"58msgid "password"
30msgstr "lozinka"59msgstr "lozinka"
60=======
61msgid "passcode or passphrase"
62msgstr "zaporka ili šifra"
63>>>>>>> MERGE-SOURCE
3164
32#: ../src/app/qml/NotifyDialog.qml:2565#: ../src/app/qml/NotifyDialog.qml:25
33msgid "Ok"66msgid "Ok"
@@ -42,6 +75,7 @@
42msgid "Authentication failed"75msgid "Authentication failed"
43msgstr "Neuspješna autentifikacija"76msgstr "Neuspješna autentifikacija"
4477
78<<<<<<< TREE
45#: ../src/app/qml/ColorDialog.qml:2579#: ../src/app/qml/ColorDialog.qml:25
46msgid "Pick a color"80msgid "Pick a color"
47msgstr ""81msgstr ""
@@ -89,16 +123,89 @@
89#: ../src/app/qml/Configs.qml:280123#: ../src/app/qml/Configs.qml:280
90msgid "Jitter"124msgid "Jitter"
91msgstr ""125msgstr ""
126=======
127#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129
128msgid "Color Scheme"
129msgstr "Paleta boja"
130
131#: ../src/app/qml/KeyboardBar.qml:174
132msgid "Change Keyboard"
133msgstr "Promijeni tipkovnicu"
134
135#. TRANSLATORS: This a keyboard layout name
136#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18
137msgid "Control Keys"
138msgstr "Kontrolne tipke"
139
140#. TRANSLATORS: This a keyboard layout name
141#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21
142msgid "Function Keys"
143msgstr "Funkcijske tipke"
144
145#. TRANSLATORS: This a keyboard layout name
146#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24
147msgid "Scroll Keys"
148msgstr "Tipke pomicanja"
149
150#. TRANSLATORS: This a keyboard layout name
151#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27
152msgid "Command Keys"
153msgstr "Komandne tipke"
154
155#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
156#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase!
157#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35
158#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61
159msgid "CTRL"
160msgstr "CTRL"
161
162#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
163#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38
164msgid "FNS"
165msgstr "FNS"
166
167#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
168#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41
169msgid "SCR"
170msgstr "SCR"
171
172#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
173#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44
174msgid "CMD"
175msgstr "CMD"
176
177#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase!
178#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64
179msgid "ALT"
180msgstr "ALT"
181
182#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase!
183#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67
184msgid "SHIFT"
185msgstr "SHIFT"
186
187#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase!
188#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80
189msgid "ESC"
190msgstr "ESC"
191>>>>>>> MERGE-SOURCE
92192
93#. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!193#. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!
94#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100194#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100
95msgid "PG_UP"195msgid "PG_UP"
96msgstr "PG_UP"196msgstr "PG_UP"
97197
198<<<<<<< TREE
98#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase!199#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase!
99#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:115200#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:115
100msgid "TAB"201msgid "TAB"
101msgstr "TAB"202msgstr "TAB"
203=======
204#. TRANSLATORS: This is the name of the Page Down key. All letters should be uppercase!
205#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:86
206msgid "PG_DN"
207msgstr "PG_DN"
208>>>>>>> MERGE-SOURCE
102209
103#. TRANSLATORS: This is the name of the Delete key. All letters should be uppercase!210#. TRANSLATORS: This is the name of the Delete key. All letters should be uppercase!
104#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:106211#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:106
@@ -108,26 +215,49 @@
108#. TRANSLATORS: This is the name of the Home key. All letters should be uppercase!215#. TRANSLATORS: This is the name of the Home key. All letters should be uppercase!
109#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:109216#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:109
110msgid "HOME"217msgid "HOME"
218<<<<<<< TREE
111msgstr "HOME"219msgstr "HOME"
112220
113#. TRANSLATORS: This is the name of the Page Down key. All letters should be uppercase!221#. TRANSLATORS: This is the name of the Page Down key. All letters should be uppercase!
114#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:103222#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:103
115msgid "PG_DN"223msgid "PG_DN"
116msgstr "PG_DN"224msgstr "PG_DN"
225=======
226msgstr "HOME"
227>>>>>>> MERGE-SOURCE
117228
118#. TRANSLATORS: This is the name of the End key. All letters should be uppercase!229#. TRANSLATORS: This is the name of the End key. All letters should be uppercase!
119#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:112230#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:112
120msgid "END"231msgid "END"
232<<<<<<< TREE
121msgstr "END"233msgstr "END"
122234
123#: ubuntu-terminal-app.desktop.in.in.h:1235#: ubuntu-terminal-app.desktop.in.in.h:1
124msgid "Terminal"236msgid "Terminal"
125msgstr "Terminal"237msgstr "Terminal"
238=======
239msgstr "END"
240
241#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase!
242#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:98
243msgid "TAB"
244msgstr "TAB"
245
246#. TRANSLATORS: This is the name of the Enter key. All letters should be uppercase!
247#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:101
248msgid "ENTER"
249msgstr "ENTER"
250
251#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:41
252msgid "Layouts"
253msgstr "Rasporedi"
254>>>>>>> MERGE-SOURCE
126255
127#: ../src/app/qml/SettingsPage.qml:26256#: ../src/app/qml/SettingsPage.qml:26
128msgid "Settings"257msgid "Settings"
129msgstr "Postavke"258msgstr "Postavke"
130259
260<<<<<<< TREE
131#: ../src/app/qml/ubuntu-terminal-app.qml:57261#: ../src/app/qml/ubuntu-terminal-app.qml:57
132msgid "Hide all key panels"262msgid "Hide all key panels"
133msgstr ""263msgstr ""
@@ -146,6 +276,73 @@
146276
147#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291277#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291
148#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320278#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320
279=======
280#: ../src/app/qml/SettingsPage.qml:57
281msgid "Show Keyboard Bar"
282msgstr "Prikaži traku tipkovnice"
283
284#: ../src/app/qml/SettingsPage.qml:73
285msgid "Show Keyboard Button"
286msgstr "Prikaži tipku tipkovnice"
287
288#: ../src/app/qml/SettingsPage.qml:96
289msgid "Font Size:"
290msgstr "Veličina fonta:"
291
292#: ../src/app/qml/TabsPage.qml:7
293msgid "Tabs"
294msgstr "Kartice"
295
296#: ../src/app/qml/TabsPage.qml:13
297msgid "New tab"
298msgstr "Nova kartica"
299
300#: ../src/app/qml/TerminalPage.qml:170
301msgid "Selection Mode"
302msgstr "Način odabira"
303
304#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
305#: ../src/app/qml/ubuntu-terminal-app.qml:128
306msgid "Green on black"
307msgstr "Zeleno na crnom"
308
309#: ../src/app/qml/ubuntu-terminal-app.qml:128
310msgid "White on black"
311msgstr "Bijelo na crnom"
312
313#: ../src/app/qml/ubuntu-terminal-app.qml:128
314msgid "Black on white"
315msgstr "Crno na bijelom"
316
317#: ../src/app/qml/ubuntu-terminal-app.qml:128
318msgid "Black on random light"
319msgstr "Crno na nasumičnom svjetlu"
320
321#: ../src/app/qml/ubuntu-terminal-app.qml:128
322msgid "Linux"
323msgstr "Linux"
324
325#: ../src/app/qml/ubuntu-terminal-app.qml:128
326msgid "Cool retro term"
327msgstr "Fora retro term"
328
329#: ../src/app/qml/ubuntu-terminal-app.qml:128
330msgid "Dark pastels / Ubuntu (old)"
331msgstr "Tamne pastelne / Ubuntu (stari)"
332
333#: ../src/app/qml/ubuntu-terminal-app.qml:128
334msgid "Black on light yellow"
335msgstr "Crno na svjetlo-žutom"
336
337#: ../src/app/qml/ubuntu-terminal-app.qml:128
338msgid "Ubuntu"
339msgstr "Ubuntu"
340
341#: ../src/plugin/konsole/ColorScheme.cpp:276
342#: ../src/plugin/konsole/ColorScheme.cpp:291
343#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
344#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
345>>>>>>> MERGE-SOURCE
149msgid "Un-named Color Scheme"346msgid "Un-named Color Scheme"
150msgstr "Bezimena paleta boja"347msgstr "Bezimena paleta boja"
151348

Subscribers

People subscribed via source and target branches