From 1db703f5791434e216867c816da52539655c8702 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 21 Aug 2019 15:36:36 +0200 Subject: [PATCH 1/2] Galeone mit einem L --- clibs | 2 +- iniparser | 2 +- res/translations/strings.de.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clibs b/clibs index 696505016..1854780fe 160000 --- a/clibs +++ b/clibs @@ -1 +1 @@ -Subproject commit 6965050165efdae89305a13bff06283229f143f4 +Subproject commit 1854780fe3073e491775836c22f709668b1fff62 diff --git a/iniparser b/iniparser index e3533ac0a..22741d9ce 160000 --- a/iniparser +++ b/iniparser @@ -1 +1 @@ -Subproject commit e3533ac0a45e43e9716c40f6a874bc6f41ddc96d +Subproject commit 22741d9ce9d19bf7b5f5a219b6ed0925259a4d1b diff --git a/res/translations/strings.de.po b/res/translations/strings.de.po index 5884eda83..8c90d6657 100644 --- a/res/translations/strings.de.po +++ b/res/translations/strings.de.po @@ -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" From 61b86aa0221b85ab1283437c02abe9ad166debf5 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 21 Aug 2019 19:44:10 +0200 Subject: [PATCH 2/2] Anpassung an neue Leuchtturm-Regelung --- tests/run-turn.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/run-turn.sh b/tests/run-turn.sh index 470cb6e2b..ad2e0e6b8 100755 --- a/tests/run-turn.sh +++ b/tests/run-turn.sh @@ -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