Merge lp:~gerboland/unity-2d/update-pots into lp:unity-2d

[Gerry Boland]

[l18n] Update POT files to reflect recent string changes

[l18n] Update POT files to reflect recent string changes

UNBLOCK

[lp:~gerboland/unity-2d/update-pots]

1004. By Paweł Stołowski on 2012-03-20

[panel] Reset Panel if dbus connection to Dash is lost (e.g. Shell process gets killed):
    - connect to serviceUnregistered of QDBusServiceWatcher in both DashClient and HudClient
    - call updateWidgets in AppNameApplet applet and updatePallette in PanelPaletteManager
      on loss of dbus connection
    - DashClient and HudClient reconnect to dbus after dbus service becomes available. Fixes: https://bugs.launchpad.net/bugs/953168. Approved by .

1005. By Tiago Salem Herrmann on 2012-03-20

[dash] Home lens state not reset if dash closed & reopened. Fixes: https://bugs.launchpad.net/bugs/948299. Approved by .

[Paweł Stołowski (stolowski)]

Looks good.

review: Approve

[lp:~gerboland/unity-2d/update-pots]

1006. By Gerry Boland on 2012-03-20

[hud] [a11y] completionText not supplied by HUD for A11Y, so need to convert resultText html to plain text and use that as A11Y string. Fixes: https://bugs.launchpad.net/bugs/948024, https://bugs.launchpad.net/bugs/949445. Approved by Tiago Salem Herrmann.

1007. By Gerry Boland on 2012-03-21

Compute the wallpaper average color and use it to colorize the launcher's, panel's and dash's background. Thanks to Florian Boucault. Fixes: https://bugs.launchpad.net/bugs/960194. Approved by Michał Sawicz.

1008. By Launchpad Translations on behalf of unity-2d-team on 2012-03-23

Launchpad automatic translations update.

1009. By Gerry Boland on 2012-03-23

[l18n] Update POT files to reflect recent string changes. Fixes: . Approved by Pawel Stolowski.

=== modified file 'po/unity-2d.pot'
--- po/unity-2d.pot	2012-03-06 16:11:53 +0000
+++ po/unity-2d.pot	2012-03-20 11:04:21 +0000
@@ -1,99 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-2d\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/unity-2d/+filebug\n"
-"POT-Creation-Date: 2012-03-06 17:07+0100\n"
+"POT-Creation-Date: 2012-03-20 10:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: panel/applets/appname/appnameapplet.cpp:364
-msgid "Ubuntu Desktop"
-msgstr ""
-
-#: shell/hud/Hud.qml:192
-msgid "Type your Command"
-msgstr ""
-
-#: shell/launcher/LauncherList.qml:88
+#: shell/launcher/LauncherList.qml:89
 #, qt-format
 msgid "%1 window opened"
 msgid_plural "%1 windows opened"
 msgstr[0] ""
 msgstr[1] ""
 
-#: shell/launcher/LauncherList.qml:91
+#: shell/launcher/LauncherList.qml:92
 msgid "not running"
 msgstr ""
 
-#: shell/dash/CategoryHeader.qml:37
-msgid "not expanded"
-msgstr ""
-
-#: shell/dash/CategoryHeader.qml:37
-msgid "expanded"
-msgstr ""
-
-#: shell/dash/CategoryHeader.qml:81
-#, qt-format
-msgid "See %1 more result"
-msgid_plural "See %1 more results"
-msgstr[0] ""
-msgstr[1] ""
-
-#: shell/dash/CategoryHeader.qml:83
-msgid "See fewer results"
-msgstr ""
-
-#: shell/dash/Home.qml:82
-msgid "Shortcuts"
-msgstr ""
-
-#: shell/dash/HomeShortcuts.qml:47
-msgid "Media Apps"
-msgstr ""
-
-#: shell/dash/HomeShortcuts.qml:53
-msgid "Internet Apps"
-msgstr ""
-
-#: shell/dash/HomeShortcuts.qml:59
-msgid "More Apps"
-msgstr ""
-
-#: shell/dash/HomeShortcuts.qml:65
-msgid "Find Files"
-msgstr ""
-
-#: shell/dash/HomeShortcuts.qml:72
-msgid "Browse the Web"
-msgstr ""
-
-#: shell/dash/HomeShortcuts.qml:77
-msgid "View Photos"
-msgstr ""
-
-#: shell/dash/HomeShortcuts.qml:83
-msgid "Check Email"
-msgstr ""
-
-#: shell/dash/HomeShortcuts.qml:88
-msgid "Listen to Music"
+#: shell/hud/Hud.qml:198
+msgid "Type your Command"
 msgstr ""
 
 #: shell/dash/FilterPane.qml:71
 msgid "Filter results"
 msgstr ""
 
-#: shell/dash/Dash.qml:279 libunity-2d-private/src/lenses.cpp:41
-msgid "Search"
-msgstr ""
-
 #: shell/dash/FilterLoader.qml:38
 #, qt-format
 msgid "Filter %1 active"
@@ -108,24 +51,63 @@
 msgid "All"
 msgstr ""
 
+#: shell/dash/Dash.qml:292 libunity-2d-private/src/lenses.cpp:41
+msgid "Search"
+msgstr ""
+
+#: shell/dash/CategoryHeader.qml:37
+msgid "not expanded"
+msgstr ""
+
+#: shell/dash/CategoryHeader.qml:37
+msgid "expanded"
+msgstr ""
+
+#: shell/dash/CategoryHeader.qml:93
+#, qt-format
+msgid "See %1 more result"
+msgid_plural "See %1 more results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: shell/dash/CategoryHeader.qml:95
+msgid "See fewer results"
+msgstr ""
+
+#: shell/dash/Home.qml:82
+msgid "Shortcuts"
+msgstr ""
+
+#: libunity-2d-private/src/launcherdevice.cpp:279
+msgid "Eject"
+msgstr ""
+
+#: libunity-2d-private/src/launcherdevice.cpp:287
+msgid "Safely remove"
+msgstr ""
+
+#: libunity-2d-private/src/application.cpp:999
+msgid "Lock to Launcher"
+msgstr ""
+
+#: libunity-2d-private/src/application.cpp:999
+msgid "Unlock from Launcher"
+msgstr ""
+
+#: libunity-2d-private/src/application.cpp:1006
+msgid "Quit"
+msgstr ""
+
+#: libunity-2d-private/src/bfb.cpp:69
+msgid "Dash home"
+msgstr ""
+
 #. TRANSLATORS: This refers to the direction of text
 #. (left-to-right or right-to-left): possible values are LTR or RTL
 #: libunity-2d-private/src/unity2dapplication.cpp:170
 msgid "QT_LAYOUT_DIRECTION"
 msgstr ""
 
-#: libunity-2d-private/src/application.cpp:986
-msgid "Keep in launcher"
-msgstr ""
-
-#: libunity-2d-private/src/application.cpp:986
-msgid "Remove from launcher"
-msgstr ""
-
-#: libunity-2d-private/src/application.cpp:993
-msgid "Quit"
-msgstr ""
-
 #: libunity-2d-private/src/lenses.cpp:41
 msgid "Home"
 msgstr ""
@@ -134,33 +116,25 @@
 msgid "Home screen"
 msgstr ""
 
-#: libunity-2d-private/src/bfb.cpp:60
-msgid "Dash home"
-msgstr ""
-
-#: libunity-2d-private/src/workspaces.cpp:73
-msgid "Workspaces"
-msgstr ""
-
-#: libunity-2d-private/src/trash.cpp:128
+#: libunity-2d-private/src/trash.cpp:134
 msgid "Trash"
 msgstr ""
 
-#: libunity-2d-private/src/trash.cpp:208
+#: libunity-2d-private/src/trash.cpp:214
 #, c-format, qt-plural-format
 msgid "%n item in trash"
 msgid_plural "%n items in trash"
 msgstr[0] ""
 msgstr[1] ""
 
-#: libunity-2d-private/src/trash.cpp:215
+#: libunity-2d-private/src/trash.cpp:221
 msgid "Empty Trash"
 msgstr ""
 
-#: libunity-2d-private/src/launcherdevice.cpp:273
-msgid "Eject"
+#: libunity-2d-private/src/workspaces.cpp:79
+msgid "Workspaces"
 msgstr ""
 
-#: libunity-2d-private/src/launcherdevice.cpp:281
-msgid "Safely remove"
+#: panel/applets/appname/appnameapplet.cpp:367
+msgid "Ubuntu Desktop"
 msgstr ""