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

[Evan McIntire]

Disables "paste" if the clipboard buffer is empty

Disables "paste" if the clipboard buffer is empty

[Niklas Wenzel (nikwen)]

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)]

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)]

Looks good!

review: Approve

[Niklas Wenzel (nikwen)]

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)]

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

[Evan McIntire (mcintire-evan)]

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)]

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)]

Alright, there we go :)

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

[David Planella (dpm)]

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).

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:155
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/217/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/503/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/217/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:155
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/982/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/527/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/982/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:155
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/989/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/534/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/989/rebuild

review: Approve (continuous-integration)

[Stefano Verzegnassi (verzegnassi-stefano)]

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)]

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)]

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

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)]

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. ;)

[lp:~mcintire-evan/ubuntu-terminal-app/disable-paste]

155. By Evan McIntire on 2016-02-06

Hopefully fix merge issues

[Evan McIntire (mcintire-evan)]

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

[Stefano Verzegnassi (verzegnassi-stefano)]

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)]

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

[Stefano Verzegnassi (verzegnassi-stefano)]

@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)]

@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

=== modified file 'manifest.json.in'
--- manifest.json.in	2016-01-09 01:49:55 +0000
+++ manifest.json.in	2016-02-06 20:00:51 +0000
@@ -1,6 +1,6 @@
 {
     "description": "Terminal application",
-    "framework": "ubuntu-sdk-15.04.3",
+    "framework": "ubuntu-sdk-15.04",
     "architecture": "@CLICK_ARCH@",
     "hooks": {
         "terminal": {

=== modified file 'po/am.po'
--- po/am.po	2016-01-23 05:52:15 +0000
+++ po/am.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
-"PO-Revision-Date: 2016-01-22 14:40+0000\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+"PO-Revision-Date: 2015-09-22 22:32+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-23 05:52+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "ማረጋገጫ ያስፈልጋል"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr "የ ማለፊያ ኮድ ወይንም የ ማለፊያ ሀረግ ያስገቡ:"
+msgid "Enter password:"
+msgstr "የመግቢያ ቃል ያስገቡ:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr "የ ማለፊያ ኮድ ወይንም የ ማለፊያ ሀረግ"
+msgid "password"
+msgstr "የመግቢያ ቃል"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -163,7 +163,7 @@
 
 #: ../src/app/qml/SettingsPage.qml:50
 msgid "Show Keyboard Button"
-msgstr "የ ፊደል ገበታ ቁልፍ ማሳያ"
+msgstr ""
 
 #: ../src/app/qml/SettingsPage.qml:60
 msgid "Font Size:"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "ተርሚናል"
 
-#~ msgid "Enter password:"
-#~ msgstr "የመግቢያ ቃል ያስገቡ:"
-
-#~ msgid "password"
-#~ msgstr "የመግቢያ ቃል"
-
 #~ msgid "Ok"
 #~ msgstr "እሺ"

=== modified file 'po/ar.po'
--- po/ar.po	2016-01-22 06:01:12 +0000
+++ po/ar.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-02-03 05:51+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "الاستيثاق مطلوب"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "أدخل كلمة السر:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "كلمة السر"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -249,11 +249,5 @@
 msgid "Terminal"
 msgstr ""
 
-#~ msgid "Enter password:"
-#~ msgstr "أدخل كلمة السر:"
-
 #~ msgid "Ok"
 #~ msgstr "موافق"
-
-#~ msgid "password"
-#~ msgstr "كلمة السر"

=== modified file 'po/ast.po'
--- po/ast.po	2016-01-22 06:01:12 +0000
+++ po/ast.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-10-31 15:29+0000\n"
 "Last-Translator: enolp <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Ríquese l'autenticación"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Introduz la contraseña:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "contraseña"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "password"
-#~ msgstr "contraseña"
-
 #~ msgid "Ok"
 #~ msgstr "Aceutar"
-
-#~ msgid "Enter password:"
-#~ msgstr "Introduz la contraseña:"

=== modified file 'po/az.po'
--- po/az.po	2016-01-22 06:01:12 +0000
+++ po/az.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-12-26 12:21+0000\n"
 "Last-Translator: Nicat Məmmədov <[e-mail]>\n"
 "Language-Team: Azerbaijani <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Təsdiqlənmə lazımdır"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Şifrəni daxil edin:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "şifrə"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -248,9 +248,3 @@
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr ""
-
-#~ msgid "Enter password:"
-#~ msgstr "Şifrəni daxil edin:"
-
-#~ msgid "password"
-#~ msgstr "şifrə"

=== modified file 'po/be.po'
--- po/be.po	2016-01-22 06:01:12 +0000
+++ po/be.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-09-14 13:41+0000\n"
 "Last-Translator: Siamion Šachalevič <[e-mail]>\n"
 "Language-Team: Belarusian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Патрабуецца ідэнтыфікацыя"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Увядзіце пароль"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "пароль"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,9 +251,3 @@
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr "Тэрмінал"
-
-#~ msgid "Enter password:"
-#~ msgstr "Увядзіце пароль"
-
-#~ msgid "password"
-#~ msgstr "пароль"

=== modified file 'po/br.po'
--- po/br.po	2016-01-22 06:01:12 +0000
+++ po/br.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-08-25 13:43+0000\n"
 "Last-Translator: Fohanno Thierry <[e-mail]>\n"
 "Language-Team: Breton <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Dilesadur rekis"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Merkañ ar ger-tremen :"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "ger-tremen"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -254,9 +254,3 @@
 
 #~ msgid "Ok"
 #~ msgstr "Mat eo"
-
-#~ msgid "Enter password:"
-#~ msgstr "Merkañ ar ger-tremen :"
-
-#~ msgid "password"
-#~ msgstr "ger-tremen"

=== modified file 'po/bs.po'
--- po/bs.po	2016-01-22 06:01:12 +0000
+++ po/bs.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-09-01 16:38+0000\n"
 "Last-Translator: Kenan Gutić <Unknown>\n"
 "Language-Team: Bosnian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Potrebna autentifikacija"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Unesite šifru:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "šifra"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -250,9 +250,3 @@
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
-
-#~ msgid "Enter password:"
-#~ msgstr "Unesite šifru:"
-
-#~ msgid "password"
-#~ msgstr "šifra"

=== modified file 'po/ca.po'
--- po/ca.po	2016-01-30 05:47:13 +0000
+++ po/ca.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,25 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2016-01-19 20:23-0500\n"
 "PO-Revision-Date: 2016-01-29 09:46+0000\n"
+=======
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+"PO-Revision-Date: 2015-01-23 11:42+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: David Planella <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-01-30 05:47+0000\n"
 "X-Generator: Launchpad (build 17908)\n"
+=======
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +44,22 @@
 msgstr "Cal autenticació"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
+<<<<<<< TREE
 msgid "Enter passcode or passphrase:"
 msgstr "Introduïu la contrasenya:"
+=======
+msgid "Enter password:"
+msgstr "Introduïu la contrasenya:"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
+<<<<<<< TREE
 msgid "passcode or passphrase"
 msgstr "contrasenya"
+=======
+msgid "password"
+msgstr "Contrasenya"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +271,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Introduïu la contrasenya:"
-
-#~ msgid "password"
-#~ msgstr "Contrasenya"
-
 #~ msgid "Ok"
 #~ msgstr "D'acord"

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2016-02-06 18:18:42 +0000
+++ po/com.ubuntu.terminal.pot	2016-02-06 20:00:51 +0000
@@ -8,7 +8,11 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2016-02-06 17:44+0100\n"
+=======
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -34,11 +38,11 @@
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
+msgid "Enter password:"
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
+msgid "password"
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:50

=== modified file 'po/cs.po'
--- po/cs.po	2016-01-22 06:01:12 +0000
+++ po/cs.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-07-03 12:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,11 +34,11 @@
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
+msgid "Enter password:"
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
+msgid "password"
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:50

=== modified file 'po/cy.po'
--- po/cy.po	2016-01-22 06:01:12 +0000
+++ po/cy.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-07-14 12:43+0000\n"
 "Last-Translator: Owen Llywelyn <[e-mail]>\n"
 "Language-Team: Welsh <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Angen dilysu"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Rhowch gyfrinair:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "cyfrinair"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -250,9 +250,3 @@
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr "Terfynell"
-
-#~ msgid "Enter password:"
-#~ msgstr "Rhowch gyfrinair:"
-
-#~ msgid "password"
-#~ msgstr "cyfrinair"

=== modified file 'po/da.po'
--- po/da.po	2016-01-22 06:01:12 +0000
+++ po/da.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-06-04 20:02+0000\n"
 "Last-Translator: Aputsiaĸ Niels Janussen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,11 +34,11 @@
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
+msgid "Enter password:"
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
+msgid "password"
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:50

=== modified file 'po/de.po'
--- po/de.po	2016-01-22 06:01:12 +0000
+++ po/de.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-08-12 21:44+0000\n"
 "Last-Translator: Phillip Sz <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Legitimierung erforderlich"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Passwort eingeben:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "Passwort"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Befehlsfenster"
 
-#~ msgid "Enter password:"
-#~ msgstr "Passwort eingeben:"
-
-#~ msgid "password"
-#~ msgstr "Passwort"
-
 #~ msgid "Ok"
 #~ msgstr "Ok"

=== modified file 'po/el.po'
--- po/el.po	2016-01-22 06:01:12 +0000
+++ po/el.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-12-08 18:13+0000\n"
 "Last-Translator: Aggelos Arnaoutis <[e-mail]>\n"
 "Language-Team: Greek <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Απαιτείται πιστοποίηση"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Εισάγετε κωδικό πρόσβασης:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "κωδικός πρόσβασης"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -254,9 +254,3 @@
 
 #~ msgid "Ok"
 #~ msgstr "Εντάξει"
-
-#~ msgid "Enter password:"
-#~ msgstr "Εισάγετε κωδικό πρόσβασης:"
-
-#~ msgid "password"
-#~ msgstr "κωδικός πρόσβασης"

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2016-01-22 06:01:12 +0000
+++ po/en_AU.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-01-21 02:20+0000\n"
 "Last-Translator: Joel Addison <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Authentication required"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Enter password:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "password"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Enter password:"
-
 #~ msgid "Ok"
 #~ msgstr "Ok"
-
-#~ msgid "password"
-#~ msgstr "password"

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2016-01-22 06:01:12 +0000
+++ po/en_GB.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-09-07 13:48+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Authentication required"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Enter password:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "password"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Enter password:"
-
 #~ msgid "Ok"
 #~ msgstr "Ok"
-
-#~ msgid "password"
-#~ msgstr "password"

=== modified file 'po/eo.po'
--- po/eo.po	2016-01-22 06:01:12 +0000
+++ po/eo.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2016-01-17 16:31+0000\n"
 "Last-Translator: Esperanto <Unknown>\n"
 "Language-Team: Esperanto <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-18 05:52+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Aŭtentokontrolo bezonatas"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
+msgid "Enter password:"
 msgstr ""
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "pasvorto"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -250,6 +250,3 @@
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr "Terminalo"
-
-#~ msgid "password"
-#~ msgstr "pasvorto"

=== modified file 'po/es.po'
--- po/es.po	2016-01-22 06:01:12 +0000
+++ po/es.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-07-01 15:47+0000\n"
 "Last-Translator: Luciano Barea <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Se necesita autenticación"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Escriba la contraseña:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "contraseña"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -252,11 +252,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Escriba la contraseña:"
-
-#~ msgid "password"
-#~ msgstr "contraseña"
-
 #~ msgid "Ok"
 #~ msgstr "Aceptar"

=== modified file 'po/eu.po'
--- po/eu.po	2016-01-22 06:01:12 +0000
+++ po/eu.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-01-21 00:32+0000\n"
 "Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
 "Language-Team: Basque <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Autentifikazioa behar da"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Sartu pasahitza:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "pasahitza"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Terminala"
 
-#~ msgid "Enter password:"
-#~ msgstr "Sartu pasahitza:"
-
-#~ msgid "password"
-#~ msgstr "pasahitza"
-
 #~ msgid "Ok"
 #~ msgstr "Ados"

=== modified file 'po/fa.po'
--- po/fa.po	2016-01-22 06:01:12 +0000
+++ po/fa.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-12-04 17:36+0000\n"
 "Last-Translator: Danial Behzadi <[e-mail]>\n"
 "Language-Team: Persian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "تأیید هویت لازم است"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "گذرواژه را وارد کنید:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "گذرواژه"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "پایانه"
 
-#~ msgid "Enter password:"
-#~ msgstr "گذرواژه را وارد کنید:"
-
-#~ msgid "password"
-#~ msgstr "گذرواژه"
-
 #~ msgid "Ok"
 #~ msgstr "تأیید"

=== modified file 'po/fi.po'
--- po/fi.po	2016-01-22 06:01:12 +0000
+++ po/fi.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-01-18 19:39+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Tunnistautuminen vaaditaan"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Anna salasana:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "salasana"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Pääte"
 
-#~ msgid "Enter password:"
-#~ msgstr "Anna salasana:"
-
-#~ msgid "password"
-#~ msgstr "salasana"
-
 #~ msgid "Ok"
 #~ msgstr "OK"

=== modified file 'po/fo.po'
--- po/fo.po	2016-01-29 05:43:45 +0000
+++ po/fo.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,25 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2016-01-19 20:23-0500\n"
 "PO-Revision-Date: 2016-01-28 20:36+0000\n"
+=======
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+"PO-Revision-Date: 2015-11-05 20:34+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Angutivik Casper Rúnur Tausen Hansen <Unknown>\n"
 "Language-Team: Faroese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-01-29 05:43+0000\n"
 "X-Generator: Launchpad (build 17902)\n"
+=======
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +44,22 @@
 msgstr "Samgildi er neyðugt"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
+<<<<<<< TREE
 msgid "Enter passcode or passphrase:"
 msgstr "Skriva loyniorð:"
+=======
+msgid "Enter password:"
+msgstr "Skriva loyniorð:"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
+<<<<<<< TREE
 msgid "passcode or passphrase"
 msgstr "loyniorð"
+=======
+msgid "password"
+msgstr "loyniorð"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -250,9 +270,3 @@
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
-
-#~ msgid "Enter password:"
-#~ msgstr "Skriva loyniorð:"
-
-#~ msgid "password"
-#~ msgstr "loyniorð"

=== modified file 'po/fr.po'
--- po/fr.po	2016-01-22 06:01:12 +0000
+++ po/fr.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2016-01-18 19:09+0000\n"
 "Last-Translator: Anne <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-19 05:53+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Authentification requise"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Entrez le mot de passe :"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "mot de passe"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -252,11 +252,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Entrez le mot de passe :"
-
 #~ msgid "Ok"
 #~ msgstr "Valider"
-
-#~ msgid "password"
-#~ msgstr "mot de passe"

=== modified file 'po/gd.po'
--- po/gd.po	2016-01-27 05:33:42 +0000
+++ po/gd.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2016-01-19 20:23-0500\n"
 "PO-Revision-Date: 2016-01-26 22:27+0000\n"
 "Last-Translator: Akerbeltz <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+"PO-Revision-Date: 2015-03-20 04:16+0000\n"
+"Last-Translator: GunChleoc <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Fòram na Gàidhlig\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-01-27 05:33+0000\n"
 "X-Generator: Launchpad (build 17902)\n"
+=======
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
+>>>>>>> MERGE-SOURCE
 "Language: gd\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
@@ -35,12 +46,22 @@
 msgstr "Tha feum air dearbhadh"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
+<<<<<<< TREE
 msgid "Enter passcode or passphrase:"
 msgstr "Cuir a-steach an còd-faire no an abairt-fhaire:"
+=======
+msgid "Enter password:"
+msgstr "Cuir a-steach facal-faire:"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
+<<<<<<< TREE
 msgid "passcode or passphrase"
 msgstr "còd-faire no abairt-fhaire"
+=======
+msgid "password"
+msgstr "facal-faire"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -255,9 +276,3 @@
 
 #~ msgid "Ok"
 #~ msgstr "Ceart ma-thà"
-
-#~ msgid "password"
-#~ msgstr "facal-faire"
-
-#~ msgid "Enter password:"
-#~ msgstr "Cuir a-steach facal-faire:"

=== modified file 'po/gl.po'
--- po/gl.po	2016-01-23 05:52:15 +0000
+++ po/gl.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
-"PO-Revision-Date: 2016-01-22 14:38+0000\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+"PO-Revision-Date: 2016-01-18 17:48+0000\n"
 "Last-Translator: Marcos Lans <Unknown>\n"
 "Language-Team: Galician <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-23 05:52+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-19 05:53+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Requírese autenticación"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr "Introducir código ou contrasinal:"
+msgid "Enter password:"
+msgstr "Introduza o contrasinal:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr "código ou contrasinal"
+msgid "password"
+msgstr "contrasinal"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Introduza o contrasinal:"
-
 #~ msgid "Ok"
 #~ msgstr "Aceptar"
-
-#~ msgid "password"
-#~ msgstr "contrasinal"

=== modified file 'po/he.po'
--- po/he.po	2016-01-22 06:01:12 +0000
+++ po/he.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-01-16 14:56+0000\n"
 "Last-Translator: Yaron <[e-mail]>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "נדרש אימות"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "נא להזין ססמה:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "ססמה"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -249,11 +249,5 @@
 msgid "Terminal"
 msgstr "מסוף"
 
-#~ msgid "Enter password:"
-#~ msgstr "נא להזין ססמה:"
-
-#~ msgid "password"
-#~ msgstr "ססמה"
-
 #~ msgid "Ok"
 #~ msgstr "אישור"

=== modified file 'po/hr.po'
--- po/hr.po	2016-01-22 06:01:12 +0000
+++ po/hr.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2016-01-08 15:22+0000\n"
 "Last-Translator: gogo <[e-mail]>\n"
 "Language-Team: Croatian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Potrebna autentifikacija"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Upišite lozinku:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "lozinka"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Upišite lozinku:"
-
 #~ msgid "Ok"
 #~ msgstr "U redu"
-
-#~ msgid "password"
-#~ msgstr "lozinka"

=== modified file 'po/hu.po'
--- po/hu.po	2016-01-22 06:01:12 +0000
+++ po/hu.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-08-12 06:49+0000\n"
 "Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Hitelesítés szükséges"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Jelszó megadása:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "jelszó"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -253,9 +253,3 @@
 
 #~ msgid "Ok"
 #~ msgstr "Ok"
-
-#~ msgid "Enter password:"
-#~ msgstr "Jelszó megadása:"
-
-#~ msgid "password"
-#~ msgstr "jelszó"

=== modified file 'po/id.po'
--- po/id.po	2016-01-22 06:01:12 +0000
+++ po/id.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-07-30 01:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Perlu otentikasi"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Masukkan sandi:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "sandi"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -252,11 +252,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Masukkan sandi:"
-
-#~ msgid "password"
-#~ msgstr "sandi"
-
 #~ msgid "Ok"
 #~ msgstr "Oke"

=== modified file 'po/it.po'
--- po/it.po	2016-01-22 06:01:12 +0000
+++ po/it.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-09-18 08:37+0000\n"
 "Last-Translator: Claudio Arseni <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Richiesta autenticazione"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Inserire la password:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "password"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -252,11 +252,5 @@
 msgid "Terminal"
 msgstr "Terminale"
 
-#~ msgid "password"
-#~ msgstr "password"
-
 #~ msgid "Ok"
 #~ msgstr "Ok"
-
-#~ msgid "Enter password:"
-#~ msgstr "Inserire la password:"

=== modified file 'po/ja.po'
--- po/ja.po	2016-01-22 06:01:12 +0000
+++ po/ja.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-01-21 06:32+0000\n"
 "Last-Translator: Shushi Kurose <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "認証が必要です"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "パスワードを入力:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "パスワード"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -249,11 +249,5 @@
 msgid "Terminal"
 msgstr "端末"
 
-#~ msgid "Enter password:"
-#~ msgstr "パスワードを入力:"
-
 #~ msgid "Ok"
 #~ msgstr "OK"
-
-#~ msgid "password"
-#~ msgstr "パスワード"

=== modified file 'po/lv.po'
--- po/lv.po	2016-01-22 06:01:12 +0000
+++ po/lv.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-11-21 19:02+0000\n"
 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
 "Language-Team: Latvian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Nepieciešama autentifikācija"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Ievadiet paroli"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "parole"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Terminālis"
 
-#~ msgid "Enter password:"
-#~ msgstr "Ievadiet paroli"
-
 #~ msgid "Ok"
 #~ msgstr "Labi"
-
-#~ msgid "password"
-#~ msgstr "parole"

=== modified file 'po/nb.po'
--- po/nb.po	2016-01-22 06:01:12 +0000
+++ po/nb.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-11-07 12:39+0000\n"
 "Last-Translator: Åka Sikrom <Unknown>\n"
 "Language-Team: Norwegian Bokmal <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Autentisering kreves"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Skriv inn passord:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "passord"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -253,9 +253,3 @@
 
 #~ msgid "Ok"
 #~ msgstr "OK"
-
-#~ msgid "password"
-#~ msgstr "passord"
-
-#~ msgid "Enter password:"
-#~ msgstr "Skriv inn passord:"

=== modified file 'po/nl.po'
--- po/nl.po	2016-01-22 06:01:12 +0000
+++ po/nl.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-09-03 08:44+0000\n"
 "Last-Translator: Hannie Dumoleyn <Unknown>\n"
 "Language-Team: Dutch <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:00+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Authenticatie vereist"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Voer wachtwoord in:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "wachtwoord"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -252,11 +252,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Voer wachtwoord in:"
-
 #~ msgid "Ok"
 #~ msgstr "Ok"
-
-#~ msgid "password"
-#~ msgstr "wachtwoord"

=== modified file 'po/pa.po'
--- po/pa.po	2016-01-22 06:01:12 +0000
+++ po/pa.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-06-17 14:19+0000\n"
 "Last-Translator: Gursharnjit_Singh <[e-mail]>\n"
 "Language-Team: Punjabi <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਦੀ ਲੋੜ"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "ਪਾਸਵਰਡ"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "ਟਰਮੀਨਲ"
 
-#~ msgid "Enter password:"
-#~ msgstr "ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"
-
 #~ msgid "Ok"
 #~ msgstr "ਠੀਕ"
-
-#~ msgid "password"
-#~ msgstr "ਪਾਸਵਰਡ"

=== modified file 'po/pl.po'
--- po/pl.po	2016-02-02 05:48:35 +0000
+++ po/pl.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,25 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2016-01-19 20:23-0500\n"
 "PO-Revision-Date: 2016-02-01 07:32+0000\n"
+=======
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+"PO-Revision-Date: 2015-08-28 14:57+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Krzysztof Tataradziński <Unknown>\n"
 "Language-Team: Polish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2016-02-02 05:48+0000\n"
 "X-Generator: Launchpad (build 17908)\n"
+=======
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
+>>>>>>> MERGE-SOURCE
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +44,12 @@
 msgstr "Wymagane jest uwierzytelnienie"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Podaj hasło:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "hasło"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +261,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Podaj hasło:"
-
 #~ msgid "Ok"
 #~ msgstr "OK"
-
-#~ msgid "password"
-#~ msgstr "hasło"

=== modified file 'po/pt.po'
--- po/pt.po	2016-01-23 05:52:15 +0000
+++ po/pt.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
-"PO-Revision-Date: 2016-01-22 22:43+0000\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+"PO-Revision-Date: 2016-01-15 10:38+0000\n"
 "Last-Translator: Ivo Xavier <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-23 05:52+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-16 05:50+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "É necessário autenticar"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr "Introduza código ou frase-senha:"
+msgid "Enter password:"
+msgstr "Introduza palavra-passe:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr "código ou frase-senha"
+msgid "password"
+msgstr "palavra-passe"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -253,9 +253,3 @@
 
 #~ msgid "Ok"
 #~ msgstr "Ok"
-
-#~ msgid "Enter password:"
-#~ msgstr "Introduza palavra-passe:"
-
-#~ msgid "password"
-#~ msgstr "palavra-passe"

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2016-01-22 06:01:12 +0000
+++ po/pt_BR.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-02-26 15:53+0000\n"
 "Last-Translator: Tiago Hillebrandt <[e-mail]>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Autenticação necessária"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Informe a senha:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "senha"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -254,9 +254,3 @@
 
 #~ msgid "Ok"
 #~ msgstr "Ok"
-
-#~ msgid "password"
-#~ msgstr "senha"
-
-#~ msgid "Enter password:"
-#~ msgstr "Informe a senha:"

=== modified file 'po/ro.po'
--- po/ro.po	2016-01-22 06:01:12 +0000
+++ po/ro.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-08-31 17:16+0000\n"
 "Last-Translator: Meriuță Cornel <[e-mail]>\n"
 "Language-Team: Romanian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Autentificare necesară"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Introduceţi parola:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "parolă"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -248,9 +248,3 @@
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
-
-#~ msgid "Enter password:"
-#~ msgstr "Introduceţi parola:"
-
-#~ msgid "password"
-#~ msgstr "parolă"

=== modified file 'po/ru.po'
--- po/ru.po	2016-01-22 06:01:12 +0000
+++ po/ru.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-01-19 05:38+0000\n"
 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Требуется аутентификация"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Введите пароль:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "пароль"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -253,9 +253,3 @@
 
 #~ msgid "Ok"
 #~ msgstr "ОК"
-
-#~ msgid "password"
-#~ msgstr "пароль"
-
-#~ msgid "Enter password:"
-#~ msgstr "Введите пароль:"

=== modified file 'po/sl.po'
--- po/sl.po	2016-01-22 06:01:12 +0000
+++ po/sl.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-01-18 09:37+0000\n"
 "Last-Translator: Damir Jerovšek <Unknown>\n"
 "Language-Team: Slovenian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Zahtevana je overitev"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Vnesite geslo:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "geslo"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#~ msgid "Enter password:"
-#~ msgstr "Vnesite geslo:"
-
-#~ msgid "password"
-#~ msgstr "geslo"
-
 #~ msgid "Ok"
 #~ msgstr "V redu"

=== modified file 'po/sr.po'
--- po/sr.po	2016-01-22 06:01:12 +0000
+++ po/sr.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
-"PO-Revision-Date: 2016-01-21 22:18+0000\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
+"PO-Revision-Date: 2015-09-07 20:05+0000\n"
 "Last-Translator: Bojan Bogdanović <Unknown>\n"
 "Language-Team: Serbian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Обавезна аутентификација"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Унесите лозинку:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "лозинка"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -163,7 +163,7 @@
 
 #: ../src/app/qml/SettingsPage.qml:50
 msgid "Show Keyboard Button"
-msgstr "Прикажи дугме тастатуре"
+msgstr ""
 
 #: ../src/app/qml/SettingsPage.qml:60
 msgid "Font Size:"
@@ -250,9 +250,3 @@
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr "Терминал"
-
-#~ msgid "Enter password:"
-#~ msgstr "Унесите лозинку:"
-
-#~ msgid "password"
-#~ msgstr "лозинка"

=== modified file 'po/sv.po'
--- po/sv.po	2016-01-22 06:01:12 +0000
+++ po/sv.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-08-14 22:07+0000\n"
 "Last-Translator: Marcus Gisslén <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 "Language: sv\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
@@ -35,12 +35,12 @@
 msgstr "Autentisering krävs"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Ange lösenord:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "lösenord"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,9 +251,3 @@
 #: com.ubuntu.terminal.desktop.in.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
-
-#~ msgid "Enter password:"
-#~ msgstr "Ange lösenord:"
-
-#~ msgid "password"
-#~ msgstr "lösenord"

=== modified file 'po/tr.po'
--- po/tr.po	2016-01-22 06:01:12 +0000
+++ po/tr.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-11-10 06:48+0000\n"
 "Last-Translator: Mutlu Can YILMAZ <[e-mail]>\n"
 "Language-Team: Turkish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Kimlik doğrulama gerekli"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Parolayı girin:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "parola"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "Uçbirim"
 
-#~ msgid "Enter password:"
-#~ msgstr "Parolayı girin:"
-
 #~ msgid "Ok"
 #~ msgstr "Tamam"
-
-#~ msgid "password"
-#~ msgstr "parola"

=== modified file 'po/ug.po'
--- po/ug.po	2016-01-22 06:01:12 +0000
+++ po/ug.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-10-25 04:06+0000\n"
 "Last-Translator: Eltikin <[e-mail]>\n"
 "Language-Team: Uyghur <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "كىملىك دەلىللەش زۆرۈر"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "ئىم كىرگۈزۈڭ :"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "ئىم"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -251,11 +251,5 @@
 msgid "Terminal"
 msgstr "تېرمىنال"
 
-#~ msgid "password"
-#~ msgstr "ئىم"
-
 #~ msgid "Ok"
 #~ msgstr "تامام"
-
-#~ msgid "Enter password:"
-#~ msgstr "ئىم كىرگۈزۈڭ :"

=== modified file 'po/uk.po'
--- po/uk.po	2016-01-22 06:01:12 +0000
+++ po/uk.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-01-16 14:58+0000\n"
 "Last-Translator: Yuri Chornoivan <[e-mail]>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "Слід пройти розпізнавання"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "Введіть пароль:"
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "пароль"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -252,11 +252,5 @@
 msgid "Terminal"
 msgstr "Термінал"
 
-#~ msgid "Enter password:"
-#~ msgstr "Введіть пароль:"
-
-#~ msgid "password"
-#~ msgstr "пароль"
-
 #~ msgid "Ok"
 #~ msgstr "Гаразд"

=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2016-01-22 06:01:12 +0000
+++ po/zh_CN.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-01-20 09:16+0000\n"
 "Last-Translator: cthbleachbit <Unknown>\n"
 "Language-Team: Chinese (Simplified) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "需要认证"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "输入密码："
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "密码"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -249,11 +249,5 @@
 msgid "Terminal"
 msgstr "终端"
 
-#~ msgid "Enter password:"
-#~ msgstr "输入密码："
-
 #~ msgid "Ok"
 #~ msgstr "确定"
-
-#~ msgid "password"
-#~ msgstr "密码"

=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2016-01-22 06:01:12 +0000
+++ po/zh_TW.po	2016-02-06 20:00:51 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntu-terminal-app\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2015-12-19 00:08-0500\n"
 "PO-Revision-Date: 2015-03-01 07:21+0000\n"
 "Last-Translator: Cheng-Chia Tseng <[e-mail]>\n"
 "Language-Team: Chinese (Traditional) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-01-22 06:01+0000\n"
-"X-Generator: Launchpad (build 17902)\n"
+"X-Launchpad-Export-Date: 2016-01-14 06:13+0000\n"
+"X-Generator: Launchpad (build 17886)\n"
 
 #: ../src/app/qml/AlternateActionPopover.qml:13
 msgid "Select"
@@ -34,12 +34,12 @@
 msgstr "要求核對身分"
 
 #: ../src/app/qml/AuthenticationDialog.qml:27
-msgid "Enter passcode or passphrase:"
-msgstr ""
+msgid "Enter password:"
+msgstr "輸入密碼："
 
 #: ../src/app/qml/AuthenticationDialog.qml:40
-msgid "passcode or passphrase"
-msgstr ""
+msgid "password"
+msgstr "密碼"
 
 #: ../src/app/qml/AuthenticationDialog.qml:50
 msgid "OK"
@@ -249,11 +249,5 @@
 msgid "Terminal"
 msgstr "終端機"
 
-#~ msgid "Enter password:"
-#~ msgstr "輸入密碼："
-
-#~ msgid "password"
-#~ msgstr "密碼"
-
 #~ msgid "Ok"
 #~ msgstr "確定"

=== modified file 'src/app/qml/AlternateActionPopover.qml'
--- src/app/qml/AlternateActionPopover.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/AlternateActionPopover.qml	2016-02-06 20:00:51 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 
 Component {
     id: popoverComponent
@@ -20,6 +20,7 @@
             Action {
                 text: i18n.tr("Paste")
                 onTriggered: terminal.pasteClipboard();
+                visible: !terminal.isClipboardEmpty();
             }
         }
     }

=== modified file 'src/app/qml/AuthenticationDialog.qml'
--- src/app/qml/AuthenticationDialog.qml	2016-01-22 17:50:33 +0000
+++ src/app/qml/AuthenticationDialog.qml	2016-02-06 20:00:51 +0000
@@ -16,15 +16,15 @@
  * Authored by: Arto Jalkanen <[e-mail]>
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 
 Dialog {
     id: root
 
     title: i18n.tr("Authentication required")
 
-    text: i18n.tr("Enter passcode or passphrase:")
+    text: i18n.tr("Enter password:")
 
     signal passwordEntered(string password)
     signal dialogCanceled
@@ -37,7 +37,7 @@
         id: passwordField
         objectName: "inputField"
 
-        placeholderText: i18n.tr("passcode or passphrase")
+        placeholderText: i18n.tr("password")
         echoMode: TextInput.Password
 
         onAccepted: okButton.clicked(text)

=== modified file 'src/app/qml/AuthenticationService.qml'
--- src/app/qml/AuthenticationService.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/AuthenticationService.qml	2016-02-06 20:00:51 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 import com.ubuntu.PamAuthentication 0.1
 
 /**

=== modified file 'src/app/qml/CircularTransparentButton.qml'
--- src/app/qml/CircularTransparentButton.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/CircularTransparentButton.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 
 Rectangle {
     property color backgroundColor: "black"

=== renamed file 'src/app/qml/ColorSchemePage.qml' => 'src/app/qml/ColorSchemePage.qml.THIS'
=== modified file 'src/app/qml/ExpandableButton.qml'
--- src/app/qml/ExpandableButton.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/ExpandableButton.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 
 Item {
     id: container

=== modified file 'src/app/qml/KeyboardBar.qml'
--- src/app/qml/KeyboardBar.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardBar.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 import "KeyboardRows"
 
 import "KeyboardRows/jsonParser.js" as Parser

=== modified file 'src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml'
--- src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 
 import ".."
 

=== modified file 'src/app/qml/KeyboardRows/JsonTranslator.qml'
--- src/app/qml/KeyboardRows/JsonTranslator.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/JsonTranslator.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 
 Item {
 

=== modified file 'src/app/qml/KeyboardRows/KeyModel.qml'
--- src/app/qml/KeyboardRows/KeyModel.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/KeyModel.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 
 QtObject {
     property string text

=== modified file 'src/app/qml/KeyboardRows/KeyboardButton.qml'
--- src/app/qml/KeyboardRows/KeyboardButton.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/KeyboardButton.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 
 Rectangle {
     property alias text: mainLabel.text

=== modified file 'src/app/qml/KeyboardRows/KeyboardLayout.qml'
--- src/app/qml/KeyboardRows/KeyboardLayout.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/KeyboardLayout.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 
 import "jsonParser.js" as Parser
 
@@ -59,7 +59,7 @@
     function createEntryString(text, actionString, otherActionsString) {
         var objectString = "
             import QtQuick 2.4
-            import Ubuntu.Components 1.3
+            import Ubuntu.Components 1.2
 
             KeyModel {
                 text: \"" + text + "\"

=== modified file 'src/app/qml/KeyboardRows/KeyboardRow.qml'
--- src/app/qml/KeyboardRows/KeyboardRow.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/KeyboardRows/KeyboardRow.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 
 Rectangle {
     id: container

=== modified file 'src/app/qml/LayoutsPage.qml'
--- src/app/qml/LayoutsPage.qml	2016-01-09 02:00:10 +0000
+++ src/app/qml/LayoutsPage.qml	2016-02-06 20:00:51 +0000
@@ -17,7 +17,8 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {
     id: rootItem
@@ -33,23 +34,18 @@
     ListView {
         anchors.fill: parent
         model: settings.profilesList
-        delegate: ListItem {
-            ListItemLayout {
-                anchors.fill: parent
-                title.text: name
-
-                Switch {
-                    id: layoutSwitch
-                    SlotsLayout.position: SlotsLayout.Trailing
-
-                    checked: profileVisible
-                    onCheckedChanged: {
-                        settings.profilesList.setProperty(index, "profileVisible", checked);
-                    }
+        delegate: ListItem.Standard {
+            text: name
+
+            control: Switch {
+                id: layoutSwitch
+                checked: profileVisible
+                onCheckedChanged: {
+                    settings.profilesList.setProperty(index, "profileVisible", checked);
                 }
             }
 
-            onClicked: layoutSwitch.trigger()
+            onTriggered: layoutSwitch.trigger()
         }
     }
 }

=== added file 'src/app/qml/ListItemWithActions.qml'
--- src/app/qml/ListItemWithActions.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ListItemWithActions.qml	2016-02-06 20:00:51 +0000
@@ -0,0 +1,454 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+
+Item {
+    id: root
+
+    property Action leftSideAction: null
+    property list<Action> rightSideActions
+    property double defaultHeight: units.gu(8)
+    property bool locked: false
+    property Action activeAction: null
+    property var activeItem: null
+    property bool triggerActionOnMouseRelease: false
+    property color color: Theme.palette.normal.background
+    property color selectedColor: "#E6E6E6"
+    property bool selected: false
+    property bool selectionMode: false
+    property alias internalAnchors: mainContents.anchors
+    default property alias contents: mainContents.children
+
+    readonly property double actionWidth: units.gu(4)
+    readonly property double leftActionWidth: units.gu(10)
+    readonly property double actionThreshold: actionWidth * 0.4
+    readonly property double threshold: 0.4
+    readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
+    readonly property alias swipping: mainItemMoving.running
+    readonly property bool _showActions: mouseArea.pressed || swipeState != "Normal" || swipping
+
+    /* internal */
+    property var _visibleRightSideActions: filterVisibleActions(rightSideActions)
+
+    signal itemClicked(var mouse)
+    signal itemPressAndHold(var mouse)
+
+    function returnToBoundsRTL(direction)
+    {
+        var actionFullWidth = actionWidth + units.gu(2)
+
+        // go back to normal state if swipping reverse
+        if (direction === "LTR") {
+            updatePosition(0)
+            return
+        } else if (!triggerActionOnMouseRelease) {
+            updatePosition(-rightActionsView.width + units.gu(2))
+            return
+        }
+
+        var xOffset = Math.abs(main.x)
+        var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
+        var newX = 0
+      if (index === _visibleRightSideActions.length) {
+            newX = -(rightActionsView.width - units.gu(2))
+        } else if (index >= 1) {
+            newX = -(actionFullWidth * index)
+        }
+        updatePosition(newX)
+    }
+
+    function returnToBoundsLTR(direction)
+    {
+        var finalX = leftActionWidth
+        if ((direction === "RTL") || (main.x <= (finalX * root.threshold)))
+            finalX = 0
+        updatePosition(finalX)
+    }
+
+    function returnToBounds(direction)
+    {
+        if (main.x < 0) {
+            returnToBoundsRTL(direction)
+        } else if (main.x > 0) {
+            returnToBoundsLTR(direction)
+        } else {
+            updatePosition(0)
+        }
+    }
+
+    function contains(item, point, marginX)
+    {
+        var itemStartX = item.x - marginX
+        var itemEndX = item.x + item.width + marginX
+        return (point.x >= itemStartX) && (point.x <= itemEndX) &&
+               (point.y >= item.y) && (point.y <= (item.y + item.height));
+    }
+
+    function getActionAt(point)
+    {
+        if (contains(leftActionView, point, 0)) {
+            return leftSideAction
+        } else if (contains(rightActionsView, point, 0)) {
+            var newPoint = root.mapToItem(rightActionsView, point.x, point.y)
+            for (var i = 0; i < rightActionsRepeater.count; i++) {
+                var child = rightActionsRepeater.itemAt(i)
+                if (contains(child, newPoint, units.gu(1))) {
+                    return i
+                }
+            }
+        }
+        return -1
+    }
+
+    function updateActiveAction()
+    {
+        if (triggerActionOnMouseRelease &&
+            (main.x <= -(root.actionWidth + units.gu(2))) &&
+            (main.x > -(rightActionsView.width - units.gu(2)))) {
+            var actionFullWidth = actionWidth + units.gu(2)
+            var xOffset = Math.abs(main.x)
+            var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
+            index = index - 1
+            if (index > -1) {
+                root.activeItem = rightActionsRepeater.itemAt(index)
+                root.activeAction = root._visibleRightSideActions[index]
+            }
+        } else {
+            root.activeAction = null
+        }
+    }
+
+    function resetSwipe()
+    {
+        updatePosition(0)
+    }
+
+    function filterVisibleActions(actions)
+    {
+        var visibleActions = []
+        for(var i = 0; i < actions.length; i++) {
+            var action = actions[i]
+            if (action.visible) {
+                visibleActions.push(action)
+            }
+        }
+        return visibleActions
+    }
+
+    function updatePosition(pos)
+    {
+        if (!root.triggerActionOnMouseRelease && (pos !== 0)) {
+            mouseArea.state = pos > 0 ? "RightToLeft" : "LeftToRight"
+        } else {
+            mouseArea.state = ""
+        }
+        main.x = pos
+    }
+
+    states: [
+        State {
+            name: "select"
+            when: selectionMode || selected
+            PropertyChanges {
+                target: selectionIcon
+                source: Qt.resolvedUrl("ListItemWithActionsCheckBox.qml")
+                anchors.leftMargin: units.gu(2)
+            }
+            PropertyChanges {
+                target: root
+                locked: true
+            }
+            PropertyChanges {
+                target: main
+                x: 0
+            }
+        }
+    ]
+
+    height: defaultHeight
+    clip: height !== defaultHeight
+
+    Rectangle {
+        id: leftActionView
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: main.left
+        }
+        width: root.leftActionWidth + actionThreshold
+        visible: leftSideAction
+        color: UbuntuColors.red
+
+        Icon {
+            anchors {
+                centerIn: parent
+                horizontalCenterOffset: actionThreshold / 2
+            }
+            name: leftSideAction && _showActions ? leftSideAction.iconName : ""
+            color: Theme.palette.selected.field
+            height: units.gu(3)
+            width: units.gu(3)
+        }
+    }
+
+    Rectangle {
+       id: rightActionsView
+
+       anchors {
+           top: main.top
+           left: main.right
+           bottom: main.bottom
+       }
+       visible: _visibleRightSideActions.length > 0
+       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(2) : 0
+       color: "white"
+       Row {
+           anchors{
+               top: parent.top
+               left: parent.left
+               leftMargin: units.gu(2)
+               right: parent.right
+               rightMargin: units.gu(2)
+               bottom: parent.bottom
+           }
+           spacing: units.gu(2)
+           Repeater {
+               id: rightActionsRepeater
+
+               model: _showActions ? _visibleRightSideActions : []
+               Item {
+                   property alias image: img
+
+                   height: rightActionsView.height
+                   width: root.actionWidth
+
+                   Icon {
+                       id: img
+
+                       anchors.centerIn: parent
+                       width: units.gu(3)
+                       height: units.gu(3)
+                       name: modelData.iconName
+                       color: root.activeAction === modelData ? UbuntuColors.lightAubergine : UbuntuColors.lightGrey
+                   }
+              }
+           }
+       }
+    }
+
+
+    Rectangle {
+        id: main
+        objectName: "mainItem"
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+        }
+
+        width: parent.width
+        color: root.selected ? root.selectedColor : root.color
+
+        Loader {
+            id: selectionIcon
+
+            anchors {
+                left: main.left
+                verticalCenter: main.verticalCenter
+            }
+            width: (status === Loader.Ready) ? item.implicitWidth : 0
+            visible: (status === Loader.Ready) && (item.width === item.implicitWidth)
+            Behavior on width {
+                NumberAnimation {
+                    duration: UbuntuAnimation.SnapDuration
+                }
+            }
+        }
+
+
+        Item {
+            id: mainContents
+
+            anchors {
+                left: selectionIcon.right
+                leftMargin: units.gu(2)
+                top: parent.top
+                topMargin: units.gu(1)
+                right: parent.right
+                rightMargin: units.gu(2)
+                bottom: parent.bottom
+                bottomMargin: units.gu(1)
+            }
+        }
+
+        Behavior on x {
+            UbuntuNumberAnimation {
+                id: mainItemMoving
+
+                easing.type: Easing.OutElastic
+                duration: UbuntuAnimation.SlowDuration
+            }
+        }
+        Behavior on color {
+           ColorAnimation {}
+        }
+    }
+
+    SequentialAnimation {
+        id: triggerAction
+
+        property var currentItem: root.activeItem ? root.activeItem.image : null
+
+        running: false
+        ParallelAnimation {
+            UbuntuNumberAnimation {
+                target: triggerAction.currentItem
+                property: "opacity"
+                from: 1.0
+                to: 0.0
+                duration: UbuntuAnimation.SlowDuration
+                easing {type: Easing.InOutBack; }
+            }
+            UbuntuNumberAnimation {
+                target: triggerAction.currentItem
+                properties: "width, height"
+                from: units.gu(3)
+                to: root.actionWidth
+                duration: UbuntuAnimation.SlowDuration
+                easing {type: Easing.InOutBack; }
+            }
+        }
+        PropertyAction {
+            target: triggerAction.currentItem
+            properties: "width, height"
+            value: units.gu(3)
+        }
+        PropertyAction {
+            target: triggerAction.currentItem
+            properties: "opacity"
+            value: 1.0
+        }
+        ScriptAction {
+            script: {
+                root.activeAction.triggered(root)
+                mouseArea.state = ""
+            }
+        }
+        PauseAnimation {
+            duration: 500
+        }
+        UbuntuNumberAnimation {
+            target: main
+            property: "x"
+            to: 0
+
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+
+        property bool locked: root.locked || ((root.leftSideAction === null) && (root._visibleRightSideActions.count === 0))
+        property bool manual: false
+        property string direction: "None"
+        property real lastX: -1
+
+        anchors.fill: parent
+        drag {
+            target: locked ? null : main
+            axis: Drag.XAxis
+            minimumX: rightActionsView.visible ? -(rightActionsView.width) : 0
+            maximumX: leftActionView.visible ? leftActionView.width : 0
+            threshold: root.actionThreshold
+        }
+
+        states: [
+            State {
+                name: "LeftToRight"
+                PropertyChanges {
+                    target: mouseArea
+                    drag.maximumX: 0
+                }
+            },
+            State {
+                name: "RightToLeft"
+                PropertyChanges {
+                    target: mouseArea
+                    drag.minimumX: 0
+                }
+            }
+        ]
+
+        onMouseXChanged: {
+            var offset = (lastX - mouseX)
+            if (Math.abs(offset) <= root.actionThreshold) {
+                return
+            }
+            lastX = mouseX
+            direction = offset > 0 ? "RTL" : "LTR";
+        }
+
+        onPressed: {
+            lastX = mouse.x
+        }
+
+        onReleased: {
+            if (root.triggerActionOnMouseRelease && root.activeAction) {
+                triggerAction.start()
+            } else {
+                root.returnToBounds(direction)
+                root.activeAction = null
+            }
+            lastX = -1
+            direction = "None"
+        }
+        onClicked: {
+            if (main.x === 0) {
+                root.itemClicked(mouse)
+            } else if (main.x > 0) {
+                var action = getActionAt(Qt.point(mouse.x, mouse.y))
+                if (action && action !== -1) {
+                    action.triggered(root)
+                }
+            } else {
+                var actionIndex = getActionAt(Qt.point(mouse.x, mouse.y))
+                if (actionIndex !== -1) {
+                    root.activeItem = rightActionsRepeater.itemAt(actionIndex)
+                    root.activeAction = root._visibleRightSideActions[actionIndex]
+                    triggerAction.start()
+                    return
+                }
+            }
+            root.resetSwipe()
+        }
+
+        onPositionChanged: {
+            if (mouseArea.pressed) {
+                updateActiveAction()
+            }
+        }
+        onPressAndHold: {
+            if (main.x === 0) {
+                root.itemPressAndHold(mouse)
+            }
+        }
+        z: -1
+    }
+}
+

=== modified file 'src/app/qml/SettingsPage.qml'
--- src/app/qml/SettingsPage.qml	2016-02-06 16:58:50 +0000
+++ src/app/qml/SettingsPage.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014, 2016 Canonical Ltd
+ * Copyright (C) 2013, 2014 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -17,17 +17,21 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {
     id: settingsPage
     objectName: "settingsPage"
 
     title: i18n.tr("Settings")
-    flickable: null
-
-    Flickable {
+
+    Column {
+        id: mainColumn
+
+        spacing: units.gu(1)
         anchors.fill: parent
+<<<<<<< TREE
         interactive: contentHeight + units.gu(6) > height
         contentHeight: mainColumn.height
 
@@ -141,6 +145,84 @@
                 }
 
                 onClicked: pageStack.push(colorSchemePage);
+=======
+
+        ListItem.Standard {
+            text: i18n.tr("Layouts")
+            progression: true
+            onClicked: pageStack.push(layoutsPage);
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("Show Keyboard Bar")
+            control: Switch {
+                onCheckedChanged: settings.showKeyboardBar = checked;
+                Component.onCompleted: checked = settings.showKeyboardBar;
+            }
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("Show Keyboard Button")
+            control: Switch {
+                onCheckedChanged: settings.showKeyboardButton = checked;
+                Component.onCompleted: checked = settings.showKeyboardButton;
+            }
+        }
+
+        ListItem.Empty {
+            height: units.gu(10)
+            Label {
+                text: i18n.tr("Font Size:")
+                x: units.gu(2)
+            }
+            Slider {
+                id: slFont
+                objectName: "slFont"
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    bottom: parent.bottom
+                    margins: units.gu(2)
+                }
+                minimumValue: settings.minFontSize;
+                maximumValue: settings.maxFontSize;
+                onValueChanged: {
+                    settings.fontSize = value;
+                }
+                Component.onCompleted: {
+                    value = settings.fontSize;
+                }
+
+                Connections {
+                    target: settings
+                    onFontSizeChanged: {
+                        slFont.value = settings.fontSize
+                    }
+                }
+            }
+        }
+
+        OptionSelector {
+            id: colorsSchemeSelector
+            objectName: "colorsSchemeSelector"
+            text: i18n.tr("Color Scheme")
+            width: parent.width - units.gu(4)
+            x: units.gu(2)
+
+            // TODO Hackish, but works quite well.
+            containerHeight: parent.height - y - units.gu(6)
+
+            // TODO This is a workaround at the moment.
+            // The application should get them from the c++.
+            model: ["GreenOnBlack","WhiteOnBlack","BlackOnWhite","BlackOnRandomLight","Linux","cool-retro-term","DarkPastels","BlackOnLightYellow", "Ubuntu"]
+
+            onSelectedIndexChanged: {
+                settings.colorScheme = model[selectedIndex];
+            }
+
+            Component.onCompleted: {
+                selectedIndex = model.indexOf(settings.colorScheme);
+>>>>>>> MERGE-SOURCE
             }
         }
     }

=== modified file 'src/app/qml/TabsPage.qml'
--- src/app/qml/TabsPage.qml	2016-01-09 02:00:10 +0000
+++ src/app/qml/TabsPage.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,6 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {
     id: tabsPage

=== modified file 'src/app/qml/TerminalComponent.qml'
--- src/app/qml/TerminalComponent.qml	2016-02-06 16:31:36 +0000
+++ src/app/qml/TerminalComponent.qml	2016-02-06 20:00:51 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 import QMLTermWidget 1.0
 
 Component {

=== modified file 'src/app/qml/TerminalPage.qml'
--- src/app/qml/TerminalPage.qml	2016-01-22 18:01:49 +0000
+++ src/app/qml/TerminalPage.qml	2016-02-06 20:00:51 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.0
 import QMLTermWidget 1.0
 
 Page {
@@ -10,12 +10,6 @@
 
     anchors.fill: parent
 
-    header: PageHeader {
-        // WORKAROUND: This way we disable the 'hide' animation when
-        // closing the settings page.
-        visible: false
-    }
-
     AlternateActionPopover {
         id: alternateActionPopover
     }

=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml	2016-01-29 02:16:38 +0000
+++ src/app/qml/ubuntu-terminal-app.qml	2016-02-06 20:00:51 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtGraphicalEffects 1.0
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 import "KeyboardRows"
 
 import QMLTermWidget 1.0
@@ -115,15 +115,6 @@
             id: layoutsPage
             visible: false
         }
-
-        ColorSchemePage {
-            id: colorSchemePage
-            visible: false
-
-            // TODO This is a workaround at the moment.
-            // The application should get them from the c++.
-            model: ["GreenOnBlack","WhiteOnBlack","BlackOnWhite","BlackOnRandomLight","Linux","cool-retro-term","DarkPastels","BlackOnLightYellow", "Ubuntu"]
-        }
     }
 
     Component.onCompleted: {

=== modified file 'src/plugin/qmltermwidget/lib/TerminalDisplay.cpp'
--- src/plugin/qmltermwidget/lib/TerminalDisplay.cpp	2015-02-14 10:33:32 +0000
+++ src/plugin/qmltermwidget/lib/TerminalDisplay.cpp	2016-02-06 20:00:51 +0000
@@ -2570,6 +2570,11 @@
   emitSelection(true,false);
 }
 
+bool TerminalDisplay::isClipboardEmpty()
+{
+    return QApplication::clipboard()->text().isEmpty();
+}
+
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                                Keyboard                                   */

=== modified file 'src/plugin/qmltermwidget/lib/TerminalDisplay.h'
--- src/plugin/qmltermwidget/lib/TerminalDisplay.h	2015-02-14 10:33:32 +0000
+++ src/plugin/qmltermwidget/lib/TerminalDisplay.h	2016-02-06 20:00:51 +0000
@@ -482,6 +482,10 @@
      */
     void pasteSelection();
 
+    /** Checks if the clipboard is empty
+     */
+    bool isClipboardEmpty();
+
     /** 
        * Changes whether the flow control warning box should be shown when the flow control
        * stop key (Ctrl+S) are pressed.

=== modified file 'terminal.apparmor'
--- terminal.apparmor	2016-01-09 01:49:55 +0000
+++ terminal.apparmor	2016-02-06 20:00:51 +0000
@@ -2,4 +2,4 @@
     "policy_groups": [],
     "policy_version": 1.3,
     "template": "unconfined"
-}
\ No newline at end of file
+}