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

Proposed by Alberto Mardegan
Status: Superseded
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/lp1342031
Merge into: lp:~mardy/ubuntu-system-settings-online-accounts/master
Diff against target: 10226 lines (+4815/-1109)
116 files modified
.bzrignore (+5/-1)
click-hooks/click-hooks.pro (+5/-2)
click-hooks/main.cpp (+94/-2)
client/OnlineAccountsClient/setup.cpp (+4/-1)
client/OnlineAccountsClient/setup.h (+2/-1)
coverage.pri (+1/-1)
debian/changelog (+92/-0)
debian/control (+15/-2)
debian/rules (+1/-0)
online-accounts-service/main.cpp (+3/-0)
online-accounts-service/mir-helper.cpp (+18/-2)
online-accounts-service/mir-helper.h (+6/-1)
online-accounts-service/online-accounts-service.pro (+1/-0)
online-accounts-service/request-manager.cpp (+0/-2)
online-accounts-service/signonui-service.cpp (+83/-2)
online-accounts-service/signonui-service.h (+15/-0)
online-accounts-service/ui-proxy.cpp (+23/-5)
online-accounts-ui/access-model.cpp (+25/-3)
online-accounts-ui/account-manager.cpp (+0/-18)
online-accounts-ui/account-manager.h (+0/-3)
online-accounts-ui/application-manager.cpp (+9/-0)
online-accounts-ui/browser-request.cpp (+34/-4)
online-accounts-ui/globals.h (+1/-0)
online-accounts-ui/module/ServiceItem.qml (+3/-2)
online-accounts-ui/module/WebView.qml (+35/-8)
online-accounts-ui/online-accounts-ui-helper.pro (+4/-0)
online-accounts-ui/provider-request.cpp (+16/-2)
online-accounts-ui/qml/AccountCreationPage.qml (+2/-3)
online-accounts-ui/qml/AuthorizationPage.qml (+1/-1)
online-accounts-ui/qml/ProviderRequest.qml (+18/-3)
online-accounts-ui/request-handler.cpp (+2/-0)
online-accounts-ui/ui-server.cpp (+0/-2)
po/am.po (+44/-19)
po/ar.po (+43/-18)
po/ast.po (+45/-20)
po/az.po (+113/-0)
po/br.po (+44/-19)
po/bs.po (+43/-18)
po/ca.po (+44/-19)
po/ckb.po (+42/-17)
po/cs.po (+43/-18)
po/da.po (+43/-18)
po/de.po (+45/-20)
po/el.po (+43/-18)
po/en_AU.po (+45/-20)
po/en_GB.po (+45/-20)
po/es.po (+45/-20)
po/eu.po (+44/-19)
po/fa.po (+44/-19)
po/fi.po (+46/-21)
po/fr.po (+45/-20)
po/fr_CA.po (+42/-17)
po/gd.po (+48/-22)
po/gl.po (+48/-23)
po/he.po (+43/-18)
po/hu.po (+50/-25)
po/is.po (+44/-19)
po/it.po (+44/-19)
po/ja.po (+48/-23)
po/km.po (+45/-20)
po/ko.po (+43/-18)
po/lo.po (+43/-18)
po/lv.po (+44/-19)
po/ms.po (+43/-18)
po/my.po (+43/-18)
po/nb.po (+44/-19)
po/nl.po (+44/-19)
po/pl.po (+43/-18)
po/po.pro (+3/-3)
po/pt.po (+45/-20)
po/pt_BR.po (+45/-20)
po/ro.po (+111/-0)
po/ru.po (+45/-20)
po/shn.po (+42/-17)
po/sl.po (+44/-19)
po/sr.po (+112/-0)
po/sv.po (+44/-19)
po/ta.po (+44/-19)
po/te.po (+43/-18)
po/tr.po (+43/-18)
po/ubuntu-system-settings-online-accounts.pot (+40/-15)
po/ug.po (+44/-19)
po/uk.po (+44/-19)
po/zh_CN.po (+43/-18)
po/zh_TW.po (+45/-20)
system-settings-plugin/AccountEditPage.qml (+9/-3)
system-settings-plugin/AccountItem.qml (+2/-1)
system-settings-plugin/AccountsPage.qml (+1/-1)
system-settings-plugin/AddAccountLabel.qml (+1/-1)
system-settings-plugin/MainPage.qml (+5/-2)
system-settings-plugin/NewAccountPage.qml (+4/-2)
system-settings-plugin/NoAccountsPage.qml (+3/-8)
system-settings-plugin/ProviderPluginList.qml (+5/-2)
system-settings-plugin/ProvidersList.qml (+27/-13)
tests/autopilot/online_accounts_ui/__init__.py (+4/-29)
tests/autopilot/online_accounts_ui/tests/__init__.py (+2/-14)
tests/autopilot/online_accounts_ui/tests/test_online_accounts_ui.py (+0/-12)
tests/click-hooks/tst_online_accounts_hooks.cpp (+143/-2)
tests/client/tst_client.cpp (+5/-5)
tests/client/tst_qml_client.cpp (+2/-2)
tests/online-accounts-service/mock/request-manager-mock.cpp (+65/-0)
tests/online-accounts-service/mock/request-manager-mock.h (+49/-0)
tests/online-accounts-service/mock/request-mock.cpp (+129/-0)
tests/online-accounts-service/mock/request-mock.h (+63/-0)
tests/online-accounts-service/online-accounts-service.pro (+3/-1)
tests/online-accounts-service/tst_signonui_service.cpp (+151/-0)
tests/online-accounts-service/tst_signonui_service.pro (+42/-0)
tests/online-accounts-service/tst_ui_proxy.cpp (+412/-0)
tests/online-accounts-service/tst_ui_proxy.pro (+44/-0)
tests/online-accounts-ui/mock/signonui-request-mock.cpp (+113/-0)
tests/online-accounts-ui/mock/signonui-request-mock.h (+50/-0)
tests/online-accounts-ui/online-accounts-ui.pro (+1/-0)
tests/online-accounts-ui/tst_access_model.cpp (+22/-0)
tests/online-accounts-ui/tst_application_manager.cpp (+87/-0)
tests/online-accounts-ui/tst_browser_request.cpp (+300/-0)
tests/online-accounts-ui/tst_browser_request.pro (+51/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1342031
Reviewer Review Type Date Requested Status
Alberto Mardegan Pending
Review via email: mp+237243@code.launchpad.net

Commit message

Rename QML package

Description of the change

Rename QML package

To post a comment you must log in.

Unmerged revisions

194. By Alberto Mardegan

Rename QML package

193. By PS Jenkins bot

Releasing 0.4+14.10.20141001-0ubuntu1

192. By Alberto Mardegan

Minor improvements

- Show appId when app display name is empty
- Add spinner while waiting for account setup
- Add progress indicator in the webview
- Improve tests coverage

191. By Launchpad Translations on behalf of online-accounts

Launchpad automatic translations update.

190. By PS Jenkins bot

Releasing 0.4+14.10.20140925-0ubuntu1

189. By Alberto Mardegan

* Enforce the limit on single accounts even when the request comes from an app
Approved by: PS Jenkins bot, David Barth

188. By Launchpad Translations on behalf of online-accounts

Launchpad automatic translations update.

187. By Launchpad Translations on behalf of online-accounts

Launchpad automatic translations update.

186. By Launchpad Translations on behalf of online-accounts

Launchpad automatic translations update.

185. By Launchpad Translations on behalf of online-accounts

Launchpad automatic translations update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2014-08-08 11:37:56 +0000
3+++ .bzrignore 2014-10-06 11:49:54 +0000
4@@ -21,8 +21,9 @@
5 /debian/files
6 /debian/libonline-accounts-client-dev/
7 /debian/libonline-accounts-client1/
8+/debian/qml-module-ubuntu-onlineaccounts-client/
9+/debian/qml-module-ubuntu-onlineaccounts-client-doc/
10 /debian/qtdeclarative5-online-accounts-client0.1/
11-/debian/qtdeclarative5-online-accounts-client-doc/
12 /debian/tmp
13 /debian/ubuntu-system-settings-online-accounts/
14 /debian/ubuntu-system-settings-online-accounts-autopilot/
15@@ -43,8 +44,11 @@
16 /tests/client/tst_qml_client
17 /tests/online-accounts-service/tst_inactivity_timer
18 /tests/online-accounts-service/tst_service
19+/tests/online-accounts-service/tst_signonui_service
20+/tests/online-accounts-service/tst_ui_proxy
21 /tests/online-accounts-ui/qml/tst_online_accounts_qml
22 /tests/online-accounts-ui/tst_access_model
23 /tests/online-accounts-ui/tst_application_manager
24+/tests/online-accounts-ui/tst_browser_request
25 /tests/online-accounts-ui/tst_notification
26 /tests/online-accounts-ui/tst_signonui_request
27
28=== modified file 'click-hooks/click-hooks.pro'
29--- click-hooks/click-hooks.pro 2014-05-07 09:01:03 +0000
30+++ click-hooks/click-hooks.pro 2014-10-06 11:49:54 +0000
31@@ -11,13 +11,16 @@
32 xml
33
34 PKGCONFIG += \
35- accounts-qt5
36+ accounts-qt5 \
37+ click-0.4 \
38+ gobject-2.0
39
40 SOURCES += \
41 main.cpp
42
43 DEFINES += \
44- HOOK_FILES_SUBDIR=\\\"$${TARGET}\\\"
45+ HOOK_FILES_SUBDIR=\\\"$${TARGET}\\\" \
46+ QT_NO_KEYWORDS
47
48 QMAKE_SUBSTITUTES += \
49 account-application.hook.in \
50
51=== modified file 'click-hooks/main.cpp'
52--- click-hooks/main.cpp 2014-06-03 07:55:40 +0000
53+++ click-hooks/main.cpp 2014-10-06 11:49:54 +0000
54@@ -29,6 +29,41 @@
55 #include <QFileInfo>
56 #include <QStandardPaths>
57 #include <QStringList>
58+#include <click.h>
59+
60+static QString findPackageDir(const QString &appId)
61+{
62+ /* For testing */
63+ QByteArray packageDirEnv = qgetenv("OAH_CLICK_DIR");
64+ if (!packageDirEnv.isEmpty()) {
65+ return QString::fromUtf8(packageDirEnv);
66+ }
67+
68+ QStringList components = appId.split('_');
69+ QByteArray package = components.first().toUtf8();
70+
71+ GError *error = NULL;
72+ ClickUser *user = click_user_new_for_user(NULL, NULL, &error);
73+ if (Q_UNLIKELY(!user)) {
74+ qWarning() << "Unable to read Click database:" << error->message;
75+ g_error_free(error);
76+ return QString();
77+ }
78+
79+ gchar *pkgDir = click_user_get_path(user, package.constData(), &error);
80+ if (Q_UNLIKELY(!pkgDir)) {
81+ qWarning() << "Unable to get the Click package directory for" <<
82+ package << ":" << error->message;
83+ g_error_free(error);
84+ g_object_unref(user);
85+ return QString();
86+ }
87+
88+ QString ret = QString::fromUtf8(pkgDir);
89+ g_object_unref(user);
90+ g_free(pkgDir);
91+ return ret;
92+}
93
94 static QString stripVersion(const QString &appId)
95 {
96@@ -51,7 +86,10 @@
97
98 void checkId(const QString &shortAppId);
99 void addProfile(const QString &appId);
100+ void addPackageDir(const QString &appId);
101 QString profile() const;
102+ void addDesktopFile(const QString &appId);
103+ void checkIconPath(const QString &appId);
104 bool writeTo(const QString &fileName) const;
105 bool isValid() const { return m_isValid; }
106
107@@ -90,12 +128,61 @@
108 root.appendChild(elem);
109 }
110
111+void LibAccountsFile::addPackageDir(const QString &appId)
112+{
113+ QString packageDir = findPackageDir(appId);
114+ if (Q_UNLIKELY(packageDir.isEmpty())) return;
115+
116+ QDomElement root = documentElement();
117+ QDomElement elem = createElement(QStringLiteral("package-dir"));
118+ elem.appendChild(createTextNode(packageDir));
119+ root.appendChild(elem);
120+}
121+
122 QString LibAccountsFile::profile() const
123 {
124 QDomElement root = documentElement();
125 return root.firstChildElement("profile").text();
126 }
127
128+void LibAccountsFile::addDesktopFile(const QString &appId)
129+{
130+ QString desktopEntryTag = QStringLiteral("desktop-entry");
131+ QDomElement root = documentElement();
132+ /* if a <desktop-entry> element already exists, don't touch it */
133+ QDomElement elem = root.firstChildElement(desktopEntryTag);
134+ if (!elem.isNull()) return;
135+
136+ elem = createElement(desktopEntryTag);
137+ elem.appendChild(createTextNode(appId));
138+ root.appendChild(elem);
139+}
140+
141+void LibAccountsFile::checkIconPath(const QString &appId)
142+{
143+ QString iconTag = QStringLiteral("icon");
144+ QDomElement root = documentElement();
145+ /* if the <icon> element does not exist, do nothing*/
146+ QDomElement elem = root.firstChildElement(iconTag);
147+ if (elem.isNull()) return;
148+
149+ /* If the icon path is absolute, do nothing */
150+ QString icon = elem.text();
151+ if (QDir::isAbsolutePath(icon)) return;
152+
153+ /* Otherwise, try appending it to the click package install dir */
154+ QString packageDir = findPackageDir(appId);
155+ if (Q_UNLIKELY(packageDir.isEmpty())) return;
156+
157+ QFileInfo iconFile(packageDir + "/" + icon);
158+ if (iconFile.exists()) {
159+ while (elem.hasChildNodes()) {
160+ elem.removeChild(elem.firstChild());
161+ }
162+ elem.appendChild(createTextNode(iconFile.canonicalFilePath()));
163+ }
164+}
165+
166 bool LibAccountsFile::writeTo(const QString &fileName) const
167 {
168 /* Make sure that the target directory exists */
169@@ -206,14 +293,19 @@
170
171 xml.checkId(shortAppId);
172 xml.addProfile(appId);
173+ xml.addPackageDir(appId);
174+ xml.checkIconPath(appId);
175+ if (fileType == "application") {
176+ xml.addDesktopFile(appId);
177+ }
178 xml.writeTo(destination);
179 }
180
181 /* To ensure that all the installed services are parsed into
182 * libaccounts' DB, we enumerate them now.
183 */
184- Accounts::Manager *manager = new Accounts::Manager;
185- manager->serviceList();
186+ Accounts::Manager *manager =
187+ new Accounts::Manager(Accounts::Manager::DisableNotifications);
188 delete manager;
189
190 return EXIT_SUCCESS;
191
192=== modified file 'client/OnlineAccountsClient/setup.cpp'
193--- client/OnlineAccountsClient/setup.cpp 2014-08-12 12:33:10 +0000
194+++ client/OnlineAccountsClient/setup.cpp 2014-10-06 11:49:54 +0000
195@@ -129,14 +129,17 @@
196
197 watcher->deleteLater();
198
199+ QVariantMap response;
200+
201 QDBusPendingReply<QVariantMap> reply = *watcher;
202 if (reply.isError()) {
203 qWarning() << "RequestAccess failed:" << reply.error();
204 } else {
205 // At the moment, we don't have any use for the reply.
206+ response = reply.value();
207 }
208
209- Q_EMIT q->finished();
210+ Q_EMIT q->finished(response);
211 }
212
213 /*!
214
215=== modified file 'client/OnlineAccountsClient/setup.h'
216--- client/OnlineAccountsClient/setup.h 2014-03-19 12:14:14 +0000
217+++ client/OnlineAccountsClient/setup.h 2014-10-06 11:49:54 +0000
218@@ -25,6 +25,7 @@
219
220 #include "global.h"
221 #include <QObject>
222+#include <QVariantMap>
223
224 namespace OnlineAccountsClient {
225
226@@ -58,7 +59,7 @@
227 void applicationIdChanged();
228 void serviceTypeIdChanged();
229 void providerIdChanged();
230- void finished();
231+ void finished(QVariantMap reply);
232
233 private:
234 SetupPrivate *d_ptr;
235
236=== modified file 'coverage.pri'
237--- coverage.pri 2013-09-11 07:34:28 +0000
238+++ coverage.pri 2014-10-06 11:49:54 +0000
239@@ -26,7 +26,7 @@
240 generate-coverage-html.commands = \
241 "@echo Collecting coverage data"; \
242 "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
243- "lcov --extract coverage.info \"*/src/*.cpp\" --extract coverage.info \"*/client/OnlineAccountsClient/*.cpp\" -o coverage.info"; \
244+ "lcov --extract coverage.info \"*/online-accounts-service/*.cpp\" --extract coverage.info \"*/online-accounts-ui/*.cpp\" --extract coverage.info \"*/client/OnlineAccountsClient/*.cpp\" --extract coverage.info \"*/click-hooks/*.cpp\" -o coverage.info"; \
245 "lcov --remove coverage.info \"moc_*.cpp\" --remove coverage.info \"tests/*.cpp\" -o coverage.info"; \
246 "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
247
248
249=== modified file 'debian/changelog'
250--- debian/changelog 2014-07-08 14:13:10 +0000
251+++ debian/changelog 2014-10-06 11:49:54 +0000
252@@ -1,3 +1,95 @@
253+ubuntu-system-settings-online-accounts (0.4+14.10.20141001-0ubuntu1) utopic; urgency=low
254+
255+ [ Ubuntu daily release ]
256+ * New rebuild forced
257+
258+ [ Alberto Mardegan ]
259+ * Minor improvements
260+
261+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 01 Oct 2014 13:31:34 +0000
262+
263+ubuntu-system-settings-online-accounts (0.4+14.10.20140925-0ubuntu1) utopic; urgency=low
264+
265+ [ CI bot ]
266+ * Resync trunk
267+
268+ [ Alberto Mardegan ]
269+ * Enforce the limit on single accounts even when the request comes
270+ from an app .
271+
272+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 25 Sep 2014 13:25:30 +0000
273+
274+ubuntu-system-settings-online-accounts (0.4+14.10.20140917-0ubuntu1) utopic; urgency=low
275+
276+ [ CI bot ]
277+ * Resync trunk
278+
279+ [ Alberto Mardegan ]
280+ * Don't go back to SystemSettings when creating the first account.
281+ Keep listening to account model changes. Set QML import path for
282+ click plugins. Enable automatic orientation .
283+
284+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 17 Sep 2014 09:05:56 +0000
285+
286+ubuntu-system-settings-online-accounts (0.4+14.10.20140908-0ubuntu1) utopic; urgency=low
287+
288+ [ CI bot ]
289+ * Resync trunk
290+
291+ [ Alberto Mardegan ]
292+ * Handle stopping of trusted sessions. Use new Oxide cookie API .
293+
294+ [ Ubuntu daily release ]
295+ * New rebuild forced
296+
297+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 08 Sep 2014 08:55:20 +0000
298+
299+ubuntu-system-settings-online-accounts (0.4+14.10.20140903-0ubuntu1) utopic; urgency=low
300+
301+ [ CI bot ]
302+ * Resync trunk
303+
304+ [ Alberto Mardegan ]
305+ * Make locating of icons more robust
306+
307+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 03 Sep 2014 06:37:09 +0000
308+
309+ubuntu-system-settings-online-accounts (0.4+14.10.20140827-0ubuntu1) utopic; urgency=low
310+
311+ [ CI bot ]
312+ * Resync trunk
313+
314+ [ Alberto Mardegan ]
315+ * Implement the D-Bus method to export cookies. Updated the list of
316+ files to translate and the template. Fix autopilot tests .
317+
318+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 27 Aug 2014 14:22:07 +0000
319+
320+ubuntu-system-settings-online-accounts (0.4+14.10.20140819.1-0ubuntu1) utopic; urgency=low
321+
322+ [ Ubuntu daily release ]
323+ * New rebuild forced
324+
325+ [ Alberto Mardegan ]
326+ * Add desktop file information to .application files. Make the click
327+ hook work even without D-Bus. better feedback while waiting for the
328+ Trusted Session Prompt to appear .
329+ * Fix autopilot tests Change the name of the main page, which is now
330+ the one from System Settings. Remove the test case for account
331+ creation, because the implementation has moved into a separate
332+ process and is not easily testable.
333+
334+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 19 Aug 2014 14:43:48 +0000
335+
336+ubuntu-system-settings-online-accounts (0.4+14.10.20140818.1-0ubuntu1) utopic; urgency=low
337+
338+ [ Alberto Mardegan ]
339+ * New version - Use signon-ui-service, to fix co-installation with of
340+ signon-ui.- Implement reauthentication (via snap-decisions) (LP:
341+ #1346950)
342+
343+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 18 Aug 2014 13:46:44 +0000
344+
345 ubuntu-system-settings-online-accounts (0.4+14.10.20140708-0ubuntu2) utopic; urgency=medium
346
347 * Add forgotten test-dep on ubuntu-ui-toolkit-autopilot.
348
349=== modified file 'debian/control'
350--- debian/control 2014-08-18 13:24:54 +0000
351+++ debian/control 2014-10-06 11:49:54 +0000
352@@ -5,7 +5,8 @@
353 Build-Depends: debhelper (>= 9),
354 pkg-config,
355 python3:any,
356- libaccounts-qt5-dev,
357+ libaccounts-qt5-dev (>= 1.13),
358+ libclick-0.4-dev,
359 libmirclient-dev [!powerpc !ppc64 !ppc64el],
360 libnotify-dev,
361 libsignon-qt5-dev,
362@@ -28,11 +29,13 @@
363 Vcs-Bzr: https://code.launchpad.net/~online-accounts/ubuntu-system-settings-online-accounts/trunk
364 X-Python-Version: 2.7
365 XS-Testsuite: autopkgtest
366+X-Ubuntu-Use-Langpack: yes
367
368 Package: ubuntu-system-settings-online-accounts
369 Architecture: any
370 Depends: ${misc:Depends},
371 ${shlibs:Depends},
372+ liboxideqt-qmlplugin (>= 1.2.0),
373 qtdeclarative5-accounts-plugin (>= 0.3),
374 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
375 signon-ui-service,
376@@ -67,14 +70,24 @@
377
378 Package: qtdeclarative5-online-accounts-client0.1
379 Architecture: any
380+Section: oldlibs
381+Depends: qml-module-ubuntu-onlineaccounts-client, ${misc:Depends}
382+Description: transitional dummy package for Online Accounts QML clients
383+ This module offers an API for applications to invoke the Online Accounts panel
384+ in order to request the creation/configuration of accounts.
385+
386+Package: qml-module-ubuntu-onlineaccounts-client
387+Architecture: any
388 Depends: ${misc:Depends},
389 ${shlibs:Depends},
390 qtdeclarative5-qtquick2-plugin,
391+Breaks: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
392+Replaces: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
393 Description: Online Accounts panel library for QML applications
394 This module offers an API for applications to invoke the Online Accounts panel
395 in order to request the creation/configuration of accounts.
396
397-Package: qtdeclarative5-online-accounts-client-doc
398+Package: qml-module-ubuntu-onlineaccounts-client-doc
399 Section: doc
400 Architecture: all
401 Multi-Arch: foreign
402
403=== renamed file 'debian/qtdeclarative5-online-accounts-client-doc.install' => 'debian/qml-module-ubuntu-onlineaccounts-client-doc.install'
404=== renamed file 'debian/qtdeclarative5-online-accounts-client0.1.install' => 'debian/qml-module-ubuntu-onlineaccounts-client.install'
405=== modified file 'debian/rules'
406--- debian/rules 2014-08-18 13:24:54 +0000
407+++ debian/rules 2014-10-06 11:49:54 +0000
408@@ -7,6 +7,7 @@
409 override_dh_auto_configure:
410 dh_auto_configure -- \
411 LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
412+ DEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH) \
413 "QMAKE_CXXFLAGS=$(CFLAGS)" \
414 CONFIG+=enable-mir \
415 CONFIG+=ubuntu-docs \
416
417=== modified file 'online-accounts-service/main.cpp'
418--- online-accounts-service/main.cpp 2014-08-06 13:49:45 +0000
419+++ online-accounts-service/main.cpp 2014-10-06 11:49:54 +0000
420@@ -28,6 +28,7 @@
421
422 #include <QCoreApplication>
423 #include <QDBusConnection>
424+#include <QDBusMetaType>
425 #include <QProcessEnvironment>
426
427 using namespace OnlineAccountsUi;
428@@ -60,6 +61,8 @@
429
430 RequestManager *requestManager = new RequestManager();
431
432+ qDBusRegisterMetaType<SignOnUi::RawCookies>();
433+
434 Service *service = new Service();
435 QDBusConnection connection = QDBusConnection::sessionBus();
436 connection.registerService(OAU_SERVICE_NAME);
437
438=== modified file 'online-accounts-service/mir-helper.cpp'
439--- online-accounts-service/mir-helper.cpp 2014-08-12 14:04:29 +0000
440+++ online-accounts-service/mir-helper.cpp 2014-10-06 11:49:54 +0000
441@@ -39,6 +39,8 @@
442 inline PromptSessionPrivate(MirPromptSession *session);
443 inline ~PromptSessionPrivate();
444
445+ void emitFinished() { Q_EMIT q_ptr->finished(); }
446+
447 MirPromptSession *m_mirSession;
448 QList<int> m_fds;
449 mutable PromptSession *q_ptr;
450@@ -54,6 +56,7 @@
451 inline ~MirHelperPrivate();
452
453 PromptSession *createPromptSession(pid_t initiatorPid);
454+ void onSessionStopped(MirPromptSession *mirSession);
455
456 private:
457 friend class PromptSession;
458@@ -78,6 +81,7 @@
459 PromptSession::PromptSession(PromptSessionPrivate *priv):
460 d_ptr(priv)
461 {
462+ priv->q_ptr = this;
463 MirHelperPrivate *helperPrivate = MirHelper::instance()->d_ptr;
464 helperPrivate->m_sessions.append(this);
465 }
466@@ -136,13 +140,25 @@
467 }
468 }
469
470-static void session_event_callback(MirPromptSession *,
471+static void session_event_callback(MirPromptSession *mirSession,
472 MirPromptSessionState state,
473- void *)
474+ void *self)
475 {
476+ MirHelperPrivate *helper = reinterpret_cast<MirHelperPrivate*>(self);
477 DEBUG() << "Prompt Session state updated to" << state;
478+ if (state == mir_prompt_session_state_stopped) {
479+ helper->onSessionStopped(mirSession);
480+ }
481 }
482
483+void MirHelperPrivate::onSessionStopped(MirPromptSession *mirSession)
484+{
485+ Q_FOREACH(PromptSession *session, m_sessions) {
486+ if (mirSession == session->d_ptr->m_mirSession) {
487+ session->d_ptr->emitFinished();
488+ }
489+ }
490+}
491
492 PromptSession *MirHelperPrivate::createPromptSession(pid_t initiatorPid)
493 {
494
495=== modified file 'online-accounts-service/mir-helper.h'
496--- online-accounts-service/mir-helper.h 2014-08-12 12:33:10 +0000
497+++ online-accounts-service/mir-helper.h 2014-10-06 11:49:54 +0000
498@@ -28,13 +28,18 @@
499 class PromptSessionPrivate;
500 class MirHelperPrivate;
501
502-class PromptSession
503+class PromptSession: public QObject
504 {
505+ Q_OBJECT
506+
507 public:
508 ~PromptSession();
509
510 QString requestSocket();
511
512+Q_SIGNALS:
513+ void finished();
514+
515 private:
516 explicit PromptSession(PromptSessionPrivate *priv);
517
518
519=== modified file 'online-accounts-service/online-accounts-service.pro'
520--- online-accounts-service/online-accounts-service.pro 2014-08-18 13:24:54 +0000
521+++ online-accounts-service/online-accounts-service.pro 2014-10-06 11:49:54 +0000
522@@ -31,6 +31,7 @@
523
524 DEFINES += \
525 DEBUG_ENABLED \
526+ INSTALL_BIN_DIR=\\\"$${INSTALL_PREFIX}/bin\\\" \
527 SIGNONUI_I18N_DOMAIN=\\\"$${SIGNONUI_I18N_DOMAIN}\\\"
528
529 COMMON_SRC = ../online-accounts-ui
530
531=== modified file 'online-accounts-service/request-manager.cpp'
532--- online-accounts-service/request-manager.cpp 2014-08-12 12:33:10 +0000
533+++ online-accounts-service/request-manager.cpp 2014-10-06 11:49:54 +0000
534@@ -163,8 +163,6 @@
535
536 void RequestManagerPrivate::onProxyFinished()
537 {
538- Q_Q(RequestManager);
539-
540 UiProxy *proxy = qobject_cast<UiProxy*>(sender());
541 m_proxies.removeOne(proxy);
542
543
544=== modified file 'online-accounts-service/signonui-service.cpp'
545--- online-accounts-service/signonui-service.cpp 2014-08-06 13:49:45 +0000
546+++ online-accounts-service/signonui-service.cpp 2014-10-06 11:49:54 +0000
547@@ -24,14 +24,60 @@
548 #include "signonui-service.h"
549
550 #include <QDBusArgument>
551+#include <QDateTime>
552 #include <QDir>
553+#include <QFile>
554+#include <QFileInfo>
555+#include <QJsonArray>
556+#include <QJsonDocument>
557+#include <QList>
558+#include <QNetworkCookie>
559 #include <QStandardPaths>
560+#include <QVariant>
561 #include <SignOn/uisessiondata_priv.h>
562
563 using namespace SignOnUi;
564
565 namespace SignOnUi {
566
567+static QList<QByteArray> cookiesFromVariant(const QVariantList &cl)
568+{
569+ QList<QByteArray> cookies;
570+ Q_FOREACH(QVariant cookie, cl) {
571+ if (!cookie.canConvert(QVariant::Map)) {
572+ continue;
573+ }
574+
575+ QNetworkCookie nc;
576+ QVariantMap vm = cookie.toMap();
577+ if (!vm.contains("name") || !vm.contains("value")) {
578+ continue;
579+ }
580+
581+ nc.setName(vm.value("name").toByteArray());
582+ nc.setValue(vm.value("value").toByteArray());
583+ nc.setDomain(vm.value("domain").toString());
584+ nc.setPath(vm.value("path").toString());
585+ if (vm.contains("httponly") &&
586+ vm.value("httponly").canConvert(QVariant::Bool)) {
587+ nc.setHttpOnly(vm.value("httponly").toBool());
588+ }
589+
590+ if (vm.contains("issecure") &&
591+ vm.value("issecure").canConvert(QVariant::Bool)) {
592+ nc.setSecure(vm.value("issecure").toBool());
593+ }
594+
595+ if (vm.contains("expirationdate") &&
596+ vm.value("expirationdate").canConvert(QMetaType::QDateTime)) {
597+ nc.setExpirationDate(vm.value("expirationdate").toDateTime());
598+ }
599+
600+ cookies.append(nc.toRawForm());
601+ }
602+ return cookies;
603+}
604+
605 static QVariant dbusValueToVariant(const QDBusArgument &argument)
606 {
607 QVariant ret;
608@@ -74,6 +120,7 @@
609
610 void cancelUiRequest(const QString &requestId);
611 void removeIdentityData(quint32 id);
612+ RawCookies cookiesForIdentity(quint32 id, qint64 &timestamp) const;
613
614 static QString rootDirForIdentity(quint32 id);
615
616@@ -87,6 +134,7 @@
617 QObject(service),
618 q_ptr(service)
619 {
620+ qRegisterMetaType<RawCookies>("RawCookies");
621 }
622
623 ServicePrivate::~ServicePrivate()
624@@ -109,8 +157,8 @@
625 QString ServicePrivate::rootDirForIdentity(quint32 id)
626 {
627 QString cachePath =
628- QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
629- return cachePath + QString("/id-%1").arg(id);
630+ QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
631+ return cachePath + QString("/online-accounts-ui/id-%1").arg(id);
632 }
633
634 void ServicePrivate::removeIdentityData(quint32 id)
635@@ -120,6 +168,32 @@
636 rootDir.removeRecursively();
637 }
638
639+RawCookies ServicePrivate::cookiesForIdentity(quint32 id,
640+ qint64 &timestamp) const
641+{
642+ RawCookies cookies;
643+
644+ QFileInfo fileInfo(rootDirForIdentity(id) + "/cookies.json");
645+ if (!fileInfo.exists()) {
646+ DEBUG() << "File does not exist:" << fileInfo.filePath();
647+ return cookies;
648+ }
649+ timestamp = fileInfo.lastModified().toMSecsSinceEpoch() / 1000;
650+
651+ QFile file(fileInfo.filePath());
652+ if (Q_UNLIKELY(!file.open(QIODevice::ReadOnly | QIODevice::Text))) {
653+ qWarning() << "Cannot open file" << fileInfo.filePath();
654+ return cookies;
655+ }
656+
657+ QByteArray contents = file.readAll();
658+ QJsonDocument doc = QJsonDocument::fromJson(contents);
659+ if (doc.isEmpty() || !doc.isArray()) return cookies;
660+
661+ QVariantList cookieVariants = doc.array().toVariantList();
662+ return cookiesFromVariant(cookieVariants);
663+}
664+
665 Service::Service(QObject *parent):
666 QObject(parent),
667 d_ptr(new ServicePrivate(this))
668@@ -171,4 +245,11 @@
669 d->removeIdentityData(id);
670 }
671
672+void Service::cookiesForIdentity(quint32 id,
673+ RawCookies &cookies, qint64 &timestamp)
674+{
675+ Q_D(Service);
676+ cookies = d->cookiesForIdentity(id, timestamp);
677+}
678+
679 #include "signonui-service.moc"
680
681=== modified file 'online-accounts-service/signonui-service.h'
682--- online-accounts-service/signonui-service.h 2014-08-06 13:49:45 +0000
683+++ online-accounts-service/signonui-service.h 2014-10-06 11:49:54 +0000
684@@ -25,8 +25,12 @@
685 #include <QObject>
686 #include <QVariantMap>
687
688+class QByteArray;
689+
690 namespace SignOnUi {
691
692+typedef QList<QByteArray> RawCookies;
693+
694 class ServicePrivate;
695
696 class Service: public QObject, protected QDBusContext
697@@ -44,6 +48,15 @@
698 Q_NOREPLY void cancelUiRequest(const QString &requestId);
699 void removeIdentityData(quint32 id);
700
701+ /*
702+ * This is not officially part of the interface; it's an Ubuntu-specific
703+ * experimental method, and we reserve the right to remove or change it in
704+ * future releases.
705+ */
706+ void cookiesForIdentity(quint32 id,
707+ // Output parameters
708+ RawCookies &cookies, qint64 &timestamp);
709+
710 private:
711 ServicePrivate *d_ptr;
712 Q_DECLARE_PRIVATE(Service)
713@@ -51,5 +64,7 @@
714
715 } // namespace
716
717+Q_DECLARE_METATYPE(SignOnUi::RawCookies)
718+
719 #endif // SIGNON_UI_SERVICE_H
720
721
722=== modified file 'online-accounts-service/ui-proxy.cpp'
723--- online-accounts-service/ui-proxy.cpp 2014-08-14 12:25:29 +0000
724+++ online-accounts-service/ui-proxy.cpp 2014-10-06 11:49:54 +0000
725@@ -142,8 +142,6 @@
726
727 void UiProxyPrivate::onDataReady(QByteArray &data)
728 {
729- Q_Q(UiProxy);
730-
731 QVariantMap map;
732 QDataStream stream(&data, QIODevice::ReadOnly);
733 stream >> map;
734@@ -189,6 +187,8 @@
735
736 void UiProxyPrivate::setupPromptSession()
737 {
738+ Q_Q(UiProxy);
739+
740 QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
741 if (!env.value("QT_QPA_PLATFORM").startsWith("ubuntu")) return;
742
743@@ -203,6 +203,8 @@
744 }
745
746 m_promptSession = session;
747+ QObject::connect(m_promptSession, SIGNAL(finished()),
748+ q, SIGNAL(finished()));
749
750 env.insert("MIR_SOCKET", mirSocket);
751 m_process.setProcessEnvironment(env);
752@@ -212,9 +214,20 @@
753 {
754 if (Q_UNLIKELY(!setupSocket())) return false;
755
756+ QString processName;
757 QStringList arguments;
758- /* the first argument is required to be the desktop file */
759- arguments.append("--desktop_file_hint=/usr/share/applications/online-accounts-ui.desktop");
760+ QString wrapper = QString::fromUtf8(qgetenv("OAU_WRAPPER"));
761+ QString accountsUi = QStringLiteral(INSTALL_BIN_DIR "/online-accounts-ui");
762+ if (wrapper.isEmpty()) {
763+ processName = accountsUi;
764+ } else {
765+ processName = wrapper;
766+ arguments.append(accountsUi);
767+ }
768+ if (!m_promptSession) {
769+ /* the first argument is required to be the desktop file */
770+ arguments.append("--desktop_file_hint=/usr/share/applications/online-accounts-ui.desktop");
771+ }
772 arguments.append("--socket");
773 arguments.append(m_server.fullServerName());
774
775@@ -222,7 +235,7 @@
776 setupPromptSession();
777 }
778
779- m_process.start("/usr/bin/online-accounts-ui", arguments);
780+ m_process.start(processName, arguments);
781 return m_process.waitForStarted();
782 }
783
784@@ -240,10 +253,15 @@
785
786 void UiProxyPrivate::onRequestCompleted()
787 {
788+ Q_Q(UiProxy);
789+
790 Request *request = qobject_cast<Request*>(sender());
791 int id = m_requests.key(request, -1);
792 if (id != -1) {
793 m_requests.remove(id);
794+ if (m_requests.isEmpty()) {
795+ Q_EMIT q->finished();
796+ }
797 }
798 }
799
800
801=== modified file 'online-accounts-ui/access-model.cpp'
802--- online-accounts-ui/access-model.cpp 2014-02-03 10:27:39 +0000
803+++ online-accounts-ui/access-model.cpp 2014-10-06 11:49:54 +0000
804@@ -159,7 +159,8 @@
805
806 int AccessModel::rowCount(const QModelIndex &parent) const
807 {
808- return QIdentityProxyModel::rowCount(parent) + 1;
809+ return QIdentityProxyModel::rowCount(parent) +
810+ (lastItemText().isEmpty() ? 0 : 1);
811 }
812
813 void AccessModel::setLastItemText(const QString &text)
814@@ -167,11 +168,32 @@
815 Q_D(AccessModel);
816
817 if (text == d->m_lastItemText) return;
818+
819+ bool wasEmpty = d->m_lastItemText.isEmpty();
820+ bool insertingRow = false;
821+ bool removingRow = false;
822+ int oldRowCount = rowCount();
823+ if (text.isEmpty() != wasEmpty) {
824+ if (wasEmpty) {
825+ beginInsertRows(QModelIndex(), oldRowCount, oldRowCount);
826+ insertingRow = true;
827+ } else {
828+ beginRemoveRows(QModelIndex(), oldRowCount - 1, oldRowCount - 1);
829+ removingRow = true;
830+ }
831+ }
832+
833 d->m_lastItemText = text;
834 Q_EMIT lastItemTextChanged();
835
836- QModelIndex lastItemIndex = index(d->rowCount(), 0);
837- Q_EMIT dataChanged(lastItemIndex, lastItemIndex);
838+ if (insertingRow) {
839+ endInsertRows();
840+ } else if (removingRow) {
841+ endRemoveRows();
842+ } else {
843+ QModelIndex lastItemIndex = index(oldRowCount - 1, 0);
844+ Q_EMIT dataChanged(lastItemIndex, lastItemIndex);
845+ }
846 }
847
848 QString AccessModel::lastItemText() const
849
850=== modified file 'online-accounts-ui/account-manager.cpp'
851--- online-accounts-ui/account-manager.cpp 2014-02-03 10:27:39 +0000
852+++ online-accounts-ui/account-manager.cpp 2014-10-06 11:49:54 +0000
853@@ -48,21 +48,3 @@
854 AccountManager::~AccountManager()
855 {
856 }
857-
858-AccountIdList
859-AccountManager::accountListByProvider(const QString &providerId) const
860-{
861- AccountIdList allAccounts = accountList();
862- AccountIdList providerAccounts;
863-
864- Q_FOREACH(AccountId accountId, allAccounts) {
865- Account *account = this->account(accountId);
866- if (!account) continue;
867-
868- if (account->providerName() != providerId) continue;
869-
870- providerAccounts.append(accountId);
871- }
872-
873- return providerAccounts;
874-}
875
876=== modified file 'online-accounts-ui/account-manager.h'
877--- online-accounts-ui/account-manager.h 2014-02-03 10:27:39 +0000
878+++ online-accounts-ui/account-manager.h 2014-10-06 11:49:54 +0000
879@@ -32,9 +32,6 @@
880 public:
881 static AccountManager *instance();
882
883- Accounts::AccountIdList accountListByProvider(
884- const QString &providerId) const;
885-
886 protected:
887 explicit AccountManager(QObject *parent = 0);
888 ~AccountManager();
889
890=== modified file 'online-accounts-ui/application-manager.cpp'
891--- online-accounts-ui/application-manager.cpp 2014-08-14 09:31:29 +0000
892+++ online-accounts-ui/application-manager.cpp 2014-10-06 11:49:54 +0000
893@@ -183,6 +183,15 @@
894 info.insert(QStringLiteral("id"), providerId);
895 info.insert(QStringLiteral("displayName"), provider.displayName());
896 info.insert(QStringLiteral("icon"), provider.iconName());
897+ info.insert(QStringLiteral("isSingleAccount"), provider.isSingleAccount());
898+
899+ /* Get Ubuntu-specific information directly from the XML file */
900+ const QDomDocument doc = provider.domDocument();
901+ QDomElement root = doc.documentElement();
902+ info.insert(QStringLiteral("profile"),
903+ root.firstChildElement("profile").text());
904+ info.insert(QStringLiteral("package-dir"),
905+ root.firstChildElement("package-dir").text());
906 return info;
907 }
908
909
910=== modified file 'online-accounts-ui/browser-request.cpp'
911--- online-accounts-ui/browser-request.cpp 2014-08-14 09:31:29 +0000
912+++ online-accounts-ui/browser-request.cpp 2014-10-06 11:49:54 +0000
913@@ -27,14 +27,23 @@
914 #include "request-handler.h"
915
916 #include <QDir>
917+#include <QFile>
918+#include <QJsonArray>
919+#include <QJsonDocument>
920+#include <QList>
921 #include <QQmlContext>
922 #include <QQmlEngine>
923 #include <QStandardPaths>
924 #include <QTimer>
925+#include <QVariant>
926 #include <SignOn/uisessiondata_priv.h>
927
928 using namespace SignOnUi;
929
930+#ifndef SIGNONUI_FAIL_TIMEOUT
931+#define SIGNONUI_FAIL_TIMEOUT 3000
932+#endif
933+
934 namespace SignOnUi {
935
936 class BrowserRequestPrivate: public QObject
937@@ -64,6 +73,7 @@
938 static QString rootDirForIdentity(quint32 id);
939
940 public Q_SLOTS:
941+ void setCookies(const QVariant &cookies);
942 void cancel();
943 void onLoadStarted();
944 void onLoadFinished(bool ok);
945@@ -72,6 +82,9 @@
946 void onFailTimer();
947 void onFinished();
948
949+Q_SIGNALS:
950+ void authenticated();
951+
952 private:
953 void buildDialog(const QVariantMap &params);
954 void closeView();
955@@ -95,7 +108,7 @@
956 q_ptr(request)
957 {
958 m_failTimer.setSingleShot(true);
959- m_failTimer.setInterval(3000);
960+ m_failTimer.setInterval(SIGNONUI_FAIL_TIMEOUT);
961 QObject::connect(&m_failTimer, SIGNAL(timeout()),
962 this, SLOT(onFailTimer()));
963 }
964@@ -177,15 +190,32 @@
965 } else {
966 /* Replace the web page with an information screen */
967 /* TODO */
968- m_dialog->accept();
969+ Q_EMIT authenticated();
970 }
971 } else {
972 DEBUG();
973- onFinished();
974+ Q_EMIT authenticated();
975 }
976 }
977 }
978
979+void BrowserRequestPrivate::setCookies(const QVariant &cookies)
980+{
981+ DEBUG() << cookies;
982+
983+ QJsonArray jsonCookies =
984+ QJsonArray::fromVariantList(cookies.toList());
985+
986+ /* Save the cookies into a text file */
987+ QFile file(m_rootDir + "/cookies.json");
988+ if (Q_LIKELY(file.open(QIODevice::WriteOnly | QIODevice::Text))) {
989+ QJsonDocument doc(jsonCookies);
990+ file.write(doc.toJson());
991+ }
992+
993+ onFinished();
994+}
995+
996 void BrowserRequestPrivate::cancel()
997 {
998 Q_Q(BrowserRequest);
999@@ -215,7 +245,7 @@
1000 if (m_responseUrl.isEmpty()) {
1001 q->setWindow(m_dialog);
1002 } else {
1003- onFinished();
1004+ Q_EMIT authenticated();
1005 }
1006 }
1007 }
1008
1009=== modified file 'online-accounts-ui/globals.h'
1010--- online-accounts-ui/globals.h 2014-08-12 12:33:10 +0000
1011+++ online-accounts-ui/globals.h 2014-10-06 11:49:54 +0000
1012@@ -30,6 +30,7 @@
1013 #define OAU_KEY_SERVICE_TYPE QStringLiteral("serviceType")
1014 #define OAU_KEY_WINDOW_ID QStringLiteral("windowId")
1015 #define OAU_KEY_PID QStringLiteral("pid")
1016+#define OAU_KEY_ACCOUNT_ID QStringLiteral("accountId")
1017
1018 // D-Bus error names
1019 #define OAU_ERROR_PREFIX "com.ubuntu.OnlineAccountsUi."
1020
1021=== modified file 'online-accounts-ui/module/ServiceItem.qml'
1022--- online-accounts-ui/module/ServiceItem.qml 2014-05-09 10:52:01 +0000
1023+++ online-accounts-ui/module/ServiceItem.qml 2014-10-06 11:49:54 +0000
1024@@ -42,8 +42,9 @@
1025 }
1026
1027 delegate: ListItem.Standard {
1028- text: model.displayName
1029- iconName: model.iconName
1030+ text: model.displayName ? model.displayName : model.applicationId
1031+ iconSource: model.iconName.indexOf("/") === 0 ?
1032+ model.iconName : "image://theme/" + model.iconName
1033 control: Switch {
1034 checked: accountService.serviceEnabled
1035 onCheckedChanged: {
1036
1037=== modified file 'online-accounts-ui/module/WebView.qml'
1038--- online-accounts-ui/module/WebView.qml 2014-06-10 14:48:22 +0000
1039+++ online-accounts-ui/module/WebView.qml 2014-10-06 11:49:54 +0000
1040@@ -1,12 +1,16 @@
1041 import QtQuick 2.0
1042-import Ubuntu.Components 0.1
1043-import Ubuntu.Components.Extras.Browser 0.2
1044-import com.canonical.Oxide 1.0
1045-
1046-UbuntuWebView {
1047+import Ubuntu.Components 1.1
1048+import Ubuntu.Web 0.2
1049+
1050+WebView {
1051+ id: root
1052+
1053 property QtObject signonRequest
1054
1055- Component.onCompleted: url = signonRequest.startUrl
1056+ Component.onCompleted: {
1057+ signonRequest.authenticated.connect(onAuthenticated)
1058+ url = signonRequest.startUrl
1059+ }
1060
1061 onLoadingChanged: {
1062 console.log("Loading changed")
1063@@ -20,7 +24,30 @@
1064 }
1065 onUrlChanged: signonRequest.currentUrl = url
1066
1067- context: UbuntuWebContext {
1068- dataPath: signonRequest.rootDir
1069+ context: WebContext {
1070+ dataPath: signonRequest ? signonRequest.rootDir : ""
1071+ }
1072+
1073+ function onAuthenticated() {
1074+ /* Get the cookies and set them on the request */
1075+ console.log("Authenticated; getting cookies")
1076+ context.cookieManager.getCookiesResponse.connect(onGotCookies)
1077+ context.cookieManager.getAllCookies()
1078+ visible = false
1079+ }
1080+
1081+ function onGotCookies(requestId, cookies) {
1082+ signonRequest.setCookies(cookies)
1083+ }
1084+
1085+ /* Taken from webbrowser-app */
1086+ ProgressBar {
1087+ anchors.top: parent.top
1088+ anchors.left: parent.left
1089+ anchors.right: parent.right
1090+ height: units.dp(3)
1091+ showProgressPercentage: false
1092+ visible: root.loading
1093+ value: root.loadProgress / 100
1094 }
1095 }
1096
1097=== modified file 'online-accounts-ui/online-accounts-ui-helper.pro'
1098--- online-accounts-ui/online-accounts-ui-helper.pro 2014-08-14 07:12:42 +0000
1099+++ online-accounts-ui/online-accounts-ui-helper.pro 2014-10-06 11:49:54 +0000
1100@@ -30,6 +30,10 @@
1101 OAU_PLUGIN_DIR=\\\"$${ONLINE_ACCOUNTS_PLUGIN_DIR}/\\\" \
1102 PLUGIN_PRIVATE_MODULE_DIR=\\\"$${PLUGIN_PRIVATE_MODULE_DIR}\\\"
1103
1104+!isEmpty(DEB_HOST_MULTIARCH) {
1105+ DEFINES += DEB_HOST_MULTIARCH=\\\"$${DEB_HOST_MULTIARCH}\\\"
1106+}
1107+
1108 SOURCES += \
1109 access-model.cpp \
1110 account-manager.cpp \
1111
1112=== modified file 'online-accounts-ui/provider-request.cpp'
1113--- online-accounts-ui/provider-request.cpp 2014-08-07 13:41:03 +0000
1114+++ online-accounts-ui/provider-request.cpp 2014-10-06 11:49:54 +0000
1115@@ -106,7 +106,21 @@
1116 QObject::connect(m_view, SIGNAL(visibleChanged(bool)),
1117 this, SLOT(onWindowVisibleChanged(bool)));
1118 m_view->setResizeMode(QQuickView::SizeRootObjectToView);
1119- m_view->engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
1120+ QQmlEngine *engine = m_view->engine();
1121+ engine->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
1122+
1123+ /* If the plugin comes from a click package, also add
1124+ * <package-dir>/lib
1125+ * <package-dir>/lib/<DEB_HOST_MULTIARCH>
1126+ * to the QML import path.
1127+ */
1128+ QString packageDir = providerInfo.value("package-dir").toString();
1129+ if (!packageDir.isEmpty()) {
1130+ engine->addImportPath(packageDir + "/lib");
1131+#ifdef DEB_HOST_MULTIARCH
1132+ engine->addImportPath(packageDir + "/lib/" DEB_HOST_MULTIARCH);
1133+#endif
1134+ }
1135
1136 QQmlContext *context = m_view->rootContext();
1137
1138@@ -159,7 +173,7 @@
1139 Q_Q(ProviderRequest);
1140 DEBUG() << "Access allowed for account:" << accountId;
1141 QVariantMap result;
1142- result.insert("accountId", quint32(accountId));
1143+ result.insert(OAU_KEY_ACCOUNT_ID, quint32(accountId));
1144 q->setResult(result);
1145 m_view->close();
1146 }
1147
1148=== modified file 'online-accounts-ui/qml/AccountCreationPage.qml'
1149--- online-accounts-ui/qml/AccountCreationPage.qml 2014-03-19 12:14:14 +0000
1150+++ online-accounts-ui/qml/AccountCreationPage.qml 2014-10-06 11:49:54 +0000
1151@@ -20,15 +20,14 @@
1152 import Ubuntu.Components 0.1
1153 import Ubuntu.OnlineAccounts 0.1
1154
1155-Page {
1156+Item {
1157 id: root
1158
1159 property string providerId
1160+ property var flickable: null
1161
1162 signal finished(int accountId)
1163
1164- title: account.provider.displayName
1165-
1166 Account {
1167 id: account
1168 objectHandle: Manager.createAccount(providerId)
1169
1170=== modified file 'online-accounts-ui/qml/AuthorizationPage.qml'
1171--- online-accounts-ui/qml/AuthorizationPage.qml 2014-02-03 10:27:39 +0000
1172+++ online-accounts-ui/qml/AuthorizationPage.qml 2014-10-06 11:49:54 +0000
1173@@ -54,7 +54,7 @@
1174 }
1175 onDelegateClicked: {
1176 /* The last item in the model is the "Add another..." label */
1177- if (index == model.count - 1) root.createAccount();
1178+ if (model.lastItemText && index == model.count - 1) root.createAccount();
1179 }
1180 }
1181
1182
1183=== modified file 'online-accounts-ui/qml/ProviderRequest.qml'
1184--- online-accounts-ui/qml/ProviderRequest.qml 2014-08-14 09:31:29 +0000
1185+++ online-accounts-ui/qml/ProviderRequest.qml 2014-10-06 11:49:54 +0000
1186@@ -26,6 +26,7 @@
1187
1188 property variant applicationInfo: application
1189 property variant providerInfo: provider
1190+ property bool wasDenied: false
1191 property int __createdAccountId: 0
1192
1193 signal denied
1194@@ -34,27 +35,36 @@
1195 width: units.gu(48)
1196 height: units.gu(60)
1197 useDeprecatedToolbar: false
1198+ automaticOrientation: true
1199
1200 Component.onCompleted: {
1201 i18n.domain = "ubuntu-system-settings-online-accounts"
1202+ if (accessModel.count === 0) {
1203+ /* No accounts to authorize */
1204+ denied()
1205+ return
1206+ }
1207 loader.active = true
1208 pageStack.push(mainPage)
1209 }
1210
1211 on__CreatedAccountIdChanged: grantAccessIfReady()
1212+ onDenied: wasDenied = true
1213
1214 PageStack {
1215 id: pageStack
1216
1217 Page {
1218 id: mainPage
1219- title: i18n.tr("Accounts")
1220+ title: providerInfo.displayName
1221
1222 Loader {
1223 id: loader
1224 anchors.fill: parent
1225 active: false
1226- sourceComponent: (accessModel.count <= 1 || applicationInfo.id === "system-settings") ? accountCreationPage : authorizationPage
1227+ sourceComponent: ((accessModel.count <= 1 && accessModel.canCreateAccounts()) ||
1228+ applicationInfo.id === "system-settings") ?
1229+ accountCreationPage : authorizationPage
1230 onLoaded: {
1231 // use this trick to break the sourceComponent binding
1232 var tmp = sourceComponent
1233@@ -84,7 +94,12 @@
1234 id: accessModel
1235 accountModel: accountsModel
1236 applicationId: applicationInfo.id
1237- lastItemText: i18n.tr("Add another")
1238+ lastItemText: canCreateAccounts() ? i18n.tr("Add another") : ""
1239+
1240+ function canCreateAccounts() {
1241+ if (!providerInfo.isSingleAccount) return true
1242+ return accountsModel.count === 0
1243+ }
1244 }
1245
1246 Component {
1247
1248=== modified file 'online-accounts-ui/request-handler.cpp'
1249--- online-accounts-ui/request-handler.cpp 2014-08-07 13:41:03 +0000
1250+++ online-accounts-ui/request-handler.cpp 2014-10-06 11:49:54 +0000
1251@@ -84,6 +84,8 @@
1252 {
1253 Q_D(RequestHandler);
1254
1255+ if (request == d->m_request) return;
1256+
1257 if (d->m_request != 0 && request != 0) {
1258 qCritical() << "RequestHandler is already assigned a request";
1259 return;
1260
1261=== modified file 'online-accounts-ui/ui-server.cpp'
1262--- online-accounts-ui/ui-server.cpp 2014-08-08 15:07:17 +0000
1263+++ online-accounts-ui/ui-server.cpp 2014-10-06 11:49:54 +0000
1264@@ -87,8 +87,6 @@
1265
1266 void UiServerPrivate::onDataReady(QByteArray &data)
1267 {
1268- Q_Q(UiServer);
1269-
1270 QVariantMap map;
1271 QDataStream stream(&data, QIODevice::ReadOnly);
1272 stream >> map;
1273
1274=== modified file 'po/am.po'
1275--- po/am.po 2014-07-28 06:44:20 +0000
1276+++ po/am.po 2014-10-06 11:49:54 +0000
1277@@ -7,15 +7,15 @@
1278 msgstr ""
1279 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
1280 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1281-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
1282-"PO-Revision-Date: 2014-07-27 17:39+0000\n"
1283+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
1284+"PO-Revision-Date: 2014-08-30 14:19+0000\n"
1285 "Last-Translator: samson <Unknown>\n"
1286 "Language-Team: Amharic <am@li.org>\n"
1287 "MIME-Version: 1.0\n"
1288 "Content-Type: text/plain; charset=UTF-8\n"
1289 "Content-Transfer-Encoding: 8bit\n"
1290-"X-Launchpad-Export-Date: 2014-07-28 06:44+0000\n"
1291-"X-Generator: Launchpad (build 17131)\n"
1292+"X-Launchpad-Export-Date: 2014-08-31 07:29+0000\n"
1293+"X-Generator: Launchpad (build 17176)\n"
1294
1295 #: ../plugins/example/Main.qml:33
1296 msgid "User name"
1297@@ -25,11 +25,11 @@
1298 msgid "Password"
1299 msgstr "የመግቢያ ቃል"
1300
1301-#: ../src/AccountsPage.qml:53
1302+#: ../system-settings-plugin/AccountsPage.qml:51
1303 msgid "Add account…"
1304 msgstr "መግለጫ መጨመሪያ…"
1305
1306-#: ../src/AddAccountLabel.qml:27
1307+#: ../system-settings-plugin/AddAccountLabel.qml:27
1308 msgid ""
1309 "Storing account details here lets apps use the accounts without you having "
1310 "to sign in for each app."
1311@@ -37,49 +37,74 @@
1312 "መግለጫን እዚህ ማስቀመጥ መተግበሪያውን ሁል ጊዜ መጠቀም ያስችለዋል ለ እያንዳንዱ መተግበሪያ እርስዎን እንዲፈርሙ "
1313 "ክመጠየቅ ይልቅ"
1314
1315-#: ../src/NewAccountPage.qml:23
1316+#: ../system-settings-plugin/MainPage.qml:29
1317+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
1318+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
1319+msgid "Accounts"
1320+msgstr "መግለጫ"
1321+
1322+#: ../system-settings-plugin/NewAccountPage.qml:23
1323 msgid "Add account"
1324 msgstr "መግለጫ መጨመሪያ"
1325
1326-#: ../src/NoAccountsPage.qml:36
1327+#: ../system-settings-plugin/NoAccountsPage.qml:36
1328 msgid "No accounts"
1329 msgstr "መግለጫ የለም"
1330
1331-#: ../src/NoAccountsPage.qml:44
1332+#: ../system-settings-plugin/NoAccountsPage.qml:44
1333 msgid "Add account:"
1334 msgstr "መግለጫ መጨመሪያ:"
1335
1336-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
1337+#: ../online-accounts-ui/module/OAuth.qml:119
1338+msgid "Loading…"
1339+msgstr "በመጫን ላይ..."
1340+
1341+#: ../online-accounts-ui/module/OAuth.qml:149
1342+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
1343+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
1344 msgid "Cancel"
1345 msgstr "መሰረዣ"
1346
1347-#: ../src/module/Options.qml:36
1348+#: ../online-accounts-ui/module/Options.qml:36
1349 msgid "ID"
1350 msgstr "መታወቂያ"
1351
1352-#: ../src/module/Options.qml:54
1353+#: ../online-accounts-ui/module/Options.qml:48
1354 msgid "Remove account…"
1355 msgstr "መግለጫ ማስወገጃ..."
1356
1357-#: ../src/module/RemovalConfirmation.qml:32
1358+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
1359 msgid "Remove account"
1360 msgstr "መግለጫ ማስወገጃ"
1361
1362-#: ../src/module/RemovalConfirmation.qml:33
1363+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
1364 #, qt-format
1365 msgid ""
1366 "The %1 account will be removed only from your phone. You can add it again "
1367 "later."
1368 msgstr "ይህ %1 መግለጫ ከ ስልኩ ውስጥ ብቻ ይወገዳል ፡ በኋላ እንደገና ሊጨምሩት ይችላሉ"
1369
1370-#: ../src/module/RemovalConfirmation.qml:36
1371+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
1372 msgid "Remove"
1373 msgstr "ማስወገጃ"
1374
1375-#: ../src/module/ServiceSwitches.qml:33
1376+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
1377 msgid "Access to this account:"
1378 msgstr "ወደ እዚህ መግለጫ ጋር ለመድረስ"
1379
1380-#: ../.build/settings.js:1
1381-msgid "Accounts"
1382-msgstr "መግለጫ"
1383+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
1384+#, qt-format
1385+msgid "%1 wants to access your %2 account"
1386+msgstr "%1 የ እርስዎ መግለጫ ጋር መድረስ %2 ይፈልጋል"
1387+
1388+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
1389+msgid "Allow"
1390+msgstr "መፍቀጃ"
1391+
1392+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
1393+msgid "Don't allow"
1394+msgstr "መከልከያ"
1395+
1396+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
1397+msgid "Add another"
1398+msgstr "ሌላ መጨመሪያ"
1399
1400=== modified file 'po/ar.po'
1401--- po/ar.po 2014-06-20 06:09:21 +0000
1402+++ po/ar.po 2014-10-06 11:49:54 +0000
1403@@ -7,15 +7,15 @@
1404 msgstr ""
1405 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
1406 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1407-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
1408+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
1409 "PO-Revision-Date: 2013-10-03 19:50+0000\n"
1410 "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
1411 "Language-Team: Arabic <ar@li.org>\n"
1412 "MIME-Version: 1.0\n"
1413 "Content-Type: text/plain; charset=UTF-8\n"
1414 "Content-Transfer-Encoding: 8bit\n"
1415-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
1416-"X-Generator: Launchpad (build 17058)\n"
1417+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
1418+"X-Generator: Launchpad (build 17176)\n"
1419
1420 #: ../plugins/example/Main.qml:33
1421 msgid "User name"
1422@@ -25,11 +25,11 @@
1423 msgid "Password"
1424 msgstr "كلمة السر"
1425
1426-#: ../src/AccountsPage.qml:53
1427+#: ../system-settings-plugin/AccountsPage.qml:51
1428 msgid "Add account…"
1429 msgstr "إضافة حساب..."
1430
1431-#: ../src/AddAccountLabel.qml:27
1432+#: ../system-settings-plugin/AddAccountLabel.qml:27
1433 msgid ""
1434 "Storing account details here lets apps use the accounts without you having "
1435 "to sign in for each app."
1436@@ -37,49 +37,74 @@
1437 "تخزين تفاصيل الحساب هنا يتيح للتطبيقات استخدام الحسابات دون الحاجة للولوج "
1438 "لكل تطبيق."
1439
1440-#: ../src/NewAccountPage.qml:23
1441+#: ../system-settings-plugin/MainPage.qml:29
1442+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
1443+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
1444+msgid "Accounts"
1445+msgstr "الحسابات"
1446+
1447+#: ../system-settings-plugin/NewAccountPage.qml:23
1448 msgid "Add account"
1449 msgstr "إضافة حساب"
1450
1451-#: ../src/NoAccountsPage.qml:36
1452+#: ../system-settings-plugin/NoAccountsPage.qml:36
1453 msgid "No accounts"
1454 msgstr "لا حسابات"
1455
1456-#: ../src/NoAccountsPage.qml:44
1457+#: ../system-settings-plugin/NoAccountsPage.qml:44
1458 msgid "Add account:"
1459 msgstr "إضافة حساب:"
1460
1461-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
1462+#: ../online-accounts-ui/module/OAuth.qml:119
1463+msgid "Loading…"
1464+msgstr ""
1465+
1466+#: ../online-accounts-ui/module/OAuth.qml:149
1467+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
1468+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
1469 msgid "Cancel"
1470 msgstr "إلغاء"
1471
1472-#: ../src/module/Options.qml:36
1473+#: ../online-accounts-ui/module/Options.qml:36
1474 msgid "ID"
1475 msgstr "المعرّف"
1476
1477-#: ../src/module/Options.qml:54
1478+#: ../online-accounts-ui/module/Options.qml:48
1479 msgid "Remove account…"
1480 msgstr "إزالة حساب..."
1481
1482-#: ../src/module/RemovalConfirmation.qml:32
1483+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
1484 msgid "Remove account"
1485 msgstr "أزِل الحساب"
1486
1487-#: ../src/module/RemovalConfirmation.qml:33
1488+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
1489 #, qt-format
1490 msgid ""
1491 "The %1 account will be removed only from your phone. You can add it again "
1492 "later."
1493 msgstr "سيُحذف حساب \"%1\" من هاتفك فقط. يمكنك إضافته مُجددا في وقت لاحق."
1494
1495-#: ../src/module/RemovalConfirmation.qml:36
1496+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
1497 msgid "Remove"
1498 msgstr "أزِل"
1499
1500-#: ../src/module/ServiceSwitches.qml:33
1501+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
1502 msgid "Access to this account:"
1503 msgstr "الوصول إلى هذا الحساب:"
1504
1505-#: ../.build/settings.js:1
1506-msgid "Accounts"
1507-msgstr "الحسابات"
1508+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
1509+#, qt-format
1510+msgid "%1 wants to access your %2 account"
1511+msgstr ""
1512+
1513+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
1514+msgid "Allow"
1515+msgstr ""
1516+
1517+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
1518+msgid "Don't allow"
1519+msgstr ""
1520+
1521+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
1522+msgid "Add another"
1523+msgstr ""
1524
1525=== modified file 'po/ast.po'
1526--- po/ast.po 2014-06-20 06:09:21 +0000
1527+++ po/ast.po 2014-10-06 11:49:54 +0000
1528@@ -7,15 +7,15 @@
1529 msgstr ""
1530 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
1531 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1532-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
1533-"PO-Revision-Date: 2014-02-06 20:02+0000\n"
1534-"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
1535+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
1536+"PO-Revision-Date: 2014-08-31 09:39+0000\n"
1537+"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
1538 "Language-Team: Asturian <ast@li.org>\n"
1539 "MIME-Version: 1.0\n"
1540 "Content-Type: text/plain; charset=UTF-8\n"
1541 "Content-Transfer-Encoding: 8bit\n"
1542-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
1543-"X-Generator: Launchpad (build 17058)\n"
1544+"X-Launchpad-Export-Date: 2014-09-01 07:33+0000\n"
1545+"X-Generator: Launchpad (build 17176)\n"
1546
1547 #: ../plugins/example/Main.qml:33
1548 msgid "User name"
1549@@ -25,11 +25,11 @@
1550 msgid "Password"
1551 msgstr "Contraseña"
1552
1553-#: ../src/AccountsPage.qml:53
1554+#: ../system-settings-plugin/AccountsPage.qml:51
1555 msgid "Add account…"
1556 msgstr "Amestar cuenta…"
1557
1558-#: ../src/AddAccountLabel.qml:27
1559+#: ../system-settings-plugin/AddAccountLabel.qml:27
1560 msgid ""
1561 "Storing account details here lets apps use the accounts without you having "
1562 "to sign in for each app."
1563@@ -37,35 +37,47 @@
1564 "Guardar equí la información de la cuenta permitirá que les aplicaciones la "
1565 "usen ensin tener qu'aniciar sesión con caúna d'elles."
1566
1567-#: ../src/NewAccountPage.qml:23
1568+#: ../system-settings-plugin/MainPage.qml:29
1569+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
1570+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
1571+msgid "Accounts"
1572+msgstr "Cuentes"
1573+
1574+#: ../system-settings-plugin/NewAccountPage.qml:23
1575 msgid "Add account"
1576 msgstr "Amestar cuenta"
1577
1578-#: ../src/NoAccountsPage.qml:36
1579+#: ../system-settings-plugin/NoAccountsPage.qml:36
1580 msgid "No accounts"
1581 msgstr "Nun hai cuentes"
1582
1583-#: ../src/NoAccountsPage.qml:44
1584+#: ../system-settings-plugin/NoAccountsPage.qml:44
1585 msgid "Add account:"
1586 msgstr "Amestar cuenta:"
1587
1588-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
1589+#: ../online-accounts-ui/module/OAuth.qml:119
1590+msgid "Loading…"
1591+msgstr "Cargando…"
1592+
1593+#: ../online-accounts-ui/module/OAuth.qml:149
1594+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
1595+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
1596 msgid "Cancel"
1597 msgstr "Encaboxar"
1598
1599-#: ../src/module/Options.qml:36
1600+#: ../online-accounts-ui/module/Options.qml:36
1601 msgid "ID"
1602 msgstr "ID"
1603
1604-#: ../src/module/Options.qml:54
1605+#: ../online-accounts-ui/module/Options.qml:48
1606 msgid "Remove account…"
1607 msgstr "Desaniciar cuenta..."
1608
1609-#: ../src/module/RemovalConfirmation.qml:32
1610+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
1611 msgid "Remove account"
1612 msgstr "Desaniciar cuenta"
1613
1614-#: ../src/module/RemovalConfirmation.qml:33
1615+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
1616 #, qt-format
1617 msgid ""
1618 "The %1 account will be removed only from your phone. You can add it again "
1619@@ -73,14 +85,27 @@
1620 msgstr ""
1621 "La cuenta %1 desaniciaráse sólo del teléfonu. Pue volver a amestala más sero."
1622
1623-#: ../src/module/RemovalConfirmation.qml:36
1624+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
1625 msgid "Remove"
1626 msgstr "Desaniciar"
1627
1628-#: ../src/module/ServiceSwitches.qml:33
1629+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
1630 msgid "Access to this account:"
1631 msgstr "Entrar a esta cuenta:"
1632
1633-#: ../.build/settings.js:1
1634-msgid "Accounts"
1635-msgstr "Cuentes"
1636+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
1637+#, qt-format
1638+msgid "%1 wants to access your %2 account"
1639+msgstr "%1 quier acceder a la to cuenta %2"
1640+
1641+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
1642+msgid "Allow"
1643+msgstr "Permitir"
1644+
1645+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
1646+msgid "Don't allow"
1647+msgstr "Nun permitir"
1648+
1649+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
1650+msgid "Add another"
1651+msgstr "Amestar otru"
1652
1653=== added file 'po/az.po'
1654--- po/az.po 1970-01-01 00:00:00 +0000
1655+++ po/az.po 2014-10-06 11:49:54 +0000
1656@@ -0,0 +1,113 @@
1657+# Azerbaijani translation for ubuntu-system-settings-online-accounts
1658+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
1659+# This file is distributed under the same license as the ubuntu-system-settings-online-accounts package.
1660+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
1661+#
1662+msgid ""
1663+msgstr ""
1664+"Project-Id-Version: ubuntu-system-settings-online-accounts\n"
1665+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1666+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
1667+"PO-Revision-Date: 2014-09-04 12:10+0000\n"
1668+"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
1669+"Language-Team: Azerbaijani <az@li.org>\n"
1670+"MIME-Version: 1.0\n"
1671+"Content-Type: text/plain; charset=UTF-8\n"
1672+"Content-Transfer-Encoding: 8bit\n"
1673+"X-Launchpad-Export-Date: 2014-09-05 07:50+0000\n"
1674+"X-Generator: Launchpad (build 17196)\n"
1675+
1676+#: ../plugins/example/Main.qml:33
1677+msgid "User name"
1678+msgstr "İstifadəçi adı"
1679+
1680+#: ../plugins/example/Main.qml:39
1681+msgid "Password"
1682+msgstr "Şifrə"
1683+
1684+#: ../system-settings-plugin/AccountsPage.qml:51
1685+msgid "Add account…"
1686+msgstr "Hesab әlavә et"
1687+
1688+#: ../system-settings-plugin/AddAccountLabel.qml:27
1689+msgid ""
1690+"Storing account details here lets apps use the accounts without you having "
1691+"to sign in for each app."
1692+msgstr ""
1693+"Hesab məlumatlarınızı buraya qeyd etdiyinizdə, hər tətbiqetmə üçün təzədən "
1694+"hesab açmağın qarşısını almaq üçün tətbiqetmələrin hesablardan istifadə "
1695+"etməsinə icazə verə bilərsiniz."
1696+
1697+#: ../system-settings-plugin/MainPage.qml:29
1698+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
1699+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
1700+msgid "Accounts"
1701+msgstr "Hesablar"
1702+
1703+#: ../system-settings-plugin/NewAccountPage.qml:23
1704+msgid "Add account"
1705+msgstr "Hesab әlavә et"
1706+
1707+#: ../system-settings-plugin/NoAccountsPage.qml:36
1708+msgid "No accounts"
1709+msgstr "Hesab yoxdu"
1710+
1711+#: ../system-settings-plugin/NoAccountsPage.qml:44
1712+msgid "Add account:"
1713+msgstr "Hesab əlavə et:"
1714+
1715+#: ../online-accounts-ui/module/OAuth.qml:119
1716+msgid "Loading…"
1717+msgstr "Yüklənir..."
1718+
1719+#: ../online-accounts-ui/module/OAuth.qml:149
1720+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
1721+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
1722+msgid "Cancel"
1723+msgstr "İmtina"
1724+
1725+#: ../online-accounts-ui/module/Options.qml:36
1726+msgid "ID"
1727+msgstr "Kimlik"
1728+
1729+#: ../online-accounts-ui/module/Options.qml:48
1730+msgid "Remove account…"
1731+msgstr "Hesabı sil..."
1732+
1733+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
1734+msgid "Remove account"
1735+msgstr "Hesabı sil"
1736+
1737+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
1738+#, qt-format
1739+msgid ""
1740+"The %1 account will be removed only from your phone. You can add it again "
1741+"later."
1742+msgstr ""
1743+"%1 hesabı yalnız telefonunuzdan silinəcək. Daha sonra təzədən əlavə edə "
1744+"bilərsiz."
1745+
1746+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
1747+msgid "Remove"
1748+msgstr "Sil"
1749+
1750+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
1751+msgid "Access to this account:"
1752+msgstr "Bu hesaba giriş:"
1753+
1754+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
1755+#, qt-format
1756+msgid "%1 wants to access your %2 account"
1757+msgstr "%1 %2 hesabınıza daxil olmaq istəyir"
1758+
1759+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
1760+msgid "Allow"
1761+msgstr "İcazə ver"
1762+
1763+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
1764+msgid "Don't allow"
1765+msgstr "İcazә vermә"
1766+
1767+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
1768+msgid "Add another"
1769+msgstr "Başqasını əlavə et"
1770
1771=== modified file 'po/br.po'
1772--- po/br.po 2014-06-20 06:09:21 +0000
1773+++ po/br.po 2014-10-06 11:49:54 +0000
1774@@ -7,15 +7,15 @@
1775 msgstr ""
1776 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
1777 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1778-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
1779-"PO-Revision-Date: 2014-03-11 15:58+0000\n"
1780+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
1781+"PO-Revision-Date: 2014-09-01 07:45+0000\n"
1782 "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
1783 "Language-Team: Breton <br@li.org>\n"
1784 "MIME-Version: 1.0\n"
1785 "Content-Type: text/plain; charset=UTF-8\n"
1786 "Content-Transfer-Encoding: 8bit\n"
1787-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
1788-"X-Generator: Launchpad (build 17058)\n"
1789+"X-Launchpad-Export-Date: 2014-09-02 07:20+0000\n"
1790+"X-Generator: Launchpad (build 17192)\n"
1791
1792 #: ../plugins/example/Main.qml:33
1793 msgid "User name"
1794@@ -25,11 +25,11 @@
1795 msgid "Password"
1796 msgstr "Ger-tremen"
1797
1798-#: ../src/AccountsPage.qml:53
1799+#: ../system-settings-plugin/AccountsPage.qml:51
1800 msgid "Add account…"
1801 msgstr "Ouzhpennañ ur gont…"
1802
1803-#: ../src/AddAccountLabel.qml:27
1804+#: ../system-settings-plugin/AddAccountLabel.qml:27
1805 msgid ""
1806 "Storing account details here lets apps use the accounts without you having "
1807 "to sign in for each app."
1808@@ -37,35 +37,47 @@
1809 "Mirout munudoù ar gont amañ a lez an arloadoù da ober gant ar c'hontoù anez "
1810 "goulenn diganeoc'h kevreañ evit pep arload."
1811
1812-#: ../src/NewAccountPage.qml:23
1813+#: ../system-settings-plugin/MainPage.qml:29
1814+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
1815+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
1816+msgid "Accounts"
1817+msgstr "Kontoù"
1818+
1819+#: ../system-settings-plugin/NewAccountPage.qml:23
1820 msgid "Add account"
1821 msgstr "Ouzhpennañ ur gont"
1822
1823-#: ../src/NoAccountsPage.qml:36
1824+#: ../system-settings-plugin/NoAccountsPage.qml:36
1825 msgid "No accounts"
1826 msgstr "Kont ebet"
1827
1828-#: ../src/NoAccountsPage.qml:44
1829+#: ../system-settings-plugin/NoAccountsPage.qml:44
1830 msgid "Add account:"
1831 msgstr "Ouzhpennañ ur gont :"
1832
1833-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
1834+#: ../online-accounts-ui/module/OAuth.qml:119
1835+msgid "Loading…"
1836+msgstr "O kargañ..."
1837+
1838+#: ../online-accounts-ui/module/OAuth.qml:149
1839+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
1840+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
1841 msgid "Cancel"
1842 msgstr "Nullañ"
1843
1844-#: ../src/module/Options.qml:36
1845+#: ../online-accounts-ui/module/Options.qml:36
1846 msgid "ID"
1847 msgstr "ID"
1848
1849-#: ../src/module/Options.qml:54
1850+#: ../online-accounts-ui/module/Options.qml:48
1851 msgid "Remove account…"
1852 msgstr "Dilemel ar gont..."
1853
1854-#: ../src/module/RemovalConfirmation.qml:32
1855+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
1856 msgid "Remove account"
1857 msgstr "Dilemel ar gont"
1858
1859-#: ../src/module/RemovalConfirmation.qml:33
1860+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
1861 #, qt-format
1862 msgid ""
1863 "The %1 account will be removed only from your phone. You can add it again "
1864@@ -74,14 +86,27 @@
1865 "Ar gont %1 a vo dilamet diwar ho pellgomzer nemetken. Gallout a reoc'h "
1866 "adlakaat anezhi diwezhatoc'h."
1867
1868-#: ../src/module/RemovalConfirmation.qml:36
1869+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
1870 msgid "Remove"
1871 msgstr "Dilemel"
1872
1873-#: ../src/module/ServiceSwitches.qml:33
1874+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
1875 msgid "Access to this account:"
1876 msgstr "Mont d'ar gont-mañ :"
1877
1878-#: ../.build/settings.js:1
1879-msgid "Accounts"
1880-msgstr "Kontoù"
1881+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
1882+#, qt-format
1883+msgid "%1 wants to access your %2 account"
1884+msgstr "%1 a fell dezhañ mont d'ho kont %2"
1885+
1886+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
1887+msgid "Allow"
1888+msgstr "Aotren"
1889+
1890+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
1891+msgid "Don't allow"
1892+msgstr "Nac'h"
1893+
1894+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
1895+msgid "Add another"
1896+msgstr "Ouzhpennañ unan all"
1897
1898=== modified file 'po/bs.po'
1899--- po/bs.po 2014-06-20 06:09:21 +0000
1900+++ po/bs.po 2014-10-06 11:49:54 +0000
1901@@ -7,15 +7,15 @@
1902 msgstr ""
1903 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
1904 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1905-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
1906+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
1907 "PO-Revision-Date: 2014-05-15 13:43+0000\n"
1908 "Last-Translator: Dinko Osmankovic <Unknown>\n"
1909 "Language-Team: Bosnian <bs@li.org>\n"
1910 "MIME-Version: 1.0\n"
1911 "Content-Type: text/plain; charset=UTF-8\n"
1912 "Content-Transfer-Encoding: 8bit\n"
1913-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
1914-"X-Generator: Launchpad (build 17058)\n"
1915+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
1916+"X-Generator: Launchpad (build 17176)\n"
1917
1918 #: ../plugins/example/Main.qml:33
1919 msgid "User name"
1920@@ -25,11 +25,11 @@
1921 msgid "Password"
1922 msgstr "Šifra"
1923
1924-#: ../src/AccountsPage.qml:53
1925+#: ../system-settings-plugin/AccountsPage.qml:51
1926 msgid "Add account…"
1927 msgstr "Dodaj nalog…"
1928
1929-#: ../src/AddAccountLabel.qml:27
1930+#: ../system-settings-plugin/AddAccountLabel.qml:27
1931 msgid ""
1932 "Storing account details here lets apps use the accounts without you having "
1933 "to sign in for each app."
1934@@ -37,35 +37,47 @@
1935 "Održavanje korisničkih računa ovdeje omogućava aplikacijama korištenje "
1936 "računa bez prijavljivanja u pojedinačnim aplikacijama."
1937
1938-#: ../src/NewAccountPage.qml:23
1939+#: ../system-settings-plugin/MainPage.qml:29
1940+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
1941+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
1942+msgid "Accounts"
1943+msgstr "Računi"
1944+
1945+#: ../system-settings-plugin/NewAccountPage.qml:23
1946 msgid "Add account"
1947 msgstr "Dodaj račun"
1948
1949-#: ../src/NoAccountsPage.qml:36
1950+#: ../system-settings-plugin/NoAccountsPage.qml:36
1951 msgid "No accounts"
1952 msgstr "Nema računa"
1953
1954-#: ../src/NoAccountsPage.qml:44
1955+#: ../system-settings-plugin/NoAccountsPage.qml:44
1956 msgid "Add account:"
1957 msgstr "Dodaj račun:"
1958
1959-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
1960+#: ../online-accounts-ui/module/OAuth.qml:119
1961+msgid "Loading…"
1962+msgstr ""
1963+
1964+#: ../online-accounts-ui/module/OAuth.qml:149
1965+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
1966+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
1967 msgid "Cancel"
1968 msgstr "Otkaži"
1969
1970-#: ../src/module/Options.qml:36
1971+#: ../online-accounts-ui/module/Options.qml:36
1972 msgid "ID"
1973 msgstr "ID"
1974
1975-#: ../src/module/Options.qml:54
1976+#: ../online-accounts-ui/module/Options.qml:48
1977 msgid "Remove account…"
1978 msgstr "Obriši račun..."
1979
1980-#: ../src/module/RemovalConfirmation.qml:32
1981+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
1982 msgid "Remove account"
1983 msgstr "Obriši račun"
1984
1985-#: ../src/module/RemovalConfirmation.qml:33
1986+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
1987 #, qt-format
1988 msgid ""
1989 "The %1 account will be removed only from your phone. You can add it again "
1990@@ -73,14 +85,27 @@
1991 msgstr ""
1992 "Račun %1 će biti obrisan sa telefona. Možete ga dodati poslije ponovo."
1993
1994-#: ../src/module/RemovalConfirmation.qml:36
1995+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
1996 msgid "Remove"
1997 msgstr "Obriši"
1998
1999-#: ../src/module/ServiceSwitches.qml:33
2000+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
2001 msgid "Access to this account:"
2002 msgstr "Pristup ovom računu:"
2003
2004-#: ../.build/settings.js:1
2005-msgid "Accounts"
2006-msgstr "Računi"
2007+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
2008+#, qt-format
2009+msgid "%1 wants to access your %2 account"
2010+msgstr ""
2011+
2012+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
2013+msgid "Allow"
2014+msgstr ""
2015+
2016+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
2017+msgid "Don't allow"
2018+msgstr ""
2019+
2020+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
2021+msgid "Add another"
2022+msgstr ""
2023
2024=== modified file 'po/ca.po'
2025--- po/ca.po 2014-06-20 06:09:21 +0000
2026+++ po/ca.po 2014-10-06 11:49:54 +0000
2027@@ -7,15 +7,15 @@
2028 msgstr ""
2029 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
2030 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2031-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
2032-"PO-Revision-Date: 2014-01-16 10:47+0000\n"
2033+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
2034+"PO-Revision-Date: 2014-09-07 04:10+0000\n"
2035 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
2036 "Language-Team: Catalan <ca@li.org>\n"
2037 "MIME-Version: 1.0\n"
2038 "Content-Type: text/plain; charset=UTF-8\n"
2039 "Content-Transfer-Encoding: 8bit\n"
2040-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
2041-"X-Generator: Launchpad (build 17058)\n"
2042+"X-Launchpad-Export-Date: 2014-09-08 06:58+0000\n"
2043+"X-Generator: Launchpad (build 17196)\n"
2044
2045 #: ../plugins/example/Main.qml:33
2046 msgid "User name"
2047@@ -25,11 +25,11 @@
2048 msgid "Password"
2049 msgstr "Contrasenya"
2050
2051-#: ../src/AccountsPage.qml:53
2052+#: ../system-settings-plugin/AccountsPage.qml:51
2053 msgid "Add account…"
2054 msgstr "Afegeix un compte..."
2055
2056-#: ../src/AddAccountLabel.qml:27
2057+#: ../system-settings-plugin/AddAccountLabel.qml:27
2058 msgid ""
2059 "Storing account details here lets apps use the accounts without you having "
2060 "to sign in for each app."
2061@@ -38,35 +38,47 @@
2062 "podran utilitzar-los sense que hàgiu d'introduir les dades d'accés per a "
2063 "cadascuna d'elles."
2064
2065-#: ../src/NewAccountPage.qml:23
2066+#: ../system-settings-plugin/MainPage.qml:29
2067+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
2068+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
2069+msgid "Accounts"
2070+msgstr "Comptes"
2071+
2072+#: ../system-settings-plugin/NewAccountPage.qml:23
2073 msgid "Add account"
2074 msgstr "Afegeix un compte"
2075
2076-#: ../src/NoAccountsPage.qml:36
2077+#: ../system-settings-plugin/NoAccountsPage.qml:36
2078 msgid "No accounts"
2079 msgstr "No hi ha cap compte"
2080
2081-#: ../src/NoAccountsPage.qml:44
2082+#: ../system-settings-plugin/NoAccountsPage.qml:44
2083 msgid "Add account:"
2084 msgstr "Afegeix un compte:"
2085
2086-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
2087+#: ../online-accounts-ui/module/OAuth.qml:119
2088+msgid "Loading…"
2089+msgstr "S'està carregant…"
2090+
2091+#: ../online-accounts-ui/module/OAuth.qml:149
2092+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
2093+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
2094 msgid "Cancel"
2095 msgstr "Cancel·la"
2096
2097-#: ../src/module/Options.qml:36
2098+#: ../online-accounts-ui/module/Options.qml:36
2099 msgid "ID"
2100 msgstr "Identificador"
2101
2102-#: ../src/module/Options.qml:54
2103+#: ../online-accounts-ui/module/Options.qml:48
2104 msgid "Remove account…"
2105 msgstr "Suprimeix el compte..."
2106
2107-#: ../src/module/RemovalConfirmation.qml:32
2108+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
2109 msgid "Remove account"
2110 msgstr "Suprimeix el compte"
2111
2112-#: ../src/module/RemovalConfirmation.qml:33
2113+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
2114 #, qt-format
2115 msgid ""
2116 "The %1 account will be removed only from your phone. You can add it again "
2117@@ -75,14 +87,27 @@
2118 "Se suprimirà el compte %1 només en aquest dispositiu. Podeu tornar-lo a "
2119 "afegir-lo més endavant."
2120
2121-#: ../src/module/RemovalConfirmation.qml:36
2122+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
2123 msgid "Remove"
2124 msgstr "Suprimeix"
2125
2126-#: ../src/module/ServiceSwitches.qml:33
2127+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
2128 msgid "Access to this account:"
2129 msgstr "Accés a aquest compte:"
2130
2131-#: ../.build/settings.js:1
2132-msgid "Accounts"
2133-msgstr "Comptes"
2134+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
2135+#, qt-format
2136+msgid "%1 wants to access your %2 account"
2137+msgstr "%1 vol accedir al vostre compte %2"
2138+
2139+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
2140+msgid "Allow"
2141+msgstr "Permet"
2142+
2143+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
2144+msgid "Don't allow"
2145+msgstr "No ho permetis"
2146+
2147+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
2148+msgid "Add another"
2149+msgstr "Afegeix-ne una altra"
2150
2151=== modified file 'po/ckb.po'
2152--- po/ckb.po 2014-06-20 06:09:21 +0000
2153+++ po/ckb.po 2014-10-06 11:49:54 +0000
2154@@ -7,15 +7,15 @@
2155 msgstr ""
2156 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
2157 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2158-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
2159+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
2160 "PO-Revision-Date: 2014-01-19 11:35+0000\n"
2161 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2162 "Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
2163 "MIME-Version: 1.0\n"
2164 "Content-Type: text/plain; charset=UTF-8\n"
2165 "Content-Transfer-Encoding: 8bit\n"
2166-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
2167-"X-Generator: Launchpad (build 17058)\n"
2168+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
2169+"X-Generator: Launchpad (build 17176)\n"
2170
2171 #: ../plugins/example/Main.qml:33
2172 msgid "User name"
2173@@ -25,59 +25,84 @@
2174 msgid "Password"
2175 msgstr ""
2176
2177-#: ../src/AccountsPage.qml:53
2178+#: ../system-settings-plugin/AccountsPage.qml:51
2179 msgid "Add account…"
2180 msgstr ""
2181
2182-#: ../src/AddAccountLabel.qml:27
2183+#: ../system-settings-plugin/AddAccountLabel.qml:27
2184 msgid ""
2185 "Storing account details here lets apps use the accounts without you having "
2186 "to sign in for each app."
2187 msgstr ""
2188
2189-#: ../src/NewAccountPage.qml:23
2190+#: ../system-settings-plugin/MainPage.qml:29
2191+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
2192+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
2193+msgid "Accounts"
2194+msgstr ""
2195+
2196+#: ../system-settings-plugin/NewAccountPage.qml:23
2197 msgid "Add account"
2198 msgstr ""
2199
2200-#: ../src/NoAccountsPage.qml:36
2201+#: ../system-settings-plugin/NoAccountsPage.qml:36
2202 msgid "No accounts"
2203 msgstr ""
2204
2205-#: ../src/NoAccountsPage.qml:44
2206+#: ../system-settings-plugin/NoAccountsPage.qml:44
2207 msgid "Add account:"
2208 msgstr ""
2209
2210-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
2211+#: ../online-accounts-ui/module/OAuth.qml:119
2212+msgid "Loading…"
2213+msgstr ""
2214+
2215+#: ../online-accounts-ui/module/OAuth.qml:149
2216+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
2217+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
2218 msgid "Cancel"
2219 msgstr ""
2220
2221-#: ../src/module/Options.qml:36
2222+#: ../online-accounts-ui/module/Options.qml:36
2223 msgid "ID"
2224 msgstr ""
2225
2226-#: ../src/module/Options.qml:54
2227+#: ../online-accounts-ui/module/Options.qml:48
2228 msgid "Remove account…"
2229 msgstr ""
2230
2231-#: ../src/module/RemovalConfirmation.qml:32
2232+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
2233 msgid "Remove account"
2234 msgstr ""
2235
2236-#: ../src/module/RemovalConfirmation.qml:33
2237+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
2238 #, qt-format
2239 msgid ""
2240 "The %1 account will be removed only from your phone. You can add it again "
2241 "later."
2242 msgstr ""
2243
2244-#: ../src/module/RemovalConfirmation.qml:36
2245+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
2246 msgid "Remove"
2247 msgstr ""
2248
2249-#: ../src/module/ServiceSwitches.qml:33
2250+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
2251 msgid "Access to this account:"
2252 msgstr ""
2253
2254-#: ../.build/settings.js:1
2255-msgid "Accounts"
2256+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
2257+#, qt-format
2258+msgid "%1 wants to access your %2 account"
2259+msgstr ""
2260+
2261+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
2262+msgid "Allow"
2263+msgstr ""
2264+
2265+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
2266+msgid "Don't allow"
2267+msgstr ""
2268+
2269+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
2270+msgid "Add another"
2271 msgstr ""
2272
2273=== modified file 'po/cs.po'
2274--- po/cs.po 2014-06-20 06:09:21 +0000
2275+++ po/cs.po 2014-10-06 11:49:54 +0000
2276@@ -7,15 +7,15 @@
2277 msgstr ""
2278 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
2279 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2280-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
2281+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
2282 "PO-Revision-Date: 2014-01-02 12:52+0000\n"
2283 "Last-Translator: Ondra Kadlec <o.kadlec@seznam.cz>\n"
2284 "Language-Team: Czech <cs@li.org>\n"
2285 "MIME-Version: 1.0\n"
2286 "Content-Type: text/plain; charset=UTF-8\n"
2287 "Content-Transfer-Encoding: 8bit\n"
2288-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
2289-"X-Generator: Launchpad (build 17058)\n"
2290+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
2291+"X-Generator: Launchpad (build 17176)\n"
2292
2293 #: ../plugins/example/Main.qml:33
2294 msgid "User name"
2295@@ -25,11 +25,11 @@
2296 msgid "Password"
2297 msgstr "Heslo"
2298
2299-#: ../src/AccountsPage.qml:53
2300+#: ../system-settings-plugin/AccountsPage.qml:51
2301 msgid "Add account…"
2302 msgstr "Přidat účet..."
2303
2304-#: ../src/AddAccountLabel.qml:27
2305+#: ../system-settings-plugin/AddAccountLabel.qml:27
2306 msgid ""
2307 "Storing account details here lets apps use the accounts without you having "
2308 "to sign in for each app."
2309@@ -37,35 +37,47 @@
2310 "Uložení podrobností účtů umožňuje aplikacím používat vaše účty, aniž byste "
2311 "se museli pokaždé přihlašovat do každé aplikace zvlášť."
2312
2313-#: ../src/NewAccountPage.qml:23
2314+#: ../system-settings-plugin/MainPage.qml:29
2315+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
2316+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
2317+msgid "Accounts"
2318+msgstr "Účty"
2319+
2320+#: ../system-settings-plugin/NewAccountPage.qml:23
2321 msgid "Add account"
2322 msgstr "Přidat účet"
2323
2324-#: ../src/NoAccountsPage.qml:36
2325+#: ../system-settings-plugin/NoAccountsPage.qml:36
2326 msgid "No accounts"
2327 msgstr "Žádné účty"
2328
2329-#: ../src/NoAccountsPage.qml:44
2330+#: ../system-settings-plugin/NoAccountsPage.qml:44
2331 msgid "Add account:"
2332 msgstr "Přidat účet:"
2333
2334-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
2335+#: ../online-accounts-ui/module/OAuth.qml:119
2336+msgid "Loading…"
2337+msgstr ""
2338+
2339+#: ../online-accounts-ui/module/OAuth.qml:149
2340+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
2341+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
2342 msgid "Cancel"
2343 msgstr "Zrušit"
2344
2345-#: ../src/module/Options.qml:36
2346+#: ../online-accounts-ui/module/Options.qml:36
2347 msgid "ID"
2348 msgstr "ID"
2349
2350-#: ../src/module/Options.qml:54
2351+#: ../online-accounts-ui/module/Options.qml:48
2352 msgid "Remove account…"
2353 msgstr "Odebrat účet..."
2354
2355-#: ../src/module/RemovalConfirmation.qml:32
2356+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
2357 msgid "Remove account"
2358 msgstr "Odebrat účet"
2359
2360-#: ../src/module/RemovalConfirmation.qml:33
2361+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
2362 #, qt-format
2363 msgid ""
2364 "The %1 account will be removed only from your phone. You can add it again "
2365@@ -74,14 +86,27 @@
2366 "Účet %1 bude odebrán pouze z vašeho telefonu. Můžete jej přidat později "
2367 "znovu."
2368
2369-#: ../src/module/RemovalConfirmation.qml:36
2370+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
2371 msgid "Remove"
2372 msgstr "Odebrat"
2373
2374-#: ../src/module/ServiceSwitches.qml:33
2375+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
2376 msgid "Access to this account:"
2377 msgstr "Přístup k tomuto účtu:"
2378
2379-#: ../.build/settings.js:1
2380-msgid "Accounts"
2381-msgstr "Účty"
2382+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
2383+#, qt-format
2384+msgid "%1 wants to access your %2 account"
2385+msgstr ""
2386+
2387+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
2388+msgid "Allow"
2389+msgstr ""
2390+
2391+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
2392+msgid "Don't allow"
2393+msgstr ""
2394+
2395+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
2396+msgid "Add another"
2397+msgstr ""
2398
2399=== modified file 'po/da.po'
2400--- po/da.po 2014-07-23 07:00:44 +0000
2401+++ po/da.po 2014-10-06 11:49:54 +0000
2402@@ -8,15 +8,15 @@
2403 msgstr ""
2404 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
2405 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2406-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
2407+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
2408 "PO-Revision-Date: 2014-07-22 15:46+0000\n"
2409 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
2410 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
2411 "MIME-Version: 1.0\n"
2412 "Content-Type: text/plain; charset=UTF-8\n"
2413 "Content-Transfer-Encoding: 8bit\n"
2414-"X-Launchpad-Export-Date: 2014-07-23 07:00+0000\n"
2415-"X-Generator: Launchpad (build 17114)\n"
2416+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
2417+"X-Generator: Launchpad (build 17176)\n"
2418
2419 #: ../plugins/example/Main.qml:33
2420 msgid "User name"
2421@@ -26,11 +26,11 @@
2422 msgid "Password"
2423 msgstr "Adgangskode"
2424
2425-#: ../src/AccountsPage.qml:53
2426+#: ../system-settings-plugin/AccountsPage.qml:51
2427 msgid "Add account…"
2428 msgstr "Tilføj konto…"
2429
2430-#: ../src/AddAccountLabel.qml:27
2431+#: ../system-settings-plugin/AddAccountLabel.qml:27
2432 msgid ""
2433 "Storing account details here lets apps use the accounts without you having "
2434 "to sign in for each app."
2435@@ -38,35 +38,47 @@
2436 "Hvis kontodetaljer lagres her, kan apps bruge kontoerne uden at du skal "
2437 "logge ind for hver app."
2438
2439-#: ../src/NewAccountPage.qml:23
2440+#: ../system-settings-plugin/MainPage.qml:29
2441+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
2442+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
2443+msgid "Accounts"
2444+msgstr "Konti"
2445+
2446+#: ../system-settings-plugin/NewAccountPage.qml:23
2447 msgid "Add account"
2448 msgstr "Tilføj konto"
2449
2450-#: ../src/NoAccountsPage.qml:36
2451+#: ../system-settings-plugin/NoAccountsPage.qml:36
2452 msgid "No accounts"
2453 msgstr "Ingen konti"
2454
2455-#: ../src/NoAccountsPage.qml:44
2456+#: ../system-settings-plugin/NoAccountsPage.qml:44
2457 msgid "Add account:"
2458 msgstr "Tilføj konto:"
2459
2460-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
2461+#: ../online-accounts-ui/module/OAuth.qml:119
2462+msgid "Loading…"
2463+msgstr ""
2464+
2465+#: ../online-accounts-ui/module/OAuth.qml:149
2466+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
2467+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
2468 msgid "Cancel"
2469 msgstr "Annullér"
2470
2471-#: ../src/module/Options.qml:36
2472+#: ../online-accounts-ui/module/Options.qml:36
2473 msgid "ID"
2474 msgstr "Id"
2475
2476-#: ../src/module/Options.qml:54
2477+#: ../online-accounts-ui/module/Options.qml:48
2478 msgid "Remove account…"
2479 msgstr "Fjern konto…"
2480
2481-#: ../src/module/RemovalConfirmation.qml:32
2482+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
2483 msgid "Remove account"
2484 msgstr "Fjern konto"
2485
2486-#: ../src/module/RemovalConfirmation.qml:33
2487+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
2488 #, qt-format
2489 msgid ""
2490 "The %1 account will be removed only from your phone. You can add it again "
2491@@ -75,14 +87,27 @@
2492 "Kontoen %1 vil kun blive fjernet fra din telefon. Du kan tilføje den igen "
2493 "senere."
2494
2495-#: ../src/module/RemovalConfirmation.qml:36
2496+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
2497 msgid "Remove"
2498 msgstr "Fjern"
2499
2500-#: ../src/module/ServiceSwitches.qml:33
2501+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
2502 msgid "Access to this account:"
2503 msgstr "Adgang til denne konto:"
2504
2505-#: ../.build/settings.js:1
2506-msgid "Accounts"
2507-msgstr "Konti"
2508+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
2509+#, qt-format
2510+msgid "%1 wants to access your %2 account"
2511+msgstr ""
2512+
2513+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
2514+msgid "Allow"
2515+msgstr ""
2516+
2517+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
2518+msgid "Don't allow"
2519+msgstr ""
2520+
2521+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
2522+msgid "Add another"
2523+msgstr ""
2524
2525=== modified file 'po/de.po'
2526--- po/de.po 2014-06-20 06:09:21 +0000
2527+++ po/de.po 2014-10-06 11:49:54 +0000
2528@@ -7,15 +7,15 @@
2529 msgstr ""
2530 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
2531 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2532-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
2533-"PO-Revision-Date: 2014-06-06 19:27+0000\n"
2534-"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"
2535+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
2536+"PO-Revision-Date: 2014-08-29 12:59+0000\n"
2537+"Last-Translator: Martin Pitt <martin.pitt@ubuntu.com>\n"
2538 "Language-Team: German <de@li.org>\n"
2539 "MIME-Version: 1.0\n"
2540 "Content-Type: text/plain; charset=UTF-8\n"
2541 "Content-Transfer-Encoding: 8bit\n"
2542-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
2543-"X-Generator: Launchpad (build 17058)\n"
2544+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
2545+"X-Generator: Launchpad (build 17176)\n"
2546
2547 #: ../plugins/example/Main.qml:33
2548 msgid "User name"
2549@@ -25,11 +25,11 @@
2550 msgid "Password"
2551 msgstr "Passwort"
2552
2553-#: ../src/AccountsPage.qml:53
2554+#: ../system-settings-plugin/AccountsPage.qml:51
2555 msgid "Add account…"
2556 msgstr "Konto hinzufügen …"
2557
2558-#: ../src/AddAccountLabel.qml:27
2559+#: ../system-settings-plugin/AddAccountLabel.qml:27
2560 msgid ""
2561 "Storing account details here lets apps use the accounts without you having "
2562 "to sign in for each app."
2563@@ -38,35 +38,47 @@
2564 "Konto zu benutzen, ohne dass Sie sich für jede einzelne Anwendung anmelden "
2565 "müssen."
2566
2567-#: ../src/NewAccountPage.qml:23
2568+#: ../system-settings-plugin/MainPage.qml:29
2569+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
2570+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
2571+msgid "Accounts"
2572+msgstr "Konten"
2573+
2574+#: ../system-settings-plugin/NewAccountPage.qml:23
2575 msgid "Add account"
2576 msgstr "Konto hinzufügen"
2577
2578-#: ../src/NoAccountsPage.qml:36
2579+#: ../system-settings-plugin/NoAccountsPage.qml:36
2580 msgid "No accounts"
2581 msgstr "Keine Konten"
2582
2583-#: ../src/NoAccountsPage.qml:44
2584+#: ../system-settings-plugin/NoAccountsPage.qml:44
2585 msgid "Add account:"
2586 msgstr "Konto hinzufügen:"
2587
2588-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
2589+#: ../online-accounts-ui/module/OAuth.qml:119
2590+msgid "Loading…"
2591+msgstr "Laden…"
2592+
2593+#: ../online-accounts-ui/module/OAuth.qml:149
2594+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
2595+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
2596 msgid "Cancel"
2597 msgstr "Abbrechen"
2598
2599-#: ../src/module/Options.qml:36
2600+#: ../online-accounts-ui/module/Options.qml:36
2601 msgid "ID"
2602 msgstr "ID"
2603
2604-#: ../src/module/Options.qml:54
2605+#: ../online-accounts-ui/module/Options.qml:48
2606 msgid "Remove account…"
2607 msgstr "Konto entfernen …"
2608
2609-#: ../src/module/RemovalConfirmation.qml:32
2610+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
2611 msgid "Remove account"
2612 msgstr "Konto entfernen"
2613
2614-#: ../src/module/RemovalConfirmation.qml:33
2615+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
2616 #, qt-format
2617 msgid ""
2618 "The %1 account will be removed only from your phone. You can add it again "
2619@@ -75,14 +87,27 @@
2620 "Das %1-Konto wird nur von ihrem Telefon entfernt. Sie können es später "
2621 "wieder hinzufügen."
2622
2623-#: ../src/module/RemovalConfirmation.qml:36
2624+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
2625 msgid "Remove"
2626 msgstr "Entfernen"
2627
2628-#: ../src/module/ServiceSwitches.qml:33
2629+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
2630 msgid "Access to this account:"
2631 msgstr "Zugriff auf dieses Konto:"
2632
2633-#: ../.build/settings.js:1
2634-msgid "Accounts"
2635-msgstr "Konten"
2636+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
2637+#, qt-format
2638+msgid "%1 wants to access your %2 account"
2639+msgstr "%1 möchte auf Ihr %2-Konto zugreifen"
2640+
2641+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
2642+msgid "Allow"
2643+msgstr "Erlauben"
2644+
2645+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
2646+msgid "Don't allow"
2647+msgstr "Verbieten"
2648+
2649+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
2650+msgid "Add another"
2651+msgstr "Weiteres hinzufügen"
2652
2653=== modified file 'po/el.po'
2654--- po/el.po 2014-07-29 06:52:44 +0000
2655+++ po/el.po 2014-10-06 11:49:54 +0000
2656@@ -7,15 +7,15 @@
2657 msgstr ""
2658 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
2659 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2660-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
2661+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
2662 "PO-Revision-Date: 2014-07-28 15:54+0000\n"
2663 "Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"
2664 "Language-Team: Greek <el@li.org>\n"
2665 "MIME-Version: 1.0\n"
2666 "Content-Type: text/plain; charset=UTF-8\n"
2667 "Content-Transfer-Encoding: 8bit\n"
2668-"X-Launchpad-Export-Date: 2014-07-29 06:52+0000\n"
2669-"X-Generator: Launchpad (build 17131)\n"
2670+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
2671+"X-Generator: Launchpad (build 17176)\n"
2672
2673 #: ../plugins/example/Main.qml:33
2674 msgid "User name"
2675@@ -25,11 +25,11 @@
2676 msgid "Password"
2677 msgstr "Κωδικός πρόσβασης"
2678
2679-#: ../src/AccountsPage.qml:53
2680+#: ../system-settings-plugin/AccountsPage.qml:51
2681 msgid "Add account…"
2682 msgstr "Πρόσθεση λογαριασμού..."
2683
2684-#: ../src/AddAccountLabel.qml:27
2685+#: ../system-settings-plugin/AddAccountLabel.qml:27
2686 msgid ""
2687 "Storing account details here lets apps use the accounts without you having "
2688 "to sign in for each app."
2689@@ -38,35 +38,47 @@
2690 "χρησιμοποιούν τους λογαριασμούς χωρίς να χρειάζεται να συνδέεστε εσείς σε "
2691 "κάθε εφαρμογή."
2692
2693-#: ../src/NewAccountPage.qml:23
2694+#: ../system-settings-plugin/MainPage.qml:29
2695+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
2696+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
2697+msgid "Accounts"
2698+msgstr "Λογαριασμοί"
2699+
2700+#: ../system-settings-plugin/NewAccountPage.qml:23
2701 msgid "Add account"
2702 msgstr "Προσθήκη λογαριασμού"
2703
2704-#: ../src/NoAccountsPage.qml:36
2705+#: ../system-settings-plugin/NoAccountsPage.qml:36
2706 msgid "No accounts"
2707 msgstr "Κανένας λογαριασμός"
2708
2709-#: ../src/NoAccountsPage.qml:44
2710+#: ../system-settings-plugin/NoAccountsPage.qml:44
2711 msgid "Add account:"
2712 msgstr "Προσθήκη λογαριασμού:"
2713
2714-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
2715+#: ../online-accounts-ui/module/OAuth.qml:119
2716+msgid "Loading…"
2717+msgstr ""
2718+
2719+#: ../online-accounts-ui/module/OAuth.qml:149
2720+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
2721+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
2722 msgid "Cancel"
2723 msgstr "Ακύρωση"
2724
2725-#: ../src/module/Options.qml:36
2726+#: ../online-accounts-ui/module/Options.qml:36
2727 msgid "ID"
2728 msgstr "Αναγνωριστικό (ID)"
2729
2730-#: ../src/module/Options.qml:54
2731+#: ../online-accounts-ui/module/Options.qml:48
2732 msgid "Remove account…"
2733 msgstr "Απομάκρυνση λογαριασμού..."
2734
2735-#: ../src/module/RemovalConfirmation.qml:32
2736+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
2737 msgid "Remove account"
2738 msgstr "Αφαίρεση λογαριασμού"
2739
2740-#: ../src/module/RemovalConfirmation.qml:33
2741+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
2742 #, qt-format
2743 msgid ""
2744 "The %1 account will be removed only from your phone. You can add it again "
2745@@ -75,14 +87,27 @@
2746 "Ο λογαριασμός %1 θα αφαιρεθεί μόνο από το τηλέφωνό σας. Μπορείτε να το "
2747 "προσθέσετε ξανά αργότερα."
2748
2749-#: ../src/module/RemovalConfirmation.qml:36
2750+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
2751 msgid "Remove"
2752 msgstr "Αφαίρεση"
2753
2754-#: ../src/module/ServiceSwitches.qml:33
2755+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
2756 msgid "Access to this account:"
2757 msgstr "Πρόσβαση σε αυτό το λογαριασμό:"
2758
2759-#: ../.build/settings.js:1
2760-msgid "Accounts"
2761-msgstr "Λογαριασμοί"
2762+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
2763+#, qt-format
2764+msgid "%1 wants to access your %2 account"
2765+msgstr ""
2766+
2767+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
2768+msgid "Allow"
2769+msgstr ""
2770+
2771+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
2772+msgid "Don't allow"
2773+msgstr ""
2774+
2775+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
2776+msgid "Add another"
2777+msgstr ""
2778
2779=== modified file 'po/en_AU.po'
2780--- po/en_AU.po 2014-06-20 06:09:21 +0000
2781+++ po/en_AU.po 2014-10-06 11:49:54 +0000
2782@@ -7,15 +7,15 @@
2783 msgstr ""
2784 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
2785 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2786-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
2787-"PO-Revision-Date: 2013-07-27 06:40+0000\n"
2788-"Last-Translator: Jackson Doak <Doak.jackson@gmail.com>\n"
2789+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
2790+"PO-Revision-Date: 2014-08-31 11:18+0000\n"
2791+"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
2792 "Language-Team: English (Australia) <en_AU@li.org>\n"
2793 "MIME-Version: 1.0\n"
2794 "Content-Type: text/plain; charset=UTF-8\n"
2795 "Content-Transfer-Encoding: 8bit\n"
2796-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
2797-"X-Generator: Launchpad (build 17058)\n"
2798+"X-Launchpad-Export-Date: 2014-09-01 07:33+0000\n"
2799+"X-Generator: Launchpad (build 17176)\n"
2800
2801 #: ../plugins/example/Main.qml:33
2802 msgid "User name"
2803@@ -25,11 +25,11 @@
2804 msgid "Password"
2805 msgstr "Password"
2806
2807-#: ../src/AccountsPage.qml:53
2808+#: ../system-settings-plugin/AccountsPage.qml:51
2809 msgid "Add account…"
2810 msgstr "Add account…"
2811
2812-#: ../src/AddAccountLabel.qml:27
2813+#: ../system-settings-plugin/AddAccountLabel.qml:27
2814 msgid ""
2815 "Storing account details here lets apps use the accounts without you having "
2816 "to sign in for each app."
2817@@ -37,35 +37,47 @@
2818 "Storing account details here lets apps use the accounts without you having "
2819 "to sign in for each app."
2820
2821-#: ../src/NewAccountPage.qml:23
2822+#: ../system-settings-plugin/MainPage.qml:29
2823+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
2824+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
2825+msgid "Accounts"
2826+msgstr "Accounts"
2827+
2828+#: ../system-settings-plugin/NewAccountPage.qml:23
2829 msgid "Add account"
2830 msgstr "Add account"
2831
2832-#: ../src/NoAccountsPage.qml:36
2833+#: ../system-settings-plugin/NoAccountsPage.qml:36
2834 msgid "No accounts"
2835 msgstr "No accounts"
2836
2837-#: ../src/NoAccountsPage.qml:44
2838+#: ../system-settings-plugin/NoAccountsPage.qml:44
2839 msgid "Add account:"
2840 msgstr "Add account:"
2841
2842-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
2843+#: ../online-accounts-ui/module/OAuth.qml:119
2844+msgid "Loading…"
2845+msgstr "Loading…"
2846+
2847+#: ../online-accounts-ui/module/OAuth.qml:149
2848+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
2849+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
2850 msgid "Cancel"
2851 msgstr "Cancel"
2852
2853-#: ../src/module/Options.qml:36
2854+#: ../online-accounts-ui/module/Options.qml:36
2855 msgid "ID"
2856 msgstr "ID"
2857
2858-#: ../src/module/Options.qml:54
2859+#: ../online-accounts-ui/module/Options.qml:48
2860 msgid "Remove account…"
2861 msgstr "Remove account…"
2862
2863-#: ../src/module/RemovalConfirmation.qml:32
2864+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
2865 msgid "Remove account"
2866 msgstr "Remove account"
2867
2868-#: ../src/module/RemovalConfirmation.qml:33
2869+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
2870 #, qt-format
2871 msgid ""
2872 "The %1 account will be removed only from your phone. You can add it again "
2873@@ -74,14 +86,27 @@
2874 "The %1 account will be removed only from your phone. You can add it again "
2875 "later."
2876
2877-#: ../src/module/RemovalConfirmation.qml:36
2878+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
2879 msgid "Remove"
2880 msgstr "Remove"
2881
2882-#: ../src/module/ServiceSwitches.qml:33
2883+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
2884 msgid "Access to this account:"
2885 msgstr "Access to this account:"
2886
2887-#: ../.build/settings.js:1
2888-msgid "Accounts"
2889-msgstr "Accounts"
2890+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
2891+#, qt-format
2892+msgid "%1 wants to access your %2 account"
2893+msgstr "%1 wants to access your %2 account"
2894+
2895+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
2896+msgid "Allow"
2897+msgstr "Allow"
2898+
2899+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
2900+msgid "Don't allow"
2901+msgstr "Don't allow"
2902+
2903+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
2904+msgid "Add another"
2905+msgstr "Add another"
2906
2907=== modified file 'po/en_GB.po'
2908--- po/en_GB.po 2014-07-10 07:29:34 +0000
2909+++ po/en_GB.po 2014-10-06 11:49:54 +0000
2910@@ -7,15 +7,15 @@
2911 msgstr ""
2912 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
2913 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2914-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
2915-"PO-Revision-Date: 2014-07-09 17:02+0000\n"
2916-"Last-Translator: Anthony Harrington <untaintableangel@ubuntu.com>\n"
2917+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
2918+"PO-Revision-Date: 2014-09-02 00:05+0000\n"
2919+"Last-Translator: Alan Pope ㋛ <alan@ubuntu.com>\n"
2920 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
2921 "MIME-Version: 1.0\n"
2922 "Content-Type: text/plain; charset=UTF-8\n"
2923 "Content-Transfer-Encoding: 8bit\n"
2924-"X-Launchpad-Export-Date: 2014-07-10 07:29+0000\n"
2925-"X-Generator: Launchpad (build 17100)\n"
2926+"X-Launchpad-Export-Date: 2014-09-02 07:20+0000\n"
2927+"X-Generator: Launchpad (build 17192)\n"
2928
2929 #: ../plugins/example/Main.qml:33
2930 msgid "User name"
2931@@ -25,11 +25,11 @@
2932 msgid "Password"
2933 msgstr "Password"
2934
2935-#: ../src/AccountsPage.qml:53
2936+#: ../system-settings-plugin/AccountsPage.qml:51
2937 msgid "Add account…"
2938 msgstr "Add account…"
2939
2940-#: ../src/AddAccountLabel.qml:27
2941+#: ../system-settings-plugin/AddAccountLabel.qml:27
2942 msgid ""
2943 "Storing account details here lets apps use the accounts without you having "
2944 "to sign in for each app."
2945@@ -37,35 +37,47 @@
2946 "Storing account details here saves time that would otherwise be spent "
2947 "signing in for each app."
2948
2949-#: ../src/NewAccountPage.qml:23
2950+#: ../system-settings-plugin/MainPage.qml:29
2951+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
2952+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
2953+msgid "Accounts"
2954+msgstr "Accounts"
2955+
2956+#: ../system-settings-plugin/NewAccountPage.qml:23
2957 msgid "Add account"
2958 msgstr "Add account"
2959
2960-#: ../src/NoAccountsPage.qml:36
2961+#: ../system-settings-plugin/NoAccountsPage.qml:36
2962 msgid "No accounts"
2963 msgstr "No accounts"
2964
2965-#: ../src/NoAccountsPage.qml:44
2966+#: ../system-settings-plugin/NoAccountsPage.qml:44
2967 msgid "Add account:"
2968 msgstr "Add account:"
2969
2970-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
2971+#: ../online-accounts-ui/module/OAuth.qml:119
2972+msgid "Loading…"
2973+msgstr "Loading…"
2974+
2975+#: ../online-accounts-ui/module/OAuth.qml:149
2976+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
2977+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
2978 msgid "Cancel"
2979 msgstr "Cancel"
2980
2981-#: ../src/module/Options.qml:36
2982+#: ../online-accounts-ui/module/Options.qml:36
2983 msgid "ID"
2984 msgstr "ID"
2985
2986-#: ../src/module/Options.qml:54
2987+#: ../online-accounts-ui/module/Options.qml:48
2988 msgid "Remove account…"
2989 msgstr "Remove account…"
2990
2991-#: ../src/module/RemovalConfirmation.qml:32
2992+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
2993 msgid "Remove account"
2994 msgstr "Remove account"
2995
2996-#: ../src/module/RemovalConfirmation.qml:33
2997+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
2998 #, qt-format
2999 msgid ""
3000 "The %1 account will be removed only from your phone. You can add it again "
3001@@ -74,14 +86,27 @@
3002 "The %1 account will be removed only from your phone. You can add it again "
3003 "later."
3004
3005-#: ../src/module/RemovalConfirmation.qml:36
3006+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
3007 msgid "Remove"
3008 msgstr "Remove"
3009
3010-#: ../src/module/ServiceSwitches.qml:33
3011+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
3012 msgid "Access to this account:"
3013 msgstr "Access to this account:"
3014
3015-#: ../.build/settings.js:1
3016-msgid "Accounts"
3017-msgstr "Accounts"
3018+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
3019+#, qt-format
3020+msgid "%1 wants to access your %2 account"
3021+msgstr "%1 wants to access your %2 account"
3022+
3023+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
3024+msgid "Allow"
3025+msgstr "Allow"
3026+
3027+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
3028+msgid "Don't allow"
3029+msgstr "Don't allow"
3030+
3031+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
3032+msgid "Add another"
3033+msgstr "Add another"
3034
3035=== modified file 'po/es.po'
3036--- po/es.po 2014-06-20 06:09:21 +0000
3037+++ po/es.po 2014-10-06 11:49:54 +0000
3038@@ -7,15 +7,15 @@
3039 msgstr ""
3040 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
3041 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3042-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
3043-"PO-Revision-Date: 2013-07-12 09:54+0000\n"
3044-"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
3045+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
3046+"PO-Revision-Date: 2014-08-29 16:10+0000\n"
3047+"Last-Translator: Víctor R. Ruiz <Unknown>\n"
3048 "Language-Team: Spanish <es@li.org>\n"
3049 "MIME-Version: 1.0\n"
3050 "Content-Type: text/plain; charset=UTF-8\n"
3051 "Content-Transfer-Encoding: 8bit\n"
3052-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
3053-"X-Generator: Launchpad (build 17058)\n"
3054+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
3055+"X-Generator: Launchpad (build 17176)\n"
3056
3057 #: ../plugins/example/Main.qml:33
3058 msgid "User name"
3059@@ -25,11 +25,11 @@
3060 msgid "Password"
3061 msgstr "Contraseña"
3062
3063-#: ../src/AccountsPage.qml:53
3064+#: ../system-settings-plugin/AccountsPage.qml:51
3065 msgid "Add account…"
3066 msgstr "Añadir cuenta…"
3067
3068-#: ../src/AddAccountLabel.qml:27
3069+#: ../system-settings-plugin/AddAccountLabel.qml:27
3070 msgid ""
3071 "Storing account details here lets apps use the accounts without you having "
3072 "to sign in for each app."
3073@@ -37,35 +37,47 @@
3074 "Al guardar detalles de cuentas aquí, permitirá que las aplicaciones las usen "
3075 "sin que tenga que iniciar sesión en cada una."
3076
3077-#: ../src/NewAccountPage.qml:23
3078+#: ../system-settings-plugin/MainPage.qml:29
3079+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
3080+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
3081+msgid "Accounts"
3082+msgstr "Cuentas"
3083+
3084+#: ../system-settings-plugin/NewAccountPage.qml:23
3085 msgid "Add account"
3086 msgstr "Añadir cuenta"
3087
3088-#: ../src/NoAccountsPage.qml:36
3089+#: ../system-settings-plugin/NoAccountsPage.qml:36
3090 msgid "No accounts"
3091 msgstr "No hay cuentas"
3092
3093-#: ../src/NoAccountsPage.qml:44
3094+#: ../system-settings-plugin/NoAccountsPage.qml:44
3095 msgid "Add account:"
3096 msgstr "Añadir cuenta:"
3097
3098-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
3099+#: ../online-accounts-ui/module/OAuth.qml:119
3100+msgid "Loading…"
3101+msgstr "Cargando…"
3102+
3103+#: ../online-accounts-ui/module/OAuth.qml:149
3104+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
3105+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
3106 msgid "Cancel"
3107 msgstr "Cancelar"
3108
3109-#: ../src/module/Options.qml:36
3110+#: ../online-accounts-ui/module/Options.qml:36
3111 msgid "ID"
3112 msgstr "Id."
3113
3114-#: ../src/module/Options.qml:54
3115+#: ../online-accounts-ui/module/Options.qml:48
3116 msgid "Remove account…"
3117 msgstr "Eliminar cuenta…"
3118
3119-#: ../src/module/RemovalConfirmation.qml:32
3120+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
3121 msgid "Remove account"
3122 msgstr "Eliminar cuenta"
3123
3124-#: ../src/module/RemovalConfirmation.qml:33
3125+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
3126 #, qt-format
3127 msgid ""
3128 "The %1 account will be removed only from your phone. You can add it again "
3129@@ -74,14 +86,27 @@
3130 "La cuenta %1 se eliminará solo de su teléfono. Puede volver a añadirla "
3131 "después."
3132
3133-#: ../src/module/RemovalConfirmation.qml:36
3134+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
3135 msgid "Remove"
3136 msgstr "Eliminar"
3137
3138-#: ../src/module/ServiceSwitches.qml:33
3139+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
3140 msgid "Access to this account:"
3141 msgstr "Acceso a esta cuenta:"
3142
3143-#: ../.build/settings.js:1
3144-msgid "Accounts"
3145-msgstr "Cuentas"
3146+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
3147+#, qt-format
3148+msgid "%1 wants to access your %2 account"
3149+msgstr "%1 quiere acceder a su cuenta de %2"
3150+
3151+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
3152+msgid "Allow"
3153+msgstr "Permitir"
3154+
3155+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
3156+msgid "Don't allow"
3157+msgstr "No permitir"
3158+
3159+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
3160+msgid "Add another"
3161+msgstr "Añadir otra"
3162
3163=== modified file 'po/eu.po'
3164--- po/eu.po 2014-07-18 05:27:28 +0000
3165+++ po/eu.po 2014-10-06 11:49:54 +0000
3166@@ -7,15 +7,15 @@
3167 msgstr ""
3168 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
3169 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3170-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
3171-"PO-Revision-Date: 2014-07-17 18:35+0000\n"
3172+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
3173+"PO-Revision-Date: 2014-09-01 22:21+0000\n"
3174 "Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
3175 "Language-Team: Basque <eu@li.org>\n"
3176 "MIME-Version: 1.0\n"
3177 "Content-Type: text/plain; charset=UTF-8\n"
3178 "Content-Transfer-Encoding: 8bit\n"
3179-"X-Launchpad-Export-Date: 2014-07-18 05:27+0000\n"
3180-"X-Generator: Launchpad (build 17114)\n"
3181+"X-Launchpad-Export-Date: 2014-09-02 07:20+0000\n"
3182+"X-Generator: Launchpad (build 17192)\n"
3183
3184 #: ../plugins/example/Main.qml:33
3185 msgid "User name"
3186@@ -25,11 +25,11 @@
3187 msgid "Password"
3188 msgstr "Pasahitza"
3189
3190-#: ../src/AccountsPage.qml:53
3191+#: ../system-settings-plugin/AccountsPage.qml:51
3192 msgid "Add account…"
3193 msgstr "Gehitu kontua..."
3194
3195-#: ../src/AddAccountLabel.qml:27
3196+#: ../system-settings-plugin/AddAccountLabel.qml:27
3197 msgid ""
3198 "Storing account details here lets apps use the accounts without you having "
3199 "to sign in for each app."
3200@@ -37,35 +37,47 @@
3201 "Kontuaren xehetasunak hemen gordez, aplikazioek kontua erabil dezakete zuk "
3202 "aldiro saioa hasi beharrik gabe."
3203
3204-#: ../src/NewAccountPage.qml:23
3205+#: ../system-settings-plugin/MainPage.qml:29
3206+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
3207+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
3208+msgid "Accounts"
3209+msgstr "Kontuak"
3210+
3211+#: ../system-settings-plugin/NewAccountPage.qml:23
3212 msgid "Add account"
3213 msgstr "Gehitu kontua"
3214
3215-#: ../src/NoAccountsPage.qml:36
3216+#: ../system-settings-plugin/NoAccountsPage.qml:36
3217 msgid "No accounts"
3218 msgstr "Konturik ez"
3219
3220-#: ../src/NoAccountsPage.qml:44
3221+#: ../system-settings-plugin/NoAccountsPage.qml:44
3222 msgid "Add account:"
3223 msgstr "Gehitu kontua:"
3224
3225-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
3226+#: ../online-accounts-ui/module/OAuth.qml:119
3227+msgid "Loading…"
3228+msgstr "Kargatzen..."
3229+
3230+#: ../online-accounts-ui/module/OAuth.qml:149
3231+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
3232+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
3233 msgid "Cancel"
3234 msgstr "Utzi"
3235
3236-#: ../src/module/Options.qml:36
3237+#: ../online-accounts-ui/module/Options.qml:36
3238 msgid "ID"
3239 msgstr "IDa"
3240
3241-#: ../src/module/Options.qml:54
3242+#: ../online-accounts-ui/module/Options.qml:48
3243 msgid "Remove account…"
3244 msgstr "Kendu kontua..."
3245
3246-#: ../src/module/RemovalConfirmation.qml:32
3247+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
3248 msgid "Remove account"
3249 msgstr "Kendu kontua"
3250
3251-#: ../src/module/RemovalConfirmation.qml:33
3252+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
3253 #, qt-format
3254 msgid ""
3255 "The %1 account will be removed only from your phone. You can add it again "
3256@@ -73,14 +85,27 @@
3257 msgstr ""
3258 "%1 kontua zure telefonotik soilik kenduko da. Geroago berriro gehi dezakezu."
3259
3260-#: ../src/module/RemovalConfirmation.qml:36
3261+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
3262 msgid "Remove"
3263 msgstr "Kendu"
3264
3265-#: ../src/module/ServiceSwitches.qml:33
3266+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
3267 msgid "Access to this account:"
3268 msgstr "Kontu honetara sarbidea:"
3269
3270-#: ../.build/settings.js:1
3271-msgid "Accounts"
3272-msgstr "Kontuak"
3273+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
3274+#, qt-format
3275+msgid "%1 wants to access your %2 account"
3276+msgstr "%1(e)k zure %2 kontura sarbidea nahi du"
3277+
3278+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
3279+msgid "Allow"
3280+msgstr "Baimendu"
3281+
3282+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
3283+msgid "Don't allow"
3284+msgstr "Ez baimendu"
3285+
3286+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
3287+msgid "Add another"
3288+msgstr "Gehitu beste bat"
3289
3290=== modified file 'po/fa.po'
3291--- po/fa.po 2014-08-04 06:32:21 +0000
3292+++ po/fa.po 2014-10-06 11:49:54 +0000
3293@@ -7,15 +7,15 @@
3294 msgstr ""
3295 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
3296 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3297-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
3298-"PO-Revision-Date: 2014-08-03 10:17+0000\n"
3299+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
3300+"PO-Revision-Date: 2014-08-29 18:08+0000\n"
3301 "Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
3302 "Language-Team: Persian <fa@li.org>\n"
3303 "MIME-Version: 1.0\n"
3304 "Content-Type: text/plain; charset=UTF-8\n"
3305 "Content-Transfer-Encoding: 8bit\n"
3306-"X-Launchpad-Export-Date: 2014-08-04 06:32+0000\n"
3307-"X-Generator: Launchpad (build 17147)\n"
3308+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
3309+"X-Generator: Launchpad (build 17176)\n"
3310
3311 #: ../plugins/example/Main.qml:33
3312 msgid "User name"
3313@@ -25,11 +25,11 @@
3314 msgid "Password"
3315 msgstr "گذرواژه"
3316
3317-#: ../src/AccountsPage.qml:53
3318+#: ../system-settings-plugin/AccountsPage.qml:51
3319 msgid "Add account…"
3320 msgstr "افزودن حساب کاربری…"
3321
3322-#: ../src/AddAccountLabel.qml:27
3323+#: ../system-settings-plugin/AddAccountLabel.qml:27
3324 msgid ""
3325 "Storing account details here lets apps use the accounts without you having "
3326 "to sign in for each app."
3327@@ -37,35 +37,47 @@
3328 "نگه داری جزئیات حساب کاربری در این‌جا به اپ‌ها اجازه می‌دهد بدون این که برای "
3329 "هر اپ وارد حسابتان شوید، از حساب‌های کاربری استفاده کنند."
3330
3331-#: ../src/NewAccountPage.qml:23
3332+#: ../system-settings-plugin/MainPage.qml:29
3333+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
3334+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
3335+msgid "Accounts"
3336+msgstr "حساب‌های کاربری"
3337+
3338+#: ../system-settings-plugin/NewAccountPage.qml:23
3339 msgid "Add account"
3340 msgstr "افزودن حساب کاربری"
3341
3342-#: ../src/NoAccountsPage.qml:36
3343+#: ../system-settings-plugin/NoAccountsPage.qml:36
3344 msgid "No accounts"
3345 msgstr "حساب کاربری‌ای وجود ندارد"
3346
3347-#: ../src/NoAccountsPage.qml:44
3348+#: ../system-settings-plugin/NoAccountsPage.qml:44
3349 msgid "Add account:"
3350 msgstr "افزودن حساب کاربری:"
3351
3352-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
3353+#: ../online-accounts-ui/module/OAuth.qml:119
3354+msgid "Loading…"
3355+msgstr "درحال بارکردن…"
3356+
3357+#: ../online-accounts-ui/module/OAuth.qml:149
3358+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
3359+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
3360 msgid "Cancel"
3361 msgstr "لغو"
3362
3363-#: ../src/module/Options.qml:36
3364+#: ../online-accounts-ui/module/Options.qml:36
3365 msgid "ID"
3366 msgstr "شناسه"
3367
3368-#: ../src/module/Options.qml:54
3369+#: ../online-accounts-ui/module/Options.qml:48
3370 msgid "Remove account…"
3371 msgstr "حذف حساب کاربری…"
3372
3373-#: ../src/module/RemovalConfirmation.qml:32
3374+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
3375 msgid "Remove account"
3376 msgstr "برداشتن حساب کاربری"
3377
3378-#: ../src/module/RemovalConfirmation.qml:33
3379+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
3380 #, qt-format
3381 msgid ""
3382 "The %1 account will be removed only from your phone. You can add it again "
3383@@ -74,14 +86,27 @@
3384 "حساب %1 تنها از روی تلفن شما برداشته خواهد شد. شما می‌توانید بعداً آن را "
3385 "دوباره بیفزایید."
3386
3387-#: ../src/module/RemovalConfirmation.qml:36
3388+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
3389 msgid "Remove"
3390 msgstr "برداشتن"
3391
3392-#: ../src/module/ServiceSwitches.qml:33
3393+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
3394 msgid "Access to this account:"
3395 msgstr "دست‌رسی به این حساب کاربری:"
3396
3397-#: ../.build/settings.js:1
3398-msgid "Accounts"
3399-msgstr "حساب‌های کاربری"
3400+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
3401+#, qt-format
3402+msgid "%1 wants to access your %2 account"
3403+msgstr "%1 می‌خواهد به حساب %2 شما دست‌رسی پیدا کند"
3404+
3405+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
3406+msgid "Allow"
3407+msgstr "اجازه دادن"
3408+
3409+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
3410+msgid "Don't allow"
3411+msgstr "اجازه ندادن"
3412+
3413+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
3414+msgid "Add another"
3415+msgstr "افزودن یکی دیگر"
3416
3417=== modified file 'po/fi.po'
3418--- po/fi.po 2014-06-20 06:09:21 +0000
3419+++ po/fi.po 2014-10-06 11:49:54 +0000
3420@@ -7,15 +7,15 @@
3421 msgstr ""
3422 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
3423 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3424-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
3425-"PO-Revision-Date: 2013-07-12 08:54+0000\n"
3426-"Last-Translator: Jiri Grönroos <Unknown>\n"
3427+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
3428+"PO-Revision-Date: 2014-08-30 10:00+0000\n"
3429+"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"
3430 "Language-Team: Finnish <fi@li.org>\n"
3431 "MIME-Version: 1.0\n"
3432 "Content-Type: text/plain; charset=UTF-8\n"
3433 "Content-Transfer-Encoding: 8bit\n"
3434-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
3435-"X-Generator: Launchpad (build 17058)\n"
3436+"X-Launchpad-Export-Date: 2014-08-31 07:30+0000\n"
3437+"X-Generator: Launchpad (build 17176)\n"
3438
3439 #: ../plugins/example/Main.qml:33
3440 msgid "User name"
3441@@ -25,11 +25,11 @@
3442 msgid "Password"
3443 msgstr "Salasana"
3444
3445-#: ../src/AccountsPage.qml:53
3446+#: ../system-settings-plugin/AccountsPage.qml:51
3447 msgid "Add account…"
3448 msgstr "Lisää tili…"
3449
3450-#: ../src/AddAccountLabel.qml:27
3451+#: ../system-settings-plugin/AddAccountLabel.qml:27
3452 msgid ""
3453 "Storing account details here lets apps use the accounts without you having "
3454 "to sign in for each app."
3455@@ -37,35 +37,47 @@
3456 "Tilitietojen tallennus tänne mahdollistaa sovellusten käyttää tilejä ilman, "
3457 "että joudut kirjautua tileillesi jokaisessa sovelluksessa erikseen."
3458
3459-#: ../src/NewAccountPage.qml:23
3460+#: ../system-settings-plugin/MainPage.qml:29
3461+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
3462+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
3463+msgid "Accounts"
3464+msgstr "Tilit"
3465+
3466+#: ../system-settings-plugin/NewAccountPage.qml:23
3467 msgid "Add account"
3468 msgstr "Lisää tili"
3469
3470-#: ../src/NoAccountsPage.qml:36
3471+#: ../system-settings-plugin/NoAccountsPage.qml:36
3472 msgid "No accounts"
3473 msgstr "Ei tilejä"
3474
3475-#: ../src/NoAccountsPage.qml:44
3476+#: ../system-settings-plugin/NoAccountsPage.qml:44
3477 msgid "Add account:"
3478 msgstr "Lisää tili:"
3479
3480-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
3481+#: ../online-accounts-ui/module/OAuth.qml:119
3482+msgid "Loading…"
3483+msgstr "Ladataan…"
3484+
3485+#: ../online-accounts-ui/module/OAuth.qml:149
3486+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
3487+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
3488 msgid "Cancel"
3489 msgstr "Peru"
3490
3491-#: ../src/module/Options.qml:36
3492+#: ../online-accounts-ui/module/Options.qml:36
3493 msgid "ID"
3494-msgstr ""
3495+msgstr "Tunniste (ID)"
3496
3497-#: ../src/module/Options.qml:54
3498+#: ../online-accounts-ui/module/Options.qml:48
3499 msgid "Remove account…"
3500 msgstr "Poista tili…"
3501
3502-#: ../src/module/RemovalConfirmation.qml:32
3503+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
3504 msgid "Remove account"
3505 msgstr "Poista tili"
3506
3507-#: ../src/module/RemovalConfirmation.qml:33
3508+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
3509 #, qt-format
3510 msgid ""
3511 "The %1 account will be removed only from your phone. You can add it again "
3512@@ -74,14 +86,27 @@
3513 "%1-tili poistetaan ainoastaan puhelimestasi. Voit lisätä sen myöhemmin "
3514 "uudelleen."
3515
3516-#: ../src/module/RemovalConfirmation.qml:36
3517+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
3518 msgid "Remove"
3519 msgstr "Poista"
3520
3521-#: ../src/module/ServiceSwitches.qml:33
3522+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
3523 msgid "Access to this account:"
3524 msgstr "Pääsy tälle tilille:"
3525
3526-#: ../.build/settings.js:1
3527-msgid "Accounts"
3528-msgstr "Tilit"
3529+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
3530+#, qt-format
3531+msgid "%1 wants to access your %2 account"
3532+msgstr "%1 haluaa käyttää ”%2”-tiliäsi"
3533+
3534+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
3535+msgid "Allow"
3536+msgstr "Salli"
3537+
3538+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
3539+msgid "Don't allow"
3540+msgstr "Älä salli"
3541+
3542+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
3543+msgid "Add another"
3544+msgstr "Lisää toinen"
3545
3546=== modified file 'po/fr.po'
3547--- po/fr.po 2014-06-20 06:09:21 +0000
3548+++ po/fr.po 2014-10-06 11:49:54 +0000
3549@@ -7,15 +7,15 @@
3550 msgstr ""
3551 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
3552 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3553-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
3554-"PO-Revision-Date: 2013-10-01 12:46+0000\n"
3555-"Last-Translator: Nicolas Delvaux <Unknown>\n"
3556+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
3557+"PO-Revision-Date: 2014-08-29 10:35+0000\n"
3558+"Last-Translator: Sebastien Bacher <seb128@ubuntu.com>\n"
3559 "Language-Team: French <fr@li.org>\n"
3560 "MIME-Version: 1.0\n"
3561 "Content-Type: text/plain; charset=UTF-8\n"
3562 "Content-Transfer-Encoding: 8bit\n"
3563-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
3564-"X-Generator: Launchpad (build 17058)\n"
3565+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
3566+"X-Generator: Launchpad (build 17176)\n"
3567
3568 #: ../plugins/example/Main.qml:33
3569 msgid "User name"
3570@@ -25,11 +25,11 @@
3571 msgid "Password"
3572 msgstr "Mot de passe"
3573
3574-#: ../src/AccountsPage.qml:53
3575+#: ../system-settings-plugin/AccountsPage.qml:51
3576 msgid "Add account…"
3577 msgstr "Ajouter un compte…"
3578
3579-#: ../src/AddAccountLabel.qml:27
3580+#: ../system-settings-plugin/AddAccountLabel.qml:27
3581 msgid ""
3582 "Storing account details here lets apps use the accounts without you having "
3583 "to sign in for each app."
3584@@ -38,35 +38,47 @@
3585 "utiliser sans que vous ayez besoin de vous connecter pour chacune d'entre "
3586 "elles."
3587
3588-#: ../src/NewAccountPage.qml:23
3589+#: ../system-settings-plugin/MainPage.qml:29
3590+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
3591+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
3592+msgid "Accounts"
3593+msgstr "Comptes"
3594+
3595+#: ../system-settings-plugin/NewAccountPage.qml:23
3596 msgid "Add account"
3597 msgstr "Ajouter un compte"
3598
3599-#: ../src/NoAccountsPage.qml:36
3600+#: ../system-settings-plugin/NoAccountsPage.qml:36
3601 msgid "No accounts"
3602 msgstr "Pas de compte"
3603
3604-#: ../src/NoAccountsPage.qml:44
3605+#: ../system-settings-plugin/NoAccountsPage.qml:44
3606 msgid "Add account:"
3607 msgstr "Ajouter un compte :"
3608
3609-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
3610+#: ../online-accounts-ui/module/OAuth.qml:119
3611+msgid "Loading…"
3612+msgstr "Chargement…"
3613+
3614+#: ../online-accounts-ui/module/OAuth.qml:149
3615+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
3616+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
3617 msgid "Cancel"
3618 msgstr "Annuler"
3619
3620-#: ../src/module/Options.qml:36
3621+#: ../online-accounts-ui/module/Options.qml:36
3622 msgid "ID"
3623 msgstr "ID"
3624
3625-#: ../src/module/Options.qml:54
3626+#: ../online-accounts-ui/module/Options.qml:48
3627 msgid "Remove account…"
3628 msgstr "Supprimer un compte…"
3629
3630-#: ../src/module/RemovalConfirmation.qml:32
3631+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
3632 msgid "Remove account"
3633 msgstr "Supprimer le compte"
3634
3635-#: ../src/module/RemovalConfirmation.qml:33
3636+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
3637 #, qt-format
3638 msgid ""
3639 "The %1 account will be removed only from your phone. You can add it again "
3640@@ -75,14 +87,27 @@
3641 "Le compte %1 sera uniquement supprimé de votre téléphone. Vous pourrez "
3642 "l'ajouter de nouveau plus tard."
3643
3644-#: ../src/module/RemovalConfirmation.qml:36
3645+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
3646 msgid "Remove"
3647 msgstr "Supprimer"
3648
3649-#: ../src/module/ServiceSwitches.qml:33
3650+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
3651 msgid "Access to this account:"
3652 msgstr "Accéder à ce compte :"
3653
3654-#: ../.build/settings.js:1
3655-msgid "Accounts"
3656-msgstr "Comptes"
3657+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
3658+#, qt-format
3659+msgid "%1 wants to access your %2 account"
3660+msgstr "%1 veut accéder à votre compte %2"
3661+
3662+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
3663+msgid "Allow"
3664+msgstr "Autoriser"
3665+
3666+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
3667+msgid "Don't allow"
3668+msgstr "Refuser"
3669+
3670+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
3671+msgid "Add another"
3672+msgstr "Ajouter un autre"
3673
3674=== modified file 'po/fr_CA.po'
3675--- po/fr_CA.po 2014-06-20 06:09:21 +0000
3676+++ po/fr_CA.po 2014-10-06 11:49:54 +0000
3677@@ -7,15 +7,15 @@
3678 msgstr ""
3679 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
3680 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3681-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
3682+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
3683 "PO-Revision-Date: 2013-07-13 12:44+0000\n"
3684 "Last-Translator: Étienne Beaulé <betienne@bellaliant.net>\n"
3685 "Language-Team: French (Canada) <fr_CA@li.org>\n"
3686 "MIME-Version: 1.0\n"
3687 "Content-Type: text/plain; charset=UTF-8\n"
3688 "Content-Transfer-Encoding: 8bit\n"
3689-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
3690-"X-Generator: Launchpad (build 17058)\n"
3691+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
3692+"X-Generator: Launchpad (build 17176)\n"
3693
3694 #: ../plugins/example/Main.qml:33
3695 msgid "User name"
3696@@ -25,59 +25,84 @@
3697 msgid "Password"
3698 msgstr "Mot de Passe"
3699
3700-#: ../src/AccountsPage.qml:53
3701+#: ../system-settings-plugin/AccountsPage.qml:51
3702 msgid "Add account…"
3703 msgstr ""
3704
3705-#: ../src/AddAccountLabel.qml:27
3706+#: ../system-settings-plugin/AddAccountLabel.qml:27
3707 msgid ""
3708 "Storing account details here lets apps use the accounts without you having "
3709 "to sign in for each app."
3710 msgstr ""
3711
3712-#: ../src/NewAccountPage.qml:23
3713+#: ../system-settings-plugin/MainPage.qml:29
3714+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
3715+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
3716+msgid "Accounts"
3717+msgstr ""
3718+
3719+#: ../system-settings-plugin/NewAccountPage.qml:23
3720 msgid "Add account"
3721 msgstr ""
3722
3723-#: ../src/NoAccountsPage.qml:36
3724+#: ../system-settings-plugin/NoAccountsPage.qml:36
3725 msgid "No accounts"
3726 msgstr ""
3727
3728-#: ../src/NoAccountsPage.qml:44
3729+#: ../system-settings-plugin/NoAccountsPage.qml:44
3730 msgid "Add account:"
3731 msgstr ""
3732
3733-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
3734+#: ../online-accounts-ui/module/OAuth.qml:119
3735+msgid "Loading…"
3736+msgstr ""
3737+
3738+#: ../online-accounts-ui/module/OAuth.qml:149
3739+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
3740+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
3741 msgid "Cancel"
3742 msgstr "Annuler"
3743
3744-#: ../src/module/Options.qml:36
3745+#: ../online-accounts-ui/module/Options.qml:36
3746 msgid "ID"
3747 msgstr "Identification"
3748
3749-#: ../src/module/Options.qml:54
3750+#: ../online-accounts-ui/module/Options.qml:48
3751 msgid "Remove account…"
3752 msgstr ""
3753
3754-#: ../src/module/RemovalConfirmation.qml:32
3755+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
3756 msgid "Remove account"
3757 msgstr ""
3758
3759-#: ../src/module/RemovalConfirmation.qml:33
3760+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
3761 #, qt-format
3762 msgid ""
3763 "The %1 account will be removed only from your phone. You can add it again "
3764 "later."
3765 msgstr ""
3766
3767-#: ../src/module/RemovalConfirmation.qml:36
3768+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
3769 msgid "Remove"
3770 msgstr ""
3771
3772-#: ../src/module/ServiceSwitches.qml:33
3773+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
3774 msgid "Access to this account:"
3775 msgstr ""
3776
3777-#: ../.build/settings.js:1
3778-msgid "Accounts"
3779+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
3780+#, qt-format
3781+msgid "%1 wants to access your %2 account"
3782+msgstr ""
3783+
3784+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
3785+msgid "Allow"
3786+msgstr ""
3787+
3788+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
3789+msgid "Don't allow"
3790+msgstr ""
3791+
3792+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
3793+msgid "Add another"
3794 msgstr ""
3795
3796=== modified file 'po/gd.po'
3797--- po/gd.po 2014-06-20 06:09:21 +0000
3798+++ po/gd.po 2014-10-06 11:49:54 +0000
3799@@ -2,20 +2,21 @@
3800 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3801 # This file is distributed under the same license as the ubuntu-system-settings-online-accounts package.
3802 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
3803-#
3804+# GunChleoc <fios@foramnagaidhlig.net>, 2014.
3805 msgid ""
3806 msgstr ""
3807 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
3808 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3809-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
3810-"PO-Revision-Date: 2014-05-19 10:05+0000\n"
3811-"Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"
3812-"Language-Team: Gaelic; Scottish <gd@li.org>\n"
3813+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
3814+"PO-Revision-Date: 2014-09-12 16:34+0000\n"
3815+"Last-Translator: GunChleoc <Unknown>\n"
3816+"Language-Team: Fòram na Gàidhlig\n"
3817 "MIME-Version: 1.0\n"
3818 "Content-Type: text/plain; charset=UTF-8\n"
3819 "Content-Transfer-Encoding: 8bit\n"
3820-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
3821-"X-Generator: Launchpad (build 17058)\n"
3822+"X-Launchpad-Export-Date: 2014-09-13 08:40+0000\n"
3823+"X-Generator: Launchpad (build 17196)\n"
3824+"Language: gd\n"
3825
3826 #: ../plugins/example/Main.qml:33
3827 msgid "User name"
3828@@ -25,11 +26,11 @@
3829 msgid "Password"
3830 msgstr "Facal-faire"
3831
3832-#: ../src/AccountsPage.qml:53
3833+#: ../system-settings-plugin/AccountsPage.qml:51
3834 msgid "Add account…"
3835 msgstr "Cuir cunntas ris..."
3836
3837-#: ../src/AddAccountLabel.qml:27
3838+#: ../system-settings-plugin/AddAccountLabel.qml:27
3839 msgid ""
3840 "Storing account details here lets apps use the accounts without you having "
3841 "to sign in for each app."
3842@@ -37,35 +38,47 @@
3843 "Ma chumas tu fiosrachadh a' chunntais agad an-seo, gheibh aplacaidean greim "
3844 "air agus cha bhi agad ri clàradh a-steach aig gach aon dhiubh."
3845
3846-#: ../src/NewAccountPage.qml:23
3847+#: ../system-settings-plugin/MainPage.qml:29
3848+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
3849+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
3850+msgid "Accounts"
3851+msgstr "Cunntasan"
3852+
3853+#: ../system-settings-plugin/NewAccountPage.qml:23
3854 msgid "Add account"
3855 msgstr "Cuir cunntas ris"
3856
3857-#: ../src/NoAccountsPage.qml:36
3858+#: ../system-settings-plugin/NoAccountsPage.qml:36
3859 msgid "No accounts"
3860 msgstr "Chan eil cunntas ann fhathast"
3861
3862-#: ../src/NoAccountsPage.qml:44
3863+#: ../system-settings-plugin/NoAccountsPage.qml:44
3864 msgid "Add account:"
3865 msgstr "Cuir cunntas ris:"
3866
3867-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
3868+#: ../online-accounts-ui/module/OAuth.qml:119
3869+msgid "Loading…"
3870+msgstr "'Ga luchdadh…"
3871+
3872+#: ../online-accounts-ui/module/OAuth.qml:149
3873+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
3874+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
3875 msgid "Cancel"
3876 msgstr "Sguir dheth"
3877
3878-#: ../src/module/Options.qml:36
3879+#: ../online-accounts-ui/module/Options.qml:36
3880 msgid "ID"
3881 msgstr "ID"
3882
3883-#: ../src/module/Options.qml:54
3884+#: ../online-accounts-ui/module/Options.qml:48
3885 msgid "Remove account…"
3886 msgstr "Thoir cunntas air falbh..."
3887
3888-#: ../src/module/RemovalConfirmation.qml:32
3889+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
3890 msgid "Remove account"
3891 msgstr "Thoir an cunntas air falbh"
3892
3893-#: ../src/module/RemovalConfirmation.qml:33
3894+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
3895 #, qt-format
3896 msgid ""
3897 "The %1 account will be removed only from your phone. You can add it again "
3898@@ -74,14 +87,27 @@
3899 "Thèid an cunntas %1 a thoirt air falbh on fhòn agad. 'S urrainn dhut a chur "
3900 "ris a-rithist às a dhèidh seo."
3901
3902-#: ../src/module/RemovalConfirmation.qml:36
3903+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
3904 msgid "Remove"
3905 msgstr "Thoir air falbh"
3906
3907-#: ../src/module/ServiceSwitches.qml:33
3908+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
3909 msgid "Access to this account:"
3910 msgstr "Cothrom air a' chunntas seo:"
3911
3912-#: ../.build/settings.js:1
3913-msgid "Accounts"
3914-msgstr "Cunntasan"
3915+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
3916+#, qt-format
3917+msgid "%1 wants to access your %2 account"
3918+msgstr "Tha %1 airson an cunntas %2 agad inntrigeadh"
3919+
3920+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
3921+msgid "Allow"
3922+msgstr "Ceadaich"
3923+
3924+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
3925+msgid "Don't allow"
3926+msgstr "Na ceadaich"
3927+
3928+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
3929+msgid "Add another"
3930+msgstr "Cuir fear eile ris"
3931
3932=== modified file 'po/gl.po'
3933--- po/gl.po 2014-08-06 06:55:20 +0000
3934+++ po/gl.po 2014-10-06 11:49:54 +0000
3935@@ -7,15 +7,15 @@
3936 msgstr ""
3937 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
3938 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3939-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
3940-"PO-Revision-Date: 2014-08-05 12:31+0000\n"
3941+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
3942+"PO-Revision-Date: 2014-09-24 16:40+0000\n"
3943 "Last-Translator: Marcos Lans <Unknown>\n"
3944 "Language-Team: Galician <gl@li.org>\n"
3945 "MIME-Version: 1.0\n"
3946 "Content-Type: text/plain; charset=UTF-8\n"
3947 "Content-Transfer-Encoding: 8bit\n"
3948-"X-Launchpad-Export-Date: 2014-08-06 06:55+0000\n"
3949-"X-Generator: Launchpad (build 17147)\n"
3950+"X-Launchpad-Export-Date: 2014-09-25 06:47+0000\n"
3951+"X-Generator: Launchpad (build 17196)\n"
3952
3953 #: ../plugins/example/Main.qml:33
3954 msgid "User name"
3955@@ -25,47 +25,59 @@
3956 msgid "Password"
3957 msgstr "Contrasinal"
3958
3959-#: ../src/AccountsPage.qml:53
3960+#: ../system-settings-plugin/AccountsPage.qml:51
3961 msgid "Add account…"
3962 msgstr "Engadir unha conta..."
3963
3964-#: ../src/AddAccountLabel.qml:27
3965+#: ../system-settings-plugin/AddAccountLabel.qml:27
3966 msgid ""
3967 "Storing account details here lets apps use the accounts without you having "
3968 "to sign in for each app."
3969 msgstr ""
3970-"Gardando aquí a información das contas permitirá os aplicativos utilizala "
3971-"sen ter que iniciar sesión cada vez."
3972-
3973-#: ../src/NewAccountPage.qml:23
3974+"Gardando aquí a información das contas permitirá que os aplicativos a "
3975+"utilicen sen ter que iniciar sesión cada un deles."
3976+
3977+#: ../system-settings-plugin/MainPage.qml:29
3978+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
3979+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
3980+msgid "Accounts"
3981+msgstr "Contas"
3982+
3983+#: ../system-settings-plugin/NewAccountPage.qml:23
3984 msgid "Add account"
3985-msgstr "Engadir conta"
3986+msgstr "Engadir unha conta"
3987
3988-#: ../src/NoAccountsPage.qml:36
3989+#: ../system-settings-plugin/NoAccountsPage.qml:36
3990 msgid "No accounts"
3991 msgstr "Non hai contas"
3992
3993-#: ../src/NoAccountsPage.qml:44
3994+#: ../system-settings-plugin/NoAccountsPage.qml:44
3995 msgid "Add account:"
3996 msgstr "Engadir conta:"
3997
3998-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
3999+#: ../online-accounts-ui/module/OAuth.qml:119
4000+msgid "Loading…"
4001+msgstr "Cargando..."
4002+
4003+#: ../online-accounts-ui/module/OAuth.qml:149
4004+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
4005+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
4006 msgid "Cancel"
4007 msgstr "Cancelar"
4008
4009-#: ../src/module/Options.qml:36
4010+#: ../online-accounts-ui/module/Options.qml:36
4011 msgid "ID"
4012 msgstr "ID"
4013
4014-#: ../src/module/Options.qml:54
4015+#: ../online-accounts-ui/module/Options.qml:48
4016 msgid "Remove account…"
4017 msgstr "Eliminar conta..."
4018
4019-#: ../src/module/RemovalConfirmation.qml:32
4020+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
4021 msgid "Remove account"
4022 msgstr "Eliminar esta conta"
4023
4024-#: ../src/module/RemovalConfirmation.qml:33
4025+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
4026 #, qt-format
4027 msgid ""
4028 "The %1 account will be removed only from your phone. You can add it again "
4029@@ -73,14 +85,27 @@
4030 msgstr ""
4031 "A conta %1 eliminarase só do teléfono. Pode engadila de novo noutro momento."
4032
4033-#: ../src/module/RemovalConfirmation.qml:36
4034+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
4035 msgid "Remove"
4036 msgstr "Eliminar"
4037
4038-#: ../src/module/ServiceSwitches.qml:33
4039+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
4040 msgid "Access to this account:"
4041 msgstr "Acceder a esta conta:"
4042
4043-#: ../.build/settings.js:1
4044-msgid "Accounts"
4045-msgstr "Contas"
4046+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
4047+#, qt-format
4048+msgid "%1 wants to access your %2 account"
4049+msgstr "%1 quere acceder á túa conta de %2"
4050+
4051+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
4052+msgid "Allow"
4053+msgstr "Permitir"
4054+
4055+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
4056+msgid "Don't allow"
4057+msgstr "Rexeitar"
4058+
4059+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
4060+msgid "Add another"
4061+msgstr "Engadir outra"
4062
4063=== modified file 'po/he.po'
4064--- po/he.po 2014-06-20 06:09:21 +0000
4065+++ po/he.po 2014-10-06 11:49:54 +0000
4066@@ -7,15 +7,15 @@
4067 msgstr ""
4068 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
4069 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4070-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
4071+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
4072 "PO-Revision-Date: 2013-07-12 08:51+0000\n"
4073 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
4074 "Language-Team: Hebrew <he@li.org>\n"
4075 "MIME-Version: 1.0\n"
4076 "Content-Type: text/plain; charset=UTF-8\n"
4077 "Content-Transfer-Encoding: 8bit\n"
4078-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
4079-"X-Generator: Launchpad (build 17058)\n"
4080+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
4081+"X-Generator: Launchpad (build 17176)\n"
4082
4083 #: ../plugins/example/Main.qml:33
4084 msgid "User name"
4085@@ -25,11 +25,11 @@
4086 msgid "Password"
4087 msgstr "ססמה"
4088
4089-#: ../src/AccountsPage.qml:53
4090+#: ../system-settings-plugin/AccountsPage.qml:51
4091 msgid "Add account…"
4092 msgstr "הוספת חשבון…"
4093
4094-#: ../src/AddAccountLabel.qml:27
4095+#: ../system-settings-plugin/AddAccountLabel.qml:27
4096 msgid ""
4097 "Storing account details here lets apps use the accounts without you having "
4098 "to sign in for each app."
4099@@ -37,49 +37,74 @@
4100 "אחסון של פרטי חשבון באזור זה מאפשרת ליישום להשתמש בחשבונות מבלי להיכנס בנפרד "
4101 "בכל יישום."
4102
4103-#: ../src/NewAccountPage.qml:23
4104+#: ../system-settings-plugin/MainPage.qml:29
4105+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
4106+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
4107+msgid "Accounts"
4108+msgstr "חשבונות"
4109+
4110+#: ../system-settings-plugin/NewAccountPage.qml:23
4111 msgid "Add account"
4112 msgstr "הוספת חשבון"
4113
4114-#: ../src/NoAccountsPage.qml:36
4115+#: ../system-settings-plugin/NoAccountsPage.qml:36
4116 msgid "No accounts"
4117 msgstr "אין חשבונות"
4118
4119-#: ../src/NoAccountsPage.qml:44
4120+#: ../system-settings-plugin/NoAccountsPage.qml:44
4121 msgid "Add account:"
4122 msgstr "הוספת חשבון:"
4123
4124-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
4125+#: ../online-accounts-ui/module/OAuth.qml:119
4126+msgid "Loading…"
4127+msgstr ""
4128+
4129+#: ../online-accounts-ui/module/OAuth.qml:149
4130+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
4131+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
4132 msgid "Cancel"
4133 msgstr "ביטול"
4134
4135-#: ../src/module/Options.qml:36
4136+#: ../online-accounts-ui/module/Options.qml:36
4137 msgid "ID"
4138 msgstr "מזהה"
4139
4140-#: ../src/module/Options.qml:54
4141+#: ../online-accounts-ui/module/Options.qml:48
4142 msgid "Remove account…"
4143 msgstr "הסרת חשבון…"
4144
4145-#: ../src/module/RemovalConfirmation.qml:32
4146+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
4147 msgid "Remove account"
4148 msgstr "הסרת חשבון"
4149
4150-#: ../src/module/RemovalConfirmation.qml:33
4151+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
4152 #, qt-format
4153 msgid ""
4154 "The %1 account will be removed only from your phone. You can add it again "
4155 "later."
4156 msgstr "חשבון ה־%1 יוסר רק מהטלפון שלך. ניתן להוסיף אותו שוב מאוחר יותר."
4157
4158-#: ../src/module/RemovalConfirmation.qml:36
4159+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
4160 msgid "Remove"
4161 msgstr "הסרה"
4162
4163-#: ../src/module/ServiceSwitches.qml:33
4164+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
4165 msgid "Access to this account:"
4166 msgstr "גישה לחשבון זה:"
4167
4168-#: ../.build/settings.js:1
4169-msgid "Accounts"
4170-msgstr "חשבונות"
4171+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
4172+#, qt-format
4173+msgid "%1 wants to access your %2 account"
4174+msgstr ""
4175+
4176+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
4177+msgid "Allow"
4178+msgstr ""
4179+
4180+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
4181+msgid "Don't allow"
4182+msgstr ""
4183+
4184+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
4185+msgid "Add another"
4186+msgstr ""
4187
4188=== modified file 'po/hu.po'
4189--- po/hu.po 2014-06-20 06:09:21 +0000
4190+++ po/hu.po 2014-10-06 11:49:54 +0000
4191@@ -7,15 +7,15 @@
4192 msgstr ""
4193 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
4194 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4195-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
4196-"PO-Revision-Date: 2013-07-12 08:51+0000\n"
4197-"Last-Translator: Kristóf Kiszel <Unknown>\n"
4198+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
4199+"PO-Revision-Date: 2014-09-02 16:52+0000\n"
4200+"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
4201 "Language-Team: Hungarian <hu@li.org>\n"
4202 "MIME-Version: 1.0\n"
4203 "Content-Type: text/plain; charset=UTF-8\n"
4204 "Content-Transfer-Encoding: 8bit\n"
4205-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
4206-"X-Generator: Launchpad (build 17058)\n"
4207+"X-Launchpad-Export-Date: 2014-09-04 08:34+0000\n"
4208+"X-Generator: Launchpad (build 17196)\n"
4209
4210 #: ../plugins/example/Main.qml:33
4211 msgid "User name"
4212@@ -25,11 +25,11 @@
4213 msgid "Password"
4214 msgstr "Jelszó"
4215
4216-#: ../src/AccountsPage.qml:53
4217+#: ../system-settings-plugin/AccountsPage.qml:51
4218 msgid "Add account…"
4219-msgstr "Fiók hozzáadása…"
4220+msgstr "Fiók hozzáadása"
4221
4222-#: ../src/AddAccountLabel.qml:27
4223+#: ../system-settings-plugin/AddAccountLabel.qml:27
4224 msgid ""
4225 "Storing account details here lets apps use the accounts without you having "
4226 "to sign in for each app."
4227@@ -37,35 +37,47 @@
4228 "A fiókadatok tárolása lehetővé teszi az alkalmazásoknak a fiókok használatát "
4229 "anélkül, hogy be kellene jelentkeznie minden egyes alkalmazásba."
4230
4231-#: ../src/NewAccountPage.qml:23
4232+#: ../system-settings-plugin/MainPage.qml:29
4233+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
4234+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
4235+msgid "Accounts"
4236+msgstr "Fiókok"
4237+
4238+#: ../system-settings-plugin/NewAccountPage.qml:23
4239 msgid "Add account"
4240 msgstr "Fiók hozzáadása"
4241
4242-#: ../src/NoAccountsPage.qml:36
4243+#: ../system-settings-plugin/NoAccountsPage.qml:36
4244 msgid "No accounts"
4245 msgstr "Nincsenek fiókok"
4246
4247-#: ../src/NoAccountsPage.qml:44
4248+#: ../system-settings-plugin/NoAccountsPage.qml:44
4249 msgid "Add account:"
4250 msgstr "Fiók hozzáadása:"
4251
4252-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
4253+#: ../online-accounts-ui/module/OAuth.qml:119
4254+msgid "Loading…"
4255+msgstr "Betöltés…"
4256+
4257+#: ../online-accounts-ui/module/OAuth.qml:149
4258+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
4259+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
4260 msgid "Cancel"
4261-msgstr "Mégsem"
4262+msgstr "Mégse"
4263
4264-#: ../src/module/Options.qml:36
4265+#: ../online-accounts-ui/module/Options.qml:36
4266 msgid "ID"
4267 msgstr "Azonosító"
4268
4269-#: ../src/module/Options.qml:54
4270+#: ../online-accounts-ui/module/Options.qml:48
4271 msgid "Remove account…"
4272-msgstr "Fiók eltávolítása…"
4273+msgstr "Fiók eltávolítása"
4274
4275-#: ../src/module/RemovalConfirmation.qml:32
4276+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
4277 msgid "Remove account"
4278 msgstr "Fiók eltávolítása"
4279
4280-#: ../src/module/RemovalConfirmation.qml:33
4281+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
4282 #, qt-format
4283 msgid ""
4284 "The %1 account will be removed only from your phone. You can add it again "
4285@@ -74,14 +86,27 @@
4286 "A(z) %1 fiók eltávolításra kerül a telefonjából. Később bármikor újra "
4287 "hozzáadhatja."
4288
4289-#: ../src/module/RemovalConfirmation.qml:36
4290+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
4291 msgid "Remove"
4292 msgstr "Eltávolítás"
4293
4294-#: ../src/module/ServiceSwitches.qml:33
4295+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
4296 msgid "Access to this account:"
4297-msgstr "Hozzáférés ehhez a fiókhoz:"
4298-
4299-#: ../.build/settings.js:1
4300-msgid "Accounts"
4301-msgstr "Fiókok"
4302+msgstr "Hozzáférhet ehhez a fiókhoz:"
4303+
4304+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
4305+#, qt-format
4306+msgid "%1 wants to access your %2 account"
4307+msgstr "%1 hozzá szeretne férni a következő fiókhoz: %2"
4308+
4309+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
4310+msgid "Allow"
4311+msgstr "Engedélyezés"
4312+
4313+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
4314+msgid "Don't allow"
4315+msgstr "Megtagadás"
4316+
4317+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
4318+msgid "Add another"
4319+msgstr "További hozzáadása"
4320
4321=== modified file 'po/is.po'
4322--- po/is.po 2014-08-01 07:13:25 +0000
4323+++ po/is.po 2014-10-06 11:49:54 +0000
4324@@ -7,15 +7,15 @@
4325 msgstr ""
4326 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
4327 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4328-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
4329-"PO-Revision-Date: 2014-07-31 16:17+0000\n"
4330+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
4331+"PO-Revision-Date: 2014-08-29 12:47+0000\n"
4332 "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
4333 "Language-Team: Icelandic <is@li.org>\n"
4334 "MIME-Version: 1.0\n"
4335 "Content-Type: text/plain; charset=UTF-8\n"
4336 "Content-Transfer-Encoding: 8bit\n"
4337-"X-Launchpad-Export-Date: 2014-08-01 07:13+0000\n"
4338-"X-Generator: Launchpad (build 17141)\n"
4339+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
4340+"X-Generator: Launchpad (build 17176)\n"
4341
4342 #: ../plugins/example/Main.qml:33
4343 msgid "User name"
4344@@ -25,11 +25,11 @@
4345 msgid "Password"
4346 msgstr "Lykilorð"
4347
4348-#: ../src/AccountsPage.qml:53
4349+#: ../system-settings-plugin/AccountsPage.qml:51
4350 msgid "Add account…"
4351 msgstr "Bæta við aðgangi..."
4352
4353-#: ../src/AddAccountLabel.qml:27
4354+#: ../system-settings-plugin/AddAccountLabel.qml:27
4355 msgid ""
4356 "Storing account details here lets apps use the accounts without you having "
4357 "to sign in for each app."
4358@@ -37,35 +37,47 @@
4359 "Það að geyma upplýsingar aðgangsreiknings hér gerir forritum kleift að nota "
4360 "hann án þess að þú þurfir að skrá þig inn í hverju forriti fyrir sig."
4361
4362-#: ../src/NewAccountPage.qml:23
4363+#: ../system-settings-plugin/MainPage.qml:29
4364+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
4365+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
4366+msgid "Accounts"
4367+msgstr "Aðgangar"
4368+
4369+#: ../system-settings-plugin/NewAccountPage.qml:23
4370 msgid "Add account"
4371 msgstr "Bæta við aðgangi"
4372
4373-#: ../src/NoAccountsPage.qml:36
4374+#: ../system-settings-plugin/NoAccountsPage.qml:36
4375 msgid "No accounts"
4376 msgstr "Engir aðgangsreikningar"
4377
4378-#: ../src/NoAccountsPage.qml:44
4379+#: ../system-settings-plugin/NoAccountsPage.qml:44
4380 msgid "Add account:"
4381 msgstr "Bæta við aðgangi:"
4382
4383-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
4384+#: ../online-accounts-ui/module/OAuth.qml:119
4385+msgid "Loading…"
4386+msgstr "Hleð..."
4387+
4388+#: ../online-accounts-ui/module/OAuth.qml:149
4389+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
4390+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
4391 msgid "Cancel"
4392 msgstr "Hætta við"
4393
4394-#: ../src/module/Options.qml:36
4395+#: ../online-accounts-ui/module/Options.qml:36
4396 msgid "ID"
4397 msgstr "Auðkenni (ID)"
4398
4399-#: ../src/module/Options.qml:54
4400+#: ../online-accounts-ui/module/Options.qml:48
4401 msgid "Remove account…"
4402 msgstr "Fjarlægja aðgang..."
4403
4404-#: ../src/module/RemovalConfirmation.qml:32
4405+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
4406 msgid "Remove account"
4407 msgstr "Fjarlægja aðgang"
4408
4409-#: ../src/module/RemovalConfirmation.qml:33
4410+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
4411 #, qt-format
4412 msgid ""
4413 "The %1 account will be removed only from your phone. You can add it again "
4414@@ -74,14 +86,27 @@
4415 "Aðgangsreikningurinn %1 verður fjarlægður úr símanum. Þú getur bætt honum "
4416 "við aftur síðar."
4417
4418-#: ../src/module/RemovalConfirmation.qml:36
4419+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
4420 msgid "Remove"
4421 msgstr "Fjarlægja"
4422
4423-#: ../src/module/ServiceSwitches.qml:33
4424+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
4425 msgid "Access to this account:"
4426 msgstr "Aðgangur að þessum aðgangsreikningi:"
4427
4428-#: ../.build/settings.js:1
4429-msgid "Accounts"
4430-msgstr "Aðgangar"
4431+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
4432+#, qt-format
4433+msgid "%1 wants to access your %2 account"
4434+msgstr "%1 vill fá aðgang að %2 reikningnum þínum"
4435+
4436+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
4437+msgid "Allow"
4438+msgstr "Leyfa"
4439+
4440+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
4441+msgid "Don't allow"
4442+msgstr "Hafna"
4443+
4444+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
4445+msgid "Add another"
4446+msgstr "Bæta við öðru"
4447
4448=== modified file 'po/it.po'
4449--- po/it.po 2014-06-20 06:09:21 +0000
4450+++ po/it.po 2014-10-06 11:49:54 +0000
4451@@ -7,15 +7,15 @@
4452 msgstr ""
4453 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
4454 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4455-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
4456-"PO-Revision-Date: 2013-10-02 08:05+0000\n"
4457+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
4458+"PO-Revision-Date: 2014-08-29 11:22+0000\n"
4459 "Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
4460 "Language-Team: Italian <it@li.org>\n"
4461 "MIME-Version: 1.0\n"
4462 "Content-Type: text/plain; charset=UTF-8\n"
4463 "Content-Transfer-Encoding: 8bit\n"
4464-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
4465-"X-Generator: Launchpad (build 17058)\n"
4466+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
4467+"X-Generator: Launchpad (build 17176)\n"
4468
4469 #: ../plugins/example/Main.qml:33
4470 msgid "User name"
4471@@ -25,11 +25,11 @@
4472 msgid "Password"
4473 msgstr "Password"
4474
4475-#: ../src/AccountsPage.qml:53
4476+#: ../system-settings-plugin/AccountsPage.qml:51
4477 msgid "Add account…"
4478 msgstr "Aggiungi account..."
4479
4480-#: ../src/AddAccountLabel.qml:27
4481+#: ../system-settings-plugin/AddAccountLabel.qml:27
4482 msgid ""
4483 "Storing account details here lets apps use the accounts without you having "
4484 "to sign in for each app."
4485@@ -37,35 +37,47 @@
4486 "Archiviare qui i dettagli dell'account consentirà alle applicazioni di "
4487 "usarli senza la necessità di effettuare l'accesso in ogni applicazione."
4488
4489-#: ../src/NewAccountPage.qml:23
4490+#: ../system-settings-plugin/MainPage.qml:29
4491+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
4492+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
4493+msgid "Accounts"
4494+msgstr "Account"
4495+
4496+#: ../system-settings-plugin/NewAccountPage.qml:23
4497 msgid "Add account"
4498 msgstr "Aggiungi account"
4499
4500-#: ../src/NoAccountsPage.qml:36
4501+#: ../system-settings-plugin/NoAccountsPage.qml:36
4502 msgid "No accounts"
4503 msgstr "Nessun account"
4504
4505-#: ../src/NoAccountsPage.qml:44
4506+#: ../system-settings-plugin/NoAccountsPage.qml:44
4507 msgid "Add account:"
4508 msgstr "Aggiungi account:"
4509
4510-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
4511+#: ../online-accounts-ui/module/OAuth.qml:119
4512+msgid "Loading…"
4513+msgstr "Caricamento..."
4514+
4515+#: ../online-accounts-ui/module/OAuth.qml:149
4516+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
4517+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
4518 msgid "Cancel"
4519 msgstr "Annulla"
4520
4521-#: ../src/module/Options.qml:36
4522+#: ../online-accounts-ui/module/Options.qml:36
4523 msgid "ID"
4524 msgstr "ID"
4525
4526-#: ../src/module/Options.qml:54
4527+#: ../online-accounts-ui/module/Options.qml:48
4528 msgid "Remove account…"
4529 msgstr "Rimuovi account..."
4530
4531-#: ../src/module/RemovalConfirmation.qml:32
4532+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
4533 msgid "Remove account"
4534 msgstr "Rimuovi account"
4535
4536-#: ../src/module/RemovalConfirmation.qml:33
4537+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
4538 #, qt-format
4539 msgid ""
4540 "The %1 account will be removed only from your phone. You can add it again "
4541@@ -74,14 +86,27 @@
4542 "L'account %1 verrà rimosso solo dal telefono. Sarà possibile aggiungerlo di "
4543 "nuovo in un secondo momento."
4544
4545-#: ../src/module/RemovalConfirmation.qml:36
4546+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
4547 msgid "Remove"
4548 msgstr "Rimuovi"
4549
4550-#: ../src/module/ServiceSwitches.qml:33
4551+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
4552 msgid "Access to this account:"
4553 msgstr "Accedere a questo account:"
4554
4555-#: ../.build/settings.js:1
4556-msgid "Accounts"
4557-msgstr "Account"
4558+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
4559+#, qt-format
4560+msgid "%1 wants to access your %2 account"
4561+msgstr "%1 vorrebbe accedere all'account %2"
4562+
4563+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
4564+msgid "Allow"
4565+msgstr "Consenti"
4566+
4567+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
4568+msgid "Don't allow"
4569+msgstr "Non consentire"
4570+
4571+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
4572+msgid "Add another"
4573+msgstr "Aggiungi altro"
4574
4575=== modified file 'po/ja.po'
4576--- po/ja.po 2014-08-08 07:06:46 +0000
4577+++ po/ja.po 2014-10-06 11:49:54 +0000
4578@@ -7,15 +7,15 @@
4579 msgstr ""
4580 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
4581 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4582-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
4583-"PO-Revision-Date: 2014-08-07 04:11+0000\n"
4584-"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"
4585+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
4586+"PO-Revision-Date: 2014-09-18 09:13+0000\n"
4587+"Last-Translator: Kentaro Kazuhama <Unknown>\n"
4588 "Language-Team: Japanese <ja@li.org>\n"
4589 "MIME-Version: 1.0\n"
4590 "Content-Type: text/plain; charset=UTF-8\n"
4591 "Content-Transfer-Encoding: 8bit\n"
4592-"X-Launchpad-Export-Date: 2014-08-08 07:06+0000\n"
4593-"X-Generator: Launchpad (build 17156)\n"
4594+"X-Launchpad-Export-Date: 2014-09-20 06:32+0000\n"
4595+"X-Generator: Launchpad (build 17196)\n"
4596
4597 #: ../plugins/example/Main.qml:33
4598 msgid "User name"
4599@@ -25,59 +25,84 @@
4600 msgid "Password"
4601 msgstr "パスワード"
4602
4603-#: ../src/AccountsPage.qml:53
4604+#: ../system-settings-plugin/AccountsPage.qml:51
4605 msgid "Add account…"
4606-msgstr ""
4607+msgstr "アカウントの追加…"
4608
4609-#: ../src/AddAccountLabel.qml:27
4610+#: ../system-settings-plugin/AddAccountLabel.qml:27
4611 msgid ""
4612 "Storing account details here lets apps use the accounts without you having "
4613 "to sign in for each app."
4614 msgstr "ここにアカウント情報を追加すると、個別に認証する必要なくアプリがアカウントを利用できます。"
4615
4616-#: ../src/NewAccountPage.qml:23
4617+#: ../system-settings-plugin/MainPage.qml:29
4618+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
4619+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
4620+msgid "Accounts"
4621+msgstr "アカウント"
4622+
4623+#: ../system-settings-plugin/NewAccountPage.qml:23
4624 msgid "Add account"
4625 msgstr "アカウントの追加"
4626
4627-#: ../src/NoAccountsPage.qml:36
4628+#: ../system-settings-plugin/NoAccountsPage.qml:36
4629 msgid "No accounts"
4630 msgstr "アカウントはありません"
4631
4632-#: ../src/NoAccountsPage.qml:44
4633+#: ../system-settings-plugin/NoAccountsPage.qml:44
4634 msgid "Add account:"
4635 msgstr "アカウントの追加:"
4636
4637-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
4638+#: ../online-accounts-ui/module/OAuth.qml:119
4639+msgid "Loading…"
4640+msgstr "読み込み中…"
4641+
4642+#: ../online-accounts-ui/module/OAuth.qml:149
4643+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
4644+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
4645 msgid "Cancel"
4646 msgstr "キャンセル"
4647
4648-#: ../src/module/Options.qml:36
4649+#: ../online-accounts-ui/module/Options.qml:36
4650 msgid "ID"
4651 msgstr "ID"
4652
4653-#: ../src/module/Options.qml:54
4654+#: ../online-accounts-ui/module/Options.qml:48
4655 msgid "Remove account…"
4656-msgstr ""
4657+msgstr "アカウントの削除..."
4658
4659-#: ../src/module/RemovalConfirmation.qml:32
4660+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
4661 msgid "Remove account"
4662-msgstr ""
4663+msgstr "アカウントの削除"
4664
4665-#: ../src/module/RemovalConfirmation.qml:33
4666+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
4667 #, qt-format
4668 msgid ""
4669 "The %1 account will be removed only from your phone. You can add it again "
4670 "later."
4671 msgstr "アカウント %1 はスマートフォン上からのみ削除されます。これはあとから再度追加できます。"
4672
4673-#: ../src/module/RemovalConfirmation.qml:36
4674+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
4675 msgid "Remove"
4676 msgstr "削除"
4677
4678-#: ../src/module/ServiceSwitches.qml:33
4679+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
4680 msgid "Access to this account:"
4681 msgstr "このアカウントにアクセスするサービス:"
4682
4683-#: ../.build/settings.js:1
4684-msgid "Accounts"
4685-msgstr "アカウント"
4686+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
4687+#, qt-format
4688+msgid "%1 wants to access your %2 account"
4689+msgstr "%1 は %2 のアカウントへのアクセスを要求します"
4690+
4691+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
4692+msgid "Allow"
4693+msgstr "許可"
4694+
4695+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
4696+msgid "Don't allow"
4697+msgstr "キャンセル"
4698+
4699+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
4700+msgid "Add another"
4701+msgstr "その他を追加"
4702
4703=== modified file 'po/km.po'
4704--- po/km.po 2014-06-20 06:09:21 +0000
4705+++ po/km.po 2014-10-06 11:49:54 +0000
4706@@ -7,15 +7,15 @@
4707 msgstr ""
4708 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
4709 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4710-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
4711-"PO-Revision-Date: 2013-10-11 04:23+0000\n"
4712-"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
4713+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
4714+"PO-Revision-Date: 2014-09-02 07:51+0000\n"
4715+"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"
4716 "Language-Team: Khmer <km@li.org>\n"
4717 "MIME-Version: 1.0\n"
4718 "Content-Type: text/plain; charset=UTF-8\n"
4719 "Content-Transfer-Encoding: 8bit\n"
4720-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
4721-"X-Generator: Launchpad (build 17058)\n"
4722+"X-Launchpad-Export-Date: 2014-09-04 08:34+0000\n"
4723+"X-Generator: Launchpad (build 17196)\n"
4724
4725 #: ../plugins/example/Main.qml:33
4726 msgid "User name"
4727@@ -25,11 +25,11 @@
4728 msgid "Password"
4729 msgstr "ពាក្យសម្ងាត់"
4730
4731-#: ../src/AccountsPage.qml:53
4732+#: ../system-settings-plugin/AccountsPage.qml:51
4733 msgid "Add account…"
4734 msgstr "បន្ថែម​គណនី…"
4735
4736-#: ../src/AddAccountLabel.qml:27
4737+#: ../system-settings-plugin/AddAccountLabel.qml:27
4738 msgid ""
4739 "Storing account details here lets apps use the accounts without you having "
4740 "to sign in for each app."
4741@@ -38,35 +38,47 @@
4742 "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ​គណនី​ដោយ​មិន​ចាំបាច់​ឲ្យ​អ្នក​ចូល​សម្រាប់​កម្មវិធី"
4743 "​នីមួយៗ។"
4744
4745-#: ../src/NewAccountPage.qml:23
4746+#: ../system-settings-plugin/MainPage.qml:29
4747+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
4748+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
4749+msgid "Accounts"
4750+msgstr "គណនី"
4751+
4752+#: ../system-settings-plugin/NewAccountPage.qml:23
4753 msgid "Add account"
4754 msgstr "បន្ថែម​គណនី"
4755
4756-#: ../src/NoAccountsPage.qml:36
4757+#: ../system-settings-plugin/NoAccountsPage.qml:36
4758 msgid "No accounts"
4759 msgstr "គ្មាន​គណនី"
4760
4761-#: ../src/NoAccountsPage.qml:44
4762+#: ../system-settings-plugin/NoAccountsPage.qml:44
4763 msgid "Add account:"
4764 msgstr "បន្ថែម​គណនី៖"
4765
4766-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
4767+#: ../online-accounts-ui/module/OAuth.qml:119
4768+msgid "Loading…"
4769+msgstr "កំពុង​ផ្ទុក…"
4770+
4771+#: ../online-accounts-ui/module/OAuth.qml:149
4772+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
4773+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
4774 msgid "Cancel"
4775 msgstr "បោះ​បង់"
4776
4777-#: ../src/module/Options.qml:36
4778+#: ../online-accounts-ui/module/Options.qml:36
4779 msgid "ID"
4780 msgstr "លេខ​សម្គាល់"
4781
4782-#: ../src/module/Options.qml:54
4783+#: ../online-accounts-ui/module/Options.qml:48
4784 msgid "Remove account…"
4785 msgstr "លុប​គណនី…"
4786
4787-#: ../src/module/RemovalConfirmation.qml:32
4788+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
4789 msgid "Remove account"
4790 msgstr "លុប​គណនី"
4791
4792-#: ../src/module/RemovalConfirmation.qml:33
4793+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
4794 #, qt-format
4795 msgid ""
4796 "The %1 account will be removed only from your phone. You can add it again "
4797@@ -75,14 +87,27 @@
4798 "គណនី %1 នឹង​ត្រូវ​បាន​លុប​តែ​ពី​ទូរស័ព្ទ​របស់​អ្នក​ប៉ុណ្ណោះ។ "
4799 "អ្នក​អាច​បន្ថែម​ម្ដង​ទៀត​ពេល​ក្រោយ។"
4800
4801-#: ../src/module/RemovalConfirmation.qml:36
4802+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
4803 msgid "Remove"
4804 msgstr "លុប​ចេញ"
4805
4806-#: ../src/module/ServiceSwitches.qml:33
4807+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
4808 msgid "Access to this account:"
4809 msgstr "ចូល​គណនី​នេះ៖"
4810
4811-#: ../.build/settings.js:1
4812-msgid "Accounts"
4813-msgstr "គណនី"
4814+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
4815+#, qt-format
4816+msgid "%1 wants to access your %2 account"
4817+msgstr "%1 ចង់​ចូល​ប្រើ​គណនី %2 របស់​អ្នក"
4818+
4819+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
4820+msgid "Allow"
4821+msgstr "អនុញ្ញាត"
4822+
4823+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
4824+msgid "Don't allow"
4825+msgstr "មិន​អនុញ្ញាត"
4826+
4827+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
4828+msgid "Add another"
4829+msgstr "បន្ថែម​ផ្សេងទៀត"
4830
4831=== modified file 'po/ko.po'
4832--- po/ko.po 2014-07-19 06:19:06 +0000
4833+++ po/ko.po 2014-10-06 11:49:54 +0000
4834@@ -7,15 +7,15 @@
4835 msgstr ""
4836 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
4837 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4838-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
4839+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
4840 "PO-Revision-Date: 2014-07-18 15:41+0000\n"
4841 "Last-Translator: MinSik CHO <Unknown>\n"
4842 "Language-Team: Korean <ko@li.org>\n"
4843 "MIME-Version: 1.0\n"
4844 "Content-Type: text/plain; charset=UTF-8\n"
4845 "Content-Transfer-Encoding: 8bit\n"
4846-"X-Launchpad-Export-Date: 2014-07-19 06:19+0000\n"
4847-"X-Generator: Launchpad (build 17114)\n"
4848+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
4849+"X-Generator: Launchpad (build 17176)\n"
4850
4851 #: ../plugins/example/Main.qml:33
4852 msgid "User name"
4853@@ -25,59 +25,84 @@
4854 msgid "Password"
4855 msgstr "비밀번호"
4856
4857-#: ../src/AccountsPage.qml:53
4858+#: ../system-settings-plugin/AccountsPage.qml:51
4859 msgid "Add account…"
4860 msgstr "계정 추가…"
4861
4862-#: ../src/AddAccountLabel.qml:27
4863+#: ../system-settings-plugin/AddAccountLabel.qml:27
4864 msgid ""
4865 "Storing account details here lets apps use the accounts without you having "
4866 "to sign in for each app."
4867 msgstr "어플리케이션별로 사용자가 직접 로그인 하지 않고 자동으로 로그인 하도록 계정 정보를 저장합니다."
4868
4869-#: ../src/NewAccountPage.qml:23
4870+#: ../system-settings-plugin/MainPage.qml:29
4871+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
4872+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
4873+msgid "Accounts"
4874+msgstr "계정"
4875+
4876+#: ../system-settings-plugin/NewAccountPage.qml:23
4877 msgid "Add account"
4878 msgstr "계정 추가"
4879
4880-#: ../src/NoAccountsPage.qml:36
4881+#: ../system-settings-plugin/NoAccountsPage.qml:36
4882 msgid "No accounts"
4883 msgstr "계정 없음"
4884
4885-#: ../src/NoAccountsPage.qml:44
4886+#: ../system-settings-plugin/NoAccountsPage.qml:44
4887 msgid "Add account:"
4888 msgstr "계정 추가:"
4889
4890-#: ../src/module/OAuth.qml:82 ../src/module/RemovalConfirmation.qml:41
4891+#: ../online-accounts-ui/module/OAuth.qml:119
4892+msgid "Loading…"
4893+msgstr ""
4894+
4895+#: ../online-accounts-ui/module/OAuth.qml:149
4896+#: ../online-accounts-ui/module/RemovalConfirmation.qml:43
4897+#: ../online-accounts-ui/qml/SignOnUiPage.qml:30
4898 msgid "Cancel"
4899 msgstr "취소"
4900
4901-#: ../src/module/Options.qml:36
4902+#: ../online-accounts-ui/module/Options.qml:36
4903 msgid "ID"
4904 msgstr "아이디"
4905
4906-#: ../src/module/Options.qml:54
4907+#: ../online-accounts-ui/module/Options.qml:48
4908 msgid "Remove account…"
4909 msgstr "계정 삭제..."
4910
4911-#: ../src/module/RemovalConfirmation.qml:32
4912+#: ../online-accounts-ui/module/RemovalConfirmation.qml:32
4913 msgid "Remove account"
4914 msgstr "계정 제거"
4915
4916-#: ../src/module/RemovalConfirmation.qml:33
4917+#: ../online-accounts-ui/module/RemovalConfirmation.qml:33
4918 #, qt-format
4919 msgid ""
4920 "The %1 account will be removed only from your phone. You can add it again "
4921 "later."
4922 msgstr "%1 계정은 휴대전화에서만 제거 됩니다. 나중에 다시 추가 할 수 있습니다."
4923
4924-#: ../src/module/RemovalConfirmation.qml:36
4925+#: ../online-accounts-ui/module/RemovalConfirmation.qml:38
4926 msgid "Remove"
4927 msgstr "제거"
4928
4929-#: ../src/module/ServiceSwitches.qml:33
4930+#: ../online-accounts-ui/module/ServiceSwitches.qml:33
4931 msgid "Access to this account:"
4932 msgstr "이 계정에 접근:"
4933
4934-#: ../.build/settings.js:1
4935-msgid "Accounts"
4936-msgstr "계정"
4937+#: ../online-accounts-ui/qml/AuthorizationPage.qml:41
4938+#, qt-format
4939+msgid "%1 wants to access your %2 account"
4940+msgstr ""
4941+
4942+#: ../online-accounts-ui/qml/AuthorizationPage.qml:64
4943+msgid "Allow"
4944+msgstr ""
4945+
4946+#: ../online-accounts-ui/qml/AuthorizationPage.qml:71
4947+msgid "Don't allow"
4948+msgstr ""
4949+
4950+#: ../online-accounts-ui/qml/ProviderRequest.qml:87
4951+msgid "Add another"
4952+msgstr ""
4953
4954=== modified file 'po/lo.po'
4955--- po/lo.po 2014-06-20 06:09:21 +0000
4956+++ po/lo.po 2014-10-06 11:49:54 +0000
4957@@ -7,15 +7,15 @@
4958 msgstr ""
4959 "Project-Id-Version: ubuntu-system-settings-online-accounts\n"
4960 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4961-"POT-Creation-Date: 2013-07-10 19:34+0200\n"
4962+"POT-Creation-Date: 2014-08-26 10:31+0200\n"
4963 "PO-Revision-Date: 2013-07-12 09:06+0000\n"
4964 "Last-Translator: Anousak <anousak@gmail.com>\n"
4965 "Language-Team: Lao <lo@li.org>\n"
4966 "MIME-Version: 1.0\n"
4967 "Content-Type: text/plain; charset=UTF-8\n"
4968 "Content-Transfer-Encoding: 8bit\n"
4969-"X-Launchpad-Export-Date: 2014-06-20 06:09+0000\n"
4970-"X-Generator: Launchpad (build 17058)\n"
4971+"X-Launchpad-Export-Date: 2014-08-30 07:43+0000\n"
4972+"X-Generator: Launchpad (build 17176)\n"
4973
4974 #: ../plugins/example/Main.qml:33
4975 msgid "User name"
4976@@ -25,11 +25,11 @@
4977 msgid "Password"
4978 msgstr "ລະຫັດຜ່ານ"
4979
4980-#: ../src/AccountsPage.qml:53
4981+#: ../system-settings-plugin/AccountsPage.qml:51
4982 msgid "Add account…"
4983 msgstr "ເພີ່ມບັນຊີ"
4984
4985-#: ../src/AddAccountLabel.qml:27
4986+#: ../system-settings-plugin/AddAccountLabel.qml:27
4987 msgid ""
4988 "Storing account details here lets apps use the accounts without you having "
4989 "to sign in for each app."
4990@@ -37,49 +37,74 @@
4991 "ເກັບຂໍ້ມູນລາຍລະອຽດບັນຊີໃສບ່ອນນີ້ເພື່ອໃຫ້ເເອບອື່ນນໍາໃຊ້ທີ່ວ່າເຈົ້າບໍ່ຈໍາເປັນຕ້"
4992 "ອງເຊັນເຂົ້າໃນເເຕ່ລະເເອບ."
4993
4994-#: ../src/NewAccountPage.qml:23
4995+#: ../system-settings-plugin/MainPage.qml:29
4996+#: ../online-accounts-ui/qml/ProviderRequest.qml:51
4997+#: ../online-accounts-ui/qml/ProviderRequest.qml:119 ../.build/settings.js:1
4998+msgid "Accounts"
4999+msgstr "ບັນຊີທົວໄປ"
5000+
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: