[ooo-build-commit] 2 commits - patches/dev300 po/ooo-build-de.sdf
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Dec 9 08:23:40 PST 2009
patches/dev300/piece-scp2.diff | 2 -
po/ooo-build-de.sdf | 52 -----------------------------------------
2 files changed, 1 insertion(+), 53 deletions(-)
New commits:
commit 673be8c7772ec3ee0409aabbc2d8583ab7113bae
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Dec 9 17:22:47 2009 +0100
Regenerated malformed ooo-build-de.sdf
* po/ooo-build-de.sdf: regenerated using "make update-sdf"
diff --git a/po/ooo-build-de.sdf b/po/ooo-build-de.sdf
index cc0f995..fefe42a 100644
--- a/po/ooo-build-de.sdf
+++ b/po/ooo-build-de.sdf
@@ -519,60 +519,8 @@ sw source\ui\misc\pggrid.src 0 fixedtext TP_TEXTGRID_PAGE FT_CHARRANGE 999 de
sw source\ui\misc\pggrid.src 0 fixedtext TP_TEXTGRID_PAGE FT_CHARRANGE 999 en-US ( 1 - 45 ) 2002-02-02 02:02:02
sw source\ui\misc\pggrid.src 0 fixedtext TP_TEXTGRID_PAGE FT_LINERANGE 999 de ( 1 - 48 ) 2002-02-02 02:02:02
sw source\ui\misc\pggrid.src 0 fixedtext TP_TEXTGRID_PAGE FT_LINERANGE 999 en-US ( 1 - 48 ) 2002-02-02 02:02:02
-<<<<<<< HEAD
sw source\ui\utlui\utlui.src 0 string RID_SHELLRES_AUTOFMTSTRS STR_AUTOFMTREDL_NON_BREAK_SPACE +1 999 en-US Add non breaking space 2002-02-02 02:02:02
-vcl source\src\btntext.src 0 string SV_BUTTONTEXT_CANCEL 999 de ~Verwerfen 2002-02-02 02:02:02
-=======
-toolkit workben\layout\sortdlg.src 0 fixedline RID_SCPAGE_SORT_FIELDS FL_SORT1 999 de Sortieren nach 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedline RID_SCPAGE_SORT_FIELDS FL_SORT1 999 en-US Sort ~by 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedline RID_SCPAGE_SORT_FIELDS FL_SORT2 999 de Dann nach 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedline RID_SCPAGE_SORT_FIELDS FL_SORT2 999 en-US Then b~y 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedline RID_SCPAGE_SORT_FIELDS FL_SORT3 999 de Dann nach 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedline RID_SCPAGE_SORT_FIELDS FL_SORT3 999 en-US T~hen by 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedline RID_SCPAGE_SORT_OPTIONS FL_DIRECTION 999 de Richtung 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedline RID_SCPAGE_SORT_OPTIONS FL_DIRECTION 999 en-US Direction 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedtext RID_SCPAGE_SORT_OPTIONS FT_ALGORITHM 999 de Optionen 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedtext RID_SCPAGE_SORT_OPTIONS FT_ALGORITHM 999 en-US O~ptions 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedtext RID_SCPAGE_SORT_OPTIONS FT_LANGUAGE 999 de Sprache 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 fixedtext RID_SCPAGE_SORT_OPTIONS FT_LANGUAGE 999 en-US ~Language 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_CASESENSITIVE 999 de Schreibungsabhängig 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_CASESENSITIVE 999 en-US Case ~sensitive 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_COPYRESULT 999 de Sortierungsergebnisse kopieren nach: 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_COPYRESULT 999 en-US ~Copy sort results to: 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_FORMATS 999 de Formate einschließen 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_FORMATS 999 en-US Include ~formats 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_NATURALSORT 999 de Natürliche Sortierung aktivieren 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_NATURALSORT 999 en-US Enable ~natural sort 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_SORT_USER 999 de Benutzerdefinierte Sortierungsordnung 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 checkbox RID_SCPAGE_SORT_OPTIONS BTN_SORT_USER 999 en-US Custom sort ~order 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 pageitem RID_SCDLG_SORT.1 TP_FIELDS 999 de Sortierungskriterien 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 pageitem RID_SCDLG_SORT.1 TP_FIELDS 999 en-US Sort Criteria 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 pageitem RID_SCDLG_SORT.1 TP_OPTIONS 999 de Optionen 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 pageitem RID_SCDLG_SORT.1 TP_OPTIONS 999 en-US Options 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_DOWN1 999 de Absteigend 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_DOWN1 999 en-US ~Descending 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_DOWN2 999 de Absteigend 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_DOWN2 999 en-US D~escending 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_DOWN3 999 de Absteigend 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_DOWN3 999 en-US Desce~nding 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_UP1 999 de Aufsteigend 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_UP1 999 en-US ~Ascending 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_UP2 999 de Aufsteigend 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_UP2 999 en-US A~scending 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_UP3 999 de Aufsteigend 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_FIELDS BTN_UP3 999 en-US As~cending 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_OPTIONS BTN_LEFT_RIGHT 999 de Links nach rechts (Spalten sortieren) 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_OPTIONS BTN_LEFT_RIGHT 999 en-US L~eft to right (sort columns) 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_OPTIONS BTN_TOP_DOWN 999 de Oben nach unten (Zeilen sortieren) 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 radiobutton RID_SCPAGE_SORT_OPTIONS BTN_TOP_DOWN 999 en-US ~Top to bottom (sort rows) 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 string RID_SCPAGE_SORT_OPTIONS STR_COL_LABEL 999 de Bereich enthält Spaltenbezeichnungen 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 string RID_SCPAGE_SORT_OPTIONS STR_COL_LABEL 999 en-US Range contains column la~bels 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 string RID_SCPAGE_SORT_OPTIONS STR_ROW_LABEL 999 de Bereich enthält Zeilenbezeichnungen 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 string RID_SCPAGE_SORT_OPTIONS STR_ROW_LABEL 999 en-US Range contains ~row labels 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 tabdialog RID_SCDLG_SORT 999 de Sortieren 2002-02-02 02:02:02
-toolkit workben\layout\sortdlg.src 0 tabdialog RID_SCDLG_SORT 999 en-US Sort 2002-02-02 02:02:02
vcl source\src\btntext.src 0 string SV_BUTTONTEXT_CANCEL 999 de Abbrechen 2002-02-02 02:02:02
->>>>>>> 7a3c50c... Fix German translation of the Cancel button (bnc#544166)
vcl source\src\btntext.src 0 string SV_BUTTONTEXT_CANCEL 999 en-US ~Cancel 2002-02-02 02:02:02
vcl source\src\btntext.src 0 string SV_BUTTONTEXT_OK 999 de ~OK 2002-02-02 02:02:02
vcl source\src\btntext.src 0 string SV_BUTTONTEXT_OK 999 en-US ~OK 2002-02-02 02:02:02
commit 1e690026d83ff0b032dbabf1d538ff0db8ae407c
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Dec 9 17:20:07 2009 +0100
Fix split sbuild with the internal updated icu-4.0.1
* patches/dev300/piece-scp2.diff: update ICU_MICRO to 1
diff --git a/patches/dev300/piece-scp2.diff b/patches/dev300/piece-scp2.diff
index 8df950a..aec50c2 100644
--- a/patches/dev300/piece-scp2.diff
+++ b/patches/dev300/piece-scp2.diff
@@ -49,7 +49,7 @@
-.INCLUDE : icuversion.mk
+ICU_MAJOR=4
+ICU_MINOR=0
-+ICU_MICRO=0
++ICU_MICRO=1
SCPDEFS+=\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
More information about the ooo-build-commit
mailing list