Online Accounts setup for Ubuntu Touch

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

  1. lp1445072
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 256
Merged at revision: 255
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/lp1445072
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 144 lines (+48/-48)
2 files modified
debian/control (+1/-0)
po/ubuntu-system-settings-online-accounts.pot (+47/-48)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1445072
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Online Accounts Pending
Review via email: mp+256619@code.launchpad.net

Commit message

Update pot file

Description of the change

Update pot file

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
256. By Alberto Mardegan

Force removal of useless plugin

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
43 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,43 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
44 signon-ui-service,44 signon-ui-service,
45 ubuntu-system-settings45 ubuntu-system-settings
46Conflicts: account-plugin-windows-live
46Provides: qml-module-ubuntu-onlineaccounts-plugin47Provides: qml-module-ubuntu-onlineaccounts-plugin
47Description: Online Accounts setup for Ubuntu Touch48Description: Online Accounts setup for Ubuntu Touch
48 Online Accounts setup utility for the Ubuntu Touch System Settings.49 Online Accounts setup utility for the Ubuntu Touch System Settings.
4950
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: ubuntu-system-settings-online-accounts\n"9"Project-Id-Version: ubuntu-system-settings-online-accounts\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-08-26 10:31+0200\n"11"POT-Creation-Date: 2015-04-17 09:24+0300\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,6 +25,44 @@
25msgid "Password"25msgid "Password"
26msgstr ""26msgstr ""
2727
28#: ../plugins/module/OAuth.qml:119
29msgid "Loading…"
30msgstr ""
31
32#: ../plugins/module/OAuth.qml:148
33#: ../plugins/module/RemovalConfirmation.qml:43
34#: ../online-accounts-ui/qml/SignOnUiDialog.qml:90
35#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
36msgid "Cancel"
37msgstr ""
38
39#: ../plugins/module/Options.qml:36
40msgid "ID"
41msgstr ""
42
43#: ../plugins/module/Options.qml:48
44msgid "Remove account…"
45msgstr ""
46
47#: ../plugins/module/RemovalConfirmation.qml:32
48msgid "Remove account"
49msgstr ""
50
51#: ../plugins/module/RemovalConfirmation.qml:33
52#, qt-format
53msgid ""
54"The %1 account will be removed only from your phone. You can add it again "
55"later."
56msgstr ""
57
58#: ../plugins/module/RemovalConfirmation.qml:38
59msgid "Remove"
60msgstr ""
61
62#: ../plugins/module/ServiceSwitches.qml:33
63msgid "Access to this account:"
64msgstr ""
65
28#: ../system-settings-plugin/AccountsPage.qml:5166#: ../system-settings-plugin/AccountsPage.qml:51
29msgid "Add account…"67msgid "Add account…"
30msgstr ""68msgstr ""
@@ -35,9 +73,7 @@
35"to sign in for each app."73"to sign in for each app."
36msgstr ""74msgstr ""
3775
38#: ../system-settings-plugin/MainPage.qml:2976#: ../system-settings-plugin/MainPage.qml:32 ../.build/settings.js:1
39#: ../online-accounts-ui/qml/ProviderRequest.qml:51
40#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
41msgid "Accounts"77msgid "Accounts"
42msgstr ""78msgstr ""
4379
@@ -53,56 +89,19 @@
53msgid "Add account:"89msgid "Add account:"
54msgstr ""90msgstr ""
5591
56#: ../online-accounts-ui/module/OAuth.qml:11992#: ../online-accounts-ui/qml/AuthorizationPage.qml:46
57msgid "Loading…"
58msgstr ""
59
60#: ../online-accounts-ui/module/OAuth.qml:149
61#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
62#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
63msgid "Cancel"
64msgstr ""
65
66#: ../online-accounts-ui/module/Options.qml:36
67msgid "ID"
68msgstr ""
69
70#: ../online-accounts-ui/module/Options.qml:48
71msgid "Remove account…"
72msgstr ""
73
74#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
75msgid "Remove account"
76msgstr ""
77
78#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
79#, qt-format
80msgid ""
81"The %1 account will be removed only from your phone. You can add it again "
82"later."
83msgstr ""
84
85#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
86msgid "Remove"
87msgstr ""
88
89#: ../online-accounts-ui/module/ServiceSwitches.qml:33
90msgid "Access to this account:"
91msgstr ""
92
93#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
94#, qt-format93#, qt-format
95msgid "%1 wants to access your %2 account"94msgid "%1 wants to access your %2 account"
96msgstr ""95msgstr ""
9796
98#: ../online-accounts-ui/qml/AuthorizationPage.qml:6497#: ../online-accounts-ui/qml/AuthorizationPage.qml:87
99msgid "Allow"98msgid "Allow"
100msgstr ""99msgstr ""
101100
102#: ../online-accounts-ui/qml/AuthorizationPage.qml:71101#: ../online-accounts-ui/qml/AuthorizationPage.qml:96
102msgid "Add another account…"
103msgstr ""
104
105#: ../online-accounts-ui/qml/AuthorizationPage.qml:104
103msgid "Don't allow"106msgid "Don't allow"
104msgstr ""107msgstr ""
105
106#: ../online-accounts-ui/qml/ProviderRequest.qml:87
107msgid "Add another"
108msgstr ""

Subscribers

People subscribed via source and target branches