diff options
| author | 2008-11-18 15:49:22 +0000 | |
|---|---|---|
| committer | 2008-11-18 15:49:22 +0000 | |
| commit | 8c72dc7940e5b4910fc64b904aedf924cd13da41 (patch) | |
| tree | f8b621c080d78b211f55fa54261eb01cb06bcdbb /src | |
| parent | nth small patch to make perl run fine in both windows and linux (diff) | |
| download | KVIrc-8c72dc7940e5b4910fc64b904aedf924cd13da41.tar.gz KVIrc-8c72dc7940e5b4910fc64b904aedf924cd13da41.tar.bz2 KVIrc-8c72dc7940e5b4910fc64b904aedf924cd13da41.zip | |
small fixes around;
updated translation files;
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2892 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/kvs/kvi_kvs_object.cpp | 24 | ||||
| -rw-r--r-- | src/kvirc/kvs/kvi_kvs_popupmenu.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp | 10 | ||||
| -rw-r--r-- | src/modules/objects/class_wrapper.cpp | 2 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp index d07308fdd..7c8e6e724 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp @@ -289,7 +289,7 @@ namespace KviKvsCoreFunctions KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName); if(!pClass) { - KVSCF_pContext->error(__tr2qs_ctx("Class \"%Q\" is not defined","kvs"),&szClassName); + KVSCF_pContext->error(__tr2qs_ctx("Class '%Q' is not defined","kvs"),&szClassName); return false; } diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index bfbf069b9..c09ae2898 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -1027,7 +1027,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) KviWindow * w = c->context()->window(); if(!bArray) - w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Listing Qt properties for object named \"%Q\" of KVS class %Q","kvs"),&m_szName,&(m_pClass->name())); + w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Listing Qt properties for object named '%Q' of KVS class %Q","kvs"),&m_szName,&(m_pClass->name())); kvs_int_t cnt = 0; if(m_pObject) { @@ -1095,7 +1095,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!m_pObject) { // there are no Qt properties at all - c->warning(__tr2qs_ctx("The object named \"%Q\" of class %Q has no Qt properties","kvs"),&m_szName,&(m_pClass->name())); + c->warning(__tr2qs_ctx("The object named '%Q' of class '%Q' has no Qt properties","kvs"),&m_szName,&(m_pClass->name())); return true; } @@ -1132,7 +1132,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) #define WRONG_TYPE(__therighttype) \ { \ - c->warning(__tr2qs_ctx("The property is of type %s but the supplied argument can't be converted to that type (expecting \"%s\")","kvs"),p->type(),__therighttype); \ + c->warning(__tr2qs_ctx("The property is of type %s but the supplied argument can't be converted to that type (expecting '%s')","kvs"),p->type(),__therighttype); \ return true; \ } @@ -1295,7 +1295,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) break; default: - c->warning(__tr2qs_ctx("Property \"%Q\" for object named \"%Q\" of class %Q has an unsupported data type","kvs"),&szName,&m_szName,&(m_pClass->name())); + c->warning(__tr2qs_ctx("Property '%Q' for object named '%Q' of class '%Q' has an unsupported data type","kvs"),&szName,&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); break; } @@ -1317,7 +1317,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) if (bNoerror) c->returnValue()->setString("No Qt properties"); else { - c->warning(__tr2qs_ctx("The object named \"%Q\" of class %Q has no Qt properties","kvs"),&m_szName,&(m_pClass->name())); + c->warning(__tr2qs_ctx("The object named '%Q' of class '%Q' has no Qt properties","kvs"),&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); } return true; @@ -1330,7 +1330,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) c->returnValue()->setString("No Qt properties"); else { - c->warning(__tr2qs_ctx("No Qt property named \"%Q\" for object named \"%Q\" of class %Q","kvs"),&szName,&m_szName,&(m_pClass->name())); + c->warning(__tr2qs_ctx("No Qt property named '%Q' for object named '%Q' of class '%Q'","kvs"),&szName,&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); } return true; @@ -1339,7 +1339,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) const QMetaProperty * p = ∝ if(!p) { - c->warning(__tr2qs_ctx("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed but it doesn't really exist","kvs"),&szName,&m_szName,&(m_pClass->name())); + c->warning(__tr2qs_ctx("Can't find property named '%Q' for object named '%Q' of class '%Q': the property is indexed but it doesn't really exist","kvs"),&szName,&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); return true; } @@ -1347,7 +1347,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) QVariant v = m_pObject->property(szName.toUtf8().data()); if(!v.isValid()) { - c->warning(__tr2qs_ctx("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid","kvs"),&szName,&m_szName,&(m_pClass->name())); + c->warning(__tr2qs_ctx("Can't find property named '%Q' for object named '%Q' of class '%Q': the property is indexed and defined but the returned variant is not valid","kvs"),&szName,&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); return true; } @@ -1438,7 +1438,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) if (bNoerror) c->returnValue()->setString("Unsupported_data_type"); else { - c->warning(__tr2qs_ctx("Property \"%Q\" for object named \"%Q\" of class %Q has an unsupported data type","kvs"),&szName,&m_szName,&(m_pClass->name())); + c->warning(__tr2qs_ctx("Property '%Q' for object named '%Q' of class '%Q' has an unsupported data type","kvs"),&szName,&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); } break; @@ -1589,9 +1589,9 @@ bool KviKvsObject::callFunction( if(!h) { if(classOverride.isEmpty()) - pContext->error(__tr2qs_ctx("Cannot find object function $%Q for object named \"%Q\" of class %Q","kvs"),&fncName,&m_szName,&(getClass()->name())); + pContext->error(__tr2qs_ctx("Cannot find object function $%Q for object named '%Q' of class '%Q'","kvs"),&fncName,&m_szName,&(getClass()->name())); else - pContext->error(__tr2qs_ctx("Cannot find object function $%Q::%Q for object named \"%Q\" of class %Q","kvs"),&classOverride,&fncName,&m_szName,&(getClass()->name())); + pContext->error(__tr2qs_ctx("Cannot find object function $%Q::%Q for object named '%Q' of class '%Q'","kvs"),&classOverride,&fncName,&m_szName,&(getClass()->name())); return false; } @@ -1599,7 +1599,7 @@ bool KviKvsObject::callFunction( { if(pCaller != this) { - pContext->error(__tr2qs_ctx("Cannot call internal object function $%Q (for object named \"%Q\" of class %Q) from this context","kvs"),&fncName,&m_szName,&(getClass()->name())); + pContext->error(__tr2qs_ctx("Cannot call internal object function $%Q (for object named '%Q' of class '%Q') from this context","kvs"),&fncName,&m_szName,&(getClass()->name())); return false; } } diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp index 533a2e78c..32b0cacdb 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp @@ -223,7 +223,7 @@ QPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLev vRet.asString(szRet); QPixmap * p = g_pIconManager->getImage(szRet); - if(!p)pData->window()->output(KVI_OUT_PARSERWARNING,__tr2qs_ctx("Can't find the icon \"%Q\": ignoring","kvs"),&szRet); + if(!p)pData->window()->output(KVI_OUT_PARSERWARNING,__tr2qs_ctx("Can't find the icon '%Q': ignoring","kvs"),&szRet); return p; } @@ -495,7 +495,7 @@ void KviKvsPopupMenuItemExtMenu::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTop else id = pMenu->insertItem(szText,m_pMenu); pMenu->setItemParameter(id,iIdx); } else { - pData->window()->output(KVI_OUT_PARSERWARNING,__tr2qs_ctx("Can't find the external popup '%Q'; ignoring","kvs"),&m_szMenuName); + pData->window()->output(KVI_OUT_PARSERWARNING,__tr2qs_ctx("Can't find the external popup '%Q': ignoring","kvs"),&m_szMenuName); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp index 3307124af..15ff44291 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp @@ -45,7 +45,7 @@ void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::dump(const char * pref void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::contextDescription(QString &szBuffer) { - KviQString::sprintf(szBuffer,"Object Member Function Definition \"%Q\"",&m_szName); + KviQString::sprintf(szBuffer,"Object Member Function Definition '%Q'",&m_szName); } KviKvsTreeNodeSpecialCommandClass::KviKvsTreeNodeSpecialCommandClass(const QChar * pLocation,KviKvsTreeNodeDataList * pParams) @@ -72,7 +72,7 @@ void KviKvsTreeNodeSpecialCommandClass::addFunctionDefinition(KviKvsTreeNodeSpec void KviKvsTreeNodeSpecialCommandClass::contextDescription(QString &szBuffer) { - szBuffer = "Special Command \"class\""; + szBuffer = "Special Command 'class'"; } void KviKvsTreeNodeSpecialCommandClass::dump(const char * prefix) @@ -122,7 +122,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) KviKvsObjectClass * pBaseClass = KviKvsKernel::instance()->objectController()->lookupClass(szBaseClassName); if(!pBaseClass) { - c->error(this,__tr2qs_ctx("Couln't find base class named \"%Q\"","kvs"),&szBaseClassName); + c->error(this,__tr2qs_ctx("Couln't find base class named '%Q'","kvs"),&szBaseClassName); return false; } @@ -132,7 +132,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) { if(KviQString::equalCI(pClass->name(),szClassName)) { - c->error(this,__tr2qs_ctx("Detected a loop in the inheritance tree of the base class \"%Q\": redefine that class first","kvs"),&szBaseClassName); + c->error(this,__tr2qs_ctx("Detected a loop in the inheritance tree of the base class '%Q': redefine that class first","kvs"),&szBaseClassName); return false; } pClass = pClass->parentClass(); @@ -141,7 +141,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) KviKvsObjectClass * pActualClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName,true); if(pActualClass) { - c->error(this,__tr2qs_ctx("Can't override the builtin class \"%Q\"","kvs"),&szClassName); + c->error(this,__tr2qs_ctx("Can't override the builtin class '%Q'","kvs"),&szClassName); return false; } pActualClass = new KviKvsObjectClass(pBaseClass,szClassName,0,false); diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index a69560d63..117c8b20c 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -161,7 +161,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis } if( !pWidget ) { - pContext->warning(__tr2qs_ctx("Failed to find one of the wrap path widgets ('%Q'::'%Q')","objects"),&szClass,&szName); + pContext->warning(__tr2qs_ctx("Failed to find one of the wrap path widgets ('%Q::%Q')","objects"),&szClass,&szName); return false; } } |
