[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source setup_native/source

[Matthias Seidel (via logerrit)]

 scp2/source/ooo/module_langpack.ulf|   16 +++---
 setup_native/source/win32/msi-encodinglist.txt |   37 +
 2 files changed, 31 insertions(+), 22 deletions(-)

New commits:
commit 671db054c3cecb2a109f69d205d45095a94a170c
Author: Matthias Seidel 
AuthorDate: Mon Jun 17 14:28:09 2019 +
Commit: Matthias Seidel 
CommitDate: Mon Jun 17 14:28:09 2019 +

Additions for new language Amharic (am)

diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index 9750f81f6423..ab7e4bc1e959 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -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"
 
diff --git a/setup_native/source/win32/msi-encodinglist.txt 
b/setup_native/source/win32/msi-encodinglist.txt
index 60246050e99e..687a133d76cc 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -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,17 +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.
-#  
+#
 # *
+
+
+
 # Syntax: language ANSI-Codepage LCID
 # comment lines begin with hash
 af1252  1078   # Afrikaans
@@ -32,26 +35,26 @@ bg1251  1026   # Bulgarian
 bn   0  2117   # Bengali
 bn-BD0  2117   # Bengali Bangladesh
 bn-IN0  1093   # Bengali India
-bo   0  2121   
+bo   0  2121
 br1252  1150   # Breton
 brx  0  1603   # Bodo (India)
-bs   0  5146   # bosnian
+bs   0  5146   # Bosnian
 ca1252  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
 cs1250  1029   # Czech
 cy1252  1106   # Welsh
-da1252  1030
-de1252  1031
+da1252  1030   # Danish
+de1252  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))
 el1253  1032
 en-GB 1252  2057
 en-US 1252  1033
 en-ZA 1252  7177
 eo   0  1553   # Esperanto
 es1252  1034
-et1257  1061
+et1257  1061   # Estonian
 eu1252  1069   # Basque
 fa   0  1065   # Farsi
 fi1252  1035
@@ -72,7 +75,7 @@ hu1250  1038
 hy   0  1067   # Armenian
 id1252  1057   # Indonesian
 is1252  1039   # Icelandic
-it1252  1040
+it1252  1040   # Italian
 ja 932  1041
 jbo  0  1624
 ka   0  1079   # Georgian
@@ -82,7 +85,7 @@ kk   0  1087
 km   0  1107   # Khmer
 kn   0  1099   # Kannada
 kn-IN0  1099   # Kannada
-ko 949  1042
+ko 949  1042   # Korean
 kok  0     # Konkani
 ks   0  1120   # Kashmiri
 ku   0  1574
@@ -115,7 +118,7 @@ om   0  2162
 or   0  1096 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source

[Jim Jagielski (via logerrit)]

 scp2/source/ooo/module_systemint.scp |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d06353475daf23b5afdaabf6784e0b7c26e8e350
Author: Jim Jagielski 
AuthorDate: Thu Apr 4 11:28:00 2019 +
Commit: Jim Jagielski 
CommitDate: Thu Apr 4 11:28:00 2019 +

Merge r1856914 from trunk:

Reviewed by: jim

diff --git a/scp2/source/ooo/module_systemint.scp 
b/scp2/source/ooo/module_systemint.scp
index 684febdea109..dcb87b7130f3 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -36,7 +36,14 @@ Module gid_Module_Optional_Systemintegration
   #else
 Styles = 
(SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
   #endif
-  #if (defined(LINUX)) || (defined(SOLARIS))
+/*
+ * Hardcode name as 'openoffice' to handle Beta and Dev builds which
+ * would result in openoffice_beta, for example.
+ * See sysui/desktop/productversion.mk
+ */
+  #if (defined(LINUX))
+PackageName = "openoffice-desktop-integration.tar.gz";
+  #elif (defined(SOLARIS))
 PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
   #else
 PackageName = "";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source

[Libreoffice Gerrit user]

 scp2/source/xsltfilter/module_xsltfilter.ulf |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1824b144d6aa3f2d7caec7b640e84f421a50910b
Author: Matthias Seidel 
AuthorDate: Mon Sep 10 15:22:48 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Sep 10 15:22:48 2018 +

i83159 - Added description for XSLT Sample Filters

diff --git a/scp2/source/xsltfilter/module_xsltfilter.ulf 
b/scp2/source/xsltfilter/module_xsltfilter.ulf
index d8458802b28c..d9fc57e963e9 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.ulf
+++ b/scp2/source/xsltfilter/module_xsltfilter.ulf
@@ -23,7 +23,5 @@
 en-US = "XSLT Sample Filters"
 
 [STR_DESC_MODULE_OPTIONAL_XSLTFILTERSAMPLES]
-en-US = "XSLT Sample Filters"
-
-
+en-US = "Filters and Conversions based on OpenDocument/OpenOffice.org XML. 
Includes DocBook, MS Word 2003 XML, MS Excel 2003 XML, and others."
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source

[Libreoffice Gerrit user]

 scp2/source/ooo/module_langpack.ulf |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 74392bd6a04052c13f0f799f04d4892af716096f
Author: Matthias Seidel 
AuthorDate: Mon Jul 23 19:17:43 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Jul 23 19:17:43 2018 +

Adding strings needed for a Kabyle language pack

diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index 70a3974e4b75..9750f81f6423 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -633,6 +633,12 @@ en-US = "Georgian"
 [STR_DESC_MODULE_LANGPACK_KA]
 en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
 
+[STR_NAME_MODULE_LANGPACK_KAB]
+en-US = "Kabyle"
+
+[STR_DESC_MODULE_LANGPACK_KAB]
+en-US = "Installs Kabyle support in %PRODUCTNAME %PRODUCTVERSION"
+
 [STR_NAME_MODULE_LANGPACK_EO]
 en-US = "Esperanto"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source

[Matthias Seidel]

 scp2/source/xsltfilter/module_xsltfilter.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8891cae6d50661068d6ec0da9176e1ff7e68a820
Author: Matthias Seidel 
Date:   Sat May 5 19:08:23 2018 +

#i127770#

Include "XSLT Sample Filter" in default installation on Windows

diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp 
b/scp2/source/xsltfilter/module_xsltfilter.scp
index 5263ed399965..de923564cb96 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -41,6 +41,6 @@ Module gid_Module_Optional_Xsltfiltersamples
 gid_File_Xsl_Export_Xhtml_Table,
 gid_File_Share_Registry_Xsltfilter_Xcd );
 Minimal = NO;
-Default = NO;
+Default = YES;
 Styles = ( );
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source

[Andre Fischer]

 scp2/source/ooo/ure.scp |   71 
 1 file changed, 71 deletions(-)

New commits:
commit 01a71171575c3d616ea0d2d30992a350f22f21af
Author: Andre Fischer a...@apache.org
Date:   Wed Nov 13 08:29:37 2013 +

123531: Removed CompID lines (already commented out).

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 5545ab8..c5f9b9d 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -66,7 +66,6 @@ File gid_File_Exe_Uno
 //Dir = gid_Dir_Ure_Bin;
 Name = EXENAME(uno);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = C66A9E2B-B16D-46A9-B9EC-772D9D3837F5;
 End
 #endif
 
@@ -91,7 +90,6 @@ File gid_File_Exe_Regcomp
 //Dir = gid_Dir_Ure_Bin;
 Name = EXENAME(regcomp);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = D51FA672-7C24-4E24-A282-872C4BF690A1;
 End
 #endif
 
@@ -119,7 +117,6 @@ File gid_File_Exe_Regmerge
 //Dir = gid_Dir_Ure_Bin;
 Name = EXENAME(regmerge);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 881BCC1D-BA4A-4527-9C7D-D89157C2D03B;
 End
 
 File gid_File_Exe_Regview
@@ -132,7 +129,6 @@ File gid_File_Exe_Regview
 //Dir = gid_Dir_Ure_Bin;
 Name = EXENAME(regview);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = DAB09DCD-8491-4DC8-B153-2BA81A830AC2;
 End
 
 #if !defined MACOSX  !defined WNT  defined SOLAR_JAVA  !defined OS2
@@ -142,7 +138,6 @@ File gid_File_Exe_Javaldx
 //Dir = gid_Dir_Ure_Bin;
 Name = EXENAME(javaldx);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 291B5981-3E41-40E2-9C3F-115A7DF1C6A1;
 End
 #endif
 
@@ -159,7 +154,6 @@ File gid_File_Exe_StartupSh
 //Dir = gid_Dir_Ure_Bin;
 Name = /ure/startup.sh;
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = C86E816A-4EAE-47E9-BD1F-3E23C80F4EAE;
 End
 #endif
 
@@ -174,7 +168,6 @@ File gid_File_Exe_UnoBin
 //Dir = gid_Dir_Ure_Bin;
 Name = uno.bin;
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 4AE33B3E-B33E-4BA4-AADC-8D7ED303FDE9;
 End
 #endif
 
@@ -189,7 +182,6 @@ File gid_File_Exe_RegcompBin
 //Dir = gid_Dir_Ure_Bin;
 Name = regcomp.bin;
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 70FBE546-A228-455F-BCBB-716BF03AD5C6;
 End
 #endif
 
@@ -200,7 +192,6 @@ File gid_File_Dl_Cppu
 Dir = SCP2_URE_DL_DIR;
 Name = SCP2_URE_DL_UNO_VER(cppu, 3);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 36C01AC6-BB0A-4181-A8B8-50B793ADEDB7;
 End
 
 File gid_File_Dl_Cppuhelper
@@ -212,7 +203,6 @@ File gid_File_Dl_Cppuhelper
 Name = SCP2_URE_DL_UNO_COMID_VER(cppuhelper, 3);
 #endif
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = D2A191E6-2023-41F5-9032-B98C50C37964;
 End
 
 File gid_File_Dl_PurpEnvHelper
@@ -224,7 +214,6 @@ File gid_File_Dl_PurpEnvHelper
 Name = SCP2_URE_DL_UNO_COMID_VER(purpenvhelper, 3);
 #endif
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = C80146A8-A14C-44D1-AB9F-D9D8BF22277E;
 End
 
 File gid_File_Dl_Sal
@@ -232,7 +221,6 @@ File gid_File_Dl_Sal
 Dir = SCP2_URE_DL_DIR;
 Name = SCP2_URE_DL_UNO_VER(sal, 3);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = B1EF3AB6-611E-4027-958A-736583EB82E6;
 End
 
 File gid_File_Dl_Salhelper
@@ -244,25 +232,15 @@ File gid_File_Dl_Salhelper
 Name = SCP2_URE_DL_UNO_COMID_VER(salhelper, 3);
 #endif
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 879B80E0-F6E1-4931-8EE6-7CF867CB6AA5;
 End
 
 // Private Dynamic Libraries:
 
-//File gid_File_Dl_Profile_Uno
-//TXT_FILE_BODY;
-//Dir = SCP2_URE_DL_DIR;
-//Name = PROFILENAME(/ure/uno);
-//Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-//// CompID = 4681F5C1-8F64-486F-B804-03B4D8CEB41F;
-//End
-
 File gid_File_Dl_Reg
 TXT_FILE_BODY;
 Dir = SCP2_URE_DL_DIR;
 Name = SCP2_URE_DL_VER(reg, 3);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = D5313B1F-D09F-401F-B180-891F70D489ED;
 End
 
 File gid_File_Dl_Store
@@ -270,7 +248,6 @@ File gid_File_Dl_Store
 Dir = SCP2_URE_DL_DIR;
 Name = SCP2_URE_DL_VER(store, 3);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = A5477BD7-89A3-44AF-8B42-9E28D55C8066;
 End
 
 File gid_File_Dl_Xmlreader
@@ -293,7 +270,6 @@ File gid_File_Dl_Jvmaccess
 Name = SCP2_URE_DL_COMID_VER(jvmaccess, 3);
 #endif
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = F3D6F794-DA6F-4522-B3A7-C15593C1A577;
 End
 
 File gid_File_Dl_Jvmfwk
@@ -301,7 +277,6 @@ File gid_File_Dl_Jvmfwk
 Dir = SCP2_URE_DL_DIR;
 Name = SCP2_URE_DL_VER(jvmfwk, 3);
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 4E128F82-FA30-4077-88DC-F745C3330093;
 End
 
 #if defined SOLAR_JAVA
@@ -314,7 +289,6 @@ File gid_File_Dl_Sunjavaplugin
 Name = SCP2_URE_DL_BARE(sunjavaplugin);
 #endif
 Styles = (PACKED,