Gwibber

Merge lp:~deejay1/gwibber/i18n-fixes into lp:gwibber

  1. i18n-fixes
  2. Merge into trunk
Proposed by Łukasz Jernaś
Status: Merged
Merged at revision: not available
Proposed branch: lp:~deejay1/gwibber/i18n-fixes
Merge into: lp:gwibber
Diff against target: 151 lines (+28/-20)
2 files modified
gwibber/actions.py (+14/-12)
po/POTFILES.in (+14/-8)
To merge this branch: bzr merge lp:~deejay1/gwibber/i18n-fixes
Reviewer Review Type Date Requested Status
gwibber-committers Pending
Review via email: mp+19212@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Łukasz Jernaś (deejay1) wrote :

I've marked string in actions.py as translatable and updated POTFILE.in accordingly.
Also I've sorted POTFILES.in a bit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gwibber/actions.py'
--- gwibber/actions.py 2010-02-07 00:50:39 +0000
+++ gwibber/actions.py 2010-02-12 23:01:12 +0000
@@ -1,6 +1,8 @@
1import gtk, gwui, microblog, resources, util, json1import gtk, gwui, microblog, resources, util, json
2from microblog.util.const import *2from microblog.util.const import *
33
4from gettext import lgettext as _
5
4class MessageAction:6class MessageAction:
5 icon = None7 icon = None
6 label = None8 label = None
@@ -19,7 +21,7 @@
1921
20class reply(MessageAction):22class reply(MessageAction):
21 icon = "mail-reply-sender"23 icon = "mail-reply-sender"
22 label = "_Reply"24 label = _("_Reply")
2325
24 @classmethod26 @classmethod
25 def action(self, w, client, msg):27 def action(self, w, client, msg):
@@ -27,7 +29,7 @@
27 29
28class thread(MessageAction):30class thread(MessageAction):
29 icon = "mail-reply-all"31 icon = "mail-reply-all"
30 label = "View reply t_hread"32 label = _("View reply t_hread")
3133
32 @classmethod34 @classmethod
33 def action(self, w, client, msg):35 def action(self, w, client, msg):
@@ -37,7 +39,7 @@
3739
38class retweet(MessageAction):40class retweet(MessageAction):
39 icon = "mail-forward"41 icon = "mail-forward"
40 label = "R_etweet"42 label = _("R_etweet")
4143
42 @classmethod44 @classmethod
43 def action(self, w, client, msg):45 def action(self, w, client, msg):
@@ -56,7 +58,7 @@
5658
57class like(MessageAction):59class like(MessageAction):
58 icon = "bookmark_add"60 icon = "bookmark_add"
59 label = "_Like this message"61 label = _("_Like this message")
6062
61 @classmethod63 @classmethod
62 def action(self, w, client, msg):64 def action(self, w, client, msg):
@@ -68,12 +70,12 @@
68 }))70 }))
69 71
70 d = gtk.MessageDialog(buttons=gtk.BUTTONS_OK)72 d = gtk.MessageDialog(buttons=gtk.BUTTONS_OK)
71 d.set_markup("You have marked this message as liked.")73 d.set_markup(_("You have marked this message as liked."))
72 if d.run(): d.destroy()74 if d.run(): d.destroy()
7375
74class delete(MessageAction):76class delete(MessageAction):
75 icon = "gtk-delete"77 icon = "gtk-delete"
76 label = "_Delete this message"78 label = _("_Delete this message")
7779
78 @classmethod80 @classmethod
79 def action(self, w, client, msg):81 def action(self, w, client, msg):
@@ -85,7 +87,7 @@
85 }))87 }))
8688
87 d = gtk.MessageDialog(buttons=gtk.BUTTONS_OK)89 d = gtk.MessageDialog(buttons=gtk.BUTTONS_OK)
88 d.set_markup("The message has been deleted.")90 d.set_markup(_("The message has been deleted."))
89 if d.run(): d.destroy()91 if d.run(): d.destroy()
9092
91 @classmethod93 @classmethod
@@ -96,7 +98,7 @@
9698
97class search(MessageAction):99class search(MessageAction):
98 icon = "gtk-find"100 icon = "gtk-find"
99 label = "_Search for a query"101 label = _("_Search for a query")
100102
101 @classmethod103 @classmethod
102 def action(self, w, client, query=None):104 def action(self, w, client, query=None):
@@ -104,7 +106,7 @@
104106
105class read(MessageAction):107class read(MessageAction):
106 icon = "mail-read"108 icon = "mail-read"
107 label = "View _Message"109 label = _("View _Message")
108110
109 @classmethod111 @classmethod
110 def action(self, w, client, msg):112 def action(self, w, client, msg):
@@ -116,7 +118,7 @@
116118
117class user(MessageAction):119class user(MessageAction):
118 icon = "face-monkey"120 icon = "face-monkey"
119 label = "View user _Profile"121 label = _("View user _Profile")
120 122
121 @classmethod123 @classmethod
122 def action(self, w, client, acct=None, name=None):124 def action(self, w, client, acct=None, name=None):
@@ -147,12 +149,12 @@
147149
148class tomboy(MessageAction):150class tomboy(MessageAction):
149 icon = "tomboy"151 icon = "tomboy"
150 label = "Save to _Tomboy"152 label = _("Save to _Tomboy")
151153
152 @classmethod154 @classmethod
153 def action(self, w, client, msg):155 def action(self, w, client, msg):
154 util.create_tomboy_note(156 util.create_tomboy_note(
155 "%s message from %s at %s\n\n%s\n\nSource: %s" % (157 _("%s message from %s at %s\n\n%s\n\nSource: %s") % (
156 client.model.services[msg["protocol"]]["name"],158 client.model.services[msg["protocol"]]["name"],
157 msg["sender"]["name"], msg["time"],159 msg["sender"]["name"], msg["time"],
158 msg["text"], msg["url"]))160 msg["text"], msg["url"]))
159161
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2010-02-12 18:06:08 +0000
+++ po/POTFILES.in 2010-02-12 23:01:12 +0000
@@ -1,18 +1,24 @@
1gwibber.desktop.in
2gwibber-accounts.desktop.in
1gwibber-preferences.desktop.in3gwibber-preferences.desktop.in
2gwibber-accounts.desktop.in4
3gwibber.desktop.in5gwibber/accounts.py
6gwibber/actions.py
4gwibber/client.py7gwibber/client.py
5gwibber/accounts.py8gwibber/gwui.py
6gwibber/preferences.py9gwibber/preferences.py
7gwibber/gwui.py10
8gwibber/microblog/__init__.py11gwibber/microblog/__init__.py
9gwibber/microblog/twitter.py12gwibber/microblog/twitter.py
10gwibber/microblog/support/__init__.py13gwibber/microblog/support/__init__.py
11ui/gwibber-preferences-dialog.ui14
12ui/gwibber-about-dialog.ui15ui/gwibber-about-dialog.ui
16ui/gwibber-accounts-dialog.ui
13ui/gwibber-accounts-facebook.ui17ui/gwibber-accounts-facebook.ui
18ui/gwibber-accounts-flickr.ui
14ui/gwibber-accounts-friendfeed.ui19ui/gwibber-accounts-friendfeed.ui
20ui/gwibber-accounts-identica.ui
15ui/gwibber-accounts-twitter.ui21ui/gwibber-accounts-twitter.ui
16ui/gwibber-accounts-dialog.ui22
17ui/gwibber-accounts-flickr.ui23ui/gwibber-preferences-dialog.ui
18ui/gwibber-accounts-identica.ui24