summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2012-09-09 20:47:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-05-23 15:19:11 +0100
commit59cc160f34c214ce1e6474e67ecc566a7faf6864 (patch)
treed387843fbad03a9f049ec14e0c8d081504a16e49
parentd586255881ec8e149c099c603249050dcb81ab28 (diff)
Resolves: #i120858# Change "Farsi" with "Persian"
Changes done on UI code and IDL, not in comments (cherry picked from commit fa88b1f1e227ad7530f6595d802a6ed1f5d54cb4) Conflicts: scp2/source/ooo/module_langpack.ulf wizards/com/sun/star/wizards/letter/LocaleCodes.java Change-Id: I9f66f697789965af79c1ea6db08c8e43f099ddf8
-rw-r--r--offapi/com/sun/star/linguistic2/XLanguageGuessing.idl2
-rw-r--r--scp2/source/ooo/module_helppack.ulf4
-rw-r--r--scp2/source/ooo/module_langpack.ulf4
-rw-r--r--svtools/source/misc/langtab.src2
4 files changed, 6 insertions, 6 deletions
diff --git a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
index f27d0865db20..6a5a63b67c52 100644
--- a/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
+++ b/offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module linguistic2 {
<li>es : Spanish</li>
<li>et : Estonian</li>
<li>eu : Basque</li>
- <li>fa : Farsi</li>
+ <li>fa : Persian</li>
<li>fi : Finnish</li>
<li>fr : French</li>
<li>fy : Frisian</li>
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
index 011e4429c2da..8f2ec4cbcda1 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -446,10 +446,10 @@ en-US = "Kinyarwanda"
en-US = "Installs Kinyarwanda help in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_HELPPACK_FA]
-en-US = "Farsi"
+en-US = "Persian"
[STR_DESC_MODULE_HELPPACK_FA]
-en-US = "Installs Farsi help in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs Persian help in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_HELPPACK_TT]
en-US = "Tatar"
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 4dd3006a601f..52c7079d1f96 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -452,10 +452,10 @@ en-US = "Kinyarwanda"
en-US = "Installs the Kinyarwanda user interface"
[STR_NAME_MODULE_LANGPACK_FA]
-en-US = "Farsi"
+en-US = "Persian"
[STR_DESC_MODULE_LANGPACK_FA]
-en-US = "Installs the Farsi user interface"
+en-US = "Installs the Persian user interface"
[STR_NAME_MODULE_LANGPACK_TT]
en-US = "Tatar"
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index ba4ffd145923..849a803f7097 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -99,7 +99,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Estonian" ; LANGUAGE_ESTONIAN ; > ;
< "Finnish" ; LANGUAGE_FINNISH ; > ;
< "Faroese" ; LANGUAGE_FAEROESE ; > ;
- < "Farsi" ; LANGUAGE_FARSI ; > ;
+ < "Persian" ; LANGUAGE_FARSI ; > ;
< "French (France)" ; LANGUAGE_FRENCH ; > ;
< "French (Belgium)" ; LANGUAGE_FRENCH_BELGIAN ; > ;
< "French (Canada)" ; LANGUAGE_FRENCH_CANADIAN ; > ;