Merge branch 'master' into 0.9.x

[quix0rs-gnu-social.git] / locale / ja / LC_MESSAGES / statusnet.po

diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index e371c88569b1a22eb68ccdba2ce89635404d8c47..ca9c2e0faecac63e5b434dc8461fa02726f060ab 100644 (file)
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
 # Expored from translatewiki.net
 #
 # Author: Brion
 # Expored from translatewiki.net
 #
 # Author: Brion

+# Author: Calamari

 # Author: Fryed-peach
 # Author: Sonoda
 # Author: Whym
 # Author: Fryed-peach
 # Author: Sonoda
 # Author: Whym


@@ -12,155 +13,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:54+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:10+0000\n"

 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-"X-POT-Import-Date: 2010-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"

 
 

-#. TRANS: Page title
+#. TRANS: Page title for Access admin panel that allows configuring site access.

 #. TRANS: Menu item for site administration
 #. TRANS: Menu item for site administration

-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
+#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363

 msgid "Access"
 msgstr "アクセス"
 
 msgid "Access"
 msgstr "アクセス"
 

-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
+#. TRANS: Page notice.
+#: actions/accessadminpanel.php:64

 msgid "Site access settings"
 msgstr "サイトアクセス設定"
 
 #. TRANS: Form legend for registration form.
 msgid "Site access settings"
 msgstr "サイトアクセス設定"
 
 #. TRANS: Form legend for registration form.

-#: actions/accessadminpanel.php:161
+#: actions/accessadminpanel.php:151

 msgid "Registration"
 msgstr "登録"
 
 msgid "Registration"
 msgstr "登録"
 

-#. TRANS: Checkbox instructions for admin setting "Private"
-#: actions/accessadminpanel.php:165
+#. TRANS: Checkbox instructions for admin setting "Private".
+#: actions/accessadminpanel.php:155

 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "匿名ユーザー(ログインしていません)がサイトを見るのを禁止しますか?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr "匿名ユーザー(ログインしていません)がサイトを見るのを禁止しますか?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.

-#: actions/accessadminpanel.php:167
+#: actions/accessadminpanel.php:157

 msgctxt "LABEL"
 msgid "Private"
 msgstr "プライバシー"
 
 msgctxt "LABEL"
 msgid "Private"
 msgstr "プライバシー"
 

-#. TRANS: Checkbox instructions for admin setting "Invite only"
-#: actions/accessadminpanel.php:174
+#. TRANS: Checkbox instructions for admin setting "Invite only".
+#: actions/accessadminpanel.php:164

 msgid "Make registration invitation only."
 msgstr "招待のみ登録する"
 
 #. TRANS: Checkbox label for configuring site as invite only.
 msgid "Make registration invitation only."
 msgstr "招待のみ登録する"
 
 #. TRANS: Checkbox label for configuring site as invite only.

-#: actions/accessadminpanel.php:176
+#: actions/accessadminpanel.php:166

 msgid "Invite only"
 msgstr "招待のみ"
 
 msgid "Invite only"
 msgstr "招待のみ"
 

-#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
-#: actions/accessadminpanel.php:183
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
+#: actions/accessadminpanel.php:173

 msgid "Disable new registrations."
 msgstr "新規登録を無効。"
 
 #. TRANS: Checkbox label for disabling new user registrations.
 msgid "Disable new registrations."
 msgstr "新規登録を無効。"
 
 #. TRANS: Checkbox label for disabling new user registrations.

-#: actions/accessadminpanel.php:185
+#: actions/accessadminpanel.php:175

 msgid "Closed"
 msgstr "閉じられた"
 
 msgid "Closed"
 msgstr "閉じられた"
 

-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
+#. TRANS: Title for button to save access settings in site admin panel.
+#: actions/accessadminpanel.php:191

 msgid "Save access settings"
 msgstr "アクセス設定の保存"
 
 msgid "Save access settings"
 msgstr "アクセス設定の保存"
 

+#. TRANS: Tooltip for button to save access settings in site admin panel.

 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.

+#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.

 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label to save SMS preferences.

+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.

 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button label in the "Edit application" form.

-#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:355
+#. TRANS: Button text on profile design page to save settings.
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/designsettings.php:270
+#: lib/groupeditform.php:207

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
 
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
 

+#. TRANS: Server error when page not found (404).

 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
 msgstr "そのようなタグはありません。"
 
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
 msgstr "そのようなタグはありません。"
 

+#. TRANS: Client error when user not found for an action.
+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error when user not found updating a profile background image.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error displayed when checking group membership for a non-existing user.
+#. TRANS: Client error displayed when trying to have a non-existing user join a group.
+#. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when updating a status for a non-existing user.
+#. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.

 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.

-#: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:115
-#: actions/apiaccountupdateprofile.php:106
-#: actions/apiaccountupdateprofilebackgroundimage.php:117
-#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
-#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
-#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
-#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
-#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:76 actions/remotesubscribe.php:145
-#: actions/remotesubscribe.php:154 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/all.php:80 actions/allrss.php:69
+#: actions/apiaccountupdatedeliverydevice.php:110
+#: actions/apiaccountupdateprofile.php:103
+#: actions/apiaccountupdateprofilebackgroundimage.php:118
+#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
+#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
+#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
+#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
+#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
+#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
+#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
+#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
+#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59

 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "そのようなユーザはいません。"
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "そのようなユーザはいません。"
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number

-#: actions/all.php:90
+#: actions/all.php:91

 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s と友人、ページ %2$d"
 
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s と友人、ページ %2$d"
 

-#. TRANS: Page title. %1$s is user nickname
-#. TRANS: H1 text. %1$s is user nickname
+#. TRANS: Page title. %s is user nickname
+#. TRANS: H1 text for page. %s is a user nickname.

 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.

-#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
-#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
-#: lib/personalgroupnav.php:100
+#. TRANS: Timeline title for user and friends. %s is a user nickname.
+#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
+#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
+#: lib/personalgroupnav.php:103

 #, php-format
 msgid "%s and friends"
 msgstr "%s と友人"
 
 #, php-format
 msgid "%s and friends"
 msgstr "%s と友人"
 

-#. TRANS: %1$s is user nickname
-#: actions/all.php:107
+#. TRANS: %s is user nickname.
+#: actions/all.php:108

 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%s の友人のフィード (RSS 1.0)"
 
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%s の友人のフィード (RSS 1.0)"
 

-#. TRANS: %1$s is user nickname
-#: actions/all.php:116
+#. TRANS: %s is user nickname.
+#: actions/all.php:117

 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%s の友人のフィード (RSS 2.0)"
 
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%s の友人のフィード (RSS 2.0)"
 

-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
+#. TRANS: %s is user nickname.
+#: actions/all.php:126

 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%s の友人のフィード (Atom)"
 
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%s の友人のフィード (Atom)"
 

-#. TRANS: %1$s is user nickname
-#: actions/all.php:138
+#. TRANS: Empty list message. %s is a user nickname.
+#: actions/all.php:139

 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr "これは %s と友人のタイムラインです。まだ誰も投稿していません。"
 
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr "これは %s と友人のタイムラインです。まだ誰も投稿していません。"
 

-#: actions/all.php:143
+#. TRANS: Encouragement displayed on logged in user's empty timeline.
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#: actions/all.php:146

 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "


@@ -169,8 +208,9 @@ msgstr ""
 "もっと多くの人をフォローしてみましょう。[グループに参加](%%action.groups%%) "
 "してみたり、何か投稿してみましょう。"
 
 "もっと多くの人をフォローしてみましょう。[グループに参加](%%action.groups%%) "
 "してみたり、何か投稿してみましょう。"
 

-#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:146
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#: actions/all.php:150

 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "


@@ -179,7 +219,11 @@ msgstr ""
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 

-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
+#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227

 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "


@@ -188,61 +232,80 @@ msgstr ""
 "なぜ [アカウント登録](%%action.register%%) しないのですか。そして最初の投稿を"
 "してください!"
 
 "なぜ [アカウント登録](%%action.register%%) しないのですか。そして最初の投稿を"
 "してください!"
 

-#. TRANS: H1 text
-#: actions/all.php:182
+#. TRANS: H1 text for page when viewing a list for self.
+#: actions/all.php:188

 msgid "You and friends"
 msgstr "あなたと友人"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 msgid "You and friends"
 msgstr "あなたと友人"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.

-#: actions/allrss.php:121 actions/apitimelinefriends.php:216
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:122 actions/apitimelinefriends.php:213
+#: actions/apitimelinehome.php:119

 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s に %1$s と友人からの更新があります！"
 
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s に %1$s と友人からの更新があります！"
 

-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:95
-#: actions/apiaccountupdateprofile.php:98
-#: actions/apiaccountupdateprofilebackgroundimage.php:95
-#: actions/apiaccountupdateprofilecolors.php:119
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
-#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
-#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#. TRANS: Client error displayed handling a non-existing API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
+#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
+#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
+#. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method showing a group.
+#. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
+#. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#: actions/apiaccountratelimitstatus.php:69
+#: actions/apiaccountupdatedeliverydevice.php:92
+#: actions/apiaccountupdateprofile.php:94
+#: actions/apiaccountupdateprofilebackgroundimage.php:92
+#: actions/apiaccountupdateprofilecolors.php:115
+#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
+#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
+#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
+#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
+#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupshow.php:114 actions/apihelptest.php:84
+#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
+#: actions/apitimelineretweetedtome.php:118
+#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
+#: actions/apitimelineuser.php:206 actions/apiusershow.php:100

 msgid "API method not found."
 msgstr "API メソッドが見つかりません。"
 
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 msgid "API method not found."
 msgstr "API メソッドが見つかりません。"
 
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.

-#: actions/apiaccountupdatedeliverydevice.php:87
-#: actions/apiaccountupdateprofile.php:90
-#: actions/apiaccountupdateprofilebackgroundimage.php:87
-#: actions/apiaccountupdateprofilecolors.php:111
-#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
-#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
-#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
-#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
-#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
-#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
-#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
+#: actions/apiaccountupdatedeliverydevice.php:83
+#: actions/apiaccountupdateprofile.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:83
+#: actions/apiaccountupdateprofilecolors.php:106
+#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
+#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
+#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
+#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
+#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
+#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
+#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194

 msgid "This method requires a POST."
 msgstr "このメソッドには POST が必要です。"
 
 msgid "This method requires a POST."
 msgstr "このメソッドには POST が必要です。"
 

-#: actions/apiaccountupdatedeliverydevice.php:107
+#. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
+#: actions/apiaccountupdatedeliverydevice.php:103

 #, fuzzy
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 #, fuzzy
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "


@@ -251,359 +314,508 @@ msgstr ""
 "「device」という名前の引数を、次の中から値を選んで、指定する必要があります: "
 "sms, im, none"
 
 "「device」という名前の引数を、次の中から値を選んで、指定する必要があります: "
 "sms, im, none"
 

-#: actions/apiaccountupdatedeliverydevice.php:134
+#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#: actions/apiaccountupdatedeliverydevice.php:130

 msgid "Could not update user."
 msgstr "ユーザを更新できませんでした。"
 
 msgid "Could not update user."
 msgstr "ユーザを更新できませんでした。"
 

-#: actions/apiaccountupdateprofile.php:113
-#: actions/apiaccountupdateprofilebackgroundimage.php:195
-#: actions/apiaccountupdateprofilecolors.php:186
-#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#. TRANS: Client error displayed if a user profile could not be found.
+#. TRANS: Client error displayed when a user has no profile.
+#. TRANS: Client error displayed a user has no profile updating profile colours.
+#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
+#. TRANS: Client error displayed when requesting user information for a user without a profile.
+#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#: actions/apiaccountupdateprofile.php:111
+#: actions/apiaccountupdateprofilebackgroundimage.php:199
+#: actions/apiaccountupdateprofilecolors.php:183
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74

 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 

-#: actions/apiaccountupdateprofile.php:148
+#. TRANS: Server error displayed if a user profile could not be saved.
+#: actions/apiaccountupdateprofile.php:147

 msgid "Could not save profile."
 msgstr "プロフィールを保存できませんでした。"
 
 msgid "Could not save profile."
 msgstr "プロフィールを保存できませんでした。"
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:109
-#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:123 actions/editapplication.php:118
-#: actions/newapplication.php:101 actions/newnotice.php:94
-#: lib/designsettings.php:283
-#, php-format
+#. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
+#. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
+#. TRANS: Form validation error in design settings form. POST should remain untranslated.
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
+#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/newapplication.php:104 actions/newnotice.php:95
+#: lib/designsettings.php:298
+#, fuzzy, php-format

 msgid ""
 msgid ""

+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""

 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."

-msgstr ""
+msgstr[0] ""

 "サーバーの現在の構成が理由で、大量の POST データ (%sバイト) を処理することが"
 "できませんでした。"
 
 "サーバーの現在の構成が理由で、大量の POST データ (%sバイト) を処理することが"
 "できませんでした。"
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:137
-#: actions/apiaccountupdateprofilebackgroundimage.php:147
-#: actions/apiaccountupdateprofilecolors.php:165
-#: actions/apiaccountupdateprofilecolors.php:175
+#. TRANS: Client error displayed when saving design settings fails because of an empty id.
+#. TRANS: Client error displayed when saving design settings fails because of an empty result.
+#. TRANS: Client error displayed when a database error occurs inserting profile colours.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:138
+#: actions/apiaccountupdateprofilebackgroundimage.php:149
+#: actions/apiaccountupdateprofilecolors.php:160
+#: actions/apiaccountupdateprofilecolors.php:171

 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "あなたのデザイン設定を保存できません。"
 
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr "あなたのデザイン設定を保存できません。"
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:188
-#: actions/apiaccountupdateprofilecolors.php:143
+#. TRANS: Error displayed when updating design settings fails.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:191
+#: actions/apiaccountupdateprofilecolors.php:139

 msgid "Could not update your design."
 msgstr "デザインを更新できませんでした。"
 
 msgid "Could not update your design."
 msgstr "デザインを更新できませんでした。"
 

-#: actions/apiblockcreate.php:106
+#: actions/apiatomservice.php:85
+msgid "Main"
+msgstr ""
+
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
+#: lib/atomusernoticefeed.php:68
+#, php-format
+msgid "%s timeline"
+msgstr "%s のタイムライン"
+
+#. TRANS: Client error displayed when users try to block themselves.
+#: actions/apiblockcreate.php:104

 msgid "You cannot block yourself!"
 msgstr "自分自身をブロックすることはできません！"
 
 msgid "You cannot block yourself!"
 msgstr "自分自身をブロックすることはできません！"
 

-#: actions/apiblockcreate.php:127
+#. TRANS: Server error displayed when blocking a user has failed.
+#: actions/apiblockcreate.php:126

 msgid "Block user failed."
 msgstr "ユーザのブロックに失敗しました。"
 
 msgid "Block user failed."
 msgstr "ユーザのブロックに失敗しました。"
 

-#: actions/apiblockdestroy.php:115
+#. TRANS: Server error displayed when unblocking a user has failed.
+#: actions/apiblockdestroy.php:113

 msgid "Unblock user failed."
 msgstr "ユーザのブロック解除に失敗しました。"
 
 msgid "Unblock user failed."
 msgstr "ユーザのブロック解除に失敗しました。"
 

-#: actions/apidirectmessage.php:89
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:88

 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s からのダイレクトメッセージ"
 
 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s からのダイレクトメッセージ"
 

+#. TRANS: Subtitle. %s is a user nickname.

 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s から送られた全てのダイレクトメッセージ"
 
 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s から送られた全てのダイレクトメッセージ"
 

-#: actions/apidirectmessage.php:101
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:102

 #, php-format
 msgid "Direct messages to %s"
 msgstr "%s へのダイレクトメッセージ"
 
 #, php-format
 msgid "Direct messages to %s"
 msgstr "%s へのダイレクトメッセージ"
 

-#: actions/apidirectmessage.php:105
+#. TRANS: Subtitle. %s is a user nickname.
+#: actions/apidirectmessage.php:107

 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%s へ送った全てのダイレクトメッセージ"
 
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "%s へ送った全てのダイレクトメッセージ"
 

-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error displayed when no message text was submitted (406).
+#: actions/apidirectmessagenew.php:117

 msgid "No message text!"
 msgstr "メッセージの本文がありません！"
 
 msgid "No message text!"
 msgstr "メッセージの本文がありません！"
 

-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "長すぎます。メッセージは最大 %d 字までです。"
+#. TRANS: Client error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#. TRANS: Form validation error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
+#, fuzzy, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "長すぎます。メッセージは最大 %d 字までです。"

 
 

+#. TRANS: Client error displayed if a recipient user could not be found (403).

 #: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "受け取り手のユーザが見つかりません。"
 
 #: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "受け取り手のユーザが見つかりません。"
 

-#: actions/apidirectmessagenew.php:143
+#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
+#: actions/apidirectmessagenew.php:144

 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "友人でないユーザにダイレクトメッセージを送ることはできません。"
 
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "友人でないユーザにダイレクトメッセージを送ることはできません。"
 

-#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
+#. TRANS: Client error displayed trying to direct message self (403).
+#: actions/apidirectmessagenew.php:154
+#, fuzzy
+msgid ""
+"Do not send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"自分自身にメッセージを送ることはできません; かわりに独り言を言いましょう。"
+
+#. TRANS: Client error displayed when requesting a status with a non-existing ID.
+#. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
+#. TRANS: Client error displayed trying to delete a status with an invalid ID.
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108

 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "そのＩＤのステータスが見つかりません。"
 
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "そのＩＤのステータスが見つかりません。"
 

-#: actions/apifavoritecreate.php:121
+#. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
+#: actions/apifavoritecreate.php:120

 msgid "This status is already a favorite."
 msgstr "このステータスはすでにお気に入りです。"
 
 msgid "This status is already a favorite."
 msgstr "このステータスはすでにお気に入りです。"
 

+#. TRANS: Client error displayed when marking a notice as favourite fails.

 #. TRANS: Error message text shown when a favorite could not be set.
 #: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "お気に入りを作成できません。"
 
 #. TRANS: Error message text shown when a favorite could not be set.
 #: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "お気に入りを作成できません。"
 

-#: actions/apifavoritedestroy.php:124
+#. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
+#: actions/apifavoritedestroy.php:122

 msgid "That status is not a favorite."
 msgstr "そのステータスはお気に入りではありません。"
 
 msgid "That status is not a favorite."
 msgstr "そのステータスはお気に入りではありません。"
 

-#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
+#. TRANS: Client error displayed when removing a favourite has failed.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87

 msgid "Could not delete favorite."
 msgstr "お気に入りを取り消すことができません。"
 
 msgid "Could not delete favorite."
 msgstr "お気に入りを取り消すことができません。"
 

-#: actions/apifriendshipscreate.php:110
+#. TRANS: Client error displayed when trying follow who's profile could not be found.
+#: actions/apifriendshipscreate.php:109

 msgid "Could not follow user: profile not found."
 msgstr "ユーザのフォローを停止できませんでした: ユーザが見つかりません。"
 
 msgid "Could not follow user: profile not found."
 msgstr "ユーザのフォローを停止できませんでした: ユーザが見つかりません。"
 

-#: actions/apifriendshipscreate.php:119
+#. TRANS: Client error displayed when trying to follow a user that's already being followed.
+#. TRANS: %s is the nickname of the user that is already being followed.
+#: actions/apifriendshipscreate.php:120

 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "ユーザをフォローできませんでした: %s は既にあなたのリストに入っています。"
 
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 "ユーザをフォローできませんでした: %s は既にあなたのリストに入っています。"
 

-#: actions/apifriendshipsdestroy.php:110
+#. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
+#: actions/apifriendshipsdestroy.php:109

 msgid "Could not unfollow user: User not found."
 msgstr "ユーザのフォローを停止できませんでした: ユーザが見つかりません。"
 
 msgid "Could not unfollow user: User not found."
 msgstr "ユーザのフォローを停止できませんでした: ユーザが見つかりません。"
 

+#. TRANS: Client error displayed when trying to unfollow self.

 #: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "自分自身をフォロー停止することはできません。"
 
 #: actions/apifriendshipsdestroy.php:121
 msgid "You cannot unfollow yourself."
 msgstr "自分自身をフォロー停止することはできません。"
 

-#: actions/apifriendshipsexists.php:91
+#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
+#: actions/apifriendshipsexists.php:88

 #, fuzzy
 #, fuzzy

-msgid "Two valid IDs or screen_names must be supplied."
+msgid "Two valid IDs or nick names must be supplied."

 msgstr "ふたつのＩＤかスクリーンネームが必要です。"
 
 msgstr "ふたつのＩＤかスクリーンネームが必要です。"
 

-#: actions/apifriendshipsshow.php:134
+#. TRANS: Client error displayed when a source user could not be determined showing friendship.
+#: actions/apifriendshipsshow.php:131

 msgid "Could not determine source user."
 msgstr "ソースユーザーを決定できません。"
 
 msgid "Could not determine source user."
 msgstr "ソースユーザーを決定できません。"
 

-#: actions/apifriendshipsshow.php:142
+#. TRANS: Client error displayed when a target user could not be determined showing friendship.
+#: actions/apifriendshipsshow.php:140

 msgid "Could not find target user."
 msgstr "ターゲットユーザーを見つけられません。"
 
 msgid "Could not find target user."
 msgstr "ターゲットユーザーを見つけられません。"
 

-#: actions/apigroupcreate.php:168 actions/editgroup.php:186
-#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
-"できません。"
-
-#: actions/apigroupcreate.php:177 actions/editgroup.php:190
-#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:215
+#. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214

 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 

-#: actions/apigroupcreate.php:184 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:217
+#. TRANS: Client error in form for group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216

 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 

-#: actions/apigroupcreate.php:200 actions/editapplication.php:215
-#: actions/editgroup.php:199 actions/newapplication.php:203
-#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:224
+#. TRANS: Client error in form for group creation.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223

 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 

-#: actions/apigroupcreate.php:209 actions/editgroup.php:202
-#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:227
-msgid "Full name is too long (max 255 chars)."
+#. TRANS: Client error in form for group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
+#, fuzzy
+msgid "Full name is too long (maximum 255 characters)."

 msgstr "フルネームが長すぎます。（255字まで）"
 
 msgstr "フルネームが長すぎます。（255字まで）"
 

-#: actions/apigroupcreate.php:217 actions/editapplication.php:190
-#: actions/newapplication.php:172
-#, php-format
-msgid "Description is too long (max %d chars)."
-msgstr "記述が長すぎます。（最長%d字）"
-
-#: actions/apigroupcreate.php:228 actions/editgroup.php:208
-#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:234
-msgid "Location is too long (max 255 chars)."
+#. TRANS: Client error shown when providing too long a description during group creation.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
+#, fuzzy, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] "記述が長すぎます。（最長%d字）"
+
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
+#, fuzzy
+msgid "Location is too long (maximum 255 characters)."

 msgstr "場所が長すぎます。（255字まで）"
 
 msgstr "場所が長すぎます。（255字まで）"
 

-#: actions/apigroupcreate.php:247 actions/editgroup.php:219
-#: actions/newgroup.php:159
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "別名が多すぎます! 最大 %d。"
+#. TRANS: Client error shown when providing too many aliases during group creation.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group edit form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
+#, fuzzy, php-format
+msgid "Too many aliases! Maximum %d allowed."
+msgid_plural "Too many aliases! Maximum %d allowed."
+msgstr[0] "別名が多すぎます! 最大 %d。"

 
 

-#: actions/apigroupcreate.php:268
+#. TRANS: Client error shown when providing an invalid alias during group creation.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupcreate.php:253

 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "不正な別名: \"%s\""
 
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "不正な別名: \"%s\""
 

-#: actions/apigroupcreate.php:277 actions/editgroup.php:232
-#: actions/newgroup.php:172
+#. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
+#. TRANS: %s is the alias that is already in use.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184

 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "別名 \"%s\" は既に使用されています。他のものを試してみて下さい。"
 
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "別名 \"%s\" は既に使用されています。他のものを試してみて下さい。"
 

-#: actions/apigroupcreate.php:290 actions/editgroup.php:238
-#: actions/newgroup.php:178
+#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191

 msgid "Alias can't be the same as nickname."
 msgstr "別名はニックネームと同じではいけません。"
 
 msgid "Alias can't be the same as nickname."
 msgstr "別名はニックネームと同じではいけません。"
 

-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
-#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
-#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. TRANS: Client error displayed when trying to join a group that does not exist.
+#. TRANS: Client error displayed when trying to leave a group that does not exist.
+#. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when trying to show a group that could not be found.
+#. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:89
+#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89

 msgid "Group not found."
 msgstr "見つかりません。"
 
 msgid "Group not found."
 msgstr "見つかりません。"
 

+#. TRANS: Server error displayed when trying to join a group the user is already a member of.

 #. TRANS: Error text shown a user tries to join a group they already are a member of.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.

-#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333

 msgid "You are already a member of that group."
 msgstr "すでにこのグループのメンバーです。"
 
 msgid "You are already a member of that group."
 msgstr "すでにこのグループのメンバーです。"
 

+#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.

 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
 #: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
 msgid "You have been blocked from that group by the admin."
 msgstr "管理者によってこのグループからブロックされています。"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
 #: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
 msgid "You have been blocked from that group by the admin."
 msgstr "管理者によってこのグループからブロックされています。"
 

+#. TRANS: Server error displayed when joining a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.

 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350

 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
 
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
 

-#: actions/apigroupleave.php:116
+#. TRANS: Server error displayed when trying to leave a group the user is not a member of.
+#: actions/apigroupleave.php:115

 msgid "You are not a member of this group."
 msgstr "このグループのメンバーではありません。"
 
 msgid "You are not a member of this group."
 msgstr "このグループのメンバーではありません。"
 

+#. TRANS: Server error displayed when leaving a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.

 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: actions/apigroupleave.php:126 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:129

 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "ユーザ %1$s をグループ %2$s から削除できません。"
 
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "ユーザ %1$s をグループ %2$s から削除できません。"
 

-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
+#. TRANS: Used as title in check for group membership. %s is a user name.
+#: actions/apigrouplist.php:94

 #, php-format
 msgid "%s's groups"
 msgstr "%s のグループ"
 
 #, php-format
 msgid "%s's groups"
 msgstr "%s のグループ"
 

-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
+#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#: actions/apigrouplist.php:104

 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "グループ %s はメンバー"
 
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "グループ %s はメンバー"
 

-#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.

 #. TRANS: Message is used as a page title. %s is a nick name.
 #. TRANS: Message is used as a page title. %s is a nick name.

-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
+#: actions/apigrouplistall.php:88 actions/usergroups.php:63

 #, php-format
 msgid "%s groups"
 msgstr "%s グループ"
 
 #, php-format
 msgid "%s groups"
 msgstr "%s グループ"
 

-#: actions/apigrouplistall.php:96
+#. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
+#: actions/apigrouplistall.php:93

 #, php-format
 msgid "groups on %s"
 msgstr "%s 上のグループ"
 
 #, php-format
 msgid "groups on %s"
 msgstr "%s 上のグループ"
 

-#: actions/apimediaupload.php:100
+#. TRANS: Client error displayed when uploading a media file has failed.
+#: actions/apimediaupload.php:101

 #, fuzzy
 msgid "Upload failed."
 msgstr "ファイルアップロード"
 
 #, fuzzy
 msgid "Upload failed."
 msgstr "ファイルアップロード"
 

-#: actions/apioauthauthorize.php:101
+#. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
+#: actions/apioauthaccesstoken.php:101
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "不正なログイントークンが指定されています。"
+
+#. TRANS: Client error given when no oauth_token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:107

 msgid "No oauth_token parameter provided."
 msgstr "oauth_token パラメータは提供されませんでした。"
 
 msgid "No oauth_token parameter provided."
 msgstr "oauth_token パラメータは提供されませんでした。"
 

-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
+#, fuzzy
+msgid "Invalid request token."

 msgstr "不正なトークン。"
 
 msgstr "不正なトークン。"
 

-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:172 actions/disfavor.php:74
-#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:121
+#, fuzzy
+msgid "Request token already authorized."
+msgstr "認証されていません。"
+
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
+#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55

 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupblock.php:66 actions/grouplogo.php:312

-#: actions/groupunblock.php:66 actions/imsettings.php:230
-#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:350
+#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
+#: actions/profilesettings.php:221 actions/recoverpassword.php:350

 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/register.php:172 actions/remotesubscribe.php:77

-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40

 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52

-#: lib/designsettings.php:294
+#: lib/designsettings.php:310

 msgid "There was a problem with your session token. Try again, please."
 msgstr "あなたのセッショントークンに問題がありました。再度お試しください。"
 
 msgid "There was a problem with your session token. Try again, please."
 msgstr "あなたのセッショントークンに問題がありました。再度お試しください。"
 

-#: actions/apioauthauthorize.php:135
+#. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
+#: actions/apioauthauthorize.php:168

 msgid "Invalid nickname / password!"
 msgstr "不正なユーザ名またはパスワード。"
 
 msgid "Invalid nickname / password!"
 msgstr "不正なユーザ名またはパスワード。"
 

-#: actions/apioauthauthorize.php:159
-msgid "Database error deleting OAuth application user."
-msgstr "OAuth アプリケーションユーザの削除時ＤＢエラー。"
-
-#: actions/apioauthauthorize.php:185
-msgid "Database error inserting OAuth application user."
+#. TRANS: Server error displayed when a database action fails.
+#: actions/apioauthauthorize.php:217
+#, fuzzy
+msgid "Database error inserting oauth_token_association."

 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 
 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 

-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"リクエストトークン %s は承認されました。 アクセストークンとそれを交換してくだ"
-"さい。"
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "リクエストトークン%sは、拒否されて、取り消されました。"
-
+#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
+#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed submitting invalid form data for edit application.

 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.

+#. TRANS: Client error when submitting a form with unexpected information.

 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.

-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
-#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:290 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:121
+#. TRANS: Unknown form validation error in design settings form.
+#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
+#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:125

 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44

-#: actions/smssettings.php:277 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:321

 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
 
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
 

-#: actions/apioauthauthorize.php:259
+#. TRANS: Title for a page where a user can confirm/deny account access by an external application.
+#: actions/apioauthauthorize.php:387

 msgid "An application would like to connect to your account"
 msgstr "アプリケーションはあなたのアカウントに接続したいです"
 
 msgid "An application would like to connect to your account"
 msgstr "アプリケーションはあなたのアカウントに接続したいです"
 

-#: actions/apioauthauthorize.php:276
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:404

 msgid "Allow or deny access"
 msgstr "アクセスを許可または拒絶"
 
 msgid "Allow or deny access"
 msgstr "アクセスを許可または拒絶"
 

-#: actions/apioauthauthorize.php:292
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
+#: actions/apioauthauthorize.php:425
+#, php-format
+msgid ""
+"An application would like the ability to <strong>%3$s</strong> your %4$s "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+msgstr ""
+
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
+#. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
+#: actions/apioauthauthorize.php:433

 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "


@@ -611,243 +823,458 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 

-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:455
+#, fuzzy
+msgctxt "LEGEND"

 msgid "Account"
 msgstr "アカウント"
 
 msgid "Account"
 msgstr "アカウント"
 

-#: actions/apioauthauthorize.php:313 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:431
-#: actions/showgroup.php:245 actions/tagother.php:94
+#. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group nickname (dt). Text hidden by default.
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/showgroup.php:240 actions/tagother.php:94

 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: actions/userauthorization.php:145 lib/groupeditform.php:152

-#: lib/userprofile.php:132
+#: lib/userprofile.php:134

 msgid "Nickname"
 msgstr "ニックネーム"
 
 msgid "Nickname"
 msgstr "ニックネーム"
 

+#. TRANS: Field label on OAuth API authorisation form.

 #. TRANS: Link description in user account settings menu.
 #. TRANS: Link description in user account settings menu.

-#: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:120
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:437 lib/accountsettingsaction.php:120

 msgid "Password"
 msgstr "パスワード"
 
 msgid "Password"
 msgstr "パスワード"
 

-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "拒絶"
+#. TRANS: Button text that when clicked will cancel the process of allowing access to an account
+#. TRANS: by an external application.
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label in the "Edit application" form.
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/imsettings.php:131 actions/smssettings.php:137
+#: lib/applicationeditform.php:351
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "中止"

 
 

-#: actions/apioauthauthorize.php:334
+#. TRANS: Button text that when clicked will allow access to an account by an external application.
+#: actions/apioauthauthorize.php:485
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Allow"
 msgstr "許可"
 
 msgid "Allow"
 msgstr "許可"
 

-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#. TRANS: Form instructions.
+#: actions/apioauthauthorize.php:502
+#, fuzzy
+msgid "Authorize access to your account information."

 msgstr "アカウント情報へのアクセスを許可するか、または拒絶してください。"
 
 msgstr "アカウント情報へのアクセスを許可するか、または拒絶してください。"
 

-#: actions/apistatusesdestroy.php:112
+#. TRANS: Header for user notification after revoking OAuth access to an application.
+#: actions/apioauthauthorize.php:594
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "確認コードがありません。"
+
+#. TRANS: User notification after revoking OAuth access to an application.
+#. TRANS: %s is an OAuth token.
+#: actions/apioauthauthorize.php:598
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "リクエストトークン%sは、拒否されて、取り消されました。"
+
+#. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+#: actions/apioauthauthorize.php:621
+#, fuzzy
+msgid "You have successfully authorized the application"
+msgstr "認証されていません。"
+
+#. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+#: actions/apioauthauthorize.php:625
+msgid ""
+"Please return to the application and enter the following security code to "
+"complete the process."
+msgstr ""
+
+#. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#: actions/apioauthauthorize.php:632
+#, fuzzy, php-format
+msgid "You have successfully authorized %s"
+msgstr "認証されていません。"
+
+#. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#: actions/apioauthauthorize.php:639
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
+#. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
+#. TRANS: POST and DELETE should not be translated.
+#: actions/apistatusesdestroy.php:111

 msgid "This method requires a POST or DELETE."
 msgstr "このメソッドには POST か DELETE が必要です。"
 
 msgid "This method requires a POST or DELETE."
 msgstr "このメソッドには POST か DELETE が必要です。"
 

-#: actions/apistatusesdestroy.php:135
+#. TRANS: Client error displayed trying to delete a status of another user.
+#: actions/apistatusesdestroy.php:136

 msgid "You may not delete another user's status."
 msgstr "他のユーザのステータスを消すことはできません。"
 
 msgid "You may not delete another user's status."
 msgstr "他のユーザのステータスを消すことはできません。"
 

-#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
+#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
+#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
+#: actions/deletenotice.php:61 actions/shownotice.php:92

 msgid "No such notice."
 msgstr "そのようなつぶやきはありません。"
 
 msgid "No such notice."
 msgstr "そのようなつぶやきはありません。"
 

+#. TRANS: Client error displayed trying to repeat an own notice through the API.

 #. TRANS: Error text shown when trying to repeat an own notice.
 #. TRANS: Error text shown when trying to repeat an own notice.

-#: actions/apistatusesretweet.php:84 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537

 msgid "Cannot repeat your own notice."
 msgstr "あなたのつぶやきを繰り返せません。"
 
 msgid "Cannot repeat your own notice."
 msgstr "あなたのつぶやきを繰り返せません。"
 

+#. TRANS: Client error displayed trying to re-repeat a notice through the API.

 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.

-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543

 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 
 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 

-#: actions/apistatusesshow.php:139
+#: actions/apistatusesshow.php:117
+#, fuzzy
+msgid "HTTP method not supported."
+msgstr "API メソッドが見つかりません。"
+
+#: actions/apistatusesshow.php:141
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
+msgstr "サポート外の形式です。"
+
+#. TRANS: Client error displayed requesting a deleted status.
+#: actions/apistatusesshow.php:152

 msgid "Status deleted."
 msgstr "ステータスを削除しました。"
 
 msgid "Status deleted."
 msgstr "ステータスを削除しました。"
 

-#: actions/apistatusesshow.php:145
+#. TRANS: Client error displayed requesting a status with an invalid ID.
+#: actions/apistatusesshow.php:159

 msgid "No status with that ID found."
 msgstr "そのＩＤでのステータスはありません。"
 
 msgid "No status with that ID found."
 msgstr "そのＩＤでのステータスはありません。"
 

-#: actions/apistatusesupdate.php:222
+#: actions/apistatusesshow.php:227
+msgid "Can only delete using the Atom format."
+msgstr ""
+
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+msgid "Can't delete this notice."
+msgstr "このつぶやきを削除できません。"
+
+#: actions/apistatusesshow.php:247
+#, fuzzy, php-format
+msgid "Deleted notice %d"
+msgstr "つぶやき削除"
+
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#: actions/apistatusesupdate.php:221

 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 

-#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#. TRANS: %d is the maximum number of character for a notice.
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161

 #: lib/mailhandler.php:60
 #: lib/mailhandler.php:60

-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "長すぎます。つぶやきは最大 %d 字までです。"
+#, fuzzy, php-format
+msgid "That's too long. Maximum notice size is %d character."
+msgid_plural "That's too long. Maximum notice size is %d characters."
+msgstr[0] "長すぎます。つぶやきは最大 %d 字までです。"

 
 

-#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
-msgid "Not found."
-msgstr "見つかりません。"
+#. TRANS: Client error displayed when replying to a non-existing notice.
+#: actions/apistatusesupdate.php:284
+#, fuzzy
+msgid "Parent notice not found."
+msgstr "API メソッドが見つかりません。"

 
 

-#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "つぶやきは URL を含めて最大 %d 字までです。"
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum lenth for a notice.
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
+#, fuzzy, php-format
+msgid "Maximum notice size is %d character, including attachment URL."
+msgid_plural "Maximum notice size is %d characters, including attachment URL."
+msgstr[0] "つぶやきは URL を含めて最大 %d 字までです。"

 
 

-#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
+#. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
+#. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
+#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258

 msgid "Unsupported format."
 msgstr "サポート外の形式です。"
 
 msgid "Unsupported format."
 msgstr "サポート外の形式です。"
 

-#: actions/apitimelinefavorites.php:110
+#. TRANS: Title for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#: actions/apitimelinefavorites.php:108

 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / %2$s からのお気に入り"
 
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / %2$s からのお気に入り"
 

-#: actions/apitimelinefavorites.php:119
-#, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
+#. TRANS: Subtitle for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
+#. TRANS: %3$s is a user nickname.
+#: actions/apitimelinefavorites.php:120
+#, fuzzy, php-format
+msgid "%1$s updates favorited by %2$s / %3$s."

 msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
 
 msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
 

-#: actions/apitimelinementions.php:118
+#. TRANS: Server error displayed when generating an Atom feed fails.
+#. TRANS: %s is the error.
+#: actions/apitimelinegroup.php:138
+#, fuzzy, php-format
+msgid "Could not generate feed for group - %s"
+msgstr "グループを更新できません。"
+
+#. TRANS: Title for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#: actions/apitimelinementions.php:115

 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / %2$s について更新"
 
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / %2$s について更新"
 

+#. TRANS: Subtitle for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
+#. TRANS: %3$s is a user's full name.

 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%2$s からアップデートに答える %1$s アップデート"
 
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%2$s からアップデートに答える %1$s アップデート"
 

-#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
+#. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:193 actions/publicrss.php:103

 #, php-format
 msgid "%s public timeline"
 msgstr "%s のパブリックタイムライン"
 
 #, php-format
 msgid "%s public timeline"
 msgstr "%s のパブリックタイムライン"
 

-#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
+#. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105

 #, php-format
 msgid "%s updates from everyone!"
 msgstr "皆からの %s アップデート!"
 
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "皆からの %s アップデート!"
 

-#: actions/apitimelineretweetedtome.php:111
+#. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
+#: actions/apitimelineretweetedbyme.php:71
+#, fuzzy
+msgid "Unimplemented."
+msgstr "未実装のメソッド。"
+
+#. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
+#: actions/apitimelineretweetedtome.php:108

 #, php-format
 msgid "Repeated to %s"
 msgstr "%s への返信"
 
 #, php-format
 msgid "Repeated to %s"
 msgstr "%s への返信"
 

-#: actions/apitimelineretweetsofme.php:114
+#. TRANS: Title of list of repeated notices of the logged in user.
+#. TRANS: %s is the nickname of the logged in user.
+#: actions/apitimelineretweetsofme.php:112

 #, php-format
 msgid "Repeats of %s"
 msgstr "%s の返信"
 
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s の返信"
 

-#: actions/apitimelinetag.php:105 actions/tag.php:67
+#. TRANS: Title for timeline with lastest notices with a given tag.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:67

 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s とタグ付けされたつぶやき"
 
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s とタグ付けされたつぶやき"
 

-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
+#. TRANS: Subtitle for timeline with lastest notices with a given tag.
+#. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
+#: actions/apitimelinetag.php:105 actions/tagrss.php:65

 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s に %1$s による更新があります！"
 
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s に %1$s による更新があります！"
 

-#: actions/apitrends.php:87
+#: actions/apitimelineuser.php:300
+#, fuzzy
+msgid "Only the user can add to their own timeline."
+msgstr "ユーザだけがかれら自身のメールボックスを読むことができます。"
+
+#: actions/apitimelineuser.php:306
+msgid "Only accept AtomPub for atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:316
+msgid "Atom post must be an Atom entry."
+msgstr ""
+
+#: actions/apitimelineuser.php:325
+msgid "Can only handle post activities."
+msgstr ""
+
+#: actions/apitimelineuser.php:334
+#, php-format
+msgid "Cannot handle activity object type \"%s\""
+msgstr ""
+
+#: actions/apitimelineuser.php:392
+#, fuzzy, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr "その ID によるつぶやきは存在していません"
+
+#: actions/apitimelineuser.php:423
+#, php-format
+msgid "AtomPub post with unknown attention URI %s"
+msgstr ""
+
+#. TRANS: Server error for unfinished API method showTrends.
+#: actions/apitrends.php:85

 msgid "API method under construction."
 msgstr "API メソッドが工事中です。"
 
 msgid "API method under construction."
 msgstr "API メソッドが工事中です。"
 

+#. TRANS: Client error displayed when requesting user information for a non-existing user.
+#: actions/apiusershow.php:94
+#, fuzzy
+msgid "User not found."
+msgstr "API メソッドが見つかりません。"
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.

 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "そのような添付はありません。"
 
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "そのような添付はありません。"
 

-#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed if no nickname argument was given requesting a group page.
+#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:85 actions/groupdesignsettings.php:84

 #: actions/grouplogo.php:86 actions/groupmembers.php:76
 #: actions/grouplogo.php:86 actions/groupmembers.php:76

-#: actions/grouprss.php:91 actions/showgroup.php:121
+#: actions/grouprss.php:91 actions/showgroup.php:116

 msgid "No nickname."
 msgstr "ニックネームがありません。"
 
 msgid "No nickname."
 msgstr "ニックネームがありません。"
 

-#: actions/avatarbynickname.php:64
+#. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
+#: actions/avatarbynickname.php:66

 msgid "No size."
 msgstr "サイズがありません。"
 
 msgid "No size."
 msgstr "サイズがありません。"
 

-#: actions/avatarbynickname.php:69
+#. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
+#: actions/avatarbynickname.php:72

 msgid "Invalid size."
 msgstr "不正なサイズ。"
 
 msgid "Invalid size."
 msgstr "不正なサイズ。"
 

+#. TRANS: Title for avatar upload page.
+#. TRANS: Label for group avatar (dt). Text hidden by default.

 #. TRANS: Link description in user account settings menu.
 #. TRANS: Link description in user account settings menu.

-#: actions/avatarsettings.php:67 actions/showgroup.php:230
+#: actions/avatarsettings.php:66 actions/showgroup.php:224

 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "アバター"
 
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "アバター"
 

+#. TRANS: Instruction for avatar upload page.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".

 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "自分のアバターをアップロードできます。最大サイズは%sです。"
 
 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "自分のアバターをアップロードできます。最大サイズは%sです。"
 

-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
+#: actions/avatarsettings.php:108 actions/avatarsettings.php:192

 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "合っているプロフィールのないユーザ"
 
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "合っているプロフィールのないユーザ"
 

-#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#: actions/avatarsettings.php:122 actions/avatarsettings.php:205

 #: actions/grouplogo.php:254
 msgid "Avatar settings"
 msgstr "アバター設定"
 
 #: actions/grouplogo.php:254
 msgid "Avatar settings"
 msgstr "アバター設定"
 

-#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#: actions/avatarsettings.php:131 actions/avatarsettings.php:214

 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"
 msgstr "オリジナル"
 
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"
 msgstr "オリジナル"
 

-#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#: actions/avatarsettings.php:147 actions/avatarsettings.php:227

 #: actions/grouplogo.php:213 actions/grouplogo.php:274
 msgid "Preview"
 msgstr "プレビュー"
 
 #: actions/grouplogo.php:213 actions/grouplogo.php:274
 msgid "Preview"
 msgstr "プレビュー"
 

-#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#. TRANS: Button on avatar upload page to delete current avatar.
+#: actions/avatarsettings.php:155
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Delete"
 msgstr "削除"
 
 msgid "Delete"
 msgstr "削除"
 

-#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+#. TRANS: Button on avatar upload page to upload an avatar.
+#: actions/avatarsettings.php:173
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Upload"
 msgstr "アップロード"
 
 msgid "Upload"
 msgstr "アップロード"
 

-#: actions/avatarsettings.php:231 actions/grouplogo.php:289
+#. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
+#: actions/avatarsettings.php:243
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Crop"
 msgstr "切り取り"
 
 msgid "Crop"
 msgstr "切り取り"
 

-#: actions/avatarsettings.php:305
+#. TRANS: Validation error on avatar upload form when no file was uploaded.
+#: actions/avatarsettings.php:318

 #, fuzzy
 msgid "No file uploaded."
 msgstr "プロファイル記述がありません。"
 
 #, fuzzy
 msgid "No file uploaded."
 msgstr "プロファイル記述がありません。"
 

-#: actions/avatarsettings.php:332
+#. TRANS: Avatar upload form unstruction after uploading a file.
+#: actions/avatarsettings.php:346

 msgid "Pick a square area of the image to be your avatar"
 msgstr "あなたのアバターとなるイメージを正方形で指定"
 
 msgid "Pick a square area of the image to be your avatar"
 msgstr "あなたのアバターとなるイメージを正方形で指定"
 

-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+#. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:380

 msgid "Lost our file data."
 msgstr "ファイルデータを紛失しました。"
 
 msgid "Lost our file data."
 msgstr "ファイルデータを紛失しました。"
 

-#: actions/avatarsettings.php:370
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385

 msgid "Avatar updated."
 msgstr "アバターが更新されました。"
 
 msgid "Avatar updated."
 msgstr "アバターが更新されました。"
 

-#: actions/avatarsettings.php:373
+#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+#: actions/avatarsettings.php:389

 msgid "Failed updating avatar."
 msgstr "アバターの更新に失敗しました。"
 
 msgid "Failed updating avatar."
 msgstr "アバターの更新に失敗しました。"
 

-#: actions/avatarsettings.php:397
+#. TRANS: Success message for deleting a user avatar.
+#: actions/avatarsettings.php:413

 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 
 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 

-#: actions/block.php:69
+#. TRANS: Client error displayed when blocking a user that has already been blocked.
+#: actions/block.php:68

 msgid "You already blocked that user."
 msgstr "そのユーザはすでにブロック済みです。"
 
 msgid "You already blocked that user."
 msgstr "そのユーザはすでにブロック済みです。"
 

-#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
+#. TRANS: Title for block user page.
+#. TRANS: Legend for block user form.
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158

 msgid "Block user"
 msgstr "ユーザをブロック"
 
 msgid "Block user"
 msgstr "ユーザをブロック"
 

-#: actions/block.php:138
+#. TRANS: Explanation of consequences when blocking a user on the block user page.
+#: actions/block.php:139

 #, fuzzy
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 #, fuzzy
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "


@@ -860,30 +1287,32 @@ msgstr ""
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.

+#. TRANS: Button label on the delete group form.

 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.

-#: actions/block.php:153 actions/deleteapplication.php:154
-#: actions/deletenotice.php:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
+#: actions/deleteuser.php:152 actions/groupblock.php:178

 msgctxt "BUTTON"
 msgid "No"
 msgstr "ノート"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
 msgctxt "BUTTON"
 msgid "No"
 msgstr "ノート"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.

-#: actions/block.php:157 actions/deleteuser.php:156
+#: actions/block.php:158 actions/deleteuser.php:156

 msgid "Do not block this user"
 msgstr "このユーザをアンブロックする"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 msgid "Do not block this user"
 msgstr "このユーザをアンブロックする"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.

+#. TRANS: Button label on the delete group form.

 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.

-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
+#: actions/deleteuser.php:159 actions/groupblock.php:185

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"


@@ -891,151 +1320,189 @@ msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #. TRANS: Description of the form to block a user.
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #. TRANS: Description of the form to block a user.

-#: actions/block.php:164 lib/blockform.php:79
+#: actions/block.php:165 lib/blockform.php:79

 msgid "Block this user"
 msgstr "このユーザをブロックする"
 
 msgid "Block this user"
 msgstr "このユーザをブロックする"
 

-#: actions/block.php:187
+#. TRANS: Server error displayed when blocking a user fails.
+#: actions/block.php:189

 msgid "Failed to save block information."
 msgstr "ブロック情報の保存に失敗しました。"
 
 msgid "Failed to save block information."
 msgstr "ブロック情報の保存に失敗しました。"
 

+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.

 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.

-#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
-#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
+#: actions/deletegroup.php:87 actions/deletegroup.php:100
+#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62

 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105

-#: actions/groupunblock.php:86 actions/joingroup.php:82
+#: actions/groupunblock.php:88 actions/joingroup.php:82

 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86

-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:168
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168

 #: lib/command.php:380
 msgid "No such group."
 msgstr "そのようなグループはありません。"
 
 #: lib/command.php:380
 msgid "No such group."
 msgstr "そのようなグループはありません。"
 

-#: actions/blockedfromgroup.php:97
+#. TRANS: Title for first page with list of users blocked from a group.
+#. TRANS: %s is a group nickname.
+#: actions/blockedfromgroup.php:101

 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s ブロックされたプロファイル"
 
 #, php-format
 msgid "%s blocked profiles"
 msgstr "%s ブロックされたプロファイル"
 

-#: actions/blockedfromgroup.php:100
+#. TRANS: Title for any but the first page with list of users blocked from a group.
+#. TRANS: %1$s is a group nickname, %2$d is a page number.
+#: actions/blockedfromgroup.php:106

 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s ブロックされたプロファイル、ページ %2$d"
 
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s ブロックされたプロファイル、ページ %2$d"
 

-#: actions/blockedfromgroup.php:115
+#. TRANS: Instructions for list of users blocked from a group.
+#: actions/blockedfromgroup.php:122

 msgid "A list of the users blocked from joining this group."
 msgstr "このグループへの参加をブロックされたユーザのリスト。"
 
 msgid "A list of the users blocked from joining this group."
 msgstr "このグループへの参加をブロックされたユーザのリスト。"
 

-#: actions/blockedfromgroup.php:288
+#. TRANS: Form legend for unblocking a user from a group.
+#: actions/blockedfromgroup.php:291

 msgid "Unblock user from group"
 msgstr "グループからのアンブロックユーザ"
 
 msgid "Unblock user from group"
 msgstr "グループからのアンブロックユーザ"
 

-#. TRANS: Title for the form to unblock a user.
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
+#. TRANS: Button text for unblocking a user from a group.
+#: actions/blockedfromgroup.php:323
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Unblock"
 msgstr "アンブロック"
 
 msgid "Unblock"
 msgstr "アンブロック"
 

+#. TRANS: Tooltip for button for unblocking a user from a group.

 #. TRANS: Description of the form to unblock a user.
 #. TRANS: Description of the form to unblock a user.

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
+#: actions/blockedfromgroup.php:327 lib/unblockform.php:78

 msgid "Unblock this user"
 msgstr "このユーザをアンブロックする"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 msgid "Unblock this user"
 msgstr "このユーザをアンブロックする"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.

+#. TRANS: %s is the StatusNet site name.

 #: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "%s 上のグループ"
 
 #: actions/bookmarklet.php:51
 #, php-format
 msgid "Post to %s"
 msgstr "%s 上のグループ"
 

-#: actions/confirmaddress.php:75
+#. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
+#: actions/confirmaddress.php:74

 msgid "No confirmation code."
 msgstr "確認コードがありません。"
 
 msgid "No confirmation code."
 msgstr "確認コードがありません。"
 

+#. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.

 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "確認コードが見つかりません。"
 
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "確認コードが見つかりません。"
 

-#: actions/confirmaddress.php:85
+#. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
+#: actions/confirmaddress.php:86

 msgid "That confirmation code is not for you!"
 msgstr "その確認コードはあなたのものではありません！"
 
 msgid "That confirmation code is not for you!"
 msgstr "その確認コードはあなたのものではありません！"
 

-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
+#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:92

 #, fuzzy, php-format
 msgid "Unrecognized address type %s."
 msgstr "不明なアドレスタイプ %s"
 
 #, fuzzy, php-format
 msgid "Unrecognized address type %s."
 msgstr "不明なアドレスタイプ %s"
 

-#. TRANS: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+#: actions/confirmaddress.php:97

 msgid "That address has already been confirmed."
 msgstr "そのアドレスは既に承認されています。"
 
 msgid "That address has already been confirmed."
 msgstr "そのアドレスは既に承認されています。"
 

+#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.

 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.

+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.

 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.

-#: actions/confirmaddress.php:116 actions/emailsettings.php:331
-#: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/confirmaddress.php:118 actions/emailsettings.php:337
+#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:184
+#: actions/profilesettings.php:326 actions/smssettings.php:308

 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ユーザを更新できません"
 
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ユーザを更新できません"
 

-#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/confirmaddress.php:128 actions/emailsettings.php:437
-#: actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#. TRANS: Server error displayed when an address confirmation code deletion from the
+#. TRANS: database fails in the contact address confirmation action.
+#: actions/confirmaddress.php:132
+#, fuzzy
+msgid "Could not delete address confirmation."

 msgstr "メール承認を削除できません"
 
 msgstr "メール承認を削除できません"
 

-#: actions/confirmaddress.php:146
+#. TRANS: Title for the contact address confirmation action.
+#: actions/confirmaddress.php:150

 msgid "Confirm address"
 msgstr "アドレスの確認"
 
 msgid "Confirm address"
 msgstr "アドレスの確認"
 

-#: actions/confirmaddress.php:161
+#. TRANS: Success message for the contact address confirmation action.
+#. TRANS: %s can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:166

 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "アドレス \"%s\" はあなたのアカウントとして承認されています。"
 
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "アドレス \"%s\" はあなたのアカウントとして承認されています。"
 

-#: actions/conversation.php:99
+#. TRANS: Title for page with a conversion (multiple notices in context).
+#: actions/conversation.php:96

 msgid "Conversation"
 msgstr "会話"
 
 msgid "Conversation"
 msgstr "会話"
 

-#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87

 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "つぶやき"
 
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "つぶやき"
 

-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62

 msgid "You must be logged in to delete an application."
 msgstr "アプリケーションを削除するにはログインしていなければなりません。"
 
 msgid "You must be logged in to delete an application."
 msgstr "アプリケーションを削除するにはログインしていなければなりません。"
 

+#. TRANS: Client error displayed trying to delete an application that does not exist.

 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "アプリケーションが見つかりません。"
 
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "アプリケーションが見つかりません。"
 

-#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
+#. TRANS: Client error displayed trying to edit an application while not being its owner.
+#: actions/deleteapplication.php:79 actions/editapplication.php:78

 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "このアプリケーションのオーナーではありません。"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "このアプリケーションのオーナーではありません。"
 
 #. TRANS: Client error text when there is a problem with the session token.

-#: actions/deleteapplication.php:102 actions/editapplication.php:127
-#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1307
+#: actions/deleteapplication.php:102 actions/editapplication.php:131
+#: actions/newapplication.php:114 actions/showapplication.php:118
+#: lib/action.php:1409

 msgid "There was a problem with your session token."
 msgstr "あなたのセッショントークンに関する問題がありました。"
 
 msgid "There was a problem with your session token."
 msgstr "あなたのセッショントークンに関する問題がありました。"
 

-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149

 msgid "Delete application"
 msgstr "アプリケーション削除"
 
 msgid "Delete application"
 msgstr "アプリケーション削除"
 

-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152

 #, fuzzy
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "


@@ -1046,31 +1513,94 @@ msgstr ""
 "ベースからユーザに関するすべてのデータをクリアします。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 "ベースからユーザに関するすべてのデータをクリアします。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.

-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161

 msgid "Do not delete this application"
 msgstr "このアプリケーションを削除しないでください"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 msgid "Do not delete this application"
 msgstr "このアプリケーションを削除しないでください"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.

-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167

 msgid "Delete this application"
 msgstr "このアプリケーションを削除"
 
 msgid "Delete this application"
 msgstr "このアプリケーションを削除"
 

+#. TRANS: Client error when trying to delete group while not logged in.
+#: actions/deletegroup.php:64
+#, fuzzy
+msgid "You must be logged in to delete a group."
+msgstr "グループから離れるにはログインしていなければなりません。"
+
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No nickname or ID."
+msgstr "ニックネームがありません。"
+
+#. TRANS: Client error when trying to delete a group without having the rights to delete it.
+#: actions/deletegroup.php:107
+#, fuzzy
+msgid "You are not allowed to delete this group."
+msgstr "このグループのメンバーではありません。"
+
+#. TRANS: Server error displayed if a group could not be deleted.
+#. TRANS: %s is the name of the group that could not be deleted.
+#: actions/deletegroup.php:150
+#, fuzzy, php-format
+msgid "Could not delete group %s."
+msgstr "グループを更新できません。"
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s はグループ %2$s に残りました。"
+
+#. TRANS: Title of delete group page.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "ユーザ削除"
+
+#. TRANS: Warning in form for deleleting a group.
+#: actions/deletegroup.php:206
+#, fuzzy
+msgid ""
+"Are you sure you want to delete this group? This will clear all data about "
+"the group from the database, without a backup. Public posts to this group "
+"will still appear in individual timelines."
+msgstr ""
+"あなたは本当にこのユーザを削除したいですか? これはバックアップなしでデータ"
+"ベースからユーザに関するすべてのデータをクリアします。"
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "このつぶやきを削除できません。"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "このユーザを削除"
+
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying a change a subscription while not logged in.

 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.

-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96

 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ログインしていません。"
 
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ログインしていません。"
 

-#: actions/deletenotice.php:74
-msgid "Can't delete this notice."
-msgstr "このつぶやきを削除できません。"
-
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110

 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."


@@ -1078,21 +1608,24 @@ msgstr ""
 "あなたはつぶやきを永久に削除しようとしています。 これが完了するとそれを元に戻"
 "すことはできません。"
 
 "あなたはつぶやきを永久に削除しようとしています。 これが完了するとそれを元に戻"
 "すことはできません。"
 

-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148

 msgid "Delete notice"
 msgstr "つぶやき削除"
 
 msgid "Delete notice"
 msgstr "つぶやき削除"
 

-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152

 msgid "Are you sure you want to delete this notice?"
 msgstr "本当にこのつぶやきを削除しますか？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 msgid "Are you sure you want to delete this notice?"
 msgstr "本当にこのつぶやきを削除しますか？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.

-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159

 msgid "Do not delete this notice"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 msgid "Do not delete this notice"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.

-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:672

 msgid "Delete this notice"
 msgstr "このつぶやきを削除"
 
 msgid "Delete this notice"
 msgstr "このつぶやきを削除"
 


@@ -1131,54 +1664,66 @@ msgstr "デザイン"
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 msgid "Design settings for this StatusNet site"
 msgstr ""
 

-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:335

 msgid "Invalid logo URL."
 msgstr "不正なロゴ URL"
 
 msgid "Invalid logo URL."
 msgstr "不正なロゴ URL"
 

-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:340
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "不正なロゴ URL"
+
+#: actions/designadminpanel.php:344

 #, php-format
 msgid "Theme not available: %s."
 msgstr "ＩＭ が利用不可。"
 
 #, php-format
 msgid "Theme not available: %s."
 msgstr "ＩＭ が利用不可。"
 

-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:448

 msgid "Change logo"
 msgstr "ロゴの変更"
 
 msgid "Change logo"
 msgstr "ロゴの変更"
 

-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:453

 msgid "Site logo"
 msgstr "サイトロゴ"
 
 msgid "Site logo"
 msgstr "サイトロゴ"
 

-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:457
+#, fuzzy
+msgid "SSL logo"
+msgstr "サイトロゴ"
+
+#: actions/designadminpanel.php:469

 msgid "Change theme"
 msgstr "テーマ変更"
 
 msgid "Change theme"
 msgstr "テーマ変更"
 

-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:486

 msgid "Site theme"
 msgstr "サイトテーマ"
 
 msgid "Site theme"
 msgstr "サイトテーマ"
 

-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:487

 msgid "Theme for the site."
 msgstr "サイトのテーマ"
 
 msgid "Theme for the site."
 msgstr "サイトのテーマ"
 

-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:493

 #, fuzzy
 msgid "Custom theme"
 msgstr "サイトテーマ"
 
 #, fuzzy
 msgid "Custom theme"
 msgstr "サイトテーマ"
 

-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:497

 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 

-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#. TRANS: Fieldset legend on profile design page.
+#: actions/designadminpanel.php:512 lib/designsettings.php:98

 msgid "Change background image"
 msgstr "バックグラウンドイメージの変更"
 
 msgid "Change background image"
 msgstr "バックグラウンドイメージの変更"
 

-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
-#: lib/designsettings.php:178
+#. TRANS: Label on profile design page for setting a profile page background colour.
+#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: lib/designsettings.php:183

 msgid "Background"
 msgstr "バックグラウンド"
 
 msgid "Background"
 msgstr "バックグラウンド"
 

-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:522

 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"


@@ -1188,76 +1733,84 @@ msgstr ""
 "イズは %1$s。"
 
 #. TRANS: Used as radio button label to add a background image.
 "イズは %1$s。"
 
 #. TRANS: Used as radio button label to add a background image.

-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:553

 msgid "On"
 msgstr "オン"
 
 #. TRANS: Used as radio button label to not add a background image.
 msgid "On"
 msgstr "オン"
 
 #. TRANS: Used as radio button label to not add a background image.

-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:570

 msgid "Off"
 msgstr "オフ"
 
 msgid "Off"
 msgstr "オフ"
 

-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
+#. TRANS: use of the uploaded profile image.
+#: actions/designadminpanel.php:571 lib/designsettings.php:159

 msgid "Turn background image on or off."
 msgstr "バックグラウンドイメージのオンまたはオフ。"
 
 msgid "Turn background image on or off."
 msgstr "バックグラウンドイメージのオンまたはオフ。"
 

-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
+#: actions/designadminpanel.php:576 lib/designsettings.php:165

 msgid "Tile background image"
 msgstr "タイルバックグラウンドイメージ"
 
 msgid "Tile background image"
 msgstr "タイルバックグラウンドイメージ"
 

-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: actions/designadminpanel.php:590 lib/designsettings.php:175

 msgid "Change colours"
 msgstr "色の変更"
 
 msgid "Change colours"
 msgstr "色の変更"
 

-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#. TRANS: Label on profile design page for setting a profile page content colour.
+#: actions/designadminpanel.php:613 lib/designsettings.php:197

 msgid "Content"
 msgstr "内容"
 
 msgid "Content"
 msgstr "内容"
 

-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#. TRANS: Label on profile design page for setting a profile page sidebar colour.
+#: actions/designadminpanel.php:626 lib/designsettings.php:211

 msgid "Sidebar"
 msgstr "サイドバー"
 
 msgid "Sidebar"
 msgstr "サイドバー"
 

-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#. TRANS: Label on profile design page for setting a profile page text colour.
+#: actions/designadminpanel.php:639 lib/designsettings.php:225

 msgid "Text"
 msgstr "テキスト"
 
 msgid "Text"
 msgstr "テキスト"
 

-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#. TRANS: Label on profile design page for setting a profile page links colour.
+#: actions/designadminpanel.php:652 lib/designsettings.php:239

 msgid "Links"
 msgstr "リンク"
 
 msgid "Links"
 msgstr "リンク"
 

-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:677

 msgid "Advanced"
 msgstr ""
 
 msgid "Advanced"
 msgstr ""
 

-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:681

 msgid "Custom CSS"
 msgstr ""
 
 msgid "Custom CSS"
 msgstr ""
 

-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: actions/designadminpanel.php:702 lib/designsettings.php:257

 msgid "Use defaults"
 msgstr "デフォルトを使用"
 
 msgid "Use defaults"
 msgstr "デフォルトを使用"
 

-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:703 lib/designsettings.php:259

 msgid "Restore default designs"
 msgstr "デフォルトデザインに戻す。"
 
 msgid "Restore default designs"
 msgstr "デフォルトデザインに戻す。"
 

-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:709 lib/designsettings.php:267

 msgid "Reset back to default"
 msgstr "デフォルトへリセットする"
 
 #. TRANS: Submit button title.
 msgid "Reset back to default"
 msgstr "デフォルトへリセットする"
 
 #. TRANS: Submit button title.

-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
-#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:295
-#: lib/applicationeditform.php:357 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
+#: lib/applicationeditform.php:357

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:712 lib/designsettings.php:272

 msgid "Save design"
 msgstr "デザインの保存"
 
 msgid "Save design"
 msgstr "デザインの保存"
 


@@ -1274,109 +1827,131 @@ msgstr "お気に入りに加える"
 msgid "No such document \"%s\""
 msgstr "そのようなドキュメントはありません。\"%s\""
 
 msgid "No such document \"%s\""
 msgstr "そのようなドキュメントはありません。\"%s\""
 

-#: actions/editapplication.php:54
-msgid "Edit Application"
+#. TRANS: Title for "Edit application" form.
+#. TRANS: Form legend.
+#: actions/editapplication.php:54 lib/applicationeditform.php:129
+msgid "Edit application"

 msgstr "アプリケーション編集"
 
 msgstr "アプリケーション編集"
 

+#. TRANS: Client error displayed trying to edit an application while not logged in.

 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "アプリケーションを編集するにはログインしていなければなりません。"
 
 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "アプリケーションを編集するにはログインしていなければなりません。"
 

-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
+#. TRANS: Client error displayed trying to edit an application that does not exist.
+#: actions/editapplication.php:83 actions/showapplication.php:87

 msgid "No such application."
 msgstr "そのようなアプリケーションはありません。"
 
 msgid "No such application."
 msgstr "そのようなアプリケーションはありません。"
 

-#: actions/editapplication.php:161
+#. TRANS: Instructions for "Edit application" form.
+#: actions/editapplication.php:167

 msgid "Use this form to edit your application."
 msgstr "このフォームを使ってアプリケーションを編集します。"
 
 msgid "Use this form to edit your application."
 msgstr "このフォームを使ってアプリケーションを編集します。"
 

-#: actions/editapplication.php:177 actions/newapplication.php:159
+#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
+#: actions/editapplication.php:184 actions/newapplication.php:163

 msgid "Name is required."
 msgstr "名前は必須です。"
 
 msgid "Name is required."
 msgstr "名前は必須です。"
 

-#: actions/editapplication.php:180 actions/newapplication.php:165
-msgid "Name is too long (max 255 chars)."
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."

 msgstr "名前が長すぎます。（最大255字まで）"
 
 msgstr "名前が長すぎます。（最大255字まで）"
 

-#: actions/editapplication.php:183 actions/newapplication.php:162
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
+#: actions/editapplication.php:192 actions/newapplication.php:166

 msgid "Name already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
 msgid "Name already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 

-#: actions/editapplication.php:186 actions/newapplication.php:168
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#: actions/editapplication.php:196 actions/newapplication.php:172

 msgid "Description is required."
 msgstr "概要が必要です。"
 
 msgid "Description is required."
 msgstr "概要が必要です。"
 

-#: actions/editapplication.php:194
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+#: actions/editapplication.php:208

 msgid "Source URL is too long."
 msgstr "ソースＵＲＬが長すぎます。"
 
 msgid "Source URL is too long."
 msgstr "ソースＵＲＬが長すぎます。"
 

-#: actions/editapplication.php:200 actions/newapplication.php:185
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#: actions/editapplication.php:215 actions/newapplication.php:193

 msgid "Source URL is not valid."
 msgstr "ソースＵＲＬが不正です。"
 
 msgid "Source URL is not valid."
 msgstr "ソースＵＲＬが不正です。"
 

-#: actions/editapplication.php:203 actions/newapplication.php:188
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#: actions/editapplication.php:219 actions/newapplication.php:196

 msgid "Organization is required."
 msgstr "組織が必要です。"
 
 msgid "Organization is required."
 msgstr "組織が必要です。"
 

-#: actions/editapplication.php:206 actions/newapplication.php:191
-msgid "Organization is too long (max 255 chars)."
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+#: actions/editapplication.php:223 actions/newapplication.php:199
+#, fuzzy
+msgid "Organization is too long (maximum 255 characters)."

 msgstr "組織が長すぎます。（最大255字）"
 
 msgstr "組織が長すぎます。（最大255字）"
 

-#: actions/editapplication.php:209 actions/newapplication.php:194
+#: actions/editapplication.php:226 actions/newapplication.php:202

 msgid "Organization homepage is required."
 msgstr "組織のホームページが必要です。"
 
 msgid "Organization homepage is required."
 msgstr "組織のホームページが必要です。"
 

-#: actions/editapplication.php:218 actions/newapplication.php:206
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#: actions/editapplication.php:237 actions/newapplication.php:214

 msgid "Callback is too long."
 msgstr "コールバックが長すぎます。"
 
 msgid "Callback is too long."
 msgstr "コールバックが長すぎます。"
 

-#: actions/editapplication.php:225 actions/newapplication.php:215
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#: actions/editapplication.php:245 actions/newapplication.php:223

 msgid "Callback URL is not valid."
 msgstr "コールバックURLが不正です。"
 
 msgid "Callback URL is not valid."
 msgstr "コールバックURLが不正です。"
 

-#: actions/editapplication.php:261
+#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
+#: actions/editapplication.php:282

 msgid "Could not update application."
 msgstr "アプリケーションを更新できません。"
 
 msgid "Could not update application."
 msgstr "アプリケーションを更新できません。"
 

-#: actions/editgroup.php:56
+#. TRANS: Title for form to edit a group. %s is a group nickname.
+#: actions/editgroup.php:55

 #, php-format
 msgid "Edit %s group"
 msgstr "%s グループを編集"
 
 #, php-format
 msgid "Edit %s group"
 msgstr "%s グループを編集"
 

+#. TRANS: Client error displayed trying to edit a group while not logged in.
+#. TRANS: Client error displayed trying to create a group while not logged in.

 #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "グループを作るにはログインしていなければなりません。"
 
 #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "グループを作るにはログインしていなければなりません。"
 

-#: actions/editgroup.php:107 actions/editgroup.php:172
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#: actions/editgroup.php:110 actions/editgroup.php:176

 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
 msgstr "グループを編集するには管理者である必要があります。"
 
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
 msgstr "グループを編集するには管理者である必要があります。"
 

-#: actions/editgroup.php:158
+#. TRANS: Form instructions for group edit form.
+#: actions/editgroup.php:161

 msgid "Use this form to edit the group."
 msgstr "このフォームを使ってグループを編集します。"
 
 msgid "Use this form to edit the group."
 msgstr "このフォームを使ってグループを編集します。"
 

-#: actions/editgroup.php:205 actions/newgroup.php:145
-#, php-format
-msgid "description is too long (max %d chars)."
-msgstr "記述が長すぎます。（最長 %d 字）"
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/editgroup.php:239 actions/newgroup.php:179

 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "不正な別名: \"%s\""
 
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "不正な別名: \"%s\""
 

-#: actions/editgroup.php:258
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/editgroup.php:272

 msgid "Could not update group."
 msgstr "グループを更新できません。"
 
 msgid "Could not update group."
 msgstr "グループを更新できません。"
 

+#. TRANS: Server error displayed when group aliases could not be added.

 #. TRANS: Server exception thrown when creating group aliases failed.
 #. TRANS: Server exception thrown when creating group aliases failed.

-#: actions/editgroup.php:264 classes/User_group.php:513
+#: actions/editgroup.php:279 classes/User_group.php:529

 msgid "Could not create aliases."
 msgstr "別名を作成できません。"
 
 msgid "Could not create aliases."
 msgstr "別名を作成できません。"
 

-#: actions/editgroup.php:280
+#. TRANS: Group edit form success message.
+#: actions/editgroup.php:296

 msgid "Options saved."
 msgstr "オプションが保存されました。"
 
 msgid "Options saved."
 msgstr "オプションが保存されました。"
 


@@ -1423,17 +1998,6 @@ msgstr ""
 "このアドレスは承認待ちです。受信ボックス（とスパムボックス）に追加の指示が書"
 "かれたメッセージが届いていないか確認してください。"
 
 "このアドレスは承認待ちです。受信ボックス（とスパムボックス）に追加の指示が書"
 "かれたメッセージが届いていないか確認してください。"
 

-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label in the "Edit application" form.
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:351
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "中止"
-

 #. TRANS: Instructions for e-mail address input form. Do not translate
 #. TRANS: "example.org". It is one of the domain names reserved for
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Instructions for e-mail address input form. Do not translate
 #. TRANS: "example.org". It is one of the domain names reserved for
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.


@@ -1485,85 +2049,85 @@ msgid "Email preferences"
 msgstr "メールアドレス"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgstr "メールアドレス"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:184
+#: actions/emailsettings.php:186

 msgid "Send me notices of new subscriptions through email."
 msgstr "メールで新規フォローの通知を私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me notices of new subscriptions through email."
 msgstr "メールで新規フォローの通知を私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:190
+#: actions/emailsettings.php:192

 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "だれかがお気に入りとして私のつぶやきを加えたら、メールを私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "だれかがお気に入りとして私のつぶやきを加えたら、メールを私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:197
+#: actions/emailsettings.php:199

 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "だれかがプライベート・メッセージを私に送るときには、メールを私に送ってくださ"
 "い。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "だれかがプライベート・メッセージを私に送るときには、メールを私に送ってくださ"
 "い。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:203
+#: actions/emailsettings.php:205

 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:209
+#: actions/emailsettings.php:211

 msgid "Allow friends to nudge me and send me an email."
 msgstr "友達が私に合図とメールを送ることを許可する。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Allow friends to nudge me and send me an email."
 msgstr "友達が私に合図とメールを送ることを許可する。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:218

 msgid "I want to post notices by email."
 msgstr "メールでつぶやきを投稿したい。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "I want to post notices by email."
 msgstr "メールでつぶやきを投稿したい。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:223
+#: actions/emailsettings.php:225

 msgid "Publish a MicroID for my email address."
 msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 msgid "Publish a MicroID for my email address."
 msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.

-#: actions/emailsettings.php:338
+#: actions/emailsettings.php:346

 #, fuzzy
 msgid "Email preferences saved."
 msgstr "デザイン設定が保存されました。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "デザイン設定が保存されました。"
 
 #. TRANS: Message given saving e-mail address without having provided one.

-#: actions/emailsettings.php:357
+#: actions/emailsettings.php:366

 msgid "No email address."
 msgstr "メールアドレスがありません。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 msgid "No email address."
 msgstr "メールアドレスがありません。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.

-#: actions/emailsettings.php:365
+#: actions/emailsettings.php:374

 msgid "Cannot normalize that email address"
 msgstr "そのメールアドレスを正規化できません"
 
 #. TRANS: Message given saving e-mail address that not valid.
 msgid "Cannot normalize that email address"
 msgstr "そのメールアドレスを正規化できません"
 
 #. TRANS: Message given saving e-mail address that not valid.

-#: actions/emailsettings.php:370 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212

 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
 
 #. TRANS: Message given saving e-mail address that is already set.
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
 
 #. TRANS: Message given saving e-mail address that is already set.

-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:383

 msgid "That is already your email address."
 msgstr "これはすでにあなたのメールアドレスです。"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 msgid "That is already your email address."
 msgstr "これはすでにあなたのメールアドレスです。"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.

-#: actions/emailsettings.php:378
+#: actions/emailsettings.php:387

 msgid "That email address already belongs to another user."
 msgstr "このメールアドレスは既に他の人が使っています。"
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 msgid "That email address already belongs to another user."
 msgstr "このメールアドレスは既に他の人が使っています。"
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.

-#: actions/emailsettings.php:395 actions/imsettings.php:351
+#: actions/emailsettings.php:404 actions/imsettings.php:351

 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "承認コードを追加できません"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "承認コードを追加できません"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.

-#: actions/emailsettings.php:402
+#: actions/emailsettings.php:411

 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."


@@ -1575,51 +2139,57 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.

-#: actions/emailsettings.php:423 actions/imsettings.php:386
+#: actions/emailsettings.php:432 actions/imsettings.php:386

 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.

-#: actions/emailsettings.php:428
+#: actions/emailsettings.php:437

 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "その IM アドレスは不正です。"
 
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "その IM アドレスは不正です。"
 

+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/emailsettings.php:446 actions/smssettings.php:422
+msgid "Couldn't delete email confirmation."
+msgstr "メール承認を削除できません"
+

 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

-#: actions/emailsettings.php:442
+#: actions/emailsettings.php:451

 msgid "Email confirmation cancelled."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
 msgid "Email confirmation cancelled."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.

-#: actions/emailsettings.php:462
+#: actions/emailsettings.php:471

 msgid "That is not your email address."
 msgstr "これはあなたのメールアドレスではありません。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 msgid "That is not your email address."
 msgstr "これはあなたのメールアドレスではありません。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.

-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:492

 msgid "The email address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 msgid "The email address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 

-#: actions/emailsettings.php:497 actions/smssettings.php:568
+#: actions/emailsettings.php:506 actions/smssettings.php:568

 msgid "No incoming email address."
 msgstr "入ってくるメールアドレスではありません。"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 msgid "No incoming email address."
 msgstr "入ってくるメールアドレスではありません。"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.

-#: actions/emailsettings.php:508 actions/emailsettings.php:532
+#: actions/emailsettings.php:517 actions/emailsettings.php:541

 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.

-#: actions/emailsettings.php:512 actions/smssettings.php:581
+#: actions/emailsettings.php:521 actions/smssettings.php:581

 msgid "Incoming email address removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 msgid "Incoming email address removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.

-#: actions/emailsettings.php:536 actions/smssettings.php:605
+#: actions/emailsettings.php:545 actions/smssettings.php:605

 msgid "New incoming email address added."
 msgstr "新しい入ってくるメールアドレスが追加されました。"
 
 msgid "New incoming email address added."
 msgstr "新しい入ってくるメールアドレスが追加されました。"
 


@@ -1631,7 +2201,7 @@ msgstr "このつぶやきはすでにお気に入りです!"
 msgid "Disfavor favorite"
 msgstr "お気に入りをやめる"
 
 msgid "Disfavor favorite"
 msgstr "お気に入りをやめる"
 

-#: actions/favorited.php:65 lib/popularnoticesection.php:91
+#: actions/favorited.php:65 lib/popularnoticesection.php:62

 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "人気のつぶやき"
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgstr "人気のつぶやき"


@@ -1669,7 +2239,7 @@ msgstr ""
 "気に入りにつぶやきを加える最初になりましょう!"
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
 "気に入りにつぶやきを加える最初になりましょう!"
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77

-#: lib/personalgroupnav.php:115
+#: lib/personalgroupnav.php:118

 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s のお気に入りのつぶやき"
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s のお気に入りのつぶやき"


@@ -1739,7 +2309,7 @@ msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 "リモートサービスは、不明なバージョンの OMB プロトコルを使用しています。"
 
 msgstr ""
 "リモートサービスは、不明なバージョンの OMB プロトコルを使用しています。"
 

-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317

 #, fuzzy
 msgid "Error updating remote profile."
 msgstr "リモートプロファイル更新エラー"
 #, fuzzy
 msgid "Error updating remote profile."
 msgstr "リモートプロファイル更新エラー"


@@ -1771,19 +2341,23 @@ msgstr "あなたはこのサイトのサンドボックスユーザができま
 msgid "User already has this role."
 msgstr "ユーザは既に黙っています。"
 
 msgid "User already has this role."
 msgstr "ユーザは既に黙っています。"
 

+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.

 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/groupblock.php:71 actions/groupunblock.php:71

-#: actions/makeadmin.php:71 actions/subedit.php:46
+#: actions/makeadmin.php:71 actions/subedit.php:49

 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "プロファイル記述がありません。"
 
 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr "プロファイル記述がありません。"
 

-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#: actions/groupblock.php:76 actions/groupunblock.php:77
+#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46

 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr "そのＩＤのプロファイルがありません。"
 
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr "そのＩＤのプロファイルがありません。"
 

-#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/groupblock.php:81 actions/groupunblock.php:82

 #: actions/makeadmin.php:81
 msgid "No group specified."
 msgstr "グループ記述がありません。"
 #: actions/makeadmin.php:81
 msgid "No group specified."
 msgstr "グループ記述がありません。"


@@ -1848,8 +2422,10 @@ msgstr ""
 "あなたが選んだパレットの色とバックグラウンドイメージであなたのグループをカス"
 "タマイズしてください。"
 
 "あなたが選んだパレットの色とバックグラウンドイメージであなたのグループをカス"
 "タマイズしてください。"
 

+#. TRANS: Error message displayed if design settings could not be saved.
+#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".

 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186

-#: lib/designsettings.php:391 lib/designsettings.php:413
+#: lib/designsettings.php:405 lib/designsettings.php:427

 msgid "Couldn't update your design."
 msgstr "あなたのデザインを更新できません。"
 
 msgid "Couldn't update your design."
 msgstr "あなたのデザインを更新できません。"
 


@@ -1869,6 +2445,14 @@ msgstr ""
 "あなたのグループ用にロゴイメージをアップロードできます。最大ファイルサイズは "
 "%s。"
 
 "あなたのグループ用にロゴイメージをアップロードできます。最大ファイルサイズは "
 "%s。"
 

+#: actions/grouplogo.php:236
+msgid "Upload"
+msgstr "アップロード"
+
+#: actions/grouplogo.php:289
+msgid "Crop"
+msgstr "切り取り"
+

 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr "ロゴとなるイメージの正方形を選択。"
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr "ロゴとなるイメージの正方形を選択。"


@@ -1931,15 +2515,6 @@ msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 msgstr ""
 
 msgid "Make this user an admin"
 msgstr ""
 

-#. TRANS: Message is used as link title. %s is a user nickname.
-#. TRANS: Title in atom group notice feed. %s is a group name.
-#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:68
-#, php-format
-msgid "%s timeline"
-msgstr "%s のタイムライン"
-

 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
 #, php-format
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
 #, php-format


@@ -2011,15 +2586,18 @@ msgstr ""
 "なぜ[アカウント登録](%%action.register%%) や [グループ作成](%%action.newgroup"
 "%%) しないのか!"
 
 "なぜ[アカウント登録](%%action.register%%) や [グループ作成](%%action.newgroup"
 "%%) しないのか!"
 

-#: actions/groupunblock.php:91
+#. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
+#: actions/groupunblock.php:94

 msgid "Only an admin can unblock group members."
 msgstr "管理者だけがグループメンバーをアンブロックできます。"
 
 msgid "Only an admin can unblock group members."
 msgstr "管理者だけがグループメンバーをアンブロックできます。"
 

-#: actions/groupunblock.php:95
+#. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
+#: actions/groupunblock.php:99

 msgid "User is not blocked from group."
 msgstr "ユーザはグループからブロックされていません。"
 
 msgid "User is not blocked from group."
 msgstr "ユーザはグループからブロックされていません。"
 

-#: actions/groupunblock.php:128 actions/unblock.php:86
+#. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#: actions/groupunblock.php:131 actions/unblock.php:86

 msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
 
 msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
 


@@ -2108,7 +2686,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful IM preferences save.
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful IM preferences save.

-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190

 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 


@@ -2190,51 +2768,78 @@ msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "これはあなたの受信箱です、やってきたプライベートメッセージをリストします。"
 
 msgstr ""
 "これはあなたの受信箱です、やってきたプライベートメッセージをリストします。"
 

-#: actions/invite.php:39
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+#: actions/invite.php:40

 msgid "Invites have been disabled."
 msgstr "招待は無効にされました。"
 
 msgid "Invites have been disabled."
 msgstr "招待は無効にされました。"
 

-#: actions/invite.php:41
+#. TRANS: Client error displayed when trying to sent invites while not logged in.
+#. TRANS: %s is the StatusNet site name.
+#: actions/invite.php:44

 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "グループを編集するにはログインしていなければなりません。"
 
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "グループを編集するにはログインしていなければなりません。"
 

-#: actions/invite.php:72
-#, php-format
-msgid "Invalid email address: %s"
+#. TRANS: Form validation message when providing an e-mail address that does not validate.
+#. TRANS: %s is an invalid e-mail address.
+#: actions/invite.php:77
+#, fuzzy, php-format
+msgid "Invalid email address: %s."

 msgstr "不正なメールアドレス：%s'"
 
 msgstr "不正なメールアドレス：%s'"
 

-#: actions/invite.php:110
-msgid "Invitation(s) sent"
+#. TRANS: Page title when invitations have been sent.
+#: actions/invite.php:116
+#, fuzzy
+msgid "Invitations sent"

 msgstr "招待を送りました。"
 
 msgstr "招待を送りました。"
 

-#: actions/invite.php:112
+#. TRANS: Page title when inviting potential users.
+#: actions/invite.php:119

 msgid "Invite new users"
 msgstr "新しいユーザを招待"
 
 msgid "Invite new users"
 msgstr "新しいユーザを招待"
 

-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr "すでにこれらのユーザをフォローしています:"
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. TRANS: is already subscribed to one or more users with the given e-mail address(es).
+#. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
+#. TRANS: Followed by a bullet list.
+#: actions/invite.php:139
+#, fuzzy
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] "すでにこれらのユーザをフォローしています:"

 
 

-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:426
-#, php-format
+#. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
+#. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"

 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 

-#: actions/invite.php:136
-msgid ""
+#. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
+#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
+#. TRANS: reported already present people. Followed by a bullet list.
+#: actions/invite.php:153
+#, fuzzy
+msgid "This person is already a user and you were automatically subscribed:"
+msgid_plural ""

 "These people are already users and you were automatically subscribed to them:"
 "These people are already users and you were automatically subscribed to them:"

-msgstr ""
+msgstr[0] ""

 "これらの人々は既にユーザです、そして、あなたは自動的に彼らにフォローされまし"
 "た:"
 
 "これらの人々は既にユーザです、そして、あなたは自動的に彼らにフォローされまし"
 "た:"
 

-#: actions/invite.php:144
-msgid "Invitation(s) sent to the following people:"
-msgstr "招待を以下の人々に送信しました:"
+#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
+#. TRANS: based on the number of invitations sent. Followed by a bullet list of
+#. TRANS: e-mail addresses to which invitations were sent.
+#: actions/invite.php:167
+#, fuzzy
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] "招待を以下の人々に送信しました:"

 
 

-#: actions/invite.php:150
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+#: actions/invite.php:177

 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"


@@ -2242,43 +2847,54 @@ msgstr ""
 "あなたの招待参加者が招待に応じて、サイトに登録すると、あなたに通知されるで"
 "しょう。 コミュニティを広げてくださってありがとうございます!"
 
 "あなたの招待参加者が招待に応じて、サイトに登録すると、あなたに通知されるで"
 "しょう。 コミュニティを広げてくださってありがとうございます!"
 

-#: actions/invite.php:162
+#. TRANS: Form instructions.
+#: actions/invite.php:190

 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "友人や同僚がこのサービスを利用するようこのフォームを使用して誘ってください。"
 
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 "友人や同僚がこのサービスを利用するようこのフォームを使用して誘ってください。"
 

-#: actions/invite.php:187
+#. TRANS: Field label for a list of e-mail addresses.
+#: actions/invite.php:217

 msgid "Email addresses"
 msgstr "メールアドレス"
 
 msgid "Email addresses"
 msgstr "メールアドレス"
 

-#: actions/invite.php:189
+#. TRANS: Tooltip for field label for a list of e-mail addresses.
+#: actions/invite.php:220

 msgid "Addresses of friends to invite (one per line)"
 msgstr "招待する友人のアドレス (一行に一つ)"
 
 msgid "Addresses of friends to invite (one per line)"
 msgstr "招待する友人のアドレス (一行に一つ)"
 

-#: actions/invite.php:192
+#. TRANS: Field label for a personal message to send to invitees.
+#: actions/invite.php:224

 msgid "Personal message"
 msgstr "パーソナルメッセージ"
 
 msgid "Personal message"
 msgstr "パーソナルメッセージ"
 

-#: actions/invite.php:194
+#. TRANS: Tooltip for field label for a personal message to send to invitees.
+#: actions/invite.php:227

 msgid "Optionally add a personal message to the invitation."
 msgstr "任意に招待にパーソナルメッセージを加えてください。"
 
 #. TRANS: Send button for inviting friends
 msgid "Optionally add a personal message to the invitation."
 msgstr "任意に招待にパーソナルメッセージを加えてください。"
 
 #. TRANS: Send button for inviting friends

-#: actions/invite.php:198
+#: actions/invite.php:231

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "投稿"
 
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "投稿"
 

-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
+#. TRANS: the StatusNet sitename.
+#: actions/invite.php:263

 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s があなたを %2$s へ招待しました"
 
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s があなたを %2$s へ招待しました"
 

-#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:231
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, %2$s is the
+#. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
+#. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
+#. TRANS: to register with the StatusNet site.
+#: actions/invite.php:270

 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"


@@ -2339,11 +2955,6 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "グループに入るためにはログインしなければなりません。"
 
 msgid "You must be logged in to join a group."
 msgstr "グループに入るためにはログインしなければなりません。"
 

-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "ニックネームがありません。"
-

 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"


@@ -2367,11 +2978,11 @@ msgstr "%1$s はグループ %2$s に残りました。"
 #: actions/licenseadminpanel.php:56
 msgctxt "TITLE"
 msgid "License"
 #: actions/licenseadminpanel.php:56
 msgctxt "TITLE"
 msgid "License"

-msgstr ""
+msgstr "ライセンス"

 
 #: actions/licenseadminpanel.php:67
 msgid "License for this StatusNet site"
 
 #: actions/licenseadminpanel.php:67
 msgid "License for this StatusNet site"

-msgstr ""
+msgstr "このStatusNetサイトのライセンス"

 
 #: actions/licenseadminpanel.php:139
 msgid "Invalid license selection."
 
 #: actions/licenseadminpanel.php:139
 msgid "Invalid license selection."


@@ -2384,8 +2995,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
 msgstr ""
 
 #: actions/licenseadminpanel.php:156

-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "不正なウェルカムテキスト。最大長は255字です。"

 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."


@@ -2487,11 +3099,11 @@ msgstr "ログイン"
 msgid "Login to site"
 msgstr "サイトへログイン"
 
 msgid "Login to site"
 msgstr "サイトへログイン"
 

-#: actions/login.php:258 actions/register.php:485
+#: actions/login.php:258 actions/register.php:491

 msgid "Remember me"
 msgstr "ログイン状態を保持"
 
 msgid "Remember me"
 msgstr "ログイン状態を保持"
 

-#: actions/login.php:259 actions/register.php:487
+#: actions/login.php:259 actions/register.php:493

 msgid "Automatically login in the future; not for shared computers!"
 msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 


@@ -2543,73 +3155,77 @@ msgstr "%1$s をグループ %2$s の管理者にすることはできません"
 msgid "No current status."
 msgstr "結果なし。"
 
 msgid "No current status."
 msgstr "結果なし。"
 

+#. TRANS: This is the title of the form for adding a new application.

 #: actions/newapplication.php:52
 #: actions/newapplication.php:52

-msgid "New Application"
+msgid "New application"

 msgstr "新しいアプリケーション"
 
 msgstr "新しいアプリケーション"
 

-#: actions/newapplication.php:64
+#. TRANS: Client error displayed trying to add a new application while not logged in.
+#: actions/newapplication.php:65

 msgid "You must be logged in to register an application."
 msgstr "アプリケーションを登録するにはログインしていなければなりません。"
 
 msgid "You must be logged in to register an application."
 msgstr "アプリケーションを登録するにはログインしていなければなりません。"
 

-#: actions/newapplication.php:143
+#: actions/newapplication.php:147

 msgid "Use this form to register a new application."
 msgstr "このフォームを使って新しいアプリケーションを登録します。"
 
 msgid "Use this form to register a new application."
 msgstr "このフォームを使って新しいアプリケーションを登録します。"
 

-#: actions/newapplication.php:176
+#: actions/newapplication.php:184

 msgid "Source URL is required."
 msgstr "ソースURLが必要です。"
 
 msgid "Source URL is required."
 msgstr "ソースURLが必要です。"
 

-#: actions/newapplication.php:258 actions/newapplication.php:267
+#: actions/newapplication.php:266 actions/newapplication.php:275

 msgid "Could not create application."
 msgstr "アプリケーションを作成できません。"
 
 msgid "Could not create application."
 msgstr "アプリケーションを作成できません。"
 

+#. TRANS: Title for form to create a group.

 #: actions/newgroup.php:53
 msgid "New group"
 msgstr "新しいグループ"
 
 #: actions/newgroup.php:53
 msgid "New group"
 msgstr "新しいグループ"
 

+#. TRANS: Form instructions for group create form.

 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "このフォームを使って新しいグループを作成します。"
 
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "このフォームを使って新しいグループを作成します。"
 

-#: actions/newmessage.php:71 actions/newmessage.php:231
+#: actions/newmessage.php:71 actions/newmessage.php:234

 msgid "New message"
 msgstr "新しいメッセージ"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
 msgid "New message"
 msgstr "新しいメッセージ"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).

-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501

 msgid "You can't send a message to this user."
 msgstr "このユーザにメッセージを送ることはできません。"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 msgid "You can't send a message to this user."
 msgstr "このユーザにメッセージを送ることはできません。"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.

-#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:478
-#: lib/command.php:579
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
+#: lib/command.php:581

 msgid "No content!"
 msgstr "コンテンツがありません！"
 
 msgid "No content!"
 msgstr "コンテンツがありません！"
 

-#: actions/newmessage.php:158
+#: actions/newmessage.php:161

 msgid "No recipient specified."
 msgstr "受取人が書かれていません。"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
 msgid "No recipient specified."
 msgstr "受取人が書かれていません。"
 
 #. TRANS: Error text shown when trying to send a direct message to self.

-#: actions/newmessage.php:164 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505

 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "自分自身にメッセージを送ることはできません; かわりに独り言を言いましょう。"
 
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "自分自身にメッセージを送ることはできません; かわりに独り言を言いましょう。"
 

-#: actions/newmessage.php:181
+#: actions/newmessage.php:184

 msgid "Message sent"
 msgstr "メッセージを送りました"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
 msgid "Message sent"
 msgstr "メッセージを送りました"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.

-#: actions/newmessage.php:185 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513

 #, php-format
 msgid "Direct message to %s sent."
 msgstr "ダイレクトメッセージを %s  に送りました"
 
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "ダイレクトメッセージを %s  に送りました"
 

-#: actions/newmessage.php:210 actions/newnotice.php:261
+#: actions/newmessage.php:213 actions/newnotice.php:264

 msgid "Ajax Error"
 msgstr "Ajax エラー"
 
 msgid "Ajax Error"
 msgstr "Ajax エラー"
 


@@ -2617,7 +3233,7 @@ msgstr "Ajax エラー"
 msgid "New notice"
 msgstr "新しいつぶやき"
 
 msgid "New notice"
 msgstr "新しいつぶやき"
 

-#: actions/newnotice.php:227
+#: actions/newnotice.php:230

 msgid "Notice posted"
 msgstr "つぶやきを投稿しました"
 
 msgid "Notice posted"
 msgstr "つぶやきを投稿しました"
 


@@ -2669,7 +3285,8 @@ msgstr "\"%2$s\" 上の検索語 \"$1$s\" に一致するすべての更新"
 #: actions/nudge.php:85
 #, fuzzy
 msgid ""
 #: actions/nudge.php:85
 #, fuzzy
 msgid ""

-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."

 msgstr ""
 "このユーザは、合図を許可していないか、確認されていた状態でないか、メール設定"
 "をしていません。"
 msgstr ""
 "このユーザは、合図を許可していないか、確認されていた状態でないか、メール設定"
 "をしていません。"


@@ -2682,74 +3299,99 @@ msgstr "合図を送った"
 msgid "Nudge sent!"
 msgstr "合図を送った!"
 
 msgid "Nudge sent!"
 msgstr "合図を送った!"
 

-#: actions/oauthappssettings.php:59
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+#: actions/oauthappssettings.php:60

 msgid "You must be logged in to list your applications."
 msgstr "アプリケーションをリストするにはログインしていなければなりません。"
 
 msgid "You must be logged in to list your applications."
 msgstr "アプリケーションをリストするにはログインしていなければなりません。"
 

-#: actions/oauthappssettings.php:74
+#. TRANS: Page title for OAuth applications
+#: actions/oauthappssettings.php:76

 msgid "OAuth applications"
 msgstr "OAuth アプリケーション"
 
 msgid "OAuth applications"
 msgstr "OAuth アプリケーション"
 

-#: actions/oauthappssettings.php:85
+#. TRANS: Page instructions for OAuth applications
+#: actions/oauthappssettings.php:88

 msgid "Applications you have registered"
 msgstr "あなたが登録したアプリケーション"
 
 msgid "Applications you have registered"
 msgstr "あなたが登録したアプリケーション"
 

-#: actions/oauthappssettings.php:135
+#. TRANS: Empty list message on page with OAuth applications.
+#: actions/oauthappssettings.php:141

 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "あなたはまだなんのアプリケーションも登録していません。"
 
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr "あなたはまだなんのアプリケーションも登録していません。"
 

-#: actions/oauthconnectionssettings.php:72
+#. TRANS: Title for OAuth connection settings.
+#: actions/oauthconnectionssettings.php:71

 msgid "Connected applications"
 msgstr "接続されたアプリケーション"
 
 msgid "Connected applications"
 msgstr "接続されたアプリケーション"
 

+#. TRANS: Instructions for OAuth connection settings.

 #: actions/oauthconnectionssettings.php:83
 #: actions/oauthconnectionssettings.php:83

-msgid "You have allowed the following applications to access your account."
+msgid "The following connections exist for your account."

 msgstr ""
 
 msgstr ""
 

-#: actions/oauthconnectionssettings.php:175
+#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
+#: actions/oauthconnectionssettings.php:168

 msgid "You are not a user of that application."
 msgstr "あなたはそのアプリケーションのユーザではありません。"
 
 msgid "You are not a user of that application."
 msgstr "あなたはそのアプリケーションのユーザではありません。"
 

-#: actions/oauthconnectionssettings.php:186
+#. TRANS: Client error when revoking access has failed for some reason.
+#. TRANS: %s is the application ID revoking access failed for.
+#: actions/oauthconnectionssettings.php:183

 #, fuzzy, php-format
 #, fuzzy, php-format

-msgid "Unable to revoke access for app: %s."
+msgid "Unable to revoke access for application: %s."

 msgstr "アプリケーションのための取消しアクセスができません: "
 
 msgstr "アプリケーションのための取消しアクセスができません: "
 

-#: actions/oauthconnectionssettings.php:198
+#. TRANS: Success message after revoking access for an application.
+#. TRANS: %1$s is the application name, %2$s is the first part of the user token.
+#: actions/oauthconnectionssettings.php:202
+#, php-format
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."
+msgstr ""
+
+#. TRANS: Empty list message when no applications have been authorised yet.
+#: actions/oauthconnectionssettings.php:213

 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "あなたは、どんなアプリケーションもあなたのアカウントを使用するのを認可してい"
 "ません。"
 
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "あなたは、どんなアプリケーションもあなたのアカウントを使用するのを認可してい"
 "ません。"
 

-#: actions/oauthconnectionssettings.php:211
-msgid "Developers can edit the registration settings for their applications "
-msgstr "開発者は彼らのアプリケーションのために登録設定を編集できます "
+#. TRANS: Note for developers in the OAuth connection settings form.
+#. TRANS: This message contains a Markdown link. Do not separate "](".
+#. TRANS: %s is the URL to the OAuth settings.
+#: actions/oauthconnectionssettings.php:233
+#, php-format
+msgid ""
+"Are you a developer? [Register an OAuth client application](%s) to use with "
+"this instance of StatusNet."
+msgstr ""

 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 

-#: actions/oembed.php:87 actions/shownotice.php:176
+#: actions/oembed.php:83 actions/shownotice.php:172

 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%2$s における %1$s のステータス"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%2$s における %1$s のステータス"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')

-#: actions/oembed.php:159
+#: actions/oembed.php:168

 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "内容種別 "
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #, fuzzy, php-format
 msgid "Content type %s not supported."
 msgstr "内容種別 "
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.

-#: actions/oembed.php:163
+#: actions/oembed.php:172

 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.

-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1362

 msgid "Not a supported data format."
 msgstr "サポートされていないデータ形式。"
 
 msgid "Not a supported data format."
 msgstr "サポートされていないデータ形式。"
 


@@ -2761,36 +3403,46 @@ msgstr "ピープル検索"
 msgid "Notice Search"
 msgstr "つぶやき検索"
 
 msgid "Notice Search"
 msgstr "つぶやき検索"
 

-#: actions/othersettings.php:60
+#: actions/othersettings.php:59

 msgid "Other settings"
 msgstr "その他の設定"
 
 msgid "Other settings"
 msgstr "その他の設定"
 

+#. TRANS: Instructions for tab "Other" in user profile settings.

 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "他のオプションを管理。"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "他のオプションを管理。"
 

-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111

 msgid " (free service)"
 msgstr "(フリーサービス)"
 
 msgid " (free service)"
 msgstr "(フリーサービス)"
 

-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120

 msgid "Shorten URLs with"
 msgstr "URLを短くします"
 
 msgid "Shorten URLs with"
 msgstr "URLを短くします"
 

-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122

 msgid "Automatic shortening service to use."
 msgstr "使用する自動短縮サービス。"
 
 msgid "Automatic shortening service to use."
 msgstr "使用する自動短縮サービス。"
 

-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128

 msgid "View profile designs"
 msgstr "プロファイルデザインを表示"
 
 msgid "View profile designs"
 msgstr "プロファイルデザインを表示"
 

-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130

 msgid "Show or hide profile designs."
 msgstr "プロファイルデザインの表示または非表示"
 
 msgid "Show or hide profile designs."
 msgstr "プロファイルデザインの表示または非表示"
 

-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."

 msgstr "URL 短縮サービスが長すぎます。（最大50字）"
 
 #: actions/otp.php:69
 msgstr "URL 短縮サービスが長すぎます。（最大50字）"
 
 #: actions/otp.php:69


@@ -2854,7 +3506,7 @@ msgid "6 or more characters"
 msgstr "6文字以上"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
 msgstr "6文字以上"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239

-#: actions/register.php:440
+#: actions/register.php:441

 msgid "Confirm"
 msgstr "パスワード確認"
 
 msgid "Confirm"
 msgstr "パスワード確認"
 


@@ -2866,11 +3518,11 @@ msgstr "上と同じパスワード"
 msgid "Change"
 msgstr "変更"
 
 msgid "Change"
 msgstr "変更"
 

-#: actions/passwordsettings.php:154 actions/register.php:237
+#: actions/passwordsettings.php:154 actions/register.php:238

 msgid "Password must be 6 or more characters."
 msgstr "パスワードは6文字以上にする必要があります。"
 
 msgid "Password must be 6 or more characters."
 msgstr "パスワードは6文字以上にする必要があります。"
 

-#: actions/passwordsettings.php:157 actions/register.php:240
+#: actions/passwordsettings.php:157 actions/register.php:241

 msgid "Passwords don't match."
 msgstr "パスワードが一致しません。"
 
 msgid "Passwords don't match."
 msgstr "パスワードが一致しません。"
 


@@ -2890,156 +3542,291 @@ msgstr "新しいパスワードを保存できません。"
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 

+#. TRANS: Title for Paths admin panel.

 #. TRANS: Menu item for site administration
 #. TRANS: Menu item for site administration

-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
+#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371

 msgid "Paths"
 msgstr "パス"
 
 msgid "Paths"
 msgstr "パス"
 

-#: actions/pathsadminpanel.php:70
+#. TRANS: Form instructions for Path admin panel.
+#: actions/pathsadminpanel.php:69

 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 

-#: actions/pathsadminpanel.php:157
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the directory that could not be read from.
+#: actions/pathsadminpanel.php:155

 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "テーマディレクトリ"
 
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "テーマディレクトリ"
 

+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the avatar directory that could not be written to.

 #: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "アバターディレクトリ"
 
 #: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "アバターディレクトリ"
 

-#: actions/pathsadminpanel.php:169
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the background directory that could not be written to.
+#: actions/pathsadminpanel.php:171

 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "バックグラウンドディレクトリ"
 
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "バックグラウンドディレクトリ"
 

-#: actions/pathsadminpanel.php:177
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the locales directory that could not be read from.
+#: actions/pathsadminpanel.php:181

 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "場所ディレクトリが読み込めません: %s"
 
 #, fuzzy, php-format
 msgid "Locales directory not readable: %s."
 msgstr "場所ディレクトリが読み込めません: %s"
 

-#: actions/pathsadminpanel.php:183
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the SSL server URL that is too long.
+#: actions/pathsadminpanel.php:189

 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "不正な SSL サーバー。最大 255 文字まで。"
 
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "不正な SSL サーバー。最大 255 文字まで。"
 

-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58

 msgid "Site"
 msgstr "サイト"
 
 msgid "Site"
 msgstr "サイト"
 

-#: actions/pathsadminpanel.php:238
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425

 msgid "Server"
 msgstr "サーバー"
 
 msgid "Server"
 msgstr "サーバー"
 

-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:242

 msgid "Site's server hostname."
 msgstr "サイトのサーバーホスト名"
 
 msgid "Site's server hostname."
 msgstr "サイトのサーバーホスト名"
 

-#: actions/pathsadminpanel.php:242
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434

 msgid "Path"
 msgstr "パス"
 
 msgid "Path"
 msgstr "パス"
 

-#: actions/pathsadminpanel.php:242
-msgid "Site path"
+#: actions/pathsadminpanel.php:249
+#, fuzzy
+msgid "Site path."

 msgstr "サイトパス"
 
 msgstr "サイトパス"
 

-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "ロケールのパス"
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:255
+#, fuzzy
+msgid "Locale directory"
+msgstr "テーマディレクトリ"

 
 

-#: actions/pathsadminpanel.php:246
-msgid "Directory path to locales"
+#: actions/pathsadminpanel.php:256
+#, fuzzy
+msgid "Directory path to locales."

 msgstr "ロケールへのディレクトリパス"
 
 msgstr "ロケールへのディレクトリパス"
 

-#: actions/pathsadminpanel.php:250
+#. TRANS: Checkbox label in Paths admin panel.
+#: actions/pathsadminpanel.php:263

 msgid "Fancy URLs"
 msgstr ""
 
 msgid "Fancy URLs"
 msgstr ""
 

-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:265

 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Fancy URL (読みやすく忘れにくい) を使用しますか?"
 
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "Fancy URL (読みやすく忘れにくい) を使用しますか?"
 

-#: actions/pathsadminpanel.php:259
-msgid "Theme"
-msgstr "テーマ"
+#: actions/pathsadminpanel.php:272
+msgid "Theme"
+msgstr "テーマ"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Server for themes."
+msgstr "サイトのテーマ"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:290
+msgid "Web path to themes."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
+#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
+msgid "SSL server"
+msgstr "SSLサーバ"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:299
+msgid "SSL server for themes (default: SSL server)."
+msgstr ""

 
 

-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "テーマサーバー"
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
+#: actions/pathsadminpanel.php:452
+#, fuzzy
+msgid "SSL path"
+msgstr "サイトパス"

 
 

-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "テーマパス"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:308
+msgid "SSL path to themes (default: /theme/)."
+msgstr ""

 
 

-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
+#: actions/pathsadminpanel.php:461
+#, fuzzy
+msgid "Directory"

 msgstr "テーマディレクトリ"
 
 msgstr "テーマディレクトリ"
 

-#: actions/pathsadminpanel.php:279
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:317
+#, fuzzy
+msgid "Directory where themes are located."
+msgstr "ロケールへのディレクトリパス"
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:326

 msgid "Avatars"
 msgstr "アバター"
 
 msgid "Avatars"
 msgstr "アバター"
 

-#: actions/pathsadminpanel.php:284
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:333

 msgid "Avatar server"
 msgstr "アバターサーバー"
 
 msgid "Avatar server"
 msgstr "アバターサーバー"
 

-#: actions/pathsadminpanel.php:288
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:335
+#, fuzzy
+msgid "Server for avatars."
+msgstr "サイトのテーマ"
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:342

 msgid "Avatar path"
 msgstr "アバターパス"
 
 msgid "Avatar path"
 msgstr "アバターパス"
 

-#: actions/pathsadminpanel.php:292
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:344
+#, fuzzy
+msgid "Web path to avatars."
+msgstr "アバターの更新に失敗しました。"
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:351

 msgid "Avatar directory"
 msgstr "アバターディレクトリ"
 
 msgid "Avatar directory"
 msgstr "アバターディレクトリ"
 

-#: actions/pathsadminpanel.php:301
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:353
+#, fuzzy
+msgid "Directory where avatars are located."
+msgstr "ロケールへのディレクトリパス"
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:364

 msgid "Backgrounds"
 msgstr "バックグラウンド"
 
 msgid "Backgrounds"
 msgstr "バックグラウンド"
 

-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "バックグラウンドサーバー"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:372
+#, fuzzy
+msgid "Server for backgrounds."
+msgstr "サイトのテーマ"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:381
+msgid "Web path to backgrounds."
+msgstr ""

 
 

-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "バックグラウンドパス"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:390
+msgid "Server for backgrounds on SSL pages."
+msgstr ""

 
 

-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "バックグラウンドディレクトリ"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:399
+msgid "Web path to backgrounds on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:408
+#, fuzzy
+msgid "Directory where backgrounds are located."
+msgstr "ロケールへのディレクトリパス"

 
 

-#: actions/pathsadminpanel.php:320
+#. TRANS: Fieldset legens in Paths admin panel.
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+msgid "Attachments"
+msgstr "添付"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:427
+#, fuzzy
+msgid "Server for attachments."
+msgstr "サイトのテーマ"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:436
+#, fuzzy
+msgid "Web path to attachments."
+msgstr "そのような添付はありません。"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:445
+#, fuzzy
+msgid "Server for attachments on SSL pages."
+msgstr "サイトのテーマ"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:454
+msgid "Web path to attachments on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:463
+#, fuzzy
+msgid "Directory where attachments are located."
+msgstr "ロケールへのディレクトリパス"
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:472

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202

 msgid "Never"
 msgstr ""
 
 msgid "Never"
 msgstr ""
 

-#: actions/pathsadminpanel.php:324
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:479

 msgid "Sometimes"
 msgstr "ときどき"
 
 msgid "Sometimes"
 msgstr "ときどき"
 

-#: actions/pathsadminpanel.php:325
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:481

 msgid "Always"
 msgstr "いつも"
 
 msgid "Always"
 msgstr "いつも"
 

-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:485

 msgid "Use SSL"
 msgstr "SSL 使用"
 
 msgid "Use SSL"
 msgstr "SSL 使用"
 

-#: actions/pathsadminpanel.php:330
-msgid "When to use SSL"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:487
+#, fuzzy
+msgid "When to use SSL."

 msgstr "SSL 使用時"
 
 msgstr "SSL 使用時"
 

-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSLサーバ"
-
-#: actions/pathsadminpanel.php:336
-msgid "Server to direct SSL requests to"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:497
+#, fuzzy
+msgid "Server to direct SSL requests to."

 msgstr "ダイレクト SSL リクエストを向けるサーバ"
 
 msgstr "ダイレクト SSL リクエストを向けるサーバ"
 

-#: actions/pathsadminpanel.php:352
+#. TRANS: Button title text to store form data in the Paths admin panel.
+#: actions/pathsadminpanel.php:514

 msgid "Save paths"
 msgstr "保存パス"
 
 msgid "Save paths"
 msgstr "保存パス"
 


@@ -3076,139 +3863,182 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 "つぶやきライセンス ‘%1$s’ はサイトライセンス ‘%2$s’ と互換性がありません。"
 
 msgstr ""
 "つぶやきライセンス ‘%1$s’ はサイトライセンス ‘%2$s’ と互換性がありません。"
 

-#: actions/profilesettings.php:60
+#. TRANS: Page title for profile settings.
+#: actions/profilesettings.php:61

 msgid "Profile settings"
 msgstr "プロファイル設定"
 
 msgid "Profile settings"
 msgstr "プロファイル設定"
 

-#: actions/profilesettings.php:71
+#. TRANS: Usage instructions for profile settings.
+#: actions/profilesettings.php:73

 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 "あなたのことについて知ってもらうために、ここでプロファイル情報を更新できま"
 "す。"
 
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 "あなたのことについて知ってもらうために、ここでプロファイル情報を更新できま"
 "す。"
 

-#: actions/profilesettings.php:99
+#. TRANS: Profile settings form legend.
+#: actions/profilesettings.php:102

 msgid "Profile information"
 msgstr "プロファイル情報"
 
 msgid "Profile information"
 msgstr "プロファイル情報"
 

-#: actions/profilesettings.php:108 lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:113
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."

 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 

-#: actions/profilesettings.php:111 actions/register.php:455
-#: actions/showgroup.php:256 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:150
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for full group name (dt). Text hidden by default.
+#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/showgroup.php:252 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:152

 msgid "Full name"
 msgstr "フルネーム"
 
 msgid "Full name"
 msgstr "フルネーム"
 

+#. TRANS: Field label in form for profile settings.

 #. TRANS: Form input field label.
 #. TRANS: Form input field label.

-#: actions/profilesettings.php:115 actions/register.php:460
+#: actions/profilesettings.php:122 actions/register.php:461

 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ホームページ"
 
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ホームページ"
 

-#: actions/profilesettings.php:117 actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:125
+#, fuzzy
+msgid "URL of your homepage, blog, or profile on another site."

 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 

-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr "%d字以内で自分自身と自分の興味について書いてください"
+#. TRANS: Tooltip for field label in form for profile settings. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
+#: actions/profilesettings.php:133 actions/register.php:472
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d character"
+msgid_plural "Describe yourself and your interests in %d characters"
+msgstr[0] "%d字以内で自分自身と自分の興味について書いてください"

 
 

-#: actions/profilesettings.php:125 actions/register.php:471
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:139 actions/register.php:477

 msgid "Describe yourself and your interests"
 msgstr "自分自身と自分の興味について書いてください"
 
 msgid "Describe yourself and your interests"
 msgstr "自分自身と自分の興味について書いてください"
 

-#: actions/profilesettings.php:127 actions/register.php:473
+#. TRANS: Text area label in form for profile settings where users can provide.
+#. TRANS: their biography.
+#: actions/profilesettings.php:143 actions/register.php:479

 msgid "Bio"
 msgstr "自己紹介"
 
 msgid "Bio"
 msgstr "自己紹介"
 

-#: actions/profilesettings.php:132 actions/register.php:478
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:165
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group location (dt). Text hidden by default.
+#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/showgroup.php:262 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: lib/userprofile.php:167

 msgid "Location"
 msgstr "場所"
 
 msgid "Location"
 msgstr "場所"
 

-#: actions/profilesettings.php:134 actions/register.php:480
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:152 actions/register.php:486

 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 

-#: actions/profilesettings.php:138
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:157

 msgid "Share my current location when posting notices"
 msgstr "つぶやきを投稿するときには私の現在の場所を共有してください"
 
 msgid "Share my current location when posting notices"
 msgstr "つぶやきを投稿するときには私の現在の場所を共有してください"
 

-#: actions/profilesettings.php:145 actions/tagother.php:149
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:165 actions/tagother.php:149

 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: actions/tagother.php:209 lib/subscriptionlist.php:106

-#: lib/subscriptionlist.php:108 lib/userprofile.php:210
+#: lib/subscriptionlist.php:108 lib/userprofile.php:212

 msgid "Tags"
 msgstr "タグ"
 
 msgid "Tags"
 msgstr "タグ"
 

-#: actions/profilesettings.php:147
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:168

 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "自分自身についてのタグ (アルファベット、数字、-、.、_)、カンマまたは空白区切"
 "りで"
 
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "自分自身についてのタグ (アルファベット、数字、-、.、_)、カンマまたは空白区切"
 "りで"
 

-#: actions/profilesettings.php:151
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:173

 msgid "Language"
 msgstr "言語"
 
 msgid "Language"
 msgstr "言語"
 

-#: actions/profilesettings.php:152
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:175

 msgid "Preferred language"
 msgstr "ご希望の言語"
 
 msgid "Preferred language"
 msgstr "ご希望の言語"
 

-#: actions/profilesettings.php:161
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:185

 msgid "Timezone"
 msgstr "タイムゾーン"
 
 msgid "Timezone"
 msgstr "タイムゾーン"
 

-#: actions/profilesettings.php:162
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:187

 msgid "What timezone are you normally in?"
 msgstr "普段のタイムゾーンはどれですか？"
 
 msgid "What timezone are you normally in?"
 msgstr "普段のタイムゾーンはどれですか？"
 

-#: actions/profilesettings.php:167
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:193

 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)"
 
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)"
 

-#: actions/profilesettings.php:228 actions/register.php:230
-#, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr "自己紹介が長すぎます (最長%d文字)。"
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Plural form is used based on the maximum number of allowed
+#. TRANS: characters for the biography (%d).
+#: actions/profilesettings.php:262 actions/register.php:229
+#, fuzzy, php-format
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] "自己紹介が長すぎます (最長%d文字)。"

 
 

-#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:273 actions/siteadminpanel.php:151

 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 
 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 

-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:281
+#, fuzzy
+msgid "Language is too long (maximum 50 characters)."

 msgstr "言語が長すぎます。(最大50字)"
 
 msgstr "言語が長すぎます。(最大50字)"
 

-#: actions/profilesettings.php:253 actions/tagother.php:178
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#: actions/profilesettings.php:295 actions/tagother.php:178

 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "不正なタグ: \"%s\""
 
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "不正なタグ: \"%s\""
 

-#: actions/profilesettings.php:306
+#. TRANS: Server error thrown when user profile settings could not be updated to
+#. TRANS: automatically subscribe to any subscriber.
+#: actions/profilesettings.php:351

 msgid "Couldn't update user for autosubscribe."
 msgstr "自動フォローのためのユーザを更新できませんでした。"
 
 msgid "Couldn't update user for autosubscribe."
 msgstr "自動フォローのためのユーザを更新できませんでした。"
 

-#: actions/profilesettings.php:363
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+#: actions/profilesettings.php:409

 msgid "Couldn't save location prefs."
 msgstr "場所情報を保存できません。"
 
 msgid "Couldn't save location prefs."
 msgstr "場所情報を保存できません。"
 

-#: actions/profilesettings.php:375
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/profilesettings.php:422

 msgid "Couldn't save profile."
 msgstr "プロファイルを保存できません"
 
 msgid "Couldn't save profile."
 msgstr "プロファイルを保存できません"
 

-#: actions/profilesettings.php:383
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#: actions/profilesettings.php:431

 msgid "Couldn't save tags."
 msgstr "タグを保存できません。"
 
 msgid "Couldn't save tags."
 msgstr "タグを保存できません。"
 

+#. TRANS: Confirmation shown when user profile settings are saved.

 #. TRANS: Message after successful saving of administrative settings.
 #. TRANS: Message after successful saving of administrative settings.

-#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:440 lib/adminpanelaction.php:138

 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
 msgid "Settings saved."
 msgstr "設定が保存されました。"
 


@@ -3288,26 +4118,39 @@ msgstr ""
 "net/)を基にした[マイクロブロギング](http://en.wikipedia.org/wiki/Micro-"
 "blogging) サービス。"
 
 "net/)を基にした[マイクロブロギング](http://en.wikipedia.org/wiki/Micro-"
 "blogging) サービス。"
 

+#. TRANS: Title for public tag cloud.

 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "パブリックタグクラウド"
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "パブリックタグクラウド"
 

-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
+#. TRANS: Instructions (more used like an explanation/header).
+#. TRANS: %s is the StatusNet sitename.
+#: actions/publictagcloud.php:65
+#, fuzzy, php-format
+msgid "These are most popular recent tags on %s"

 msgstr "これらは %s の人気がある最近のタグです "
 
 msgstr "これらは %s の人気がある最近のタグです "
 

-#: actions/publictagcloud.php:69
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:74

 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 "まだだれも [ハッシュタグ](%%doc.tags%%) 付きのつぶやきを投稿していません。"
 
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 "まだだれも [ハッシュタグ](%%doc.tags%%) 付きのつぶやきを投稿していません。"
 

-#: actions/publictagcloud.php:72
+#. TRANS: Message shown to a logged in user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#: actions/publictagcloud.php:79

 msgid "Be the first to post one!"
 msgstr "投稿する1番目になってください!"
 
 msgid "Be the first to post one!"
 msgstr "投稿する1番目になってください!"
 

-#: actions/publictagcloud.php:75
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:87

 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "


@@ -3316,7 +4159,7 @@ msgstr ""
 "なぜ [アカウント登録](%%action.register%%) しないのですか。そして最初の投稿を"
 "してください!"
 
 "なぜ [アカウント登録](%%action.register%%) しないのですか。そして最初の投稿を"
 "してください!"
 

-#: actions/publictagcloud.php:134
+#: actions/publictagcloud.php:146

 msgid "Tag cloud"
 msgstr "タグクラウド"
 
 msgid "Tag cloud"
 msgstr "タグクラウド"
 


@@ -3427,14 +4270,15 @@ msgid "Unexpected password reset."
 msgstr "予期せぬパスワードのリセットです。"
 
 #: actions/recoverpassword.php:365
 msgstr "予期せぬパスワードのリセットです。"
 
 #: actions/recoverpassword.php:365

-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."

 msgstr "パスワードは6字以上でなければいけません。"
 
 #: actions/recoverpassword.php:369
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 
 msgstr "パスワードは6字以上でなければいけません。"
 
 #: actions/recoverpassword.php:369
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 

-#: actions/recoverpassword.php:388 actions/register.php:255
+#: actions/recoverpassword.php:388 actions/register.php:256

 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 


@@ -3442,7 +4286,7 @@ msgstr "ユーザ設定エラー"
 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 
 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 

-#: actions/register.php:92 actions/register.php:196 actions/register.php:412
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413

 msgid "Sorry, only invited people can register."
 msgstr "すみません、招待された人々だけが登録できます。"
 
 msgid "Sorry, only invited people can register."
 msgstr "すみません、招待された人々だけが登録できます。"
 


@@ -3454,7 +4298,7 @@ msgstr "すみません、不正な招待コード。"
 msgid "Registration successful"
 msgstr "登録成功"
 
 msgid "Registration successful"
 msgstr "登録成功"
 

-#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85

 msgid "Register"
 msgstr "登録"
 
 msgid "Register"
 msgstr "登録"
 


@@ -3462,19 +4306,19 @@ msgstr "登録"
 msgid "Registration not allowed."
 msgstr "登録は許可されていません。"
 
 msgid "Registration not allowed."
 msgstr "登録は許可されていません。"
 

-#: actions/register.php:205
+#: actions/register.php:209

 msgid "You can't register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 
 msgid "You can't register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 

-#: actions/register.php:219
+#: actions/register.php:218

 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 
 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 

-#: actions/register.php:250 actions/register.php:272
+#: actions/register.php:251 actions/register.php:273

 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 
 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 

-#: actions/register.php:350
+#: actions/register.php:351

 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "


@@ -3483,63 +4327,67 @@ msgstr ""
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
 "同僚にリンクできます。 "
 
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
 "同僚にリンクできます。 "
 

-#: actions/register.php:432
+#: actions/register.php:433

 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
 

-#: actions/register.php:437
+#: actions/register.php:438

 msgid "6 or more characters. Required."
 msgstr "6文字以上。必須です。"
 
 msgid "6 or more characters. Required."
 msgstr "6文字以上。必須です。"
 

-#: actions/register.php:441
+#: actions/register.php:442

 msgid "Same as password above. Required."
 msgstr "上のパスワードと同じです。 必須。"
 
 #. TRANS: Link description in user account settings menu.
 msgid "Same as password above. Required."
 msgstr "上のパスワードと同じです。 必須。"
 
 #. TRANS: Link description in user account settings menu.

-#: actions/register.php:445 actions/register.php:449
+#: actions/register.php:446 actions/register.php:450

 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "メール"
 
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "メール"
 

-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:447 actions/register.php:451

 msgid "Used only for updates, announcements, and password recovery"
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 

-#: actions/register.php:457
+#: actions/register.php:458

 msgid "Longer name, preferably your \"real\" name"
 msgstr "長い名前"
 
 msgid "Longer name, preferably your \"real\" name"
 msgstr "長い名前"
 

-#: actions/register.php:518
+#: actions/register.php:463
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
+
+#: actions/register.php:524

 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 

-#: actions/register.php:528
+#: actions/register.php:534

 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.

-#: actions/register.php:532
+#: actions/register.php:538

 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.

-#: actions/register.php:535
+#: actions/register.php:541

 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.

-#: actions/register.php:540
+#: actions/register.php:546

 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
 
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
 

-#: actions/register.php:583
+#: actions/register.php:589

 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "


@@ -3572,7 +4420,7 @@ msgstr ""
 "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
 "で使ってくれることを願っています。"
 
 "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
 "で使ってくれることを願っています。"
 

-#: actions/register.php:607
+#: actions/register.php:613

 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"


@@ -3617,7 +4465,7 @@ msgid "URL of your profile on another compatible microblogging service"
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139

-#: lib/userprofile.php:406
+#: lib/userprofile.php:411

 msgid "Subscribe"
 msgstr "フォロー"
 
 msgid "Subscribe"
 msgstr "フォロー"
 


@@ -3656,7 +4504,7 @@ msgstr "自分のつぶやきは繰り返せません。"
 msgid "You already repeated that notice."
 msgstr "すでにそのつぶやきを繰り返しています。"
 
 msgid "You already repeated that notice."
 msgstr "すでにそのつぶやきを繰り返しています。"
 

-#: actions/repeat.php:114 lib/noticelist.php:686
+#: actions/repeat.php:114 lib/noticelist.php:691

 msgid "Repeated"
 msgstr "繰り返された"
 
 msgid "Repeated"
 msgstr "繰り返された"
 


@@ -3665,7 +4513,7 @@ msgid "Repeated!"
 msgstr "繰り返されました!"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 msgstr "繰り返されました!"
 
 #: actions/replies.php:126 actions/repliesrss.php:68

-#: lib/personalgroupnav.php:105
+#: lib/personalgroupnav.php:108

 #, php-format
 msgid "Replies to %s"
 msgstr "%s への返信"
 #, php-format
 msgid "Replies to %s"
 msgstr "%s への返信"


@@ -3798,11 +4646,12 @@ msgstr "組織"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200

-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175

 msgid "Description"
 msgstr "概要"
 
 msgid "Description"
 msgstr "概要"
 

-#: actions/showapplication.php:192 actions/showgroup.php:436
+#. TRANS: Header for group statistics on a group page (h2).
+#: actions/showapplication.php:192 actions/showgroup.php:448

 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "統計データ"
 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "統計データ"


@@ -3820,6 +4669,11 @@ msgstr "アプリケーションアクション"
 msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 
 msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 

+#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:66 lib/noticelist.php:672
+msgid "Delete"
+msgstr "削除"
+

 #: actions/showapplication.php:261
 msgid "Application info"
 msgstr "アプリケーション情報"
 #: actions/showapplication.php:261
 msgid "Application info"
 msgstr "アプリケーション情報"


@@ -3913,77 +4767,106 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "これは、あなたが好きなことを共有する方法です。"
 
 msgid "This is a way to share what you like."
 msgstr "これは、あなたが好きなことを共有する方法です。"
 

-#: actions/showgroup.php:82
+#. TRANS: Page title for first group page. %s is a group name.
+#: actions/showgroup.php:75

 #, php-format
 msgid "%s group"
 msgstr "%s グループ"
 
 #, php-format
 msgid "%s group"
 msgstr "%s グループ"
 

-#: actions/showgroup.php:84
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#: actions/showgroup.php:79

 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 

-#: actions/showgroup.php:227
+#. TRANS: Group profile header (h2). Text hidden by default.
+#: actions/showgroup.php:220

 msgid "Group profile"
 msgstr "グループプロファイル"
 
 msgid "Group profile"
 msgstr "グループプロファイル"
 

-#: actions/showgroup.php:272 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:178
+#. TRANS: Label for group URL (dt). Text hidden by default.
+#: actions/showgroup.php:270 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:180

 msgid "URL"
 msgstr "URL"
 
 msgid "URL"
 msgstr "URL"
 

-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
+#. TRANS: Label for group description or group note (dt). Text hidden by default.
+#: actions/showgroup.php:282 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:197

 msgid "Note"
 msgstr "ノート"
 
 msgid "Note"
 msgstr "ノート"
 

-#: actions/showgroup.php:293 lib/groupeditform.php:184
+#. TRANS: Label for group aliases (dt). Text hidden by default.
+#: actions/showgroup.php:293 lib/groupeditform.php:187

 msgid "Aliases"
 msgstr "別名"
 
 msgid "Aliases"
 msgstr "別名"
 

-#: actions/showgroup.php:302
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: actions/showgroup.php:304

 msgid "Group actions"
 msgstr "グループアクション"
 
 msgid "Group actions"
 msgstr "グループアクション"
 

-#: actions/showgroup.php:338
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:345

 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s グループのつぶやきフィード (RSS 1.0)"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s グループのつぶやきフィード (RSS 1.0)"
 

-#: actions/showgroup.php:344
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:352

 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s グループのつぶやきフィード (RSS 2.0)"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s グループのつぶやきフィード (RSS 2.0)"
 

-#: actions/showgroup.php:350
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:359

 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s グループのつぶやきフィード (Atom)"
 
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s グループのつぶやきフィード (Atom)"
 

-#: actions/showgroup.php:355
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:365

 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s グループの FOAF"
 
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s グループの FOAF"
 

-#: actions/showgroup.php:393 actions/showgroup.php:445
+#. TRANS: Header for mini list of group members on a group page (h2).
+#: actions/showgroup.php:402

 msgid "Members"
 msgstr "メンバー"
 
 msgid "Members"
 msgstr "メンバー"
 

-#: actions/showgroup.php:398 lib/profileaction.php:117
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#: actions/showgroup.php:408 lib/profileaction.php:117

 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(なし)"
 
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(なし)"
 

-#: actions/showgroup.php:404
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+#: actions/showgroup.php:417

 msgid "All members"
 msgstr "全てのメンバー"
 
 msgid "All members"
 msgstr "全てのメンバー"
 

-#: actions/showgroup.php:439
+#. TRANS: Label for creation date in statistics on group page.
+#: actions/showgroup.php:453
+#, fuzzy
+msgctxt "LABEL"

 msgid "Created"
 msgstr "作成日"
 
 msgid "Created"
 msgstr "作成日"
 

-#: actions/showgroup.php:455
+#. TRANS: Label for member count in statistics on group page.
+#: actions/showgroup.php:461
+#, fuzzy
+msgctxt "LABEL"
+msgid "Members"
+msgstr "メンバー"
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#: actions/showgroup.php:476

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -3998,7 +4881,10 @@ msgstr ""
 "する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ"
 "のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))"
 
 "する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ"
 "のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))"
 

-#: actions/showgroup.php:461
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#: actions/showgroup.php:486

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -4011,24 +4897,31 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
 "する短いメッセージを共有します。"
 
 "wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
 "する短いメッセージを共有します。"
 

-#: actions/showgroup.php:489
+#. TRANS: Header for list of group administrators on a group page (h2).
+#: actions/showgroup.php:515

 msgid "Admins"
 msgstr "管理者"
 
 msgid "Admins"
 msgstr "管理者"
 

-#: actions/showmessage.php:81
+#. TRANS: Client error displayed requesting a single message that does not exist.
+#: actions/showmessage.php:79

 msgid "No such message."
 msgstr "そのようなメッセージはありません。"
 
 msgid "No such message."
 msgstr "そのようなメッセージはありません。"
 

-#: actions/showmessage.php:98
+#. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
+#: actions/showmessage.php:97

 msgid "Only the sender and recipient may read this message."
 msgstr "送信者と受取人だけがこのメッセージを読めます。"
 
 msgid "Only the sender and recipient may read this message."
 msgstr "送信者と受取人だけがこのメッセージを読めます。"
 

-#: actions/showmessage.php:108
+#. TRANS: Page title for single direct message display when viewing user is the sender.
+#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:110

 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "%2$s 上の %1$s へのメッセージ"
 
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr "%2$s 上の %1$s へのメッセージ"
 

-#: actions/showmessage.php:113
+#. TRANS: Page title for single message display.
+#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:118

 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "%2$s 上の %1$s からのメッセージ"
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "%2$s 上の %1$s からのメッセージ"


@@ -4037,47 +4930,67 @@ msgstr "%2$s 上の %1$s からのメッセージ"
 msgid "Notice deleted."
 msgstr "つぶやきを削除しました。"
 
 msgid "Notice deleted."
 msgstr "つぶやきを削除しました。"
 

-#: actions/showstream.php:73
-#, php-format
-msgid " tagged %s"
-msgstr "タグ付けされた %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s、ページ %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "%1$s とタグ付けされたつぶやき、ページ %2$d"

 
 

-#: actions/showstream.php:79
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82

 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s、ページ %2$d"
 
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s、ページ %2$d"
 

-#: actions/showstream.php:122
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127

 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%1$sの%2$sとタグ付けされたつぶやきフィード (RSS 1.0)"
 
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%1$sの%2$sとタグ付けされたつぶやきフィード (RSS 1.0)"
 

-#: actions/showstream.php:129
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136

 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%sのつぶやきフィード (RSS 1.0)"
 
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%sのつぶやきフィード (RSS 1.0)"
 

-#: actions/showstream.php:136
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145

 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%sのつぶやきフィード (RSS 2.0)"
 
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%sのつぶやきフィード (RSS 2.0)"
 

-#: actions/showstream.php:143
+#: actions/showstream.php:152

 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%sのつぶやきフィード (Atom)"
 
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%sのつぶやきフィード (Atom)"
 

-#: actions/showstream.php:148
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159

 #, php-format
 msgid "FOAF for %s"
 msgstr "%s の FOAF"
 
 #, php-format
 msgid "FOAF for %s"
 msgstr "%s の FOAF"
 

-#: actions/showstream.php:200
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."

 msgstr "これは %1$s のタイムラインですが、%2$s はまだなにも投稿していません。"
 
 msgstr "これは %1$s のタイムラインですが、%2$s はまだなにも投稿していません。"
 

-#: actions/showstream.php:205
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217

 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"


@@ -4085,7 +4998,9 @@ msgstr ""
 "最近おもしろいものは何でしょう? あなたは少しのつぶやきも投稿していませんが、"
 "いまは始める良い時でしょう:)"
 
 "最近おもしろいものは何でしょう? あなたは少しのつぶやきも投稿していませんが、"
 "いまは始める良い時でしょう:)"
 

-#: actions/showstream.php:207
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221

 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"


@@ -4094,7 +5009,9 @@ msgstr ""
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 

-#: actions/showstream.php:246
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -4108,7 +5025,9 @@ msgstr ""
 "%%%%)して、**%s** のつぶやきなどをフォローしましょう! ([もっと読む](%%%%doc."
 "help%%%%))"
 
 "%%%%)して、**%s** のつぶやきなどをフォローしましょう! ([もっと読む](%%%%doc."
 "help%%%%))"
 

-#: actions/showstream.php:251
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -4119,7 +5038,8 @@ msgstr ""
 "[StatusNet](http://status.net/)を基にした[マイクロブロギング](http://en."
 "wikipedia.org/wiki/Micro-blogging) サービス。"
 
 "[StatusNet](http://status.net/)を基にした[マイクロブロギング](http://en."
 "wikipedia.org/wiki/Micro-blogging) サービス。"
 

-#: actions/showstream.php:308
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328

 #, php-format
 msgid "Repeat of %s"
 msgstr "%s の繰り返し"
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s の繰り返し"


@@ -4236,35 +5156,43 @@ msgstr ""
 "どれくらい長い間(秒)、ユーザは、再び同じものを投稿するのを待たなければならな"
 "いか。"
 
 "どれくらい長い間(秒)、ユーザは、再び同じものを投稿するのを待たなければならな"
 "いか。"
 

-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55

 #, fuzzy
 msgid "Site Notice"
 msgstr "サイトつぶやき"
 
 #, fuzzy
 msgid "Site Notice"
 msgstr "サイトつぶやき"
 

-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66

 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "新しいメッセージ"
 
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "新しいメッセージ"
 

-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101

 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "あなたのデザイン設定を保存できません。"
 
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "あなたのデザイン設定を保存できません。"
 

-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
+msgstr "プロファイル自己紹介の最大文字長。"

 
 

+#. TRANS: Label for site-wide notice text field in admin panel.

 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "サイトつぶやき"
 
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "サイトつぶやき"
 

-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"

 msgstr ""
 
 msgstr ""
 

-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201

 #, fuzzy
 msgid "Save site notice"
 msgstr "サイトつぶやき"
 #, fuzzy
 msgid "Save site notice"
 msgstr "サイトつぶやき"


@@ -4487,12 +5415,14 @@ msgstr "このURLにスナップショットを送るでしょう"
 msgid "Save snapshot settings"
 msgstr "サイト設定の保存"
 
 msgid "Save snapshot settings"
 msgstr "サイト設定の保存"
 

-#: actions/subedit.php:70
+#. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
+#: actions/subedit.php:75

 msgid "You are not subscribed to that profile."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 msgid "You are not subscribed to that profile."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 

+#. TRANS: Server error displayed when updating a subscription fails with a database error.

 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.

-#: actions/subedit.php:83 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:136

 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 
 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 


@@ -4514,39 +5444,56 @@ msgstr "あなたはそのプロファイルにフォローされていません
 msgid "Subscribed"
 msgstr "フォローしている"
 
 msgid "Subscribed"
 msgstr "フォローしている"
 

-#: actions/subscribers.php:50
+#. TRANS: Header for list of subscribers for a user (first page).
+#. TRANS: %s is the user's nickname.
+#: actions/subscribers.php:51

 #, php-format
 msgid "%s subscribers"
 msgstr "フォローされている"
 
 #, php-format
 msgid "%s subscribers"
 msgstr "フォローされている"
 

-#: actions/subscribers.php:52
+#. TRANS: Header for list of subscribers for a user (not first page).
+#. TRANS: %1$s is the user's nickname, $2$d is the page number.
+#: actions/subscribers.php:55

 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s フォローされている、ページ %2$d"
 
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s フォローされている、ページ %2$d"
 

-#: actions/subscribers.php:63
+#. TRANS: Page notice for page with an overview of all subscribers
+#. TRANS: of the logged in user's own profile.
+#: actions/subscribers.php:68

 msgid "These are the people who listen to your notices."
 msgstr "あなたのつぶやきを聞いている人"
 
 msgid "These are the people who listen to your notices."
 msgstr "あなたのつぶやきを聞いている人"
 

-#: actions/subscribers.php:67
+#. TRANS: Page notice for page with an overview of all subscribers of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscribers.php:74

 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s　のつぶやきを聞いている人"
 
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "%s　のつぶやきを聞いている人"
 

-#: actions/subscribers.php:108
+#. TRANS: Subscriber list text when the logged in user has no subscribers.
+#: actions/subscribers.php:116
+#, fuzzy

 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "

-"return the favor"
+"return the favor."

 msgstr ""
 "あなたには、フォローしている人が全くいません。 あなたが知っている人々をフォ"
 "ローしてみてください。そうすれば、彼らはお気に入りを返すかもしれません。"
 
 msgstr ""
 "あなたには、フォローしている人が全くいません。 あなたが知っている人々をフォ"
 "ローしてみてください。そうすれば、彼らはお気に入りを返すかもしれません。"
 

-#: actions/subscribers.php:110
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
+#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
+#: actions/subscribers.php:120

 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s にはフォローしている人がいません。最初の人になりますか?"
 
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s にはフォローしている人がいません。最初の人になりますか?"
 

-#: actions/subscribers.php:114
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscribers.php:129

 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"


@@ -4555,26 +5502,38 @@ msgstr ""
 "%s にはフォローしている人がいません。なぜ[アカウント登録](%%%%action.register"
 "%%%%)して最初にならないのですか?"
 
 "%s にはフォローしている人がいません。なぜ[アカウント登録](%%%%action.register"
 "%%%%)して最初にならないのですか?"
 

-#: actions/subscriptions.php:52
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/subscriptions.php:51

 #, php-format
 msgid "%s subscriptions"
 msgstr "%s フォローしている"
 
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s フォローしている"
 

-#: actions/subscriptions.php:54
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#: actions/subscriptions.php:55

 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s フォローしている、ページ %2$d"
 
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s フォローしている、ページ %2$d"
 

-#: actions/subscriptions.php:65
+#. TRANS: Page notice for page with an overview of all subscriptions
+#. TRANS: of the logged in user's own profile.
+#: actions/subscriptions.php:68

 msgid "These are the people whose notices you listen to."
 msgstr "あなたがつぶやきを聞いている人"
 
 msgid "These are the people whose notices you listen to."
 msgstr "あなたがつぶやきを聞いている人"
 

-#: actions/subscriptions.php:69
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscriptions.php:74

 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s がつぶやきを聞いている人"
 
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "%s がつぶやきを聞いている人"
 

-#: actions/subscriptions.php:126
+#. TRANS: Subscription list text when the logged in user has no subscriptions.
+#. TRANS: This message contains Markdown URLs. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscriptions.php:135

 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "


@@ -4590,16 +5549,22 @@ msgstr ""
 "twittersettings%%)であれば、あなたは自動的に既にフォローしている人々をフォ"
 "ローできます。"
 
 "twittersettings%%)であれば、あなたは自動的に既にフォローしている人々をフォ"
 "ローできます。"
 

-#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#: actions/subscriptions.php:143 actions/subscriptions.php:149

 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s はだれも言うことを聞いていません。"
 
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s はだれも言うことを聞いていません。"
 

-#: actions/subscriptions.php:208
+#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:226

 msgid "Jabber"
 msgstr "Jabber"
 
 msgid "Jabber"
 msgstr "Jabber"
 

-#: actions/subscriptions.php:222
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:241

 msgid "SMS"
 msgstr "SMS"
 
 msgid "SMS"
 msgstr "SMS"
 


@@ -4637,7 +5602,7 @@ msgid "User profile"
 msgstr "ユーザプロファイル"
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
 msgstr "ユーザプロファイル"
 
 #: actions/tagother.php:81 actions/userauthorization.php:132

-#: lib/userprofile.php:103
+#: lib/userprofile.php:107

 msgid "Photo"
 msgstr "写真"
 
 msgid "Photo"
 msgstr "写真"
 


@@ -4700,76 +5665,94 @@ msgstr ""
 "りません。"
 
 #. TRANS: User admin panel title
 "りません。"
 
 #. TRANS: User admin panel title

-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58

 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "ユーザ"
 
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "ユーザ"
 

-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69

 msgid "User settings for this StatusNet site"
 msgstr ""
 
 msgid "User settings for this StatusNet site"
 msgstr ""
 

-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147

 msgid "Invalid bio limit. Must be numeric."
 msgstr "不正な自己紹介制限。数字である必要があります。"
 
 msgid "Invalid bio limit. Must be numeric."
 msgstr "不正な自己紹介制限。数字である必要があります。"
 

-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."

 msgstr "不正なウェルカムテキスト。最大長は255字です。"
 
 msgstr "不正なウェルカムテキスト。最大長は255字です。"
 

+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.

 #: actions/useradminpanel.php:166
 #: actions/useradminpanel.php:166

-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."

 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 
 #. TRANS: Link description in user account settings menu.
 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 
 #. TRANS: Link description in user account settings menu.

-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:109
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: lib/personalgroupnav.php:112

 msgid "Profile"
 msgstr "プロファイル"
 
 msgid "Profile"
 msgstr "プロファイル"
 

-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220

 msgid "Bio Limit"
 msgstr "自己紹介制限"
 
 msgid "Bio Limit"
 msgstr "自己紹介制限"
 

-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222

 msgid "Maximum length of a profile bio in characters."
 msgstr "プロファイル自己紹介の最大文字長。"
 
 msgid "Maximum length of a profile bio in characters."
 msgstr "プロファイル自己紹介の最大文字長。"
 

-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231

 msgid "New users"
 msgstr "新しいユーザ"
 
 msgid "New users"
 msgstr "新しいユーザ"
 

+#. TRANS: Field label in user admin panel for setting new user welcome text.

 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "新しいユーザを歓迎"
 
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "新しいユーザを歓迎"
 

-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."

 msgstr "新しいユーザへのウェルカムテキスト (最大255字)。"
 
 msgstr "新しいユーザへのウェルカムテキスト (最大255字)。"
 

-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244

 msgid "Default subscription"
 msgstr "デフォルトフォロー"
 
 msgid "Default subscription"
 msgstr "デフォルトフォロー"
 

-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246

 msgid "Automatically subscribe new users to this user."
 msgstr "自動的にこのユーザに新しいユーザをフォローしてください。"
 
 msgid "Automatically subscribe new users to this user."
 msgstr "自動的にこのユーザに新しいユーザをフォローしてください。"
 

-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256

 msgid "Invitations"
 msgstr "招待"
 
 msgid "Invitations"
 msgstr "招待"
 

-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262

 msgid "Invitations enabled"
 msgstr "招待が可能"
 
 msgid "Invitations enabled"
 msgstr "招待が可能"
 

-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265

 msgid "Whether to allow users to invite new users."
 msgstr "ユーザが新しいユーザを招待するのを許容するかどうか。"
 
 msgid "Whether to allow users to invite new users."
 msgstr "ユーザが新しいユーザを招待するのを許容するかどうか。"
 

-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302

 msgid "Save user settings"
 msgstr ""
 
 msgid "Save user settings"
 msgstr ""
 


@@ -4876,11 +5859,13 @@ msgstr "アバターURL　を読み取れません '%s'"
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "アバター URL '%s' は不正な画像形式。"
 
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "アバター URL '%s' は不正な画像形式。"
 

-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#. TRANS: Page title for profile design page.
+#: actions/userdesignsettings.php:76 lib/designsettings.php:63

 msgid "Profile design"
 msgstr "プロファイルデザイン"
 
 msgid "Profile design"
 msgstr "プロファイルデザイン"
 

-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+#. TRANS: Instructions for profile design page.
+#: actions/userdesignsettings.php:87 lib/designsettings.php:74

 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."


@@ -4970,7 +5955,7 @@ msgid "Plugins"
 msgstr "プラグイン"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 msgstr "プラグイン"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.

-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:885

 msgid "Version"
 msgstr "バージョン"
 
 msgid "Version"
 msgstr "バージョン"
 


@@ -4991,46 +5976,52 @@ msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.

-#: classes/File.php:142
+#: classes/File.php:156

 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!

-#: classes/File.php:174
+#: classes/File.php:188

 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 msgid "Robin thinks something is impossible."
 msgstr ""
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.

-#: classes/File.php:189
+#. TRANS: %1$s is used for plural.
+#: classes/File.php:204

 #, fuzzy, php-format
 msgid ""
 #, fuzzy, php-format
 msgid ""

+"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgid_plural ""

 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."

-msgstr ""
+msgstr[0] ""

 "どんなファイルも %d バイトより大きくてはいけません、そして、あなたが送った"
 "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして"
 "ください。"
 
 #. TRANS: Message given if an upload would exceed user quota.
 "どんなファイルも %d バイトより大きくてはいけません、そして、あなたが送った"
 "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして"
 "ください。"
 
 #. TRANS: Message given if an upload would exceed user quota.

-#. TRANS: %d (number) is the user quota in bytes.
-#: classes/File.php:201
-#, php-format
-msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+#. TRANS: %d (number) is the user quota in bytes and is used for plural.
+#: classes/File.php:217
+#, fuzzy, php-format
+msgid "A file this large would exceed your user quota of %d byte."
+msgid_plural "A file this large would exceed your user quota of %d bytes."
+msgstr[0] ""

 "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。"
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。"
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.

-#. TRANS: $d (number) is the monthly user quota in bytes.
-#: classes/File.php:210
-#, php-format
-msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
+#: classes/File.php:229
+#, fuzzy, php-format
+msgid "A file this large would exceed your monthly quota of %d byte."
+msgid_plural "A file this large would exceed your monthly quota of %d bytes."
+msgstr[0] ""

 "これほど大きいファイルはあなたの%dバイトの毎月の割当てを超えているでしょう。"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 "これほど大きいファイルはあなたの%dバイトの毎月の割当てを超えているでしょう。"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.

-#: classes/File.php:247 classes/File.php:262
+#: classes/File.php:276 classes/File.php:291

 #, fuzzy
 msgid "Invalid filename."
 msgstr "不正なサイズ。"
 #, fuzzy
 msgid "Invalid filename."
 msgstr "不正なサイズ。"


@@ -5160,39 +6151,46 @@ msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgstr "つぶやきを保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:907
-msgid "Bad type provided to saveKnownGroups"
+#: classes/Notice.php:909
+msgid "Bad type provided to saveKnownGroups."

 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.

-#: classes/Notice.php:1006
+#: classes/Notice.php:1008

 msgid "Problem saving group inbox."
 msgstr "グループ受信箱を保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
 msgid "Problem saving group inbox."
 msgstr "グループ受信箱を保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.

-#: classes/Notice.php:1120
+#: classes/Notice.php:1122

 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.

-#: classes/Notice.php:1822
+#: classes/Notice.php:1853

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 

+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:172 classes/User_group.php:247
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+

 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:785
+#: classes/Profile.php:845

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:794
+#: classes/Profile.php:854

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""


@@ -5209,7 +6207,7 @@ msgid "Unable to save tag."
 msgstr "タグをを保存できません。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 msgstr "タグをを保存できません。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.

-#: classes/Subscription.php:75 lib/oauthstore.php:466
+#: classes/Subscription.php:75 lib/oauthstore.php:482

 msgid "You have been banned from subscribing."
 msgstr "あなたはフォローが禁止されました。"
 
 msgid "You have been banned from subscribing."
 msgstr "あなたはフォローが禁止されました。"
 


@@ -5257,28 +6255,38 @@ msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.

-#: classes/User.php:384
+#: classes/User.php:395

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 

+#. TRANS: Server exception.
+#: classes/User.php:923
+msgid "No single user defined for single-user mode."
+msgstr "single-user　モードのためのシングルユーザが定義されていません。"
+
+#. TRANS: Server exception.
+#: classes/User.php:927
+msgid "Single-user mode code called when not enabled."
+msgstr ""
+

 #. TRANS: Server exception thrown when creating a group failed.
 #. TRANS: Server exception thrown when creating a group failed.

-#: classes/User_group.php:495
+#: classes/User_group.php:511

 msgid "Could not create group."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 msgid "Could not create group."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.

-#: classes/User_group.php:505
+#: classes/User_group.php:521

 msgid "Could not set group URI."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 msgid "Could not set group URI."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when setting group membership failed.

-#: classes/User_group.php:528
+#: classes/User_group.php:544

 msgid "Could not set group membership."
 msgstr "グループメンバーシップをセットできません。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
 msgid "Could not set group membership."
 msgstr "グループメンバーシップをセットできません。"
 
 #. TRANS: Server exception thrown when saving local group information failed.

-#: classes/User_group.php:543
+#: classes/User_group.php:559

 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"


@@ -5329,127 +6337,141 @@ msgstr ""
 msgid "Untitled page"
 msgstr "名称未設定ページ"
 
 msgid "Untitled page"
 msgstr "名称未設定ページ"
 

+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:312
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+

 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:448
+#: lib/action.php:531

 msgid "Primary site navigation"
 msgstr "プライマリサイトナビゲーション"
 
 #. TRANS: Tooltip for main menu option "Personal"
 msgid "Primary site navigation"
 msgstr "プライマリサイトナビゲーション"
 
 #. TRANS: Tooltip for main menu option "Personal"

-#: lib/action.php:454
+#: lib/action.php:537

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "パーソナルプロファイルと友人のタイムライン"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "パーソナルプロファイルと友人のタイムライン"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline

-#: lib/action.php:457
+#: lib/action.php:540

 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "パーソナル"
 
 #. TRANS: Tooltip for main menu option "Account"
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "パーソナル"
 
 #. TRANS: Tooltip for main menu option "Account"

-#: lib/action.php:459
+#: lib/action.php:542

 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "パスワードの変更"
 
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "パスワードの変更"
 

+#. TRANS: Main menu option when logged in for access to user settings
+#: lib/action.php:545
+msgid "Account"
+msgstr "アカウント"
+

 #. TRANS: Tooltip for main menu option "Services"
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:464
+#: lib/action.php:547

 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "接続"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "接続"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services

-#: lib/action.php:467
+#: lib/action.php:550

 msgid "Connect"
 msgstr "接続"
 
 #. TRANS: Tooltip for menu option "Admin"
 msgid "Connect"
 msgstr "接続"
 
 #. TRANS: Tooltip for menu option "Admin"

-#: lib/action.php:470
+#: lib/action.php:553

 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "基本サイト設定"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "基本サイト設定"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.

-#: lib/action.php:473 lib/groupnav.php:117
+#: lib/action.php:556 lib/groupnav.php:117

 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理者"
 
 #. TRANS: Tooltip for main menu option "Invite"
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理者"
 
 #. TRANS: Tooltip for main menu option "Invite"

-#: lib/action.php:477
+#: lib/action.php:560

 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "友人や同僚が %s で加わるよう誘ってください。"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "友人や同僚が %s で加わるよう誘ってください。"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users

-#: lib/action.php:480
+#: lib/action.php:563

 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "招待"
 
 #. TRANS: Tooltip for main menu option "Logout"
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "招待"
 
 #. TRANS: Tooltip for main menu option "Logout"

-#: lib/action.php:486
+#: lib/action.php:569

 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "サイトのテーマ"
 
 #. TRANS: Main menu option when logged in to log out the current user
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "サイトのテーマ"
 
 #. TRANS: Main menu option when logged in to log out the current user

-#: lib/action.php:489
+#: lib/action.php:572

 msgctxt "MENU"
 msgid "Logout"
 msgstr "ロゴ"
 
 #. TRANS: Tooltip for main menu option "Register"
 msgctxt "MENU"
 msgid "Logout"
 msgstr "ロゴ"
 
 #. TRANS: Tooltip for main menu option "Register"

-#: lib/action.php:494
+#: lib/action.php:577

 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "新しいグループを作成"
 
 #. TRANS: Main menu option when not logged in to register a new account
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "新しいグループを作成"
 
 #. TRANS: Main menu option when not logged in to register a new account

-#: lib/action.php:497
+#: lib/action.php:580

 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "登録"
 
 #. TRANS: Tooltip for main menu option "Login"
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "登録"
 
 #. TRANS: Tooltip for main menu option "Login"

-#: lib/action.php:500
+#: lib/action.php:583

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "サイトへログイン"
 
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "サイトへログイン"
 

-#: lib/action.php:503
+#. TRANS: Main menu option when not logged in to log in
+#: lib/action.php:586

 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANS: Tooltip for main menu option "Help"
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANS: Tooltip for main menu option "Help"

-#: lib/action.php:506
+#: lib/action.php:589

 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ヘルプ"
 
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ヘルプ"
 

-#: lib/action.php:509
+#. TRANS: Main menu option for help on the StatusNet site
+#: lib/action.php:592

 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Tooltip for main menu option "Search"
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Tooltip for main menu option "Search"

-#: lib/action.php:512
+#: lib/action.php:595

 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "もっとグループを検索"
 
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "もっとグループを検索"
 

-#: lib/action.php:515
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: lib/action.php:598

 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"


@@ -5457,67 +6479,68 @@ msgstr "検索"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration

-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:620 lib/adminpanelaction.php:387

 msgid "Site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 msgid "Site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.

-#: lib/action.php:604
+#: lib/action.php:687

 msgid "Local views"
 msgstr "ローカルビュー"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 msgid "Local views"
 msgstr "ローカルビュー"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.

-#: lib/action.php:674
+#: lib/action.php:757

 msgid "Page notice"
 msgstr "ページつぶやき"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 msgid "Page notice"
 msgstr "ページつぶやき"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.

-#: lib/action.php:775
+#: lib/action.php:858

 msgid "Secondary site navigation"
 msgstr "セカンダリサイトナビゲーション"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 msgid "Secondary site navigation"
 msgstr "セカンダリサイトナビゲーション"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.

-#: lib/action.php:781
+#: lib/action.php:864

 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.

-#: lib/action.php:784
+#: lib/action.php:867

 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.

-#: lib/action.php:787
+#: lib/action.php:870

 msgid "FAQ"
 msgstr "よくある質問"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
 msgid "FAQ"
 msgstr "よくある質問"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.

-#: lib/action.php:792
+#: lib/action.php:875

 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.

-#: lib/action.php:796
+#: lib/action.php:879

 msgid "Privacy"
 msgstr "プライバシー"
 
 msgid "Privacy"
 msgstr "プライバシー"
 

-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:882

 msgid "Source"
 msgstr "ソース"
 
 msgid "Source"
 msgstr "ソース"
 

-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:889

 msgid "Contact"
 msgstr "連絡先"
 
 msgid "Contact"
 msgstr "連絡先"
 

-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:892

 msgid "Badge"
 msgstr "バッジ"
 
 #. TRANS: DT element for StatusNet software license.
 msgid "Badge"
 msgstr "バッジ"
 
 #. TRANS: DT element for StatusNet software license.

-#: lib/action.php:837
+#: lib/action.php:921

 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 
 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 


@@ -5525,7 +6548,7 @@ msgstr "StatusNet ソフトウェアライセンス"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby

-#: lib/action.php:844
+#: lib/action.php:928

 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."


@@ -5535,7 +6558,7 @@ msgstr ""
 "イクロブログサービスです。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 "イクロブログサービスです。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.

-#: lib/action.php:847
+#: lib/action.php:931

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** はマイクロブログサービスです。"
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** はマイクロブログサービスです。"


@@ -5544,7 +6567,7 @@ msgstr "**%%site.name%%** はマイクロブログサービスです。"
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.

-#: lib/action.php:854
+#: lib/action.php:938

 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"


@@ -5556,50 +6579,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)。"
 
 #. TRANS: DT element for StatusNet site content license.
 "org/licensing/licenses/agpl-3.0.html)。"
 
 #. TRANS: DT element for StatusNet site content license.

-#: lib/action.php:870
+#: lib/action.php:954

 msgid "Site content license"
 msgstr "サイト内容ライセンス"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 msgid "Site content license"
 msgstr "サイト内容ライセンス"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.

-#: lib/action.php:877
+#: lib/action.php:961

 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.

-#: lib/action.php:884
+#: lib/action.php:968

 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.

-#: lib/action.php:888
+#: lib/action.php:972

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.

-#: lib/action.php:902
+#: lib/action.php:1004

 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).

-#: lib/action.php:1238
+#: lib/action.php:1340

 msgid "Pagination"
 msgstr "ページ化"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 msgid "Pagination"
 msgstr "ページ化"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.

-#: lib/action.php:1249
+#: lib/action.php:1351

 msgid "After"
 msgstr "<<後"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 msgid "After"
 msgstr "<<後"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.

-#: lib/action.php:1259
+#: lib/action.php:1361

 msgid "Before"
 msgstr "前>>"
 
 msgid "Before"
 msgstr "前>>"
 


@@ -5680,7 +6703,7 @@ msgid "User configuration"
 msgstr "ユーザ設定"
 
 #. TRANS: Menu item for site administration
 msgstr "ユーザ設定"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118

 msgid "User"
 msgstr "ユーザ"
 
 msgid "User"
 msgstr "ユーザ"
 


@@ -5724,41 +6747,65 @@ msgstr ""
 "いません。"
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
 "いません。"
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.

-#: lib/apiauth.php:175
+#: lib/apiauth.php:177

 msgid "No application for that consumer key."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "No application for that consumer key."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.

-#: lib/apiauth.php:212
+#: lib/apiauth.php:219

 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).

-#: lib/apiauth.php:217
+#: lib/apiauth.php:224

 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.

-#: lib/apiauth.php:258 lib/apiauth.php:290
+#: lib/apiauth.php:266 lib/apiauth.php:293

 msgid "Could not authenticate you."
 msgstr ""
 
 msgid "Could not authenticate you."
 msgstr ""
 

+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#: lib/apioauthstore.php:45
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "別名を作成できません。"
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#: lib/apioauthstore.php:69
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "アプリケーションを作成できません。"
+
+#. TRANS: Exception thrown when no token association could be found.
+#: lib/apioauthstore.php:151
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#: lib/apioauthstore.php:186
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "メッセージを追加できません。"
+
+#. TRANS: Server error displayed when a database error occurs.
+#: lib/apioauthstore.php:243
+msgid "Database error inserting OAuth application user."
+msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
+

 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.

-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:285

 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.

-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:290

 msgid "Failed to delete revoked token."
 msgstr ""
 
 msgid "Failed to delete revoked token."
 msgstr ""
 

-#. TRANS: Form legend.
-#: lib/applicationeditform.php:129
-msgid "Edit application"
-msgstr "アプリケーション編集"
-

 #. TRANS: Form guide.
 #: lib/applicationeditform.php:178
 msgid "Icon for this application"
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:178
 msgid "Icon for this application"


@@ -5839,26 +6886,37 @@ msgstr ""
 msgid "Cancel"
 msgstr "中止"
 
 msgid "Cancel"
 msgstr "中止"
 

+#: lib/applicationlist.php:247
+msgid " by "
+msgstr ""
+

 #. TRANS: Application access type
 #. TRANS: Application access type

-#: lib/applicationlist.php:134
+#: lib/applicationlist.php:260

 #, fuzzy
 msgid "read-write"
 msgstr "リードライト"
 
 #. TRANS: Application access type
 #, fuzzy
 msgid "read-write"
 msgstr "リードライト"
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:262

 #, fuzzy
 msgid "read-only"
 msgstr "リードオンリー"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
 #, fuzzy
 msgid "read-only"
 msgstr "リードオンリー"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")

-#: lib/applicationlist.php:142
+#: lib/applicationlist.php:268

 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 

+#. TRANS: Access token in the application list.
+#. TRANS: %s are the first 7 characters of the access token.
+#: lib/applicationlist.php:282
+#, php-format
+msgid "Access token starting with: %s"
+msgstr ""
+

 #. TRANS: Button label
 #. TRANS: Button label

-#: lib/applicationlist.php:157
+#: lib/applicationlist.php:298

 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "回復"
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "回復"


@@ -5867,18 +6925,13 @@ msgstr "回復"
 msgid "author element must contain a name element."
 msgstr ""
 
 msgid "author element must contain a name element."
 msgstr ""
 

-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "添付"
-

 #. TRANS: DT element label in attachment list item.
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:256
+#: lib/attachmentlist.php:294

 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.
 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:270
+#: lib/attachmentlist.php:308

 msgid "Provider"
 msgstr "プロバイダ"
 
 msgid "Provider"
 msgstr "プロバイダ"
 


@@ -5921,7 +6974,7 @@ msgid "AJAX error"
 msgstr "Ajax エラー"
 
 #. TRANS: E-mail subject when a command has completed.
 msgstr "Ajax エラー"
 
 #. TRANS: E-mail subject when a command has completed.

-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143

 msgid "Command complete"
 msgstr "コマンド完了"
 
 msgid "Command complete"
 msgstr "コマンド完了"
 


@@ -5938,7 +6991,7 @@ msgstr "その ID によるつぶやきは存在していません"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.

-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630

 #, fuzzy
 msgid "User has no last notice."
 msgstr "利用者はまだつぶやいていません"
 #, fuzzy
 msgid "User has no last notice."
 msgstr "利用者はまだつぶやいていません"


@@ -6008,6 +7061,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
 msgid "%1$s left group %2$s."
 msgstr ""
 

+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+

 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format


@@ -6015,15 +7076,17 @@ msgid "Fullname: %s"
 msgstr "フルネーム： %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 msgstr "フルネーム： %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.

-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:434 lib/mail.php:268
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a location.
+#: lib/command.php:434 lib/mail.php:278

 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.

-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:438 lib/mail.php:271
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a homepage.
+#: lib/command.php:438 lib/mail.php:282

 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"


@@ -6043,171 +7106,173 @@ msgid ""
 "same server."
 msgstr ""
 
 "same server."
 msgstr ""
 

-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.

 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:488 lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
+#: lib/command.php:488
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"

 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.

-#: lib/command.php:514
+#: lib/command.php:516

 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ送信エラー。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ送信エラー。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.

-#: lib/command.php:551
+#: lib/command.php:553

 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "%s からつぶやきが繰り返されています"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "%s からつぶやきが繰り返されています"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.

-#: lib/command.php:554
+#: lib/command.php:556

 msgid "Error repeating notice."
 msgstr "つぶやき繰り返しエラー"
 
 msgid "Error repeating notice."
 msgstr "つぶやき繰り返しエラー"
 

-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.

 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:589
+#: lib/command.php:591

 #, fuzzy, php-format
 #, fuzzy, php-format

-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"

 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.

-#: lib/command.php:600
+#: lib/command.php:604

 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%s へ返信を送りました"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%s へ返信を送りました"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.

-#: lib/command.php:603
+#: lib/command.php:607

 msgid "Error saving notice."
 msgstr "つぶやき保存エラー。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 msgid "Error saving notice."
 msgstr "つぶやき保存エラー。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.

-#: lib/command.php:650
+#: lib/command.php:654

 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "フォローする利用者の名前を指定してください"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "フォローする利用者の名前を指定してください"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.

-#: lib/command.php:659
+#: lib/command.php:663

 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.

-#: lib/command.php:667
+#: lib/command.php:671

 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.

-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803

 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "フォローをやめるユーザの名前を指定してください"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "フォローをやめるユーザの名前を指定してください"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:699
+#: lib/command.php:703

 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.

-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749

 msgid "Command not yet implemented."
 msgstr "コマンドはまだ実装されていません。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
 msgid "Command not yet implemented."
 msgstr "コマンドはまだ実装されていません。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.

-#: lib/command.php:723
+#: lib/command.php:727

 msgid "Notification off."
 msgstr "通知オフ。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 msgid "Notification off."
 msgstr "通知オフ。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.

-#: lib/command.php:726
+#: lib/command.php:730

 msgid "Can't turn off notification."
 msgstr "通知をオフできません。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
 msgid "Can't turn off notification."
 msgstr "通知をオフできません。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.

-#: lib/command.php:749
+#: lib/command.php:753

 msgid "Notification on."
 msgstr "通知オン。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
 msgid "Notification on."
 msgstr "通知オン。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.

-#: lib/command.php:752
+#: lib/command.php:756

 msgid "Can't turn on notification."
 msgstr "通知をオンできません。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
 msgid "Can't turn on notification."
 msgstr "通知をオンできません。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.

-#: lib/command.php:766
+#: lib/command.php:770

 #, fuzzy
 msgid "Login command is disabled."
 msgstr "ログインコマンドが無効になっています。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
 #, fuzzy
 msgid "Login command is disabled."
 msgstr "ログインコマンドが無効になっています。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..

-#: lib/command.php:779
+#: lib/command.php:783

 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:808
+#: lib/command.php:812

 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.

-#: lib/command.php:826
+#: lib/command.php:830

 msgid "You are not subscribed to anyone."
 msgstr "あなたはだれにもフォローされていません。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 msgid "You are not subscribed to anyone."
 msgstr "あなたはだれにもフォローされていません。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.

-#: lib/command.php:831
+#: lib/command.php:835

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "あなたはこの人にフォローされています:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "あなたはこの人にフォローされています:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.

-#: lib/command.php:853
+#: lib/command.php:857

 msgid "No one is subscribed to you."
 msgstr "誰もフォローしていません。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 msgid "No one is subscribed to you."
 msgstr "誰もフォローしていません。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.

-#: lib/command.php:858
+#: lib/command.php:862

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "この人はあなたにフォローされている:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "この人はあなたにフォローされている:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.

-#: lib/command.php:880
+#: lib/command.php:884

 msgid "You are not a member of any groups."
 msgstr "あなたはどのグループのメンバーでもありません。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 msgid "You are not a member of any groups."
 msgstr "あなたはどのグループのメンバーでもありません。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.

-#: lib/command.php:885
+#: lib/command.php:889

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "あなたはこのグループのメンバーではありません:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "あなたはこのグループのメンバーではありません:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.

-#: lib/command.php:900
+#: lib/command.php:904

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -6250,18 +7315,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.

-#: lib/common.php:136
-msgid "No configuration file found. "
+#: lib/common.php:147
+#, fuzzy
+msgid "No configuration file found."

 msgstr "コンフィギュレーションファイルがありません。 "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
 msgstr "コンフィギュレーションファイルがありません。 "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).

-#: lib/common.php:139
-msgid "I looked for configuration files in the following places: "
+#: lib/common.php:150
+#, fuzzy
+msgid "I looked for configuration files in the following places:"

 msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.

-#: lib/common.php:142
+#: lib/common.php:153

 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"


@@ -6269,7 +7336,7 @@ msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.

-#: lib/common.php:146
+#: lib/common.php:157

 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 


@@ -6297,26 +7364,29 @@ msgstr "SMS"
 msgid "Updates by SMS"
 msgstr "SMSでの更新"
 
 msgid "Updates by SMS"
 msgstr "SMSでの更新"
 

-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.

 #: lib/connectsettingsaction.php:120
 #, fuzzy
 msgctxt "MENU"
 msgid "Connections"
 msgstr "接続"
 
 #: lib/connectsettingsaction.php:120
 #, fuzzy
 msgctxt "MENU"
 msgid "Connections"
 msgstr "接続"
 

-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.

 #: lib/connectsettingsaction.php:122
 msgid "Authorized connected applications"
 msgstr "承認された接続アプリケーション"
 
 #: lib/connectsettingsaction.php:122
 msgid "Authorized connected applications"
 msgstr "承認された接続アプリケーション"
 

-#: lib/dberroraction.php:60
+#: lib/dberroraction.php:59

 msgid "Database error"
 msgstr "データベースエラー"
 
 msgid "Database error"
 msgstr "データベースエラー"
 

-#: lib/designsettings.php:105
+#. TRANS: Label in form on profile design page.
+#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
+#: lib/designsettings.php:104

 msgid "Upload file"
 msgstr "ファイルアップロード"
 
 msgid "Upload file"
 msgstr "ファイルアップロード"
 

+#. TRANS: Instructions for form on profile design page.

 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."


@@ -6324,7 +7394,29 @@ msgstr ""
 "自分のバックグラウンド画像をアップロードできます。最大ファイルサイズは 2MB で"
 "す。"
 
 "自分のバックグラウンド画像をアップロードできます。最大ファイルサイズは 2MB で"
 "す。"
 

-#: lib/designsettings.php:418
+#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
+#: lib/designsettings.php:139
+#, fuzzy
+msgctxt "RADIO"
+msgid "On"
+msgstr "オン"
+
+#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
+#: lib/designsettings.php:156
+#, fuzzy
+msgctxt "RADIO"
+msgid "Off"
+msgstr "オフ"
+
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr "リセット"
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:433

 msgid "Design defaults restored."
 msgstr "デフォルトのデザインを回復。"
 
 msgid "Design defaults restored."
 msgstr "デフォルトのデザインを回復。"
 


@@ -6336,22 +7428,23 @@ msgstr "このつぶやきのお気に入りをやめる"
 msgid "Favor this notice"
 msgstr "このつぶやきをお気に入りにする"
 
 msgid "Favor this notice"
 msgstr "このつぶやきをお気に入りにする"
 

-#: lib/feed.php:85
+#: lib/feed.php:84

 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 

-#: lib/feed.php:87
+#: lib/feed.php:86

 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 
 msgid "RSS 2.0"
 msgstr "RSS 2.0"
 

-#: lib/feed.php:89
+#: lib/feed.php:88

 msgid "Atom"
 msgstr "Atom"
 
 msgid "Atom"
 msgstr "Atom"
 

-#: lib/feed.php:91
+#: lib/feed.php:90

 msgid "FOAF"
 msgstr "FOAF"
 
 msgid "FOAF"
 msgstr "FOAF"
 

+#. TRANS: Header for feed links (h2).

 #: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 #: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""


@@ -6385,8 +7478,13 @@ msgstr "移動"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 

+#: lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
+

 #: lib/groupeditform.php:163
 #: lib/groupeditform.php:163

-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."

 msgstr "グループやトピックのホームページやブログの URL"
 
 #: lib/groupeditform.php:168
 msgstr "グループやトピックのホームページやブログの URL"
 
 #: lib/groupeditform.php:168


@@ -6394,19 +7492,27 @@ msgid "Describe the group or topic"
 msgstr "グループやトピックを記述"
 
 #: lib/groupeditform.php:170
 msgstr "グループやトピックを記述"
 
 #: lib/groupeditform.php:170

-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "グループやトピックを %d 字以内記述"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "グループやトピックを %d 字以内記述"

 
 

-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy

 msgid ""
 msgid ""

-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."

 msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
 
 msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
 

-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr "グループのエクストラニックネーム、カンマまたはスペース区切り、最大 %d"
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"グループのエクストラニックネーム、カンマまたはスペース区切り、最大 %d"

 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86


@@ -6480,15 +7586,19 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
 msgid "Add or edit %s design"
 msgstr ""
 

+#. TRANS: Title for groups with the most members section.

 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "メンバー数が多いグループ"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "メンバー数が多いグループ"
 

+#. TRANS: Title for groups with the most posts section.

 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "投稿が多いグループ"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr "投稿が多いグループ"
 

-#: lib/grouptagcloudsection.php:56
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
+#: lib/grouptagcloudsection.php:57

 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "%s グループのつぶやきにあるタグ"
 #, php-format
 msgid "Tags in %s group's notices"
 msgstr "%s グループのつぶやきにあるタグ"


@@ -6502,39 +7612,54 @@ msgstr "このページはあなたが承認したメディアタイプでは利
 msgid "Unsupported image file format."
 msgstr "サポート外の画像形式です。"
 
 msgid "Unsupported image file format."
 msgstr "サポート外の画像形式です。"
 

-#: lib/imagefile.php:88
+#. TRANS: Exception thrown when too large a file is uploaded.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#: lib/imagefile.php:90

 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。"
 
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。"
 

-#: lib/imagefile.php:93
+#: lib/imagefile.php:95

 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.

-#: lib/imagefile.php:101 lib/mediafile.php:179
+#: lib/imagefile.php:103 lib/mediafile.php:228

 msgid "System error uploading file."
 msgstr "ファイルのアップロードでシステムエラー"
 
 msgid "System error uploading file."
 msgstr "ファイルのアップロードでシステムエラー"
 

-#: lib/imagefile.php:109
+#: lib/imagefile.php:111

 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
 
 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
 

-#: lib/imagefile.php:122
+#: lib/imagefile.php:160

 msgid "Lost our file."
 msgstr "ファイルを紛失。"
 
 msgid "Lost our file."
 msgstr "ファイルを紛失。"
 

-#: lib/imagefile.php:163 lib/imagefile.php:224
+#: lib/imagefile.php:197 lib/imagefile.php:237

 msgid "Unknown file type"
 msgstr "不明なファイルタイプ"
 
 msgid "Unknown file type"
 msgstr "不明なファイルタイプ"
 

-#: lib/imagefile.php:244
-msgid "MB"
-msgstr "MB"
+#. TRANS: Number of megabytes. %d is the number.
+#: lib/imagefile.php:283
+#, fuzzy, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] "MB"
+
+#. TRANS: Number of kilobytes. %d is the number.
+#: lib/imagefile.php:287
+#, fuzzy, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] "kB"

 
 

-#: lib/imagefile.php:246
-msgid "kB"
-msgstr "kB"
+#. TRANS: Number of bytes. %d is the number.
+#: lib/imagefile.php:290
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] ""

 
 #: lib/jabber.php:387
 #, php-format
 
 #: lib/jabber.php:387
 #, php-format


@@ -6558,27 +7683,29 @@ msgstr "ユーザ名とパスワードでログイン"
 msgid "Sign up for a new account"
 msgstr "新しいアカウントでサインアップ"
 
 msgid "Sign up for a new account"
 msgstr "新しいアカウントでサインアップ"
 

-#. TRANS: Subject for address confirmation email
+#. TRANS: Subject for address confirmation email.

 #: lib/mail.php:174
 msgid "Email address confirmation"
 msgstr "メールアドレス確認"
 
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:174
 msgid "Email address confirmation"
 msgstr "メールアドレス確認"
 
 #. TRANS: Body for address confirmation email.

-#: lib/mail.php:177
-#, php-format
+#. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the URL to confirm at.
+#: lib/mail.php:179
+#, fuzzy, php-format

 msgid ""
 msgid ""

-"Hey, %s.\n"
+"Hey, %1$s.\n"

 "\n"
 "\n"

-"Someone just entered this email address on %s.\n"
+"Someone just entered this email address on %2$s.\n"

 "\n"
 "If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"
 "\n"
 "If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"

-"\t%s\n"
+"\t%3$s\n"

 "\n"
 "If not, just ignore this message.\n"
 "\n"
 "Thanks for your time, \n"
 "\n"
 "If not, just ignore this message.\n"
 "\n"
 "Thanks for your time, \n"

-"%s\n"
+"%2$s\n"

 msgstr ""
 "こんにちは、%s\n"
 "\n"
 msgstr ""
 "こんにちは、%s\n"
 "\n"


@@ -6593,21 +7720,28 @@ msgstr ""
 "ありがとうございます。\n"
 "%s\n"
 
 "ありがとうございます。\n"
 "%s\n"
 

-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
+#. TRANS: Subject of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#: lib/mail.php:246

 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 

-#: lib/mail.php:248
+#. TRANS: This is a paragraph in a new-subscriber e-mail.
+#. TRANS: %s is a URL where the subscriber can be reported as abusive.
+#: lib/mail.php:253

 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 

-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
+#. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
+#. TRANS: %7$s is a link to the addressed user's e-mail settings.
+#: lib/mail.php:263

 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"


@@ -6616,10 +7750,10 @@ msgid ""
 "\n"
 "%4$s%5$s%6$s\n"
 "Faithfully yours,\n"
 "\n"
 "%4$s%5$s%6$s\n"
 "Faithfully yours,\n"

-"%7$s.\n"
+"%2$s.\n"

 "\n"
 "----\n"
 "\n"
 "----\n"

-"Change your email address or notification options at %8$s\n"
+"Change your email address or notification options at %7$s\n"

 msgstr ""
 "%1$s は %2$s であなたのつぶやきを聞いています。\n"
 "\n"
 msgstr ""
 "%1$s は %2$s であなたのつぶやきを聞いています。\n"
 "\n"


@@ -6632,20 +7766,24 @@ msgstr ""
 "----\n"
 "%8$s でメールアドレスか通知オプションを変えてください。\n"
 
 "----\n"
 "%8$s でメールアドレスか通知オプションを変えてください。\n"
 

-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is biographical information.
+#: lib/mail.php:286

 #, php-format
 msgid "Bio: %s"
 msgstr "自己紹介: %s"
 
 #, php-format
 msgid "Bio: %s"
 msgstr "自己紹介: %s"
 

-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
+#. TRANS: Subject of notification mail for new posting email address.
+#. TRANS: %s is the StatusNet sitename.
+#: lib/mail.php:315

 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s へ投稿のための新しいメールアドレス"
 
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s へ投稿のための新しいメールアドレス"
 

-#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:308
+#. TRANS: Body of notification mail for new posting email address.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
+#. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
+#: lib/mail.php:321

 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"


@@ -6655,7 +7793,7 @@ msgid ""
 "More email instructions at %3$s.\n"
 "\n"
 "Faithfully yours,\n"
 "More email instructions at %3$s.\n"
 "\n"
 "Faithfully yours,\n"

-"%4$s"
+"%1$s"

 msgstr ""
 "あなたは %1$s に関する新しい投稿アドレスを持っています。\n"
 "\n"
 msgstr ""
 "あなたは %1$s に関する新しい投稿アドレスを持っています。\n"
 "\n"


@@ -6666,31 +7804,36 @@ msgstr ""
 "忠実である、あなたのもの、\n"
 "%4$s"
 
 "忠実である、あなたのもの、\n"
 "%4$s"
 

-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#: lib/mail.php:442

 #, php-format
 msgid "%s status"
 msgstr "%s の状態"
 
 #, php-format
 msgid "%s status"
 msgstr "%s の状態"
 

-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+#: lib/mail.php:468

 msgid "SMS confirmation"
 msgstr "SMS確認"
 
 msgid "SMS confirmation"
 msgstr "SMS確認"
 

-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
+#. TRANS: Main body heading for SMS-by-email address confirmation message.
+#. TRANS: %s is the addressed user's nickname.
+#: lib/mail.php:472

 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "この電話番号は確認待ちです。"
 
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "この電話番号は確認待ちです。"
 

-#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:484
+#. TRANS: Subject for 'nudge' notification email.
+#. TRANS: %s is the nudging user.
+#: lib/mail.php:493

 #, php-format
 msgid "You've been nudged by %s"
 msgstr "あなたは %s に合図されています"
 
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "あなたは %s に合図されています"
 

-#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:489
+#. TRANS: Body for 'nudge' notification email.
+#. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
+#. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
+#: lib/mail.php:500

 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "


@@ -6717,14 +7860,18 @@ msgstr ""
 "敬具\n"
 "%4$s\n"
 
 "敬具\n"
 "%4$s\n"
 

-#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:536
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#: lib/mail.php:547

 #, php-format
 msgid "New private message from %s"
 msgstr "%s からの新しいプライベートメッセージ"
 
 #, php-format
 msgid "New private message from %s"
 msgstr "%s からの新しいプライベートメッセージ"
 

-#. TRANS: Body for direct-message notification email
-#: lib/mail.php:541
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#: lib/mail.php:555

 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"


@@ -6757,14 +7904,19 @@ msgstr ""
 "敬具\n"
 "%5$s\n"
 
 "敬具\n"
 "%5$s\n"
 

-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, php-format
-msgid "%s (@%s) added your notice as a favorite"
+#. TRANS: Subject for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:607
+#, fuzzy, php-format
+msgid "%1$s (@%2$s) added your notice as a favorite"

 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 

-#. TRANS: Body for favorite notification email
-#: lib/mail.php:592
+#. TRANS: Body for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
+#. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
+#. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
+#. TRANS: %7$s is the adding user's nickname.
+#: lib/mail.php:614

 #, fuzzy, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 #, fuzzy, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"


@@ -6803,7 +7955,7 @@ msgstr ""
 "%6%s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 "%6%s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.

-#: lib/mail.php:651
+#: lib/mail.php:672

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -6811,13 +7963,20 @@ msgid ""
 "\t%s"
 msgstr ""
 
 "\t%s"
 msgstr ""
 

-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
+#. TRANS: E-mail subject for notice notification.
+#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:680
+#, fuzzy, php-format
+msgid "%1$s (@%2$s) sent a notice to your attention"

 msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
 
 #. TRANS: Body of @-reply notification e-mail.
 msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
 
 #. TRANS: Body of @-reply notification e-mail.

-#: lib/mail.php:660
+#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
+#. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
+#: lib/mail.php:688

 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"


@@ -6857,7 +8016,7 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 

-#: lib/mailbox.php:228 lib/noticelist.php:516
+#: lib/mailbox.php:228 lib/noticelist.php:521

 msgid "from"
 msgstr "from"
 
 msgid "from"
 msgstr "from"
 


@@ -6877,27 +8036,27 @@ msgstr "すみません、それはあなたの入って来るメールアドレ
 msgid "Sorry, no incoming email allowed."
 msgstr "すみません、入ってくるメールは許可されていません。"
 
 msgid "Sorry, no incoming email allowed."
 msgstr "すみません、入ってくるメールは許可されていません。"
 

-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229

 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "サポート外のメッセージタイプ: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "サポート外のメッセージタイプ: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.

-#: lib/mediafile.php:99 lib/mediafile.php:125
+#: lib/mediafile.php:102 lib/mediafile.php:174

 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "データベースエラーがあなたのファイルを保存しているときにありました。 再試行し"
 "てください。"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "データベースエラーがあなたのファイルを保存しているときにありました。 再試行し"
 "てください。"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.

-#: lib/mediafile.php:145
+#: lib/mediafile.php:194

 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "アップロードされたファイルは php.ini の upload_max_filesize ディレクティブを"
 "超えています。"
 
 #. TRANS: Client exception.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "アップロードされたファイルは php.ini の upload_max_filesize ディレクティブを"
 "超えています。"
 
 #. TRANS: Client exception.

-#: lib/mediafile.php:151
+#: lib/mediafile.php:200

 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."


@@ -6906,46 +8065,46 @@ msgstr ""
 "ティブを超えています。"
 
 #. TRANS: Client exception.
 "ティブを超えています。"
 
 #. TRANS: Client exception.

-#: lib/mediafile.php:157
+#: lib/mediafile.php:206

 msgid "The uploaded file was only partially uploaded."
 msgstr "アップロードされたファイルは部分的にアップロードされていただけです。"
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
 msgid "The uploaded file was only partially uploaded."
 msgstr "アップロードされたファイルは部分的にアップロードされていただけです。"
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.

-#: lib/mediafile.php:165
+#: lib/mediafile.php:214

 msgid "Missing a temporary folder."
 msgstr "一時フォルダを失いました。"
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
 msgid "Missing a temporary folder."
 msgstr "一時フォルダを失いました。"
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.

-#: lib/mediafile.php:169
+#: lib/mediafile.php:218

 msgid "Failed to write file to disk."
 msgstr "ディスクへのファイル書き込みに失敗しました。"
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
 msgid "Failed to write file to disk."
 msgstr "ディスクへのファイル書き込みに失敗しました。"
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.

-#: lib/mediafile.php:173
+#: lib/mediafile.php:222

 msgid "File upload stopped by extension."
 msgstr "エクステンションによってファイルアップロードを中止しました。"
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
 msgid "File upload stopped by extension."
 msgstr "エクステンションによってファイルアップロードを中止しました。"
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.

-#: lib/mediafile.php:189 lib/mediafile.php:232
+#: lib/mediafile.php:238 lib/mediafile.php:281

 msgid "File exceeds user's quota."
 msgstr "ファイルはユーザの割当てを超えています。"
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
 msgid "File exceeds user's quota."
 msgstr "ファイルはユーザの割当てを超えています。"
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.

-#: lib/mediafile.php:209 lib/mediafile.php:251
+#: lib/mediafile.php:258 lib/mediafile.php:300

 msgid "File could not be moved to destination directory."
 msgstr "ファイルを目的ディレクトリに動かすことができませんでした。"
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
 msgid "File could not be moved to destination directory."
 msgstr "ファイルを目的ディレクトリに動かすことができませんでした。"
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.

-#: lib/mediafile.php:216 lib/mediafile.php:257
+#: lib/mediafile.php:265 lib/mediafile.php:306

 msgid "Could not determine file's MIME type."
 msgstr "ファイルのMIMEタイプを決定できません。"
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
 msgid "Could not determine file's MIME type."
 msgstr "ファイルのMIMEタイプを決定できません。"
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.

-#: lib/mediafile.php:340
+#: lib/mediafile.php:394

 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "


@@ -6954,7 +8113,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.

-#: lib/mediafile.php:345
+#: lib/mediafile.php:399

 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""


@@ -6963,20 +8122,51 @@ msgstr ""
 msgid "Send a direct notice"
 msgstr "直接つぶやきを送る"
 
 msgid "Send a direct notice"
 msgstr "直接つぶやきを送る"
 

-#: lib/messageform.php:146
+#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
+#: lib/messageform.php:137
+#, fuzzy
+msgid "Select recipient:"
+msgstr "キャリア選択"
+
+#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#: lib/messageform.php:150
+#, fuzzy
+msgid "No mutual subscribers."
+msgstr "フォローしていません！"
+
+#: lib/messageform.php:153

 msgid "To"
 msgstr "To"
 
 msgid "To"
 msgstr "To"
 

-#: lib/messageform.php:159 lib/noticeform.php:186
+#: lib/messageform.php:166 lib/noticeform.php:186

 msgid "Available characters"
 msgstr "利用可能な文字"
 
 msgid "Available characters"
 msgstr "利用可能な文字"
 

-#: lib/messageform.php:178 lib/noticeform.php:237
+#: lib/messageform.php:185 lib/noticeform.php:237

 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "投稿"
 
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "投稿"
 

+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
+"できません。"
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+

 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "つぶやきを送る"
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "つぶやきを送る"


@@ -7011,59 +8201,59 @@ msgstr ""
 "度試みてください"
 
 #. TRANS: Used in coordinates as abbreviation of north
 "度試みてください"
 
 #. TRANS: Used in coordinates as abbreviation of north

-#: lib/noticelist.php:446
+#: lib/noticelist.php:451

 #, fuzzy
 msgid "N"
 msgstr "北"
 
 #. TRANS: Used in coordinates as abbreviation of south
 #, fuzzy
 msgid "N"
 msgstr "北"
 
 #. TRANS: Used in coordinates as abbreviation of south

-#: lib/noticelist.php:448
+#: lib/noticelist.php:453

 #, fuzzy
 msgid "S"
 msgstr "南"
 
 #. TRANS: Used in coordinates as abbreviation of east
 #, fuzzy
 msgid "S"
 msgstr "南"
 
 #. TRANS: Used in coordinates as abbreviation of east

-#: lib/noticelist.php:450
+#: lib/noticelist.php:455

 #, fuzzy
 msgid "E"
 msgstr "東"
 
 #. TRANS: Used in coordinates as abbreviation of west
 #, fuzzy
 msgid "E"
 msgstr "東"
 
 #. TRANS: Used in coordinates as abbreviation of west

-#: lib/noticelist.php:452
+#: lib/noticelist.php:457

 #, fuzzy
 msgid "W"
 msgstr "西"
 
 #, fuzzy
 msgid "W"
 msgstr "西"
 

-#: lib/noticelist.php:454
+#: lib/noticelist.php:459

 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 

-#: lib/noticelist.php:463
+#: lib/noticelist.php:468

 msgid "at"
 msgstr "at"
 
 msgid "at"
 msgstr "at"
 

-#: lib/noticelist.php:512
+#: lib/noticelist.php:517

 msgid "web"
 msgstr ""
 
 msgid "web"
 msgstr ""
 

-#: lib/noticelist.php:578
+#: lib/noticelist.php:583

 msgid "in context"
 msgstr ""
 
 msgid "in context"
 msgstr ""
 

-#: lib/noticelist.php:613
+#: lib/noticelist.php:618

 msgid "Repeated by"
 msgstr ""
 
 msgid "Repeated by"
 msgstr ""
 

-#: lib/noticelist.php:640
+#: lib/noticelist.php:645

 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 
 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 

-#: lib/noticelist.php:641
+#: lib/noticelist.php:646

 msgid "Reply"
 msgstr "返信"
 
 msgid "Reply"
 msgstr "返信"
 

-#: lib/noticelist.php:685
+#: lib/noticelist.php:690

 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 


@@ -7079,52 +8269,52 @@ msgstr "合図"
 msgid "Send a nudge to this user"
 msgstr "このユーザへ合図を送る"
 
 msgid "Send a nudge to this user"
 msgstr "このユーザへ合図を送る"
 

-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294

 msgid "Error inserting new profile."
 msgstr ""
 
 msgid "Error inserting new profile."
 msgstr ""
 

-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302

 msgid "Error inserting avatar."
 msgstr ""
 
 msgid "Error inserting avatar."
 msgstr ""
 

-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322

 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
 msgid "Error inserting remote profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.

-#: lib/oauthstore.php:346
+#: lib/oauthstore.php:362

 msgid "Duplicate notice."
 msgstr ""
 
 msgid "Duplicate notice."
 msgstr ""
 

-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507

 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 

-#: lib/personalgroupnav.php:99
+#: lib/personalgroupnav.php:102

 msgid "Personal"
 msgstr "パーソナル"
 
 msgid "Personal"
 msgstr "パーソナル"
 

-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:107

 msgid "Replies"
 msgstr "返信"
 
 msgid "Replies"
 msgstr "返信"
 

-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:117

 msgid "Favorites"
 msgstr "お気に入り"
 
 msgid "Favorites"
 msgstr "お気に入り"
 

-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:128

 msgid "Inbox"
 msgstr "受信箱"
 
 msgid "Inbox"
 msgstr "受信箱"
 

-#: lib/personalgroupnav.php:126
+#: lib/personalgroupnav.php:129

 msgid "Your incoming messages"
 msgstr "あなたの入ってくるメッセージ"
 
 msgid "Your incoming messages"
 msgstr "あなたの入ってくるメッセージ"
 

-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:133

 msgid "Outbox"
 msgstr "送信箱"
 
 msgid "Outbox"
 msgstr "送信箱"
 

-#: lib/personalgroupnav.php:131
+#: lib/personalgroupnav.php:134

 msgid "Your sent messages"
 msgstr "あなたが送ったメッセージ"
 
 msgid "Your sent messages"
 msgstr "あなたが送ったメッセージ"
 


@@ -7216,9 +8406,11 @@ msgstr "このつぶやきを繰り返す"
 msgid "Revoke the \"%s\" role from this user"
 msgstr "このグループからこのユーザをブロック"
 
 msgid "Revoke the \"%s\" role from this user"
 msgstr "このグループからこのユーザをブロック"
 

-#: lib/router.php:711
-msgid "No single user defined for single-user mode."
-msgstr "single-user　モードのためのシングルユーザが定義されていません。"
+#. TRANS: Client error on action trying to visit a non-existing page.
+#: lib/router.php:938
+#, fuzzy
+msgid "Page not found."
+msgstr "API メソッドが見つかりません。"

 
 #: lib/sandboxform.php:67
 msgid "Sandbox"
 
 #: lib/sandboxform.php:67
 msgid "Sandbox"


@@ -7229,16 +8421,17 @@ msgid "Sandbox this user"
 msgstr "このユーザをサンドボックス"
 
 #. TRANS: Fieldset legend for the search form.
 msgstr "このユーザをサンドボックス"
 
 #. TRANS: Fieldset legend for the search form.

-#: lib/searchaction.php:121
+#: lib/searchaction.php:120

 msgid "Search site"
 msgstr "サイト検索"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
 msgid "Search site"
 msgstr "サイト検索"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.

-#: lib/searchaction.php:129
+#: lib/searchaction.php:128

 msgid "Keyword(s)"
 msgstr "キーワード"
 
 msgid "Keyword(s)"
 msgstr "キーワード"
 

+#. TRANS: Button text for searching site.

 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"


@@ -7319,6 +8512,12 @@ msgstr "タグ付けとしての人々タグクラウド"
 msgid "None"
 msgstr "なし"
 
 msgid "None"
 msgstr "なし"
 

+#. TRANS: Server exception displayed if a theme name was invalid.
+#: lib/theme.php:74
+#, fuzzy
+msgid "Invalid theme name."
+msgstr "不正なサイズ。"
+

 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""


@@ -7328,8 +8527,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102

-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298

 #, fuzzy
 msgid "Failed saving theme."
 msgstr "アバターの更新に失敗しました。"
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "アバターの更新に失敗しました。"


@@ -7340,29 +8539,31 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
 
 #: lib/themeuploader.php:166
 #, php-format

-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""

 
 

-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179

 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 

-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219

 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 

-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225

 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 

-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242

 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 

-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260

 msgid "Error opening theme archive."
 msgstr "ブロックの削除エラー"
 
 msgid "Error opening theme archive."
 msgstr "ブロックの削除エラー"
 


@@ -7370,6 +8571,13 @@ msgstr "ブロックの削除エラー"
 msgid "Top posters"
 msgstr "上位投稿者"
 
 msgid "Top posters"
 msgstr "上位投稿者"
 

+#. TRANS: Title for the form to unblock a user.
+#: lib/unblockform.php:67
+#, fuzzy
+msgctxt "TITLE"
+msgid "Unblock"
+msgstr "アンブロック"
+

 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "アンサンドボックス"
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr "アンサンドボックス"


@@ -7401,135 +8609,166 @@ msgstr "フォロー解除"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ユーザはプロフィールをもっていません。"
 
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ユーザはプロフィールをもっていません。"
 

-#: lib/userprofile.php:117
+#: lib/userprofile.php:119

 msgid "Edit Avatar"
 msgstr "アバターを編集する"
 
 msgid "Edit Avatar"
 msgstr "アバターを編集する"
 

-#: lib/userprofile.php:234 lib/userprofile.php:248
+#: lib/userprofile.php:236 lib/userprofile.php:250

 msgid "User actions"
 msgstr "利用者アクション"
 
 msgid "User actions"
 msgstr "利用者アクション"
 

-#: lib/userprofile.php:237
+#: lib/userprofile.php:239

 msgid "User deletion in progress..."
 msgstr ""
 
 msgid "User deletion in progress..."
 msgstr ""
 

-#: lib/userprofile.php:263
+#: lib/userprofile.php:265

 msgid "Edit profile settings"
 msgstr "プロファイル設定編集"
 
 msgid "Edit profile settings"
 msgstr "プロファイル設定編集"
 

-#: lib/userprofile.php:264
+#: lib/userprofile.php:266

 msgid "Edit"
 msgstr "編集"
 
 msgid "Edit"
 msgstr "編集"
 

-#: lib/userprofile.php:287
+#: lib/userprofile.php:289

 msgid "Send a direct message to this user"
 msgstr "この利用者にダイレクトメッセージを送る"
 
 msgid "Send a direct message to this user"
 msgstr "この利用者にダイレクトメッセージを送る"
 

-#: lib/userprofile.php:288
+#: lib/userprofile.php:290

 msgid "Message"
 msgstr "メッセージ"
 
 msgid "Message"
 msgstr "メッセージ"
 

-#: lib/userprofile.php:326
+#: lib/userprofile.php:331

 #, fuzzy
 msgid "Moderate"
 msgstr "管理"
 
 #, fuzzy
 msgid "Moderate"
 msgstr "管理"
 

-#: lib/userprofile.php:364
+#: lib/userprofile.php:369

 #, fuzzy
 msgid "User role"
 msgstr "ユーザプロファイル"
 
 #, fuzzy
 msgid "User role"
 msgstr "ユーザプロファイル"
 

-#: lib/userprofile.php:366
+#: lib/userprofile.php:371

 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "管理者"
 
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "管理者"
 

-#: lib/userprofile.php:367
+#: lib/userprofile.php:372

 #, fuzzy
 msgctxt "role"
 msgid "Moderator"
 msgstr "管理"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #, fuzzy
 msgctxt "role"
 msgid "Moderator"
 msgstr "管理"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1153
+#: lib/util.php:1276

 msgid "a few seconds ago"
 msgstr "数秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
 msgstr "数秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1156
+#: lib/util.php:1279

 msgid "about a minute ago"
 msgstr "約 1 分前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a minute ago"
 msgstr "約 1 分前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1160
+#: lib/util.php:1283

 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1163
+#: lib/util.php:1286

 msgid "about an hour ago"
 msgstr "約 1 時間前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
 msgstr "約 1 時間前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1167
+#: lib/util.php:1290

 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1170
+#: lib/util.php:1293

 msgid "about a day ago"
 msgstr "約 1 日前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
 msgstr "約 1 日前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1174
+#: lib/util.php:1297

 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1177
+#: lib/util.php:1300

 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1181
+#: lib/util.php:1304

 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
 msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1184
+#: lib/util.php:1307

 msgid "about a year ago"
 msgstr "約 1 年前"
 
 msgid "about a year ago"
 msgstr "約 1 年前"
 

-#: lib/webcolor.php:82
+#: lib/webcolor.php:80

 #, php-format
 msgid "%s is not a valid color!"
 msgstr "%sは有効な色ではありません!"
 
 #, php-format
 msgid "%s is not a valid color!"
 msgstr "%sは有効な色ではありません!"
 

-#: lib/webcolor.php:123
-#, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
+#. TRANS: Validation error for a web colour.
+#. TRANS: %s is the provided (invalid) text for colour.
+#: lib/webcolor.php:120
+#, fuzzy, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex characters."

 msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
 
 msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
 

-#: scripts/restoreuser.php:82
+#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
+#: lib/xmppmanager.php:287
+#, php-format
+msgid "Unknown user. Go to %s to add your address to your account"
+msgstr ""
+
+#. TRANS: Response to XMPP source when it sent too long a message.
+#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
+#: lib/xmppmanager.php:406
+#, fuzzy, php-format
+msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+msgstr[0] "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
+
+#. TRANS: Exception.
+#: lib/xrd.php:64
+#, fuzzy
+msgid "Invalid XML."
+msgstr "不正なサイズ。"
+
+#. TRANS: Exception.
+#: lib/xrd.php:69
+msgid "Invalid XML, missing XRD root."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61

 #, php-format
 #, php-format

-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."

 msgstr ""
 
 msgstr ""
 

-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91

 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "ユーザIDの記述がありません。"
 
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "ユーザIDの記述がありません。"
 

-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98

 #, php-format
 #, php-format

-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""