diff --git a/Contrib/Language files/Afrikaans.nsh b/Contrib/Language files/Afrikaans.nsh index fb23c2b3..70423bc3 100644 --- a/Contrib/Language files/Afrikaans.nsh +++ b/Contrib/Language files/Afrikaans.nsh @@ -1,7 +1,7 @@ ;Language: Afrikaans (1078) ;By Friedel Wolff -!insertmacro LANGFILE "Afrikaans" "Afrikaans" "Afrikaans" +!insertmacro LANGFILE "Afrikaans" = "Afrikaans" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welkom by die $(^NameDA) Installasieslimmerd" diff --git a/Contrib/Language files/Albanian.nsh b/Contrib/Language files/Albanian.nsh index 040e65d6..cfc3b447 100644 --- a/Contrib/Language files/Albanian.nsh +++ b/Contrib/Language files/Albanian.nsh @@ -1,7 +1,7 @@ ;Language: Albanian (1052) ;Translation Besnik Bleta, besnik@programeshqip.org -!insertmacro LANGFILE "Albanian" "Shqip" "Shqip" +!insertmacro LANGFILE "Albanian" = "Shqip" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Mirësevini te Rregullimi i $(^NameDA)" @@ -48,8 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Për të parë përshkrimin e një përbërësi, vendosni miun përsipër tij." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Për të parë përshkrimin e një përbërësi, vendosni miun përsipër tij." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Arabic.nsh b/Contrib/Language files/Arabic.nsh index 1a6ddf32..39833c40 100644 --- a/Contrib/Language files/Arabic.nsh +++ b/Contrib/Language files/Arabic.nsh @@ -2,7 +2,7 @@ ;Translation by asdfuae@msn.com ;updated by Rami Kattan -!insertmacro LANGFILE "Arabic" "Arabic" "العربية" +!insertmacro LANGFILE "Arabic" = "العربية" "Al-Arabiyyah" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "مرحبا بك في مرشد إعداد $(^NameDA)" @@ -49,8 +49,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "أشر بالفأرة فوق أحد المكونات لرؤية الوصف" !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "أشر بالفأرة فوق أحد المكونات لرؤية الوصف" + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Asturian.nsh b/Contrib/Language files/Asturian.nsh index b295019f..a6412140 100644 --- a/Contrib/Language files/Asturian.nsh +++ b/Contrib/Language files/Asturian.nsh @@ -1,7 +1,7 @@ ;Language: Asturian (1150) ;By Marcos (marcoscostales@gmail.com). -!insertmacro LANGFILE "Asturian" "Asturies" "Asturies" +!insertmacro LANGFILE "Asturian" = "Asturies" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bienveníu al Asistente d'Instalación de $(^NameDA)" @@ -48,8 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Allugue'l mur enriba d'un componente pa ver la so descripción." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Allugue'l mur enriba d'un componente pa ver la so descripción." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Basque.nsh b/Contrib/Language files/Basque.nsh index 937d4697..33d59802 100644 --- a/Contrib/Language files/Basque.nsh +++ b/Contrib/Language files/Basque.nsh @@ -1,7 +1,7 @@ ;Language: Basque (1069) ;By Iñaki San Vicente -!insertmacro LANGFILE "Basque" "Euskera" "Euskera" +!insertmacro LANGFILE "Basque" = "Euskera" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ongi etorri $(^NameDA) -ren instalazio programara" diff --git a/Contrib/Language files/Belarusian.nsh b/Contrib/Language files/Belarusian.nsh index a6d72f39..7279a439 100644 --- a/Contrib/Language files/Belarusian.nsh +++ b/Contrib/Language files/Belarusian.nsh @@ -1,7 +1,7 @@ ;Language: Belarusian (1059) ;Translated by Sitnikov Vjacheslav [ glory_man@tut.by ] -!insertmacro LANGFILE "Belarusian" "Byelorussian" "Беларуская" +!insertmacro LANGFILE "Belarusian" = "Беларуская" "Byelorussian" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Вас вiтае майстар ўстаноўкі $(^NameDA)" diff --git a/Contrib/Language files/Bosnian.nsh b/Contrib/Language files/Bosnian.nsh index 6bdf09ed..29c1bcb2 100644 --- a/Contrib/Language files/Bosnian.nsh +++ b/Contrib/Language files/Bosnian.nsh @@ -1,7 +1,7 @@ ;Language: Bosnian (5146) ;By Salih Čavkić, cavkic@skynet.be -!insertmacro LANGFILE "Bosnian" "Bosanski" "Bosanski" +!insertmacro LANGFILE "Bosnian" = "Bosanski" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Dobrodošli u program za instalaciju $(^NameDA)" diff --git a/Contrib/Language files/Breton.nsh b/Contrib/Language files/Breton.nsh index 33d8b966..a17d9359 100644 --- a/Contrib/Language files/Breton.nsh +++ b/Contrib/Language files/Breton.nsh @@ -1,7 +1,7 @@ ;Language: Breton (1150) ;By KAD-Korvigelloù An Drouizig -!insertmacro LANGFILE "Breton" "Brezhoneg" "Brezhoneg" +!insertmacro LANGFILE "Breton" = "Brezhoneg" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Degemer mat e skoazeller staliañ $(^NameDA)" diff --git a/Contrib/Language files/Bulgarian.nsh b/Contrib/Language files/Bulgarian.nsh index d0987881..74c4c078 100644 --- a/Contrib/Language files/Bulgarian.nsh +++ b/Contrib/Language files/Bulgarian.nsh @@ -4,7 +4,7 @@ ;Updated by Кирил Кирилов (DumpeR) [dumper@data.bg] ; -!insertmacro LANGFILE "Bulgarian" "Bulgarian" "Български" +!insertmacro LANGFILE "Bulgarian" = "Български" "Balgarski" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Добре дошли в Съветника за инсталиране на $(^NameDA)!" diff --git a/Contrib/Language files/Catalan.nsh b/Contrib/Language files/Catalan.nsh index a740e363..e085500d 100644 --- a/Contrib/Language files/Catalan.nsh +++ b/Contrib/Language files/Catalan.nsh @@ -1,7 +1,7 @@ ;Language: Catalan (1027) ;By falanko, corrections by Toni Hermoso Pulido -!insertmacro LANGFILE "Catalan" "Catala" "Català" +!insertmacro LANGFILE "Catalan" = "Català" "Catala" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Benvinguts a l'auxiliar d'instal·lació de l'aplicació $(^NameDA)" @@ -48,8 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Situeu el ratolí damunt d'un component per a veure'n la descripció." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Situeu el ratolí damunt d'un component per a veure'n la descripció." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Cibemba.nlf b/Contrib/Language files/Cibemba.nlf index 8faaec4b..445b0f47 100644 Binary files a/Contrib/Language files/Cibemba.nlf and b/Contrib/Language files/Cibemba.nlf differ diff --git a/Contrib/Language files/Cibemba.nsh b/Contrib/Language files/Cibemba.nsh index 793b59b6..80b9b513 100644 Binary files a/Contrib/Language files/Cibemba.nsh and b/Contrib/Language files/Cibemba.nsh differ diff --git a/Contrib/Language files/Croatian.nsh b/Contrib/Language files/Croatian.nsh index 7c45a803..9fd76771 100644 --- a/Contrib/Language files/Croatian.nsh +++ b/Contrib/Language files/Croatian.nsh @@ -1,7 +1,7 @@ ;Language: Croatian (1050) ;By Igor Ostriz -!insertmacro LANGFILE "Croatian" "Hrvatski" "Hrvatski" +!insertmacro LANGFILE "Croatian" = "Hrvatski" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Dobrodošli u instalaciju programa $(^NameDA)" diff --git a/Contrib/Language files/Czech.nsh b/Contrib/Language files/Czech.nsh index cb1bb231..3e6f8ffe 100644 --- a/Contrib/Language files/Czech.nsh +++ b/Contrib/Language files/Czech.nsh @@ -2,7 +2,7 @@ ;By SELiCE (ls@selice.cz - http://ls.selice.cz) ;Corrected by Ondřej Vaniš - http://www.vanis.cz/ondra -!insertmacro LANGFILE "Czech" "Cestina" "Čeština" +!insertmacro LANGFILE "Czech" = "Čeština" "Cestina" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Vítejte v průvodci instalace programu $(^NameDA)" @@ -49,8 +49,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Při pohybu myší nad instalátorem programu se zobrazí její popis." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Při pohybu myší nad instalátorem programu se zobrazí její popis." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Danish.nsh b/Contrib/Language files/Danish.nsh index ed05b5a2..d3a9e98d 100644 --- a/Contrib/Language files/Danish.nsh +++ b/Contrib/Language files/Danish.nsh @@ -1,7 +1,7 @@ ;Language: Danish (1030) ;By Claus Futtrup -!insertmacro LANGFILE "Danish" "Dansk" "Dansk" +!insertmacro LANGFILE "Danish" = "Dansk" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Velkommen til installationsguiden for $(^NameDA)" @@ -48,8 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Placer musemarkøren over en komponent for at se beskrivelsen af komponenten." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Placer musemarkøren over en komponent for at se beskrivelsen af komponenten." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Dutch.nsh b/Contrib/Language files/Dutch.nsh index 03d05adc..3ae418b2 100644 --- a/Contrib/Language files/Dutch.nsh +++ b/Contrib/Language files/Dutch.nsh @@ -1,7 +1,7 @@ ;Language: Dutch (1043) ;By Joost Verburg -!insertmacro LANGFILE "Dutch" "Nederlands" "Nederlands" +!insertmacro LANGFILE "Dutch" = "Nederlands" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welkom bij de $(^NameDA)-installatiewizard" diff --git a/Contrib/Language files/Efik.nlf b/Contrib/Language files/Efik.nlf index 70b9cd88..f5da26dc 100644 Binary files a/Contrib/Language files/Efik.nlf and b/Contrib/Language files/Efik.nlf differ diff --git a/Contrib/Language files/Efik.nsh b/Contrib/Language files/Efik.nsh index 13cc0092..1cfed71d 100644 Binary files a/Contrib/Language files/Efik.nsh and b/Contrib/Language files/Efik.nsh differ diff --git a/Contrib/Language files/English.nsh b/Contrib/Language files/English.nsh index f12689a4..d128bc11 100644 --- a/Contrib/Language files/English.nsh +++ b/Contrib/Language files/English.nsh @@ -1,7 +1,7 @@ ;Language: English (1033) ;By Joost Verburg -!insertmacro LANGFILE "English" "English" "English" +!insertmacro LANGFILE "English" = "English" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Welcome to $(^NameDA) Setup" diff --git a/Contrib/Language files/Esperanto.nsh b/Contrib/Language files/Esperanto.nsh index 36224175..cdbdd30a 100644 --- a/Contrib/Language files/Esperanto.nsh +++ b/Contrib/Language files/Esperanto.nsh @@ -1,7 +1,7 @@ ;Language: Esperanto (0) ;By Felipe Castro -!insertmacro LANGFILE "Esperanto" "Esperanto" "Esperanto" +!insertmacro LANGFILE "Esperanto" = "Esperanto" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bonvenon al la Gvidilo por Instalado de $(^NameDA)" @@ -48,8 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Poziciu la muson sur konsistero por rigardi ties priskribon." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Poziciu la muson sur konsistero por rigardi ties priskribon." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Estonian.nsh b/Contrib/Language files/Estonian.nsh index e09a7fd3..a780a6fa 100644 --- a/Contrib/Language files/Estonian.nsh +++ b/Contrib/Language files/Estonian.nsh @@ -1,7 +1,7 @@ ;Language: Estonian (1061) ;Translated by johnny izzo (izzo@hot.ee) -!insertmacro LANGFILE "Estonian" "Eesti keel" "Eesti keel" +!insertmacro LANGFILE "Estonian" = "Eesti keel" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) paigaldamine!" diff --git a/Contrib/Language files/Farsi.nsh b/Contrib/Language files/Farsi.nsh index 503f34c0..bb0adb40 100644 --- a/Contrib/Language files/Farsi.nsh +++ b/Contrib/Language files/Farsi.nsh @@ -1,7 +1,7 @@ ;Language: Farsi (1065) ;By FzerorubigD - FzerorubigD@gmail.com - Thanx to all people help me in forum.persiantools.com -!insertmacro LANGFILE "Farsi" "Farsi" "فارسی" +!insertmacro LANGFILE "Farsi" "Persian" "فارسی" "Farsi" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "به برنامه نصب $(^NameDA) خوش آمدید." diff --git a/Contrib/Language files/Finnish.nsh b/Contrib/Language files/Finnish.nsh index 24ac29bf..fa465ad6 100644 --- a/Contrib/Language files/Finnish.nsh +++ b/Contrib/Language files/Finnish.nsh @@ -4,7 +4,7 @@ ;Updated by Puuhis (puuhis@puuhis.net) ;Updated 11/08 by WTLib Team -!insertmacro LANGFILE "Finnish" "Suomi" "Suomi" +!insertmacro LANGFILE "Finnish" = "Suomi" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Tervetuloa $(^NameDA) -ohjelman asennukseen" diff --git a/Contrib/Language files/French.nsh b/Contrib/Language files/French.nsh index b4c4161c..163df4e8 100644 --- a/Contrib/Language files/French.nsh +++ b/Contrib/Language files/French.nsh @@ -1,7 +1,7 @@ ;Language: French (1036) ;By Sébastien Delahaye -!insertmacro LANGFILE "French" "Francais" "Français" +!insertmacro LANGFILE "French" = "Français" "Francais" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bienvenue dans le programme d'installation de $(^NameDA)" @@ -123,7 +123,7 @@ !ifdef MULTIUSER_INSTALLMODEPAGE ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Choix des utilisateurs" ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Sélection des utilisateurs désirant utiliser $(^NameDA)." - ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Choix entre installer $(^NameDA) seulement pour vous-même ou bien pour tous les utilisateurs du système. $(^ClickNext)" + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Choix entre installer $(^NameDA) seulement pour vous-même ou bien pour tous les utilisateurs du système. $(^ClickNext)" ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installer pour tous les utilisateurs" ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer seulement pour moi" !endif diff --git a/Contrib/Language files/Galician.nsh b/Contrib/Language files/Galician.nsh index e1166266..7654c2a6 100644 --- a/Contrib/Language files/Galician.nsh +++ b/Contrib/Language files/Galician.nsh @@ -1,7 +1,7 @@ ;Language: Galician (1110) ;Ramon Flores -!insertmacro LANGFILE "Galician" "Galego" "Galego" +!insertmacro LANGFILE "Galician" = "Galego" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Benvindo ao Asistente de Instalación do $(^NameDA)" diff --git a/Contrib/Language files/Georgian.nlf b/Contrib/Language files/Georgian.nlf index e7550a00..a0ad2652 100644 Binary files a/Contrib/Language files/Georgian.nlf and b/Contrib/Language files/Georgian.nlf differ diff --git a/Contrib/Language files/Georgian.nsh b/Contrib/Language files/Georgian.nsh index 8115660d..83402ede 100644 Binary files a/Contrib/Language files/Georgian.nsh and b/Contrib/Language files/Georgian.nsh differ diff --git a/Contrib/Language files/German.nsh b/Contrib/Language files/German.nsh index feb9fa54..81b68430 100644 --- a/Contrib/Language files/German.nsh +++ b/Contrib/Language files/German.nsh @@ -1,7 +1,7 @@ ;Language: German (1031) ;By L.King, changes by K. Windszus & R. Bisswanger & M. Simmack & D. Weiß & Frederik Schwarzer -!insertmacro LANGFILE "German" "Deutsch" "Deutsch" +!insertmacro LANGFILE "German" = "Deutsch" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Willkommen beim Installations-$\r$\nAssistenten für $(^NameDA)" diff --git a/Contrib/Language files/Greek.nsh b/Contrib/Language files/Greek.nsh index 6b09260f..50628d8d 100644 --- a/Contrib/Language files/Greek.nsh +++ b/Contrib/Language files/Greek.nsh @@ -1,7 +1,7 @@ ;Language: Greek (1032) ;By Makidis N. Michael - http://dias.aueb.gr/~p3010094/ -!insertmacro LANGFILE "Greek" "Greek" "Ελληνικά" +!insertmacro LANGFILE "Greek" = "Ελληνικά" "Ellinika" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Καλώς ήλθατε στην Εγκατάσταση του '$(^NameDA)'" diff --git a/Contrib/Language files/Hebrew.nsh b/Contrib/Language files/Hebrew.nsh index 83eb730d..5dcc80e3 100644 --- a/Contrib/Language files/Hebrew.nsh +++ b/Contrib/Language files/Hebrew.nsh @@ -1,7 +1,7 @@ ;Language: Hebrew (1037) ;By Yaron Shahrabani -!insertmacro LANGFILE "Hebrew" "Hebrew" "עברית" +!insertmacro LANGFILE "Hebrew" = "עברית" "Ivrit" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "ברוכים הבאים לאשף ההתקנה של $(^NameDA)" diff --git a/Contrib/Language files/Hungarian.nsh b/Contrib/Language files/Hungarian.nsh index bbbf987a..317f8929 100644 --- a/Contrib/Language files/Hungarian.nsh +++ b/Contrib/Language files/Hungarian.nsh @@ -2,7 +2,7 @@ ;Translation by Jozsef Tamas Herczeg ( - 1.61-ig), ; Lajos Molnar (Orfanik) ( 1.62 - től) -!insertmacro LANGFILE "Hungarian" "Magyar" "Magyar" +!insertmacro LANGFILE "Hungarian" = "Magyar" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Üdvözli a(z) $(^NameDA) Telepítő Varázsló" @@ -49,8 +49,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vigye rá az egeret az összetevőre, hogy megtekinthesse a leírását." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vigye rá az egeret az összetevőre, hogy megtekinthesse a leírását." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Icelandic.nsh b/Contrib/Language files/Icelandic.nsh index 4adfdd27..eb24d6f7 100644 --- a/Contrib/Language files/Icelandic.nsh +++ b/Contrib/Language files/Icelandic.nsh @@ -1,7 +1,7 @@ ;Language: Icelandic (15) ;By Gretar Orri Kristinsson -!insertmacro LANGFILE "Icelandic" "Islenska" "Íslenska" +!insertmacro LANGFILE "Icelandic" = "Íslenska" "Islenska" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Velkominn til $(^NameDA) uppsetningarhjálparinnar" diff --git a/Contrib/Language files/Igbo.nlf b/Contrib/Language files/Igbo.nlf index f7c91423..2b4c3fb4 100644 Binary files a/Contrib/Language files/Igbo.nlf and b/Contrib/Language files/Igbo.nlf differ diff --git a/Contrib/Language files/Igbo.nsh b/Contrib/Language files/Igbo.nsh index c549bcd6..97cd0783 100644 Binary files a/Contrib/Language files/Igbo.nsh and b/Contrib/Language files/Igbo.nsh differ diff --git a/Contrib/Language files/Indonesian.nsh b/Contrib/Language files/Indonesian.nsh index d7965b94..48064c24 100644 --- a/Contrib/Language files/Indonesian.nsh +++ b/Contrib/Language files/Indonesian.nsh @@ -1,7 +1,7 @@ ;Language: Indonesian (1057) ;By Ariel825010106@yahoo.com modified by was.uthm@gmail.com in April 2009 -!insertmacro LANGFILE "Indonesian" "Bahasa Indonesia" "Bahasa Indonesia" +!insertmacro LANGFILE "Indonesian" = "Bahasa Indonesia" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Selamat datang di program instalasi $(^NameDA)" @@ -48,8 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Tunjuk ke salah satu komponen untuk melihat deskripsi tentang komponen itu." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Tunjuk ke salah satu komponen untuk melihat deskripsi tentang komponen itu." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Irish.nsh b/Contrib/Language files/Irish.nsh index 3ae0e57e..aff4d54d 100644 --- a/Contrib/Language files/Irish.nsh +++ b/Contrib/Language files/Irish.nsh @@ -1,7 +1,7 @@ ;Language: Irish (2108) ;By Kevin P. Scannell < scannell at slu dot edu > -!insertmacro LANGFILE "Irish" "Gaeilge" "Gaeilge" +!insertmacro LANGFILE "Irish" = "Gaeilge" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Fáilte go dtí Draoi Suiteála $(^NameDA)" diff --git a/Contrib/Language files/Italian.nsh b/Contrib/Language files/Italian.nsh index 07d7d915..d03e27e0 100644 --- a/Contrib/Language files/Italian.nsh +++ b/Contrib/Language files/Italian.nsh @@ -1,9 +1,9 @@ -;Language: Italian (1040) +;Language: Italian (1040) ;By SANFACE Software v1.67 accents ;Review and update from v1.65 to v1.67 by Alessandro Staltari < staltari (a) geocities.com > ;Review and update from v1.67 to v1.68 by Lorenzo Bevilacqua < meow811@libero.it > -!insertmacro LANGFILE "Italian" "Italiano" "Italiano" +!insertmacro LANGFILE "Italian" = "Italiano" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Benvenuti nel programma di installazione di $(^NameDA)" diff --git a/Contrib/Language files/Japanese.nsh b/Contrib/Language files/Japanese.nsh index eb08c4c7..b5a4c54c 100644 --- a/Contrib/Language files/Japanese.nsh +++ b/Contrib/Language files/Japanese.nsh @@ -2,7 +2,7 @@ ;By Dnanako ;Translation updated by Takahiro Yoshimura -!insertmacro LANGFILE "Japanese" "Japanese" "日本語" +!insertmacro LANGFILE "Japanese" = "日本語" "Nihongo" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) セットアップ ウィザードへようこそ" diff --git a/Contrib/Language files/Khmer.nlf b/Contrib/Language files/Khmer.nlf index 17010c2f..0dd3e131 100644 --- a/Contrib/Language files/Khmer.nlf +++ b/Contrib/Language files/Khmer.nlf @@ -2,7 +2,7 @@ NLF v6 # Start editing here # Language ID -10311 +1107 # Font and size - dash (-) means default - - @@ -42,6 +42,7 @@ Nullsoft Install System %s # ^NextBtn &ទៅ​មុខ​​ > # ^AgreeBtn +#FIXME? I &យល់​ព្រម​ # ^AcceptBtn ខ្ញុំ​ &យល់ព្រមតាម​កិច្ច​ព្រម​ព្រាង​អាជ្ញាប័ណ្ណ @@ -120,8 +121,10 @@ $(^NameDA) នឹង​ត្រូវ​បាន​លុប​ចេញ​ព # ^UninstallingSubText កំពុង​លុប​ចេញពី:​ # ^FileError +#FIXME? មាន​កំហុស​ក្នុង​ការ​បើក​ឯកសារ​ដើម្បី​សរសេរ​ចូល​:\r\n\r\n$0\r\n\r\n​ សូមចុចលើ​ បញ្ឈប់​ ដើម្បី​បញ្ចប់ការ​ដំឡើង​ \r\n Retry ដើម្បី​ព្យាយាម​ម្តង​ទៀត​ ឫ បដិសេធ​ដើម្បី​បញ្ឈប់​ឯកសារនេះ​។​ # ^FileError_NoIgnore +#FIXME? មាន​កំហុស​ក្នុង​ការ​បើក​ឯកសារ​ដើម្បី​សរសេរ​ចូល​:​\r\n\r\n$0\r\n\r\n សូមចុចលើ​ Retry ដើម្បី​ព្យាយាម​ម្តង​ទៀត ឫ \r\nបដិសេធ ដើម្បី​បញ្ឈប់​ការ​ដំឡើង​។​ # ^CantWrite "មិនអាច​សរសេរ​ចូល​បាន​: " @@ -178,6 +181,7 @@ $(^NameDA) នឹង​ត្រូវ​បាន​លុប​ចេញ​ព # ^Skipped "ត្រូវបាន​រំលង​: " # ^CopyDetails +#FIXME? ចំលង​ពិពណ៌នាទៅ​ Clipboard # ^LogInstall កត់ត្រា​ដំណើរការ​ដំឡើង​ diff --git a/Contrib/Language files/Khmer.nsh b/Contrib/Language files/Khmer.nsh index a4918435..cec099eb 100644 --- a/Contrib/Language files/Khmer.nsh +++ b/Contrib/Language files/Khmer.nsh @@ -1,11 +1,11 @@ ;Language: Khmer (1033) ;By yi.sophally -!insertmacro LANGFILE "Khmer" "Khmer" "ភាសាខ្មែរ" +!insertmacro LANGFILE "Khmer" = "ភាសាខ្មែរ" "Khmer" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "សូមស្វាគមន៍ចំពោះការ​ដំឡើង​កម្មវិធី​ $(^NameDA)" - ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "កម្មវិធីជំនួយនេះនឹងនាំអ្នកដល់​ការ​ដំឡើង​កម្មវិធី​នៃកម្មវិធី $(^NameDA).$\r$\n$\r$\nIt ដែល​សូម​អោយ​អ្នក​បិទ​នូវ​កម្ម​វិធី​ទាំងឡាយ​ផ្សេង​ទៀត​មុន​ពេល​ចាប់ផ្តើម​ការ​ដំឡើង​។ ដើម្បី​ងាយ​ស្រួល​ក្នុង​ការ​កែប្រែ​ឯកសារ​នៃប្រព័ន្ធប្រតិបត្តការ​ដោយ​មិន​ចាំបាច់​ចាប់​ផ្តើម​ដំណើរ​ការ​ម៉ាស៊ីនរបស់​អ្នក​​សារ​ជា​ថ្មី។​ $\r$\n$\r$\n$_CLICK" + ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "កម្មវិធីជំនួយនេះនឹងនាំអ្នកដល់​ការ​ដំឡើង​កម្មវិធី​នៃកម្មវិធី $(^NameDA).$\r$\n$\r$\nIt ដែល​សូម​អោយ​អ្នក​បិទ​នូវ​កម្ម​វិធី​ទាំងឡាយ​ផ្សេង​ទៀត​មុន​ពេល​ចាប់ផ្តើម​ការ​ដំឡើង​។ ដើម្បី​ងាយ​ស្រួល​ក្នុង​ការ​កែប្រែ​ឯកសារ​នៃប្រព័ន្ធប្រតិបត្តការ​ដោយ​មិន​ចាំបាច់​ចាប់​ផ្តើម​ដំណើរ​ការ​ម៉ាស៊ីនរបស់​អ្នក​​សារ​ជា​ថ្មី។​ $\r$\n$\r$\n$_CLICK" #FIXME? BUGBUG: "It"? !endif !ifdef MUI_UNWELCOMEPAGE @@ -24,7 +24,7 @@ !ifdef MUI_UNLICENSEPAGE ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "កិច្ចព្រមព្រាង​អាជ្ញា​ប័ណ្ណ" ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "សូម​អាន​អាជ្ញាប័ណ្ណ​អោយ​បាន​ត្រឹម​ត្រូវ​មុន​ពេល​លុប​កម្មវិធី​ $(^NameDA)ចេញ។​" - ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "ប្រសិន​បើ​អ្នក​យល់​ព្រម​តាម​កិច្ចព្រម​ព្រាង​ សូម​ចុច​ I Agree ដើម្បី​ដំណើរការ​បន្ត។ ដើម្បីលុប​កម្មវិធី​ $(^NameDA) នេះ​អ្នក​ត្រូវ​តែ​យល់ព្រម​តាម​កិច្ចព្រមព្រាង​ $_CLICK" + #FIXME:MUI_UNINNERTEXT_LICENSE_BOTTOM "ប្រសិន​បើ​អ្នក​យល់​ព្រម​តាម​កិច្ចព្រម​ព្រាង​ សូម​ចុច​ I Agree ដើម្បី​ដំណើរការ​បន្ត។ ដើម្បីលុប​កម្មវិធី​ $(^NameDA) នេះ​អ្នក​ត្រូវ​តែ​យល់ព្រម​តាម​កិច្ចព្រមព្រាង​ $_CLICK" ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "ប្រសិន​បើ​អ្នក​យល់​ព្រម​តាម​កិច្ចព្រម​ព្រាង​សូម​ចុច​ធិច​ប្រអប់​ខាងក្រោម​។ ដើម្បីលុបកម្មវិធី​ $(^NameDA) នេះ​អ្នក​ត្រូវ​តែ​យល់ព្រម​តាម​កិច្ចព្រមព្រាង​ $_CLICK" ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "ប្រសិន​បើ​អ្នក​យល់​ព្រម​តាម​កិច្ចព្រម​ព្រាង​សូមជ្រើសរើស​ជំរើស​ទីមួយ​ខាង​ក្រោម​។ ដើម្បីលុប​កម្មវិធី​ $(^NameDA) នេះ​អ្នក​ត្រូវ​តែ​យល់ព្រម​តាម​កិច្ចព្រមព្រាង $_CLICK" !endif @@ -48,8 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ដាក់កណ្តុរ​បញ្ជារបស់​អ្នក​លើ​សមាសភាគ​ណា​មួយ​ដើម្បី​មើល​ការ​ពិពណ៍នារបស់​វា​​។" !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ដាក់កណ្តុរ​បញ្ជារបស់​អ្នក​លើ​សមាសភាគ​ណា​មួយ​ដើម្បី​មើល​ការ​ពិពណ៍នារបស់​វា​​។" + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif @@ -83,25 +82,26 @@ !ifdef MUI_FINISHPAGE ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "កម្មវិធី​ជំនួយ​ក្នុងការ​ដំឡើង​ $(^NameDA) កំពុងត្រូវ​បាន​បញ្ចប់​" - ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "កម្មវិធី​ $(^NameDA) បាន​ត្រូវ​ដំឡើង​រួចរាល់​នៅក្នុង​កុំព្យូទ័រ​របស់​អ្នក​។ $\r$\n$\r$\nចុច​ Finish ដើម្បីបិទកម្មវិធីជំនួយ​នេះ​" + #FIXME:MUI_TEXT_FINISH_INFO_TEXT "កម្មវិធី​ $(^NameDA) បាន​ត្រូវ​ដំឡើង​រួចរាល់​នៅក្នុង​កុំព្យូទ័រ​របស់​អ្នក​។ $\r$\n$\r$\nចុច​ Finish ដើម្បីបិទកម្មវិធីជំនួយ​នេះ​" ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "កុំព្យូទ័រ​របស់​អ្នក​ត្រូវតែ​ចាប់​ដំណើរ​ការ​សារ​ជាថ្មី​ដើម្បី​បំពេញ​ការ​ដំឡើង​កម្មវិធី​ $(^NameDA)​ នេះ។ តើ​អ្នក​ចង់ចាប់ផ្តើមដំណើរការ​​កុំព្យូទ័រអ្នក​ឡើង​វិញ​ពេល​នេះ​?" !endif !ifdef MUI_UNFINISHPAGE ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "កម្មវិធី​ជំនួយ​ក្នុងការ​លុប​ $(^NameDA) កំពុងត្រូវ​បាន​បញ្ចប់" - ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "កម្មវិធី​ $(^NameDA) បាន​ត្រូវ​លុប​រួចរាល់​ពី​ក្នុង​កុំព្យូទ័រ​របស់​អ្នក​។ $\r$\n$\r$\nចុច​ Finish ដើម្បីបិទកម្មវិធីជំនួយ​នេះ​" + #FIXME:MUI_UNTEXT_FINISH_INFO_TEXT "កម្មវិធី​ $(^NameDA) បាន​ត្រូវ​លុប​រួចរាល់​ពី​ក្នុង​កុំព្យូទ័រ​របស់​អ្នក​។ $\r$\n$\r$\nចុច​ Finish ដើម្បីបិទកម្មវិធីជំនួយ​នេះ​" ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "កុំព្យូទ័រ​របស់​អ្នក​ត្រូវតែ​ចាប់​ដំណើរ​ការ​សារ​ជាថ្មី​ដើម្បី​បំពេញ​ការ​ដំឡើង​កម្មវិធី​ $(^NameDA)​ នេះ។ តើ​អ្នក​ចង់ចាប់ផ្តើមដំណើរការ​​កុំព្យូទ័រអ្នក​ឡើង​វិញ​ពេល​នេះ​?" !endif !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE ${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "ចាប់ផ្តើមដំណើរការ​​កុំព្យូទ័រឡើង​វិញ​ពេល​នេះ​" ${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "ចង់​ដំណើរការ​កុំព្យូទ័រ​ដោយ​ខ្លួន​ឯង​ពេល​ក្រោយ​" - ${LangFileString} MUI_TEXT_FINISH_RUN "&Run $(^NameDA)" - ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Show Readme" - ${LangFileString} MUI_BUTTONTEXT_FINISH "&Finish" + #FIXME:MUI_TEXT_FINISH_RUN + #FIXME:MUI_TEXT_FINISH_SHOWREADME + #FIXME:MUI_BUTTONTEXT_FINISH !endif !ifdef MUI_STARTMENUPAGE + #FIXME? ${LangFileString} MUI_TEXT_STARTMENU_TITLE "ជ្រើសរើស​ថត​ម៉ឺនុយ Start " ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "ជ្រើសរើស​ថត​ម៉ឺនុយ Start ដើម្បី​បង្កើត​ផ្លូវ​កាត់​ទៅ​កម្ម​វិធី​ $(^NameDA) ។" ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "ជ្រើសរើស​ថត​ម៉ឺនុយ Start ដែល​អ្នក​ចង់​បង្កើត​ផ្លូវកាត់​ទៅ​កម្មវិធី​​នេះ​។​ អ្នក​ក៏​អាច​បញ្ចូលឈ្មោះមួយ​ដើម្បី​បង្កើត​ថត​ថ្មីមួយទៀត​។" diff --git a/Contrib/Language files/Korean.nsh b/Contrib/Language files/Korean.nsh index 251f36d1..b48c777f 100644 --- a/Contrib/Language files/Korean.nsh +++ b/Contrib/Language files/Korean.nsh @@ -1,7 +1,7 @@ ;Language: Korean (1042) ;By linak linak@korea.com ( ~ V2.0 BETA3 ) By kippler@gmail.com(www.kipple.pe.kr) ( V2.0 BETA3 ~ ) (last update:2007/09/05) -!insertmacro LANGFILE "Korean" "Korean" "한국어" +!insertmacro LANGFILE "Korean" = "한국어" "Hangugeo" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) 설치를 시작합니다." diff --git a/Contrib/Language files/Kurdish.nsh b/Contrib/Language files/Kurdish.nsh index 79eac457..75a27867 100644 --- a/Contrib/Language files/Kurdish.nsh +++ b/Contrib/Language files/Kurdish.nsh @@ -2,7 +2,7 @@ ;By Rêzan Tovjîn ;Updated by Erdal Ronahî (erdal.ronahi@gmail.com) -!insertmacro LANGFILE "Kurdish" "Kurdi" "Kurdî" +!insertmacro LANGFILE "Kurdish" = "Kurdî" "Kurdi" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) Tu bi xêr hatî sêrbaziya sazkirinê" diff --git a/Contrib/Language files/Latvian.nsh b/Contrib/Language files/Latvian.nsh index a15fe165..4371e89c 100644 --- a/Contrib/Language files/Latvian.nsh +++ b/Contrib/Language files/Latvian.nsh @@ -2,7 +2,7 @@ ;By Valdis Griķis ;Corrections by Kristaps Meņģelis / x-f (x-f 'AT' inbox.lv) -!insertmacro LANGFILE "Latvian" "Latviesu" "Latviešu" +!insertmacro LANGFILE "Latvian" = "Latviešu" "Latviesu" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Esiet sveicināti '$(^NameDA)' uzstādīšanas vednī" @@ -49,8 +49,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Novietojiet peles kursoru uz komponenta, lai tiktu parādīts tā apraksts." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Novietojiet peles kursoru uz komponenta, lai tiktu parādīts tā apraksts." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Lithuanian.nsh b/Contrib/Language files/Lithuanian.nsh index fd28c8fb..094e99af 100644 --- a/Contrib/Language files/Lithuanian.nsh +++ b/Contrib/Language files/Lithuanian.nsh @@ -1,7 +1,7 @@ ;Language: Lithuanian (1063) ;By Vytautas Krivickas (Vytautas). Updated by Danielius Scepanskis (Daan daniel@takas.lt) 2004.01.09 -!insertmacro LANGFILE "Lithuanian" "Lietuviu" "Lietuvių" +!insertmacro LANGFILE "Lithuanian" = "Lietuvių" "Lietuviu" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Sveiki atvykę į $(^NameDA) įdiegimo programą." diff --git a/Contrib/Language files/Luxembourgish.nsh b/Contrib/Language files/Luxembourgish.nsh index 0fa11b0f..61fb95d2 100644 --- a/Contrib/Language files/Luxembourgish.nsh +++ b/Contrib/Language files/Luxembourgish.nsh @@ -1,7 +1,7 @@ ;Language: Luxembourgish (1031) ;By Snowloard, changes by Philo -!insertmacro LANGFILE "Luxembourgish" "Letzebuergesch" "Lëtzebuergesch" +!insertmacro LANGFILE "Luxembourgish" = "Lëtzebuergesch" "Letzebuergesch" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Wëllkomm beim Installatiouns-$\r$\nAssistent vun $(^NameDA)" @@ -48,8 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Hal den Mausfeil iwwer eng Komponent, fir d'Beschreiwung dervun ze gesinn." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Hal den Mausfeil iwwer eng Komponent, fir d'Beschreiwung dervun ze gesinn." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Macedonian.nsh b/Contrib/Language files/Macedonian.nsh index 8d368a21..1694fae4 100644 --- a/Contrib/Language files/Macedonian.nsh +++ b/Contrib/Language files/Macedonian.nsh @@ -1,7 +1,7 @@ ;Language: Macedonian (1071) ;By Sasko Zdravkin [wingman2083@yahoo.com] -!insertmacro LANGFILE "Macedonian" "Macedonian" "Македонски" +!insertmacro LANGFILE "Macedonian" = "Македонски" "Makedonski" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Добро дојдовте во инсталацијата на $(^NameDA)" diff --git a/Contrib/Language files/Malagasy.nlf b/Contrib/Language files/Malagasy.nlf index d639d01c..5fc7c83d 100644 Binary files a/Contrib/Language files/Malagasy.nlf and b/Contrib/Language files/Malagasy.nlf differ diff --git a/Contrib/Language files/Malagasy.nsh b/Contrib/Language files/Malagasy.nsh index e8a9909b..2e2972ce 100644 Binary files a/Contrib/Language files/Malagasy.nsh and b/Contrib/Language files/Malagasy.nsh differ diff --git a/Contrib/Language files/Malay.nsh b/Contrib/Language files/Malay.nsh index 5d81b15e..81ae9dec 100644 --- a/Contrib/Language files/Malay.nsh +++ b/Contrib/Language files/Malay.nsh @@ -1,7 +1,7 @@ ;Language: Malay (1086) ;By muhammadazwa@yahoo.com -!insertmacro LANGFILE "Malay" "Malay" "Malay" +!insertmacro LANGFILE "Malay" = "Bahasa Melayu" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Assalamualaikum, Selamat datang ke $(^NameDA) Setup Wizard" diff --git a/Contrib/Language files/Mongolian.nsh b/Contrib/Language files/Mongolian.nsh index 6c3af747..351fe7b3 100644 --- a/Contrib/Language files/Mongolian.nsh +++ b/Contrib/Language files/Mongolian.nsh @@ -1,7 +1,7 @@ ;Language: Mongolian (1104) ;By Bayarsaikhan Enkhtaivan -!insertmacro LANGFILE "Mongolian" "Mongolian" "Монгол" +!insertmacro LANGFILE "Mongolian" "Mongolian (Cyrillic)" "Монгол Кирилл" "Mongol kirill" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) Суулгацад тавтай морил" diff --git a/Contrib/Language files/Norwegian.nsh b/Contrib/Language files/Norwegian.nsh index 9cb2263f..5fda41fa 100644 --- a/Contrib/Language files/Norwegian.nsh +++ b/Contrib/Language files/Norwegian.nsh @@ -1,7 +1,7 @@ ;Language: Norwegian (2068) ;By Jonas Lindsrøm (jonasc_88@hotmail.com) Reviewed and fixed by Jan Ivar Beddari, d0der at online.no -!insertmacro LANGFILE "Norwegian" "Norwegian" "Norwegian" +!insertmacro LANGFILE "Norwegian" = "Norsk" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Velkommen til veiviseren for installasjon av $(^NameDA) " @@ -48,7 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beveg musen over komponentene for å se beskrivelsen." !else - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vel eit komponent for å se beskrivinga." + ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Velg en komponent for å se beskrivelsen." !endif !endif diff --git a/Contrib/Language files/NorwegianNynorsk.nsh b/Contrib/Language files/NorwegianNynorsk.nsh index 96b65545..85c59ba7 100644 --- a/Contrib/Language files/NorwegianNynorsk.nsh +++ b/Contrib/Language files/NorwegianNynorsk.nsh @@ -1,7 +1,7 @@ ;Language: Norwegian nynorsk (2068) ;By Vebjoern Sture and Håvard Mork (www.firefox.no) -!insertmacro LANGFILE "NorwegianNynorsk" "Norwegian nynorsk" "Norwegian nynorsk" +!insertmacro LANGFILE "NorwegianNynorsk" "Norwegian (Nynorsk)" "Norsk (nynorsk)" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Velkommen til $(^NameDA) innstallasjonsvegvisar" @@ -48,7 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beveg musa over komponentene for å sjå beskrivinga." !else - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vel eit komponent for å seå beskrivinga." + ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Vel ein komponent for å sjå beskrivinga." !endif !endif diff --git a/Contrib/Language files/Pashto.nlf b/Contrib/Language files/Pashto.nlf index 884e2b7d..3414dca0 100644 Binary files a/Contrib/Language files/Pashto.nlf and b/Contrib/Language files/Pashto.nlf differ diff --git a/Contrib/Language files/Pashto.nsh b/Contrib/Language files/Pashto.nsh index 427ed392..a558bf69 100644 Binary files a/Contrib/Language files/Pashto.nsh and b/Contrib/Language files/Pashto.nsh differ diff --git a/Contrib/Language files/Polish.nsh b/Contrib/Language files/Polish.nsh index 148265fd..cb37aee1 100644 --- a/Contrib/Language files/Polish.nsh +++ b/Contrib/Language files/Polish.nsh @@ -4,7 +4,7 @@ ;Updated by Paweł Porwisz, http://www.pepesoft.tox.pl ;Corrected by Mateusz Gola (aka Prozac) - http://www.videopedia.pl/avirecomp -!insertmacro LANGFILE "Polish" "Polski" "Polski" +!insertmacro LANGFILE "Polish" = "Polski" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Witamy w kreatorze instalacji programu $(^NameDA)" @@ -51,8 +51,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Przesuń kursor myszy nad komponent, aby zobaczyć jego opis." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Przesuń kursor myszy nad komponent, aby zobaczyć jego opis." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Portuguese.nsh b/Contrib/Language files/Portuguese.nsh index f6abe14e..837079fd 100644 --- a/Contrib/Language files/Portuguese.nsh +++ b/Contrib/Language files/Portuguese.nsh @@ -1,7 +1,7 @@ ;Language: Portuguese (2070) ;By Ramon -!insertmacro LANGFILE "Portuguese" "Portugues" "Português" +!insertmacro LANGFILE "Portuguese" = "Português" "Portugues" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bem vindo ao Assistente de Instalação do $(^NameDA)" diff --git a/Contrib/Language files/PortugueseBR.nsh b/Contrib/Language files/PortugueseBR.nsh index b69ddf73..881267ac 100644 --- a/Contrib/Language files/PortugueseBR.nsh +++ b/Contrib/Language files/PortugueseBR.nsh @@ -7,7 +7,7 @@ ; - MUI_UNTEXT_FINISH_INFO_TITLE - mudança de completando para concluindo ; - MUI_TEXT_FINISH_SHOWREADME - mudança de Readme para Leiame -!insertmacro LANGFILE "PortugueseBR" "Portugues Brasileiro" "Português Brasileiro" +!insertmacro LANGFILE "PortugueseBR" "Brazilian Portuguese" "Português Brasileiro" "Portugues Brasileiro" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bem-vindo ao Assistente de Instalação da $(^NameDA)" diff --git a/Contrib/Language files/Romanian.nsh b/Contrib/Language files/Romanian.nsh index ba9c34d0..82f6bece 100644 --- a/Contrib/Language files/Romanian.nsh +++ b/Contrib/Language files/Romanian.nsh @@ -7,7 +7,8 @@ ; - ".. produsului" removed as unnecessary ; - "Elimină" related terms replaced with more appropiate "Dezinstalează" ; - Misc language tweaks -!insertmacro LANGFILE "Romanian" "Romana" "Română" + +!insertmacro LANGFILE "Romanian" = "Română" "Romana" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bine aţi venit la instalarea $(^NameDA)" @@ -58,8 +59,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Aşezaţi mouse-ul deasupra fiecărei componente pentru a vizualiza descrierea acesteia." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Aşezaţi mouse-ul deasupra fiecărei componente pentru a vizualiza descrierea acesteia." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Russian.nsh b/Contrib/Language files/Russian.nsh index a7530b81..e0bd4a74 100644 --- a/Contrib/Language files/Russian.nsh +++ b/Contrib/Language files/Russian.nsh @@ -1,7 +1,7 @@ ;Language: Russian (1049) ;Translation updated by Dmitry Yerokhin [erodim@mail.ru] (050424) -!insertmacro LANGFILE "Russian" "Russian" "Русский" +!insertmacro LANGFILE "Russian" = "Русский" "Russkij" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Вас приветствует мастер установки $(^NameDA)" diff --git a/Contrib/Language files/SConscript b/Contrib/Language files/SConscript index 1fb1b99e..f231c10d 100644 --- a/Contrib/Language files/SConscript +++ b/Contrib/Language files/SConscript @@ -20,6 +20,7 @@ languages = Split(""" Finnish French Galician + Georgian German Greek Hebrew @@ -39,6 +40,7 @@ languages = Split(""" Mongolian Norwegian NorwegianNynorsk + Pashto Polish Portuguese PortugueseBR diff --git a/Contrib/Language files/Serbian.nsh b/Contrib/Language files/Serbian.nsh index 32811107..78a9141a 100644 --- a/Contrib/Language files/Serbian.nsh +++ b/Contrib/Language files/Serbian.nsh @@ -1,7 +1,7 @@ ;Language: Serbian (3098) ;Translation by Срђан Обућина -!insertmacro LANGFILE "Serbian" "Serbian Cyrillic" "Српски" +!insertmacro LANGFILE "Serbian" "Serbian (Cyrillic)" "Српски" "Srpski (Cyrillic)" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Добродошли у водич за инсталацију програма $(^NameDA)" diff --git a/Contrib/Language files/SerbianLatin.nsh b/Contrib/Language files/SerbianLatin.nsh index 50fb13ee..5ac473ff 100644 --- a/Contrib/Language files/SerbianLatin.nsh +++ b/Contrib/Language files/SerbianLatin.nsh @@ -1,7 +1,7 @@ ;Language: Serbian Latin (2074) ;Translation by Srđan Obućina -!insertmacro LANGFILE "SerbianLatin" "Srpski" "Srpski" +!insertmacro LANGFILE "SerbianLatin" "Serbian (Latin)" "Srpski" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Dobrodošli u vodič za instalaciju programa $(^NameDA)" diff --git a/Contrib/Language files/SimpChinese.nsh b/Contrib/Language files/SimpChinese.nsh index 0625ee87..17fc8a3b 100644 --- a/Contrib/Language files/SimpChinese.nsh +++ b/Contrib/Language files/SimpChinese.nsh @@ -2,7 +2,7 @@ ;Translator: Kii Ali ,, ;Revision date: 2010-09-28 -!insertmacro LANGFILE "SimpChinese" "Chinese (Simplified)" +!insertmacro LANGFILE "SimpChinese" "Chinese (Simplified)" "中文(简体)" "Hanyu (Jiantizi)" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "欢迎使用 $(^NameDA) 安装向导" diff --git a/Contrib/Language files/Slovak.nsh b/Contrib/Language files/Slovak.nsh index a88b87c6..fdba1a50 100644 --- a/Contrib/Language files/Slovak.nsh +++ b/Contrib/Language files/Slovak.nsh @@ -5,7 +5,7 @@ ; Marián Hikaník (podnety@mojepreklady.net) ; Ivan Masár , 2008. -!insertmacro LANGFILE "Slovak" "Slovencina" "Slovenčina" +!insertmacro LANGFILE "Slovak" = "Slovenčina" "Slovencina" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Vitajte v sprievodcovi inštaláciou programu $(^NameDA)" diff --git a/Contrib/Language files/Slovenian.nsh b/Contrib/Language files/Slovenian.nsh index f6fb4354..7a77901a 100644 --- a/Contrib/Language files/Slovenian.nsh +++ b/Contrib/Language files/Slovenian.nsh @@ -1,7 +1,8 @@ ;Language: Slovenian (1060) ;By Janez Dolinar, edited by Martin Srebotnjak - Lugos.si -!insertmacro LANGFILE "Slovenian" "Slovenscina" "Slovenščina" +# We use "slovenski", the other alternative is "slovenščina" (Note: "slovenčina" is the native name of Slovak) +!insertmacro LANGFILE "Slovenian" = "Slovenski" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Dobrodošli v čarovniku namestitve $(^NameDA)" diff --git a/Contrib/Language files/Spanish.nsh b/Contrib/Language files/Spanish.nsh index 8c421c76..3d10ff4e 100644 --- a/Contrib/Language files/Spanish.nsh +++ b/Contrib/Language files/Spanish.nsh @@ -2,7 +2,7 @@ ;By MoNKi & Joel ;Updates & Review Darwin Rodrigo Toledo Cáceres - www.winamp-es.com - niwrad777@gmail.com -!insertmacro LANGFILE "Spanish" "Espanol" "Español" +!insertmacro LANGFILE "Spanish" = "Español" "Espanol" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de Instalación de $(^NameDA)" diff --git a/Contrib/Language files/SpanishInternational.nsh b/Contrib/Language files/SpanishInternational.nsh index 1b497c9e..736861da 100644 --- a/Contrib/Language files/SpanishInternational.nsh +++ b/Contrib/Language files/SpanishInternational.nsh @@ -2,7 +2,7 @@ ;By Darwin Rodrigo Toledo Cáceres - www.winamp-es.com - niwrad777@gmail.com ;Base by Monki y Joel -!insertmacro LANGFILE "SpanishInternational" "Espanol (Alfabetizacion Internacional)" "Español (Alfabetización Internacional)" +!insertmacro LANGFILE "SpanishInternational" "Spanish (International)" "Español (Alfabetización Internacional)" "Espanol (Alfabetizacion Internacional)" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de Instalación de $(^NameDA)" diff --git a/Contrib/Language files/Swahili.nlf b/Contrib/Language files/Swahili.nlf index 083b7343..02ad4bfc 100644 Binary files a/Contrib/Language files/Swahili.nlf and b/Contrib/Language files/Swahili.nlf differ diff --git a/Contrib/Language files/Swahili.nsh b/Contrib/Language files/Swahili.nsh index 7697a5b2..94bad184 100644 Binary files a/Contrib/Language files/Swahili.nsh and b/Contrib/Language files/Swahili.nsh differ diff --git a/Contrib/Language files/Swedish.nsh b/Contrib/Language files/Swedish.nsh index 4e1d6e93..626ec551 100644 --- a/Contrib/Language files/Swedish.nsh +++ b/Contrib/Language files/Swedish.nsh @@ -1,8 +1,8 @@ -;Compatible with Modern UI 1.72 +;Compatible with Modern UI 1.72 ;Language: Swedish (1053) ;By Magnus Bonnevier (magnus.bonnevier@telia.com), updated by Rickard Angbratt (r.angbratt@home.se), updated by Ulf Axelsson (ulf.axelsson@gmail.com) -!insertmacro LANGFILE "Swedish" "Svenska" "Svenska" +!insertmacro LANGFILE "Swedish" = "Svenska" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Välkommen till installationsguiden för $(^NameDA)." diff --git a/Contrib/Language files/Thai.nsh b/Contrib/Language files/Thai.nsh index d3ece3f0..99dc77de 100644 --- a/Contrib/Language files/Thai.nsh +++ b/Contrib/Language files/Thai.nsh @@ -1,7 +1,7 @@ ;Language: Thai (1054) ;By SoKoOLz, TuW@nNu (asdfuae) -!insertmacro LANGFILE "Thai" "Thai" "ไทย" +!insertmacro LANGFILE "Thai" = "ไทย" /* TODO: ISO 11940? */ "Thai" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "ยินดีต้อนรับเข้าสู่การติดตั้งโปรแกรม $(^NameDA) " diff --git a/Contrib/Language files/TradChinese.nsh b/Contrib/Language files/TradChinese.nsh index a566ce97..8efd0c9d 100644 --- a/Contrib/Language files/TradChinese.nsh +++ b/Contrib/Language files/TradChinese.nsh @@ -2,7 +2,7 @@ ;Translator: Kii Ali ,, ;Revision date: 2010-09-28 -!insertmacro LANGFILE "TradChinese" "Chinese (Traditional)" +!insertmacro LANGFILE "TradChinese" "Chinese (Traditional)" "中文(繁體)" "Hanyu (Fantizi)" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "歡迎使用 $(^NameDA) 安裝精靈" diff --git a/Contrib/Language files/Turkish.nsh b/Contrib/Language files/Turkish.nsh index b63e614b..c4d13584 100644 --- a/Contrib/Language files/Turkish.nsh +++ b/Contrib/Language files/Turkish.nsh @@ -2,7 +2,7 @@ ;By Çagatay Dilsiz(Chagy) ;Updated by Fatih BOY (fatih_boy@yahoo.com) -!insertmacro LANGFILE "Turkish" "Turkce" "Türkçe" +!insertmacro LANGFILE "Turkish" = "Türkçe" "Turkce" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) Kurulum sihirbazına hoş geldiniz" @@ -49,8 +49,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bileşenlerin açıklamalarını görmek için imleci bileşen üzerine götürün." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bileşenlerin açıklamalarını görmek için imleci bileşen üzerine götürün." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Ukrainian.nsh b/Contrib/Language files/Ukrainian.nsh index 9a7e23ea..4b0a3b4f 100644 --- a/Contrib/Language files/Ukrainian.nsh +++ b/Contrib/Language files/Ukrainian.nsh @@ -2,7 +2,7 @@ ;By Yuri Holubow, http://www.Nash-Soft.com ;Correct by Osidach Vitaly (Vit_Os2) -!insertmacro LANGFILE "Ukrainian" "Ukrainian" "Українська" +!insertmacro LANGFILE "Ukrainian" = "Українська" "Ukrayins'ka" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Ласкаво просимо до Майстра Встановлення $(^NameDA)" @@ -49,8 +49,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Підведіть вашу мишку до компонента, щоб побачити його опис." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Підведіть вашу мишку до компонента, щоб побачити його опис." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Uzbek.nsh b/Contrib/Language files/Uzbek.nsh index 8910718d..b60afd53 100644 --- a/Contrib/Language files/Uzbek.nsh +++ b/Contrib/Language files/Uzbek.nsh @@ -1,7 +1,7 @@ ;Language: Uzbek (1091) ;Translation updated by Emil Garipov [emil.garipov@gmail.com] -!insertmacro LANGFILE "Uzbek" "O'zbek" "O‘zbek" +!insertmacro LANGFILE "Uzbek" = "O‘zbek" "O'zbek" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Sizni o'rnatish dastur tabriklaydi $(^NameDA)" diff --git a/Contrib/Language files/Valencian.nlf b/Contrib/Language files/Valencian.nlf index 79609e1c..c9095515 100644 Binary files a/Contrib/Language files/Valencian.nlf and b/Contrib/Language files/Valencian.nlf differ diff --git a/Contrib/Language files/Valencian.nsh b/Contrib/Language files/Valencian.nsh index c6c375e8..d1edee8c 100644 Binary files a/Contrib/Language files/Valencian.nsh and b/Contrib/Language files/Valencian.nsh differ diff --git a/Contrib/Language files/Vietnamese.nsh b/Contrib/Language files/Vietnamese.nsh index 47fb44d5..3a4857ff 100644 --- a/Contrib/Language files/Vietnamese.nsh +++ b/Contrib/Language files/Vietnamese.nsh @@ -1,7 +1,7 @@ ;Language: Vietnamese (1066) ;By NGUYỄN Mạnh Hùng -!insertmacro LANGFILE "Vietnamese" "Tieng Viet" "Tiếng Việt" +!insertmacro LANGFILE "Vietnamese" = "Tiếng Việt" "Tieng Viet" !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Chào mừng đến với Trợ lí Cài đặt $(^NameDA)" @@ -48,8 +48,7 @@ !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Rê chuột lên trên một thành phần để thấy mô tả của nó." !else - # FIXME - ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Rê chuột lên trên một thành phần để thấy mô tả của nó." + #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO !endif !endif diff --git a/Contrib/Language files/Welsh.nsh b/Contrib/Language files/Welsh.nsh index a75f2e76..1aeabf1c 100644 --- a/Contrib/Language files/Welsh.nsh +++ b/Contrib/Language files/Welsh.nsh @@ -1,7 +1,7 @@ ;Language: Welsh (1106) ;By Rhoslyn Prys, Meddal.com -!insertmacro LANGFILE "Welsh" "Cymraeg" "Cymraeg" +!insertmacro LANGFILE "Welsh" = "Cymraeg" = !ifdef MUI_WELCOMEPAGE ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Croeso i Ddewin Gosod $(^NameDA)" diff --git a/Contrib/Language files/Yoruba.nlf b/Contrib/Language files/Yoruba.nlf index c22f1af8..141df29b 100644 Binary files a/Contrib/Language files/Yoruba.nlf and b/Contrib/Language files/Yoruba.nlf differ diff --git a/Contrib/Language files/Yoruba.nsh b/Contrib/Language files/Yoruba.nsh index 7d376b17..d497680e 100644 Binary files a/Contrib/Language files/Yoruba.nsh and b/Contrib/Language files/Yoruba.nsh differ diff --git a/Contrib/Modern UI 2/Localization.nsh b/Contrib/Modern UI 2/Localization.nsh index 41934582..c489a8b4 100644 --- a/Contrib/Modern UI 2/Localization.nsh +++ b/Contrib/Modern UI 2/Localization.nsh @@ -26,7 +26,7 @@ Localization ;-------------------------------- ;Include langauge files -!macro MUI_LANGUAGE LANGUAGE +!macro MUI_LANGUAGE NLFID ;Include a language @@ -35,31 +35,19 @@ Localization !insertmacro MUI_INSERT - LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf" + LoadLanguageFile "${NSISDIR}\Contrib\Language files\${NLFID}.nlf" ;Include language file - !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh" + !insertmacro LANGFILE_INCLUDE_WITHDEFAULT \ + "${NSISDIR}\Contrib\Language files\${NLFID}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh" ;Add language to list of languages for selection dialog - !ifndef MUI_LANGDLL_LANGUAGES - !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' " - !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' " - !else - !ifdef MUI_LANGDLL_LANGUAGES_TEMP - !undef MUI_LANGDLL_LANGUAGES_TEMP - !endif - !define MUI_LANGDLL_LANGUAGES_TEMP "${MUI_LANGDLL_LANGUAGES}" - !undef MUI_LANGDLL_LANGUAGES - - !ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP - !undef MUI_LANGDLL_LANGUAGES_CP_TEMP - !endif - !define MUI_LANGDLL_LANGUAGES_CP_TEMP "${MUI_LANGDLL_LANGUAGES_CP}" - !undef MUI_LANGDLL_LANGUAGES_CP - - !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' ${MUI_LANGDLL_LANGUAGES_TEMP}" - !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' ${MUI_LANGDLL_LANGUAGES_CP_TEMP}" - !endif + !define /ifndef MUI_LANGDLL_LANGUAGES "" + !define /redef MUI_LANGDLL_LANGUAGES \ + `"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" ${MUI_LANGDLL_LANGUAGES}` + !define /ifndef MUI_LANGDLL_LANGUAGES_CP "" + !define /redef MUI_LANGDLL_LANGUAGES_CP \ + `"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" "${LANG_${NLFID}_CP}" ${MUI_LANGDLL_LANGUAGES_CP}` !verbose pop diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index d3bc3aa3..fe667af3 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -2067,7 +2067,7 @@ Var MUI_TEMP2 ;-------------------------------- ;LANGUAGES -!macro MUI_LANGUAGE LANGUAGE +!macro MUI_LANGUAGE NLFID ;Include a language @@ -2076,31 +2076,19 @@ Var MUI_TEMP2 !insertmacro MUI_INSERT - LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf" + LoadLanguageFile "${NSISDIR}\Contrib\Language files\${NLFID}.nlf" ;Include language file - !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh" + !insertmacro LANGFILE_INCLUDE_WITHDEFAULT \ + "${NSISDIR}\Contrib\Language files\${NLFID}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh" - ;Add language to list of languages for selection dialog - !ifndef MUI_LANGDLL_LANGUAGES - !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' " - !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' " - !else - !ifdef MUI_LANGDLL_LANGUAGES_TEMP - !undef MUI_LANGDLL_LANGUAGES_TEMP - !endif - !define MUI_LANGDLL_LANGUAGES_TEMP "${MUI_LANGDLL_LANGUAGES}" - !undef MUI_LANGDLL_LANGUAGES - - !ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP - !undef MUI_LANGDLL_LANGUAGES_CP_TEMP - !endif - !define MUI_LANGDLL_LANGUAGES_CP_TEMP "${MUI_LANGDLL_LANGUAGES_CP}" - !undef MUI_LANGDLL_LANGUAGES_CP - - !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' ${MUI_LANGDLL_LANGUAGES_TEMP}" - !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' ${MUI_LANGDLL_LANGUAGES_CP_TEMP}" - !endif + ;Add language to list of languages for selection dialog + !define /ifndef MUI_LANGDLL_LANGUAGES "" + !define /redef MUI_LANGDLL_LANGUAGES \ + `"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" ${MUI_LANGDLL_LANGUAGES}` + !define /ifndef MUI_LANGDLL_LANGUAGES_CP "" + !define /redef MUI_LANGDLL_LANGUAGES_CP \ + `"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" "${LANG_${NLFID}_CP}" ${MUI_LANGDLL_LANGUAGES_CP}` !verbose pop diff --git a/Docs/src/history.but b/Docs/src/history.but index 78c41a0e..af1dcceb 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -12,6 +12,16 @@ Released on ?, 2013 \b MakeNSIS /NOTIFYHWND uses a (optional) new event name to abort compilation, see build.cpp/h for details. +\S2{} Translations + +\b Changed LANGFILE macro in LangFile.nsh + +\b Warnings are now displayed for missing strings (LANGFILE_INCLUDE_WITHDEFAULT) + +\b Added Georgian (David Huriev) + +\b Added Pashto (Pakhtosoft) + \H{v2.46} 2.46 Released on December 6th, 2009 diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi index b59441a9..09cf145b 100644 --- a/Examples/Modern UI/MultiLanguage.nsi +++ b/Examples/Modern UI/MultiLanguage.nsi @@ -110,6 +110,10 @@ !insertmacro MUI_LANGUAGE "Catalan" !insertmacro MUI_LANGUAGE "Esperanto" !insertmacro MUI_LANGUAGE "Asturian" + !insertmacro MUI_LANGUAGE "Pashto" +!ifdef NSIS_UNICODE + !insertmacro MUI_LANGUAGE "Georgian" +!endif ;-------------------------------- ;Reserve Files diff --git a/Include/LangFile.nsh b/Include/LangFile.nsh index e07c43d2..bb02ee34 100644 --- a/Include/LangFile.nsh +++ b/Include/LangFile.nsh @@ -2,10 +2,10 @@ LangFile.nsh -Header file to create langauge files that can be +Header file to create language files that can be included with a single command. -Copyright 2008-2009 Joost Verburg +Copyright 2008-2013 Joost Verburg, Anders Kjersem * Either LANGFILE_INCLUDE or LANGFILE_INCLUDE_WITHDEFAULT can be called from the script to include a language @@ -13,12 +13,10 @@ Copyright 2008-2009 Joost Verburg - LANGFILE_INCLUDE takes the language file name as parameter. - LANGFILE_INCLUDE_WITHDEFAULT takes as additional second - parameter the default language file to load missing strings + parameter, the default language file to load missing strings from. -* A language file start with: - !insertmacro LANGFILE_EXT "English" - using the same name as the standard NSIS language file. +* A language file must start by inserting the LANGFILE macro. * Language strings in the language file have the format: ${LangFileString} LANGSTRING_NAME "Text" @@ -30,7 +28,7 @@ Copyright 2008-2009 Joost Verburg !macro LANGFILE_INCLUDE FILENAME - ;Called from script: include a langauge file + ;Called from script: include a language file !ifdef LangFileString !undef LangFileString @@ -43,16 +41,14 @@ Copyright 2008-2009 Joost Verburg !undef LANGFILE_SETNAMES ;Create language strings - - !undef LangFileString - !define LangFileString "!insertmacro LANGFILE_LANGSTRING" + !define /redef LangFileString "!insertmacro LANGFILE_LANGSTRING" !include "${FILENAME}" !macroend !macro LANGFILE_INCLUDE_WITHDEFAULT FILENAME FILENAME_DEFAULT - ;Called from script: include a langauge file + ;Called from script: include a language file ;Obtains missing strings from a default file !ifdef LangFileString @@ -66,35 +62,63 @@ Copyright 2008-2009 Joost Verburg !undef LANGFILE_SETNAMES ;Include default language for missing strings + !define LANGFILE_PRIV_INCLUDEISFALLBACK "${FILENAME_DEFAULT}" !include "${FILENAME_DEFAULT}" - + !undef LANGFILE_PRIV_INCLUDEISFALLBACK + ;Create language strings - !undef LangFileString - !define LangFileString "!insertmacro LANGFILE_LANGSTRING" + !define /redef LangFileString "!insertmacro LANGFILE_LANGSTRING" !include "${FILENAME_DEFAULT}" !macroend -!macro LANGFILE IDNAME ASCIINAME LOCNAME +!macro LANGFILE NLFID ENGNAME NATIVENAME NATIVEASCIINAME ;Start of standard NSIS language file + ; NLFID: Must match the name of the .nlf file + ; ENGNAME: English name of language, "=" if it is the same as NLFID + ; NATIVENAME: Native name of language. (In Unicode) + ; NATIVEASCIINAME: Native name of language using only ASCII, "=" if it is the same as NATIVENAME + + ; Example: LANGFILE "Swedish" = "Svenska" = + ; For more examples, see French.nsh, Greek.nsh and PortugueseBR.nsh + !ifdef LANGFILE_SETNAMES !ifdef LANGFILE_IDNAME !undef LANGFILE_IDNAME !endif - !define LANGFILE_IDNAME "${IDNAME}" + !define LANGFILE_IDNAME "${NLFID}" - !ifndef "LANGFILE_${IDNAME}_NAME" - !ifndef MUI_LANGDLL_ALLLANGUAGES - !define "LANGFILE_${IDNAME}_NAME" "${LOCNAME}" - !else ifdef NSIS_UNICODE - !define "LANGFILE_${IDNAME}_NAME" "${LOCNAME}" - !else - !define "LANGFILE_${IDNAME}_NAME" "${ASCIINAME}" + ; ModernUI or the .nsi can change LANGFILE_LANGDLL_FMT if desired + !ifndef LANGFILE_LANGDLL_FMT + !ifndef NSIS_UNICODE + !define LANGFILE_LANGDLL_FMT "%ENGNAME% / %NATIVEASCIINAME%" !endif + !define /ifndef LANGFILE_LANGDLL_FMT "%NATIVENAME%" + !endif + + !ifndef "LANGFILE_${NLFID}_NAME" + !if "${ENGNAME}" == "=" + !define /redef ENGNAME "${NLFID}" + !endif + !if "${NATIVEASCIINAME}" == "=" + !define /redef NATIVEASCIINAME "${NATIVENAME}" + !endif + + !define "LANGFILE_${NLFID}_ENGLISHNAME" "${ENGNAME}" + !ifdef NSIS_UNICODE + !define "LANGFILE_${NLFID}_NAME" "${NATIVENAME}" + !else + !define "LANGFILE_${NLFID}_NAME" "${NATIVEASCIINAME}" + !endif + + !searchreplace LANGFILE_${NLFID}_LANGDLL "${LANGFILE_LANGDLL_FMT}" %NATIVEASCIINAME% "${NATIVEASCIINAME}" + !searchreplace LANGFILE_${NLFID}_LANGDLL "${LANGFILE_${NLFID}_LANGDLL}" %NATIVENAME% "${NATIVENAME}" + !searchreplace LANGFILE_${NLFID}_LANGDLL "${LANGFILE_${NLFID}_LANGDLL}" %ENGNAME% "${ENGNAME}" + !endif !endif @@ -123,6 +147,9 @@ Copyright 2008-2009 Joost Verburg !ifndef ${NAME} !define "${NAME}" "${VALUE}" + !ifdef LANGFILE_PRIV_INCLUDEISFALLBACK + !warning 'LangString "${NAME}" for language ${LANGFILE_IDNAME} is missing, using fallback from "${LANGFILE_PRIV_INCLUDEISFALLBACK}"' + !endif !endif !macroend