immibis
/
colobot-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-physfs 

Conflicts:
	help/generic/po/de.po
	help/generic/po/fr.po
	help/generic/po/generic.pot
	help/generic/po/pl.po
	help/generic/po/ru.po
dev-hd-graphics
krzys-h 2014-10-14 15:41:35 +02:00
parent 1d95ad172a 4b58acd103
commit 131005c1ae
8 changed files with 79 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.i18n.md
View File

@ -21,11 +21,7 @@ Helpfiles are divided in two categories:
programs, etc. These are stored in levels/$level/help/.
Helpfiles have their source in english, always stored in the E/
subdirectory. To ensure retro-compatibility, existing translations have
not been integrated in the gettext-based translation mechanisms and are
stored in their respective one-character directories. New translations
snd updates to existing ones should really use the gettext-based
translation.
subdirectory. Every other language directory is dynamically generated in the build process from files in level's po/ directory.
## Colobot syntax

4
README.md
View File

@ -26,6 +26,6 @@ Some details of how data file translation is achieved can be found in
The source code contained here was released by Epsitec -- the original
creator of the game -- on open source (GPLv3) license. The code was
given and the rights granted specifically to PPC community in
given and the rights granted specifically to ICC community in
March 2012. Since then, we have been modifying the code and working on
our goals, which are briefly summed up below.
our goals. For more info, see [README.md in the main repository](https://github.com/colobot/colobot/blob/master/README.md)

8
help/generic/E/authors.txt
View File

@ -1,8 +1,8 @@
Developers and internal betatesters of Original COLOBOT game from EPSITEC:
Developers and internal betatesters of Original COLOBOT game from EPSITEC
-Daniel Roux -Denis Dumoulin -Otto Kölbl -Michael Walz -Didier Gertsch
-Adrien Roux -Daniel Sauthier -Didier Raboud -Nicolas Stubi
-Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin
PPC GOLD Project team and members:
https://github.com/orgs/colobot/members
https://github.com/colobot/colobot/graphs/contributors
Colobot: Gold Edition developers
- TerranovaTeam: https://github.com/orgs/colobot/members
- Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors

19
help/generic/po/de.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#: help/generic/E/authors.txt:2
#, no-wrap
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC:\n"
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC\n"
msgstr ""
#. type: Bullet: '-'
@ -41,12 +41,21 @@ msgid "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
msgstr ""
#. type: Plain text
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "Colobot: Gold Edition developers\n"
msgstr ""
#. type: Bullet: '-'
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "TerranovaTeam: https://github.com/orgs/colobot/members"
msgstr ""
#. type: Bullet: '-'
#: help/generic/E/authors.txt:8
#, no-wrap
msgid ""
"PPC GOLD Project team and members:\n"
"https://github.com/orgs/colobot/members\n"
"https://github.com/colobot/colobot/graphs/contributors"
msgid "Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors"
msgstr ""
#. type: \b; header

19
help/generic/po/fr.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#: help/generic/E/authors.txt:2
#, no-wrap
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC:\n"
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC\n"
msgstr ""
#. type: Bullet: '-'
@ -41,12 +41,21 @@ msgid "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
msgstr ""
#. type: Plain text
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "Colobot: Gold Edition developers\n"
msgstr ""
#. type: Bullet: '-'
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "TerranovaTeam: https://github.com/orgs/colobot/members"
msgstr ""
#. type: Bullet: '-'
#: help/generic/E/authors.txt:8
#, no-wrap
msgid ""
"PPC GOLD Project team and members:\n"
"https://github.com/orgs/colobot/members\n"
"https://github.com/colobot/colobot/graphs/contributors"
msgid "Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors"
msgstr ""
#. type: \b; header

17
help/generic/po/generic.pot
View File

@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#: help/generic/E/authors.txt:2
#, no-wrap
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC:\n"
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC\n"
msgstr ""
#. type: Bullet: '-'
@ -43,11 +43,22 @@ msgid "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
msgstr ""
#. type: Plain text
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "Colobot: Gold Edition developers\n"
msgstr ""
#. type: Bullet: '-'
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "TerranovaTeam: https://github.com/orgs/colobot/members"
msgstr ""
#. type: Bullet: '-'
#: help/generic/E/authors.txt:8
#, no-wrap
msgid ""
"PPC GOLD Project team and members:\n"
"https://github.com/orgs/colobot/members\n"
"Contributors on GitHub: "
"https://github.com/colobot/colobot/graphs/contributors"
msgstr ""

26
help/generic/po/pl.po
View File

@ -21,8 +21,8 @@ msgstr ""
#. type: Plain text
#: help/generic/E/authors.txt:2
#, no-wrap
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC:\n"
msgstr "Twórcy i wewnętrzni betatesterzy oryginalnej gry COLOBOT z EPSITEC:\n"
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC\n"
msgstr "Twórcy i wewnętrzni betatesterzy oryginalnej gry COLOBOT od EPSITEC\n"
#. type: Bullet: '-'
#: help/generic/E/authors.txt:2
@ -43,16 +43,22 @@ msgid "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
msgstr "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
#. type: Plain text
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "Colobot: Gold Edition developers\n"
msgstr "Twórcy Colobot: Gold Edition\n"
#. type: Bullet: '-'
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "TerranovaTeam: https://github.com/orgs/colobot/members"
msgstr "TerranovaTeam: https://github.com/orgs/colobot/members"
#. type: Bullet: '-'
#: help/generic/E/authors.txt:8
#, no-wrap
msgid ""
"PPC GOLD Project team and members:\n"
"https://github.com/orgs/colobot/members\n"
"https://github.com/colobot/colobot/graphs/contributors"
msgstr ""
"Twórcy projektu Colobot GOLD z PPC:\n"
"https://github.com/orgs/colobot/members\n"
"https://github.com/colobot/colobot/graphs/contributors"
msgid "Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors"
msgstr "Wkład na GitHubie: https://github.com/colobot/colobot/graphs/contributors"
#. type: \b; header
#: help/generic/E/cbot.txt:1

19
help/generic/po/ru.po
View File

@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#: help/generic/E/authors.txt:2
#, no-wrap
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC:\n"
msgid "Developers and internal betatesters of Original COLOBOT game from EPSITEC\n"
msgstr ""
#. type: Bullet: '-'
@ -41,12 +41,21 @@ msgid "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
msgstr ""
#. type: Plain text
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "Colobot: Gold Edition developers\n"
msgstr ""
#. type: Bullet: '-'
#: help/generic/E/authors.txt:7
#, no-wrap
msgid "TerranovaTeam: https://github.com/orgs/colobot/members"
msgstr ""
#. type: Bullet: '-'
#: help/generic/E/authors.txt:8
#, no-wrap
msgid ""
"PPC GOLD Project team and members:\n"
"https://github.com/orgs/colobot/members\n"
"https://github.com/colobot/colobot/graphs/contributors"
msgid "Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors"
msgstr ""
#. type: \b; header