diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b02fb699f6c..f6097581c57 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5011,6 +5011,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l } else { /* charset is DEFAULT_CHARSET or invalid. */ INT acp, i; + DWORD mask = 0; /* Set the current codepage's charset as the first element. */ acp = GetACP(); @@ -5019,6 +5020,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l list->element[n].mask = csi.fs.fsCsb[0]; list->element[n].charset = csi.ciCharset; load_script_name( ffs(csi.fs.fsCsb[0]) - 1, list->element[n].name ); + mask |= csi.fs.fsCsb[0]; n++; } @@ -5027,7 +5029,7 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l FONTSIGNATURE fs; fs.fsCsb[0] = 1L << i; fs.fsCsb[1] = 0; - if (n > 0 && fs.fsCsb[0] == list->element[0].mask) + if (fs.fsCsb[0] & mask) continue; /* skip, already added. */ if (!TranslateCharsetInfo(fs.fsCsb, &csi, TCI_SRCFONTSIG)) continue; /* skip, this is an invalid fsCsb bit. */ @@ -5035,6 +5037,16 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l list->element[n].mask = fs.fsCsb[0]; list->element[n].charset = csi.ciCharset; load_script_name( i, list->element[n].name ); + mask |= fs.fsCsb[0]; + n++; + } + + /* add catch all mask for remaining bits */ + if (~mask) + { + list->element[n].mask = ~mask; + list->element[n].charset = DEFAULT_CHARSET; + load_script_name( IDS_OTHER - IDS_FIRST_SCRIPT, list->element[n].name ); n++; } } @@ -5186,11 +5198,15 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha for(i = 0; i < list->total; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; - load_script_name( IDS_OEM_DOS, elf.elfScript ); + load_script_name( IDS_OEM_DOS - IDS_FIRST_SCRIPT, elf.elfScript ); i = list->total; /* break out of loop after enumeration */ - } else if(!(face->fs.fsCsb[0] & list->element[i].mask)) - continue; - else { + } + else + { + if(!(face->fs.fsCsb[0] & list->element[i].mask)) continue; + /* use the DEFAULT_CHARSET case only if no other charset is present */ + if (list->element[i].charset == DEFAULT_CHARSET && + (face->fs.fsCsb[0] & ~list->element[i].mask)) continue; elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = list->element[i].charset; strcpyW(elf.elfScript, list->element[i].name); if (!elf.elfScript[0]) diff --git a/dlls/gdi32/gdi32.rc b/dlls/gdi32/gdi32.rc index 84d36afff38..18a896fc9d9 100644 --- a/dlls/gdi32/gdi32.rc +++ b/dlls/gdi32/gdi32.rc @@ -39,6 +39,7 @@ STRINGTABLE IDS_HANGUL_JOHAB "Hangul(Johab)" IDS_SYMBOL "Symbol" IDS_OEM_DOS "OEM/DOS" + IDS_OTHER "Other" } LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/dlls/gdi32/resource.h b/dlls/gdi32/resource.h index 77382529ecc..b9a0eb66735 100644 --- a/dlls/gdi32/resource.h +++ b/dlls/gdi32/resource.h @@ -37,3 +37,4 @@ #define IDS_HANGUL_JOHAB (IDS_FIRST_SCRIPT + 21) #define IDS_SYMBOL (IDS_FIRST_SCRIPT + 31) #define IDS_OEM_DOS (IDS_FIRST_SCRIPT + 32) +#define IDS_OTHER (IDS_FIRST_SCRIPT + 33) diff --git a/po/ar.po b/po/ar.po index 86f7c906309..78c25be27a0 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3019,6 +3019,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 #, fuzzy msgid "Files on Camera" @@ -9027,10 +9031,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/bg.po b/po/bg.po index 296b5734ea7..8be6b3e95ba 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3031,6 +3031,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 #, fuzzy msgid "Files on Camera" @@ -9164,10 +9168,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 #, fuzzy msgid "Server Down" diff --git a/po/ca.po b/po/ca.po index b1fb11f9c46..bb7554fb68c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3090,6 +3090,10 @@ msgstr "Símbol" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Altre" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Arxius en Càmera" @@ -9271,10 +9275,6 @@ msgstr "Resultats Massa Grans" msgid "Affects Multiple DSAs" msgstr "Afecta DSAs Múltiples" -#: wldap32.rc:107 -msgid "Other" -msgstr "Altre" - #: wldap32.rc:108 msgid "Server Down" msgstr "Servidor Fora de Línia" diff --git a/po/cs.po b/po/cs.po index a9894b28772..95c4d4348be 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3074,6 +3074,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 #, fuzzy msgid "Files on Camera" @@ -9349,10 +9353,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/da.po b/po/da.po index 3c1e7885040..c49ff82e938 100644 --- a/po/da.po +++ b/po/da.po @@ -3061,6 +3061,10 @@ msgstr "Symbol" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Anden" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Filer på kamera" @@ -9202,10 +9206,6 @@ msgstr "Resultaterne er for store" msgid "Affects Multiple DSAs" msgstr "Berører flere DSA'er" -#: wldap32.rc:107 -msgid "Other" -msgstr "Anden" - #: wldap32.rc:108 msgid "Server Down" msgstr "Server nede" diff --git a/po/de.po b/po/de.po index b6edbb218ae..891b347c98d 100644 --- a/po/de.po +++ b/po/de.po @@ -3053,6 +3053,10 @@ msgstr "Symbol" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Andere" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Dateien auf der Kamera" @@ -9201,10 +9205,6 @@ msgstr "Ergebnisse zu groß" msgid "Affects Multiple DSAs" msgstr "Mehrere DSAs betroffen" -#: wldap32.rc:107 -msgid "Other" -msgstr "Andere" - #: wldap32.rc:108 msgid "Server Down" msgstr "Server heruntergefahren" diff --git a/po/el.po b/po/el.po index 87bb3b26ffd..677ad9fb20e 100644 --- a/po/el.po +++ b/po/el.po @@ -2978,6 +2978,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "" @@ -9022,10 +9026,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/en.po b/po/en.po index 35ebb8d67ed..68034dde6c2 100644 --- a/po/en.po +++ b/po/en.po @@ -3045,6 +3045,10 @@ msgstr "Symbol" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Other" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Files on Camera" @@ -9149,10 +9153,6 @@ msgstr "Results Too Large" msgid "Affects Multiple DSAs" msgstr "Affects Multiple DSAs" -#: wldap32.rc:107 -msgid "Other" -msgstr "Other" - #: wldap32.rc:108 msgid "Server Down" msgstr "Server Down" diff --git a/po/en_US.po b/po/en_US.po index 8ea241e4369..d7644e435fa 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -3047,6 +3047,10 @@ msgstr "Symbol" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Other" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Files on Camera" @@ -9153,10 +9157,6 @@ msgstr "Results Too Large" msgid "Affects Multiple DSAs" msgstr "Affects Multiple DSAs" -#: wldap32.rc:107 -msgid "Other" -msgstr "Other" - #: wldap32.rc:108 msgid "Server Down" msgstr "Server Down" diff --git a/po/eo.po b/po/eo.po index ee1f976e950..7ade9fb2c8b 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2969,6 +2969,10 @@ msgstr "Simbola" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Dosieroj en la fotilo" @@ -8888,10 +8892,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/es.po b/po/es.po index 080cf0198dd..ed7c00091b9 100644 --- a/po/es.po +++ b/po/es.po @@ -3075,6 +3075,10 @@ msgstr "Symbol" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Otro" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Archivos de la cámara" @@ -9257,10 +9261,6 @@ msgstr "Resultados demasiado largos" msgid "Affects Multiple DSAs" msgstr "Afecta a múltiples DSAs" -#: wldap32.rc:107 -msgid "Other" -msgstr "Otro" - #: wldap32.rc:108 msgid "Server Down" msgstr "Servidor caído" diff --git a/po/fa.po b/po/fa.po index fca5be504d8..4337bc75c9f 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3019,6 +3019,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 #, fuzzy msgid "Files on Camera" @@ -9028,10 +9032,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/fi.po b/po/fi.po index c607400342a..e6e0a3b844c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3042,6 +3042,10 @@ msgstr "Symbolit" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Muu" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Tiedostot kamerassa" @@ -9130,10 +9134,6 @@ msgstr "Tulokset liian suuret" msgid "Affects Multiple DSAs" msgstr "Vaikuttaa usean DSA:han" -#: wldap32.rc:107 -msgid "Other" -msgstr "Muu" - #: wldap32.rc:108 msgid "Server Down" msgstr "Palvelin ei toiminnassa" diff --git a/po/fr.po b/po/fr.po index c831c80f239..7085ae86779 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3069,6 +3069,10 @@ msgstr "Symbole" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Autre" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Fichiers sur l'appareil photo" @@ -9228,10 +9232,6 @@ msgstr "Résultats trop grands" msgid "Affects Multiple DSAs" msgstr "Affecte de multiples DSA" -#: wldap32.rc:107 -msgid "Other" -msgstr "Autre" - #: wldap32.rc:108 msgid "Server Down" msgstr "Serveur indisponible" diff --git a/po/he.po b/po/he.po index 7706afeff90..c87f235120d 100644 --- a/po/he.po +++ b/po/he.po @@ -3050,6 +3050,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "אחר" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "קבצים במצלמה" @@ -9290,10 +9294,6 @@ msgstr "התוצאות גדולות מדי" msgid "Affects Multiple DSAs" msgstr "משפיע על מספר DSA" -#: wldap32.rc:107 -msgid "Other" -msgstr "אחר" - #: wldap32.rc:108 msgid "Server Down" msgstr "השרת מושבת" diff --git a/po/hi.po b/po/hi.po index dc0a45256ab..1c3104bea42 100644 --- a/po/hi.po +++ b/po/hi.po @@ -2962,6 +2962,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "" @@ -8883,10 +8887,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/hu.po b/po/hu.po index f37621c6b30..b571cfe7f4b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3075,6 +3075,10 @@ msgstr "Szimbólum" msgid "OEM/DOS" msgstr "OEM/DO" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Egyéb" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Fényképezőgépen lévő fájlok" @@ -9180,10 +9184,6 @@ msgstr "Eredmény túl nagy" msgid "Affects Multiple DSAs" msgstr "Több DSA-ra van hatással" -#: wldap32.rc:107 -msgid "Other" -msgstr "Egyéb" - #: wldap32.rc:108 msgid "Server Down" msgstr "Kiszolgáló nem elérhető" diff --git a/po/it.po b/po/it.po index 521cfe85342..01d1aa6e655 100644 --- a/po/it.po +++ b/po/it.po @@ -3090,6 +3090,10 @@ msgstr "Symbol" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Altro" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Files sulla videocamera" @@ -9264,10 +9268,6 @@ msgstr "Risultati troppo grandi" msgid "Affects Multiple DSAs" msgstr "Ha effetto su molti DSA" -#: wldap32.rc:107 -msgid "Other" -msgstr "Altro" - #: wldap32.rc:108 msgid "Server Down" msgstr "Server irraggiungibile" diff --git a/po/ja.po b/po/ja.po index f5e5b689c6e..c601d3e19dc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3041,6 +3041,10 @@ msgstr "シンボル" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "その他" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "カメラにあるファイル" @@ -9138,10 +9142,6 @@ msgstr "結果が大きすぎる" msgid "Affects Multiple DSAs" msgstr "複数のディレクトリ サービス エージェント(DSA)に影響" -#: wldap32.rc:107 -msgid "Other" -msgstr "その他" - #: wldap32.rc:108 msgid "Server Down" msgstr "サーバ ダウン" diff --git a/po/ko.po b/po/ko.po index 40ce9e1e51f..c220c05f6c9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3039,6 +3039,10 @@ msgstr "기호" msgid "OEM/DOS" msgstr "OEM/도" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "다른 문제" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "카메라에 있는 파" @@ -9116,10 +9120,6 @@ msgstr "결과가 너무 큽니다" msgid "Affects Multiple DSAs" msgstr "다양한 DSAs이 작용합니다" -#: wldap32.rc:107 -msgid "Other" -msgstr "다른 문제" - #: wldap32.rc:108 msgid "Server Down" msgstr "서바 다운" diff --git a/po/lt.po b/po/lt.po index a79eedbc81d..6742e0096df 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3053,6 +3053,10 @@ msgstr "Simboliai" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Kita" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Failai kameroje" @@ -9170,10 +9174,6 @@ msgstr "Rezultatai per dideli" msgid "Affects Multiple DSAs" msgstr "Įtakoja daugelį DSA" -#: wldap32.rc:107 -msgid "Other" -msgstr "Kita" - #: wldap32.rc:108 msgid "Server Down" msgstr "Serveris nepasiekiamas" diff --git a/po/ml.po b/po/ml.po index 3ab7b7e200f..f98cb011a2f 100644 --- a/po/ml.po +++ b/po/ml.po @@ -2962,6 +2962,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "" @@ -8883,10 +8887,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index c485c4a11f8..b527c10b33a 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -3156,6 +3156,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Annen" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Filer på kamera" @@ -9447,10 +9451,6 @@ msgstr "Resultatene er for store" msgid "Affects Multiple DSAs" msgstr "Berører flere DSA'er" -#: wldap32.rc:107 -msgid "Other" -msgstr "Annen" - #: wldap32.rc:108 msgid "Server Down" msgstr "Tjener nede" diff --git a/po/nl.po b/po/nl.po index 611b17ec298..eb36957258c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3098,6 +3098,10 @@ msgstr "Symbol" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Anders" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Bestanden op de camera" @@ -9300,10 +9304,6 @@ msgstr "Resultaten te groot" msgid "Affects Multiple DSAs" msgstr "Betreft meerdere DSA's" -#: wldap32.rc:107 -msgid "Other" -msgstr "Anders" - #: wldap32.rc:108 msgid "Server Down" msgstr "Server plat" diff --git a/po/or.po b/po/or.po index f65429427d8..9d46644787c 100644 --- a/po/or.po +++ b/po/or.po @@ -2962,6 +2962,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "" @@ -8883,10 +8887,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/pa.po b/po/pa.po index a806f13e0ef..8d46bbbc2f3 100644 --- a/po/pa.po +++ b/po/pa.po @@ -2962,6 +2962,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "" @@ -8883,10 +8887,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/pl.po b/po/pl.po index dfced28b6fe..d1d398653de 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3064,6 +3064,10 @@ msgstr "Symbol" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Inne" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Pliki w aparacie" @@ -9187,10 +9191,6 @@ msgstr "Wynik zbyt duży" msgid "Affects Multiple DSAs" msgstr "Ma wpływ na wiele agentów DSA" -#: wldap32.rc:107 -msgid "Other" -msgstr "Inne" - #: wldap32.rc:108 msgid "Server Down" msgstr "Serwer wyłączony" diff --git a/po/pt_BR.po b/po/pt_BR.po index 79d55340c31..f6565cf76b5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3060,6 +3060,10 @@ msgstr "Símbolo" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Outro" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Arquivos na Câmera" @@ -9190,10 +9194,6 @@ msgstr "Resultados Muito Grandes" msgid "Affects Multiple DSAs" msgstr "Afeta Múltiplos DSAs" -#: wldap32.rc:107 -msgid "Other" -msgstr "Outro" - #: wldap32.rc:108 msgid "Server Down" msgstr "Servidor Desligado" diff --git a/po/pt_PT.po b/po/pt_PT.po index ffde0f1e7b4..7fba3c5535a 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -3087,6 +3087,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Outro" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Ficheiros na Câmara" @@ -9204,10 +9208,6 @@ msgstr "Resultados Muito Grandes" msgid "Affects Multiple DSAs" msgstr "Afecta Múltiplos DSAs" -#: wldap32.rc:107 -msgid "Other" -msgstr "Outro" - #: wldap32.rc:108 msgid "Server Down" msgstr "Servidor em Baixo" diff --git a/po/rm.po b/po/rm.po index d5685103901..46fdc4e3f37 100644 --- a/po/rm.po +++ b/po/rm.po @@ -2987,6 +2987,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 #, fuzzy msgid "Files on Camera" @@ -8941,10 +8945,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/ro.po b/po/ro.po index c14dc12c03f..1b7d0b08ced 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3058,6 +3058,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Altul" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Fișiere în aparatul foto" @@ -9455,10 +9459,6 @@ msgstr "Rezultate prea mari" msgid "Affects Multiple DSAs" msgstr "Afectează mai multe DSA" -#: wldap32.rc:107 -msgid "Other" -msgstr "Altul" - #: wldap32.rc:108 msgid "Server Down" msgstr "Server indisponibil" diff --git a/po/ru.po b/po/ru.po index a9e7121f7c4..14705f34c2b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3052,6 +3052,10 @@ msgstr "Символьный" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Другой" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Файлы в камере" @@ -9156,10 +9160,6 @@ msgstr "Результаты слишком велики" msgid "Affects Multiple DSAs" msgstr "Влияет на несколько DSA" -#: wldap32.rc:107 -msgid "Other" -msgstr "Другой" - #: wldap32.rc:108 msgid "Server Down" msgstr "Сервер недоступен" diff --git a/po/sk.po b/po/sk.po index 2e7ce341e00..48d272fe5ca 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2994,6 +2994,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Súbory na fotoaparáte" @@ -9019,10 +9023,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/sl.po b/po/sl.po index c04d760fc46..36f71563e0a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3079,6 +3079,10 @@ msgstr "Simbol" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Drugo" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Datoteke na fotoaparatu" @@ -9216,10 +9220,6 @@ msgstr "Rezultati so preveliki" msgid "Affects Multiple DSAs" msgstr "Vpliva na več DSA-jev" -#: wldap32.rc:107 -msgid "Other" -msgstr "Drugo" - #: wldap32.rc:108 msgid "Server Down" msgstr "Strežnik ni dostopen" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 47dd1acbe65..723e51f050b 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -3050,6 +3050,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Остало" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Датотеке на камери" @@ -9353,10 +9357,6 @@ msgstr "Резултати су превелики" msgid "Affects Multiple DSAs" msgstr "Утиче на вишеструке алгоритме" -#: wldap32.rc:107 -msgid "Other" -msgstr "Остало" - #: wldap32.rc:108 msgid "Server Down" msgstr "Сервер тренутно не ради" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 065833c061c..3167fe5340e 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -3131,6 +3131,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Ostalo" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Datoteke na kameri" @@ -9453,10 +9457,6 @@ msgstr "Rezultati su preveliki" msgid "Affects Multiple DSAs" msgstr "Utiče na višestruke algoritme" -#: wldap32.rc:107 -msgid "Other" -msgstr "Ostalo" - #: wldap32.rc:108 msgid "Server Down" msgstr "Server trenutno ne radi" diff --git a/po/sv.po b/po/sv.po index bb669d44eaa..14333f4835a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3048,6 +3048,10 @@ msgstr "" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Filer på kamera" @@ -9120,10 +9124,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/te.po b/po/te.po index 0884912f850..f77d9f573f5 100644 --- a/po/te.po +++ b/po/te.po @@ -2962,6 +2962,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "" @@ -8883,10 +8887,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/th.po b/po/th.po index afc63c33cc3..6cd0956fc6d 100644 --- a/po/th.po +++ b/po/th.po @@ -2994,6 +2994,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 #, fuzzy msgid "Files on Camera" @@ -9040,10 +9044,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/tr.po b/po/tr.po index 2fcc2697998..0c844e61c9b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2958,6 +2958,10 @@ msgstr "" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Diğer" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "" @@ -8993,10 +8997,6 @@ msgstr "Sonuçlar Çok Büyük" msgid "Affects Multiple DSAs" msgstr "Birden Fazla DSA Etkilenir" -#: wldap32.rc:107 -msgid "Other" -msgstr "Diğer" - #: wldap32.rc:108 msgid "Server Down" msgstr "Sunucu Kapalı" diff --git a/po/uk.po b/po/uk.po index 8c45d4112fd..f90080897e3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3068,6 +3068,10 @@ msgstr "Символ" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "Інший" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "Файли в камері" @@ -9210,10 +9214,6 @@ msgstr "Результати завеликі" msgid "Affects Multiple DSAs" msgstr "Впливає на декілька DSA" -#: wldap32.rc:107 -msgid "Other" -msgstr "Інший" - #: wldap32.rc:108 msgid "Server Down" msgstr "Сервер недоступний" diff --git a/po/wa.po b/po/wa.po index 85705ce6c5f..56260cb1d01 100644 --- a/po/wa.po +++ b/po/wa.po @@ -3005,6 +3005,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 #, fuzzy msgid "Files on Camera" @@ -8981,10 +8985,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/wine.pot b/po/wine.pot index 4b1ea4069bb..77750d6383c 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -2934,6 +2934,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "" @@ -8829,10 +8833,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index bdc624f5dc4..b5096c172cb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2979,6 +2979,10 @@ msgstr "" msgid "OEM/DOS" msgstr "" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "照相机中的文件" @@ -8946,10 +8950,6 @@ msgstr "" msgid "Affects Multiple DSAs" msgstr "" -#: wldap32.rc:107 -msgid "Other" -msgstr "" - #: wldap32.rc:108 msgid "Server Down" msgstr "服务器不可用" diff --git a/po/zh_TW.po b/po/zh_TW.po index bf9b987dec7..f4a38198745 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3004,6 +3004,10 @@ msgstr "符號" msgid "OEM/DOS" msgstr "OEM/DOS" +#: gdi32.rc:42 wldap32.rc:107 +msgid "Other" +msgstr "其他" + #: gphoto2.rc:27 msgid "Files on Camera" msgstr "照相機中的檔案" @@ -9011,10 +9015,6 @@ msgstr "結果太大" msgid "Affects Multiple DSAs" msgstr "影響多重 DSAs" -#: wldap32.rc:107 -msgid "Other" -msgstr "其他" - #: wldap32.rc:108 msgid "Server Down" msgstr "伺服器停機"