[ooo-build-commit] 2 commits - src/sdf

Kalman "" Szalai kami911 at kemper.freedesktop.org
Mon Sep 28 16:15:20 PDT 2009 

 src/sdf/fixes-hu.sdf |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit e81cfbe5c4b558b65dc1edd4cce5dd66d76d9a64
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Tue Sep 29 01:15:08 2009 +0200

    Added Hungarian quick fixes to translation
    
    * src/sdf/fixes-hu.sdf: Quick fixes for Hungarian translation.
    
    Conflicts:
    
    	src/sdf/fixes-hu.sdf

diff --git a/src/sdf/fixes-hu.sdf b/src/sdf/fixes-hu.sdf
index 1b16b7b..0d40368 100644
--- a/src/sdf/fixes-hu.sdf
+++ b/src/sdf/fixes-hu.sdf
@@ -10,7 +10,6 @@ sfx2	source\appl\app.src	0	string	STR_EVENT_SAVEASDOCDONE				244	en-US	Document
 sfx2	source\appl\app.src	0	string	STR_EVENT_SAVEASDOCDONE				0	hu	Dokumentum mentve másként				20090312 19:30:37
 svx	source\dialog\macropg.src	0	string	RID_SVXSTR_EVENT_SAVEASDOCDONE				0	en-US	Document has been saved as				20090312 19:30:37
 svx	source\dialog\macropg.src	0	string	RID_SVXSTR_EVENT_SAVEASDOCDONE				0	hu	Dokumentum mentve másként				20090312 19:30:37
-<<<<<<< HEAD:src/sdf/fixes-hu.sdf
 svx	source\intro\ooo.src	0	fixedtext	RID_DEFAULTABOUT	ABOUT_FTXT_COPYRIGHT			168	en-US	Copyright 2000-2009 Sun Microsystems Inc.\nThis product was created by \" OOO_VENDOR \", based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.				2002-02-02 02:02:02
 svx	source\intro\ooo.src	0	fixedtext	RID_DEFAULTABOUT	ABOUT_FTXT_COPYRIGHT			168	hu	Copyright 2000-2009 Sun Microsystems Inc.\nA terméket az OpenOffice.org alapján készítette: \" OOO_VENDOR \".\nAz OpenOffice.org köszöni minden közösségi tag hozzájárulását, különösen a http://www.openoffice.org/welcome/credits.html oldalon szereplőkét.				2002-02-02 02:02:02
 formula	source\ui\dlg\formdlgs.src	0	imagebutton	RID_FORMULADLG_FORMULA_MODAL	RB_REF			13	en-US	-		Maximize		20051120 17:50:58
@@ -21,6 +20,10 @@ formula	source\ui\dlg\parawin.src	0	#define	RB_ARGBLOCK( y )				13	en-US	-		Sele
 formula	source\ui\dlg\parawin.src	0	#define	RB_ARGBLOCK( y )				13	hu	-		Kijelölés		20051120 17:50:58
 sc	source\ui\dbgui\pivot.src	0	imagebutton	RID_SCDLG_PIVOT_LAYOUT	RB_INAREA			13	en-US	-		Shrink		20090812 20:51:58
 sc	source\ui\dbgui\pivot.src	0	imagebutton	RID_SCDLG_PIVOT_LAYOUT	RB_INAREA			13	hu	-		Zsugorítás		20090812 20:51:58
+scp2	source\extensions\module_extensions.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_EXTENSIONS				0	en-US	Extensions				20051120 17:50:58
+scp2	source\extensions\module_extensions.ulf	0	LngText	STR_NAME_MODULE_OPTIONAL_EXTENSIONS				0	hu	Kiterjesztések				20051120 17:50:58
+scp2	source\extensions\module_extensions.ulf	0	LngText	STR_DESC_MODULE_OPTIONAL_EXTENSIONS				0	en-US	Useful %PRODUCTNAME extensions.				20051120 17:50:58
+scp2	source\extensions\module_extensions.ulf	0	LngText	STR_DESC_MODULE_OPTIONAL_EXTENSIONS				0	hu	Hasznos %PRODUCTNAME-kiterjesztések.				20051120 17:50:58
 sfx2	source\dialog\dinfdlg.src	0	combobox	SFX_CB_PROPERTY_NAME				60	en-US	-		Property Name		20051120 17:50:58
 sfx2	source\dialog\dinfdlg.src	0	combobox	SFX_CB_PROPERTY_NAME				60	hu	-		Tulajdonság neve		20051120 17:50:58
 sfx2	source\dialog\dinfdlg.src	0	imagebutton	SFX_PB_PROPERTY_REMOVE				0	en-US	-		Remove Property		20051120 17:50:58
@@ -31,6 +34,3 @@ svx	source\stbctrls\stbctrls.src	0	string	RID_SVXSTR_DOC_MODIFIED_YES				0	en-US
 svx	source\stbctrls\stbctrls.src	0	string	RID_SVXSTR_DOC_MODIFIED_YES				0	hu	A dokumentum megváltozott. Kattintson duplán a dokumentum mentéséhez.				20051120 17:50:58
 svx	source\stbctrls\stbctrls.src	0	string	RID_SVXSTR_DOC_MODIFIED_NO				0	en-US	The document has not been modified since the last save.				20051120 17:50:58
 svx	source\stbctrls\stbctrls.src	0	string	RID_SVXSTR_DOC_MODIFIED_NO				0	hu	A dokumentum nem változott meg az utolsó mentés óta.				20051120 17:50:58
-=======
-svx	source\intro\ooo.src	0	fixedtext	RID_DEFAULTABOUT	ABOUT_FTXT_COPYRIGHT			168	hu	Copyright 2000-2009 Sun Microsystems Inc.\nA terméket az OpenOffice.org alapján készítette: \" OOO_VENDOR \".\nAz OpenOffice.org köszöni minden közösségi tag hozzájárulását, különösen a http://www.openoffice.org/welcome/credits.html oldalon szereplőkét.				2002-02-02 02:02:02
->>>>>>> 539d3ba... Using real OOO_VENDOR variable in Hungarian translation:src/sdf/fixes-hu.sdf
commit 33c8f3d7de1921e826cb85d15321a749c5548695
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Tue Sep 29 01:12:09 2009 +0200

    Using real OOO_VENDOR variable in Hungarian translation
    
    Using \" OOO_VENDOR \" variable instead of using OOO_VENDOR text in the about box.
    
    Conflicts:
    
    	src/sdf/fixes-hu.sdf

diff --git a/src/sdf/fixes-hu.sdf b/src/sdf/fixes-hu.sdf
index 4a506d8..1b16b7b 100644
--- a/src/sdf/fixes-hu.sdf
+++ b/src/sdf/fixes-hu.sdf
@@ -10,6 +10,7 @@ sfx2	source\appl\app.src	0	string	STR_EVENT_SAVEASDOCDONE				244	en-US	Document
 sfx2	source\appl\app.src	0	string	STR_EVENT_SAVEASDOCDONE				0	hu	Dokumentum mentve másként				20090312 19:30:37
 svx	source\dialog\macropg.src	0	string	RID_SVXSTR_EVENT_SAVEASDOCDONE				0	en-US	Document has been saved as				20090312 19:30:37
 svx	source\dialog\macropg.src	0	string	RID_SVXSTR_EVENT_SAVEASDOCDONE				0	hu	Dokumentum mentve másként				20090312 19:30:37
+<<<<<<< HEAD:src/sdf/fixes-hu.sdf
 svx	source\intro\ooo.src	0	fixedtext	RID_DEFAULTABOUT	ABOUT_FTXT_COPYRIGHT			168	en-US	Copyright 2000-2009 Sun Microsystems Inc.\nThis product was created by \" OOO_VENDOR \", based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.				2002-02-02 02:02:02
 svx	source\intro\ooo.src	0	fixedtext	RID_DEFAULTABOUT	ABOUT_FTXT_COPYRIGHT			168	hu	Copyright 2000-2009 Sun Microsystems Inc.\nA terméket az OpenOffice.org alapján készítette: \" OOO_VENDOR \".\nAz OpenOffice.org köszöni minden közösségi tag hozzájárulását, különösen a http://www.openoffice.org/welcome/credits.html oldalon szereplőkét.				2002-02-02 02:02:02
 formula	source\ui\dlg\formdlgs.src	0	imagebutton	RID_FORMULADLG_FORMULA_MODAL	RB_REF			13	en-US	-		Maximize		20051120 17:50:58
@@ -30,3 +31,6 @@ svx	source\stbctrls\stbctrls.src	0	string	RID_SVXSTR_DOC_MODIFIED_YES				0	en-US
 svx	source\stbctrls\stbctrls.src	0	string	RID_SVXSTR_DOC_MODIFIED_YES				0	hu	A dokumentum megváltozott. Kattintson duplán a dokumentum mentéséhez.				20051120 17:50:58
 svx	source\stbctrls\stbctrls.src	0	string	RID_SVXSTR_DOC_MODIFIED_NO				0	en-US	The document has not been modified since the last save.				20051120 17:50:58
 svx	source\stbctrls\stbctrls.src	0	string	RID_SVXSTR_DOC_MODIFIED_NO				0	hu	A dokumentum nem változott meg az utolsó mentés óta.				20051120 17:50:58
+=======
+svx	source\intro\ooo.src	0	fixedtext	RID_DEFAULTABOUT	ABOUT_FTXT_COPYRIGHT			168	hu	Copyright 2000-2009 Sun Microsystems Inc.\nA terméket az OpenOffice.org alapján készítette: \" OOO_VENDOR \".\nAz OpenOffice.org köszöni minden közösségi tag hozzájárulását, különösen a http://www.openoffice.org/welcome/credits.html oldalon szereplőkét.				2002-02-02 02:02:02
+>>>>>>> 539d3ba... Using real OOO_VENDOR variable in Hungarian translation:src/sdf/fixes-hu.sdf

More information about the ooo-build-commit mailing list