changed sr@Latn into sr@latin

diff --git a/packaging/win32/catalan.nsh b/packaging/win32/catalan.nsh
index 6a5c641fd34d128804474af9e4f75decdfa5946f..7a942b29937fef870b83c821a02bc2dbab2c5ed2 100644 (file)
--- a/packaging/win32/catalan.nsh
+++ b/packaging/win32/catalan.nsh
@@ -275,8 +275,8 @@
   LangString lng_sq $(LANG_CATALAN) "sq  Albanès"\r
 ; LangString lng_sr $(LANG_CATALAN) "sr  Serbian"\r
   LangString lng_sr $(LANG_CATALAN) "sr  Serbi"\r
-; LangString lng_sr@Latn $(LANG_CATALAN) "sr@Latn  Serbian in Latin script"\r
-  LangString lng_sr@Latn $(LANG_CATALAN) "sr@Latn  Serbi en alfabet llatí"\r
+; LangString lng_sr@latin $(LANG_CATALAN) "sr@latin  Serbian in Latin script"\r
+  LangString lng_sr@latin $(LANG_CATALAN) "sr@latin  Serbi en alfabet llatí"\r
 ; LangString lng_sv $(LANG_CATALAN) "sv  Swedish"\r
   LangString lng_sv $(LANG_CATALAN) "sv  Suec"\r
 ; LangString lng_th $(LANG_CATALAN) "th  Thai"
@@ -308,7 +308,7 @@
   LangString lng_RETRY_CANCEL_DESC ${LANG_CATALAN} "$\n$\nPremeu Reintenta per a continuar o Cancel·la per a interrompre."
 \r
 ; LangString lng_ClearDirectoryBefore ${LANG_CATALAN} "${PRODUCT_NAME} must be installed in an empty directory. $INSTDIR is not empty. Please clear this directory first!$(lng_RETRY_CANCEL_DESC)"\r
-  LangString lng_ClearDirectoryBefore ${LANG_CATALAN} "$Heu d'instal·lar l'{PRODUCT_NAME} en una carpeta buida. La carpeta $INSTDIR no és buida; haureu de buidar-la primer.$(lng_RETRY_CANCEL_DESC)"
+  LangString lng_ClearDirectoryBefore ${LANG_CATALAN} "Heu d'instal·lar l'${PRODUCT_NAME} en una carpeta buida. La carpeta $INSTDIR no és buida; haureu de buidar-la primer.$(lng_RETRY_CANCEL_DESC)"
 \r
 ; LangString lng_UninstallLogNotFound ${LANG_CATALAN} "$INSTDIR\uninstall.log not found!$\r$\nPlease uninstall by clearing directory $INSTDIR yourself!"\r
   LangString lng_UninstallLogNotFound ${LANG_CATALAN} "No s'ha trobat $INSTDIR\uninstall.log.$\r$\nPer a desinstal·lar, haureu de netejar la carpeta $INSTDIR vosaltres mateixos!"

diff --git a/packaging/win32/czech.nsh b/packaging/win32/czech.nsh
index 4ab5d0fd9a87320861aa07e65fea46a1a0d7ce68..db9f4266868a2974542623c41b3d1a1b0e26c9da 100644 (file)
--- a/packaging/win32/czech.nsh
+++ b/packaging/win32/czech.nsh
@@ -190,7 +190,7 @@ LangString lng_sk $(LANG_CZECH) "sk  Sloven
 LangString lng_sl $(LANG_CZECH) "sl  Slovin\9atina"
 LangString lng_sq $(LANG_CZECH) "sq  Albán\9atina"
 LangString lng_sr $(LANG_CZECH) "sr  Srb\9atina"
-LangString lng_sr@Latn $(LANG_CZECH) "sr@Latn  Srb\9atina v latince"
+LangString lng_sr@latin $(LANG_CZECH) "sr@latin  Srb\9atina v latince"
 LangString lng_sv $(LANG_CZECH) "sv  \8avéd\9atina"
 LangString lng_th $(LANG_CZECH) "th  Thai"\r
 LangString lng_tr $(LANG_CZECH) "tr  Tureètina"

diff --git a/packaging/win32/english.nsh b/packaging/win32/english.nsh
index d55971c6ee074b263506814d4258d5aabf133e09..01b34d6bc88808377c0c831e9d4a658d7f91dfb0 100644 (file)
--- a/packaging/win32/english.nsh
+++ b/packaging/win32/english.nsh
@@ -1,3 +1,4 @@
+
 ; #######################################
 ; english.nsh
 ; english language strings for inkscape installer
@@ -188,7 +189,7 @@ LangString lng_sk $(LANG_ENGLISH) "sk  Slovak"
 LangString lng_sl $(LANG_ENGLISH) "sl  Slovenian"
 LangString lng_sq $(LANG_ENGLISH) "sq  Albanian"
 LangString lng_sr $(LANG_ENGLISH) "sr  Serbian"
-LangString lng_sr@Latn $(LANG_ENGLISH) "sr@Latn  Serbian in Latin script"
+LangString lng_sr@latin $(LANG_ENGLISH) "sr@latin  Serbian in Latin script"
 LangString lng_sv $(LANG_ENGLISH) "sv  Swedish"
 LangString lng_th $(LANG_ENGLISH) "th  Thai"
 LangString lng_tr $(LANG_ENGLISH) "tr  Turkish"

diff --git a/packaging/win32/finnish.nsh b/packaging/win32/finnish.nsh
index d6abd3d531e71a536b9ae6f5cc1f1dbdca5ec199..76c31a9aded9663cb0a4181b0abc7e7110cd9022 100644 (file)
--- a/packaging/win32/finnish.nsh
+++ b/packaging/win32/finnish.nsh
@@ -188,7 +188,7 @@ LangString lng_sk $(LANG_FINNISH) "sk  slovakki"
 LangString lng_sl $(LANG_FINNISH) "sl  sloveeni"
 LangString lng_sq $(LANG_FINNISH) "sq  albania"
 LangString lng_sr $(LANG_FINNISH) "sr  serbia"
-LangString lng_sr@Latn $(LANG_FINNISH) "sr@Latn  serbia (latin)"
+LangString lng_sr@latin $(LANG_FINNISH) "sr@latin  serbia (latin)"
 LangString lng_sv $(LANG_FINNISH) "sv  ruotsi"
 LangString lng_th $(LANG_FINNISH) "th  thai"
 LangString lng_tr $(LANG_FINNISH) "tr  turkki"

diff --git a/packaging/win32/french.nsh b/packaging/win32/french.nsh
index 19c1a655bacdecb077c54bb55730d86aae9a47dc..6b890cb1d7b5da2c4d5dc842d736a45a490fa51c 100644 (file)
--- a/packaging/win32/french.nsh
+++ b/packaging/win32/french.nsh
@@ -189,7 +189,7 @@ LangString lng_sk $(LANG_FRENCH) "sk  Slovaque"
 LangString lng_sl $(LANG_FRENCH) "sl  Slovène"
 LangString lng_sq $(LANG_FRENCH) "sq  Albanian"
 LangString lng_sr $(LANG_FRENCH) "sr  Serbe"
-LangString lng_sr@Latn $(LANG_FRENCH) "sr@Latn  Serbe en notation latine"
+LangString lng_sr@latin $(LANG_FRENCH) "sr@latin  Serbe en notation latine"
 LangString lng_sv $(LANG_FRENCH) "sv  Suédois"
 LangString lng_th $(LANG_FRENCH) "th  Thai"\r
 LangString lng_tr $(LANG_FRENCH) "tr  Turc"

diff --git a/packaging/win32/galician.nsh b/packaging/win32/galician.nsh
index 0df8971cba4901e1439ea17cd66991b45cc2e658..4be7a8c7603c946d810397ff7d8b08be6d2bf4d0 100644 (file)
--- a/packaging/win32/galician.nsh
+++ b/packaging/win32/galician.nsh
@@ -188,7 +188,7 @@ LangString lng_sk $(LANG_GALICIAN) "sk  Eslovaco"
 LangString lng_sl $(LANG_GALICIAN) "sl  Eslovenio"
 LangString lng_sq $(LANG_GALICIAN) "sq  Albanés"
 LangString lng_sr $(LANG_GALICIAN) "sr  Serbio"
-LangString lng_sr@Latn $(LANG_GALICIAN) "sr@Latn  Serbio con alfabeto Latino"
+LangString lng_sr@latin $(LANG_GALICIAN) "sr@latin  Serbio con alfabeto Latino"
 LangString lng_sv $(LANG_GALICIAN) "sv  Sueco"
 LangString lng_th $(LANG_GALICIAN) "th  Tailandés"
 LangString lng_tr $(LANG_GALICIAN) "tr  Turco"

diff --git a/packaging/win32/german.nsh b/packaging/win32/german.nsh
index 8fd403a421406099232de57e6628576965b43387..a685a64a9d8527d17f679ccb30155fac90b11584 100644 (file)
--- a/packaging/win32/german.nsh
+++ b/packaging/win32/german.nsh
@@ -191,7 +191,7 @@ LangString lng_sk $(LANG_GERMAN) "sk  Slowakisch"
 LangString lng_sl $(LANG_GERMAN) "sl  Slowenisch"
 LangString lng_sq $(LANG_GERMAN) "sq  Albanisch"
 LangString lng_sr $(LANG_GERMAN) "sr  Serbisch"
-LangString lng_sr@Latn $(LANG_GERMAN) "sr@Latn Serbisch mit lat. Buchstaben"
+LangString lng_sr@latin $(LANG_GERMAN) "sr@latin Serbisch mit lat. Buchstaben"
 LangString lng_sv $(LANG_GERMAN) "sv  Schwedisch"
 LangString lng_th $(LANG_GERMAN) "th  Thai"
 LangString lng_tr $(LANG_GERMAN) "tr  Türkisch"

diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi
index 6e9dc022f2139a60514dc07a01d93802d27109c4..7233996e5d70ff71ca580c07d37a28cb957f7264 100644 (file)
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -923,8 +923,8 @@ Section $(lng_sr) SecSerbian
   !insertmacro Language sr sr
 SectionEnd
 
-Section $(lng_sr@Latn) SecSerbianLatin
-  !insertmacro Language 'sr@Latn' 'sr@Latn'
+Section $(lng_sr@latin) SecSerbianLatin
+  !insertmacro Language 'sr@latin' 'sr@latin'
 SectionEnd
 
 Section $(lng_sv) SecSwedish
@@ -1199,7 +1199,7 @@ Function .onInit
   !insertmacro Parameter "sl" ${SecSlovenian}
   !insertmacro Parameter "sq" ${SecAlbanian}
   !insertmacro Parameter "sr" ${SecSerbian}
-  !insertmacro Parameter "sr@Latn" ${SecSerbianLatin}
+  !insertmacro Parameter "sr@latin" ${SecSerbianLatin}
   !insertmacro Parameter "sv" ${SecSwedish}
   !insertmacro Parameter "th" ${SecThai}
   !insertmacro Parameter "tr" ${SecTurkish}

diff --git a/packaging/win32/italian.nsh b/packaging/win32/italian.nsh
index 62f162cade35dd4c3e3cef8b36df6fee018a7ba4..4ed2b3c6297f552bb03283a677841963a832a001 100644 (file)
--- a/packaging/win32/italian.nsh
+++ b/packaging/win32/italian.nsh
@@ -188,7 +188,7 @@ LangString lng_sk $(LANG_ITALIAN) "sk  Slovacco"
 LangString lng_sl $(LANG_ITALIAN) "sl  Sloveno"\r
 LangString lng_sq $(LANG_ITALIAN) "sq  Albanese"\r
 LangString lng_sr $(LANG_ITALIAN) "sr  Serbo"\r
-LangString lng_sr@Latn $(LANG_ITALIAN) "sr@Latn  Serbo in caratteri Latini"\r
+LangString lng_sr@latin $(LANG_ITALIAN) "sr@latin  Serbo in caratteri Latini"\r
 LangString lng_sv $(LANG_ITALIAN) "sv  Svedese"\r
 LangString lng_th $(LANG_ITALIAN) "th  Thai"\r
 LangString lng_tr $(LANG_ITALIAN) "tr  Turco"\r

diff --git a/packaging/win32/japanese.nsh b/packaging/win32/japanese.nsh
index c371f7f4842e347bc51e8ec7e5b8880aa6ae9ef5..d76705e616220d5655bb1e2e534806c0b63ef91b 100644 (file)
--- a/packaging/win32/japanese.nsh
+++ b/packaging/win32/japanese.nsh
@@ -183,7 +183,7 @@ LangString lng_sk $(LANG_JAPANESE) "sk  
 LangString lng_sl $(LANG_JAPANESE) "sl  \83X\83\8d\83x\83j\83A\8cê"\r
 LangString lng_sq $(LANG_JAPANESE) "sq  \83A\83\8b\83o\83j\83A\8cê"\r
 LangString lng_sr $(LANG_JAPANESE) "sr  \83Z\83\8b\83r\83A\8cê"\r
-LangString lng_sr@Latn $(LANG_JAPANESE) "sr@Latn  \83Z\83\8b\83r\83A\8cê\81i\83\89\83e\83\93\81j"\r
+LangString lng_sr@latin $(LANG_JAPANESE) "sr@latin  \83Z\83\8b\83r\83A\8cê\81i\83\89\83e\83\93\81j"\r
 LangString lng_sv $(LANG_JAPANESE) "sv  \83X\83E\83F\81[\83f\83\93\8cê"\r
 LangString lng_th $(LANG_JAPANESE) "th  \83^\83C\8cê"\r
 LangString lng_tr $(LANG_JAPANESE) "tr  \83g\83\8b\83R\8cê"\r

diff --git a/packaging/win32/polish.nsh b/packaging/win32/polish.nsh
index 829c666b98bf7384236e2ba5a297073262a6b45e..40ccaeea0ac40013f4f0d38195551e7478fa1cb0 100644 (file)
--- a/packaging/win32/polish.nsh
+++ b/packaging/win32/polish.nsh
@@ -188,7 +188,7 @@ LangString lng_sk $(LANG_POLISH) "sk  Slovak"
 LangString lng_sl $(LANG_POLISH) "sl  Slovenian"\r
 LangString lng_sq $(LANG_POLISH) "sq  Albanian"\r
 LangString lng_sr $(LANG_POLISH) "sr  Serbian"\r
-LangString lng_sr@Latn $(LANG_POLISH) "sr@Latn  Serbian in Latin script"\r
+LangString lng_sr@latin $(LANG_POLISH) "sr@latin  Serbian in Latin script"\r
 LangString lng_sv $(LANG_POLISH) "sv  Swedish"\r
 LangString lng_th $(LANG_POLISH) "th  Thai"\r
 LangString lng_tr $(LANG_POLISH) "tr  Turkish"\r

diff --git a/packaging/win32/russian.nsh b/packaging/win32/russian.nsh
index 69f4fab087ce974a2922c721f271b820883fe7b0..e9d8c1fa100e5d32de6e25088dd2d87130731684 100644 (file)
--- a/packaging/win32/russian.nsh
+++ b/packaging/win32/russian.nsh
@@ -188,7 +188,7 @@ LangString lng_sk $(LANG_RUSSIAN) "sk  
 LangString lng_sl $(LANG_RUSSIAN) "sl  Ñëîâåíñêèé"
 LangString lng_sq $(LANG_RUSSIAN) "sq  Àëáàíñêèé"
 LangString lng_sr $(LANG_RUSSIAN) "sr  Ñåðáñêèé"
-LangString lng_sr@Latn $(LANG_RUSSIAN) "sr@Latn  Ñåðáñêèé (ëàòèíèöà)"
+LangString lng_sr@latin $(LANG_RUSSIAN) "sr@latin  Ñåðáñêèé (ëàòèíèöà)"
 LangString lng_sv $(LANG_RUSSIAN) "sv  Øâåäñêèé"
 LangString lng_th $(LANG_RUSSIAN) "th  Òàéñêèé"
 LangString lng_tr $(LANG_RUSSIAN) "tr  Òóðåöêèé"

diff --git a/packaging/win32/slovak.nsh b/packaging/win32/slovak.nsh
index 2c6f98196eeba3dfa103f237dbe9b50263f5e8e7..80f923f565269e8f9f56956cce65cb3069e62e74 100644 (file)
--- a/packaging/win32/slovak.nsh
+++ b/packaging/win32/slovak.nsh
@@ -188,7 +188,7 @@ LangString lng_sk $(LANG_SLOVAK) "sk  sloven
 LangString lng_sl $(LANG_SLOVAK) "sl  slovinèina"\r
 LangString lng_sq $(LANG_SLOVAK) "sq  albánèina"\r
 LangString lng_sr $(LANG_SLOVAK) "sr  srbèina"\r
-LangString lng_sr@Latn $(LANG_SLOVAK) "sr@Latn  srbèina (latinka)"\r
+LangString lng_sr@latin $(LANG_SLOVAK) "sr@latin  srbèina (latinka)"\r
 LangString lng_sv $(LANG_SLOVAK) "sv  \9avédèina"\r
 LangString lng_th $(LANG_SLOVAK) "th  thajèina"\r
 LangString lng_tr $(LANG_SLOVAK) "tr  tureètina"\r

diff --git a/packaging/win32/slovenian.nsh b/packaging/win32/slovenian.nsh
index 9363bf158bdfb06381e2654959dabe18ec00682a..11b2be324e9cbdfa3a8e4d80cc19ea406d21ed1e 100644 (file)
--- a/packaging/win32/slovenian.nsh
+++ b/packaging/win32/slovenian.nsh
@@ -16,7 +16,7 @@
 ; January 2008 new uninstaller messages
 
 ; !insertmacro MUI_LANGUAGE "Sloven\9aèina"
-!insertmacro MUI_LANGUAGE "Slovenski jezik"
+!insertmacro MUI_LANGUAGE "Slovenian"
 
 ; Product name
 LangString lng_Caption   ${LANG_SLOVENIAN} "${PRODUCT_NAME} -- Odprtokodni urejevalnik vektorskih slik"
@@ -189,7 +189,7 @@ LangString lng_sk $(LANG_SLOVENIAN) "slova
 LangString lng_sl $(LANG_SLOVENIAN) "slovenski (sl)"
 LangString lng_sq $(LANG_SLOVENIAN) "albanski (sq)"
 LangString lng_sr $(LANG_SLOVENIAN) "srbski (sr)"
-LangString lng_sr@Latn $(LANG_SLOVENIAN) "srbski - latinica (sr@Latn)"
+LangString lng_sr@latin $(LANG_SLOVENIAN) "srbski - latinica (sr@latin)"
 LangString lng_sv $(LANG_SLOVENIAN) "\9avedski (sv)"
 LangString lng_th $(LANG_SLOVENIAN) "tajski (th)"
 LangString lng_tr $(LANG_SLOVENIAN) "tur\9aki (tr)"

diff --git a/packaging/win32/spanish.nsh b/packaging/win32/spanish.nsh
index 3bd8a6be6258d7b5d5f36104632b04feacdc7178..df5cc18127cdb009be1dd2f4be36a3030c7c6705 100644 (file)
--- a/packaging/win32/spanish.nsh
+++ b/packaging/win32/spanish.nsh
@@ -187,7 +187,7 @@ LangString lng_sk $(LANG_SPANISH) "sk  Slovak"
 LangString lng_sl $(LANG_SPANISH) "sl  Slovenian"
 LangString lng_sq $(LANG_SPANISH) "sq  Albanian"
 LangString lng_sr $(LANG_SPANISH) "sr  Serbian"
-LangString lng_sr@Latn $(LANG_SPANISH) "sr@Latn  Serbian in Latin script"
+LangString lng_sr@latin $(LANG_SPANISH) "sr@latin  Serbian in Latin script"
 LangString lng_sv $(LANG_SPANISH) "sv  Swedish"
 LangString lng_th $(LANG_SPANISH) "th  Thai"\r
 LangString lng_tr $(LANG_SPANISH) "tr  Turkish"