Merge lp:~mcintire-evan/ubuntu-terminal-app/disable-paste into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Evan McIntire on 2016-01-20
Status: Superseded
Proposed branch: lp:~mcintire-evan/ubuntu-terminal-app/disable-paste
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 3410 lines (+971/-635) (has conflicts)
71 files modified
manifest.json.in (+1/-1)
po/am.po (+9/-15)
po/ar.po (+7/-13)
po/ast.po (+7/-13)
po/az.po (+7/-13)
po/be.po (+7/-13)
po/br.po (+7/-13)
po/bs.po (+7/-13)
po/ca.po (+20/-6)
po/com.ubuntu.terminal.pot (+6/-2)
po/cs.po (+5/-5)
po/cy.po (+7/-13)
po/da.po (+5/-5)
po/de.po (+7/-13)
po/el.po (+7/-13)
po/en_AU.po (+7/-13)
po/en_GB.po (+7/-13)
po/eo.po (+6/-9)
po/es.po (+7/-13)
po/eu.po (+7/-13)
po/fa.po (+7/-13)
po/fi.po (+7/-13)
po/fo.po (+20/-6)
po/fr.po (+7/-13)
po/gd.po (+21/-6)
po/gl.po (+8/-14)
po/he.po (+7/-13)
po/hr.po (+7/-13)
po/hu.po (+7/-13)
po/id.po (+7/-13)
po/it.po (+7/-13)
po/ja.po (+7/-13)
po/lv.po (+7/-13)
po/nb.po (+7/-13)
po/nl.po (+7/-13)
po/pa.po (+7/-13)
po/pl.po (+14/-10)
po/pt.po (+8/-14)
po/pt_BR.po (+7/-13)
po/ro.po (+7/-13)
po/ru.po (+7/-13)
po/sl.po (+7/-13)
po/sr.po (+9/-15)
po/sv.po (+7/-13)
po/tr.po (+7/-13)
po/ug.po (+7/-13)
po/uk.po (+7/-13)
po/zh_CN.po (+7/-13)
po/zh_TW.po (+7/-13)
src/app/qml/AlternateActionPopover.qml (+3/-2)
src/app/qml/AuthenticationDialog.qml (+4/-4)
src/app/qml/AuthenticationService.qml (+2/-2)
src/app/qml/CircularTransparentButton.qml (+1/-1)
src/app/qml/ExpandableButton.qml (+1/-1)
src/app/qml/KeyboardBar.qml (+1/-1)
src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml (+1/-1)
src/app/qml/KeyboardRows/JsonTranslator.qml (+1/-1)
src/app/qml/KeyboardRows/KeyModel.qml (+1/-1)
src/app/qml/KeyboardRows/KeyboardButton.qml (+1/-1)
src/app/qml/KeyboardRows/KeyboardLayout.qml (+2/-2)
src/app/qml/KeyboardRows/KeyboardRow.qml (+1/-1)
src/app/qml/LayoutsPage.qml (+11/-15)
src/app/qml/ListItemWithActions.qml (+454/-0)
src/app/qml/SettingsPage.qml (+87/-5)
src/app/qml/TabsPage.qml (+2/-1)
src/app/qml/TerminalComponent.qml (+1/-1)
src/app/qml/TerminalPage.qml (+2/-8)
src/app/qml/ubuntu-terminal-app.qml (+1/-10)
src/plugin/qmltermwidget/lib/TerminalDisplay.cpp (+5/-0)
src/plugin/qmltermwidget/lib/TerminalDisplay.h (+4/-0)
terminal.apparmor (+1/-1)
Text conflict in po/ca.po
Text conflict in po/com.ubuntu.terminal.pot
Text conflict in po/fo.po
Text conflict in po/gd.po
Text conflict in po/pl.po
Contents conflict in src/app/qml/ColorSchemePage.qml
Text conflict in src/app/qml/SettingsPage.qml
To merge this branch: bzr merge lp:~mcintire-evan/ubuntu-terminal-app/disable-paste
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Needs Fixing on 2016-02-06
Niklas Wenzel (community) 2016-01-20 Approve on 2016-02-06
Stefano Verzegnassi 2016-02-05 Approve on 2016-02-05
Alan Pope 🍺🐧🐱 🦄 Approve on 2016-01-22
Review via email: mp+283244@code.launchpad.net

This proposal has been superseded by a proposal from 2016-02-06.

Commit message

Disables "paste" if the clipboard buffer is empty

Description of the change

Disables "paste" if the clipboard buffer is empty

To post a comment you must log in.
Niklas Wenzel (nikwen) wrote :

Thank you for the patch!

I really see why you want to implement this feature. However, there are some issues with the code.

What this currently does is the following: it hides the paste option when the user has selected some text and shows it if there is no selection. So currently this does not at all check if the clipboard is empty or not.
In order to change that, you would probably want to use the Clipboard API for that: https://developer.ubuntu.com/api/apps/qml/sdk-15.04.1/Ubuntu.Components.Clipboard/
It should do the trick. ;)

Cheers,
Niklas

review: Needs Fixing
Evan McIntire (mcintire-evan) wrote :

Hmm, I did fix that already, i guess the commit didn't push, I'll look into it when I get home

Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Looks good!

review: Approve
Niklas Wenzel (nikwen) wrote :

Thanks for changing this. :)

However, there are four lines in the pot file which seem to stem from a merge error. We need to fix this before we can merge the MP. The easiest way to do that would probably be to just run it once again from the Ubuntu SDK and then commit the automatic pot file updates. Would you mind doing that? :)

Thank you very much in advance!

review: Needs Fixing
Evan McIntire (mcintire-evan) wrote :

Sure, thanks for the review! These small merge issues always get me

Evan McIntire (mcintire-evan) wrote :

Hmm, still not fixed. Any pointers? I assume this is a bzr-ism or a launchpad-ism I'm not used to

Niklas Wenzel (nikwen) wrote :

Looks like there have been a few changes in trunk since you branched off your tree. Here is how to resolve this:

$ bzr branch lp:~mcintire-evan/ubuntu-terminal-app/disable-paste
$ bzr branch lp:ubuntu-terminal-app trunk
$ cd disable-paste
$ bzr merge ../trunk
$ bzr conflicts # should list one conflict
$ nano po/com.ubuntu.terminal.pot
$ # Now resolve the conflict by removing the old date and the lines added by bzr
$ bzr resolve po/com.ubuntu.terminal.pot
$ bzr commit -m "Merge trunk"

That's it. :)

Give it a try. I agree that it can be a bit strange at first. ;)

Evan McIntire (mcintire-evan) wrote :

Alright, there we go :)

Also, quick question, does launchpad squish all the commits from a branch into one when it merges

David Planella (dpm) wrote :

It does, although the individual commits are still there and can be seen under the main merge commit with tools such as 'bzr qlog' ('sudo apt install qbzr' to use it).

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)
review: Approve (continuous-integration)

Tested on my BQ, and looks good. Nice job! :D

Having a look at Niklas' review, I guess the "needs-fixing" is about the conflict with .pot, so there shouldn't be any problem in getting this branch merged.

Anyway, here's some note for a further task:

1) I believe it's better to use the Qt APIs (instead of Ubuntu.Components.Clipboard) since currently the QML GUI does not handle the clipboard (everything is done internally in the terminal widget). This could change in future, but I don't think it's a good idea to change heavily the C++ terminal code yet (Filippo, the former terminal-app maintainer, aimed to keep the code in sync with the upstream project from LxQt).

2) I'd prefer to set "enabled: !terminal.isClipboardEmpty()" instead of "visible" in order to stay consistent with the rest of the platform (i.e. see TextField/TextArea popover).
   The entry in the popover should be always visible, but not triggerable if not necessary (I should check the UI specs though).

3) I'd expect to see a similar MP for the copy action too. Currently the action is still visible when no text is actually selected. (TBD in a different branch though)

4) Probably we'd like to redesign the whole popover, so that it looks similar to the popover used in the TextField/TextArea. We'd need to check if the component is publicly available or if we can get its style through a StyledItem.

About the .pot conflict:
If you don't need to update the translations in your branch, remember to "bzr revert po/*.pot" before committing. That way you're sure you won't get any annoying conflict.

Thank you again! :)

review: Approve
Evan McIntire (mcintire-evan) wrote :

Thanks for the review - I linked your comment in a wishlist bug[1] relating to improving paste functionality, there are actually a few relating to that idea that we could work towards figuring out how we want it :)

[1] https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1396974

Niklas Wenzel (nikwen) wrote :

Thank you for fixing this, Evan! The MP looks very good. :)

@Stefano: You make a really good point with (1). Let's keep that in mind when we continue to add features. :)

[Another note regarding pot file conflicts: If you have already committed stuff which causes a merge conflict, you can revert the po directory to the state which it was in before your first commit using

bzr revert -r 151 po/

where 151 is the revision before your first commit. That will also be handy sometimes. ;) ]

Let's merge the MP now!

review: Approve

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/terminal-app-autolanding/85/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/3390/console

review: Needs Fixing (continuous-integration)
Niklas Wenzel (nikwen) wrote :

Merging 'lp:ubuntu-terminal-app' in to 'build_dir'.
Text conflict in po/com.ubuntu.terminal.pot
1 conflicts encountered.
bzr: ERROR: Conflicts from merge

Looks like the pot file merge conflict we've been talking about. Try the command I posted above. ;)

155. By Evan McIntire on 2016-02-06

Hopefully fix merge issues

Evan McIntire (mcintire-evan) wrote :

Wow, I made it worse. Just a moment, let me re-merge the trunk in and fix all of this nonsense

Ooh, the magical world of Launchpad trying to merge a .pot update when the
.pot has been updated in the meantime. :)

P.S. Now you know how a DocViewer developer feels, haha :'D

P.S. #2 We probably should prevent this from happening, by avoiding to
update translations every time the app is built in QtCreator
Il 06/feb/2016 21:01, "Evan McIntire" <email address hidden> ha scritto:

Wow, I made it worse. Just a moment, let me re-merge the trunk in and fix
all of this nonsense
--
https://code.launchpad.net/~mcintire-evan/ubuntu-terminal-app/disable-paste/+merge/283244
You are reviewing the proposed merge of
lp:~mcintire-evan/ubuntu-terminal-app/disable-paste into
lp:ubuntu-terminal-app.

Niklas Wenzel (nikwen) wrote :

@Stefano: Will Launchpad build the pot file itself in that case or how will it pick up new translatable strings then?

@Niklas: Changing the behaviour of the .pot custom target (i.e. removing the "ALL" option) in CMake should be enough, assuming nothing else will be broken.

That would mean that you'd have to explicitely do:
  mkdir build && cd dir
  cmake ../
  make <translations_target_name>
  (bzr commit & bzr push)

So it would be something you should do whenever you're about to release a new version of the app.
We may want to add a script in the root of the project for making this easier for new contributors.

Niklas Wenzel (nikwen) wrote :

@Stefano: I'm open to that.

However, we need to make sure to still build a new .pot file every once in a while and with enough time before the next release in order to make sure that translators have at least a week to get their translations in.

Unmerged revisions

155. By Evan McIntire on 2016-02-06

Hopefully fix merge issues

154. By Evan McIntire on 2016-01-23

Update POT file to resolve merge issues

153. By Evan McIntire on 2016-01-20

Use clipboard text, not selection text

152. By Evan McIntire on 2016-01-20

Hide "paste" option if the clipboard buffer is empty

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json.in'
2--- manifest.json.in 2016-01-09 01:49:55 +0000
3+++ manifest.json.in 2016-02-06 20:00:51 +0000
4@@ -1,6 +1,6 @@
5 {
6 "description": "Terminal application",
7- "framework": "ubuntu-sdk-15.04.3",
8+ "framework": "ubuntu-sdk-15.04",
9 "architecture": "@CLICK_ARCH@",
10 "hooks": {
11 "terminal": {
12
13=== modified file 'po/am.po'
14--- po/am.po 2016-01-23 05:52:15 +0000
15+++ po/am.po 2016-02-06 20:00:51 +0000
16@@ -7,15 +7,15 @@
17 msgstr ""
18 "Project-Id-Version: ubuntu-terminal-app\n"
19 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
20-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
21-"PO-Revision-Date: 2016-01-22 14:40+0000\n"
22+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
23+"PO-Revision-Date: 2015-09-22 22:32+0000\n"
24 "Last-Translator: samson <Unknown>\n"
25 "Language-Team: Amharic <am@li.org>\n"
26 "MIME-Version: 1.0\n"
27 "Content-Type: text/plain; charset=UTF-8\n"
28 "Content-Transfer-Encoding: 8bit\n"
29-"X-Launchpad-Export-Date: 2016-01-23 05:52+0000\n"
30-"X-Generator: Launchpad (build 17902)\n"
31+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
32+"X-Generator: Launchpad (build 17886)\n"
33
34 #: ../src/app/qml/AlternateActionPopover.qml:13
35 msgid "Select"
36@@ -34,12 +34,12 @@
37 msgstr "ማረጋገጫ ያስፈልጋል"
38
39 #: ../src/app/qml/AuthenticationDialog.qml:27
40-msgid "Enter passcode or passphrase:"
41-msgstr "የ ማለፊያ ኮድ ወይንም የ ማለፊያ ሀረግ ያስገቡ:"
42+msgid "Enter password:"
43+msgstr "የመግቢያ ቃል ያስገቡ:"
44
45 #: ../src/app/qml/AuthenticationDialog.qml:40
46-msgid "passcode or passphrase"
47-msgstr "የ ማለፊያ ኮድ ወይንም የ ማለፊያ ሀረግ"
48+msgid "password"
49+msgstr "የመግቢያ ቃል"
50
51 #: ../src/app/qml/AuthenticationDialog.qml:50
52 msgid "OK"
53@@ -163,7 +163,7 @@
54
55 #: ../src/app/qml/SettingsPage.qml:50
56 msgid "Show Keyboard Button"
57-msgstr "የ ፊደል ገበታ ቁልፍ ማሳያ"
58+msgstr ""
59
60 #: ../src/app/qml/SettingsPage.qml:60
61 msgid "Font Size:"
62@@ -251,11 +251,5 @@
63 msgid "Terminal"
64 msgstr "ተርሚናል"
65
66-#~ msgid "Enter password:"
67-#~ msgstr "የመግቢያ ቃል ያስገቡ:"
68-
69-#~ msgid "password"
70-#~ msgstr "የመግቢያ ቃል"
71-
72 #~ msgid "Ok"
73 #~ msgstr "እሺ"
74
75=== modified file 'po/ar.po'
76--- po/ar.po 2016-01-22 06:01:12 +0000
77+++ po/ar.po 2016-02-06 20:00:51 +0000
78@@ -7,15 +7,15 @@
79 msgstr ""
80 "Project-Id-Version: ubuntu-terminal-app\n"
81 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
82-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
83+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
84 "PO-Revision-Date: 2015-02-03 05:51+0000\n"
85 "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
86 "Language-Team: Arabic <ar@li.org>\n"
87 "MIME-Version: 1.0\n"
88 "Content-Type: text/plain; charset=UTF-8\n"
89 "Content-Transfer-Encoding: 8bit\n"
90-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
91-"X-Generator: Launchpad (build 17902)\n"
92+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
93+"X-Generator: Launchpad (build 17886)\n"
94
95 #: ../src/app/qml/AlternateActionPopover.qml:13
96 msgid "Select"
97@@ -34,12 +34,12 @@
98 msgstr "الاستيثاق مطلوب"
99
100 #: ../src/app/qml/AuthenticationDialog.qml:27
101-msgid "Enter passcode or passphrase:"
102-msgstr ""
103+msgid "Enter password:"
104+msgstr "أدخل كلمة السر:"
105
106 #: ../src/app/qml/AuthenticationDialog.qml:40
107-msgid "passcode or passphrase"
108-msgstr ""
109+msgid "password"
110+msgstr "كلمة السر"
111
112 #: ../src/app/qml/AuthenticationDialog.qml:50
113 msgid "OK"
114@@ -249,11 +249,5 @@
115 msgid "Terminal"
116 msgstr ""
117
118-#~ msgid "Enter password:"
119-#~ msgstr "أدخل كلمة السر:"
120-
121 #~ msgid "Ok"
122 #~ msgstr "موافق"
123-
124-#~ msgid "password"
125-#~ msgstr "كلمة السر"
126
127=== modified file 'po/ast.po'
128--- po/ast.po 2016-01-22 06:01:12 +0000
129+++ po/ast.po 2016-02-06 20:00:51 +0000
130@@ -7,15 +7,15 @@
131 msgstr ""
132 "Project-Id-Version: ubuntu-terminal-app\n"
133 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
134-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
135+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
136 "PO-Revision-Date: 2015-10-31 15:29+0000\n"
137 "Last-Translator: enolp <enolp@softastur.org>\n"
138 "Language-Team: Asturian <ast@li.org>\n"
139 "MIME-Version: 1.0\n"
140 "Content-Type: text/plain; charset=UTF-8\n"
141 "Content-Transfer-Encoding: 8bit\n"
142-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
143-"X-Generator: Launchpad (build 17902)\n"
144+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
145+"X-Generator: Launchpad (build 17886)\n"
146
147 #: ../src/app/qml/AlternateActionPopover.qml:13
148 msgid "Select"
149@@ -34,12 +34,12 @@
150 msgstr "Ríquese l'autenticación"
151
152 #: ../src/app/qml/AuthenticationDialog.qml:27
153-msgid "Enter passcode or passphrase:"
154-msgstr ""
155+msgid "Enter password:"
156+msgstr "Introduz la contraseña:"
157
158 #: ../src/app/qml/AuthenticationDialog.qml:40
159-msgid "passcode or passphrase"
160-msgstr ""
161+msgid "password"
162+msgstr "contraseña"
163
164 #: ../src/app/qml/AuthenticationDialog.qml:50
165 msgid "OK"
166@@ -251,11 +251,5 @@
167 msgid "Terminal"
168 msgstr "Terminal"
169
170-#~ msgid "password"
171-#~ msgstr "contraseña"
172-
173 #~ msgid "Ok"
174 #~ msgstr "Aceutar"
175-
176-#~ msgid "Enter password:"
177-#~ msgstr "Introduz la contraseña:"
178
179=== modified file 'po/az.po'
180--- po/az.po 2016-01-22 06:01:12 +0000
181+++ po/az.po 2016-02-06 20:00:51 +0000
182@@ -7,15 +7,15 @@
183 msgstr ""
184 "Project-Id-Version: ubuntu-terminal-app\n"
185 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
186-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
187+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
188 "PO-Revision-Date: 2015-12-26 12:21+0000\n"
189 "Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
190 "Language-Team: Azerbaijani <az@li.org>\n"
191 "MIME-Version: 1.0\n"
192 "Content-Type: text/plain; charset=UTF-8\n"
193 "Content-Transfer-Encoding: 8bit\n"
194-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
195-"X-Generator: Launchpad (build 17902)\n"
196+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
197+"X-Generator: Launchpad (build 17886)\n"
198
199 #: ../src/app/qml/AlternateActionPopover.qml:13
200 msgid "Select"
201@@ -34,12 +34,12 @@
202 msgstr "Təsdiqlənmə lazımdır"
203
204 #: ../src/app/qml/AuthenticationDialog.qml:27
205-msgid "Enter passcode or passphrase:"
206-msgstr ""
207+msgid "Enter password:"
208+msgstr "Şifrəni daxil edin:"
209
210 #: ../src/app/qml/AuthenticationDialog.qml:40
211-msgid "passcode or passphrase"
212-msgstr ""
213+msgid "password"
214+msgstr "şifrə"
215
216 #: ../src/app/qml/AuthenticationDialog.qml:50
217 msgid "OK"
218@@ -248,9 +248,3 @@
219 #: com.ubuntu.terminal.desktop.in.in.h:1
220 msgid "Terminal"
221 msgstr ""
222-
223-#~ msgid "Enter password:"
224-#~ msgstr "Şifrəni daxil edin:"
225-
226-#~ msgid "password"
227-#~ msgstr "şifrə"
228
229=== modified file 'po/be.po'
230--- po/be.po 2016-01-22 06:01:12 +0000
231+++ po/be.po 2016-02-06 20:00:51 +0000
232@@ -7,15 +7,15 @@
233 msgstr ""
234 "Project-Id-Version: ubuntu-terminal-app\n"
235 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
236-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
237+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
238 "PO-Revision-Date: 2015-09-14 13:41+0000\n"
239 "Last-Translator: Siamion Šachalevič <semen.shah@gmail.com>\n"
240 "Language-Team: Belarusian <be@li.org>\n"
241 "MIME-Version: 1.0\n"
242 "Content-Type: text/plain; charset=UTF-8\n"
243 "Content-Transfer-Encoding: 8bit\n"
244-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
245-"X-Generator: Launchpad (build 17902)\n"
246+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
247+"X-Generator: Launchpad (build 17886)\n"
248
249 #: ../src/app/qml/AlternateActionPopover.qml:13
250 msgid "Select"
251@@ -34,12 +34,12 @@
252 msgstr "Патрабуецца ідэнтыфікацыя"
253
254 #: ../src/app/qml/AuthenticationDialog.qml:27
255-msgid "Enter passcode or passphrase:"
256-msgstr ""
257+msgid "Enter password:"
258+msgstr "Увядзіце пароль"
259
260 #: ../src/app/qml/AuthenticationDialog.qml:40
261-msgid "passcode or passphrase"
262-msgstr ""
263+msgid "password"
264+msgstr "пароль"
265
266 #: ../src/app/qml/AuthenticationDialog.qml:50
267 msgid "OK"
268@@ -251,9 +251,3 @@
269 #: com.ubuntu.terminal.desktop.in.in.h:1
270 msgid "Terminal"
271 msgstr "Тэрмінал"
272-
273-#~ msgid "Enter password:"
274-#~ msgstr "Увядзіце пароль"
275-
276-#~ msgid "password"
277-#~ msgstr "пароль"
278
279=== modified file 'po/br.po'
280--- po/br.po 2016-01-22 06:01:12 +0000
281+++ po/br.po 2016-02-06 20:00:51 +0000
282@@ -7,15 +7,15 @@
283 msgstr ""
284 "Project-Id-Version: ubuntu-terminal-app\n"
285 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
286-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
287+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
288 "PO-Revision-Date: 2015-08-25 13:43+0000\n"
289 "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
290 "Language-Team: Breton <br@li.org>\n"
291 "MIME-Version: 1.0\n"
292 "Content-Type: text/plain; charset=UTF-8\n"
293 "Content-Transfer-Encoding: 8bit\n"
294-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
295-"X-Generator: Launchpad (build 17902)\n"
296+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
297+"X-Generator: Launchpad (build 17886)\n"
298
299 #: ../src/app/qml/AlternateActionPopover.qml:13
300 msgid "Select"
301@@ -34,12 +34,12 @@
302 msgstr "Dilesadur rekis"
303
304 #: ../src/app/qml/AuthenticationDialog.qml:27
305-msgid "Enter passcode or passphrase:"
306-msgstr ""
307+msgid "Enter password:"
308+msgstr "Merkañ ar ger-tremen :"
309
310 #: ../src/app/qml/AuthenticationDialog.qml:40
311-msgid "passcode or passphrase"
312-msgstr ""
313+msgid "password"
314+msgstr "ger-tremen"
315
316 #: ../src/app/qml/AuthenticationDialog.qml:50
317 msgid "OK"
318@@ -254,9 +254,3 @@
319
320 #~ msgid "Ok"
321 #~ msgstr "Mat eo"
322-
323-#~ msgid "Enter password:"
324-#~ msgstr "Merkañ ar ger-tremen :"
325-
326-#~ msgid "password"
327-#~ msgstr "ger-tremen"
328
329=== modified file 'po/bs.po'
330--- po/bs.po 2016-01-22 06:01:12 +0000
331+++ po/bs.po 2016-02-06 20:00:51 +0000
332@@ -7,15 +7,15 @@
333 msgstr ""
334 "Project-Id-Version: ubuntu-terminal-app\n"
335 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
336-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
337+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
338 "PO-Revision-Date: 2015-09-01 16:38+0000\n"
339 "Last-Translator: Kenan Gutić <Unknown>\n"
340 "Language-Team: Bosnian <bs@li.org>\n"
341 "MIME-Version: 1.0\n"
342 "Content-Type: text/plain; charset=UTF-8\n"
343 "Content-Transfer-Encoding: 8bit\n"
344-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
345-"X-Generator: Launchpad (build 17902)\n"
346+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
347+"X-Generator: Launchpad (build 17886)\n"
348
349 #: ../src/app/qml/AlternateActionPopover.qml:13
350 msgid "Select"
351@@ -34,12 +34,12 @@
352 msgstr "Potrebna autentifikacija"
353
354 #: ../src/app/qml/AuthenticationDialog.qml:27
355-msgid "Enter passcode or passphrase:"
356-msgstr ""
357+msgid "Enter password:"
358+msgstr "Unesite šifru:"
359
360 #: ../src/app/qml/AuthenticationDialog.qml:40
361-msgid "passcode or passphrase"
362-msgstr ""
363+msgid "password"
364+msgstr "šifra"
365
366 #: ../src/app/qml/AuthenticationDialog.qml:50
367 msgid "OK"
368@@ -250,9 +250,3 @@
369 #: com.ubuntu.terminal.desktop.in.in.h:1
370 msgid "Terminal"
371 msgstr "Terminal"
372-
373-#~ msgid "Enter password:"
374-#~ msgstr "Unesite šifru:"
375-
376-#~ msgid "password"
377-#~ msgstr "šifra"
378
379=== modified file 'po/ca.po'
380--- po/ca.po 2016-01-30 05:47:13 +0000
381+++ po/ca.po 2016-02-06 20:00:51 +0000
382@@ -7,15 +7,25 @@
383 msgstr ""
384 "Project-Id-Version: ubuntu-terminal-app\n"
385 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
386+<<<<<<< TREE
387 "POT-Creation-Date: 2016-01-19 20:23-0500\n"
388 "PO-Revision-Date: 2016-01-29 09:46+0000\n"
389+=======
390+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
391+"PO-Revision-Date: 2015-01-23 11:42+0000\n"
392+>>>>>>> MERGE-SOURCE
393 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
394 "Language-Team: Catalan <ca@li.org>\n"
395 "MIME-Version: 1.0\n"
396 "Content-Type: text/plain; charset=UTF-8\n"
397 "Content-Transfer-Encoding: 8bit\n"
398+<<<<<<< TREE
399 "X-Launchpad-Export-Date: 2016-01-30 05:47+0000\n"
400 "X-Generator: Launchpad (build 17908)\n"
401+=======
402+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
403+"X-Generator: Launchpad (build 17886)\n"
404+>>>>>>> MERGE-SOURCE
405
406 #: ../src/app/qml/AlternateActionPopover.qml:13
407 msgid "Select"
408@@ -34,12 +44,22 @@
409 msgstr "Cal autenticació"
410
411 #: ../src/app/qml/AuthenticationDialog.qml:27
412+<<<<<<< TREE
413 msgid "Enter passcode or passphrase:"
414 msgstr "Introduïu la contrasenya:"
415+=======
416+msgid "Enter password:"
417+msgstr "Introduïu la contrasenya:"
418+>>>>>>> MERGE-SOURCE
419
420 #: ../src/app/qml/AuthenticationDialog.qml:40
421+<<<<<<< TREE
422 msgid "passcode or passphrase"
423 msgstr "contrasenya"
424+=======
425+msgid "password"
426+msgstr "Contrasenya"
427+>>>>>>> MERGE-SOURCE
428
429 #: ../src/app/qml/AuthenticationDialog.qml:50
430 msgid "OK"
431@@ -251,11 +271,5 @@
432 msgid "Terminal"
433 msgstr "Terminal"
434
435-#~ msgid "Enter password:"
436-#~ msgstr "Introduïu la contrasenya:"
437-
438-#~ msgid "password"
439-#~ msgstr "Contrasenya"
440-
441 #~ msgid "Ok"
442 #~ msgstr "D'acord"
443
444=== modified file 'po/com.ubuntu.terminal.pot'
445--- po/com.ubuntu.terminal.pot 2016-02-06 18:18:42 +0000
446+++ po/com.ubuntu.terminal.pot 2016-02-06 20:00:51 +0000
447@@ -8,7 +8,11 @@
448 msgstr ""
449 "Project-Id-Version: \n"
450 "Report-Msgid-Bugs-To: \n"
451+<<<<<<< TREE
452 "POT-Creation-Date: 2016-02-06 17:44+0100\n"
453+=======
454+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
455+>>>>>>> MERGE-SOURCE
456 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
457 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
458 "Language-Team: LANGUAGE <LL@li.org>\n"
459@@ -34,11 +38,11 @@
460 msgstr ""
461
462 #: ../src/app/qml/AuthenticationDialog.qml:27
463-msgid "Enter passcode or passphrase:"
464+msgid "Enter password:"
465 msgstr ""
466
467 #: ../src/app/qml/AuthenticationDialog.qml:40
468-msgid "passcode or passphrase"
469+msgid "password"
470 msgstr ""
471
472 #: ../src/app/qml/AuthenticationDialog.qml:50
473
474=== modified file 'po/cs.po'
475--- po/cs.po 2016-01-22 06:01:12 +0000
476+++ po/cs.po 2016-02-06 20:00:51 +0000
477@@ -7,15 +7,15 @@
478 msgstr ""
479 "Project-Id-Version: ubuntu-terminal-app\n"
480 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
481-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
482+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
483 "PO-Revision-Date: 2015-07-03 12:45+0000\n"
484 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
485 "Language-Team: Czech <cs@li.org>\n"
486 "MIME-Version: 1.0\n"
487 "Content-Type: text/plain; charset=UTF-8\n"
488 "Content-Transfer-Encoding: 8bit\n"
489-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
490-"X-Generator: Launchpad (build 17902)\n"
491+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
492+"X-Generator: Launchpad (build 17886)\n"
493
494 #: ../src/app/qml/AlternateActionPopover.qml:13
495 msgid "Select"
496@@ -34,11 +34,11 @@
497 msgstr ""
498
499 #: ../src/app/qml/AuthenticationDialog.qml:27
500-msgid "Enter passcode or passphrase:"
501+msgid "Enter password:"
502 msgstr ""
503
504 #: ../src/app/qml/AuthenticationDialog.qml:40
505-msgid "passcode or passphrase"
506+msgid "password"
507 msgstr ""
508
509 #: ../src/app/qml/AuthenticationDialog.qml:50
510
511=== modified file 'po/cy.po'
512--- po/cy.po 2016-01-22 06:01:12 +0000
513+++ po/cy.po 2016-02-06 20:00:51 +0000
514@@ -7,15 +7,15 @@
515 msgstr ""
516 "Project-Id-Version: ubuntu-terminal-app\n"
517 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
518-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
519+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
520 "PO-Revision-Date: 2015-07-14 12:43+0000\n"
521 "Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"
522 "Language-Team: Welsh <cy@li.org>\n"
523 "MIME-Version: 1.0\n"
524 "Content-Type: text/plain; charset=UTF-8\n"
525 "Content-Transfer-Encoding: 8bit\n"
526-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
527-"X-Generator: Launchpad (build 17902)\n"
528+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
529+"X-Generator: Launchpad (build 17886)\n"
530
531 #: ../src/app/qml/AlternateActionPopover.qml:13
532 msgid "Select"
533@@ -34,12 +34,12 @@
534 msgstr "Angen dilysu"
535
536 #: ../src/app/qml/AuthenticationDialog.qml:27
537-msgid "Enter passcode or passphrase:"
538-msgstr ""
539+msgid "Enter password:"
540+msgstr "Rhowch gyfrinair:"
541
542 #: ../src/app/qml/AuthenticationDialog.qml:40
543-msgid "passcode or passphrase"
544-msgstr ""
545+msgid "password"
546+msgstr "cyfrinair"
547
548 #: ../src/app/qml/AuthenticationDialog.qml:50
549 msgid "OK"
550@@ -250,9 +250,3 @@
551 #: com.ubuntu.terminal.desktop.in.in.h:1
552 msgid "Terminal"
553 msgstr "Terfynell"
554-
555-#~ msgid "Enter password:"
556-#~ msgstr "Rhowch gyfrinair:"
557-
558-#~ msgid "password"
559-#~ msgstr "cyfrinair"
560
561=== modified file 'po/da.po'
562--- po/da.po 2016-01-22 06:01:12 +0000
563+++ po/da.po 2016-02-06 20:00:51 +0000
564@@ -7,15 +7,15 @@
565 msgstr ""
566 "Project-Id-Version: ubuntu-terminal-app\n"
567 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
568-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
569+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
570 "PO-Revision-Date: 2015-06-04 20:02+0000\n"
571 "Last-Translator: Aputsiaĸ Niels Janussen <aj@isit.gl>\n"
572 "Language-Team: Danish <da@li.org>\n"
573 "MIME-Version: 1.0\n"
574 "Content-Type: text/plain; charset=UTF-8\n"
575 "Content-Transfer-Encoding: 8bit\n"
576-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
577-"X-Generator: Launchpad (build 17902)\n"
578+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
579+"X-Generator: Launchpad (build 17886)\n"
580
581 #: ../src/app/qml/AlternateActionPopover.qml:13
582 msgid "Select"
583@@ -34,11 +34,11 @@
584 msgstr ""
585
586 #: ../src/app/qml/AuthenticationDialog.qml:27
587-msgid "Enter passcode or passphrase:"
588+msgid "Enter password:"
589 msgstr ""
590
591 #: ../src/app/qml/AuthenticationDialog.qml:40
592-msgid "passcode or passphrase"
593+msgid "password"
594 msgstr ""
595
596 #: ../src/app/qml/AuthenticationDialog.qml:50
597
598=== modified file 'po/de.po'
599--- po/de.po 2016-01-22 06:01:12 +0000
600+++ po/de.po 2016-02-06 20:00:51 +0000
601@@ -7,15 +7,15 @@
602 msgstr ""
603 "Project-Id-Version: ubuntu-terminal-app\n"
604 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
605-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
606+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
607 "PO-Revision-Date: 2015-08-12 21:44+0000\n"
608 "Last-Translator: Phillip Sz <Unknown>\n"
609 "Language-Team: German <de@li.org>\n"
610 "MIME-Version: 1.0\n"
611 "Content-Type: text/plain; charset=UTF-8\n"
612 "Content-Transfer-Encoding: 8bit\n"
613-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
614-"X-Generator: Launchpad (build 17902)\n"
615+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
616+"X-Generator: Launchpad (build 17886)\n"
617
618 #: ../src/app/qml/AlternateActionPopover.qml:13
619 msgid "Select"
620@@ -34,12 +34,12 @@
621 msgstr "Legitimierung erforderlich"
622
623 #: ../src/app/qml/AuthenticationDialog.qml:27
624-msgid "Enter passcode or passphrase:"
625-msgstr ""
626+msgid "Enter password:"
627+msgstr "Passwort eingeben:"
628
629 #: ../src/app/qml/AuthenticationDialog.qml:40
630-msgid "passcode or passphrase"
631-msgstr ""
632+msgid "password"
633+msgstr "Passwort"
634
635 #: ../src/app/qml/AuthenticationDialog.qml:50
636 msgid "OK"
637@@ -251,11 +251,5 @@
638 msgid "Terminal"
639 msgstr "Befehlsfenster"
640
641-#~ msgid "Enter password:"
642-#~ msgstr "Passwort eingeben:"
643-
644-#~ msgid "password"
645-#~ msgstr "Passwort"
646-
647 #~ msgid "Ok"
648 #~ msgstr "Ok"
649
650=== modified file 'po/el.po'
651--- po/el.po 2016-01-22 06:01:12 +0000
652+++ po/el.po 2016-02-06 20:00:51 +0000
653@@ -7,15 +7,15 @@
654 msgstr ""
655 "Project-Id-Version: ubuntu-terminal-app\n"
656 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
657-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
658+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
659 "PO-Revision-Date: 2015-12-08 18:13+0000\n"
660 "Last-Translator: Aggelos Arnaoutis <angelosarn@hotmail.com>\n"
661 "Language-Team: Greek <el@li.org>\n"
662 "MIME-Version: 1.0\n"
663 "Content-Type: text/plain; charset=UTF-8\n"
664 "Content-Transfer-Encoding: 8bit\n"
665-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
666-"X-Generator: Launchpad (build 17902)\n"
667+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
668+"X-Generator: Launchpad (build 17886)\n"
669
670 #: ../src/app/qml/AlternateActionPopover.qml:13
671 msgid "Select"
672@@ -34,12 +34,12 @@
673 msgstr "Απαιτείται πιστοποίηση"
674
675 #: ../src/app/qml/AuthenticationDialog.qml:27
676-msgid "Enter passcode or passphrase:"
677-msgstr ""
678+msgid "Enter password:"
679+msgstr "Εισάγετε κωδικό πρόσβασης:"
680
681 #: ../src/app/qml/AuthenticationDialog.qml:40
682-msgid "passcode or passphrase"
683-msgstr ""
684+msgid "password"
685+msgstr "κωδικός πρόσβασης"
686
687 #: ../src/app/qml/AuthenticationDialog.qml:50
688 msgid "OK"
689@@ -254,9 +254,3 @@
690
691 #~ msgid "Ok"
692 #~ msgstr "Εντάξει"
693-
694-#~ msgid "Enter password:"
695-#~ msgstr "Εισάγετε κωδικό πρόσβασης:"
696-
697-#~ msgid "password"
698-#~ msgstr "κωδικός πρόσβασης"
699
700=== modified file 'po/en_AU.po'
701--- po/en_AU.po 2016-01-22 06:01:12 +0000
702+++ po/en_AU.po 2016-02-06 20:00:51 +0000
703@@ -7,15 +7,15 @@
704 msgstr ""
705 "Project-Id-Version: ubuntu-terminal-app\n"
706 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
707-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
708+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
709 "PO-Revision-Date: 2015-01-21 02:20+0000\n"
710 "Last-Translator: Joel Addison <jaddi27@gmail.com>\n"
711 "Language-Team: English (Australia) <en_AU@li.org>\n"
712 "MIME-Version: 1.0\n"
713 "Content-Type: text/plain; charset=UTF-8\n"
714 "Content-Transfer-Encoding: 8bit\n"
715-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
716-"X-Generator: Launchpad (build 17902)\n"
717+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
718+"X-Generator: Launchpad (build 17886)\n"
719
720 #: ../src/app/qml/AlternateActionPopover.qml:13
721 msgid "Select"
722@@ -34,12 +34,12 @@
723 msgstr "Authentication required"
724
725 #: ../src/app/qml/AuthenticationDialog.qml:27
726-msgid "Enter passcode or passphrase:"
727-msgstr ""
728+msgid "Enter password:"
729+msgstr "Enter password:"
730
731 #: ../src/app/qml/AuthenticationDialog.qml:40
732-msgid "passcode or passphrase"
733-msgstr ""
734+msgid "password"
735+msgstr "password"
736
737 #: ../src/app/qml/AuthenticationDialog.qml:50
738 msgid "OK"
739@@ -251,11 +251,5 @@
740 msgid "Terminal"
741 msgstr "Terminal"
742
743-#~ msgid "Enter password:"
744-#~ msgstr "Enter password:"
745-
746 #~ msgid "Ok"
747 #~ msgstr "Ok"
748-
749-#~ msgid "password"
750-#~ msgstr "password"
751
752=== modified file 'po/en_GB.po'
753--- po/en_GB.po 2016-01-22 06:01:12 +0000
754+++ po/en_GB.po 2016-02-06 20:00:51 +0000
755@@ -7,15 +7,15 @@
756 msgstr ""
757 "Project-Id-Version: ubuntu-terminal-app\n"
758 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
759-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
760+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
761 "PO-Revision-Date: 2015-09-07 13:48+0000\n"
762 "Last-Translator: Andi Chandler <Unknown>\n"
763 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
764 "MIME-Version: 1.0\n"
765 "Content-Type: text/plain; charset=UTF-8\n"
766 "Content-Transfer-Encoding: 8bit\n"
767-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
768-"X-Generator: Launchpad (build 17902)\n"
769+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
770+"X-Generator: Launchpad (build 17886)\n"
771
772 #: ../src/app/qml/AlternateActionPopover.qml:13
773 msgid "Select"
774@@ -34,12 +34,12 @@
775 msgstr "Authentication required"
776
777 #: ../src/app/qml/AuthenticationDialog.qml:27
778-msgid "Enter passcode or passphrase:"
779-msgstr ""
780+msgid "Enter password:"
781+msgstr "Enter password:"
782
783 #: ../src/app/qml/AuthenticationDialog.qml:40
784-msgid "passcode or passphrase"
785-msgstr ""
786+msgid "password"
787+msgstr "password"
788
789 #: ../src/app/qml/AuthenticationDialog.qml:50
790 msgid "OK"
791@@ -251,11 +251,5 @@
792 msgid "Terminal"
793 msgstr "Terminal"
794
795-#~ msgid "Enter password:"
796-#~ msgstr "Enter password:"
797-
798 #~ msgid "Ok"
799 #~ msgstr "Ok"
800-
801-#~ msgid "password"
802-#~ msgstr "password"
803
804=== modified file 'po/eo.po'
805--- po/eo.po 2016-01-22 06:01:12 +0000
806+++ po/eo.po 2016-02-06 20:00:51 +0000
807@@ -7,15 +7,15 @@
808 msgstr ""
809 "Project-Id-Version: ubuntu-terminal-app\n"
810 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
811-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
812+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
813 "PO-Revision-Date: 2016-01-17 16:31+0000\n"
814 "Last-Translator: Esperanto <Unknown>\n"
815 "Language-Team: Esperanto <eo@li.org>\n"
816 "MIME-Version: 1.0\n"
817 "Content-Type: text/plain; charset=UTF-8\n"
818 "Content-Transfer-Encoding: 8bit\n"
819-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
820-"X-Generator: Launchpad (build 17902)\n"
821+"X-Launchpad-Export-Date: 2016-01-18 05:52+0000\n"
822+"X-Generator: Launchpad (build 17886)\n"
823
824 #: ../src/app/qml/AlternateActionPopover.qml:13
825 msgid "Select"
826@@ -34,12 +34,12 @@
827 msgstr "Aŭtentokontrolo bezonatas"
828
829 #: ../src/app/qml/AuthenticationDialog.qml:27
830-msgid "Enter passcode or passphrase:"
831+msgid "Enter password:"
832 msgstr ""
833
834 #: ../src/app/qml/AuthenticationDialog.qml:40
835-msgid "passcode or passphrase"
836-msgstr ""
837+msgid "password"
838+msgstr "pasvorto"
839
840 #: ../src/app/qml/AuthenticationDialog.qml:50
841 msgid "OK"
842@@ -250,6 +250,3 @@
843 #: com.ubuntu.terminal.desktop.in.in.h:1
844 msgid "Terminal"
845 msgstr "Terminalo"
846-
847-#~ msgid "password"
848-#~ msgstr "pasvorto"
849
850=== modified file 'po/es.po'
851--- po/es.po 2016-01-22 06:01:12 +0000
852+++ po/es.po 2016-02-06 20:00:51 +0000
853@@ -7,15 +7,15 @@
854 msgstr ""
855 "Project-Id-Version: ubuntu-terminal-app\n"
856 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
857-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
858+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
859 "PO-Revision-Date: 2015-07-01 15:47+0000\n"
860 "Last-Translator: Luciano Barea <lubareac@hotmail.com>\n"
861 "Language-Team: Spanish <es@li.org>\n"
862 "MIME-Version: 1.0\n"
863 "Content-Type: text/plain; charset=UTF-8\n"
864 "Content-Transfer-Encoding: 8bit\n"
865-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
866-"X-Generator: Launchpad (build 17902)\n"
867+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
868+"X-Generator: Launchpad (build 17886)\n"
869
870 #: ../src/app/qml/AlternateActionPopover.qml:13
871 msgid "Select"
872@@ -34,12 +34,12 @@
873 msgstr "Se necesita autenticación"
874
875 #: ../src/app/qml/AuthenticationDialog.qml:27
876-msgid "Enter passcode or passphrase:"
877-msgstr ""
878+msgid "Enter password:"
879+msgstr "Escriba la contraseña:"
880
881 #: ../src/app/qml/AuthenticationDialog.qml:40
882-msgid "passcode or passphrase"
883-msgstr ""
884+msgid "password"
885+msgstr "contraseña"
886
887 #: ../src/app/qml/AuthenticationDialog.qml:50
888 msgid "OK"
889@@ -252,11 +252,5 @@
890 msgid "Terminal"
891 msgstr "Terminal"
892
893-#~ msgid "Enter password:"
894-#~ msgstr "Escriba la contraseña:"
895-
896-#~ msgid "password"
897-#~ msgstr "contraseña"
898-
899 #~ msgid "Ok"
900 #~ msgstr "Aceptar"
901
902=== modified file 'po/eu.po'
903--- po/eu.po 2016-01-22 06:01:12 +0000
904+++ po/eu.po 2016-02-06 20:00:51 +0000
905@@ -7,15 +7,15 @@
906 msgstr ""
907 "Project-Id-Version: ubuntu-terminal-app\n"
908 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
909-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
910+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
911 "PO-Revision-Date: 2015-01-21 00:32+0000\n"
912 "Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
913 "Language-Team: Basque <eu@li.org>\n"
914 "MIME-Version: 1.0\n"
915 "Content-Type: text/plain; charset=UTF-8\n"
916 "Content-Transfer-Encoding: 8bit\n"
917-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
918-"X-Generator: Launchpad (build 17902)\n"
919+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
920+"X-Generator: Launchpad (build 17886)\n"
921
922 #: ../src/app/qml/AlternateActionPopover.qml:13
923 msgid "Select"
924@@ -34,12 +34,12 @@
925 msgstr "Autentifikazioa behar da"
926
927 #: ../src/app/qml/AuthenticationDialog.qml:27
928-msgid "Enter passcode or passphrase:"
929-msgstr ""
930+msgid "Enter password:"
931+msgstr "Sartu pasahitza:"
932
933 #: ../src/app/qml/AuthenticationDialog.qml:40
934-msgid "passcode or passphrase"
935-msgstr ""
936+msgid "password"
937+msgstr "pasahitza"
938
939 #: ../src/app/qml/AuthenticationDialog.qml:50
940 msgid "OK"
941@@ -251,11 +251,5 @@
942 msgid "Terminal"
943 msgstr "Terminala"
944
945-#~ msgid "Enter password:"
946-#~ msgstr "Sartu pasahitza:"
947-
948-#~ msgid "password"
949-#~ msgstr "pasahitza"
950-
951 #~ msgid "Ok"
952 #~ msgstr "Ados"
953
954=== modified file 'po/fa.po'
955--- po/fa.po 2016-01-22 06:01:12 +0000
956+++ po/fa.po 2016-02-06 20:00:51 +0000
957@@ -7,15 +7,15 @@
958 msgstr ""
959 "Project-Id-Version: ubuntu-terminal-app\n"
960 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
961-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
962+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
963 "PO-Revision-Date: 2015-12-04 17:36+0000\n"
964 "Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
965 "Language-Team: Persian <fa@li.org>\n"
966 "MIME-Version: 1.0\n"
967 "Content-Type: text/plain; charset=UTF-8\n"
968 "Content-Transfer-Encoding: 8bit\n"
969-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
970-"X-Generator: Launchpad (build 17902)\n"
971+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
972+"X-Generator: Launchpad (build 17886)\n"
973
974 #: ../src/app/qml/AlternateActionPopover.qml:13
975 msgid "Select"
976@@ -34,12 +34,12 @@
977 msgstr "تأیید هویت لازم است"
978
979 #: ../src/app/qml/AuthenticationDialog.qml:27
980-msgid "Enter passcode or passphrase:"
981-msgstr ""
982+msgid "Enter password:"
983+msgstr "گذرواژه را وارد کنید:"
984
985 #: ../src/app/qml/AuthenticationDialog.qml:40
986-msgid "passcode or passphrase"
987-msgstr ""
988+msgid "password"
989+msgstr "گذرواژه"
990
991 #: ../src/app/qml/AuthenticationDialog.qml:50
992 msgid "OK"
993@@ -251,11 +251,5 @@
994 msgid "Terminal"
995 msgstr "پایانه"
996
997-#~ msgid "Enter password:"
998-#~ msgstr "گذرواژه را وارد کنید:"
999-
1000-#~ msgid "password"
1001-#~ msgstr "گذرواژه"
1002-
1003 #~ msgid "Ok"
1004 #~ msgstr "تأیید"
1005
1006=== modified file 'po/fi.po'
1007--- po/fi.po 2016-01-22 06:01:12 +0000
1008+++ po/fi.po 2016-02-06 20:00:51 +0000
1009@@ -7,15 +7,15 @@
1010 msgstr ""
1011 "Project-Id-Version: ubuntu-terminal-app\n"
1012 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1013-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1014+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1015 "PO-Revision-Date: 2015-01-18 19:39+0000\n"
1016 "Last-Translator: Jiri Grönroos <Unknown>\n"
1017 "Language-Team: Finnish <fi@li.org>\n"
1018 "MIME-Version: 1.0\n"
1019 "Content-Type: text/plain; charset=UTF-8\n"
1020 "Content-Transfer-Encoding: 8bit\n"
1021-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
1022-"X-Generator: Launchpad (build 17902)\n"
1023+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1024+"X-Generator: Launchpad (build 17886)\n"
1025
1026 #: ../src/app/qml/AlternateActionPopover.qml:13
1027 msgid "Select"
1028@@ -34,12 +34,12 @@
1029 msgstr "Tunnistautuminen vaaditaan"
1030
1031 #: ../src/app/qml/AuthenticationDialog.qml:27
1032-msgid "Enter passcode or passphrase:"
1033-msgstr ""
1034+msgid "Enter password:"
1035+msgstr "Anna salasana:"
1036
1037 #: ../src/app/qml/AuthenticationDialog.qml:40
1038-msgid "passcode or passphrase"
1039-msgstr ""
1040+msgid "password"
1041+msgstr "salasana"
1042
1043 #: ../src/app/qml/AuthenticationDialog.qml:50
1044 msgid "OK"
1045@@ -251,11 +251,5 @@
1046 msgid "Terminal"
1047 msgstr "Pääte"
1048
1049-#~ msgid "Enter password:"
1050-#~ msgstr "Anna salasana:"
1051-
1052-#~ msgid "password"
1053-#~ msgstr "salasana"
1054-
1055 #~ msgid "Ok"
1056 #~ msgstr "OK"
1057
1058=== modified file 'po/fo.po'
1059--- po/fo.po 2016-01-29 05:43:45 +0000
1060+++ po/fo.po 2016-02-06 20:00:51 +0000
1061@@ -7,15 +7,25 @@
1062 msgstr ""
1063 "Project-Id-Version: ubuntu-terminal-app\n"
1064 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1065+<<<<<<< TREE
1066 "POT-Creation-Date: 2016-01-19 20:23-0500\n"
1067 "PO-Revision-Date: 2016-01-28 20:36+0000\n"
1068+=======
1069+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1070+"PO-Revision-Date: 2015-11-05 20:34+0000\n"
1071+>>>>>>> MERGE-SOURCE
1072 "Last-Translator: Angutivik Casper Rúnur Tausen Hansen <Unknown>\n"
1073 "Language-Team: Faroese <fo@li.org>\n"
1074 "MIME-Version: 1.0\n"
1075 "Content-Type: text/plain; charset=UTF-8\n"
1076 "Content-Transfer-Encoding: 8bit\n"
1077+<<<<<<< TREE
1078 "X-Launchpad-Export-Date: 2016-01-29 05:43+0000\n"
1079 "X-Generator: Launchpad (build 17902)\n"
1080+=======
1081+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1082+"X-Generator: Launchpad (build 17886)\n"
1083+>>>>>>> MERGE-SOURCE
1084
1085 #: ../src/app/qml/AlternateActionPopover.qml:13
1086 msgid "Select"
1087@@ -34,12 +44,22 @@
1088 msgstr "Samgildi er neyðugt"
1089
1090 #: ../src/app/qml/AuthenticationDialog.qml:27
1091+<<<<<<< TREE
1092 msgid "Enter passcode or passphrase:"
1093 msgstr "Skriva loyniorð:"
1094+=======
1095+msgid "Enter password:"
1096+msgstr "Skriva loyniorð:"
1097+>>>>>>> MERGE-SOURCE
1098
1099 #: ../src/app/qml/AuthenticationDialog.qml:40
1100+<<<<<<< TREE
1101 msgid "passcode or passphrase"
1102 msgstr "loyniorð"
1103+=======
1104+msgid "password"
1105+msgstr "loyniorð"
1106+>>>>>>> MERGE-SOURCE
1107
1108 #: ../src/app/qml/AuthenticationDialog.qml:50
1109 msgid "OK"
1110@@ -250,9 +270,3 @@
1111 #: com.ubuntu.terminal.desktop.in.in.h:1
1112 msgid "Terminal"
1113 msgstr "Terminal"
1114-
1115-#~ msgid "Enter password:"
1116-#~ msgstr "Skriva loyniorð:"
1117-
1118-#~ msgid "password"
1119-#~ msgstr "loyniorð"
1120
1121=== modified file 'po/fr.po'
1122--- po/fr.po 2016-01-22 06:01:12 +0000
1123+++ po/fr.po 2016-02-06 20:00:51 +0000
1124@@ -7,15 +7,15 @@
1125 msgstr ""
1126 "Project-Id-Version: ubuntu-terminal-app\n"
1127 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1128-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1129+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1130 "PO-Revision-Date: 2016-01-18 19:09+0000\n"
1131 "Last-Translator: Anne <anneonyme017@gmail.com>\n"
1132 "Language-Team: French <fr@li.org>\n"
1133 "MIME-Version: 1.0\n"
1134 "Content-Type: text/plain; charset=UTF-8\n"
1135 "Content-Transfer-Encoding: 8bit\n"
1136-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
1137-"X-Generator: Launchpad (build 17902)\n"
1138+"X-Launchpad-Export-Date: 2016-01-19 05:53+0000\n"
1139+"X-Generator: Launchpad (build 17886)\n"
1140
1141 #: ../src/app/qml/AlternateActionPopover.qml:13
1142 msgid "Select"
1143@@ -34,12 +34,12 @@
1144 msgstr "Authentification requise"
1145
1146 #: ../src/app/qml/AuthenticationDialog.qml:27
1147-msgid "Enter passcode or passphrase:"
1148-msgstr ""
1149+msgid "Enter password:"
1150+msgstr "Entrez le mot de passe :"
1151
1152 #: ../src/app/qml/AuthenticationDialog.qml:40
1153-msgid "passcode or passphrase"
1154-msgstr ""
1155+msgid "password"
1156+msgstr "mot de passe"
1157
1158 #: ../src/app/qml/AuthenticationDialog.qml:50
1159 msgid "OK"
1160@@ -252,11 +252,5 @@
1161 msgid "Terminal"
1162 msgstr "Terminal"
1163
1164-#~ msgid "Enter password:"
1165-#~ msgstr "Entrez le mot de passe :"
1166-
1167 #~ msgid "Ok"
1168 #~ msgstr "Valider"
1169-
1170-#~ msgid "password"
1171-#~ msgstr "mot de passe"
1172
1173=== modified file 'po/gd.po'
1174--- po/gd.po 2016-01-27 05:33:42 +0000
1175+++ po/gd.po 2016-02-06 20:00:51 +0000
1176@@ -7,15 +7,26 @@
1177 msgstr ""
1178 "Project-Id-Version: ubuntu-terminal-app\n"
1179 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1180+<<<<<<< TREE
1181 "POT-Creation-Date: 2016-01-19 20:23-0500\n"
1182 "PO-Revision-Date: 2016-01-26 22:27+0000\n"
1183 "Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"
1184+=======
1185+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1186+"PO-Revision-Date: 2015-03-20 04:16+0000\n"
1187+"Last-Translator: GunChleoc <Unknown>\n"
1188+>>>>>>> MERGE-SOURCE
1189 "Language-Team: Fòram na Gàidhlig\n"
1190 "MIME-Version: 1.0\n"
1191 "Content-Type: text/plain; charset=UTF-8\n"
1192 "Content-Transfer-Encoding: 8bit\n"
1193+<<<<<<< TREE
1194 "X-Launchpad-Export-Date: 2016-01-27 05:33+0000\n"
1195 "X-Generator: Launchpad (build 17902)\n"
1196+=======
1197+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1198+"X-Generator: Launchpad (build 17886)\n"
1199+>>>>>>> MERGE-SOURCE
1200 "Language: gd\n"
1201
1202 #: ../src/app/qml/AlternateActionPopover.qml:13
1203@@ -35,12 +46,22 @@
1204 msgstr "Tha feum air dearbhadh"
1205
1206 #: ../src/app/qml/AuthenticationDialog.qml:27
1207+<<<<<<< TREE
1208 msgid "Enter passcode or passphrase:"
1209 msgstr "Cuir a-steach an còd-faire no an abairt-fhaire:"
1210+=======
1211+msgid "Enter password:"
1212+msgstr "Cuir a-steach facal-faire:"
1213+>>>>>>> MERGE-SOURCE
1214
1215 #: ../src/app/qml/AuthenticationDialog.qml:40
1216+<<<<<<< TREE
1217 msgid "passcode or passphrase"
1218 msgstr "còd-faire no abairt-fhaire"
1219+=======
1220+msgid "password"
1221+msgstr "facal-faire"
1222+>>>>>>> MERGE-SOURCE
1223
1224 #: ../src/app/qml/AuthenticationDialog.qml:50
1225 msgid "OK"
1226@@ -255,9 +276,3 @@
1227
1228 #~ msgid "Ok"
1229 #~ msgstr "Ceart ma-thà"
1230-
1231-#~ msgid "password"
1232-#~ msgstr "facal-faire"
1233-
1234-#~ msgid "Enter password:"
1235-#~ msgstr "Cuir a-steach facal-faire:"
1236
1237=== modified file 'po/gl.po'
1238--- po/gl.po 2016-01-23 05:52:15 +0000
1239+++ po/gl.po 2016-02-06 20:00:51 +0000
1240@@ -7,15 +7,15 @@
1241 msgstr ""
1242 "Project-Id-Version: ubuntu-terminal-app\n"
1243 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1244-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1245-"PO-Revision-Date: 2016-01-22 14:38+0000\n"
1246+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1247+"PO-Revision-Date: 2016-01-18 17:48+0000\n"
1248 "Last-Translator: Marcos Lans <Unknown>\n"
1249 "Language-Team: Galician <gl@li.org>\n"
1250 "MIME-Version: 1.0\n"
1251 "Content-Type: text/plain; charset=UTF-8\n"
1252 "Content-Transfer-Encoding: 8bit\n"
1253-"X-Launchpad-Export-Date: 2016-01-23 05:52+0000\n"
1254-"X-Generator: Launchpad (build 17902)\n"
1255+"X-Launchpad-Export-Date: 2016-01-19 05:53+0000\n"
1256+"X-Generator: Launchpad (build 17886)\n"
1257
1258 #: ../src/app/qml/AlternateActionPopover.qml:13
1259 msgid "Select"
1260@@ -34,12 +34,12 @@
1261 msgstr "Requírese autenticación"
1262
1263 #: ../src/app/qml/AuthenticationDialog.qml:27
1264-msgid "Enter passcode or passphrase:"
1265-msgstr "Introducir código ou contrasinal:"
1266+msgid "Enter password:"
1267+msgstr "Introduza o contrasinal:"
1268
1269 #: ../src/app/qml/AuthenticationDialog.qml:40
1270-msgid "passcode or passphrase"
1271-msgstr "código ou contrasinal"
1272+msgid "password"
1273+msgstr "contrasinal"
1274
1275 #: ../src/app/qml/AuthenticationDialog.qml:50
1276 msgid "OK"
1277@@ -251,11 +251,5 @@
1278 msgid "Terminal"
1279 msgstr "Terminal"
1280
1281-#~ msgid "Enter password:"
1282-#~ msgstr "Introduza o contrasinal:"
1283-
1284 #~ msgid "Ok"
1285 #~ msgstr "Aceptar"
1286-
1287-#~ msgid "password"
1288-#~ msgstr "contrasinal"
1289
1290=== modified file 'po/he.po'
1291--- po/he.po 2016-01-22 06:01:12 +0000
1292+++ po/he.po 2016-02-06 20:00:51 +0000
1293@@ -7,15 +7,15 @@
1294 msgstr ""
1295 "Project-Id-Version: ubuntu-terminal-app\n"
1296 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1297-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1298+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1299 "PO-Revision-Date: 2015-01-16 14:56+0000\n"
1300 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
1301 "Language-Team: Hebrew <he@li.org>\n"
1302 "MIME-Version: 1.0\n"
1303 "Content-Type: text/plain; charset=UTF-8\n"
1304 "Content-Transfer-Encoding: 8bit\n"
1305-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1306-"X-Generator: Launchpad (build 17902)\n"
1307+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1308+"X-Generator: Launchpad (build 17886)\n"
1309
1310 #: ../src/app/qml/AlternateActionPopover.qml:13
1311 msgid "Select"
1312@@ -34,12 +34,12 @@
1313 msgstr "נדרש אימות"
1314
1315 #: ../src/app/qml/AuthenticationDialog.qml:27
1316-msgid "Enter passcode or passphrase:"
1317-msgstr ""
1318+msgid "Enter password:"
1319+msgstr "נא להזין ססמה:"
1320
1321 #: ../src/app/qml/AuthenticationDialog.qml:40
1322-msgid "passcode or passphrase"
1323-msgstr ""
1324+msgid "password"
1325+msgstr "ססמה"
1326
1327 #: ../src/app/qml/AuthenticationDialog.qml:50
1328 msgid "OK"
1329@@ -249,11 +249,5 @@
1330 msgid "Terminal"
1331 msgstr "מסוף"
1332
1333-#~ msgid "Enter password:"
1334-#~ msgstr "נא להזין ססמה:"
1335-
1336-#~ msgid "password"
1337-#~ msgstr "ססמה"
1338-
1339 #~ msgid "Ok"
1340 #~ msgstr "אישור"
1341
1342=== modified file 'po/hr.po'
1343--- po/hr.po 2016-01-22 06:01:12 +0000
1344+++ po/hr.po 2016-02-06 20:00:51 +0000
1345@@ -7,15 +7,15 @@
1346 msgstr ""
1347 "Project-Id-Version: ubuntu-terminal-app\n"
1348 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1349-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1350+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1351 "PO-Revision-Date: 2016-01-08 15:22+0000\n"
1352 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
1353 "Language-Team: Croatian <hr@li.org>\n"
1354 "MIME-Version: 1.0\n"
1355 "Content-Type: text/plain; charset=UTF-8\n"
1356 "Content-Transfer-Encoding: 8bit\n"
1357-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1358-"X-Generator: Launchpad (build 17902)\n"
1359+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1360+"X-Generator: Launchpad (build 17886)\n"
1361
1362 #: ../src/app/qml/AlternateActionPopover.qml:13
1363 msgid "Select"
1364@@ -34,12 +34,12 @@
1365 msgstr "Potrebna autentifikacija"
1366
1367 #: ../src/app/qml/AuthenticationDialog.qml:27
1368-msgid "Enter passcode or passphrase:"
1369-msgstr ""
1370+msgid "Enter password:"
1371+msgstr "Upišite lozinku:"
1372
1373 #: ../src/app/qml/AuthenticationDialog.qml:40
1374-msgid "passcode or passphrase"
1375-msgstr ""
1376+msgid "password"
1377+msgstr "lozinka"
1378
1379 #: ../src/app/qml/AuthenticationDialog.qml:50
1380 msgid "OK"
1381@@ -251,11 +251,5 @@
1382 msgid "Terminal"
1383 msgstr "Terminal"
1384
1385-#~ msgid "Enter password:"
1386-#~ msgstr "Upišite lozinku:"
1387-
1388 #~ msgid "Ok"
1389 #~ msgstr "U redu"
1390-
1391-#~ msgid "password"
1392-#~ msgstr "lozinka"
1393
1394=== modified file 'po/hu.po'
1395--- po/hu.po 2016-01-22 06:01:12 +0000
1396+++ po/hu.po 2016-02-06 20:00:51 +0000
1397@@ -7,15 +7,15 @@
1398 msgstr ""
1399 "Project-Id-Version: ubuntu-terminal-app\n"
1400 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1401-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1402+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1403 "PO-Revision-Date: 2015-08-12 06:49+0000\n"
1404 "Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1405 "Language-Team: Hungarian <hu@li.org>\n"
1406 "MIME-Version: 1.0\n"
1407 "Content-Type: text/plain; charset=UTF-8\n"
1408 "Content-Transfer-Encoding: 8bit\n"
1409-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1410-"X-Generator: Launchpad (build 17902)\n"
1411+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1412+"X-Generator: Launchpad (build 17886)\n"
1413
1414 #: ../src/app/qml/AlternateActionPopover.qml:13
1415 msgid "Select"
1416@@ -34,12 +34,12 @@
1417 msgstr "Hitelesítés szükséges"
1418
1419 #: ../src/app/qml/AuthenticationDialog.qml:27
1420-msgid "Enter passcode or passphrase:"
1421-msgstr ""
1422+msgid "Enter password:"
1423+msgstr "Jelszó megadása:"
1424
1425 #: ../src/app/qml/AuthenticationDialog.qml:40
1426-msgid "passcode or passphrase"
1427-msgstr ""
1428+msgid "password"
1429+msgstr "jelszó"
1430
1431 #: ../src/app/qml/AuthenticationDialog.qml:50
1432 msgid "OK"
1433@@ -253,9 +253,3 @@
1434
1435 #~ msgid "Ok"
1436 #~ msgstr "Ok"
1437-
1438-#~ msgid "Enter password:"
1439-#~ msgstr "Jelszó megadása:"
1440-
1441-#~ msgid "password"
1442-#~ msgstr "jelszó"
1443
1444=== modified file 'po/id.po'
1445--- po/id.po 2016-01-22 06:01:12 +0000
1446+++ po/id.po 2016-02-06 20:00:51 +0000
1447@@ -7,15 +7,15 @@
1448 msgstr ""
1449 "Project-Id-Version: ubuntu-terminal-app\n"
1450 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1451-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1452+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1453 "PO-Revision-Date: 2015-07-30 01:59+0000\n"
1454 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1455 "Language-Team: Indonesian <id@li.org>\n"
1456 "MIME-Version: 1.0\n"
1457 "Content-Type: text/plain; charset=UTF-8\n"
1458 "Content-Transfer-Encoding: 8bit\n"
1459-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1460-"X-Generator: Launchpad (build 17902)\n"
1461+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1462+"X-Generator: Launchpad (build 17886)\n"
1463
1464 #: ../src/app/qml/AlternateActionPopover.qml:13
1465 msgid "Select"
1466@@ -34,12 +34,12 @@
1467 msgstr "Perlu otentikasi"
1468
1469 #: ../src/app/qml/AuthenticationDialog.qml:27
1470-msgid "Enter passcode or passphrase:"
1471-msgstr ""
1472+msgid "Enter password:"
1473+msgstr "Masukkan sandi:"
1474
1475 #: ../src/app/qml/AuthenticationDialog.qml:40
1476-msgid "passcode or passphrase"
1477-msgstr ""
1478+msgid "password"
1479+msgstr "sandi"
1480
1481 #: ../src/app/qml/AuthenticationDialog.qml:50
1482 msgid "OK"
1483@@ -252,11 +252,5 @@
1484 msgid "Terminal"
1485 msgstr "Terminal"
1486
1487-#~ msgid "Enter password:"
1488-#~ msgstr "Masukkan sandi:"
1489-
1490-#~ msgid "password"
1491-#~ msgstr "sandi"
1492-
1493 #~ msgid "Ok"
1494 #~ msgstr "Oke"
1495
1496=== modified file 'po/it.po'
1497--- po/it.po 2016-01-22 06:01:12 +0000
1498+++ po/it.po 2016-02-06 20:00:51 +0000
1499@@ -7,15 +7,15 @@
1500 msgstr ""
1501 "Project-Id-Version: ubuntu-terminal-app\n"
1502 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1503-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1504+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1505 "PO-Revision-Date: 2015-09-18 08:37+0000\n"
1506 "Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
1507 "Language-Team: Italian <it@li.org>\n"
1508 "MIME-Version: 1.0\n"
1509 "Content-Type: text/plain; charset=UTF-8\n"
1510 "Content-Transfer-Encoding: 8bit\n"
1511-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1512-"X-Generator: Launchpad (build 17902)\n"
1513+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1514+"X-Generator: Launchpad (build 17886)\n"
1515
1516 #: ../src/app/qml/AlternateActionPopover.qml:13
1517 msgid "Select"
1518@@ -34,12 +34,12 @@
1519 msgstr "Richiesta autenticazione"
1520
1521 #: ../src/app/qml/AuthenticationDialog.qml:27
1522-msgid "Enter passcode or passphrase:"
1523-msgstr ""
1524+msgid "Enter password:"
1525+msgstr "Inserire la password:"
1526
1527 #: ../src/app/qml/AuthenticationDialog.qml:40
1528-msgid "passcode or passphrase"
1529-msgstr ""
1530+msgid "password"
1531+msgstr "password"
1532
1533 #: ../src/app/qml/AuthenticationDialog.qml:50
1534 msgid "OK"
1535@@ -252,11 +252,5 @@
1536 msgid "Terminal"
1537 msgstr "Terminale"
1538
1539-#~ msgid "password"
1540-#~ msgstr "password"
1541-
1542 #~ msgid "Ok"
1543 #~ msgstr "Ok"
1544-
1545-#~ msgid "Enter password:"
1546-#~ msgstr "Inserire la password:"
1547
1548=== modified file 'po/ja.po'
1549--- po/ja.po 2016-01-22 06:01:12 +0000
1550+++ po/ja.po 2016-02-06 20:00:51 +0000
1551@@ -7,15 +7,15 @@
1552 msgstr ""
1553 "Project-Id-Version: ubuntu-terminal-app\n"
1554 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1555-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1556+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1557 "PO-Revision-Date: 2015-01-21 06:32+0000\n"
1558 "Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
1559 "Language-Team: Japanese <ja@li.org>\n"
1560 "MIME-Version: 1.0\n"
1561 "Content-Type: text/plain; charset=UTF-8\n"
1562 "Content-Transfer-Encoding: 8bit\n"
1563-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1564-"X-Generator: Launchpad (build 17902)\n"
1565+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1566+"X-Generator: Launchpad (build 17886)\n"
1567
1568 #: ../src/app/qml/AlternateActionPopover.qml:13
1569 msgid "Select"
1570@@ -34,12 +34,12 @@
1571 msgstr "認証が必要です"
1572
1573 #: ../src/app/qml/AuthenticationDialog.qml:27
1574-msgid "Enter passcode or passphrase:"
1575-msgstr ""
1576+msgid "Enter password:"
1577+msgstr "パスワードを入力:"
1578
1579 #: ../src/app/qml/AuthenticationDialog.qml:40
1580-msgid "passcode or passphrase"
1581-msgstr ""
1582+msgid "password"
1583+msgstr "パスワード"
1584
1585 #: ../src/app/qml/AuthenticationDialog.qml:50
1586 msgid "OK"
1587@@ -249,11 +249,5 @@
1588 msgid "Terminal"
1589 msgstr "端末"
1590
1591-#~ msgid "Enter password:"
1592-#~ msgstr "パスワードを入力:"
1593-
1594 #~ msgid "Ok"
1595 #~ msgstr "OK"
1596-
1597-#~ msgid "password"
1598-#~ msgstr "パスワード"
1599
1600=== modified file 'po/lv.po'
1601--- po/lv.po 2016-01-22 06:01:12 +0000
1602+++ po/lv.po 2016-02-06 20:00:51 +0000
1603@@ -7,15 +7,15 @@
1604 msgstr ""
1605 "Project-Id-Version: ubuntu-terminal-app\n"
1606 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1607-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1608+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1609 "PO-Revision-Date: 2015-11-21 19:02+0000\n"
1610 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
1611 "Language-Team: Latvian <lv@li.org>\n"
1612 "MIME-Version: 1.0\n"
1613 "Content-Type: text/plain; charset=UTF-8\n"
1614 "Content-Transfer-Encoding: 8bit\n"
1615-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1616-"X-Generator: Launchpad (build 17902)\n"
1617+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1618+"X-Generator: Launchpad (build 17886)\n"
1619
1620 #: ../src/app/qml/AlternateActionPopover.qml:13
1621 msgid "Select"
1622@@ -34,12 +34,12 @@
1623 msgstr "Nepieciešama autentifikācija"
1624
1625 #: ../src/app/qml/AuthenticationDialog.qml:27
1626-msgid "Enter passcode or passphrase:"
1627-msgstr ""
1628+msgid "Enter password:"
1629+msgstr "Ievadiet paroli"
1630
1631 #: ../src/app/qml/AuthenticationDialog.qml:40
1632-msgid "passcode or passphrase"
1633-msgstr ""
1634+msgid "password"
1635+msgstr "parole"
1636
1637 #: ../src/app/qml/AuthenticationDialog.qml:50
1638 msgid "OK"
1639@@ -251,11 +251,5 @@
1640 msgid "Terminal"
1641 msgstr "Terminālis"
1642
1643-#~ msgid "Enter password:"
1644-#~ msgstr "Ievadiet paroli"
1645-
1646 #~ msgid "Ok"
1647 #~ msgstr "Labi"
1648-
1649-#~ msgid "password"
1650-#~ msgstr "parole"
1651
1652=== modified file 'po/nb.po'
1653--- po/nb.po 2016-01-22 06:01:12 +0000
1654+++ po/nb.po 2016-02-06 20:00:51 +0000
1655@@ -7,15 +7,15 @@
1656 msgstr ""
1657 "Project-Id-Version: ubuntu-terminal-app\n"
1658 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1659-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1660+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1661 "PO-Revision-Date: 2015-11-07 12:39+0000\n"
1662 "Last-Translator: Åka Sikrom <Unknown>\n"
1663 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
1664 "MIME-Version: 1.0\n"
1665 "Content-Type: text/plain; charset=UTF-8\n"
1666 "Content-Transfer-Encoding: 8bit\n"
1667-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1668-"X-Generator: Launchpad (build 17902)\n"
1669+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1670+"X-Generator: Launchpad (build 17886)\n"
1671
1672 #: ../src/app/qml/AlternateActionPopover.qml:13
1673 msgid "Select"
1674@@ -34,12 +34,12 @@
1675 msgstr "Autentisering kreves"
1676
1677 #: ../src/app/qml/AuthenticationDialog.qml:27
1678-msgid "Enter passcode or passphrase:"
1679-msgstr ""
1680+msgid "Enter password:"
1681+msgstr "Skriv inn passord:"
1682
1683 #: ../src/app/qml/AuthenticationDialog.qml:40
1684-msgid "passcode or passphrase"
1685-msgstr ""
1686+msgid "password"
1687+msgstr "passord"
1688
1689 #: ../src/app/qml/AuthenticationDialog.qml:50
1690 msgid "OK"
1691@@ -253,9 +253,3 @@
1692
1693 #~ msgid "Ok"
1694 #~ msgstr "OK"
1695-
1696-#~ msgid "password"
1697-#~ msgstr "passord"
1698-
1699-#~ msgid "Enter password:"
1700-#~ msgstr "Skriv inn passord:"
1701
1702=== modified file 'po/nl.po'
1703--- po/nl.po 2016-01-22 06:01:12 +0000
1704+++ po/nl.po 2016-02-06 20:00:51 +0000
1705@@ -7,15 +7,15 @@
1706 msgstr ""
1707 "Project-Id-Version: ubuntu-terminal-app\n"
1708 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1709-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1710+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1711 "PO-Revision-Date: 2015-09-03 08:44+0000\n"
1712 "Last-Translator: Hannie Dumoleyn <Unknown>\n"
1713 "Language-Team: Dutch <nl@li.org>\n"
1714 "MIME-Version: 1.0\n"
1715 "Content-Type: text/plain; charset=UTF-8\n"
1716 "Content-Transfer-Encoding: 8bit\n"
1717-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
1718-"X-Generator: Launchpad (build 17902)\n"
1719+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1720+"X-Generator: Launchpad (build 17886)\n"
1721
1722 #: ../src/app/qml/AlternateActionPopover.qml:13
1723 msgid "Select"
1724@@ -34,12 +34,12 @@
1725 msgstr "Authenticatie vereist"
1726
1727 #: ../src/app/qml/AuthenticationDialog.qml:27
1728-msgid "Enter passcode or passphrase:"
1729-msgstr ""
1730+msgid "Enter password:"
1731+msgstr "Voer wachtwoord in:"
1732
1733 #: ../src/app/qml/AuthenticationDialog.qml:40
1734-msgid "passcode or passphrase"
1735-msgstr ""
1736+msgid "password"
1737+msgstr "wachtwoord"
1738
1739 #: ../src/app/qml/AuthenticationDialog.qml:50
1740 msgid "OK"
1741@@ -252,11 +252,5 @@
1742 msgid "Terminal"
1743 msgstr "Terminal"
1744
1745-#~ msgid "Enter password:"
1746-#~ msgstr "Voer wachtwoord in:"
1747-
1748 #~ msgid "Ok"
1749 #~ msgstr "Ok"
1750-
1751-#~ msgid "password"
1752-#~ msgstr "wachtwoord"
1753
1754=== modified file 'po/pa.po'
1755--- po/pa.po 2016-01-22 06:01:12 +0000
1756+++ po/pa.po 2016-02-06 20:00:51 +0000
1757@@ -7,15 +7,15 @@
1758 msgstr ""
1759 "Project-Id-Version: ubuntu-terminal-app\n"
1760 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1761-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1762+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1763 "PO-Revision-Date: 2015-06-17 14:19+0000\n"
1764 "Last-Translator: Gursharnjit_Singh <ubuntuser13@gmail.com>\n"
1765 "Language-Team: Punjabi <pa@li.org>\n"
1766 "MIME-Version: 1.0\n"
1767 "Content-Type: text/plain; charset=UTF-8\n"
1768 "Content-Transfer-Encoding: 8bit\n"
1769-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1770-"X-Generator: Launchpad (build 17902)\n"
1771+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1772+"X-Generator: Launchpad (build 17886)\n"
1773
1774 #: ../src/app/qml/AlternateActionPopover.qml:13
1775 msgid "Select"
1776@@ -34,12 +34,12 @@
1777 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਦੀ ਲੋੜ"
1778
1779 #: ../src/app/qml/AuthenticationDialog.qml:27
1780-msgid "Enter passcode or passphrase:"
1781-msgstr ""
1782+msgid "Enter password:"
1783+msgstr "ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"
1784
1785 #: ../src/app/qml/AuthenticationDialog.qml:40
1786-msgid "passcode or passphrase"
1787-msgstr ""
1788+msgid "password"
1789+msgstr "ਪਾਸਵਰਡ"
1790
1791 #: ../src/app/qml/AuthenticationDialog.qml:50
1792 msgid "OK"
1793@@ -251,11 +251,5 @@
1794 msgid "Terminal"
1795 msgstr "ਟਰਮੀਨਲ"
1796
1797-#~ msgid "Enter password:"
1798-#~ msgstr "ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"
1799-
1800 #~ msgid "Ok"
1801 #~ msgstr "ਠੀਕ"
1802-
1803-#~ msgid "password"
1804-#~ msgstr "ਪਾਸਵਰਡ"
1805
1806=== modified file 'po/pl.po'
1807--- po/pl.po 2016-02-02 05:48:35 +0000
1808+++ po/pl.po 2016-02-06 20:00:51 +0000
1809@@ -7,15 +7,25 @@
1810 msgstr ""
1811 "Project-Id-Version: ubuntu-terminal-app\n"
1812 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1813+<<<<<<< TREE
1814 "POT-Creation-Date: 2016-01-19 20:23-0500\n"
1815 "PO-Revision-Date: 2016-02-01 07:32+0000\n"
1816+=======
1817+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1818+"PO-Revision-Date: 2015-08-28 14:57+0000\n"
1819+>>>>>>> MERGE-SOURCE
1820 "Last-Translator: Krzysztof Tataradziński <Unknown>\n"
1821 "Language-Team: Polish <pl@li.org>\n"
1822 "MIME-Version: 1.0\n"
1823 "Content-Type: text/plain; charset=UTF-8\n"
1824 "Content-Transfer-Encoding: 8bit\n"
1825+<<<<<<< TREE
1826 "X-Launchpad-Export-Date: 2016-02-02 05:48+0000\n"
1827 "X-Generator: Launchpad (build 17908)\n"
1828+=======
1829+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1830+"X-Generator: Launchpad (build 17886)\n"
1831+>>>>>>> MERGE-SOURCE
1832
1833 #: ../src/app/qml/AlternateActionPopover.qml:13
1834 msgid "Select"
1835@@ -34,12 +44,12 @@
1836 msgstr "Wymagane jest uwierzytelnienie"
1837
1838 #: ../src/app/qml/AuthenticationDialog.qml:27
1839-msgid "Enter passcode or passphrase:"
1840-msgstr ""
1841+msgid "Enter password:"
1842+msgstr "Podaj hasło:"
1843
1844 #: ../src/app/qml/AuthenticationDialog.qml:40
1845-msgid "passcode or passphrase"
1846-msgstr ""
1847+msgid "password"
1848+msgstr "hasło"
1849
1850 #: ../src/app/qml/AuthenticationDialog.qml:50
1851 msgid "OK"
1852@@ -251,11 +261,5 @@
1853 msgid "Terminal"
1854 msgstr "Terminal"
1855
1856-#~ msgid "Enter password:"
1857-#~ msgstr "Podaj hasło:"
1858-
1859 #~ msgid "Ok"
1860 #~ msgstr "OK"
1861-
1862-#~ msgid "password"
1863-#~ msgstr "hasło"
1864
1865=== modified file 'po/pt.po'
1866--- po/pt.po 2016-01-23 05:52:15 +0000
1867+++ po/pt.po 2016-02-06 20:00:51 +0000
1868@@ -7,15 +7,15 @@
1869 msgstr ""
1870 "Project-Id-Version: ubuntu-terminal-app\n"
1871 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1872-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1873-"PO-Revision-Date: 2016-01-22 22:43+0000\n"
1874+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1875+"PO-Revision-Date: 2016-01-15 10:38+0000\n"
1876 "Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
1877 "Language-Team: Portuguese <pt@li.org>\n"
1878 "MIME-Version: 1.0\n"
1879 "Content-Type: text/plain; charset=UTF-8\n"
1880 "Content-Transfer-Encoding: 8bit\n"
1881-"X-Launchpad-Export-Date: 2016-01-23 05:52+0000\n"
1882-"X-Generator: Launchpad (build 17902)\n"
1883+"X-Launchpad-Export-Date: 2016-01-16 05:50+0000\n"
1884+"X-Generator: Launchpad (build 17886)\n"
1885
1886 #: ../src/app/qml/AlternateActionPopover.qml:13
1887 msgid "Select"
1888@@ -34,12 +34,12 @@
1889 msgstr "É necessário autenticar"
1890
1891 #: ../src/app/qml/AuthenticationDialog.qml:27
1892-msgid "Enter passcode or passphrase:"
1893-msgstr "Introduza código ou frase-senha:"
1894+msgid "Enter password:"
1895+msgstr "Introduza palavra-passe:"
1896
1897 #: ../src/app/qml/AuthenticationDialog.qml:40
1898-msgid "passcode or passphrase"
1899-msgstr "código ou frase-senha"
1900+msgid "password"
1901+msgstr "palavra-passe"
1902
1903 #: ../src/app/qml/AuthenticationDialog.qml:50
1904 msgid "OK"
1905@@ -253,9 +253,3 @@
1906
1907 #~ msgid "Ok"
1908 #~ msgstr "Ok"
1909-
1910-#~ msgid "Enter password:"
1911-#~ msgstr "Introduza palavra-passe:"
1912-
1913-#~ msgid "password"
1914-#~ msgstr "palavra-passe"
1915
1916=== modified file 'po/pt_BR.po'
1917--- po/pt_BR.po 2016-01-22 06:01:12 +0000
1918+++ po/pt_BR.po 2016-02-06 20:00:51 +0000
1919@@ -7,15 +7,15 @@
1920 msgstr ""
1921 "Project-Id-Version: ubuntu-terminal-app\n"
1922 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1923-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1924+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1925 "PO-Revision-Date: 2015-02-26 15:53+0000\n"
1926 "Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"
1927 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
1928 "MIME-Version: 1.0\n"
1929 "Content-Type: text/plain; charset=UTF-8\n"
1930 "Content-Transfer-Encoding: 8bit\n"
1931-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1932-"X-Generator: Launchpad (build 17902)\n"
1933+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1934+"X-Generator: Launchpad (build 17886)\n"
1935
1936 #: ../src/app/qml/AlternateActionPopover.qml:13
1937 msgid "Select"
1938@@ -34,12 +34,12 @@
1939 msgstr "Autenticação necessária"
1940
1941 #: ../src/app/qml/AuthenticationDialog.qml:27
1942-msgid "Enter passcode or passphrase:"
1943-msgstr ""
1944+msgid "Enter password:"
1945+msgstr "Informe a senha:"
1946
1947 #: ../src/app/qml/AuthenticationDialog.qml:40
1948-msgid "passcode or passphrase"
1949-msgstr ""
1950+msgid "password"
1951+msgstr "senha"
1952
1953 #: ../src/app/qml/AuthenticationDialog.qml:50
1954 msgid "OK"
1955@@ -254,9 +254,3 @@
1956
1957 #~ msgid "Ok"
1958 #~ msgstr "Ok"
1959-
1960-#~ msgid "password"
1961-#~ msgstr "senha"
1962-
1963-#~ msgid "Enter password:"
1964-#~ msgstr "Informe a senha:"
1965
1966=== modified file 'po/ro.po'
1967--- po/ro.po 2016-01-22 06:01:12 +0000
1968+++ po/ro.po 2016-02-06 20:00:51 +0000
1969@@ -7,15 +7,15 @@
1970 msgstr ""
1971 "Project-Id-Version: ubuntu-terminal-app\n"
1972 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1973-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
1974+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
1975 "PO-Revision-Date: 2015-08-31 17:16+0000\n"
1976 "Last-Translator: Meriuță Cornel <meriutacornel@neacornel.eu>\n"
1977 "Language-Team: Romanian <ro@li.org>\n"
1978 "MIME-Version: 1.0\n"
1979 "Content-Type: text/plain; charset=UTF-8\n"
1980 "Content-Transfer-Encoding: 8bit\n"
1981-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
1982-"X-Generator: Launchpad (build 17902)\n"
1983+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
1984+"X-Generator: Launchpad (build 17886)\n"
1985
1986 #: ../src/app/qml/AlternateActionPopover.qml:13
1987 msgid "Select"
1988@@ -34,12 +34,12 @@
1989 msgstr "Autentificare necesară"
1990
1991 #: ../src/app/qml/AuthenticationDialog.qml:27
1992-msgid "Enter passcode or passphrase:"
1993-msgstr ""
1994+msgid "Enter password:"
1995+msgstr "Introduceţi parola:"
1996
1997 #: ../src/app/qml/AuthenticationDialog.qml:40
1998-msgid "passcode or passphrase"
1999-msgstr ""
2000+msgid "password"
2001+msgstr "parolă"
2002
2003 #: ../src/app/qml/AuthenticationDialog.qml:50
2004 msgid "OK"
2005@@ -248,9 +248,3 @@
2006 #: com.ubuntu.terminal.desktop.in.in.h:1
2007 msgid "Terminal"
2008 msgstr "Terminal"
2009-
2010-#~ msgid "Enter password:"
2011-#~ msgstr "Introduceţi parola:"
2012-
2013-#~ msgid "password"
2014-#~ msgstr "parolă"
2015
2016=== modified file 'po/ru.po'
2017--- po/ru.po 2016-01-22 06:01:12 +0000
2018+++ po/ru.po 2016-02-06 20:00:51 +0000
2019@@ -7,15 +7,15 @@
2020 msgstr ""
2021 "Project-Id-Version: ubuntu-terminal-app\n"
2022 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2023-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
2024+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
2025 "PO-Revision-Date: 2015-01-19 05:38+0000\n"
2026 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
2027 "Language-Team: Russian <ru@li.org>\n"
2028 "MIME-Version: 1.0\n"
2029 "Content-Type: text/plain; charset=UTF-8\n"
2030 "Content-Transfer-Encoding: 8bit\n"
2031-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
2032-"X-Generator: Launchpad (build 17902)\n"
2033+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
2034+"X-Generator: Launchpad (build 17886)\n"
2035
2036 #: ../src/app/qml/AlternateActionPopover.qml:13
2037 msgid "Select"
2038@@ -34,12 +34,12 @@
2039 msgstr "Требуется аутентификация"
2040
2041 #: ../src/app/qml/AuthenticationDialog.qml:27
2042-msgid "Enter passcode or passphrase:"
2043-msgstr ""
2044+msgid "Enter password:"
2045+msgstr "Введите пароль:"
2046
2047 #: ../src/app/qml/AuthenticationDialog.qml:40
2048-msgid "passcode or passphrase"
2049-msgstr ""
2050+msgid "password"
2051+msgstr "пароль"
2052
2053 #: ../src/app/qml/AuthenticationDialog.qml:50
2054 msgid "OK"
2055@@ -253,9 +253,3 @@
2056
2057 #~ msgid "Ok"
2058 #~ msgstr "ОК"
2059-
2060-#~ msgid "password"
2061-#~ msgstr "пароль"
2062-
2063-#~ msgid "Enter password:"
2064-#~ msgstr "Введите пароль:"
2065
2066=== modified file 'po/sl.po'
2067--- po/sl.po 2016-01-22 06:01:12 +0000
2068+++ po/sl.po 2016-02-06 20:00:51 +0000
2069@@ -7,15 +7,15 @@
2070 msgstr ""
2071 "Project-Id-Version: ubuntu-terminal-app\n"
2072 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2073-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
2074+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
2075 "PO-Revision-Date: 2015-01-18 09:37+0000\n"
2076 "Last-Translator: Damir Jerovšek <Unknown>\n"
2077 "Language-Team: Slovenian <sl@li.org>\n"
2078 "MIME-Version: 1.0\n"
2079 "Content-Type: text/plain; charset=UTF-8\n"
2080 "Content-Transfer-Encoding: 8bit\n"
2081-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
2082-"X-Generator: Launchpad (build 17902)\n"
2083+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
2084+"X-Generator: Launchpad (build 17886)\n"
2085
2086 #: ../src/app/qml/AlternateActionPopover.qml:13
2087 msgid "Select"
2088@@ -34,12 +34,12 @@
2089 msgstr "Zahtevana je overitev"
2090
2091 #: ../src/app/qml/AuthenticationDialog.qml:27
2092-msgid "Enter passcode or passphrase:"
2093-msgstr ""
2094+msgid "Enter password:"
2095+msgstr "Vnesite geslo:"
2096
2097 #: ../src/app/qml/AuthenticationDialog.qml:40
2098-msgid "passcode or passphrase"
2099-msgstr ""
2100+msgid "password"
2101+msgstr "geslo"
2102
2103 #: ../src/app/qml/AuthenticationDialog.qml:50
2104 msgid "OK"
2105@@ -251,11 +251,5 @@
2106 msgid "Terminal"
2107 msgstr "Terminal"
2108
2109-#~ msgid "Enter password:"
2110-#~ msgstr "Vnesite geslo:"
2111-
2112-#~ msgid "password"
2113-#~ msgstr "geslo"
2114-
2115 #~ msgid "Ok"
2116 #~ msgstr "V redu"
2117
2118=== modified file 'po/sr.po'
2119--- po/sr.po 2016-01-22 06:01:12 +0000
2120+++ po/sr.po 2016-02-06 20:00:51 +0000
2121@@ -7,15 +7,15 @@
2122 msgstr ""
2123 "Project-Id-Version: ubuntu-terminal-app\n"
2124 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2125-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
2126-"PO-Revision-Date: 2016-01-21 22:18+0000\n"
2127+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
2128+"PO-Revision-Date: 2015-09-07 20:05+0000\n"
2129 "Last-Translator: Bojan Bogdanović <Unknown>\n"
2130 "Language-Team: Serbian <sr@li.org>\n"
2131 "MIME-Version: 1.0\n"
2132 "Content-Type: text/plain; charset=UTF-8\n"
2133 "Content-Transfer-Encoding: 8bit\n"
2134-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
2135-"X-Generator: Launchpad (build 17902)\n"
2136+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
2137+"X-Generator: Launchpad (build 17886)\n"
2138
2139 #: ../src/app/qml/AlternateActionPopover.qml:13
2140 msgid "Select"
2141@@ -34,12 +34,12 @@
2142 msgstr "Обавезна аутентификација"
2143
2144 #: ../src/app/qml/AuthenticationDialog.qml:27
2145-msgid "Enter passcode or passphrase:"
2146-msgstr ""
2147+msgid "Enter password:"
2148+msgstr "Унесите лозинку:"
2149
2150 #: ../src/app/qml/AuthenticationDialog.qml:40
2151-msgid "passcode or passphrase"
2152-msgstr ""
2153+msgid "password"
2154+msgstr "лозинка"
2155
2156 #: ../src/app/qml/AuthenticationDialog.qml:50
2157 msgid "OK"
2158@@ -163,7 +163,7 @@
2159
2160 #: ../src/app/qml/SettingsPage.qml:50
2161 msgid "Show Keyboard Button"
2162-msgstr "Прикажи дугме тастатуре"
2163+msgstr ""
2164
2165 #: ../src/app/qml/SettingsPage.qml:60
2166 msgid "Font Size:"
2167@@ -250,9 +250,3 @@
2168 #: com.ubuntu.terminal.desktop.in.in.h:1
2169 msgid "Terminal"
2170 msgstr "Терминал"
2171-
2172-#~ msgid "Enter password:"
2173-#~ msgstr "Унесите лозинку:"
2174-
2175-#~ msgid "password"
2176-#~ msgstr "лозинка"
2177
2178=== modified file 'po/sv.po'
2179--- po/sv.po 2016-01-22 06:01:12 +0000
2180+++ po/sv.po 2016-02-06 20:00:51 +0000
2181@@ -7,15 +7,15 @@
2182 msgstr ""
2183 "Project-Id-Version: ubuntu-terminal-app\n"
2184 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2185-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
2186+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
2187 "PO-Revision-Date: 2015-08-14 22:07+0000\n"
2188 "Last-Translator: Marcus Gisslén <marcus.gisslen@gmail.com>\n"
2189 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
2190 "MIME-Version: 1.0\n"
2191 "Content-Type: text/plain; charset=UTF-8\n"
2192 "Content-Transfer-Encoding: 8bit\n"
2193-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
2194-"X-Generator: Launchpad (build 17902)\n"
2195+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
2196+"X-Generator: Launchpad (build 17886)\n"
2197 "Language: sv\n"
2198
2199 #: ../src/app/qml/AlternateActionPopover.qml:13
2200@@ -35,12 +35,12 @@
2201 msgstr "Autentisering krävs"
2202
2203 #: ../src/app/qml/AuthenticationDialog.qml:27
2204-msgid "Enter passcode or passphrase:"
2205-msgstr ""
2206+msgid "Enter password:"
2207+msgstr "Ange lösenord:"
2208
2209 #: ../src/app/qml/AuthenticationDialog.qml:40
2210-msgid "passcode or passphrase"
2211-msgstr ""
2212+msgid "password"
2213+msgstr "lösenord"
2214
2215 #: ../src/app/qml/AuthenticationDialog.qml:50
2216 msgid "OK"
2217@@ -251,9 +251,3 @@
2218 #: com.ubuntu.terminal.desktop.in.in.h:1
2219 msgid "Terminal"
2220 msgstr "Terminal"
2221-
2222-#~ msgid "Enter password:"
2223-#~ msgstr "Ange lösenord:"
2224-
2225-#~ msgid "password"
2226-#~ msgstr "lösenord"
2227
2228=== modified file 'po/tr.po'
2229--- po/tr.po 2016-01-22 06:01:12 +0000
2230+++ po/tr.po 2016-02-06 20:00:51 +0000
2231@@ -7,15 +7,15 @@
2232 msgstr ""
2233 "Project-Id-Version: ubuntu-terminal-app\n"
2234 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2235-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
2236+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
2237 "PO-Revision-Date: 2015-11-10 06:48+0000\n"
2238 "Last-Translator: Mutlu Can YILMAZ <mtlcnylmz@gmail.com>\n"
2239 "Language-Team: Turkish <tr@li.org>\n"
2240 "MIME-Version: 1.0\n"
2241 "Content-Type: text/plain; charset=UTF-8\n"
2242 "Content-Transfer-Encoding: 8bit\n"
2243-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
2244-"X-Generator: Launchpad (build 17902)\n"
2245+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
2246+"X-Generator: Launchpad (build 17886)\n"
2247
2248 #: ../src/app/qml/AlternateActionPopover.qml:13
2249 msgid "Select"
2250@@ -34,12 +34,12 @@
2251 msgstr "Kimlik doğrulama gerekli"
2252
2253 #: ../src/app/qml/AuthenticationDialog.qml:27
2254-msgid "Enter passcode or passphrase:"
2255-msgstr ""
2256+msgid "Enter password:"
2257+msgstr "Parolayı girin:"
2258
2259 #: ../src/app/qml/AuthenticationDialog.qml:40
2260-msgid "passcode or passphrase"
2261-msgstr ""
2262+msgid "password"
2263+msgstr "parola"
2264
2265 #: ../src/app/qml/AuthenticationDialog.qml:50
2266 msgid "OK"
2267@@ -251,11 +251,5 @@
2268 msgid "Terminal"
2269 msgstr "Uçbirim"
2270
2271-#~ msgid "Enter password:"
2272-#~ msgstr "Parolayı girin:"
2273-
2274 #~ msgid "Ok"
2275 #~ msgstr "Tamam"
2276-
2277-#~ msgid "password"
2278-#~ msgstr "parola"
2279
2280=== modified file 'po/ug.po'
2281--- po/ug.po 2016-01-22 06:01:12 +0000
2282+++ po/ug.po 2016-02-06 20:00:51 +0000
2283@@ -7,15 +7,15 @@
2284 msgstr ""
2285 "Project-Id-Version: ubuntu-terminal-app\n"
2286 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2287-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
2288+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
2289 "PO-Revision-Date: 2015-10-25 04:06+0000\n"
2290 "Last-Translator: Eltikin <eltikinuyghur@hotmail.com>\n"
2291 "Language-Team: Uyghur <ug@li.org>\n"
2292 "MIME-Version: 1.0\n"
2293 "Content-Type: text/plain; charset=UTF-8\n"
2294 "Content-Transfer-Encoding: 8bit\n"
2295-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
2296-"X-Generator: Launchpad (build 17902)\n"
2297+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
2298+"X-Generator: Launchpad (build 17886)\n"
2299
2300 #: ../src/app/qml/AlternateActionPopover.qml:13
2301 msgid "Select"
2302@@ -34,12 +34,12 @@
2303 msgstr "كىملىك دەلىللەش زۆرۈر"
2304
2305 #: ../src/app/qml/AuthenticationDialog.qml:27
2306-msgid "Enter passcode or passphrase:"
2307-msgstr ""
2308+msgid "Enter password:"
2309+msgstr "ئىم كىرگۈزۈڭ :"
2310
2311 #: ../src/app/qml/AuthenticationDialog.qml:40
2312-msgid "passcode or passphrase"
2313-msgstr ""
2314+msgid "password"
2315+msgstr "ئىم"
2316
2317 #: ../src/app/qml/AuthenticationDialog.qml:50
2318 msgid "OK"
2319@@ -251,11 +251,5 @@
2320 msgid "Terminal"
2321 msgstr "تېرمىنال"
2322
2323-#~ msgid "password"
2324-#~ msgstr "ئىم"
2325-
2326 #~ msgid "Ok"
2327 #~ msgstr "تامام"
2328-
2329-#~ msgid "Enter password:"
2330-#~ msgstr "ئىم كىرگۈزۈڭ :"
2331
2332=== modified file 'po/uk.po'
2333--- po/uk.po 2016-01-22 06:01:12 +0000
2334+++ po/uk.po 2016-02-06 20:00:51 +0000
2335@@ -7,15 +7,15 @@
2336 msgstr ""
2337 "Project-Id-Version: ubuntu-terminal-app\n"
2338 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2339-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
2340+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
2341 "PO-Revision-Date: 2015-01-16 14:58+0000\n"
2342 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
2343 "Language-Team: Ukrainian <uk@li.org>\n"
2344 "MIME-Version: 1.0\n"
2345 "Content-Type: text/plain; charset=UTF-8\n"
2346 "Content-Transfer-Encoding: 8bit\n"
2347-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
2348-"X-Generator: Launchpad (build 17902)\n"
2349+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
2350+"X-Generator: Launchpad (build 17886)\n"
2351
2352 #: ../src/app/qml/AlternateActionPopover.qml:13
2353 msgid "Select"
2354@@ -34,12 +34,12 @@
2355 msgstr "Слід пройти розпізнавання"
2356
2357 #: ../src/app/qml/AuthenticationDialog.qml:27
2358-msgid "Enter passcode or passphrase:"
2359-msgstr ""
2360+msgid "Enter password:"
2361+msgstr "Введіть пароль:"
2362
2363 #: ../src/app/qml/AuthenticationDialog.qml:40
2364-msgid "passcode or passphrase"
2365-msgstr ""
2366+msgid "password"
2367+msgstr "пароль"
2368
2369 #: ../src/app/qml/AuthenticationDialog.qml:50
2370 msgid "OK"
2371@@ -252,11 +252,5 @@
2372 msgid "Terminal"
2373 msgstr "Термінал"
2374
2375-#~ msgid "Enter password:"
2376-#~ msgstr "Введіть пароль:"
2377-
2378-#~ msgid "password"
2379-#~ msgstr "пароль"
2380-
2381 #~ msgid "Ok"
2382 #~ msgstr "Гаразд"
2383
2384=== modified file 'po/zh_CN.po'
2385--- po/zh_CN.po 2016-01-22 06:01:12 +0000
2386+++ po/zh_CN.po 2016-02-06 20:00:51 +0000
2387@@ -7,15 +7,15 @@
2388 msgstr ""
2389 "Project-Id-Version: ubuntu-terminal-app\n"
2390 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2391-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
2392+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
2393 "PO-Revision-Date: 2015-01-20 09:16+0000\n"
2394 "Last-Translator: cthbleachbit <Unknown>\n"
2395 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
2396 "MIME-Version: 1.0\n"
2397 "Content-Type: text/plain; charset=UTF-8\n"
2398 "Content-Transfer-Encoding: 8bit\n"
2399-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
2400-"X-Generator: Launchpad (build 17902)\n"
2401+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
2402+"X-Generator: Launchpad (build 17886)\n"
2403
2404 #: ../src/app/qml/AlternateActionPopover.qml:13
2405 msgid "Select"
2406@@ -34,12 +34,12 @@
2407 msgstr "需要认证"
2408
2409 #: ../src/app/qml/AuthenticationDialog.qml:27
2410-msgid "Enter passcode or passphrase:"
2411-msgstr ""
2412+msgid "Enter password:"
2413+msgstr "输入密码:"
2414
2415 #: ../src/app/qml/AuthenticationDialog.qml:40
2416-msgid "passcode or passphrase"
2417-msgstr ""
2418+msgid "password"
2419+msgstr "密码"
2420
2421 #: ../src/app/qml/AuthenticationDialog.qml:50
2422 msgid "OK"
2423@@ -249,11 +249,5 @@
2424 msgid "Terminal"
2425 msgstr "终端"
2426
2427-#~ msgid "Enter password:"
2428-#~ msgstr "输入密码:"
2429-
2430 #~ msgid "Ok"
2431 #~ msgstr "确定"
2432-
2433-#~ msgid "password"
2434-#~ msgstr "密码"
2435
2436=== modified file 'po/zh_TW.po'
2437--- po/zh_TW.po 2016-01-22 06:01:12 +0000
2438+++ po/zh_TW.po 2016-02-06 20:00:51 +0000
2439@@ -7,15 +7,15 @@
2440 msgstr ""
2441 "Project-Id-Version: ubuntu-terminal-app\n"
2442 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2443-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
2444+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
2445 "PO-Revision-Date: 2015-03-01 07:21+0000\n"
2446 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
2447 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
2448 "MIME-Version: 1.0\n"
2449 "Content-Type: text/plain; charset=UTF-8\n"
2450 "Content-Transfer-Encoding: 8bit\n"
2451-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
2452-"X-Generator: Launchpad (build 17902)\n"
2453+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
2454+"X-Generator: Launchpad (build 17886)\n"
2455
2456 #: ../src/app/qml/AlternateActionPopover.qml:13
2457 msgid "Select"
2458@@ -34,12 +34,12 @@
2459 msgstr "要求核對身分"
2460
2461 #: ../src/app/qml/AuthenticationDialog.qml:27
2462-msgid "Enter passcode or passphrase:"
2463-msgstr ""
2464+msgid "Enter password:"
2465+msgstr "輸入密碼:"
2466
2467 #: ../src/app/qml/AuthenticationDialog.qml:40
2468-msgid "passcode or passphrase"
2469-msgstr ""
2470+msgid "password"
2471+msgstr "密碼"
2472
2473 #: ../src/app/qml/AuthenticationDialog.qml:50
2474 msgid "OK"
2475@@ -249,11 +249,5 @@
2476 msgid "Terminal"
2477 msgstr "終端機"
2478
2479-#~ msgid "Enter password:"
2480-#~ msgstr "輸入密碼:"
2481-
2482-#~ msgid "password"
2483-#~ msgstr "密碼"
2484-
2485 #~ msgid "Ok"
2486 #~ msgstr "確定"
2487
2488=== modified file 'src/app/qml/AlternateActionPopover.qml'
2489--- src/app/qml/AlternateActionPopover.qml 2016-01-09 01:47:56 +0000
2490+++ src/app/qml/AlternateActionPopover.qml 2016-02-06 20:00:51 +0000
2491@@ -1,6 +1,6 @@
2492 import QtQuick 2.4
2493-import Ubuntu.Components 1.3
2494-import Ubuntu.Components.Popups 1.3
2495+import Ubuntu.Components 1.2
2496+import Ubuntu.Components.Popups 1.0
2497
2498 Component {
2499 id: popoverComponent
2500@@ -20,6 +20,7 @@
2501 Action {
2502 text: i18n.tr("Paste")
2503 onTriggered: terminal.pasteClipboard();
2504+ visible: !terminal.isClipboardEmpty();
2505 }
2506 }
2507 }
2508
2509=== modified file 'src/app/qml/AuthenticationDialog.qml'
2510--- src/app/qml/AuthenticationDialog.qml 2016-01-22 17:50:33 +0000
2511+++ src/app/qml/AuthenticationDialog.qml 2016-02-06 20:00:51 +0000
2512@@ -16,15 +16,15 @@
2513 * Authored by: Arto Jalkanen <ajalkane@gmail.com>
2514 */
2515 import QtQuick 2.4
2516-import Ubuntu.Components 1.3
2517-import Ubuntu.Components.Popups 1.3
2518+import Ubuntu.Components 1.2
2519+import Ubuntu.Components.Popups 1.0
2520
2521 Dialog {
2522 id: root
2523
2524 title: i18n.tr("Authentication required")
2525
2526- text: i18n.tr("Enter passcode or passphrase:")
2527+ text: i18n.tr("Enter password:")
2528
2529 signal passwordEntered(string password)
2530 signal dialogCanceled
2531@@ -37,7 +37,7 @@
2532 id: passwordField
2533 objectName: "inputField"
2534
2535- placeholderText: i18n.tr("passcode or passphrase")
2536+ placeholderText: i18n.tr("password")
2537 echoMode: TextInput.Password
2538
2539 onAccepted: okButton.clicked(text)
2540
2541=== modified file 'src/app/qml/AuthenticationService.qml'
2542--- src/app/qml/AuthenticationService.qml 2016-01-09 01:47:56 +0000
2543+++ src/app/qml/AuthenticationService.qml 2016-02-06 20:00:51 +0000
2544@@ -14,8 +14,8 @@
2545 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2546 */
2547 import QtQuick 2.4
2548-import Ubuntu.Components 1.3
2549-import Ubuntu.Components.Popups 1.3
2550+import Ubuntu.Components 1.2
2551+import Ubuntu.Components.Popups 1.0
2552 import com.ubuntu.PamAuthentication 0.1
2553
2554 /**
2555
2556=== modified file 'src/app/qml/CircularTransparentButton.qml'
2557--- src/app/qml/CircularTransparentButton.qml 2016-01-09 01:47:56 +0000
2558+++ src/app/qml/CircularTransparentButton.qml 2016-02-06 20:00:51 +0000
2559@@ -1,5 +1,5 @@
2560 import QtQuick 2.4
2561-import Ubuntu.Components 1.3
2562+import Ubuntu.Components 1.2
2563
2564 Rectangle {
2565 property color backgroundColor: "black"
2566
2567=== renamed file 'src/app/qml/ColorSchemePage.qml' => 'src/app/qml/ColorSchemePage.qml.THIS'
2568=== modified file 'src/app/qml/ExpandableButton.qml'
2569--- src/app/qml/ExpandableButton.qml 2016-01-09 01:47:56 +0000
2570+++ src/app/qml/ExpandableButton.qml 2016-02-06 20:00:51 +0000
2571@@ -1,5 +1,5 @@
2572 import QtQuick 2.4
2573-import Ubuntu.Components 1.3
2574+import Ubuntu.Components 1.2
2575
2576 Item {
2577 id: container
2578
2579=== modified file 'src/app/qml/KeyboardBar.qml'
2580--- src/app/qml/KeyboardBar.qml 2016-01-09 01:47:56 +0000
2581+++ src/app/qml/KeyboardBar.qml 2016-02-06 20:00:51 +0000
2582@@ -1,5 +1,5 @@
2583 import QtQuick 2.4
2584-import Ubuntu.Components 1.3
2585+import Ubuntu.Components 1.2
2586 import "KeyboardRows"
2587
2588 import "KeyboardRows/jsonParser.js" as Parser
2589
2590=== modified file 'src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml'
2591--- src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml 2016-01-09 01:47:56 +0000
2592+++ src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml 2016-02-06 20:00:51 +0000
2593@@ -1,5 +1,5 @@
2594 import QtQuick 2.4
2595-import Ubuntu.Components 1.3
2596+import Ubuntu.Components 1.2
2597
2598 import ".."
2599
2600
2601=== modified file 'src/app/qml/KeyboardRows/JsonTranslator.qml'
2602--- src/app/qml/KeyboardRows/JsonTranslator.qml 2016-01-09 01:47:56 +0000
2603+++ src/app/qml/KeyboardRows/JsonTranslator.qml 2016-02-06 20:00:51 +0000
2604@@ -1,5 +1,5 @@
2605 import QtQuick 2.4
2606-import Ubuntu.Components 1.3
2607+import Ubuntu.Components 1.2
2608
2609 Item {
2610
2611
2612=== modified file 'src/app/qml/KeyboardRows/KeyModel.qml'
2613--- src/app/qml/KeyboardRows/KeyModel.qml 2016-01-09 01:47:56 +0000
2614+++ src/app/qml/KeyboardRows/KeyModel.qml 2016-02-06 20:00:51 +0000
2615@@ -1,5 +1,5 @@
2616 import QtQuick 2.4
2617-import Ubuntu.Components 1.3
2618+import Ubuntu.Components 1.2
2619
2620 QtObject {
2621 property string text
2622
2623=== modified file 'src/app/qml/KeyboardRows/KeyboardButton.qml'
2624--- src/app/qml/KeyboardRows/KeyboardButton.qml 2016-01-09 01:47:56 +0000
2625+++ src/app/qml/KeyboardRows/KeyboardButton.qml 2016-02-06 20:00:51 +0000
2626@@ -1,5 +1,5 @@
2627 import QtQuick 2.4
2628-import Ubuntu.Components 1.3
2629+import Ubuntu.Components 1.2
2630
2631 Rectangle {
2632 property alias text: mainLabel.text
2633
2634=== modified file 'src/app/qml/KeyboardRows/KeyboardLayout.qml'
2635--- src/app/qml/KeyboardRows/KeyboardLayout.qml 2016-01-09 01:47:56 +0000
2636+++ src/app/qml/KeyboardRows/KeyboardLayout.qml 2016-02-06 20:00:51 +0000
2637@@ -1,5 +1,5 @@
2638 import QtQuick 2.4
2639-import Ubuntu.Components 1.3
2640+import Ubuntu.Components 1.2
2641
2642 import "jsonParser.js" as Parser
2643
2644@@ -59,7 +59,7 @@
2645 function createEntryString(text, actionString, otherActionsString) {
2646 var objectString = "
2647 import QtQuick 2.4
2648- import Ubuntu.Components 1.3
2649+ import Ubuntu.Components 1.2
2650
2651 KeyModel {
2652 text: \"" + text + "\"
2653
2654=== modified file 'src/app/qml/KeyboardRows/KeyboardRow.qml'
2655--- src/app/qml/KeyboardRows/KeyboardRow.qml 2016-01-09 01:47:56 +0000
2656+++ src/app/qml/KeyboardRows/KeyboardRow.qml 2016-02-06 20:00:51 +0000
2657@@ -1,5 +1,5 @@
2658 import QtQuick 2.4
2659-import Ubuntu.Components 1.3
2660+import Ubuntu.Components 1.2
2661
2662 Rectangle {
2663 id: container
2664
2665=== modified file 'src/app/qml/LayoutsPage.qml'
2666--- src/app/qml/LayoutsPage.qml 2016-01-09 02:00:10 +0000
2667+++ src/app/qml/LayoutsPage.qml 2016-02-06 20:00:51 +0000
2668@@ -17,7 +17,8 @@
2669 */
2670
2671 import QtQuick 2.4
2672-import Ubuntu.Components 1.3
2673+import Ubuntu.Components 1.2
2674+import Ubuntu.Components.ListItems 1.0 as ListItem
2675
2676 Page {
2677 id: rootItem
2678@@ -33,23 +34,18 @@
2679 ListView {
2680 anchors.fill: parent
2681 model: settings.profilesList
2682- delegate: ListItem {
2683- ListItemLayout {
2684- anchors.fill: parent
2685- title.text: name
2686-
2687- Switch {
2688- id: layoutSwitch
2689- SlotsLayout.position: SlotsLayout.Trailing
2690-
2691- checked: profileVisible
2692- onCheckedChanged: {
2693- settings.profilesList.setProperty(index, "profileVisible", checked);
2694- }
2695+ delegate: ListItem.Standard {
2696+ text: name
2697+
2698+ control: Switch {
2699+ id: layoutSwitch
2700+ checked: profileVisible
2701+ onCheckedChanged: {
2702+ settings.profilesList.setProperty(index, "profileVisible", checked);
2703 }
2704 }
2705
2706- onClicked: layoutSwitch.trigger()
2707+ onTriggered: layoutSwitch.trigger()
2708 }
2709 }
2710 }
2711
2712=== added file 'src/app/qml/ListItemWithActions.qml'
2713--- src/app/qml/ListItemWithActions.qml 1970-01-01 00:00:00 +0000
2714+++ src/app/qml/ListItemWithActions.qml 2016-02-06 20:00:51 +0000
2715@@ -0,0 +1,454 @@
2716+/*
2717+ * Copyright (C) 2012-2014 Canonical, Ltd.
2718+ *
2719+ * This program is free software; you can redistribute it and/or modify
2720+ * it under the terms of the GNU General Public License as published by
2721+ * the Free Software Foundation; version 3.
2722+ *
2723+ * This program is distributed in the hope that it will be useful,
2724+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2725+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2726+ * GNU General Public License for more details.
2727+ *
2728+ * You should have received a copy of the GNU General Public License
2729+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2730+ */
2731+
2732+import QtQuick 2.4
2733+import Ubuntu.Components 1.2
2734+
2735+Item {
2736+ id: root
2737+
2738+ property Action leftSideAction: null
2739+ property list<Action> rightSideActions
2740+ property double defaultHeight: units.gu(8)
2741+ property bool locked: false
2742+ property Action activeAction: null
2743+ property var activeItem: null
2744+ property bool triggerActionOnMouseRelease: false
2745+ property color color: Theme.palette.normal.background
2746+ property color selectedColor: "#E6E6E6"
2747+ property bool selected: false
2748+ property bool selectionMode: false
2749+ property alias internalAnchors: mainContents.anchors
2750+ default property alias contents: mainContents.children
2751+
2752+ readonly property double actionWidth: units.gu(4)
2753+ readonly property double leftActionWidth: units.gu(10)
2754+ readonly property double actionThreshold: actionWidth * 0.4
2755+ readonly property double threshold: 0.4
2756+ readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
2757+ readonly property alias swipping: mainItemMoving.running
2758+ readonly property bool _showActions: mouseArea.pressed || swipeState != "Normal" || swipping
2759+
2760+ /* internal */
2761+ property var _visibleRightSideActions: filterVisibleActions(rightSideActions)
2762+
2763+ signal itemClicked(var mouse)
2764+ signal itemPressAndHold(var mouse)
2765+
2766+ function returnToBoundsRTL(direction)
2767+ {
2768+ var actionFullWidth = actionWidth + units.gu(2)
2769+
2770+ // go back to normal state if swipping reverse
2771+ if (direction === "LTR") {
2772+ updatePosition(0)
2773+ return
2774+ } else if (!triggerActionOnMouseRelease) {
2775+ updatePosition(-rightActionsView.width + units.gu(2))
2776+ return
2777+ }
2778+
2779+ var xOffset = Math.abs(main.x)
2780+ var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
2781+ var newX = 0
2782+ if (index === _visibleRightSideActions.length) {
2783+ newX = -(rightActionsView.width - units.gu(2))
2784+ } else if (index >= 1) {
2785+ newX = -(actionFullWidth * index)
2786+ }
2787+ updatePosition(newX)
2788+ }
2789+
2790+ function returnToBoundsLTR(direction)
2791+ {
2792+ var finalX = leftActionWidth
2793+ if ((direction === "RTL") || (main.x <= (finalX * root.threshold)))
2794+ finalX = 0
2795+ updatePosition(finalX)
2796+ }
2797+
2798+ function returnToBounds(direction)
2799+ {
2800+ if (main.x < 0) {
2801+ returnToBoundsRTL(direction)
2802+ } else if (main.x > 0) {
2803+ returnToBoundsLTR(direction)
2804+ } else {
2805+ updatePosition(0)
2806+ }
2807+ }
2808+
2809+ function contains(item, point, marginX)
2810+ {
2811+ var itemStartX = item.x - marginX
2812+ var itemEndX = item.x + item.width + marginX
2813+ return (point.x >= itemStartX) && (point.x <= itemEndX) &&
2814+ (point.y >= item.y) && (point.y <= (item.y + item.height));
2815+ }
2816+
2817+ function getActionAt(point)
2818+ {
2819+ if (contains(leftActionView, point, 0)) {
2820+ return leftSideAction
2821+ } else if (contains(rightActionsView, point, 0)) {
2822+ var newPoint = root.mapToItem(rightActionsView, point.x, point.y)
2823+ for (var i = 0; i < rightActionsRepeater.count; i++) {
2824+ var child = rightActionsRepeater.itemAt(i)
2825+ if (contains(child, newPoint, units.gu(1))) {
2826+ return i
2827+ }
2828+ }
2829+ }
2830+ return -1
2831+ }
2832+
2833+ function updateActiveAction()
2834+ {
2835+ if (triggerActionOnMouseRelease &&
2836+ (main.x <= -(root.actionWidth + units.gu(2))) &&
2837+ (main.x > -(rightActionsView.width - units.gu(2)))) {
2838+ var actionFullWidth = actionWidth + units.gu(2)
2839+ var xOffset = Math.abs(main.x)
2840+ var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
2841+ index = index - 1
2842+ if (index > -1) {
2843+ root.activeItem = rightActionsRepeater.itemAt(index)
2844+ root.activeAction = root._visibleRightSideActions[index]
2845+ }
2846+ } else {
2847+ root.activeAction = null
2848+ }
2849+ }
2850+
2851+ function resetSwipe()
2852+ {
2853+ updatePosition(0)
2854+ }
2855+
2856+ function filterVisibleActions(actions)
2857+ {
2858+ var visibleActions = []
2859+ for(var i = 0; i < actions.length; i++) {
2860+ var action = actions[i]
2861+ if (action.visible) {
2862+ visibleActions.push(action)
2863+ }
2864+ }
2865+ return visibleActions
2866+ }
2867+
2868+ function updatePosition(pos)
2869+ {
2870+ if (!root.triggerActionOnMouseRelease && (pos !== 0)) {
2871+ mouseArea.state = pos > 0 ? "RightToLeft" : "LeftToRight"
2872+ } else {
2873+ mouseArea.state = ""
2874+ }
2875+ main.x = pos
2876+ }
2877+
2878+ states: [
2879+ State {
2880+ name: "select"
2881+ when: selectionMode || selected
2882+ PropertyChanges {
2883+ target: selectionIcon
2884+ source: Qt.resolvedUrl("ListItemWithActionsCheckBox.qml")
2885+ anchors.leftMargin: units.gu(2)
2886+ }
2887+ PropertyChanges {
2888+ target: root
2889+ locked: true
2890+ }
2891+ PropertyChanges {
2892+ target: main
2893+ x: 0
2894+ }
2895+ }
2896+ ]
2897+
2898+ height: defaultHeight
2899+ clip: height !== defaultHeight
2900+
2901+ Rectangle {
2902+ id: leftActionView
2903+
2904+ anchors {
2905+ top: parent.top
2906+ bottom: parent.bottom
2907+ right: main.left
2908+ }
2909+ width: root.leftActionWidth + actionThreshold
2910+ visible: leftSideAction
2911+ color: UbuntuColors.red
2912+
2913+ Icon {
2914+ anchors {
2915+ centerIn: parent
2916+ horizontalCenterOffset: actionThreshold / 2
2917+ }
2918+ name: leftSideAction && _showActions ? leftSideAction.iconName : ""
2919+ color: Theme.palette.selected.field
2920+ height: units.gu(3)
2921+ width: units.gu(3)
2922+ }
2923+ }
2924+
2925+ Rectangle {
2926+ id: rightActionsView
2927+
2928+ anchors {
2929+ top: main.top
2930+ left: main.right
2931+ bottom: main.bottom
2932+ }
2933+ visible: _visibleRightSideActions.length > 0
2934+ width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(2) : 0
2935+ color: "white"
2936+ Row {
2937+ anchors{
2938+ top: parent.top
2939+ left: parent.left
2940+ leftMargin: units.gu(2)
2941+ right: parent.right
2942+ rightMargin: units.gu(2)
2943+ bottom: parent.bottom
2944+ }
2945+ spacing: units.gu(2)
2946+ Repeater {
2947+ id: rightActionsRepeater
2948+
2949+ model: _showActions ? _visibleRightSideActions : []
2950+ Item {
2951+ property alias image: img
2952+
2953+ height: rightActionsView.height
2954+ width: root.actionWidth
2955+
2956+ Icon {
2957+ id: img
2958+
2959+ anchors.centerIn: parent
2960+ width: units.gu(3)
2961+ height: units.gu(3)
2962+ name: modelData.iconName
2963+ color: root.activeAction === modelData ? UbuntuColors.lightAubergine : UbuntuColors.lightGrey
2964+ }
2965+ }
2966+ }
2967+ }
2968+ }
2969+
2970+
2971+ Rectangle {
2972+ id: main
2973+ objectName: "mainItem"
2974+
2975+ anchors {
2976+ top: parent.top
2977+ bottom: parent.bottom
2978+ }
2979+
2980+ width: parent.width
2981+ color: root.selected ? root.selectedColor : root.color
2982+
2983+ Loader {
2984+ id: selectionIcon
2985+
2986+ anchors {
2987+ left: main.left
2988+ verticalCenter: main.verticalCenter
2989+ }
2990+ width: (status === Loader.Ready) ? item.implicitWidth : 0
2991+ visible: (status === Loader.Ready) && (item.width === item.implicitWidth)
2992+ Behavior on width {
2993+ NumberAnimation {
2994+ duration: UbuntuAnimation.SnapDuration
2995+ }
2996+ }
2997+ }
2998+
2999+
3000+ Item {
3001+ id: mainContents
3002+
3003+ anchors {
3004+ left: selectionIcon.right
3005+ leftMargin: units.gu(2)
3006+ top: parent.top
3007+ topMargin: units.gu(1)
3008+ right: parent.right
3009+ rightMargin: units.gu(2)
3010+ bottom: parent.bottom
3011+ bottomMargin: units.gu(1)
3012+ }
3013+ }
3014+
3015+ Behavior on x {
3016+ UbuntuNumberAnimation {
3017+ id: mainItemMoving
3018+
3019+ easing.type: Easing.OutElastic
3020+ duration: UbuntuAnimation.SlowDuration
3021+ }
3022+ }
3023+ Behavior on color {
3024+ ColorAnimation {}
3025+ }
3026+ }
3027+
3028+ SequentialAnimation {
3029+ id: triggerAction
3030+
3031+ property var currentItem: root.activeItem ? root.activeItem.image : null
3032+
3033+ running: false
3034+ ParallelAnimation {
3035+ UbuntuNumberAnimation {
3036+ target: triggerAction.currentItem
3037+ property: "opacity"
3038+ from: 1.0
3039+ to: 0.0
3040+ duration: UbuntuAnimation.SlowDuration
3041+ easing {type: Easing.InOutBack; }
3042+ }
3043+ UbuntuNumberAnimation {
3044+ target: triggerAction.currentItem
3045+ properties: "width, height"
3046+ from: units.gu(3)
3047+ to: root.actionWidth
3048+ duration: UbuntuAnimation.SlowDuration
3049+ easing {type: Easing.InOutBack; }
3050+ }
3051+ }
3052+ PropertyAction {
3053+ target: triggerAction.currentItem
3054+ properties: "width, height"
3055+ value: units.gu(3)
3056+ }
3057+ PropertyAction {
3058+ target: triggerAction.currentItem
3059+ properties: "opacity"
3060+ value: 1.0
3061+ }
3062+ ScriptAction {
3063+ script: {
3064+ root.activeAction.triggered(root)
3065+ mouseArea.state = ""
3066+ }
3067+ }
3068+ PauseAnimation {
3069+ duration: 500
3070+ }
3071+ UbuntuNumberAnimation {
3072+ target: main
3073+ property: "x"
3074+ to: 0
3075+
3076+ }
3077+ }
3078+
3079+ MouseArea {
3080+ id: mouseArea
3081+
3082+ property bool locked: root.locked || ((root.leftSideAction === null) && (root._visibleRightSideActions.count === 0))
3083+ property bool manual: false
3084+ property string direction: "None"
3085+ property real lastX: -1
3086+
3087+ anchors.fill: parent
3088+ drag {
3089+ target: locked ? null : main
3090+ axis: Drag.XAxis
3091+ minimumX: rightActionsView.visible ? -(rightActionsView.width) : 0
3092+ maximumX: leftActionView.visible ? leftActionView.width : 0
3093+ threshold: root.actionThreshold
3094+ }
3095+
3096+ states: [
3097+ State {
3098+ name: "LeftToRight"
3099+ PropertyChanges {
3100+ target: mouseArea
3101+ drag.maximumX: 0
3102+ }
3103+ },
3104+ State {
3105+ name: "RightToLeft"
3106+ PropertyChanges {
3107+ target: mouseArea
3108+ drag.minimumX: 0
3109+ }
3110+ }
3111+ ]
3112+
3113+ onMouseXChanged: {
3114+ var offset = (lastX - mouseX)
3115+ if (Math.abs(offset) <= root.actionThreshold) {
3116+ return
3117+ }
3118+ lastX = mouseX
3119+ direction = offset > 0 ? "RTL" : "LTR";
3120+ }
3121+
3122+ onPressed: {
3123+ lastX = mouse.x
3124+ }
3125+
3126+ onReleased: {
3127+ if (root.triggerActionOnMouseRelease && root.activeAction) {
3128+ triggerAction.start()
3129+ } else {
3130+ root.returnToBounds(direction)
3131+ root.activeAction = null
3132+ }
3133+ lastX = -1
3134+ direction = "None"
3135+ }
3136+ onClicked: {
3137+ if (main.x === 0) {
3138+ root.itemClicked(mouse)
3139+ } else if (main.x > 0) {
3140+ var action = getActionAt(Qt.point(mouse.x, mouse.y))
3141+ if (action && action !== -1) {
3142+ action.triggered(root)
3143+ }
3144+ } else {
3145+ var actionIndex = getActionAt(Qt.point(mouse.x, mouse.y))
3146+ if (actionIndex !== -1) {
3147+ root.activeItem = rightActionsRepeater.itemAt(actionIndex)
3148+ root.activeAction = root._visibleRightSideActions[actionIndex]
3149+ triggerAction.start()
3150+ return
3151+ }
3152+ }
3153+ root.resetSwipe()
3154+ }
3155+
3156+ onPositionChanged: {
3157+ if (mouseArea.pressed) {
3158+ updateActiveAction()
3159+ }
3160+ }
3161+ onPressAndHold: {
3162+ if (main.x === 0) {
3163+ root.itemPressAndHold(mouse)
3164+ }
3165+ }
3166+ z: -1
3167+ }
3168+}
3169+
3170
3171=== modified file 'src/app/qml/SettingsPage.qml'
3172--- src/app/qml/SettingsPage.qml 2016-02-06 16:58:50 +0000
3173+++ src/app/qml/SettingsPage.qml 2016-02-06 20:00:51 +0000
3174@@ -1,5 +1,5 @@
3175 /*
3176- * Copyright (C) 2013, 2014, 2016 Canonical Ltd
3177+ * Copyright (C) 2013, 2014 Canonical Ltd
3178 *
3179 * This program is free software: you can redistribute it and/or modify
3180 * it under the terms of the GNU General Public License version 3 as
3181@@ -17,17 +17,21 @@
3182 */
3183
3184 import QtQuick 2.4
3185-import Ubuntu.Components 1.3
3186+import Ubuntu.Components 1.2
3187+import Ubuntu.Components.ListItems 1.0 as ListItem
3188
3189 Page {
3190 id: settingsPage
3191 objectName: "settingsPage"
3192
3193 title: i18n.tr("Settings")
3194- flickable: null
3195-
3196- Flickable {
3197+
3198+ Column {
3199+ id: mainColumn
3200+
3201+ spacing: units.gu(1)
3202 anchors.fill: parent
3203+<<<<<<< TREE
3204 interactive: contentHeight + units.gu(6) > height
3205 contentHeight: mainColumn.height
3206
3207@@ -141,6 +145,84 @@
3208 }
3209
3210 onClicked: pageStack.push(colorSchemePage);
3211+=======
3212+
3213+ ListItem.Standard {
3214+ text: i18n.tr("Layouts")
3215+ progression: true
3216+ onClicked: pageStack.push(layoutsPage);
3217+ }
3218+
3219+ ListItem.Standard {
3220+ text: i18n.tr("Show Keyboard Bar")
3221+ control: Switch {
3222+ onCheckedChanged: settings.showKeyboardBar = checked;
3223+ Component.onCompleted: checked = settings.showKeyboardBar;
3224+ }
3225+ }
3226+
3227+ ListItem.Standard {
3228+ text: i18n.tr("Show Keyboard Button")
3229+ control: Switch {
3230+ onCheckedChanged: settings.showKeyboardButton = checked;
3231+ Component.onCompleted: checked = settings.showKeyboardButton;
3232+ }
3233+ }
3234+
3235+ ListItem.Empty {
3236+ height: units.gu(10)
3237+ Label {
3238+ text: i18n.tr("Font Size:")
3239+ x: units.gu(2)
3240+ }
3241+ Slider {
3242+ id: slFont
3243+ objectName: "slFont"
3244+ anchors {
3245+ left: parent.left
3246+ right: parent.right
3247+ bottom: parent.bottom
3248+ margins: units.gu(2)
3249+ }
3250+ minimumValue: settings.minFontSize;
3251+ maximumValue: settings.maxFontSize;
3252+ onValueChanged: {
3253+ settings.fontSize = value;
3254+ }
3255+ Component.onCompleted: {
3256+ value = settings.fontSize;
3257+ }
3258+
3259+ Connections {
3260+ target: settings
3261+ onFontSizeChanged: {
3262+ slFont.value = settings.fontSize
3263+ }
3264+ }
3265+ }
3266+ }
3267+
3268+ OptionSelector {
3269+ id: colorsSchemeSelector
3270+ objectName: "colorsSchemeSelector"
3271+ text: i18n.tr("Color Scheme")
3272+ width: parent.width - units.gu(4)
3273+ x: units.gu(2)
3274+
3275+ // TODO Hackish, but works quite well.
3276+ containerHeight: parent.height - y - units.gu(6)
3277+
3278+ // TODO This is a workaround at the moment.
3279+ // The application should get them from the c++.
3280+ model: ["GreenOnBlack","WhiteOnBlack","BlackOnWhite","BlackOnRandomLight","Linux","cool-retro-term","DarkPastels","BlackOnLightYellow", "Ubuntu"]
3281+
3282+ onSelectedIndexChanged: {
3283+ settings.colorScheme = model[selectedIndex];
3284+ }
3285+
3286+ Component.onCompleted: {
3287+ selectedIndex = model.indexOf(settings.colorScheme);
3288+>>>>>>> MERGE-SOURCE
3289 }
3290 }
3291 }
3292
3293=== modified file 'src/app/qml/TabsPage.qml'
3294--- src/app/qml/TabsPage.qml 2016-01-09 02:00:10 +0000
3295+++ src/app/qml/TabsPage.qml 2016-02-06 20:00:51 +0000
3296@@ -1,5 +1,6 @@
3297 import QtQuick 2.4
3298-import Ubuntu.Components 1.3
3299+import Ubuntu.Components 1.2
3300+import Ubuntu.Components.ListItems 1.0 as ListItem
3301
3302 Page {
3303 id: tabsPage
3304
3305=== modified file 'src/app/qml/TerminalComponent.qml'
3306--- src/app/qml/TerminalComponent.qml 2016-02-06 16:31:36 +0000
3307+++ src/app/qml/TerminalComponent.qml 2016-02-06 20:00:51 +0000
3308@@ -1,5 +1,5 @@
3309 import QtQuick 2.4
3310-import Ubuntu.Components 1.3
3311+import Ubuntu.Components 1.2
3312 import QMLTermWidget 1.0
3313
3314 Component {
3315
3316=== modified file 'src/app/qml/TerminalPage.qml'
3317--- src/app/qml/TerminalPage.qml 2016-01-22 18:01:49 +0000
3318+++ src/app/qml/TerminalPage.qml 2016-02-06 20:00:51 +0000
3319@@ -1,6 +1,6 @@
3320 import QtQuick 2.4
3321-import Ubuntu.Components 1.3
3322-import Ubuntu.Components.Popups 1.3
3323+import Ubuntu.Components 1.2
3324+import Ubuntu.Components.Popups 1.0
3325 import QMLTermWidget 1.0
3326
3327 Page {
3328@@ -10,12 +10,6 @@
3329
3330 anchors.fill: parent
3331
3332- header: PageHeader {
3333- // WORKAROUND: This way we disable the 'hide' animation when
3334- // closing the settings page.
3335- visible: false
3336- }
3337-
3338 AlternateActionPopover {
3339 id: alternateActionPopover
3340 }
3341
3342=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
3343--- src/app/qml/ubuntu-terminal-app.qml 2016-01-29 02:16:38 +0000
3344+++ src/app/qml/ubuntu-terminal-app.qml 2016-02-06 20:00:51 +0000
3345@@ -1,6 +1,6 @@
3346 import QtQuick 2.4
3347 import QtGraphicalEffects 1.0
3348-import Ubuntu.Components 1.3
3349+import Ubuntu.Components 1.2
3350 import "KeyboardRows"
3351
3352 import QMLTermWidget 1.0
3353@@ -115,15 +115,6 @@
3354 id: layoutsPage
3355 visible: false
3356 }
3357-
3358- ColorSchemePage {
3359- id: colorSchemePage
3360- visible: false
3361-
3362- // TODO This is a workaround at the moment.
3363- // The application should get them from the c++.
3364- model: ["GreenOnBlack","WhiteOnBlack","BlackOnWhite","BlackOnRandomLight","Linux","cool-retro-term","DarkPastels","BlackOnLightYellow", "Ubuntu"]
3365- }
3366 }
3367
3368 Component.onCompleted: {
3369
3370=== modified file 'src/plugin/qmltermwidget/lib/TerminalDisplay.cpp'
3371--- src/plugin/qmltermwidget/lib/TerminalDisplay.cpp 2015-02-14 10:33:32 +0000
3372+++ src/plugin/qmltermwidget/lib/TerminalDisplay.cpp 2016-02-06 20:00:51 +0000
3373@@ -2570,6 +2570,11 @@
3374 emitSelection(true,false);
3375 }
3376
3377+bool TerminalDisplay::isClipboardEmpty()
3378+{
3379+ return QApplication::clipboard()->text().isEmpty();
3380+}
3381+
3382 /* ------------------------------------------------------------------------- */
3383 /* */
3384 /* Keyboard */
3385
3386=== modified file 'src/plugin/qmltermwidget/lib/TerminalDisplay.h'
3387--- src/plugin/qmltermwidget/lib/TerminalDisplay.h 2015-02-14 10:33:32 +0000
3388+++ src/plugin/qmltermwidget/lib/TerminalDisplay.h 2016-02-06 20:00:51 +0000
3389@@ -482,6 +482,10 @@
3390 */
3391 void pasteSelection();
3392
3393+ /** Checks if the clipboard is empty
3394+ */
3395+ bool isClipboardEmpty();
3396+
3397 /**
3398 * Changes whether the flow control warning box should be shown when the flow control
3399 * stop key (Ctrl+S) are pressed.
3400
3401=== modified file 'terminal.apparmor'
3402--- terminal.apparmor 2016-01-09 01:49:55 +0000
3403+++ terminal.apparmor 2016-02-06 20:00:51 +0000
3404@@ -2,4 +2,4 @@
3405 "policy_groups": [],
3406 "policy_version": 1.3,
3407 "template": "unconfined"
3408-}
3409\ No newline at end of file
3410+}

Subscribers

People subscribed via source and target branches