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

Proposed by Alberto Mardegan on 2015-04-17
Status: Merged
Approved by: David Barth on 2015-04-21
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 on 2015-04-17
Online Accounts 2015-04-17 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.
256. By Alberto Mardegan on 2015-04-17

Force removal of useless plugin

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-12-03 13:42:09 +0000
3+++ debian/control 2015-04-17 12:05:00 +0000
4@@ -43,6 +43,7 @@
5 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
6 signon-ui-service,
7 ubuntu-system-settings
8+Conflicts: account-plugin-windows-live
9 Provides: qml-module-ubuntu-onlineaccounts-plugin
10 Description: Online Accounts setup for Ubuntu Touch
11 Online Accounts setup utility for the Ubuntu Touch System Settings.
12
13=== modified file 'po/ubuntu-system-settings-online-accounts.pot'
14--- po/ubuntu-system-settings-online-accounts.pot 2014-08-26 08:36:35 +0000
15+++ po/ubuntu-system-settings-online-accounts.pot 2015-04-17 12:05:00 +0000
16@@ -8,7 +8,7 @@
17 msgstr ""
18 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
19 "Report-Msgid-Bugs-To: \n"
20-"POT-Creation-Date: 2014-08-26 10:31+0200\n"
21+"POT-Creation-Date: 2015-04-17 09:24+0300\n"
22 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
23 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
24 "Language-Team: LANGUAGE <LL@li.org>\n"
25@@ -25,6 +25,44 @@
26 msgid "Password"
27 msgstr ""
28
29+#: ../plugins/module/OAuth.qml:119
30+msgid "Loading…"
31+msgstr ""
32+
33+#: ../plugins/module/OAuth.qml:148
34+#: ../plugins/module/RemovalConfirmation.qml:43
35+#: ../online-accounts-ui/qml/SignOnUiDialog.qml:90
36+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
37+msgid "Cancel"
38+msgstr ""
39+
40+#: ../plugins/module/Options.qml:36
41+msgid "ID"
42+msgstr ""
43+
44+#: ../plugins/module/Options.qml:48
45+msgid "Remove account…"
46+msgstr ""
47+
48+#: ../plugins/module/RemovalConfirmation.qml:32
49+msgid "Remove account"
50+msgstr ""
51+
52+#: ../plugins/module/RemovalConfirmation.qml:33
53+#, qt-format
54+msgid ""
55+"The %1 account will be removed only from your phone. You can add it again "
56+"later."
57+msgstr ""
58+
59+#: ../plugins/module/RemovalConfirmation.qml:38
60+msgid "Remove"
61+msgstr ""
62+
63+#: ../plugins/module/ServiceSwitches.qml:33
64+msgid "Access to this account:"
65+msgstr ""
66+
67 #: ../system-settings-plugin/AccountsPage.qml:51
68 msgid "Add account…"
69 msgstr ""
70@@ -35,9 +73,7 @@
71 "to sign in for each app."
72 msgstr ""
73
74-#: ../system-settings-plugin/MainPage.qml:29
75-#: ../online-accounts-ui/qml/ProviderRequest.qml:51
76-#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
77+#: ../system-settings-plugin/MainPage.qml:32 ../.build/settings.js:1
78 msgid "Accounts"
79 msgstr ""
80
81@@ -53,56 +89,19 @@
82 msgid "Add account:"
83 msgstr ""
84
85-#: ../online-accounts-ui/module/OAuth.qml:119
86-msgid "Loading…"
87-msgstr ""
88-
89-#: ../online-accounts-ui/module/OAuth.qml:149
90-#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
91-#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
92-msgid "Cancel"
93-msgstr ""
94-
95-#: ../online-accounts-ui/module/Options.qml:36
96-msgid "ID"
97-msgstr ""
98-
99-#: ../online-accounts-ui/module/Options.qml:48
100-msgid "Remove account…"
101-msgstr ""
102-
103-#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
104-msgid "Remove account"
105-msgstr ""
106-
107-#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
108-#, qt-format
109-msgid ""
110-"The %1 account will be removed only from your phone. You can add it again "
111-"later."
112-msgstr ""
113-
114-#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
115-msgid "Remove"
116-msgstr ""
117-
118-#: ../online-accounts-ui/module/ServiceSwitches.qml:33
119-msgid "Access to this account:"
120-msgstr ""
121-
122-#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
123+#: ../online-accounts-ui/qml/AuthorizationPage.qml:46
124 #, qt-format
125 msgid "%1 wants to access your %2 account"
126 msgstr ""
127
128-#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
129+#: ../online-accounts-ui/qml/AuthorizationPage.qml:87
130 msgid "Allow"
131 msgstr ""
132
133-#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
134+#: ../online-accounts-ui/qml/AuthorizationPage.qml:96
135+msgid "Add another account…"
136+msgstr ""
137+
138+#: ../online-accounts-ui/qml/AuthorizationPage.qml:104
139 msgid "Don't allow"
140 msgstr ""
141-
142-#: ../online-accounts-ui/qml/ProviderRequest.qml:87
143-msgid "Add another"
144-msgstr ""

Subscribers

People subscribed via source and target branches