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

[ttosttos]

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

[David Gomes (davidgomes)]

Nice one.

review: Approve

[Mario Guerriero (mefrio-g)]

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)]

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)]

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

[Mario Guerriero (mefrio-g)]

Corentin confirmed my answer so I can merge it

review: Approve

=== modified file 'data/pantheon-terminal.desktop'
--- data/pantheon-terminal.desktop	2012-05-17 18:29:15 +0000
+++ data/pantheon-terminal.desktop	2012-05-25 06:22:19 +0000
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Name=Terminal
 Comment=Use the command line
-Comment[it]=Usa la riga di comando
 TryExec=pantheon-terminal
 Exec=pantheon-terminal
 Icon=utilities-terminal
 Type=Application
 Categories=GTK;Utility;TerminalEmulator;
 StartupNotify=true
+X-GNOME-Gettext-Domain=pantheon-terminal
 
 X-Ayatana-Desktop-Shortcuts=NewWindow;NewRootWindow
 

=== modified file 'po/es.po' (properties changed: -x to +x)
--- po/es.po	2012-05-08 05:37:08 +0000
+++ po/es.po	2012-05-25 06:22:19 +0000
@@ -112,3 +112,8 @@
 #: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:344
 msgid "Select tab 1"
 msgstr "Seleccionar pestaña 1"
+
+#: pantheon-terminal.desktop:3
+msgid "Use the command line"
+msgstr "Usar la línea de comandos"
+

=== modified file 'po/it.po' (properties changed: -x to +x)
--- po/it.po	2012-05-14 05:19:42 +0000
+++ po/it.po	2012-05-25 06:22:19 +0000
@@ -112,3 +112,7 @@
 #: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:344
 msgid "Select tab 1"
 msgstr "Seleziona scheda 1"
+
+#: pantheon-terminal.desktop:3
+msgid "Use the command line"
+msgstr "Usa la riga di comando"

=== modified file 'po/pantheon-terminal.pot' (properties changed: -x to +x)
--- po/pantheon-terminal.pot	2012-05-02 15:05:48 +0000
+++ po/pantheon-terminal.pot	2012-05-25 06:22:19 +0000
@@ -112,3 +112,8 @@
 #: /home/mario/elementary/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:344
 msgid "Select tab 1"
 msgstr ""
+
+#: pantheon-terminal.desktop:3
+msgid "Use the command line"
+msgstr ""
+