Author: mseidel
Date: Mon Jun 17 14:32:34 2019
New Revision: 1861514
URL: http://svn.apache.org/viewvc?rev=1861514&view=rev
Log:
Merge r1861483 and r1861512 from trunk
Add new language Amharic (am)
Additions for new language Amharic (am)
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/scp2/source/ooo/module_langpack.ulf
openoffice/branches/AOO42X/main/setup_native/source/win32/msi-encodinglist.txt
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 17 14:32:34 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512
Modified: openoffice/branches/AOO42X/main/scp2/source/ooo/module_langpack.ulf
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/scp2/source/ooo/module_langpack.ulf?rev=1861514&r1=1861513&r2=1861514&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/scp2/source/ooo/module_langpack.ulf
(original)
+++ openoffice/branches/AOO42X/main/scp2/source/ooo/module_langpack.ulf Mon Jun
17 14:32:34 2019
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
+
[STR_NAME_MODULE_ROOT_LANGPACK]
en-US = "Additional language packs"
@@ -723,6 +723,12 @@ en-US = "Oromo"
[STR_DESC_MODULE_LANGPACK_OM]
en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_NAME_MODULE_LANGPACK_AM]
+en-US = "Amharic"
+
+[STR_DESC_MODULE_LANGPACK_AM]
+en-US = "Installs Amharic support in %PRODUCTNAME %PRODUCTVERSION"
+
[STR_NAME_MODULE_LANGPACK_AST]
en-US = "Asturian"
Modified:
openoffice/branches/AOO42X/main/setup_native/source/win32/msi-encodinglist.txt
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/setup_native/source/win32/msi-encodinglist.txt?rev=1861514&r1=1861513&r2=1861514&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/setup_native/source/win32/msi-encodinglist.txt
(original)
+++
openoffice/branches/AOO42X/main/setup_native/source/win32/msi-encodinglist.txt
Mon Jun 17 14:32:34 2019
@@ -1,5 +1,5 @@
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,20 +7,24 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
+
+
+
# Syntax: language ANSI-Codepage LCID
# comment lines begin with hash
af 1252 1078 # Afrikaans
+am 0 1118 # Amharic
ar 1256 1025
ar-SA 1256 1025
as 0 1101 # Assamese
@@ -31,26 +35,26 @@ bg 1251 1026 # Bulgarian
bn 0 2117 # Bengali
bn-BD 0 2117 # Bengali Bangladesh
bn-IN 0 1093 # Bengali India
-bo 0 2121
+bo 0 2121
br 1252 1150 # Breton
brx 0 1603 # Bodo (India)
-bs 0 5146 # bosnian
+bs 0 5146 # Bosnian
ca 1252 1027 # Catalan
-ca-XR 1252 32772 # Catalan Valencian RACV
-ca-XV 1252 32771 # Catalan Valencian AVL
+ca-XR 1252 32772 # Catalan Valencian RACV
+ca-XV 1252 32771 # Catalan Valencian AVL
cs 1250 1029 # Czech
cy 1252 1106 # Welsh
-da 1252 1030
-de 1252 1031
+da 1252 1030 # Danish
+de 1252 1031 # German
dgo 0 1604 # Dogri (India)
-dz 0 2129 # Dzongkha (same ID as tibetan bhutan (s. i40713))
+dz 0 2129 # Dzongkha (same ID as tibetan bhutan (see i40713))
el 1253 1032
en-GB 1252 2057
en-US 1252 1033
en-ZA 1252 7177
eo 0 1553 # Esperanto
es 1252 1034
-et 1257 1061
+et 1257 1061 # Estonian
eu 1252 1069 # Basque
fa 0 1065 # Farsi
fi 1252 1035
@@ -71,7 +75,7 @@ hu 1250 1038
hy 0 1067 # Armenian
id 1252 1057 # Indonesian
is 1252 1039 # Icelandic
-it 1252 1040
+it 1252 1040 # Italian
ja 932 1041
jbo 0 1624
ka 0 1079 # Georgian
@@ -81,7 +85,7 @@ kk 0 1087
km 0 1107 # Khmer
kn 0 1099 # Kannada
kn-IN 0 1099 # Kannada
-ko 949 1042
+ko 949 1042 # Korean
kok 0 1111 # Konkani
ks 0 1120 # Kashmiri
ku 0 1574
@@ -114,7 +118,7 @@ om 0 2162
or 0 1096 # Oriya
or-IN 0 1096
pa-IN 0 1094 # Punjabi
-pap 0 2171
+pap 0 2171
pl 1250 1045
ps 0 2171
pt 1252 2070
@@ -138,10 +142,10 @@ sr 1251 3098 # Serbian Cyrillic
sr-SP 1251 3098 # Serbian Cyrillic
ss 0 1579 # Swazi
st 0 1072 # Southern Sotho, Sutu
-sv 1252 1053
+sv 1252 1053 # Swedish
sw 1252 1089 # Swahili
sw-TZ 1252 1089 # Swahili
-so 0 1143
+so 0 1143
ta 0 1097 # Tamil
ta-IN 0 1097 # Tamil
te 0 1098
