aboutsummaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-07-23 15:50:05 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-07-23 15:50:05 +0300
commitf17cfb35d1bd54e098c0e9df7a77d32b6126ccdf (patch)
treebaec1331ec077ce4b5c6acb46f7717e09deecdae /po
parent3882536d40656564b31c20008b55dfd77e848304 (diff)
parent7da02e05a6b97eb70fd17abdfdb38d8f99fabad9 (diff)
downloadminetest-f17cfb35d1bd54e098c0e9df7a77d32b6126ccdf.tar.gz
minetest-f17cfb35d1bd54e098c0e9df7a77d32b6126ccdf.tar.bz2
minetest-f17cfb35d1bd54e098c0e9df7a77d32b6126ccdf.zip
uh, i guess this now merges the new delta stuff?
Diffstat (limited to 'po')
-rw-r--r--po/de/minetest.po (renamed from po/de/minetest-c55.po)42
-rw-r--r--po/en/minetest.pot113
-rw-r--r--po/fr/minetest.po (renamed from po/fr/minetest-c55.po)42
3 files changed, 153 insertions, 44 deletions
diff --git a/po/de/minetest-c55.po b/po/de/minetest.po
index c5ec1c7a0..69b57fd95 100644
--- a/po/de/minetest-c55.po
+++ b/po/de/minetest.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-20 16:57+0200\n"
+"POT-Creation-Date: 2011-07-22 11:00+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"
@@ -21,44 +21,43 @@ msgstr ""
msgid "Name/Password"
msgstr "Name/Passwort"
-#: src/guiMainMenu.cpp:202
+#: src/guiMainMenu.cpp:203
msgid "Address/Port"
msgstr "Adresse / Port"
-#: src/guiMainMenu.cpp:220
+#: src/guiMainMenu.cpp:223
msgid "Leave address blank to start a local server."
msgstr "Lasse die Adresse frei um einen eigenen Server zu starten"
-#: src/guiMainMenu.cpp:226
+#: src/guiMainMenu.cpp:230
msgid "Fancy trees"
msgstr "Schöne Bäume"
-#: src/guiMainMenu.cpp:232
+#: src/guiMainMenu.cpp:236
msgid "Smooth Lighting"
msgstr "Besseres Licht"
-#: src/guiMainMenu.cpp:239
+#: src/guiMainMenu.cpp:244
msgid "Start Game / Connect"
msgstr "Spiel starten / Verbinden"
-#: src/guiMainMenu.cpp:247
+#: src/guiMainMenu.cpp:253
msgid "Change keys"
msgstr "Tastenbelegung ändern"
-#: src/guiMainMenu.cpp:269
+#: src/guiMainMenu.cpp:276
msgid "Creative Mode"
msgstr "Kreativitätsmodus"
-#: src/guiMainMenu.cpp:274
+#: src/guiMainMenu.cpp:282
msgid "Enable Damage"
msgstr "Schaden einschalten"
-#: src/guiMainMenu.cpp:281
+#: src/guiMainMenu.cpp:290
msgid "Delete map"
msgstr "Karte löschen"
-#: src/guiMessageMenu.cpp:92
-#: src/guiTextInputMenu.cpp:110
+#: src/guiMessageMenu.cpp:93 src/guiTextInputMenu.cpp:111
msgid "Proceed"
msgstr "Fortsetzen"
@@ -66,39 +65,39 @@ msgstr "Fortsetzen"
msgid "Old Password"
msgstr "Altes Passwort"
-#: src/guiPasswordChange.cpp:116
+#: src/guiPasswordChange.cpp:117
msgid "New Password"
msgstr "Neues Passwort"
-#: src/guiPasswordChange.cpp:129
+#: src/guiPasswordChange.cpp:131
msgid "Confirm Password"
msgstr "Passwort wiederholen"
-#: src/guiPasswordChange.cpp:143
+#: src/guiPasswordChange.cpp:146
msgid "Change"
msgstr "Ändern"
-#: src/guiPasswordChange.cpp:151
+#: src/guiPasswordChange.cpp:155
msgid "Passwords do not match!"
msgstr "Passwörter passen nicht zusammen"
-#: src/guiPauseMenu.cpp:109
+#: src/guiPauseMenu.cpp:110
msgid "Continue"
msgstr "Weiter"
-#: src/guiPauseMenu.cpp:115
+#: src/guiPauseMenu.cpp:117
msgid "Change Password"
msgstr "Passwort ändern"
-#: src/guiPauseMenu.cpp:121
+#: src/guiPauseMenu.cpp:124
msgid "Disconnect"
msgstr "Verbindung trennen"
-#: src/guiPauseMenu.cpp:127
+#: src/guiPauseMenu.cpp:131
msgid "Exit to OS"
msgstr "Programm beenden"
-#: src/guiPauseMenu.cpp:134
+#: src/guiPauseMenu.cpp:138
msgid ""
"Keys:\n"
"- WASD: Walk\n"
@@ -122,4 +121,3 @@ msgstr ""
"- R: Alle geladenen Kartenteile anzeigen, umschalten\n"
"- I: Inventarmenü\n"
"- T: Chat\n"
-
diff --git a/po/en/minetest.pot b/po/en/minetest.pot
new file mode 100644
index 000000000..e242c494b
--- /dev/null
+++ b/po/en/minetest.pot
@@ -0,0 +1,113 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: minetest\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-22 11:02+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/guiMainMenu.cpp:180
+msgid "Name/Password"
+msgstr ""
+
+#: src/guiMainMenu.cpp:203
+msgid "Address/Port"
+msgstr ""
+
+#: src/guiMainMenu.cpp:223
+msgid "Leave address blank to start a local server."
+msgstr ""
+
+#: src/guiMainMenu.cpp:230
+msgid "Fancy trees"
+msgstr ""
+
+#: src/guiMainMenu.cpp:236
+msgid "Smooth Lighting"
+msgstr ""
+
+#: src/guiMainMenu.cpp:244
+msgid "Start Game / Connect"
+msgstr ""
+
+#: src/guiMainMenu.cpp:253
+msgid "Change keys"
+msgstr ""
+
+#: src/guiMainMenu.cpp:276
+msgid "Creative Mode"
+msgstr ""
+
+#: src/guiMainMenu.cpp:282
+msgid "Enable Damage"
+msgstr ""
+
+#: src/guiMainMenu.cpp:290
+msgid "Delete map"
+msgstr ""
+
+#: src/guiMessageMenu.cpp:93 src/guiTextInputMenu.cpp:111
+msgid "Proceed"
+msgstr ""
+
+#: src/guiPasswordChange.cpp:102
+msgid "Old Password"
+msgstr ""
+
+#: src/guiPasswordChange.cpp:117
+msgid "New Password"
+msgstr ""
+
+#: src/guiPasswordChange.cpp:131
+msgid "Confirm Password"
+msgstr ""
+
+#: src/guiPasswordChange.cpp:146
+msgid "Change"
+msgstr ""
+
+#: src/guiPasswordChange.cpp:155
+msgid "Passwords do not match!"
+msgstr ""
+
+#: src/guiPauseMenu.cpp:110
+msgid "Continue"
+msgstr ""
+
+#: src/guiPauseMenu.cpp:117
+msgid "Change Password"
+msgstr ""
+
+#: src/guiPauseMenu.cpp:124
+msgid "Disconnect"
+msgstr ""
+
+#: src/guiPauseMenu.cpp:131
+msgid "Exit to OS"
+msgstr ""
+
+#: src/guiPauseMenu.cpp:138
+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 ""
diff --git a/po/fr/minetest-c55.po b/po/fr/minetest.po
index cfb76ae1a..b060c424c 100644
--- a/po/fr/minetest-c55.po
+++ b/po/fr/minetest.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-21 02:00+0200\n"
+"POT-Creation-Date: 2011-07-22 11: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"
@@ -21,44 +21,43 @@ msgstr ""
msgid "Name/Password"
msgstr "Nom / MdP"
-#: src/guiMainMenu.cpp:202
+#: src/guiMainMenu.cpp:203
msgid "Address/Port"
msgstr "Adresse / Port"
-#: src/guiMainMenu.cpp:220
+#: src/guiMainMenu.cpp:223
msgid "Leave address blank to start a local server."
msgstr "Laisser l'adresse vide pour lancer un serveur local."
-#: src/guiMainMenu.cpp:226
+#: src/guiMainMenu.cpp:230
msgid "Fancy trees"
msgstr "Arbres spéciaux"
-#: src/guiMainMenu.cpp:232
+#: src/guiMainMenu.cpp:236
msgid "Smooth Lighting"
msgstr "Lumière douce"
-#: src/guiMainMenu.cpp:239
+#: src/guiMainMenu.cpp:244
msgid "Start Game / Connect"
msgstr "Démarrer / Connecter"
-#: src/guiMainMenu.cpp:247
+#: src/guiMainMenu.cpp:253
msgid "Change keys"
msgstr "Changer touches"
-#: src/guiMainMenu.cpp:269
+#: src/guiMainMenu.cpp:276
msgid "Creative Mode"
msgstr "Mode créatif"
-#: src/guiMainMenu.cpp:274
+#: src/guiMainMenu.cpp:282
msgid "Enable Damage"
msgstr "Activer blessures"
-#: src/guiMainMenu.cpp:281
+#: src/guiMainMenu.cpp:290
msgid "Delete map"
msgstr "Supprimer carte"
-#: src/guiMessageMenu.cpp:92
-#: src/guiTextInputMenu.cpp:110
+#: src/guiMessageMenu.cpp:93 src/guiTextInputMenu.cpp:111
msgid "Proceed"
msgstr "OK"
@@ -66,39 +65,39 @@ msgstr "OK"
msgid "Old Password"
msgstr "Ancien mot de passe"
-#: src/guiPasswordChange.cpp:116
+#: src/guiPasswordChange.cpp:117
msgid "New Password"
msgstr "Nouveau mot de passe"
-#: src/guiPasswordChange.cpp:129
+#: src/guiPasswordChange.cpp:131
msgid "Confirm Password"
msgstr "Confirmer mot de passe"
-#: src/guiPasswordChange.cpp:143
+#: src/guiPasswordChange.cpp:146
msgid "Change"
msgstr "Changer"
-#: src/guiPasswordChange.cpp:151
+#: src/guiPasswordChange.cpp:155
msgid "Passwords do not match!"
msgstr "Mauvaise correspondance!"
-#: src/guiPauseMenu.cpp:109
+#: src/guiPauseMenu.cpp:110
msgid "Continue"
msgstr "Continuer"
-#: src/guiPauseMenu.cpp:115
+#: src/guiPauseMenu.cpp:117
msgid "Change Password"
msgstr "Changer mot de passe"
-#: src/guiPauseMenu.cpp:121
+#: src/guiPauseMenu.cpp:124
msgid "Disconnect"
msgstr "Déconnection"
-#: src/guiPauseMenu.cpp:127
+#: src/guiPauseMenu.cpp:131
msgid "Exit to OS"
msgstr "Quitter le jeu"
-#: src/guiPauseMenu.cpp:134
+#: src/guiPauseMenu.cpp:138
msgid ""
"Keys:\n"
"- WASD: Walk\n"
@@ -122,4 +121,3 @@ msgstr ""
"- R: Active la vue de tous les blocs\n"
"- I: Inventaire\n"
"- T: Chat\n"
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-13 03:26:39 +0000
pan class="hl opt">::S3DVertex(-0.5,-0.5,-0.5, 0,-1,0, c, 0,0), video::S3DVertex(+0.5,-0.5,-0.5, 0,-1,0, c, 1,0), video::S3DVertex(+0.5,-0.5,+0.5, 0,-1,0, c, 1,1), video::S3DVertex(-0.5,-0.5,+0.5, 0,-1,0, c, 0,1), // Right video::S3DVertex(+0.5,-0.5,-0.5, 1,0,0, c, 0,1), video::S3DVertex(+0.5,+0.5,-0.5, 1,0,0, c, 0,0), video::S3DVertex(+0.5,+0.5,+0.5, 1,0,0, c, 1,0), video::S3DVertex(+0.5,-0.5,+0.5, 1,0,0, c, 1,1), // Left video::S3DVertex(-0.5,-0.5,-0.5, -1,0,0, c, 1,1), video::S3DVertex(-0.5,-0.5,+0.5, -1,0,0, c, 0,1), video::S3DVertex(-0.5,+0.5,+0.5, -1,0,0, c, 0,0), video::S3DVertex(-0.5,+0.5,-0.5, -1,0,0, c, 1,0), // Back video::S3DVertex(-0.5,-0.5,+0.5, 0,0,1, c, 1,1), video::S3DVertex(+0.5,-0.5,+0.5, 0,0,1, c, 0,1), video::S3DVertex(+0.5,+0.5,+0.5, 0,0,1, c, 0,0), video::S3DVertex(-0.5,+0.5,+0.5, 0,0,1, c, 1,0), // Front video::S3DVertex(-0.5,-0.5,-0.5, 0,0,-1, c, 0,1), video::S3DVertex(-0.5,+0.5,-0.5, 0,0,-1, c, 0,0), video::S3DVertex(+0.5,+0.5,-0.5, 0,0,-1, c, 1,0), video::S3DVertex(+0.5,-0.5,-0.5, 0,0,-1, c, 1,1), }; u16 indices[6] = {0,1,2,2,3,0}; scene::SMesh *mesh = new scene::SMesh(); for (u32 i=0; i<6; ++i) { scene::IMeshBuffer *buf = new scene::SMeshBuffer(); buf->append(vertices + 4 * i, 4, indices, 6); // Set default material buf->getMaterial().setFlag(video::EMF_LIGHTING, false); buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; // Add mesh buffer to mesh mesh->addMeshBuffer(buf); buf->drop(); } scene::SAnimatedMesh *anim_mesh = new scene::SAnimatedMesh(mesh); mesh->drop(); scaleMesh(anim_mesh, scale); // also recalculates bounding box return anim_mesh; } static scene::IAnimatedMesh* extrudeARGB(u32 twidth, u32 theight, u8 *data) { const s32 argb_wstep = 4 * twidth; const s32 alpha_threshold = 1; scene::IMeshBuffer *buf = new scene::SMeshBuffer(); video::SColor c(255,255,255,255); // Front and back { video::S3DVertex vertices[8] = { video::S3DVertex(-0.5,-0.5,-0.5, 0,0,-1, c, 0,1), video::S3DVertex(-0.5,+0.5,-0.5, 0,0,-1, c, 0,0), video::S3DVertex(+0.5,+0.5,-0.5, 0,0,-1, c, 1,0), video::S3DVertex(+0.5,-0.5,-0.5, 0,0,-1, c, 1,1), video::S3DVertex(+0.5,-0.5,+0.5, 0,0,+1, c, 1,1), video::S3DVertex(+0.5,+0.5,+0.5, 0,0,+1, c, 1,0), video::S3DVertex(-0.5,+0.5,+0.5, 0,0,+1, c, 0,0), video::S3DVertex(-0.5,-0.5,+0.5, 0,0,+1, c, 0,1), }; u16 indices[12] = {0,1,2,2,3,0,4,5,6,6,7,4}; buf->append(vertices, 8, indices, 12); } // "Interior" // (add faces where a solid pixel is next to a transparent one) u8 *solidity = new u8[(twidth+2) * (theight+2)]; u32 wstep = twidth + 2; for (u32 y = 0; y < theight + 2; ++y) { u8 *scanline = solidity + y * wstep; if (y == 0 || y == theight + 1) { for (u32 x = 0; x < twidth + 2; ++x) scanline[x] = 0; } else { scanline[0] = 0; u8 *argb_scanline = data + (y - 1) * argb_wstep; for (u32 x = 0; x < twidth; ++x) scanline[x+1] = (argb_scanline[x*4+3] >= alpha_threshold); scanline[twidth + 1] = 0; } } // without this, there would be occasional "holes" in the mesh f32 eps = 0.01; for (u32 y = 0; y <= theight; ++y) { u8 *scanline = solidity + y * wstep + 1; for (u32 x = 0; x <= twidth; ++x) { if (scanline[x] && !scanline[x + wstep]) { u32 xx = x + 1; while (scanline[xx] && !scanline[xx + wstep]) ++xx; f32 vx1 = (x - eps) / (f32) twidth - 0.5; f32 vx2 = (xx + eps) / (f32) twidth - 0.5; f32 vy = 0.5 - (y - eps) / (f32) theight; f32 tx1 = x / (f32) twidth; f32 tx2 = xx / (f32) twidth; f32 ty = (y - 0.5) / (f32) theight; video::S3DVertex vertices[8] = { video::S3DVertex(vx1,vy,-0.5, 0,-1,0, c, tx1,ty), video::S3DVertex(vx2,vy,-0.5, 0,-1,0, c, tx2,ty), video::S3DVertex(vx2,vy,+0.5, 0,-1,0, c, tx2,ty), video::S3DVertex(vx1,vy,+0.5, 0,-1,0, c, tx1,ty), }; u16 indices[6] = {0,1,2,2,3,0}; buf->append(vertices, 4, indices, 6); x = xx - 1; } if (!scanline[x] && scanline[x + wstep]) { u32 xx = x + 1; while (!scanline[xx] && scanline[xx + wstep]) ++xx;