Static naming of po file

The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po

diff --git a/po/de/minetest-c55.po b/po/de/minetest-c55.po
deleted file mode 100644 (file)
index c5ec1c7..0000000
--- a/po/de/minetest-c55.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# German translations for minetest-c55 package.
-# Copyright (C) 2011 celeron
-# This file is distributed under the same license as the minetest-c55 package.
-# Constantin Wenger <constantin.wenger@googlemail.com>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-20 16:57+0200\n"
-"PO-Revision-Date: 2011-07-20 16:58+0100\n"
-"Last-Translator: Constantin Wenger <constantin.wenger@googlemail.com>\n"
-"Language-Team: Deutsch <>\n"
-"Language: de\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"
-
-#: src/guiMainMenu.cpp:180
-msgid "Name/Password"
-msgstr "Name/Passwort"
-
-#: src/guiMainMenu.cpp:202
-msgid "Address/Port"
-msgstr "Adresse / Port"
-
-#: src/guiMainMenu.cpp:220
-msgid "Leave address blank to start a local server."
-msgstr "Lasse die Adresse frei um einen eigenen Server zu starten"
-
-#: src/guiMainMenu.cpp:226
-msgid "Fancy trees"
-msgstr "Schöne Bäume"
-
-#: src/guiMainMenu.cpp:232
-msgid "Smooth Lighting"
-msgstr "Besseres Licht"
-
-#: src/guiMainMenu.cpp:239
-msgid "Start Game / Connect"
-msgstr "Spiel starten / Verbinden"
-
-#: src/guiMainMenu.cpp:247
-msgid "Change keys"
-msgstr "Tastenbelegung ändern"
-
-#: src/guiMainMenu.cpp:269
-msgid "Creative Mode"
-msgstr "Kreativitätsmodus"
-
-#: src/guiMainMenu.cpp:274
-msgid "Enable Damage"
-msgstr "Schaden einschalten"
-
-#: src/guiMainMenu.cpp:281
-msgid "Delete map"
-msgstr "Karte löschen"
-
-#: src/guiMessageMenu.cpp:92
-#: src/guiTextInputMenu.cpp:110
-msgid "Proceed"
-msgstr "Fortsetzen"
-
-#: src/guiPasswordChange.cpp:102
-msgid "Old Password"
-msgstr "Altes Passwort"
-
-#: src/guiPasswordChange.cpp:116
-msgid "New Password"
-msgstr "Neues Passwort"
-
-#: src/guiPasswordChange.cpp:129
-msgid "Confirm Password"
-msgstr "Passwort wiederholen"
-
-#: src/guiPasswordChange.cpp:143
-msgid "Change"
-msgstr "Ändern"
-
-#: src/guiPasswordChange.cpp:151
-msgid "Passwords do not match!"
-msgstr "Passwörter passen nicht zusammen"
-
-#: src/guiPauseMenu.cpp:109
-msgid "Continue"
-msgstr "Weiter"
-
-#: src/guiPauseMenu.cpp:115
-msgid "Change Password"
-msgstr "Passwort ändern"
-
-#: src/guiPauseMenu.cpp:121
-msgid "Disconnect"
-msgstr "Verbindung trennen"
-
-#: src/guiPauseMenu.cpp:127
-msgid "Exit to OS"
-msgstr "Programm beenden"
-
-#: src/guiPauseMenu.cpp:134
-msgid ""
-"Keys:\n"
-"- WASD: Walk\n"
-"- Mouse left: dig blocks\n"
-"- Mouse right: place blocks\n"
-"- Mouse wheel: select item\n"
-"- 0...9: select item\n"
-"- Shift: sneak\n"
-"- R: Toggle viewing all loaded chunks\n"
-"- I: Inventory menu\n"
-"- ESC: This menu\n"
-"- T: Chat\n"
-msgstr ""
-"Tastenkürzel:\n"
-"- WASD: Gehen\n"
-"- linke Maustaste: dig blocks\n"
-"- rechte Maustaste: place blocks\n"
-"- Mausrad: Item auswählen\n"
-"- 0...9: Item auswählen\n"
-"- Shift: ducken\n"
-"- R: Alle geladenen Kartenteile anzeigen, umschalten\n"
-"- I: Inventarmenü\n"
-"- T: Chat\n"
-

diff --git a/po/de/minetest.po b/po/de/minetest.po
new file mode 100644 (file)
index 0000000..c5ec1c7
--- /dev/null
+++ b/po/de/minetest.po
@@ -0,0 +1,125 @@
+# German translations for minetest-c55 package.
+# Copyright (C) 2011 celeron
+# This file is distributed under the same license as the minetest-c55 package.
+# Constantin Wenger <constantin.wenger@googlemail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-20 16:57+0200\n"
+"PO-Revision-Date: 2011-07-20 16:58+0100\n"
+"Last-Translator: Constantin Wenger <constantin.wenger@googlemail.com>\n"
+"Language-Team: Deutsch <>\n"
+"Language: de\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"
+
+#: src/guiMainMenu.cpp:180
+msgid "Name/Password"
+msgstr "Name/Passwort"
+
+#: src/guiMainMenu.cpp:202
+msgid "Address/Port"
+msgstr "Adresse / Port"
+
+#: src/guiMainMenu.cpp:220
+msgid "Leave address blank to start a local server."
+msgstr "Lasse die Adresse frei um einen eigenen Server zu starten"
+
+#: src/guiMainMenu.cpp:226
+msgid "Fancy trees"
+msgstr "Schöne Bäume"
+
+#: src/guiMainMenu.cpp:232
+msgid "Smooth Lighting"
+msgstr "Besseres Licht"
+
+#: src/guiMainMenu.cpp:239
+msgid "Start Game / Connect"
+msgstr "Spiel starten / Verbinden"
+
+#: src/guiMainMenu.cpp:247
+msgid "Change keys"
+msgstr "Tastenbelegung ändern"
+
+#: src/guiMainMenu.cpp:269
+msgid "Creative Mode"
+msgstr "Kreativitätsmodus"
+
+#: src/guiMainMenu.cpp:274
+msgid "Enable Damage"
+msgstr "Schaden einschalten"
+
+#: src/guiMainMenu.cpp:281
+msgid "Delete map"
+msgstr "Karte löschen"
+
+#: src/guiMessageMenu.cpp:92
+#: src/guiTextInputMenu.cpp:110
+msgid "Proceed"
+msgstr "Fortsetzen"
+
+#: src/guiPasswordChange.cpp:102
+msgid "Old Password"
+msgstr "Altes Passwort"
+
+#: src/guiPasswordChange.cpp:116
+msgid "New Password"
+msgstr "Neues Passwort"
+
+#: src/guiPasswordChange.cpp:129
+msgid "Confirm Password"
+msgstr "Passwort wiederholen"
+
+#: src/guiPasswordChange.cpp:143
+msgid "Change"
+msgstr "Ändern"
+
+#: src/guiPasswordChange.cpp:151
+msgid "Passwords do not match!"
+msgstr "Passwörter passen nicht zusammen"
+
+#: src/guiPauseMenu.cpp:109
+msgid "Continue"
+msgstr "Weiter"
+
+#: src/guiPauseMenu.cpp:115
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: src/guiPauseMenu.cpp:121
+msgid "Disconnect"
+msgstr "Verbindung trennen"
+
+#: src/guiPauseMenu.cpp:127
+msgid "Exit to OS"
+msgstr "Programm beenden"
+
+#: src/guiPauseMenu.cpp:134
+msgid ""
+"Keys:\n"
+"- WASD: Walk\n"
+"- Mouse left: dig blocks\n"
+"- Mouse right: place blocks\n"
+"- Mouse wheel: select item\n"
+"- 0...9: select item\n"
+"- Shift: sneak\n"
+"- R: Toggle viewing all loaded chunks\n"
+"- I: Inventory menu\n"
+"- ESC: This menu\n"
+"- T: Chat\n"
+msgstr ""
+"Tastenkürzel:\n"
+"- WASD: Gehen\n"
+"- linke Maustaste: dig blocks\n"
+"- rechte Maustaste: place blocks\n"
+"- Mausrad: Item auswählen\n"
+"- 0...9: Item auswählen\n"
+"- Shift: ducken\n"
+"- R: Alle geladenen Kartenteile anzeigen, umschalten\n"
+"- I: Inventarmenü\n"
+"- T: Chat\n"
+

diff --git a/po/fr/minetest-c55.po b/po/fr/minetest-c55.po
deleted file mode 100644 (file)
index cfb76ae..0000000
--- a/po/fr/minetest-c55.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# French translations for minetest-c55 package.
-# Copyright (C) 2011 celeron
-# This file is distributed under the same license as the minetest-c55 package.
-# Cyriaque 'Cisoun' Skrapits <cysoun@gmail.com>, 2011
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-21 02:00+0200\n"
-"PO-Revision-Date: 2011-07-21 15:48+0200\n"
-"Last-Translator: Cyriaque 'Cisoun' Skrapits <cysoun@gmail.com>\n"
-"Language-Team: Français <>\n"
-"Language: fr\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"
-
-#: src/guiMainMenu.cpp:180
-msgid "Name/Password"
-msgstr "Nom / MdP"
-
-#: src/guiMainMenu.cpp:202
-msgid "Address/Port"
-msgstr "Adresse / Port"
-
-#: src/guiMainMenu.cpp:220
-msgid "Leave address blank to start a local server."
-msgstr "Laisser l'adresse vide pour lancer un serveur local."
-
-#: src/guiMainMenu.cpp:226
-msgid "Fancy trees"
-msgstr "Arbres spéciaux"
-
-#: src/guiMainMenu.cpp:232
-msgid "Smooth Lighting"
-msgstr "Lumière douce"
-
-#: src/guiMainMenu.cpp:239
-msgid "Start Game / Connect"
-msgstr "Démarrer / Connecter"
-
-#: src/guiMainMenu.cpp:247
-msgid "Change keys"
-msgstr "Changer touches"
-
-#: src/guiMainMenu.cpp:269
-msgid "Creative Mode"
-msgstr "Mode créatif"
-
-#: src/guiMainMenu.cpp:274
-msgid "Enable Damage"
-msgstr "Activer blessures"
-
-#: src/guiMainMenu.cpp:281
-msgid "Delete map"
-msgstr "Supprimer carte"
-
-#: src/guiMessageMenu.cpp:92
-#: src/guiTextInputMenu.cpp:110
-msgid "Proceed"
-msgstr "OK"
-
-#: src/guiPasswordChange.cpp:102
-msgid "Old Password"
-msgstr "Ancien mot de passe"
-
-#: src/guiPasswordChange.cpp:116
-msgid "New Password"
-msgstr "Nouveau mot de passe"
-
-#: src/guiPasswordChange.cpp:129
-msgid "Confirm Password"
-msgstr "Confirmer mot de passe"
-
-#: src/guiPasswordChange.cpp:143
-msgid "Change"
-msgstr "Changer"
-
-#: src/guiPasswordChange.cpp:151
-msgid "Passwords do not match!"
-msgstr "Mauvaise correspondance!"
-
-#: src/guiPauseMenu.cpp:109
-msgid "Continue"
-msgstr "Continuer"
-
-#: src/guiPauseMenu.cpp:115
-msgid "Change Password"
-msgstr "Changer mot de passe"
-
-#: src/guiPauseMenu.cpp:121
-msgid "Disconnect"
-msgstr "Déconnection"
-
-#: src/guiPauseMenu.cpp:127
-msgid "Exit to OS"
-msgstr "Quitter le jeu"
-
-#: src/guiPauseMenu.cpp:134
-msgid ""
-"Keys:\n"
-"- WASD: Walk\n"
-"- Mouse left: dig blocks\n"
-"- Mouse right: place blocks\n"
-"- Mouse wheel: select item\n"
-"- 0...9: select item\n"
-"- Shift: sneak\n"
-"- R: Toggle viewing all loaded chunks\n"
-"- I: Inventory menu\n"
-"- ESC: This menu\n"
-"- T: Chat\n"
-msgstr ""
-"Touches:\n"
-"- WASD: Marcher\n"
-"- Clic gauche: Creuser bloc\n"
-"- Clic droite: Insérer bloc\n"
-"- Roulette: Sélection élément\n"
-"- 0...9: Sélection élément\n"
-"- Shift: S'accroupir\n"
-"- R: Active la vue de tous les blocs\n"
-"- I: Inventaire\n"
-"- T: Chat\n"
-

diff --git a/po/fr/minetest.po b/po/fr/minetest.po
new file mode 100644 (file)
index 0000000..cfb76ae
--- /dev/null
+++ b/po/fr/minetest.po
@@ -0,0 +1,125 @@
+# French translations for minetest-c55 package.
+# Copyright (C) 2011 celeron
+# This file is distributed under the same license as the minetest-c55 package.
+# Cyriaque 'Cisoun' Skrapits <cysoun@gmail.com>, 2011
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-21 02:00+0200\n"
+"PO-Revision-Date: 2011-07-21 15:48+0200\n"
+"Last-Translator: Cyriaque 'Cisoun' Skrapits <cysoun@gmail.com>\n"
+"Language-Team: Français <>\n"
+"Language: fr\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"
+
+#: src/guiMainMenu.cpp:180
+msgid "Name/Password"
+msgstr "Nom / MdP"
+
+#: src/guiMainMenu.cpp:202
+msgid "Address/Port"
+msgstr "Adresse / Port"
+
+#: src/guiMainMenu.cpp:220
+msgid "Leave address blank to start a local server."
+msgstr "Laisser l'adresse vide pour lancer un serveur local."
+
+#: src/guiMainMenu.cpp:226
+msgid "Fancy trees"
+msgstr "Arbres spéciaux"
+
+#: src/guiMainMenu.cpp:232
+msgid "Smooth Lighting"
+msgstr "Lumière douce"
+
+#: src/guiMainMenu.cpp:239
+msgid "Start Game / Connect"
+msgstr "Démarrer / Connecter"
+
+#: src/guiMainMenu.cpp:247
+msgid "Change keys"
+msgstr "Changer touches"
+
+#: src/guiMainMenu.cpp:269
+msgid "Creative Mode"
+msgstr "Mode créatif"
+
+#: src/guiMainMenu.cpp:274
+msgid "Enable Damage"
+msgstr "Activer blessures"
+
+#: src/guiMainMenu.cpp:281
+msgid "Delete map"
+msgstr "Supprimer carte"
+
+#: src/guiMessageMenu.cpp:92
+#: src/guiTextInputMenu.cpp:110
+msgid "Proceed"
+msgstr "OK"
+
+#: src/guiPasswordChange.cpp:102
+msgid "Old Password"
+msgstr "Ancien mot de passe"
+
+#: src/guiPasswordChange.cpp:116
+msgid "New Password"
+msgstr "Nouveau mot de passe"
+
+#: src/guiPasswordChange.cpp:129
+msgid "Confirm Password"
+msgstr "Confirmer mot de passe"
+
+#: src/guiPasswordChange.cpp:143
+msgid "Change"
+msgstr "Changer"
+
+#: src/guiPasswordChange.cpp:151
+msgid "Passwords do not match!"
+msgstr "Mauvaise correspondance!"
+
+#: src/guiPauseMenu.cpp:109
+msgid "Continue"
+msgstr "Continuer"
+
+#: src/guiPauseMenu.cpp:115
+msgid "Change Password"
+msgstr "Changer mot de passe"
+
+#: src/guiPauseMenu.cpp:121
+msgid "Disconnect"
+msgstr "Déconnection"
+
+#: src/guiPauseMenu.cpp:127
+msgid "Exit to OS"
+msgstr "Quitter le jeu"
+
+#: src/guiPauseMenu.cpp:134
+msgid ""
+"Keys:\n"
+"- WASD: Walk\n"
+"- Mouse left: dig blocks\n"
+"- Mouse right: place blocks\n"
+"- Mouse wheel: select item\n"
+"- 0...9: select item\n"
+"- Shift: sneak\n"
+"- R: Toggle viewing all loaded chunks\n"
+"- I: Inventory menu\n"
+"- ESC: This menu\n"
+"- T: Chat\n"
+msgstr ""
+"Touches:\n"
+"- WASD: Marcher\n"
+"- Clic gauche: Creuser bloc\n"
+"- Clic droite: Insérer bloc\n"
+"- Roulette: Sélection élément\n"
+"- 0...9: Sélection élément\n"
+"- Shift: S'accroupir\n"
+"- R: Active la vue de tous les blocs\n"
+"- I: Inventaire\n"
+"- T: Chat\n"
+

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4427a1380009d8a0b5a5d6e03081ed1281ecdcf3..61fb206804ef1eac743cf9b8ad219cb1bd2cc823 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -305,7 +305,7 @@ if (USE_GETTEXT)
                        COMMENT "mo-update [${LOCALE}]: Creating locale directory.")
 
                set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
-               set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/minetest-c55.po")
+               set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/minetest.po")
 
                add_custom_command(
                        OUTPUT ${MO_FILE_PATH}

diff --git a/updatelocales.sh b/updatelocales.sh
index e8414510700c4b7249cab1b2d6d8901de4429f8a..72ecd48d21734e1cb009c799d44a650280ea5d25 100755 (executable)
--- a/updatelocales.sh
+++ b/updatelocales.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-xgettext -n -o minetest-c55.pot ./src/*.cpp ./src/*.h
-msgmerge -U ./po/de/minetest-c55.po minetest-c55.pot
-msgmerge -U ./po/fr/minetest-c55.po minetest-c55.pot
-rm minetest-c55.pot
+xgettext -n -o minetest.pot ./src/*.cpp ./src/*.h
+msgmerge -U ./po/de/minetest.po minetest.pot
+msgmerge -U ./po/fr/minetest.po minetest.pot
+rm minetest.pot