Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

* '0.9.x' of gitorious.org:statusnet/mainline:
  Localisation updates for !StatusNet from !translatewiki.net
  Use the browser's geolocation API to set the location on the notice form
  Add geometa library, and include it.
  Add location form elements to the noticeform, and save their values on submission
  Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc
  Revert "Re added NICKNAME_FMT constant to router.php."

1 files changed, 315 insertions, 130 deletions

diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 0e6e27d53..ed366612b 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -1,20 +1,18 @@
 # Translation of StatusNet to Traditional Chinese
 #
 # --
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-18 19:31+0000\n"
+"POT-Creation-Date: 2009-11-19 10:43+0000\n"
 "PO-Revision-Date: 2009-11-18 19:32:56+0000\n"
 "Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hant\n"
@@ -150,7 +148,7 @@ msgstr "無法更新使用者"
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
 #: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
-#: actions/designadminpanel.php:125 actions/newnotice.php:94
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
 msgid ""
@@ -233,7 +231,7 @@ msgstr ""
 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
 #: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
@@ -300,82 +298,66 @@ msgstr "無法更新使用者"
 msgid "Could not find target user."
 msgstr "無法更新使用者"
 
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-#, fuzzy
-msgid "Could not create group."
-msgstr "無法存取個人圖像資料"
-
-#: actions/apigroupcreate.php:147 actions/editgroup.php:259
-#: actions/newgroup.php:210
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "無法存取個人圖像資料"
-
-#: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "註冊失敗"
-
-#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
 #: actions/newgroup.php:126 actions/profilesettings.php:208
 #: actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "暱稱請用小寫字母或數字，勿加空格。"
 
-#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/apigroupcreate.php:173 actions/editgroup.php:186
 #: actions/newgroup.php:130 actions/profilesettings.php:231
 #: actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "此暱稱已有人使用。再試試看別的吧。"
 
-#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/apigroupcreate.php:180 actions/editgroup.php:189
 #: actions/newgroup.php:133 actions/profilesettings.php:211
 #: actions/register.php:210
 msgid "Not a valid nickname."
 msgstr ""
 
-#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editgroup.php:195
 #: actions/newgroup.php:139 actions/profilesettings.php:215
 #: actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "個人首頁位址錯誤"
 
-#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/apigroupcreate.php:205 actions/editgroup.php:198
 #: actions/newgroup.php:142 actions/profilesettings.php:218
 #: actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名過長（最多255字元）"
 
-#: actions/apigroupcreate.php:261
+#: actions/apigroupcreate.php:213
 #, fuzzy, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "自我介紹過長(共140個字元)"
 
-#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/apigroupcreate.php:224 actions/editgroup.php:204
 #: actions/newgroup.php:148 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "地點過長（共255個字）"
 
-#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
 #: actions/newgroup.php:168
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "個人首頁連結%s無效"
 
-#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
 #: actions/newgroup.php:172
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "此暱稱已有人使用。再試試看別的吧。"
 
-#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr ""
@@ -600,10 +582,10 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/emailsettings.php:255
-#: actions/grouplogo.php:319 actions/imsettings.php:220
-#: actions/recoverpassword.php:44 actions/smssettings.php:248
-#: lib/designsettings.php:304
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -667,7 +649,7 @@ msgstr "無此使用者"
 msgid "Unblock"
 msgstr ""
 
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
 #, fuzzy
 msgid "Unblock this user"
 msgstr "無此使用者"
@@ -840,7 +822,7 @@ msgid "Delete this user"
 msgstr "無此使用者"
 
 #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:275 lib/groupnav.php:119
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
 msgid "Design"
 msgstr ""
 
@@ -848,105 +830,181 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:220
-msgid "Unable to delete design setting."
-msgstr ""
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "尺寸錯誤"
 
-#: actions/designadminpanel.php:301
+#: actions/designadminpanel.php:282
 #, fuzzy, php-format
 msgid "Theme not available: %s"
 msgstr "個人首頁位址錯誤"
 
-#: actions/designadminpanel.php:406
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "個人首頁位址錯誤"
+
+#: actions/designadminpanel.php:292
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:296
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr ""
+
+#: actions/designadminpanel.php:312
+#, php-format
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
+
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "更改密碼"
+
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "新訊息"
+
+#: actions/designadminpanel.php:424
 #, fuzzy
 msgid "Change theme"
 msgstr "更改"
 
-#: actions/designadminpanel.php:410
-msgid "Theme"
-msgstr ""
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "新訊息"
 
-#: actions/designadminpanel.php:411
+#: actions/designadminpanel.php:442
 msgid "Theme for the site."
 msgstr ""
 
-#: actions/designadminpanel.php:420 lib/designsettings.php:101
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
+
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
+
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
+
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "線上即時通設定"
+
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "線上即時通設定"
+
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "更新個人圖像"
+
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "更新個人圖像"
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
 msgid "Change background image"
 msgstr ""
 
-#: actions/designadminpanel.php:424 actions/designadminpanel.php:498
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
 #: lib/designsettings.php:178
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:429
+#: actions/designadminpanel.php:496
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 "$s."
 msgstr ""
 
-#: actions/designadminpanel.php:459 lib/designsettings.php:139
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
 msgid "On"
 msgstr ""
 
-#: actions/designadminpanel.php:475 lib/designsettings.php:155
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
 msgid "Off"
 msgstr ""
 
-#: actions/designadminpanel.php:476 lib/designsettings.php:156
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
 msgid "Turn background image on or off."
 msgstr ""
 
-#: actions/designadminpanel.php:481 lib/designsettings.php:161
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
 msgid "Tile background image"
 msgstr ""
 
-#: actions/designadminpanel.php:490 lib/designsettings.php:170
+#: actions/designadminpanel.php:554
+msgid "Background server"
+msgstr ""
+
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
+
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
+
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
 #, fuzzy
 msgid "Change colours"
 msgstr "更改密碼"
 
-#: actions/designadminpanel.php:511 lib/designsettings.php:191
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
 #, fuzzy
 msgid "Content"
 msgstr "連結"
 
-#: actions/designadminpanel.php:524 lib/designsettings.php:204
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
 msgid "Sidebar"
 msgstr ""
 
-#: actions/designadminpanel.php:537 lib/designsettings.php:217
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
-#: actions/designadminpanel.php:550 lib/designsettings.php:230
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
 #, fuzzy
 msgid "Links"
 msgstr "登入"
 
-#: actions/designadminpanel.php:611 lib/designsettings.php:247
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
 msgid "Use defaults"
 msgstr ""
 
-#: actions/designadminpanel.php:612 lib/designsettings.php:248
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
 msgid "Restore default designs"
 msgstr ""
 
-#: actions/designadminpanel.php:618 lib/designsettings.php:254
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
 msgid "Reset back to default"
 msgstr ""
 
-#: actions/designadminpanel.php:620 actions/emailsettings.php:195
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
 #: actions/imsettings.php:163 actions/othersettings.php:126
-#: actions/profilesettings.php:167 actions/siteadminpanel.php:371
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
 #: actions/smssettings.php:181 actions/subscriptions.php:203
 #: actions/tagother.php:154 actions/useradminpanel.php:226
 #: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
-#: actions/designadminpanel.php:621 lib/designsettings.php:257
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
 msgid "Save design"
 msgstr ""
 
@@ -990,6 +1048,11 @@ msgstr "自我介紹過長(共140個字元)"
 msgid "Could not update group."
 msgstr "無法更新使用者"
 
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "無法存取個人圖像資料"
+
 #: actions/editgroup.php:269
 msgid "Options saved."
 msgstr ""
@@ -1104,7 +1167,7 @@ msgstr ""
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:330 actions/siteadminpanel.php:156
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
 msgid "Not a valid email address"
 msgstr ""
 
@@ -1783,10 +1846,9 @@ msgstr ""
 msgid "Incorrect username or password."
 msgstr "使用者名稱或密碼錯誤"
 
-#: actions/login.php:149 actions/recoverpassword.php:375
-#: actions/register.php:248
-msgid "Error setting user."
-msgstr "使用者設定發生錯誤"
+#: actions/login.php:149
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
 
 #: actions/login.php:204 actions/login.php:257 lib/action.php:457
 #: lib/logingroupnav.php:79
@@ -2199,7 +2261,7 @@ msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
 msgid "Language"
 msgstr ""
 
@@ -2225,7 +2287,7 @@ msgstr ""
 msgid "Bio is too long (max %d chars)."
 msgstr "自我介紹過長(共140個字元)"
 
-#: actions/profilesettings.php:228 actions/siteadminpanel.php:163
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
 msgid "Timezone not selected."
 msgstr ""
 
@@ -2465,6 +2527,10 @@ msgstr ""
 msgid "Password and confirmation do not match."
 msgstr ""
 
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "使用者設定發生錯誤"
+
 #: actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "新密碼已儲存成功。你已登入。"
@@ -2526,7 +2592,7 @@ msgid "Same as password above. Required."
 msgstr ""
 
 #: actions/register.php:437 actions/register.php:441
-#: actions/siteadminpanel.php:253 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
 msgid "Email"
 msgstr "電子信箱"
 
@@ -2944,7 +3010,7 @@ msgstr ""
 msgid "User is already silenced."
 msgstr ""
 
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
 msgid "Site"
 msgstr ""
 
@@ -2952,119 +3018,230 @@ msgstr ""
 msgid "Basic settings for this StatusNet site."
 msgstr ""
 
-#: actions/siteadminpanel.php:145
+#: actions/siteadminpanel.php:147
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:153
+#: actions/siteadminpanel.php:155
 #, fuzzy
 msgid "You must have a valid contact email address"
 msgstr "此信箱無效"
 
-#: actions/siteadminpanel.php:171
+#: actions/siteadminpanel.php:173
 #, php-format
 msgid "Unknown language \"%s\""
 msgstr ""
 
-#: actions/siteadminpanel.php:178
+#: actions/siteadminpanel.php:180
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/siteadminpanel.php:184
+#: actions/siteadminpanel.php:186
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/siteadminpanel.php:190
+#: actions/siteadminpanel.php:192
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
 #, fuzzy
 msgid "Site name"
 msgstr "新訊息"
 
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:276
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:245
+#: actions/siteadminpanel.php:279
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:246
+#: actions/siteadminpanel.php:280
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:283
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:250
+#: actions/siteadminpanel.php:284
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:254
+#: actions/siteadminpanel.php:288
 #, fuzzy
 msgid "contact email address for your site"
 msgstr "查無此使用者所註冊的信箱"
 
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:302
 msgid "Default timezone"
 msgstr ""
 
-#: actions/siteadminpanel.php:269
+#: actions/siteadminpanel.php:303
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:276
+#: actions/siteadminpanel.php:310
 msgid "Default site language"
 msgstr ""
 
-#: actions/siteadminpanel.php:282
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+msgid "Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
+
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "新訊息"
+
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/siteadminpanel.php:334
 msgid "Private"
 msgstr ""
 
-#: actions/siteadminpanel.php:284
+#: actions/siteadminpanel.php:336
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
-#: actions/siteadminpanel.php:290
+#: actions/siteadminpanel.php:340
+msgid "Invite only"
+msgstr ""
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
+#, fuzzy
+msgid "Closed"
+msgstr "無此使用者"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
+
+#: actions/siteadminpanel.php:353
 msgid "Randomly during Web hit"
 msgstr ""
 
-#: actions/siteadminpanel.php:291
+#: actions/siteadminpanel.php:354
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/siteadminpanel.php:292
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
 msgid "Never"
 msgstr ""
 
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:357
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/siteadminpanel.php:295
+#: actions/siteadminpanel.php:358
 msgid "When to send statistical data to status.net servers"
 msgstr ""
 
-#: actions/siteadminpanel.php:301
+#: actions/siteadminpanel.php:364
 msgid "Frequency"
 msgstr ""
 
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:365
 msgid "Snapshots will be sent once every N Web hits"
 msgstr ""
 
-#: actions/siteadminpanel.php:309
+#: actions/siteadminpanel.php:372
 msgid "Report URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:310
+#: actions/siteadminpanel.php:373
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:371 actions/useradminpanel.php:226
+#: actions/siteadminpanel.php:381
+msgid "Sometimes"
+msgstr ""
+
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
+
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
+
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
 #, fuzzy
 msgid "Save site settings"
 msgstr "線上即時通設定"
@@ -3379,11 +3556,6 @@ msgstr ""
 msgid "User settings for this StatusNet site."
 msgstr ""
 
-#: actions/useradminpanel.php:171
-#, fuzzy
-msgid "Closed"
-msgstr "無此使用者"
-
 #: actions/useradminpanel.php:173
 msgid "Is registration on this site prohibited?"
 msgstr ""
@@ -3595,6 +3767,16 @@ msgstr ""
 msgid "DB error inserting reply: %s"
 msgstr "增加回覆時,資料庫發生錯誤: %s"
 
+#: classes/User_group.php:380
+#, fuzzy
+msgid "Could not create group."
+msgstr "無法存取個人圖像資料"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "註冊失敗"
+
 #: classes/User.php:347
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
@@ -3834,12 +4016,16 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr ""
+
+#: lib/adminpanelaction.php:300
 #, fuzzy
 msgid "Basic site configuration"
 msgstr "確認信箱"
 
-#: lib/adminpanelaction.php:276
+#: lib/adminpanelaction.php:303
 #, fuzzy
 msgid "Design configuration"
 msgstr "確認信箱"
@@ -4085,20 +4271,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:203
+#: lib/common.php:199
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "無確認碼"
 
-#: lib/common.php:204
+#: lib/common.php:200
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:205
+#: lib/common.php:201
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:206
+#: lib/common.php:202
 msgid "Go to the installer."
 msgstr ""
 
@@ -4867,11 +5053,6 @@ msgstr ""
 msgid "Top posters"
 msgstr ""
 
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "無此使用者"
-
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
@@ -4924,47 +5105,47 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: lib/util.php:821
+#: lib/util.php:826
 msgid "a few seconds ago"
 msgstr ""
 
-#: lib/util.php:823
+#: lib/util.php:828
 msgid "about a minute ago"
 msgstr ""
 
-#: lib/util.php:825
+#: lib/util.php:830
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/util.php:827
+#: lib/util.php:832
 msgid "about an hour ago"
 msgstr ""
 
-#: lib/util.php:829
+#: lib/util.php:834
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: lib/util.php:831
+#: lib/util.php:836
 msgid "about a day ago"
 msgstr ""
 
-#: lib/util.php:833
+#: lib/util.php:838
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: lib/util.php:835
+#: lib/util.php:840
 msgid "about a month ago"
 msgstr ""
 
-#: lib/util.php:837
+#: lib/util.php:842
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: lib/util.php:839
+#: lib/util.php:844
 msgid "about a year ago"
 msgstr ""
 
@@ -4995,5 +5176,9 @@ msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "無此使用者"
+
+#, fuzzy
 #~ msgid "These people are subscribed to you: "
 #~ msgstr "此帳號已註冊"