Merge lp:~milo/gwibber/gwibber-milo into lp:gwibber/1.2

[Milo Casagrande]

[Milo Casagrande (milo)]

Proposing for merge, the change is trivial:
 - modified the LOCALEDIR so that now points to '/usr/share/locale' otherwise gwibber will not be shown localized
 - updated the pot file: some strings from the Gwibber menu were left out and not translatable

[lp:~milo/gwibber/gwibber-milo]

303. By Ryan Paul on 2009-05-23

[Merge] new theme system and FriendFeed support merged from template-theme-engine

304. By Ryan Paul on 2009-05-23

Added the new themes to setup.py

305. By Ryan Paul on 2009-05-23

Added support for retweeting

306. By Ryan Paul on 2009-05-23

Fixed color bug in bluelines and shine

307. By Ryan Paul on 2009-05-23

Fixed Tomboy integration and added source URL to Tomboy notes

308. By Ryan Paul on 2009-05-24

Fixed Ping.fm

309. By Ryan Paul on 2009-05-24

Added support for BrightKite

310. By Ryan Paul on 2009-05-24

Display scalable SVG icons at the proper size in themes and the action menu

311. By Ryan Paul on 2009-05-24

Restored FriendFeed properties dialog

312. By Ryan Paul on 2009-05-24

Added support for customizing font size

313. By Ryan Paul on 2009-05-24

Minor theme tweak

314. By Ryan Paul on 2009-05-24

Improved theme templates and added image handling to brightkite

315. By Ryan Paul on 2009-05-25

Added CSS template

316. By Ryan Paul on 2009-05-25

Added support for deleting Twitter and Identi.ca messages

317. By zzz on 2009-05-25

Fix user_tab links

318. By Ryan Paul on 2009-05-25

Allow the base template to process messages that don't have profile icons

319. By Ryan Paul on 2009-05-25

Support Brightkite messages that don't have a text body

320. By Ryan Paul on 2009-05-25

Allow users to access laconi.ca servers that don't support SSL

321. By Ryan Paul on 2009-05-25

Added option for showing nicknames instead of full names

322. By Ryan Paul on 2009-05-27

Fixed Jaiku support

323. By Ryan Paul on 2009-05-27

Added support for favoriting messages

324. By Ryan Paul on 2009-05-27

Added like, delete, and reply to FriendFeed

325. By Ryan Paul on 2009-05-27

Use official API for FriendFeed profile icons

326. By Ryan Paul on 2009-05-27

Fix new tab font glitch

327. By Ryan Paul on 2009-05-27

[Merge] Added the dark-gwilouche theme

328. By Ryan Paul on 2009-05-27

Fixed Jaiku timestamp handling

329. By sathyz on 2009-05-27

Show account name for Facebook

[zzz (oldman-deactivatedaccount)]

Approved (sorry it took so long!)

review: Approve

[lp:~milo/gwibber/gwibber-milo]

330. By Milo Casagrande on 2009-05-28

[Merge] LOCALEDIR fix and pot update

331. By zzz on 2009-05-28

Update gwibber.pot translation template for new trunk feature strings

=== modified file 'gwibber/client.py'
--- gwibber/client.py	2009-04-15 23:04:33 +0000
+++ gwibber/client.py	2009-04-18 16:54:25 +0000
@@ -26,7 +26,7 @@
 import urllib
 
 # Set this way as in setup.cfg we have prefix=/usr/local
-LOCALEDIR = "/usr/local/share/locale"
+LOCALEDIR = "/usr/share/locale"
 DOMAIN = "gwibber"
 
 locale.setlocale(locale.LC_ALL, "")

=== modified file 'po/gwibber.pot'
--- po/gwibber.pot	2009-03-31 10:08:08 +0000
+++ po/gwibber.pot	2009-04-18 16:54:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 10:58+0100\n"
+"POT-Creation-Date: 2009-04-18 18:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -29,57 +29,61 @@
 msgid "Microblogging client for GNOME"
 msgstr ""
 
-#: ../gwibber/client.py:48
+#: ../gwibber/client.py:49
 msgid "_Editor"
 msgstr ""
 
-#: ../gwibber/client.py:49
+#: ../gwibber/client.py:50
 msgid "_Statusbar"
 msgstr ""
 
-#: ../gwibber/client.py:50
+#: ../gwibber/client.py:51
 msgid "Tray _Icon"
 msgstr ""
 
 #. Translators: these are checkbox
-#: ../gwibber/client.py:55 ../ui/preferences.glade.h:54
+#: ../gwibber/client.py:56 ../ui/preferences.glade.h:54
 msgid "_Receive Messages"
 msgstr ""
 
-#: ../gwibber/client.py:56 ../ui/preferences.glade.h:55
+#: ../gwibber/client.py:57 ../ui/preferences.glade.h:55
 msgid "_Send Messages"
 msgstr ""
 
-#: ../gwibber/client.py:57
+#: ../gwibber/client.py:58
 msgid "Search _Messages"
 msgstr ""
 
-#: ../gwibber/client.py:84
+#: ../gwibber/client.py:87
 msgid "Gwibber"
 msgstr ""
 
-#: ../gwibber/client.py:146
+#: ../gwibber/client.py:149
 msgid "Messages"
 msgstr ""
 
-#: ../gwibber/client.py:147
+#: ../gwibber/client.py:150
 msgid "Replies"
 msgstr ""
 
-#: ../gwibber/client.py:170 ../gwibber/client.py:353 ../gwibber/client.py:678
+#: ../gwibber/client.py:173 ../gwibber/client.py:369
 #: ../gwibber/configui.py:133
 msgid "Search"
 msgstr ""
 
-#: ../gwibber/client.py:186
+#: ../gwibber/client.py:189
 msgid "Cancel"
 msgstr ""
 
-#: ../gwibber/client.py:337
+#: ../gwibber/client.py:316
+msgid "Failed to shorten URL"
+msgstr ""
+
+#: ../gwibber/client.py:353
 msgid "Enter a search query:"
 msgstr ""
 
-#: ../gwibber/client.py:475
+#: ../gwibber/client.py:507
 #, python-format
 msgid ""
 "%s message from %s at %s\n"
@@ -87,95 +91,104 @@
 "%s"
 msgstr ""
 
-#: ../gwibber/client.py:577 ../gwibber/client.py:583
+#: ../gwibber/client.py:610 ../gwibber/client.py:616
 #, python-format
 msgid "Characters remaining: %s"
 msgstr ""
 
-#: ../gwibber/client.py:613
+#: ../gwibber/client.py:646
 msgid "_Manage"
 msgstr ""
 
-#: ../gwibber/client.py:617
+#: ../gwibber/client.py:650
 msgid "_Create"
 msgstr ""
 
-#: ../gwibber/client.py:677
-msgid "Refresh"
-msgstr ""
-
-#: ../gwibber/client.py:679
+#: ../gwibber/client.py:710
+msgid "_Refresh"
+msgstr ""
+
+#: ../gwibber/client.py:711
+msgid "_Search"
+msgstr ""
+
+#. XXX: actCloseWindow should be disabled (greyed out) when false self.preferences['minimize_to_tray'] as it is the same as quitting
+#: ../gwibber/client.py:713
+msgid "_Close Window"
+msgstr ""
+
+#: ../gwibber/client.py:714
+msgid "_Close Tab"
+msgstr ""
+
+#: ../gwibber/client.py:716
 msgid "C_lear"
 msgstr ""
 
-#: ../gwibber/client.py:680
-msgid "Close Window"
-msgstr ""
-
-#: ../gwibber/client.py:682 ../ui/preferences.glade.h:35
-msgid "Preferences"
-msgstr ""
-
-#: ../gwibber/client.py:684
-msgid "Quit"
+#: ../gwibber/client.py:718
+msgid "_Preferences"
+msgstr ""
+
+#: ../gwibber/client.py:720
+msgid "_Quit"
 msgstr ""
 
 #. actThemeTest = gtk.Action("gwibberThemeTest", "_Theme Test", None, gtk.STOCK_PREFERENCES)
 #. actThemeTest.connect("activate", self.theme_preview_test)
 #. menuHelp.append(actThemeTest.create_menu_item())
-#: ../gwibber/client.py:690
+#: ../gwibber/client.py:726
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../gwibber/client.py:692
+#: ../gwibber/client.py:728
 msgid "Translate This Application..."
 msgstr ""
 
-#: ../gwibber/client.py:694
+#: ../gwibber/client.py:730
 msgid "Report a Problem"
 msgstr ""
 
-#: ../gwibber/client.py:696
+#: ../gwibber/client.py:732
 msgid "_About"
 msgstr ""
 
-#: ../gwibber/client.py:711
+#: ../gwibber/client.py:747
 msgid "S_pellcheck"
 msgstr ""
 
-#: ../gwibber/client.py:715
+#: ../gwibber/client.py:751
 msgid "E_rrors"
 msgstr ""
 
-#: ../gwibber/client.py:720
+#: ../gwibber/client.py:756
 msgid "_Gwibber"
 msgstr ""
 
-#: ../gwibber/client.py:723
+#: ../gwibber/client.py:759
 msgid "_View"
 msgstr ""
 
-#: ../gwibber/client.py:726
+#: ../gwibber/client.py:762
 msgid "_Accounts"
 msgstr ""
 
-#: ../gwibber/client.py:730
+#: ../gwibber/client.py:766
 msgid "_Help"
 msgstr ""
 
-#: ../gwibber/client.py:739 ../ui/preferences.glade.h:22
+#: ../gwibber/client.py:775 ../ui/preferences.glade.h:22
 msgid "Display bubbles"
 msgstr ""
 
-#: ../gwibber/client.py:790
+#: ../gwibber/client.py:826
 msgid "Errors"
 msgstr ""
 
-#: ../gwibber/client.py:796
+#: ../gwibber/client.py:832
 msgid "Debug Output"
 msgstr ""
 
-#: ../gwibber/client.py:1037
+#: ../gwibber/client.py:1100
 #, python-format
 msgid "Last update: %s"
 msgstr ""
@@ -410,7 +423,7 @@
 msgstr ""
 
 #: ../ui/preferences.glade.h:18
-msgid "Automatically shorten pasted URLs"
+msgid "Automatically shorten pasted URLs using:"
 msgstr ""
 
 #: ../ui/preferences.glade.h:19
@@ -476,6 +489,10 @@
 msgid "Password:"
 msgstr ""
 
+#: ../ui/preferences.glade.h:35
+msgid "Preferences"
+msgstr ""
+
 #: ../ui/preferences.glade.h:36
 msgid "Request Login Code"
 msgstr ""