X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fzh_CN.po;h=2cd37ef1631d5b7b3772e8ecbe45db854162982b;hp=4b6615880049cfcba76cedfee896857363abd044;hb=c83924a406438a3d51b496737a598ead54b44856;hpb=12de4bc686cb6412a5018c157157c45e9fef67ca

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4b661588..2cd37ef1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quassel IRC\n"
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
-"PO-Revision-Date: 2012-01-23 18:06+0000\n"
-"Last-Translator: Daniel Albers <daniel@lbers.com>\n"
+"PO-Revision-Date: 2012-01-24 15:34+0000\n"
+"Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -730,7 +730,7 @@ msgstr "过滤器："
 
 #: ../src/qtui/ui/channellistdlg.ui:98
 msgctxt "ChannelListDlg|"
-msgid "Errors Occured:"
+msgid "Errors Occurred:"
 msgstr "发生错误："
 
 #: ../src/qtui/ui/channellistdlg.ui:132
@@ -3739,11 +3739,6 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr "其他活动："
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:272
-msgctxt "ItemViewSettingsPage|"
-msgid "1"
-msgstr "1"
-
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:286
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
@@ -4314,8 +4309,8 @@ msgstr "正在接收储备"
 #: ../src/uisupport/multilineedit.cpp:661
 #, qt-format
 msgctxt "MultiLineEdit|"
-msgid "Do you really want to paste %n lines?"
-msgid_plural "Do you really want to paste %n lines?"
+msgid "Do you really want to paste %n line(s)?"
+msgid_plural "Do you really want to paste %n line(s)?"
 msgstr[0] "您真的想粘贴 %n 行吗？"
 
 #: ../src/uisupport/multilineedit.cpp:670
@@ -5789,7 +5784,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"
@@ -5893,67 +5888,6 @@ msgctxt "UiStyle::StyledMessage|"
 msgid "<%1>"
 msgstr "<%1>"
 
-#: ../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 "<-x"
-
-#: ../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|"