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.podev-hd-graphics
commit
131005c1ae
|
@ -21,11 +21,7 @@ Helpfiles are divided in two categories:
|
||||||
programs, etc. These are stored in levels/$level/help/.
|
programs, etc. These are stored in levels/$level/help/.
|
||||||
|
|
||||||
Helpfiles have their source in english, always stored in the E/
|
Helpfiles have their source in english, always stored in the E/
|
||||||
subdirectory. To ensure retro-compatibility, existing translations have
|
subdirectory. Every other language directory is dynamically generated in the build process from files in level's po/ directory.
|
||||||
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.
|
|
||||||
|
|
||||||
## Colobot syntax
|
## Colobot syntax
|
||||||
|
|
||||||
|
|
|
@ -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
|
The source code contained here was released by Epsitec -- the original
|
||||||
creator of the game -- on open source (GPLv3) license. The code was
|
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
|
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)
|
||||||
|
|
|
@ -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
|
-Daniel Roux -Denis Dumoulin -Otto Kölbl -Michael Walz -Didier Gertsch
|
||||||
-Adrien Roux -Daniel Sauthier -Didier Raboud -Nicolas Stubi
|
-Adrien Roux -Daniel Sauthier -Didier Raboud -Nicolas Stubi
|
||||||
-Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin
|
-Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin
|
||||||
|
|
||||||
PPC GOLD Project team and members:
|
Colobot: Gold Edition developers
|
||||||
https://github.com/orgs/colobot/members
|
- TerranovaTeam: https://github.com/orgs/colobot/members
|
||||||
https://github.com/colobot/colobot/graphs/contributors
|
- Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors
|
||||||
|
|
|
@ -19,7 +19,7 @@ msgstr ""
|
||||||
#. type: Plain text
|
#. type: Plain text
|
||||||
#: help/generic/E/authors.txt:2
|
#: help/generic/E/authors.txt:2
|
||||||
#, no-wrap
|
#, 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 ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: Bullet: '-'
|
#. type: Bullet: '-'
|
||||||
|
@ -41,12 +41,21 @@ msgid "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: Plain text
|
#. 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
|
#: help/generic/E/authors.txt:8
|
||||||
#, no-wrap
|
#, no-wrap
|
||||||
msgid ""
|
msgid "Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors"
|
||||||
"PPC GOLD Project team and members:\n"
|
|
||||||
"https://github.com/orgs/colobot/members\n"
|
|
||||||
"https://github.com/colobot/colobot/graphs/contributors"
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: \b; header
|
#. type: \b; header
|
||||||
|
|
|
@ -19,7 +19,7 @@ msgstr ""
|
||||||
#. type: Plain text
|
#. type: Plain text
|
||||||
#: help/generic/E/authors.txt:2
|
#: help/generic/E/authors.txt:2
|
||||||
#, no-wrap
|
#, 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 ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: Bullet: '-'
|
#. type: Bullet: '-'
|
||||||
|
@ -41,12 +41,21 @@ msgid "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: Plain text
|
#. 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
|
#: help/generic/E/authors.txt:8
|
||||||
#, no-wrap
|
#, no-wrap
|
||||||
msgid ""
|
msgid "Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors"
|
||||||
"PPC GOLD Project team and members:\n"
|
|
||||||
"https://github.com/orgs/colobot/members\n"
|
|
||||||
"https://github.com/colobot/colobot/graphs/contributors"
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: \b; header
|
#. type: \b; header
|
||||||
|
|
|
@ -19,7 +19,7 @@ msgstr ""
|
||||||
#. type: Plain text
|
#. type: Plain text
|
||||||
#: help/generic/E/authors.txt:2
|
#: help/generic/E/authors.txt:2
|
||||||
#, no-wrap
|
#, 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 ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: Bullet: '-'
|
#. type: Bullet: '-'
|
||||||
|
@ -43,11 +43,22 @@ msgid "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: Plain text
|
#. 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
|
#: help/generic/E/authors.txt:8
|
||||||
#, no-wrap
|
#, no-wrap
|
||||||
msgid ""
|
msgid ""
|
||||||
"PPC GOLD Project team and members:\n"
|
"Contributors on GitHub: "
|
||||||
"https://github.com/orgs/colobot/members\n"
|
|
||||||
"https://github.com/colobot/colobot/graphs/contributors"
|
"https://github.com/colobot/colobot/graphs/contributors"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,8 @@ msgstr ""
|
||||||
#. type: Plain text
|
#. type: Plain text
|
||||||
#: help/generic/E/authors.txt:2
|
#: help/generic/E/authors.txt:2
|
||||||
#, no-wrap
|
#, 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 "Twórcy i wewnętrzni betatesterzy oryginalnej gry COLOBOT z EPSITEC:\n"
|
msgstr "Twórcy i wewnętrzni betatesterzy oryginalnej gry COLOBOT od EPSITEC\n"
|
||||||
|
|
||||||
#. type: Bullet: '-'
|
#. type: Bullet: '-'
|
||||||
#: help/generic/E/authors.txt:2
|
#: 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"
|
msgstr "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
|
||||||
|
|
||||||
#. type: Plain text
|
#. 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
|
#: help/generic/E/authors.txt:8
|
||||||
#, no-wrap
|
#, no-wrap
|
||||||
msgid ""
|
msgid "Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors"
|
||||||
"PPC GOLD Project team and members:\n"
|
msgstr "Wkład na GitHubie: https://github.com/colobot/colobot/graphs/contributors"
|
||||||
"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"
|
|
||||||
|
|
||||||
#. type: \b; header
|
#. type: \b; header
|
||||||
#: help/generic/E/cbot.txt:1
|
#: help/generic/E/cbot.txt:1
|
||||||
|
|
|
@ -19,7 +19,7 @@ msgstr ""
|
||||||
#. type: Plain text
|
#. type: Plain text
|
||||||
#: help/generic/E/authors.txt:2
|
#: help/generic/E/authors.txt:2
|
||||||
#, no-wrap
|
#, 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 ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: Bullet: '-'
|
#. type: Bullet: '-'
|
||||||
|
@ -41,12 +41,21 @@ msgid "Nicolas Beuchat -Patrick Thévoz -Joël Roux -Michael Jubin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: Plain text
|
#. 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
|
#: help/generic/E/authors.txt:8
|
||||||
#, no-wrap
|
#, no-wrap
|
||||||
msgid ""
|
msgid "Contributors on GitHub: https://github.com/colobot/colobot/graphs/contributors"
|
||||||
"PPC GOLD Project team and members:\n"
|
|
||||||
"https://github.com/orgs/colobot/members\n"
|
|
||||||
"https://github.com/colobot/colobot/graphs/contributors"
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. type: \b; header
|
#. type: \b; header
|
||||||
|
|
Loading…
Reference in New Issue