summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-12 22:58:28 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-12 22:58:28 +0100
commitc27dc71277c2cd2631f285108e4f365db50201dd (patch)
treed6099696558f382b6442c33ed1e77a71c98e3234
parentd8296df5d73fc189d393cddd9e2277f7c8a4cbf6 (diff)
Localisation updates from translatewiki.net (2009-11-12)
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.mobin22332 -> 22584 bytes
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po211
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.mobin83123 -> 83559 bytes
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.mobin71227 -> 71507 bytes
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.mobin34906 -> 35137 bytes
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po211
-rw-r--r--locale/de/LC_MESSAGES/statusnet.mobin71423 -> 71701 bytes
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/el/LC_MESSAGES/statusnet.mobin29237 -> 29484 bytes
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po217
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.mobin66104 -> 66327 bytes
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po222
-rw-r--r--locale/es/LC_MESSAGES/statusnet.mobin70370 -> 70651 bytes
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.mobin74094 -> 74355 bytes
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.mobin75427 -> 76895 bytes
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po452
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.mobin73257 -> 74535 bytes
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po239
-rw-r--r--locale/he/LC_MESSAGES/statusnet.mobin38349 -> 38631 bytes
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po211
-rw-r--r--locale/is/LC_MESSAGES/statusnet.mobin62720 -> 62875 bytes
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po217
-rw-r--r--locale/it/LC_MESSAGES/statusnet.mobin70500 -> 70765 bytes
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.mobin47704 -> 47907 bytes
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po214
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.mobin74777 -> 75097 bytes
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.mobin44896 -> 45259 bytes
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po211
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.mobin23106 -> 23307 bytes
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.mobin85178 -> 99610 bytes
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po396
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.mobin67679 -> 67929 bytes
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.mobin94675 -> 96011 bytes
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po245
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.mobin25296 -> 25469 bytes
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po217
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.mobin70063 -> 70361 bytes
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po218
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.mobin94082 -> 94452 bytes
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po218
-rw-r--r--locale/statusnet.po196
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.mobin58606 -> 58861 bytes
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/te/LC_MESSAGES/statusnet.mobin47515 -> 48739 bytes
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po274
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.mobin34413 -> 34654 bytes
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po211
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.mobin91848 -> 92216 bytes
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.mobin67147 -> 68028 bytes
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po229
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.mobin64571 -> 64800 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.mobin18568 -> 18784 bytes
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po214
63 files changed, 4648 insertions, 2749 deletions
diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo
index 396f81227..ff3af0e18 100644
--- a/locale/ar/LC_MESSAGES/statusnet.mo
+++ b/locale/ar/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index d5000e633..aa58a5689 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:58:39+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:38:34+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "لا صفحة كهذه"
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -105,35 +108,42 @@ msgstr "أنت والأصدقاء"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "لم يوجد رمز التأكيد."
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "تعذّر تحديث المستخدم."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -141,12 +151,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "تعذر تحديث المجموعة."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "ليس للمستخدم ملف شخصي."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "تعذّر حفظ الملف الشخصي."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -192,6 +223,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -377,17 +425,17 @@ msgstr "حُذِفت الحالة."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "لم يوجد"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -469,7 +517,7 @@ msgid "Invalid size."
msgstr "حجم غير صالح."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "أفتار"
@@ -517,7 +565,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1573,7 +1621,7 @@ msgid "Nickname"
msgstr "الاسم المستعار"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "كلمة السر"
@@ -1702,7 +1750,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1746,8 +1794,8 @@ msgstr "نوع المحتوى "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1767,11 +1815,15 @@ msgstr "إعدادات أخرى"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr "قصّر المسارات بـ"
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1805,65 +1857,60 @@ msgstr ""
msgid "Change password"
msgstr "غيّر كلمة السر"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "غير كلمة سرّك"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "غيّر كلمة سرك."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "تغيير كلمة السر"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "كلمة السر القديمة"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "كلمة سر جديدة"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr ""
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "أكد"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr ""
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "غيّر"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "كلمتا السر غير متطابقتين."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "كلمة السر القديمة غير صحيحة"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr ""
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "حُفظت كلمة السر."
@@ -2288,7 +2335,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "البريد الإلكتروني"
@@ -3156,31 +3203,31 @@ msgstr ""
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "الملف الشخصي"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "غيّر إعدادات ملفك الشخصي"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr ""
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "غير كلمة سرّك"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr "التصميم"
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "صمّم ملفك الشخصي"
@@ -3188,7 +3235,7 @@ msgstr "صمّم ملفك الشخصي"
msgid "Other"
msgstr "أخرى"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "خيارات أخرى"
@@ -3571,19 +3618,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -3843,7 +3890,7 @@ msgstr ""
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
+msgid "[%s]"
msgstr ""
#: lib/joinform.php:114
@@ -4391,47 +4438,47 @@ msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
msgid "Message"
msgstr "رسالة"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
@@ -4460,3 +4507,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "غير كلمة سرّك"
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
index a05e3245c..ed18172d2 100644
--- a/locale/bg/LC_MESSAGES/statusnet.mo
+++ b/locale/bg/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 33844a4c7..6aff75834 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:58:41+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:38:36+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Няма такъв етикет."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s и приятели"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Бележки от %1$s и приятели в %2$s."
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Не е открит методът в API."
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Този метод изисква заявка POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Грешка при обновяване на потребителя."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Грешка при записване настройките за Twitter"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Грешка при обновяване на потребителя."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Потребителят няма профил."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Грешка при запазване на профила."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -195,6 +227,23 @@ msgstr "Преки съобщения до %s"
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Не е открит методът в API."
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -392,17 +441,17 @@ msgstr "Аватарът е обновен."
msgid "No status with that ID found."
msgstr "Не е открита бележка с такъв идентификатор."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Не е открито."
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -486,7 +535,7 @@ msgid "Invalid size."
msgstr "Неправилен размер."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Аватар"
@@ -534,7 +583,7 @@ msgstr "Изрязване"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1672,7 +1721,7 @@ msgid "Nickname"
msgstr "Псевдоним"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Парола"
@@ -1811,7 +1860,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1856,8 +1905,8 @@ msgstr "Свързване"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Неподдържан формат на данните"
@@ -1877,11 +1926,15 @@ msgstr "Други настройки"
msgid "Manage various other options."
msgstr "Управление на различни други настройки."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Услуга за автоматично съкращаване, която да се ползва."
@@ -1916,66 +1969,61 @@ msgstr "Това е изходящата ви кутия с лични съоб
msgid "Change password"
msgstr "Смяна на паролата"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Смяна на паролата"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Смяна на паролата."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Паролата е записана."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Стара парола"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Нова парола"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 или повече знака"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Потвърждаване"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "също като паролата по-горе"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Промяна"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Паролата трябва да е 6 или повече знака."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Паролите не съвпадат."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Грешна стара парола"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Грешка при запазване на потребител — невалидност."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Грешка при запазване на новата парола."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Паролата е записана."
@@ -2414,7 +2462,7 @@ msgid "Same as password above. Required."
msgstr "Същото като паролата по-горе. Задължително поле."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-поща"
@@ -3346,31 +3394,31 @@ msgstr "Грешка в базата от данни — отговор при
msgid "Welcome to %1$s, @%2$s!"
msgstr "Съобщение до %1$s в %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профил"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Промяна настройките на профила"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Качване на аватар"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Смяна на паролата"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Промяна обработката на писмата"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Потребителски профил"
@@ -3379,7 +3427,7 @@ msgstr "Потребителски профил"
msgid "Other"
msgstr "Друго"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Други настройки"
@@ -3775,20 +3823,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Няма код за потвърждение."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Влизане в сайта"
@@ -4060,8 +4108,8 @@ msgstr "Неподдържан вид файл"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Нова бележка"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4624,47 +4672,47 @@ msgstr "Изпращате на пряко съобщение до този по
msgid "Message"
msgstr "Съобщение"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "преди няколко секунди"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "преди около минута"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "преди около час"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d часа"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "преди около ден"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "преди около месец"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "преди около %d месеца"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "преди около година"
@@ -4693,3 +4741,10 @@ msgstr "Това не е вашият входящ адрес."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Входящата поща не е разрешена."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Смяна на паролата"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Нова бележка"
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
index ac01d8ed9..f6d142e9b 100644
--- a/locale/ca/LC_MESSAGES/statusnet.mo
+++ b/locale/ca/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 11d83cad8..bd19ad23a 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:58:44+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:38:39+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "No existeix aquesta etiqueta."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s i amics"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualitzacions de %1$s i amics a %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "No s'ha trobat el mètode API!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Aquest mètode requereix POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "No s'ha pogut actualitzar l'usuari."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "No s'ha pogut actualitzar l'usuari."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "L'usuari no té perfil."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "No s'ha pogut guardar el perfil."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Ha fallat el bloqueig d'usuari."
@@ -193,6 +225,23 @@ msgstr "Missatges directes a %s"
msgid "All the direct messages sent to %s"
msgstr "Tots els missatges directes enviats a %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "No s'ha trobat el mètode API!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -390,17 +439,17 @@ msgstr "Avatar actualitzat."
msgid "No status with that ID found."
msgstr "No s'ha trobat cap estatus amb la ID trobada."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Massa llarg. La longitud màxima és de 140 caràcters."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "No s'ha trobat"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -484,7 +533,7 @@ msgid "Invalid size."
msgstr "Mida invàlida."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -532,7 +581,7 @@ msgstr "Crop"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1691,7 +1740,7 @@ msgid "Nickname"
msgstr "Sobrenom"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Contrasenya"
@@ -1830,7 +1879,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1877,8 +1926,8 @@ msgstr "Connectar-se"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Format de data no suportat."
@@ -1898,11 +1947,15 @@ msgstr "Altres configuracions"
msgid "Manage various other options."
msgstr "Gestionar altres vàries opcions."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Servei d'auto-escurçament a utilitzar."
@@ -1940,65 +1993,60 @@ msgstr ""
msgid "Change password"
msgstr "Canviar contrasenya"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Canviar la teva contrasenya"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Canviar contrasenya"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Contrasenya canviada."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Antiga contrasenya"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nova contrasenya"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 o més caràcters"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Confirmar"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "repeteix la contrasenya anterior"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Canviar"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Les contrasenyes no coincideixen."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Contrasenya antiga incorrecta"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Error en guardar usuari; invàlid."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "No es pot guardar la nova contrasenya."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Contrasenya guardada."
@@ -2444,7 +2492,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contrasenya de dalt. Requerit."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correu electrònic"
@@ -3384,31 +3432,31 @@ msgstr "Error de BD en inserir resposta: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Missatge per a %1$s a %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Canviar les preferències del teu perfil"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Pujar un avatar"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Canviar la teva contrasenya"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Canviar correu electrònic"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Perfil de l'usuari"
@@ -3417,7 +3465,7 @@ msgstr "Perfil de l'usuari"
msgid "Other"
msgstr "Altres"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Altres opcions"
@@ -3807,20 +3855,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Cap codi de confirmació."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Accedir a aquest lloc"
@@ -4090,8 +4138,8 @@ msgstr "Tipus de fitxer desconegut"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Nou avís"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4662,47 +4710,47 @@ msgstr "Enviar un missatge directe a aquest usuari"
msgid "Message"
msgstr "Missatge"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "fa un any"
@@ -4731,3 +4779,10 @@ msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Perdó, no hi ha un correu electrònic entrant permès."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Canviar la teva contrasenya"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Nou avís"
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
index 275a5e3a3..8ae0c5ef6 100644
--- a/locale/cs/LC_MESSAGES/statusnet.mo
+++ b/locale/cs/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 17a12027f..41e922a19 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:58:47+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:38:42+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Žádné takové oznámení."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s a přátelé"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Potvrzující kód nebyl nalezen"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Nelze aktualizovat uživatele"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Uživatel nemá profil."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Nelze uložit profil"
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -193,6 +224,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -387,17 +435,17 @@ msgstr "Obrázek nahrán"
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -482,7 +530,7 @@ msgid "Invalid size."
msgstr "Neplatná velikost"
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Obrázek"
@@ -531,7 +579,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1637,7 +1685,7 @@ msgid "Nickname"
msgstr "Přezdívka"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Heslo"
@@ -1772,7 +1820,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1817,8 +1865,8 @@ msgstr "Připojit"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1839,11 +1887,15 @@ msgstr "Nastavení"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1879,66 +1931,62 @@ msgstr ""
msgid "Change password"
msgstr "Změnit heslo"
-#: actions/passwordsettings.php:70
-msgid "You are not allowed to change your password"
-msgstr ""
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Změnit heslo"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Heslo uloženo"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Staré heslo"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nové heslo"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 a více znaků"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Heslo znovu"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "stejné jako heslo výše"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Změnit"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Hesla nesouhlasí"
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Neplatné heslo"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Chyba při ukládaní uživatele; neplatný"
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Nelze uložit nové heslo"
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Heslo uloženo"
@@ -2377,7 +2425,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -3290,32 +3338,32 @@ msgstr "Chyba v DB při vkládání odpovědi: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
#, fuzzy
msgid "Upload an avatar"
msgstr "Nahrávání obrázku selhalo."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr ""
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Uživatel nemá profil."
@@ -3324,7 +3372,7 @@ msgstr "Uživatel nemá profil."
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3721,20 +3769,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Žádný potvrzující kód."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -4007,8 +4055,8 @@ msgstr ""
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Nové sdělení"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4580,47 +4628,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "před pár sekundami"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "asi před minutou"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "asi před hodinou"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "asi přede dnem"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "asi před měsícem"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "asi před rokem"
@@ -4649,3 +4697,6 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#~ msgid "notice id: %s"
+#~ msgstr "Nové sdělení"
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
index 9591afa0b..83ea15c97 100644
--- a/locale/de/LC_MESSAGES/statusnet.mo
+++ b/locale/de/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 0cca46cb4..aad5fa2c7 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:58:49+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:38:44+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -23,12 +23,15 @@ msgid "No such page"
msgstr "Tag nicht vorhanden."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -107,35 +110,42 @@ msgstr "%s und Freunde"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "API-Methode nicht gefunden!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Diese Methode benötigt ein POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -143,12 +153,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Konnte Twitter Einstellungen nicht speichern!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Benutzer hat kein Profil."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Konnte Profil nicht speichern."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Blockieren des Benutzers fehlgeschlagen."
@@ -197,6 +229,23 @@ msgstr "Direkte Nachricht an %s"
msgid "All the direct messages sent to %s"
msgstr "Alle an %s gesendeten direkten Nachrichten"
+#: 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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-Methode nicht gefunden!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -394,18 +443,18 @@ msgstr "Avatar aktualisiert."
msgid "No status with that ID found."
msgstr "Keine Nachricht mit dieser ID gefunden."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Nicht gefunden"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -489,7 +538,7 @@ msgid "Invalid size."
msgstr "Ungültige Größe."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -538,7 +587,7 @@ msgstr "Zuschneiden"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1698,7 +1747,7 @@ msgid "Nickname"
msgstr "Nutzername"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Passwort"
@@ -1837,7 +1886,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1884,8 +1933,8 @@ msgstr "Verbinden"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Kein unterstütztes Datenformat."
@@ -1905,11 +1954,15 @@ msgstr "Andere Einstellungen"
msgid "Manage various other options."
msgstr "Verwalte zahlreiche andere Einstellungen."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "URL-Auto-Kürzungs-Dienst."
@@ -1945,65 +1998,60 @@ msgstr ""
msgid "Change password"
msgstr "Passwort ändern"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Ändere dein Passwort"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Ändere dein Passwort."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Passwort geändert"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Altes Passwort"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Neues Passwort"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 oder mehr Zeichen"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Bestätigen"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "Gleiches Passwort wie oben"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Ändern"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Passwörter stimmen nicht überein."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Altes Passwort falsch"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Fehler beim Speichern des Nutzers, ungültig."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Konnte neues Passwort nicht speichern"
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Passwort gespeichert."
@@ -2450,7 +2498,7 @@ msgid "Same as password above. Required."
msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-Mail"
@@ -3395,31 +3443,31 @@ msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Nachricht an %1$s auf %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Ändern der Profileinstellungen"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Avatar hochladen"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Ändere dein Passwort"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Ändere die E-Mail Verarbeitung"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Benutzerprofil"
@@ -3428,7 +3476,7 @@ msgstr "Benutzerprofil"
msgid "Other"
msgstr "Sonstige"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Sonstige Optionen"
@@ -3819,20 +3867,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Kein Bestätigungs-Code."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Auf der Seite anmelden"
@@ -4109,8 +4157,8 @@ msgstr "Unbekannter Dateityp"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Neue Nachricht"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4695,47 +4743,47 @@ msgstr "Direkte Nachricht an Benutzer verschickt"
msgid "Message"
msgstr "Nachricht"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "vor einem Jahr"
@@ -4765,3 +4813,10 @@ msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Sorry, keinen eingehenden E-Mails gestattet."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Ändere dein Passwort"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Neue Nachricht"
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
index 72dc2ce58..4c52ea135 100644
--- a/locale/el/LC_MESSAGES/statusnet.mo
+++ b/locale/el/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index a7163a762..61897cbeb 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:58:52+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:38:47+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Αδύνατη η αποθήκευση του προφίλ."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s και οι φίλοι του/της"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr ""
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Απέτυχε η αποθήκευση του προφίλ."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -193,6 +224,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -386,17 +434,17 @@ msgstr "Ρυθμίσεις OpenID"
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -478,7 +526,7 @@ msgid "Invalid size."
msgstr ""
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr ""
@@ -527,7 +575,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1613,7 +1661,7 @@ msgid "Nickname"
msgstr "Ψευδώνυμο"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Κωδικός"
@@ -1747,7 +1795,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1792,8 +1840,8 @@ msgstr "Σύνδεση"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1814,11 +1862,15 @@ msgstr "Ρυθμίσεις OpenID"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1853,67 +1905,62 @@ msgstr ""
msgid "Change password"
msgstr "Αλλαγή κωδικού"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Αλλάξτε τον κωδικό σας"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Αλλαγή κωδικού"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Ο κωδικός αποθηκεύτηκε."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr ""
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Νέος κωδικός"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 ή περισσότεροι χαρακτήρες"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Επιβεβαίωση"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr ""
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Αλλαγή"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Οι κωδικοί δεν ταυτίζονται."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Λάθος παλιός κωδικός"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr ""
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Αδύνατη η αποθήκευση του νέου κωδικού"
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Ο κωδικός αποθηκεύτηκε."
@@ -2346,7 +2393,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -3250,31 +3297,31 @@ msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγω
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr ""
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr ""
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Αλλάξτε τον κωδικό σας"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Αδύνατη η αποθήκευση του προφίλ."
@@ -3283,7 +3330,7 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3670,20 +3717,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -3948,9 +3995,9 @@ msgid "Unknown file type"
msgstr ""
#: lib/jabber.php:192
-#, fuzzy, php-format
-msgid "notice id: %s"
-msgstr "Μήνυμα"
+#, php-format
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4507,47 +4554,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr ""
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr ""
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr ""
@@ -4576,3 +4623,11 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Αλλάξτε τον κωδικό σας"
+
+#, fuzzy
+#~ msgid "notice id: %s"
+#~ msgstr "Μήνυμα"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index b6dc8fa58..74608c5c2 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.mo
+++ b/locale/en_GB/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 3eb1678ec..9e6780ddc 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to British English
#
+# Author@translatewiki.net: CiaranG
# --
# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
@@ -11,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:58:54+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:38:50+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -28,12 +29,15 @@ msgid "No such page"
msgstr "No such tag."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -111,35 +115,42 @@ msgstr "You and friends"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Updates from %1$s and friends on %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "API method not found!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "This method requires a POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Couldn't update user."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -147,12 +158,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Unable to save your Twitter settings!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Couldn't update user."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "User has no profile."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Couldn't save profile."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Block user failed."
@@ -198,6 +231,23 @@ msgstr "Direct messages to %s"
msgid "All the direct messages sent to %s"
msgstr "All the direct messages sent to %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API method not found!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -392,17 +442,17 @@ msgstr "Avatar updated."
msgid "No status with that ID found."
msgstr "No status with that ID found."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "That's too long. Max notice size is 140 chars."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Not found"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -486,7 +536,7 @@ msgid "Invalid size."
msgstr "Invalid size."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -534,7 +584,7 @@ msgstr "Crop"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -722,9 +772,8 @@ msgid "The address \"%s\" has been confirmed for your account."
msgstr "The address \"%s\" has been confirmed for your account."
#: actions/conversation.php:99
-#, fuzzy
msgid "Conversation"
-msgstr "Confirmation code"
+msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
#: lib/profileaction.php:206
@@ -1672,7 +1721,7 @@ msgid "Nickname"
msgstr "Nickname"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Password"
@@ -1810,7 +1859,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1856,8 +1905,8 @@ msgstr "Connect"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Not a supported data format."
@@ -1877,11 +1926,15 @@ msgstr "Other Settings"
msgid "Manage various other options."
msgstr "Manage various other options."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Automatic shortening service to use."
@@ -1916,65 +1969,60 @@ msgstr "This is your outbox, which lists private messages you have sent."
msgid "Change password"
msgstr "Change password"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Change your password"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Change your password."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Password change"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Old password"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "New password"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 or more characters"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Confirm"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "same as password above"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Change"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Password must be 6 or more characters."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Passwords don't match."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Incorrect old password"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Error saving user; invalid."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Can't save new password."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Password saved."
@@ -2413,7 +2461,7 @@ msgid "Same as password above. Required."
msgstr "Same as password above. Required."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -3349,31 +3397,31 @@ msgstr "DB error inserting reply: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Message to %1$s on %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profile"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Change your profile settings"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Upload an avatar"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Change your password"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Change e-mail handling"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "User profile"
@@ -3382,7 +3430,7 @@ msgstr "User profile"
msgid "Other"
msgstr "Other"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Other options"
@@ -3772,20 +3820,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
-#, fuzzy
+#: lib/common.php:189
msgid "No configuration file found. "
-msgstr "No confirmation code."
+msgstr "No configuration file found"
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Login to the site"
@@ -4055,8 +4102,8 @@ msgstr "Unknown file type"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "New notice"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4627,47 +4674,47 @@ msgstr "Send a direct message to this user"
msgid "Message"
msgstr "Message"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "about a year ago"
@@ -4696,3 +4743,10 @@ msgstr "Sorry, that is not your incoming e-mail address."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Sorry, no incoming e-mail allowed."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Change your password"
+
+#~ msgid "notice id: %s"
+#~ msgstr "New notice"
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
index eda910548..6972043ab 100644
--- a/locale/es/LC_MESSAGES/statusnet.mo
+++ b/locale/es/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index d04d4f826..bcd3ea64e 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:58:57+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:38:53+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -28,12 +28,15 @@ msgid "No such page"
msgstr "No existe tal página"
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -111,35 +114,42 @@ msgstr "Tú y amigos"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "¡No se encontró el método de la API!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Este método requiere PUBLICAR"
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "No se pudo actualizar el usuario."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -147,12 +157,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "¡No se pudo guardar tu configuración de Twitter!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "No se pudo actualizar el usuario."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "El usuario no tiene un perfil."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "No se pudo guardar el perfil."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Falló bloquear usuario."
@@ -198,6 +230,23 @@ msgstr "Mensajes directos a %s"
msgid "All the direct messages sent to %s"
msgstr "Todos los mensajes directos enviados a %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "¡No se encontró el método de la API!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -393,17 +442,17 @@ msgstr "Status borrado."
msgid "No status with that ID found."
msgstr "No hay estado para ese ID"
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "No encontrado"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -487,7 +536,7 @@ msgid "Invalid size."
msgstr "Tamaño inválido."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -535,7 +584,7 @@ msgstr "Cortar"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1693,7 +1742,7 @@ msgid "Nickname"
msgstr "Apodo"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Contraseña"
@@ -1833,7 +1882,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1881,8 +1930,8 @@ msgstr "Conectarse"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "No es un formato de dato soportado"
@@ -1903,11 +1952,15 @@ msgstr "Otras configuraciones"
msgid "Manage various other options."
msgstr "Manejo de varias opciones adicionales."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Servicio de acorte automático a usar."
@@ -1944,67 +1997,62 @@ msgstr ""
msgid "Change password"
msgstr "Cambiar contraseña"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Cambia tu contraseña"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Cambia tu contraseña."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Cambio de contraseña "
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Antigua contraseña"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nueva contraseña"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 o más caracteres"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Confirmar"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "repita la contraseña anterior"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Cotrnaseña debe tener 6 o más caracteres."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Las contraseñas no coinciden"
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Contraseña antigua incorrecta."
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Error al guardar el usuario; inválido."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "No se puede guardar la nueva contraseña."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Se guardó Contraseña."
@@ -2454,7 +2502,7 @@ msgid "Same as password above. Required."
msgstr "Igual a la contraseña de arriba. Requerida"
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo electrónico"
@@ -3407,31 +3455,31 @@ msgstr "Error de BD al insertar respuesta: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensaje a %1$s en %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Cambia tus opciones de perfil"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Cargar un avatar."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Cambia tu contraseña"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Cambiar el manejo del correo."
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "Diseñar tu perfil"
@@ -3439,7 +3487,7 @@ msgstr "Diseñar tu perfil"
msgid "Other"
msgstr "Otro"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Otras opciones"
@@ -3833,19 +3881,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
msgid "No configuration file found. "
msgstr "Ningún archivo de configuración encontrado. "
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr "Ir al instalador."
@@ -4110,8 +4158,8 @@ msgstr "Tipo de archivo desconocido"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Nuevo aviso"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4686,47 +4734,47 @@ msgstr "Enviar un mensaje directo a este usuario"
msgid "Message"
msgstr "Mensaje"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "hace un día"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "hace un año"
@@ -4755,3 +4803,10 @@ msgstr "Lo sentimos, pero este no es su dirección de correo entrante."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Lo sentimos, pero no se permite correos entrantes"
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Cambia tu contraseña"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Nuevo aviso"
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
index 61946bd6a..a64023a6d 100644
--- a/locale/fi/LC_MESSAGES/statusnet.mo
+++ b/locale/fi/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 8202cd4f4..97bd0b253 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:00+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:38:58+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -28,12 +28,15 @@ msgid "No such page"
msgstr "Sivua ei ole."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -111,35 +114,42 @@ msgstr "Sinä ja kaverit"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "API-metodia ei löytynyt!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Tämä metodi edellyttää POST sanoman."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Ei voitu päivittää käyttäjää."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -147,12 +157,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Twitter-asetuksia ei voitu tallentaa!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Ei voitu päivittää käyttäjää."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Käyttäjällä ei ole profiilia."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Ei voitu tallentaa profiilia."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Käyttäjän esto epäonnistui."
@@ -199,6 +231,23 @@ msgstr "Suorat viestit käyttäjälle %s"
msgid "All the direct messages sent to %s"
msgstr "Kaikki suorat viestit käyttäjälle %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-metodia ei löytynyt!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -388,17 +437,17 @@ msgstr "Päivitys poistettu."
msgid "No status with that ID found."
msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Ei löytynyt"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
@@ -481,7 +530,7 @@ msgid "Invalid size."
msgstr "Koko ei kelpaa."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Kuva"
@@ -529,7 +578,7 @@ msgstr "Rajaa"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1664,7 +1713,7 @@ msgid "Nickname"
msgstr "Tunnus"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Salasana"
@@ -1802,7 +1851,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1849,8 +1898,8 @@ msgstr "Yhdistä"
msgid "Only "
msgstr "Vain "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Tuo ei ole tuettu tietomuoto."
@@ -1870,11 +1919,15 @@ msgstr "Muita Asetuksia"
msgid "Manage various other options."
msgstr "Hallinnoi muita asetuksia."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr "Lyhennä URL-osoitteita"
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Käytettävä automaattinen lyhennyspalvelu."
@@ -1909,65 +1962,60 @@ msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit."
msgid "Change password"
msgstr "Vaihda salasana"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Vaihda salasanasi"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Vaihda salasanasi."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Salasanan vaihto"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Vanha salasana"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Uusi salasana"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 tai useampia merkkejä"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Vahvista"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "sama salasana kuin yllä"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Vaihda"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Salasanat eivät täsmää."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Väärä vanha salasana"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Uutta salasanaa ei voida tallentaa."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Salasana tallennettu."
@@ -2412,7 +2460,7 @@ msgid "Same as password above. Required."
msgstr "Sama kuin ylläoleva salasana. Pakollinen."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Sähköposti"
@@ -3355,31 +3403,31 @@ msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Viesti käyttäjälle %1$s, %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profiili"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Vaihda profiiliasetuksesi"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Lataa kuva"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Vaihda salasanasi"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Muuta sähköpostin käsittelyasetuksia."
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Käyttäjän profiili"
@@ -3388,7 +3436,7 @@ msgstr "Käyttäjän profiili"
msgid "Other"
msgstr "Muut"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Muita asetuksia"
@@ -3778,20 +3826,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Varmistuskoodia ei ole annettu."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Kirjaudu sisään palveluun"
@@ -4062,8 +4110,8 @@ msgstr "Tunnistamaton tiedoston tyyppi"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Uusi päivitys"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4638,47 +4686,47 @@ msgstr "Lähetä suora viesti tälle käyttäjälle"
msgid "Message"
msgstr "Viesti"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "noin vuosi sitten"
@@ -4707,3 +4755,10 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Vaihda salasanasi"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Uusi päivitys"
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
index 59b7812fc..059d75717 100644
--- a/locale/fr/LC_MESSAGES/statusnet.mo
+++ b/locale/fr/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 7507e44db..3531e335f 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -2,34 +2,37 @@
#
# Author@translatewiki.net: IAlex
# Author@translatewiki.net: Jean-Frédéric
+# Author@translatewiki.net: Zetud
# --
msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:03+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:00+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
msgid "No such page"
-msgstr "Aucun marquage trouvé."
+msgstr "Page non trouvée"
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -107,35 +110,42 @@ msgstr "Vous et vos amis"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Statuts de %1$s et ses amis dans %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Méthode API non trouvée !"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Ce processus requiert un POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Impossible de mettre à jour l'utilisateur."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -143,12 +153,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "L'enregistrement de votre configuration Twitter a échoué !"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Impossible de mettre à jour l'utilisateur."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Aucun profil ne correspond à cet utilisateur."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Impossible d'enregistrer le profil."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Le blocage de l'utilisateur a échoué."
@@ -162,9 +194,9 @@ msgid "No message text!"
msgstr "Message sans texte !"
#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Max message size is %d chars."
-msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères."
+msgstr "C'est trop long ! La taille maximale du message est de %d caractères."
#: actions/apidirectmessagenew.php:146
msgid "Recipient user not found."
@@ -177,9 +209,9 @@ msgstr ""
"comme amis."
#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
msgid "Direct messages from %s"
-msgstr "Messages envoyés à %s"
+msgstr "Messages direct depuis %s"
#: actions/apidirectmessage.php:93
#, php-format
@@ -196,6 +228,23 @@ msgstr "Messages envoyés à %s"
msgid "All the direct messages sent to %s"
msgstr "Tous les messages envoyés à %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Méthode API non trouvée !"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -227,9 +276,8 @@ msgid "Could not follow user: %s is already on your list."
msgstr "Impossible de suivre l'utilisateur : %s est déjà dans votre liste."
#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
msgid "Could not unfollow user: User not found."
-msgstr "Impossible de suivre l'utilisateur : Utilisateur non trouvé."
+msgstr "Impossible de ne plus suivre l'utilisateur : utilisateur non trouvé."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself!"
@@ -240,9 +288,8 @@ msgid "Two user ids or screen_names must be supplied."
msgstr "Vous devez fournir 2 identifiants ou pseudos."
#: actions/apifriendshipsshow.php:135
-#, fuzzy
msgid "Could not determine source user."
-msgstr "Impossible de récupérer le flux public."
+msgstr "Impossible de déterminer l'utilisateur source."
#: actions/apifriendshipsshow.php:143
msgid "Could not find target user."
@@ -254,9 +301,8 @@ msgstr "Impossible de créer le groupe."
#: actions/apigroupcreate.php:147 actions/editgroup.php:259
#: actions/newgroup.php:210
-#, fuzzy
msgid "Could not create aliases."
-msgstr "Impossible de créer le favori."
+msgstr "Impossible de créer les alias."
#: actions/apigroupcreate.php:166 actions/newgroup.php:224
msgid "Could not set group membership."
@@ -295,9 +341,9 @@ msgid "Full name is too long (max 255 chars)."
msgstr "Nom complet trop long (maximum de 255 caractères)."
#: actions/apigroupcreate.php:261
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (max %d chars)."
-msgstr "la description est trop longue (140 caractères maximum)."
+msgstr "La description est trop longue (%d caractères maximum)."
#: actions/apigroupcreate.php:272 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
@@ -313,15 +359,15 @@ msgstr ""
#: actions/apigroupcreate.php:312 actions/editgroup.php:224
#: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Marquage invalide : \"%s\""
+msgstr "Alias invalide : « %s »"
#: actions/apigroupcreate.php:321 actions/editgroup.php:228
#: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Pseudo déjà utilisé. Essayez-en un autre."
+msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
#: actions/apigroupcreate.php:334 actions/editgroup.php:234
#: actions/newgroup.php:178
@@ -329,26 +375,24 @@ msgid "Alias can't be the same as nickname."
msgstr ""
#: actions/apigroupjoin.php:110
-#, fuzzy
msgid "You are already a member of that group."
-msgstr "Vous êtes déjà membre de ce groupe "
+msgstr "Vous êtes déjà membre de ce groupe."
#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
msgid "You have been blocked from that group by the admin."
msgstr ""
#: actions/apigroupjoin.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s."
-msgstr "Impossible d'inscrire l'utilisateur %s au groupe %s"
+msgstr "Impossible de joindre l'utilisateur %s au groupe %s."
#: actions/apigroupleave.php:114
-#, fuzzy
msgid "You are not a member of this group."
msgstr "Vous n'êtes pas membre de ce groupe."
#: actions/apigroupleave.php:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s."
msgstr "Impossible de retirer l'utilisateur %s du groupe %s"
@@ -358,12 +402,12 @@ msgid "%s groups"
msgstr "Groupes de %s"
#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
+#, php-format
msgid "groups on %s"
-msgstr "Actions du groupe"
+msgstr "groupes sur %s"
#: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
msgid "%s's groups"
msgstr "Groupes de %s"
@@ -381,33 +425,31 @@ msgid "You may not delete another user's status."
msgstr "Vous ne pouvez pas supprimer le statut d'un autre utilisateur."
#: actions/apistatusesshow.php:138
-#, fuzzy
msgid "Status deleted."
-msgstr "Avatar supprimé."
+msgstr "Statut supprimé."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
msgstr "Aucun statut trouvé avec cet identifiant."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Max notice size is %d chars."
-msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères."
+msgstr "C'est trop long ! La taille maximale de l'avis est de %d caractères."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Non trouvé"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
-#, fuzzy
msgid "Unsupported format."
-msgstr "Format de fichier d'image non supporté."
+msgstr "Format non supporté."
#: actions/apitimelinefavorites.php:107
#, php-format
@@ -482,14 +524,16 @@ msgid "Invalid size."
msgstr "Taille incorrecte."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
#: actions/avatarsettings.php:78
-#, fuzzy, php-format
+#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Vous pouvez associer un « avatar » (image personnelle) à votre profil."
+msgstr ""
+"Vous pouvez associer un « avatar » (image personnelle) à votre profil. La "
+"taille maximale du fichier est de %s."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
@@ -530,7 +574,7 @@ msgstr "Recadrer"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -583,14 +627,14 @@ msgid "No such group"
msgstr "Aucun groupe trouvé"
#: actions/blockedfromgroup.php:90
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles"
-msgstr "Profil de l'utilisateur"
+msgstr "%s profils bloqués"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked profiles, page %d"
-msgstr "%s et ses amis - page %d"
+msgstr "%s profils bloqués, page %d"
#: actions/blockedfromgroup.php:108
#, fuzzy
@@ -598,9 +642,8 @@ msgid "A list of the users blocked from joining this group."
msgstr "Liste des utilisateurs inscrits à ce groupe."
#: actions/blockedfromgroup.php:281
-#, fuzzy
msgid "Unblock user from group"
-msgstr "Le déblocage de l'utilisateur a échoué."
+msgstr "Débloquer l'utilisateur du groupe"
#: actions/blockedfromgroup.php:313 lib/unblockform.php:150
msgid "Unblock"
@@ -674,9 +717,8 @@ msgid "Failed to save block information."
msgstr "Impossible d'enregistrer les informations de blocage."
#: actions/bookmarklet.php:50
-#, fuzzy
msgid "Post to "
-msgstr "Photo"
+msgstr "Poster sur"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -722,9 +764,8 @@ msgid "The address \"%s\" has been confirmed for your account."
msgstr "L'adresse \"%s\" a été validée pour votre compte."
#: actions/conversation.php:99
-#, fuzzy
msgid "Conversation"
-msgstr "Code de confirmation"
+msgstr "Conversation"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
#: lib/profileaction.php:206
@@ -802,9 +843,9 @@ msgid "Use this form to edit the group."
msgstr "Remplissez ce formulaire pour modifier les options du groupe."
#: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
msgid "description is too long (max %d chars)."
-msgstr "la description est trop longue (140 caractères maximum)."
+msgstr "la description est trop longue (%d caractères maximum)."
#: actions/editgroup.php:253
msgid "Could not update group."
@@ -1102,19 +1143,16 @@ msgid "That user has blocked you from subscribing."
msgstr "Cet utilisateur vous a empêché de vous inscrire."
#: actions/finishremotesubscribe.php:106
-#, fuzzy
msgid "You are not authorized."
-msgstr "Non autorisé."
+msgstr "Vous n'êtes pas autorisé."
#: actions/finishremotesubscribe.php:109
-#, fuzzy
msgid "Could not convert request token to access token."
-msgstr "Impossible de convertir les jetons de requête en jetons d'accès"
+msgstr "Impossible de convertir le jeton de requête en jeton d'accès."
#: actions/finishremotesubscribe.php:114
-#, fuzzy
msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Version inconnue du protocole OMB"
+msgstr "Le service distant utilise une version inconnue du protocole OMB."
#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
msgid "Error updating remote profile"
@@ -1127,9 +1165,8 @@ msgid "No such group."
msgstr "Aucun groupe trouvé."
#: actions/getfile.php:75
-#, fuzzy
msgid "No such file."
-msgstr "Statut non trouvé. "
+msgstr "Fichier non trouvé."
#: actions/getfile.php:79
msgid "Cannot read file."
@@ -1221,10 +1258,12 @@ msgid "Group logo"
msgstr "Logo du groupe"
#: actions/grouplogo.php:150
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Choisissez un logo pour votre groupe."
+msgstr ""
+"Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier "
+"est de %s."
#: actions/grouplogo.php:362
#, fuzzy
@@ -1266,13 +1305,12 @@ msgid "Make user an admin of the group"
msgstr "Faire de cet utilisateur un administrateur du groupe"
#: actions/groupmembers.php:473
-#, fuzzy
msgid "Make Admin"
-msgstr "Administrer"
+msgstr "Faire un administrateur"
#: actions/groupmembers.php:473
msgid "Make this user an admin"
-msgstr ""
+msgstr "Faire de cet utilisateur un administrateur"
#: actions/grouprss.php:133
#, fuzzy, php-format
@@ -1338,12 +1376,11 @@ msgstr "Créer un nouveau groupe"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Seul un administrateur peut débloquer les membres du groupes."
#: actions/groupunblock.php:95
-#, fuzzy
msgid "User is not blocked from group."
-msgstr "Cet utilisateur vous a bloqué."
+msgstr "Cet utilisateur n'est pas bloqué du groupe."
#: actions/groupunblock.php:128 actions/unblock.php:108
msgid "Error removing the block."
@@ -1364,9 +1401,8 @@ msgstr ""
"dessous."
#: actions/imsettings.php:89
-#, fuzzy
msgid "IM is not available."
-msgstr "Cette page n'est pas disponible dans "
+msgstr "La messagerie instantanée n'est pas disponible."
#: actions/imsettings.php:106
msgid "Current confirmed Jabber/GTalk address."
@@ -1679,7 +1715,7 @@ msgid "Nickname"
msgstr "Pseudo"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Mot de passe"
@@ -1722,7 +1758,7 @@ msgstr ""
#: actions/makeadmin.php:95
#, php-format
msgid "%s is already an admin for group \"%s\"."
-msgstr ""
+msgstr "%s est déjà un administrateur du groupe « %s »."
#: actions/makeadmin.php:132
#, php-format
@@ -1818,14 +1854,14 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
#: actions/noticesearchrss.php:89
-#, fuzzy, php-format
+#, php-format
msgid "Updates with \"%s\""
-msgstr "Statuts de %1$s dans %2$s!"
+msgstr "Mises à jour avec « %s »"
#: actions/noticesearchrss.php:91
#, fuzzy, php-format
@@ -1857,16 +1893,15 @@ msgid "%1$s's status on %2$s"
msgstr "Statut de %1$s sur %2$s"
#: actions/oembed.php:157
-#, fuzzy
msgid "content type "
-msgstr "Contenu"
+msgstr "type de contenu "
#: actions/oembed.php:160
msgid "Only "
-msgstr ""
+msgstr "Seulement "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Format de données non supporté."
@@ -1886,11 +1921,15 @@ msgstr "Autres paramètres"
msgid "Manage various other options."
msgstr "Autres options à configurer"
-#: actions/othersettings.php:117
-msgid "Shorten URLs with"
+#: actions/othersettings.php:108
+msgid " (free service)"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "Raccourcir les URL avec"
+
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Sélectionnez un service de réduction d'URL."
@@ -1926,65 +1965,60 @@ msgstr ""
msgid "Change password"
msgstr "Modifier le mot de passe"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Modifier votre mot de passe"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Modifier votre mot de passe."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Modification du mot de passe"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Ancien mot de passe"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nouveau mot de passe"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 caractères ou plus"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Confirmer"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "identique au mot de passe ci-dessus"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Modifier"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Votre mot de passe doit contenir au moins 6 caractères."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Les mots de passe ne correspondent pas."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Ancien mot de passe incorrect"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Impossible de sauvegarder le nouveau mot de passe."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Mot de passe enregistré."
@@ -2056,14 +2090,13 @@ msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site"
#: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "Décrivez vos intérêts en 140 caractères"
+msgstr "Décrivez vous et vos intérêts en %d caractères"
#: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "Décrivez qui vous êtes et vos "
+msgstr "Décrivez vous et vos interêts"
#: actions/profilesettings.php:127 actions/register.php:465
msgid "Bio"
@@ -2116,9 +2149,9 @@ msgstr ""
"les utilisateurs non-humains)"
#: actions/profilesettings.php:221 actions/register.php:223
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (max %d chars)."
-msgstr "La bio est trop longue (140 caractères maximum)."
+msgstr "La bio est trop longue (%d caractères maximum)."
#: actions/profilesettings.php:228
msgid "Timezone not selected."
@@ -2384,9 +2417,8 @@ msgid "Sorry, only invited people can register."
msgstr "Désolé ! Seules les personnes invitées peuvent s'inscrire."
#: actions/register.php:92
-#, fuzzy
msgid "Sorry, invalid invitation code."
-msgstr "Erreur dans le code de confirmation."
+msgstr "Désolé, code d'invitation invalide."
#: actions/register.php:112
msgid "Registration successful"
@@ -2437,7 +2469,7 @@ msgid "Same as password above. Required."
msgstr "Identique au mot de passe ci-dessus. Requis."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Courriel"
@@ -2527,9 +2559,8 @@ msgid "Remote subscribe"
msgstr "Abonnement à distance "
#: actions/remotesubscribe.php:124
-#, fuzzy
msgid "Subscribe to a remote user"
-msgstr "S'abonner à cet utilisateur"
+msgstr "S'abonner à un utilisateur distant"
#: actions/remotesubscribe.php:129
msgid "User nickname"
@@ -2563,14 +2594,12 @@ msgid ""
msgstr "URL de profil invalide (aucun document YADIS)."
#: actions/remotesubscribe.php:176
-#, fuzzy
msgid "That’s a local profile! Login to subscribe."
-msgstr "Ce profil est local ! Ouvrez une session pour vous abonner."
+msgstr "Ce profil est local ! Connectez-vous pour vous abonner."
#: actions/remotesubscribe.php:183
-#, fuzzy
msgid "Couldn’t get a request token."
-msgstr "Impossible d'obtenir le jeton de requête."
+msgstr "Impossible d'obtenir un jeton de requête."
#: actions/replies.php:125 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
@@ -2625,9 +2654,9 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Message adressé à %1$s le %2$s"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%s's favorite notices, page %d"
-msgstr "Statuts favoris de %s - page %d"
+msgstr "Avis favoris de %s, page %d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -2699,26 +2728,26 @@ msgstr "Note"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Alias"
#: actions/showgroup.php:293
msgid "Group actions"
msgstr "Actions du groupe"
#: actions/showgroup.php:328
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Fil des statuts du groupe %s"
+msgstr "Fil des avis du groupe %s (RSS 1.0)"
#: actions/showgroup.php:334
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Fil des statuts du groupe %s"
+msgstr "Fil des avis du groupe %s (RSS 2.0)"
#: actions/showgroup.php:340
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr "Fil des statuts du groupe %s"
+msgstr "Fil des avis du groupe %s (Atom)"
#: actions/showgroup.php:345
#, php-format
@@ -2793,9 +2822,8 @@ msgid "Message from %1$s on %2$s"
msgstr "Message reçu de %1$s le %2$s"
#: actions/shownotice.php:90
-#, fuzzy
msgid "Notice deleted."
-msgstr "Statut publié"
+msgstr "Avis supprimé."
#: actions/showstream.php:73
#, fuzzy, php-format
@@ -2881,9 +2909,8 @@ msgstr ""
"name%%."
#: actions/smssettings.php:91
-#, fuzzy
msgid "SMS is not available."
-msgstr "Cette page n'est pas disponible dans "
+msgstr "Les SMS ne sont pas disponibles."
#: actions/smssettings.php:112
msgid "Current confirmed SMS-enabled phone number."
@@ -3194,7 +3221,7 @@ msgstr "Refuser"
#: actions/userauthorization.php:212
msgid "Reject this subscription"
-msgstr "Rejeter cet souscription"
+msgstr "Rejeter cette souscription"
#: actions/userauthorization.php:225
msgid "No authorization request!"
@@ -3256,14 +3283,14 @@ msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
#: actions/userauthorization.php:343
-#, fuzzy, php-format
+#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "Impossible de lire l'URL '%s'"
+msgstr "Impossible de lire l'URL de l'avatar « %s »."
#: actions/userauthorization.php:348
-#, fuzzy, php-format
+#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Format d'image invalide pour '%s'"
+msgstr "Format d'image invalide pour l'URL de l'avatar « %s »."
#: actions/userbyid.php:70
msgid "No id."
@@ -3289,9 +3316,8 @@ msgid "%s groups, page %d"
msgstr "Groupes de %s - page %d"
#: actions/usergroups.php:130
-#, fuzzy
msgid "Search for more groups"
-msgstr "Rechercher des personnes ou du texte"
+msgstr "Rechercher pour plus de groupes"
#: actions/usergroups.php:153
#, php-format
@@ -3334,9 +3360,8 @@ msgid "DB error inserting hashtag: %s"
msgstr "Erreur de base de donnée en insérant le hashtag : %s"
#: classes/Notice.php:179
-#, fuzzy
msgid "Problem saving notice. Too long."
-msgstr "Problème lors de l'enregistrement du statut."
+msgstr "Problème lors de l'enregistrement de l'avis ; trop long."
#: classes/Notice.php:183
msgid "Problem saving notice. Unknown user."
@@ -3376,31 +3401,31 @@ msgstr "Erreur de base de donnée en insérant la réponse :%s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Message adressé à %1$s le %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Modifier vos paramètres de profil"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Ajouter un avatar"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Modifier votre mot de passe"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Modifier le traitement des courriels"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr "Conception"
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "Concevez votre profile"
@@ -3408,7 +3433,7 @@ msgstr "Concevez votre profile"
msgid "Other"
msgstr "Autres "
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Autres options "
@@ -3447,9 +3472,8 @@ msgid "Connect"
msgstr "Connecter"
#: lib/action.php:435
-#, fuzzy
msgid "Connect to services"
-msgstr "Impossible de rediriger vers le serveur : %s"
+msgstr "Se connecter aux services"
#: lib/action.php:439 lib/subgroupnav.php:105
msgid "Invite"
@@ -3501,9 +3525,8 @@ msgid "Local views"
msgstr "Vues locales"
#: lib/action.php:612
-#, fuzzy
msgid "Page notice"
-msgstr "Notice de la page"
+msgstr "Avis de la page"
#: lib/action.php:714
msgid "Secondary site navigation"
@@ -3568,9 +3591,8 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#: lib/action.php:785
-#, fuzzy
msgid "Site content license"
-msgstr "Licence du logiciel StatusNet"
+msgstr "Licence du contenu du site"
#: lib/action.php:794
msgid "All "
@@ -3696,10 +3718,10 @@ msgid "About: %s"
msgstr "À propos : %s"
#: lib/command.php:358 scripts/xmppdaemon.php:321
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-"Message trop long ! La taille maximale est de 140 caractères ; vous en avez "
+"Message trop long ! La taille maximale est de %d caractères ; vous en avez "
"entré %d."
#: lib/command.php:377
@@ -3707,21 +3729,20 @@ msgid "Error sending direct message."
msgstr "Une erreur est survenue pendant l'envoi de votre message."
#: lib/command.php:431
-#, fuzzy, php-format
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-"Message trop long ! La taille maximale est de 140 caractères ; vous en avez "
+"Avis trop long ! La taille maximale est de %d caractères ; vous en avez "
"entré %d."
#: lib/command.php:439
-#, fuzzy, php-format
+#, php-format
msgid "Reply to %s sent"
-msgstr "Répondre à ce statut"
+msgstr "Réponse à %s envoyée"
#: lib/command.php:441
-#, fuzzy
msgid "Error saving notice."
-msgstr "Problème lors de l'enregistrement du statut."
+msgstr "Problème lors de l'enregistrement de l'avis."
#: lib/command.php:495
msgid "Specify the name of the user to subscribe to"
@@ -3807,23 +3828,21 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
-#, fuzzy
+#: lib/common.php:189
msgid "No configuration file found. "
-msgstr "Aucun code de confirmation."
+msgstr "Aucun fichier de configuration n'a été trouvé. "
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
-#, fuzzy
+#: lib/common.php:192
msgid "Go to the installer."
-msgstr "Ouvrir une session"
+msgstr "Aller au programme d'installation"
#: lib/connectsettingsaction.php:110
msgid "IM"
@@ -4085,8 +4104,8 @@ msgstr "Type de fichier inconnu"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Nouveau statut"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4357,11 +4376,11 @@ msgstr ""
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Un dossier temporaire est manquant."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Impossible d'écrire sur le disque."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
@@ -4412,11 +4431,11 @@ msgstr "Quoi de neuf, %s ?"
#: lib/noticeform.php:180
msgid "Attach"
-msgstr ""
+msgstr "Attacher"
#: lib/noticeform.php:184
msgid "Attach a file"
-msgstr ""
+msgstr "Attacher un fichier"
#: lib/noticelist.php:478
msgid "in context"
@@ -4455,9 +4474,8 @@ msgid "Error inserting remote profile"
msgstr "Erreur lors de l'insertion du profil distant"
#: lib/oauthstore.php:345
-#, fuzzy
msgid "Duplicate notice"
-msgstr "Supprimer ce statut"
+msgstr "Dupliquer l'avis"
#: lib/oauthstore.php:487
msgid "Couldn't insert new subscription."
@@ -4615,7 +4633,7 @@ msgstr "(aucun)"
#: lib/subs.php:48
msgid "Already subscribed!"
-msgstr ""
+msgstr "Déjà souscrit !"
#: lib/subs.php:52
msgid "User has blocked you."
@@ -4677,47 +4695,47 @@ msgstr "Envoyer un message à cet utilisateur"
msgid "Message"
msgstr "Message "
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "il y a quelques secondes "
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "il y a environ 1 an"
@@ -4730,6 +4748,7 @@ msgstr "&s n'est pas une couleur valide !"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
+"%s n'est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
#: scripts/maildaemon.php:48
msgid "Could not parse message."
@@ -4746,3 +4765,10 @@ msgstr "Désolé, ceci n'est pas votre adresse de courriel entrant."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Désolé, la réception de courriels n'est pas permise. "
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Modifier votre mot de passe"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Nouveau statut"
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
index bf827fd68..157f791ac 100644
--- a/locale/ga/LC_MESSAGES/statusnet.mo
+++ b/locale/ga/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 294ef6f94..d8b2f76d7 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:05+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:04+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Non existe a etiqueta."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s e amigos"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizacións dende %1$s e amigos en %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Método da API non atopado"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Este método require un POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Non se puideron gardar os teus axustes de Twitter!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "O usuario non ten perfil."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Non se puido gardar o perfil."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Bloqueo de usuario fallido."
@@ -195,6 +227,23 @@ msgstr "Mensaxes directas para %s"
msgid "All the direct messages sent to %s"
msgstr "Tódalas mensaxes directas enviadas a %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Método da API non atopado"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -391,18 +440,18 @@ msgstr "Avatar actualizado."
msgid "No status with that ID found."
msgstr "Non existe ningún estado con esa ID atopada."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Non atopado"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -486,7 +535,7 @@ msgid "Invalid size."
msgstr "Tamaño inválido."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -536,7 +585,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1692,7 +1741,7 @@ msgid "Nickname"
msgstr "Alcume"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Contrasinal"
@@ -1831,7 +1880,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1878,8 +1927,8 @@ msgstr "Conectar"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Non é un formato de datos soportado."
@@ -1899,11 +1948,15 @@ msgstr "Outros axustes"
msgid "Manage various other options."
msgstr "Xestionár axustes varios."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Servizo de acortado automático a usar."
@@ -1939,67 +1992,62 @@ msgstr ""
msgid "Change password"
msgstr "Cambiar contrasinal"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Cambiar contrasinal"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Cambiar contrasinal"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Contrasinal gardada."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Contrasinal antiga"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nova contrasinal"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 ou máis caracteres"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Confirmar"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "igual á contrasinal de enriba"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Modificado"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "A contrasinal debe ter 6 caracteres ou máis."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "As contrasinais non coinciden"
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Contrasinal actual incorrecta"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Acounteceu un erro gardando o usuario: é inválido."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Non se pode gardar a contrasinal."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Contrasinal gardada."
@@ -2456,7 +2504,7 @@ msgid "Same as password above. Required."
msgstr "A mesma contrasinal que arriba. Requerido."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Correo Electrónico"
@@ -3412,32 +3460,32 @@ msgstr "Erro ó inserir a contestación na BD: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensaxe de %1$s en %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Configuración de perfil"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
#, fuzzy
msgid "Upload an avatar"
msgstr "Acounteceu un fallo ó actualizar o avatar."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Cambiar contrasinal"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Cambiar a xestión de email"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "O usuario non ten perfil."
@@ -3446,7 +3494,7 @@ msgstr "O usuario non ten perfil."
msgid "Other"
msgstr "Outros"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Outras opcions"
@@ -3878,20 +3926,20 @@ msgstr ""
"tracks - non implementado por agora.\n"
"tracking - non implementado por agora.\n"
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Sen código de confirmación."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -4167,8 +4215,8 @@ msgstr "tipo de ficheiro non soportado"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Novo chío"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4336,6 +4384,16 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) preguntase que é de ti, e invítate a publicar algun chío.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
#: lib/mail.php:509
#, php-format
@@ -4360,6 +4418,20 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) enviouche unha mensaxe privada:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
#: lib/mail.php:554
#, fuzzy, php-format
@@ -4783,47 +4855,47 @@ msgstr "Non podes enviar mensaxes a este usurio."
msgid "Message"
msgstr "Nova mensaxe"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "fai un día"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "fai un ano"
@@ -4852,3 +4924,10 @@ msgstr "Ise é un enderezo IM incorrecto."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Aivá, non se permiten correos entrantes."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Cambiar contrasinal"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Novo chío"
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
index faaf5f29b..821468374 100644
--- a/locale/he/LC_MESSAGES/statusnet.mo
+++ b/locale/he/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 902e4a5c0..3499f2a5d 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:08+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:06+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "אין הודעה כזו."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s וחברים"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "קוד האישור לא נמצא."
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "למשתמש אין פרופיל."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "שמירת הפרופיל נכשלה."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -193,6 +224,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -387,17 +435,17 @@ msgstr "התמונה עודכנה."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "לא נמצא"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -482,7 +530,7 @@ msgid "Invalid size."
msgstr "גודל לא חוקי."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "תמונה"
@@ -532,7 +580,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1640,7 +1688,7 @@ msgid "Nickname"
msgstr "כינוי"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "סיסמה"
@@ -1775,7 +1823,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1820,8 +1868,8 @@ msgstr "התחבר"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1842,11 +1890,15 @@ msgstr "הגדרות"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1882,66 +1934,62 @@ msgstr ""
msgid "Change password"
msgstr "שנה סיסמה"
-#: actions/passwordsettings.php:70
-msgid "You are not allowed to change your password"
-msgstr ""
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "שנה סיסמה"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "הסיסמה נשמרה."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "סיסמה ישנה"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "סיסמה חדשה"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "לפחות 6 אותיות"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "אשר"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "זהה לסיסמה למעלה"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "שנה"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "הסיסמאות לא תואמות."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "הסיסמה הישנה לא נכונה"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "לא ניתן לשמור את הסיסמה"
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "הסיסמה נשמרה."
@@ -2376,7 +2424,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -3284,32 +3332,32 @@ msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "פרופיל"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
#, fuzzy
msgid "Upload an avatar"
msgstr "עדכון התמונה נכשל."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr ""
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "למשתמש אין פרופיל."
@@ -3318,7 +3366,7 @@ msgstr "למשתמש אין פרופיל."
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3715,20 +3763,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "אין קוד אישור."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -4001,8 +4049,8 @@ msgstr ""
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "הודעה חדשה"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4575,47 +4623,47 @@ msgstr ""
msgid "Message"
msgstr "הודעה חדשה"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "לפני כדקה"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "לפני כשעה"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "לפני כיום"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "לפני כ-%d ימים"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "לפני כחודש"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "לפני כ-%d חודשים"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "לפני כשנה"
@@ -4644,3 +4692,6 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#~ msgid "notice id: %s"
+#~ msgstr "הודעה חדשה"
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
index eaf63735e..06c9153d1 100644
--- a/locale/is/LC_MESSAGES/statusnet.mo
+++ b/locale/is/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index c0bef7ddf..c8cae147b 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:10+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:09+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Ekkert þannig merki."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -105,35 +108,42 @@ msgstr ""
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Færslur frá %1$s og vinum á %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Aðferð í forritsskilum fannst ekki!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Þessi aðferð krefst POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Gat ekki uppfært notanda."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -141,12 +151,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Gat ekki uppfært hóp."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Notandi hefur enga persónulega síðu."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Gat ekki vistað persónulega síðu."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Mistókst að loka á notanda."
@@ -192,6 +223,23 @@ msgstr "Bein skilaboð til %s"
msgid "All the direct messages sent to %s"
msgstr "Öll bein skilaboð til %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Aðferð í forritsskilum fannst ekki!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -381,17 +429,17 @@ msgstr ""
msgid "No status with that ID found."
msgstr "Engin staða með þessu kenni fannst."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Fannst ekki"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -474,7 +522,7 @@ msgid "Invalid size."
msgstr "Ótæk stærð."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Mynd"
@@ -522,7 +570,7 @@ msgstr "Skera af"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1638,7 +1686,7 @@ msgid "Nickname"
msgstr "Stuttnefni"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Lykilorð"
@@ -1778,7 +1826,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1824,8 +1872,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Enginn stuðningur við gagnasnið."
@@ -1845,11 +1893,15 @@ msgstr "Aðrar stillingar"
msgid "Manage various other options."
msgstr "Sjá um ýmsar aðrar stillingar."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Þjónusta sem sér um sjálfkrafa styttingu."
@@ -1885,65 +1937,60 @@ msgstr ""
msgid "Change password"
msgstr "Breyta lykilorði"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Breyta lykilorðinu þínu"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Breyta lykilorðinu þínu."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Lykilorðabreyting"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Eldra lykilorð"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nýtt lykilorð"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 eða fleiri tákn"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Staðfesta"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "sama og lykilorðið hér fyrir ofan"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Breyta"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Lykilorðin passa ekki saman."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Rangt eldra lykilorð"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Villa kom upp í vistun notanda: ótækt."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Get ekki vistað nýja lykilorðið."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Lykilorð vistað."
@@ -2384,7 +2431,7 @@ msgid "Same as password above. Required."
msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Tölvupóstur"
@@ -3304,31 +3351,31 @@ msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Persónuleg síða"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Breyta persónulegu stillingunum þínum"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Hlaða upp einkennismynd"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Breyta lykilorðinu þínu"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Breyta tölvupóstumsjón"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr ""
@@ -3336,7 +3383,7 @@ msgstr ""
msgid "Other"
msgstr "Annað"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Aðrir valkostir"
@@ -3726,20 +3773,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Enginn staðfestingarlykill."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Skrá þig inn á síðuna"
@@ -4002,9 +4049,9 @@ msgid "Unknown file type"
msgstr "Óþekkt skráargerð"
#: lib/jabber.php:192
-#, fuzzy, php-format
-msgid "notice id: %s"
-msgstr "Bablveita fyrir %s"
+#, php-format
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4564,47 +4611,47 @@ msgstr "Senda bein skilaboð til þessa notanda"
msgid "Message"
msgstr "Skilaboð"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
@@ -4633,3 +4680,11 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Því miður er móttökutölvupóstur ekki leyfður."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Breyta lykilorðinu þínu"
+
+#, fuzzy
+#~ msgid "notice id: %s"
+#~ msgstr "Bablveita fyrir %s"
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
index 1e33d6b95..015f5f70b 100644
--- a/locale/it/LC_MESSAGES/statusnet.mo
+++ b/locale/it/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 06a8a0a12..00a632ed9 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:13+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:12+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Nessuna tale etichetta."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s e amici"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aggiornamenti da %1$s e amici su %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Metodo delle API non trovato!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Questo metodo richiede POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Impossibile aggiornare l'utente."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Impossibile salvare le tue impostazioni di Twitter!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Impossibile aggiornare l'utente."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "L'utente non ha un profilo."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Impossibile salvare il profilo."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Blocco dell'utente non riuscito."
@@ -193,6 +225,23 @@ msgstr "Messaggi diretti a %s"
msgid "All the direct messages sent to %s"
msgstr "Tutti i messaggi diretti inviati a %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Metodo delle API non trovato!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -389,17 +438,17 @@ msgstr "Immagine aggiornata."
msgid "No status with that ID found."
msgstr "Nessuno stato con quel ID trovato."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Troppo lungo. Lunghezza massima 140 caratteri."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Non trovato"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -483,7 +532,7 @@ msgid "Invalid size."
msgstr "Dimensione non valida."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Immagine"
@@ -531,7 +580,7 @@ msgstr "Ritaglia"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1679,7 +1728,7 @@ msgid "Nickname"
msgstr "Soprannome"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Password"
@@ -1816,7 +1865,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1863,8 +1912,8 @@ msgstr "Connetti"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Non è un formato di dati supportato."
@@ -1884,11 +1933,15 @@ msgstr "Altre impostazioni"
msgid "Manage various other options."
msgstr "Gestisci altre opzioni."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Servizio di autoriduzione da usare."
@@ -1925,65 +1978,60 @@ msgstr ""
msgid "Change password"
msgstr "Modifica password"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Modifica la tua password"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Modifica la tua password."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Cambio password"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Vecchia password"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nuova password"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 o più caratteri"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Conferma"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "stessa password di sopra"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Modifica"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "La password deve essere di 6 o più caratteri."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Le password non corrispondono."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Vecchia password non corretta"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Errore nel salvare l'utente; non valido."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Impossibile salvare la nuova password."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Password salvata."
@@ -2427,7 +2475,7 @@ msgid "Same as password above. Required."
msgstr "Stessa password di sopra. Richiesta."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -3364,31 +3412,31 @@ msgstr "Errore del DB nell'inserire la risposta: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Messaggio a %1$s su %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profilo"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Modifica le impostazioni del tuo profilo"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Carica un'immagine"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Modifica la tua password"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Modifica la gestione dell'email"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Profilo utente"
@@ -3397,7 +3445,7 @@ msgstr "Profilo utente"
msgid "Other"
msgstr "Altro"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Altre opzioni"
@@ -3787,20 +3835,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Nessun codice di conferma."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Accedi al sito"
@@ -4069,8 +4117,8 @@ msgstr "Tipo di file sconosciuto"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Nuovo messaggio"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4641,47 +4689,47 @@ msgstr "Invia un messaggio diretto a questo utente"
msgid "Message"
msgstr "Messaggio"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "circa un anno fa"
@@ -4710,3 +4758,10 @@ msgstr "Quella non è la tua email di ricezione."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Email di ricezione non consentita."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Modifica la tua password"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Nuovo messaggio"
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
index 9bbc582ac..a5e15962e 100644
--- a/locale/ja/LC_MESSAGES/statusnet.mo
+++ b/locale/ja/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index fd22e5177..dbba05855 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:16+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:15+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -23,12 +23,15 @@ msgid "No such page"
msgstr "そのような通知はありません。"
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -107,35 +110,42 @@ msgstr "%s & ともだち"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "API メソッドが見つかりません!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "ユーザを更新できません"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -143,12 +153,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "ユーザを更新できません"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "プロファイルがありません。"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "プロファイルを保存できません"
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "ユーザのブロックに失敗しました。"
@@ -194,6 +225,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API メソッドが見つかりません!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -391,17 +439,17 @@ msgstr "アバターが更新されました。"
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "長すぎます。通知は最大 140 字までです。"
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -485,7 +533,7 @@ msgid "Invalid size."
msgstr "不正なサイズ。"
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "アバター"
@@ -534,7 +582,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1668,7 +1716,7 @@ msgid "Nickname"
msgstr "ニックネーム"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "パスワード"
@@ -1800,7 +1848,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1844,8 +1892,8 @@ msgstr "内容種別 "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1866,11 +1914,15 @@ msgstr "設定"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1906,67 +1958,62 @@ msgstr ""
msgid "Change password"
msgstr "パスワードの変更"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "パスワードの変更"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "パスワードの変更"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "パスワードが保存されました。"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "古いパスワード"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "新しいパスワード"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6文字以上"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "確認"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "上のパスワードと同じ"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "変更"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "パスワードが一致しません。"
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "古いパスワードが間違っています。"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "ユーザ保存エラー; 不正なユーザ"
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "新しいパスワードを保存できません。"
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "パスワードが保存されました。"
@@ -2403,7 +2450,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "メール"
@@ -3323,31 +3370,31 @@ msgstr "返信を追加する際にデータベースエラー : %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "プロファイル"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "プロファイル設定の変更"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "アバターのアップロード"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "パスワードの変更"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "メールの扱いを変更"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "プロファイルがありません。"
@@ -3356,7 +3403,7 @@ msgstr "プロファイルがありません。"
msgid "Other"
msgstr "その他"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "その他のオプション"
@@ -3751,20 +3798,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "確認コードがありません。"
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "サイトへログイン"
@@ -4033,8 +4080,8 @@ msgstr ""
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "新しい通知"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4596,47 +4643,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "数秒前"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "約 1 分前"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "約 %d 分前"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "約 1 時間前"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "約 %d 時間前"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "約 1 日前"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "約 %d 日前"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "約 1 ヵ月前"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "約 %d ヵ月前"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "約 1 年前"
@@ -4665,3 +4712,10 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "パスワードの変更"
+
+#~ msgid "notice id: %s"
+#~ msgstr "新しい通知"
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
index b2e5f3d92..5d5cebe9a 100644
--- a/locale/ko/LC_MESSAGES/statusnet.mo
+++ b/locale/ko/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index f521a9f09..23dd573e9 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:19+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:17+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "그러한 태그가 없습니다."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s 및 친구들"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "API 메서드를 찾을 수 없습니다."
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "이 메서드는 등록을 요구합니다."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "사용자를 업데이트 할 수 없습니다."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "트위터 환경설정을 저장할 수 없습니다."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "사용자를 업데이트 할 수 없습니다."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "이용자가 프로필을 가지고 있지 않습니다."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "프로필을 저장 할 수 없습니다."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "사용자 차단에 실패했습니다."
@@ -193,6 +225,23 @@ msgstr "%s에게 직접 메시지"
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API 메서드를 찾을 수 없습니다."
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -389,17 +438,17 @@ msgstr "아바타가 업데이트 되었습니다."
msgid "No status with that ID found."
msgstr "발견된 ID의 상태가 없습니다."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "너무 깁니다. 통지의 최대 길이는 140글자 입니다."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "찾지 못함"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -483,7 +532,7 @@ msgid "Invalid size."
msgstr "옳지 않은 크기"
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "아바타"
@@ -531,7 +580,7 @@ msgstr "자르기"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1661,7 +1710,7 @@ msgid "Nickname"
msgstr "별명"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "비밀 번호"
@@ -1798,7 +1847,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1844,8 +1893,8 @@ msgstr "연결"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "지원하는 형식의 데이터가 아닙니다."
@@ -1865,11 +1914,15 @@ msgstr "기타 설정"
msgid "Manage various other options."
msgstr "다양한 다른 옵션관리"
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "사용할 URL 자동 줄이기 서비스"
@@ -1904,65 +1957,60 @@ msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비
msgid "Change password"
msgstr "비밀번호 바꾸기"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "비밀번호 바꾸기"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "비밀번호를 변경하세요."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "비밀번호 변경"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "기존 비밀 번호"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "새로운 비밀 번호"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6글자 이상"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "인증"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "위 비밀번호와 동일하게"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "변환"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "비밀번호는 6자리 이상이어야 합니다."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "비밀 번호가 일치하지 않습니다."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "기존 비밀 번호가 틀렸습니다"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "사용자 저장 오류; 무효한 사용자"
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "새 비밀번호를 저장 할 수 없습니다."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "비밀 번호 저장"
@@ -2401,7 +2449,7 @@ msgid "Same as password above. Required."
msgstr "위와 같은 비밀 번호. 필수 사항."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "이메일"
@@ -3329,31 +3377,31 @@ msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "%2$s에서 %1$s까지 메시지"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "프로필"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "프로필 세팅 바꾸기"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "아바타를 업로드하세요."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "비밀번호 바꾸기"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "이메일 처리 변경"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "이용자 프로필"
@@ -3362,7 +3410,7 @@ msgstr "이용자 프로필"
msgid "Other"
msgstr "기타"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "다른 옵션들"
@@ -3752,20 +3800,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "확인 코드가 없습니다."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "이 사이트 로그인"
@@ -4034,8 +4082,8 @@ msgstr "알 수 없는 종류의 파일입니다"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "새로운 통지"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4598,47 +4646,47 @@ msgstr "이 회원에게 직접 메시지를 보냅니다."
msgid "Message"
msgstr "메시지"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "1분 전"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "%d일 전"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "1년 전"
@@ -4667,3 +4715,10 @@ msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "죄송합니다. 이메일이 허용되지 않습니다."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "비밀번호 바꾸기"
+
+#~ msgid "notice id: %s"
+#~ msgstr "새로운 통지"
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
index 3914f339c..4a09ab212 100644
--- a/locale/mk/LC_MESSAGES/statusnet.mo
+++ b/locale/mk/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 91f7eaebe..22ebe9b74 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:21+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:20+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -23,12 +23,15 @@ msgid "No such page"
msgstr "Нема такво известување."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -107,35 +110,42 @@ msgstr "%s и пријателите"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Кодот за потврда не е пронајден."
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Корисникот не може да се освежи/"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -143,12 +153,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Корисникот не може да се освежи/"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Корисникот нема профил."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Профилот не може да се сними."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -194,6 +225,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -388,17 +436,17 @@ msgstr "Аватарот е ажуриран."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Ова е предолго. Максималната должина е 140 знаци."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -483,7 +531,7 @@ msgid "Invalid size."
msgstr "Погрешна големина."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Аватар"
@@ -532,7 +580,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1638,7 +1686,7 @@ msgid "Nickname"
msgstr "Прекар"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Лозинка"
@@ -1775,7 +1823,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1820,8 +1868,8 @@ msgstr "Поврзи се"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1842,11 +1890,15 @@ msgstr "Поставки"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1882,66 +1934,62 @@ msgstr ""
msgid "Change password"
msgstr "Промени ја лозинката"
-#: actions/passwordsettings.php:70
-msgid "You are not allowed to change your password"
-msgstr ""
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Промени ја лозинката"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Лозинката е снимена."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Стара лозинка"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Нова лозинка"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 или повеќе знаци"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Потврди"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "исто како лозинката погоре"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Промени"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Лозинките не се совпаѓаат."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Неточна стара лозинка"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Грешка во снимањето на корисникот; неправилен."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Новата лозинка не може да се сними"
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Лозинката е снимена."
@@ -2382,7 +2430,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Е-пошта"
@@ -3295,32 +3343,32 @@ msgstr "Одговор од внесот во базата: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профил"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
#, fuzzy
msgid "Upload an avatar"
msgstr "Товарањето на аватарот не успеа."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr ""
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Корисникот нема профил."
@@ -3329,7 +3377,7 @@ msgstr "Корисникот нема профил."
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3726,20 +3774,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Нема код за потврда."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -4012,8 +4060,8 @@ msgstr ""
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Ново известување"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4583,47 +4631,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "пред неколку секунди"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "пред една минута"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "пред еден час"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "пред %d часа"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "пред еден ден"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "пред еден месец"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "пред %d месеци"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "пред една година"
@@ -4652,3 +4700,6 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#~ msgid "notice id: %s"
+#~ msgstr "Ново известување"
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
index 80e30b11f..fc2345852 100644
--- a/locale/nb/LC_MESSAGES/statusnet.mo
+++ b/locale/nb/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index fa895ce1c..fe94f18dd 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:24+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:23+0000\n"
"Language-Team: Norwegian (bokmål)‬\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -28,12 +28,15 @@ msgid "No such page"
msgstr "Klarte ikke å lagre profil."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -112,35 +115,42 @@ msgstr "%s og venner"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "API-metode ikke funnet!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Klarte ikke å oppdatere bruker."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -148,12 +158,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Klarte ikke å oppdatere bruker."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr ""
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Klarte ikke å lagre profil."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -199,6 +230,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-metode ikke funnet!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -393,17 +441,17 @@ msgstr ""
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -486,7 +534,7 @@ msgid "Invalid size."
msgstr "Ugyldig størrelse"
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Brukerbilde"
@@ -536,7 +584,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1640,7 +1688,7 @@ msgid "Nickname"
msgstr "Nick"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Passord"
@@ -1770,7 +1818,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1814,8 +1862,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1836,11 +1884,15 @@ msgstr "Innstillinger for IM"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1875,67 +1927,62 @@ msgstr ""
msgid "Change password"
msgstr "Endre passord"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Endre passordet ditt"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Endre passord"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Passordet ble lagret"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Gammelt passord"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nytt passord"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 eller flere tegn"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Bekreft"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr ""
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Endre"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr ""
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Feil gammelt passord"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr ""
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Klarer ikke å lagre nytt passord."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Passordet ble lagret"
@@ -2367,7 +2414,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-post"
@@ -3269,31 +3316,31 @@ msgstr ""
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Endre profilinnstillingene dine"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr ""
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Endre passordet ditt"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Endre eposthåndtering"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Klarte ikke å lagre profil."
@@ -3302,7 +3349,7 @@ msgstr "Klarte ikke å lagre profil."
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3689,20 +3736,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Fant ikke bekreftelseskode."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -3974,7 +4021,7 @@ msgstr ""
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
+msgid "[%s]"
msgstr ""
#: lib/joinform.php:114
@@ -4542,47 +4589,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "omtrent ett år siden"
@@ -4611,3 +4658,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Endre passordet ditt"
diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo
index 74e52e10d..b1efe47cd 100644
--- a/locale/nl/LC_MESSAGES/statusnet.mo
+++ b/locale/nl/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 42b776809..a2639fdd2 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:29+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:28+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -23,12 +23,15 @@ msgid "No such page"
msgstr "Deze pagina bestaat niet"
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -94,8 +97,8 @@ msgid ""
"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
"U kunt proberen [%s te porren](../%s) op de eigen profielpagina of [een "
-"bericht aan die gebruiker richten](%%%%action.newnotice%%%%?status_textarea=%"
-"s)."
+"bericht voor die gebruiker plaatsen](%%%%action.newnotice%%%%?"
+"status_textarea=%s)."
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
#, php-format
@@ -103,6 +106,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
+"U kunt een [gebruiker registeren](%%%%action.register%%%%) en %s dan porren "
+"of een een bericht voor die gebruiker plaatsen."
#: actions/all.php:165
msgid "You and friends"
@@ -113,35 +118,42 @@ msgstr "U en vrienden"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Updates van %1$s en vrienden op %2$s."
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "De API-functie is niet aangetroffen!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Deze methode heeft een POST nodig."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Kon gebruiker niet actualiseren."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -151,12 +163,34 @@ msgstr ""
"De server was niet in staat zoveel POST-gegevens af te handelen (%s bytes) "
"vanwege de huidige instellingen."
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Het was niet mogelijk uw ontwerp bij te werken."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Deze gebruiker heeft geen profiel."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Het profiel kon niet opgeslagen worden."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Het blokkeren van de gebruiker is mislukt."
@@ -204,6 +238,23 @@ msgstr "Directe beichten aan %s"
msgid "All the direct messages sent to %s"
msgstr "Alle directe berichten verzonden aan %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "De API-functie is niet aangetroffen!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -395,17 +446,17 @@ msgstr "De status is verwijderd."
msgid "No status with that ID found."
msgstr "Er is geen status gevonden met dit ID."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Dat is te lang. De maximale mededelingslengte is 140 tekens."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Niet gevonden"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -489,7 +540,7 @@ msgid "Invalid size."
msgstr "Ongeldige afmetingen."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -538,7 +589,7 @@ msgstr "Uitsnijden"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -647,6 +698,10 @@ msgid ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"Weet u zeker dat u deze gebruiker wilt blokkeren? Na deze handeling wordt "
+"het abonnement van de gebruiker op u opgezegd en kan deze gebruiker in de "
+"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-"
+"antwoorden van de gebruiker."
#: actions/block.php:149 actions/deletenotice.php:145
#: actions/groupblock.php:178
@@ -654,9 +709,8 @@ msgid "No"
msgstr "Nee"
#: actions/block.php:149
-#, fuzzy
msgid "Do not block this user"
-msgstr "Deblokkeer deze gebruiker."
+msgstr "Gebruiker deblokkeren"
#: actions/block.php:150 actions/deletenotice.php:146
#: actions/groupblock.php:179
@@ -1036,6 +1090,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
+"U kunt een [gebruiker registreren](%%action.register%%) en de eerste "
+"mededeling voor de favorietenlijst plaatsen!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
@@ -1165,6 +1221,9 @@ msgid ""
"be removed from the group, unable to post, and unable to subscribe to the "
"group in the future."
msgstr ""
+"Weet u zeker dat u gebruiker \"%s\" uit de groep \"%s\" wilt weren? De "
+"gebruiker wordt dan uit de groep verwijderd, kan er geen berichten meer "
+"plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren."
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
@@ -1197,6 +1256,8 @@ msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Het uiterlijk van uw groep aanpassen met een achtergrondafbeeldingen en een "
+"kleurenpalet van uw keuze."
#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
#: lib/designsettings.php:434 lib/designsettings.php:464
@@ -1301,6 +1362,8 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
+"Als u de groep waar u naar zoekt niet kunt vinden, dan kunt u deze zelf "
+"[aanmaken](%%action.newgroup%%)."
#: actions/groupsearch.php:85
#, php-format
@@ -1308,6 +1371,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"U kunt een [gebruiker registreren](%%action.register%%) en de groep zelf "
+"[aanmaken](%%action.newgroup%%)!"
#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
#: lib/subgroupnav.php:98
@@ -1328,6 +1393,12 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
+"Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke "
+"interessen en daarmee in contact treden. Nadat u lid bent geworden van een "
+"groep, kunt u berichten naar alle gebruikers zenden met door het voorvoegsel "
+"\"!groepsnaam\" te gebruiken. Als u geen groep ziet die u aantreft, "
+"[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een "
+"groep!](%%%%action.newgroup%%%%)."
#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1668,7 +1739,7 @@ msgid "Nickname"
msgstr "Gebruikersnaam"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Wachtwoord"
@@ -1799,13 +1870,18 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"U kunt de eerste zijn die een bericht plaatst in [dit onderwerp](%%%%action."
+"newnotice%%%%?status_textarea=%s)!"
#: actions/noticesearch.php:124
-#, php-format
+#, fuzzy, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste "
+"zijn die een bericht plaatst in [dit onderwerp](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
#: actions/noticesearchrss.php:89
#, php-format
@@ -1849,8 +1925,8 @@ msgstr "inhoudstype "
msgid "Only "
msgstr "Alleen "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Geen ondersteund gegevensformaat."
@@ -1870,11 +1946,15 @@ msgstr "Overige instellingen"
msgid "Manage various other options."
msgstr "Overige instellingen beheren."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr "URL's inkorten met"
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Te gebruiken automatische verkortingsdienst."
@@ -1908,65 +1988,60 @@ msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan."
msgid "Change password"
msgstr "Wachtwoord wijzigen"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Uw wachtwoord wijzigen"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Wachtwoord wijzigen"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Wachtwoord wijzigen"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Oud wachtwoord"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nieuw wachtwoord"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "Zes of meer tekens"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Bevestigen"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "gelijk aan wachtwoord hierboven"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Wijzigen"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Het wachtwoord moet zes of meer tekens bevatten."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "De wachtwoorden komen niet overeen."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Het oude wachtwoord is onjuist"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Fout bij opslaan gebruiker; ongeldig."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Het wachtwoord is opgeslagen."
@@ -2171,6 +2246,8 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Dit is de publieke tijdlijn voor %%site.name%%, maar niemand heeft nog "
+"berichten geplaatst."
#: actions/public.php:182
msgid "Be the first to post!"
@@ -2192,6 +2269,11 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/"
+"Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status."
+"net/). [Registreer nu](%%%%action.register%%%%) om mededelingen over uzelf "
+"te delen met vrienden, familie en collega's! [Meer lezen...](%%%%doc.help%%%"
+"%)"
#: actions/public.php:238
#, php-format
@@ -2200,8 +2282,9 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
-"Dit is %%site.name%%, [microblogdienst](http://en.wikipedia.org/wiki/Micro-"
-"blogging) gebaseerd op de Vrije Software [StatusNet](http://status.net/)"
+"Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/"
+"Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status."
+"net/)"
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -2228,6 +2311,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste "
+"zijn die er een plaatst!"
#: actions/publictagcloud.php:135
msgid "Tag cloud"
@@ -2268,10 +2353,13 @@ msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr ""
+"Als u uw wachtwoord kwijt bent of vergeten bent, dan is het mogelijk een "
+"nieuw wachtwoord toegezonden te krijgen op het e-mailadres dat bij uw "
+"gebruiker staat opgeslagen."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
@@ -2417,7 +2505,7 @@ msgid "Same as password above. Required."
msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -2579,6 +2667,8 @@ msgid ""
"This is the timeline showing replies to %s but %s hasn't received a notice "
"to his attention yet."
msgstr ""
+"Dit is de tijdlijn met de antwoorden aan %s, maar %s heeft nog geen "
+"antwoorden ontvangen."
#: actions/replies.php:203
#, php-format
@@ -2586,6 +2676,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"U kunt gesprekken aanknopen met andere gebruikers, op meer gebruikers "
+"abonneren of [lid worden van groepen](%%action.groups%%)."
#: actions/replies.php:205
#, php-format
@@ -2593,6 +2685,8 @@ msgid ""
"You can try to [nudge %s](../%s) or [post something to his or her attention]"
"(%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"U kunt proberen [%s te porren](../%s) of [een bericht voor die gebruiker "
+"plaatsen](%%%%action.newnotice%%%%?status_textarea=%s)."
#: actions/repliesrss.php:72
#, php-format
@@ -2628,6 +2722,9 @@ msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"U hebt nog geen favoriete mededelingen. Klik op de knop \"Aan favorieten "
+"toevoegen\" bij mededelingen die u aanstaan om ze op een lijst te bewaren en "
+"ze uit te lichten."
#: actions/showfavorites.php:207
#, php-format
@@ -2635,6 +2732,9 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s heeff nog geen mededelingen op de eigen favorietenlijst geplaatst. Plaats "
+"een interessant bericht, en dan komt u misschien wel op de "
+"favorietenlijst. :)"
#: actions/showfavorites.php:211
#, php-format
@@ -2643,6 +2743,9 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s heeft nog geen favorietenlijst. U kunt een [gebruiker registeren](%%%%"
+"action.register%%%%) en dan interessante mededelingen plaatsten die "
+"misschien aan favorietenlijsten zijn toe te voegen. :)"
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
@@ -2731,6 +2834,12 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** is een gebruikersgroep bij %%site.name%%, een [microblogdienst]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
+"[StatusNet](http://status.net/). De groepsleden wisselen korte berichten uit "
+"over hun leven en interesses. [Registreer nu](%%%%action.register%%%%) om "
+"lid te worden van deze groep en nog veel meer! [Meer lezen...](%%%%doc.help%%"
+"%%)"
#: actions/showgroup.php:454
#, php-format
@@ -2826,6 +2935,8 @@ msgid ""
"You can try to nudge %s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%s)."
msgstr ""
+"U kunt proberen %s te porren of [een bericht voor die gebruiker plaatsen](%%%"
+"%action.newnotice%%%%?status_textarea=%s)."
#: actions/showstream.php:234
#, php-format
@@ -2835,6 +2946,10 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** is actief op %%site.name%%, een [microblogdienst](http://en.wikipedia."
+"org/wiki/Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://"
+"status.net/). [Registreer nu](%%%%action.register%%%%) om te abonneren op de "
+"mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%%doc.help%%%%)"
#: actions/showstream.php:239
#, php-format
@@ -2843,7 +2958,7 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
-"**%s** heeft een gebruiker op %%%%site.name%%%%, eena [microblogdienst]"
+"**%s** heeft een gebruiker op %%%%site.name%%%%, een [microblogdienst]"
"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
"[StatusNet](http://status.net/). "
@@ -3031,6 +3146,12 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"U bent op dit moment op geen enkele gebruiker geabonneerd. Abonneer u op "
+"gebruikers die u kent. [Zoek gebruikers](%%action.peoplesearch%%), bekijk de "
+"leden van groepen waar uw interesse naar uitgaat en kijk in de [lijst met "
+"uitgelichte gebruikers](%%action.featured%%). Als u [Twitter gebruikt](%%"
+"action.twittersettings%%), kunt u automatisch abonneren op de gebruikers die "
+"u daar al volgt."
#: actions/subscriptions.php:123 actions/subscriptions.php:127
#, php-format
@@ -3139,6 +3260,8 @@ msgstr "Het abonnement is opgezegd"
#, php-format
msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
+"De licentie \"%s\" voor de stream die u wilt volgen is niet compatibel met "
+"de sitelicentie \"%s\"."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -3216,12 +3339,12 @@ msgstr "De abonnee-URI \"%s\" is hier niet te vinden"
#: actions/userauthorization.php:301
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "De URI \"%s\" voor de stream is te lang."
#: actions/userauthorization.php:307
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "de URI \"%s\" voor de stream is een lokale gebruiker."
#: actions/userauthorization.php:322
#, php-format
@@ -3256,6 +3379,8 @@ msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"U kunt het uiterlijk van uw profiel aanpassen door een achtergrondafbeelding "
+"toe te voegen of het kleurenpalet aan te passen."
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
@@ -3279,6 +3404,7 @@ msgstr "%s is van geen enkele groep lid."
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
+"U kunt [naar groepen zoeken](%%action.groupsearch%%) en daar lid van worden."
#: classes/File.php:137
#, php-format
@@ -3286,6 +3412,8 @@ msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
+"Bestanden mogen niet groter zijn dan %d bytes, en uw bestand was %d bytes. "
+"Probeer een kleinere versie te uploaden."
#: classes/File.php:147
#, php-format
@@ -3359,31 +3487,31 @@ msgstr ""
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welkom bij %1$s, @%2$s!"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profiel"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Uw profielgegevens wijzigen"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Avatar uploaden"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Uw wachtwoord wijzigen"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "E-mailafhandeling wijzigen"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr "Ontwerp"
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "Uw profiel ontwerpen"
@@ -3391,7 +3519,7 @@ msgstr "Uw profiel ontwerpen"
msgid "Other"
msgstr "Overige"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Overige instellingen"
@@ -3785,21 +3913,55 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
-
-#: lib/common.php:191
+"Commando's:\n"
+"on - notificaties inschakelen\n"
+"off - notificaties uitschakelen\n"
+"help - deze hulptekst weergeven\n"
+"follow <gebruiker> - abonneren op gebruiker\n"
+"leave <gebruiker> - abonnement op gebruiker opzeggen\n"
+"d <gebruiker> <tekst> - direct bericht aan gebruiker\n"
+"get <gebruiker> - laatste mededeling van gebruiker opvragen\n"
+"whois <gebruiker> - profielinformatie van gebruiker opvragen\n"
+"fav <gebruiker> - laatste mededeling van gebruiker op favorietenlijst "
+"zetten\n"
+"fav #<mededeling-ID> - mededelingen met aangegeven ID op favorietenlijst "
+"zetten\n"
+"reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven ID\n"
+"reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n"
+"join <groep> - lid worden van groep\n"
+"login - verwijzing opvragen naar de webpagina voor aanmelden\n"
+"drop <groep> - groepslidmaatschap opzeggen\n"
+"stats - uw statistieken opvragen\n"
+"stop - zelfde als 'off'\n"
+"quit - zelfde als 'off'\n"
+"sub <gebruiker> - zelfde als 'follow'\n"
+"unsub <gebruiker> - zelfde als 'leave'\n"
+"last <gebruiker> - zelfde als 'get'\n"
+"on <gebruiker> - nog niet beschikbaar\n"
+"off <gebruiker> - nog niet beschikbaar\n"
+"nudge <gebruiker> - gebruiker porren\n"
+"invite <phone number> - nog niet beschikbaar\n"
+"track <word> - nog niet beschikbaar\n"
+"untrack <word> - nog niet beschikbaar\n"
+"track off - nog niet beschikbaar\n"
+"untrack all - nog niet beschikbaar\n"
+"tracks - nog niet beschikbaar\n"
+"tracking - nog niet beschikbaar\n"
+
+#: lib/common.php:189
msgid "No configuration file found. "
msgstr "Er is geen instellingenbestand aangetroffen. "
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: "
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
"U kunt proberen de installer uit te voeren om dit probleem op te lossen."
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr "Naar het installatieprogramma gaan."
@@ -4063,8 +4225,8 @@ msgstr "Onbekend bestandstype"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "mededelingennummer: %s"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4236,6 +4398,18 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) vraagt zich af wat u tegenwoordig doet en nodigt u uit om dat te "
+"delen.\n"
+"\n"
+"Laat dus iets van u horen!\n"
+"\n"
+"%3$s\n"
+"\n"
+"Schrijf geen antwoord op deze e-mail. Die komt niet aan bij de juiste "
+"gebruiker.\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%4$s\n"
#: lib/mail.php:509
#, php-format
@@ -4260,6 +4434,21 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) heeft u een privébericht gezonden:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Hier kunt u antwoorden:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Schrijf geen antwoord op deze e-mail. Die komt niet aan bij de juiste "
+"gebruiker.\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%5$s\n"
#: lib/mail.php:554
#, php-format
@@ -4286,6 +4475,23 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) heeft uw mededeling van %2$s zojuist op de favorietenlijst "
+"geplaatst.\n"
+"\n"
+"De URL van uw mededeling is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"De inhoud van uw mededeling luidt:\n"
+"\n"
+"%4$s\n"
+"\n"
+"U kunt de favorietenlijst van %1$s via de volgende verwijzing bekijken:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%6$s\n"
#: lib/mail.php:611
#, php-format
@@ -4663,47 +4869,47 @@ msgstr "Deze gebruiker een direct bericht zenden"
msgid "Message"
msgstr "Bericht"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
@@ -4732,3 +4938,9 @@ msgstr "Dit is niet uw inkomende e-mailadres."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Inkomende e-mail is niet toegestaan."
+
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "U mag uw wachtwoord niet wijzigen"
+
+#~ msgid "notice id: %s"
+#~ msgstr "mededelingennummer: %s"
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
index bf03dffcc..2df4fbc5c 100644
--- a/locale/nn/LC_MESSAGES/statusnet.mo
+++ b/locale/nn/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 6de37a959..96df29e7d 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:26+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:25+0000\n"
"Language-Team: Norwegian Nynorsk\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Dette emneord finst ikkje."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s med vener"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Oppdateringar frå %1$s og vener på %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Fann ikkje API-metode."
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Dette krev ein POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Kan ikkje oppdatera brukar."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Kan ikkje oppdatera brukar."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Brukaren har inga profil."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Kan ikkje lagra profil."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Blokkering av brukar feila."
@@ -193,6 +225,23 @@ msgstr "Direkte meldingar til %s"
msgid "All the direct messages sent to %s"
msgstr "Alle direkte meldingar sendt til %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Fann ikkje API-metode."
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -387,17 +436,17 @@ msgstr "Lasta opp brukarbilete."
msgid "No status with that ID found."
msgstr "Fann ingen status med den ID-en."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Fann ikkje"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -481,7 +530,7 @@ msgid "Invalid size."
msgstr "Ugyldig storleik."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Brukarbilete"
@@ -529,7 +578,7 @@ msgstr "Skaler"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1663,7 +1712,7 @@ msgid "Nickname"
msgstr "Kallenamn"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Passord"
@@ -1802,7 +1851,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1849,8 +1898,8 @@ msgstr "Kopla til"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Ikkje eit støtta dataformat."
@@ -1870,11 +1919,15 @@ msgstr "Andre innstillingar"
msgid "Manage various other options."
msgstr "Velikehald andre innstillingar"
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Den automatisk forkortingstenesta du vil bruke"
@@ -1909,65 +1962,60 @@ msgstr "Dette er din utboks som syner alle private meldingar du har sendt."
msgid "Change password"
msgstr "Endra passord"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Endra passordet ditt"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Endra passordet ditt"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Endra passord"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Gamalt passord"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nytt passord"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 eller fleire teikn"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Godta"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "same passord som ovanfor"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Endra"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Passord må være minst 6 teikn."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Passorda var ikkje like."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Det gamle passordet stemmer ikkje"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Feil ved lagring av brukar; fungerer ikkje."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Klarar ikkje lagra nytt passord."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Lagra passord."
@@ -2411,7 +2459,7 @@ msgid "Same as password above. Required."
msgstr "Samme som passord over. Påkrevd."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Epost"
@@ -3345,31 +3393,31 @@ msgstr "Databasefeil, kan ikkje lagra svar: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Melding til %1$s på %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Endra profilinnstillingane dine"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Last opp ein avatar"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Endra passordet ditt"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Endra eposthandtering"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Brukarprofil"
@@ -3378,7 +3426,7 @@ msgstr "Brukarprofil"
msgid "Other"
msgstr "Anna"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Andre val"
@@ -3768,20 +3816,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Ingen stadfestingskode."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Logg inn or sida"
@@ -4050,8 +4098,8 @@ msgstr "Ukjend fil type"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Ny notis"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4621,47 +4669,47 @@ msgstr "Send ei direktemelding til denne brukaren"
msgid "Message"
msgstr "Melding"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
@@ -4690,3 +4738,10 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Beklager, inngåande epost er ikkje tillatt."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Endra passordet ditt"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Ny notis"
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
index 861243ce2..3a3faf90a 100644
--- a/locale/pl/LC_MESSAGES/statusnet.mo
+++ b/locale/pl/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 6f5c7433c..499340022 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:32+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:31+0000\n"
"Language-Team: Polish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Nie ma takiego znacznika."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -114,35 +117,42 @@ msgstr "Ty i przyjaciele"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualizacje od %1$s i przyjaciół na %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Nie znaleziono metody API!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Ta metoda wymaga POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Nie można zaktualizować użytkownika."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -152,12 +162,34 @@ msgstr ""
"Serwer nie może obsłużyć aż tyle danych POST (%s bajty) z powodu bieżącej "
"konfiguracji."
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Nie można zapisać ustawień wyglądu!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Nie można zaktualizować wyglądu."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Użytkownik nie posiada profilu."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Nie można zapisać profilu."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Zablokowanie użytkownika nie powiodło się."
@@ -205,6 +237,23 @@ msgstr "Bezpośrednia wiadomość do użytkownika %s"
msgid "All the direct messages sent to %s"
msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Nie znaleziono metody API!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -394,17 +443,17 @@ msgstr "Usunięto awatar."
msgid "No status with that ID found."
msgstr "Nie znaleziono statusów z tym identyfikatorem."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Wpis jest za długi. Maksymalna długość to 140 znaków."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Nie znaleziono"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, fuzzy, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL załącznika."
@@ -487,7 +536,7 @@ msgid "Invalid size."
msgstr "Nieprawidłowy rozmiar."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Awatar"
@@ -535,7 +584,7 @@ msgstr "Przytnij"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1676,7 +1725,7 @@ msgid "Nickname"
msgstr "Pseudonim"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Hasło"
@@ -1813,9 +1862,9 @@ msgstr ""
"status_textarea=%s)!"
#: actions/noticesearch.php:124
-#, php-format
+#, fuzzy, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
"Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i zostaniesz "
@@ -1865,8 +1914,8 @@ msgstr "Zawartość"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "To nie jest obsługiwany format danych."
@@ -1886,11 +1935,15 @@ msgstr "Inne ustawienia"
msgid "Manage various other options."
msgstr "Zarządzaj różnymi innymi opcjami."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr "Skracaj adresy URL za pomocą"
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Używana automatyczna usługa skracania."
@@ -1924,65 +1977,60 @@ msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłał
msgid "Change password"
msgstr "Zmień hasło"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Zmień hasło"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Zmień hasło."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Zmiana hasła"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Stare hasło"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nowe hasło"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 lub więcej znaków"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Potwierdź"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "takie samo jak hasło powyżej"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Zmień"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Hasło musi mieć sześć lub więcej znaków."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Hasła nie pasują do siebie."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Niepoprawne stare hasło"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Nie można zapisać nowego hasła."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Zapisano hasło."
@@ -2439,7 +2487,7 @@ msgid "Same as password above. Required."
msgstr "Takie samo jak powyższe hasło. Wymagane."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -3413,31 +3461,31 @@ msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Witaj w %1$s, @%2$s!"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Zmień ustawienia profilu"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Wyślij awatar"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Zmień hasło"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Zmień obsługę adresu e-mail"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr "Wygląd"
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr "Wygląd profilu"
@@ -3445,7 +3493,7 @@ msgstr "Wygląd profilu"
msgid "Other"
msgstr "Inne"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Inne opcje"
@@ -3863,20 +3911,20 @@ msgstr ""
"tracks - jeszcze nie zaimplementowano.\n"
"tracking - jeszcze nie zaimplementowano.\n"
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Brak kodu potwierdzającego."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Zaloguj się na stronę"
@@ -4142,9 +4190,9 @@ msgid "Unknown file type"
msgstr "Nieznany typ pliku"
#: lib/jabber.php:192
-#, fuzzy, php-format
-msgid "notice id: %s"
-msgstr "Brak identyfikatora wpisu"
+#, php-format
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4318,6 +4366,17 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"Użytkownik %1$s (%2$s) zastanawia się, co się z Tobą dzieje w ostatnich "
+"dniach i zaprasza Cię do wysłania jakichś aktualności.\n"
+"\n"
+"Tak więc do usłyszenia. :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Nie odpowiadaj na tę wiadomość e-mail, nie dotrze ona do nich.\n"
+"\n"
+"Z poważaniem,\n"
+"%4$s\n"
#: lib/mail.php:509
#, php-format
@@ -4342,6 +4401,20 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"Użytkownik %1$s (%2$s) wysłał Ci prywatną wiadomość:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Tutaj możesz na nią odpowiedzieć:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Nie odpowiadaj na tę wiadomość e-mail, nie dotrze ona do nich.\n"
+"\n"
+"Z poważaniem,\n"
+"%5$s\n"
#: lib/mail.php:554
#, fuzzy, php-format
@@ -4747,47 +4820,47 @@ msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
msgid "Message"
msgstr "Wiadomość"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "około minutę temu"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "około godzinę temu"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "około miesiąc temu"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "około rok temu"
@@ -4818,3 +4891,11 @@ msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Zmień hasło"
+
+#, fuzzy
+#~ msgid "notice id: %s"
+#~ msgstr "Brak identyfikatora wpisu"
diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo
index 116a7bacd..ad28db804 100644
--- a/locale/pt/LC_MESSAGES/statusnet.mo
+++ b/locale/pt/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index cd7997a50..3460cc2fa 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:35+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:33+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -26,12 +26,15 @@ msgid "No such page"
msgstr ""
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -110,35 +113,42 @@ msgstr "%s e amigos"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Método da API não encontrado!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Não foi possível actualizar o utilizador."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -146,12 +156,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Não foi possível actualizar o utilizador."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr ""
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Não foi possível salvar o perfil."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -197,6 +228,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Método da API não encontrado!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -387,17 +435,17 @@ msgstr "Avatar actualizado."
msgid "No status with that ID found."
msgstr "Nenhum estado com esse ID encontrado."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -479,7 +527,7 @@ msgid "Invalid size."
msgstr "Tamanho inválido."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -527,7 +575,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1634,7 +1682,7 @@ msgid "Nickname"
msgstr "Alcunha"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr ""
@@ -1769,7 +1817,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1814,8 +1862,8 @@ msgstr "Ligar"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1835,11 +1883,15 @@ msgstr ""
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1873,66 +1925,61 @@ msgstr ""
msgid "Change password"
msgstr "Modificar palavra-passe"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Modificar a sua palavra-passe"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Modificar a sua palavra-passe"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr ""
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr ""
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nova palavra-passe"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 ou mais caracteres"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Confirmar"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr ""
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Modificar"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr ""
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Palavra-passe antiga incorrecta"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Erro ao guardar utilizador; inválido."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Não é possível guardar a nova password."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr ""
@@ -2365,7 +2412,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -3259,31 +3306,31 @@ msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr ""
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Modificar as suas definições de perfil"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr ""
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Modificar a sua palavra-passe"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Alterar email handling"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr ""
@@ -3291,7 +3338,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3681,20 +3728,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Código de confirmação não encontrado"
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -3959,9 +4006,9 @@ msgid "Unknown file type"
msgstr ""
#: lib/jabber.php:192
-#, fuzzy, php-format
-msgid "notice id: %s"
-msgstr "URI da mensagem inválido"
+#, php-format
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4522,47 +4569,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr ""
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr ""
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr ""
@@ -4591,3 +4638,11 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Modificar a sua palavra-passe"
+
+#, fuzzy
+#~ msgid "notice id: %s"
+#~ msgstr "URI da mensagem inválido"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
index 478729896..bb8d65071 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.mo
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index aa7f47cca..228a08f6b 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:40+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:36+0000\n"
"Language-Team: Brazilian Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -24,12 +24,15 @@ msgid "No such page"
msgstr "Essa etiqueta não existe."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -108,35 +111,42 @@ msgstr "%s e amigos"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Atualizações de %1$s e amigos no %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "O método da API não foi encontrado!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Este método requer um POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Não foi possível atualizar o usuário."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -144,12 +154,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Não foi possível salvar suas configurações do Twitter!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Não foi possível atualizar o usuário."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "O usuário não tem perfil."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Não foi possível salvar o perfil."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Não foi possível bloquear o usuário."
@@ -197,6 +229,23 @@ msgstr "Mensagem direta para %s"
msgid "All the direct messages sent to %s"
msgstr "Todas as mensagens diretas enviadas para %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "O método da API não foi encontrado!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -394,17 +443,17 @@ msgstr ""
msgid "No status with that ID found."
msgstr "Não foi encontrado nenhum status com esse ID."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Não encontrado"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -488,7 +537,7 @@ msgid "Invalid size."
msgstr "Tamanho inválido."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -536,7 +585,7 @@ msgstr "Cortar"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1698,7 +1747,7 @@ msgid "Nickname"
msgstr "Apelido"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Senha"
@@ -1840,7 +1889,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1886,8 +1935,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Formato de dados não suportado."
@@ -1907,11 +1956,15 @@ msgstr "Outras configurações"
msgid "Manage various other options."
msgstr "Gerenciar várias outras opções."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Serviço de encolhimento automático a ser utilizado."
@@ -1948,67 +2001,62 @@ msgstr ""
msgid "Change password"
msgstr "Alterar a senha"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Altere a sua senha"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Altera a sua senha"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "A senha foi salva."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Senha antiga"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nova senha"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "No mínimo 6 caracteres"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Confirmar"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "igual à senha acima"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Alterar"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "A senha deve ter 6 ou mais caracteres."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "As senhas não coincidem."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "A senha antiga está incorreta"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Erro ao salvar usuário; inválido."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Não é possível salvar a nova senha."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "A senha foi salva."
@@ -2456,7 +2504,7 @@ msgid "Same as password above. Required."
msgstr "Igual à senha acima. Obrigatório."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "E-mail"
@@ -3401,31 +3449,31 @@ msgstr "Erro no banco de dados na inserção da reposta: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensagem para %1$s no %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Alterar as suas configurações de perfil"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Enviar um avatar"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Altere a sua senha"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Configurações de uso do e-mail"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "O usuário não tem perfil."
@@ -3434,7 +3482,7 @@ msgstr "O usuário não tem perfil."
msgid "Other"
msgstr "Outras"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Outras opções"
@@ -3832,20 +3880,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Nenhum código de confirmação."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Entrar"
@@ -4113,9 +4161,9 @@ msgid "Unknown file type"
msgstr "Tipo de arquivo desconhecido"
#: lib/jabber.php:192
-#, fuzzy, php-format
-msgid "notice id: %s"
-msgstr "Feed de mensagens de %s"
+#, php-format
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4691,47 +4739,47 @@ msgstr "Você não pode enviar uma mensagem para esse usuário."
msgid "Message"
msgstr "Nova mensagem"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "segundos atrás"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "1 min atrás"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "%d mins atrás"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "1 hora atrás"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "%d horas atrás"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "1 dia atrás"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "%d dias atrás"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "1 mês atrás"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "%d meses atrás"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "1 ano atrás"
@@ -4760,3 +4808,11 @@ msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Altere a sua senha"
+
+#, fuzzy
+#~ msgid "notice id: %s"
+#~ msgstr "Feed de mensagens de %s"
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
index 7a8ba6e3d..60ba76718 100644
--- a/locale/ru/LC_MESSAGES/statusnet.mo
+++ b/locale/ru/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 80bfd1d72..4202d8844 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:42+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:39+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -23,12 +23,15 @@ msgid "No such page"
msgstr "Нет такого тега."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -107,35 +110,42 @@ msgstr "%s и друзья"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Обновлено от %1$s и его друзей на %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Метод API не найден!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Этот метод требует POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Не удаётся обновить пользователя."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -143,12 +153,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Не удаётся сохранить Ваши установки по Твиттеру!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Не удаётся обновить пользователя."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "У пользователя нет профиля."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Не удаётся сохранить профиль."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Неудача при блокировке пользователя."
@@ -196,6 +228,23 @@ msgstr "Прямые сообщения для %s"
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Метод API не найден!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -394,17 +443,17 @@ msgstr "Аватар обновлён."
msgid "No status with that ID found."
msgstr "Не найдено статуса с таким ID."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Слишком длинная запись. Максимальная длина - 140 знаков."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Не найдено"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -488,7 +537,7 @@ msgid "Invalid size."
msgstr "Неверный размер."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Аватар"
@@ -536,7 +585,7 @@ msgstr "Обрезать"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1688,7 +1737,7 @@ msgid "Nickname"
msgstr "Имя"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Пароль"
@@ -1825,7 +1874,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1872,8 +1921,8 @@ msgstr "Соединить"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Неподдерживаемый формат данных."
@@ -1893,11 +1942,15 @@ msgstr "Другие установки"
msgid "Manage various other options."
msgstr "Управление другими опциями."
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Автоматически использовать выбранный сервис"
@@ -1934,65 +1987,60 @@ msgstr ""
msgid "Change password"
msgstr "Изменить пароль"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Изменить ваш пароль"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Изменить ваш пароль"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Пароль сохранён."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Старый пароль"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Новый пароль"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 или больше знаков"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Подтвердить"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "повторить пароль сверху"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Изменить"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Пароль должен быть длиной не менее 6 символов."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Пароли не совпадают."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Некорректный старый пароль"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Ошибка сохранения пользователя; неверное имя."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Не удаётся сохранить новый пароль."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Пароль сохранён."
@@ -2445,7 +2493,7 @@ msgid "Same as password above. Required."
msgstr "Тот же пароль что и сверху. Обязательно."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -3399,31 +3447,31 @@ msgstr "Ошибка баз данных при вставке ответа дл
msgid "Welcome to %1$s, @%2$s!"
msgstr "Сообщение для %1$s на %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профиль"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Изменить ваши настройки профиля"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Загрузить аватар"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Изменить ваш пароль"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Изменить электронный адрес"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Профиль пользователя"
@@ -3432,7 +3480,7 @@ msgstr "Профиль пользователя"
msgid "Other"
msgstr "Другое"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Другие опции"
@@ -3823,20 +3871,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Нет кода подтверждения."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Войти"
@@ -4104,9 +4152,9 @@ msgid "Unknown file type"
msgstr "Неподдерживаемый тип файла"
#: lib/jabber.php:192
-#, fuzzy, php-format
-msgid "notice id: %s"
-msgstr "Новая запись"
+#, php-format
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4671,47 +4719,47 @@ msgstr "Послать приватное сообщение этому поль
msgid "Message"
msgstr "Сообщение"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "пару секунд назад"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "около часа назад"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "около %d часа(ов) назад"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "около дня назад"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "около %d дня(ей) назад"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "около месяца назад"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "около %d месяца(ев) назад"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "около года назад"
@@ -4740,3 +4788,11 @@ msgstr "Простите, это не Ваш входящий электронн
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Простите, входящих писем нет."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Изменить ваш пароль"
+
+#, fuzzy
+#~ msgid "notice id: %s"
+#~ msgstr "Новая запись"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 30d449fba..2b5d0b36e 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr ""
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -105,35 +108,40 @@ msgstr ""
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+msgid "API method not found."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -141,12 +149,31 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr ""
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr ""
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -192,6 +219,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -377,17 +421,17 @@ msgstr ""
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -469,7 +513,7 @@ msgid "Invalid size."
msgstr ""
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr ""
@@ -517,7 +561,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1572,7 +1616,7 @@ msgid "Nickname"
msgstr ""
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr ""
@@ -1701,7 +1745,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1745,8 +1789,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1766,11 +1810,15 @@ msgstr ""
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1804,64 +1852,60 @@ msgstr ""
msgid "Change password"
msgstr ""
-#: actions/passwordsettings.php:70
-msgid "You are not allowed to change your password"
-msgstr ""
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr ""
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr ""
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr ""
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr ""
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr ""
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr ""
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr ""
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr ""
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr ""
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr ""
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr ""
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr ""
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr ""
@@ -2286,7 +2330,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr ""
@@ -3154,31 +3198,31 @@ msgstr ""
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr ""
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr ""
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr ""
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
msgid "Design your profile"
msgstr ""
@@ -3186,7 +3230,7 @@ msgstr ""
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3566,19 +3610,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -3838,7 +3882,7 @@ msgstr ""
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
+msgid "[%s]"
msgstr ""
#: lib/joinform.php:114
@@ -4386,47 +4430,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr ""
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr ""
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
index 8c1d54b02..a4d3232e1 100644
--- a/locale/sv/LC_MESSAGES/statusnet.mo
+++ b/locale/sv/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index f43a686b7..ff7537edd 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:45+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:41+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Inget sådant meddelande."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s med vänner"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Uppdateringar från %1$s och vänner på %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "API-metoden hittades inte!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Denna metod kräver skicka."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Kunde inte uppdatera användare."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Kunde inte spara dina Twitter inställningar!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Kunde inte uppdatera användare."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Användaren har ingen profil."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Kunde inte spara profil."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -194,6 +226,23 @@ msgstr "Direktmeddelande till %s"
msgid "All the direct messages sent to %s"
msgstr "Alla direktmeddelanden skickade till %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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API-metoden hittades inte!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -391,17 +440,17 @@ msgstr "Användarbilden uppdaterad."
msgid "No status with that ID found."
msgstr "Ingen status med det ID hittades."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "För långt. Maximalt 140 tecken"
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Hittades inte"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -486,7 +535,7 @@ msgid "Invalid size."
msgstr "Felaktig storlek"
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Användarbild"
@@ -536,7 +585,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1698,7 +1747,7 @@ msgid "Nickname"
msgstr "Smeknamn"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Lösenord"
@@ -1836,7 +1885,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1881,8 +1930,8 @@ msgstr "Anslut"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Ingen support för det formatet."
@@ -1903,11 +1952,15 @@ msgstr "Twitter inställningar"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1943,67 +1996,62 @@ msgstr "Detta är din outbox som innehåller meddelanden som du skickat."
msgid "Change password"
msgstr "Byt lösenord"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Ändra ditt lösenord"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Ändra ditt lösenord"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Lösenord är sparat."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Gammalt lösenord"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Nytt lösenord"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "Minst 6 tecken"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Bekräfta"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "samma som lösenordet ovan"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Ändra"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Lösenordet måste vara minst 6 tecken."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Lösenorden matchar inte."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Felaktigt, gammalt lösenord"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Fel uppstog när användare skulle sparas."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Kan inte spara det nya lösenordet."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Lösenord är sparat."
@@ -2446,7 +2494,7 @@ msgid "Same as password above. Required."
msgstr "Samma som lösenordet ovan. Måste fyllas i."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Epost"
@@ -3387,32 +3435,32 @@ msgstr "Databasfel för svar: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "Meddelande till %1$s på %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Ändra dina profilinställningar"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
#, fuzzy
msgid "Upload an avatar"
msgstr "Uppdatering av profilbild misslyckades."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Ändra ditt lösenord"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Ändra email hantering"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Användaren har ingen profil."
@@ -3421,7 +3469,7 @@ msgstr "Användaren har ingen profil."
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3822,20 +3870,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Ingen bekräftelsekod."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -4113,8 +4161,8 @@ msgstr "okänd fil typ"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Nytt inlägg"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4700,47 +4748,47 @@ msgstr "Du kan inte skicka meddelande till den användaren."
msgid "Message"
msgstr "Nytt meddelande"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "för ett år sedan"
@@ -4769,3 +4817,10 @@ msgstr "Ledsen, men det är inte din inkommande emailadress."
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Ledsen, men inga inkommande email är tillåtna."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Ändra ditt lösenord"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Nytt inlägg"
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
index d1784c5d8..5a7db18d7 100644
--- a/locale/te/LC_MESSAGES/statusnet.mo
+++ b/locale/te/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index b044aef99..82b93e719 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:48+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:44+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "అటువంటి పేజీ లేదు"
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -105,35 +108,42 @@ msgstr "మీరు మరియు మీ స్నేహితులు"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -141,12 +151,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "వాడుకరి నిరోధం విఫలమైంది."
@@ -192,6 +223,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -384,17 +432,17 @@ msgstr "స్థితిని తొలగించాం."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "దొరకలేదు"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -456,14 +504,12 @@ msgid "Updates tagged with %1$s on %2$s!"
msgstr "%s యొక్క మైక్రోబ్లాగు"
#: actions/apiusershow.php:96
-#, fuzzy
msgid "Not found."
-msgstr "అభ్యర్థనలేమీ కనబడలేదు!"
+msgstr "కనబడలేదు."
#: actions/attachment.php:73
-#, fuzzy
msgid "No such attachment."
-msgstr "అటువంటి పత్రమేమీ లేదు."
+msgstr "అటువంటి జోడింపు లేదు."
#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
#, fuzzy
@@ -479,7 +525,7 @@ msgid "Invalid size."
msgstr "తప్పుడు పరిమాణం."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "అవతారం"
@@ -527,7 +573,7 @@ msgstr "కత్తిరించు"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -739,7 +785,7 @@ msgstr ""
#: actions/deletenotice.php:109 actions/deletenotice.php:141
msgid "Delete notice"
-msgstr ""
+msgstr "నోటీసుని తొలగించు"
#: actions/deletenotice.php:144
msgid "Are you sure you want to delete this notice?"
@@ -914,7 +960,7 @@ msgstr "అభిరుచులు భద్రమయ్యాయి."
#: actions/emailsettings.php:319
msgid "No email address."
-msgstr ""
+msgstr "ఈమెయిలు చిరునామా లేదు."
#: actions/emailsettings.php:326
msgid "Cannot normalize that email address"
@@ -1106,9 +1152,8 @@ msgid "No such group."
msgstr "అటువంటి గుంపు లేదు."
#: actions/getfile.php:75
-#, fuzzy
msgid "No such file."
-msgstr "అటువంటి సందేశమేమీ లేదు."
+msgstr "అటువంటి ఫైలు లేదు."
#: actions/getfile.php:79
#, fuzzy
@@ -1168,7 +1213,7 @@ msgstr ""
#: actions/groupdesignsettings.php:141
msgid "Group design"
-msgstr ""
+msgstr "గుంపు అలంకారం"
#: actions/groupdesignsettings.php:152
msgid ""
@@ -1266,15 +1311,13 @@ msgstr ""
"ఖాళీలతో వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
#: actions/groupsearch.php:58
-#, fuzzy
msgid "Group search"
-msgstr "వ్యక్తుల అన్వేషణ"
+msgstr "గుంపుల అన్వేషణ"
#: actions/groupsearch.php:79 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
-#, fuzzy
msgid "No results."
-msgstr "ఫలితాలేమీ లేవు"
+msgstr "ఫలితాలేమీ లేవు."
#: actions/groupsearch.php:82
#, php-format
@@ -1608,7 +1651,7 @@ msgid "Nickname"
msgstr "పేరు"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "సంకేతపదం"
@@ -1659,7 +1702,7 @@ msgstr ""
#: actions/microsummary.php:69
msgid "No current status"
-msgstr ""
+msgstr "ప్రస్తుత స్థితి ఏమీ లేదు"
#: actions/newgroup.php:53
msgid "New group"
@@ -1741,7 +1784,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1786,18 +1829,18 @@ msgstr "అనుసంధానించు"
msgid "Only "
msgstr "మాత్రమే "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
#: actions/opensearch.php:64
msgid "People Search"
-msgstr ""
+msgstr "ప్రజల అన్వేషణ"
#: actions/opensearch.php:67
msgid "Notice Search"
-msgstr ""
+msgstr "నోటీసుల అన్వేషణ"
#: actions/othersettings.php:60
msgid "Other Settings"
@@ -1807,11 +1850,15 @@ msgstr "ఇతర అమరికలు"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1847,66 +1894,62 @@ msgstr ""
msgid "Change password"
msgstr "సంకేతపదం మార్చుకోండి"
-#: actions/passwordsettings.php:70
-msgid "You are not allowed to change your password"
-msgstr ""
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "సంకేతపదం మార్చుకోండి"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "సంకేతపదం భద్రమయ్యింది."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "పాత సంకేతపదం"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "కొత్త సంకేతపదం"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "నిర్థారించు"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "పై సంకేతపదం వలెనే"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "మార్చు"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "సంకేతపదాలు సరిపోలలేదు."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "పాత సంకేతపదం తప్పు"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "సంకేతపదం భద్రమయ్యింది."
@@ -2162,7 +2205,7 @@ msgstr ""
#: actions/publictagcloud.php:135
msgid "Tag cloud"
-msgstr ""
+msgstr "ట్యాగు మేఘం"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
@@ -2341,7 +2384,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "ఈమెయిల్"
@@ -2429,7 +2472,7 @@ msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
#: lib/userprofile.php:321
msgid "Subscribe"
-msgstr ""
+msgstr "చందాచేరు"
#: actions/remotesubscribe.php:159
msgid "Invalid profile URL (bad format)"
@@ -2570,9 +2613,8 @@ msgstr ""
#: actions/showgroup.php:274 actions/tagother.php:128
#: actions/userauthorization.php:179 lib/userprofile.php:194
-#, fuzzy
msgid "Note"
-msgstr "సందేశాలు"
+msgstr "గమనిక"
#: actions/showgroup.php:284 lib/groupeditform.php:184
msgid "Aliases"
@@ -2667,9 +2709,8 @@ msgid "Message from %1$s on %2$s"
msgstr ""
#: actions/shownotice.php:90
-#, fuzzy
msgid "Notice deleted."
-msgstr "సందేశాలు"
+msgstr "నోటీసుని తొలగించాం."
#: actions/showstream.php:73
#, php-format
@@ -2892,9 +2933,9 @@ msgid ""
msgstr ""
#: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%s subscriptions"
-msgstr "అన్ని చందాలు"
+msgstr "%s చందాలు"
#: actions/subscriptions.php:54
#, fuzzy, php-format
@@ -2950,9 +2991,8 @@ msgid "Tag %s"
msgstr ""
#: actions/tagother.php:77 lib/userprofile.php:75
-#, fuzzy
msgid "User profile"
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+msgstr "వాడుకరి ప్రొఫైలు"
#: actions/tagother.php:81 lib/userprofile.php:102
msgid "Photo"
@@ -3231,32 +3271,32 @@ msgstr ""
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "ప్రొఫైలు"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
#, fuzzy
msgid "Upload an avatar"
msgstr "అవతారపు తాజాకరణ విఫలమైంది."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr ""
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "వాడుకరికి ప్రొఫైలు లేదు."
@@ -3265,7 +3305,7 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు."
msgid "Other"
msgstr "ఇతర"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "ఇతర ఎంపికలు"
@@ -3656,20 +3696,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "నిర్ధారణ సంకేతం లేదు."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -3939,13 +3979,12 @@ msgstr ""
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "కొత్త సందేశం"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
-#, fuzzy
msgid "Join"
-msgstr "ప్రవేశించండి"
+msgstr "చేరు"
#: lib/leaveform.php:114
#, fuzzy
@@ -3973,9 +4012,8 @@ msgid ""
msgstr ""
#: lib/mailbox.php:227 lib/noticelist.php:424
-#, fuzzy
msgid "from"
-msgstr " నుండి "
+msgstr "నుండి"
#: lib/mail.php:172
msgid "Email address confirmation"
@@ -4024,9 +4062,9 @@ msgid "Location: %s\n"
msgstr "ప్రాంతం: %s\n"
#: lib/mail.php:255
-#, fuzzy, php-format
+#, php-format
msgid "Homepage: %s\n"
-msgstr "హోమ్ పేజీ\n"
+msgstr "హోమ్ పేజీ: %s\n"
#: lib/mail.php:257
#, php-format
@@ -4060,7 +4098,7 @@ msgstr "%s స్థితి"
#: lib/mail.php:438
msgid "SMS confirmation"
-msgstr ""
+msgstr "SMS నిర్ధారణ"
#: lib/mail.php:462
#, php-format
@@ -4335,9 +4373,8 @@ msgid "Subscribers"
msgstr "చందాదార్లు"
#: lib/profileaction.php:157
-#, fuzzy
msgid "All subscribers"
-msgstr "చందాదార్లు"
+msgstr "అందరు చందాదార్లు"
#: lib/profileaction.php:177
#, fuzzy
@@ -4498,7 +4535,7 @@ msgstr "ఫ్రొఫైలు అమరికలు"
#: lib/userprofile.php:249
msgid "Edit"
-msgstr ""
+msgstr "మార్చు"
#: lib/userprofile.php:272
msgid "Send a direct message to this user"
@@ -4508,47 +4545,47 @@ msgstr ""
msgid "Message"
msgstr "సందేశం"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల క్రితం"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "%d గంటల క్రితం"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "%d రోజుల క్రితం"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల క్రితం"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
@@ -4568,7 +4605,7 @@ msgstr ""
#: scripts/maildaemon.php:53
msgid "Not a registered user."
-msgstr ""
+msgstr "నమోదైన వాడుకరి కాదు."
#: scripts/maildaemon.php:57
msgid "Sorry, that is not your incoming email address."
@@ -4577,3 +4614,6 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#~ msgid "notice id: %s"
+#~ msgstr "కొత్త సందేశం"
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
index 49093b4dc..03e33ec01 100644
--- a/locale/tr/LC_MESSAGES/statusnet.mo
+++ b/locale/tr/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index c25d1a8a6..e5bd043e0 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:50+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:47+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Böyle bir durum mesajı yok."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s ve arkadaşları"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "Onay kodu bulunamadı."
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Kullanıcı güncellenemedi."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Kullanıcının profili yok."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Profil kaydedilemedi."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -194,6 +225,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -390,18 +438,18 @@ msgstr "Avatar güncellendi."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -486,7 +534,7 @@ msgid "Invalid size."
msgstr "Geçersiz büyüklük."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Avatar"
@@ -535,7 +583,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1641,7 +1689,7 @@ msgid "Nickname"
msgstr "Takma ad"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Parola"
@@ -1779,7 +1827,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1824,8 +1872,8 @@ msgstr "Bağlan"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1846,11 +1894,15 @@ msgstr "Ayarlar"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1886,66 +1938,62 @@ msgstr ""
msgid "Change password"
msgstr "Parolayı değiştir"
-#: actions/passwordsettings.php:70
-msgid "You are not allowed to change your password"
-msgstr ""
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Parolayı değiştir"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Parola kaydedildi."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Eski parola"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Yeni parola"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 veya daha fazla karakter"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Onayla"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "yukaridaki parola ile aynı"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Değiştir"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Parolalar birbirini tutmuyor."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Eski parola yanlış"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Yeni parola kaydedilemedi."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Parola kaydedildi."
@@ -2388,7 +2436,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Eposta"
@@ -3290,32 +3338,32 @@ msgstr "Cevap eklenirken veritabanı hatası: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
#, fuzzy
msgid "Upload an avatar"
msgstr "Avatar güncellemede hata."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr ""
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Kullanıcının profili yok."
@@ -3324,7 +3372,7 @@ msgstr "Kullanıcının profili yok."
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3721,20 +3769,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Onay kodu yok."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -4009,8 +4057,8 @@ msgstr ""
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Yeni durum mesajı"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4581,47 +4629,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
@@ -4650,3 +4698,6 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#~ msgid "notice id: %s"
+#~ msgstr "Yeni durum mesajı"
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
index e7e6fe0ea..1b4461151 100644
--- a/locale/uk/LC_MESSAGES/statusnet.mo
+++ b/locale/uk/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index a1a002b85..23ca1e3f6 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:53+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:49+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Такого тегу немає."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s з друзями"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Оновлення від %1$s та друзів на %2$s!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "API метод не знайдено!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Цей метод потребує НАПИСАТИ."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Не вдалося оновити користувача."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Не маю можливості зберегти ваші налаштування Твіттера!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Не вдалося оновити користувача."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Користувач не має профілю."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Не вдалося зберегти профіль."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "Спроба заблокувати користувача невдала."
@@ -194,6 +226,23 @@ msgstr "Пряме повідомлення до %s"
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API метод не знайдено!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -390,17 +439,17 @@ msgstr "Аватару оновлено."
msgid "No status with that ID found."
msgstr "Не знайдено жодних статусів з таким ID."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Надто довго. Максимальний розмір повідомлення 140 знаків."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Не знайдено"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -484,7 +533,7 @@ msgid "Invalid size."
msgstr "Недійсний розмір."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Аватара"
@@ -532,7 +581,7 @@ msgstr "Втяти"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1683,7 +1732,7 @@ msgid "Nickname"
msgstr "Ім'я користувача"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Пароль"
@@ -1824,7 +1873,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1871,8 +1920,8 @@ msgstr "З'єднання"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Такий формат даних не підтримується."
@@ -1892,11 +1941,15 @@ msgstr "Інші опції"
msgid "Manage various other options."
msgstr "Керування деякими іншими опціями"
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "Сервіси доступні для використання"
@@ -1933,65 +1986,60 @@ msgstr ""
msgid "Change password"
msgstr "Змінити пароль"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Змінити ваш пароль"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
msgid "Change your password."
msgstr "Змінити пароль."
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr "Пароль замінено"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Старий пароль"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Новий пароль"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 або більше знаків"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Підтвердити"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "такий само, як і пароль вище"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Змінити"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "Пароль має складатись з 6-ти або більше знаків."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Паролі не співпадають."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Старий пароль неточний"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Помилка при збереженні користувача; недійсний."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Не можна зберегти новий пароль."
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Пароль збережено."
@@ -2439,7 +2487,7 @@ msgid "Same as password above. Required."
msgstr "Такий само, як і пароль вище. Неодмінно."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Пошта"
@@ -3376,31 +3424,31 @@ msgstr "Помилка бази даних при додаванні відпо
msgid "Welcome to %1$s, @%2$s!"
msgstr "Повідомлення до %1$s на %2$s"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профіль"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Змінити налаштування профілю"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "Завантаження аватари"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Змінити ваш пароль"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Змінити електронну адресу вручну"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Профіль користувача."
@@ -3409,7 +3457,7 @@ msgstr "Профіль користувача."
msgid "Other"
msgstr "Інше"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "Інші опції"
@@ -3799,20 +3847,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Немає коду підтвердження."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "Увійти на сайт"
@@ -4081,8 +4129,8 @@ msgstr "Тип файлу не підтримується"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Нове повідомлення"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
msgid "Join"
@@ -4654,47 +4702,47 @@ msgstr "Надіслати пряме повідомлення цьому кор
msgid "Message"
msgstr "Повідомлення"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "мить тому"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "хвилину тому"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "годину тому"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "день тому"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "місяць тому"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "близько %d місяців тому"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "рік тому"
@@ -4724,3 +4772,10 @@ msgstr "Вибачте, але це не є вашою електронною а
msgid "Sorry, no incoming email allowed."
msgstr ""
"Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Змінити ваш пароль"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Нове повідомлення"
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
index bb42fbee7..2ac624b85 100644
--- a/locale/vi/LC_MESSAGES/statusnet.mo
+++ b/locale/vi/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index f1b61c263..484368827 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:55+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:52+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -22,12 +22,15 @@ msgid "No such page"
msgstr "Không có tin nhắn nào."
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -106,35 +109,42 @@ msgstr "%s và bạn bè"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "Phương thức API không tìm thấy!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "Phương thức này yêu cầu là POST."
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -142,12 +152,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Không thể lưu thông tin Twitter của bạn!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "Người dùng không có thông tin."
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -195,6 +227,23 @@ msgstr "Tin nhắn riêng"
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "Phương thức API không tìm thấy!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -393,17 +442,17 @@ msgstr "Hình đại diện đã được cập nhật."
msgid "No status with that ID found."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Quá dài. Tối đa là 140 ký tự."
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "Không tìm thấy"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -488,7 +537,7 @@ msgid "Invalid size."
msgstr "Kích thước không hợp lệ."
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "Hình đại diện"
@@ -541,7 +590,7 @@ msgstr "Nhóm"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1719,7 +1768,7 @@ msgid "Nickname"
msgstr "Biệt danh"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Mật khẩu"
@@ -1861,7 +1910,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1908,8 +1957,8 @@ msgstr "Kết nối"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "Không hỗ trợ định dạng dữ liệu này."
@@ -1931,11 +1980,15 @@ msgstr "Thiết lập tài khoản Twitter"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1973,68 +2026,63 @@ msgstr ""
msgid "Change password"
msgstr "Đổi mật khẩu"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "Thay đổi mật khẩu của bạn"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "Thay đổi mật khẩu của bạn"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "Đã lưu mật khẩu."
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Mật khẩu cũ"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "Mật khẩu mới"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "Nhiều hơn 6 ký tự"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "Xác nhận"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "cùng mật khẩu ở trên"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "Thay đổi"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
#, fuzzy
msgid "Password must be 6 or more characters."
msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "Mật khẩu không khớp."
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "Mật khẩu cũ sai"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "Lỗi xảy ra khi lưu thành viên; không hợp lệ."
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "Không thể lưu mật khẩu mới"
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "Đã lưu mật khẩu."
@@ -2480,7 +2528,7 @@ msgid "Same as password above. Required."
msgstr "Cùng mật khẩu ở trên. Bắt buộc."
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
@@ -3425,32 +3473,32 @@ msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "%s chào mừng bạn "
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Hồ sơ "
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
#, fuzzy
msgid "Upload an avatar"
msgstr "Cập nhật hình đại diện không thành công."
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "Thay đổi mật khẩu của bạn"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "Đang thực hiện việc thay đổi email"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "Hồ sơ"
@@ -3460,7 +3508,7 @@ msgstr "Hồ sơ"
msgid "Other"
msgstr "Sau"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3869,20 +3917,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "Không có mã số xác nhận."
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -4166,8 +4214,8 @@ msgstr "Không hỗ trợ kiểu file ảnh này."
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "Thông báo mới"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4362,6 +4410,20 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) đã gửi đến bạn tin nhắn riêng:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Bạn có thể trả lời tại:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Đừng trả lời lại thư này; sẽ không có ai nhận thư.\n"
+"\n"
+"Chúc sức khỏe,\n"
+"%5$s\n"
#: lib/mail.php:554
#, fuzzy, php-format
@@ -4789,47 +4851,47 @@ msgstr "Bạn đã theo những người này:"
msgid "Message"
msgstr "Tin mới nhất"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "1 giờ trước"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "%d giờ trước"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "1 năm trước"
@@ -4859,3 +4921,10 @@ msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập v
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "Xin lỗi, không có địa chỉ email cho phép."
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "Thay đổi mật khẩu của bạn"
+
+#~ msgid "notice id: %s"
+#~ msgstr "Thông báo mới"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index f3b08115d..b0fbc5e4a 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 1a5c6d5ba..387ed1805 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 20:59:58+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:55+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -27,12 +27,15 @@ msgid "No such page"
msgstr "未找到此消息。"
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -111,35 +114,42 @@ msgstr "%s 及好友"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$s 上 %1$s 和好友的更新!"
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
msgstr "API 方法未实现!"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr "此方法接受POST请求。"
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "无法更新用户。"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -147,12 +157,34 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "无法保存 Twitter 设置!"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "无法更新用户。"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr "用户没有个人信息。"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "无法保存个人信息。"
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr "阻止用户失败。"
@@ -198,6 +230,23 @@ msgstr "发给 %s 的直接消息"
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr "API 方法未实现!"
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -393,17 +442,17 @@ msgstr "头像已更新。"
msgid "No status with that ID found."
msgstr "没有找到此ID的信息。"
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "超出长度限制。不能超过 140 个字符。"
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr "未找到"
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -488,7 +537,7 @@ msgid "Invalid size."
msgstr "大小不正确。"
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "头像"
@@ -537,7 +586,7 @@ msgstr "剪裁"
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1677,7 +1726,7 @@ msgid "Nickname"
msgstr "昵称"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "密码"
@@ -1811,7 +1860,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1856,8 +1905,8 @@ msgstr "连接"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr "不支持的数据格式。"
@@ -1878,11 +1927,15 @@ msgstr "Twitter 设置"
msgid "Manage various other options."
msgstr "管理其他选项。"
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr "要使用的自动缩短服务。"
@@ -1918,67 +1971,62 @@ msgstr "这是您的发件箱,包含您发送的私人消息。"
msgid "Change password"
msgstr "修改密码"
-#: actions/passwordsettings.php:70
-#, fuzzy
-msgid "You are not allowed to change your password"
-msgstr "修改密码"
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "修改密码"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
#, fuzzy
msgid "Password change"
msgstr "密码已保存。"
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "旧密码"
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "新密码"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6 个或更多字符"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "确认"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr "相同的密码"
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "修改"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "密码必须包含 6 个或更多字符。"
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr "密码不匹配。"
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "旧密码不正确"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "保存用户时出错;不正确。"
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "无法保存新密码。"
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr "密码已保存。"
@@ -2416,7 +2464,7 @@ msgid "Same as password above. Required."
msgstr "相同的密码。此项必填。"
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "电子邮件"
@@ -3350,31 +3398,31 @@ msgstr "添加回复时数据库出错:%s"
msgid "Welcome to %1$s, @%2$s!"
msgstr "发送给 %1$s 的 %2$s 消息"
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr "个人信息"
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "修改您的个人信息"
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
msgid "Upload an avatar"
msgstr "上载一个头像。"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr "修改密码"
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr "修改电子邮件"
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "用户没有个人信息。"
@@ -3383,7 +3431,7 @@ msgstr "用户没有个人信息。"
msgid "Other"
msgstr "其他"
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr "其他选项"
@@ -3782,20 +3830,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "没有验证码"
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
#, fuzzy
msgid "Go to the installer."
msgstr "登入本站"
@@ -4073,8 +4121,8 @@ msgstr "未知文件类型"
#: lib/jabber.php:192
#, php-format
-msgid "notice id: %s"
-msgstr "新通告"
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4665,47 +4713,47 @@ msgstr "无法向此用户发送消息。"
msgid "Message"
msgstr "新消息"
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr "几秒前"
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr "一分钟前"
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr "一小时前"
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr "一天前"
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr "一个月前"
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr "一年前"
@@ -4734,3 +4782,10 @@ msgstr "对不起,这个发布用的电子邮件属于其他用户。"
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "对不起,发布用的电子邮件无法使用。"
+
+#, fuzzy
+#~ msgid "You are not allowed to change your password"
+#~ msgstr "修改密码"
+
+#~ msgid "notice id: %s"
+#~ msgstr "新通告"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
index 36cdef3ba..8bfb97041 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 0843684be..2a6099a23 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 20:53+0000\n"
-"PO-Revision-Date: 2009-11-10 21:00:00+0000\n"
+"POT-Creation-Date: 2009-11-12 21:38+0000\n"
+"PO-Revision-Date: 2009-11-12 21:39:59+0000\n"
"Language-Team: Traditional Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58962); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -27,12 +27,15 @@ msgid "No such page"
msgstr "無此通知"
#: actions/all.php:74 actions/allrss.php:68
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
@@ -111,35 +114,42 @@ msgstr "%s與好友"
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
-#: actions/apiaccountratelimitstatus.php:70 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/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120
-#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101
-#: actions/apigroupshow.php:105 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144
-#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141
-#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130
-#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163
-#: actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr ""
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "確認碼遺失"
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109
+#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114
msgid "This method requires a POST."
msgstr ""
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "無法更新使用者"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
#: actions/newnotice.php:94 lib/designsettings.php:283
#, php-format
msgid ""
@@ -147,12 +157,33 @@ msgid ""
"current configuration."
msgstr ""
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "無法更新使用者"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
msgid "User has no profile."
msgstr ""
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "無法儲存個人資料"
+
#: actions/apiblockcreate.php:108
msgid "Block user failed."
msgstr ""
@@ -198,6 +229,23 @@ msgstr ""
msgid "All the direct messages sent to %s"
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/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
@@ -391,17 +439,17 @@ msgstr "更新個人圖像"
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:152 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
#: scripts/maildaemon.php:71
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:193
+#: actions/apistatusesupdate.php:198
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:216 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -485,7 +533,7 @@ msgid "Invalid size."
msgstr "尺寸錯誤"
#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:113
+#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "個人圖像"
@@ -534,7 +582,7 @@ msgstr ""
#: actions/groupunblock.php:66 actions/imsettings.php:206
#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:151
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
@@ -1619,7 +1667,7 @@ msgid "Nickname"
msgstr "暱稱"
#: actions/login.php:249 actions/register.php:428
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr ""
@@ -1748,7 +1796,7 @@ msgstr ""
#: actions/noticesearch.php:124
#, php-format
msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
@@ -1793,8 +1841,8 @@ msgstr "連結"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963
-#: lib/api.php:991 lib/api.php:1101
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
msgid "Not a supported data format."
msgstr ""
@@ -1815,11 +1863,15 @@ msgstr "線上即時通設定"
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:117
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
+
+#: actions/othersettings.php:116
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:118
+#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
msgstr ""
@@ -1854,65 +1906,61 @@ msgstr ""
msgid "Change password"
msgstr "更改密碼"
-#: actions/passwordsettings.php:70
-msgid "You are not allowed to change your password"
-msgstr ""
-
-#: actions/passwordsettings.php:82
+#: actions/passwordsettings.php:69
#, fuzzy
msgid "Change your password."
msgstr "更改密碼"
-#: actions/passwordsettings.php:109 actions/recoverpassword.php:231
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
msgid "Password change"
msgstr ""
-#: actions/passwordsettings.php:117
+#: actions/passwordsettings.php:104
msgid "Old password"
msgstr ""
-#: actions/passwordsettings.php:121 actions/recoverpassword.php:235
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
msgid "New password"
msgstr "新密碼"
-#: actions/passwordsettings.php:122
+#: actions/passwordsettings.php:109
msgid "6 or more characters"
msgstr "6個以上字元"
-#: actions/passwordsettings.php:125 actions/recoverpassword.php:239
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
#: actions/register.php:432 actions/smssettings.php:134
msgid "Confirm"
msgstr "確認"
-#: actions/passwordsettings.php:126
+#: actions/passwordsettings.php:113
msgid "same as password above"
msgstr ""
-#: actions/passwordsettings.php:130
+#: actions/passwordsettings.php:117
msgid "Change"
msgstr "更改"
-#: actions/passwordsettings.php:167 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:170 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:233
msgid "Passwords don't match."
msgstr ""
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:165
msgid "Incorrect old password"
msgstr "舊密碼錯誤"
-#: actions/passwordsettings.php:194
+#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
msgstr "儲存使用者發生錯誤;使用者名稱無效"
-#: actions/passwordsettings.php:199 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
msgid "Can't save new password."
msgstr "無法存取新密碼"
-#: actions/passwordsettings.php:205 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
msgstr ""
@@ -2341,7 +2389,7 @@ msgid "Same as password above. Required."
msgstr ""
#: actions/register.php:437 actions/register.php:441
-#: lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:120
msgid "Email"
msgstr "電子信箱"
@@ -3231,32 +3279,32 @@ msgstr "增加回覆時,資料庫發生錯誤: %s"
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
msgid "Profile"
msgstr ""
-#: lib/accountsettingsaction.php:110
+#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr ""
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:112
#, fuzzy
msgid "Upload an avatar"
msgstr "無法上傳個人圖像"
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
msgid "Change your password"
msgstr ""
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:120
msgid "Change email handling"
msgstr ""
-#: lib/accountsettingsaction.php:125 lib/groupnav.php:119
+#: lib/accountsettingsaction.php:124 lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: lib/accountsettingsaction.php:126
+#: lib/accountsettingsaction.php:124
#, fuzzy
msgid "Design your profile"
msgstr "無此通知"
@@ -3265,7 +3313,7 @@ msgstr "無此通知"
msgid "Other"
msgstr ""
-#: lib/accountsettingsaction.php:129
+#: lib/accountsettingsaction.php:128
msgid "Other options"
msgstr ""
@@ -3655,20 +3703,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:191
+#: lib/common.php:189
#, fuzzy
msgid "No configuration file found. "
msgstr "無確認碼"
-#: lib/common.php:192
+#: lib/common.php:190
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:193
+#: lib/common.php:191
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:194
+#: lib/common.php:192
msgid "Go to the installer."
msgstr ""
@@ -3937,9 +3985,9 @@ msgid "Unknown file type"
msgstr ""
#: lib/jabber.php:192
-#, fuzzy, php-format
-msgid "notice id: %s"
-msgstr "新訊息"
+#, php-format
+msgid "[%s]"
+msgstr ""
#: lib/joinform.php:114
#, fuzzy
@@ -4505,47 +4553,47 @@ msgstr ""
msgid "Message"
msgstr ""
-#: lib/util.php:818
+#: lib/util.php:821
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:820
+#: lib/util.php:823
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:822
+#: lib/util.php:825
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:824
+#: lib/util.php:827
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:826
+#: lib/util.php:829
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:828
+#: lib/util.php:831
msgid "about a day ago"
msgstr ""
-#: lib/util.php:830
+#: lib/util.php:833
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:832
+#: lib/util.php:835
msgid "about a month ago"
msgstr ""
-#: lib/util.php:834
+#: lib/util.php:837
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:836
+#: lib/util.php:839
msgid "about a year ago"
msgstr ""
@@ -4574,3 +4622,7 @@ msgstr ""
#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr ""
+
+#, fuzzy
+#~ msgid "notice id: %s"
+#~ msgstr "新訊息"