Farsi support in win32 packages and Inkscape preferences

diff --git a/packaging/win32/languages/Breton.nsh b/packaging/win32/languages/Breton.nsh
index 138d0cac224517c6a747faf5ffdce437020797ee..9dc292f3234de0d593bc6dd2ce8d4b120fb4aef9 100644 (file)
--- 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 410278100f7aec2ec51588caf3032edb7779e575..83eddba3ec68af29aa6aef13d9394c6da140ea02 100644 (file)
--- 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 e991995f50ba82fb788c23b9a3c0197aee7be760..6e200c97a2b0a5ab3d6a4f2e431a524540015d24 100644 (file)
--- a/packaging/win32/languages/Czech.nsh
+++ b/packaging/win32/languages/Czech.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "
 ${LangFileString} lng_es_MX "Mexická \8apanìl\9atina"
 ${LangFileString} lng_et "Eston\9atina"
 ${LangFileString} lng_eu "Basque"
+${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Fin\9atina"
 ${LangFileString} lng_fr "Francouz\9atina"
 ${LangFileString} lng_ga "Ir\9atina"

diff --git a/packaging/win32/languages/English.nsh b/packaging/win32/languages/English.nsh
index a5d2d693b631851f4d303b92851bf0383674ca52..27c406961172920fad20eb89beec5c3326b13900 100644 (file)
--- 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 02bee75b4b5183fada788d378908cd7b41d6fcfa..74969f39f9ee1cfd531db8c3a39cca84483f90e0 100644 (file)
--- 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 449f7a1310d287cd1d570902754cca4230233793..7dbd8d1ce9f5bd603eb75568c42c60beebe33dc6 100644 (file)
--- 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 161383c225f930b2bf96ecfa51f5dd638b7cb795..a77373888aa44aedab928498cb881a2449b0e830 100644 (file)
--- a/packaging/win32/languages/Galician.nsh
+++ b/packaging/win32/languages/Galician.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Espa
 ${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 c424a077667bacfaa69116e3533eee17e59ab0e9..73fdc77f43396d3e42270d9a1604d16519e9c714 100644 (file)
--- 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 883b28a8b9d2db3ea96ae61fbae815977d8665e1..53c2c287cf5524c1ca3ec637f19547e34df3c559 100644 (file)
--- 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 d92ae4554918adbc3176d135f99988bc1dcab30e..b30f0e09a79b8100678c5eccf4c732637b616a2c 100644 (file)
--- a/packaging/win32/languages/Japanese.nsh
+++ b/packaging/win32/languages/Japanese.nsh
@@ -61,7 +61,8 @@ ${LangFileString} lng_eo "
 ${LangFileString} lng_es "\83X\83y\83C\83\93\8cê"\r
 ${LangFileString} lng_es_MX "\83X\83y\83C\83\93\8cê (\83\81\83L\83V\83R)"\r
 ${LangFileString} lng_et "\83G\83X\83g\83j\83A\8cê"\r
-${LangFileString} lng_eu "\83o\83X\83N\8cê"\r
+${LangFileString} lng_eu "\83o\83X\83N\8cê"
+${LangFileString} lng_fa "Farsi"\r
 ${LangFileString} lng_fi "\83t\83B\83\93\83\89\83\93\83h\8cê"\r
 ${LangFileString} lng_fr "\83t\83\89\83\93\83X\8cê"\r
 ${LangFileString} lng_ga "\83A\83C\83\8b\83\89\83\93\83h\8cê"\r

diff --git a/packaging/win32/languages/Polish.nsh b/packaging/win32/languages/Polish.nsh
index d9d7160b4296358c9239ec6b0e7241c1729c97fc..f39a91751ee8de7abd69083410d4fde7adf27780 100644 (file)
--- a/packaging/win32/languages/Polish.nsh
+++ b/packaging/win32/languages/Polish.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Hiszpa
 ${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 5a64cde5a88cb1f098f87c75bf51798d97d79640..f38511643d2b0e075c8fc33a5e54ff21b8d951e0 100644 (file)
--- 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 8b4db9b0be4d9b5a68df47fb464dc4b9bae8a6b2..539218b3358d88d02284e048522097192d323cbf 100644 (file)
--- 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 331d5e28e8cef99d701d46794ae0ed5fab936638..aab693312ad48b95ad317da38eabf29816181d1a 100644 (file)
--- a/packaging/win32/languages/SimpChinese.nsh
+++ b/packaging/win32/languages/SimpChinese.nsh
@@ -61,7 +61,8 @@ ${LangFileString} lng_eo "?
 ${LangFileString} lng_es "????????"\r
 ${LangFileString} lng_es_MX "????????(ī????)"\r
 ${LangFileString} lng_et "??ɳ??????"\r
-${LangFileString} lng_eu "??˹????"\r
+${LangFileString} lng_eu "??˹????"
+${LangFileString} lng_fa "Farsi"\r
 ${LangFileString} lng_fi "??À¼??"\r
 ${LangFileString} lng_fr "????"\r
 ${LangFileString} lng_ga "????À¼??"\r

diff --git a/packaging/win32/languages/Slovak.nsh b/packaging/win32/languages/Slovak.nsh
index b0601750117ba66de297becee704a4b47e241531..058144d5e77a993140a7c9ce1a6e2a2ee8cde200 100644 (file)
--- a/packaging/win32/languages/Slovak.nsh
+++ b/packaging/win32/languages/Slovak.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "
 ${LangFileString} lng_es_MX "\9apanielè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\9atina"
 ${LangFileString} lng_ga "írèina"

diff --git a/packaging/win32/languages/Slovenian.nsh b/packaging/win32/languages/Slovenian.nsh
index b50fd625660afb8c6131aff613ead787d528e807..ae534c1b62c3718a4b7abae48c049a8264e4d849 100644 (file)
--- a/packaging/win32/languages/Slovenian.nsh
+++ b/packaging/win32/languages/Slovenian.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "
 ${LangFileString} lng_es_MX "mehi\9ako \9apanski"
 ${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 bba418357d3627ee846c706d9704f16154c6a3ee..3df868fa9ebe2def8a37bc1342409ec13a1c5285 100644 (file)
--- a/packaging/win32/languages/Spanish.nsh
+++ b/packaging/win32/languages/Spanish.nsh
@@ -62,6 +62,7 @@ ${LangFileString} lng_es "Espa
 ${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 61771464cd2274a43d0c36e783a423ce0a78bb0b..d9915c17a57cc272056bdb33733e3721ea7e1939 100644 (file)
--- a/packaging/win32/languages/TradChinese.nsh
+++ b/packaging/win32/languages/TradChinese.nsh
@@ -61,7 +61,8 @@ ${LangFileString} lng_eo "
 ${LangFileString} lng_es "¦è¯Z¤ú¤å"\r
 ${LangFileString} lng_es_MX "¦è¯Z¤ú»y(¾¥¦è­ô)"\r
 ${LangFileString} lng_et "·R¨F¥§¨È»y"\r
-${LangFileString} lng_eu "¤Ú´µ§J»y"\r
+${LangFileString} lng_eu "¤Ú´µ§J»y"
+${LangFileString} lng_fa "Farsi"\r
 ${LangFileString} lng_fi "ªâÄõ»y"\r
 ${LangFileString} lng_fr "ªk¤å"\r
 ${LangFileString} lng_ga "·Rº¸Äõ»y"\r

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index c4aa328b3ecf845603c67d70da58c709880773da..2e4a72f666e21f80c84724ce9681d4fd1edfbd0b 100644 (file)
--- 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" };