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, 318 insertions, 124 deletions

diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 4db942e5d..94db9c503 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -1,15 +1,18 @@
 # Translation of StatusNet to Ukrainian
 #
 # --
+# 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:48+0000\n"
 "Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\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: uk\n"
@@ -145,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 ""
@@ -230,7 +233,7 @@ msgstr "Всі прямі повідомлення надіслані до %s"
 #: 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
@@ -299,21 +302,7 @@ msgstr "Не вдається відновити загальний потік."
 msgid "Could not find target user."
 msgstr "Жодних статусів не виявлено."
 
-#: actions/apigroupcreate.php:136 actions/newgroup.php:204
-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
-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."
@@ -321,60 +310,60 @@ 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 "Веб-сторінка має недійсну URL-адресу."
 
-#: 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 +589,10 @@ 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 "Несподіване представлення форми."
 
@@ -666,7 +655,7 @@ msgstr "Спроба розблокувати користувача невда�
 msgid "Unblock"
 msgstr "Розблокувати"
 
-#: actions/blockedfromgroup.php:313
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
 msgid "Unblock this user"
 msgstr "Розблокувати цього користувача"
 
@@ -843,7 +832,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 ""
 
@@ -851,108 +840,183 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:220
+#: actions/designadminpanel.php:278
 #, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
+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
 #, fuzzy
 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
 #, fuzzy, 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
 #, fuzzy
 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 ""
 
@@ -995,6 +1059,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 "Опції збережено."
@@ -1113,7 +1182,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 "Це недійсна електронна адреса"
 
@@ -1852,10 +1921,10 @@ 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
+#, fuzzy
+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
@@ -2290,7 +2359,7 @@ msgstr ""
 "Позначте себе тегами (літери, цифри, -, . та _), відокремлюючи кожен комою "
 "або пробілом"
 
-#: actions/profilesettings.php:144 actions/siteadminpanel.php:275
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
 msgid "Language"
 msgstr "Мова"
 
@@ -2318,7 +2387,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 "Часовий пояс не обрано."
 
@@ -2564,6 +2633,10 @@ msgstr "Пароль має складатись з 6-ти або більше �
 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 "Новий пароль успішно збережено. Тепер ви увійшли."
@@ -2628,7 +2701,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 "Пошта"
 
@@ -3077,7 +3150,7 @@ msgstr "Ви не можете надіслати повідомлення ць�
 msgid "User is already silenced."
 msgstr "Користувач заблокував вас."
 
-#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:272
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
 #, fuzzy
 msgid "Site"
 msgstr "Запросити"
@@ -3086,122 +3159,236 @@ 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 "Нова електронна адреса для надсилання повідомлень на %s"
 
-#: 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
 #, fuzzy
 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
+#, fuzzy
+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
 #, fuzzy
 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
+#, fuzzy
+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
 #, fuzzy
 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
+#, fuzzy
+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 "Налаштування аватари"
@@ -3518,11 +3705,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 ""
@@ -3755,6 +3937,14 @@ msgstr "Проблема при збереженні повідомлення."
 msgid "DB error inserting reply: %s"
 msgstr "Помилка бази даних при додаванні відповіді: %s"
 
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "Не вдалося створити нову групу"
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "Не вдалося встановити членство."
+
 #: classes/User.php:347
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
@@ -3995,12 +4185,17 @@ msgstr "Виконання команди ще не завершено."
 msgid "saveSettings() not implemented."
 msgstr "Виконання команди ще не завершено."
 
-#: lib/adminpanelaction.php:273
+#: lib/adminpanelaction.php:247
+#, fuzzy
+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 "Підтвердження СМС"
@@ -4248,20 +4443,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
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Увійти на сайт"
@@ -5036,11 +5231,6 @@ msgstr "Пусто"
 msgid "Top posters"
 msgstr "Топ дописувачів"
 
-#: lib/unblockform.php:80
-#, fuzzy
-msgid "Unlock this user"
-msgstr "Розблокувати цього користувача"
-
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
@@ -5093,47 +5283,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 "близько %d хвилин тому"
 
-#: 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 "близько %d годин тому"
 
-#: 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 "близько %d днів тому"
 
-#: 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 "близько %d місяців тому"
 
-#: lib/util.php:839
+#: lib/util.php:844
 msgid "about a year ago"
 msgstr "рік тому"
 
@@ -5165,5 +5355,9 @@ msgstr ""
 "Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
 
 #, fuzzy
+#~ msgid "Unlock this user"
+#~ msgstr "Розблокувати цього користувача"
+
+#, fuzzy
 #~ msgid "These people are subscribed to you: "
 #~ msgstr "Люди підписані до %s"