Merge lp:~dpm/lernid/enable-translations into lp:lernid

Proposed by David Planella
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dpm/lernid/enable-translations
Merge into: lp:lernid
Diff against target: 68 lines (+11/-4)
3 files modified
bin/lernid (+3/-0)
lernid.desktop.in (+2/-2)
po/lernid.pot (+6/-2)
To merge this branch: bzr merge lp:~dpm/lernid/enable-translations
Reviewer Review Type Date Requested Status
Jono Bacon Approve
Review via email: mp+15285@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Some changes to enable translations: initial gettext set up and marking of the .desktop.in file for translation

Revision history for this message
Jono Bacon (jonobacon) wrote :

Looks great. Thanks, David!

review: Approve
lp:~dpm/lernid/enable-translations updated
12. By Jono Bacon

Merged in lp:~dpm/lernid/enable-translations from David Planella.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/lernid'
--- bin/lernid 2009-11-26 00:28:16 +0000
+++ bin/lernid 2009-11-26 17:50:20 +0000
@@ -23,6 +23,7 @@
23import ConfigParser23import ConfigParser
24import xdg.BaseDirectory24import xdg.BaseDirectory
25import pynotify25import pynotify
26import gettext
2627
27# Check if we are working in the source tree or from the installed 28# Check if we are working in the source tree or from the installed
28# package and mangle the python path accordingly29# package and mangle the python path accordingly
@@ -239,6 +240,8 @@
239 logging.basicConfig(level=logging.DEBUG)240 logging.basicConfig(level=logging.DEBUG)
240 logging.debug('logging enabled')241 logging.debug('logging enabled')
241242
243 gettext.install('lernid', unicode=True)
244
242 #run the application245 #run the application
243 window = NewLernidWindow()246 window = NewLernidWindow()
244 window.show()247 window.show()
245248
=== modified file 'lernid.desktop.in'
--- lernid.desktop.in 2009-11-26 04:57:29 +0000
+++ lernid.desktop.in 2009-11-26 17:50:20 +0000
@@ -1,6 +1,6 @@
1[Desktop Entry]1[Desktop Entry]
2Name=Lernid2_Name=Lernid
3Comment=Lernid application3_Comment=Lernid application
4Categories=GNOME;Network;4Categories=GNOME;Network;
5Exec=lernid5Exec=lernid
6Icon=/usr/share/lernid/media/icon.png6Icon=/usr/share/lernid/media/icon.png
77
=== modified file 'po/lernid.pot'
--- po/lernid.pot 2009-11-26 04:57:29 +0000
+++ po/lernid.pot 2009-11-26 17:50:20 +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-11-25 20:56-0800\n"11"POT-Creation-Date: 2009-11-26 12:10+0100\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"
@@ -16,7 +16,7 @@
16"Content-Type: text/plain; charset=CHARSET\n"16"Content-Type: text/plain; charset=CHARSET\n"
17"Content-Transfer-Encoding: 8bit\n"17"Content-Transfer-Encoding: 8bit\n"
1818
19#: ../data/ui/LernidWindow.ui.h:119#: ../data/ui/LernidWindow.ui.h:1 ../lernid.desktop.in.h:1
20msgid "Lernid"20msgid "Lernid"
21msgstr ""21msgstr ""
2222
@@ -52,6 +52,10 @@
52"with this program. If not, see <http://www.gnu.org/licenses/>."52"with this program. If not, see <http://www.gnu.org/licenses/>."
53msgstr ""53msgstr ""
5454
55#: ../lernid.desktop.in.h:2
56msgid "Lernid application"
57msgstr ""
58
55#: ../data/ui/ConnectDialog.ui.h:159#: ../data/ui/ConnectDialog.ui.h:1
56msgid "Choose an event"60msgid "Choose an event"
57msgstr ""61msgstr ""
5862
=== modified file 'setup.py' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches