diff options
| author | Matthew Hoops | 2012-08-31 21:58:58 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-08-31 21:58:58 -0400 |
| commit | 790a74ab9df5eae7bcf9d923b0d5ec26569771b2 (patch) | |
| tree | eb0a6f983abe5fa80f4798fb0dbd5dec4db43473 /gui | |
| parent | f61146f32791831211c7b9399ec681aed109f03b (diff) | |
| parent | ddffd74094768fe7c992c568d484de06f389b7a0 (diff) | |
| download | scummvm-rg350-790a74ab9df5eae7bcf9d923b0d5ec26569771b2.tar.gz scummvm-rg350-790a74ab9df5eae7bcf9d923b0d5ec26569771b2.tar.bz2 scummvm-rg350-790a74ab9df5eae7bcf9d923b0d5ec26569771b2.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/credits.h | 3 | ||||
| -rw-r--r-- | gui/themes/translations.dat | bin | 345659 -> 370908 bytes |
2 files changed, 3 insertions, 0 deletions
diff --git a/gui/credits.h b/gui/credits.h index f19002a2d8..88d492098b 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -479,6 +479,9 @@ static const char *credits[] = { "C1""French", "C0""Thierry Crozat", "", +"C1""Galician", +"C0""Santiago G. Sanz", +"", "C1""German", "C0""Simon Sawatzki", "C0""Lothar Serra Mari", diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex d81c1a0475..1c3abf84a8 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat |