Gwibber

Merge lp://qastaging/~milo/gwibber/gwibber-milo into lp://qastaging/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://qastaging/~milo/gwibber/gwibber-milo
Merge into: lp://qastaging/gwibber/1.2
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~milo/gwibber/gwibber-milo
Reviewer Review Type Date Requested Status
Dominic Evans (community) Approve
Review via email: mp+5688@code.qastaging.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://qastaging/~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://qastaging/~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
1=== modified file 'gwibber/client.py'
2--- gwibber/client.py 2009-04-15 23:04:33 +0000
3+++ gwibber/client.py 2009-04-18 16:54:25 +0000
4@@ -26,7 +26,7 @@
5 import urllib
6
7 # Set this way as in setup.cfg we have prefix=/usr/local
8-LOCALEDIR = "/usr/local/share/locale"
9+LOCALEDIR = "/usr/share/locale"
10 DOMAIN = "gwibber"
11
12 locale.setlocale(locale.LC_ALL, "")
13
14=== modified file 'po/gwibber.pot'
15--- po/gwibber.pot 2009-03-31 10:08:08 +0000
16+++ po/gwibber.pot 2009-04-18 16:54:25 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: PACKAGE VERSION\n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2009-03-31 10:58+0100\n"
22+"POT-Creation-Date: 2009-04-18 18:52+0200\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26@@ -29,57 +29,61 @@
27 msgid "Microblogging client for GNOME"
28 msgstr ""
29
30-#: ../gwibber/client.py:48
31+#: ../gwibber/client.py:49
32 msgid "_Editor"
33 msgstr ""
34
35-#: ../gwibber/client.py:49
36+#: ../gwibber/client.py:50
37 msgid "_Statusbar"
38 msgstr ""
39
40-#: ../gwibber/client.py:50
41+#: ../gwibber/client.py:51
42 msgid "Tray _Icon"
43 msgstr ""
44
45 #. Translators: these are checkbox
46-#: ../gwibber/client.py:55 ../ui/preferences.glade.h:54
47+#: ../gwibber/client.py:56 ../ui/preferences.glade.h:54
48 msgid "_Receive Messages"
49 msgstr ""
50
51-#: ../gwibber/client.py:56 ../ui/preferences.glade.h:55
52+#: ../gwibber/client.py:57 ../ui/preferences.glade.h:55
53 msgid "_Send Messages"
54 msgstr ""
55
56-#: ../gwibber/client.py:57
57+#: ../gwibber/client.py:58
58 msgid "Search _Messages"
59 msgstr ""
60
61-#: ../gwibber/client.py:84
62+#: ../gwibber/client.py:87
63 msgid "Gwibber"
64 msgstr ""
65
66-#: ../gwibber/client.py:146
67+#: ../gwibber/client.py:149
68 msgid "Messages"
69 msgstr ""
70
71-#: ../gwibber/client.py:147
72+#: ../gwibber/client.py:150
73 msgid "Replies"
74 msgstr ""
75
76-#: ../gwibber/client.py:170 ../gwibber/client.py:353 ../gwibber/client.py:678
77+#: ../gwibber/client.py:173 ../gwibber/client.py:369
78 #: ../gwibber/configui.py:133
79 msgid "Search"
80 msgstr ""
81
82-#: ../gwibber/client.py:186
83+#: ../gwibber/client.py:189
84 msgid "Cancel"
85 msgstr ""
86
87-#: ../gwibber/client.py:337
88+#: ../gwibber/client.py:316
89+msgid "Failed to shorten URL"
90+msgstr ""
91+
92+#: ../gwibber/client.py:353
93 msgid "Enter a search query:"
94 msgstr ""
95
96-#: ../gwibber/client.py:475
97+#: ../gwibber/client.py:507
98 #, python-format
99 msgid ""
100 "%s message from %s at %s\n"
101@@ -87,95 +91,104 @@
102 "%s"
103 msgstr ""
104
105-#: ../gwibber/client.py:577 ../gwibber/client.py:583
106+#: ../gwibber/client.py:610 ../gwibber/client.py:616
107 #, python-format
108 msgid "Characters remaining: %s"
109 msgstr ""
110
111-#: ../gwibber/client.py:613
112+#: ../gwibber/client.py:646
113 msgid "_Manage"
114 msgstr ""
115
116-#: ../gwibber/client.py:617
117+#: ../gwibber/client.py:650
118 msgid "_Create"
119 msgstr ""
120
121-#: ../gwibber/client.py:677
122-msgid "Refresh"
123-msgstr ""
124-
125-#: ../gwibber/client.py:679
126+#: ../gwibber/client.py:710
127+msgid "_Refresh"
128+msgstr ""
129+
130+#: ../gwibber/client.py:711
131+msgid "_Search"
132+msgstr ""
133+
134+#. XXX: actCloseWindow should be disabled (greyed out) when false self.preferences['minimize_to_tray'] as it is the same as quitting
135+#: ../gwibber/client.py:713
136+msgid "_Close Window"
137+msgstr ""
138+
139+#: ../gwibber/client.py:714
140+msgid "_Close Tab"
141+msgstr ""
142+
143+#: ../gwibber/client.py:716
144 msgid "C_lear"
145 msgstr ""
146
147-#: ../gwibber/client.py:680
148-msgid "Close Window"
149-msgstr ""
150-
151-#: ../gwibber/client.py:682 ../ui/preferences.glade.h:35
152-msgid "Preferences"
153-msgstr ""
154-
155-#: ../gwibber/client.py:684
156-msgid "Quit"
157+#: ../gwibber/client.py:718
158+msgid "_Preferences"
159+msgstr ""
160+
161+#: ../gwibber/client.py:720
162+msgid "_Quit"
163 msgstr ""
164
165 #. actThemeTest = gtk.Action("gwibberThemeTest", "_Theme Test", None, gtk.STOCK_PREFERENCES)
166 #. actThemeTest.connect("activate", self.theme_preview_test)
167 #. menuHelp.append(actThemeTest.create_menu_item())
168-#: ../gwibber/client.py:690
169+#: ../gwibber/client.py:726
170 msgid "Get Help Online..."
171 msgstr ""
172
173-#: ../gwibber/client.py:692
174+#: ../gwibber/client.py:728
175 msgid "Translate This Application..."
176 msgstr ""
177
178-#: ../gwibber/client.py:694
179+#: ../gwibber/client.py:730
180 msgid "Report a Problem"
181 msgstr ""
182
183-#: ../gwibber/client.py:696
184+#: ../gwibber/client.py:732
185 msgid "_About"
186 msgstr ""
187
188-#: ../gwibber/client.py:711
189+#: ../gwibber/client.py:747
190 msgid "S_pellcheck"
191 msgstr ""
192
193-#: ../gwibber/client.py:715
194+#: ../gwibber/client.py:751
195 msgid "E_rrors"
196 msgstr ""
197
198-#: ../gwibber/client.py:720
199+#: ../gwibber/client.py:756
200 msgid "_Gwibber"
201 msgstr ""
202
203-#: ../gwibber/client.py:723
204+#: ../gwibber/client.py:759
205 msgid "_View"
206 msgstr ""
207
208-#: ../gwibber/client.py:726
209+#: ../gwibber/client.py:762
210 msgid "_Accounts"
211 msgstr ""
212
213-#: ../gwibber/client.py:730
214+#: ../gwibber/client.py:766
215 msgid "_Help"
216 msgstr ""
217
218-#: ../gwibber/client.py:739 ../ui/preferences.glade.h:22
219+#: ../gwibber/client.py:775 ../ui/preferences.glade.h:22
220 msgid "Display bubbles"
221 msgstr ""
222
223-#: ../gwibber/client.py:790
224+#: ../gwibber/client.py:826
225 msgid "Errors"
226 msgstr ""
227
228-#: ../gwibber/client.py:796
229+#: ../gwibber/client.py:832
230 msgid "Debug Output"
231 msgstr ""
232
233-#: ../gwibber/client.py:1037
234+#: ../gwibber/client.py:1100
235 #, python-format
236 msgid "Last update: %s"
237 msgstr ""
238@@ -410,7 +423,7 @@
239 msgstr ""
240
241 #: ../ui/preferences.glade.h:18
242-msgid "Automatically shorten pasted URLs"
243+msgid "Automatically shorten pasted URLs using:"
244 msgstr ""
245
246 #: ../ui/preferences.glade.h:19
247@@ -476,6 +489,10 @@
248 msgid "Password:"
249 msgstr ""
250
251+#: ../ui/preferences.glade.h:35
252+msgid "Preferences"
253+msgstr ""
254+
255 #: ../ui/preferences.glade.h:36
256 msgid "Request Login Code"
257 msgstr ""

Subscribers

People subscribed via source and target branches