* Georgian and Pashto are now part of default install.

* LANGFILE macro now takes 4 parameters, all .nsh files have been updated * LANGFILE_INCLUDE_WITHDEFAULT will now warn if the fallback string is used * Removed some invalid English strings in various files * Fixed Khmer LangId * Minor Norwegian language fixes * Some files changed from UTF16LE to UTF8SIG git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6302 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-16 00:28:45 +00:00 · 2013-03-16 00:28:45 +00:00 · 043b4006ed
commit 043b4006ed
parent 2fc40abca0
86 changed files with 185 additions and 176 deletions
--- a/files/Afrikaans.nsh
+++ b/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"
--- a/files/Albanian.nsh
+++ b/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

--- a/files/Arabic.nsh
+++ b/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

--- a/files/Asturian.nsh
+++ b/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

--- a/files/Basque.nsh
+++ b/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"
--- a/files/Belarusian.nsh
+++ b/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)"
--- a/files/Bosnian.nsh
+++ b/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)"
--- a/files/Breton.nsh
+++ b/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)"
--- a/files/Bulgarian.nsh
+++ b/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)!"
--- a/files/Catalan.nsh
+++ b/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

--- a/files/Cibemba.nlf
+++ b/files/Cibemba.nlf
--- a/files/Cibemba.nsh
+++ b/files/Cibemba.nsh
--- a/files/Croatian.nsh
+++ b/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)"
--- a/Contrib/Language
+++ b/Contrib/Language
@ -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

--- a/files/Danish.nsh
+++ b/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

--- a/Contrib/Language
+++ b/Contrib/Language
@ -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"
--- a/Contrib/Language
+++ b/Contrib/Language
--- a/Contrib/Language
+++ b/Contrib/Language
--- a/files/English.nsh
+++ b/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"
--- a/files/Esperanto.nsh
+++ b/files/Esperanto.nsh
@ -1,7 +1,7 @@
 ;Language: Esperanto (0)
 ;By Felipe Castro <fefcas@gmail.com>

-!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

--- a/files/Estonian.nsh
+++ b/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!"
--- a/Contrib/Language
+++ b/Contrib/Language
@ -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) خوش آمدید."
--- a/files/Finnish.nsh
+++ b/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"
--- a/files/French.nsh
+++ b/files/French.nsh
@ -1,7 +1,7 @@
 ;Language: French (1036)
 ;By Sébastien Delahaye <seb@delahaye.net>

-!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
--- a/files/Galician.nsh
+++ b/files/Galician.nsh
@ -1,7 +1,7 @@
 ;Language: Galician (1110)
 ;Ramon Flores <fa2ramon@usc.es>

-!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)"
--- a/files/Georgian.nlf
+++ b/files/Georgian.nlf
--- a/files/Georgian.nsh
+++ b/files/Georgian.nsh
--- a/files/German.nsh
+++ b/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)"
--- a/Contrib/Language
+++ b/Contrib/Language
@ -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)'"
--- a/files/Hebrew.nsh
+++ b/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)"
--- a/files/Hungarian.nsh
+++ b/files/Hungarian.nsh
@ -2,7 +2,7 @@
 ;Translation by Jozsef Tamas Herczeg ( - 1.61-ig),
 ;               Lajos Molnar (Orfanik) <orfanik@axelero.hu> ( 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

--- a/files/Icelandic.nsh
+++ b/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"
--- a/Contrib/Language
+++ b/Contrib/Language
--- a/Contrib/Language
+++ b/Contrib/Language
--- a/files/Indonesian.nsh
+++ b/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

--- a/Contrib/Language
+++ b/Contrib/Language
@ -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)"
--- a/files/Italian.nsh
+++ b/files/Italian.nsh
@ -1,9 +1,9 @@
-;Language: Italian (1040)
+;Language: Italian (1040)
 ;By SANFACE Software <sanface@sanface.com> 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)"
--- a/files/Japanese.nsh
+++ b/files/Japanese.nsh
@ -2,7 +2,7 @@
 ;By Dnanako
 ;Translation updated by Takahiro Yoshimura <takahiro_y@monolithworks.co.jp>

-!insertmacro LANGFILE "Japanese" "Japanese" "日本語"
+!insertmacro LANGFILE "Japanese" = "日本語" "Nihongo"

 !ifdef MUI_WELCOMEPAGE
  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "$(^NameDA) セットアップ ウィザードへようこそ"
--- a/Contrib/Language
+++ b/Contrib/Language
@ -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
 កត់ត្រាដំណើរការដំឡើង
--- a/Contrib/Language
+++ b/Contrib/Language
@ -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 ដែលអ្នកចង់បង្កើតផ្លូវកាត់ទៅកម្មវិធីនេះ។ អ្នកក៏អាចបញ្ចូលឈ្មោះមួយដើម្បីបង្កើតថតថ្មីមួយទៀត។"
--- a/files/Korean.nsh
+++ b/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) 설치를 시작합니다."
--- a/files/Kurdish.nsh
+++ b/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ê"
--- a/files/Latvian.nsh
+++ b/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

--- a/files/Lithuanian.nsh
+++ b/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ą."
--- a/files/Luxembourgish.nsh
+++ b/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

--- a/files/Macedonian.nsh
+++ b/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)"
--- a/files/Malagasy.nlf
+++ b/files/Malagasy.nlf
--- a/files/Malagasy.nsh
+++ b/files/Malagasy.nsh
--- a/Contrib/Language
+++ b/Contrib/Language
@ -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"
--- a/files/Mongolian.nsh
+++ b/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) Суулгацад тавтай морил"
--- a/files/Norwegian.nsh
+++ b/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

--- a/files/NorwegianNynorsk.nsh
+++ b/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

--- a/files/Pashto.nlf
+++ b/files/Pashto.nlf
--- a/files/Pashto.nsh
+++ b/files/Pashto.nsh
--- a/files/Polish.nsh
+++ b/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

--- a/files/Portuguese.nsh
+++ b/files/Portuguese.nsh
@ -1,7 +1,7 @@
 ;Language: Portuguese (2070)
 ;By Ramon <ramon@netcabo.pt>

-!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)"
--- a/files/PortugueseBR.nsh
+++ b/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)"
--- a/files/Romanian.nsh
+++ b/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

--- a/files/Russian.nsh
+++ b/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)"
--- a/files/SConscript
+++ b/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
--- a/files/Serbian.nsh
+++ b/files/Serbian.nsh
@ -1,7 +1,7 @@
 ;Language: Serbian (3098)
 ;Translation by Срђан Обућина <obucina@srpskijezik.edu.yu>

-!insertmacro LANGFILE "Serbian" "Serbian Cyrillic" "Српски"
+!insertmacro LANGFILE "Serbian" "Serbian (Cyrillic)" "Српски" "Srpski (Cyrillic)"

 !ifdef MUI_WELCOMEPAGE
  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Добродошли у водич за инсталацију програма $(^NameDA)"
--- a/files/SerbianLatin.nsh
+++ b/files/SerbianLatin.nsh
@ -1,7 +1,7 @@
 ;Language: Serbian Latin (2074)
 ;Translation by Srđan Obućina <obucina@srpskijezik.edu.yu>

-!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)"
--- a/files/SimpChinese.nsh
+++ b/files/SimpChinese.nsh
@ -2,7 +2,7 @@
 ;Translator: Kii Ali <kiiali@cpatch.org>,<kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>
 ;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) 安装向导"
--- a/files/Slovak.nsh
+++ b/files/Slovak.nsh
@ -5,7 +5,7 @@
 ;  Marián Hikaník (podnety@mojepreklady.net)
 ;  Ivan Masár <helix84@centrum.sk>, 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)"
--- a/files/Slovenian.nsh
+++ b/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)"
--- a/files/Spanish.nsh
+++ b/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)"
--- a/files/SpanishInternational.nsh
+++ b/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)"
--- a/files/Swahili.nlf
+++ b/files/Swahili.nlf
--- a/files/Swahili.nsh
+++ b/files/Swahili.nsh
--- a/files/Swedish.nsh
+++ b/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)."
--- a/Contrib/Language
+++ b/Contrib/Language
@ -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) "
--- a/files/TradChinese.nsh
+++ b/files/TradChinese.nsh
@ -2,7 +2,7 @@
 ;Translator: Kii Ali <kiiali@cpatch.org>,<kiiali@ms1.url.com.tw>, <kiiali@pchome.com.tw>
 ;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) 安裝精靈"
--- a/files/Turkish.nsh
+++ b/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

--- a/files/Ukrainian.nsh
+++ b/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

--- a/Contrib/Language
+++ b/Contrib/Language
@ -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)"
--- a/files/Valencian.nlf
+++ b/files/Valencian.nlf
--- a/files/Valencian.nsh
+++ b/files/Valencian.nsh
--- a/files/Vietnamese.nsh
+++ b/files/Vietnamese.nsh
@ -1,7 +1,7 @@
 ;Language: Vietnamese (1066)
 ;By NGUYỄN Mạnh Hùng <loveleeyoungae@yahoo.com>

-!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 "Chào mừng đến với Trợ lí Cà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 thành phần để thấy mô tả của nó."
  !else
-    # FIXME
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Rê chuột lên trên một thành phần để thấy mô tả của nó."
+    #FIXME:MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO 
  !endif
 !endif

--- a/Contrib/Language
+++ b/Contrib/Language
@ -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)"
--- a/files/Yoruba.nlf
+++ b/files/Yoruba.nlf
--- a/files/Yoruba.nsh
+++ b/files/Yoruba.nsh
--- a/2/Localization.nsh
+++ b/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

--- a/Contrib/Modern
+++ b/Contrib/Modern
@ -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

--- 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
--- a/UI/MultiLanguage.nsi
+++ b/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
--- 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