From 48b999a8dd73ad5dfaf5343d72168927f4463e1c Mon Sep 17 00:00:00 2001 From: Mitori Itoshiki Date: Fri, 1 Mar 2013 04:34:44 +0100 Subject: [PATCH 01/30] Translated using Weblate (Japanese) --- po/ja/minetest.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 3679c4510..4331209c2 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-30 20:25+0100\n" -"PO-Revision-Date: 2013-02-22 03:27+0200\n" -"Last-Translator: Tomona Nanase \n" +"PO-Revision-Date: 2013-03-01 04:34+0200\n" +"Last-Translator: Mitori Itoshiki \n" "Language-Team: LANGUAGE \n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr "右へ進む" #: src/guiKeyChangeMenu.cpp:376 msgid "Use" -msgstr "" +msgstr "使う" #: src/guiKeyChangeMenu.cpp:377 msgid "Jump" @@ -651,7 +651,7 @@ msgstr "左Ctrl" #: src/keycode.cpp:241 msgid "Left Menu" -msgstr "" +msgstr "左メニュー" #: src/keycode.cpp:241 msgid "Right Control" @@ -659,7 +659,7 @@ msgstr "右Ctrl" #: src/keycode.cpp:241 msgid "Right Menu" -msgstr "" +msgstr "右メニュー" #: src/keycode.cpp:243 msgid "Comma" @@ -703,7 +703,7 @@ msgstr "" #: src/keycode.cpp:248 msgid "Zoom" -msgstr "" +msgstr "ズーム" #: src/main.cpp:1384 msgid "Main Menu" @@ -719,7 +719,7 @@ msgstr "" #: src/main.cpp:1653 msgid "Could not find or load game \"" -msgstr "" +msgstr "ゲームをロードか見つかるのに失敗" #: src/main.cpp:1667 msgid "Invalid gamespec." @@ -727,7 +727,7 @@ msgstr "" #: src/main.cpp:1707 msgid "Connection error (timed out?)" -msgstr "接続エラー (タイムアウト?)" +msgstr "接続エラー (タイムアウトか?)" #: src/main.cpp:1718 msgid "" From 57f5dc5dcf668e720bc250cffdecf873b7b8d3f3 Mon Sep 17 00:00:00 2001 From: c h Date: Wed, 6 Mar 2013 05:12:26 +0100 Subject: [PATCH 02/30] Translated using Weblate (Japanese) --- po/ja/minetest.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 4331209c2..1d487231a 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-30 20:25+0100\n" -"PO-Revision-Date: 2013-03-01 04:34+0200\n" -"Last-Translator: Mitori Itoshiki \n" +"PO-Revision-Date: 2013-03-06 05:12+0200\n" +"Last-Translator: c h \n" "Language-Team: LANGUAGE \n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -23,36 +23,36 @@ msgid "" "Warning: Some mods are not configured yet.\n" "They will be enabled by default when you save the configuration. " msgstr "" -"警告: いくつかのMODが未構成です.\n" -"これらは構成を保存するとデフォルトで有効化されます. " +"警告: マインテストの改造がいくつか設定されていません。\n" +"これらを設定を保存すると自動で有効化されます。 " #: src/guiConfigureWorld.cpp:144 msgid "" "Warning: Some configured mods are missing.\n" "Their setting will be removed when you save the configuration. " msgstr "" -"警告: いくつかの構成済みMODが見つかりません.\n" -"これらの設定は構成を保存すると削除されます. " +"警告: いくつかの設定みの改造ファイルが見つかりません.\n" +"これらの情報は設定を保存すると削除されます. " #: src/guiConfigureWorld.cpp:208 msgid "enabled" -msgstr "有効しました" +msgstr "有効にしました" #: src/guiConfigureWorld.cpp:215 msgid "Enable All" -msgstr "全部を有効する" +msgstr "全部を有効にしました" #: src/guiConfigureWorld.cpp:222 msgid "Disable All" -msgstr "全部を無効する" +msgstr "全部を無効にしました" #: src/guiConfigureWorld.cpp:228 msgid "depends on:" -msgstr "結合度は:" +msgstr "この改造ファイルが必要です：" #: src/guiConfigureWorld.cpp:240 msgid "is required by:" -msgstr "必要される:" +msgstr "この改造に必要されます:" #: src/guiConfigureWorld.cpp:262 src/guiCreateWorld.cpp:165 #: src/guiKeyChangeMenu.cpp:179 src/keycode.cpp:223 @@ -69,7 +69,7 @@ msgstr "設定を保存しました. " #: src/guiConfigureWorld.cpp:402 msgid "Warning: Configuration not consistent. " -msgstr "" +msgstr "警告：設定が一定でわありません。" #: src/guiConfirmMenu.cpp:120 msgid "Yes" @@ -89,15 +89,15 @@ msgstr "ゲーム" #: src/guiCreateWorld.cpp:159 msgid "Create" -msgstr "設ける" +msgstr "作る" #: src/guiDeathScreen.cpp:96 msgid "You died." -msgstr "死んでしまいました。" +msgstr "死亡しました。" #: src/guiDeathScreen.cpp:104 msgid "Respawn" -msgstr "生まれて帰る" +msgstr "リスポーン" #: src/guiFormSpecMenu.cpp:572 msgid "Left click: Move all items, Right click: Move single item" From 17bbf4d3f650ecf6533c2d1e97c6b0ed939437e7 Mon Sep 17 00:00:00 2001 From: 4aiman Konsorumaniakku <4aiman@inbox.ru> Date: Mon, 4 Mar 2013 22:43:44 +0100 Subject: [PATCH 03/30] Translated using Weblate (Russian) --- po/ru/minetest.po | 145 ++++++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 68 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 82ccd2949..bf3e3f5ce 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-23 18:24+0200\n" -"PO-Revision-Date: 2013-02-17 11:28+0200\n" -"Last-Translator: Mitori Itoshiki \n" +"PO-Revision-Date: 2013-03-04 22:43+0200\n" +"Last-Translator: Egor Zimovets <4aiman@inbox.ru>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -41,11 +41,11 @@ msgstr "включено" #: src/guiConfigureWorld.cpp:215 msgid "Enable All" -msgstr "Включить все" +msgstr "Включить всё" #: src/guiConfigureWorld.cpp:222 msgid "Disable All" -msgstr "Отключить все" +msgstr "Отключить всё" #: src/guiConfigureWorld.cpp:228 msgid "depends on:" @@ -107,7 +107,7 @@ msgstr "ЛКМ: Переместить все предметы, ПКМ: Пере #: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 #: src/guiTextInputMenu.cpp:123 msgid "Proceed" -msgstr "В работе" +msgstr "Продолжить" #: src/guiKeyChangeMenu.cpp:114 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" @@ -173,7 +173,7 @@ msgstr "Чат" #: src/guiKeyChangeMenu.cpp:382 msgid "Command" -msgstr "Комманда" +msgstr "Команда" #: src/guiKeyChangeMenu.cpp:383 msgid "Console" @@ -189,11 +189,11 @@ msgstr "Ускорение" #: src/guiKeyChangeMenu.cpp:386 msgid "Toggle noclip" -msgstr "Включить прохождение сквозь стены" +msgstr "Проходить сквозь стены" #: src/guiKeyChangeMenu.cpp:387 msgid "Range select" -msgstr "Выбор видимой области" +msgstr "Выбор зоны видимости" #: src/guiKeyChangeMenu.cpp:388 msgid "Print stacks" @@ -201,7 +201,7 @@ msgstr "" #: src/guiMainMenu.cpp:55 msgid "Cannot create world: Name contains invalid characters" -msgstr "Невозможно создать мир: имя содержит недопустимые символы" +msgstr "Невозможно создать мир: Имя содержит недопустимые символы" #: src/guiMainMenu.cpp:64 msgid "Cannot create world: A world by this name already exists" @@ -229,7 +229,7 @@ msgstr "Об авторах" #: src/guiMainMenu.cpp:280 msgid "Select World:" -msgstr "Выбрать мир:" +msgstr "Выберите мир:" #: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 msgid "Delete" @@ -241,7 +241,7 @@ msgstr "Новый" #: src/guiMainMenu.cpp:317 msgid "Configure" -msgstr "Настройка" +msgstr "Настроить" #: src/guiMainMenu.cpp:332 src/keycode.cpp:248 msgid "Play" @@ -249,11 +249,11 @@ msgstr "Играть" #: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 msgid "Creative Mode" -msgstr "Творчество" +msgstr "Режим Творчества" #: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 msgid "Enable Damage" -msgstr "Включить повреждения" +msgstr "Получение повреждений" #: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 msgid "Name/Password" @@ -281,7 +281,7 @@ msgstr "Оставьте адрес пустым для запуска лока #: src/guiMainMenu.cpp:538 msgid "Start Game / Connect" -msgstr "Начать игру / Подключиться" +msgstr "Начать игру" #: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 msgid "Delete world" @@ -309,25 +309,26 @@ msgstr "Непрозрачная вода" #: src/guiMainMenu.cpp:639 msgid "Mip-Mapping" -msgstr "Mip-Mapping" +msgstr "Mip-текстурирование" #: src/guiMainMenu.cpp:646 msgid "Anisotropic Filtering" -msgstr "Анизотропная фильтрация" +msgstr "Анизотропный фильтр" #: src/guiMainMenu.cpp:653 msgid "Bi-Linear Filtering" -msgstr "Билинейная фильтрация" +msgstr "Билинейный фильтр" #: src/guiMainMenu.cpp:660 msgid "Tri-Linear Filtering" -msgstr "Трилинейная фильтрация" +msgstr "Трилинейный фильтр" #: src/guiMainMenu.cpp:668 msgid "Shaders" msgstr "Шейдеры" #: src/guiMainMenu.cpp:675 +#, fuzzy msgid "Preload item visuals" msgstr "Кэшировать предметы" @@ -337,15 +338,15 @@ msgstr "Включить частицы" #: src/guiMainMenu.cpp:692 msgid "Change keys" -msgstr "Настройки управления" +msgstr "Сменить управление" #: src/guiMainMenu.cpp:977 msgid "Address required." -msgstr "Введите адрес." +msgstr "Нужно ввести адрес." #: src/guiMainMenu.cpp:995 msgid "Cannot delete world: Nothing selected" -msgstr "Не могу удалить мир: ничего не выбрано" +msgstr "Не могу удалить мир: Ничего не выбрано" #: src/guiMainMenu.cpp:1010 msgid "Files to be deleted" @@ -439,11 +440,11 @@ msgstr "Правая клавиша" #: src/keycode.cpp:223 msgid "X Button 1" -msgstr "" +msgstr "Доп. кнопка 1" #: src/keycode.cpp:224 msgid "Back" -msgstr "Назад" +msgstr "Backspace" #: src/keycode.cpp:224 msgid "Clear" @@ -451,23 +452,23 @@ msgstr "Очистить" #: src/keycode.cpp:224 msgid "Return" -msgstr "" +msgstr "Ввод" #: src/keycode.cpp:224 msgid "Tab" -msgstr "Вкладка" +msgstr "" #: src/keycode.cpp:224 msgid "X Button 2" -msgstr "" +msgstr "Доп. кнопка 2" #: src/keycode.cpp:225 msgid "Capital" -msgstr "" +msgstr "Капслок" #: src/keycode.cpp:225 msgid "Control" -msgstr "" +msgstr "Ctrl" #: src/keycode.cpp:225 msgid "Kana" @@ -475,7 +476,7 @@ msgstr "Кана" #: src/keycode.cpp:225 msgid "Menu" -msgstr "Меню" +msgstr "Alt" #: src/keycode.cpp:225 msgid "Pause" @@ -486,8 +487,9 @@ msgid "Shift" msgstr "" #: src/keycode.cpp:226 +#, fuzzy msgid "Convert" -msgstr "" +msgstr "Преобразовать" #: src/keycode.cpp:226 msgid "Escape" @@ -503,7 +505,7 @@ msgstr "" #: src/keycode.cpp:226 msgid "Kanji" -msgstr "Иероглифы" +msgstr "Кандзи" #: src/keycode.cpp:226 msgid "Nonconvert" @@ -522,44 +524,49 @@ msgid "Home" msgstr "" #: src/keycode.cpp:227 +#, fuzzy msgid "Mode Change" -msgstr "" +msgstr "Смена режима" #: src/keycode.cpp:227 +#, fuzzy msgid "Next" -msgstr "" +msgstr "След." #: src/keycode.cpp:227 +#, fuzzy msgid "Prior" -msgstr "" +msgstr "Пред." #: src/keycode.cpp:227 msgid "Space" -msgstr "" +msgstr "Пробел" #: src/keycode.cpp:228 msgid "Down" -msgstr "" +msgstr "Вниз" #: src/keycode.cpp:228 msgid "Execute" -msgstr "" +msgstr "Выполнить" #: src/keycode.cpp:228 +#, fuzzy msgid "Print" -msgstr "" +msgstr "Печать" #: src/keycode.cpp:228 +#, fuzzy msgid "Select" -msgstr "" +msgstr "Выбор" #: src/keycode.cpp:228 msgid "Up" -msgstr "" +msgstr "Вверх" #: src/keycode.cpp:229 msgid "Help" -msgstr "" +msgstr "Справка" #: src/keycode.cpp:229 msgid "Insert" @@ -571,75 +578,77 @@ msgstr "" #: src/keycode.cpp:232 msgid "Left Windows" -msgstr "" +msgstr "Левая кл. Win" #: src/keycode.cpp:233 +#, fuzzy msgid "Apps" -msgstr "" +msgstr "Приложения" #: src/keycode.cpp:233 msgid "Numpad 0" -msgstr "" +msgstr "Доп. клав. 0" #: src/keycode.cpp:233 msgid "Numpad 1" -msgstr "" +msgstr "Доп. клав. 1" #: src/keycode.cpp:233 msgid "Right Windows" -msgstr "" +msgstr "Прав. кл. Win" #: src/keycode.cpp:233 +#, fuzzy msgid "Sleep" -msgstr "" +msgstr "Сон" #: src/keycode.cpp:234 msgid "Numpad 2" -msgstr "" +msgstr "Доп. клав. 2" #: src/keycode.cpp:234 msgid "Numpad 3" -msgstr "" +msgstr "Доп. клав. 3" #: src/keycode.cpp:234 msgid "Numpad 4" -msgstr "" +msgstr "Доп. клав. 4" #: src/keycode.cpp:234 msgid "Numpad 5" -msgstr "" +msgstr "Доп. клав. 5" #: src/keycode.cpp:234 msgid "Numpad 6" -msgstr "" +msgstr "Доп. клав. 6" #: src/keycode.cpp:234 msgid "Numpad 7" -msgstr "" +msgstr "Доп. клав. 7" #: src/keycode.cpp:235 msgid "Numpad *" -msgstr "" +msgstr "Доп. клав. *" #: src/keycode.cpp:235 msgid "Numpad +" -msgstr "" +msgstr "Доп. клав. +" #: src/keycode.cpp:235 msgid "Numpad -" -msgstr "" +msgstr "Доп. клав. -" #: src/keycode.cpp:235 msgid "Numpad /" -msgstr "" +msgstr "Доп. клав. /" #: src/keycode.cpp:235 msgid "Numpad 8" -msgstr "" +msgstr "Доп. клав. 8" #: src/keycode.cpp:235 msgid "Numpad 9" -msgstr "" +msgstr "Доп. клав. 9" #: src/keycode.cpp:239 msgid "Num Lock" @@ -651,7 +660,7 @@ msgstr "" #: src/keycode.cpp:240 msgid "Left Shift" -msgstr "" +msgstr "Левый Shift" #: src/keycode.cpp:240 msgid "Right Shift" @@ -659,27 +668,27 @@ msgstr "Правый Shift" #: src/keycode.cpp:241 msgid "Left Control" -msgstr "" +msgstr "Левый Ctrl" #: src/keycode.cpp:241 msgid "Left Menu" -msgstr "" +msgstr "Левый Alt" #: src/keycode.cpp:241 msgid "Right Control" -msgstr "" +msgstr "Правый Ctrl" #: src/keycode.cpp:241 msgid "Right Menu" -msgstr "" +msgstr "Правый Alt" #: src/keycode.cpp:243 msgid "Comma" -msgstr "" +msgstr "Запятая" #: src/keycode.cpp:243 msgid "Minus" -msgstr "" +msgstr "Минус" #: src/keycode.cpp:243 msgid "Period" @@ -687,7 +696,7 @@ msgstr "" #: src/keycode.cpp:243 msgid "Plus" -msgstr "" +msgstr "Плюс" #: src/keycode.cpp:247 msgid "Attn" @@ -740,7 +749,7 @@ msgstr "" #: src/main.cpp:1707 msgid "Connection error (timed out?)" -msgstr "Ошибка соединения (таймаут?)" +msgstr "Ошибка соединения (таймаут пинга?)" #: src/main.cpp:1718 msgid "" From e6bf6950eb7d5dde0fbeefd689ee42c646b0002f Mon Sep 17 00:00:00 2001 From: Shen Zheyu Date: Sat, 9 Mar 2013 09:41:51 +0100 Subject: [PATCH 04/30] Translated using Weblate (Chinese (China)) --- po/zh_CN/minetest.po | 49 +++++++++++++------------------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index cdff5c055..d65bc8e2a 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-30 20:25+0100\n" -"PO-Revision-Date: 2013-02-23 03:40+0200\n" +"PO-Revision-Date: 2013-03-09 09:41+0200\n" "Last-Translator: Shen Zheyu \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -193,7 +193,6 @@ msgid "Range select" msgstr "选择范围" #: src/guiKeyChangeMenu.cpp:388 -#, fuzzy msgid "Print stacks" msgstr "打印栈" @@ -262,7 +261,6 @@ msgid "Address/Port" msgstr "地址/端口" #: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 -#, fuzzy msgid "Show Public" msgstr "显示公共" @@ -291,9 +289,8 @@ msgid "Create world" msgstr "创造世界" #: src/guiMainMenu.cpp:611 -#, fuzzy msgid "Fancy trees" -msgstr "更好看的树" +msgstr "更漂亮的树" #: src/guiMainMenu.cpp:617 msgid "Smooth Lighting" @@ -439,7 +436,6 @@ msgid "Right Button" msgstr "右键" #: src/keycode.cpp:223 -#, fuzzy msgid "X Button 1" msgstr "X键1" @@ -448,9 +444,8 @@ msgid "Back" msgstr "退格" #: src/keycode.cpp:224 -#, fuzzy msgid "Clear" -msgstr "清除" +msgstr "Clear键" #: src/keycode.cpp:224 msgid "Return" @@ -473,7 +468,6 @@ msgid "Control" msgstr "Ctrl" #: src/keycode.cpp:225 -#, fuzzy msgid "Kana" msgstr "假名" @@ -498,22 +492,18 @@ msgid "Escape" msgstr "Escape键" #: src/keycode.cpp:226 -#, fuzzy msgid "Final" -msgstr "最终" +msgstr "Final键" #: src/keycode.cpp:226 -#, fuzzy msgid "Junja" -msgstr "Junja" +msgstr "Junja键" #: src/keycode.cpp:226 -#, fuzzy msgid "Kanji" -msgstr "汉字" +msgstr "Kanji键" #: src/keycode.cpp:226 -#, fuzzy msgid "Nonconvert" msgstr "无变换" @@ -538,9 +528,8 @@ msgid "Next" msgstr "下一个" #: src/keycode.cpp:227 -#, fuzzy msgid "Prior" -msgstr "前一个" +msgstr "Prior键" #: src/keycode.cpp:227 msgid "Space" @@ -671,17 +660,14 @@ msgid "Left Control" msgstr "左Control键" #: src/keycode.cpp:241 -#, fuzzy msgid "Left Menu" msgstr "左菜单" #: src/keycode.cpp:241 -#, fuzzy msgid "Right Control" -msgstr "右控制" +msgstr "右Control键" #: src/keycode.cpp:241 -#, fuzzy msgid "Right Menu" msgstr "右菜单" @@ -702,34 +688,28 @@ msgid "Plus" msgstr "加号" #: src/keycode.cpp:247 -#, fuzzy msgid "Attn" -msgstr "注意" +msgstr "Attn键" #: src/keycode.cpp:247 -#, fuzzy msgid "CrSel" -msgstr "CrSel" +msgstr "CrSel键" #: src/keycode.cpp:248 -#, fuzzy msgid "Erase OEF" -msgstr "Erase OEF" +msgstr "Erase OEF键" #: src/keycode.cpp:248 -#, fuzzy msgid "ExSel" -msgstr "不选" +msgstr "ExSel键" #: src/keycode.cpp:248 -#, fuzzy msgid "OEM Clear" -msgstr "默认设置" +msgstr "OEM Clear键" #: src/keycode.cpp:248 -#, fuzzy msgid "PA1" -msgstr "PA1" +msgstr "PA1键" #: src/keycode.cpp:248 msgid "Zoom" @@ -752,7 +732,6 @@ msgid "Could not find or load game \"" msgstr "无法找到或载入游戏模式“" #: src/main.cpp:1667 -#, fuzzy msgid "Invalid gamespec." msgstr "非法游戏模式规格。" From b7def0fcf4199dc714c188d64be09d4601cbc77e Mon Sep 17 00:00:00 2001 From: Mitori Itoshiki Date: Thu, 7 Mar 2013 22:56:12 +0100 Subject: [PATCH 05/30] Translated using Weblate (Russian) --- po/ru/minetest.po | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index bf3e3f5ce..7f277cb77 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-23 18:24+0200\n" -"PO-Revision-Date: 2013-03-04 22:43+0200\n" -"Last-Translator: Egor Zimovets <4aiman@inbox.ru>\n" +"PO-Revision-Date: 2013-03-07 22:56+0200\n" +"Last-Translator: Mitori Itoshiki \n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -197,7 +197,7 @@ msgstr "Выбор зоны видимости" #: src/guiKeyChangeMenu.cpp:388 msgid "Print stacks" -msgstr "" +msgstr "Выдать стеки" #: src/guiMainMenu.cpp:55 msgid "Cannot create world: Name contains invalid characters" @@ -456,7 +456,7 @@ msgstr "Ввод" #: src/keycode.cpp:224 msgid "Tab" -msgstr "" +msgstr "Tab" #: src/keycode.cpp:224 msgid "X Button 2" @@ -484,7 +484,7 @@ msgstr "Пауза" #: src/keycode.cpp:225 msgid "Shift" -msgstr "" +msgstr "Shift" #: src/keycode.cpp:226 #, fuzzy @@ -492,16 +492,19 @@ msgid "Convert" msgstr "Преобразовать" #: src/keycode.cpp:226 +#, fuzzy msgid "Escape" -msgstr "" +msgstr "Escape" #: src/keycode.cpp:226 +#, fuzzy msgid "Final" -msgstr "" +msgstr "Final" #: src/keycode.cpp:226 +#, fuzzy msgid "Junja" -msgstr "" +msgstr "Junja" #: src/keycode.cpp:226 msgid "Kanji" From dc54af7a89550d6ba74320de6f2ade6cdca500f9 Mon Sep 17 00:00:00 2001 From: 4aiman Konsorumaniakku <4aiman@inbox.ru> Date: Sat, 9 Mar 2013 14:28:09 +0100 Subject: [PATCH 06/30] Translated using Weblate (Russian) --- po/ru/minetest.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 7f277cb77..670bba570 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-23 18:24+0200\n" -"PO-Revision-Date: 2013-03-07 22:56+0200\n" -"Last-Translator: Mitori Itoshiki \n" +"PO-Revision-Date: 2013-03-09 14:28+0200\n" +"Last-Translator: 4aiman Konsorumaniakku <4aiman@inbox.ru>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -197,7 +197,7 @@ msgstr "Выбор зоны видимости" #: src/guiKeyChangeMenu.cpp:388 msgid "Print stacks" -msgstr "Выдать стеки" +msgstr "" #: src/guiMainMenu.cpp:55 msgid "Cannot create world: Name contains invalid characters" @@ -456,7 +456,7 @@ msgstr "Ввод" #: src/keycode.cpp:224 msgid "Tab" -msgstr "Tab" +msgstr "Табуляция" #: src/keycode.cpp:224 msgid "X Button 2" @@ -464,7 +464,7 @@ msgstr "Доп. кнопка 2" #: src/keycode.cpp:225 msgid "Capital" -msgstr "Капслок" +msgstr "Caps Lock" #: src/keycode.cpp:225 msgid "Control" @@ -492,7 +492,6 @@ msgid "Convert" msgstr "Преобразовать" #: src/keycode.cpp:226 -#, fuzzy msgid "Escape" msgstr "Escape" @@ -520,11 +519,11 @@ msgstr "Принять" #: src/keycode.cpp:227 msgid "End" -msgstr "" +msgstr "End" #: src/keycode.cpp:227 msgid "Home" -msgstr "" +msgstr "Home" #: src/keycode.cpp:227 #, fuzzy @@ -573,7 +572,7 @@ msgstr "Справка" #: src/keycode.cpp:229 msgid "Insert" -msgstr "" +msgstr "Insert" #: src/keycode.cpp:229 msgid "Snapshot" @@ -655,11 +654,11 @@ msgstr "Доп. клав. 9" #: src/keycode.cpp:239 msgid "Num Lock" -msgstr "" +msgstr "Num Lock" #: src/keycode.cpp:239 msgid "Scroll Lock" -msgstr "" +msgstr "Scroll Lock" #: src/keycode.cpp:240 msgid "Left Shift" From b0f39da131bc24a41c5d5c8a03d06192937a4568 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 29 Mar 2013 11:15:49 -0400 Subject: [PATCH 07/30] Don't replace existing nodes in singlenode mapgen --- src/mapgen_singlenode.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp index 04bf02bd1..7fa56eaf1 100644 --- a/src/mapgen_singlenode.cpp +++ b/src/mapgen_singlenode.cpp @@ -72,13 +72,18 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) { v3s16 node_max = (blockpos_max+v3s16(1,1,1))*MAP_BLOCKSIZE-v3s16(1,1,1); content_t c_node = ndef->getId("mapgen_singlenode"); - if(c_node == CONTENT_IGNORE) + if (c_node == CONTENT_IGNORE) c_node = CONTENT_AIR; - for(s16 z=node_min.Z; z<=node_max.Z; z++) - for(s16 y=node_min.Y; y<=node_max.Y; y++) - for(s16 x=node_min.X; x<=node_max.X; x++) - { - data->vmanip->setNode(v3s16(x,y,z), MapNode(c_node)); + + MapNode n_node(c_node); + int i = 0; + + for (s16 z=node_min.Z; z<=node_max.Z; z++) + for (s16 y=node_min.Y; y<=node_max.Y; y++) + for (s16 x=node_min.X; x<=node_max.X; x++) { + if (vm->m_data[i].getContent() == CONTENT_IGNORE) + vm->m_data[i] = n_node; + i++; } // Add top and bottom side of water to transforming_liquid queue From 5b854f95d2144710493520151aafc48a887ac1b3 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 29 Mar 2013 13:18:09 -0400 Subject: [PATCH 08/30] Fix last singlenode modification --- src/mapgen_singlenode.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp index 7fa56eaf1..22b756abb 100644 --- a/src/mapgen_singlenode.cpp +++ b/src/mapgen_singlenode.cpp @@ -76,14 +76,15 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) { c_node = CONTENT_AIR; MapNode n_node(c_node); - int i = 0; - for (s16 z=node_min.Z; z<=node_max.Z; z++) - for (s16 y=node_min.Y; y<=node_max.Y; y++) - for (s16 x=node_min.X; x<=node_max.X; x++) { - if (vm->m_data[i].getContent() == CONTENT_IGNORE) - vm->m_data[i] = n_node; - i++; + for (s16 z = node_min.Z; z <= node_max.Z; z++) + for (s16 y = node_min.Y; y <= node_max.Y; y++) { + u32 i = vm->m_area.index(node_min.X, y, z); + for (s16 x = node_min.X; x <= node_max.X; x++) { + if (vm->m_data[i].getContent() == CONTENT_IGNORE) + vm->m_data[i] = n_node; + i++; + } } // Add top and bottom side of water to transforming_liquid queue From 02cbb5810774ec0d8eb43b6cd5796a3d43878fe1 Mon Sep 17 00:00:00 2001 From: "0gb.us" <0gb.us@0gb.us> Date: Thu, 28 Mar 2013 01:24:48 -0700 Subject: [PATCH 09/30] Fix node replacement in not-quite-loaded chunks When first entering an area, sometimes placing nodes replaces other nodes that are not buildable_to. This seems to be caused by the fact that nodes in unloaded map blocks are treated as ignore, a node that is buildable_to. This fixes that, by using get_node_or_nil() instead of the previously-used get_node(), then checking to see if the nodes were actually loaded before replacing. --- builtin/item.lua | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/builtin/item.lua b/builtin/item.lua index 1349fdf63..8e2f75a1a 100644 --- a/builtin/item.lua +++ b/builtin/item.lua @@ -129,11 +129,18 @@ function minetest.item_place_node(itemstack, placer, pointed_thing) end local under = pointed_thing.under - local oldnode_under = minetest.env:get_node(under) + local oldnode_under = minetest.env:get_node_or_nil(under) + local above = pointed_thing.above + local oldnode_above = minetest.env:get_node_or_nil(above) + + if not oldnode_under or not oldnode_above then + minetest.log("info", placer:get_player_name() .. " tried to place" + .. " node in unloaded position " .. minetest.pos_to_string(above)) + return itemstack + end + local olddef_under = ItemStack({name=oldnode_under.name}):get_definition() olddef_under = olddef_under or minetest.nodedef_default - local above = pointed_thing.above - local oldnode_above = minetest.env:get_node(above) local olddef_above = ItemStack({name=oldnode_above.name}):get_definition() olddef_above = olddef_above or minetest.nodedef_default From 3640c8c051bc6b72f4af52752b2d48ced274f539 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 29 Mar 2013 14:35:35 -0400 Subject: [PATCH 10/30] Update Credits tab --- src/guiMainMenu.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 5dc73cd96..49028fc5b 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -51,20 +51,21 @@ const wchar_t *contrib_core_strs[] = { L"Ryan Kwolek (kwolekr) ", L"PilzAdam ", L"Ilya Zhuravlev (thexyz) ", - L"Lisa Milne (darkrose) " + L"Lisa Milne (darkrose) ", + L"Maciej Kasatkin (RealBadAngel) ", + L"proller " }; const wchar_t *contrib_active_strs[] = { - L"RealBadAngel ", L"sfan5 ", L"sapier ", - L"proller ", L"Vanessa Ezekowitz (VanessaE) ", L"Jurgen Doser (doserj) ", + L"Jeija ", + L"MirceaKitsune ", L"ShadowNinja", L"dannydark ", - L"Jeija ", - L"MirceaKitsune " + L"0gb.us <0gb.us@0gb.us>" }; const wchar_t *contrib_previous_strs[] = { From 7d9329ecfe84733cdefa34eab25ee3d124c94c59 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Thu, 28 Mar 2013 21:40:44 +0100 Subject: [PATCH 11/30] New damage system, add damageGroups to ToolCapabilities, bump protocol version --- doc/lua_api.txt | 28 ++++++++++++-------- src/clientserver.h | 4 ++- src/content_sao.cpp | 6 ++--- src/itemdef.cpp | 8 +++--- src/itemdef.h | 6 ++--- src/scriptapi_common.cpp | 24 ++++++++++++++++++ src/server.cpp | 6 ++--- src/server.h | 2 +- src/tool.cpp | 55 ++++++++++++++++++++++++++-------------- src/tool.h | 21 +++++++-------- 10 files changed, 104 insertions(+), 56 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 8ef92bdf3..42ca58239 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -471,9 +471,11 @@ a node is destroyable and how long it takes to destroy by a tool. Groups of entities ------------------- For entities, groups are, as of now, used only for calculating damage. +The rating is the percentage of damage caused by tools with this damage group. +See "Entity damage mechanism". -object.get_armor_groups() -> a group-rating table (eg. {fleshy=3}) -object.set_armor_groups({level=2, fleshy=2, cracky=2}) +object.get_armor_groups() -> a group-rating table (eg. {fleshy=100}) +object.set_armor_groups({fleshy=30, cracky=80}) Groups of tools ---------------- @@ -522,7 +524,6 @@ Special groups Known damage and digging time defining groups ---------------------------------------------- -Valid ratings for these are 0, 1, 2 and 3, unless otherwise stated. - crumbly: dirt, sand - cracky: tough but crackable stuff like stone. - snappy: something that can be cut using fine tools; eg. leaves, small @@ -575,6 +576,7 @@ groups to enable interaction with tools. * Uses (until the tool breaks) * Maximum level (usually 0, 1, 2 or 3) * Digging times + * Damage groups **Full punch interval**: When used as a weapon, the tool will do full damage if this time is spent @@ -606,8 +608,9 @@ maximum level. result in the tool to be able to dig nodes that have a rating of 2 or 3 for this group, and unable to dig the rating 1, which is the toughest. Unless there is a matching group that enables digging otherwise. - * For entities, damage equals the amount of nodes dug in the time spent - between hits, with a maximum time of ''full_punch_interval''. + +**Damage groups** +List of damage for groups of entities. See "Entity damage mechanism". Example definition of the capabilities of a tool ------------------------------------------------- @@ -617,6 +620,7 @@ tool_capabilities = { groupcaps={ crumbly={maxlevel=2, uses=20, times={[1]=1.60, [2]=1.20, [3]=0.80}} } + damage_groups = {fleshy=2}, } This makes the tool be able to dig nodes that fullfill both of these: @@ -647,10 +651,12 @@ Notes: Entity damage mechanism ------------------------ Damage calculation: -- Take the time spent after the last hit -- Limit time to full_punch_interval -- Take the damage groups and imagine a bunch of nodes that have them -- Damage in HP is the amount of nodes destroyed in this time. +damage = 0 +foreach group in cap.damage_groups: + damage += cap.damage_groups[group] * limit(actual_interval / cap.full_punch_interval, 0.0, 1.0) + * (object.armor_groups[group] / 100.0) + -- Where object.armor_groups[group] is 0 for inexisting values +return damage Client predicts damage based on damage groups. Because of this, it is able to give an immediate response when an entity is damaged or dies; the response is @@ -1496,10 +1502,10 @@ Item definition (register_node, register_craftitem, register_tool) max_drop_level=0, groupcaps={ -- For example: - fleshy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1}, snappy={times={[2]=0.80, [3]=0.40}, maxwear=0.05, maxlevel=1}, choppy={times={[3]=0.90}, maxwear=0.05, maxlevel=0} - } + }, + damage_groups = {groupname=damage}, } node_placement_prediction = nil, ^ If nil and item is node, prediction is made automatically diff --git a/src/clientserver.h b/src/clientserver.h index 535fc04d8..aba84fb31 100644 --- a/src/clientserver.h +++ b/src/clientserver.h @@ -85,9 +85,11 @@ SharedBuffer makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed); TOCLIENT_SPAWN_PARTICLE TOCLIENT_ADD_PARTICLESPAWNER TOCLIENT_DELETE_PARTICLESPAWNER + PROTOCOL_VERSION 18: + damageGroups added to ToolCapabilities */ -#define LATEST_PROTOCOL_VERSION 17 +#define LATEST_PROTOCOL_VERSION 18 // Server's supported network protocol range #define SERVER_PROTOCOL_VERSION_MIN 13 diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 468dfd218..ae08b4260 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -381,8 +381,7 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos, } // Initialize something to armor groups - m_armor_groups["fleshy"] = 3; - m_armor_groups["snappy"] = 2; + m_armor_groups["fleshy"] = 100; } LuaEntitySAO::~LuaEntitySAO() @@ -942,8 +941,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_, assert(m_peer_id != 0); setBasePosition(m_player->getPosition()); m_inventory = &m_player->inventory; - m_armor_groups["choppy"] = 2; - m_armor_groups["fleshy"] = 3; + m_armor_groups["fleshy"] = 100; m_prop.hp_max = PLAYER_MAX_HP; m_prop.physical = false; diff --git a/src/itemdef.cpp b/src/itemdef.cpp index 4bd4181f9..98d7ce0a8 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -111,7 +111,7 @@ void ItemDefinition::reset() node_placement_prediction = ""; } -void ItemDefinition::serialize(std::ostream &os) const +void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const { writeU8(os, 1); // version writeU8(os, type); @@ -126,7 +126,7 @@ void ItemDefinition::serialize(std::ostream &os) const std::string tool_capabilities_s = ""; if(tool_capabilities){ std::ostringstream tmp_os(std::ios::binary); - tool_capabilities->serialize(tmp_os); + tool_capabilities->serialize(tmp_os, protocol_version); tool_capabilities_s = tmp_os.str(); } os<second; // Serialize ItemDefinition and write wrapped in a string std::ostringstream tmp_os(std::ios::binary); - def->serialize(tmp_os); + def->serialize(tmp_os, protocol_version); os<::const_iterator + i = toolcap.damageGroups.begin(); i != toolcap.damageGroups.end(); i++){ + // Create damage group table + lua_pushinteger(L, i->second); + lua_setfield(L, -2, i->first.c_str()); + } + lua_setfield(L, -2, "damage_groups"); } void push_tool_capabilities(lua_State *L, diff --git a/src/server.cpp b/src/server.cpp index db05b95cc..6bdebcec4 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2080,7 +2080,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) SendMovement(m_con, peer_id); // Send item definitions - SendItemDef(m_con, peer_id, m_itemdef); + SendItemDef(m_con, peer_id, m_itemdef, client->net_proto_version); // Send node definitions SendNodeDef(m_con, peer_id, m_nodedef, client->net_proto_version); @@ -3342,7 +3342,7 @@ void Server::SendDeathscreen(con::Connection &con, u16 peer_id, } void Server::SendItemDef(con::Connection &con, u16 peer_id, - IItemDefManager *itemdef) + IItemDefManager *itemdef, u16 protocol_version) { DSTACK(__FUNCTION_NAME); std::ostringstream os(std::ios_base::binary); @@ -3354,7 +3354,7 @@ void Server::SendItemDef(con::Connection &con, u16 peer_id, */ writeU16(os, TOCLIENT_ITEMDEF); std::ostringstream tmp_os(std::ios::binary); - itemdef->serialize(tmp_os); + itemdef->serialize(tmp_os, protocol_version); std::ostringstream tmp_os2(std::ios::binary); compressZlib(tmp_os.str(), tmp_os2); os<second); } } + if(protocol_version > 17){ + writeU32(os, damageGroups.size()); + for(std::map::const_iterator + i = damageGroups.begin(); i != damageGroups.end(); i++){ + os<first); + writeS16(os, i->second); + } + } } void ToolCapabilities::deSerialize(std::istream &is) { int version = readU8(is); - if(version != 1) throw SerializationError( + if(version != 1 && version != 2) throw SerializationError( "unsupported ToolCapabilities version"); full_punch_interval = readF1000(is); max_drop_level = readS16(is); @@ -68,6 +79,15 @@ void ToolCapabilities::deSerialize(std::istream &is) } groupcaps[name] = cap; } + if(version == 2) + { + u32 damage_groups_size = readU32(is); + for(u32 i=0; i tp->full_punch_interval) - time_from_last_punch = tp->full_punch_interval; - // Damage in hp is equivalent to nodes dug in time_from_last_punch - s16 hp = 0; - if(digprop.diggable) - hp = time_from_last_punch / digprop.time; - // Wear is the same as for digging a single node - s16 wear = (float)digprop.wear; + s16 damage = 0; + float full_punch_interval = tp->full_punch_interval; - return HitParams(hp, wear, digprop.main_group); + for(std::map::const_iterator + i = tp->damageGroups.begin(); i != tp->damageGroups.end(); i++){ + s16 armor = itemgroup_get(armor_groups, i->first); + damage += i->second * rangelim(time_from_last_punch * full_punch_interval, 0.0, 1.0) + * armor / 100.0; + } + + return HitParams(damage, 0); } -HitParams getHitParams(const ItemGroupList &groups, +HitParams getHitParams(const ItemGroupList &armor_groups, const ToolCapabilities *tp) { - return getHitParams(groups, tp, 1000000); + return getHitParams(armor_groups, tp, 1000000); } PunchDamageResult getPunchDamage( @@ -187,7 +205,6 @@ PunchDamageResult getPunchDamage( result.did_punch = true; result.wear = hitparams.wear; result.damage = hitparams.hp; - result.main_group = hitparams.main_group; } return result; diff --git a/src/tool.h b/src/tool.h index e812a9e36..509561a16 100644 --- a/src/tool.h +++ b/src/tool.h @@ -52,6 +52,7 @@ struct ToolGroupCap // CLANG SUCKS DONKEY BALLS typedef std::map ToolGCMap; +typedef std::map DamageGroup; struct ToolCapabilities { @@ -59,19 +60,22 @@ struct ToolCapabilities int max_drop_level; // CLANG SUCKS DONKEY BALLS ToolGCMap groupcaps; + DamageGroup damageGroups; ToolCapabilities( float full_punch_interval_=1.4, int max_drop_level_=1, // CLANG SUCKS DONKEY BALLS - ToolGCMap groupcaps_=ToolGCMap() + ToolGCMap groupcaps_=ToolGCMap(), + DamageGroup damageGroups_=DamageGroup() ): full_punch_interval(full_punch_interval_), max_drop_level(max_drop_level_), - groupcaps(groupcaps_) + groupcaps(groupcaps_), + damageGroups(damageGroups_) {} - void serialize(std::ostream &os) const; + void serialize(std::ostream &os, u16 version) const; void deSerialize(std::istream &is); }; @@ -103,19 +107,17 @@ struct HitParams { s16 hp; s16 wear; - std::string main_group; - HitParams(s16 hp_=0, s16 wear_=0, std::string main_group_=""): + HitParams(s16 hp_=0, s16 wear_=0): hp(hp_), - wear(wear_), - main_group(main_group_) + wear(wear_) {} }; -HitParams getHitParams(const ItemGroupList &groups, +HitParams getHitParams(const ItemGroupList &armor_groups, const ToolCapabilities *tp, float time_from_last_punch); -HitParams getHitParams(const ItemGroupList &groups, +HitParams getHitParams(const ItemGroupList &armor_groups, const ToolCapabilities *tp); struct PunchDamageResult @@ -123,7 +125,6 @@ struct PunchDamageResult bool did_punch; int damage; int wear; - std::string main_group; PunchDamageResult(): did_punch(false), From 5e7e0347cdae0cab3b7d003fbd3b22c7f820e703 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Mon, 25 Mar 2013 23:59:17 +0100 Subject: [PATCH 12/30] Add different place sound for nodes --- doc/lua_api.txt | 4 ++++ games/minimal/mods/default/init.lua | 2 ++ src/clientserver.h | 1 + src/game.cpp | 8 +++----- src/itemdef.cpp | 30 ++++++++++++++++++++++++++--- src/itemdef.h | 2 ++ src/scriptapi_item.cpp | 8 ++++++++ 7 files changed, 47 insertions(+), 8 deletions(-) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 42ca58239..beb70db15 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1514,6 +1514,9 @@ Item definition (register_node, register_craftitem, register_tool) ^ Otherwise should be name of node which the client immediately places on ground when the player places the item. Server will always update actual result to client in a short moment. + sound = { + place = , + } on_place = func(itemstack, placer, pointed_thing), ^ Shall place item and return the leftover itemstack @@ -1581,6 +1584,7 @@ Node definition (register_node) footstep = , dig = , -- "__group" = group-based sound (default) dug = , + place = , }, on_construct = func(pos), diff --git a/games/minimal/mods/default/init.lua b/games/minimal/mods/default/init.lua index fbb481a0c..163998883 100644 --- a/games/minimal/mods/default/init.lua +++ b/games/minimal/mods/default/init.lua @@ -659,6 +659,8 @@ function default.node_sound_dirt_defaults(table) {name="", gain=0.5} --table.dug = table.dug or -- {name="default_dirt_break", gain=0.5} + table.place = table.place or + {name="default_grass_footstep", gain=0.5} default.node_sound_defaults(table) return table end diff --git a/src/clientserver.h b/src/clientserver.h index aba84fb31..28b579971 100644 --- a/src/clientserver.h +++ b/src/clientserver.h @@ -87,6 +87,7 @@ SharedBuffer makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed); TOCLIENT_DELETE_PARTICLESPAWNER PROTOCOL_VERSION 18: damageGroups added to ToolCapabilities + sound_place added to ItemDefinition */ #define LATEST_PROTOCOL_VERSION 18 diff --git a/src/game.cpp b/src/game.cpp index 58ca654a0..5e4e06148 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2394,11 +2394,6 @@ void the_game( } } - // We can't actually know, but assume the sound of right-clicking - // to be the sound of placing a node - soundmaker.m_player_rightpunch_sound.gain = 0.5; - soundmaker.m_player_rightpunch_sound.name = "default_place_node"; - /* Handle digging */ @@ -2617,6 +2612,9 @@ void the_game( <<") - Position not loaded"<second); } os< 17){ + //serializeSimpleSoundSpec(sound_place, os); + os< #include #include "itemgroup.h" +#include "sound.h" class IGameDef; struct ToolCapabilities; @@ -66,6 +67,7 @@ struct ItemDefinition // May be NULL. If non-NULL, deleted by destructor ToolCapabilities *tool_capabilities; ItemGroupList groups; + SimpleSoundSpec sound_place; // Client shall immediately place this node when player places the item. // Server will update the precise end result a moment later. diff --git a/src/scriptapi_item.cpp b/src/scriptapi_item.cpp index 204939f8f..b266d856d 100644 --- a/src/scriptapi_item.cpp +++ b/src/scriptapi_item.cpp @@ -96,6 +96,14 @@ ItemDefinition read_item_definition(lua_State *L, int index, read_groups(L, -1, def.groups); lua_pop(L, 1); + lua_getfield(L, index, "sounds"); + if(lua_istable(L, -1)){ + lua_getfield(L, -1, "place"); + read_soundspec(L, -1, def.sound_place); + lua_pop(L, 1); + } + lua_pop(L, 1); + // Client shall immediately place this node when player places the item. // Server will update the precise end result a moment later. // "" = no prediction From df49b93877b40551111be6ef5ecfe4629787ab75 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 29 Mar 2013 16:51:57 -0400 Subject: [PATCH 13/30] Add varying levels of precision to TimeTaker --- src/gettime.h | 8 ++++++ src/main.cpp | 35 ++++++++++++++++------- src/porting.h | 64 ++++++++++++++++++++++++++++++++++++++++++ src/util/timetaker.cpp | 11 ++++---- src/util/timetaker.h | 7 +++-- 5 files changed, 108 insertions(+), 17 deletions(-) diff --git a/src/gettime.h b/src/gettime.h index 611906559..cde1471e5 100644 --- a/src/gettime.h +++ b/src/gettime.h @@ -31,7 +31,15 @@ with this program; if not, write to the Free Software Foundation, Inc., Normal build: main.cpp Server build: servermain.cpp */ +enum TimePrecision { + PRECISION_SECONDS, + PRECISION_MILLI, + PRECISION_MICRO, + PRECISION_NANO +}; + extern u32 getTimeMs(); +extern u32 getTime(TimePrecision prec); /* Timestamp stuff diff --git a/src/main.cpp b/src/main.cpp index 1d6252757..56c125859 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -133,7 +133,12 @@ MainGameCallback *g_gamecallback = NULL; u32 getTimeMs() { /* Use imprecise system calls directly (from porting.h) */ - return porting::getTimeMs(); + return porting::getTime(PRECISION_MILLI); +} + +u32 getTime(TimePrecision prec) +{ + return porting::getTime(prec); } #else @@ -142,7 +147,7 @@ u32 getTimeMs() class TimeGetter { public: - virtual u32 getTime() = 0; + virtual u32 getTime(TimePrecision prec) = 0; }; // A precise irrlicht one @@ -152,11 +157,15 @@ public: IrrlichtTimeGetter(IrrlichtDevice *device): m_device(device) {} - u32 getTime() + u32 getTime(TimePrecision prec) { - if(m_device == NULL) - return 0; - return m_device->getTimer()->getRealTime(); + if (prec == PRECISION_MILLI) { + if(m_device == NULL) + return 0; + return m_device->getTimer()->getRealTime(); + } else { + return porting::getTime(prec); + } } private: IrrlichtDevice *m_device; @@ -165,9 +174,9 @@ private: class SimpleTimeGetter: public TimeGetter { public: - u32 getTime() + u32 getTime(TimePrecision prec) { - return porting::getTimeMs(); + return porting::getTime(prec); } }; @@ -179,7 +188,13 @@ u32 getTimeMs() { if(g_timegetter == NULL) return 0; - return g_timegetter->getTime(); + return g_timegetter->getTime(PRECISION_MILLI); +} + +u32 getTime(TimePrecision prec) { + if (g_timegetter == NULL) + return 0; + return g_timegetter->getTime(prec); } #endif @@ -805,7 +820,7 @@ void SpeedTests() } } // Do at least 10ms - while(timer.getTime() < 10); + while(timer.getTimerTime() < 10); u32 dtime = timer.stop(); u32 per_ms = n / dtime; diff --git a/src/porting.h b/src/porting.h index d7d107340..bcce96ef7 100644 --- a/src/porting.h +++ b/src/porting.h @@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes.h" // u32 #include "debug.h" #include "constants.h" +#include "gettime.h" #ifdef _MSC_VER #define SWPRINTF_CHARSTRING L"%S" @@ -153,18 +154,65 @@ bool threadSetPriority(threadid_t tid, int prio); */ #ifdef _WIN32 // Windows #include + + inline u32 getTimeS() + { + return GetTickCount() / 1000; + } + inline u32 getTimeMs() { return GetTickCount(); } + + inline u32 getTimeUs() + { + LARGE_INTEGER freq, t; + QueryPerformanceFrequency(&freq); + QueryPerformanceCounter(&t); + return (double)(t.QuadPart) / ((double)(freq.QuadPart) / 1000000.0); + } + + inline u32 getTimeNs() + { + LARGE_INTEGER freq, t; + QueryPerformanceFrequency(&freq); + QueryPerformanceCounter(&t); + return (double)(t.QuadPart) / ((double)(freq.QuadPart) / 1000000000.0); + } + #else // Posix #include + #include + + inline u32 getTimeS() + { + struct timeval tv; + gettimeofday(&tv, NULL); + return tv.tv_sec; + } + inline u32 getTimeMs() { struct timeval tv; gettimeofday(&tv, NULL); return tv.tv_sec * 1000 + tv.tv_usec / 1000; } + + inline u32 getTimeUs() + { + struct timeval tv; + gettimeofday(&tv, NULL); + return tv.tv_sec * 1000000 + tv.tv_usec; + } + + inline u32 getTimeNs() + { + struct timespec ts; + clock_gettime(CLOCK_REALTIME, &ts); + return ts.tv_sec * 1000000000 + ts.tv_nsec; + } + /*#include inline u32 getTimeMs() { @@ -174,6 +222,22 @@ bool threadSetPriority(threadid_t tid, int prio); }*/ #endif +inline u32 getTime(TimePrecision prec) +{ + switch (prec) { + case PRECISION_SECONDS: + return getTimeS(); + case PRECISION_MILLI: + return getTimeMs(); + case PRECISION_MICRO: + return getTimeUs(); + case PRECISION_NANO: + return getTimeNs(); + } + return 0; +} + + } // namespace porting #endif // PORTING_HEADER diff --git a/src/util/timetaker.cpp b/src/util/timetaker.cpp index 910fea822..720a9e1a9 100644 --- a/src/util/timetaker.cpp +++ b/src/util/timetaker.cpp @@ -23,19 +23,20 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "../log.h" #include -TimeTaker::TimeTaker(const char *name, u32 *result) +TimeTaker::TimeTaker(const char *name, u32 *result, TimePrecision prec) { m_name = name; m_result = result; m_running = true; - m_time1 = getTimeMs(); + m_precision = prec; + m_time1 = getTime(prec); } u32 TimeTaker::stop(bool quiet) { if(m_running) { - u32 time2 = getTimeMs(); + u32 time2 = getTime(m_precision); u32 dtime = time2 - m_time1; if(m_result != NULL) { @@ -52,9 +53,9 @@ u32 TimeTaker::stop(bool quiet) return 0; } -u32 TimeTaker::getTime() +u32 TimeTaker::getTimerTime() { - u32 time2 = getTimeMs(); + u32 time2 = getTime(m_precision); u32 dtime = time2 - m_time1; return dtime; } diff --git a/src/util/timetaker.h b/src/util/timetaker.h index 0b9d9ca04..5512c205f 100644 --- a/src/util/timetaker.h +++ b/src/util/timetaker.h @@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define UTIL_TIMETAKER_HEADER #include "../irrlichttypes.h" +#include "../gettime.h" /* TimeTaker @@ -29,7 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc., class TimeTaker { public: - TimeTaker(const char *name, u32 *result=NULL); + TimeTaker(const char *name, u32 *result=NULL, + TimePrecision=PRECISION_MILLI); ~TimeTaker() { @@ -38,12 +40,13 @@ public: u32 stop(bool quiet=false); - u32 getTime(); + u32 getTimerTime(); private: const char *m_name; u32 m_time1; bool m_running; + TimePrecision m_precision; u32 *m_result; }; From 16c11eb4a3bb46a388c645b7db738762e444cde8 Mon Sep 17 00:00:00 2001 From: proller Date: Sat, 30 Mar 2013 02:03:24 +0400 Subject: [PATCH 14/30] Masterserver: report gameid, uptime, cosmetic fixes on server web page --- src/server.cpp | 2 +- src/serverlist.cpp | 5 ++++- src/serverlist.h | 2 +- util/master/list.js | 36 ++++++++++++++++++------------------ util/master/master.cgi | 5 +++++ 5 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 6bdebcec4..c4dd0ab0f 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1243,7 +1243,7 @@ void Server::AsyncRunStep() float &counter = m_masterserver_timer; if((!counter || counter >= 300.0) && g_settings->getBool("server_announce") == true) { - ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number); + ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number, m_uptime.get(), m_gamespec.id); counter = 0.01; } counter += dtime; diff --git a/src/serverlist.cpp b/src/serverlist.cpp index 3dfc79f50..93f9d2435 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -232,7 +232,7 @@ static size_t ServerAnnounceCallback(void *contents, size_t size, size_t nmemb, //((std::string*)userp)->append((char*)contents, size * nmemb); //return size * nmemb; } -void sendAnnounce(std::string action, u16 clients) { +void sendAnnounce(std::string action, u16 clients, double uptime, std::string gameid) { Json::Value server; if (action.size()) server["action"] = action; @@ -250,6 +250,9 @@ void sendAnnounce(std::string action, u16 clients) { server["pvp"] = g_settings->getBool("enable_pvp"); server["clients"] = clients; server["clients_max"] = g_settings->get("max_users"); + if (uptime >=1) server["uptime"] = (int)uptime; + if (gameid!="") server["gameid"] = gameid; + } if(server["action"] == "start") actionstream << "announcing to " << g_settings->get("serverlist_url") << std::endl; diff --git a/src/serverlist.h b/src/serverlist.h index e81e64c5b..d01415c50 100644 --- a/src/serverlist.h +++ b/src/serverlist.h @@ -39,7 +39,7 @@ namespace ServerList std::vector deSerializeJson(std::string liststring); std::string serializeJson(std::vector); #if USE_CURL - void sendAnnounce(std::string action = "", u16 clients = 0); + void sendAnnounce(std::string action = "", u16 clients = 0, double uptime = 0, std::string gameid = ""); #endif } //ServerList namespace diff --git a/util/master/list.js b/util/master/list.js index dcc30e091..18cbc4b68 100644 --- a/util/master/list.js +++ b/util/master/list.js @@ -2,11 +2,12 @@ function e(s) { if (typeof s === "undefined") s = ''; return s.replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); //mc" } -function human_time(t) { + +function human_time(t, abs) { var n = 's'; if (!t || t < 0) t = 0; var f = 0; - var s = parseInt((new Date().getTime() / 1000 - (t || 0))); + var s = parseInt(abs ? (t || 0) : (new Date().getTime() / 1000 - (t || 0))); if (!s || s <= 0) s = 0; if (s == 0) return 'now'; if (s >= 60) { @@ -35,38 +36,37 @@ function human_time(t) { } return ((f ? parseFloat(s).toFixed(1) : parseInt(s)) + n); } + function success(r) { if (!r || !r.list) return; - var h = ''; + var h = '
ip:portclients, maxversionnamedescflagsupdated/startedping
'; for (var i = 0; i < r.list.length; ++i) { var s = r.list[i]; if (!s) continue; - h += ''; - h += ''; - h += ''; - h += ''; - h += ''; + h += ''; + h += ''; + h += ''; + h += ''; - h += ''; - h += ''; + h += ''; + h += ''; if (!s.time || s.time < 0) s.time = 0; if (!s.start || s.start < 0) s.start = 0; - h += ''; - h += ''; + h += ''; + h += ''; h += ''; } h += '
ip[:port]clients/maxversion gameidnamedescflagsuptimeping
' + e(s.address) + ':' + e(s.port) + '' + e(s.clients) + (s.clients_max ? '/' + e(s.clients_max) : '') + (s.clients_top ? ', ' + s.clients_top : '') + '' + e(s.version) + ''; + h += '
' + e(s.address) + (s.port != 30000 ? (':' + e(s.port)) : '') + '' + e(s.clients) + (s.clients_max ? '/' + e(s.clients_max) : '') + (s.clients_top ? ', ' + s.clients_top : '') + '' + e(s.version) + ' ' + e(s.gameid) + ''; if (s.url) h += ''; h += e(s.name || s.url); if (s.url) h += ''; h += '' + e(s.description) + '' + e(s.password ? 'Pwd ' : '') + (s.creative ? 'Cre ' : '') + (s.damage ? 'Dmg ' : '') + (s.pvp ? 'Pvp ' : '') + (s.dedicated ? 'Ded ' : '') + '' + e(s.description) + '' + e(s.password ? 'Pwd ' : '') + (s.creative ? 'Cre ' : '') + (s.damage ? 'Dmg ' : '') + (s.pvp ? 'Pvp ' : '') + (s.dedicated ? 'Ded ' : '') + '' + human_time(s.time) + (s.start ? '/' + human_time(s.start) : '') + '' + (s.ping ? parseFloat(s.ping).toFixed(3)*1000 : '') + '' + (s.uptime ? human_time(s.uptime, 1) : '') + '' + (s.ping ? parseFloat(s.ping).toFixed(3) * 1000 : '') + '
' jQuery('#table').html(h); } +var master_root; + function get() { - jQuery.ajax({ - url: 'list', - dataType: 'json', - success: success - }); + jQuery.getJSON((master_root || '') + 'list', success); setTimeout(get, 60000); } -get(); \ No newline at end of file +get(); diff --git a/util/master/master.cgi b/util/master/master.cgi index b918876bd..0e456ed0c 100755 --- a/util/master/master.cgi +++ b/util/master/master.cgi @@ -18,6 +18,7 @@ nginx: location / { index index.html; + add_header Access-Control-Allow-Origin *; } location /announce { fastcgi_pass unix:/var/run/fcgiwrap/fcgiwrap.sock; @@ -35,6 +36,10 @@ apache .htaccess: Allow from all Deny from all + + Header set Access-Control-Allow-Origin: * + + =cut From 177ca4f4d55368718eb295f1010ad5c81660af57 Mon Sep 17 00:00:00 2001 From: proller Date: Sat, 30 Mar 2013 02:36:06 +0400 Subject: [PATCH 15/30] Fix backward compatibility for server uptime in master server web page --- util/master/list.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/master/list.js b/util/master/list.js index 18cbc4b68..990bb6ded 100644 --- a/util/master/list.js +++ b/util/master/list.js @@ -54,9 +54,8 @@ function success(r) { h += ''; h += '' + e(s.description) + ''; h += '' + e(s.password ? 'Pwd ' : '') + (s.creative ? 'Cre ' : '') + (s.damage ? 'Dmg ' : '') + (s.pvp ? 'Pvp ' : '') + (s.dedicated ? 'Ded ' : '') + ''; - if (!s.time || s.time < 0) s.time = 0; if (!s.start || s.start < 0) s.start = 0; - h += '' + (s.uptime ? human_time(s.uptime, 1) : '') + ''; + h += '' + (s.uptime ? human_time(s.uptime, 1) : s.start ? human_time(s.start) : '') + ''; h += '' + (s.ping ? parseFloat(s.ping).toFixed(3) * 1000 : '') + ''; h += ''; } From 6cf581e3604bfb9a0e91d1a016a5e5ba605bfefa Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 29 Mar 2013 21:08:35 -0400 Subject: [PATCH 16/30] Fix build on Linux with some glibcs --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8f0cc1ac5..d6182861f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -161,7 +161,7 @@ else() endif(APPLE) endif(BUILD_CLIENT) find_package(ZLIB REQUIRED) - set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS}) + set(PLATFORM_LIBS -lpthread -lrt ${CMAKE_DL_LIBS}) #set(CLIENT_PLATFORM_LIBS -lXxf86vm) # This way Xxf86vm is found on OpenBSD too find_library(XXF86VM_LIBRARY Xxf86vm) From e17ae475cf8cec3f724bf99f6a52e49a19d99d91 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 30 Mar 2013 18:09:38 +0100 Subject: [PATCH 17/30] GUI: Make singleplayer default tab, store selected serverlist, show title of serverlist --- src/guiMainMenu.cpp | 45 +++++++++++++++++++++++++++++++++++---------- src/guiMainMenu.h | 23 ++++++++--------------- src/main.cpp | 3 +++ 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 49028fc5b..579e6092d 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -157,6 +157,7 @@ enum GUI_ID_SERVERLIST, GUI_ID_SERVERLIST_TOGGLE, GUI_ID_SERVERLIST_DELETE, + GUI_ID_SERVERLIST_TITLE, }; enum @@ -427,16 +428,37 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) changeCtype(""); // Server List { - core::rect rect(0, 0, 390, 160); - rect += m_topleft_client + v2s32(50, 10); + core::rect rect(0, 0, 390, 140); + rect += m_topleft_client + v2s32(50, 30); gui::IGUIListBox *e = Environment->addListBox(rect, this, GUI_ID_SERVERLIST); e->setDrawBackground(true); - if (m_data->serverlist_show_available == false) - m_data->servers = ServerList::getLocal(); #if USE_CURL - else + if(m_data->selected_serverlist == SERVERLIST_FAVORITES) { + m_data->servers = ServerList::getLocal(); + { + core::rect rect(0, 0, 110, 20); + rect += m_topleft_client + v2s32(50, 10); + Environment->addStaticText(wgettext("Favorites:"), + rect, false, true, this, GUI_ID_SERVERLIST_TITLE); + } + } else { m_data->servers = ServerList::getOnline(); + { + core::rect rect(0, 0, 110, 20); + rect += m_topleft_client + v2s32(50, 10); + Environment->addStaticText(wgettext("Public Server List:"), + rect, false, true, this, GUI_ID_SERVERLIST_TITLE); + } + } +#else + m_data->servers = ServerList::getLocal(); + { + core::rect rect(0, 0, 110, 20); + rect += m_topleft_client + v2s32(50, 10); + Environment->addStaticText(wgettext("Favorites:"), + rect, false, true, this, GUI_ID_SERVERLIST_TITLE); + } #endif updateGuiServerList(); e->setSelected(0); @@ -474,7 +496,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_TOGGLE, wgettext("Show Public")); e->setIsPushButton(true); - if (m_data->serverlist_show_available) + if (m_data->selected_serverlist == SERVERLIST_PUBLIC) { e->setText(wgettext("Show Favorites")); e->setPressed(); @@ -487,7 +509,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) rect += m_topleft_client + v2s32(50+260+10, 180); gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_DELETE, wgettext("Delete")); - if (m_data->serverlist_show_available) // Hidden on Show-Online mode + if (m_data->selected_serverlist == SERVERLIST_PUBLIC) // Hidden when on public list e->setVisible(false); } // Start game button @@ -1154,25 +1176,28 @@ bool GUIMainMenu::OnEvent(const SEvent& event) gui::IGUIElement *togglebutton = getElementFromId(GUI_ID_SERVERLIST_TOGGLE); gui::IGUIElement *deletebutton = getElementFromId(GUI_ID_SERVERLIST_DELETE); gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST); - if (m_data->serverlist_show_available) // switch to favorite list + gui::IGUIElement *title = getElementFromId(GUI_ID_SERVERLIST_TITLE); + if (m_data->selected_serverlist == SERVERLIST_PUBLIC) // switch to favorite list { m_data->servers = ServerList::getLocal(); togglebutton->setText(wgettext("Show Public")); + title->setText(wgettext("Favorites:")); deletebutton->setVisible(true); updateGuiServerList(); serverlist->setSelected(0); + m_data->selected_serverlist = SERVERLIST_FAVORITES; } else // switch to online list { m_data->servers = ServerList::getOnline(); togglebutton->setText(wgettext("Show Favorites")); + title->setText(wgettext("Public Server List:")); deletebutton->setVisible(false); updateGuiServerList(); serverlist->setSelected(0); + m_data->selected_serverlist = SERVERLIST_PUBLIC; } serverListOnSelected(); - - m_data->serverlist_show_available = !m_data->serverlist_show_available; } #endif } diff --git a/src/guiMainMenu.h b/src/guiMainMenu.h index fa5f19def..a594ccd41 100644 --- a/src/guiMainMenu.h +++ b/src/guiMainMenu.h @@ -29,6 +29,11 @@ with this program; if not, write to the Free Software Foundation, Inc., class IGameCallback; +enum { + SERVERLIST_FAVORITES, + SERVERLIST_PUBLIC, +}; + struct MainMenuData { // These are in the native format of the gui elements @@ -64,7 +69,7 @@ struct MainMenuData std::string create_world_gameid; bool only_refresh; - bool serverlist_show_available; // if false show local favorites only + int selected_serverlist; std::vector worlds; std::vector games; @@ -72,13 +77,7 @@ struct MainMenuData MainMenuData(): // Generic - selected_tab( -#if USE_CURL - 1 -#else - 0 -#endif - ), + selected_tab(0), // Client opts fancy_trees(false), smooth_lighting(false), @@ -91,13 +90,7 @@ struct MainMenuData // Actions only_refresh(false), - serverlist_show_available( -#if USE_CURL - true -#else - false -#endif -) + selected_serverlist(SERVERLIST_FAVORITES) {} }; diff --git a/src/main.cpp b/src/main.cpp index 56c125859..2e57a8c20 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1556,6 +1556,8 @@ int main(int argc, char *argv[]) MainMenuData menudata; if(g_settings->exists("selected_mainmenu_tab")) menudata.selected_tab = g_settings->getS32("selected_mainmenu_tab"); + if(g_settings->exists("selected_serverlist")) + menudata.selected_serverlist = g_settings->getS32("selected_serverlist"); menudata.address = narrow_to_wide(address); menudata.name = narrow_to_wide(playername); menudata.port = narrow_to_wide(itos(port)); @@ -1752,6 +1754,7 @@ int main(int argc, char *argv[]) simple_singleplayer_mode = menudata.simple_singleplayer_mode; // Save settings g_settings->setS32("selected_mainmenu_tab", menudata.selected_tab); + g_settings->setS32("selected_serverlist", menudata.selected_serverlist); g_settings->set("new_style_leaves", itos(menudata.fancy_trees)); g_settings->set("smooth_lighting", itos(menudata.smooth_lighting)); g_settings->set("enable_3d_clouds", itos(menudata.clouds_3d)); From 1aa50b13622c1e264044839ecdf0152670dae6ce Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 30 Mar 2013 18:56:29 +0100 Subject: [PATCH 18/30] Make the textbox for serverlist title wider --- src/guiMainMenu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 579e6092d..4c2030039 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -437,7 +437,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) if(m_data->selected_serverlist == SERVERLIST_FAVORITES) { m_data->servers = ServerList::getLocal(); { - core::rect rect(0, 0, 110, 20); + core::rect rect(0, 0, 390, 20); rect += m_topleft_client + v2s32(50, 10); Environment->addStaticText(wgettext("Favorites:"), rect, false, true, this, GUI_ID_SERVERLIST_TITLE); @@ -445,7 +445,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) } else { m_data->servers = ServerList::getOnline(); { - core::rect rect(0, 0, 110, 20); + core::rect rect(0, 0, 390, 20); rect += m_topleft_client + v2s32(50, 10); Environment->addStaticText(wgettext("Public Server List:"), rect, false, true, this, GUI_ID_SERVERLIST_TITLE); @@ -454,7 +454,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize) #else m_data->servers = ServerList::getLocal(); { - core::rect rect(0, 0, 110, 20); + core::rect rect(0, 0, 390, 20); rect += m_topleft_client + v2s32(50, 10); Environment->addStaticText(wgettext("Favorites:"), rect, false, true, this, GUI_ID_SERVERLIST_TITLE); From 3ec3aca78d91e3123a7cfbfd405c98e1b58674b2 Mon Sep 17 00:00:00 2001 From: Ragnar Laud Date: Thu, 7 Mar 2013 09:48:51 +0100 Subject: [PATCH 19/30] Translated using Weblate (Estonian) --- po/et/minetest.po | 324 +++++++++++++++++++++++++--------------------- 1 file changed, 173 insertions(+), 151 deletions(-) diff --git a/po/et/minetest.po b/po/et/minetest.po index f07b816a5..fcdbe7eb3 100644 --- a/po/et/minetest.po +++ b/po/et/minetest.po @@ -3,393 +3,401 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-30 20:25+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-03-07 09:48+0200\n" +"Last-Translator: Ragnar Laud \n" "Language-Team: LANGUAGE \n" -"Language: \n" +"Language: et\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Weblate 1.4-dev\n" #: src/guiConfigureWorld.cpp:125 msgid "" "Warning: Some mods are not configured yet.\n" "They will be enabled by default when you save the configuration. " msgstr "" +"Hoiatus: Mõned modifikatsioonid pole sätitud veel.\n" +"Need lülitatakse sisse kohe pärast sätete salvestamist." #: src/guiConfigureWorld.cpp:144 msgid "" "Warning: Some configured mods are missing.\n" "Their setting will be removed when you save the configuration. " msgstr "" +"Hoiatus: Mõned konfigureeritud modifikatsioonid on kaotsi läinud.\n" +"Nende sätted kustutatakse kui salvestada konfiguratsioon." #: src/guiConfigureWorld.cpp:208 msgid "enabled" -msgstr "" +msgstr "Sisse lülitatud" #: src/guiConfigureWorld.cpp:215 msgid "Enable All" -msgstr "" +msgstr "Lülita kõik sisse" #: src/guiConfigureWorld.cpp:222 msgid "Disable All" -msgstr "" +msgstr "Lülita kõik välja" #: src/guiConfigureWorld.cpp:228 msgid "depends on:" -msgstr "" +msgstr "Vajab:" #: src/guiConfigureWorld.cpp:240 msgid "is required by:" -msgstr "" +msgstr "Seda vajavad:" #: src/guiConfigureWorld.cpp:262 src/guiCreateWorld.cpp:165 #: src/guiKeyChangeMenu.cpp:179 src/keycode.cpp:223 msgid "Cancel" -msgstr "" +msgstr "Tühista" #: src/guiConfigureWorld.cpp:268 src/guiKeyChangeMenu.cpp:173 msgid "Save" -msgstr "" +msgstr "Salvesta" #: src/guiConfigureWorld.cpp:394 msgid "Configuration saved. " -msgstr "" +msgstr "Konfiguratsioon salvestatud. " #: src/guiConfigureWorld.cpp:402 msgid "Warning: Configuration not consistent. " -msgstr "" +msgstr "Hoiatus: Konfiguratsioon pole kindel." #: src/guiConfirmMenu.cpp:120 msgid "Yes" -msgstr "" +msgstr "Jah" #: src/guiConfirmMenu.cpp:126 msgid "No" -msgstr "" +msgstr "Ei" #: src/guiCreateWorld.cpp:116 msgid "World name" -msgstr "" +msgstr "Maailma nimi" #: src/guiCreateWorld.cpp:135 msgid "Game" -msgstr "" +msgstr "Mäng" #: src/guiCreateWorld.cpp:159 msgid "Create" -msgstr "" +msgstr "Loo" #: src/guiDeathScreen.cpp:96 msgid "You died." -msgstr "" +msgstr "Sa surid." #: src/guiDeathScreen.cpp:104 msgid "Respawn" -msgstr "" +msgstr "Ärka ellu" #: src/guiFormSpecMenu.cpp:572 msgid "Left click: Move all items, Right click: Move single item" msgstr "" +"Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut asja" #: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 #: src/guiTextInputMenu.cpp:123 msgid "Proceed" -msgstr "" +msgstr "Jätka" #: src/guiKeyChangeMenu.cpp:114 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" +"Nupusätted. (Kui see menüü sassi läheb, siis kustuta asju failist " +"minetest.conf)" #: src/guiKeyChangeMenu.cpp:151 msgid "\"Use\" = climb down" -msgstr "" +msgstr "\"Tegevus\" = Roni alla" #: src/guiKeyChangeMenu.cpp:164 msgid "Double tap \"jump\" to toggle fly" -msgstr "" +msgstr "Topeltklõpsa \"Hüppamist\" et sisse lülitada lendamine" #: src/guiKeyChangeMenu.cpp:269 msgid "Key already in use" -msgstr "" +msgstr "Nupp juba kasutuses" #: src/guiKeyChangeMenu.cpp:347 msgid "press key" -msgstr "" +msgstr "Vajuta nuppu" #: src/guiKeyChangeMenu.cpp:372 msgid "Forward" -msgstr "" +msgstr "Edasi" #: src/guiKeyChangeMenu.cpp:373 msgid "Backward" -msgstr "" +msgstr "Tagasi" #: src/guiKeyChangeMenu.cpp:374 src/keycode.cpp:228 msgid "Left" -msgstr "" +msgstr "Vasakule" #: src/guiKeyChangeMenu.cpp:375 src/keycode.cpp:228 msgid "Right" -msgstr "" +msgstr "Paremale" #: src/guiKeyChangeMenu.cpp:376 msgid "Use" -msgstr "" +msgstr "Tegevus" #: src/guiKeyChangeMenu.cpp:377 msgid "Jump" -msgstr "" +msgstr "Hüppamine" #: src/guiKeyChangeMenu.cpp:378 msgid "Sneak" -msgstr "" +msgstr "Hiilimine" #: src/guiKeyChangeMenu.cpp:379 msgid "Drop" -msgstr "" +msgstr "Viska maha" #: src/guiKeyChangeMenu.cpp:380 msgid "Inventory" -msgstr "" +msgstr "Seljakott" #: src/guiKeyChangeMenu.cpp:381 msgid "Chat" -msgstr "" +msgstr "Jututuba" #: src/guiKeyChangeMenu.cpp:382 msgid "Command" -msgstr "" +msgstr "Käsklus" #: src/guiKeyChangeMenu.cpp:383 msgid "Console" -msgstr "" +msgstr "Konsool" #: src/guiKeyChangeMenu.cpp:384 msgid "Toggle fly" -msgstr "" +msgstr "Lülita lendamine sisse" #: src/guiKeyChangeMenu.cpp:385 msgid "Toggle fast" -msgstr "" +msgstr "Lülita kiirus sisse" #: src/guiKeyChangeMenu.cpp:386 msgid "Toggle noclip" -msgstr "" +msgstr "Lülita läbi seinte minek sisse" #: src/guiKeyChangeMenu.cpp:387 msgid "Range select" -msgstr "" +msgstr "Kauguse valik" #: src/guiKeyChangeMenu.cpp:388 msgid "Print stacks" -msgstr "" +msgstr "Prindi kogused" #: src/guiMainMenu.cpp:55 msgid "Cannot create world: Name contains invalid characters" -msgstr "" +msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti" #: src/guiMainMenu.cpp:64 msgid "Cannot create world: A world by this name already exists" -msgstr "" +msgstr "Maailma loomine ebaõnnestus: Samanimeline maailm on juba olemas" #: src/guiMainMenu.cpp:245 msgid "Singleplayer" -msgstr "" +msgstr "Üksikmäng" #: src/guiMainMenu.cpp:246 msgid "Multiplayer" -msgstr "" +msgstr "Mitmikmäng" #: src/guiMainMenu.cpp:247 msgid "Advanced" -msgstr "" +msgstr "Arenenud sätted" #: src/guiMainMenu.cpp:248 msgid "Settings" -msgstr "" +msgstr "Sätted" #: src/guiMainMenu.cpp:249 msgid "Credits" -msgstr "" +msgstr "Tänuavaldused" #: src/guiMainMenu.cpp:280 msgid "Select World:" -msgstr "" +msgstr "Vali maailm:" #: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 msgid "Delete" -msgstr "" +msgstr "Kustuta" #: src/guiMainMenu.cpp:309 msgid "New" -msgstr "" +msgstr "Uus" #: src/guiMainMenu.cpp:317 msgid "Configure" -msgstr "" +msgstr "Konfigureeri" #: src/guiMainMenu.cpp:332 src/keycode.cpp:248 msgid "Play" -msgstr "" +msgstr "Mängi" #: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 msgid "Creative Mode" -msgstr "" +msgstr "Kujunduslik mängumood" #: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 msgid "Enable Damage" -msgstr "" +msgstr "Lülita valu sisse" #: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 msgid "Name/Password" -msgstr "" +msgstr "Nimi/Parool" #: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 msgid "Address/Port" -msgstr "" +msgstr "IP/Port" #: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 msgid "Show Public" -msgstr "" +msgstr "Näita avalikke" #: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 msgid "Show Favorites" -msgstr "" +msgstr "Näita lemmikuid" #: src/guiMainMenu.cpp:459 msgid "Connect" -msgstr "" +msgstr "Liitu" #: src/guiMainMenu.cpp:529 msgid "Leave address blank to start a local server." -msgstr "" +msgstr "Jäta IP lahter tühjaks et alustada LAN serverit." #: src/guiMainMenu.cpp:538 msgid "Start Game / Connect" -msgstr "" +msgstr "Alusta mängu / Liitu" #: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 msgid "Delete world" -msgstr "" +msgstr "Kustuta maailm" #: src/guiMainMenu.cpp:577 msgid "Create world" -msgstr "" +msgstr "Loo maailm" #: src/guiMainMenu.cpp:611 msgid "Fancy trees" -msgstr "" +msgstr "Uhked puud" #: src/guiMainMenu.cpp:617 msgid "Smooth Lighting" -msgstr "" +msgstr "Ilus valgustus" #: src/guiMainMenu.cpp:623 msgid "3D Clouds" -msgstr "" +msgstr "3D pilved" #: src/guiMainMenu.cpp:629 msgid "Opaque water" -msgstr "" +msgstr "Läbipaistmatu vesi" #: src/guiMainMenu.cpp:639 msgid "Mip-Mapping" -msgstr "" +msgstr "Väga hea kvaliteet" #: src/guiMainMenu.cpp:646 msgid "Anisotropic Filtering" -msgstr "" +msgstr "Anisotroopne Filtreerimine" #: src/guiMainMenu.cpp:653 msgid "Bi-Linear Filtering" -msgstr "" +msgstr "Bi-lineaarsed Filtreerimine" #: src/guiMainMenu.cpp:660 msgid "Tri-Linear Filtering" -msgstr "" +msgstr "Tri-Linear Filtreerimine" #: src/guiMainMenu.cpp:668 msgid "Shaders" -msgstr "" +msgstr "Varjutajad" #: src/guiMainMenu.cpp:675 msgid "Preload item visuals" -msgstr "" +msgstr "Lae asjade visuaale" #: src/guiMainMenu.cpp:682 msgid "Enable Particles" -msgstr "" +msgstr "Lülita osakesed sisse" #: src/guiMainMenu.cpp:692 msgid "Change keys" -msgstr "" +msgstr "Vaheta nuppe" #: src/guiMainMenu.cpp:977 msgid "Address required." -msgstr "" +msgstr "IP on vajalkik." #: src/guiMainMenu.cpp:995 msgid "Cannot delete world: Nothing selected" -msgstr "" +msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud" #: src/guiMainMenu.cpp:1010 msgid "Files to be deleted" -msgstr "" +msgstr "Failid mida kustutada" #: src/guiMainMenu.cpp:1026 msgid "Cannot create world: No games found" -msgstr "" +msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud" #: src/guiMainMenu.cpp:1042 msgid "Cannot configure world: Nothing selected" -msgstr "" +msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud" #: src/guiMainMenu.cpp:1146 msgid "Failed to delete all world files" -msgstr "" +msgstr "Kõigi maailma failide kustutamine ebaõnnestus" #: src/guiPasswordChange.cpp:108 msgid "Old Password" -msgstr "" +msgstr "Vana parool" #: src/guiPasswordChange.cpp:125 msgid "New Password" -msgstr "" +msgstr "Uus parool" #: src/guiPasswordChange.cpp:141 msgid "Confirm Password" -msgstr "" +msgstr "Kinnita parooli" #: src/guiPasswordChange.cpp:158 msgid "Change" -msgstr "" +msgstr "Muuda" #: src/guiPasswordChange.cpp:167 msgid "Passwords do not match!" -msgstr "" +msgstr "Paroolid ei ole samad!" #: src/guiPauseMenu.cpp:118 msgid "Continue" -msgstr "" +msgstr "Jätka" #: src/guiPauseMenu.cpp:127 msgid "Change Password" -msgstr "" +msgstr "Vaheta parooli" #: src/guiPauseMenu.cpp:135 msgid "Exit to Menu" -msgstr "" +msgstr "Välju menüüsse" #: src/guiPauseMenu.cpp:142 msgid "Exit to OS" -msgstr "" +msgstr "Välju mängust" #: src/guiPauseMenu.cpp:149 msgid "" @@ -405,238 +413,252 @@ msgid "" "- ESC: This menu\n" "- T: Chat\n" msgstr "" +"Algsed nupusätted:\n" +"- WASD: Kõnni\n" +"- Vasak hiireklõps: Kaeva/löö\n" +"- Parem hiireklõps: Aseta/kasuta\n" +"- Hiireratas: Vali asi\n" +"- 0...9: Vali asi\n" +"- Shift: Hiili\n" +"- R: Vaheta nägemiskaugust\n" +"- I: Seljakott\n" +"- ESC: Menüü\n" +"- T: Jututupa\n" #: src/keycode.cpp:223 msgid "Left Button" -msgstr "" +msgstr "Vasak nupp" #: src/keycode.cpp:223 msgid "Middle Button" -msgstr "" +msgstr "Keskmine nupp" #: src/keycode.cpp:223 msgid "Right Button" -msgstr "" +msgstr "Parem nupp" #: src/keycode.cpp:223 msgid "X Button 1" -msgstr "" +msgstr "X Nuppp 1" #: src/keycode.cpp:224 msgid "Back" -msgstr "" +msgstr "Tagasi" #: src/keycode.cpp:224 msgid "Clear" -msgstr "" +msgstr "Tühjenda" #: src/keycode.cpp:224 msgid "Return" -msgstr "" +msgstr "Enter" #: src/keycode.cpp:224 msgid "Tab" -msgstr "" +msgstr "Reavahetus" #: src/keycode.cpp:224 msgid "X Button 2" -msgstr "" +msgstr "X Nupp 2" #: src/keycode.cpp:225 msgid "Capital" -msgstr "" +msgstr "Caps Lock" #: src/keycode.cpp:225 msgid "Control" -msgstr "" +msgstr "CTRL" #: src/keycode.cpp:225 +#, fuzzy msgid "Kana" -msgstr "" +msgstr "Kana" #: src/keycode.cpp:225 msgid "Menu" -msgstr "" +msgstr "Menüü" #: src/keycode.cpp:225 msgid "Pause" -msgstr "" +msgstr "Paus" #: src/keycode.cpp:225 msgid "Shift" -msgstr "" +msgstr "Shift," #: src/keycode.cpp:226 msgid "Convert" -msgstr "" +msgstr "Konverteeri" #: src/keycode.cpp:226 msgid "Escape" -msgstr "" +msgstr "Põgene" #: src/keycode.cpp:226 msgid "Final" -msgstr "" +msgstr "Viimane" #: src/keycode.cpp:226 +#, fuzzy msgid "Junja" -msgstr "" +msgstr "Junja" #: src/keycode.cpp:226 +#, fuzzy msgid "Kanji" -msgstr "" +msgstr "Kanji" #: src/keycode.cpp:226 msgid "Nonconvert" -msgstr "" +msgstr "Konverteerimatta" #: src/keycode.cpp:227 msgid "Accept" -msgstr "" +msgstr "Nõustu" #: src/keycode.cpp:227 msgid "End" -msgstr "" +msgstr "Lõpeta" #: src/keycode.cpp:227 msgid "Home" -msgstr "" +msgstr "Kodu" #: src/keycode.cpp:227 msgid "Mode Change" -msgstr "" +msgstr "Moodi vahetamine" #: src/keycode.cpp:227 msgid "Next" -msgstr "" +msgstr "Järgmine" #: src/keycode.cpp:227 msgid "Prior" -msgstr "" +msgstr "Eelnev" #: src/keycode.cpp:227 msgid "Space" -msgstr "" +msgstr "Tühik" #: src/keycode.cpp:228 msgid "Down" -msgstr "" +msgstr "Alla" #: src/keycode.cpp:228 msgid "Execute" -msgstr "" +msgstr "Soorita" #: src/keycode.cpp:228 msgid "Print" -msgstr "" +msgstr "Prindi" #: src/keycode.cpp:228 msgid "Select" -msgstr "" +msgstr "Vali" #: src/keycode.cpp:228 msgid "Up" -msgstr "" +msgstr "Üles" #: src/keycode.cpp:229 msgid "Help" -msgstr "" +msgstr "Abi" #: src/keycode.cpp:229 msgid "Insert" -msgstr "" +msgstr "Sisesta" #: src/keycode.cpp:229 msgid "Snapshot" -msgstr "" +msgstr "Mängupilt" #: src/keycode.cpp:232 msgid "Left Windows" -msgstr "" +msgstr "Vasak Windowsi nupp" #: src/keycode.cpp:233 msgid "Apps" -msgstr "" +msgstr "Aplikatsioonid" #: src/keycode.cpp:233 msgid "Numpad 0" -msgstr "" +msgstr "Numbrilaual 0" #: src/keycode.cpp:233 msgid "Numpad 1" -msgstr "" +msgstr "Numbrilaual 1" #: src/keycode.cpp:233 msgid "Right Windows" -msgstr "" +msgstr "Parem Windowsi nupp" #: src/keycode.cpp:233 msgid "Sleep" -msgstr "" +msgstr "Maga" #: src/keycode.cpp:234 msgid "Numpad 2" -msgstr "" +msgstr "Numbrilaual 2" #: src/keycode.cpp:234 msgid "Numpad 3" -msgstr "" +msgstr "Numbrilaual 3" #: src/keycode.cpp:234 msgid "Numpad 4" -msgstr "" +msgstr "Numbrilaual 4" #: src/keycode.cpp:234 msgid "Numpad 5" -msgstr "" +msgstr "Numbrilaual 5" #: src/keycode.cpp:234 msgid "Numpad 6" -msgstr "" +msgstr "Numbrilaual 6" #: src/keycode.cpp:234 msgid "Numpad 7" -msgstr "" +msgstr "Numbrilaual 7" #: src/keycode.cpp:235 msgid "Numpad *" -msgstr "" +msgstr "Numbrilaual *" #: src/keycode.cpp:235 msgid "Numpad +" -msgstr "" +msgstr "Numbrilaual +" #: src/keycode.cpp:235 msgid "Numpad -" -msgstr "" +msgstr "Numbrilaual -" #: src/keycode.cpp:235 msgid "Numpad /" -msgstr "" +msgstr "Numbrilaual /" #: src/keycode.cpp:235 msgid "Numpad 8" -msgstr "" +msgstr "Numbrilaual 8" #: src/keycode.cpp:235 msgid "Numpad 9" -msgstr "" +msgstr "Numbrilaual 9" #: src/keycode.cpp:239 msgid "Num Lock" -msgstr "" +msgstr "Numbrilaual Num Lock" #: src/keycode.cpp:239 msgid "Scroll Lock" -msgstr "" +msgstr "Scroll lukk" #: src/keycode.cpp:240 msgid "Left Shift" -msgstr "" +msgstr "Vasak Shift" #: src/keycode.cpp:240 msgid "Right Shift" -msgstr "" +msgstr "Parem Shift" #: src/keycode.cpp:241 msgid "Left Control" From 3983019fd8c7428bbfe8b65fc9223e3c4ea50580 Mon Sep 17 00:00:00 2001 From: Fabio Luongo Date: Sat, 30 Mar 2013 11:04:14 +0100 Subject: [PATCH 20/30] Translated using Weblate (Italian) --- po/it/minetest.po | 287 +++++++++++++++++++++++----------------------- 1 file changed, 142 insertions(+), 145 deletions(-) diff --git a/po/it/minetest.po b/po/it/minetest.po index 09c4b4ca2..d5e0ed2c2 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-23 18:24+0200\n" -"PO-Revision-Date: 2013-02-09 22:18+0200\n" -"Last-Translator: Pilz Adam \n" +"PO-Revision-Date: 2013-03-30 11:04+0200\n" +"Last-Translator: Fabio Luongo \n" "Language-Team: Italian\n" "Language: it\n" "MIME-Version: 1.0\n" @@ -23,35 +23,36 @@ msgid "" "Warning: Some mods are not configured yet.\n" "They will be enabled by default when you save the configuration. " msgstr "" -"Attenzione: Alcuni mods non sono ancora configurati.\n" -"Saranno attivati, in modo predefinito, al salvataggio delle impostazioni. " +"Attenzione: alcune mod non sono ancora configurate.\n" +"Saranno abilitate di default quando salverai la configurazione. " #: src/guiConfigureWorld.cpp:144 msgid "" "Warning: Some configured mods are missing.\n" "Their setting will be removed when you save the configuration. " msgstr "" +"Attenzione: mancano alcune mod configurate.\n" +"Le loro impostazioni saranno rimosse al salvataggio della configurazione. " #: src/guiConfigureWorld.cpp:208 msgid "enabled" -msgstr "" +msgstr "attivato" #: src/guiConfigureWorld.cpp:215 -#, fuzzy msgid "Enable All" -msgstr "Attiva Danno" +msgstr "Attiva tutto" #: src/guiConfigureWorld.cpp:222 msgid "Disable All" -msgstr "" +msgstr "Disabilita tutto" #: src/guiConfigureWorld.cpp:228 msgid "depends on:" -msgstr "" +msgstr "dipende da:" #: src/guiConfigureWorld.cpp:240 msgid "is required by:" -msgstr "" +msgstr "è richiesto da:" #: src/guiConfigureWorld.cpp:262 src/guiCreateWorld.cpp:165 #: src/guiKeyChangeMenu.cpp:179 src/keycode.cpp:223 @@ -64,44 +65,44 @@ msgstr "Salva" #: src/guiConfigureWorld.cpp:394 msgid "Configuration saved. " -msgstr "" +msgstr "Configurazione salvata. " #: src/guiConfigureWorld.cpp:402 msgid "Warning: Configuration not consistent. " -msgstr "" +msgstr "Attenzione: configurazione non corretta. " #: src/guiConfirmMenu.cpp:120 msgid "Yes" -msgstr "" +msgstr "Sì" #: src/guiConfirmMenu.cpp:126 msgid "No" -msgstr "" +msgstr "No" #: src/guiCreateWorld.cpp:116 msgid "World name" -msgstr "" +msgstr "Nome mondo" #: src/guiCreateWorld.cpp:135 msgid "Game" -msgstr "" +msgstr "Gioco" #: src/guiCreateWorld.cpp:159 -#, fuzzy msgid "Create" -msgstr "Modalità creativa" +msgstr "Crea" #: src/guiDeathScreen.cpp:96 msgid "You died." -msgstr "" +msgstr "Sei morto." #: src/guiDeathScreen.cpp:104 msgid "Respawn" -msgstr "" +msgstr "Ricomincia" #: src/guiFormSpecMenu.cpp:572 msgid "Left click: Move all items, Right click: Move single item" msgstr "" +"Click sinistro: muovi tutti gli oggetti; click destro: muovi un solo oggetto" #: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 #: src/guiTextInputMenu.cpp:123 @@ -111,23 +112,24 @@ msgstr "Procedi" #: src/guiKeyChangeMenu.cpp:114 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" +"Associazione tasti. (Se questo menu si incasina, rimuovi la roba da " +"minetest.conf)" #: src/guiKeyChangeMenu.cpp:151 msgid "\"Use\" = climb down" -msgstr "" +msgstr "\"Usa\" = scendi sotto" #: src/guiKeyChangeMenu.cpp:164 msgid "Double tap \"jump\" to toggle fly" -msgstr "" +msgstr "Premi due volte \"salto\" per volare" #: src/guiKeyChangeMenu.cpp:269 msgid "Key already in use" -msgstr "" +msgstr "Tasto già usato" #: src/guiKeyChangeMenu.cpp:347 -#, fuzzy msgid "press key" -msgstr "premi tasto" +msgstr "premi il tasto" #: src/guiKeyChangeMenu.cpp:372 msgid "Forward" @@ -155,15 +157,15 @@ msgstr "Salta" #: src/guiKeyChangeMenu.cpp:378 msgid "Sneak" -msgstr "" +msgstr "Abbassati" #: src/guiKeyChangeMenu.cpp:379 msgid "Drop" -msgstr "" +msgstr "Lancia" #: src/guiKeyChangeMenu.cpp:380 msgid "Inventory" -msgstr "Invetario" +msgstr "Inventario" #: src/guiKeyChangeMenu.cpp:381 msgid "Chat" @@ -171,63 +173,63 @@ msgstr "Parla" #: src/guiKeyChangeMenu.cpp:382 msgid "Command" -msgstr "" +msgstr "Comando" #: src/guiKeyChangeMenu.cpp:383 msgid "Console" -msgstr "" +msgstr "Console" #: src/guiKeyChangeMenu.cpp:384 msgid "Toggle fly" -msgstr "" +msgstr "Attiva volo" #: src/guiKeyChangeMenu.cpp:385 msgid "Toggle fast" -msgstr "" +msgstr "Aumenta velocità" #: src/guiKeyChangeMenu.cpp:386 msgid "Toggle noclip" -msgstr "" +msgstr "(Non) attraversi blocchi" #: src/guiKeyChangeMenu.cpp:387 msgid "Range select" -msgstr "" +msgstr "Distanza di rendering" #: src/guiKeyChangeMenu.cpp:388 msgid "Print stacks" -msgstr "" +msgstr "Stampa stack" #: src/guiMainMenu.cpp:55 msgid "Cannot create world: Name contains invalid characters" -msgstr "" +msgstr "Impossibile creare il mondo: il nome contiene caratteri non validi" #: src/guiMainMenu.cpp:64 msgid "Cannot create world: A world by this name already exists" -msgstr "" +msgstr "Impossibile creare il mondo: un mondo con questo nome già esiste" #: src/guiMainMenu.cpp:245 msgid "Singleplayer" -msgstr "" +msgstr "Giocatore singolo" #: src/guiMainMenu.cpp:246 msgid "Multiplayer" -msgstr "" +msgstr "Multigiocatore" #: src/guiMainMenu.cpp:247 msgid "Advanced" -msgstr "" +msgstr "Avanzato" #: src/guiMainMenu.cpp:248 msgid "Settings" -msgstr "" +msgstr "Opzioni" #: src/guiMainMenu.cpp:249 msgid "Credits" -msgstr "" +msgstr "Crediti" #: src/guiMainMenu.cpp:280 msgid "Select World:" -msgstr "" +msgstr "Seleziona mondo:" #: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 msgid "Delete" @@ -235,15 +237,15 @@ msgstr "Cancella" #: src/guiMainMenu.cpp:309 msgid "New" -msgstr "" +msgstr "Nuovo" #: src/guiMainMenu.cpp:317 msgid "Configure" -msgstr "" +msgstr "Configura" #: src/guiMainMenu.cpp:332 src/keycode.cpp:248 msgid "Play" -msgstr "" +msgstr "Gioca" #: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 msgid "Creative Mode" @@ -251,7 +253,7 @@ msgstr "Modalità creativa" #: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 msgid "Enable Damage" -msgstr "Attiva Danno" +msgstr "Attiva danno" #: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 msgid "Name/Password" @@ -263,16 +265,15 @@ msgstr "Indirizzo/Porta" #: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 msgid "Show Public" -msgstr "" +msgstr "Lista server pubblici" #: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 msgid "Show Favorites" -msgstr "" +msgstr "Mostra preferiti" #: src/guiMainMenu.cpp:459 -#, fuzzy msgid "Connect" -msgstr "Disconnetti" +msgstr "Connetti" #: src/guiMainMenu.cpp:529 msgid "Leave address blank to start a local server." @@ -280,62 +281,59 @@ msgstr "Lascia vuoto l'indirizzo per avviare un server locale." #: src/guiMainMenu.cpp:538 msgid "Start Game / Connect" -msgstr "Avvia Gioco / Connetti" +msgstr "Avvia gioco/Connetti" #: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 -#, fuzzy msgid "Delete world" -msgstr "Cancella" +msgstr "Cancella il mondo" #: src/guiMainMenu.cpp:577 -#, fuzzy msgid "Create world" -msgstr "Modalità creativa" +msgstr "Crea mondo" #: src/guiMainMenu.cpp:611 msgid "Fancy trees" -msgstr "Alberi strani" +msgstr "Alberi migliori" #: src/guiMainMenu.cpp:617 msgid "Smooth Lighting" -msgstr "" +msgstr "Luce uniforme" #: src/guiMainMenu.cpp:623 msgid "3D Clouds" -msgstr "" +msgstr "Nuvole 3D" #: src/guiMainMenu.cpp:629 msgid "Opaque water" -msgstr "" +msgstr "Acqua opaca" #: src/guiMainMenu.cpp:639 msgid "Mip-Mapping" -msgstr "" +msgstr "Mipmapping" #: src/guiMainMenu.cpp:646 msgid "Anisotropic Filtering" -msgstr "" +msgstr "Filtro anisotropico" #: src/guiMainMenu.cpp:653 msgid "Bi-Linear Filtering" -msgstr "" +msgstr "Filtro bilineare" #: src/guiMainMenu.cpp:660 msgid "Tri-Linear Filtering" -msgstr "" +msgstr "Filtro trilineare" #: src/guiMainMenu.cpp:668 msgid "Shaders" -msgstr "" +msgstr "Shader" #: src/guiMainMenu.cpp:675 msgid "Preload item visuals" -msgstr "" +msgstr "Pre-carica le immagini degli oggetti" #: src/guiMainMenu.cpp:682 -#, fuzzy msgid "Enable Particles" -msgstr "Attiva Danno" +msgstr "Attiva particelle" #: src/guiMainMenu.cpp:692 msgid "Change keys" @@ -343,27 +341,27 @@ msgstr "Modifica tasti" #: src/guiMainMenu.cpp:977 msgid "Address required." -msgstr "" +msgstr "Indirizzo necessario." #: src/guiMainMenu.cpp:995 msgid "Cannot delete world: Nothing selected" -msgstr "" +msgstr "Impossibile eliminare il mondo: nessun mondo selezionato" #: src/guiMainMenu.cpp:1010 msgid "Files to be deleted" -msgstr "" +msgstr "File da eliminarsi" #: src/guiMainMenu.cpp:1026 msgid "Cannot create world: No games found" -msgstr "" +msgstr "Impossibile creare il mondo: nessun gioco trovato" #: src/guiMainMenu.cpp:1042 msgid "Cannot configure world: Nothing selected" -msgstr "" +msgstr "Impossibile configurare il mondo: nessun mondo selezionato" #: src/guiMainMenu.cpp:1146 msgid "Failed to delete all world files" -msgstr "" +msgstr "Eliminazione di tutti i file del mondo fallita" #: src/guiPasswordChange.cpp:108 msgid "Old Password" @@ -394,16 +392,14 @@ msgid "Change Password" msgstr "Cambia password" #: src/guiPauseMenu.cpp:135 -#, fuzzy msgid "Exit to Menu" -msgstr "Esci al S.O." +msgstr "Torna al menu" #: src/guiPauseMenu.cpp:142 msgid "Exit to OS" -msgstr "Esci al S.O." +msgstr "Torna al S.O." #: src/guiPauseMenu.cpp:149 -#, fuzzy msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -418,16 +414,16 @@ msgid "" "- T: Chat\n" msgstr "" "Tasti:\n" -"- WASD: Cammina\n" -"- Mouse left: scava blocchi\n" -"- Mouse right: piazza blocchi\n" -"- Mouse wheel: seleziona oggetto\n" -"- 0...9: seleziona oggetto\n" -"- Shift: furtivo\n" -"- R: (Dis)attiva motra tutti i blocchi caricati\n" -"- I: Inventario\n" -"- ESC: Questo menu\n" -"- T: Parla\n" +"- WASD: cammina\n" +"- Click sinistro: scava blocchi/colpisci\n" +"- Click destro: piazza blocchi/usa\n" +"- Rotellina: seleziona oggetto\n" +"- 0-9: seleziona oggetto\n" +"- Shift: abbassati\n" +"- R: (Dis)attiva mostra tutti i blocchi caricati\n" +"- I: inventario\n" +"- ESC: questo menu\n" +"- T: chat\n" #: src/keycode.cpp:223 msgid "Left Button" @@ -443,7 +439,7 @@ msgstr "Tasto destro" #: src/keycode.cpp:223 msgid "X Button 1" -msgstr "" +msgstr "Tasto X 1" #: src/keycode.cpp:224 msgid "Back" @@ -451,7 +447,7 @@ msgstr "Indietro" #: src/keycode.cpp:224 msgid "Clear" -msgstr "" +msgstr "Pulisci" #: src/keycode.cpp:224 msgid "Return" @@ -459,43 +455,43 @@ msgstr "Invio" #: src/keycode.cpp:224 msgid "Tab" -msgstr "" +msgstr "Tab" #: src/keycode.cpp:224 msgid "X Button 2" -msgstr "" +msgstr "Tasto X 2" #: src/keycode.cpp:225 msgid "Capital" -msgstr "" +msgstr "Maiuscolo" #: src/keycode.cpp:225 msgid "Control" -msgstr "" +msgstr "Ctrl" #: src/keycode.cpp:225 msgid "Kana" -msgstr "" +msgstr "Kana" #: src/keycode.cpp:225 msgid "Menu" -msgstr "" +msgstr "Menu" #: src/keycode.cpp:225 msgid "Pause" -msgstr "" +msgstr "Pausa" #: src/keycode.cpp:225 msgid "Shift" -msgstr "" +msgstr "Maiusc" #: src/keycode.cpp:226 msgid "Convert" -msgstr "" +msgstr "Converti" #: src/keycode.cpp:226 msgid "Escape" -msgstr "" +msgstr "Esc" #: src/keycode.cpp:226 msgid "Final" @@ -507,7 +503,7 @@ msgstr "" #: src/keycode.cpp:226 msgid "Kanji" -msgstr "" +msgstr "Kanji" #: src/keycode.cpp:226 msgid "Nonconvert" @@ -515,15 +511,15 @@ msgstr "" #: src/keycode.cpp:227 msgid "Accept" -msgstr "" +msgstr "Accetta" #: src/keycode.cpp:227 msgid "End" -msgstr "" +msgstr "Fine" #: src/keycode.cpp:227 msgid "Home" -msgstr "" +msgstr "Inizio" #: src/keycode.cpp:227 msgid "Mode Change" @@ -531,11 +527,11 @@ msgstr "" #: src/keycode.cpp:227 msgid "Next" -msgstr "" +msgstr "Pag Giù" #: src/keycode.cpp:227 msgid "Prior" -msgstr "" +msgstr "Pag Su" #: src/keycode.cpp:227 msgid "Space" @@ -547,11 +543,11 @@ msgstr "Giù" #: src/keycode.cpp:228 msgid "Execute" -msgstr "" +msgstr "Invio" #: src/keycode.cpp:228 msgid "Print" -msgstr "Stampa" +msgstr "Stamp" #: src/keycode.cpp:228 msgid "Select" @@ -559,15 +555,15 @@ msgstr "" #: src/keycode.cpp:228 msgid "Up" -msgstr "" +msgstr "Su" #: src/keycode.cpp:229 msgid "Help" -msgstr "" +msgstr "Aiuto" #: src/keycode.cpp:229 msgid "Insert" -msgstr "" +msgstr "Ins" #: src/keycode.cpp:229 msgid "Snapshot" @@ -575,7 +571,7 @@ msgstr "" #: src/keycode.cpp:232 msgid "Left Windows" -msgstr "" +msgstr "Windows sinistro" #: src/keycode.cpp:233 msgid "Apps" @@ -583,11 +579,11 @@ msgstr "" #: src/keycode.cpp:233 msgid "Numpad 0" -msgstr "" +msgstr "Bloc Num 0" #: src/keycode.cpp:233 msgid "Numpad 1" -msgstr "" +msgstr "Bloc Num 1" #: src/keycode.cpp:233 msgid "Right Windows" @@ -599,100 +595,99 @@ msgstr "" #: src/keycode.cpp:234 msgid "Numpad 2" -msgstr "" +msgstr "Bloc Num 2" #: src/keycode.cpp:234 msgid "Numpad 3" -msgstr "" +msgstr "Bloc Num 3" #: src/keycode.cpp:234 msgid "Numpad 4" -msgstr "" +msgstr "Bloc Num 4" #: src/keycode.cpp:234 msgid "Numpad 5" -msgstr "" +msgstr "Bloc Num 5" #: src/keycode.cpp:234 msgid "Numpad 6" -msgstr "" +msgstr "Bloc Num 6" #: src/keycode.cpp:234 msgid "Numpad 7" -msgstr "" +msgstr "Bloc Num 7" #: src/keycode.cpp:235 msgid "Numpad *" -msgstr "" +msgstr "Bloc Num *" #: src/keycode.cpp:235 msgid "Numpad +" -msgstr "" +msgstr "Bloc Num +" #: src/keycode.cpp:235 msgid "Numpad -" -msgstr "" +msgstr "Bloc Num -" #: src/keycode.cpp:235 msgid "Numpad /" -msgstr "" +msgstr "Bloc Num /" #: src/keycode.cpp:235 msgid "Numpad 8" -msgstr "" +msgstr "Bloc Num 8" #: src/keycode.cpp:235 msgid "Numpad 9" -msgstr "" +msgstr "Bloc Num 9" #: src/keycode.cpp:239 msgid "Num Lock" -msgstr "" +msgstr "Bloc Num" #: src/keycode.cpp:239 msgid "Scroll Lock" -msgstr "" +msgstr "Bloc Scorr" #: src/keycode.cpp:240 msgid "Left Shift" -msgstr "" +msgstr "Maiusc sinistro" #: src/keycode.cpp:240 -#, fuzzy msgid "Right Shift" -msgstr "Destra" +msgstr "Maiusc destro" #: src/keycode.cpp:241 msgid "Left Control" -msgstr "" +msgstr "Ctrl sinistro" #: src/keycode.cpp:241 msgid "Left Menu" -msgstr "" +msgstr "Menu sinistro" #: src/keycode.cpp:241 msgid "Right Control" -msgstr "" +msgstr "Ctrl destro" #: src/keycode.cpp:241 msgid "Right Menu" -msgstr "" +msgstr "Menu destro" #: src/keycode.cpp:243 msgid "Comma" -msgstr "" +msgstr "Virgola" #: src/keycode.cpp:243 msgid "Minus" -msgstr "" +msgstr "Meno" #: src/keycode.cpp:243 msgid "Period" -msgstr "" +msgstr "Punto" #: src/keycode.cpp:243 msgid "Plus" -msgstr "" +msgstr "Più" #: src/keycode.cpp:247 msgid "Attn" @@ -724,33 +719,35 @@ msgstr "" #: src/main.cpp:1384 msgid "Main Menu" -msgstr "" +msgstr "Menu principale" #: src/main.cpp:1633 msgid "Failed to initialize world" -msgstr "" +msgstr "Fallimento nell'inizializzare il mondo" #: src/main.cpp:1645 msgid "No world selected and no address provided. Nothing to do." -msgstr "" +msgstr "Nessun mondo selezionato e nessun indirizzo fornito. Niente da fare." #: src/main.cpp:1653 msgid "Could not find or load game \"" -msgstr "" +msgstr "Impossibile trovare o caricare il gioco \"" #: src/main.cpp:1667 msgid "Invalid gamespec." -msgstr "" +msgstr "Gamespec invalide." #: src/main.cpp:1707 msgid "Connection error (timed out?)" -msgstr "" +msgstr "Errore connessione (tempo scaduto?)" #: src/main.cpp:1718 msgid "" "\n" "Check debug.txt for details." msgstr "" +"\n" +"Controlla debug.txt per i dettagli." #~ msgid "Delete map" #~ msgstr "Cancella mappa" From 3e9ed6c1c7d95403f67d5bdfc7c60408e61f56ee Mon Sep 17 00:00:00 2001 From: Mitori Itoshiki Date: Thu, 7 Mar 2013 23:06:29 +0100 Subject: [PATCH 21/30] Translated using Weblate (Japanese) --- po/ja/minetest.po | 153 ++++++++++++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 59 deletions(-) diff --git a/po/ja/minetest.po b/po/ja/minetest.po index 1d487231a..be0ea8b61 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-30 20:25+0100\n" -"PO-Revision-Date: 2013-03-06 05:12+0200\n" -"Last-Translator: c h \n" +"PO-Revision-Date: 2013-03-07 23:06+0200\n" +"Last-Translator: Mitori Itoshiki \n" "Language-Team: LANGUAGE \n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -69,7 +69,7 @@ msgstr "設定を保存しました. " #: src/guiConfigureWorld.cpp:402 msgid "Warning: Configuration not consistent. " -msgstr "警告：設定が一定でわありません。" +msgstr "注意：設定が一定でわありません。" #: src/guiConfirmMenu.cpp:120 msgid "Yes" @@ -89,7 +89,7 @@ msgstr "ゲーム" #: src/guiCreateWorld.cpp:159 msgid "Create" -msgstr "作る" +msgstr "作成" #: src/guiDeathScreen.cpp:96 msgid "You died." @@ -110,15 +110,15 @@ msgstr "続く" #: src/guiKeyChangeMenu.cpp:114 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" -msgstr "" +msgstr "キーバインド" #: src/guiKeyChangeMenu.cpp:151 msgid "\"Use\" = climb down" -msgstr "" +msgstr "「使う」は下りる" #: src/guiKeyChangeMenu.cpp:164 msgid "Double tap \"jump\" to toggle fly" -msgstr "" +msgstr "「ジャンプ」を二回押すと飛べる" #: src/guiKeyChangeMenu.cpp:269 msgid "Key already in use" @@ -178,15 +178,15 @@ msgstr "コンソール" #: src/guiKeyChangeMenu.cpp:384 msgid "Toggle fly" -msgstr "" +msgstr "飛べるモードをトグル" #: src/guiKeyChangeMenu.cpp:385 msgid "Toggle fast" -msgstr "" +msgstr "ファストモードをトグル" #: src/guiKeyChangeMenu.cpp:386 msgid "Toggle noclip" -msgstr "" +msgstr "ノクリップモードをトグル" #: src/guiKeyChangeMenu.cpp:387 msgid "Range select" @@ -242,7 +242,7 @@ msgstr "設定" #: src/guiMainMenu.cpp:332 src/keycode.cpp:248 msgid "Play" -msgstr "" +msgstr "選択した世界に入る" #: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 msgid "Creative Mode" @@ -262,11 +262,11 @@ msgstr "アドレス/ポート" #: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 msgid "Show Public" -msgstr "" +msgstr "公共を見せる" #: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 msgid "Show Favorites" -msgstr "" +msgstr "お気に入りを見せる" #: src/guiMainMenu.cpp:459 msgid "Connect" @@ -274,7 +274,7 @@ msgstr "接続" #: src/guiMainMenu.cpp:529 msgid "Leave address blank to start a local server." -msgstr "" +msgstr "アドレスを入力しないかぎりロカルサーバーを開始。" #: src/guiMainMenu.cpp:538 msgid "Start Game / Connect" @@ -289,9 +289,8 @@ msgid "Create world" msgstr "ワールド作成" #: src/guiMainMenu.cpp:611 -#, fuzzy msgid "Fancy trees" -msgstr "風変わりな木" +msgstr "きれいな木" #: src/guiMainMenu.cpp:617 #, fuzzy @@ -415,15 +414,15 @@ msgstr "" #: src/keycode.cpp:223 msgid "Left Button" -msgstr "" +msgstr "左ボタン" #: src/keycode.cpp:223 msgid "Middle Button" -msgstr "" +msgstr "中ボタン" #: src/keycode.cpp:223 msgid "Right Button" -msgstr "" +msgstr "右ボタン" #: src/keycode.cpp:223 msgid "X Button 1" @@ -435,7 +434,7 @@ msgstr "Back Space" #: src/keycode.cpp:224 msgid "Clear" -msgstr "" +msgstr "消す" #: src/keycode.cpp:224 msgid "Return" @@ -463,7 +462,7 @@ msgstr "カタカナ/ひらがな" #: src/keycode.cpp:225 msgid "Menu" -msgstr "" +msgstr "メニュー" #: src/keycode.cpp:225 msgid "Pause" @@ -498,8 +497,9 @@ msgid "Nonconvert" msgstr "無変換" #: src/keycode.cpp:227 +#, fuzzy msgid "Accept" -msgstr "" +msgstr "Accept" #: src/keycode.cpp:227 msgid "End" @@ -511,7 +511,7 @@ msgstr "Home" #: src/keycode.cpp:227 msgid "Mode Change" -msgstr "" +msgstr "モードを変更" #: src/keycode.cpp:227 msgid "Next" @@ -522,112 +522,138 @@ msgid "Prior" msgstr "Page Up" #: src/keycode.cpp:227 +#, fuzzy msgid "Space" -msgstr "" +msgstr "Space" #: src/keycode.cpp:228 +#, fuzzy msgid "Down" -msgstr "" +msgstr "Down" #: src/keycode.cpp:228 +#, fuzzy msgid "Execute" -msgstr "" +msgstr "Execute" #: src/keycode.cpp:228 +#, fuzzy msgid "Print" -msgstr "" +msgstr "Print" #: src/keycode.cpp:228 +#, fuzzy msgid "Select" -msgstr "" +msgstr "Select" #: src/keycode.cpp:228 +#, fuzzy msgid "Up" -msgstr "" +msgstr "Up" #: src/keycode.cpp:229 +#, fuzzy msgid "Help" -msgstr "" +msgstr "Help" #: src/keycode.cpp:229 msgid "Insert" msgstr "Insert" #: src/keycode.cpp:229 +#, fuzzy msgid "Snapshot" -msgstr "" +msgstr "Snapshot" #: src/keycode.cpp:232 +#, fuzzy msgid "Left Windows" -msgstr "" +msgstr "Left Windows" #: src/keycode.cpp:233 +#, fuzzy msgid "Apps" -msgstr "" +msgstr "Apps" #: src/keycode.cpp:233 +#, fuzzy msgid "Numpad 0" -msgstr "" +msgstr "Numpad 0" #: src/keycode.cpp:233 +#, fuzzy msgid "Numpad 1" -msgstr "" +msgstr "Numpad 1" #: src/keycode.cpp:233 +#, fuzzy msgid "Right Windows" -msgstr "" +msgstr "Right Windows" #: src/keycode.cpp:233 +#, fuzzy msgid "Sleep" -msgstr "" +msgstr "Sleep" #: src/keycode.cpp:234 +#, fuzzy msgid "Numpad 2" -msgstr "" +msgstr "Numpad 2" #: src/keycode.cpp:234 +#, fuzzy msgid "Numpad 3" -msgstr "" +msgstr "Numpad 3" #: src/keycode.cpp:234 +#, fuzzy msgid "Numpad 4" -msgstr "" +msgstr "Numpad 4" #: src/keycode.cpp:234 +#, fuzzy msgid "Numpad 5" -msgstr "" +msgstr "Numpad 5" #: src/keycode.cpp:234 +#, fuzzy msgid "Numpad 6" -msgstr "" +msgstr "Numpad 6" #: src/keycode.cpp:234 +#, fuzzy msgid "Numpad 7" -msgstr "" +msgstr "Numpad 7" #: src/keycode.cpp:235 +#, fuzzy msgid "Numpad *" -msgstr "" +msgstr "Numpad *" #: src/keycode.cpp:235 +#, fuzzy msgid "Numpad +" -msgstr "" +msgstr "Numpad +" #: src/keycode.cpp:235 +#, fuzzy msgid "Numpad -" -msgstr "" +msgstr "Numpad -" #: src/keycode.cpp:235 +#, fuzzy msgid "Numpad /" -msgstr "" +msgstr "Numpad /" #: src/keycode.cpp:235 +#, fuzzy msgid "Numpad 8" -msgstr "" +msgstr "Numpad 8" #: src/keycode.cpp:235 +#, fuzzy msgid "Numpad 9" -msgstr "" +msgstr "Numpad 9" #: src/keycode.cpp:239 msgid "Num Lock" @@ -663,43 +689,52 @@ msgstr "右メニュー" #: src/keycode.cpp:243 msgid "Comma" -msgstr "" +msgstr "読点" #: src/keycode.cpp:243 +#, fuzzy msgid "Minus" -msgstr "" +msgstr "Minus" #: src/keycode.cpp:243 +#, fuzzy msgid "Period" -msgstr "" +msgstr "Period" #: src/keycode.cpp:243 +#, fuzzy msgid "Plus" -msgstr "" +msgstr "Plus" #: src/keycode.cpp:247 +#, fuzzy msgid "Attn" -msgstr "" +msgstr "Attn" #: src/keycode.cpp:247 +#, fuzzy msgid "CrSel" -msgstr "" +msgstr "CrSel" #: src/keycode.cpp:248 +#, fuzzy msgid "Erase OEF" -msgstr "" +msgstr "Erase OEF" #: src/keycode.cpp:248 +#, fuzzy msgid "ExSel" -msgstr "" +msgstr "ExSel" #: src/keycode.cpp:248 +#, fuzzy msgid "OEM Clear" -msgstr "" +msgstr "OEM Clear" #: src/keycode.cpp:248 +#, fuzzy msgid "PA1" -msgstr "" +msgstr "PA1" #: src/keycode.cpp:248 msgid "Zoom" From 062a140b9c3f82c020f3ce6eb303ad27b701baef Mon Sep 17 00:00:00 2001 From: Anton Tsyganenko Date: Thu, 28 Mar 2013 15:29:43 +0100 Subject: [PATCH 22/30] Translated using Weblate (Russian) --- po/ru/minetest.po | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 670bba570..6acc42f8c 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-23 18:24+0200\n" -"PO-Revision-Date: 2013-03-09 14:28+0200\n" -"Last-Translator: 4aiman Konsorumaniakku <4aiman@inbox.ru>\n" +"PO-Revision-Date: 2013-03-28 15:29+0200\n" +"Last-Translator: Anton Tsyganenko \n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -196,8 +196,9 @@ msgid "Range select" msgstr "Выбор зоны видимости" #: src/guiKeyChangeMenu.cpp:388 +#, fuzzy msgid "Print stacks" -msgstr "" +msgstr "напечатать стеки" #: src/guiMainMenu.cpp:55 msgid "Cannot create world: Name contains invalid characters" @@ -213,7 +214,7 @@ msgstr "Одиночная игра" #: src/guiMainMenu.cpp:246 msgid "Multiplayer" -msgstr "Сетевая игра" +msgstr "Многопользовательская игра" #: src/guiMainMenu.cpp:247 msgid "Advanced" @@ -225,7 +226,7 @@ msgstr "Настройки" #: src/guiMainMenu.cpp:249 msgid "Credits" -msgstr "Об авторах" +msgstr "Благодарности" #: src/guiMainMenu.cpp:280 msgid "Select World:" @@ -249,11 +250,11 @@ msgstr "Играть" #: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 msgid "Creative Mode" -msgstr "Режим Творчества" +msgstr "Режим создания" #: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 msgid "Enable Damage" -msgstr "Получение повреждений" +msgstr "Включить повреждения" #: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 msgid "Name/Password" @@ -398,7 +399,7 @@ msgstr "Выход в меню" #: src/guiPauseMenu.cpp:142 msgid "Exit to OS" -msgstr "Выход в реальность" +msgstr "Выход в ОС" #: src/guiPauseMenu.cpp:149 msgid "" @@ -417,7 +418,7 @@ msgstr "" "Управление по умолчанию:\n" "- WASD: перемещение\n" "- ЛКМ: копать/ударить\n" -"- ПКМ: строить/использовать\n" +"- ПКМ: поставить/использовать\n" "- Колесо мыши: выбор предмета\n" "- 0...9: выбор предмета\n" "- Shift: красться\n" @@ -444,7 +445,7 @@ msgstr "Доп. кнопка 1" #: src/keycode.cpp:224 msgid "Back" -msgstr "Backspace" +msgstr "назад" #: src/keycode.cpp:224 msgid "Clear" @@ -452,11 +453,12 @@ msgstr "Очистить" #: src/keycode.cpp:224 msgid "Return" -msgstr "Ввод" +msgstr "Вернуться" #: src/keycode.cpp:224 +#, fuzzy msgid "Tab" -msgstr "Табуляция" +msgstr "Tab" #: src/keycode.cpp:224 msgid "X Button 2" @@ -476,7 +478,7 @@ msgstr "Кана" #: src/keycode.cpp:225 msgid "Menu" -msgstr "Alt" +msgstr "меню" #: src/keycode.cpp:225 msgid "Pause" @@ -576,7 +578,7 @@ msgstr "Insert" #: src/keycode.cpp:229 msgid "Snapshot" -msgstr "" +msgstr "снимок" #: src/keycode.cpp:232 msgid "Left Windows" @@ -674,7 +676,7 @@ msgstr "Левый Ctrl" #: src/keycode.cpp:241 msgid "Left Menu" -msgstr "Левый Alt" +msgstr "Левая клавиша меню" #: src/keycode.cpp:241 msgid "Right Control" @@ -682,7 +684,7 @@ msgstr "Правый Ctrl" #: src/keycode.cpp:241 msgid "Right Menu" -msgstr "Правый Alt" +msgstr "Правая клавиша меню" #: src/keycode.cpp:243 msgid "Comma" @@ -693,16 +695,18 @@ msgid "Minus" msgstr "Минус" #: src/keycode.cpp:243 +#, fuzzy msgid "Period" -msgstr "" +msgstr "период" #: src/keycode.cpp:243 msgid "Plus" msgstr "Плюс" #: src/keycode.cpp:247 +#, fuzzy msgid "Attn" -msgstr "" +msgstr "внимание" #: src/keycode.cpp:247 msgid "CrSel" From 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 Mon Sep 17 00:00:00 2001 From: Lord James Date: Tue, 19 Mar 2013 04:31:51 +0100 Subject: [PATCH 23/30] Translated using Weblate (Spanish) --- po/es/minetest.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/es/minetest.po b/po/es/minetest.po index 70b7daf06..9fdfc89ce 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-23 18:24+0200\n" -"PO-Revision-Date: 2013-02-07 22:14+0200\n" -"Last-Translator: Francizca Rodriguez \n" +"PO-Revision-Date: 2013-03-19 04:31+0200\n" +"Last-Translator: Lord James \n" "Language-Team: LANGUAGE \n" "Language: es\n" "MIME-Version: 1.0\n" @@ -48,11 +48,11 @@ msgstr "Desactivar todos" #: src/guiConfigureWorld.cpp:228 msgid "depends on:" -msgstr "Dependencia:" +msgstr "Dependencias:" #: src/guiConfigureWorld.cpp:240 msgid "is required by:" -msgstr "Requiere:" +msgstr "es dependencia de:" #: src/guiConfigureWorld.cpp:262 src/guiCreateWorld.cpp:165 #: src/guiKeyChangeMenu.cpp:179 src/keycode.cpp:223 @@ -217,7 +217,7 @@ msgstr "Multijugador" #: src/guiMainMenu.cpp:247 msgid "Advanced" -msgstr "Server" +msgstr "Servidor" #: src/guiMainMenu.cpp:248 msgid "Settings" @@ -651,15 +651,15 @@ msgstr "Bloq Despl" #: src/keycode.cpp:240 msgid "Left Shift" -msgstr "Mayúscula Izquierda" +msgstr "Mayús Izqda" #: src/keycode.cpp:240 msgid "Right Shift" -msgstr "Mayúscula Derecha" +msgstr "Mayús Dcha" #: src/keycode.cpp:241 msgid "Left Control" -msgstr "Control Izquierdo" +msgstr "Control Izqdo" #: src/keycode.cpp:241 msgid "Left Menu" @@ -667,7 +667,7 @@ msgstr "Menú Izquierda" #: src/keycode.cpp:241 msgid "Right Control" -msgstr "Control Derecho" +msgstr "Control Dcho" #: src/keycode.cpp:241 msgid "Right Menu" From 02d8df94a817a6a2bb1050954260905e6e91b5d5 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 30 Mar 2013 19:57:27 +0100 Subject: [PATCH 24/30] Update po files --- po/da/minetest.po | 148 ++++++++++++++++++++++++----------------- po/de/minetest.po | 150 +++++++++++++++++++++++++----------------- po/es/minetest.po | 147 ++++++++++++++++++++++++----------------- po/et/minetest.po | 148 ++++++++++++++++++++++++----------------- po/fr/minetest.po | 144 ++++++++++++++++++++++++---------------- po/it/minetest.po | 148 ++++++++++++++++++++++++----------------- po/ja/minetest.po | 144 ++++++++++++++++++++++++---------------- po/ko/minetest.po | 142 ++++++++++++++++++++++++---------------- po/minetest.pot | 142 ++++++++++++++++++++++++---------------- po/pl/minetest.po | 144 ++++++++++++++++++++++++---------------- po/pt/minetest.po | 144 ++++++++++++++++++++++++---------------- po/ro/minetest.po | 142 ++++++++++++++++++++++++---------------- po/ru/minetest.po | 152 ++++++++++++++++++++++++++----------------- po/zh_CN/minetest.po | 144 ++++++++++++++++++++++++---------------- 14 files changed, 1226 insertions(+), 813 deletions(-) diff --git a/po/da/minetest.po b/po/da/minetest.po index ae351b188..a3483d11c 100644 --- a/po/da/minetest.po +++ b/po/da/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 20:25+0100\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-02-17 00:41+0200\n" "Last-Translator: Rune Biskopstö Christensen \n" "Language-Team: \n" @@ -99,20 +99,20 @@ msgstr "Du døde." msgid "Respawn" msgstr "Genopstå" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "Venstre klik: flyt alle enheder. Højre klik: flyt en enkelt enhed" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "Fortsæt" #: src/guiKeyChangeMenu.cpp:114 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" -"Tastebindinger. (Hvis denne menu fucker op, fjern elementer fra " -"minetest.conf)" +"Tastebindinger. (Hvis denne menu fucker op, fjern elementer fra minetest." +"conf)" #: src/guiKeyChangeMenu.cpp:151 msgid "\"Use\" = climb down" @@ -200,167 +200,185 @@ msgstr "Afstands vælg" msgid "Print stacks" msgstr "Udskriv stakke" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "Kan ikke skabe verden: navnet indeholder ugyldige bogstaver" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "Kan ikke skabe verden: en verden med dette navn eksisterer allerede" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "Enligspiller" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "Flerspiller" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "Avanceret" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "Indstillinger" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "Skabt af" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "Vælg verden:" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "Slet" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "Ny" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "Konfigurér" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "Afspil" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "Kreativ tilstand" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "Aktivér skade" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "Navn/kodeord" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "Vis favoritter" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "Adresse/port" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "Vis offentlig" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "Vis favoritter" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "Forbind" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "Lad adresse-feltet være tomt for at starte en lokal server." -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "Start spil / Forbind" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "Vis offentlig" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "Slet verden" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "Skab verden" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "\"Smarte\" træer" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "Glat belysning" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "3D skyer" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "Opakt (uigennemsigtigt) vand" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "Mip-mapping" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "Anisotropisk filtréring" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "Bi-lineær filtréring" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "Tri-lineær filtréring" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "Shadere" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "For-indlæs elementernes grafik" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "Aktivér partikler" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "Skift bindinger" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "Adresse påkrævet." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "Kan ikke slette verden: ingenting valgt" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "Filer som slettes" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "Kan ikke skabe verden: ingen spil fundet" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "Kan ikke konfigurere verden: ingenting valgt" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "Mislykkedes i at slette alle verdenens filer" @@ -384,23 +402,27 @@ msgstr "Skift" msgid "Passwords do not match!" msgstr "Kodeordene er ikke ens!" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "Fortsæt" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "Skift kodeord" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "Afslut til menu" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "Afslut til operativsystemet" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -426,6 +448,14 @@ msgstr "" "- ESC: denne menu\n" "- T: snak\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "Venstre knap" @@ -721,31 +751,31 @@ msgstr "PA1" msgid "Zoom" msgstr "Zoom" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "Hovedmenu" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "Mislykkedes i at initialisere verden" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "Ingen verden valgt og ingen adresse angivet. Ingen opgave at lave." -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "Kunne ikke finde eller indlæse spil \"" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "Ugyldig spilspecifikationer." -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "Forbindelses fejl (udløbelse af tidsfrist?)" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/de/minetest.po b/po/de/minetest.po index 35f0060f5..8e3584f03 100644 --- a/po/de/minetest.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: 2013-01-23 18:24+0200\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-02-21 17:34+0200\n" "Last-Translator: Sfan5 . \n" "Language-Team: Deutsch <>\n" @@ -99,12 +99,12 @@ msgstr "Sie sind gestorben." msgid "Respawn" msgstr "Wiederbeleben" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "Linksklick: Alle Items bewegen, Rechtsklick: Einzelnes Item bewegen" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "Fortsetzen" @@ -196,168 +196,186 @@ msgstr "Entfernung wählen" msgid "Print stacks" msgstr "Stack ausgeben" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "Kann Welt nicht erstellen: Name enthält ungülige Zeichen" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "" "Kann Welt nicht erstellen: Eine Welt mit diesem Namen existiert bereits" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "Einzelspieler" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "Mehrspieler" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "Erweitert" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "Einstellungen" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "Credits" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "Welt wählen:" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "Entfernen" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "Neu" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "Konfigurieren" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "Spielen" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "Kreativitätsmodus" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "Schaden einschalten" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "Name/Passwort" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "Zeige Favoriten" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "Adresse / Port" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "Zeige öffentliche" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "Zeige Favoriten" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "Verbinden" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "Lasse die Adresse frei um einen eigenen Server zu starten." -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "Spiel starten / Verbinden" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "Zeige öffentliche" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "Welt löschen" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "Welt erstellen" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "Schöne Bäume" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "Besseres Licht" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "3D Wolken" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "Undurchs. Wasser" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "Mip-Mapping" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "Anisotroper Filter" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "Bi-Linearer Filter" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "Tri-Linearer Filter" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "Shader" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "Lade Inventarbilder vor" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "Aktiviere Partikel" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "Tasten ändern" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "Adresse benötigt." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "Kann Welt nicht löschen: Nichts ausgewählt" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "Zu löschende Dateien" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "Kann Welt nicht erstellen: Keine Spiele gefunden" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "Welt Dateien löschen gescheitert" @@ -381,23 +399,27 @@ msgstr "Ändern" msgid "Passwords do not match!" msgstr "Passwörter passen nicht zusammen!" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "Weiter" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "Passwort ändern" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "Hauptmenü" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "Programm beenden" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -422,6 +444,14 @@ msgstr "" "- I: Inventar\n" "- T: Chat\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "Linke Taste" @@ -714,31 +744,31 @@ msgstr "PA1" msgid "Zoom" msgstr "Zoom" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "Hauptmenü" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "Kann Welt nicht initialisieren" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "Keine Welt ausgewählt und keine Adresse angegeben. Nichts zu tun." -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "Kann Spiel nicht finden/laden\"" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "Invalide Spielspezif." -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "Verbindungsfehler (Zeitüberschreitung?)" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." @@ -746,8 +776,8 @@ msgstr "" "\n" "Siehe debug.txt für Details." -#~ msgid "KEYBINDINGS" -#~ msgstr "TASTEN EINST." - #~ msgid "Delete map" #~ msgstr "Karte löschen" + +#~ msgid "KEYBINDINGS" +#~ msgstr "TASTEN EINST." diff --git a/po/es/minetest.po b/po/es/minetest.po index 9fdfc89ce..8240bdae5 100644 --- a/po/es/minetest.po +++ b/po/es/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-23 18:24+0200\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-03-19 04:31+0200\n" "Last-Translator: Lord James \n" "Language-Team: LANGUAGE \n" @@ -99,13 +99,13 @@ msgstr "Estas Muerto." msgid "Respawn" msgstr "Respawn" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "" "Click izquierdo: Mover todos los objetos. Click derecho: Mover un objeto." -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "Continuar" @@ -199,167 +199,185 @@ msgstr "Seleccionar rango" msgid "Print stacks" msgstr "Imprimir Stacks" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "No se puede crear el mundo: El nombre contiene caracteres no válidos" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "No se puede crear el mundo: Hay un mundo con este nombre" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "Un jugador" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "Multijugador" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "Servidor" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "Configuración" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "Créditos" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "Selecciona un mundo:" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "Borrar" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "Nuevo" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "Configurar" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "Jugar" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "Modo creativo" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "Permitir daños" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "Nombre/Clave" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "Mostrar Favoritos" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "Dirección/Puerto" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "Servidores Públicos" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "Mostrar Favoritos" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "Conectar" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "Dejar la dirección en blanco para iniciar un servidor local." -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "Iniciar juego/Conectar" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "Servidores Públicos" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "Eliminar Mundo" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "Crear Mundo" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "Árboles detallados" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "Iluminación Suave" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "Nubes 3D" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "Agua Opaca" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "Mip-Mapping" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "Filtrado Anisotrópico" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "Filtrado Bi-Lineal" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "Filtrado Tri-Lineal" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "Habilitar Shaders" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "Precarga elementos visuales" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "Partículas" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "Configurar Teclas" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "Requiere una dirección." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "No se puede eliminar el mundo: ninguno ha sido seleccionado" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "Archivos que se eliminarán" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "No se puede crear el mundo: No se encontraron juegos" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "No se puede configurar el mundo: Ninguno seleccionado" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "No se pudo eliminar todos los archivos del mundo" @@ -383,23 +401,27 @@ msgstr "Cambiar" msgid "Passwords do not match!" msgstr "¡Las contraseñas no coinciden!" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "Continuar" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "Modificar contraseña" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "Salir al menú" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "Salir al S.O." -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -425,6 +447,14 @@ msgstr "" "- ESC: Este Menu\n" "- T: Chat\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "Click Izquierdo" @@ -717,33 +747,32 @@ msgstr "PA1" msgid "Zoom" msgstr "Zoom" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "Menú Principal" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "Fallo al iniciar el mundo" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "" -"No se seleccionó mundo y no se ha especificado una dirección. Nada que " -"hacer." +"No se seleccionó mundo y no se ha especificado una dirección. Nada que hacer." -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "No se puede encontrar o cargar el juego \"" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "Juego especificado no válido." -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "Error de conexión (¿tiempo agotado?)" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/et/minetest.po b/po/et/minetest.po index fcdbe7eb3..747f5ff4a 100644 --- a/po/et/minetest.po +++ b/po/et/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 20:25+0100\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-03-07 09:48+0200\n" "Last-Translator: Ragnar Laud \n" "Language-Team: LANGUAGE \n" @@ -99,21 +99,21 @@ msgstr "Sa surid." msgid "Respawn" msgstr "Ärka ellu" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "" "Vasak hiireklõps: Liiguta kõiki asju, Parem hiireklõps: Liiguta üksikut asja" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "Jätka" #: src/guiKeyChangeMenu.cpp:114 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" -"Nupusätted. (Kui see menüü sassi läheb, siis kustuta asju failist " -"minetest.conf)" +"Nupusätted. (Kui see menüü sassi läheb, siis kustuta asju failist minetest." +"conf)" #: src/guiKeyChangeMenu.cpp:151 msgid "\"Use\" = climb down" @@ -199,167 +199,185 @@ msgstr "Kauguse valik" msgid "Print stacks" msgstr "Prindi kogused" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "Maailma loomine ebaõnnestus: Nimes esineb keelatud tähti" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "Maailma loomine ebaõnnestus: Samanimeline maailm on juba olemas" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "Üksikmäng" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "Mitmikmäng" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "Arenenud sätted" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "Sätted" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "Tänuavaldused" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "Vali maailm:" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "Kustuta" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "Uus" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "Konfigureeri" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "Mängi" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "Kujunduslik mängumood" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "Lülita valu sisse" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "Nimi/Parool" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "Näita lemmikuid" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "IP/Port" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "Näita avalikke" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "Näita lemmikuid" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "Liitu" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "Jäta IP lahter tühjaks et alustada LAN serverit." -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "Alusta mängu / Liitu" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "Näita avalikke" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "Kustuta maailm" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "Loo maailm" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "Uhked puud" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "Ilus valgustus" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "3D pilved" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "Läbipaistmatu vesi" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "Väga hea kvaliteet" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "Anisotroopne Filtreerimine" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "Bi-lineaarsed Filtreerimine" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "Tri-Linear Filtreerimine" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "Varjutajad" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "Lae asjade visuaale" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "Lülita osakesed sisse" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "Vaheta nuppe" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "IP on vajalkik." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "Maailma kustutamine ebaõnnestus: Maailma pole valitud" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "Failid mida kustutada" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "Maailma loomine ebaõnnestus: Mängu ei leitud" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "Maailma konfigureerimine ebaõnnestus: Pole midagi valitud" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "Kõigi maailma failide kustutamine ebaõnnestus" @@ -383,23 +401,27 @@ msgstr "Muuda" msgid "Passwords do not match!" msgstr "Paroolid ei ole samad!" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "Jätka" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "Vaheta parooli" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "Välju menüüsse" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "Välju mängust" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -425,6 +447,14 @@ msgstr "" "- ESC: Menüü\n" "- T: Jututupa\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "Vasak nupp" @@ -720,31 +750,31 @@ msgstr "" msgid "Zoom" msgstr "" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "" -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "" -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/fr/minetest.po b/po/fr/minetest.po index 051bc1b70..4d4b54ab3 100644 --- a/po/fr/minetest.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: 2013-01-23 18:24+0200\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-02-28 17:44+0200\n" "Last-Translator: we prefer instagib metl3 \n" "Language-Team: Français <>\n" @@ -99,12 +99,12 @@ msgstr "Vous êtes mort." msgid "Respawn" msgstr "Réapparaître" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "Clic gauche: déplacer tous les objets -- Clic droit: déplacer un objet" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "OK" @@ -196,167 +196,185 @@ msgstr "Distance de rendu" msgid "Print stacks" msgstr "Imprimer stacks" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "Impossible de créer le monde: le nom contient des caractères invalides" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "Impossible de créer le monde: ce nom est déjà utilisé" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "Solo" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "Multijoueur" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "Avancé" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "Réglages" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "Crédits" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "Sélectionner le monde :" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "Supprimer" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "Nouveau" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "Configurer" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "Jouer" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "Mode créatif" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "Activer blessures" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "Nom / MdP" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "Voir serveurs favoris" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "Adresse / Port" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "Voir serveurs publics" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "Voir serveurs favoris" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "Rejoindre" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "Laisser l'adresse vide pour lancer un serveur local." -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "Démarrer / Connecter" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "Voir serveurs publics" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "Supprimer monde" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "Créer un monde" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "Arbres spéciaux" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "Lumière douce" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "Nuages 3D" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "Eau opaque" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "Mip-mapping" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "Filtrage anisotropique" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "Filtrage bilinéaire" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "Filtrage trilinéaire" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "Shaders" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "Précharger les visuels d'objets" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "Activer les particules" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "Changer touches" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "Adresse requise." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "Impossible de supprimer le monde : rien n'est sélectionné" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "Fichiers à effacer" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "Impossible de créer le monde : aucun jeu n'est présent" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "Impossible de configurer ce monde : aucune sélection active" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "Tous les fichiers du monde n'ont pu être effacés" @@ -380,23 +398,27 @@ msgstr "Changer" msgid "Passwords do not match!" msgstr "Mot de passe incorrect !" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "Continuer" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "Changer mot de passe" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "Quitter vers le menu" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "Quitter le jeu" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -421,6 +443,14 @@ msgstr "" "- I : inventaire\n" "- T : parler\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "Bouton gauche" @@ -713,31 +743,31 @@ msgstr "PA1" msgid "Zoom" msgstr "Zoomer" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "Menu principal" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "Le monde n'a pas pu être initialisé" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "Pas de monde sélectionné et pas d'adresse. Rien à faire." -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "N'a pas pu trouver ou charger le jeu \"" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "gamespec invalide." -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "Erreur de connexion (perte de connexion ?)" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/it/minetest.po b/po/it/minetest.po index d5e0ed2c2..1906d17fb 100644 --- a/po/it/minetest.po +++ b/po/it/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-23 18:24+0200\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-03-30 11:04+0200\n" "Last-Translator: Fabio Luongo \n" "Language-Team: Italian\n" @@ -99,21 +99,21 @@ msgstr "Sei morto." msgid "Respawn" msgstr "Ricomincia" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "" "Click sinistro: muovi tutti gli oggetti; click destro: muovi un solo oggetto" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "Procedi" #: src/guiKeyChangeMenu.cpp:114 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" -"Associazione tasti. (Se questo menu si incasina, rimuovi la roba da " -"minetest.conf)" +"Associazione tasti. (Se questo menu si incasina, rimuovi la roba da minetest." +"conf)" #: src/guiKeyChangeMenu.cpp:151 msgid "\"Use\" = climb down" @@ -199,167 +199,185 @@ msgstr "Distanza di rendering" msgid "Print stacks" msgstr "Stampa stack" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "Impossibile creare il mondo: il nome contiene caratteri non validi" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "Impossibile creare il mondo: un mondo con questo nome già esiste" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "Giocatore singolo" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "Multigiocatore" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "Avanzato" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "Opzioni" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "Crediti" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "Seleziona mondo:" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "Cancella" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "Nuovo" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "Configura" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "Gioca" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "Modalità creativa" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "Attiva danno" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "Nome/Password" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "Mostra preferiti" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "Indirizzo/Porta" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "Lista server pubblici" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "Mostra preferiti" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "Connetti" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "Lascia vuoto l'indirizzo per avviare un server locale." -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "Avvia gioco/Connetti" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "Lista server pubblici" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "Cancella il mondo" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "Crea mondo" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "Alberi migliori" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "Luce uniforme" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "Nuvole 3D" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "Acqua opaca" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "Mipmapping" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "Filtro anisotropico" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "Filtro bilineare" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "Filtro trilineare" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "Shader" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "Pre-carica le immagini degli oggetti" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "Attiva particelle" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "Modifica tasti" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "Indirizzo necessario." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "Impossibile eliminare il mondo: nessun mondo selezionato" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "File da eliminarsi" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "Impossibile creare il mondo: nessun gioco trovato" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "Impossibile configurare il mondo: nessun mondo selezionato" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "Eliminazione di tutti i file del mondo fallita" @@ -383,23 +401,27 @@ msgstr "Modifica" msgid "Passwords do not match!" msgstr "Le password non corrispondono!" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "Continua" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "Cambia password" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "Torna al menu" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "Torna al S.O." -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -425,6 +447,14 @@ msgstr "" "- ESC: questo menu\n" "- T: chat\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "Tasto sinistro" @@ -717,31 +747,31 @@ msgstr "" msgid "Zoom" msgstr "" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "Menu principale" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "Fallimento nell'inizializzare il mondo" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "Nessun mondo selezionato e nessun indirizzo fornito. Niente da fare." -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "Impossibile trovare o caricare il gioco \"" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "Gamespec invalide." -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "Errore connessione (tempo scaduto?)" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/ja/minetest.po b/po/ja/minetest.po index be0ea8b61..48c597570 100644 --- a/po/ja/minetest.po +++ b/po/ja/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 20:25+0100\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-03-07 23:06+0200\n" "Last-Translator: Mitori Itoshiki \n" "Language-Team: LANGUAGE \n" @@ -99,12 +99,12 @@ msgstr "死亡しました。" msgid "Respawn" msgstr "リスポーン" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "左クリックは全部のアイテムを動かす,右クリックは一つのアイテムを動かす" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "続く" @@ -196,168 +196,186 @@ msgstr "範囲選択" msgid "Print stacks" msgstr "スタックの表示" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "ワールドを作成できません: 名前に無効な文字が含まれています" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "ワールドを作成できません: 同名のワールドが既に存在しています" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "シングルプレイヤー" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "マルチプレイヤー" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "高度" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "設定" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "クレジット" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "ワールド選択:" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "削除" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "新規作成" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "設定" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "選択した世界に入る" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "クリエイティブモード" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "ダメージ有効" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "名前/パスワード" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "お気に入りを見せる" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "アドレス/ポート" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "公共を見せる" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "お気に入りを見せる" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "接続" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "アドレスを入力しないかぎりロカルサーバーを開始。" -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "ゲーム開始 / 接続" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "公共を見せる" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "ワールド削除" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "ワールド作成" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "きれいな木" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 #, fuzzy msgid "Smooth Lighting" msgstr "自然な光表現" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "3Dの雲" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "不透明な水面" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "ミップマップ" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "異方性フィルタリング" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "バイリニアフィルタリング" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "トリリニアフィルタリング" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "シェーダー" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "アイテム外観のプリロード" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "破片表現の有効化" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "キー割当て変更" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "アドレスが必要です." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "ワールドを削除できません: 何も選択されていません" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "削除されるファイル" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "ワールドを作成できません: ゲームが見つかりませんでした" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "ワールドの設定ができません: 何も選択されていません" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "ワールドファイルの全ての削除に失敗" @@ -381,23 +399,27 @@ msgstr "変更" msgid "Passwords do not match!" msgstr "新しいパスワードが一致しません!" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "続ける" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "パスワードの変更" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "メニューへ戻る" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "終了" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -412,6 +434,14 @@ msgid "" "- T: Chat\n" msgstr "" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "左ボタン" @@ -740,31 +770,31 @@ msgstr "PA1" msgid "Zoom" msgstr "ズーム" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "メインメニュー" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "ワールドの初期化に失敗" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "" -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "ゲームをロードか見つかるのに失敗" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "" -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "接続エラー (タイムアウトか?)" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/ko/minetest.po b/po/ko/minetest.po index f07b816a5..58d0d95c9 100644 --- a/po/ko/minetest.po +++ b/po/ko/minetest.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 20:25+0100\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -94,12 +94,12 @@ msgstr "" msgid "Respawn" msgstr "" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "" @@ -191,167 +191,183 @@ msgstr "" msgid "Print stacks" msgstr "" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +msgid "Favorites:" +msgstr "" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "" -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +msgid "Public" +msgstr "" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "" -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "" @@ -375,23 +391,27 @@ msgstr "" msgid "Passwords do not match!" msgstr "" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -406,6 +426,14 @@ msgid "" "- T: Chat\n" msgstr "" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "" @@ -698,31 +726,31 @@ msgstr "" msgid "Zoom" msgstr "" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "" -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "" -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/minetest.pot b/po/minetest.pot index f07b816a5..58d0d95c9 100644 --- a/po/minetest.pot +++ b/po/minetest.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 20:25+0100\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -94,12 +94,12 @@ msgstr "" msgid "Respawn" msgstr "" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "" @@ -191,167 +191,183 @@ msgstr "" msgid "Print stacks" msgstr "" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +msgid "Favorites:" +msgstr "" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "" -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +msgid "Public" +msgstr "" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "" -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "" @@ -375,23 +391,27 @@ msgstr "" msgid "Passwords do not match!" msgstr "" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -406,6 +426,14 @@ msgid "" "- T: Chat\n" msgstr "" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "" @@ -698,31 +726,31 @@ msgstr "" msgid "Zoom" msgstr "" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "" -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "" -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/pl/minetest.po b/po/pl/minetest.po index 79018fe28..ab617a1dd 100644 --- a/po/pl/minetest.po +++ b/po/pl/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-23 18:24+0200\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-02-22 16:59+0200\n" "Last-Translator: Maciej Kasatkin \n" "Language-Team: LANGUAGE \n" @@ -100,14 +100,14 @@ msgstr "Zginąłeś." msgid "Respawn" msgstr "Wróć do gry" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "" "Lewy klik: Przenieś wszystkie przedmioty, Prawy klik: przenieś pojedynczy " "przedmiot" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "Kontynuuj" @@ -201,167 +201,185 @@ msgstr "Zasięg widzenia" msgid "Print stacks" msgstr "Print stacks" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "Nie można stworzyć świata: nazwa zawiera niedozwolone znaki" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "Nie można stworzyć świata: Istnieje już świat o takiej nazwie" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "Pojedynczy gracz" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "Gra wieloosobowa" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "Zaawansowane" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "Ustawienia" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "Autorzy" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "Wybierz świat:" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "Skasuj" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "Nowy" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "Ustaw" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "Graj" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "Tryb kreatywny" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "Włącz obrażenia" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "Nazwa gracza/Hasło" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "Pokaż ulubione" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "Adres/Port" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "Pokaż publiczne" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "Pokaż ulubione" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "Połącz" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "Nie wpisuj adresu by uruchomić lokalny serwer." -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "Rozpocznij grę/Połącz" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "Pokaż publiczne" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "Skasuj świat" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "Stwórz świat" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "Ozdobne drzewa" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "Płynne oświetlenie" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "Chmury 3D" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "Nieprzeźroczysta woda" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "Mip-Mappowanie" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "Filtrowanie anizotropowe" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "Dwuliniowe filtrowanie" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "Trójliniowe filtrowanie" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "Shadery" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "Ładuj obrazy przedmiotów" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "Włącz cząstki" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "Zmień klawisze" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "Wymagany adres." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "Nie można skasować świata: nic nie zaznaczono" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "Pliki do skasowania" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "Nie można utworzyć świata: Nie znaleziono żadnego trybu gry" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "Nie można skonfigurować świata: Nic nie zaznaczono" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "Nie można skasować wszystkich plików świata" @@ -385,23 +403,27 @@ msgstr "Zmień" msgid "Passwords do not match!" msgstr "Hasła nie są jednakowe!" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "Dalej" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "Zmień hasło" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "Wyjdź do menu" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "Wyjście z gry" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -427,6 +449,14 @@ msgstr "" "- ESC: to menu\n" "- T: Czat\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "Lewy przycisk myszki" @@ -719,31 +749,31 @@ msgstr "PA1" msgid "Zoom" msgstr "Zoom" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "Menu główne" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "Inicjalizacja świata nie powiodła się" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "Nie wybrano świata ani adresu." -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "Nie można znaleźć lub wczytać trybu gry \"" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "Nieprawidłowa specyfikacja trybu gry." -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "Błąd połączenia (brak odpowiedzi?)" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/pt/minetest.po b/po/pt/minetest.po index 1025d575f..00b8ac10a 100644 --- a/po/pt/minetest.po +++ b/po/pt/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 20:25+0100\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-02-26 20:10+0200\n" "Last-Translator: Francizca Rodriguez \n" "Language-Team: LANGUAGE \n" @@ -99,12 +99,12 @@ msgstr "Estás morto." msgid "Respawn" msgstr "Renascer" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "Botão esq.: Mover todos os items, Botão dir.: Mover um item" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "Continuar" @@ -196,167 +196,185 @@ msgstr "Seleccionar Distância" msgid "Print stacks" msgstr "Imprimir stacks" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "Não foi possível criar mundo: Nome com carácteres inválidos" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "Não foi possivel criar mundo: Mundo com este nome já existente" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "Um Jogador" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "Multijogador" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "Avançado" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "Definições" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "Créditos" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "Seleccionar Mundo:" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "Eliminar" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "Novo" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "Configurar" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "Jogar" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "Modo Criativo" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "Ativar Dano" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "Nome/Senha" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "Mostrar Favoritos" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "Endereço/Porta" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "Mostrar Públicos" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "Mostrar Favoritos" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "Conectar" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "Deixe endereço em branco para iniciar servidor local." -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "Iniciar Jogo / Conectar" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "Mostrar Públicos" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "Eliminar mundo" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "Criar mundo" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "Árvores Melhoradas" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "Iluminação Suave" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "Nuvens 3D" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "Água Opaca" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "Mip-Mapping" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "Filtro Anisotropico" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "Filtro Bi-Linear" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "Filtro Tri-Linear" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "Sombras" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "Precarregamento dos items" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "Ativar Particulas" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "Mudar teclas" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "Endereço necessário." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "Não foi possível eliminar mundo: Nada seleccionado" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "Ficheiros para eliminar" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "Não foi possivel criar mundo: Jogos não detectados" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "Não foi possivel configurar mundo: Nada seleccionado" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "Remoção dos ficheiros dos mundos falhada" @@ -380,23 +398,27 @@ msgstr "Mudar" msgid "Passwords do not match!" msgstr "Senhas não correspondem!" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "Continuar" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "Mudar Senha" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "Sair para Menu" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "Sair para SO" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -422,6 +444,14 @@ msgstr "" "- ESC: Este menu\n" "- T: Chat\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "Botão Esquerdo" @@ -714,32 +744,32 @@ msgstr "PAL" msgid "Zoom" msgstr "Zoom" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "Menu Principal" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "Falha ao iniciar mundo" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "" "Nenhum mundo seleccionado e nenhum endereço providenciado. Nada para fazer." -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "Não foi possível encontrar ou carregar jogo \"" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "gamespec inválido." -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "Erro de conexão (excedeu tempo?)" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/ro/minetest.po b/po/ro/minetest.po index f07b816a5..58d0d95c9 100644 --- a/po/ro/minetest.po +++ b/po/ro/minetest.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 20:25+0100\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -94,12 +94,12 @@ msgstr "" msgid "Respawn" msgstr "" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "" @@ -191,167 +191,183 @@ msgstr "" msgid "Print stacks" msgstr "" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +msgid "Favorites:" +msgstr "" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "" -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +msgid "Public" +msgstr "" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "" -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "" @@ -375,23 +391,27 @@ msgstr "" msgid "Passwords do not match!" msgstr "" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -406,6 +426,14 @@ msgid "" "- T: Chat\n" msgstr "" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "" @@ -698,31 +726,31 @@ msgstr "" msgid "Zoom" msgstr "" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "" -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "" -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/ru/minetest.po b/po/ru/minetest.po index 6acc42f8c..d6634d5a2 100644 --- a/po/ru/minetest.po +++ b/po/ru/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-23 18:24+0200\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-03-28 15:29+0200\n" "Last-Translator: Anton Tsyganenko \n" "Language-Team: Russian\n" @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Weblate 1.4-dev\n" #: src/guiConfigureWorld.cpp:125 @@ -100,20 +100,20 @@ msgstr "Вы умерли." msgid "Respawn" msgstr "Воскреснуть" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "ЛКМ: Переместить все предметы, ПКМ: Переместить один предмет" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "Продолжить" #: src/guiKeyChangeMenu.cpp:114 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)" msgstr "" -"Сочетания клавиш. (Если это меню сломалось, удалите настройки из " -"minetest.conf)" +"Сочетания клавиш. (Если это меню сломалось, удалите настройки из minetest." +"conf)" #: src/guiKeyChangeMenu.cpp:151 msgid "\"Use\" = climb down" @@ -200,168 +200,186 @@ msgstr "Выбор зоны видимости" msgid "Print stacks" msgstr "напечатать стеки" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "Невозможно создать мир: Имя содержит недопустимые символы" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "Невозможно создать мир: Мир под таким названием уже существует" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "Одиночная игра" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "Многопользовательская игра" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "Дополнительно" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "Настройки" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "Благодарности" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "Выберите мир:" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "Удалить" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "Новый" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "Настроить" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "Играть" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "Режим создания" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "Включить повреждения" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "Имя/Пароль" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "Сохраненные" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "Адрес/Порт" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "Публичные" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "Сохраненные" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "Подключиться" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "Оставьте адрес пустым для запуска локального сервера." -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "Начать игру" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "Публичные" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "Удалить мир" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "Создать мир" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "Красивые деревья" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "Мягкое освещение" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "3D облака" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "Непрозрачная вода" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "Mip-текстурирование" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "Анизотропный фильтр" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "Билинейный фильтр" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "Трилинейный фильтр" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "Шейдеры" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 #, fuzzy msgid "Preload item visuals" msgstr "Кэшировать предметы" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "Включить частицы" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "Сменить управление" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "Нужно ввести адрес." -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "Не могу удалить мир: Ничего не выбрано" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "Следующие файлы будут удалены" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "Не могу создать мир: Ни одной игры не найдено" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "Не могу настроить мир: ничего не выбрано" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "Ошибка при удалении файлов мира" @@ -385,23 +403,27 @@ msgstr "Изменить" msgid "Passwords do not match!" msgstr "Пароли не совпадают!" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "Продолжить" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "Изменить пароль" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "Выход в меню" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "Выход в ОС" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -427,6 +449,14 @@ msgstr "" "- ESC: это меню\n" "- T: чат\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "Левая клавиша" @@ -733,31 +763,31 @@ msgstr "" msgid "Zoom" msgstr "Масштаб" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "Главное меню" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "Ошибка при инициализации мира" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "Не выбран мир и не введен адрес." -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "Невозможно найти или загрузить игру \"" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "" -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "Ошибка соединения (таймаут пинга?)" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po index d65bc8e2a..c40e046a4 100644 --- a/po/zh_CN/minetest.po +++ b/po/zh_CN/minetest.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: minetest\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 20:25+0100\n" +"POT-Creation-Date: 2013-03-30 19:56+0100\n" "PO-Revision-Date: 2013-03-09 09:41+0200\n" "Last-Translator: Shen Zheyu \n" "Language-Team: LANGUAGE \n" @@ -99,12 +99,12 @@ msgstr "你死了。" msgid "Respawn" msgstr "重生" -#: src/guiFormSpecMenu.cpp:572 +#: src/guiFormSpecMenu.cpp:582 msgid "Left click: Move all items, Right click: Move single item" msgstr "左键：移动所有物品，右键：移动单个物品" -#: src/guiFormSpecMenu.cpp:597 src/guiMessageMenu.cpp:109 -#: src/guiTextInputMenu.cpp:123 +#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109 +#: src/guiTextInputMenu.cpp:131 msgid "Proceed" msgstr "继续游戏" @@ -196,167 +196,185 @@ msgstr "选择范围" msgid "Print stacks" msgstr "打印栈" -#: src/guiMainMenu.cpp:55 +#: src/guiMainMenu.cpp:92 msgid "Cannot create world: Name contains invalid characters" msgstr "无法创建世界：名字包含非法字符" -#: src/guiMainMenu.cpp:64 +#: src/guiMainMenu.cpp:101 msgid "Cannot create world: A world by this name already exists" msgstr "无法创建世界：同名世界已经存在" -#: src/guiMainMenu.cpp:245 +#: src/guiMainMenu.cpp:283 msgid "Singleplayer" msgstr "单人游戏" -#: src/guiMainMenu.cpp:246 +#: src/guiMainMenu.cpp:284 msgid "Multiplayer" msgstr "多人游戏" -#: src/guiMainMenu.cpp:247 +#: src/guiMainMenu.cpp:285 msgid "Advanced" msgstr "高级联机设置" -#: src/guiMainMenu.cpp:248 +#: src/guiMainMenu.cpp:286 msgid "Settings" msgstr "设置" -#: src/guiMainMenu.cpp:249 +#: src/guiMainMenu.cpp:287 msgid "Credits" msgstr "关于" -#: src/guiMainMenu.cpp:280 +#: src/guiMainMenu.cpp:317 msgid "Select World:" msgstr "选择世界：" -#: src/guiMainMenu.cpp:302 src/guiMainMenu.cpp:449 src/keycode.cpp:229 +#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229 msgid "Delete" msgstr "删除" -#: src/guiMainMenu.cpp:309 +#: src/guiMainMenu.cpp:346 msgid "New" msgstr "新建" -#: src/guiMainMenu.cpp:317 +#: src/guiMainMenu.cpp:354 msgid "Configure" msgstr "配置" -#: src/guiMainMenu.cpp:332 src/keycode.cpp:248 +#: src/guiMainMenu.cpp:369 src/keycode.cpp:248 msgid "Play" msgstr "开始游戏" -#: src/guiMainMenu.cpp:343 src/guiMainMenu.cpp:557 +#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619 msgid "Creative Mode" msgstr "创造模式" -#: src/guiMainMenu.cpp:349 src/guiMainMenu.cpp:563 +#: src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:625 msgid "Enable Damage" msgstr "开启伤害" -#: src/guiMainMenu.cpp:369 src/guiMainMenu.cpp:479 +#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541 msgid "Name/Password" msgstr "名字/密码" -#: src/guiMainMenu.cpp:408 src/guiMainMenu.cpp:506 +#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184 +#, fuzzy +msgid "Favorites:" +msgstr "显示最爱" + +#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194 +msgid "Public Server List:" +msgstr "" + +#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568 msgid "Address/Port" msgstr "地址/端口" -#: src/guiMainMenu.cpp:435 src/guiMainMenu.cpp:1075 +#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183 msgid "Show Public" msgstr "显示公共" -#: src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:1083 +#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193 msgid "Show Favorites" msgstr "显示最爱" -#: src/guiMainMenu.cpp:459 +#: src/guiMainMenu.cpp:521 msgid "Connect" msgstr "连接" -#: src/guiMainMenu.cpp:529 +#: src/guiMainMenu.cpp:591 msgid "Leave address blank to start a local server." msgstr "地址栏留空可启动本地服务器。" -#: src/guiMainMenu.cpp:538 +#: src/guiMainMenu.cpp:600 msgid "Start Game / Connect" msgstr "启动游戏/连接" -#: src/guiMainMenu.cpp:570 src/guiMainMenu.cpp:1006 +#: src/guiMainMenu.cpp:632 +#, fuzzy +msgid "Public" +msgstr "显示公共" + +#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113 msgid "Delete world" msgstr "删除世界" -#: src/guiMainMenu.cpp:577 +#: src/guiMainMenu.cpp:647 msgid "Create world" msgstr "创造世界" -#: src/guiMainMenu.cpp:611 +#: src/guiMainMenu.cpp:681 msgid "Fancy trees" msgstr "更漂亮的树" -#: src/guiMainMenu.cpp:617 +#: src/guiMainMenu.cpp:687 msgid "Smooth Lighting" msgstr "平滑光照" -#: src/guiMainMenu.cpp:623 +#: src/guiMainMenu.cpp:693 msgid "3D Clouds" msgstr "3D云彩" -#: src/guiMainMenu.cpp:629 +#: src/guiMainMenu.cpp:699 msgid "Opaque water" msgstr "不反光的水" -#: src/guiMainMenu.cpp:639 +#: src/guiMainMenu.cpp:709 msgid "Mip-Mapping" msgstr "贴图处理" -#: src/guiMainMenu.cpp:646 +#: src/guiMainMenu.cpp:716 msgid "Anisotropic Filtering" msgstr "各向异性过滤" -#: src/guiMainMenu.cpp:653 +#: src/guiMainMenu.cpp:723 msgid "Bi-Linear Filtering" msgstr "双线性过滤" -#: src/guiMainMenu.cpp:660 +#: src/guiMainMenu.cpp:730 msgid "Tri-Linear Filtering" msgstr "三线性过滤" -#: src/guiMainMenu.cpp:668 +#: src/guiMainMenu.cpp:738 msgid "Shaders" msgstr "着色器" -#: src/guiMainMenu.cpp:675 +#: src/guiMainMenu.cpp:745 msgid "Preload item visuals" msgstr "预先加载物品图像" -#: src/guiMainMenu.cpp:682 +#: src/guiMainMenu.cpp:752 msgid "Enable Particles" msgstr "启用粒子效果" -#: src/guiMainMenu.cpp:692 +#: src/guiMainMenu.cpp:759 +msgid "Finite liquid" +msgstr "" + +#: src/guiMainMenu.cpp:769 msgid "Change keys" msgstr "改变键位设置" -#: src/guiMainMenu.cpp:977 +#: src/guiMainMenu.cpp:1084 msgid "Address required." msgstr "需要地址。" -#: src/guiMainMenu.cpp:995 +#: src/guiMainMenu.cpp:1102 msgid "Cannot delete world: Nothing selected" msgstr "无法删除世界：没有选择世界" -#: src/guiMainMenu.cpp:1010 +#: src/guiMainMenu.cpp:1117 msgid "Files to be deleted" msgstr "将被删除的文件" -#: src/guiMainMenu.cpp:1026 +#: src/guiMainMenu.cpp:1133 msgid "Cannot create world: No games found" msgstr "无法创造世界：未找到游戏模式" -#: src/guiMainMenu.cpp:1042 +#: src/guiMainMenu.cpp:1149 msgid "Cannot configure world: Nothing selected" msgstr "无法配置世界：没有选择世界" -#: src/guiMainMenu.cpp:1146 +#: src/guiMainMenu.cpp:1256 msgid "Failed to delete all world files" msgstr "无法删除所有该世界的文件" @@ -380,23 +398,27 @@ msgstr "更改" msgid "Passwords do not match!" msgstr "密码不匹配！" -#: src/guiPauseMenu.cpp:118 +#: src/guiPauseMenu.cpp:123 msgid "Continue" msgstr "继续" -#: src/guiPauseMenu.cpp:127 +#: src/guiPauseMenu.cpp:132 msgid "Change Password" msgstr "更改密码" -#: src/guiPauseMenu.cpp:135 +#: src/guiPauseMenu.cpp:140 +msgid "Sound Volume" +msgstr "" + +#: src/guiPauseMenu.cpp:147 msgid "Exit to Menu" msgstr "退出至菜单" -#: src/guiPauseMenu.cpp:142 +#: src/guiPauseMenu.cpp:154 msgid "Exit to OS" msgstr "退出至操作系统" -#: src/guiPauseMenu.cpp:149 +#: src/guiPauseMenu.cpp:161 msgid "" "Default Controls:\n" "- WASD: Walk\n" @@ -423,6 +445,14 @@ msgstr "" "ESC：菜单\n" "T：聊天\n" +#: src/guiVolumeChange.cpp:108 +msgid "Sound Volume: " +msgstr "" + +#: src/guiVolumeChange.cpp:121 +msgid "Exit" +msgstr "" + #: src/keycode.cpp:223 msgid "Left Button" msgstr "左键" @@ -715,31 +745,31 @@ msgstr "PA1键" msgid "Zoom" msgstr "缩放" -#: src/main.cpp:1384 +#: src/main.cpp:1506 msgid "Main Menu" msgstr "主菜单" -#: src/main.cpp:1633 +#: src/main.cpp:1830 msgid "Failed to initialize world" msgstr "无法初始化世界" -#: src/main.cpp:1645 +#: src/main.cpp:1842 msgid "No world selected and no address provided. Nothing to do." msgstr "没有选择世界或提供地址。未执行操作。" -#: src/main.cpp:1653 +#: src/main.cpp:1850 msgid "Could not find or load game \"" msgstr "无法找到或载入游戏模式“" -#: src/main.cpp:1667 +#: src/main.cpp:1864 msgid "Invalid gamespec." msgstr "非法游戏模式规格。" -#: src/main.cpp:1707 +#: src/main.cpp:1904 msgid "Connection error (timed out?)" msgstr "连接出错（超时？）" -#: src/main.cpp:1718 +#: src/main.cpp:1915 msgid "" "\n" "Check debug.txt for details." From 414f0275cfa014423394cc9c37ecb0151c3bd46c Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 30 Mar 2013 19:12:23 -0400 Subject: [PATCH 25/30] Optimize CNodeDefManager::getIds --- src/nodedef.cpp | 36 ++++++++++++++++++++++++++++++++++++ src/nodedef.h | 3 +++ 2 files changed, 39 insertions(+) diff --git a/src/nodedef.cpp b/src/nodedef.cpp index d41df5c3b..59db68a36 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "settings.h" #include "nameidmapping.h" #include "util/serialize.h" +//#include "profiler.h" // For TimeTaker /* NodeBox @@ -452,6 +453,7 @@ public: virtual void getIds(const std::string &name, std::set &result) const { + //TimeTaker t("getIds", NULL, PRECISION_MICRO); if(name.substr(0,6) != "group:"){ content_t id = CONTENT_IGNORE; if(getId(name, id)) @@ -459,6 +461,20 @@ public: return; } std::string group = name.substr(6); + +#if 1 // Optimized version, takes less than 1 microsecond at -O1 + std::map::const_iterator + i = m_group_to_items.find(group); + if (i == m_group_to_items.end()) + return; + + const GroupItems &items = i->second; + for (GroupItems::const_iterator j = items.begin(); + j != items.end(); ++j) { + if ((*j).second != 0) + result.insert((*j).first); + } +#else // Old version, takes about ~150-200us at -O1 for(u16 id=0; id<=MAX_CONTENT; id++) { const ContentFeatures &f = m_content_features[id]; @@ -467,6 +483,8 @@ public: if(itemgroup_get(f.groups, group) != 0) result.insert(id); } +#endif + //printf("getIds: %dus\n", t.stop()); } virtual const ContentFeatures& get(const std::string &name) const { @@ -498,6 +516,21 @@ public: m_content_features[c] = def; if(def.name != "") addNameIdMapping(c, def.name); + + // Add this content to the list of all groups it belongs to + for (ItemGroupList::const_iterator i = def.groups.begin(); + i != def.groups.end(); ++i) { + std::string group_name = i->first; + + std::map::iterator + j = m_group_to_items.find(group_name); + if (j == m_group_to_items.end()) { + m_group_to_items[group_name].push_back(std::make_pair(c, i->second)); + } else { + GroupItems &items = j->second; + items.push_back(std::make_pair(c, i->second)); + } + } } virtual content_t set(const std::string &name, const ContentFeatures &def) @@ -787,6 +820,9 @@ private: // item aliases too. Updated by updateAliases() // Note: Not serialized. std::map m_name_id_mapping_with_aliases; + // A mapping from groups to a list of content_ts (and their levels) + // that belong to it. Necessary for a direct lookup in getIds(). + std::map m_group_to_items; }; IWritableNodeDefManager* createNodeDefManager() diff --git a/src/nodedef.h b/src/nodedef.h index 4f07565d1..d846489ae 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include +#include #include "mapnode.h" #ifndef SERVER #include "tile.h" @@ -36,6 +37,8 @@ class IItemDefManager; class ITextureSource; class IGameDef; +typedef std::list > GroupItems; + enum ContentParamType { CPT_NONE, From c517215bcf3c92ccef1690ad871a234e547c8435 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 30 Mar 2013 21:24:37 -0400 Subject: [PATCH 26/30] Fix MapgenV6::generateCaves possible division by 0 and misc. cosmetic fixes --- src/mapgen_v6.cpp | 36 +++++++++++++++++++++--------------- src/nodedef.cpp | 1 + src/scriptapi.cpp | 2 +- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 0b419617d..275d4b78f 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -928,20 +928,20 @@ void MapgenV6::growGrass() { void MapgenV6::defineCave(Cave &cave, PseudoRandom ps, v3s16 node_min, bool large_cave) { - cave.min_tunnel_diameter = 2; - cave.max_tunnel_diameter = ps.range(2,6); - cave.dswitchint = ps.range(1,14); - cave.flooded = true; //large_cave && ps.range(0,4); - if(large_cave){ - cave.part_max_length_rs = ps.range(2,4); - cave.tunnel_routepoints = ps.range(5, ps.range(15,30)); - cave.min_tunnel_diameter = 5; - cave.max_tunnel_diameter = ps.range(7, ps.range(8,24)); - } else { - cave.part_max_length_rs = ps.range(2,9); - cave.tunnel_routepoints = ps.range(10, ps.range(15,30)); - } - cave.large_cave_is_flat = (ps.range(0,1) == 0); + cave.min_tunnel_diameter = 2; + cave.max_tunnel_diameter = ps.range(2,6); + cave.dswitchint = ps.range(1,14); + cave.flooded = true; //large_cave && ps.range(0,4); + if (large_cave){ + cave.part_max_length_rs = ps.range(2,4); + cave.tunnel_routepoints = ps.range(5, ps.range(15,30)); + cave.min_tunnel_diameter = 5; + cave.max_tunnel_diameter = ps.range(7, ps.range(8,24)); + } else { + cave.part_max_length_rs = ps.range(2,9); + cave.tunnel_routepoints = ps.range(10, ps.range(15,30)); + } + cave.large_cave_is_flat = (ps.range(0,1) == 0); } @@ -1120,7 +1120,13 @@ void MapgenV6::generateCaves(int max_stone_y) { rp.Z = ar.Z-1; vec = rp - orp; - for(float f=0; f<1.0; f+=1.0/vec.getLength()) + float veclen = vec.getLength(); + // As odd as it sounds, veclen is *exactly* + // 0.0 sometimes, causing a FPE + if (veclen == 0.0) + veclen = 1.0; + + for(float f=0; f<1.0; f+=1.0/veclen) { v3f fp = orp + vec * f; fp.X += 0.1*ps.range(-10,10); diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 59db68a36..ca8898907 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -822,6 +822,7 @@ private: std::map m_name_id_mapping_with_aliases; // A mapping from groups to a list of content_ts (and their levels) // that belong to it. Necessary for a direct lookup in getIds(). + // Note: Not serialized. std::map m_group_to_items; }; diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index 80abffa2b..81fcc08d3 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -727,7 +727,7 @@ static int l_register_ore(lua_State *L) if (ore->clust_scarcity <= 0 || ore->clust_num_ores <= 0) { errorstream << "register_ore: clust_scarcity and clust_num_ores" - "must be greater than 0"; + " must be greater than 0" << std::endl; delete ore; return 0; } From 923a97b1089c117cb787a2f95a38097e8a31e4a8 Mon Sep 17 00:00:00 2001 From: Zeg9 Date: Tue, 26 Mar 2013 18:22:52 +0100 Subject: [PATCH 27/30] Install locales in minetest directory, so they are correctly loaded --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 437d31cf5..6bbe6454a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ elseif(UNIX) # Linux, BSD etc set(EXAMPLE_CONF_DIR ${DOCDIR}) set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications") set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons") - set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale") + set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/locale") endif() endif() From 23590a8383f068509265d5724458c7966d71a0e3 Mon Sep 17 00:00:00 2001 From: "0gb.us" <0gb.us@0gb.us> Date: Sat, 30 Mar 2013 01:51:41 -0700 Subject: [PATCH 28/30] Don't grant priveleges to non-existent players. When accidentally misspelling a name, privileges are sometimes granted to non-existent players, leaving them with the extra privileges, but without the default privileges, if they ever join the server. This corrects that by disallowing /grant from working with invalid players. For completeness, it does the same for /revoke. --- builtin/chatcommands.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/builtin/chatcommands.lua b/builtin/chatcommands.lua index f41f9afe4..4b09f7b2b 100644 --- a/builtin/chatcommands.lua +++ b/builtin/chatcommands.lua @@ -116,6 +116,9 @@ minetest.register_chatcommand("grant", { if not grantname or not grantprivstr then minetest.chat_send_player(name, "Invalid parameters (see /help grant)") return + elseif not minetest.auth_table[grantname] then + minetest.chat_send_player(name, "Player "..grantname.." does not exist.") + return end local grantprivs = minetest.string_to_privs(grantprivstr) if grantprivstr == "all" then @@ -159,6 +162,9 @@ minetest.register_chatcommand("revoke", { if not revokename or not revokeprivstr then minetest.chat_send_player(name, "Invalid parameters (see /help revoke)") return + elseif not minetest.auth_table[revokename] then + minetest.chat_send_player(name, "Player "..revokename.." does not exist.") + return end local revokeprivs = minetest.string_to_privs(revokeprivstr) local privs = minetest.get_player_privs(revokename) From 96387ee88a89d172fa23ef325a15da510afac3e5 Mon Sep 17 00:00:00 2001 From: khonkhortisan Date: Sat, 30 Mar 2013 14:49:46 -0700 Subject: [PATCH 29/30] Don't load menu textures every frame --- src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 2e57a8c20..439b59d31 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -618,7 +618,7 @@ void drawMenuBackground(video::IVideoDriver* driver) { std::string path = getTexturePath("menubg.png"); if (path[0]) { - video::ITexture *bgtexture = + static const video::ITexture *bgtexture = driver->getTexture(path.c_str()); if (bgtexture) { @@ -646,7 +646,7 @@ void drawMenuFooter(video::IVideoDriver* driver, bool clouds) { std::string path = getTexturePath(clouds ? "menufooter_clouds.png" : "menufooter.png"); if (path[0]) { - video::ITexture *footertexture = + static const video::ITexture *footertexture = driver->getTexture(path.c_str()); if (footertexture) { @@ -678,7 +678,7 @@ void drawMenuHeader(video::IVideoDriver* driver) { std::string path = getTexturePath("menuheader.png"); if (path[0]) { - video::ITexture *splashtexture = + static const video::ITexture *splashtexture = driver->getTexture(path.c_str()); if(splashtexture) { @@ -713,7 +713,7 @@ void drawMenuHeader(video::IVideoDriver* driver) { void drawMenuSplash(video::IVideoDriver* driver) { core::dimension2d screensize = driver->getScreenSize(); if (getTexturePath("menusplash.png") != "") { - video::ITexture *splashtexture = + static const video::ITexture *splashtexture = driver->getTexture(getTexturePath("menusplash.png").c_str()); if(splashtexture) { From 7d3b3890b5fde204051662f5ad73dd5d75e0a6f8 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 30 Mar 2013 18:40:33 -0400 Subject: [PATCH 30/30] Add a small optimization to the menu splash and remove a old comment --- src/main.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 439b59d31..08af6a37d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -682,9 +682,6 @@ void drawMenuHeader(video::IVideoDriver* driver) { driver->getTexture(path.c_str()); if(splashtexture) { - //v2s32 splashsize((splashtexture->getOriginalSize().Width*100)/ - // splashtexture->getOriginalSize().Height, 80); - f32 mult = (((f32)screensize.Width / 2)) / ((f32)splashtexture->getOriginalSize().Width); @@ -712,9 +709,10 @@ void drawMenuHeader(video::IVideoDriver* driver) { // Draw the Splash over the clouds and under the main menu void drawMenuSplash(video::IVideoDriver* driver) { core::dimension2d screensize = driver->getScreenSize(); - if (getTexturePath("menusplash.png") != "") { + std::string path = getTexturePath("menusplash.png"); + if (path[0]) { static const video::ITexture *splashtexture = - driver->getTexture(getTexturePath("menusplash.png").c_str()); + driver->getTexture(path.c_str()); if(splashtexture) { core::rect splashrect(0, 0, screensize.Width, screensize.Height);