[Qemu-devel] [PATCH 0/5] Translation improvements

[Qemu-devel] [PATCH 0/5] Translation improvements

[Aurelien Jarno]

This patch series marks a few more messages as translatable, improves
po/Makefile and add French translation.

Aurelien Jarno (5):
  gtk: make more messages translatable
  po/Makefile: simplify
  po/Makefile: correctly pass QEMU version
  po: update existing translation files
  po: add French translation

 po/Makefile    |   14 +++++--------
 po/de_DE.po    |   41 +++++++++++++++++++++++++++++--------
 po/fr_FR.po    |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/it.po       |   41 +++++++++++++++++++++++++++++--------
 po/messages.po |   36 ++++++++++++++++++++++++--------
 ui/gtk.c       |    4 ++--
 6 files changed, 161 insertions(+), 37 deletions(-)
 create mode 100644 po/fr_FR.po

-- 
1.7.10.4

[Qemu-devel] [PATCH 1/5] gtk: make more messages translatable

[Aurelien Jarno]

Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 ui/gtk.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index a5a8156..9692c56 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -210,11 +210,11 @@ static void gd_update_caption(GtkDisplayState *s)
     bool is_paused = !runstate_is_running();
 
     if (gd_is_grab_active(s)) {
-        grab = " - Press Ctrl+Alt+G to release grab";
+        grab = _(" - Press Ctrl+Alt+G to release grab");
     }
 
     if (is_paused) {
-        status = " [Paused]";
+        status = _(" [Paused]");
     }
     s->external_pause_update = true;
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->pause_item),
-- 
1.7.10.4

[Qemu-devel] [PATCH 2/5] po/Makefile: simplify

[Aurelien Jarno]

In the hope we get more translations, we should not have to modify
po/Makefile for each of them.

Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 po/Makefile |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/po/Makefile b/po/Makefile
index 2b4420f..2c0193e 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -2,9 +2,8 @@
 # process and also within the source tree to update the translation files.
 
 VERSION=$(shell cat ../VERSION)
-TRANSLATIONS=de_DE it
-SRCS=$(addsuffix .po, $(TRANSLATIONS))
-OBJS=$(addsuffix .mo, $(TRANSLATIONS))
+SRCS=$(filter-out messages.po,$(wildcard *.po))
+OBJS=$(patsubst %.po,%.mo,$(SRCS))
 
 SRC_PATH=..
 
@@ -37,10 +36,7 @@ install: $(OBJS)
 messages.po: $(SRC_PATH)/ui/gtk.c
 	@xgettext -o $@ --foreign-user --package-name=QEMU --package-version=1.0.50 --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C $<
 
-de_DE.po: messages.po $(SRC_PATH)/ui/gtk.c
+%.po: messages.po
 	@msgmerge $@ $< > $@.bak && mv $@.bak $@
 
-it.po: messages.po $(SRC_PATH)/ui/gtk.c
-	@msgmerge $@ $< > $@.bak && mv $@.bak $@
-
-.PHONY: $(SRCS) clean all
+.PHONY: clean all
-- 
1.7.10.4

[Qemu-devel] [PATCH 3/5] po/Makefile: correctly pass QEMU version

[Aurelien Jarno]

Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 po/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/Makefile b/po/Makefile
index 2c0193e..8297ab5 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -34,7 +34,7 @@ install: $(OBJS)
 	@msgfmt -o $@ $(SRC_PATH)/po/`basename $@ .mo`.po
 
 messages.po: $(SRC_PATH)/ui/gtk.c
-	@xgettext -o $@ --foreign-user --package-name=QEMU --package-version=1.0.50 --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C $<
+	@xgettext -o $@ --foreign-user --package-name=QEMU --package-version=$(VERSION) --msgid-bugs-address=qemu-devel@nongnu.org -k_ -C $<
 
 %.po: messages.po
 	@msgmerge $@ $< > $@.bak && mv $@.bak $@
-- 
1.7.10.4

[Qemu-devel] [PATCH 4/5] po: update existing translation files

[Aurelien Jarno]

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 po/de_DE.po    |   41 ++++++++++++++++++++++++++++++++---------
 po/it.po       |   41 ++++++++++++++++++++++++++++++++---------
 po/messages.po |   36 ++++++++++++++++++++++++++++--------
 3 files changed, 92 insertions(+), 26 deletions(-)

diff --git a/po/de_DE.po b/po/de_DE.po
index 8755783..2566674 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: QEMU 1.4.50\n"
 "Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n"
-"POT-Creation-Date: 2013-02-08 09:21-0600\n"
+"POT-Creation-Date: 2013-03-31 20:42+0200\n"
 "PO-Revision-Date: 2012-02-28 16:00+0100\n"
 "Last-Translator: Kevin Wolf <kwolf@redhat.com>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -16,26 +16,49 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../ui/gtk.c:990
-msgid "_File"
-msgstr "_Datei"
+#: ../ui/gtk.c:213
+msgid " - Press Ctrl+Alt+G to release grab"
+msgstr ""
+
+#: ../ui/gtk.c:217
+msgid " [Paused]"
+msgstr ""
+
+#: ../ui/gtk.c:1250
+msgid "_Machine"
+msgstr ""
+
+#: ../ui/gtk.c:1252
+msgid "_Pause"
+msgstr ""
+
+#: ../ui/gtk.c:1258
+msgid "_Reset"
+msgstr ""
 
-#: ../ui/gtk.c:1000
+#: ../ui/gtk.c:1261
+msgid "Power _Down"
+msgstr ""
+
+#: ../ui/gtk.c:1276
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../ui/gtk.c:1029
+#: ../ui/gtk.c:1306
 msgid "Zoom To _Fit"
 msgstr "Auf _Fenstergröße skalieren"
 
-#: ../ui/gtk.c:1035
+#: ../ui/gtk.c:1312
 msgid "Grab On _Hover"
 msgstr "Tastatur _automatisch einfangen"
 
-#: ../ui/gtk.c:1038
+#: ../ui/gtk.c:1315
 msgid "_Grab Input"
 msgstr "_Eingabegeräte einfangen"
 
-#: ../ui/gtk.c:1064
+#: ../ui/gtk.c:1341
 msgid "Show _Tabs"
 msgstr "_Tableiste anzeigen"
+
+#~ msgid "_File"
+#~ msgstr "_Datei"
diff --git a/po/it.po b/po/it.po
index 7d77fff..2ace3b0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: QEMU 1.4.50\n"
 "Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n"
-"POT-Creation-Date: 2013-02-08 09:21-0600\n"
+"POT-Creation-Date: 2013-03-31 20:42+0200\n"
 "PO-Revision-Date: 2012-02-27 08:23+0100\n"
 "Last-Translator: Paolo Bonzini <pbonzini@redhat.com>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -16,26 +16,49 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../ui/gtk.c:990
-msgid "_File"
-msgstr "_File"
+#: ../ui/gtk.c:213
+msgid " - Press Ctrl+Alt+G to release grab"
+msgstr ""
+
+#: ../ui/gtk.c:217
+msgid " [Paused]"
+msgstr ""
+
+#: ../ui/gtk.c:1250
+msgid "_Machine"
+msgstr ""
+
+#: ../ui/gtk.c:1252
+msgid "_Pause"
+msgstr ""
+
+#: ../ui/gtk.c:1258
+msgid "_Reset"
+msgstr ""
 
-#: ../ui/gtk.c:1000
+#: ../ui/gtk.c:1261
+msgid "Power _Down"
+msgstr ""
+
+#: ../ui/gtk.c:1276
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../ui/gtk.c:1029
+#: ../ui/gtk.c:1306
 msgid "Zoom To _Fit"
 msgstr "Adatta alla _finestra"
 
-#: ../ui/gtk.c:1035
+#: ../ui/gtk.c:1312
 msgid "Grab On _Hover"
 msgstr "Cattura _automatica input"
 
-#: ../ui/gtk.c:1038
+#: ../ui/gtk.c:1315
 msgid "_Grab Input"
 msgstr "_Cattura input"
 
-#: ../ui/gtk.c:1064
+#: ../ui/gtk.c:1341
 msgid "Show _Tabs"
 msgstr "Mostra _tab"
+
+#~ msgid "_File"
+#~ msgstr "_File"
diff --git a/po/messages.po b/po/messages.po
index 191e81c..42a3eac 100644
--- a/po/messages.po
+++ b/po/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: QEMU 1.4.50\n"
 "Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n"
-"POT-Creation-Date: 2013-02-08 09:21-0600\n"
+"POT-Creation-Date: 2013-03-31 20:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,26 +16,46 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../ui/gtk.c:990
-msgid "_File"
+#: ../ui/gtk.c:213
+msgid " - Press Ctrl+Alt+G to release grab"
 msgstr ""
 
-#: ../ui/gtk.c:1000
+#: ../ui/gtk.c:217
+msgid " [Paused]"
+msgstr ""
+
+#: ../ui/gtk.c:1250
+msgid "_Machine"
+msgstr ""
+
+#: ../ui/gtk.c:1252
+msgid "_Pause"
+msgstr ""
+
+#: ../ui/gtk.c:1258
+msgid "_Reset"
+msgstr ""
+
+#: ../ui/gtk.c:1261
+msgid "Power _Down"
+msgstr ""
+
+#: ../ui/gtk.c:1276
 msgid "_View"
 msgstr ""
 
-#: ../ui/gtk.c:1029
+#: ../ui/gtk.c:1306
 msgid "Zoom To _Fit"
 msgstr ""
 
-#: ../ui/gtk.c:1035
+#: ../ui/gtk.c:1312
 msgid "Grab On _Hover"
 msgstr ""
 
-#: ../ui/gtk.c:1038
+#: ../ui/gtk.c:1315
 msgid "_Grab Input"
 msgstr ""
 
-#: ../ui/gtk.c:1064
+#: ../ui/gtk.c:1341
 msgid "Show _Tabs"
 msgstr ""
-- 
1.7.10.4

[Qemu-devel] [PATCH 5/5] po: add French translation

[Aurelien Jarno]

Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 po/fr_FR.po |   62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 po/fr_FR.po

diff --git a/po/fr_FR.po b/po/fr_FR.po
new file mode 100644
index 0000000..27d8636
--- /dev/null
+++ b/po/fr_FR.po
@@ -0,0 +1,62 @@
+# French translation for QEMU.
+# This file is put in the public domain.
+#
+# Aurelien Jarno <aurelien@aurel32.net>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: QEMU 1.4.50\n"
+"Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n"
+"POT-Creation-Date: 2013-03-31 20:42+0200\n"
+"PO-Revision-Date: 2013-03-31 19:39+0200\n"
+"Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n"
+"Language-Team: French <FR@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: ../ui/gtk.c:213
+msgid " - Press Ctrl+Alt+G to release grab"
+msgstr "- Appuyer sur Ctrl+Alt+G pour arrêter la capture"
+
+#: ../ui/gtk.c:217
+msgid " [Paused]"
+msgstr " [En pause]"
+
+#: ../ui/gtk.c:1250
+msgid "_Machine"
+msgstr "_Machine"
+
+#: ../ui/gtk.c:1252
+msgid "_Pause"
+msgstr "_Pause"
+
+#: ../ui/gtk.c:1258
+msgid "_Reset"
+msgstr "_Réinitialiser"
+
+#: ../ui/gtk.c:1261
+msgid "Power _Down"
+msgstr "_Éteindre"
+
+#: ../ui/gtk.c:1276
+msgid "_View"
+msgstr "_Vue"
+
+#: ../ui/gtk.c:1306
+msgid "Zoom To _Fit"
+msgstr "Zoomer pour _ajuster"
+
+#: ../ui/gtk.c:1312
+msgid "Grab On _Hover"
+msgstr "Capturer en _survolant"
+
+#: ../ui/gtk.c:1315
+msgid "_Grab Input"
+msgstr "_Capturer les entrées"
+
+#: ../ui/gtk.c:1341
+msgid "Show _Tabs"
+msgstr "Montrer les _onglets"
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH 0/5] Translation improvements

[Anthony Liguori]

Aurelien Jarno <aurelien@aurel32.net> writes:

> This patch series marks a few more messages as translatable, improves
> po/Makefile and add French translation.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

>
> Aurelien Jarno (5):
>   gtk: make more messages translatable
>   po/Makefile: simplify
>   po/Makefile: correctly pass QEMU version
>   po: update existing translation files
>   po: add French translation
>
>  po/Makefile    |   14 +++++--------
>  po/de_DE.po    |   41 +++++++++++++++++++++++++++++--------
>  po/fr_FR.po    |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  po/it.po       |   41 +++++++++++++++++++++++++++++--------
>  po/messages.po |   36 ++++++++++++++++++++++++--------
>  ui/gtk.c       |    4 ++--
>  6 files changed, 161 insertions(+), 37 deletions(-)
>  create mode 100644 po/fr_FR.po
>
> -- 
> 1.7.10.4

Re: [Qemu-devel] [PATCH 0/5] Translation improvements

[Anthony Liguori]

Applied.  Thanks.

Regards,

Anthony Liguori