GNOME.org
 

ooo-build r11239 - in trunk: . patches/src680

Author: jannieuw
Date: Thu Jan 10 14:18:51 2008
New Revision: 11239
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11239&view=rev

Log:
2008-01-10  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/src680/layout-dialogs-layout.diff: Add manually
	translated de/zoom.xml and de/wordcount.xml files, realizing
	that German is probably a better demo.
	
	* patches/src680/layout-dialogs-config_office-scp2.diff: Install
	the translated xml files.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/layout-dialogs-layout.diff
   trunk/patches/src680/layout-dialogs-svx-sw.diff

Modified: trunk/patches/src680/layout-dialogs-layout.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-layout.diff	(original)
+++ trunk/patches/src680/layout-dialogs-layout.diff	Thu Jan 10 14:18:51 2008
@@ -1881,10 +1881,10 @@
 +ly	layout\util	      nmake	-	all	ly_util ly_api ly_awt ly_core ly_wrap NULL
 diff --git a/layout/prj/d.lst b/layout/prj/d.lst
 new file mode 100644
-index 0000000..7a54403
+index 0000000..a9de8aa
 --- /dev/null
 +++ layout/prj/d.lst
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,23 @@
 +mkdir: %_DEST%\inc%_EXT%\layout
 +mkdir: %_DEST%\inc%_EXT%\com
 +mkdir: %_DEST%\inc%_EXT%\com\sun
@@ -1897,7 +1897,10 @@
 +..\%__SRC%\lib\layout.lib %_DEST%\lib%_EXT%\layout.lib
 +..\%__SRC%\bin\layout*.dll %_DEST%\bin%_EXT%\layout*.dll
 +..\%__SRC%\misc\layout*.map %_DEST%\bin%_EXT%\layout*.map
++
 +..\%__SRC%\lib\*.xml %_DEST%\lib%_EXT%\*.xml
++mkdir: %_DEST%\lib%_EXT%\de
++..\%__SRC%\lib\de\*.xml %_DEST%\lib%_EXT%\de\*.xml
 +mkdir: %_DEST%\lib%_EXT%\nl
 +..\%__SRC%\lib\nl\*.xml %_DEST%\lib%_EXT%\nl\*.xml
 +
@@ -15292,6 +15295,102 @@
 +	        </hbox>
 +	</vbox>
 +</dialog>
+diff --git a/layout/workben/de/wordcount.xml b/layout/workben/de/wordcount.xml
+new file mode 100644
+index 0000000..ed49600
+--- /dev/null
++++ layout/workben/de/wordcount.xml
+@@ -0,0 +1,47 @@
++<?xml version="1.0" encoding="UTF-8"?>
++
++<modaldialog xmlns="http://openoffice.org/2007/layout";
++             xmlns:cnt="http://openoffice.org/2007/layout/container";
++             help-id="HID_DLG_WORDCOUNT"
++             id="dialog"
++             sizeable="true" moveable="true" optimumsize="true"
++             has_border="true" sv-look="true" title="Wortanzahl">
++    <vbox border="5" spacing="5">
++        <fixedline id="FL_CURRENT" text="Aktuelle Auswahl"/>
++	<hbox>
++	    <vbox cnt:padding="13" spacing="5">
++		<hbox>
++		    <fixedtext id="FT_CURRENTWORD" label="WÃrter:"/>
++		    <flow cnt:padding="60"/>
++		    <fixedtext id="FI_CURRENTWORD" right="true" label="0"/>
++		</hbox>
++		<hbox>
++		    <fixedtext id="FT_CURRENTCHARACTER" label="Zeichen:"/>
++		    <flow cnt:padding="60"/>
++		    <fixedtext id="FI_CURRENTCHARACTER" right="true" label="00"/>
++		</hbox>
++	    </vbox>
++	</hbox>
++	<!-- if we could do cnt:cnt:padding="-13" here, we would not have to close
++	     and reope the hbox/vbox thing !-->
++        <fixedline id="FL_DOC" text="Gesamtes Dokument"/>
++	<hbox>
++	    <vbox cnt:padding="13" spacing="5">
++		<hbox>
++		    <fixedtext id="FT_DOCWORD" label="WÃrter:"/>
++		    <fixedtext id="FI_DOCWORD" right="true" label="000"/>
++		</hbox>
++		<hbox>
++		    <fixedtext id="FT_DOCCHARACTER" label="Zeichen:"/>
++		    <fixedtext id="FI_DOCCHARACTER" right="true" label="0000"/>
++		</hbox>
++	    </vbox>
++	</hbox>
++        <fixedline cnt:padding="1" id="FL_BOTTOM"/>
++	<dialogbuttonhbox spacing="5">
++            <flow/>
++            <okbutton id="PB_OK"/>
++            <helpbutton id="PB_HELP"/>
++        </dialogbuttonhbox>
++    </vbox>
++</modaldialog>
+diff --git a/layout/workben/de/zoom.xml b/layout/workben/de/zoom.xml
+new file mode 100644
+index 0000000..04e6424
+--- /dev/null
++++ layout/workben/de/zoom.xml
+@@ -0,0 +1,37 @@
++<?xml version="1.0" encoding="UTF-8"?>
++
++<modaldialog xmlns="http://openoffice.org/2007/layout";
++             xmlns:cnt="http://openoffice.org/2007/layout/container";
++             id="dialog" title="MaÃstab" optimumsize="true"
++	     help-id="SID_ATTR_ZOOM"
++             has_border="true" sizeable="true" moveable="true">
++    <vbox spacing="5" border="5">
++	<fixedline id="FL_ZOOM" text="Zoomfaktor" cnt:expand="true"/>
++	<radiobutton radiogroup="zoom" id="BTN_WHOLE_PAGE" label="Ganze Seite"/>
++	<radiobutton radiogroup="zoom" id="BTN_PAGE_WIDTH" label="Seiten~breite Width"/>
++	<radiobutton radiogroup="zoom" id="BTN_OPTIMAL"   label="Optimal"/>
++	<radiobutton radiogroup="zoom" id="BTN_200"   label="200 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_150"   label="15~0 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_100"   label="100 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_75"    label="75 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_50"    label="50 %"/>
++	<hbox cnt:expand="false" cnt:fill="true">
++	    <align cnt:expand="false" cnt:fill="true">
++		<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" label="Stufenlos"/>
++	    </align>
++	    <flow cnt:padding="10" cnt:expand="false"/>
++	    <metricfield id="ED_USER" value-step="1"
++			 repeat="true" has_border="true" spin="true"
++			 text="100%" unit="13" custom-unit-text="%"
++			 right="true"
++			 cnt:expand="false"/>
++	</hbox>
++        <fixedline cnt:padding="1" id="FL_BOTTOM"/>
++	<dialogbuttonhbox border="5" spacing="5">
++	    <flow/>
++	    <okbutton     id="BTN_ZOOM_OK"/>
++	    <cancelbutton id="BTN_ZOOM_CANCEL"/>
++	    <helpbutton   id="BTN_ZOOM_HELP"/>
++	</dialogbuttonhbox>
++    </vbox>
++</modaldialog>
 diff --git a/layout/workben/dialogbuttons-ok.xml b/layout/workben/dialogbuttons-ok.xml
 new file mode 100644
 index 0000000..5b6e123
@@ -17719,10 +17818,10 @@
 +</dialog>
 diff --git a/layout/workben/makefile.mk b/layout/workben/makefile.mk
 new file mode 100644
-index 0000000..328f9c0
+index 0000000..e892fa2
 --- /dev/null
 +++ layout/workben/makefile.mk
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,74 @@
 +PRJ=..
 +PRJNAME=layout
 +TARGET=test
@@ -17779,6 +17878,8 @@
 +ALLTAR: \
 +    $(DLLDEST)$/wordcount.xml\
 +    $(DLLDEST)$/zoom.xml\
++    $(DLLDEST)$/de/wordcount.xml\
++    $(DLLDEST)$/de/zoom.xml\
 +    $(DLLDEST)$/nl/wordcount.xml\
 +    $(DLLDEST)$/nl/zoom.xml
 +
@@ -17786,11 +17887,6 @@
 +# modes, INSTALL?
 +	-$(MKDIR) $(@:d)
 +	$(COPY) $< $@
-+
-+$(DLLDEST)$/nl/%.xml: nl/%.xml
-+# modes, INSTALL?
-+	-$(MKDIR) $(@:d)
-+	$(COPY) $< $@
 +.ENDIF # ENABLE_LAYOUT == TRUE
 +
 +dist .PHONY :
@@ -17855,7 +17951,7 @@
 +</modaldialog>
 diff --git a/layout/workben/nl/zoom.xml b/layout/workben/nl/zoom.xml
 new file mode 100644
-index 0000000..774a4ab
+index 0000000..9f65898
 --- /dev/null
 +++ layout/workben/nl/zoom.xml
 @@ -0,0 +1,37 @@
@@ -17869,16 +17965,16 @@
 +    <vbox spacing="5" border="5">
 +	<fixedline id="FL_ZOOM" text="Zoomfactor" cnt:expand="true"/>
 +	<radiobutton radiogroup="zoom" id="BTN_WHOLE_PAGE" label="H~ele pagina"/>
-+	<radiobutton radiogroup="zoom" id="BTN_PAGE_WIDTH" label="~Paginabreedte"/>
-+	<radiobutton radiogroup="zoom" id="BTN_OPTIMAL"   label="~Optimaal"/>
-+	<radiobutton radiogroup="zoom" id="BTN_200"   label="~200 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_PAGE_WIDTH" label="Paginabreedte"/>
++	<radiobutton radiogroup="zoom" id="BTN_OPTIMAL"   label="Optimaal"/>
++	<radiobutton radiogroup="zoom" id="BTN_200"   label="200 %"/>
 +	<radiobutton radiogroup="zoom" id="BTN_150"   label="15~0 %"/>
-+	<radiobutton radiogroup="zoom" id="BTN_100"   label="~100 %"/>
-+	<radiobutton radiogroup="zoom" id="BTN_75"    label="~75 %"/>
-+	<radiobutton radiogroup="zoom" id="BTN_50"    label="~50 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_100"   label="100 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_75"    label="75 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_50"    label="50 %"/>
 +	<hbox cnt:expand="false" cnt:fill="true">
 +	    <align cnt:expand="false" cnt:fill="true">
-+		<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" label="~Variabel"/>
++		<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" label="Variabel"/>
 +	    </align>
 +	    <flow cnt:padding="10" cnt:expand="false"/>
 +	    <metricfield id="ED_USER" value-step="1"
@@ -23606,7 +23702,7 @@
 +
 diff --git a/layout/workben/zoom.xml b/layout/workben/zoom.xml
 new file mode 100644
-index 0000000..e2c0ead
+index 0000000..1cd3157
 --- /dev/null
 +++ layout/workben/zoom.xml
 @@ -0,0 +1,37 @@
@@ -23622,14 +23718,14 @@
 +	<radiobutton radiogroup="zoom" id="BTN_WHOLE_PAGE" label="Whole Page"/>
 +	<radiobutton radiogroup="zoom" id="BTN_PAGE_WIDTH" label="Page Width"/>
 +	<radiobutton radiogroup="zoom" id="BTN_OPTIMAL"   label="Optimal"/>
-+	<radiobutton radiogroup="zoom" id="BTN_200"   label="~200 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_200"   label="200 %"/>
 +	<radiobutton radiogroup="zoom" id="BTN_150"   label="15~0 %"/>
-+	<radiobutton radiogroup="zoom" id="BTN_100"   label="~100 %"/>
-+	<radiobutton radiogroup="zoom" id="BTN_75"    label="~75 %"/>
-+	<radiobutton radiogroup="zoom" id="BTN_50"    label="~50 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_100"   label="100 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_75"    label="75 %"/>
++	<radiobutton radiogroup="zoom" id="BTN_50"    label="50 %"/>
 +	<hbox cnt:expand="false" cnt:fill="true">
 +	    <align cnt:expand="false" cnt:fill="true">
-+		<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" label="~Variable"/>
++		<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom" id="BTN_USER" label="Variable"/>
 +	    </align>
 +	    <flow cnt:padding="10" cnt:expand="false"/>
 +	    <metricfield id="ED_USER" value-step="1"

Modified: trunk/patches/src680/layout-dialogs-svx-sw.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-svx-sw.diff	(original)
+++ trunk/patches/src680/layout-dialogs-svx-sw.diff	Thu Jan 10 14:18:51 2008
@@ -24,7 +24,7 @@
  
  SRS1NAME=dialogs
 diff --git a/svx/source/dialog/zoom.cxx b/svx/source/dialog/zoom.cxx
-index 6809030..66bd0b8 100644
+index e2410eb..66bd0b8 100644
 --- svx/source/dialog/zoom.cxx
 +++ svx/source/dialog/zoom.cxx
 @@ -61,7 +61,9 @@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]