Merge branch '0.9.x'

* 0.9.x: (141 commits)
  Reload the admin design panel page to show the new CSS when the
  Only pick up new default site colors if the theme has NOT changed.
  Delete design when user chooses to restore default design, instead
  Localisation updates for !StatusNet from !translatewiki.net !sntrans
  Do not rebuild/add .mo files by default
  If an XHR notice is sent form a page that has no timeline, show a
  Revert "If the page doesn't have .notices, silently skip the notice XHR response"
  Revert "Clear/reset the XHR notice form on pages where there is no timeline"
  Clear/reset the XHR notice form on pages where there is no timeline
  If the page doesn't have .notices, silently skip the notice XHR response
  Remove useless debugging statement
  Moved form control styles (i.e., border and radius) out of base
  add pluginhandler to list of daemons to shut down
  Using box-shadow only on the current navigation item
  Updated theme readme
  Fix regression in password settings: users have been unable to change their passwords since introduction of ChangePassword event (later StartChangePassword)  November 5 in commit d6ddb84132d7b9510ba82064c67f2a39822dab49
  Ticket 2048: make OMB posting HTTP timeout configurable as $config['omb']['timeout']; defaults to 5 seconds instead of 20-second default in Yadis library
  ticket 1100: add Drupal source link
  Fix makefile wildcards for locale compilation (now works on Ubuntu 8.04)
  typo fix: '$this' now spelled correctly. Looks like this'll fix acceptance of 'source' param for direct messages posted to API
  ...

Conflicts:
	js/util.js
	locale/ar/LC_MESSAGES/statusnet.po
	locale/bg/LC_MESSAGES/statusnet.po
	locale/ca/LC_MESSAGES/statusnet.po
	locale/cs/LC_MESSAGES/statusnet.po
	locale/de/LC_MESSAGES/statusnet.po
	locale/el/LC_MESSAGES/statusnet.po
	locale/en_GB/LC_MESSAGES/statusnet.po
	locale/es/LC_MESSAGES/statusnet.po
	locale/fi/LC_MESSAGES/statusnet.po
	locale/fr/LC_MESSAGES/statusnet.po
	locale/ga/LC_MESSAGES/statusnet.po
	locale/he/LC_MESSAGES/statusnet.po
	locale/is/LC_MESSAGES/statusnet.po
	locale/it/LC_MESSAGES/statusnet.po
	locale/ja/LC_MESSAGES/statusnet.po
	locale/ko/LC_MESSAGES/statusnet.po
	locale/mk/LC_MESSAGES/statusnet.po
	locale/nb/LC_MESSAGES/statusnet.po
	locale/nl/LC_MESSAGES/statusnet.po
	locale/nn/LC_MESSAGES/statusnet.po
	locale/pl/LC_MESSAGES/statusnet.po
	locale/pt/LC_MESSAGES/statusnet.po
	locale/pt_BR/LC_MESSAGES/statusnet.po
	locale/ru/LC_MESSAGES/statusnet.po
	locale/statusnet.po
	locale/sv/LC_MESSAGES/statusnet.po
	locale/te/LC_MESSAGES/statusnet.po
	locale/tr/LC_MESSAGES/statusnet.po
	locale/uk/LC_MESSAGES/statusnet.po
	locale/vi/LC_MESSAGES/statusnet.po
	locale/zh_CN/LC_MESSAGES/statusnet.po
	locale/zh_TW/LC_MESSAGES/statusnet.po
	plugins/Realtime/realtimeupdate.js

1 files changed, 40 insertions, 52 deletions

diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index f82bb65f1..8421ccdb0 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 23:50+0000\n"
-"PO-Revision-Date: 2009-11-28 19:50:56+0000\n"
+"POT-Creation-Date: 2009-12-02 23:18+0000\n"
+"PO-Revision-Date: 2009-12-02 23:20:46+0000\n"
 "Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: out-statusnet\n"
@@ -580,7 +580,7 @@ msgstr ""
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:129 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -757,7 +757,7 @@ msgid "Conversation"
 msgstr "Bekräftelsekod"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:206 lib/searchgroupnav.php:82
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Inlägg"
 
@@ -1292,26 +1292,26 @@ msgstr "Användaren som avlyssnas existerar inte."
 msgid "You can use the local subscription!"
 msgstr "Du kan använda lokala prenumerationer!"
 
-#: actions/finishremotesubscribe.php:96
+#: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:106
+#: actions/finishremotesubscribe.php:110
 #, fuzzy
 msgid "You are not authorized."
 msgstr "Inte tillstånd ännu."
 
-#: actions/finishremotesubscribe.php:109
+#: actions/finishremotesubscribe.php:113
 #, fuzzy
 msgid "Could not convert request token to access token."
 msgstr "Kunde inte konvertera förfrågan tokens till Access tokens."
 
-#: actions/finishremotesubscribe.php:114
+#: actions/finishremotesubscribe.php:118
 #, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Okänd version av OMB protokollet."
 
-#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "Fel uppstog under uppdatering av fjärranvändare"
 
@@ -1528,8 +1528,8 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
-#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -1861,53 +1861,53 @@ msgstr ""
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
-#: actions/login.php:110 actions/login.php:120
+#: actions/login.php:108 actions/login.php:118
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Ogiltig innehåll i inlägget "
 
-#: actions/login.php:143
+#: actions/login.php:146
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: actions/login.php:149
+#: actions/login.php:152
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Inte tillstånd ännu."
 
-#: actions/login.php:204 actions/login.php:257 lib/action.php:458
+#: actions/login.php:207 actions/login.php:260 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Logga in"
 
-#: actions/login.php:243
+#: actions/login.php:246
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/login.php:249 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: actions/login.php:249 actions/register.php:428
+#: actions/login.php:252 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Lösenord"
 
-#: actions/login.php:252 actions/register.php:477
+#: actions/login.php:255 actions/register.php:477
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
-#: actions/login.php:253 actions/register.php:479
+#: actions/login.php:256 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!"
 
-#: actions/login.php:263
+#: actions/login.php:266
 msgid "Lost or forgotten password?"
 msgstr "Glömt bort lösenord?"
 
-#: actions/login.php:282
+#: actions/login.php:285
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1915,7 +1915,7 @@ msgstr ""
 "Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord innan "
 "du ändrar dina inställningar."
 
-#: actions/login.php:286
+#: actions/login.php:289
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -2865,8 +2865,7 @@ msgstr "Nåt är fel med profil URL (Format fel)"
 
 #: actions/remotesubscribe.php:168
 #, fuzzy
-msgid ""
-"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "Det är ingen giltig profil URL (ingen YADIS angiven)."
 
 #: actions/remotesubscribe.php:176
@@ -3049,7 +3048,7 @@ msgid "Members"
 msgstr "Medlem sedan"
 
 #: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr ""
@@ -3058,7 +3057,7 @@ msgstr ""
 msgid "All members"
 msgstr ""
 
-#: actions/showgroup.php:429 lib/profileaction.php:173
+#: actions/showgroup.php:429 lib/profileaction.php:174
 msgid "Statistics"
 msgstr "Statistik"
 
@@ -4496,50 +4495,40 @@ msgstr ""
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:597
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Kan inte skapa OpenID formulär: %s"
-
-#: lib/command.php:602
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:618
+#: lib/command.php:592
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Du skickade inte oss den profilen"
 
-#: lib/command.php:620
+#: lib/command.php:594
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du prenumererar redan på dessa användare:"
 msgstr[1] "Du prenumererar redan på dessa användare:"
 
-#: lib/command.php:640
+#: lib/command.php:614
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Kunde inte prenumerera på annat åt dig."
 
-#: lib/command.php:642
+#: lib/command.php:616
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Kunde inte prenumerera på annat åt dig."
 msgstr[1] "Kunde inte prenumerera på annat åt dig."
 
-#: lib/command.php:662
+#: lib/command.php:636
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du skickade inte oss den profilen"
 
-#: lib/command.php:664
+#: lib/command.php:638
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du skickade inte oss den profilen"
 msgstr[1] "Du skickade inte oss den profilen"
 
-#: lib/command.php:678
+#: lib/command.php:652
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4558,7 +4547,6 @@ msgid ""
 "reply #<notice_id> - reply to notice with a given id\n"
 "reply <nickname> - reply to the last notice from user\n"
 "join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
 "drop <group> - leave group\n"
 "stats - get your stats\n"
 "stop - same as 'off'\n"
@@ -4812,7 +4800,7 @@ msgstr ""
 msgid "kB"
 msgstr ""
 
-#: lib/jabber.php:192
+#: lib/jabber.php:191
 #, php-format
 msgid "[%s]"
 msgstr ""
@@ -5236,7 +5224,7 @@ msgstr ""
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Prenumerationer"
 
@@ -5244,7 +5232,7 @@ msgstr "Prenumerationer"
 msgid "All subscriptions"
 msgstr "Alla prenumerationer"
 
-#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Prenumerant"
 
@@ -5253,15 +5241,15 @@ msgstr "Prenumerant"
 msgid "All subscribers"
 msgstr "Prenumerant"
 
-#: lib/profileaction.php:177
+#: lib/profileaction.php:178
 msgid "User ID"
 msgstr ""
 
-#: lib/profileaction.php:182
+#: lib/profileaction.php:183
 msgid "Member since"
 msgstr "Medlem sedan"
 
-#: lib/profileaction.php:235
+#: lib/profileaction.php:245
 msgid "All groups"
 msgstr ""