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

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Feb 25 09:30:02 2008
New Revision: 11697
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11697&view=rev

Log:
2008-02-25  Rene Engelhard  <rene debian org>

        * patches/src680/ubuntu-soffice-config.diff: reenable autohinting for
          Thai, see http://bugs.debian.org/467180
        * patches/src680/reportdesign-mention-package.diff: add fr
          translation


Modified:
   trunk/ChangeLog
   trunk/patches/src680/reportdesign-mention-package.diff
   trunk/patches/src680/ubuntu-soffice-config.diff

Modified: trunk/patches/src680/reportdesign-mention-package.diff
==============================================================================
--- trunk/patches/src680/reportdesign-mention-package.diff	(original)
+++ trunk/patches/src680/reportdesign-mention-package.diff	Mon Feb 25 09:30:02 2008
@@ -37,7 +37,7 @@
 diff -u -u -r1.37 localize.sdf
 --- dbaccess/source/ui/dlg/localize.sdf	12 Nov 2007 13:22:41 -0000	1.37
 +++ dbaccess/source/ui/dlg/localize.sdf	24 Nov 2007 13:31:11 -0000
-@@ -6922,42 +6922,7 @@
+@@ -6922,42 +6922,8 @@
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	vi	Tái ~vá...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-CN	äè(~D)...				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	pushbutton	RID_EXTENSION_NOT_PRESENT_DLG	PB_DOWNLOAD			0	zh-TW	äè(~D)...				2002-02-02 02:02:02
@@ -78,6 +78,7 @@
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				1	vi	Khá nÄng má bÃo cÃo nhá phán má ráng %RPT_EXTENSION_NAME.\n\nNhán vÃo  Tái vá...  Äá tái vá và cÃi Äát phán má ráng nÃy.				2002-02-02 02:02:02
 -dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	zh-CN	äæåæèæéè %RPT_EXTENSION_NAME æåã\n\nèååâäè...âæäèååèèæåã				2002-02-02 02:02:02
 +dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	de	Zum Ãffnen eines Berichts wird die Erweiterung %RPT_EXTENSION_NAME benÃtigt.\n\nInstallieren Sie dafÃr das Paket 'openoffice.org-report-builder'.				2002-02-02 02:02:02
++dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	fr	L'ouverture d'un rapport requiert l'extension %RPT_EXTENSION_NAME.\n\nPur cela, installez le package 'openoffice.org-report-builder'.				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\ExtensionNotPresent.src	0	string	RID_STR_EXTENSION_NOT_PRESENT				0	zh-TW	æéèææåèé %RPT_EXTENSION_NAME æèéååèã\n\nèæää [äè...] ääèååèæåèéã				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\RelationDlg.src	0	fixedline	DLG_REL_PROPERTIES	FL_CASC_DEL			84	af	Skrapopsies				2002-02-02 02:02:02
  dbaccess	source\ui\dlg\RelationDlg.src	0	fixedline	DLG_REL_PROPERTIES	FL_CASC_DEL			84	ar	ØÙØØØØ ØÙØØÙ				2002-02-02 02:02:02

Modified: trunk/patches/src680/ubuntu-soffice-config.diff
==============================================================================
--- trunk/patches/src680/ubuntu-soffice-config.diff	(original)
+++ trunk/patches/src680/ubuntu-soffice-config.diff	Mon Feb 25 09:30:02 2008
@@ -1,6 +1,6 @@
 --- desktop/scripts/soffice.sh~	2007-03-27 15:04:38.380150637 +0200
 +++ desktop/scripts/soffice.sh	2007-03-27 19:49:12.717713134 +0200
-@@ -39,13 +39,105 @@
+@@ -39,13 +39,96 @@
  # export STAR_PROFILE_LOCKING_DISABLED
  #
  
@@ -101,15 +101,6 @@
 +	export SAL_NOOPENGL
 +    esac
 +fi
-+
-+
-+# other Ubuntu stuff
-+
-+# turn off autohinting for thai (Ubuntu #35305).
-+case "$LANG" in th*)
-+    SAL_AUTOHINTING_PRIORITY=0
-+    export SAL_AUTOHINTING_PRIORITY
-+esac
  
  sd_platform=`uname -s`