Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ennorehling/eressea into develop

Browse source
This commit is contained in:
Enno Rehling 2019-08-25 10:54:26 +02:00
commit 0dabf02628
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clibs

@ -1 +1 @@
Subproject commit 6965050165efdae89305a13bff06283229f143f4
Subproject commit 1854780fe3073e491775836c22f709668b1fff62

2
iniparser

@ -1 +1 @@
Subproject commit e3533ac0a45e43e9716c40f6a874bc6f41ddc96d
Subproject commit 22741d9ce9d19bf7b5f5a219b6ed0925259a4d1b

4
res/translations/strings.de.po
View file

@ -1708,7 +1708,7 @@ msgid "caravel_a"
msgstr "eine Karavelle"
msgid "galleon_a"
msgstr "eine Galleone"
msgstr "eine Galeone"
msgctxt "keyword"
msgid "describe"
@ -2068,7 +2068,7 @@ msgid "caravel"
msgstr "Karavelle"
msgid "galleon"
msgstr "Galleone"
msgstr "Galeone"
msgid "dragon_postfix_10"
msgstr "der Goldene"

10
tests/run-turn.sh
View file

@ -54,11 +54,11 @@ assert_grep_count reports/$CRFILE '^EINHEIT' 2
assert_grep_count reports/$CRFILE '^GEGENSTAENDE' 2
assert_grep_count reports/185-heg.cr '185;Runde' 1
assert_grep_count reports/185-heg.cr ';Baeume' 2
assert_grep_count reports/185-heg.cr '"B.ume";type' 2
assert_grep_count reports/185-heg.cr '"Pferde";type' 2
assert_grep_count reports/185-heg.nr 'erblickt' 2
assert_grep_count reports/185-heg.cr '"lighthouse";visibility' 2
assert_grep_count reports/185-heg.cr ';Baeume' 4
assert_grep_count reports/185-heg.cr '"B.ume";type' 4
assert_grep_count reports/185-heg.cr '"Pferde";type' 6
assert_grep_count reports/185-heg.nr 'erblickt' 6
assert_grep_count reports/185-heg.cr '"lighthouse";visibility' 6
assert_grep_count reports/185-heg.cr '"neighbour";visibility' 11
assert_grep_count reports/185-6rLo.cr '^EINHEIT' 2
assert_grep_count reports/185-6rLo.cr '^REGION' 13