From: Perry Rapp Date: Mon, 18 Jul 2005 16:06:27 +0000 (+0000) Subject: 2005-07-18 Perry X-Git-Tag: 2.16.5~5824 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c4e14004c3c8656e07d82fca8ff702d0751d483c;p=winmerge-jp%2Fwinmerge-jp.git 2005-07-18 Perry BUG: [ 1232382 ] Inconsistent language name casing in Spanish UI (v2.3.4.0) Make all language names capitalized in Spanish, as in Catalan Src/Languages/Spanish: MergeSpanish.rc --- diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 2a27602cf..db6c1eda3 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -2200,36 +2200,36 @@ END // LANGUAGE NAMES #1 STRINGTABLE BEGIN - IDS_AFRIKAANS "afrikaans" - IDS_ALBANIAN "albanés" - IDS_ARABIC_SAUDI "árabe (Saudi Arabian)" - IDS_ARABIC_IRAQ "árabe (Iraq)" - IDS_ARABIC_EGYPT "árabe (Egyptian)" - IDS_ARABIC_LIBYA "árabe (Libyan)" - IDS_ARABIC_ALGERIA "árabe (Algerian)" - IDS_ARABIC_MOROCCO "árabe (Moroccan)" - IDS_ARABIC_TUNISIA "árabe (Tunisian)" - IDS_ARABIC_OMAN "árabe (Oman)" - IDS_ARABIC_YEMEN "árabe (Yemen)" - IDS_ARABIC_SYRIA "árabe (Syrian)" - IDS_ARABIC_JORDAN "árabe (Jordan)" + IDS_AFRIKAANS "Afrikaans" + IDS_ALBANIAN "Albanés" + IDS_ARABIC_SAUDI "Árabe (Saudi Arabian)" + IDS_ARABIC_IRAQ "Árabe (Iraq)" + IDS_ARABIC_EGYPT "Árabe (Egyptian)" + IDS_ARABIC_LIBYA "Árabe (Libyan)" + IDS_ARABIC_ALGERIA "Árabe (Algerian)" + IDS_ARABIC_MOROCCO "Árabe (Moroccan)" + IDS_ARABIC_TUNISIA "Árabe (Tunisian)" + IDS_ARABIC_OMAN "Árabe (Oman)" + IDS_ARABIC_YEMEN "Árabe (Yemen)" + IDS_ARABIC_SYRIA "Árabe (Syrian)" + IDS_ARABIC_JORDAN "Árabe (Jordan)" END // LANGUAGE NAMES #2 STRINGTABLE BEGIN - IDS_ARABIC_LEBANON "árabe (Lebanon)" - IDS_ARABIC_KUWAIT "árabe (Kuwait)" - IDS_ARABIC_UAE "árabe (UAE)" - IDS_ARABIC_BAHRAIN "árabe (Bahrain)" - IDS_ARABIC_QATAR "árabe (Qatar)" - IDS_ARMENIAN "armenio" + IDS_ARABIC_LEBANON "Árabe (Lebanon)" + IDS_ARABIC_KUWAIT "Árabe (Kuwait)" + IDS_ARABIC_UAE "Árabe (UAE)" + IDS_ARABIC_BAHRAIN "Árabe (Bahrain)" + IDS_ARABIC_QATAR "Árabe (Qatar)" + IDS_ARMENIAN "Armenio" IDS_AZERI_LATIN "Azeri (Latin)" IDS_AZERI_CYRILLIC "Azeri (Cyrillic)" IDS_BASQUE "Euskera" IDS_BELARUSIAN "Bieloruso" - IDS_BULGARIAN "búlgaro" - IDS_CATALAN "catalán" + IDS_BULGARIAN "Búlgaro" + IDS_CATALAN "Catalán" IDS_CHINESE_TRADITIONAL "Chino (Traditional)" IDS_CHINESE_SIMPLIFIED "Chino (Simplified)" IDS_CHINESE_HONGKONG "Chino (Hong Kong)" @@ -2245,24 +2245,24 @@ BEGIN IDS_DANISH "Danés" IDS_DUTCH "Belga" IDS_DUTCH_BELGIAN "Belga (Belgium)" - IDS_ENGLISH_US "inglés (US)" - IDS_ENGLISH_UK "inglés (UK)" - IDS_ENGLISH_AUS "inglés (Australian)" - IDS_ENGLISH_CAN "inglés (Canadian)" - IDS_ENGLISH_NZ "inglés (New Zealand)" - IDS_ENGLISH_EIRE "inglés (Irish)" - IDS_ENGLISH_SOUTH_AFRICA "inglés (So. African)" - IDS_ENGLISH_JAMAICA "inglés (Jamaican)" - IDS_ENGLISH_CARIBBEAN "inglés (Caribbean)" - IDS_ENGLISH_BELIZE "inglés (Belize)" + IDS_ENGLISH_US "Inglés (US)" + IDS_ENGLISH_UK "Inglés (UK)" + IDS_ENGLISH_AUS "Inglés (Australian)" + IDS_ENGLISH_CAN "Inglés (Canadian)" + IDS_ENGLISH_NZ "Inglés (New Zealand)" + IDS_ENGLISH_EIRE "Inglés (Irish)" + IDS_ENGLISH_SOUTH_AFRICA "Inglés (So. African)" + IDS_ENGLISH_JAMAICA "Inglés (Jamaican)" + IDS_ENGLISH_CARIBBEAN "Inglés (Caribbean)" + IDS_ENGLISH_BELIZE "Inglés (Belize)" END // LANGUAGE NAMES #4 STRINGTABLE BEGIN - IDS_ENGLISH_TRINIDAD "inglés (Trinidad)" - IDS_ENGLISH_ZIMBABWE "inglés (Zimbabwe)" - IDS_ENGLISH_PHILIPPINES "inglés (Philippines)" + IDS_ENGLISH_TRINIDAD "Inglés (Trinidad)" + IDS_ENGLISH_ZIMBABWE "Inglés (Zimbabwe)" + IDS_ENGLISH_PHILIPPINES "Inglés (Philippines)" IDS_ESTONIAN "Eesti" IDS_FAEROESE "Faeroese" IDS_FARSI "Farsi" @@ -2274,46 +2274,46 @@ BEGIN IDS_FRENCH_LUXEMBOURG "Francés (Luxembourg)" IDS_FRENCH_MONACO "Francés (Monaco)" IDS_GEORGIAN "Georgiano" - IDS_GERMAN "alemán (Germany)" - IDS_GERMAN_SWISS "alemán (Switzerland)" + IDS_GERMAN "Alemán (Germany)" + IDS_GERMAN_SWISS "Alemán (Switzerland)" END // LANGUAGE NAMES #5 STRINGTABLE BEGIN - IDS_GERMAN_AUSTRIAN "alemán (Austria)" - IDS_GERMAN_LUXEMBOURG "alemán (Luxembourg)" - IDS_GERMAN_LIECHTENSTEIN "alemán (Liechtenstein)" - IDS_GREEK "griego" - IDS_HEBREW "hebreo" - IDS_HINDI "hindú" - IDS_HUNGARIAN "húngaro" - IDS_ICELANDIC "islandés" + IDS_GERMAN_AUSTRIAN "Alemán (Austria)" + IDS_GERMAN_LUXEMBOURG "Alemán (Luxembourg)" + IDS_GERMAN_LIECHTENSTEIN "Alemán (Liechtenstein)" + IDS_GREEK "Griego" + IDS_HEBREW "Hebreo" + IDS_HINDI "Hindú" + IDS_HUNGARIAN "Húngaro" + IDS_ICELANDIC "Islandés" IDS_INDONESIAN "Indonesio" - IDS_ITALIAN "italiano" - IDS_ITALIAN_SWISS "italiano (Swiss)" - IDS_JAPANESE "japonés" + IDS_ITALIAN "Italiano" + IDS_ITALIAN_SWISS "Italiano (Swiss)" + IDS_JAPANESE "Japonés" IDS_KASHMIRI "Kashmiri (India)" IDS_KAZAK "Kazakh" - IDS_KOREAN "koreano" - IDS_KOREAN_JOHAB "koreano (Johab)" + IDS_KOREAN "Koreano" + IDS_KOREAN_JOHAB "Koreano (Johab)" END // LANGUAGE NAMES #6 STRINGTABLE BEGIN IDS_LATVIAN "Letón" - IDS_LITHUANIAN "lituano" + IDS_LITHUANIAN "Lituano" IDS_MALAY_MALAYSIA "Malay (Malaysian)" IDS_MALAY_BRUNEI_DARUSSALAM "Malay (Brunei Darussalam)" IDS_MANIPURI "Manipuri" - IDS_NORWEGIAN_BOKMAL "noruego (Bokmal)" - IDS_NORWEGIAN_NYNORSK "noruego (Nynorsk)" - IDS_POLISH "polaco" - IDS_PORTUGUESE "portugués" - IDS_PORTUGUESE_BRAZILIAN "portugués brasilero" - IDS_ROMANIAN "rumano" - IDS_RUSSIAN "ruso" + IDS_NORWEGIAN_BOKMAL "Noruego (Bokmal)" + IDS_NORWEGIAN_NYNORSK "Noruego (Nynorsk)" + IDS_POLISH "Polaco" + IDS_PORTUGUESE "Portugués" + IDS_PORTUGUESE_BRAZILIAN "Portugués brasilero" + IDS_ROMANIAN "Rumano" + IDS_RUSSIAN "Ruso" IDS_SANSKRIT "Sanscrito" IDS_SERBIAN_LATIN "Serbio (Latin)" IDS_SERBIAN_CYRILLIC "Serbio (Cyrillic)" @@ -2323,41 +2323,41 @@ END // LANGUAGE NAMES #7 STRINGTABLE BEGIN - IDS_SLOVAK "eslovaco" - IDS_SLOVENIAN "esloveno" - IDS_SPANISH "español" - IDS_SPANISH_MEXICAN "español (Mexican)" - IDS_SPANISH_MODERN "español (Moderno)" - IDS_SPANISH_GUATEMALA "español (Guatemala)" - IDS_SPANISH_COSTA_RICA "español (Costa Rica)" - IDS_SPANISH_PANAMA "español (Panama)" - IDS_SPANISH_DOMINICAN "español (Dominican)" - IDS_SPANISH_VENEZUELA "español (Venezuela)" - IDS_SPANISH_COLOMBIA "español (Colombia)" - IDS_SPANISH_PERU "español (Peru)" - IDS_SPANISH_ARGENTINA "español (Argentina)" - IDS_SPANISH_ECUADOR "español (Ecuador)" - IDS_SPANISH_CHILE "español (Chile)" - IDS_SPANISH_URUGUAY "español (Uruguay)" + IDS_SLOVAK "Eslovaco" + IDS_SLOVENIAN "Esloveno" + IDS_SPANISH "Español" + IDS_SPANISH_MEXICAN "Español (Mexican)" + IDS_SPANISH_MODERN "Español (Moderno)" + IDS_SPANISH_GUATEMALA "Español (Guatemala)" + IDS_SPANISH_COSTA_RICA "Español (Costa Rica)" + IDS_SPANISH_PANAMA "Español (Panama)" + IDS_SPANISH_DOMINICAN "Español (Dominican)" + IDS_SPANISH_VENEZUELA "Español (Venezuela)" + IDS_SPANISH_COLOMBIA "Español (Colombia)" + IDS_SPANISH_PERU "Español (Peru)" + IDS_SPANISH_ARGENTINA "Español (Argentina)" + IDS_SPANISH_ECUADOR "Español (Ecuador)" + IDS_SPANISH_CHILE "Español (Chile)" + IDS_SPANISH_URUGUAY "Español (Uruguay)" END // LANGUAGE NAMES #8 STRINGTABLE BEGIN - IDS_SPANISH_PARAGUAY "español (Paraguay)" - IDS_SPANISH_BOLIVIA "español (Bolivia)" - IDS_SPANISH_EL_SALVADOR "español (El Salvador)" - IDS_SPANISH_HONDURAS "español (Honduras)" - IDS_SPANISH_NICARAGUA "español (Nicaragua)" - IDS_SPANISH_PUERTO_RICO "español (Puerto Rico)" - IDS_SWAHILI "swahili (Kenya)" - IDS_SWEDISH "sueco" - IDS_SWEDISH_FINLAND "sueco (Finland)" + IDS_SPANISH_PARAGUAY "Español (Paraguay)" + IDS_SPANISH_BOLIVIA "Español (Bolivia)" + IDS_SPANISH_EL_SALVADOR "Español (El Salvador)" + IDS_SPANISH_HONDURAS "Español (Honduras)" + IDS_SPANISH_NICARAGUA "Español (Nicaragua)" + IDS_SPANISH_PUERTO_RICO "Español (Puerto Rico)" + IDS_SWAHILI "Swahili (Kenya)" + IDS_SWEDISH "Sueco" + IDS_SWEDISH_FINLAND "Sueco (Finland)" IDS_TAMIL "Tamil" IDS_TATAR "Tatar (Tatarstan)" - IDS_THAI "tailandés" - IDS_TURKISH "turco" - IDS_UKRANIAN "ucraniano" + IDS_THAI "Tailandés" + IDS_TURKISH "Turco" + IDS_UKRANIAN "Ucraniano" IDS_URDU_PAKISTAN "Urdu (Pakistan)" IDS_URDU_INDIA "Urdu (India)" END @@ -2367,7 +2367,7 @@ STRINGTABLE BEGIN IDS_UZBEK_LATIN "Uzbeko (Latin)" IDS_UZBEK_CYRILLIC "Uzbeko (Cyrillic)" - IDS_VIETNAMESE "vietnamita" + IDS_VIETNAMESE "Vietnamita" END // CODEPAGE GEOGRAPHIC GROUPS diff --git a/Src/readme.txt b/Src/readme.txt index c603a7031..dd51333b0 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,8 @@ +2005-07-18 Perry + BUG: [ 1232382 ] Inconsistent language name casing in Spanish UI (v2.3.4.0) + Make all language names capitalized in Spanish, as in Catalan + Src/Languages/Spanish: MergeSpanish.rc + 2005-07-17 Jochen BUG: [ 1239605 ] Cannot open diff due to 7zip error Src: DirView.cpp