Merge branch 'master' into 0.5.1-dev
- Conflicts:
- CMakeLists.txt
- src/Game.cpp
- src/libs/tinygettext/language.cpp
Description
Description
Details
Details
- Provenance
acme_pjz Authored on Oct 6 2018, 11:00 PM - Parents
- R79:70f841371e7d: update authors
R79:63446fec2447: Merge branch 'master' into 0.5.1-dev - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
- 70f841371e7d update authorsAuthoracme_pjz
- c2f176a02a2f Merge pull request #28 from eugeneloza/masterAuthorJz Pan
- Authoracme_pjz
- d15c22895673 some fixes and refactoringAuthoracme_pjz
- 57c75a5a1bf4 ad-hoc fix to make addon popup dialog biggerAuthoracme_pjz
- 0d2d277039af Minor fixes to Russian translationAuthoreugeneloza
- adf3089c6725 Add spaces in RussianAuthoreugeneloza
- 630c09cf5815 fix Tutorial:UkrainianAuthoreugeneloza
- c195c208dfbb Merge pull request #2 from eugeneloza/acmepjz-masterAuthorEugene Loza
- Authoreugeneloza
- da1fbeff378c Proof-reading part 2 (Russian)Authoreugeneloza
- 212010a14607 Merge branch 'origin/master' into WeblateAuthorHosted Weblate
- e1e89c260332 Translated using Weblate (Norwegian Bokmål)AuthorPetter Reinholdtsen
- 0d993fc777d5 show time and recordings during replayAuthoracme_pjz
- 25c13759d397 fix compile under clangAuthoracme_pjz
- 748fa05fcbd9 Proof-reading part 1Authoreugeneloza
- 7697c129c4e8 translate 1 string in Tututorial:RussianAuthoreugeneloza
- 1c9f2d9ac84f Translation Tutorial:Ukrainian (100%)Authoreugeneloza
- 2a318dcf69dd Translation Tutorial:Ukrainian (56%)Authoreugeneloza
- 3270da8fcd12 fix Default:Ukrainian headerAuthoreugeneloza
- 62b75014cfa9 Ukrainian translation for Default level packAuthoreugeneloza
- Authoreugeneloza
- f3889610c8e6 Ukrainian translation for CLASSICAuthoreugeneloza
- Authoreugeneloza
- 2955d8b76add Some fixes to Russian translationAuthoreugeneloza
- e5a63153774d Ukrainian translation (100%)Authoreugeneloza
- ed7b50801207 Fix some capitalizations in RussianAuthoreugeneloza
- 48192f07da0e Ukrainian translation (67%)Authoreugeneloza
- a3d78fc9bbc9 Ukrainian translation (32%)Authoreugeneloza
- 157883173e06 Ukrainian translation (16%)Authoreugeneloza
- 82167cd04125 Fix 2 errors in RussianAuthoreugeneloza
- c806ef64fd2d Add 4th plural form for 11-14Authoreugeneloza
- cae0131564ae Translate to Russian (100%)Authoreugeneloza
- 6da39583743c Translate to Russian (98%)Authoreugeneloza
- b0f0dd9d9cfd Translate to Russian (67%)Authoreugeneloza