[Libreoffice-commits] core.git: rsc/inc
rsc/inc/rscarray.hxx | 13 +++-
rsc/inc/rscclass.hxx | 26
rsc/inc/rscconst.hxx | 16 -
rsc/inc/rsccont.hxx | 13 +++-
rsc/inc/rscdb.hxx| 37 +++
rsc/inc/rscdef.hxx | 38 +++
rsc/inc/rscflag.hxx | 12 +++
rsc/inc/rsckey.hxx |6 +--
rsc/inc/rscrange.hxx | 42 +-
rsc/inc/rscrsc.hxx | 18 +--
rsc/inc/rscstr.hxx | 10 +++---
rsc/inc/rsctop.hxx | 82 ---
rsc/inc/rsctree.hxx | 10 ++
13 files changed, 157 insertions(+), 166 deletions(-)
New commits:
commit 686c85f768cf4f9566375e9cf54aab950eadf4cc
Author: Lucas Satabin lucas.sata...@gnieh.org
Date: Tue Aug 25 18:57:23 2015 +0200
tdf#39468: Translate German comments in core/rsc/inc
Change-Id: I5d878192bde816e59ef570731113b526e8098d85
Reviewed-on: https://gerrit.libreoffice.org/18065
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index 232091f..65a74e9 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -49,16 +49,13 @@ struct RscArrayInst
RscInstNode * pNode;
};
-/* Der Baum wird ueber die Werte des Enums sortiert, nicht ueber
-seine HashId.
-*/
+/* The tree is sorted against its enum value, not gainst its HashId */
class RscArray : public RscTop
{
protected:
-RscEnum * pTypeClass; // Typ der Eintraege
-sal_uInt32 nSize; // Groesse der Instanzdaten dieser Klasse
-// mit Superklassen
-sal_uInt32 nOffInstData;// Offset auf eigen Instanzdaten
+RscEnum * pTypeClass; // type of entries
+sal_uInt32 nSize; // size of this class instance data with super
class
+sal_uInt32 nOffInstData;// Offset of self instance data
voidWriteSrcArray( const RSCINST rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const
char * );
public:
@@ -77,7 +74,7 @@ public:
RscTop * pCreateClass,
RSCINST * pGetInst ) SAL_OVERRIDE;
-// Gibt die Groesse der Klasse in Bytes
+// gives the size of the class in bytes
sal_uInt32 Size() SAL_OVERRIDE { return nSize; }
boolIsConsistent( const RSCINST rInst ) SAL_OVERRIDE;
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 7d2b09e..668098a 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -33,19 +33,19 @@ protected:
};
struct VARTYPE_STRUCT
{
-AtomnVarName; // Variablenname
-RSCVAR nVarType; // Variablentyp
-sal_uInt32 nMask; // Maskierungsbit
-sal_uInt32 nOffset;// Beginn der Instanzdaten
-RscTop *pClass; // Klasse
-CLASS_DATA pDefault; // Zeiger auf DefaultDaten
-AtomnDataBaseName;//Name fuer Fremddatenbereich
+AtomnVarName; // variable name
+RSCVAR nVarType; // variable type
+sal_uInt32 nMask; // bit mask
+sal_uInt32 nOffset;// start of instance data
+RscTop *pClass; // class
+CLASS_DATA pDefault; // pointer to default data
+AtomnDataBaseName;//name of foreign data area
};
-sal_uInt32 nSuperSize; // Groesse der Instanzdaten der SuperKl.
-sal_uInt32 nSize; // Groesse der Instanzdaten dieser Klasse
-// mit Superklassen
-sal_uInt32 nEntries; // Eintraege in pVarTypeList
-VARTYPE_STRUCT *pVarTypeList; // Variablenliste
+sal_uInt32 nSuperSize; // size of super class instance data
+sal_uInt32 nSize; // size of this class instance data
+// with super class
+sal_uInt32 nEntries; // entries in pVarTypeList
+VARTYPE_STRUCT *pVarTypeList; // variable list
RSCINST GetInstData( CLASS_DATA pData, sal_uInt32 nEle,
bool bGetCopy = false );
CLASS_DATA GetDfltData( sal_uInt32 nEle );
@@ -73,7 +73,7 @@ public:
RscTop * pCreateClass = NULL ) SAL_OVERRIDE;
RSCINST GetCopyVar( const RSCINST rInst, Atom nVarName )
SAL_OVERRIDE;
-// Gibt die Groesse der Klasse in Bytes
+// gives the class size in bytes
sal_uInt32 Size() SAL_OVERRIDE { return nSize; }
boolIsConsistent( const RSCINST rInst ) SAL_OVERRIDE;
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 55ea458..201d3f2 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -29,16
[Libreoffice-commits] core.git: bin/find-german-comments
bin/find-german-comments |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f09218141cfad230202f370b0366042ca74a52ca Author: Lucas Satabin lucas.sata...@gnieh.org Date: Thu Aug 27 20:24:40 2015 +0200 Mark rsc comments as translated Change-Id: I6f6248678462f64e469ce9f7b7889e73624e34af Reviewed-on: https://gerrit.libreoffice.org/18067 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/bin/find-german-comments b/bin/find-german-comments index c8493be..1fb755c 100755 --- a/bin/find-german-comments +++ b/bin/find-german-comments @@ -296,7 +296,7 @@ class Parser: registry : 1, remotebridges : 1, reportdesign : 0, # -rsc : 0, # +rsc : 1, sal : 1, salhelper : 1, sax : 1, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: rsc/source
rsc/source/parser/rscdb.cxx | 56 +++---
rsc/source/parser/rscicpx.cxx | 167 --
rsc/source/parser/rscinit.cxx | 28 +++
rsc/source/parser/rsclex.cxx | 32
rsc/source/parser/rscpar.cxx | 14 +--
rsc/source/res/rscclass.cxx | 56 ++
rsc/source/res/rsccont.cxx| 16 ++--
rsc/source/res/rscmgr.cxx | 27 +++---
rsc/source/res/rscrange.cxx |2
rsc/source/res/rscstr.cxx |8 +-
rsc/source/rsc/rsc.cxx| 40 +-
rsc/source/tools/rscdef.cxx | 29 +++
rsc/source/tools/rsctree.cxx | 17 ++--
13 files changed, 242 insertions(+), 250 deletions(-)
New commits:
commit 894151e80f27c84113b571dda3479ad4b2525686
Author: Lucas Satabin lucas.sata...@gnieh.org
Date: Tue Aug 25 22:31:58 2015 +0200
tdf#39468: Translate German comments in core/rsc/source
Change-Id: Ia2d94a88d217a3b0ec9c78096b8d74a38216fbc9
Reviewed-on: https://gerrit.libreoffice.org/18066
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Thorsten Behrens thorsten.behr...@cib.de
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index f58ff3e..42aa6da 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -61,7 +61,7 @@ RscTypCont :: RscTypCont( RscError * pErrHdl,
, nFlags( nFlagsP )
{
nUniqueId = 256;
-nPMId = RSC_VERSIONCONTROL +1; //mindestens einen groesser
+nPMId = RSC_VERSIONCONTROL +1; // at least one more
pEH = pErrHdl;
Init();
}
@@ -168,13 +168,13 @@ void Pre_dtorTree( RscTop * pRscTop )
RscTypCont :: ~RscTypCont()
{
-// Alle Unterbaeume loeschen
+// delete all subtrees
aVersion.pClass-Destroy( aVersion );
rtl_freeMemory( aVersion.pData );
DestroySubTrees( pRoot );
-// Alle Klassen noch gueltig, jeweilige Instanzen freigeben
-// BasisTypen
+// all classes are still valid, destroy each instance
+// of base types
for ( size_t i = 0, n = aBaseLst.size(); i n; ++i )
aBaseLst[ i ]-Pre_dtor();
@@ -188,10 +188,10 @@ RscTypCont :: ~RscTypCont()
aString.Pre_dtor();
aWinBits.Pre_dtor();
aVersion.pClass-Pre_dtor();
-// Zusammengesetzte Typen
+// sub-types
Pre_dtorTree( pRoot );
-// Klassen zerstoeren
+// destroy classes
delete aVersion.pClass;
DestroyTree( pRoot );
@@ -216,9 +216,9 @@ void RscTypCont::ClearSysNames()
RscTop * RscTypCont::SearchType( Atom nId )
{
-/* [Beschreibung]
+/* [Description]
-Sucht eine Basistyp nId;
+Search for base type nId;
*/
if( nId == InvalidAtom )
return NULL;
@@ -343,10 +343,10 @@ class RscEnumerateObj
{
friend class RscEnumerateRef;
private:
-ERRTYPE aError; // Enthaelt den ersten Fehler
+ERRTYPE aError; // contains the first field
RscTypCont* pTypCont;
-FILE * fOutput;// AusgabeDatei
-sal_uLong lFileKey; // Welche src-Datei
+FILE * fOutput;// output file
+sal_uLong lFileKey; // what source file
RscTop *pClass;
DECL_LINK( CallBackWriteRc, ObjNode * );
@@ -397,45 +397,45 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteSrc, ObjNode *,
pObjNode )
void RscEnumerateObj :: WriteRcFile( RscWriteRc rMem, FILE * fOut )
{
-// Definition der Struktur, aus denen die Resource aufgebaut ist
+// structure definition from which the resource is built
/*
struct RSHEADER_TYPE{
-sal_uInt32 nId;// Identifier der Resource
-sal_uInt32 nRT;// Resource Typ
-sal_uInt32 nGlobOff; // Globaler Offset
-sal_uInt32 nLocalOff; // Lokaler Offset
+sal_uInt32 nId;// resource identifier
+sal_uInt32 nRT;// resource type
+sal_uInt32 nGlobOff; // global offset
+sal_uInt32 nLocalOff; // local offset
} aHeader;
*/
sal_uInt32 nId = rMem.GetLong( 0 );
sal_uInt32 nRT = rMem.GetLong( 4 );
-// Tabelle wird entsprechend gefuellt
+// table is filled with with nId and nRT
pTypCont-PutTranslatorKey( (sal_uInt64(nRT) 32) + sal_uInt64(nId) );
if( nRT == RSC_VERSIONCONTROL )
-{ // kommt immmer als letztes
+{ // always comes last
sal_Int32 nCount = pTypCont-aIdTranslator.size();
-// groesse der Tabelle
+// table size
sal_uInt32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(sal_Int32))) +
sizeof(sal_Int32);
-rMem.Put( nCount ); //Anzahl speichern
+rMem.Put( nCount ); // save the count
for( std::map sal_uInt64, sal_uLong ::const_iterator it =
pTypCont-aIdTranslator.begin(); it !=
pTypCont-aIdTranslator.end(); ++it )
{
-// Schluessel schreiben
+// save the key
rMem.Put( it-first );
-// Objekt Id oder Position schreiben
Translating comments
Hi all, I started translating some german comments. So far I translated all german comments I found in rsc. The changes were submitted to gerrit [0] and [1]. I am open to comments and feedback on these changes. I am not sure whether it is better to submit patches to gerrit or on this mailing list for comment translation. Tell me if must submit patches here. Thanks in advance. Lucas [0] https://gerrit.libreoffice.org/#/c/17999/ [1] https://gerrit.libreoffice.org/#/c/18000/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Translating comments
On 27/08/2015 20:20, Michael Meeks wrote: Hi Lucas, On Thu, 2015-08-27 at 20:03 +0200, Lucas Satabin wrote: I started translating some german comments. So far I translated all german comments I found in rsc. The changes were submitted to gerrit [0] and [1]. Nice work =) I am open to comments and feedback on these changes. I'm no expert in German - but the English looks sensible and clean to me, thanks ! if no-one else gets to checking them, will try to merge early next week. Ok One minor point - could you patch bin/find-german-comments to disable 'rsc' if you've completed that module =) Ok, it's done. Thanks for the hint I missed this one :) Lucas I am not sure whether it is better to submit patches to gerrit or on this mailing list for comment translation. Tell me if must submit patches here. Gerrit is great. Thanks ! Michael. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Lucas Satabin license statement
Hi all, All of my past future contributions to LibreOffice may be licensed under the MLPv2/LGPLv3 license. Regards Lucas Satabin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
