------------------------------------------------------------
revno: 2372
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2011-02-09 17:54:41 +0100
message:
make reportdesign-mention-package-l10n.diff apply again
modified:
changelog
patches/buildfix-patches.diff
=== modified file 'changelog'
--- a/changelog 2011-02-09 16:38:06 +0000
+++ b/changelog 2011-02-09 16:54:41 +0000
@@ -2,7 +2,7 @@
* new upstream release candidate
- -- Rene Engelhard <r...@debian.org> Wed, 09 Feb 2011 13:57:01 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 09 Feb 2011 17:49:30 +0100
libreoffice (1:3.3.0-3) UNRELEASED; urgency=low
=== modified file 'patches/buildfix-patches.diff'
--- a/patches/buildfix-patches.diff 2011-01-18 20:58:27 +0000
+++ b/patches/buildfix-patches.diff 2011-02-09 16:54:41 +0000
@@ -10,3 +10,45 @@
# Backport from cbosdo06 CWS
sw-table-frame-uno-fix.diff, i#112564, cbosdo
+---
libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-mention-package-l10n.diff-old
2011-02-09 17:44:39.000000000 +0100
++++
libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-mention-package-l10n.diff
2011-02-09 17:47:38.000000000 +0100
+@@ -86,14 +86,14 @@
+ index 3e9018e..8fa1966 100644
+ --- l10n/source/br/localize.sdf
+ +++ l10n/source/br/localize.sdf
+-@@ -3309,7 +3309,6 @@ dbaccess source\ui\dlg\queryfilter.src 0
fixedline DLG_FILTERCRIT FL_FIELDS 23
+- dbaccess source\ui\dlg\queryfilter.src 0 string DLG_FILTERCRIT
STR_NOENTRY 50 br - tra ebet -
2002-02-02 02:02:02
+- dbaccess source\ui\dlg\queryfilter.src 0 string DLG_FILTERCRIT
STR_COMPARE_OPERATORS 0 br
=;<>;<;<=;>;>=;evel;disheñvel diouzh;goullo;dic'houllo
2002-02-02 02:02:02
+- dbaccess source\ui\dlg\queryfilter.src 0 modaldialog
DLG_FILTERCRIT HID_DLG_FILTERCRIT 303 br Sil
skoueriek 2002-02-02 02:02:02
++@@ -453,7 +453,6 @@ dbaccess source\ui\dlg\dbadmin.src 0
fixedtext PAGE_LDAP FT_LDAPROWCOUNT 0 br
++ dbaccess source\ui\dlg\dbadmin.src 0 fixedtext
PAGE_USERDRIVER FT_HOSTNAME 0 br ~Anv an ostiz
2002-02-02 02:02:02
++ dbaccess source\ui\dlg\dbadmin.src 0 fixedtext
PAGE_USERDRIVER FT_PORTNUMBER 0 br ~Niverenn borzh
2002-02-02 02:02:02
++ dbaccess source\ui\dlg\dbadmin.src 0 fixedtext
PAGE_USERDRIVER FT_OPTIONS 0 br ~Arventennoù ar
stur 2002-02-02 02:02:02
+ -dbaccess source\ui\dlg\ExtensionNotPresent.src 0 string
RID_STR_EXTENSION_NOT_PRESENT 0 br Evit
digeriñ ur marilh ho po ezhomm eus an askouezhad %RPT_EXTENSION_NAME.\n\nKlikañ
war 'Pellgargañ...' evit pellgargañ ha staliañ an askouezhad.
2002-02-02 02:02:02
+ dbaccess source\ui\dlg\ExtensionNotPresent.src 0 pushbutton
RID_EXTENSION_NOT_PRESENT_DLG PB_DOWNLOAD 0 br
~Pellgargañ... 2002-02-02 02:02:02
+ dbaccess source\ui\dlg\ExtensionNotPresent.src 0 modaldialog
RID_EXTENSION_NOT_PRESENT_DLG HID_EXTENSION_NOT_PRESENT_DLG
0 br %PRODUCTNAME %PRODUCTVERSION
2002-02-02 02:02:02
+- dbaccess source\ui\dlg\AutoControls_tmpl.hrc 0 pushbutton
AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID)
PB_AUTOBROWSEURL (AUTO_HID + 1) 0 br Kantreal
2002-02-02 02:02:02
++ dbaccess source\ui\dlg\queryfilter.src 0 stringlist
DLG_FILTERCRIT.LB_WHERECOND2 1 0 br HA
2002-02-02 02:02:02
+ diff --git l10n/source/bs/localize.sdf l10n/source/bs/localize.sdf
+ index 4439ce4..637c0f8 100644
+ --- l10n/source/bs/localize.sdf
+@@ -571,14 +571,14 @@
+ index 7934400..060502b 100644
+ --- l10n/source/nb/localize.sdf
+ +++ l10n/source/nb/localize.sdf
+-@@ -5259,7 +5259,6 @@ dbaccess source\ui\dlg\ConnectionPage.src
0 string STR_JDBCDRIVER_SUCCESS 0 n
+- dbaccess source\ui\dlg\ConnectionPage.src 0 string
STR_JDBCDRIVER_NO_SUCCESS 0 nb Klarte
ikke å laste inn JDBC-driveren. 2002-02-02 02:02:02
+- dbaccess source\ui\dlg\ConnectionPage.src 0 string
STR_MSACCESS_FILTERNAME 0 nb MS Access-fil
2002-02-02 02:02:02
+- dbaccess source\ui\dlg\ConnectionPage.src 0 string
STR_MSACCESS_2007_FILTERNAME 0 nb MS
Access 2007-fil 2002-02-02 02:02:02
++@@ -5481,7 +5481,6 @@ dbaccess source\ui\dlg\dbadmin.src 0
fixedtext PAGE_USERDRIVER FT_HOSTNAME 0 n
++ dbaccess source\ui\dlg\dbadmin.src 0 fixedtext
PAGE_USERDRIVER FT_PORTNUMBER 0 nb ~Portnummer
2002-02-02 02:02:02
++ dbaccess source\ui\dlg\dbadmin.src 0 fixedtext
PAGE_USERDRIVER FT_OPTIONS 0 nb
~Driverinnstillinger 2002-02-02 02:02:02
++ dbaccess source\ui\dlg\dbadmin.src 0 string
STR_ERR_USE_CONNECT_TO 25800 nb Velg «Koble til
en database» for å koble til en eksisterende database i stedet.
2002-02-02 02:02:02
+ -dbaccess source\ui\dlg\ExtensionNotPresent.src 0 string
RID_STR_EXTENSION_NOT_PRESENT 0 nb Du
trenger utvidelsen «Sun™ Report Builder» for å åpne rapporter.\n\nTrykk på
«Last ned» for å laste ned og installere denne utvidelsen.
2002-02-02 02:02:02
+ dbaccess source\ui\dlg\ExtensionNotPresent.src 0 pushbutton
RID_EXTENSION_NOT_PRESENT_DLG PB_DOWNLOAD 0 nb
~Last ned 2002-02-02 02:02:02
+ dbaccess source\ui\dlg\ExtensionNotPresent.src 0 modaldialog
RID_EXTENSION_NOT_PRESENT_DLG HID_EXTENSION_NOT_PRESENT_DLG
0 nb %PRODUCTNAME %PRODUCTVERSION
2002-02-02 02:02:02
+- dbaccess source\ui\dlg\CollectionView.src 0 imagebutton
DLG_COLLECTION_VIEW BTN_EXPLORERFILE_NEWFOLDER 0
nb - Lag ny mappe 2002-02-02 02:02:02
++ dbaccess source\ui\dlg\queryfilter.src 0 stringlist
DLG_FILTERCRIT.LB_WHERECOND2 1 0 nb OG
2002-02-02 02:02:02
+ diff --git l10n/source/ne/localize.sdf l10n/source/ne/localize.sdf
+ index 35d5273..18fc04c 100644
+ --- l10n/source/ne/localize.sdf
