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
1=== modified file 'po/ast.po'
2--- po/ast.po 2017-04-14 05:44:59 +0000
3+++ po/ast.po 2017-09-16 02:26:52 +0000
4@@ -7,27 +7,60 @@
5 msgstr ""
6 "Project-Id-Version: ubuntu-terminal-app\n"
7 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
8+<<<<<<< TREE
9 "POT-Creation-Date: 2014-10-07 04:16-0700\n"
10 "PO-Revision-Date: 2014-10-12 16:26+0000\n"
11 "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
12+=======
13+"POT-Creation-Date: 2016-02-07 19:27+0100\n"
14+"PO-Revision-Date: 2016-12-16 01:50+0000\n"
15+"Last-Translator: enolp <enolp@softastur.org>\n"
16+>>>>>>> MERGE-SOURCE
17 "Language-Team: Asturian <ast@li.org>\n"
18 "MIME-Version: 1.0\n"
19 "Content-Type: text/plain; charset=UTF-8\n"
20 "Content-Transfer-Encoding: 8bit\n"
21+<<<<<<< TREE
22 "X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"
23 "X-Generator: Launchpad (build 18352)\n"
24+=======
25+"X-Launchpad-Export-Date: 2016-12-17 05:38+0000\n"
26+"X-Generator: Launchpad (build 18298)\n"
27+
28+#: ../src/app/qml/AlternateActionPopover.qml:13
29+msgid "Select"
30+msgstr "Esbillar"
31+
32+#: ../src/app/qml/AlternateActionPopover.qml:17
33+msgid "Copy"
34+msgstr "Copiar"
35+
36+#: ../src/app/qml/AlternateActionPopover.qml:21
37+msgid "Paste"
38+msgstr "Apegar"
39+>>>>>>> MERGE-SOURCE
40
41 #: ../src/app/qml/AuthenticationDialog.qml:25
42 msgid "Authentication required"
43 msgstr "Ríquese l'autenticación"
44
45 #: ../src/app/qml/AuthenticationDialog.qml:27
46+<<<<<<< TREE
47 msgid "Enter password:"
48 msgstr "Introduz la contraseña:"
49+=======
50+msgid "Enter passcode or passphrase:"
51+msgstr "Introduz el códigu o fras de pasu:"
52+>>>>>>> MERGE-SOURCE
53
54 #: ../src/app/qml/AuthenticationDialog.qml:40
55+<<<<<<< TREE
56 msgid "password"
57 msgstr "contraseña"
58+=======
59+msgid "passcode or passphrase"
60+msgstr "códigu o fras de pasu"
61+>>>>>>> MERGE-SOURCE
62
63 #: ../src/app/qml/NotifyDialog.qml:25
64 msgid "Ok"
65@@ -128,6 +161,7 @@
66 msgid "Settings"
67 msgstr "Axustes"
68
69+<<<<<<< TREE
70 #: ../src/app/qml/ubuntu-terminal-app.qml:57
71 msgid "Hide all key panels"
72 msgstr ""
73@@ -146,6 +180,73 @@
74
75 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291
76 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320
77+=======
78+#: ../src/app/qml/SettingsPage.qml:57
79+msgid "Show Keyboard Bar"
80+msgstr "Amosar barra de tecláu"
81+
82+#: ../src/app/qml/SettingsPage.qml:73
83+msgid "Show Keyboard Button"
84+msgstr "Amosar botón del tecláu"
85+
86+#: ../src/app/qml/SettingsPage.qml:96
87+msgid "Font Size:"
88+msgstr "Tamañu de fonte:"
89+
90+#: ../src/app/qml/TabsPage.qml:7
91+msgid "Tabs"
92+msgstr "Llingüetes"
93+
94+#: ../src/app/qml/TabsPage.qml:13
95+msgid "New tab"
96+msgstr "Llingüeta nueva"
97+
98+#: ../src/app/qml/TerminalPage.qml:170
99+msgid "Selection Mode"
100+msgstr "Mou d'esbilla"
101+
102+#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
103+#: ../src/app/qml/ubuntu-terminal-app.qml:128
104+msgid "Green on black"
105+msgstr "Verde sobro prietu"
106+
107+#: ../src/app/qml/ubuntu-terminal-app.qml:128
108+msgid "White on black"
109+msgstr "Blancu sobro prietu"
110+
111+#: ../src/app/qml/ubuntu-terminal-app.qml:128
112+msgid "Black on white"
113+msgstr "Prietu sobro blancu"
114+
115+#: ../src/app/qml/ubuntu-terminal-app.qml:128
116+msgid "Black on random light"
117+msgstr "Prietu sobro lluz balera"
118+
119+#: ../src/app/qml/ubuntu-terminal-app.qml:128
120+msgid "Linux"
121+msgstr "Linux"
122+
123+#: ../src/app/qml/ubuntu-terminal-app.qml:128
124+msgid "Cool retro term"
125+msgstr "Cool retro term"
126+
127+#: ../src/app/qml/ubuntu-terminal-app.qml:128
128+msgid "Dark pastels / Ubuntu (old)"
129+msgstr "Pasteles escuros / Ubuntu (vieyu)"
130+
131+#: ../src/app/qml/ubuntu-terminal-app.qml:128
132+msgid "Black on light yellow"
133+msgstr "Prietu sobro mariellu claro"
134+
135+#: ../src/app/qml/ubuntu-terminal-app.qml:128
136+msgid "Ubuntu"
137+msgstr "Ubuntu"
138+
139+#: ../src/plugin/konsole/ColorScheme.cpp:276
140+#: ../src/plugin/konsole/ColorScheme.cpp:291
141+#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
142+#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
143+>>>>>>> MERGE-SOURCE
144 msgid "Un-named Color Scheme"
145 msgstr "Esquema de color ensin nome"
146
147
148=== modified file 'po/de.po'
149--- po/de.po 2017-04-14 05:44:59 +0000
150+++ po/de.po 2017-09-16 02:26:52 +0000
151@@ -7,15 +7,38 @@
152 msgstr ""
153 "Project-Id-Version: ubuntu-terminal-app\n"
154 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
155+<<<<<<< TREE
156 "POT-Creation-Date: 2014-10-07 04:16-0700\n"
157 "PO-Revision-Date: 2015-05-02 13:34+0000\n"
158 "Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"
159+=======
160+"POT-Creation-Date: 2016-02-07 19:27+0100\n"
161+"PO-Revision-Date: 2016-12-24 15:47+0000\n"
162+"Last-Translator: Tobias Bannert <tobannert@gmail.com>\n"
163+>>>>>>> MERGE-SOURCE
164 "Language-Team: German <de@li.org>\n"
165 "MIME-Version: 1.0\n"
166 "Content-Type: text/plain; charset=UTF-8\n"
167 "Content-Transfer-Encoding: 8bit\n"
168+<<<<<<< TREE
169 "X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"
170 "X-Generator: Launchpad (build 18352)\n"
171+=======
172+"X-Launchpad-Export-Date: 2016-12-25 05:22+0000\n"
173+"X-Generator: Launchpad (build 18298)\n"
174+
175+#: ../src/app/qml/AlternateActionPopover.qml:13
176+msgid "Select"
177+msgstr "Auswählen"
178+
179+#: ../src/app/qml/AlternateActionPopover.qml:17
180+msgid "Copy"
181+msgstr "Kopieren"
182+
183+#: ../src/app/qml/AlternateActionPopover.qml:21
184+msgid "Paste"
185+msgstr "Einfügen"
186+>>>>>>> MERGE-SOURCE
187
188 #: ../src/app/qml/AuthenticationDialog.qml:25
189 msgid "Authentication required"
190@@ -42,6 +65,7 @@
191 msgid "Authentication failed"
192 msgstr "Legitimierung fehlgeschlagen"
193
194+<<<<<<< TREE
195 #: ../src/app/qml/ColorDialog.qml:25
196 msgid "Pick a color"
197 msgstr "Wählen Sie eine Farbe"
198@@ -89,6 +113,72 @@
199 #: ../src/app/qml/Configs.qml:280
200 msgid "Jitter"
201 msgstr "Flimmern"
202+=======
203+#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129
204+msgid "Color Scheme"
205+msgstr "Farbschema"
206+
207+#: ../src/app/qml/KeyboardBar.qml:174
208+msgid "Change Keyboard"
209+msgstr "Tastatur ändern"
210+
211+#. TRANSLATORS: This a keyboard layout name
212+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18
213+msgid "Control Keys"
214+msgstr "Steuertasten"
215+
216+#. TRANSLATORS: This a keyboard layout name
217+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21
218+msgid "Function Keys"
219+msgstr "Funktionstasten"
220+
221+#. TRANSLATORS: This a keyboard layout name
222+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24
223+msgid "Scroll Keys"
224+msgstr "Rolltasten"
225+
226+#. TRANSLATORS: This a keyboard layout name
227+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27
228+msgid "Command Keys"
229+msgstr "Befehlstasten"
230+
231+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
232+#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase!
233+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35
234+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61
235+msgid "CTRL"
236+msgstr "STRG"
237+
238+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
239+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38
240+msgid "FNS"
241+msgstr "FNS"
242+
243+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
244+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41
245+msgid "SCR"
246+msgstr "SCR"
247+
248+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
249+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44
250+msgid "CMD"
251+msgstr "CMD"
252+
253+#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase!
254+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64
255+msgid "ALT"
256+msgstr "ALT"
257+
258+#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase!
259+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67
260+msgid "SHIFT"
261+msgstr "SHIFT"
262+
263+#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase!
264+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80
265+msgid "ESC"
266+msgstr "ESC"
267+>>>>>>> MERGE-SOURCE
268
269 #. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!
270 #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100
271@@ -128,6 +218,7 @@
272 msgid "Settings"
273 msgstr "Einstellungen"
274
275+<<<<<<< TREE
276 #: ../src/app/qml/ubuntu-terminal-app.qml:57
277 msgid "Hide all key panels"
278 msgstr "Alle Tastaturbereiche ausblenden"
279@@ -146,6 +237,73 @@
280
281 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291
282 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320
283+=======
284+#: ../src/app/qml/SettingsPage.qml:57
285+msgid "Show Keyboard Bar"
286+msgstr "Bildschirmtastatur anzeigen"
287+
288+#: ../src/app/qml/SettingsPage.qml:73
289+msgid "Show Keyboard Button"
290+msgstr "Knopf für Tastatur anzeigen"
291+
292+#: ../src/app/qml/SettingsPage.qml:96
293+msgid "Font Size:"
294+msgstr "Schriftgröße:"
295+
296+#: ../src/app/qml/TabsPage.qml:7
297+msgid "Tabs"
298+msgstr "Reiter"
299+
300+#: ../src/app/qml/TabsPage.qml:13
301+msgid "New tab"
302+msgstr "Neuer Reiter"
303+
304+#: ../src/app/qml/TerminalPage.qml:170
305+msgid "Selection Mode"
306+msgstr "Auswahlmodus"
307+
308+#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
309+#: ../src/app/qml/ubuntu-terminal-app.qml:128
310+msgid "Green on black"
311+msgstr "Grün auf schwarz"
312+
313+#: ../src/app/qml/ubuntu-terminal-app.qml:128
314+msgid "White on black"
315+msgstr "Weiß auf schwarz"
316+
317+#: ../src/app/qml/ubuntu-terminal-app.qml:128
318+msgid "Black on white"
319+msgstr "Schwarz auf weiß"
320+
321+#: ../src/app/qml/ubuntu-terminal-app.qml:128
322+msgid "Black on random light"
323+msgstr "Schwarz auf wahlloser heller Farbe"
324+
325+#: ../src/app/qml/ubuntu-terminal-app.qml:128
326+msgid "Linux"
327+msgstr "Linux"
328+
329+#: ../src/app/qml/ubuntu-terminal-app.qml:128
330+msgid "Cool retro term"
331+msgstr "Kühles Retrothema"
332+
333+#: ../src/app/qml/ubuntu-terminal-app.qml:128
334+msgid "Dark pastels / Ubuntu (old)"
335+msgstr "Dunkle Pastelltöne / Ubuntu (alt)"
336+
337+#: ../src/app/qml/ubuntu-terminal-app.qml:128
338+msgid "Black on light yellow"
339+msgstr "Schwarz auf hellem Gelb"
340+
341+#: ../src/app/qml/ubuntu-terminal-app.qml:128
342+msgid "Ubuntu"
343+msgstr "Ubuntu"
344+
345+#: ../src/plugin/konsole/ColorScheme.cpp:276
346+#: ../src/plugin/konsole/ColorScheme.cpp:291
347+#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
348+#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
349+>>>>>>> MERGE-SOURCE
350 msgid "Un-named Color Scheme"
351 msgstr "Unbenanntes Farbschema"
352
353
354=== modified file 'po/fi.po'
355--- po/fi.po 2017-04-14 05:44:59 +0000
356+++ po/fi.po 2017-09-16 02:26:52 +0000
357@@ -7,27 +7,60 @@
358 msgstr ""
359 "Project-Id-Version: ubuntu-terminal-app\n"
360 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
361+<<<<<<< TREE
362 "POT-Creation-Date: 2014-10-07 04:16-0700\n"
363 "PO-Revision-Date: 2014-12-16 19:11+0000\n"
364 "Last-Translator: Timo Jyrinki <Unknown>\n"
365+=======
366+"POT-Creation-Date: 2016-02-07 19:27+0100\n"
367+"PO-Revision-Date: 2016-11-23 07:45+0000\n"
368+"Last-Translator: Jiri Grönroos <Unknown>\n"
369+>>>>>>> MERGE-SOURCE
370 "Language-Team: Finnish <fi@li.org>\n"
371 "MIME-Version: 1.0\n"
372 "Content-Type: text/plain; charset=UTF-8\n"
373 "Content-Transfer-Encoding: 8bit\n"
374+<<<<<<< TREE
375 "X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"
376 "X-Generator: Launchpad (build 18352)\n"
377+=======
378+"X-Launchpad-Export-Date: 2016-11-25 06:49+0000\n"
379+"X-Generator: Launchpad (build 18282)\n"
380+
381+#: ../src/app/qml/AlternateActionPopover.qml:13
382+msgid "Select"
383+msgstr "Valitse"
384+
385+#: ../src/app/qml/AlternateActionPopover.qml:17
386+msgid "Copy"
387+msgstr "Kopioi"
388+
389+#: ../src/app/qml/AlternateActionPopover.qml:21
390+msgid "Paste"
391+msgstr "Liitä"
392+>>>>>>> MERGE-SOURCE
393
394 #: ../src/app/qml/AuthenticationDialog.qml:25
395 msgid "Authentication required"
396 msgstr "Tunnistautuminen vaaditaan"
397
398 #: ../src/app/qml/AuthenticationDialog.qml:27
399+<<<<<<< TREE
400 msgid "Enter password:"
401 msgstr "Anna salasana:"
402+=======
403+msgid "Enter passcode or passphrase:"
404+msgstr "Anna suojakoodi tai tunnuslause:"
405+>>>>>>> MERGE-SOURCE
406
407 #: ../src/app/qml/AuthenticationDialog.qml:40
408+<<<<<<< TREE
409 msgid "password"
410 msgstr "salasana"
411+=======
412+msgid "passcode or passphrase"
413+msgstr "suojakoodi tai tunnuslause"
414+>>>>>>> MERGE-SOURCE
415
416 #: ../src/app/qml/NotifyDialog.qml:25
417 msgid "Ok"
418@@ -42,6 +75,7 @@
419 msgid "Authentication failed"
420 msgstr "Tunnistautuminen epäonnistui"
421
422+<<<<<<< TREE
423 #: ../src/app/qml/ColorDialog.qml:25
424 msgid "Pick a color"
425 msgstr "Valitse väri"
426@@ -89,6 +123,72 @@
427 #: ../src/app/qml/Configs.qml:280
428 msgid "Jitter"
429 msgstr "Värinä"
430+=======
431+#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129
432+msgid "Color Scheme"
433+msgstr "Väriteema"
434+
435+#: ../src/app/qml/KeyboardBar.qml:174
436+msgid "Change Keyboard"
437+msgstr "Vaihda näppäimistöä"
438+
439+#. TRANSLATORS: This a keyboard layout name
440+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18
441+msgid "Control Keys"
442+msgstr ""
443+
444+#. TRANSLATORS: This a keyboard layout name
445+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21
446+msgid "Function Keys"
447+msgstr ""
448+
449+#. TRANSLATORS: This a keyboard layout name
450+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24
451+msgid "Scroll Keys"
452+msgstr ""
453+
454+#. TRANSLATORS: This a keyboard layout name
455+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27
456+msgid "Command Keys"
457+msgstr ""
458+
459+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
460+#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase!
461+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35
462+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61
463+msgid "CTRL"
464+msgstr "CTRL"
465+
466+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
467+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38
468+msgid "FNS"
469+msgstr ""
470+
471+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
472+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41
473+msgid "SCR"
474+msgstr ""
475+
476+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
477+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44
478+msgid "CMD"
479+msgstr ""
480+
481+#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase!
482+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64
483+msgid "ALT"
484+msgstr "ALT"
485+
486+#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase!
487+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67
488+msgid "SHIFT"
489+msgstr "SHIFT"
490+
491+#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase!
492+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80
493+msgid "ESC"
494+msgstr "ESC"
495+>>>>>>> MERGE-SOURCE
496
497 #. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!
498 #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100
499@@ -120,14 +220,31 @@
500 msgid "END"
501 msgstr "END"
502
503+<<<<<<< TREE
504 #: ubuntu-terminal-app.desktop.in.in.h:1
505 msgid "Terminal"
506 msgstr "Pääte"
507+=======
508+#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase!
509+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:98
510+msgid "TAB"
511+msgstr "TAB"
512+
513+#. TRANSLATORS: This is the name of the Enter key. All letters should be uppercase!
514+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:101
515+msgid "ENTER"
516+msgstr "ENTER"
517+
518+#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:41
519+msgid "Layouts"
520+msgstr "Asettelut"
521+>>>>>>> MERGE-SOURCE
522
523 #: ../src/app/qml/SettingsPage.qml:26
524 msgid "Settings"
525 msgstr "Asetukset"
526
527+<<<<<<< TREE
528 #: ../src/app/qml/ubuntu-terminal-app.qml:57
529 msgid "Hide all key panels"
530 msgstr "Piilota kaikki näppäinpaneelit"
531@@ -146,6 +263,73 @@
532
533 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291
534 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320
535+=======
536+#: ../src/app/qml/SettingsPage.qml:57
537+msgid "Show Keyboard Bar"
538+msgstr "Näytä näppäimistöpalkki"
539+
540+#: ../src/app/qml/SettingsPage.qml:73
541+msgid "Show Keyboard Button"
542+msgstr "Näytä näppäimistöpainike"
543+
544+#: ../src/app/qml/SettingsPage.qml:96
545+msgid "Font Size:"
546+msgstr "Fontin koko:"
547+
548+#: ../src/app/qml/TabsPage.qml:7
549+msgid "Tabs"
550+msgstr "Välilehdet"
551+
552+#: ../src/app/qml/TabsPage.qml:13
553+msgid "New tab"
554+msgstr "Uusi välilehti"
555+
556+#: ../src/app/qml/TerminalPage.qml:170
557+msgid "Selection Mode"
558+msgstr "Valintatila"
559+
560+#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
561+#: ../src/app/qml/ubuntu-terminal-app.qml:128
562+msgid "Green on black"
563+msgstr "Vihreä mustalla"
564+
565+#: ../src/app/qml/ubuntu-terminal-app.qml:128
566+msgid "White on black"
567+msgstr "Valkoinen mustalla"
568+
569+#: ../src/app/qml/ubuntu-terminal-app.qml:128
570+msgid "Black on white"
571+msgstr "Musta valkoisella"
572+
573+#: ../src/app/qml/ubuntu-terminal-app.qml:128
574+msgid "Black on random light"
575+msgstr "Musta satunnaisella vaalealla"
576+
577+#: ../src/app/qml/ubuntu-terminal-app.qml:128
578+msgid "Linux"
579+msgstr "Linux"
580+
581+#: ../src/app/qml/ubuntu-terminal-app.qml:128
582+msgid "Cool retro term"
583+msgstr "Hieno retropääte"
584+
585+#: ../src/app/qml/ubuntu-terminal-app.qml:128
586+msgid "Dark pastels / Ubuntu (old)"
587+msgstr ""
588+
589+#: ../src/app/qml/ubuntu-terminal-app.qml:128
590+msgid "Black on light yellow"
591+msgstr "Musta keltaisella"
592+
593+#: ../src/app/qml/ubuntu-terminal-app.qml:128
594+msgid "Ubuntu"
595+msgstr "Ubuntu"
596+
597+#: ../src/plugin/konsole/ColorScheme.cpp:276
598+#: ../src/plugin/konsole/ColorScheme.cpp:291
599+#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
600+#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
601+>>>>>>> MERGE-SOURCE
602 msgid "Un-named Color Scheme"
603 msgstr "Nimetön väriteema"
604
605
606=== modified file 'po/fr.po'
607--- po/fr.po 2017-07-15 05:44:16 +0000
608+++ po/fr.po 2017-09-16 02:26:52 +0000
609@@ -7,15 +7,26 @@
610 msgstr ""
611 "Project-Id-Version: ubuntu-terminal-app\n"
612 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
613+<<<<<<< TREE
614 "POT-Creation-Date: 2017-01-17 21:46+0100\n"
615 "PO-Revision-Date: 2017-07-14 13:34+0000\n"
616 "Last-Translator: Anne017 <anneonyme017@openmailbox.org>\n"
617+=======
618+"POT-Creation-Date: 2016-02-07 19:27+0100\n"
619+"PO-Revision-Date: 2016-11-27 13:09+0000\n"
620+"Last-Translator: Alberto <alberto@canv.ch>\n"
621+>>>>>>> MERGE-SOURCE
622 "Language-Team: French <fr@li.org>\n"
623 "MIME-Version: 1.0\n"
624 "Content-Type: text/plain; charset=UTF-8\n"
625 "Content-Transfer-Encoding: 8bit\n"
626+<<<<<<< TREE
627 "X-Launchpad-Export-Date: 2017-07-15 05:44+0000\n"
628 "X-Generator: Launchpad (build 18419)\n"
629+=======
630+"X-Launchpad-Export-Date: 2016-11-28 05:48+0000\n"
631+"X-Generator: Launchpad (build 18282)\n"
632+>>>>>>> MERGE-SOURCE
633
634 #: ../src/app/qml/AlternateActionPopover.qml:68
635 msgid "Select"
636@@ -355,6 +366,7 @@
637
638 #: ../src/plugin/qmltermwidget/lib/SearchBar.cpp:49
639 msgid "Higlight all matches"
640+<<<<<<< TREE
641 msgstr "Mettre en surbrillance toutes les correspondances"
642
643 #: ../src/plugin/qmltermwidget/lib/Vt102Emulation.cpp:982
644@@ -367,6 +379,11 @@
645 "sont manquantes."
646
647 #: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:406
648+=======
649+msgstr "Mettre en surbrillance les correspondances"
650+
651+#: ../src/plugin/qmltermwidget/lib/qtermwidget.cpp:405
652+>>>>>>> MERGE-SOURCE
653 msgid "Color Scheme Error"
654 msgstr "Erreur de thème de couleurs"
655
656
657=== modified file 'po/hr.po'
658--- po/hr.po 2017-04-14 05:44:59 +0000
659+++ po/hr.po 2017-09-16 02:26:52 +0000
660@@ -7,27 +7,60 @@
661 msgstr ""
662 "Project-Id-Version: ubuntu-terminal-app\n"
663 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
664+<<<<<<< TREE
665 "POT-Creation-Date: 2014-10-07 04:16-0700\n"
666 "PO-Revision-Date: 2015-03-26 15:18+0000\n"
667 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
668+=======
669+"POT-Creation-Date: 2016-02-07 19:27+0100\n"
670+"PO-Revision-Date: 2016-12-19 11:05+0000\n"
671+"Last-Translator: Kristijan Žic  <kristijan.zic@gmail.com>\n"
672+>>>>>>> MERGE-SOURCE
673 "Language-Team: Croatian <hr@li.org>\n"
674 "MIME-Version: 1.0\n"
675 "Content-Type: text/plain; charset=UTF-8\n"
676 "Content-Transfer-Encoding: 8bit\n"
677+<<<<<<< TREE
678 "X-Launchpad-Export-Date: 2017-04-14 05:44+0000\n"
679 "X-Generator: Launchpad (build 18352)\n"
680+=======
681+"X-Launchpad-Export-Date: 2016-12-20 05:11+0000\n"
682+"X-Generator: Launchpad (build 18298)\n"
683+
684+#: ../src/app/qml/AlternateActionPopover.qml:13
685+msgid "Select"
686+msgstr "Odaberi"
687+
688+#: ../src/app/qml/AlternateActionPopover.qml:17
689+msgid "Copy"
690+msgstr "Kopiraj"
691+
692+#: ../src/app/qml/AlternateActionPopover.qml:21
693+msgid "Paste"
694+msgstr "Umetni"
695+>>>>>>> MERGE-SOURCE
696
697 #: ../src/app/qml/AuthenticationDialog.qml:25
698 msgid "Authentication required"
699 msgstr "Potrebna je ovjera"
700
701 #: ../src/app/qml/AuthenticationDialog.qml:27
702+<<<<<<< TREE
703 msgid "Enter password:"
704 msgstr "Upišite lozinku:"
705+=======
706+msgid "Enter passcode or passphrase:"
707+msgstr "Unesite zaporku ili šifru"
708+>>>>>>> MERGE-SOURCE
709
710 #: ../src/app/qml/AuthenticationDialog.qml:40
711+<<<<<<< TREE
712 msgid "password"
713 msgstr "lozinka"
714+=======
715+msgid "passcode or passphrase"
716+msgstr "zaporka ili šifra"
717+>>>>>>> MERGE-SOURCE
718
719 #: ../src/app/qml/NotifyDialog.qml:25
720 msgid "Ok"
721@@ -42,6 +75,7 @@
722 msgid "Authentication failed"
723 msgstr "Neuspješna autentifikacija"
724
725+<<<<<<< TREE
726 #: ../src/app/qml/ColorDialog.qml:25
727 msgid "Pick a color"
728 msgstr ""
729@@ -89,16 +123,89 @@
730 #: ../src/app/qml/Configs.qml:280
731 msgid "Jitter"
732 msgstr ""
733+=======
734+#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:129
735+msgid "Color Scheme"
736+msgstr "Paleta boja"
737+
738+#: ../src/app/qml/KeyboardBar.qml:174
739+msgid "Change Keyboard"
740+msgstr "Promijeni tipkovnicu"
741+
742+#. TRANSLATORS: This a keyboard layout name
743+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:18
744+msgid "Control Keys"
745+msgstr "Kontrolne tipke"
746+
747+#. TRANSLATORS: This a keyboard layout name
748+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:21
749+msgid "Function Keys"
750+msgstr "Funkcijske tipke"
751+
752+#. TRANSLATORS: This a keyboard layout name
753+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:24
754+msgid "Scroll Keys"
755+msgstr "Tipke pomicanja"
756+
757+#. TRANSLATORS: This a keyboard layout name
758+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:27
759+msgid "Command Keys"
760+msgstr "Komandne tipke"
761+
762+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
763+#. TRANSLATORS: This is the name of the Control key. All letters should be uppercase!
764+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:35
765+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:61
766+msgid "CTRL"
767+msgstr "CTRL"
768+
769+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
770+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:38
771+msgid "FNS"
772+msgstr "FNS"
773+
774+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
775+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:41
776+msgid "SCR"
777+msgstr "SCR"
778+
779+#. TRANSLATORS: This the short display name of a keyboard layout. It should be no longer than 4 characters!
780+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:44
781+msgid "CMD"
782+msgstr "CMD"
783+
784+#. TRANSLATORS: This is the name of the Alt key. All letters should be uppercase!
785+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:64
786+msgid "ALT"
787+msgstr "ALT"
788+
789+#. TRANSLATORS: This is the name of the Shift key. All letters should be uppercase!
790+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:67
791+msgid "SHIFT"
792+msgstr "SHIFT"
793+
794+#. TRANSLATORS: This is the name of the Escape key. All letters should be uppercase!
795+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:80
796+msgid "ESC"
797+msgstr "ESC"
798+>>>>>>> MERGE-SOURCE
799
800 #. TRANSLATORS: This is the name of the Page Up key. All letters should be uppercase!
801 #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:100
802 msgid "PG_UP"
803 msgstr "PG_UP"
804
805+<<<<<<< TREE
806 #. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase!
807 #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:115
808 msgid "TAB"
809 msgstr "TAB"
810+=======
811+#. TRANSLATORS: This is the name of the Page Down key. All letters should be uppercase!
812+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:86
813+msgid "PG_DN"
814+msgstr "PG_DN"
815+>>>>>>> MERGE-SOURCE
816
817 #. TRANSLATORS: This is the name of the Delete key. All letters should be uppercase!
818 #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:106
819@@ -108,26 +215,49 @@
820 #. TRANSLATORS: This is the name of the Home key. All letters should be uppercase!
821 #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:109
822 msgid "HOME"
823+<<<<<<< TREE
824 msgstr "HOME"
825
826 #. TRANSLATORS: This is the name of the Page Down key. All letters should be uppercase!
827 #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:103
828 msgid "PG_DN"
829 msgstr "PG_DN"
830+=======
831+msgstr "HOME"
832+>>>>>>> MERGE-SOURCE
833
834 #. TRANSLATORS: This is the name of the End key. All letters should be uppercase!
835 #: ../src/app/qml/KeyboardRows/JsonTranslator.qml:112
836 msgid "END"
837+<<<<<<< TREE
838 msgstr "END"
839
840 #: ubuntu-terminal-app.desktop.in.in.h:1
841 msgid "Terminal"
842 msgstr "Terminal"
843+=======
844+msgstr "END"
845+
846+#. TRANSLATORS: This is the name of the Tab key. All letters should be uppercase!
847+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:98
848+msgid "TAB"
849+msgstr "TAB"
850+
851+#. TRANSLATORS: This is the name of the Enter key. All letters should be uppercase!
852+#: ../src/app/qml/KeyboardRows/JsonTranslator.qml:101
853+msgid "ENTER"
854+msgstr "ENTER"
855+
856+#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:41
857+msgid "Layouts"
858+msgstr "Rasporedi"
859+>>>>>>> MERGE-SOURCE
860
861 #: ../src/app/qml/SettingsPage.qml:26
862 msgid "Settings"
863 msgstr "Postavke"
864
865+<<<<<<< TREE
866 #: ../src/app/qml/ubuntu-terminal-app.qml:57
867 msgid "Hide all key panels"
868 msgstr ""
869@@ -146,6 +276,73 @@
870
871 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:291
872 #: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:320
873+=======
874+#: ../src/app/qml/SettingsPage.qml:57
875+msgid "Show Keyboard Bar"
876+msgstr "Prikaži traku tipkovnice"
877+
878+#: ../src/app/qml/SettingsPage.qml:73
879+msgid "Show Keyboard Button"
880+msgstr "Prikaži tipku tipkovnice"
881+
882+#: ../src/app/qml/SettingsPage.qml:96
883+msgid "Font Size:"
884+msgstr "Veličina fonta:"
885+
886+#: ../src/app/qml/TabsPage.qml:7
887+msgid "Tabs"
888+msgstr "Kartice"
889+
890+#: ../src/app/qml/TabsPage.qml:13
891+msgid "New tab"
892+msgstr "Nova kartica"
893+
894+#: ../src/app/qml/TerminalPage.qml:170
895+msgid "Selection Mode"
896+msgstr "Način odabira"
897+
898+#. TRANSLATORS: This is the name of a terminal color scheme which is displayed in the settings
899+#: ../src/app/qml/ubuntu-terminal-app.qml:128
900+msgid "Green on black"
901+msgstr "Zeleno na crnom"
902+
903+#: ../src/app/qml/ubuntu-terminal-app.qml:128
904+msgid "White on black"
905+msgstr "Bijelo na crnom"
906+
907+#: ../src/app/qml/ubuntu-terminal-app.qml:128
908+msgid "Black on white"
909+msgstr "Crno na bijelom"
910+
911+#: ../src/app/qml/ubuntu-terminal-app.qml:128
912+msgid "Black on random light"
913+msgstr "Crno na nasumičnom svjetlu"
914+
915+#: ../src/app/qml/ubuntu-terminal-app.qml:128
916+msgid "Linux"
917+msgstr "Linux"
918+
919+#: ../src/app/qml/ubuntu-terminal-app.qml:128
920+msgid "Cool retro term"
921+msgstr "Fora retro term"
922+
923+#: ../src/app/qml/ubuntu-terminal-app.qml:128
924+msgid "Dark pastels / Ubuntu (old)"
925+msgstr "Tamne pastelne / Ubuntu (stari)"
926+
927+#: ../src/app/qml/ubuntu-terminal-app.qml:128
928+msgid "Black on light yellow"
929+msgstr "Crno na svjetlo-žutom"
930+
931+#: ../src/app/qml/ubuntu-terminal-app.qml:128
932+msgid "Ubuntu"
933+msgstr "Ubuntu"
934+
935+#: ../src/plugin/konsole/ColorScheme.cpp:276
936+#: ../src/plugin/konsole/ColorScheme.cpp:291
937+#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:277
938+#: ../src/plugin/qmltermwidget/lib/ColorScheme.cpp:292
939+>>>>>>> MERGE-SOURCE
940 msgid "Un-named Color Scheme"
941 msgstr "Bezimena paleta boja"
942

Subscribers

People subscribed via source and target branches