Merge lp:~nataliabidart/magicicada-client/ubuntu-one-changed-magicicada into lp:magicicada-client

[Natalia Bidart]

- Use ~/Magicicada as root folder.
- Fixed a syntax error and many missing inlineCallbacks.

[lp:~nataliabidart/magicicada-client/ubuntu-one-changed-magicicada]

1425. By Natalia Bidart on 2015-09-29

Proper fix.

[Facundo Batista (facundo)]

Awesome! Thanks

review: Approve

=== modified file 'HACKING'
--- HACKING	2011-07-21 15:24:02 +0000
+++ HACKING	2015-09-29 21:34:16 +0000
@@ -1,18 +1,11 @@
-Ubuntu One requires acceptance of the Canonical Contributor Agreement. You
-will need to follow the instructions at:
-
-http://www.canonical.com/contributors
-
-Once the agreement is accepted, you will be added to the Canonical Contributor
-Agreement team on Launchpad, so that your branches may be merged in upstream.
-
-
 In order to run tests in ubuntuone-client, you will need to have a built
 version of ubuntuone-storage-protocol in a tree, or installed. You can
 specify the path to a built tree with the --with-protocol option to configure,
 or autogen.sh (which calls configure after creating it).
 
-$: ./configure --with-protocol=$HOME/source/ubuntuone-storage-protocol/trunk
+Or you can simply bootstrap and everything will happen automagically:
+
+$: make boostrap
 
 After configuring, in order to run the tests, all you need to do is run
 make check.
@@ -20,7 +13,7 @@
 $: make check
 
 
-Ubuntu One uses branch based development on Launchpad, and bugs to track
+Magicicada uses branch based development on Launchpad, and bugs to track
 features and issues. Make sure a bug is filed for the piece of code you wish
 to work on. When committing your changes, be sure to specify the bug # it
 fixes using the --fixes option in bzr.
@@ -34,6 +27,8 @@
 
 After pushing your branch to Launchpad, you will need to propose it
 for merging into the parent branch. You can do this from the Launchpad web
-page for your branch. In order for your branch to be accepted, you will have
-to have accepted the Canonical Contributor Agreement as stated above, and
-there will need to be at least two approvals from Ubuntu One developers.
+page for your branch. In order for your branch to be accepted, it needs to
+ensure all existing tests keep passing, and the code you are adding/modifying
+has the proper addings/modifications in the tests/ folder.
+Your branch will also need at least one Magicicada developers (the
+chicharreros team) positive vote before landing.

=== modified file 'LICENSE'
--- LICENSE	2013-02-13 20:57:13 +0000
+++ LICENSE	2015-09-29 21:34:16 +0000
@@ -1,4 +1,4 @@
-# This is the Ubuntu One client package.
+# This is the Magicicada client package.
 # 
 # Copyright (C) 2009-2013 Canonical Ltd.
 #

=== modified file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	2012-10-15 20:12:29 +0000
+++ bin/ubuntuone-launch	2015-09-29 21:34:16 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# ubuntuone-launch - Ubuntu One storage synchronization daemon startup helper
+# Magicicada storage synchronization daemon startup helper
 #
 # Author: John Lenton <[e-mail]>
 #
@@ -31,12 +31,12 @@
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
 """
-Ubuntu One storage synchronization daemon (syncdaemon) startup helper.
+Storage synchronization daemon (syncdaemon) startup helper.
 
 This script decides whether to start and connect syncdaemon.
 
- * If you've never used Ubuntu One file sync, or if you've disabled
-   file sync via Ubuntu One control panel (or equivalently via setting
+ * If you've never used file sync, or if you've disabled
+   file sync via the control panel (or equivalently via setting
    files_sync_enabled to False in the syncdaemon configuration file),
    syncdaemon is not started, and nothing happens as a result of this
    script being run.
@@ -45,7 +45,7 @@
    local rescan is allowed to finish.
 
  * if syncdaemon has never synced to the server, or if there are no
-   credentials for Ubuntu One in the keyring, nothing further happens.
+   credentials, nothing further happens.
 
  * otherwise, syncdaemon is asked to connect.
 
@@ -53,12 +53,12 @@
 import sys
 import os
 
-U1ROOT = os.path.expanduser('~/Ubuntu One/')
+ROOT_FOLDER = os.path.expanduser('~/Magicicada/')
 
 if __name__ == '__main__':
     # this check is done early to speed up startup on people who are not
     # (yet) using the service (this way avoids all the imports).
-    if not os.path.isdir(U1ROOT):
+    if not os.path.isdir(ROOT_FOLDER):
         # no directory, just quit
         sys.exit(1)
 

=== modified file 'bin/ubuntuone-login'
--- bin/ubuntuone-login	2012-10-19 20:04:10 +0000
+++ bin/ubuntuone-login	2015-09-29 21:34:16 +0000
@@ -27,7 +27,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""The script tu ron the Ubuntu One Login D-Bus service."""
+"""The script tu run the Login D-Bus service."""
 
 # Invalid name "ubuntuone-login"
 
@@ -56,7 +56,7 @@
         name = bus.request_name(DBUS_BUS_NAME,
                                 dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
         if name == dbus.bus.REQUEST_NAME_REPLY_EXISTS:
-            logger.error("Ubuntu One login manager already running, quitting.")
+            logger.error(Login manager already running, quitting.")
             sys.exit(0)
     except dbus.DBusException:
         pass
@@ -68,7 +68,7 @@
             logger.setLevel(logging.DEBUG)
             logger.addHandler(debug_handler)
 
-        logger.info("Starting Ubuntu One login manager for bus %r.",
+        logger.info("Starting login manager for bus %r.",
                     DBUS_BUS_NAME)
         bus_name = dbus.service.BusName(DBUS_BUS_NAME, bus=bus)
         mainloop = GLib.MainLoop()

=== modified file 'bin/ubuntuone-proxy-tunnel'
--- bin/ubuntuone-proxy-tunnel	2012-04-09 20:07:05 +0000
+++ bin/ubuntuone-proxy-tunnel	2015-09-29 21:34:16 +0000
@@ -26,7 +26,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Ubuntu One tunnel for proxy support."""
+"""Tunnel for proxy support."""
 
 import sys
 

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2015-05-18 21:20:05 +0000
+++ bin/ubuntuone-syncdaemon	2015-09-29 21:34:16 +0000
@@ -26,7 +26,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Ubuntu One storage synchronization daemon."""
+"""Storage synchronization daemon."""
 
 import sys
 

=== modified file 'data/syncdaemon.conf'
--- data/syncdaemon.conf	2015-05-18 21:20:05 +0000
+++ data/syncdaemon.conf	2015-09-29 21:34:16 +0000
@@ -19,7 +19,7 @@
 files_sync_enabled.parser = bool
 files_sync_enabled.help = Toggles synchronization of files (False disables syncdaemon entirely)
 
-root_dir.default = ~/Ubuntu One
+root_dir.default = ~/Magicicada
 root_dir.parser = home_dir
 root_dir.help = Use the specified directory as the root
 

=== modified file 'data/ubuntuone-launch.desktop.in'
--- data/ubuntuone-launch.desktop.in	2011-07-01 12:06:13 +0000
+++ data/ubuntuone-launch.desktop.in	2015-09-29 21:34:16 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Ubuntu One
-Exec=/bin/sh -c '[ -d "$HOME/Ubuntu One" ] && ubuntuone-launch'
+Name=Magicicada
+Exec=/bin/sh -c '[ -d "$HOME/Magicicada" ] && ubuntuone-launch'
 Type=Application
 X-GNOME-Autostart-Delay=30
 Icon=ubuntuone

=== modified file 'po/ace.po'
--- po/ace.po	2012-09-17 19:03:52 +0000
+++ po/ace.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/af.po'
--- po/af.po	2012-09-17 19:03:52 +0000
+++ po/af.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One vereis 'n Ubuntu Single Sign On (SSO) rekening. Hierdie proses "
-"sal u toelaat om 'n nuwe rekening te skep, indien u nog nie een het nie."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/am.po'
--- po/am.po	2012-09-17 19:03:52 +0000
+++ po/am.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/an.po'
--- po/an.po	2012-09-17 19:03:52 +0000
+++ po/an.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/ar.po'
--- po/ar.po	2012-09-17 19:03:52 +0000
+++ po/ar.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"يتطلب أبونتو ون حساب أبونتو موّحد (SSO). إذا لم تكن تمتلك حسابا، ستتيح لك "
-"هذه العملية إنشاء واحد جديد."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "أبونتو ون"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ast.po'
--- po/ast.po	2012-09-17 19:03:52 +0000
+++ po/ast.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One necesita una cuenta Ubuntu Single Sign On (SSO). Esti procesu "
-"permitiráte crear una cuenta nueva, si ye qu'entá nun tienes una."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/az.po'
--- po/az.po	2012-09-17 19:03:52 +0000
+++ po/az.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/be.po'
--- po/be.po	2012-09-17 19:03:52 +0000
+++ po/be.po	2015-09-29 21:34:16 +0000
@@ -19,19 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Каб карыстацца з сэрвісу Ubuntu One неабходны ўліковы запіс Ubuntu Single "
-"Sign On (SSO). Калі вы працягнеце, то будзе створаны новы ўліковы запіс "
-"(калі ў вас яго яшчэ няма)."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/bg.po'
--- po/bg.po	2012-09-17 19:03:52 +0000
+++ po/bg.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One изисква Ubuntu Single Sign On (SSO) акаунт. Този процес ще ви "
-"позволи да си направите нов акаунт, ако все още нямате."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/bn.po'
--- po/bn.po	2012-09-17 19:03:52 +0000
+++ po/bn.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"উবুন্টু ওয়ানের জন্য উবুন্টু একক লগইন (SSO) একাউন্ট অত্যাবশ্যক। এই প্রক্রিয়া "
-"নতুন একাউন্ট তৈরি করতে অনুমোদন করে, যদি আপনার একটিও না থাকে।"
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "উবুন্টু ওয়ান"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/bo.po'
--- po/bo.po	2012-09-17 19:03:52 +0000
+++ po/bo.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/br.po'
--- po/br.po	2012-09-17 19:03:52 +0000
+++ po/br.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/bs.po'
--- po/bs.po	2012-09-17 19:03:52 +0000
+++ po/bs.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One zahtijeva Ubuntu Single Sign On (SSO) nalog.. Ovaj proces će vam "
-"omogućiti kreiranje novog naloga ako nemate vlastiti.."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ca.po'
--- po/ca.po	2012-09-17 19:03:52 +0000
+++ po/ca.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"L'Ubuntu One requereix un compte a l'Ubuntu Single Sign On (SSO). Aquest "
-"procés us permetrà crear un compte nou, si encara no en teniu."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/[e-mail]'
--- po/[e-mail]	2012-09-17 19:03:52 +0000
+++ po/[e-mail]	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"L'Ubuntu One requereix un compte a l'Ubuntu Single Sign On (SSO). Este "
-"procés vos permetrà crear un compte nou, si encara no en teniu."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ckb.po'
--- po/ckb.po	2012-09-17 19:03:52 +0000
+++ po/ckb.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/crh.po'
--- po/crh.po	2012-09-17 19:03:52 +0000
+++ po/crh.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/cs.po'
--- po/cs.po	2012-09-17 19:03:52 +0000
+++ po/cs.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One vyžaduje účet Ubuntu Single Sign On (SSO). Tento postup vám "
-"umožní vytvořit nový účet, pokud jej ještě nemáte."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/csb.po'
--- po/csb.po	2012-09-17 19:03:52 +0000
+++ po/csb.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One brëkùje kònta Single Sign On (SSO). Mòżesz gò terô ùsadzëc, żlë "
-"gò jesz ni môsz ."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/cv.po'
--- po/cv.po	2012-09-17 19:03:52 +0000
+++ po/cv.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/cy.po'
--- po/cy.po	2012-09-17 19:03:52 +0000
+++ po/cy.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Mae angen cyfri Ubuntu Single Sign On (SSO) ar Ubuntu One. Bydd y broses hon "
-"yn rhoi cyfle i ti greu cyfri newydd os nag oes un gen ti."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/da.po'
--- po/da.po	2012-09-17 19:03:52 +0000
+++ po/da.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Generator: Launchpad (build 15966)\n"
 "X-Poedit-Language: Danish\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One kræver en Ubuntu Single SIgn On-konto (SSO). Denne process vil "
-"hjælpe dig med at oprette en ny konto, hvis du endnu ikke har en."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/de.po'
--- po/de.po	2012-09-17 19:03:52 +0000
+++ po/de.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One erfordert ein »Ubuntu Single Sign On« (SSO)-Benutzerkonto. Wenn "
-"Sie noch keines haben, können Sie innerhalb dieses Dialogs solch ein "
-"Benutzerkonto anlegen."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/el.po'
--- po/el.po	2012-09-17 19:03:52 +0000
+++ po/el.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Το Ubuntu One απαιτεί ένα Ubuntu Single Sign On (SSO) λογαριασμό. Η "
-"διαδικασία αυτή θα σας επιτρέψει να δημιουργήσετε ένα νέο λογαριασμό, αν δεν "
-"έχετε έναν ακόμα."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2012-09-17 19:03:52 +0000
+++ po/en_AU.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/en_CA.po'
--- po/en_CA.po	2012-09-17 19:03:52 +0000
+++ po/en_CA.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2012-09-17 19:03:52 +0000
+++ po/en_GB.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/eo.po'
--- po/eo.po	2012-09-17 19:03:52 +0000
+++ po/eo.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu Unu postulas konton de Ubuntu-SolaAliĝo. Ĉi tiu procezo permesos al "
-"vi krei novan konton, se vi ankoraŭ ne havas unu."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu Unu"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/es.po'
--- po/es.po	2012-09-17 19:03:52 +0000
+++ po/es.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One necesita una cuenta Ubuntu Single Sign On (SSO). Este proceso le "
-"permitirá crear una cuenta nueva, si aún no tiene una."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/et.po'
--- po/et.po	2012-09-17 19:03:52 +0000
+++ po/et.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One vajab 'Ubuntu Single Sign On' (SSO) kontot. See protsess "
-"võimaldab sul luua uue konto, kui sul veel ei ole."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/eu.po'
--- po/eu.po	2012-09-17 19:03:52 +0000
+++ po/eu.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One-k Ubuntu Signle Sign On (SSO) kontu bat behar du. Prozesu honek "
-"kontu hori sortzen lagunduko dizu jada bat ez baduzu."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/fa.po'
--- po/fa.po	2012-09-17 19:03:52 +0000
+++ po/fa.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/fi.po'
--- po/fi.po	2012-09-17 19:03:52 +0000
+++ po/fi.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One tarvitsee Ubuntu-kertakirjautumistunnuksen (SSO). Luo uusi "
-"tunnus, jos sinulla ei ole sellaista entuudestaan."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/fo.po'
--- po/fo.po	2012-09-17 19:03:52 +0000
+++ po/fo.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/fr.po'
--- po/fr.po	2012-09-17 19:03:52 +0000
+++ po/fr.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One requiert un compte Ubuntu. Ce processus vous permettra de créer "
-"un nouveau compte, si vous n'en possédez pas déjà un."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/fy.po'
--- po/fy.po	2012-09-17 19:03:52 +0000
+++ po/fy.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/gd.po'
--- po/gd.po	2012-09-17 19:03:52 +0000
+++ po/gd.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Tha Ubuntu One ag iarraidh cunntas Ubuntu Singilte Soidhnigeadh Air (SSO). "
-"Ceadaich am pròiseis seo dhut cruthachadh cunntas ùr, ma nach eil fear agad "
-"mar thràth."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/gl.po'
--- po/gl.po	2012-09-17 19:03:52 +0000
+++ po/gl.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One require unha conta de Ubuntu Single Sign On (SSO). Este proceso "
-"permitiralle crear unha nova conta, se aínda non ten ningunha."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/gu.po'
--- po/gu.po	2012-09-17 19:03:52 +0000
+++ po/gu.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One માટે એક  Ubuntu Single Sign On (SSO) ખાતું જરૂરી છે. જો તમારી "
-"પાસે હજુ ખાતું ન હોય તો, આ પ્રક્રિયા તમને ખાતું બનાવવાની પરવાનગી આપે છે."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/he.po'
--- po/he.po	2012-09-17 19:03:52 +0000
+++ po/he.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One דורשת חשבון Ubuntu Single Sign On (SSO). תהליך זה יאפשר לך ליצור "
-"חשבון חדש, אם עדיין אין לך אחד כזה."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/hi.po'
--- po/hi.po	2012-09-17 19:03:52 +0000
+++ po/hi.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"उबुन्टू एकल के लिए उबुन्टू एकीकृत साइन ऑन (एसएसओ) खाता की आवश्यकता है. यदि "
-"आपके पास एक भी ऐसा खाता नहीं है तो यही प्रक्रिया नए खाता खोलने की इजाजत देता "
-"है."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "उबुन्टू एकल"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/hr.po'
--- po/hr.po	2012-09-17 19:03:52 +0000
+++ po/hr.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One zahtijeva Ubuntu Single Sign On (SSO) korisnički račun. Ako ga "
-"već nemate, sada ćete ga moći otvoriti."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/hu.po'
--- po/hu.po	2012-09-17 19:03:52 +0000
+++ po/hu.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Az Ubuntu One használatához Ubuntu Single Sign On (SSO) fiók szükséges. Ez a "
-"folyamat lehetővé teszi új fiók létrehozását, ha még nem rendelkezik "
-"ilyennel."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/hy.po'
--- po/hy.po	2012-09-17 19:03:52 +0000
+++ po/hy.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/id.po'
--- po/id.po	2012-09-17 19:03:52 +0000
+++ po/id.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One membutuhkan akun Ubuntu Single Sign On (SSO). Proses ini akan "
-"meminta Anda membuat akun baru, jika Anda belum memilikinya."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/is.po'
--- po/is.po	2012-09-17 19:03:52 +0000
+++ po/is.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/it.po'
--- po/it.po	2012-09-17 19:03:52 +0000
+++ po/it.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One richiede un account Ubuntu SSO (Single Sign On). Questo processo "
-"consentirà di creare un nuovo account, qualora non se ne possieda uno."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ja.po'
--- po/ja.po	2012-09-17 19:03:52 +0000
+++ po/ja.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu OneにはUbuntu Single Sign "
-"On(SSO)アカウントが必要です。アカウントをお持ちでない場合は、この処理でアカウントを作成できます。"
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/jv.po'
--- po/jv.po	2012-09-17 19:03:52 +0000
+++ po/jv.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/kk.po'
--- po/kk.po	2012-09-17 19:03:52 +0000
+++ po/kk.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One қызметін пайдалану үшін, Ubuntu Single Sign On (SSO) тіркемесі "
-"қажет. Тіркемеңіз жоқ болса, жаңа тіркеме құруыңызға тура келеді."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One қызметі"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/km.po'
--- po/km.po	2012-09-17 19:03:52 +0000
+++ po/km.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Generator: Launchpad (build 15966)\n"
 "X-Language: km-KH\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"អ៊ូប៊ុនទូ​វ៉ាន់​ទាមទារ​គណនី​ Ubuntu Single Sign On  (SSO) ។ "
-"ដំណើរការ​នេះ​នឹង​អនុញ្ញាត​ឲ្យ​អ្នក​បង្កើត​គណនី​ថ្មី​ ប្រសិនបើ "
-"អ្នក​មិន​ទាន់​មាន​គណនី ។"
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "អ៊ូប៊ុនទូ​វ៉ាន់"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/kn.po'
--- po/kn.po	2012-09-17 19:03:52 +0000
+++ po/kn.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/ko.po'
--- po/ko.po	2012-09-17 19:03:52 +0000
+++ po/ko.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"우분투 원을 사용하시려면 우분투 통합 로그인(Single Sign On, SSO) 계정이 필요합니다. 다음 과정을 통해 새로운 계정을 "
-"만드실 수 있습니다."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "우분투 원"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ku.po'
--- po/ku.po	2012-09-17 19:03:52 +0000
+++ po/ku.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One,pêwîs tîyawî bi hesabekî Ubuntu Sing On (SS) heye. Eger hesab "
-"tune ev amur wê hesabêkî bi biafirîne"
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ky.po'
--- po/ky.po	2012-09-17 19:03:52 +0000
+++ po/ky.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/lt.po'
--- po/lt.po	2012-09-17 19:03:52 +0000
+++ po/lt.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One reikalauja Ubuntu Single Sign On (SSO) paskyros. Šis procesas "
-"Jums leis susikurti naują paskyrą, jei dar tokios neturite."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "„Ubuntu One“"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/lv.po'
--- po/lv.po	2012-09-17 19:03:52 +0000
+++ po/lv.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One ir nepieciešams Ubuntu Single Sign On (SSO) konts. Tas jums ļaus "
-"izveidot jaunu kontu, ja jums tā vēl nav."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/mi.po'
--- po/mi.po	2012-09-17 19:03:52 +0000
+++ po/mi.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr "Ubuntu Tahi"
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/ml.po'
--- po/ml.po	2012-09-17 19:03:52 +0000
+++ po/ml.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/mr.po'
--- po/mr.po	2012-09-17 19:03:52 +0000
+++ po/mr.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"उबुंतू वन साठी तुम्हाला उबुंतू सिंगल सैइन ऑन अकौंट लागेल. जर तुमचा जवळ ते "
-"नसेल तर हि प्रक्रिया तुम्हाला ते अकौंट तयार करण्यास मदत करेल."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "उबुंतू वन"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ms.po'
--- po/ms.po	2012-09-17 19:03:52 +0000
+++ po/ms.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One memerlukan akaun Ubuntu Single Sign On (SSO). Proses ini akan "
-"membenarkan anda mencipta akaun baru, jika anda belum memilikinya."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/my.po'
--- po/my.po	2012-09-17 19:03:52 +0000
+++ po/my.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One ကို အသံုးပြုရန် SSO ဟုခေါ်သည့် Ubuntu Single Sign On "
-"အကောက်တစ်ခုရှိရန် လိုအပ်ပါသည်။ အကောက်မရှိသေးပါက အောက်တွင် ဖြည့်စွက်ပြီး "
-"အကောက်သစ်တစ်ခု ဖန်တီးနိုင်ပါသည်။"
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/nb.po'
--- po/nb.po	2012-09-17 19:03:52 +0000
+++ po/nb.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One krever en Ubuntu Single Sign On (SSO)-konto. Denne prosessen vil "
-"la deg å opprette en ny konto, hvis du ikke allerede har en."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/nds.po'
--- po/nds.po	2012-09-17 19:03:52 +0000
+++ po/nds.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/nl.po'
--- po/nl.po	2012-09-17 19:03:52 +0000
+++ po/nl.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One vereist een Ubuntu Single Sign On (SSO)-account. Dit proces geeft "
-"u de mogelijkheid om een nieuw account aan te maken indien u er nog geen "
-"heeft."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/nn.po'
--- po/nn.po	2012-09-17 19:03:52 +0000
+++ po/nn.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One krev ein Ubuntu Single Sign On (SSO)-konto. Denne prosessen vil "
-"la deg oppretta ein ny konto, viss du ikkje allereie har ein."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/oc.po'
--- po/oc.po	2012-09-17 19:03:52 +0000
+++ po/oc.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One requesís un compte Ubuntu. Aqueste processus vos permetrà de "
-"crear un compte novèl, se n'avètz pas encara un."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/pl.po'
--- po/pl.po	2012-09-17 19:03:52 +0000
+++ po/pl.po	2015-09-29 21:34:16 +0000
@@ -21,18 +21,9 @@
 "X-Poedit-Country: Poland\n"
 "X-Poedit-Language: Polish\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Usługa Ubuntu One wymaga konta Ubuntu Single Sign On (SSO). Jeśli jeszcze go "
-"nie posiadasz, ten proces umożliwi jego założenie."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/pt.po'
--- po/pt.po	2012-09-17 19:03:52 +0000
+++ po/pt.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"O Ubuntu One requer uma conta Ubuntu Single Sign On (SSO). este processo vai-"
-"lhe permitir criar uma conta, caso não possua uma."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2012-09-17 19:03:52 +0000
+++ po/pt_BR.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One necessita de uma conta Ubuntu Single Sign On (SSO). Este processo "
-"lhe permitirá criar uma nova conta, se você ainda não tiver."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ro.po'
--- po/ro.po	2012-09-17 19:03:52 +0000
+++ po/ro.po	2015-09-29 21:34:16 +0000
@@ -20,18 +20,9 @@
 "X-Generator: Launchpad (build 15966)\n"
 "Language: ro\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One necesită un cont Ubuntu Single Sign On (SSO). Acest proces vă "
-"permite crearea unui nou cont, dacă nu aveți deja unul."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ru.po'
--- po/ru.po	2012-09-17 19:03:52 +0000
+++ po/ru.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One использует Ubuntu Single Sign On (SSO).  Здесь вы можете создать "
-"новую учетную запись SSO, если у вас её еще нет."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/sd.po'
--- po/sd.po	2012-09-17 19:03:52 +0000
+++ po/sd.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "اُبنٽو ون"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/se.po'
--- po/se.po	2012-09-17 19:03:52 +0000
+++ po/se.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/shn.po'
--- po/shn.po	2012-09-17 19:03:52 +0000
+++ po/shn.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/si.po'
--- po/si.po	2012-09-17 19:03:52 +0000
+++ po/si.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "උබුන්ටු වන්"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/sk.po'
--- po/sk.po	2012-09-17 19:03:52 +0000
+++ po/sk.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One vyžaduje účet Jednotné prihlásenie Ubuntu (SSO). Ak nemáte žiadny "
-"účet, tak vám ho tento proces umožní vytvoriť."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/sl.po'
--- po/sl.po	2012-09-17 19:03:52 +0000
+++ po/sl.po	2015-09-29 21:34:16 +0000
@@ -19,18 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One zahteva račun Ubuntu Single Sign On (SSO). To opravilo vam bo "
-"omogočilo ustvarjanje novega računa, če ga še nimate."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/sq.po'
--- po/sq.po	2012-09-17 19:03:52 +0000
+++ po/sq.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One ju kërkon një llogari Ubuntu regjistrim i Vetëm (SSO). Ky proçes "
-"do ju lejojë të krijoni një llogari të re, nëse nuk e keni një tashmë."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/sr.po'
--- po/sr.po	2012-09-17 19:03:52 +0000
+++ po/sr.po	2015-09-29 21:34:16 +0000
@@ -20,18 +20,9 @@
 "X-Generator: Launchpad (build 15966)\n"
 "Language: sr\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Убунту Један захтева један Убунту налог Јединственог пријављивања (SSO). "
-"Овај процес ће Вам омогућити да направите нови налог, ако већ немате један."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Убунту један"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/sv.po'
--- po/sv.po	2012-09-17 19:03:52 +0000
+++ po/sv.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One kräver ett Ubuntu Single Sign On-konto (SSO). Denna process låter "
-"dig skapa ett nytt konto, om du inte redan har ett."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ta.po'
--- po/ta.po	2012-09-17 19:03:52 +0000
+++ po/ta.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "உபுண்டு ஒன்று"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/te.po'
--- po/te.po	2012-09-17 19:03:52 +0000
+++ po/te.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "ఉబుంటు వన్"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/th.po'
--- po/th.po	2012-09-17 19:03:52 +0000
+++ po/th.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One ต้องการบัญชี Ubuntu Single Sign On (SSO) "
-"ขั้นตอนนี้จะอนุญาตให้คุณสร้างบัญชีใหม่ถ้าคุณยังไม่มี"
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/tr.po'
--- po/tr.po	2012-09-17 19:03:52 +0000
+++ po/tr.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One, bir Ubuntu Single Sign On (SSO) hesabına ihtiyaç duyuyor. Bu "
-"işlem, eğer yoksa yeni bir hesap oluşturmanızı sağlayacak."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ug.po'
--- po/ug.po	2012-09-17 19:03:52 +0000
+++ po/ug.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"ئۇبۇنتۇ بىر(Ubuntu One) نى زىيارەت قىلىش ئۈچۈن Ubuntu Single Sign On(SSO) "
-"ھېساباتى تەلەپ قىلىنىدۇ. بۇ بۇ مەشغۇلات سىزنىڭ ھېساباتىڭىز بولمىسا يېڭىدىن "
-"بىرنى قۇرۇشىڭىزغا يول قويىدۇ."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "ئۇبۇنتۇ بىر(Ubuntu One)"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/uk.po'
--- po/uk.po	2012-09-17 19:03:52 +0000
+++ po/uk.po	2015-09-29 21:34:16 +0000
@@ -19,19 +19,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Щоб користуватись Ubuntu One, треба мати обліковий запис Ubuntu Single Sign "
-"On (SSO). Зараз ви зможете створити цей обліковий запис, якщо ще не маєте "
-"його."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/ur.po'
--- po/ur.po	2012-09-17 19:03:52 +0000
+++ po/ur.po	2015-09-29 21:34:16 +0000
@@ -18,15 +18,8 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
+msgid "Magicicada"
 msgstr ""
 
 #: ../ubuntuone/status/aggregator.py:52

=== modified file 'po/uz.po'
--- po/uz.po	2012-09-17 19:03:52 +0000
+++ po/uz.po	2015-09-29 21:34:16 +0000
@@ -18,18 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One Ubuntu Single Sign On (SSO) ҳисобини талаб қилади. Ушбу жараён "
-"агар сизнинг ҳисобингиз бўлмаса, янги яратишга рухсат беради."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/vi.po'
--- po/vi.po	2012-09-17 19:03:52 +0000
+++ po/vi.po	2015-09-29 21:34:16 +0000
@@ -18,19 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr ""
-"Ubuntu One cần có một tài khoản Ubuntu Single Sign On (SSO - tài khoản "
-"Ubuntu Đăng nhập Một lần). Quá trình này sẽ cho phép bạn tạo một tài khoản "
-"mới, nếu bạn chưa có."
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2012-09-17 19:03:52 +0000
+++ po/zh_CN.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr "Ubuntu One 需要使用 Ubuntu Single Sign On (SSO) 账户。如果您还没有，这里可以让您创建一个新账户。"
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/zh_HK.po'
--- po/zh_HK.po	2012-09-17 19:03:52 +0000
+++ po/zh_HK.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr "Ubuntu One 需要有 Ubuntu Single Sign On (SSO) 帳號。如果您還沒有帳號，本程序會幫您建立新帳號。"
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2012-09-17 19:03:52 +0000
+++ po/zh_TW.po	2015-09-29 21:34:16 +0000
@@ -18,16 +18,9 @@
 "X-Launchpad-Export-Date: 2012-09-17 18:32+0000\n"
 "X-Generator: Launchpad (build 15966)\n"
 
-#: ../ubuntuone/clientdefs.py.in:52
-#: ../ubuntuone/platform/credentials/__init__.py:90
-msgid ""
-"Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process "
-"will allow you to create a new account, if you do not yet have one."
-msgstr "Ubuntu One 需要有 Ubuntu Single Sign On (SSO) 帳號。如果您還沒有帳號，本程序會幫您建立新帳號。"
-
 #: ../ubuntuone/status/aggregator.py:51
-msgid "Ubuntu One"
-msgstr "Ubuntu One"
+msgid "Magicicada"
+msgstr "Magicicada"
 
 #: ../ubuntuone/status/aggregator.py:52
 msgid "New cloud folder(s) available"

=== modified file 'tests/platform/test_credentials.py'
--- tests/platform/test_credentials.py	2015-09-17 02:20:40 +0000
+++ tests/platform/test_credentials.py	2015-09-29 21:34:16 +0000
@@ -47,8 +47,6 @@
     BASE_PING_URL,
     CredentialsError,
     CredentialsManagementTool,
-    DESCRIPTION,
-    HELP_TEXT_KEY,
     NO_OP,
     PING_URL,
     PING_URL_KEY,
@@ -253,7 +251,6 @@
     def test_ui_params(self):
         """The UI_PARAMS dict is correct."""
         expected = {
-            HELP_TEXT_KEY: DESCRIPTION,
             PING_URL_KEY: PING_URL,
             POLICY_URL_KEY: POLICY_URL,
             TC_URL_KEY: TC_URL,

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2015-05-18 21:20:05 +0000
+++ tests/syncdaemon/test_action_queue.py	2015-09-29 21:34:16 +0000
@@ -5416,6 +5416,7 @@
         self.assertEqual(called, ['run', exc, 'run', 'finish'])
         self._check_finished_ok()
 
+    @defer.inlineCallbacks
     def test_retry_conditions_solved(self):
         """Retry the command because conditions solved later."""
         finished = defer.Deferred()
@@ -5671,6 +5672,7 @@
         intrdef.interrupt()
         self.assertFalse(intrdef.interrupted)
 
+    @defer.inlineCallbacks
     def test_interrupt_except(self):
         """Interrupt!"""
         intrdef = InterruptibleDeferred(defer.Deferred())
@@ -5683,6 +5685,7 @@
         else:
             self.fail("Test should have raised an exception")
 
+    @defer.inlineCallbacks
     def test_interrupt_callback_original(self):
         """Interrupt silences further original callbacks."""
         origdef = defer.Deferred()
@@ -5699,6 +5702,7 @@
         # further callback to original deferred is harmless
         origdef.callback("foo")
 
+    @defer.inlineCallbacks
     def test_interrupt_errback_original(self):
         """Interrupt silences further original errbacks."""
         origdef = defer.Deferred()

=== modified file 'tests/syncdaemon/test_eq_inotify.py'
--- tests/syncdaemon/test_eq_inotify.py	2013-01-10 22:17:15 +0000
+++ tests/syncdaemon/test_eq_inotify.py	2015-09-29 21:34:16 +0000
@@ -78,6 +78,11 @@
                                           (a, k))
 
 
+class FakedVolume(object):
+
+    path = __file__
+
+
 class WatchTests(BaseEQTestCase):
     """Test the EQ API to add and remove watchs."""
 
@@ -98,11 +103,12 @@
         self.assertEqual(called, [method_arg])
         self.assertEqual(res, method_resp)
 
+    @defer.inlineCallbacks
     def test_add_watches_to_udf_ancestors(self):
         """Test that ancestors watches can be added."""
         called = []
         method_resp = True
-        method_arg = object()
+        method_arg = FakedVolume()
 
         def add_watches_to_udf_ancestors(path):
             """Fake it."""
@@ -115,11 +121,12 @@
         self.assertEqual(called, [method_arg])
         self.assertEqual(res, method_resp)
 
+    @defer.inlineCallbacks
     def test_add_watches_to_udf_ancestors_no_access(self):
         """Test that ancestors watches are not added."""
         called = []
         method_resp = True
-        method_arg = object()
+        method_arg = FakedVolume()
 
         def add_watches_to_udf_ancestors(path):
             """Fake it."""
@@ -127,7 +134,7 @@
             return defer.succeed(method_resp)
 
         self.patch(event_queue, 'access', lambda path: False)
-        self.pathc(self.eq.monitor, 'add_watches_to_udf_ancestors',
+        self.patch(self.eq.monitor, 'add_watches_to_udf_ancestors',
                    add_watches_to_udf_ancestors)
         added = yield self.eq.add_watches_to_udf_ancestors(method_arg)
         self.assertFalse(added, 'Watches should have not been added.')

=== modified file 'tests/syncdaemon/test_interaction_interfaces.py'
--- tests/syncdaemon/test_interaction_interfaces.py	2015-09-20 15:18:41 +0000
+++ tests/syncdaemon/test_interaction_interfaces.py	2015-09-29 21:34:16 +0000
@@ -2166,6 +2166,7 @@
 
         self.assertEqual(self.called, ['MetaQueueChanged'])
 
+    @defer.inlineCallbacks
     def test_handle_SYS_QUEUE_REMOVED_content_queue_changed_upload(self):
         """Test that handle_SYS_QUEUE_REMOVED also calls ContentQueueChanged."""
         d = defer.Deferred()

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2012-09-07 20:53:24 +0000
+++ tests/syncdaemon/test_localrescan.py	2015-09-29 21:34:16 +0000
@@ -1775,6 +1775,7 @@
         self.assertFalse(path_exists(partial_path), partial_path)
         self.assertTrue(self.fsm.has_metadata(path=path))
 
+    @defer.inlineCallbacks
     def test_partial_for_dir_in_NONE(self):
         """Found a .partial of a directory whose MD said changed=NONE."""
         # create the dir in metadata

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2015-09-17 02:20:40 +0000
+++ tests/syncdaemon/test_vm.py	2015-09-29 21:34:16 +0000
@@ -2006,6 +2006,7 @@
         d.addCallback(check)
         return d
 
+    @defer.inlineCallbacks
     def test_create_udf_unicode(self):
         """Test VolumeManager.create_udf.
 
@@ -2368,6 +2369,7 @@
         self.assertIn(share.volume_id, self.vm.shares)
         self.assertIn(share_2.volume_id, self.vm.shares)
 
+    @defer.inlineCallbacks
     def test_handle_AQ_CREATE_UDF_OK(self):
         """Test AQ_CREATE_UDF_OK. The UDF is always subscribed."""
         d = defer.Deferred()
@@ -3819,6 +3821,7 @@
         vol_id = yield d
         self.assertEquals(vol_id, share.volume_id)
 
+    @defer.inlineCallbacks
     def test_handle_SV_VOLUME_NEW_GENERATION_share_eq(self):
         """Test handle_SV_VOLUME_NEW_GENERATION for a share."""
         share = self._create_share(subscribed=True)

=== modified file 'ubuntuone/clientdefs.py.in'
--- ubuntuone/clientdefs.py.in	2013-06-07 15:22:31 +0000
+++ ubuntuone/clientdefs.py.in	2015-09-29 21:34:16 +0000
@@ -28,11 +28,7 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Ubuntu One client definitions.
-
-This is a package containing configure-time definitions for the Ubuntu One
-client.
-"""
+"""Configure-time definitions for the client."""
 
 import gettext
 

=== modified file 'ubuntuone/platform/credentials/__init__.py'
--- ubuntuone/platform/credentials/__init__.py	2015-09-19 23:15:50 +0000
+++ ubuntuone/platform/credentials/__init__.py	2015-09-29 21:34:16 +0000
@@ -42,7 +42,6 @@
 
 from ubuntu_sso import UI_EXECUTABLE_QT
 from ubuntu_sso.credentials import (
-    HELP_TEXT_KEY,
     PING_URL_KEY,
     POLICY_URL_KEY,
     UI_EXECUTABLE_KEY,
@@ -88,11 +87,7 @@
     u"https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/{email}"
 # the result of platform_data is given by urlencode, encoded with ascii
 PING_URL = BASE_PING_URL + u"?" + platform_data().decode('ascii')
-DESCRIPTION = Q_('Magicicada requires an Ubuntu Single Sign On (SSO) account. '
-                 'This process will allow you to create a new account, '
-                 'if you do not yet have one.')
 UI_PARAMS = {
-    HELP_TEXT_KEY: DESCRIPTION,
     PING_URL_KEY: PING_URL,
     POLICY_URL_KEY: POLICY_URL,
     TC_URL_KEY: TC_URL,