[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst officecfg/registry

Ariel Constenla-Haile arielch at apache.org
Fri Jun 14 23:07:13 PDT 2013


 external_deps.lst                                        |    6 -
 officecfg/registry/data/org/openoffice/Office/Common.xcu |   58 +++++++++++++++
 officecfg/registry/data/org/openoffice/Office/Writer.xcu |    6 +
 3 files changed, 65 insertions(+), 5 deletions(-)

New commits:
commit 10a7481b927d3a9940eeeff4f3ea09f2506d36de
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Sat Jun 15 04:15:20 2013 +0000

    i122518 - Partial revert of revision 1465678

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index dcfee1d..db9480b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -32,10 +32,68 @@
     </node>
     <node oor:name="Localisation">
       <prop oor:name="AutoMnemonic">
+        <value xml:lang="x-no-translate">true</value>
+        <value xml:lang="ar">false</value>
+        <value xml:lang="ca">true</value>
+        <value xml:lang="cs">true</value>
+        <value xml:lang="da">true</value>
+        <value xml:lang="de">true</value>
+        <value xml:lang="el">true</value>
         <value xml:lang="en-US">true</value>
+        <value xml:lang="es">true</value>
+        <value xml:lang="et">true</value>
+        <value xml:lang="fi">true</value>
+        <value xml:lang="fr">true</value>
+        <value xml:lang="he">true</value>
+        <value xml:lang="hi-IN">true</value>
+        <value xml:lang="hu">true</value>
+        <value xml:lang="it">true</value>
+        <value xml:lang="ja">true</value>
+        <value xml:lang="ko">true</value>
+        <value xml:lang="nl">true</value>
+        <value xml:lang="pl">true</value>
+        <value xml:lang="pt">true</value>
+        <value xml:lang="pt-BR">true</value>
+        <value xml:lang="ru">true</value>
+        <value xml:lang="sk">true</value>
+        <value xml:lang="sl">true</value>
+        <value xml:lang="sv">true</value>
+        <value xml:lang="th">true</value>
+        <value xml:lang="tr">true</value>
+        <value xml:lang="zh-CN">true</value>
+        <value xml:lang="zh-TW">true</value>
       </prop>
       <prop oor:name="DialogScale">
+        <value xml:lang="x-no-translate">10</value>
+        <value xml:lang="ca">10</value>
+        <value xml:lang="cs">10</value>
+        <value xml:lang="da">10</value>
+        <value xml:lang="de">0</value>
+        <value xml:lang="el">10</value>
         <value xml:lang="en-US">10</value>
+        <value xml:lang="es">10</value>
+        <value xml:lang="et">10</value>
+        <value xml:lang="fi">10</value>
+        <value xml:lang="fr">10</value>
+        <value xml:lang="he">10</value>
+        <value xml:lang="hi-IN">10</value>
+        <value xml:lang="hu">10</value>
+        <value xml:lang="it">10</value>
+        <value xml:lang="nl">10</value>
+        <value xml:lang="pl">13</value>
+        <value xml:lang="pt">10</value>
+        <value xml:lang="pt-BR">10</value>
+        <value xml:lang="sk">10</value>
+        <value xml:lang="sl">10</value>
+        <value xml:lang="sv">10</value>
+        <value xml:lang="th">10</value>
+        <value xml:lang="ar">13</value>
+        <value xml:lang="ja">13</value>
+        <value xml:lang="ko">13</value>
+        <value xml:lang="ru">13</value>
+        <value xml:lang="tr">13</value>
+        <value xml:lang="zh-CN">13</value>
+        <value xml:lang="zh-TW">13</value>
     </prop>
     </node>
     <node oor:name="FontAntiAliasing" install:module="gconflockdown">
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index 992b135..429f571 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -50,7 +50,8 @@
   <node oor:name="Insert">
     <node oor:name="Caption">
       <prop oor:name="CaptionOrderNumberingFirst">
-         <value xml:lang="en-US">true</value>
+         <value xml:lang="x-no-translate"/>
+         <value xml:lang="hu">true</value>
       </prop>
       <node oor:name="WriterObject">
         <node oor:name="Table">
@@ -701,7 +702,8 @@
  <node oor:name="Layout" >
   <node oor:name="Other" >
     <prop oor:name="TabStop">
-     <value xml:lang="en-US">740</value>
+        <value xml:lang="x-no-translate">1250</value>
+        <value xml:lang="zh-CN">740</value>
     </prop>
   </node>
  </node>
commit a8d5cd07fabbf7a30b79b93eeee78b0ea042e652
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Sat Jun 15 04:15:06 2013 +0000

    i121823 - Update serf to new version 1.2.1

diff --git a/external_deps.lst b/external_deps.lst
index 5e02b96..3c14624 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -126,9 +126,9 @@ if ( true )
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
-    SHA1 = 30b29bd9214d50887abcc20cf82096aaaf5d1d61
-    name = serf-1.2.0.tar.bz2
-    URL1 = http://serf.googlecode.com/files/serf-1.2.0.tar.bz2
+    SHA1 = f65fbbd72926c8e7cf0dbd4ada03b0d226f461fd
+    name = serf-1.2.1.tar.bz2
+    URL1 = http://serf.googlecode.com/files/serf-1.2.1.tar.bz2
     URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
 
 if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))


More information about the Libreoffice-commits mailing list