[Libreoffice-commits] .: 7 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 223c547825b4ff03247538ca61dc9e7a7775bd38
Merge: b702533... b922342...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 10:14:00 2011 +0200

    Merge commit 'libreoffice-3.4.2.3'

commit b92234229a4f904893175f64f5311a90a433591f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 25 20:28:41 2011 +0200

    Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
commit 828189bd04b6176b1aeff81d7f5834d1f7303299
Author: Andras Timar <atimar at suse.com>
Date:   Sun Jul 24 12:08:26 2011 +0200

    enable l10n of presenter screen
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>

diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
index 0e68614..deba55a 100644
--- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
+++ b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
@@ -38,7 +38,7 @@
       <prop oor:name="Name" oor:type="xs:string">
         <info><desc>Name of the bitmap.  Used to look-up the bitmap in a container.</desc></info>
       </prop>
-      <prop oor:name="Text" oor:type="xs:string">
+      <prop oor:name="Text" oor:type="xs:string" oor:localized="true">
         <info><desc>Text that is displayed together with the icon.</desc></info>
       </prop>
       <prop oor:name="NormalFileName" oor:type="xs:string">
@@ -169,7 +169,7 @@
       <node-ref oor:name="Icon" oor:node-type="BitmapDescriptor">
         <info><desc>The icon to display.</desc></info>
       </node-ref>
-      <prop oor:name="Text" oor:type="xs:string">
+      <prop oor:name="Text" oor:type="xs:string" oor:localized="true">
         <info><desc>The text to display.</desc></info>
       </prop>
       <prop oor:name="Action" oor:type="xs:string">
@@ -212,7 +212,7 @@
       <node-ref oor:name="Icon" oor:node-type="BitmapDescriptor">
         <info><desc>The icon to display.</desc></info>
       </node-ref>
-      <prop oor:name="Text" oor:type="xs:string">
+      <prop oor:name="Text" oor:type="xs:string" oor:localized="true">
         <info><desc>The text to display.</desc></info>
       </prop>
       <prop oor:name="Action" oor:type="xs:string">
@@ -220,10 +220,10 @@
       </prop>
     </group>
     <group oor:name="HelpEntry">
-      <prop oor:name="Left" oor:type="xs:string">
+      <prop oor:name="Left" oor:type="xs:string" oor:localized="true">
         <info><desc>Typically a list of keyboard key names.</desc></info>
       </prop>
-      <prop oor:name="Right" oor:type="xs:string">
+      <prop oor:name="Right" oor:type="xs:string" oor:localized="true">
         <info><desc>Typically a description of the action triggered by pressing the keys on the left.</desc></info>
       </prop>
     </group>
@@ -289,7 +289,7 @@
     </group>
     <group oor:name="PresenterString">
       <info><desc></desc></info>
-      <prop oor:name="String" oor:type="xs:string">
+      <prop oor:name="String" oor:type="xs:string" oor:localized="true">
       </prop>
     </group>
     <group oor:name="ViewDescription">
@@ -301,12 +301,12 @@
       <prop oor:name="StyleName" oor:type="xs:string">
         <info><desc>Name of a view style.</desc></info>
       </prop>
-      <prop oor:name="Title" oor:type="xs:string">
+      <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
         <info><desc>Title displayed for the component.  An empty or missing
             title means that no title is displayed.</desc></info>
         <value></value>
       </prop>
-      <prop oor:name="AccessibleTitle" oor:type="xs:string">
+      <prop oor:name="AccessibleTitle" oor:type="xs:string" oor:localized="true">
         <info><desc>Title displayed for the component when accessibility support is active.
             An empty or missing title means that no title is displayed.</desc></info>
         <value></value>
commit 44824af56d7438c601a6feaaf0e6905a2648ce58
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 19 17:07:57 2011 +0200

    Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
commit efb5c7ce72b2f243b83fb74c5489e4c23543c121
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 16:41:08 2011 +0200

    Branch libreoffice-3-4-2
    
    This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.4.x release,
    please use the 'libreoffice-3-4' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit 4aa00d23bb684e833086ea6bd1180b036a1062f4
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 15:49:39 2011 +0200

    Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
commit b6a4b4bc6ce10c771d4bf0ce332976b60544e03a
Author: Andras Timar <atimar at suse.com>
Date:   Sun Jul 10 20:21:07 2011 +0200

    hotfix to include localizations of Presenter screen extension
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 3c93866..1a3c052 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -370,6 +370,13 @@ $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
     @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
     $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
 
+ALLTAR: $(MISC)/../bin/presenter-screen.oxt
+# hotfix to missing localizations
+.IF "$(WITH_LANG)"!=""
+    $(COPY) $(ZIP1DIR)_in/merge/org/openoffice/Office/extension/PresenterScreen.xcu $(ZIP1DIR)/registry/data/org/openoffice/Office/extension/
+    cd $(ZIP1DIR);zip -r -u ../../bin/presenter-screen.oxt registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
+.ENDIF
+
 .ELSE
 ivo:
     $(ECHO)