Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1445072 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Update pot file

Update pot file

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/201/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2303/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2022/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2301
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2301/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19735

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/201/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/lp1445072]

256. By Alberto Mardegan on 2015-04-17

Force removal of useless plugin

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:256
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/202/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2310
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19752

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/202/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-12-03 13:42:09 +0000
+++ debian/control	2015-04-17 12:05:00 +0000
@@ -43,6 +43,7 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          signon-ui-service,
          ubuntu-system-settings
+Conflicts: account-plugin-windows-live
 Provides: qml-module-ubuntu-onlineaccounts-plugin
 Description: Online Accounts setup for Ubuntu Touch
  Online Accounts setup utility for the Ubuntu Touch System Settings.

=== modified file 'po/ubuntu-system-settings-online-accounts.pot'
--- po/ubuntu-system-settings-online-accounts.pot	2014-08-26 08:36:35 +0000
+++ po/ubuntu-system-settings-online-accounts.pot	2015-04-17 12:05:00 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-26 10:31+0200\n"
+"POT-Creation-Date: 2015-04-17 09:24+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -25,6 +25,44 @@
 msgid "Password"
 msgstr ""
 
+#: ../plugins/module/OAuth.qml:119
+msgid "Loading…"
+msgstr ""
+
+#: ../plugins/module/OAuth.qml:148
+#: ../plugins/module/RemovalConfirmation.qml:43
+#: ../online-accounts-ui/qml/SignOnUiDialog.qml:90
+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/module/Options.qml:36
+msgid "ID"
+msgstr ""
+
+#: ../plugins/module/Options.qml:48
+msgid "Remove account…"
+msgstr ""
+
+#: ../plugins/module/RemovalConfirmation.qml:32
+msgid "Remove account"
+msgstr ""
+
+#: ../plugins/module/RemovalConfirmation.qml:33
+#, qt-format
+msgid ""
+"The %1 account will be removed only from your phone. You can add it again "
+"later."
+msgstr ""
+
+#: ../plugins/module/RemovalConfirmation.qml:38
+msgid "Remove"
+msgstr ""
+
+#: ../plugins/module/ServiceSwitches.qml:33
+msgid "Access to this account:"
+msgstr ""
+
 #: ../system-settings-plugin/AccountsPage.qml:51
 msgid "Add account…"
 msgstr ""
@@ -35,9 +73,7 @@
 "to sign in for each app."
 msgstr ""
 
-#: ../system-settings-plugin/MainPage.qml:29
-#: ../online-accounts-ui/qml/ProviderRequest.qml:51
-#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
+#: ../system-settings-plugin/MainPage.qml:32 ../.build/settings.js:1
 msgid "Accounts"
 msgstr ""
 
@@ -53,56 +89,19 @@
 msgid "Add account:"
 msgstr ""
 
-#: ../online-accounts-ui/module/OAuth.qml:119
-msgid "Loading…"
-msgstr ""
-
-#: ../online-accounts-ui/module/OAuth.qml:149
-#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
-#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
-msgid "Cancel"
-msgstr ""
-
-#: ../online-accounts-ui/module/Options.qml:36
-msgid "ID"
-msgstr ""
-
-#: ../online-accounts-ui/module/Options.qml:48
-msgid "Remove account…"
-msgstr ""
-
-#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
-msgid "Remove account"
-msgstr ""
-
-#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
-#, qt-format
-msgid ""
-"The %1 account will be removed only from your phone. You can add it again "
-"later."
-msgstr ""
-
-#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
-msgid "Remove"
-msgstr ""
-
-#: ../online-accounts-ui/module/ServiceSwitches.qml:33
-msgid "Access to this account:"
-msgstr ""
-
-#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
+#: ../online-accounts-ui/qml/AuthorizationPage.qml:46
 #, qt-format
 msgid "%1 wants to access your %2 account"
 msgstr ""
 
-#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
+#: ../online-accounts-ui/qml/AuthorizationPage.qml:87
 msgid "Allow"
 msgstr ""
 
-#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
+#: ../online-accounts-ui/qml/AuthorizationPage.qml:96
+msgid "Add another account…"
+msgstr ""
+
+#: ../online-accounts-ui/qml/AuthorizationPage.qml:104
 msgid "Don't allow"
 msgstr ""
-
-#: ../online-accounts-ui/qml/ProviderRequest.qml:87
-msgid "Add another"
-msgstr ""