mark some strings untranslatable

diff --git a/po/quassel.pot b/po/quassel.pot
index d460562..f7cc960 100644 (file)
--- a/po/quassel.pot
+++ b/po/quassel.pot
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Project-Id-Version: Quassel IRC\n"
-"PO-Revision-Date: 2011-06-03 06:57+0000\n"
+"PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en_US\n"
@@ -3688,11 +3688,6 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr ""
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:272
-msgctxt "ItemViewSettingsPage|"
-msgid "1"
-msgstr ""
-
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:286
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
@@ -5726,7 +5721,7 @@ msgstr ""
 #: ../src/uisupport/uistyle.cpp:577 ../src/uisupport/uistyle.cpp:580
 #: ../src/uisupport/uistyle.cpp:620 ../src/uisupport/uistyle.cpp:623
 #: ../src/uisupport/uistyle.cpp:626 ../src/uisupport/uistyle.cpp:633
-#: ../src/uisupport/uistyle.cpp:665 ../src/uisupport/uistyle.cpp:739
+#: ../src/uisupport/uistyle.cpp:665
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%1"
@@ -5830,67 +5825,6 @@ msgctxt "UiStyle::StyledMessage|"
 msgid "<%1>"
 msgstr ""
 
-#: ../src/uisupport/uistyle.cpp:707
-msgctxt "UiStyle::StyledMessage|"
-msgid "-*-"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:709
-msgctxt "UiStyle::StyledMessage|"
-msgid "<->"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:711
-msgctxt "UiStyle::StyledMessage|"
-msgid "***"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:713
-msgctxt "UiStyle::StyledMessage|"
-msgid "-->"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:715 ../src/uisupport/uistyle.cpp:717
-msgctxt "UiStyle::StyledMessage|"
-msgid "<--"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:719
-msgctxt "UiStyle::StyledMessage|"
-msgid "<-*"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:721
-msgctxt "UiStyle::StyledMessage|"
-msgid "<-x"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:723 ../src/uisupport/uistyle.cpp:725
-#: ../src/uisupport/uistyle.cpp:727 ../src/uisupport/uistyle.cpp:731
-msgctxt "UiStyle::StyledMessage|"
-msgid "*"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:729
-msgctxt "UiStyle::StyledMessage|"
-msgid "-"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:733
-msgctxt "UiStyle::StyledMessage|"
-msgid "=>"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:735
-msgctxt "UiStyle::StyledMessage|"
-msgid "<="
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:737
-msgctxt "UiStyle::StyledMessage|"
-msgid "->"
-msgstr ""
-
 #: ../src/client/networkmodel.cpp:697
 #, qt-format
 msgctxt "UserCategoryItem|"

diff --git a/src/qtui/settingspages/itemviewsettingspage.ui b/src/qtui/settingspages/itemviewsettingspage.ui
index b1088be..8a0a3ca 100644 (file)
--- a/src/qtui/settingspages/itemviewsettingspage.ui
+++ b/src/qtui/settingspages/itemviewsettingspage.ui
@@ -269,7 +269,7 @@
            </attribute>
            <column>
             <property name="text">
-             <string>1</string>
+             <string notr="true">1</string>
             </property>
            </column>
           </widget>

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index b08134b..f04dcf2 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -704,39 +704,39 @@ QString UiStyle::StyledMessage::decoratedSender() const {
     case Message::Notice:
       return tr("[%1]").arg(plainSender()); break;
     case Message::Action:
-      return tr("-*-"); break;
+      return "-*-"; break;
     case Message::Nick:
-      return tr("<->"); break;
+      return "<->"; break;
     case Message::Mode:
-      return tr("***"); break;
+      return "***"; break;
     case Message::Join:
-      return tr("-->"); break;
+      return "-->"; break;
     case Message::Part:
-      return tr("<--"); break;
+      return "<--"; break;
     case Message::Quit:
-      return tr("<--"); break;
+      return "<--"; break;
     case Message::Kick:
-      return tr("<-*"); break;
+      return "<-*"; break;
     case Message::Kill:
-      return tr("<-x"); break;
+      return "<-x"; break;
     case Message::Server:
-      return tr("*"); break;
+      return "*"; break;
     case Message::Info:
-      return tr("*"); break;
+      return "*"; break;
     case Message::Error:
-      return tr("*"); break;
+      return "*"; break;
     case Message::DayChange:
-      return tr("-"); break;
+      return "-"; break;
     case Message::Topic:
-      return tr("*"); break;
+      return "*"; break;
     case Message::NetsplitJoin:
-      return tr("=>"); break;
+      return "=>"; break;
     case Message::NetsplitQuit:
-      return tr("<="); break;
+      return "<="; break;
     case Message::Invite:
-      return tr("->"); break;
+      return "->"; break;
     default:
-      return tr("%1").arg(plainSender());
+      return QString("%1").arg(plainSender());
   }
 }