summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-25 20:38:48 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-25 20:38:48 +0300
commit9ce2870616a4fc1ed45020e6100aa888242fe79a (patch)
tree90ee1607507eb28b07d2e76d86c1e20bbac66168
parent8ade9e707f81e11570ec8bac9d4b4157f829a2c6 (diff)
parent0be66eee1e3f927a178164373dea21ed2f260980 (diff)
downloadplus-9ce2870616a4fc1ed45020e6100aa888242fe79a.tar.gz
plus-9ce2870616a4fc1ed45020e6100aa888242fe79a.tar.bz2
plus-9ce2870616a4fc1ed45020e6100aa888242fe79a.tar.xz
plus-9ce2870616a4fc1ed45020e6100aa888242fe79a.zip
Merge remote-tracking branch 'linuxcobras-manaplus/master'
-rw-r--r--data/help/about.txt2
-rw-r--r--data/help/chatcommands.txt2
-rw-r--r--data/translations/help/de.po6
-rw-r--r--data/translations/help/es.po6
-rw-r--r--data/translations/help/fr.po6
-rw-r--r--data/translations/help/pl.po6
-rw-r--r--data/translations/help/pt_BR.po6
-rw-r--r--data/translations/help/ru.po6
8 files changed, 20 insertions, 20 deletions
diff --git a/data/help/about.txt b/data/help/about.txt
index 882e94f32..92f52932b 100644
--- a/data/help/about.txt
+++ b/data/help/about.txt
@@ -7,7 +7,7 @@
<<##2ManaPlus##P is a serious effort to create an innovative free and open
source MMORPG Client. Mana uses 2D graphics and aims to create a large
- and diverse interactive world. It is licensed under the GPL, making)
+ and diverse interactive world. It is licensed under the GPL, making
sure this game can't ever run away from you.>>
<<The project includes the development of both a client and a server.
diff --git a/data/help/chatcommands.txt b/data/help/chatcommands.txt
index 127f541ca..39af73312 100644
--- a/data/help/chatcommands.txt
+++ b/data/help/chatcommands.txt
@@ -73,5 +73,5 @@
##P<<Whispers commands>>
##2
<<Most commands working in whispers.
-For example command /imitation in whisper nick nick1,
+For example command /imitation in whisper with nick1,
similar to command /imitation nick1.>>
diff --git a/data/translations/help/de.po b/data/translations/help/de.po
index 3f5f6ccec..5703136d9 100644
--- a/data/translations/help/de.po
+++ b/data/translations/help/de.po
@@ -98,7 +98,7 @@ msgstr " - ##2allow whispers##P: Möchten Sie mit jedem Spieler Privatnachrichte
msgid ""
"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making)\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
" sure this game can't ever run away from you."
msgstr "##2ManaPlus##P ist ernsthaft bemüht, einen innovativen und freien Open\n Source MMORPG-Client zu erstellen.Mana verwendet 2D-Grafik und zielt\n darauf ab, eine große und vielfältig interaktive Welt zu schaffen.\n Es unterliegt der GPL, so dass sichergestellt ist, das dieses Spiel\n nicht wegkommen kann."
@@ -461,7 +461,7 @@ msgid ""
msgstr "##2ManaPlus##P ist ein erweiterter Client, basierend auf dem Code des\n ##2Mana##P Clients. Hinzugefügt wurden viele Funktionen, verbesserte\n Performance, Stabilität, Sicherheit und vieles mehr."
msgid ""
-" If you're having troubles, plase first of all read the FAQ. If you\n"
+" If you're having troubles, please first of all read the FAQ. If you\n"
" can't find a solution to your problem, feel free to check our\n"
" Bugs/Support section of the forum:"
msgstr "Wenn Sie Probleme haben, dann lesen Sie bitte zuerst die FAQ. Wenn Sie\ndort keine Lösung für Ihr Problem finden können, dann zögern Sie nicht,\nden Fehler- / Hilfebereich unseres Forums zu besuchen:"
@@ -829,7 +829,7 @@ msgstr "##2Insert##P \"Item Tastaturkürzel 14\""
msgid ""
"Most commands working in whispers.\n"
-"For example command /imitation in whisper nick nick1,\n"
+"For example command /imitation in whisper with nick1,\n"
" similar to command /imitation nick1."
msgstr "Die meisten Befehle arbeiten im Flüsterchat.\nZum Beispiel der Befehl '/imitation' im Flüsterchat mit nick1,\nähnlich dem Befehl '/imitation nick1'."
diff --git a/data/translations/help/es.po b/data/translations/help/es.po
index 0749ab492..6abc9a3f6 100644
--- a/data/translations/help/es.po
+++ b/data/translations/help/es.po
@@ -98,7 +98,7 @@ msgstr " - ##2permitir susurros##P: ¿Deseas permitir que cualquier jugador te e
msgid ""
"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making)\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
" sure this game can't ever run away from you."
msgstr "##2Mana##P es fruto de un arduo esfuerzo crear un Cliente MMORPG innovador,\n libre y de código abierto. Mana usa gráficos 2D y apunta a crear un gran\n mundo diverso e interactivo. Está licenciado bajo la GPL, asegurando que\n este juego nunca dejará de estar a tu alcance."
@@ -461,7 +461,7 @@ msgid ""
msgstr ""
msgid ""
-" If you're having troubles, plase first of all read the FAQ. If you\n"
+" If you're having troubles, please first of all read the FAQ. If you\n"
" can't find a solution to your problem, feel free to check our\n"
" Bugs/Support section of the forum:"
msgstr "Si estás teniendo problemas, por favor, primero que nada, lee la FAQ.\nSi no encuentras una solución a tu problema, siéntete libre de chequear\nnuestra sección Problemas/Soporte del foro:"
@@ -829,7 +829,7 @@ msgstr "##2Insert##P \"Atajo de artículo 14\""
msgid ""
"Most commands working in whispers.\n"
-"For example command /imitation in whisper nick nick1,\n"
+"For example command /imitation in whisper with nick1,\n"
" similar to command /imitation nick1."
msgstr ""
diff --git a/data/translations/help/fr.po b/data/translations/help/fr.po
index d27e69899..7970b8436 100644
--- a/data/translations/help/fr.po
+++ b/data/translations/help/fr.po
@@ -98,7 +98,7 @@ msgstr ""
msgid ""
"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making)\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
" sure this game can't ever run away from you."
msgstr ""
@@ -461,7 +461,7 @@ msgid ""
msgstr ""
msgid ""
-" If you're having troubles, plase first of all read the FAQ. If you\n"
+" If you're having troubles, please first of all read the FAQ. If you\n"
" can't find a solution to your problem, feel free to check our\n"
" Bugs/Support section of the forum:"
msgstr ""
@@ -829,7 +829,7 @@ msgstr "##2Inser##P \"Raccourci Objet 14\""
msgid ""
"Most commands working in whispers.\n"
-"For example command /imitation in whisper nick nick1,\n"
+"For example command /imitation in whisper with nick1,\n"
" similar to command /imitation nick1."
msgstr ""
diff --git a/data/translations/help/pl.po b/data/translations/help/pl.po
index 3c69582ac..2c881e785 100644
--- a/data/translations/help/pl.po
+++ b/data/translations/help/pl.po
@@ -98,7 +98,7 @@ msgstr ""
msgid ""
"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making)\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
" sure this game can't ever run away from you."
msgstr ""
@@ -461,7 +461,7 @@ msgid ""
msgstr ""
msgid ""
-" If you're having troubles, plase first of all read the FAQ. If you\n"
+" If you're having troubles, please first of all read the FAQ. If you\n"
" can't find a solution to your problem, feel free to check our\n"
" Bugs/Support section of the forum:"
msgstr ""
@@ -829,7 +829,7 @@ msgstr ""
msgid ""
"Most commands working in whispers.\n"
-"For example command /imitation in whisper nick nick1,\n"
+"For example command /imitation in whisper with nick1,\n"
" similar to command /imitation nick1."
msgstr ""
diff --git a/data/translations/help/pt_BR.po b/data/translations/help/pt_BR.po
index d58c671ef..bda1f4407 100644
--- a/data/translations/help/pt_BR.po
+++ b/data/translations/help/pt_BR.po
@@ -98,7 +98,7 @@ msgstr " - ##2allow whispers##P: Você deseja permiti que os jogadores arbitrár
msgid ""
"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making)\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
" sure this game can't ever run away from you."
msgstr "##2ManaPlus##P é um serio esforço para criar um inovado, grátis e de código aberto cliente MMORPG. Mana utiliza gráficos 2D e foca em criar um largo e diverso mundo interativo. É licenciado sobre licença GPL. Tendo certeza que o jogo jamais te abandonará; "
@@ -461,7 +461,7 @@ msgid ""
msgstr "##2Manaplus##P é uma extensão baseada no código do cliente ##2Mana##P.\nAdicionado muitos recursos, melhorado a performance, estabilidade, segurança e muito mais."
msgid ""
-" If you're having troubles, plase first of all read the FAQ. If you\n"
+" If you're having troubles, please first of all read the FAQ. If you\n"
" can't find a solution to your problem, feel free to check our\n"
" Bugs/Support section of the forum:"
msgstr "Se você está tendo problemas, por favor, antes de tudo, leia o FAQ. Se você não encontrar uma solução para seu problema, sinta-se livre para verificar a nossa seção de Erros no suporte do fórum:"
@@ -829,7 +829,7 @@ msgstr ""
msgid ""
"Most commands working in whispers.\n"
-"For example command /imitation in whisper nick nick1,\n"
+"For example command /imitation in whisper with nick1,\n"
" similar to command /imitation nick1."
msgstr ""
diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po
index 17f967ffe..91b89dde2 100644
--- a/data/translations/help/ru.po
+++ b/data/translations/help/ru.po
@@ -99,7 +99,7 @@ msgstr ""
msgid ""
"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making)\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
" sure this game can't ever run away from you."
msgstr ""
@@ -462,7 +462,7 @@ msgid ""
msgstr "##2ManaPlus##P - расширенный клиент для которого за основу взят ##2Mana##P клиент.\n Добавлено множество возможностей, улучшина производительность,\nстабильность, безопасность и многое другое."
msgid ""
-" If you're having troubles, plase first of all read the FAQ. If you\n"
+" If you're having troubles, please first of all read the FAQ. If you\n"
" can't find a solution to your problem, feel free to check our\n"
" Bugs/Support section of the forum:"
msgstr ""
@@ -830,7 +830,7 @@ msgstr ""
msgid ""
"Most commands working in whispers.\n"
-"For example command /imitation in whisper nick nick1,\n"
+"For example command /imitation in whisper with nick1,\n"
" similar to command /imitation nick1."
msgstr ""