ooo-build r14353 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Oct 20 12:23:43 2008
New Revision: 14353
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14353&view=rev

Log:
2008-10-20  Tor Lillqvist  <tml novell com>

	Merge from ooo-build-3-0:

	* patches/dev300/win32-tooltips.diff: Just drop the
	ALL_LANG(Tooltip, STR_FI_TOOLTIP_FOO) entries from the scp files,
	so that no tooltips are created in the first place, instead of
	trying to make the tooltips less lame and less misleading. In
	particular, drop the misleading "Supported by Sun Microsystems"
	from the icon on the desktop. They are localised anyway, and I
	don't want to attempt to edit them in umpteen languages in the
	localize.sdf file.

	* patches/dev300/apply: Add win32-tooltips.diff to Fixes.



Added:
   trunk/patches/dev300/win32-tooltips.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Oct 20 12:23:43 2008
@@ -2758,3 +2758,8 @@
 # depend on it.
 
 unused-methods-removal-sc.diff, i#85185, kohei
+
+[ Fixes ]
+# Drop the lame and misleading tooltips for the icon on the desktop
+# and in the Start Menu on Windows
+win32-tooltips.diff, tml

Added: trunk/patches/dev300/win32-tooltips.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/win32-tooltips.diff	Mon Oct 20 12:23:43 2008
@@ -0,0 +1,65 @@
+--- scp2/source/base/folderitem_base.scp
++++ scp2/source/base/folderitem_base.scp
+@@ -40,5 +40,4 @@
+     WkDir = gid_Dir_Program;
+     Parameter = "";
+     Styles = (NOWEB, NON_ADVERTISED);
+-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
+ End
+--- scp2/source/calc/folderitem_calc.scp
++++ scp2/source/calc/folderitem_calc.scp
+@@ -40,5 +40,4 @@
+     WkDir = gid_Dir_Program;
+     Parameter = "";
+     Styles = (NOWEB, NON_ADVERTISED);
+-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
+ End
+--- scp2/source/impress/folderitem_impress.scp
++++ scp2/source/impress/folderitem_impress.scp
+@@ -40,5 +40,4 @@
+     WkDir = gid_Dir_Program;
+     Parameter = "";
+     Styles = (NOWEB, NON_ADVERTISED);
+-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
+ End
+--- scp2/source/math/folderitem_math.scp
++++ scp2/source/math/folderitem_math.scp
+@@ -40,5 +40,4 @@
+     WkDir = gid_Dir_Program;
+     Parameter = "";
+     Styles = (NOWEB, NON_ADVERTISED);
+-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
+ End
+--- scp2/source/draw/folderitem_draw.scp
++++ scp2/source/draw/folderitem_draw.scp
+@@ -40,5 +40,4 @@
+     WkDir = gid_Dir_Program;
+     Parameter = "";
+     Styles = (NOWEB, NON_ADVERTISED);
+-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
+ End
+--- scp2/source/ooo/folderitem_ooo.scp
++++ scp2/source/ooo/folderitem_ooo.scp
+@@ -40,7 +40,6 @@
+     WkDir = gid_Dir_Program;
+     Parameter = "";
+     Styles = (NOWEB, NON_ADVERTISED);
+-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
+ End
+ 
+ FolderItem gid_Folderitem_Soffice_Desktop
+@@ -54,6 +54,5 @@
+     WkDir = gid_Dir_Program;
+     Parameter = "";
+ 	Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
+-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
+     ComponentCondition = "CREATEDESKTOPLINK=1";
+ End
+--- scp2/source/writer/folderitem_writer.scp
++++ scp2/source/writer/folderitem_writer.scp
+@@ -40,5 +40,4 @@
+     WkDir = gid_Dir_Program;
+     Parameter = "";
+     Styles = (NOWEB, NON_ADVERTISED);
+-    ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
+ End