Gwibber

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

  1. gwibber-milo
  2. Merge into gwibber-1.2
Proposed by Milo Casagrande
Status: Merged
Merged at revision: not available
Proposed branch: lp:~milo/gwibber/gwibber-milo
Merge into: lp:gwibber/1.2
Diff against target: None lines
To merge this branch: bzr merge lp:~milo/gwibber/gwibber-milo
Reviewer Review Type Date Requested Status
Dominic Evans (community) Approve
Review via email: mp+5688@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) wrote :

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 updated
303. By Ryan Paul

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

304. By Ryan Paul

Added the new themes to setup.py

305. By Ryan Paul

Added support for retweeting

306. By Ryan Paul

Fixed color bug in bluelines and shine

307. By Ryan Paul

Fixed Tomboy integration and added source URL to Tomboy notes

308. By Ryan Paul

Fixed Ping.fm

309. By Ryan Paul

Added support for BrightKite

310. By Ryan Paul

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

311. By Ryan Paul

Restored FriendFeed properties dialog

312. By Ryan Paul

Added support for customizing font size

313. By Ryan Paul

Minor theme tweak

314. By Ryan Paul

Improved theme templates and added image handling to brightkite

315. By Ryan Paul

Added CSS template

316. By Ryan Paul

Added support for deleting Twitter and Identi.ca messages

317. By Dominic Evans

Fix user_tab links

318. By Ryan Paul

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

319. By Ryan Paul

Support Brightkite messages that don't have a text body

320. By Ryan Paul

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

321. By Ryan Paul

Added option for showing nicknames instead of full names

322. By Ryan Paul

Fixed Jaiku support

323. By Ryan Paul

Added support for favoriting messages

324. By Ryan Paul

Added like, delete, and reply to FriendFeed

325. By Ryan Paul

Use official API for FriendFeed profile icons

326. By Ryan Paul

Fix new tab font glitch

327. By Ryan Paul

[Merge] Added the dark-gwilouche theme

328. By Ryan Paul

Fixed Jaiku timestamp handling

329. By sathyz

Show account name for Facebook

Revision history for this message
Dominic Evans (oldmanuk) wrote :

Approved (sorry it took so long!)

review: Approve
lp:~milo/gwibber/gwibber-milo updated
330. By Milo Casagrande

[Merge] LOCALEDIR fix and pot update

331. By Dominic Evans

Update gwibber.pot translation template for new trunk feature strings

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
26import urllib26import urllib
2727
28# Set this way as in setup.cfg we have prefix=/usr/local28# Set this way as in setup.cfg we have prefix=/usr/local
29LOCALEDIR = "/usr/local/share/locale"29LOCALEDIR = "/usr/share/locale"
30DOMAIN = "gwibber"30DOMAIN = "gwibber"
3131
32locale.setlocale(locale.LC_ALL, "")32locale.setlocale(locale.LC_ALL, "")
3333
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2009-03-31 10:58+0100\n"11"POT-Creation-Date: 2009-04-18 18:52+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,57 +29,61 @@
29msgid "Microblogging client for GNOME"29msgid "Microblogging client for GNOME"
30msgstr ""30msgstr ""
3131
32#: ../gwibber/client.py:4832#: ../gwibber/client.py:49
33msgid "_Editor"33msgid "_Editor"
34msgstr ""34msgstr ""
3535
36#: ../gwibber/client.py:4936#: ../gwibber/client.py:50
37msgid "_Statusbar"37msgid "_Statusbar"
38msgstr ""38msgstr ""
3939
40#: ../gwibber/client.py:5040#: ../gwibber/client.py:51
41msgid "Tray _Icon"41msgid "Tray _Icon"
42msgstr ""42msgstr ""
4343
44#. Translators: these are checkbox44#. Translators: these are checkbox
45#: ../gwibber/client.py:55 ../ui/preferences.glade.h:5445#: ../gwibber/client.py:56 ../ui/preferences.glade.h:54
46msgid "_Receive Messages"46msgid "_Receive Messages"
47msgstr ""47msgstr ""
4848
49#: ../gwibber/client.py:56 ../ui/preferences.glade.h:5549#: ../gwibber/client.py:57 ../ui/preferences.glade.h:55
50msgid "_Send Messages"50msgid "_Send Messages"
51msgstr ""51msgstr ""
5252
53#: ../gwibber/client.py:5753#: ../gwibber/client.py:58
54msgid "Search _Messages"54msgid "Search _Messages"
55msgstr ""55msgstr ""
5656
57#: ../gwibber/client.py:8457#: ../gwibber/client.py:87
58msgid "Gwibber"58msgid "Gwibber"
59msgstr ""59msgstr ""
6060
61#: ../gwibber/client.py:14661#: ../gwibber/client.py:149
62msgid "Messages"62msgid "Messages"
63msgstr ""63msgstr ""
6464
65#: ../gwibber/client.py:14765#: ../gwibber/client.py:150
66msgid "Replies"66msgid "Replies"
67msgstr ""67msgstr ""
6868
69#: ../gwibber/client.py:170 ../gwibber/client.py:353 ../gwibber/client.py:67869#: ../gwibber/client.py:173 ../gwibber/client.py:369
70#: ../gwibber/configui.py:13370#: ../gwibber/configui.py:133
71msgid "Search"71msgid "Search"
72msgstr ""72msgstr ""
7373
74#: ../gwibber/client.py:18674#: ../gwibber/client.py:189
75msgid "Cancel"75msgid "Cancel"
76msgstr ""76msgstr ""
7777
78#: ../gwibber/client.py:33778#: ../gwibber/client.py:316
79msgid "Failed to shorten URL"
80msgstr ""
81
82#: ../gwibber/client.py:353
79msgid "Enter a search query:"83msgid "Enter a search query:"
80msgstr ""84msgstr ""
8185
82#: ../gwibber/client.py:47586#: ../gwibber/client.py:507
83#, python-format87#, python-format
84msgid ""88msgid ""
85"%s message from %s at %s\n"89"%s message from %s at %s\n"
@@ -87,95 +91,104 @@
87"%s"91"%s"
88msgstr ""92msgstr ""
8993
90#: ../gwibber/client.py:577 ../gwibber/client.py:58394#: ../gwibber/client.py:610 ../gwibber/client.py:616
91#, python-format95#, python-format
92msgid "Characters remaining: %s"96msgid "Characters remaining: %s"
93msgstr ""97msgstr ""
9498
95#: ../gwibber/client.py:61399#: ../gwibber/client.py:646
96msgid "_Manage"100msgid "_Manage"
97msgstr ""101msgstr ""
98102
99#: ../gwibber/client.py:617103#: ../gwibber/client.py:650
100msgid "_Create"104msgid "_Create"
101msgstr ""105msgstr ""
102106
103#: ../gwibber/client.py:677107#: ../gwibber/client.py:710
104msgid "Refresh"108msgid "_Refresh"
105msgstr ""109msgstr ""
106110
107#: ../gwibber/client.py:679111#: ../gwibber/client.py:711
112msgid "_Search"
113msgstr ""
114
115#. XXX: actCloseWindow should be disabled (greyed out) when false self.preferences['minimize_to_tray'] as it is the same as quitting
116#: ../gwibber/client.py:713
117msgid "_Close Window"
118msgstr ""
119
120#: ../gwibber/client.py:714
121msgid "_Close Tab"
122msgstr ""
123
124#: ../gwibber/client.py:716
108msgid "C_lear"125msgid "C_lear"
109msgstr ""126msgstr ""
110127
111#: ../gwibber/client.py:680128#: ../gwibber/client.py:718
112msgid "Close Window"129msgid "_Preferences"
113msgstr ""130msgstr ""
114131
115#: ../gwibber/client.py:682 ../ui/preferences.glade.h:35132#: ../gwibber/client.py:720
116msgid "Preferences"133msgid "_Quit"
117msgstr ""
118
119#: ../gwibber/client.py:684
120msgid "Quit"
121msgstr ""134msgstr ""
122135
123#. actThemeTest = gtk.Action("gwibberThemeTest", "_Theme Test", None, gtk.STOCK_PREFERENCES)136#. actThemeTest = gtk.Action("gwibberThemeTest", "_Theme Test", None, gtk.STOCK_PREFERENCES)
124#. actThemeTest.connect("activate", self.theme_preview_test)137#. actThemeTest.connect("activate", self.theme_preview_test)
125#. menuHelp.append(actThemeTest.create_menu_item())138#. menuHelp.append(actThemeTest.create_menu_item())
126#: ../gwibber/client.py:690139#: ../gwibber/client.py:726
127msgid "Get Help Online..."140msgid "Get Help Online..."
128msgstr ""141msgstr ""
129142
130#: ../gwibber/client.py:692143#: ../gwibber/client.py:728
131msgid "Translate This Application..."144msgid "Translate This Application..."
132msgstr ""145msgstr ""
133146
134#: ../gwibber/client.py:694147#: ../gwibber/client.py:730
135msgid "Report a Problem"148msgid "Report a Problem"
136msgstr ""149msgstr ""
137150
138#: ../gwibber/client.py:696151#: ../gwibber/client.py:732
139msgid "_About"152msgid "_About"
140msgstr ""153msgstr ""
141154
142#: ../gwibber/client.py:711155#: ../gwibber/client.py:747
143msgid "S_pellcheck"156msgid "S_pellcheck"
144msgstr ""157msgstr ""
145158
146#: ../gwibber/client.py:715159#: ../gwibber/client.py:751
147msgid "E_rrors"160msgid "E_rrors"
148msgstr ""161msgstr ""
149162
150#: ../gwibber/client.py:720163#: ../gwibber/client.py:756
151msgid "_Gwibber"164msgid "_Gwibber"
152msgstr ""165msgstr ""
153166
154#: ../gwibber/client.py:723167#: ../gwibber/client.py:759
155msgid "_View"168msgid "_View"
156msgstr ""169msgstr ""
157170
158#: ../gwibber/client.py:726171#: ../gwibber/client.py:762
159msgid "_Accounts"172msgid "_Accounts"
160msgstr ""173msgstr ""
161174
162#: ../gwibber/client.py:730175#: ../gwibber/client.py:766
163msgid "_Help"176msgid "_Help"
164msgstr ""177msgstr ""
165178
166#: ../gwibber/client.py:739 ../ui/preferences.glade.h:22179#: ../gwibber/client.py:775 ../ui/preferences.glade.h:22
167msgid "Display bubbles"180msgid "Display bubbles"
168msgstr ""181msgstr ""
169182
170#: ../gwibber/client.py:790183#: ../gwibber/client.py:826
171msgid "Errors"184msgid "Errors"
172msgstr ""185msgstr ""
173186
174#: ../gwibber/client.py:796187#: ../gwibber/client.py:832
175msgid "Debug Output"188msgid "Debug Output"
176msgstr ""189msgstr ""
177190
178#: ../gwibber/client.py:1037191#: ../gwibber/client.py:1100
179#, python-format192#, python-format
180msgid "Last update: %s"193msgid "Last update: %s"
181msgstr ""194msgstr ""
@@ -410,7 +423,7 @@
410msgstr ""423msgstr ""
411424
412#: ../ui/preferences.glade.h:18425#: ../ui/preferences.glade.h:18
413msgid "Automatically shorten pasted URLs"426msgid "Automatically shorten pasted URLs using:"
414msgstr ""427msgstr ""
415428
416#: ../ui/preferences.glade.h:19429#: ../ui/preferences.glade.h:19
@@ -476,6 +489,10 @@
476msgid "Password:"489msgid "Password:"
477msgstr ""490msgstr ""
478491
492#: ../ui/preferences.glade.h:35
493msgid "Preferences"
494msgstr ""
495
479#: ../ui/preferences.glade.h:36496#: ../ui/preferences.glade.h:36
480msgid "Request Login Code"497msgid "Request Login Code"
481msgstr ""498msgstr ""

Subscribers

People subscribed via source and target branches