From c02d5ef1d6f40a702a88c5c67e8d5dbc563ab7c8 Mon Sep 17 00:00:00 2001 From: Elvio Basello Date: Thu, 23 Oct 2008 17:16:32 +0000 Subject: updated translations git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2770 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/objects/class_file.cpp | 19 +++++-- src/modules/objects/class_groupbox.cpp | 22 ++++---- src/modules/objects/class_label.cpp | 88 +++++++++++++++-------------- src/modules/objects/class_lcd.cpp | 5 +- src/modules/objects/class_multilineedit.cpp | 8 +-- src/modules/objects/class_painter.cpp | 9 +-- src/modules/objects/class_socket.cpp | 6 +- src/modules/objects/class_toolbar.cpp | 2 +- src/modules/objects/class_widget.cpp | 6 +- src/modules/options/optw_identity.cpp | 6 +- 10 files changed, 90 insertions(+), 81 deletions(-) (limited to 'src/modules') diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index d642cfe03..823bde943 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -246,7 +246,7 @@ KVSO_CLASS_FUNCTION(file,open) if(mod!=QIODevice::ReadOnly) sum = sum | mod; else - c->warning(__tr2qs_ctx("No such open mode: '%Q'","objects"),&modes.at(idx)); + c->warning(__tr2qs_ctx("No such open mode '%Q'","objects"),&modes.at(idx)); } } @@ -318,19 +318,21 @@ KVSO_CLASS_FUNCTION(file,putch) KVSO_PARAMETERS_END(c) if (szChar.length()>1)c->warning(__tr2qs_ctx("Argument to long, using only first char","objects")); const char *ch=szChar.toUtf8().data(); - if (!m_pFile->putChar(ch[0])) c->warning(__tr2qs_ctx("Write error occured !","objects")); + if (!m_pFile->putChar(ch[0])) c->warning(__tr2qs_ctx("Write error occured!","objects")); return true; } + KVSO_CLASS_FUNCTION(file,getch) { CHECK_INTERNAL_POINTER(m_pFile) CHECK_FILE_IS_OPEN char ch; - if (!m_pFile->getChar(&ch)) c->warning(__tr2qs_ctx("Read error occured !","objects")); // c->error ? + if (!m_pFile->getChar(&ch)) c->warning(__tr2qs_ctx("Read error occured!","objects")); // c->error ? QString szChar = QChar(ch); c->returnValue()->setString(szChar); return true; } + KVSO_CLASS_FUNCTION(file,unGetch) { CHECK_INTERNAL_POINTER(m_pFile) @@ -339,11 +341,12 @@ KVSO_CLASS_FUNCTION(file,unGetch) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("char",KVS_PT_STRING,0,szChar) KVSO_PARAMETERS_END(c) - if (szChar.length()>1) c->warning(__tr2qs_ctx("Argument to long, using only first char","objects")); + if (szChar.length()>1) c->warning(__tr2qs_ctx("Argument too long, using only the first char","objects")); const char *ch=szChar.toUtf8().data(); m_pFile->ungetChar(ch[0]); return true; } + KVSO_CLASS_FUNCTION(file,readBlock) { CHECK_INTERNAL_POINTER(m_pFile) @@ -384,6 +387,7 @@ KVSO_CLASS_FUNCTION(file,readBlock) } return true; } + KVSO_CLASS_FUNCTION(file,read) { CHECK_INTERNAL_POINTER(m_pFile) @@ -436,6 +440,7 @@ KVSO_CLASS_FUNCTION(file,read) } return true; } + KVSO_CLASS_FUNCTION(file,write) { CHECK_INTERNAL_POINTER(m_pFile) @@ -459,7 +464,6 @@ KVSO_CLASS_FUNCTION(file,write) return true; } - KVSO_CLASS_FUNCTION(file,writeBlock) { CHECK_INTERNAL_POINTER(m_pFile) @@ -522,6 +526,7 @@ KVSO_CLASS_FUNCTION(file,writeBlock) } return true; } + KVSO_CLASS_FUNCTION(file,readLine) { CHECK_INTERNAL_POINTER(m_pFile) @@ -531,6 +536,7 @@ KVSO_CLASS_FUNCTION(file,readLine) c->returnValue()->setString(buffer); return true; } + KVSO_CLASS_FUNCTION(file,writeLine) { CHECK_INTERNAL_POINTER(m_pFile) @@ -543,6 +549,7 @@ KVSO_CLASS_FUNCTION(file,writeLine) ts << szLine; return true; } + KVSO_CLASS_FUNCTION(file,readHexBlock) { CHECK_INTERNAL_POINTER(m_pFile) @@ -574,6 +581,7 @@ KVSO_CLASS_FUNCTION(file,readHexBlock) delete buff; return true; } + KVSO_CLASS_FUNCTION(file,writeHexBlock) { CHECK_INTERNAL_POINTER(m_pFile) @@ -612,4 +620,3 @@ KVSO_CLASS_FUNCTION(file,writeHexBlock) c->returnValue()->setInteger(uLen/2); return true; } - diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index f272ed193..7c5105e37 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -35,15 +35,17 @@ // Tables used in $setAlignment , $alignment and in $setOrientation & $orientation const char * const align_tbl[] = { - "Left", - "Right", - "HCenter" - }; + "Left", + "Right", + "HCenter" +}; + const int align_cod[] = { - Qt::AlignLeft, - Qt::AlignRight, - Qt::AlignHCenter - }; + Qt::AlignLeft, + Qt::AlignRight, + Qt::AlignHCenter +}; + #define align_num (sizeof(align_tbl) / sizeof(align_tbl[0])) @@ -310,7 +312,7 @@ KVSO_CLASS_FUNCTION(groupbox,setAlignment) return true; } } - c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objets"),&szAlign); + c->warning(__tr2qs_ctx("Unknown alignment '%Q'","objets"),&szAlign); return true; } @@ -343,7 +345,7 @@ KVSO_CLASS_FUNCTION(groupbox,setOrientation) else if(KviQString::equalCI(szMode, "Vertical")) ((KviTalGroupBox *)widget())->setOrientation(Qt::Horizontal); - else c->warning( __tr2qs_ctx("Unknown orientation: '%Q'","objects"),&szMode); + else c->warning( __tr2qs_ctx("Unknown orientation '%Q'","objects"),&szMode); return true; } diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index ba0238c34..555631fd4 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -38,54 +38,52 @@ // Tables used in $setAlignment & $alignment const char * const align_tbl[] = { - "Left", - "Right", - "HCenter", - "VCenter", - "Center", - "Top", - "Bottom", - "WordBreak" - }; - - + "Left", + "Right", + "HCenter", + "VCenter", + "Center", + "Top", + "Bottom", + "WordBreak" +}; const int align_cod[] = { - Qt::AlignLeft, - Qt::AlignRight, - Qt::AlignHCenter, - Qt::AlignVCenter, - Qt::AlignCenter, - Qt::AlignTop, - Qt::AlignBottom, - Qt::AlignJustify, - }; + Qt::AlignLeft, + Qt::AlignRight, + Qt::AlignHCenter, + Qt::AlignVCenter, + Qt::AlignCenter, + Qt::AlignTop, + Qt::AlignBottom, + Qt::AlignJustify, +}; #define align_num (sizeof(align_tbl) / sizeof(align_tbl[0])) // used in $frameStyle & $setFrameStyle const char * const frame_tbl[] = { - "NoFrame", - "Box", - "Panel", - "WinPanel", - "Hline", - // shadow styles - "Plain", - "Raised", - "Sunken" - }; + "NoFrame", + "Box", + "Panel", + "WinPanel", + "Hline", + // shadow styles + "Plain", + "Raised", + "Sunken" +}; const int frame_cod[] = { - QFrame::NoFrame, - QFrame::Box, - QFrame::Panel, - QFrame::WinPanel, - QFrame::HLine, - QFrame::Plain, - QFrame::Raised, - QFrame::Sunken - }; + QFrame::NoFrame, + QFrame::Box, + QFrame::Panel, + QFrame::WinPanel, + QFrame::HLine, + QFrame::Plain, + QFrame::Raised, + QFrame::Sunken +}; #define frame_num (sizeof(frame_tbl) / sizeof(frame_tbl[0])) @@ -223,6 +221,7 @@ KVSO_CLASS_FUNCTION(label,setText) ((QLabel *)widget())->setText(szText); return true; } + KVSO_CLASS_FUNCTION(label,text) { CHECK_INTERNAL_POINTER(widget()) @@ -237,7 +236,7 @@ KVSO_CLASS_FUNCTION(label,setMargin) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,iMargin) KVSO_PARAMETERS_END(c) - ((QLabel *)widget())->setMargin(iMargin); + ((QLabel *)widget())->setMargin(iMargin); return true; } KVSO_CLASS_FUNCTION(label,margin) @@ -289,12 +288,13 @@ KVSO_CLASS_FUNCTION(label,setAlignment) if(align) sum = sum | align; else - c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objects"),&(*it)); + c->warning(__tr2qs_ctx("Unknown alignment '%Q'","objects"),&(*it)); } ((QLabel *)widget())->setAlignment((Qt::Alignment)sum); return true; } + KVSO_CLASS_FUNCTION(label,alignment) { CHECK_INTERNAL_POINTER(widget()) @@ -311,6 +311,7 @@ KVSO_CLASS_FUNCTION(label,alignment) c->returnValue()->setString(szAlignment); return true; } + KVSO_CLASS_FUNCTION(label,clear) { CHECK_INTERNAL_POINTER(widget()) @@ -341,13 +342,13 @@ KVSO_CLASS_FUNCTION(label,setFrameStyle) if(framestyle) sum = sum | framestyle; else - c->warning(__tr2qs_ctx("Unknown style: '%Q'","objects"),&(*it)); + c->warning(__tr2qs_ctx("Unknown style '%Q'","objects"),&(*it)); } ((QLabel *)widget())->setFrameStyle(sum); return true; - } + KVSO_CLASS_FUNCTION(label,frameStyle) { CHECK_INTERNAL_POINTER(widget()) @@ -364,6 +365,7 @@ KVSO_CLASS_FUNCTION(label,frameStyle) c->returnValue()->setString(szStyle); return true; } + KVSO_CLASS_FUNCTION(label,setImage) { CHECK_INTERNAL_POINTER(widget()) diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index 5f70501ca..831508f5c 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -139,7 +139,7 @@ KVSO_CLASS_FUNCTION(lcd,setMode) else if(KviQString::equalCI(szMode, "DEC")) ((QLCDNumber *)widget())->setDecMode(); else if(KviQString::equalCI(szMode, "BIN")) ((QLCDNumber *)widget())->setBinMode(); else if(KviQString::equalCI(szMode, "OCT")) ((QLCDNumber *)widget())->setOctMode(); - else c->warning( __tr2qs_ctx("Unknown mode: '%Q'","objects"),&szMode); + else c->warning( __tr2qs_ctx("Unknown mode '%Q'","objects"),&szMode); return true; } @@ -153,7 +153,7 @@ KVSO_CLASS_FUNCTION(lcd,setSegmentStyle) if(KviQString::equalCI(szStyle, "Outline")) ((QLCDNumber *)widget())->setSegmentStyle(QLCDNumber::Outline); else if(KviQString::equalCI(szStyle, "Filled")) ((QLCDNumber *)widget())->setSegmentStyle(QLCDNumber::Filled); else if(KviQString::equalCI(szStyle, "Flat")) ((QLCDNumber *)widget())->setSegmentStyle(QLCDNumber::Flat); - else c->warning( __tr2qs_ctx("Unknown segment style: '%Q'","objects"),&szStyle); + else c->warning( __tr2qs_ctx("Unknown segment style '%Q'","objects"),&szStyle); return true; } @@ -178,6 +178,7 @@ KVSO_CLASS_FUNCTION(lcd,setSmallDecimalPoint) ((QLCDNumber *)widget())->setSmallDecimalPoint(bFlag); return true; } + KVSO_CLASS_FUNCTION(lcd,checkOverflow) { CHECK_INTERNAL_POINTER(widget()) diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index 91dbe6301..781675a6b 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -876,7 +876,7 @@ bool KviKvsObject_textedit::functionsetColor(KviKvsObjectFunctionCall * c) int i=0; if (value.length()!=6) { - c->warning(__tr2qs("A string of 6 digits hex is required")); + c->warning(__tr2qs("A string of 6 hex digits is required")); return true; } QString buffer(value.mid(0,2)); @@ -887,7 +887,7 @@ bool KviKvsObject_textedit::functionsetColor(KviKvsObjectFunctionCall * c) iColB=buffer.toInt(&bOk2,16); if (!bOk || !bOk1 || !bOk2) { - c->warning(__tr2qs("Not an hex digits")); + c->warning(__tr2qs("Not an hex digit")); return true; } // if (widget()) ((QTextEdit *)widget())->setColor(QColor(iColR,iColG,iColB)); @@ -1077,7 +1077,7 @@ bool KviKvsObject_textedit::functionsetParagraphBackgroundColor(KviKvsObjectFunc int i=0; if (value.length()!=6) { - c->warning(__tr2qs("A string of 6 digits hex is required")); + c->warning(__tr2qs("A string of 6 hex digits is required")); return true; } QString buffer(value.mid(0,2)); @@ -1088,7 +1088,7 @@ bool KviKvsObject_textedit::functionsetParagraphBackgroundColor(KviKvsObjectFunc iColB=buffer.toInt(&bOk2,16); if (!bOk || !bOk1 || !bOk2) { - c->warning(__tr2qs("Not an hex digits")); + c->warning(__tr2qs("Not an hex digit")); return true; } //if (widget()) ((QTextEdit *)widget())->setParagraphBackgroundColor(iParagraph,QColor(iColR,iColG,iColB)); diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index d73c51c8c..e91b267fb 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -1441,7 +1441,7 @@ bool KviKvsObject_painter::functionsetBrushStyle(KviKvsObjectFunctionCall *c) brush.setStyle(brushstyles_cod[j]); m_pPainter->setBrush(brush); } - else c->warning(__tr2qs("Unknown brushn style %Q"),&szStyle); + else c->warning(__tr2qs("Unknown brush style %Q"),&szStyle); return true; } @@ -1506,7 +1506,7 @@ bool KviKvsObject_painter::functionsetGradientColor(KviKvsObjectFunctionCall *c) { if(c->paramCount()<4) { - c->error(__tr2qs("Color name or triplette rgb/hsv values required")); + c->error(__tr2qs("Color name or triplette RGB/HSV values required")); return true; } if ( !var2->asInteger(iCol2)||!var3->asInteger(iCol3)) @@ -1670,7 +1670,4 @@ bool KviKvsObject_painter::functionresetPath(KviKvsObjectFunctionCall *c) #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_painter.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES - - - +#endif //COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index ff8528c0e..b113f3e32 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -509,7 +509,7 @@ KVSO_CLASS_FUNCTION(socket,write) KviFile *pFile=((KviKvsObject_file *)pObject)->pFile(); if (!pFile->isOpen()) { - c->warning(__tr2qs_ctx("File is not open !","objects")); + c->warning(__tr2qs_ctx("File is not open!","objects")); return true; } if (!uLen) uLen=pFile->size(); @@ -702,7 +702,7 @@ KVSO_CLASS_FUNCTION(socket,listen) #ifndef COMPILE_IPV6_SUPPORT if(m_bIPv6) { - c->warning(__tr2qs("No IPV6 support in this executable")); + c->warning(__tr2qs("No IPv6 support in this executable")); c->returnValue()->setBoolean(false); reset(); return true; @@ -724,7 +724,7 @@ KVSO_CLASS_FUNCTION(socket,listen) m_bIPv6 = true; } else { #else - c->warning(__tr2qs_ctx("Invalid IP address specified ('%Q')","objects"),&m_szLocalIp); + c->warning(__tr2qs_ctx("Invalid IP address specified (%Q)","objects"),&m_szLocalIp); c->returnValue()->setBoolean(false); reset(); return true; diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index 880878c7b..cf76e4e9a 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -80,7 +80,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis { if (!parentObject()) { - pContext->warning(__tr2qs_ctx("the toolbar cannot be a parent-widget!","objects")); + pContext->warning(__tr2qs_ctx("The toolbar cannot be a parent-widget!","objects")); return true; } if(parentObject()->inheritsClass("mainwindow")) diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index c3dff4b7e..b4797dfc9 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1255,7 +1255,7 @@ bool KviKvsObject_widget::function_setPaletteForeground(KviKvsObjectFunctionCall int i=0; if (value.length()!=6) { - c->warning(__tr2qs("A string of 6 digits hex is required")); + c->warning(__tr2qs("A string of 6 hex digits is required")); return true; } QString buffer(value.mid(0,2)); @@ -1266,7 +1266,7 @@ bool KviKvsObject_widget::function_setPaletteForeground(KviKvsObjectFunctionCall iColB=buffer.toInt(&bOk2,16); if (!bOk || !bOk1 || !bOk2) { - c->warning(__tr2qs("Not an hex digits")); + c->warning(__tr2qs("Not an hex digit")); return true; } if (widget()) @@ -1342,7 +1342,7 @@ bool KviKvsObject_widget::function_setBackgroundColor(KviKvsObjectFunctionCall * int i=0; if (value.length()!=6) { - c->warning(__tr2qs("A string of 6 digits hex is required")); + c->warning(__tr2qs("A string of 6 hex digits is required")); return true; } QString buffer(value.mid(0,2)); diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 08d2e53f2..250d822bf 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -700,10 +700,10 @@ KviIdentityProfileOptionsWidget::KviIdentityProfileOptionsWidget(QWidget * pPare KviTalToolTip::add(m_pTreeWidget, \ __tr2qs_ctx("
This is a set of rules to use profiles." \ - "KVIrc will use them to handle the user connection" \ + "KVIrc will use them to handle the user connection " \ "data before the data is sent to the IRC server.
" \ - "This is useful if a user wants to use different data" \ - "on different networks without changing them at every" \ + "This is useful if a user wants to use different data " \ + "on different networks without changing them at every " \ "connection attempt.","options")); pLayout->addWidget(m_pTreeWidget,1,0,1,3); connect(m_pTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(toggleControls())); -- cgit v1.3.1-10-gc9f91