ooo-build r13943 - in branches/debian-2-4-1: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Sep 18 12:33:15 2008
New Revision: 13943
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13943&view=rev

Log:
merge math-draw-generic-name*diff

Added:
   branches/debian-2-4-1/patches/src680/math-draw-generic-name-localize.diff
   branches/debian-2-4-1/patches/src680/math-draw-generic-name.diff
Modified:
   branches/debian-2-4-1/ChangeLog
   branches/debian-2-4-1/patches/src680/apply

Modified: branches/debian-2-4-1/patches/src680/apply
==============================================================================
--- branches/debian-2-4-1/patches/src680/apply	(original)
+++ branches/debian-2-4-1/patches/src680/apply	Thu Sep 18 12:33:15 2008
@@ -522,6 +522,9 @@
 # fix by Caolan, already in OOo-3.0
 raise-annotation-priority-above-charproperties-i53885.diff, i#53885, pmladek
 
+math-draw-generic-name.diff, i#93909, rengelha
+math-draw-generic-name-localize.diff, i#93909, rengelha
+
 [ Fixes > ooh680-m15 ]
 
 # init all members in svx's line geometry creator

Added: branches/debian-2-4-1/patches/src680/math-draw-generic-name-localize.diff
==============================================================================
--- (empty file)
+++ branches/debian-2-4-1/patches/src680/math-draw-generic-name-localize.diff	Thu Sep 18 12:33:15 2008
@@ -0,0 +1,13 @@
+Index: desktop/share/localize.sdf
+===================================================================
+--- sysui/desktop/share/localize.sdf	(Revision 261918)
++++ sysui/desktop/share/localize.sdf	(Arbeitskopie)
+@@ -3102,6 +3102,8 @@
+ sysui	desktop\share\launcher_genericname.ulf	0	LngText	writer				0	vi	Xá là tá				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_genericname.ulf	0	LngText	writer				0	zh-CN	ååçå				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_genericname.ulf	0	LngText	writer				0	zh-TW	ææèçå				2002-02-02 02:02:02
++sysui	desktop\share\launcher_genericname.ulf	0	LngText	math				0	de	Formeleditor				2002-02-02 02:02:02
++sysui	desktop\share\launcher_genericname.ulf	0	LngText	draw				0	de	Zeichenprogramm				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_name.ulf	0	LngText	printeradmin				0	af	%PRODUCTNAME-drukkeradministrasie				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_name.ulf	0	LngText	printeradmin				0	ar	ØØØØØ ØØØØØØ %PRODUCTNAME				2002-02-02 02:02:02
+ sysui	desktop\share\launcher_name.ulf	0	LngText	printeradmin				0	as-IN	%PRODUCTNAME àààààà ààààààà				2002-02-02 02:02:02

Added: branches/debian-2-4-1/patches/src680/math-draw-generic-name.diff
==============================================================================
--- (empty file)
+++ branches/debian-2-4-1/patches/src680/math-draw-generic-name.diff	Thu Sep 18 12:33:15 2008
@@ -0,0 +1,33 @@
+Index: desktop/menus/math.desktop
+===================================================================
+--- sysui/desktop/menus/math.desktop	(Revision 261918)
++++ sysui/desktop/menus/math.desktop	(Arbeitskopie)
+@@ -7,4 +7,5 @@
+ Exec=openoffice -math %U
+ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
+ Name=%PRODUCTNAME Math
++GenericName=Formula Editor
+ Comment=Create and edit scientific formulas and equations by using Math.
+Index: desktop/menus/draw.desktop
+===================================================================
+--- sysui/desktop/menus/draw.desktop	(Revision 261918)
++++ sysui/desktop/menus/draw.desktop	(Arbeitskopie)
+@@ -7,4 +7,5 @@
+ Exec=openoffice -draw %U
+ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
+ Name=%PRODUCTNAME Draw
++GenericName=Drawing Program
+ Comment=Create and edit drawings, flow charts, and logos by using Draw.
+Index: desktop/share/launcher_genericname.ulf
+===================================================================
+--- sysui/desktop/share/launcher_genericname.ulf	(Revision 261918)
++++ sysui/desktop/share/launcher_genericname.ulf	(Arbeitskopie)
+@@ -10,3 +10,8 @@
+ [base]
+ en-US = "Database Development"
+ 
++[math]
++en-US = "Formula Editor"
++
++[draw]
++en-US = "Drawing Program"