You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/07/08 14:31:39 UTC
[openoffice] branch AOO42X updated: Translation (#86)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 48d3561 Translation (#86)
48d3561 is described below
commit 48d35613a8fe830d8061f225724ddcc9e8d17516
Author: Peter <le...@users.noreply.github.com>
AuthorDate: Wed Jul 8 16:24:12 2020 +0200
Translation (#86)
* translated german comments in
vcl/win/source/app/saldata.cxx
* translation of a comment in file
sc/source/ui/src/sc.src
* translation of comments to english in
main/sc/source/ui/src/sc.src
* translation of comments in
main/sc/source/ui/app/client.cxx
* translation of comments for file
main/sfx2/source/appl/appopen.cxx
* Update client.cxx
Fixed typos
* Update client.cxx
Fixed typo
* Update appopen.cxx
Fixed typos
* Update appopen.cxx
Fixed typos
* Update client.cxx
* Update appopen.cxx
* Update client.cxx
* Update appopen.cxx
Co-authored-by: Matthias Seidel <ms...@apache.org>
(cherry picked from commit 9dac8d9b377c4b09c55fda9257c846053f75d61d)
---
main/sc/source/ui/app/client.cxx | 12 ++++----
main/sc/source/ui/src/sc.src | 4 +--
main/sfx2/source/appl/appopen.cxx | 56 +++++++++++++++++--------------------
main/vcl/win/source/app/saldata.cxx | 2 +-
4 files changed, 34 insertions(+), 40 deletions(-)
diff --git a/main/sc/source/ui/app/client.cxx b/main/sc/source/ui/app/client.cxx
index 5e3df5d..b934def 100644
--- a/main/sc/source/ui/app/client.cxx
+++ b/main/sc/source/ui/app/client.cxx
@@ -161,7 +161,7 @@ void __EXPORT ScClient::ObjectAreaChanged()
return;
}
- // Position und Groesse ins Dokument uebernehmen
+ // adopt position and size into document
SdrOle2Obj* pDrawObj = GetDrawObj();
if (pDrawObj)
{
@@ -220,7 +220,7 @@ void __EXPORT ScClient::ViewChanged()
MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( GetAspect() ) );
Size aVisSize = OutputDevice::LogicToLogic( Size( aSz.Width, aSz.Height ), aMapUnit, MAP_100TH_MM );
- // Groesse ins Dokument uebernehmen
+ // adopt size into the document
SdrOle2Obj* pDrawObj = GetDrawObj();
if (pDrawObj)
{
@@ -229,12 +229,12 @@ void __EXPORT ScClient::ViewChanged()
Fraction aFractY = GetScaleHeight();
aFractX *= aVisSize.Width();
aFractY *= aVisSize.Height();
- aVisSize = Size( (long) aFractX, (long) aFractY ); // skaliert fuer Draw-Model
+ aVisSize = Size( (long) aFractX, (long) aFractY ); // scale for Draw-Model
- // pClientData->SetObjArea vor pDrawObj->SetLogicRect, damit keine
- // falschen Skalierungen ausgerechnet werden:
+ // pClientData->SetObjArea before pDrawObj->SetLogicRect, to avoid wrong
+ // scale calculations:
//Rectangle aObjArea = aLogicRect;
- //aObjArea.SetSize( aVisSize ); // Dokument-Groesse vom Server
+ //aObjArea.SetSize( aVisSize ); // Size of document from Server
//SetObjArea( aObjArea );
SfxViewShell* pSfxViewSh = GetViewShell();
diff --git a/main/sc/source/ui/src/sc.src b/main/sc/source/ui/src/sc.src
index 74d9648..66f6002 100644
--- a/main/sc/source/ui/src/sc.src
+++ b/main/sc/source/ui/src/sc.src
@@ -25,11 +25,11 @@
-// App-Titel------------------------------------------------------
+// App-Title------------------------------------------------------
String RID_APPTITLE
{
- /* ### ACHTUNG: Neuer Text in Resource? StarCalc 4.0 : StarCalc 3.1 */
+ /* ### ATTENTION: New text in Ressource? StarCalc 4.0 : StarCalc 3.1 */
Text [ en-US ] = "%PRODUCTNAME Calc" ;
};
diff --git a/main/sfx2/source/appl/appopen.cxx b/main/sfx2/source/appl/appopen.cxx
index 116a49b..e0799fd 100644
--- a/main/sfx2/source/appl/appopen.cxx
+++ b/main/sfx2/source/appl/appopen.cxx
@@ -148,45 +148,42 @@ void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) thr
SfxObjectShellRef SfxApplication::DocAlreadyLoaded
(
- const String& rName, // Name des Dokuments mit Pfad
- sal_Bool bSilent, // sal_True: nicht nach neuer Sicht fragen
- sal_Bool bActivate, // soll bestehende Sicht aktiviert werden
+ const String& rName, // Name of the Document including path
+ sal_Bool bSilent, // sal_True: do not ask for new view
+ sal_Bool bActivate, // should current view be activated
sal_Bool bForbidVisible,
const String* pPostStr
)
-/* [Beschreibung]
-
- Stellt fest, ob ein Dokument mit dem Namen 'rName' bereits geladen
- ist und liefert einen Pointer darauf zu"uck.
-
- Ist das Dokument noch nicht geladen, wird ein 0-Pointer zur"uckgeliefert.
+/* [description]
+ assert if Document with the name 'rname' has been loaded and delivers the
+ pointer. Otherwise a zeropointer will be returned
*/
{
- // zu suchenden Namen als URL aufbereiten
+ // create URL from searchable name
INetURLObject aUrlToFind( rName );
DBG_ASSERT( aUrlToFind.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL" );
String aPostString;
if ( pPostStr )
aPostString = *pPostStr;
- // noch offen?
+ // still open?
SfxObjectShellRef xDoc;
if ( !aUrlToFind.HasError() )
{
- // dann bei den normal geoeffneten Docs
+ // check at normal opened documents
if ( !xDoc.Is() )
{
- xDoc = SfxObjectShell::GetFirst( 0, sal_False ); // auch hidden Docs
+ xDoc = SfxObjectShell::GetFirst( 0, sal_False ); // include hidden files
while( xDoc.Is() )
{
if ( xDoc->GetMedium() &&
xDoc->GetCreateMode() == SFX_CREATE_MODE_STANDARD &&
!xDoc->IsAbortingImport() && !xDoc->IsLoading() )
{
- // Vergleiche anhand der URLs
+ // compare by URLs
INetURLObject aUrl( xDoc->GetMedium()->GetName() );
if ( !aUrl.HasError() && aUrl == aUrlToFind &&
(!bForbidVisible || !SfxViewFrame::GetFirst( xDoc, sal_True )) &&
@@ -200,11 +197,11 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded
}
}
- // gefunden?
+ // found?
if ( xDoc.Is() && bActivate )
{
DBG_ASSERT(
- !bForbidVisible, "Unsichtbares kann nicht aktiviert werden" );
+ !bForbidVisible, "Invisible files cannot be activated" );
SfxViewFrame* pFrame;
for( pFrame = SfxViewFrame::GetFirst( xDoc );
@@ -297,19 +294,17 @@ private:
sal_uInt32 CheckPasswd_Impl
(
- //Window *pWin, // Parent des Dialogs
+ //Window *pWin, // Parent of dialog
SfxObjectShell* pDoc,
- SfxItemPool& /*rPool*/, // Pool, falls ein Set erzeugt werden mus
- SfxMedium* pFile // das Medium, dessen Passwort gfs. erfragt werden soll
+ SfxItemPool& /*rPool*/, // Pool, if we need to create a set
+ SfxMedium* pFile // Medium that needs a password (if necessary)
)
-/* [Beschreibung]
-
- Zu einem Medium das Passwort erfragen; funktioniert nur, wenn es sich
- um einen Storage handelt.
- Wenn in der Documentinfo das Passwort-Flag gesetzt ist, wird
- das Passwort vom Benutzer per Dialog erfragt und an dem Set
- des Mediums gesetzt; das Set wird, wenn nicht vorhanden, erzeugt.
+/* [description]
+ To query a passwort on a medium works only if the medium is a storage.
+ If in documentinfo the password-flag is set, a dialog will query the user
+ for the password. The password will be saved in a set. If the set does not
+ exist, a set will be created.
*/
{
sal_uIntPtr nRet = ERRCODE_NONE;
@@ -572,7 +567,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
{
DBG_MEMTEST();
- // keine Parameter vom BASIC nur Factory angegeben?
+ // No Parameters given and only factory given by BASIC ?
SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False);
SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, sal_False);
@@ -580,7 +575,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
SfxObjectShellLock xDoc;
String aTemplateRegion, aTemplateName, aTemplateFileName;
- sal_Bool bDirect = sal_False; // "uber FileName anstelle Region/Template
+ sal_Bool bDirect = sal_False; // use filename instead of region/template
SfxErrorContext aEc(ERRCTX_SFX_NEWDOC);
if ( !pTemplNameItem && !pTemplFileNameItem )
{
@@ -793,8 +788,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
rReq.RemoveItem( SID_FILE_NAME );
rReq.AppendItem( SfxStringItem( SID_FILE_NAME, aURL ) );
- // synchron ausf"uhren, damit beim Reschedulen nicht schon das n"achste Dokument
- // geladen wird
+ // execute synchronous, to avoid next document load at reschedule
// TODO/LATER: use URLList argument and always remove one document after another, each step in asychronous execution, until finished
// but only if reschedule is a problem
GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, *rReq.GetArgs() );
@@ -846,7 +840,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_False ) );
}
// pass URL to OS by using ShellExecuter or open it internal
- // if it seams to be an own format.
+ // if it seems to be an own format.
/* Attention!
There exist two possibilities to open hyperlinks:
a) using SID_OPENHYPERLINK (new)
diff --git a/main/vcl/win/source/app/saldata.cxx b/main/vcl/win/source/app/saldata.cxx
index 336a241..a75ee9e 100644
--- a/main/vcl/win/source/app/saldata.cxx
+++ b/main/vcl/win/source/app/saldata.cxx
@@ -93,7 +93,7 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 )
char c2;
do
{
- // Ist das Zeichen zwischen 'A' und 'Z' dann umwandeln
+ // translate if character is between 'A' and 'Z'
c1 = *pStr1;
c2 = *pStr2;
if ( (c1 >= 65) && (c1 <= 90) )