merge new nb_NO translation

2 files changed, 118 insertions, 114 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index f85e86f76..b7cff05dd 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index c79e0ae68..b37024a09 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-20 12:57+0400\n"
+"POT-Creation-Date: 2008-05-27 00:22+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <[email protected]>\n"
 "Language-Team: hicode.org <[email protected]>\n"
@@ -12,107 +12,107 @@ msgstr ""
 "X-Poedit-Country: china\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: backend.php:103 backend.php:112 backend.php:123
+#: backend.php:108 backend.php:117 backend.php:128
 msgid "Use default"
 msgstr "用户默认"
 
-#: backend.php:104
+#: backend.php:109
 msgid "Never purge"
 msgstr "从未"
 
-#: backend.php:105
+#: backend.php:110
 msgid "1 week old"
 msgstr "1周前"
 
-#: backend.php:106
+#: backend.php:111
 msgid "2 weeks old"
 msgstr "2周前"
 
-#: backend.php:107
+#: backend.php:112
 msgid "1 month old"
 msgstr "1月前"
 
-#: backend.php:108
+#: backend.php:113
 msgid "2 months old"
 msgstr "2月前"
 
-#: backend.php:109
+#: backend.php:114
 msgid "3 months old"
 msgstr "3月前"
 
-#: backend.php:113
+#: backend.php:118
 msgid "Disable updates"
 msgstr "禁用更新"
 
-#: backend.php:114
+#: backend.php:119
 msgid "Each 15 minutes"
 msgstr "每15分钟"
 
-#: backend.php:115
+#: backend.php:120
 msgid "Each 30 minutes"
 msgstr "每30分钟"
 
-#: backend.php:116
+#: backend.php:121
 msgid "Hourly"
 msgstr "每小时"
 
-#: backend.php:117
+#: backend.php:122
 msgid "Each 4 hours"
 msgstr "每4小时"
 
-#: backend.php:118
+#: backend.php:123
 msgid "Each 12 hours"
 msgstr "每12小时"
 
-#: backend.php:119
+#: backend.php:124
 msgid "Daily"
 msgstr "每天"
 
-#: backend.php:120
+#: backend.php:125
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:124
+#: backend.php:129
 #, fuzzy
 msgid "Magpie"
 msgstr "页"
 
-#: backend.php:125
+#: backend.php:130
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:134
+#: backend.php:139
 msgid "User"
 msgstr "用户"
 
-#: backend.php:135
+#: backend.php:140
 msgid "Power User"
 msgstr ""
 
-#: backend.php:136
+#: backend.php:141
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:400 modules/pref-users.php:295
+#: backend.php:420 modules/pref-users.php:295
 msgid "Registered"
 msgstr ""
 
-#: backend.php:401
+#: backend.php:421
 #, fuzzy
 msgid "Last logged in"
 msgstr "最后登陆"
 
-#: backend.php:402
+#: backend.php:422
 #, fuzzy
 msgid "Stored articles"
 msgstr "星级文章"
 
-#: backend.php:409
+#: backend.php:429
 #, fuzzy
 msgid "Subscribed feeds count"
 msgstr "订阅feed:"
 
-#: backend.php:424
+#: backend.php:444
 #, fuzzy
 msgid "Subscribed feeds"
 msgstr "订阅feed:"
@@ -173,193 +173,193 @@ msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
 "\t\t官方网站获取更多信息。"
 
-#: functions.php:2526 functions.php:2865 functions.php:3235 functions.php:4088
+#: functions.php:2544 functions.php:2908 functions.php:3278 functions.php:4119
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2535 functions.php:2867 functions.php:3238 functions.php:4095
+#: functions.php:2560 functions.php:2910 functions.php:3281 functions.php:4126
 #: modules/pref-feeds.php:1146
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2544 functions.php:2869 functions.php:3241 functions.php:4073
+#: functions.php:2576 functions.php:2912 functions.php:3284 functions.php:4104
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2787 modules/popup-dialog.php:151
+#: functions.php:2830 modules/popup-dialog.php:151
 #: modules/pref-filters.php:340
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2816 functions.php:2855 functions.php:3213 functions.php:4254
-#: functions.php:4284 modules/pref-feeds.php:977
+#: functions.php:2859 functions.php:2898 functions.php:3256 functions.php:4280
+#: functions.php:4310 modules/pref-feeds.php:977
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2845 functions.php:3400
+#: functions.php:2888 functions.php:3443
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2847 functions.php:3402
+#: functions.php:2890 functions.php:3445
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:3199 functions.php:3201
+#: functions.php:3242 functions.php:3244
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:3217 functions.php:3230 functions.php:3236 functions.php:3239
-#: functions.php:3242 functions.php:3250
+#: functions.php:3260 functions.php:3273 functions.php:3279 functions.php:3282
+#: functions.php:3285 functions.php:3293
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:3864 functions.php:3913 functions.php:5137
+#: functions.php:3907 functions.php:3956 functions.php:5160
 #: modules/pref-feeds.php:758 modules/pref-feeds.php:939
 #: modules/pref-filters.php:292 modules/pref-labels.php:269
 #: modules/pref-users.php:286
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:3865 functions.php:3914 modules/pref-feeds.php:759
+#: functions.php:3908 functions.php:3957 modules/pref-feeds.php:759
 #: modules/pref-feeds.php:940 modules/pref-filters.php:293
 #: modules/pref-labels.php:270 modules/pref-users.php:287
 msgid "All"
 msgstr "所有"
 
-#: functions.php:3866 functions.php:3871 functions.php:3915 functions.php:3918
-#: tt-rss.php:200
+#: functions.php:3909 functions.php:3914 functions.php:3958 functions.php:3961
+#: tt-rss.php:191
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:3867 functions.php:3916 modules/pref-feeds.php:760
+#: functions.php:3910 functions.php:3959 modules/pref-feeds.php:760
 #: modules/pref-feeds.php:941 modules/pref-filters.php:294
 #: modules/pref-labels.php:271 modules/pref-users.php:288
 msgid "None"
 msgstr "无"
 
-#: functions.php:3869 tt-rss.php:151 modules/pref-feeds.php:1100
+#: functions.php:3912 tt-rss.php:142 modules/pref-feeds.php:1100
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:3870
+#: functions.php:3913
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:3872 functions.php:3919 tt-rss.php:199
+#: functions.php:3915 functions.php:3962 tt-rss.php:190
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:3873
+#: functions.php:3916
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:3875 functions.php:3921
+#: functions.php:3918 functions.php:3964
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:3876
+#: functions.php:3919
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:3890
+#: functions.php:3933
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:3893 tt-rss.php:166
+#: functions.php:3936 tt-rss.php:157
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: functions.php:3900 functions.php:3902
+#: functions.php:3943 functions.php:3945
 #, fuzzy
 msgid "Search to label"
 msgstr "转换标签"
 
-#: functions.php:3918
+#: functions.php:3961
 msgid "Toggle:"
 msgstr "触发:"
 
-#: functions.php:3922
+#: functions.php:3965
 msgid "Page"
 msgstr "页"
 
-#: functions.php:3923 modules/pref-filters.php:329
+#: functions.php:3966 modules/pref-filters.php:329
 msgid "Feed"
 msgstr "Feed"
 
-#: functions.php:3930
+#: functions.php:3973
 msgid "Convert to label"
 msgstr "转换标签"
 
-#: functions.php:3977
+#: functions.php:4020
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4061
+#: functions.php:4092
 msgid "Dashboard"
 msgstr ""
 
-#: functions.php:4324
+#: functions.php:4330
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4341
+#: functions.php:4347
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4566
+#: functions.php:4573
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4621
+#: functions.php:4628
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:4652 functions.php:5096
+#: functions.php:4659 functions.php:5119
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4654 functions.php:5098
+#: functions.php:4661 functions.php:5121
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4664 functions.php:5107
+#: functions.php:4671 functions.php:5130
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4737 modules/pref-feed-browser.php:75
+#: functions.php:4744 modules/pref-feed-browser.php:75
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4806
+#: functions.php:4813
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4917
+#: functions.php:4926
 msgid "(Click to change)"
 msgstr ""
 
-#: functions.php:5066
+#: functions.php:5099
 #, fuzzy
-msgid "Show article"
+msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5204
+#: functions.php:5227
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5207
+#: functions.php:5230
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5210
+#: functions.php:5233
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
@@ -372,7 +372,7 @@ msgstr "显示Feed"
 msgid "display tags"
 msgstr "显示标签"
 
-#: localized_js.php:37 prefs.php:74 prefs.php:159 tt-rss.php:75
+#: localized_js.php:37 prefs.php:65 prefs.php:150 tt-rss.php:66
 msgid "Loading, please wait..."
 msgstr "读取中，请等待..."
 
@@ -570,7 +570,7 @@ msgstr "更新提要失败（缺少XML支持）"
 msgid "Could not display article (missing XML object)"
 msgstr "显示条目失败（缺少XML支持）"
 
-#: localized_js.php:95 tt-rss.php:242 tt-rss.php:249
+#: localized_js.php:95 tt-rss.php:233 tt-rss.php:240
 msgid "No feed selected."
 msgstr "无选定feed."
 
@@ -1064,54 +1064,54 @@ msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
-#: prefs.php:82 prefs.php:162 tt-rss.php:83
+#: prefs.php:73 prefs.php:153 tt-rss.php:74
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
 "\t\tbrowser settings."
 msgstr "您的浏览器不支持Javascript, 请检查设置。"
 
-#: prefs.php:109
+#: prefs.php:100
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: prefs.php:115 tt-rss.php:119
+#: prefs.php:106 tt-rss.php:110
 msgid "Hello,"
 msgstr "你好,"
 
-#: prefs.php:117 prefs.php:127
+#: prefs.php:108 prefs.php:118
 msgid "Exit preferences"
 msgstr "退出我的最爱"
 
-#: prefs.php:119 tt-rss.php:129
+#: prefs.php:110 tt-rss.php:120
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:137 tt-rss.php:121 tt-rss.php:153
+#: prefs.php:128 tt-rss.php:112 tt-rss.php:144
 msgid "Preferences"
 msgstr "我的最爱"
 
-#: prefs.php:139
+#: prefs.php:130
 msgid "My Feeds"
 msgstr "我的feed"
 
-#: prefs.php:142
+#: prefs.php:133
 msgid "Other Feeds"
 msgstr "其他feed"
 
-#: prefs.php:145
+#: prefs.php:136
 msgid "Published Articles"
 msgstr "已发布文章"
 
-#: prefs.php:147
+#: prefs.php:138
 msgid "Content Filtering"
 msgstr "内容过滤器"
 
-#: prefs.php:150
+#: prefs.php:141
 msgid "Label Editor"
 msgstr "标记编辑"
 
-#: prefs.php:154
+#: prefs.php:145
 msgid "User Manager"
 msgstr "用户管理"
 
@@ -1201,107 +1201,107 @@ msgstr ""
 msgid "Fatal Error"
 msgstr "致命错误"
 
-#: tt-rss.php:125
+#: tt-rss.php:116
 #, fuzzy
 msgid "Comments?"
 msgstr "内容"
 
-#: tt-rss.php:142
+#: tt-rss.php:133
 msgid "tag cloud"
 msgstr "标签簇"
 
-#: tt-rss.php:152 modules/popup-dialog.php:127 modules/popup-dialog.php:196
+#: tt-rss.php:143 modules/popup-dialog.php:127 modules/popup-dialog.php:196
 #: modules/pref-feeds.php:854 modules/pref-filters.php:235
 #: modules/pref-labels.php:233 modules/pref-users.php:242
 msgid "Search"
 msgstr "搜索"
 
-#: tt-rss.php:155
+#: tt-rss.php:146
 msgid "Feed actions:"
 msgstr "Feed 操作："
 
-#: tt-rss.php:156
+#: tt-rss.php:147
 msgid "&nbsp;&nbsp;Subscribe to feed"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:157
+#: tt-rss.php:148
 msgid "&nbsp;&nbsp;Edit this feed"
 msgstr "&nbsp;&nbsp;编辑feed"
 
-#: tt-rss.php:158
+#: tt-rss.php:149
 #, fuzzy
 msgid "&nbsp;&nbsp;Clear articles"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:159
+#: tt-rss.php:150
 #, fuzzy
 msgid "&nbsp;&nbsp;Rescore feed"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:160
+#: tt-rss.php:151
 msgid "&nbsp;&nbsp;Unsubscribe"
 msgstr "&nbsp;&nbsp;退订"
 
-#: tt-rss.php:162
+#: tt-rss.php:153
 msgid "All feeds:"
 msgstr "所有feed:"
 
-#: tt-rss.php:163
+#: tt-rss.php:154
 msgid "&nbsp;&nbsp;Mark as read"
 msgstr "&nbsp;&nbsp;标记未已读"
 
-#: tt-rss.php:164
+#: tt-rss.php:155
 msgid "&nbsp;&nbsp;(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 
-#: tt-rss.php:167
+#: tt-rss.php:158
 msgid "&nbsp;&nbsp;Create filter"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:168
+#: tt-rss.php:159
 #, fuzzy
 msgid "&nbsp;&nbsp;Reset UI layout"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:170
+#: tt-rss.php:161
 #, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:178
+#: tt-rss.php:169
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:180
+#: tt-rss.php:171
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:188 modules/popup-dialog.php:139
+#: tt-rss.php:179 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "搜索:"
 
-#: tt-rss.php:195
+#: tt-rss.php:186
 msgid "View:"
 msgstr "浏览:"
 
-#: tt-rss.php:197
+#: tt-rss.php:188
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:198
+#: tt-rss.php:189
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:203
+#: tt-rss.php:194
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:228
+#: tt-rss.php:219
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:246
+#: tt-rss.php:237
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1951,10 +1951,6 @@ msgstr "密码已更改."
 msgid "The configuration was reset to defaults."
 msgstr "设置重置为默认"
 
-#: modules/pref-prefs.php:154 modules/pref-prefs.php:328
-msgid "Change theme"
-msgstr "更改模板"
-
 #: modules/pref-prefs.php:195
 msgid ""
 "Your password is at default value, \n"
@@ -2011,6 +2007,10 @@ msgstr "选择模板"
 msgid "Default"
 msgstr "默认"
 
+#: modules/pref-prefs.php:328
+msgid "Change theme"
+msgstr "更改模板"
+
 #: modules/pref-prefs.php:385
 msgid "short_desc"
 msgstr "short_desc"
@@ -2125,6 +2125,10 @@ msgid "No matching users found."
 msgstr "未找到文章。"
 
 #, fuzzy
+#~ msgid "Show article"
+#~ msgstr "星级文章"
+
+#, fuzzy
 #~ msgid "Update errors"
 #~ msgstr "更新错误"