Farsi support in win32 packages and Inkscape preferences

(bzr r9021)

19 files changed, 24 insertions, 6 deletions

diff --git a/packaging/win32/languages/Breton.nsh b/packaging/win32/languages/Breton.nsh
index 138d0cac2..9dc292f32 100644
--- a/packaging/win32/languages/Breton.nsh
+++ b/packaging/win32/languages/Breton.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Spagnoleg"
 ${LangFileString} lng_es_MX "Spagnoleg Mec'hiko"
 ${LangFileString} lng_et "Estoneg"
 ${LangFileString} lng_eu "Euskareg"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finneg"
 ${LangFileString} lng_fr "Galleg"
 ${LangFileString} lng_he "Hebraeg"
diff --git a/packaging/win32/languages/Catalan.nsh b/packaging/win32/languages/Catalan.nsh
index 410278100..83eddba3e 100644
--- a/packaging/win32/languages/Catalan.nsh
+++ b/packaging/win32/languages/Catalan.nsh
@@ -63,6 +63,7 @@ ${LangFileString} lng_es_MX "Espanyol mexicà"
 ${LangFileString} lng_et "Estonià"
 ${LangFileString} lng_eu "Basc"
 ${LangFileString} lng_fi "Finès"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fr "Francès"
 ${LangFileString} lng_ga "Irlandès"
 ${LangFileString} lng_gl "Gallec"
diff --git a/packaging/win32/languages/Czech.nsh b/packaging/win32/languages/Czech.nsh
index e991995f5..6e200c97a 100644
--- a/packaging/win32/languages/Czech.nsh
+++ b/packaging/win32/languages/Czech.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Španìlština"
 ${LangFileString} lng_es_MX "Mexická Španìlština"
 ${LangFileString} lng_et "Estonština"
 ${LangFileString} lng_eu "Basque"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finština"
 ${LangFileString} lng_fr "Francouzština"
 ${LangFileString} lng_ga "Irština"
diff --git a/packaging/win32/languages/English.nsh b/packaging/win32/languages/English.nsh
index a5d2d693b..27c406961 100644
--- a/packaging/win32/languages/English.nsh
+++ b/packaging/win32/languages/English.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Spanish"
 ${LangFileString} lng_es_MX "Mexican Spanish"
 ${LangFileString} lng_et "Estonian"
 ${LangFileString} lng_eu "Basque"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finnish"
 ${LangFileString} lng_fr "French"
 ${LangFileString} lng_ga "Irish"
diff --git a/packaging/win32/languages/Finnish.nsh b/packaging/win32/languages/Finnish.nsh
index 02bee75b4..74969f39f 100644
--- a/packaging/win32/languages/Finnish.nsh
+++ b/packaging/win32/languages/Finnish.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "espanja"
 ${LangFileString} lng_es_MX "Meksikon espanja"
 ${LangFileString} lng_et "eesti"
 ${LangFileString} lng_eu "Basque"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "suomi"
 ${LangFileString} lng_fr "ranska"
 ${LangFileString} lng_ga "iiri"
diff --git a/packaging/win32/languages/French.nsh b/packaging/win32/languages/French.nsh
index 449f7a131..7dbd8d1ce 100644
--- a/packaging/win32/languages/French.nsh
+++ b/packaging/win32/languages/French.nsh
@@ -1,6 +1,6 @@
 ;Language: French (1036, CP1252)
 ;By matiphas@free.fr, Nicolas Dufour <nicoduf@yahoo.fr>
-${LangFileString} CaptionDescription "Editeur vectoriel SVG libre"
+${LangFileString} CaptionDescription "Éditeur vectoriel SVG libre"
 ${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) est diffusé sous la licence publique générale (GPL) GNU. La licence est fournie ici pour information uniquement. $_CLICK"
 ${LangFileString} DIFFERENT_USER "Inkscape a déjà été installé par l'utilisateur $0.$\r$\nSi vous continuez, l'installation pourrait devenir défectueuse!$\r$\nVeuillez, svp, vous connecter en tant que $0 et essayer de nouveau."
 ${LangFileString} WANT_UNINSTALL_BEFORE "$R1 a déjà été installé. $\nVoulez-vous supprimer la version précédente avant l'installation d' $(^Name) ?"
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Espagnol"
 ${LangFileString} lng_es_MX "Espagnol (Mexique)"
 ${LangFileString} lng_et "Estonien"
 ${LangFileString} lng_eu "Basque"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finnois"
 ${LangFileString} lng_fr "Français"
 ${LangFileString} lng_he "Hébreu"
diff --git a/packaging/win32/languages/Galician.nsh b/packaging/win32/languages/Galician.nsh
index 161383c22..a77373888 100644
--- a/packaging/win32/languages/Galician.nsh
+++ b/packaging/win32/languages/Galician.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Español"
 ${LangFileString} lng_es_MX "Español Mexicano"
 ${LangFileString} lng_et "Estonio"
 ${LangFileString} lng_eu "Éuscaro "
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finés"
 ${LangFileString} lng_fr "Francés"
 ${LangFileString} lng_ga "Gaélico Irlandés"
diff --git a/packaging/win32/languages/German.nsh b/packaging/win32/languages/German.nsh
index c424a0776..73fdc77f4 100644
--- a/packaging/win32/languages/German.nsh
+++ b/packaging/win32/languages/German.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Spanisch"
 ${LangFileString} lng_es_MX "Spanisch-Mexio"
 ${LangFileString} lng_et "Estonisch"
 ${LangFileString} lng_eu "Baskisch"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finnisch"
 ${LangFileString} lng_fr "Französisch"
 ${LangFileString} lng_ga "Irisch"
diff --git a/packaging/win32/languages/Italian.nsh b/packaging/win32/languages/Italian.nsh
index 883b28a8b..53c2c287c 100644
--- a/packaging/win32/languages/Italian.nsh
+++ b/packaging/win32/languages/Italian.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Spagnolo"
 ${LangFileString} lng_es_MX "Spagnolo Messicano"
 ${LangFileString} lng_et "Estone"
 ${LangFileString} lng_eu "Basco"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finlandese"
 ${LangFileString} lng_fr "Francese"
 ${LangFileString} lng_ga "Irlandese"
diff --git a/packaging/win32/languages/Japanese.nsh b/packaging/win32/languages/Japanese.nsh
index d92ae4554..b30f0e09a 100644
--- a/packaging/win32/languages/Japanese.nsh
+++ b/packaging/win32/languages/Japanese.nsh
@@ -61,7 +61,8 @@ ${LangFileString} lng_eo "ƒGƒXƒyƒ‰ƒ“ƒgŒê"
 ${LangFileString} lng_es "ƒXƒyƒCƒ“Œê"

 ${LangFileString} lng_es_MX "ƒXƒyƒCƒ“Œê (ƒ�ƒLƒVƒR)"

 ${LangFileString} lng_et "ƒGƒXƒgƒjƒAŒê"

-${LangFileString} lng_eu "ƒoƒXƒNŒê"

+${LangFileString} lng_eu "ƒoƒXƒNŒê"
+${LangFileString} lng_fa "Farsi"

 ${LangFileString} lng_fi "ƒtƒBƒ“ƒ‰ƒ“ƒhŒê"

 ${LangFileString} lng_fr "ƒtƒ‰ƒ“ƒXŒê"

 ${LangFileString} lng_ga "ƒAƒCƒ‹ƒ‰ƒ“ƒhŒê"

diff --git a/packaging/win32/languages/Polish.nsh b/packaging/win32/languages/Polish.nsh
index d9d7160b4..f39a91751 100644
--- a/packaging/win32/languages/Polish.nsh
+++ b/packaging/win32/languages/Polish.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Hiszpañski"
 ${LangFileString} lng_es_MX "Hiszpañski-Meksykañski"
 ${LangFileString} lng_et "Estoñski"
 ${LangFileString} lng_eu "Baskijski"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Fiñski"
 ${LangFileString} lng_fr "Francuski"
 ${LangFileString} lng_ga "Irlandzki"
diff --git a/packaging/win32/languages/Romanian.nsh b/packaging/win32/languages/Romanian.nsh
index 5a64cde5a..f38511643 100644
--- a/packaging/win32/languages/Romanian.nsh
+++ b/packaging/win32/languages/Romanian.nsh
@@ -162,6 +162,7 @@ LangString lng_es $(LANG_ENGLISH) "es  Spaniolã"
 LangString lng_es_MX $(LANG_ENGLISH) "es_MX  Spaniolã mexicanã"
 LangString lng_et $(LANG_ENGLISH) "et  Estonianã"
 LangString lng_eu $(LANG_ENGLISH) "eu  Bascã"
+LangString lng_fa $(LANG_ENGLISH) "fa  Farsi"
 LangString lng_fi $(LANG_ENGLISH) "fi  Finlandezã"
 LangString lng_fr $(LANG_ENGLISH) "fr  Francezã"
 LangString lng_ga $(LANG_ENGLISH) "ga  Irlandezã"
diff --git a/packaging/win32/languages/Russian.nsh b/packaging/win32/languages/Russian.nsh
index 8b4db9b0b..539218b33 100644
--- a/packaging/win32/languages/Russian.nsh
+++ b/packaging/win32/languages/Russian.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Èñïàíñêèé"
 ${LangFileString} lng_es_MX "Èñïàíñêèé (Ìåêñèêà)"
 ${LangFileString} lng_et "Ýñòîíñêèé"
 ${LangFileString} lng_eu "Áàñêñêèé"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Ôèíñêèé"
 ${LangFileString} lng_fr "Ôðàíöóçñêèé"
 ${LangFileString} lng_ga "Èðëàíäñêèé"
diff --git a/packaging/win32/languages/SimpChinese.nsh b/packaging/win32/languages/SimpChinese.nsh
index 331d5e28e..aab693312 100644
--- a/packaging/win32/languages/SimpChinese.nsh
+++ b/packaging/win32/languages/SimpChinese.nsh
@@ -61,7 +61,8 @@ ${LangFileString} lng_eo "?À½???"
 ${LangFileString} lng_es "????????"

 ${LangFileString} lng_es_MX "????????(Ä«????)"

 ${LangFileString} lng_et "??ɳ??????"

-${LangFileString} lng_eu "??˹????"

+${LangFileString} lng_eu "??˹????"
+${LangFileString} lng_fa "Farsi"

 ${LangFileString} lng_fi "??À¼??"

 ${LangFileString} lng_fr "????"

 ${LangFileString} lng_ga "????À¼??"

diff --git a/packaging/win32/languages/Slovak.nsh b/packaging/win32/languages/Slovak.nsh
index b06017501..058144d5e 100644
--- a/packaging/win32/languages/Slovak.nsh
+++ b/packaging/win32/languages/Slovak.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "španielèina"
 ${LangFileString} lng_es_MX "španielèina (Mexiko)"
 ${LangFileString} lng_et "estónèina"
 ${LangFileString} lng_eu "baskiètina"
+${LangFileString} lng_fa "farsi"
 ${LangFileString} lng_fi "fínèina"
 ${LangFileString} lng_fr "francúzština"
 ${LangFileString} lng_ga "írèina"
diff --git a/packaging/win32/languages/Slovenian.nsh b/packaging/win32/languages/Slovenian.nsh
index b50fd6256..ae534c1b6 100644
--- a/packaging/win32/languages/Slovenian.nsh
+++ b/packaging/win32/languages/Slovenian.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "španski"
 ${LangFileString} lng_es_MX "mehiško španski"
 ${LangFileString} lng_et "estonski"
 ${LangFileString} lng_eu "baskovski"
+${LangFileString} lng_fa "farsi"
 ${LangFileString} lng_fi "finski"
 ${LangFileString} lng_fr "francoski"
 ${LangFileString} lng_ga "irski"
diff --git a/packaging/win32/languages/Spanish.nsh b/packaging/win32/languages/Spanish.nsh
index bba418357..3df868fa9 100644
--- a/packaging/win32/languages/Spanish.nsh
+++ b/packaging/win32/languages/Spanish.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Español"
 ${LangFileString} lng_es_MX "Español mexicano"
 ${LangFileString} lng_et "Estonio"
 ${LangFileString} lng_eu "Euskera"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finés"
 ${LangFileString} lng_fr "Francés"
 ${LangFileString} lng_ga "Irlandés"
diff --git a/packaging/win32/languages/TradChinese.nsh b/packaging/win32/languages/TradChinese.nsh
index 61771464c..d9915c17a 100644
--- a/packaging/win32/languages/TradChinese.nsh
+++ b/packaging/win32/languages/TradChinese.nsh
@@ -61,7 +61,8 @@ ${LangFileString} lng_eo "¥@¬É»y"
 ${LangFileString} lng_es "¦è¯Z¤ú¤å"

 ${LangFileString} lng_es_MX "¦è¯Z¤ú»y(¾¥¦è­ô)"

 ${LangFileString} lng_et "·R¨F¥§¨È»y"

-${LangFileString} lng_eu "¤Ú´µ§J»y"

+${LangFileString} lng_eu "¤Ú´µ§J»y"
+${LangFileString} lng_fa "Farsi"

 ${LangFileString} lng_fi "ªâÄõ»y"

 ${LangFileString} lng_fr "ªk¤å"

 ${LangFileString} lng_ga "·Rº¸Äõ»y"

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index c4aa328b3..2e4a72f66 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1076,7 +1076,7 @@ void InkscapePreferences::initPageUI()
                                  _("Chinese/Taiwan (zh_TW)"), _("Croatian (hr)"), _("Czech (cs)"),
         _("Danish (da)"), _("Dutch (nl)"), _("Dzongkha (dz)"), _("German (de)"), _("Greek (el)"), _("English (en)"), _("English/Australia (en_AU)"),
         _("English/Canada (en_CA)"), _("English/Great Britain (en_GB)"), _("Pig Latin (en_US@piglatin)"),
-        _("Esperanto (eo)"), _("Estonian (et)"), _("Finnish (fi)"),
+        _("Esperanto (eo)"), _("Estonian (et)"), _("Farsi (fa)"), _("Finnish (fi)"),
         _("French (fr)"), _("Irish (ga)"), _("Galician (gl)"), _("Hebrew (he)"), _("Hungarian (hu)"),
         _("Indonesian (id)"), _("Italian (it)"), _("Japanese (ja)"), _("Khmer (km)"), _("Kinyarwanda (rw)"), _("Korean (ko)"), _("Lithuanian (lt)"), _("Macedonian (mk)"),
         _("Mongolian (mn)"), _("Nepali (ne)"), _("Norwegian Bokmål (nb)"), _("Norwegian Nynorsk (nn)"), _("Panjabi (pa)"),
@@ -1084,7 +1084,7 @@ void InkscapePreferences::initPageUI()
         _("Serbian (sr)"), _("Serbian in Latin script (sr@latin)"), _("Slovak (sk)"), _("Slovenian (sl)"),  _("Spanish (es)"), _("Spanish/Mexico (es_MX)"),
         _("Swedish (sv)"), _("Thai (th)"), _("Turkish (tr)"), _("Ukrainian (uk)"), _("Vietnamese (vi)")};
     Glib::ustring langValues[] = {"", "sq", "am", "ar", "hy", "az", "eu", "be", "bg", "bn", "br", "ca", "ca@valencia", "zh_CN", "zh_TW", "hr", "cs", "da", "nl",
-        "dz", "de", "el", "en", "en_AU", "en_CA", "en_GB", "en_US@piglatin", "eo", "et", "fi", "fr", "ga",
+        "dz", "de", "el", "en", "en_AU", "en_CA", "en_GB", "en_US@piglatin", "eo", "et", "fa", "fi", "fr", "ga",
         "gl", "he", "hu", "id", "it", "ja", "km", "rw", "ko", "lt", "mk", "mn", "ne", "nb", "nn", "pa",
         "pl", "pt", "pt_BR", "ro", "ru", "sr", "sr@latin", "sk", "sl", "es", "es_MX", "sv", "th", "tr", "uk", "vi" };