# HG changeset patch # User ib # Date 1389717495 0 # Node ID 6137162e1eae4bea1053a1c77fea51ddbc4a16ef # Parent 87b83c8faf1d11239676957a275e07a48f1345b2 Fix KOI8 encodings. There doesn't seem to exist a KOI8-U/RU encoding, so split it. diff -r 87b83c8faf1d -r 6137162e1eae gui/dialog/preferences.c --- a/gui/dialog/preferences.c Mon Jan 13 19:53:53 2014 +0000 +++ b/gui/dialog/preferences.c Tue Jan 14 16:38:15 2014 +0000 @@ -170,7 +170,8 @@ { "ISO-8859-14", MSGTR_PREFERENCES_FontEncoding12 }, { "ISO-8859-15", MSGTR_PREFERENCES_FontEncoding3 }, { "KOI8-R", MSGTR_PREFERENCES_FontEncoding14 }, - { "KOI8-U/RU", MSGTR_PREFERENCES_FontEncoding15 }, + { "KOI8-U", MSGTR_PREFERENCES_FontEncoding15 }, + { "KOI8-RU", MSGTR_PREFERENCES_FontEncoding25 }, { "BIG5", MSGTR_PREFERENCES_FontEncoding17 }, { "SHIFT-JIS", MSGTR_PREFERENCES_FontEncoding18 }, { "CP1250", MSGTR_PREFERENCES_FontEncoding22}, diff -r 87b83c8faf1d -r 6137162e1eae help/help_mp-de.h --- a/help/help_mp-de.h Mon Jan 13 19:53:53 2014 +0000 +++ b/help/help_mp-de.h Tue Jan 14 16:38:15 2014 +0000 @@ -993,7 +993,7 @@ #define MSGTR_PREFERENCES_FontEncoding12 "Keltisch (ISO-8859-14)" #define MSGTR_PREFERENCES_FontEncoding13 "Hebräisch (ISO-8859-8)" #define MSGTR_PREFERENCES_FontEncoding14 "Russisch (KOI8-R)" -#define MSGTR_PREFERENCES_FontEncoding15 "Ukrainisch, Belarussisch (KOI8-U/RU)" +#define MSGTR_PREFERENCES_FontEncoding15 "Ukrainisch (KOI8-U)" #define MSGTR_PREFERENCES_FontEncoding16 "Vereinfachtes Chinesisch (CP936)" #define MSGTR_PREFERENCES_FontEncoding17 "Traditionelles Chinesisch (BIG5)" #define MSGTR_PREFERENCES_FontEncoding18 "Japanisch (SHIFT-JIS)" @@ -1003,6 +1003,7 @@ #define MSGTR_PREFERENCES_FontEncoding22 "Mitteleuropäisch (CP1250)" #define MSGTR_PREFERENCES_FontEncoding23 "Arabisch (CP1256)" #define MSGTR_PREFERENCES_FontEncoding24 "UTF-8" +#define MSGTR_PREFERENCES_FontEncoding25 "Russisch/Ukrainisch/Weißrussisch (KOI8-RU)" #define MSGTR_PREFERENCES_FontNoAutoScale "Keine automatische Skalierung" #define MSGTR_PREFERENCES_FontPropWidth "Proportional zur Breite des Films" #define MSGTR_PREFERENCES_FontPropHeight "Proportional zur Höhe des Films" diff -r 87b83c8faf1d -r 6137162e1eae help/help_mp-en.h --- a/help/help_mp-en.h Mon Jan 13 19:53:53 2014 +0000 +++ b/help/help_mp-en.h Tue Jan 14 16:38:15 2014 +0000 @@ -786,7 +786,7 @@ #define MSGTR_PREFERENCES_FontEncoding12 "Celtic (ISO-8859-14)" #define MSGTR_PREFERENCES_FontEncoding13 "Hebrew (ISO-8859-8)" #define MSGTR_PREFERENCES_FontEncoding14 "Russian (KOI8-R)" -#define MSGTR_PREFERENCES_FontEncoding15 "Ukrainian, Belarusian (KOI8-U/RU)" +#define MSGTR_PREFERENCES_FontEncoding15 "Ukrainian (KOI8-U)" #define MSGTR_PREFERENCES_FontEncoding16 "Simplified Chinese (CP936)" #define MSGTR_PREFERENCES_FontEncoding17 "Traditional Chinese (BIG5)" #define MSGTR_PREFERENCES_FontEncoding18 "Japanese (SHIFT-JIS)" @@ -796,6 +796,7 @@ #define MSGTR_PREFERENCES_FontEncoding22 "Central European (CP1250)" #define MSGTR_PREFERENCES_FontEncoding23 "Arabic (CP1256)" #define MSGTR_PREFERENCES_FontEncoding24 "UTF-8" +#define MSGTR_PREFERENCES_FontEncoding25 "Russian/Ukrainian/Belarusian (KOI8-RU)" #define MSGTR_PREFERENCES_FontNoAutoScale "No autoscale" #define MSGTR_PREFERENCES_FontPropWidth "Proportional to movie width" #define MSGTR_PREFERENCES_FontPropHeight "Proportional to movie height"