[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/kdeui
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2004-10-08 9:41:38
Message-ID: 20041008094138.4027116B54 () office ! kde ! org
[Download RAW message or body]

CVS commit by lukas: 

i18n fix, please forward port


  M +10 -10    kedittoolbar.cpp   1.99.2.1


--- kdelibs/kdeui/kedittoolbar.cpp  #1.99:1.99.2.1
@@ -48,6 +48,6 @@
 #include <kprocio.h>
 
-#define LINESEPARATORSTRING i18n("--- line separator ---")
-#define SEPARATORSTRING i18n("--- separator ---")
+#define LINESEPARATORSTRING I18N_NOOP("--- line separator ---")
+#define SEPARATORSTRING I18N_NOOP("--- separator ---")
 
 static void dump_xml(const QDomDocument& doc)
@@ -106,7 +106,7 @@ public:
   {
     QString s = text( column );
-    if ( s == LINESEPARATORSTRING )
+    if ( s == i18n(LINESEPARATORSTRING) )
       return "0";
-    if ( s == SEPARATORSTRING )
+    if ( s == i18n(SEPARATORSTRING) )
       return "1";
     return "2" + s;
@@ -884,7 +884,7 @@ void KEditToolbarWidget::loadActionList(
       bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == \
QString::fromLatin1("true") );  if(isLineSep)
-        act->setText(1, LINESEPARATORSTRING);
+        act->setText(1, i18n(LINESEPARATORSTRING));
       else
-        act->setText(1, SEPARATORSTRING);
+        act->setText(1, i18n(SEPARATORSTRING));
       it.setAttribute( attrName, act->internalName() );
       continue;
@@ -955,7 +955,7 @@ void KEditToolbarWidget::loadActionList(
   // finally, add default separators to the inactive list
   ToolbarItem *act = new ToolbarItem(m_inactiveList, tagSeparator, \
                sep_name.arg(sep_num++), QString::null);
-  act->setText(1, LINESEPARATORSTRING);
+  act->setText(1, i18n(LINESEPARATORSTRING));
   act = new ToolbarItem(m_inactiveList, tagSeparator, sep_name.arg(sep_num++), \
                QString::null);
-  act->setText(1, SEPARATORSTRING);
+  act->setText(1, i18n(SEPARATORSTRING));
 }
 
@@ -1104,7 +1104,7 @@ void KEditToolbarWidget::insertActive(To
   QDomElement new_item;
   // let's handle the separator specially
-  if (item->text(1) == LINESEPARATORSTRING) {
+  if (item->text(1) == i18n(LINESEPARATORSTRING)) {
     new_item = domDocument().createElement(tagSeparator);
-  } else if (item->text(1) == SEPARATORSTRING) {
+  } else if (item->text(1) == i18n(SEPARATORSTRING)) {
     new_item = domDocument().createElement(tagSeparator);
     new_item.setAttribute(attrLineSeparator, "false");


[prev in list] [next in list] [prev in thread] [next in thread]