Merge lp:~ttosttos/pantheon-terminal/fix-1004294 into lp:~elementary-apps/pantheon-terminal/trunk

Proposed by ttosttos on 2012-05-25
Status: Merged
Merged at revision: 203
Proposed branch: lp:~ttosttos/pantheon-terminal/fix-1004294
Merge into: lp:~elementary-apps/pantheon-terminal/trunk
Diff against target: 56 lines (+15/-1)
4 files modified
data/pantheon-terminal.desktop (+1/-1)
po/es.po (+5/-0)
po/it.po (+4/-0)
po/pantheon-terminal.pot (+5/-0)
To merge this branch: bzr merge lp:~ttosttos/pantheon-terminal/fix-1004294
Reviewer Review Type Date Requested Status
Mario Guerriero Approve on 2012-05-25
David Gomes 2012-05-25 Approve on 2012-05-25
Review via email: mp+107330@code.launchpad.net

Description of the change

Launcher now uses X-GNOME-Gettext-Domain key. Gettext template updated to allow contributor translation of the "comment" key in the launcher.

To post a comment you must log in.
David Gomes (davidgomes) wrote :

Nice one.

review: Approve
Mario Guerriero (mefrio-g) wrote :

This patch wasn't merged and however it doesn't work at all. The .pot template must be updated manually but it shouldn't be so. In fact to update .pot templates you sohuld be easilly run "make pot" instead of add manually a new string each time it is added to the code

review: Needs Fixing
Corentin Noël (tintou) wrote :

What I did into Maya is to add this into the main vala file :

    internal void desktop_translations () {
        // maya.desktop:6
        var comment = _("View and schedule events");
        // maya.desktop:5
        var generic_name = _("Calendar");
        // maya.desktop:18
        var add_event = _("_Add Event");
    }

And it works (at least in Slingshot because it seems that plank don't accept X-GNOME-Gettext-Domain).

Mario Guerriero (mefrio-g) wrote :

So with no addictional code lines the desktop file will be automatically translated?

Mario Guerriero (mefrio-g) wrote :

Corentin confirmed my answer so I can merge it

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/pantheon-terminal.desktop'
2--- data/pantheon-terminal.desktop 2012-05-17 18:29:15 +0000
3+++ data/pantheon-terminal.desktop 2012-05-25 06:22:19 +0000
4@@ -1,13 +1,13 @@
5 [Desktop Entry]
6 Name=Terminal
7 Comment=Use the command line
8-Comment[it]=Usa la riga di comando
9 TryExec=pantheon-terminal
10 Exec=pantheon-terminal
11 Icon=utilities-terminal
12 Type=Application
13 Categories=GTK;Utility;TerminalEmulator;
14 StartupNotify=true
15+X-GNOME-Gettext-Domain=pantheon-terminal
16
17 X-Ayatana-Desktop-Shortcuts=NewWindow;NewRootWindow
18
19
20=== modified file 'po/es.po' (properties changed: -x to +x)
21--- po/es.po 2012-05-08 05:37:08 +0000
22+++ po/es.po 2012-05-25 06:22:19 +0000
23@@ -112,3 +112,8 @@
24 #: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:344
25 msgid "Select tab 1"
26 msgstr "Seleccionar pestaña 1"
27+
28+#: pantheon-terminal.desktop:3
29+msgid "Use the command line"
30+msgstr "Usar la línea de comandos"
31+
32
33=== modified file 'po/it.po' (properties changed: -x to +x)
34--- po/it.po 2012-05-14 05:19:42 +0000
35+++ po/it.po 2012-05-25 06:22:19 +0000
36@@ -112,3 +112,7 @@
37 #: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:344
38 msgid "Select tab 1"
39 msgstr "Seleziona scheda 1"
40+
41+#: pantheon-terminal.desktop:3
42+msgid "Use the command line"
43+msgstr "Usa la riga di comando"
44
45=== modified file 'po/pantheon-terminal.pot' (properties changed: -x to +x)
46--- po/pantheon-terminal.pot 2012-05-02 15:05:48 +0000
47+++ po/pantheon-terminal.pot 2012-05-25 06:22:19 +0000
48@@ -112,3 +112,8 @@
49 #: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:344
50 msgid "Select tab 1"
51 msgstr ""
52+
53+#: pantheon-terminal.desktop:3
54+msgid "Use the command line"
55+msgstr ""
56+

Subscribers

People subscribed via source and target branches