changed sr@Latn into sr@latin

(bzr r4817)

15 files changed, 21 insertions, 20 deletions

diff --git a/packaging/win32/catalan.nsh b/packaging/win32/catalan.nsh
index 6a5c641fd..7a942b299 100644
--- a/packaging/win32/catalan.nsh
+++ b/packaging/win32/catalan.nsh
@@ -275,8 +275,8 @@
   LangString lng_sq $(LANG_CATALAN) "sq  Albančs"

 ; LangString lng_sr $(LANG_CATALAN) "sr  Serbian"

   LangString lng_sr $(LANG_CATALAN) "sr  Serbi"

-; LangString lng_sr@Latn $(LANG_CATALAN) "sr@Latn  Serbian in Latin script"

-  LangString lng_sr@Latn $(LANG_CATALAN) "sr@Latn  Serbi en alfabet llatí"

+; LangString lng_sr@latin $(LANG_CATALAN) "sr@latin  Serbian in Latin script"

+  LangString lng_sr@latin $(LANG_CATALAN) "sr@latin  Serbi en alfabet llatí"

 ; LangString lng_sv $(LANG_CATALAN) "sv  Swedish"

   LangString lng_sv $(LANG_CATALAN) "sv  Suec"

 ; 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."
 

 ; 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)"

-  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)"
 

 ; LangString lng_UninstallLogNotFound ${LANG_CATALAN} "$INSTDIR\uninstall.log not found!$\r$\nPlease uninstall by clearing directory $INSTDIR yourself!"

   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 4ab5d0fd9..db9f42668 100644
--- a/packaging/win32/czech.nsh
+++ b/packaging/win32/czech.nsh
@@ -190,7 +190,7 @@ LangString lng_sk $(LANG_CZECH) "sk  Slovenština"
 LangString lng_sl $(LANG_CZECH) "sl  Slovinština"
 LangString lng_sq $(LANG_CZECH) "sq  Albánština"
 LangString lng_sr $(LANG_CZECH) "sr  Srbština"
-LangString lng_sr@Latn $(LANG_CZECH) "sr@Latn  Srbština v latince"
+LangString lng_sr@latin $(LANG_CZECH) "sr@latin  Srbština v latince"
 LangString lng_sv $(LANG_CZECH) "sv  Švédština"
 LangString lng_th $(LANG_CZECH) "th  Thai"

 LangString lng_tr $(LANG_CZECH) "tr  Turečtina"
diff --git a/packaging/win32/english.nsh b/packaging/win32/english.nsh
index d55971c6e..01b34d6bc 100644
--- 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 d6abd3d53..76c31a9ad 100644
--- 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 19c1a655b..6b890cb1d 100644
--- 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"

 LangString lng_tr $(LANG_FRENCH) "tr  Turc"
diff --git a/packaging/win32/galician.nsh b/packaging/win32/galician.nsh
index 0df8971cb..4be7a8c76 100644
--- 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 8fd403a42..a685a64a9 100644
--- 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 6e9dc022f..7233996e5 100644
--- 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 62f162cad..4ed2b3c62 100644
--- 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"

 LangString lng_sq $(LANG_ITALIAN) "sq  Albanese"

 LangString lng_sr $(LANG_ITALIAN) "sr  Serbo"

-LangString lng_sr@Latn $(LANG_ITALIAN) "sr@Latn  Serbo in caratteri Latini"

+LangString lng_sr@latin $(LANG_ITALIAN) "sr@latin  Serbo in caratteri Latini"

 LangString lng_sv $(LANG_ITALIAN) "sv  Svedese"

 LangString lng_th $(LANG_ITALIAN) "th  Thai"

 LangString lng_tr $(LANG_ITALIAN) "tr  Turco"

diff --git a/packaging/win32/japanese.nsh b/packaging/win32/japanese.nsh
index c371f7f48..d76705e61 100644
--- a/packaging/win32/japanese.nsh
+++ b/packaging/win32/japanese.nsh
@@ -183,7 +183,7 @@ LangString lng_sk $(LANG_JAPANESE) "sk  ƒXƒƒoƒLƒAŒę"
 LangString lng_sl $(LANG_JAPANESE) "sl  ƒXƒƒxƒjƒAŒę"

 LangString lng_sq $(LANG_JAPANESE) "sq  ƒAƒ‹ƒoƒjƒAŒę"

 LangString lng_sr $(LANG_JAPANESE) "sr  ƒZƒ‹ƒrƒAŒę"

-LangString lng_sr@Latn $(LANG_JAPANESE) "sr@Latn  ƒZƒ‹ƒrƒAŒęiƒ‰ƒeƒ“j"

+LangString lng_sr@latin $(LANG_JAPANESE) "sr@latin  ƒZƒ‹ƒrƒAŒęiƒ‰ƒeƒ“j"

 LangString lng_sv $(LANG_JAPANESE) "sv  ƒXƒEƒF[ƒfƒ“Œę"

 LangString lng_th $(LANG_JAPANESE) "th  ƒ^ƒCŒę"

 LangString lng_tr $(LANG_JAPANESE) "tr  ƒgƒ‹ƒRŒę"

diff --git a/packaging/win32/polish.nsh b/packaging/win32/polish.nsh
index 829c666b9..40ccaeea0 100644
--- 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"

 LangString lng_sq $(LANG_POLISH) "sq  Albanian"

 LangString lng_sr $(LANG_POLISH) "sr  Serbian"

-LangString lng_sr@Latn $(LANG_POLISH) "sr@Latn  Serbian in Latin script"

+LangString lng_sr@latin $(LANG_POLISH) "sr@latin  Serbian in Latin script"

 LangString lng_sv $(LANG_POLISH) "sv  Swedish"

 LangString lng_th $(LANG_POLISH) "th  Thai"

 LangString lng_tr $(LANG_POLISH) "tr  Turkish"

diff --git a/packaging/win32/russian.nsh b/packaging/win32/russian.nsh
index 69f4fab08..e9d8c1fa1 100644
--- 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 2c6f98196..80f923f56 100644
--- a/packaging/win32/slovak.nsh
+++ b/packaging/win32/slovak.nsh
@@ -188,7 +188,7 @@ LangString lng_sk $(LANG_SLOVAK) "sk  slovenčina"
 LangString lng_sl $(LANG_SLOVAK) "sl  slovinčina"

 LangString lng_sq $(LANG_SLOVAK) "sq  albánčina"

 LangString lng_sr $(LANG_SLOVAK) "sr  srbčina"

-LangString lng_sr@Latn $(LANG_SLOVAK) "sr@Latn  srbčina (latinka)"

+LangString lng_sr@latin $(LANG_SLOVAK) "sr@latin  srbčina (latinka)"

 LangString lng_sv $(LANG_SLOVAK) "sv  švédčina"

 LangString lng_th $(LANG_SLOVAK) "th  thajčina"

 LangString lng_tr $(LANG_SLOVAK) "tr  turečtina"

diff --git a/packaging/win32/slovenian.nsh b/packaging/win32/slovenian.nsh
index 9363bf158..11b2be324 100644
--- a/packaging/win32/slovenian.nsh
+++ b/packaging/win32/slovenian.nsh
@@ -16,7 +16,7 @@
 ; January 2008 new uninstaller messages
 
 ; !insertmacro MUI_LANGUAGE "Slovenšč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ški (sk)"
 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) "švedski (sv)"
 LangString lng_th $(LANG_SLOVENIAN) "tajski (th)"
 LangString lng_tr $(LANG_SLOVENIAN) "turški (tr)"
diff --git a/packaging/win32/spanish.nsh b/packaging/win32/spanish.nsh
index 3bd8a6be6..df5cc1812 100644
--- 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"

 LangString lng_tr $(LANG_SPANISH) "tr  Turkish"