Merge branch '0.9.x' of gitorious.org:statusnet/mainline 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 c2cdd77822cec2f832f21dd83bca15f7fb21cf1f..4e13fa0e9dde63126901cf729c81337871f159c8 100644 (file)
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -2,9 +2,11 @@
 # 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

+# Author: 青子守歌

 # --
 # This file is distributed under the same license as the StatusNet package.
 #
 # --
 # This file is distributed under the same license as the StatusNet package.
 #


@@ -12,17 +14,17 @@ 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-11-07 20:24+0000\n"
-"PO-Revision-Date: 2010-11-07 20:27:26+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:16+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 (r76266); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); 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-11-05 00:36:07+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"

 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration


@@ -43,18 +45,19 @@ msgstr "登録"
 #. TRANS: Checkbox instructions for admin setting "Private".
 #: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 #. TRANS: Checkbox instructions for admin setting "Private".
 #: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"

-msgstr "匿名ユーザー(ログインしていません)がサイトを見るのを禁止しますか?"
+msgstr ""
+"匿名ユーザー（ログインしていないユーザー）がサイトを見るのを禁止しますか？"

 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"

-msgstr "ã\83\97ã\83©ã\82¤ã\83\90ã\82·ã\83¼"
+msgstr "ã\83\97ã\83©ã\82¤ã\83\99ã\83¼ã\83\88"

 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
 #: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
 #: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."

-msgstr "æ\8b\9bå¾\85ã\81®ã\81¿ç\99»é\8c²ã\81\99ã\82\8b"
+msgstr "æ\8b\9bå¾\85ã\81®ã\81¿ç\99»é\8c²ã\81\95ã\81\9bã\82\8bã\80\82"

 
 #. TRANS: Checkbox label for configuring site as invite only.
 #: actions/accessadminpanel.php:166
 
 #. TRANS: Checkbox label for configuring site as invite only.
 #: actions/accessadminpanel.php:166


@@ -77,6 +80,7 @@ msgid "Save access settings"
 msgstr "アクセス設定の保存"
 
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 msgstr "アクセス設定の保存"
 
 #. TRANS: Tooltip for button to save access settings in site admin panel.

+#. TRANS: Button text for saving theme settings.

 #. 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 label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.


@@ -88,14 +92,13 @@ msgstr "アクセス設定の保存"
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.

-#: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: 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
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198

 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"


@@ -105,13 +108,16 @@ msgstr "保存"
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
 #: 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 "ã\81\9dã\81®ã\82\88ã\81\86ã\81ªã\82¿ã\82°はありません。"
+msgstr "ã\81\9dã\81®ã\82\88ã\81\86ã\81ªã\83\9aã\83¼ã\82¸はありません。"

 
 #. TRANS: Client error when user not found for an action.
 
 #. 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 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 displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.

 #. 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 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.


@@ -128,24 +134,26 @@ msgstr "そのようなタグはありません。"
 #. 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: 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.

-#: actions/all.php:80 actions/apiaccountupdatedeliverydevice.php:110
+#: actions/all.php:80 actions/allrss.php:69
+#: actions/apiaccountupdatedeliverydevice.php:110

 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118

-#: actions/apiaccountupdateprofileimage.php:104 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/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
+#: actions/apiblockcreate.php:96 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:144 actions/remotesubscribe.php:153
+#: 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."
 #: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."


@@ -155,43 +163,43 @@ msgstr "そのようなユーザはいません。"
 #: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 #: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"

-msgstr "%1$s と友人、ページ %2$d"
+msgstr "%1$sとその友人、%2$dページ目"

 
 #. 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: Timeline title for user and friends. %s is a 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: Timeline title for user and friends. %s is a user nickname.

-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:115
+#: 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"
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
 #: lib/personalgroupnav.php:103
 #, php-format
 msgid "%s and friends"

-msgstr "%s と友人"
+msgstr "%sとその友人"

 
 #. TRANS: %s is user nickname.
 #: actions/all.php:108
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 
 #. 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)"
+msgstr "%sの友人のフィード(RSS 1.0)"

 
 #. TRANS: %s is user nickname.
 #: actions/all.php:117
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 
 #. 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)"
+msgstr "%sの友人のフィード(RSS 2.0)"

 
 #. TRANS: %s is user nickname.
 #: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 
 #. TRANS: %s is user nickname.
 #: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"

-msgstr "%s の友人のフィード (Atom)"
+msgstr "%sの友人のフィード(Atom)"

 
 #. 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."
 
 #. 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 と友人のタイムラインです。まだ誰も投稿していません。"
+msgstr "これは%sとその友人のタイムラインですが、まだ誰も投稿していません。"

 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.


@@ -235,7 +243,7 @@ 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.
 
 #. 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:120 actions/apitimelinefriends.php:213
+#: actions/allrss.php:122 actions/apitimelinefriends.php:213

 #: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 #: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"


@@ -276,11 +284,11 @@ msgstr "%2$s に %1$s と友人からの更新があります！"
 #: 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/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/apitimelinegroup.php:147 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/apitimelinementions.php:174 actions/apitimelinepublic.php:239
 #: actions/apitimelineretweetedtome.php:118
 #: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159

-#: actions/apitimelineuser.php:158 actions/apiusershow.php:100
+#: actions/apitimelineuser.php:206 actions/apiusershow.php:100

 msgid "API method not found."
 msgstr "API メソッドが見つかりません。"
 
 msgid "API method not found."
 msgstr "API メソッドが見つかりません。"
 


@@ -311,7 +319,21 @@ msgstr ""
 "sms, im, none"
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
 "sms, im, none"
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.

+#. 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 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.

 #: actions/apiaccountupdatedeliverydevice.php:130
 #: actions/apiaccountupdatedeliverydevice.php:130

+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:322 actions/smssettings.php:301
+#: actions/smssettings.php:454

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


@@ -324,7 +346,8 @@ msgstr "ユーザを更新できませんでした。"
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183

-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 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
 #: 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


@@ -332,7 +355,8 @@ msgid "User has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 msgstr "ユーザはプロフィールをもっていません。"
 
 #. TRANS: Server error displayed if a user profile could not be saved.

-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418

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


@@ -342,7 +366,7 @@ msgstr "プロフィールを保存できませんでした。"
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: 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/designadminpanel.php:120 actions/editapplication.php:121

 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format


@@ -365,8 +389,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: 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
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263

 msgid "Unable to save your design settings."
 msgstr "あなたのデザイン設定を保存できません。"
 
 msgid "Unable to save your design settings."
 msgstr "あなたのデザイン設定を保存できません。"
 


@@ -374,16 +398,59 @@ msgstr "あなたのデザイン設定を保存できません。"
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139

+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179

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

+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
+msgid "Main"
+msgstr ""
+
+#. TRANS: Title for Atom feed. %s is a user nickname.
+#. 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:93 actions/grouprss.php:139
+#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
+#: lib/atomusernoticefeed.php:68
+#, php-format
+msgid "%s timeline"
+msgstr "%s のタイムライン"
+
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. TRANS: %s is a user nickname.
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s フォローしている"
+
+#. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
+#. TRANS: Title for Atom favorites feed.
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "お気に入り"
+
+#. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
+#: actions/apiatomservice.php:126
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s グループメンバー"
+

 #. TRANS: Client error displayed when users try to block themselves.
 #. TRANS: Client error displayed when users try to block themselves.

-#: actions/apiblockcreate.php:104
+#: actions/apiblockcreate.php:105

 msgid "You cannot block yourself!"
 msgstr "自分自身をブロックすることはできません！"
 
 #. TRANS: Server error displayed when blocking a user has failed.
 msgid "You cannot block yourself!"
 msgstr "自分自身をブロックすることはできません！"
 
 #. TRANS: Server error displayed when blocking a user has failed.

-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127

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


@@ -474,7 +541,8 @@ msgid "That status is not a favorite."
 msgstr "そのステータスはお気に入りではありません。"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 msgstr "そのステータスはお気に入りではありません。"
 
 #. TRANS: Client error displayed when removing a favourite has failed.

-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91

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


@@ -504,7 +572,7 @@ msgstr "自分自身をフォロー停止することはできません。"
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
 #: actions/apifriendshipsexists.php:88
 #, fuzzy
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
 #: actions/apifriendshipsexists.php:88
 #, fuzzy

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

 msgstr "ふたつのＩＤかスクリーンネームが必要です。"
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
 msgstr "ふたつのＩＤかスクリーンネームが必要です。"
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.


@@ -517,24 +585,13 @@ msgstr "ソースユーザーを決定できません。"
 msgid "Could not find target user."
 msgstr "ターゲットユーザーを見つけられません。"
 
 msgid "Could not find target user."
 msgstr "ターゲットユーザーを見つけられません。"
 

-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
-"できません。"
-

 #. 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.
 #. 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:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/register.php:214

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


@@ -542,9 +599,9 @@ msgstr "そのニックネームは既に使用されています。他のもの
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/register.php:216

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


@@ -553,10 +610,10 @@ msgstr "有効なニックネームではありません。"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/register.php:223

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


@@ -564,9 +621,9 @@ msgstr "ホームページのURLが不適切です。"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/register.php:226

 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "フルネームが長すぎます。（255字まで）"
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "フルネームが長すぎます。（255字まで）"


@@ -579,9 +636,9 @@ msgstr "フルネームが長すぎます。（255字まで）"
 #. 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.
 #. 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:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:156

 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."


@@ -591,9 +648,9 @@ msgstr[0] "記述が長すぎます。（最長%d字）"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.

-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/register.php:235

 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "場所が長すぎます。（255字まで）"
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "場所が長すぎます。（255字まで）"


@@ -604,8 +661,8 @@ msgstr "場所が長すぎます。（255字まで）"
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. 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:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:176

 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."


@@ -613,7 +670,7 @@ msgstr[0] "別名が多すぎます! 最大 %d。"
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.

-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253

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


@@ -622,8 +679,8 @@ msgstr "不正な別名: \"%s\""
 #. TRANS: %s is the alias that is already in use.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. 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:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:191

 #, 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\" は既に使用されています。他のものを試してみて下さい。"


@@ -631,8 +688,8 @@ msgstr "別名 \"%s\" は既に使用されています。他のものを試し
 #. 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.
 #. 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:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:198

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


@@ -649,22 +706,26 @@ msgid "Group not found."
 msgstr "見つかりません。"
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 msgstr "見つかりません。"
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.

+#. TRANS: Client error displayed when trying to join a group while already a member.

 #. 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:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333

 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.
 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: Client error displayed when trying to join a group while being blocked form joining it.

 #. TRANS: Error text shown when a user tries to join a group they are 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
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 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.
 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: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.

 #. 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:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 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 に参加できません。"


@@ -676,9 +737,11 @@ msgstr "このグループのメンバーではありません。"
 
 #. TRANS: Server error displayed when leaving a group fails.
 #. TRANS: %1$s is a user nickname, $2$s is a group nickname.
 
 #. TRANS: Server error displayed when leaving a group fails.
 #. TRANS: %1$s is a user nickname, $2$s is a group nickname.

+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.

 #. 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:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133

 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."


@@ -716,7 +779,7 @@ msgid "Upload failed."
 msgstr "ファイルアップロード"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
 msgstr "ファイルアップロード"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.

-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102

 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "不正なログイントークンが指定されています。"
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "不正なログイントークンが指定されています。"


@@ -739,18 +802,22 @@ msgid "Request token already authorized."
 msgstr "認証されていません。"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 msgstr "認証されていません。"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.

+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
+#. TRANS: Form validation error message.

 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280

-#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/deletenotice.php:177 actions/disfavor.php:76
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224

 #: 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/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/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
+#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40

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


@@ -770,18 +837,21 @@ msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 
 #. 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 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 when the submitted form contains unexpected data.

 #. 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: 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: Form validation error message when an unsupported argument is used.

 #. 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 IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.

+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.

 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. 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:290 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
+#: actions/smssettings.php:271 lib/designsettings.php:321

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


@@ -796,7 +866,7 @@ msgid "Allow or deny access"
 msgstr "アクセスを許可または拒絶"
 
 #. TRANS: User notification of external application requesting account access.
 msgstr "アクセスを許可または拒絶"
 
 #. TRANS: User notification of external application requesting account access.

-#. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
+#. 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 ""
 #: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""


@@ -827,17 +897,17 @@ msgstr "アカウント"
 #. 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
 #. 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:433
+#: actions/profilesettings.php:106 actions/register.php:432

 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/showgroup.php:240 actions/tagother.php:94

-#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:132
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: lib/userprofile.php:134

 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
 #: actions/apioauthauthorize.php:463 actions/login.php:255
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
 #: actions/apioauthauthorize.php:463 actions/login.php:255

-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120

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


@@ -847,8 +917,8 @@ msgstr "パスワード"
 #. 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.
 #. 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
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
+#: actions/imsettings.php:127 actions/smssettings.php:133

 #: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
 #: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"


@@ -923,9 +993,11 @@ msgstr "他のユーザのステータスを消すことはできません。"
 
 #. 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: 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: Client exception thrown when referencing a non-existing notice.

 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
 #. 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
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92

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


@@ -941,16 +1013,56 @@ msgstr "あなたのつぶやきを繰り返せません。"
 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 
 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 

+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client error shown when using a non-supported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
+#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
+#: actions/atompubshowsubscription.php:122
+#: actions/atompubsubscriptionfeed.php:109
+#, fuzzy
+msgid "HTTP method not supported."
+msgstr "API メソッドが見つかりません。"
+
+#. TRANS: Exception thrown requesting an unsupported notice output format.
+#. TRANS: %s is the requested output format.
+#: actions/apistatusesshow.php:144
+#, fuzzy, php-format
+msgid "Unsupported format: %s"
+msgstr "サポート外の形式です。"
+

 #. TRANS: Client error displayed requesting a deleted status.
 #. TRANS: Client error displayed requesting a deleted status.

-#: actions/apistatusesshow.php:134
+#: actions/apistatusesshow.php:155

 msgid "Status deleted."
 msgstr "ステータスを削除しました。"
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
 msgid "Status deleted."
 msgstr "ステータスを削除しました。"
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.

-#: actions/apistatusesshow.php:141
+#: actions/apistatusesshow.php:162

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

+#. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
+#: actions/apistatusesshow.php:227
+msgid "Can only delete using the Atom format."
+msgstr ""
+
+#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
+msgstr "このつぶやきを削除できません。"
+
+#. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
+#: actions/apistatusesshow.php:249
+#, 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."
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."


@@ -1002,7 +1114,7 @@ msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.

-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134

 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "グループを更新できません。"
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "グループを更新できません。"


@@ -1067,17 +1179,243 @@ msgstr "%s とタグ付けされたつぶやき"
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s に %1$s による更新があります！"
 
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s に %1$s による更新があります！"
 

+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
+#, fuzzy
+msgid "Only the user can add to their own timeline."
+msgstr "ユーザだけがかれら自身のメールボックスを読むことができます。"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
+msgid "Atom post must not be empty."
+msgstr ""
+
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/atompubmembershipfeed.php:230
+#: actions/atompubsubscriptionfeed.php:236
+msgid "Atom post must be an Atom entry."
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:336
+msgid "Can only handle POST activities."
+msgstr ""
+
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:347
+#, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr ""
+
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "つぶやきの内容を探す"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:409
+#, fuzzy, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr "その ID によるつぶやきは存在していません"
+

 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API メソッドが工事中です。"
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "API メソッドが工事中です。"
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.

-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94

 #, fuzzy
 msgid "User not found."
 msgstr "API メソッドが見つかりません。"
 
 #, fuzzy
 msgid "User not found."
 msgstr "API メソッドが見つかりません。"
 

+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "そのようなファイルはありません。"
+
+#. TRANS: Client exception thrown when trying to set a favorite for another user.
+#. TRANS: Client exception thrown when trying to subscribe another user.
+#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
+#, fuzzy
+msgid "Cannot add someone else's subscription."
+msgstr "サブスクリプションを追加できません"
+
+#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
+#: actions/atompubfavoritefeed.php:240
+#, fuzzy
+msgid "Can only handle favorite activities."
+msgstr "つぶやきの内容を探す"
+
+#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
+#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "つぶやきの内容を探す"
+
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
+#, fuzzy
+msgid "Unknown note."
+msgstr "不明"
+
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
+#, fuzzy
+msgid "Already a favorite."
+msgstr "お気に入りに加える"
+
+#. TRANS: Title for group membership feed.
+#. TRANS: %s is a username.
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s グループメンバー"
+
+#. TRANS: Client exception thrown when trying subscribe someone else to a group.
+#: actions/atompubmembershipfeed.php:219
+#, fuzzy
+msgid "Cannot add someone else's membership."
+msgstr "サブスクリプションを追加できません"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "つぶやきの内容を探す"
+
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
+#, fuzzy
+msgid "Unknown group."
+msgstr "不明"
+
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
+#, fuzzy
+msgid "Already a member."
+msgstr "全てのメンバー"
+
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
+msgid "Blocked by admin."
+msgstr ""
+
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+#: actions/atompubshowfavorite.php:90
+#, fuzzy
+msgid "No such favorite."
+msgstr "そのようなファイルはありません。"
+
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Cannot delete someone else's favorite."
+msgstr "お気に入りを取り消すことができません。"
+
+#. TRANS: Client exception thrown when referencing a non-existing group.
+#. 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 update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave 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.
+#: actions/atompubshowmembership.php:81 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:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+msgstr "そのようなグループはありません。"
+
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
+#, fuzzy
+msgid "Not a member."
+msgstr "全てのメンバー"
+
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, fuzzy
+msgid "Cannot delete someone else's membership."
+msgstr "フォローを保存できません。"
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
+#. TRANS: %d is the non-existing profile ID number.
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:83
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d."
+msgstr "そのようなファイルはありません。"
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
+#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
+#: actions/atompubshowsubscription.php:94
+#, fuzzy, php-format
+msgid "Profile %1$d not subscribed to profile %2$d."
+msgstr "あなたはそのプロファイルにフォローされていません。"
+
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
+#, fuzzy
+msgid "Cannot delete someone else's subscription."
+msgstr "フォローを保存できません。"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:249
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
+msgid "Can only follow people."
+msgstr ""
+
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
+msgstr "不明なファイルタイプ"
+

 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."


@@ -1086,10 +1424,11 @@ msgstr "そのような添付はありません。"
 #. 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 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 when trying to change group logo settings without having a nickname.

 #. 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
 #. 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:87 actions/groupmembers.php:76

 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "ニックネームがありません。"
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "ニックネームがありません。"


@@ -1120,42 +1459,50 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "自分のアバターをアップロードできます。最大サイズは%sです。"
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
 msgstr "自分のアバターをアップロードできます。最大サイズは%sです。"
 
 #. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.

+#. TRANS: Server error displayed coming across a request from a user without a profile.

 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192

-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190

 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "合っているプロフィールのないユーザ"
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "合っているプロフィールのないユーザ"
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.

+#. TRANS: Legend for group logo settings fieldset.

 #: actions/avatarsettings.php:122 actions/avatarsettings.php:205
 #: actions/avatarsettings.php:122 actions/avatarsettings.php:205

-#: actions/grouplogo.php:254
+#: actions/grouplogo.php:263

 msgid "Avatar settings"
 msgstr "アバター設定"
 
 #. 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).
 msgid "Avatar settings"
 msgstr "アバター設定"
 
 #. 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).

+#. TRANS: Uploaded original file in group logo form.
+#. TRANS: Header for originally uploaded file before a crop on the group logo page.

 #: actions/avatarsettings.php:131 actions/avatarsettings.php:214
 #: actions/avatarsettings.php:131 actions/avatarsettings.php:214

-#: actions/grouplogo.php:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272

 msgid "Original"
 msgstr "オリジナル"
 
 #. 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).
 msgid "Original"
 msgstr "オリジナル"
 
 #. 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).

+#. TRANS: Header for preview of to be displayed group logo.
+#. TRANS: Header for the cropped group logo on the group logo page.

 #: actions/avatarsettings.php:147 actions/avatarsettings.php:227
 #: actions/avatarsettings.php:147 actions/avatarsettings.php:227

-#: actions/grouplogo.php:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285

 msgid "Preview"
 msgstr "プレビュー"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 msgid "Preview"
 msgstr "プレビュー"
 
 #. TRANS: Button on avatar upload page to delete current avatar.

-#: actions/avatarsettings.php:155
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "削除"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "削除"
 
 #. TRANS: Button on avatar upload page to upload an avatar.

-#: actions/avatarsettings.php:173
+#. TRANS: Submit button to confirm upload of a user backup file for account restore.
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:369

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"


@@ -1180,7 +1527,8 @@ msgid "Pick a square area of the image to be your avatar"
 msgstr "あなたのアバターとなるイメージを正方形で指定"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 msgstr "あなたのアバターとなるイメージを正方形で指定"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.

-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393

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


@@ -1199,6 +1547,45 @@ msgstr "アバターの更新に失敗しました。"
 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 
 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 

+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:464
+msgid "Backup account"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "ログインユーザだけがつぶやきを繰り返せます。"
+
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "バックグラウンド"
+
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
+msgid "Backup your account"
+msgstr ""
+

 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
 msgid "You already blocked that user."
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
 msgid "You already blocked that user."


@@ -1230,14 +1617,13 @@ msgstr ""
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:154 actions/deleteapplication.php:157
 #: actions/deletegroup.php:220 actions/deletenotice.php:155
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:154 actions/deleteapplication.php:157
 #: actions/deletegroup.php:220 actions/deletenotice.php:155

-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178

 msgctxt "BUTTON"
 msgid "No"
 msgstr "ノート"
 
 #. TRANS: Submit button title for 'No' when blocking 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:158 actions/deleteuser.php:156
+#: actions/block.php:158

 msgid "Do not block this user"
 msgstr "このユーザをアンブロックする"
 
 msgid "Do not block this user"
 msgstr "このユーザをアンブロックする"
 


@@ -1249,11 +1635,10 @@ msgstr "このユーザをアンブロックする"
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:161 actions/deleteapplication.php:164
 #: actions/deletegroup.php:227 actions/deletenotice.php:162
 #. TRANS: Button label on the form to block a user from a group.
 #: 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
+#: actions/deleteuser.php:161 actions/groupblock.php:185

 msgctxt "BUTTON"
 msgid "Yes"
 msgctxt "BUTTON"
 msgid "Yes"

-msgstr "Yes"
+msgstr "はい"

 
 #. 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.


@@ -1266,31 +1651,6 @@ msgstr "このユーザをブロックする"
 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.
-#: 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/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "そのようなグループはありません。"
-

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


@@ -1361,23 +1721,6 @@ msgstr "不明なアドレスタイプ %s"
 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 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.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:331
-#: actions/emailsettings.php:477 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 "ユーザを更新できません"
-

 #. 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
 #. 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


@@ -1408,6 +1751,79 @@ msgstr "会話"
 msgid "Notices"
 msgstr "つぶやき"
 
 msgid "Notices"
 msgstr "つぶやき"
 

+#. TRANS: Client exception displayed trying to delete a user account while not logged in.
+#: actions/deleteaccount.php:71
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "ログインユーザだけがつぶやきを繰り返せます。"
+
+#. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "ユーザを削除できません"
+
+#. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
+#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
+msgid "I am sure."
+msgstr ""
+
+#. TRANS: Notification for user about the text that must be input to be able to delete a user account.
+#. TRANS: %s is the text that needs to be input.
+#: actions/deleteaccount.php:164
+#, php-format
+msgid "You must write  \"%s\" exactly in the box."
+msgstr ""
+
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
+#, fuzzy
+msgid "Account deleted."
+msgstr "アバターが削除されました。"
+
+#. TRANS: Page title for page on which a user account can be deleted.
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
+#, fuzzy
+msgid "Delete account"
+msgstr "新しいグループを作成"
+
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
+msgid ""
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
+msgstr ""
+
+#. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
+#. TRANS: %s is a URL to the backup page.
+#: actions/deleteaccount.php:285
+#, php-format
+msgid ""
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
+msgstr ""
+
+#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:262 actions/register.php:440
+msgid "Confirm"
+msgstr "パスワード確認"
+
+#. TRANS: Input title for the delete account field.
+#. TRANS: %s is the text that needs to be input.
+#: actions/deleteaccount.php:304
+#, fuzzy, php-format
+msgid "Enter \"%s\" to confirm that you want to delete your account."
+msgstr "ユーザを削除できません"
+
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "ユーザを削除できません"
+

 #. 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."
 #. 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."


@@ -1428,7 +1844,7 @@ msgstr "このアプリケーションのオーナーではありません。"
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118

-#: lib/action.php:1404
+#: lib/action.php:1409

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


@@ -1466,8 +1882,10 @@ 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.
 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
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89

 #, fuzzy
 msgid "No nickname or ID."
 msgstr "ニックネームがありません。"
 #, fuzzy
 msgid "No nickname or ID."
 msgstr "ニックネームがありません。"


@@ -1523,10 +1941,11 @@ msgid "Delete this group"
 msgstr "このユーザを削除"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 msgstr "このユーザを削除"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.

+#. TRANS: Client error displayed when trying to remove a favorite 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 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.

-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 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/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


@@ -1536,11 +1955,6 @@ msgstr "このユーザを削除"
 msgid "Not logged in."
 msgstr "ログインしていません。"
 
 msgid "Not logged in."
 msgstr "ログインしていません。"
 

-#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/deletenotice.php:78
-msgid "Can't delete this notice."
-msgstr "このつぶやきを削除できません。"
-

 #. TRANS: Instructions for deleting a notice.
 #: actions/deletenotice.php:110
 msgid ""
 #. TRANS: Instructions for deleting a notice.
 #: actions/deletenotice.php:110
 msgid ""


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

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

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

-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66

 msgid "You cannot delete users."
 msgstr "ユーザを削除できません"
 
 msgid "You cannot delete users."
 msgstr "ユーザを削除できません"
 

+#. TRANS: Client error displayed when trying to delete a non-local user.

 #: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "ローカルユーザのみ削除できます。"
 
 #: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr "ローカルユーザのみ削除できます。"
 

-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
+msgid "Delete user"
+msgstr "ユーザ削除"
+
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134

 msgid "Delete user"
 msgstr "ユーザ削除"
 
 msgid "Delete user"
 msgstr "ユーザ削除"
 

-#: actions/deleteuser.php:136
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138

 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."


@@ -1591,81 +2016,105 @@ msgstr ""
 "あなたは本当にこのユーザを削除したいですか? これはバックアップなしでデータ"
 "ベースからユーザに関するすべてのデータをクリアします。"
 
 "あなたは本当にこのユーザを削除したいですか? これはバックアップなしでデータ"
 "ベースからユーザに関するすべてのデータをクリアします。"
 

+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "このつぶやきを削除できません。"
+

 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Submit button title for 'Yes' when deleting a user.

-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75

 msgid "Delete this user"
 msgstr "このユーザを削除"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 msgid "Delete this user"
 msgstr "このユーザを削除"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.

-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134

 msgid "Design"
 msgstr "デザイン"
 
 msgid "Design"
 msgstr "デザイン"
 

-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71

 msgid "Design settings for this StatusNet site"
 msgstr ""
 
 msgid "Design settings for this StatusNet site"
 msgstr ""
 

-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327

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

-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333

 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "不正なロゴ URL"
 
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "不正なロゴ URL"
 

-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339

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

-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437

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

-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444

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

-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452

 #, fuzzy
 msgid "SSL logo"
 msgstr "サイトロゴ"
 
 #, fuzzy
 msgid "SSL logo"
 msgstr "サイトロゴ"
 

-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467

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

-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485

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

+#. TRANS: Title for field label for dropdown to choose site theme.

 #: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "サイトのテーマ"
 
 #: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr "サイトのテーマ"
 

-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494

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

-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499

 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 ""
 

+#. TRANS: Fieldset legend for theme background image.

 #. TRANS: Fieldset legend on profile design page.
 #. TRANS: Fieldset legend on profile design page.

-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98

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

+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.

 #. TRANS: Label on profile design page for setting a profile page background colour.
 #. TRANS: Label on profile design page for setting a profile page background colour.

-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609

 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "バックグラウンド"
 
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "バックグラウンド"
 

-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527

 #, 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"


@@ -1675,98 +2124,108 @@ 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:553
+#: actions/designadminpanel.php:558

 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:570
+#: actions/designadminpanel.php:575

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

+#. TRANS: Form guide for turning background image on or off on theme designer page.

 #. 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.
 #. 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
+#: actions/designadminpanel.php:577 lib/designsettings.php:159

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

+#. TRANS: Checkbox label to title background image on theme designer page.

 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
 #. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.

-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165

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

-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"

 msgstr "色の変更"
 
 msgstr "色の変更"
 

+#. TRANS: Field label for content color selector.

 #. TRANS: Label on profile design page for setting a profile page content colour.
 #. TRANS: Label on profile design page for setting a profile page content colour.

-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197

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

+#. TRANS: Field label for sidebar color selector.

 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.

-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211

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

+#. TRANS: Field label for text color selector.

 #. TRANS: Label on profile design page for setting a profile page text colour.
 #. TRANS: Label on profile design page for setting a profile page text colour.

-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225

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

+#. TRANS: Field label for link color selector.

 #. TRANS: Label on profile design page for setting a profile page links colour.
 #. TRANS: Label on profile design page for setting a profile page links colour.

-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239

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

-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691

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

-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696

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

-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"

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

+#. TRANS: Title for button for resetting theme settings.

 #. TRANS: Title for button on profile design page to reset all colour settings to default.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.

-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259

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

+#. TRANS: Title for button for resetting theme settings.

 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
 #. 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
+#: actions/designadminpanel.php:728 lib/designsettings.php:267

 msgid "Reset back to default"
 msgstr "デフォルトへリセットする"
 
 msgid "Reset back to default"
 msgstr "デフォルトへリセットする"
 

-#. TRANS: Submit button title.
-#: 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 "保存"
-
+#. TRANS: Title for button for saving theme settings.

 #. TRANS: Title for button on profile design page to save settings.
 #. TRANS: Title for button on profile design page to save settings.

-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272

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

-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84

 msgid "This notice is not a favorite!"
 msgstr "このつぶやきはお気に入りではありません!"
 
 msgid "This notice is not a favorite!"
 msgstr "このつぶやきはお気に入りではありません!"
 

-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99

 msgid "Add to favorites"
 msgstr "お気に入りに加える"
 
 msgid "Add to favorites"
 msgstr "お気に入りに加える"
 

-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
+#, fuzzy, php-format
+msgid "No such document \"%s\"."

 msgstr "そのようなドキュメントはありません。\"%s\""
 
 #. TRANS: Title for "Edit application" form.
 msgstr "そのようなドキュメントはありません。\"%s\""
 
 #. TRANS: Title for "Edit application" form.


@@ -1858,14 +2317,16 @@ msgid "Edit %s group"
 msgstr "%s グループを編集"
 
 #. TRANS: Client error displayed trying to edit a group while not logged in.
 msgstr "%s グループを編集"
 
 #. TRANS: Client error displayed trying to edit a group while not logged in.

+#. TRANS: Client error displayed when trying to create 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 "グループを作るにはログインしていなければなりません。"
 
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
 #. 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 "グループを作るにはログインしていなければなりません。"
 
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.

+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.

 #: actions/editgroup.php:110 actions/editgroup.php:176
 #: actions/editgroup.php:110 actions/editgroup.php:176

-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112

 msgid "You must be an admin to edit the group."
 msgstr "グループを編集するには管理者である必要があります。"
 
 msgid "You must be an admin to edit the group."
 msgstr "グループを編集するには管理者である必要があります。"
 


@@ -1876,24 +2337,24 @@ msgstr "このフォームを使ってグループを編集します。"
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.

-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:186

 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "不正な別名: \"%s\""
 
 #. TRANS: Server error displayed when editing a group fails.
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "不正な別名: \"%s\""
 
 #. TRANS: Server error displayed when editing a group fails.

-#: actions/editgroup.php:281
+#: actions/editgroup.php:272

 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.
 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.

-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534

 msgid "Could not create aliases."
 msgstr "別名を作成できません。"
 
 #. TRANS: Group edit form success message.
 msgid "Could not create aliases."
 msgstr "別名を作成できません。"
 
 #. TRANS: Group edit form success message.

-#: actions/editgroup.php:305
+#: actions/editgroup.php:296

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


@@ -1911,12 +2372,12 @@ msgstr "%%site.name%% からのメールを管理。"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.

-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133

 msgid "Email address"
 msgstr "メールアドレス"
 
 #. TRANS: Form note in e-mail settings form.
 msgid "Email address"
 msgstr "メールアドレス"
 
 #. TRANS: Form note in e-mail settings form.

-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113

 msgid "Current confirmed email address."
 msgstr "現在確認されているメールアドレス。"
 
 msgid "Current confirmed email address."
 msgstr "現在確認されているメールアドレス。"
 


@@ -1925,14 +2386,14 @@ msgstr "現在確認されているメールアドレス。"
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.

-#: actions/emailsettings.php:115 actions/emailsettings.php:162
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176

 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "回復"
 
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "回復"
 

-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123

 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."


@@ -1945,15 +2406,15 @@ msgstr ""
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.

-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140

 msgid "Email address, like \"UserName@example.org\""
 msgstr "メールアドレス、\"UserName@example.org\" のような"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 msgid "Email address, like \"UserName@example.org\""
 msgstr "メールアドレス、\"UserName@example.org\" のような"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.

-#: actions/emailsettings.php:143 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"


@@ -1961,115 +2422,123 @@ msgstr "追加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.

-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167

 msgid "Incoming email"
 msgstr "入ってくるメール"
 
 msgid "Incoming email"
 msgstr "入ってくるメール"
 

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

 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.

-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174

 msgid "Send email to this address to post new notices."
 msgstr "新しいつぶやき投稿にこのアドレスへメールする"
 
 msgid "Send email to this address to post new notices."
 msgstr "新しいつぶやき投稿にこのアドレスへメールする"
 

-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.

 #. TRANS: Instructions for incoming SMS e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.

-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182

 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。"
 
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。"
 

+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+

 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.

-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185

 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
 #. TRANS: Form legend for e-mail preferences form.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
 #. TRANS: Form legend for e-mail preferences form.

-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208

 msgid "Email preferences"
 msgstr "メールアドレス"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Email preferences"
 msgstr "メールアドレス"
 
 #. TRANS: Checkbox label in e-mail preferences form.

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

 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:222

 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:229

 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:235

 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:241

 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
-msgid "I want to post notices by email."
-msgstr "メールでつぶやきを投稿したい。"
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:223
+#: actions/emailsettings.php:247

 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:368

 #, 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:388

 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:396

 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:401 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:405

 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:409

 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/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."

 msgstr "承認コードを追加できません"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 msgstr "承認コードを追加できません"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.

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

 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."


@@ -2081,57 +2550,59 @@ 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/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399

 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 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:459

 #, 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.
 #, 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:437 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."

 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

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

 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:493

 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:514

 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:528 actions/smssettings.php:554

 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/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."

 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.

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

 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:569 actions/smssettings.php:590

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


@@ -2143,7 +2614,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 "人気のつぶやき"


@@ -2230,7 +2701,7 @@ msgstr "想定外のレスポンスです！"
 msgid "User being listened to does not exist."
 msgstr "存在しないように聴かれているユーザ。"
 
 msgid "User being listened to does not exist."
 msgstr "存在しないように聴かれているユーザ。"
 

-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58

 msgid "You can use the local subscription!"
 msgstr "ローカルサブスクリプションを使用可能です！"
 
 msgid "You can use the local subscription!"
 msgstr "ローカルサブスクリプションを使用可能です！"
 


@@ -2364,22 +2835,19 @@ 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
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "あなたのデザインを更新できません。"
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222

 msgid "Design preferences saved."
 msgstr "デザイン設定が保存されました。"
 
 msgid "Design preferences saved."
 msgstr "デザイン設定が保存されました。"
 

-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200

 msgid "Group logo"
 msgstr "グループロゴ"
 
 msgid "Group logo"
 msgstr "グループロゴ"
 

-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157

 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."


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

-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244

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

-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301

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

-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378

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

-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413

 msgid "Logo updated."
 msgstr "ロゴが更新されました。"
 
 msgid "Logo updated."
 msgstr "ロゴが更新されました。"
 

-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416

 msgid "Failed updating logo."
 msgstr "ロゴの更新に失敗しました。"
 
 msgid "Failed updating logo."
 msgstr "ロゴの更新に失敗しました。"
 


@@ -2457,15 +2930,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


@@ -2497,7 +2961,7 @@ msgstr ""
 "うか[探してみる](%%%%action.groupsearch%%%%)か、あなた自身で[始めてください!]"
 "(%%%%action.newgroup%%%%)"
 
 "うか[探してみる](%%%%action.groupsearch%%%%)か、あなた自身で[始めてください!]"
 "(%%%%action.newgroup%%%%)"
 

-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115

 msgid "Create a new group"
 msgstr "新しいグループを作成"
 
 msgid "Create a new group"
 msgstr "新しいグループを作成"
 


@@ -2553,14 +3017,14 @@ msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
 
 #. TRANS: Title for instance messaging settings.
 msgstr "ブロックの削除エラー"
 
 #. TRANS: Title for instance messaging settings.

-#: actions/imsettings.php:60
+#: actions/imsettings.php:58

 msgid "IM settings"
 msgstr "IM設定"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 msgid "IM settings"
 msgstr "IM設定"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.

-#: actions/imsettings.php:74
+#: actions/imsettings.php:71

 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"


@@ -2570,23 +3034,23 @@ msgstr ""
 "す。下のアドレスを設定して下さい。"
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 "す。下のアドレスを設定して下さい。"
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.

-#: actions/imsettings.php:94
+#: actions/imsettings.php:90

 msgid "IM is not available."
 msgstr "ＩＭ が利用不可。"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 msgid "IM is not available."
 msgstr "ＩＭ が利用不可。"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.

-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132

 msgid "IM address"
 msgstr "IMアドレス"
 
 msgid "IM address"
 msgstr "IMアドレス"
 

-#: actions/imsettings.php:113
+#: actions/imsettings.php:109

 msgid "Current confirmed Jabber/GTalk address."
 msgstr "確認された最新の　Jabber/GTakk アドレス"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "確認された最新の　Jabber/GTakk アドレス"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.

-#: actions/imsettings.php:124
+#: actions/imsettings.php:120

 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "


@@ -2600,7 +3064,7 @@ msgstr ""
 #. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
 #. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
 #. TRANS: person or organization.
 #. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
 #. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
 #. TRANS: person or organization.

-#: actions/imsettings.php:143
+#: actions/imsettings.php:139

 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "


@@ -2610,65 +3074,65 @@ msgstr ""
 "IMクライアントやGTalkに追加して下さい。"
 
 #. TRANS: Form legend for IM preferences form.
 "IMクライアントやGTalkに追加して下さい。"
 
 #. TRANS: Form legend for IM preferences form.

-#: actions/imsettings.php:158
+#: actions/imsettings.php:154

 msgid "IM preferences"
 msgstr "設定が保存されました。"
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "IM preferences"
 msgstr "設定が保存されました。"
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:163
+#: actions/imsettings.php:159

 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk で私に通知を送って下さい。"
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk で私に通知を送って下さい。"
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:169
+#: actions/imsettings.php:165

 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:175
+#: actions/imsettings.php:171

 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Jabber/GTalkを通して回答を、私がフォローされていない人々から私に送ってくださ"
 "い。"
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Jabber/GTalkを通して回答を、私がフォローされていない人々から私に送ってくださ"
 "い。"
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:182
+#: actions/imsettings.php:178

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

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

 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Message given saving IM address without having provided one.
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Message given saving IM address without having provided one.

-#: actions/imsettings.php:312
+#: actions/imsettings.php:304

 msgid "No Jabber ID."
 msgstr "Jabbar ID はありません。"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
 msgid "No Jabber ID."
 msgstr "Jabbar ID はありません。"
 
 #. TRANS: Message given saving IM address that cannot be normalised.

-#: actions/imsettings.php:320
+#: actions/imsettings.php:312

 msgid "Cannot normalize that Jabber ID"
 msgstr "その Jabbar ID を正規化できません"
 
 #. TRANS: Message given saving IM address that not valid.
 msgid "Cannot normalize that Jabber ID"
 msgstr "その Jabbar ID を正規化できません"
 
 #. TRANS: Message given saving IM address that not valid.

-#: actions/imsettings.php:325
+#: actions/imsettings.php:317

 msgid "Not a valid Jabber ID"
 msgstr "有効な Jabber ID ではありません。"
 
 #. TRANS: Message given saving IM address that is already set.
 msgid "Not a valid Jabber ID"
 msgstr "有効な Jabber ID ではありません。"
 
 #. TRANS: Message given saving IM address that is already set.

-#: actions/imsettings.php:329
+#: actions/imsettings.php:321

 msgid "That is already your Jabber ID."
 msgstr "その Jabber ID は既にあなたのものです。"
 
 #. TRANS: Message given saving IM address that is already set for another user.
 msgid "That is already your Jabber ID."
 msgstr "その Jabber ID は既にあなたのものです。"
 
 #. TRANS: Message given saving IM address that is already set for another user.

-#: actions/imsettings.php:333
+#: actions/imsettings.php:325

 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.

-#: actions/imsettings.php:361
+#: actions/imsettings.php:353

 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"


@@ -2678,29 +3142,29 @@ msgstr ""
 "ようにするには%sを承認してください。"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 "ようにするには%sを承認してください。"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.

-#: actions/imsettings.php:391
+#: actions/imsettings.php:382

 msgid "That is the wrong IM address."
 msgstr "その IM アドレスは不正です。"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 msgid "That is the wrong IM address."
 msgstr "その IM アドレスは不正です。"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.

-#: actions/imsettings.php:400
+#: actions/imsettings.php:391

 #, fuzzy
 #, fuzzy

-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."

 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.

-#: actions/imsettings.php:405
+#: actions/imsettings.php:396

 msgid "IM confirmation cancelled."
 msgstr "確認コードがありません。"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
 msgid "IM confirmation cancelled."
 msgstr "確認コードがありません。"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.

-#: actions/imsettings.php:427
+#: actions/imsettings.php:417

 msgid "That is not your Jabber ID."
 msgstr "その Jabber ID はあなたのものではありません。"
 
 #. TRANS: Message given after successfully removing a registered IM address.
 msgid "That is not your Jabber ID."
 msgstr "その Jabber ID はあなたのものではありません。"
 
 #. TRANS: Message given after successfully removing a registered IM address.

-#: actions/imsettings.php:450
+#: actions/imsettings.php:440

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


@@ -2902,131 +3366,145 @@ msgstr ""
 "\n"
 "%2$s\n"
 
 "\n"
 "%2$s\n"
 

-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59

 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:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"

 msgid "%1$s joined group %2$s"
 msgstr "%1$s はグループ %2$s に参加しました"
 
 msgid "%1$s joined group %2$s"
 msgstr "%1$s はグループ %2$s に参加しました"
 

-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59

 msgid "You must be logged in to leave a group."
 msgstr "グループから離れるにはログインしていなければなりません。"
 
 msgid "You must be logged in to leave a group."
 msgstr "グループから離れるにはログインしていなければなりません。"
 

+#. TRANS: Client error displayed when trying to join a group while already a member.

 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.

-#: actions/leavegroup.php:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386

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

-#: actions/leavegroup.php:137
-#, php-format
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
+#, fuzzy, php-format
+msgctxt "TITLE"

 msgid "%1$s left group %2$s"
 msgstr "%1$s はグループ %2$s に残りました。"
 
 #. TRANS: User admin panel title
 msgid "%1$s left group %2$s"
 msgstr "%1$s はグループ %2$s に残りました。"
 
 #. TRANS: User admin panel title

-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55

 msgctxt "TITLE"
 msgid "License"
 msgctxt "TITLE"
 msgid "License"

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

 
 

-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65

 msgid "License for this StatusNet site"
 msgid "License for this StatusNet site"

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

 
 

-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134

 msgid "Invalid license selection."
 msgstr ""
 
 msgid "Invalid license selection."
 msgstr ""
 

-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144

 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 

-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151

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

-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163

 msgid "Invalid license URL."
 msgstr ""
 
 msgid "Invalid license URL."
 msgstr ""
 

-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166

 msgid "Invalid license image URL."
 msgstr ""
 
 msgid "Invalid license image URL."
 msgstr ""
 

-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174

 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 

-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182

 msgid "License image must be blank or valid URL."
 msgstr ""
 
 msgid "License image must be blank or valid URL."
 msgstr ""
 

-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232

 msgid "License selection"
 msgstr ""
 
 msgid "License selection"
 msgstr ""
 

-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238

 msgid "Private"
 msgstr "プライベート"
 
 msgid "Private"
 msgstr "プライベート"
 

-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239

 msgid "All Rights Reserved"
 msgstr ""
 
 msgid "All Rights Reserved"
 msgstr ""
 

-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240

 msgid "Creative Commons"
 msgstr ""
 
 msgid "Creative Commons"
 msgstr ""
 

-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245

 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 

-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247

 msgid "Select license"
 msgstr ""
 
 msgid "Select license"
 msgstr ""
 

-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261

 msgid "License details"
 msgstr ""
 
 msgid "License details"
 msgstr ""
 

-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267

 msgid "Owner"
 msgstr ""
 
 msgid "Owner"
 msgstr ""
 

-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268

 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 

-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276

 msgid "License Title"
 msgstr ""
 
 msgid "License Title"
 msgstr ""
 

-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277

 msgid "The title of the license."
 msgstr ""
 
 msgid "The title of the license."
 msgstr ""
 

-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285

 msgid "License URL"
 msgstr ""
 
 msgid "License URL"
 msgstr ""
 

-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286

 msgid "URL for more information about the license."
 msgstr ""
 
 msgid "URL for more information about the license."
 msgstr ""
 

-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293

 msgid "License Image URL"
 msgstr ""
 
 msgid "License Image URL"
 msgstr ""
 

-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294

 msgid "URL for an image to display with the license."
 msgstr ""
 
 msgid "URL for an image to display with the license."
 msgstr ""
 

-#: actions/licenseadminpanel.php:319
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "保存"
+
+#: actions/licenseadminpanel.php:311

 msgid "Save license settings"
 msgstr ""
 
 msgid "Save license settings"
 msgstr ""
 


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

-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:490

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

-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:492

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


@@ -3133,8 +3611,14 @@ msgstr "アプリケーションを作成できません。"
 msgid "New group"
 msgstr "新しいグループ"
 
 msgid "New group"
 msgstr "新しいグループ"
 

+#. TRANS: Client exception thrown when a user tries to create a group while banned.
+#: actions/newgroup.php:73 classes/User_group.php:485
+#, fuzzy
+msgid "You are not allowed to create groups on this site."
+msgstr "このグループのメンバーではありません。"
+

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

-#: actions/newgroup.php:110
+#: actions/newgroup.php:117

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


@@ -3329,20 +3813,20 @@ 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')
 msgstr "%2$s における %1$s のステータス"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')

-#: actions/oembed.php:155
+#: 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:159
+#: 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:180 actions/oembed.php:199 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1356
+#: 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 "サポートされていないデータ形式。"
 


@@ -3440,7 +3924,8 @@ msgstr "パスワードの変更"
 msgid "Change your password."
 msgstr "パスワードを変更します。"
 
 msgid "Change your password."
 msgstr "パスワードを変更します。"
 

-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251

 msgid "Password change"
 msgstr "パスワード変更"
 
 msgid "Password change"
 msgstr "パスワード変更"
 


@@ -3448,7 +3933,8 @@ msgstr "パスワード変更"
 msgid "Old password"
 msgstr "古いパスワード"
 
 msgid "Old password"
 msgstr "古いパスワード"
 

-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256

 msgid "New password"
 msgstr "新しいパスワード"
 
 msgid "New password"
 msgstr "新しいパスワード"
 


@@ -3456,12 +3942,7 @@ msgstr "新しいパスワード"
 msgid "6 or more characters"
 msgstr "6文字以上"
 
 msgid "6 or more characters"
 msgstr "6文字以上"
 

-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
-msgid "Confirm"
-msgstr "パスワード確認"
-
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113

 msgid "Same as password above"
 msgstr "上と同じパスワード"
 
 msgid "Same as password above"
 msgstr "上と同じパスワード"
 


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

-#: actions/passwordsettings.php:154 actions/register.php:239
+#: 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:242
+#: actions/passwordsettings.php:157 actions/register.php:241

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


@@ -3485,11 +3966,12 @@ msgstr "古いパスワードが間違っています。"
 msgid "Error saving user; invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
 msgid "Error saving user; invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 

-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186

 msgid "Can't save new password."
 msgstr "新しいパスワードを保存できません。"
 
 msgid "Can't save new password."
 msgstr "新しいパスワードを保存できません。"
 

-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229

 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 


@@ -3707,7 +4189,7 @@ msgstr "ロケールへのディレクトリパス"
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.

-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:85
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99

 msgid "Attachments"
 msgstr "添付"
 
 msgid "Attachments"
 msgstr "添付"
 


@@ -3815,12 +4297,12 @@ msgstr ""
 "つぶやきライセンス ‘%1$s’ はサイトライセンス ‘%2$s’ と互換性がありません。"
 
 #. TRANS: Page title for profile settings.
 "つぶやきライセンス ‘%1$s’ はサイトライセンス ‘%2$s’ と互換性がありません。"
 
 #. TRANS: Page title for profile settings.

-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59

 msgid "Profile settings"
 msgstr "プロファイル設定"
 
 #. TRANS: Usage instructions for profile settings.
 msgid "Profile settings"
 msgstr "プロファイル設定"
 
 #. TRANS: Usage instructions for profile settings.

-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70

 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 ""


@@ -3828,33 +4310,34 @@ msgstr ""
 "す。"
 
 #. TRANS: Profile settings form legend.
 "す。"
 
 #. TRANS: Profile settings form legend.

-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98

 msgid "Profile information"
 msgstr "プロファイル情報"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Profile information"
 msgstr "プロファイル情報"
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146

 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
 #. 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:457
+#: actions/profilesettings.php:113 actions/register.php:455

 #: actions/showgroup.php:252 actions/tagother.php:104
 #: actions/showgroup.php:252 actions/tagother.php:104

-#: lib/groupeditform.php:157 lib/userprofile.php:150
+#: lib/groupeditform.php:149 lib/userprofile.php:152

 msgid "Full name"
 msgstr "フルネーム"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
 msgid "Full name"
 msgstr "フルネーム"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.

-#: actions/profilesettings.php:122 actions/register.php:462
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153

 msgid "Homepage"
 msgstr "ホームページ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Homepage"
 msgstr "ホームページ"
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121

 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"


@@ -3862,51 +4345,51 @@ msgstr "ホームページ、ブログ、プロファイル、その他サイト
 #. 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).
 #. 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:473
+#: actions/profilesettings.php:129 actions/register.php:471

 #, 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字以内で自分自身と自分の興味について書いてください"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #, 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字以内で自分自身と自分の興味について書いてください"
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:135 actions/register.php:476

 msgid "Describe yourself and your interests"
 msgstr "自分自身と自分の興味について書いてください"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
 msgid "Describe yourself and your interests"
 msgstr "自分自身と自分の興味について書いてください"
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.

-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:139 actions/register.php:478

 msgid "Bio"
 msgstr "自己紹介"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
 msgid "Bio"
 msgstr "自己紹介"
 
 #. 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:485
+#: actions/profilesettings.php:145 actions/register.php:483

 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/showgroup.php:262 actions/tagother.php:112

-#: actions/userauthorization.php:166 lib/groupeditform.php:180
-#: lib/userprofile.php:165
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: lib/userprofile.php:167

 msgid "Location"
 msgstr "場所"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Location"
 msgstr "場所"
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:148 actions/register.php:485

 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
 #. TRANS: Checkbox label in form for profile settings.

-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153

 msgid "Share my current location when posting notices"
 msgstr "つぶやきを投稿するときには私の現在の場所を共有してください"
 
 #. TRANS: Field label in form for profile settings.
 msgid "Share my current location when posting notices"
 msgstr "つぶやきを投稿するときには私の現在の場所を共有してください"
 
 #. TRANS: Field label in form for profile settings.

-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 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 "タグ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 msgid "Tags"
 msgstr "タグ"
 
 #. TRANS: Tooltip for field label in form for profile settings.

-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164

 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""


@@ -3914,27 +4397,27 @@ msgstr ""
 "りで"
 
 #. TRANS: Dropdownlist label in form for profile settings.
 "りで"
 
 #. TRANS: Dropdownlist label in form for profile settings.

-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169

 msgid "Language"
 msgstr "言語"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 msgid "Language"
 msgstr "言語"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.

-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171

 msgid "Preferred language"
 msgstr "ご希望の言語"
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Preferred language"
 msgstr "ご希望の言語"
 
 #. TRANS: Dropdownlist label in form for profile settings.

-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181

 msgid "Timezone"
 msgstr "タイムゾーン"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 msgid "Timezone"
 msgstr "タイムゾーン"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.

-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183

 msgid "What timezone are you normally in?"
 msgstr "普段のタイムゾーンはどれですか？"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "What timezone are you normally in?"
 msgstr "普段のタイムゾーンはどれですか？"
 
 #. TRANS: Checkbox label in form for profile settings.

-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189

 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に最適)"


@@ -3942,57 +4425,61 @@ msgstr "自分をフォローしている者を自動的にフォローする (B
 #. 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).
 #. 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:230
+#: actions/profilesettings.php:258 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文字)。"
 
 #. TRANS: Validation error in form for profile settings.
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "自己紹介が長すぎます (最長%d文字)。"
 
 #. TRANS: Validation error in form for profile settings.

-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151

 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 
 #. TRANS: Validation error in form for profile settings.
 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 
 #. TRANS: Validation error in form for profile settings.

-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:277

 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "言語が長すぎます。(最大50字)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "言語が長すぎます。(最大50字)"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.

-#: actions/profilesettings.php:295 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178

 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "不正なタグ: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "不正なタグ: \"%s\""
 
 #. 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."
+#: actions/profilesettings.php:347
+#, fuzzy
+msgid "Could not update user for autosubscribe."

 msgstr "自動フォローのためのユーザを更新できませんでした。"
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
 msgstr "自動フォローのためのユーザを更新できませんでした。"
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.

-#: actions/profilesettings.php:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:405
+#, fuzzy
+msgid "Could not save location prefs."

 msgstr "場所情報を保存できません。"
 
 msgstr "場所情報を保存できません。"
 

-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "プロファイルを保存できません"
-

 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 #. TRANS: Server error thrown when user profile settings tags could not be saved.

-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "タグを保存できません。"
+#: actions/profilesettings.php:427 actions/tagother.php:200
+msgid "Could not save tags."
+msgstr "タグをを保存できません。"

 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.

-#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138

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

+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
+#, fuzzy
+msgid "Restore account"
+msgstr "新しいグループを作成"
+

 #: actions/public.php:83
 #, fuzzy, php-format
 msgid "Beyond the page limit (%s)."
 #: actions/public.php:83
 #, fuzzy, php-format
 msgid "Beyond the page limit (%s)."


@@ -4114,35 +4601,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
 msgid "Tag cloud"
 msgstr "タグクラウド"
 

-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37

 msgid "You are already logged in!"
 msgstr "既にログイン済みです。"
 
 msgid "You are already logged in!"
 msgstr "既にログイン済みです。"
 

-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64

 msgid "No such recovery code."
 msgstr "そのような回復コードはありません。"
 
 msgid "No such recovery code."
 msgstr "そのような回復コードはありません。"
 

-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69

 msgid "Not a recovery code."
 msgstr "回復コードではありません。"
 
 msgid "Not a recovery code."
 msgstr "回復コードではありません。"
 

-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77

 msgid "Recovery code for unknown user."
 msgstr "不明なユーザのための回復コード。"
 
 msgid "Recovery code for unknown user."
 msgstr "不明なユーザのための回復コード。"
 

-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91

 msgid "Error with confirmation code."
 msgstr "確認コードにエラーがあります。"
 
 msgid "Error with confirmation code."
 msgstr "確認コードにエラーがあります。"
 

-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103

 msgid "This confirmation code is too old. Please start again."
 msgstr "確認コードが古すぎます。もう一度やり直してください。"
 
 msgid "This confirmation code is too old. Please start again."
 msgstr "確認コードが古すぎます。もう一度やり直してください。"
 

-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118

 msgid "Could not update user with confirmed email address."
 msgstr "確認されたメールアドレスでユーザを更新できません。"
 
 msgid "Could not update user with confirmed email address."
 msgstr "確認されたメールアドレスでユーザを更新できません。"
 

-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160

 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."


@@ -4150,94 +4645,139 @@ msgstr ""
 "あなたのパスワードを忘れるか紛失したなら、あなたはアカウントに格納したメール"
 "アドレスに新しいものを送らせることができます。"
 
 "あなたのパスワードを忘れるか紛失したなら、あなたはアカウントに格納したメール"
 "アドレスに新しいものを送らせることができます。"
 

-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."

 msgstr "あなたは特定されました。 以下の新しいパスワードを入力してください。 "
 
 msgstr "あなたは特定されました。 以下の新しいパスワードを入力してください。 "
 

-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198

 msgid "Password recovery"
 msgstr "パスワード回復"
 
 msgid "Password recovery"
 msgstr "パスワード回復"
 

-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202

 msgid "Nickname or email address"
 msgstr "ニックネームまたはメールアドレス"
 
 msgid "Nickname or email address"
 msgstr "ニックネームまたはメールアドレス"
 

-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205

 msgid "Your nickname on this server, or your registered email address."
 msgstr "このサーバでのニックネーム、または登録したメールアドレス。"
 
 msgid "Your nickname on this server, or your registered email address."
 msgstr "このサーバでのニックネーム、または登録したメールアドレス。"
 

-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
+msgid "Recover"
+msgstr "回復"
+
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Recover"
 msgstr "回復"
 
 msgid "Recover"
 msgstr "回復"
 

-#: actions/recoverpassword.php:208
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223

 msgid "Reset password"
 msgstr "パスワードをリセット"
 
 msgid "Reset password"
 msgstr "パスワードをリセット"
 

-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225

 msgid "Recover password"
 msgstr "パスワードを回復"
 
 msgid "Recover password"
 msgstr "パスワードを回復"
 

-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366

 msgid "Password recovery requested"
 msgstr "パスワード回復がリクエストされました"
 
 msgid "Password recovery requested"
 msgstr "パスワード回復がリクエストされました"
 

-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232

 msgid "Unknown action"
 msgstr "不明なアクション"
 
 msgid "Unknown action"
 msgstr "不明なアクション"
 

-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+#, fuzzy
+msgid "6 or more characters, and do not forget it!"

 msgstr "6文字以上。忘れないでください！"
 
 msgstr "6文字以上。忘れないでください！"
 

-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+#, fuzzy
+msgid "Same as password above."
+msgstr "上と同じパスワード"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Reset"
 msgstr "リセット"
 
 msgid "Reset"
 msgstr "リセット"
 

-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278

 msgid "Enter a nickname or email address."
 msgstr "ニックネームかメールアドレスを入力してください。"
 
 msgid "Enter a nickname or email address."
 msgstr "ニックネームかメールアドレスを入力してください。"
 

-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309

 msgid "No user with that email address or username."
 msgstr "そのメールアドレスかユーザ名をもっているユーザがありません。"
 
 msgid "No user with that email address or username."
 msgstr "そのメールアドレスかユーザ名をもっているユーザがありません。"
 

-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327

 msgid "No registered email address for that user."
 msgstr "そのユーザにはメールアドレスの登録がありません。"
 
 msgid "No registered email address for that user."
 msgstr "そのユーザにはメールアドレスの登録がありません。"
 

-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342

 msgid "Error saving address confirmation."
 msgstr "アドレス確認保存エラー"
 
 msgid "Error saving address confirmation."
 msgstr "アドレス確認保存エラー"
 

-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370

 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "登録されたメールアドレスにパスワードの回復方法をお送りしました。"
 
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "登録されたメールアドレスにパスワードの回復方法をお送りしました。"
 

-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391

 msgid "Unexpected password reset."
 msgstr "予期せぬパスワードのリセットです。"
 
 msgid "Unexpected password reset."
 msgstr "予期せぬパスワードのリセットです。"
 

-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400

 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "パスワードは6字以上でなければいけません。"
 
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "パスワードは6字以上でなければいけません。"
 

-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405

 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 

-#: actions/recoverpassword.php:388 actions/register.php:257
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "新しいパスワードを保存できません。"
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256

 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 

-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434

 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:414
+#: 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 "すみません、招待された人々だけが登録できます。"
 


@@ -4249,7 +4789,7 @@ msgstr "すみません、不正な招待コード。"
 msgid "Registration successful"
 msgstr "登録成功"
 
 msgid "Registration successful"
 msgstr "登録成功"
 

-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85

 msgid "Register"
 msgstr "登録"
 
 msgid "Register"
 msgstr "登録"
 


@@ -4257,19 +4797,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:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273

 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 
 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 

-#: actions/register.php:352
+#: 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 "


@@ -4278,67 +4818,59 @@ msgstr ""
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
 "同僚にリンクできます。 "
 
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
 "同僚にリンクできます。 "
 

-#: actions/register.php:434
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
-
-#: actions/register.php:439
-msgid "6 or more characters. Required."
-msgstr "6文字以上。必須です。"
-
-#: actions/register.php:443
-msgid "Same as password above. Required."
-msgstr "上のパスワードと同じです。 必須。"
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6文字以上"

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

-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:445 actions/register.php:449

 #: 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:448 actions/register.php:452
+#: actions/register.php:446 actions/register.php:450

 msgid "Used only for updates, announcements, and password recovery"
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 

-#: actions/register.php:459
+#: actions/register.php:457

 msgid "Longer name, preferably your \"real\" name"
 msgstr "長い名前"
 
 msgid "Longer name, preferably your \"real\" name"
 msgstr "長い名前"
 

-#: actions/register.php:464
+#: actions/register.php:462

 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 

-#: actions/register.php:525
+#: actions/register.php:523

 #, 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:535
+#: actions/register.php:533

 #, 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:539
+#: actions/register.php:537

 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:542
+#: actions/register.php:540

 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:547
+#: actions/register.php:545

 #, 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:590
+#: actions/register.php:588

 #, 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 "


@@ -4371,7 +4903,7 @@ msgstr ""
 "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
 "で使ってくれることを願っています。"
 
 "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
 "で使ってくれることを願っています。"
 

-#: actions/register.php:614
+#: actions/register.php:612

 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.)"


@@ -4379,7 +4911,7 @@ msgstr ""
 "(メールアドレスを承認する方法を読んで、すぐにメールによるメッセージを受け取る"
 "ようにしてください)"
 
 "(メールアドレスを承認する方法を読んで、すぐにメールによるメッセージを受け取る"
 "ようにしてください)"
 

-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97

 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."


@@ -4391,75 +4923,78 @@ msgstr ""
 "openmublog%%) にアカウントをお持ちの場合は、下にプロファイルURLを入力して下さ"
 "い."
 
 "openmublog%%) にアカウントをお持ちの場合は、下にプロファイルURLを入力して下さ"
 "い."
 

-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111

 msgid "Remote subscribe"
 msgstr "リモートフォロー"
 
 msgid "Remote subscribe"
 msgstr "リモートフォロー"
 

-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123

 msgid "Subscribe to a remote user"
 msgstr "リモートユーザーをフォロー"
 
 msgid "Subscribe to a remote user"
 msgstr "リモートユーザーをフォロー"
 

-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128

 msgid "User nickname"
 msgstr "ユーザのニックネーム"
 
 msgid "User nickname"
 msgstr "ユーザのニックネーム"
 

-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129

 msgid "Nickname of the user you want to follow"
 msgstr "フォローしたいユーザのニックネーム"
 
 msgid "Nickname of the user you want to follow"
 msgstr "フォローしたいユーザのニックネーム"
 

-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132

 msgid "Profile URL"
 msgstr "プロファイルURL"
 
 msgid "Profile URL"
 msgstr "プロファイルURL"
 

-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133

 msgid "URL of your profile on another compatible microblogging service"
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 

-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:406
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
+#: lib/userprofile.php:411

 msgid "Subscribe"
 msgstr "フォロー"
 
 msgid "Subscribe"
 msgstr "フォロー"
 

-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158

 msgid "Invalid profile URL (bad format)"
 msgstr "不正なプロファイルURL。（形式不備）"
 
 msgid "Invalid profile URL (bad format)"
 msgstr "不正なプロファイルURL。（形式不備）"
 

-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167

 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "有効なプロファイルURLではありません。（YADIS ドキュメントがないかまたは 不正"
 "な XRDS 定義）"
 
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "有効なプロファイルURLではありません。（YADIS ドキュメントがないかまたは 不正"
 "な XRDS 定義）"
 

-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."

 msgstr ""
 "それはローカルのプロファイルです! フォローするには、ログインしてください。"
 
 msgstr ""
 "それはローカルのプロファイルです! フォローするには、ログインしてください。"
 

-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."

 msgstr "リクエストトークンを取得できません"
 
 msgstr "リクエストトークンを取得できません"
 

-#: actions/repeat.php:57
+#: actions/repeat.php:56

 msgid "Only logged-in users can repeat notices."
 msgstr "ログインユーザだけがつぶやきを繰り返せます。"
 
 msgid "Only logged-in users can repeat notices."
 msgstr "ログインユーザだけがつぶやきを繰り返せます。"
 

-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70

 msgid "No notice specified."
 msgstr "つぶやきがありません。"
 
 msgid "No notice specified."
 msgstr "つぶやきがありません。"
 

-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."

 msgstr "自分のつぶやきは繰り返せません。"
 
 msgstr "自分のつぶやきは繰り返せません。"
 

-#: actions/repeat.php:90
+#: actions/repeat.php:89

 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:112 lib/noticelist.php:692

 msgid "Repeated"
 msgstr "繰り返された"
 
 msgid "Repeated"
 msgstr "繰り返された"
 

-#: actions/repeat.php:119
+#: actions/repeat.php:117

 msgid "Repeated!"
 msgstr "繰り返されました!"
 
 msgid "Repeated!"
 msgstr "繰り返されました!"
 


@@ -4519,6 +5054,97 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%2$s 上の %1$s への返信!"
 
 msgid "Replies to %1$s on %2$s!"
 msgstr "%2$s 上の %1$s への返信!"
 

+#. TRANS: Client exception displayed when trying to restore an account while not logged in.
+#: actions/restoreaccount.php:78
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "ログインユーザだけがつぶやきを繰り返せます。"
+
+#. TRANS: Client exception displayed when trying to restore an account without having restore rights.
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "あなたはまだなんのアプリケーションも登録していません。"
+
+#. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
+#. TRANS: Client exception. No file; probably just a non-AJAX submission.
+#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
+#, fuzzy
+msgid "No uploaded file."
+msgstr "ファイルアップロード"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:129 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.
+#: actions/restoreaccount.php:135 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"アップロードされたファイルはHTMLフォームで指定された MAX_FILE_SIZE ディレク"
+"ティブを超えています。"
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:141 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.
+#: actions/restoreaccount.php:150 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.
+#: actions/restoreaccount.php:154 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.
+#: actions/restoreaccount.php:158 lib/mediafile.php:222
+msgid "File upload stopped by extension."
+msgstr "エクステンションによってファイルアップロードを中止しました。"
+
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "ファイルのアップロードでシステムエラー"
+
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
+#, fuzzy
+msgid "Not an Atom feed."
+msgstr "全てのメンバー"
+
+#. TRANS: Success message when a feed has been restored.
+#: actions/restoreaccount.php:241
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#. TRANS: Message when a feed restore is in progress.
+#: actions/restoreaccount.php:245
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#. TRANS: Form instructions for feed restore.
+#: actions/restoreaccount.php:342
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
+#: actions/restoreaccount.php:373
+#, fuzzy
+msgid "Upload the file"
+msgstr "ファイルアップロード"
+

 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."


@@ -4597,7 +5223,7 @@ 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:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167

 msgid "Description"
 msgstr "概要"
 
 msgid "Description"
 msgstr "概要"
 


@@ -4620,8 +5246,9 @@ msgstr "アプリケーションアクション"
 msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 
 msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 

+#. TRANS: Title of form for deleting a user.

 #: actions/showapplication.php:252 lib/deletegroupform.php:121
 #: actions/showapplication.php:252 lib/deletegroupform.php:121

-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deleteuserform.php:64 lib/noticelist.php:673

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


@@ -4738,18 +5365,18 @@ msgstr "グループプロファイル"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
 #: actions/showgroup.php:270 actions/tagother.php:118
 
 #. 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:178
+#: actions/userauthorization.php:175 lib/userprofile.php:180

 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
 #: actions/showgroup.php:282 actions/tagother.php:128
 msgid "URL"
 msgstr "URL"
 
 #. 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:195
+#: actions/userauthorization.php:187 lib/userprofile.php:197

 msgid "Note"
 msgstr "ノート"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
 msgid "Note"
 msgstr "ノート"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.

-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179

 msgid "Aliases"
 msgstr "別名"
 
 msgid "Aliases"
 msgstr "別名"
 


@@ -5149,73 +5776,73 @@ msgid "Save site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: Title for SMS settings.
 msgstr "サイトつぶやき"
 
 #. TRANS: Title for SMS settings.

-#: actions/smssettings.php:59
+#: actions/smssettings.php:57

 msgid "SMS settings"
 msgstr "SMS 設定"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
 msgid "SMS settings"
 msgstr "SMS 設定"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.

-#: actions/smssettings.php:74
+#: actions/smssettings.php:71

 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "あなたは %%site.name%% からメールでSMSメッセージを受け取ることができます。"
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "あなたは %%site.name%% からメールでSMSメッセージを受け取ることができます。"
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.

-#: actions/smssettings.php:97
+#: actions/smssettings.php:93

 msgid "SMS is not available."
 msgstr "SMS は利用できません。"
 
 #. TRANS: Form legend for SMS settings form.
 msgid "SMS is not available."
 msgstr "SMS は利用できません。"
 
 #. TRANS: Form legend for SMS settings form.

-#: actions/smssettings.php:111
+#: actions/smssettings.php:107

 #, fuzzy
 msgid "SMS address"
 msgstr "IMアドレス"
 
 #. TRANS: Form guide in SMS settings form.
 #, fuzzy
 msgid "SMS address"
 msgstr "IMアドレス"
 
 #. TRANS: Form guide in SMS settings form.

-#: actions/smssettings.php:120
+#: actions/smssettings.php:116

 msgid "Current confirmed SMS-enabled phone number."
 msgstr "現在の確認された SMS 可能な電話番号。"
 
 #. TRANS: Form guide in IM settings form.
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "現在の確認された SMS 可能な電話番号。"
 
 #. TRANS: Form guide in IM settings form.

-#: actions/smssettings.php:133
+#: actions/smssettings.php:129

 msgid "Awaiting confirmation on this phone number."
 msgstr "この電話番号は確認待ちです。"
 
 #. TRANS: Field label for SMS address input in SMS settings form.
 msgid "Awaiting confirmation on this phone number."
 msgstr "この電話番号は確認待ちです。"
 
 #. TRANS: Field label for SMS address input in SMS settings form.

-#: actions/smssettings.php:142
+#: actions/smssettings.php:138

 msgid "Confirmation code"
 msgstr "確認コード"
 
 #. TRANS: Form field instructions in SMS settings form.
 msgid "Confirmation code"
 msgstr "確認コード"
 
 #. TRANS: Form field instructions in SMS settings form.

-#: actions/smssettings.php:144
+#: actions/smssettings.php:140

 msgid "Enter the code you received on your phone."
 msgstr "あなたがあなたの電話で受け取ったコードを入れてください。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
 msgid "Enter the code you received on your phone."
 msgstr "あなたがあなたの電話で受け取ったコードを入れてください。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.

-#: actions/smssettings.php:148
+#: actions/smssettings.php:144

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "パスワード確認"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "パスワード確認"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.

-#: actions/smssettings.php:153
+#: actions/smssettings.php:149

 msgid "SMS phone number"
 msgstr "SMS 電話番号"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 msgid "SMS phone number"
 msgstr "SMS 電話番号"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.

-#: actions/smssettings.php:156
+#: actions/smssettings.php:152

 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "電話番号、句読点またはスペースがない、市街番号付き"
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "電話番号、句読点またはスペースがない、市街番号付き"
 
 #. TRANS: Form legend for SMS preferences form.

-#: actions/smssettings.php:195
+#: actions/smssettings.php:191

 msgid "SMS preferences"
 msgstr "設定が保存されました。"
 
 #. TRANS: Checkbox label in SMS preferences form.
 msgid "SMS preferences"
 msgstr "設定が保存されました。"
 
 #. TRANS: Checkbox label in SMS preferences form.

-#: actions/smssettings.php:201
+#: actions/smssettings.php:197

 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."


@@ -5224,33 +5851,33 @@ msgstr ""
 "るかもしれないのを理解しています。"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
 "るかもしれないのを理解しています。"
 
 #. TRANS: Confirmation message for successful SMS preferences save.

-#: actions/smssettings.php:315
+#: actions/smssettings.php:308

 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.

-#: actions/smssettings.php:338
+#: actions/smssettings.php:330

 msgid "No phone number."
 msgstr "電話番号がありません。"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 msgid "No phone number."
 msgstr "電話番号がありません。"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.

-#: actions/smssettings.php:344
+#: actions/smssettings.php:336

 msgid "No carrier selected."
 msgstr "キャリアが選択されていません。"
 
 #. TRANS: Message given saving SMS phone number that is already set.
 msgid "No carrier selected."
 msgstr "キャリアが選択されていません。"
 
 #. TRANS: Message given saving SMS phone number that is already set.

-#: actions/smssettings.php:352
+#: actions/smssettings.php:344

 msgid "That is already your phone number."
 msgstr "これはすでにあなたの電話番号です。"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 msgid "That is already your phone number."
 msgstr "これはすでにあなたの電話番号です。"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.

-#: actions/smssettings.php:356
+#: actions/smssettings.php:348

 msgid "That phone number already belongs to another user."
 msgstr "この電話番号はすでに他のユーザに使われています。"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 msgid "That phone number already belongs to another user."
 msgstr "この電話番号はすでに他のユーザに使われています。"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.

-#: actions/smssettings.php:384
+#: actions/smssettings.php:376

 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."


@@ -5259,40 +5886,40 @@ msgstr ""
 "コードと指示のために電話をチェックしてください。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 "コードと指示のために電話をチェックしてください。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.

-#: actions/smssettings.php:413
+#: actions/smssettings.php:404

 msgid "That is the wrong confirmation number."
 msgstr "それは間違った確認番号です。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "That is the wrong confirmation number."
 msgstr "それは間違った確認番号です。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.

-#: actions/smssettings.php:427
+#: actions/smssettings.php:418

 msgid "SMS confirmation cancelled."
 msgstr "SMS確認"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
 msgid "SMS confirmation cancelled."
 msgstr "SMS確認"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.

-#: actions/smssettings.php:448
+#: actions/smssettings.php:438

 msgid "That is not your phone number."
 msgstr "それはあなたの電話番号ではありません。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 msgid "That is not your phone number."
 msgstr "それはあなたの電話番号ではありません。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.

-#: actions/smssettings.php:470
+#: actions/smssettings.php:460

 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS 電話番号"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS 電話番号"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.

-#: actions/smssettings.php:511
+#: actions/smssettings.php:499

 msgid "Mobile carrier"
 msgstr "携帯電話会社"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
 msgid "Mobile carrier"
 msgstr "携帯電話会社"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.

-#: actions/smssettings.php:516
+#: actions/smssettings.php:504

 msgid "Select a carrier"
 msgstr "キャリア選択"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
 msgid "Select a carrier"
 msgstr "キャリア選択"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.

-#: actions/smssettings.php:525
+#: actions/smssettings.php:513

 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "


@@ -5303,7 +5930,7 @@ msgstr ""
 "ください。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 "ください。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.

-#: actions/smssettings.php:548
+#: actions/smssettings.php:535

 msgid "No code entered"
 msgstr "コードが入力されていません"
 
 msgid "No code entered"
 msgstr "コードが入力されていません"
 


@@ -5373,7 +6000,7 @@ 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: 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.

-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141

 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 
 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 


@@ -5381,11 +6008,6 @@ msgstr "フォローを保存できません。"
 msgid "This action only accepts POST requests."
 msgstr ""
 
 msgid "This action only accepts POST requests."
 msgstr ""
 

-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "そのようなファイルはありません。"
-

 #: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 #: actions/subscribe.php:117
 #, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."


@@ -5453,13 +6075,6 @@ msgstr ""
 "%s にはフォローしている人がいません。なぜ[アカウント登録](%%%%action.register"
 "%%%%)して最初にならないのですか?"
 
 "%s にはフォローしている人がいません。なぜ[アカウント登録](%%%%action.register"
 "%%%%)して最初にならないのですか?"
 

-#. 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 フォローしている"
-

 #. 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
 #. 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


@@ -5509,13 +6124,18 @@ msgstr ""
 msgid "%s is not listening to anyone."
 msgstr "%s はだれも言うことを聞いていません。"
 
 msgid "%s is not listening to anyone."
 msgstr "%s はだれも言うことを聞いていません。"
 

+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "%sのつぶやきフィード (Atom)"
+

 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.

-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242

 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.

-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257

 msgid "SMS"
 msgstr "SMS"
 
 msgid "SMS"
 msgstr "SMS"
 


@@ -5553,7 +6173,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 "写真"
 


@@ -5575,10 +6195,6 @@ msgstr ""
 "あなたはフォローされる人々にタグ付けをすることができるだけか、あなたをフォ"
 "ローされているか。"
 
 "あなたはフォローされる人々にタグ付けをすることができるだけか、あなたをフォ"
 "ローされているか。"
 

-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "タグをを保存できません。"
-

 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "このフォームを使用して、フォロー者かフォローにタグを加えてください。"
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "このフォームを使用して、フォロー者かフォローにタグを加えてください。"


@@ -5811,12 +6427,12 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "アバター URL '%s' は不正な画像形式。"
 
 #. TRANS: Page title for profile design page.
 msgstr "アバター URL '%s' は不正な画像形式。"
 
 #. TRANS: Page title for profile design page.

-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63

 msgid "Profile design"
 msgstr "プロファイルデザイン"
 
 #. TRANS: Instructions for profile design page.
 msgid "Profile design"
 msgstr "プロファイルデザイン"
 
 #. TRANS: Instructions for profile design page.

-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 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."


@@ -5824,7 +6440,7 @@ msgstr ""
 "あなたのプロフィールがバックグラウンド画像とあなたの選択の色のパレットで見る"
 "方法をカスタマイズしてください。"
 
 "あなたのプロフィールがバックグラウンド画像とあなたの選択の色のパレットで見る"
 "方法をカスタマイズしてください。"
 

-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272

 #, fuzzy
 msgid "Enjoy your hotdog!"
 msgstr "あなたのhotdogを楽しんでください!"
 #, fuzzy
 msgid "Enjoy your hotdog!"
 msgstr "あなたのhotdogを楽しんでください!"


@@ -5906,7 +6522,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:880
+#: actions/version.php:198 lib/action.php:885

 msgid "Version"
 msgstr "バージョン"
 
 msgid "Version"
 msgstr "バージョン"
 


@@ -5915,32 +6531,32 @@ msgid "Author(s)"
 msgstr "作者"
 
 #. TRANS: Activity title when marking a notice as favorite.
 msgstr "作者"
 
 #. TRANS: Activity title when marking a notice as favorite.

-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143

 msgid "Favor"
 msgstr "お気に入り"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
 msgid "Favor"
 msgstr "お気に入り"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.

-#: classes/Fave.php:151
+#: classes/Fave.php:167

 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 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.
 #. TRANS: %1$s is used for plural.
 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.
 #. TRANS: %1$s is used for plural.

-#: classes/File.php:190
+#: classes/File.php:204

 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
 #, fuzzy, php-format
 msgid ""
 "No file may be larger than %1$d byte and the file you sent was %2$d bytes. "


@@ -5955,7 +6571,7 @@ msgstr[0] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.

-#: classes/File.php:203
+#: 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."
 #, 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."


@@ -5964,7 +6580,7 @@ msgstr[0] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.

-#: classes/File.php:215
+#: 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."
 #, 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."


@@ -5972,48 +6588,48 @@ 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:262 classes/File.php:277
+#: classes/File.php:276 classes/File.php:291

 #, fuzzy
 msgid "Invalid filename."
 msgstr "不正なサイズ。"
 
 #. TRANS: Exception thrown when joining a group fails.
 #, fuzzy
 msgid "Invalid filename."
 msgstr "不正なサイズ。"
 
 #. TRANS: Exception thrown when joining a group fails.

-#: classes/Group_member.php:42
+#: classes/Group_member.php:51

 msgid "Group join failed."
 msgstr "グループ参加に失敗しました。"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 msgid "Group join failed."
 msgstr "グループ参加に失敗しました。"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.

-#: classes/Group_member.php:55
+#: classes/Group_member.php:64

 msgid "Not part of group."
 msgstr "グループの一部ではありません。"
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 msgid "Not part of group."
 msgstr "グループの一部ではありません。"
 
 #. TRANS: Exception thrown when trying to leave a group fails.

-#: classes/Group_member.php:63
+#: classes/Group_member.php:72

 msgid "Group leave failed."
 msgstr "グループ脱退に失敗しました。"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
 msgid "Group leave failed."
 msgstr "グループ脱退に失敗しました。"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.

-#: classes/Group_member.php:76
+#: classes/Group_member.php:85

 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.

-#: classes/Group_member.php:89
+#: classes/Group_member.php:98

 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
 #. TRANS: Activity title.
 #, fuzzy, php-format
 msgid "Group ID %s is invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
 #. TRANS: Activity title.

-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114

 msgid "Join"
 msgstr "参加"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
 msgid "Join"
 msgstr "参加"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.

-#: classes/Group_member.php:117
+#: classes/Group_member.php:151

 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""


@@ -6032,7 +6648,7 @@ msgid "Could not create login token for %s"
 msgstr "%s 用のログイン・トークンを作成できませんでした"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgstr "%s 用のログイン・トークンを作成できませんでした"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.

-#: classes/Memcached_DataObject.php:533
+#: classes/Memcached_DataObject.php:537

 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 msgid "No database name or DSN found anywhere."
 msgstr ""
 


@@ -6042,12 +6658,12 @@ msgid "You are banned from sending direct messages."
 msgstr "あなたはダイレクトメッセージを送るのが禁止されています。"
 
 #. TRANS: Message given when a message could not be stored on the server.
 msgstr "あなたはダイレクトメッセージを送るのが禁止されています。"
 
 #. TRANS: Message given when a message could not be stored on the server.

-#: classes/Message.php:62
+#: classes/Message.php:69

 msgid "Could not insert message."
 msgstr "メッセージを追加できません。"
 
 #. TRANS: Message given when a message could not be updated on the server.
 msgid "Could not insert message."
 msgstr "メッセージを追加できません。"
 
 #. TRANS: Message given when a message could not be updated on the server.

-#: classes/Message.php:73
+#: classes/Message.php:80

 msgid "Could not update message with new URI."
 msgstr "新しいURIでメッセージをアップデートできませんでした。"
 
 msgid "Could not update message with new URI."
 msgstr "新しいURIでメッセージをアップデートできませんでした。"
 


@@ -6059,30 +6675,30 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.

-#: classes/Notice.php:193
+#: classes/Notice.php:199

 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.

-#: classes/Notice.php:265
+#: classes/Notice.php:279

 msgid "Problem saving notice. Too long."
 msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
 msgid "Problem saving notice. Too long."
 msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.

-#: classes/Notice.php:270
+#: classes/Notice.php:284

 msgid "Problem saving notice. Unknown user."
 msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
 msgid "Problem saving notice. Unknown user."
 msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.

-#: classes/Notice.php:276
+#: classes/Notice.php:290

 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。"
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。"
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.

-#: classes/Notice.php:283
+#: classes/Notice.php:297

 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."


@@ -6091,42 +6707,42 @@ msgstr ""
 "い。"
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 "い。"
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.

-#: classes/Notice.php:291
+#: classes/Notice.php:305

 msgid "You are banned from posting notices on this site."
 msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 msgid "You are banned from posting notices on this site."
 msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.

-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:372 classes/Notice.php:399

 msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:905
+#: classes/Notice.php:914

 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.

-#: classes/Notice.php:1004
+#: classes/Notice.php:1013

 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:1118
+#: classes/Notice.php:1127

 #, 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:1820
+#: classes/Notice.php:1646

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Full name of a profile or group followed by nickname in parens
 #, 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:164 classes/User_group.php:247
+#: classes/Profile.php:172 classes/User_group.php:242

 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"


@@ -6134,14 +6750,14 @@ 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:812
+#: classes/Profile.php:765

 #, 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:821
+#: classes/Profile.php:774

 #, 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 ""


@@ -6158,86 +6774,86 @@ 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:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482

 msgid "You have been banned from subscribing."
 msgstr "あなたはフォローが禁止されました。"
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 msgid "You have been banned from subscribing."
 msgstr "あなたはフォローが禁止されました。"
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.

-#: classes/Subscription.php:80
+#: classes/Subscription.php:82

 msgid "Already subscribed!"
 msgstr "すでにフォローしています!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 msgid "Already subscribed!"
 msgstr "すでにフォローしています!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.

-#: classes/Subscription.php:85
+#: classes/Subscription.php:87

 msgid "User has blocked you."
 msgstr "ユーザはあなたをブロックしました。"
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 msgid "User has blocked you."
 msgstr "ユーザはあなたをブロックしました。"
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.

-#: classes/Subscription.php:171
+#: classes/Subscription.php:176

 msgid "Not subscribed!"
 msgstr "フォローしていません！"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 msgid "Not subscribed!"
 msgstr "フォローしていません！"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.

-#: classes/Subscription.php:178
+#: classes/Subscription.php:183

 msgid "Could not delete self-subscription."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 msgid "Could not delete self-subscription."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.

-#: classes/Subscription.php:206
+#: classes/Subscription.php:211

 msgid "Could not delete subscription OMB token."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription OMB token."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.

-#: classes/Subscription.php:218
+#: classes/Subscription.php:223

 msgid "Could not delete subscription."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Activity tile when subscribing to another person.
 msgid "Could not delete subscription."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Activity tile when subscribing to another person.

-#: classes/Subscription.php:255
+#: classes/Subscription.php:265

 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.

-#: classes/Subscription.php:258
+#: classes/Subscription.php:268

 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 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.
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 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.

-#: classes/User.php:384
+#: classes/User.php:395

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 
 #. TRANS: Server exception.
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 
 #. TRANS: Server exception.

-#: classes/User.php:912
+#: classes/User.php:918

 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 
 #. TRANS: Server exception.

-#: classes/User.php:916
+#: classes/User.php:922

 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.

-#: classes/User_group.php:511
+#: classes/User_group.php:516

 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:521
+#: classes/User_group.php:526

 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:544
+#: classes/User_group.php:549

 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:559
+#: classes/User_group.php:564

 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"


@@ -6289,140 +6905,140 @@ msgid "Untitled page"
 msgstr "名称未設定ページ"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgstr "名称未設定ページ"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.

-#: lib/action.php:310
+#: lib/action.php:312

 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:526
+#: 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:532
+#: 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:535
+#: 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:537
+#: lib/action.php:542

 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "パスワードの変更"
 
 #. TRANS: Main menu option when logged in for access to user settings
 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:540
+#: lib/action.php:545

 msgid "Account"
 msgstr "アカウント"
 
 #. TRANS: Tooltip for main menu option "Services"
 msgid "Account"
 msgstr "アカウント"
 
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:542
+#: 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:545
+#: 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:548
+#: 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:551 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:555
+#: 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:558
+#: 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:564
+#: 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:567
+#: 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:572
+#: 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:575
+#: 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:578
+#: lib/action.php:583

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "サイトへログイン"
 
 #. TRANS: Main menu option when not logged in to log in
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "サイトへログイン"
 
 #. TRANS: Main menu option when not logged in to log in

-#: lib/action.php:581
+#: 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:584
+#: lib/action.php:589

 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ヘルプ"
 
 #. TRANS: Main menu option for help on the StatusNet site
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ヘルプ"
 
 #. TRANS: Main menu option for help on the StatusNet site

-#: lib/action.php:587
+#: 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:590
+#: lib/action.php:595

 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "もっとグループを検索"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "もっとグループを検索"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private

-#: lib/action.php:593
+#: lib/action.php:598

 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"


@@ -6430,68 +7046,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:615 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:682
+#: 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:752
+#: 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:853
+#: 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:859
+#: 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:862
+#: 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:865
+#: 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:870
+#: 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:874
+#: lib/action.php:879

 msgid "Privacy"
 msgstr "プライバシー"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
 msgid "Privacy"
 msgstr "プライバシー"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.

-#: lib/action.php:877
+#: lib/action.php:882

 msgid "Source"
 msgstr "ソース"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...
 msgid "Source"
 msgstr "ソース"
 
 #. TRANS: Secondary navigation menu option leading to e-mail contact information on the
 #. TRANS: StatusNet site, where to report bugs, ...

-#: lib/action.php:884
+#: lib/action.php:889

 msgid "Contact"
 msgstr "連絡先"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
 msgid "Contact"
 msgstr "連絡先"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.

-#: lib/action.php:887
+#: 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:916
+#: lib/action.php:921

 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 
 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 


@@ -6499,7 +7115,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:923
+#: 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."


@@ -6509,7 +7125,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:926
+#: 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%%** はマイクロブログサービスです。"


@@ -6518,7 +7134,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:933
+#: 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 %"


@@ -6530,58 +7146,109 @@ 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:949
+#: 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:956
+#: 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:963
+#: 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:967
+#: 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:999
+#: 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:1335
+#: 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:1346
+#: 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:1356
+#: lib/action.php:1361

 msgid "Before"
 msgstr "前>>"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 msgid "Before"
 msgstr "前>>"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.

-#: lib/activity.php:120
+#: lib/activity.php:125

 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 

+#. TRANS: Client exception thrown when using an unknown verb for the activity importer.
+#: lib/activityimporter.php:81
+#, fuzzy, php-format
+msgid "Unknown verb: \"%s\"."
+msgstr "不明な言語 \"%s\""
+
+#. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
+#: lib/activityimporter.php:107
+msgid "Cannot force subscription for untrusted user."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to for a remote user to subscribe.
+#: lib/activityimporter.php:117
+#, fuzzy
+msgid "Cannot force remote user to subscribe."
+msgstr "フォローする利用者の名前を指定してください"
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
+#, fuzzy
+msgid "Unknown profile."
+msgstr "不明なファイルタイプ"
+
+#. TRANS: Client exception thrown when trying to import an event not related to the importing user.
+#: lib/activityimporter.php:138
+msgid "This activity seems unrelated to our user."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to join a remote group that is not a group.
+#: lib/activityimporter.php:154
+msgid "Remote profile is not a group!"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
+#: lib/activityimporter.php:163
+#, fuzzy
+msgid "User is already a member of this group."
+msgstr "すでにこのグループのメンバーです。"
+
+#. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
+#: lib/activityimporter.php:207
+msgid "Not overwriting author info for non-trusted user."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to import a notice without content.
+#. TRANS: %s is the notice URI.
+#: lib/activityimporter.php:223
+#, fuzzy, php-format
+msgid "No content for notice %s."
+msgstr "つぶやきの内容を探す"
+

 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."


@@ -6737,23 +7404,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.

-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209

 #, fuzzy
 msgid "Could not issue access token."
 msgstr "メッセージを追加できません。"
 
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "メッセージを追加できません。"
 

-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: lib/apioauthstore.php:317

 msgid "Database error inserting OAuth application user."
 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 
 msgid "Database error inserting OAuth application user."
 msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 

+#: lib/apioauthstore.php:345
+#, fuzzy
+msgid "Database error updating 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:285
+#: lib/apioauthstore.php:371

 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:290
+#: lib/apioauthstore.php:376

 msgid "Failed to delete revoked token."
 msgstr ""
 
 msgid "Failed to delete revoked token."
 msgstr ""
 


@@ -6872,17 +7543,23 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "回復"
 
 msgid "Revoke"
 msgstr "回復"
 

-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."

 msgstr ""
 
 msgstr ""
 

+#. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
+#: lib/atom10feed.php:160
+#, fuzzy
+msgid "Do not use this method!"
+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 "プロバイダ"
 


@@ -7266,20 +7943,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
+#: lib/common.php:155

 #, 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).
 #, 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).

-#: lib/common.php:139
+#: lib/common.php:158

 #, 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.
 #, 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.

-#: lib/common.php:142
+#: lib/common.php:161

 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"


@@ -7287,7 +7964,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:165

 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 


@@ -7359,12 +8036,21 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "オフ"
 
 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: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "色の変更"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+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".
+#: lib/designsettings.php:405 lib/designsettings.php:427
+msgid "Couldn't update your design."
+msgstr "あなたのデザインを更新できません。"

 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433


@@ -7395,6 +8081,19 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
 msgid "FOAF"
 msgstr "FOAF"
 

+#: lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "全てのメンバー"
+
+#: lib/feedimporter.php:82
+msgid "No author in the feed."
+msgstr ""
+
+#: lib/feedimporter.php:89
+msgid "Can't import without a user."
+msgstr ""
+

 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
 msgid "Feeds"
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
 msgid "Feeds"


@@ -7429,32 +8128,28 @@ 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:155

 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "グループやトピックのホームページやブログの URL"
 
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "グループやトピックのホームページやブログの URL"
 

-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160

 msgid "Describe the group or topic"
 msgstr "グループやトピックを記述"
 
 msgid "Describe the group or topic"
 msgstr "グループやトピックを記述"
 

-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162

 #, fuzzy, php-format
 #, 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"
+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 字以内記述"
 
 msgstr[0] "グループやトピックを %d 字以内記述"
 

-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174

 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
 
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
 

-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182

 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "


@@ -7574,39 +8269,34 @@ msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 
 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 
 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 

-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:179
-msgid "System error uploading file."
-msgstr "ファイルのアップロードでシステムエラー"
-

 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
 
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
 

-#: lib/imagefile.php:124
+#: lib/imagefile.php:160

 msgid "Lost our file."
 msgstr "ファイルを紛失。"
 
 msgid "Lost our file."
 msgstr "ファイルを紛失。"
 

-#: lib/imagefile.php:165 lib/imagefile.php:226
+#: lib/imagefile.php:197 lib/imagefile.php:237

 msgid "Unknown file type"
 msgstr "不明なファイルタイプ"
 
 #. TRANS: Number of megabytes. %d is the number.
 msgid "Unknown file type"
 msgstr "不明なファイルタイプ"
 
 #. TRANS: Number of megabytes. %d is the number.

-#: lib/imagefile.php:248
+#: lib/imagefile.php:283

 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 msgstr[0] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
 msgstr[0] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.

-#: lib/imagefile.php:252
+#: lib/imagefile.php:287

 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 msgstr[0] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
 msgstr[0] "kB"
 
 #. TRANS: Number of bytes. %d is the number.

-#: lib/imagefile.php:255
+#: lib/imagefile.php:290

 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"


@@ -7967,7 +8657,7 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 

-#: lib/mailbox.php:228 lib/noticelist.php:516
+#: lib/mailbox.php:228 lib/noticelist.php:522

 msgid "from"
 msgstr "from"
 
 msgid "from"
 msgstr "from"
 


@@ -7993,69 +8683,33 @@ msgid "Unsupported message type: %s"
 msgstr "サポート外のメッセージタイプ: %s"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 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 ""
 "データベースエラーがあなたのファイルを保存しているときにありました。 再試行し"
 "てください。"
 
 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
-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
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"アップロードされたファイルはHTMLフォームで指定された MAX_FILE_SIZE ディレク"
-"ティブを超えています。"
-
-#. TRANS: Client exception.
-#: lib/mediafile.php:157
-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
-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
-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
-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.
 #. 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:345
+#: lib/mediafile.php:396

 #, 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 "


@@ -8064,7 +8718,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:350
+#: lib/mediafile.php:401

 #, 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 ""


@@ -8073,20 +8727,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:165
+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:178
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:191
+#, 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 "つぶやきを送る"


@@ -8121,59 +8806,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:452

 #, 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:454

 #, 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:456

 #, 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:458

 #, fuzzy
 msgid "W"
 msgstr "西"
 
 #, fuzzy
 msgid "W"
 msgstr "西"
 

-#: lib/noticelist.php:454
+#: lib/noticelist.php:460

 #, 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:469

 msgid "at"
 msgstr "at"
 
 msgid "at"
 msgstr "at"
 

-#: lib/noticelist.php:512
+#: lib/noticelist.php:518

 msgid "web"
 msgstr ""
 
 msgid "web"
 msgstr ""
 

-#: lib/noticelist.php:578
+#: lib/noticelist.php:584

 msgid "in context"
 msgstr ""
 
 msgid "in context"
 msgstr ""
 

-#: lib/noticelist.php:613
+#: lib/noticelist.php:619

 msgid "Repeated by"
 msgstr ""
 
 msgid "Repeated by"
 msgstr ""
 

-#: lib/noticelist.php:640
+#: lib/noticelist.php:646

 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 
 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 

-#: lib/noticelist.php:641
+#: lib/noticelist.php:647

 msgid "Reply"
 msgstr "返信"
 
 msgid "Reply"
 msgstr "返信"
 

-#: lib/noticelist.php:685
+#: lib/noticelist.php:691

 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 


@@ -8315,7 +9000,7 @@ msgstr "このつぶやきを繰り返しますか?"
 
 #: lib/repeatform.php:132
 msgid "Yes"
 
 #: lib/repeatform.php:132
 msgid "Yes"

-msgstr "Yes"
+msgstr "はい"

 
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 
 #: lib/repeatform.php:132
 msgid "Repeat this notice"


@@ -8327,7 +9012,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "このグループからこのユーザをブロック"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
 msgstr "このグループからこのユーザをブロック"
 
 #. TRANS: Client error on action trying to visit a non-existing page.

-#: lib/router.php:847
+#: lib/router.php:974

 #, fuzzy
 msgid "Page not found."
 msgstr "API メソッドが見つかりません。"
 #, fuzzy
 msgid "Page not found."
 msgstr "API メソッドが見つかりません。"


@@ -8529,155 +9214,176 @@ 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:1175
+#: lib/util.php:1306

 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:1178
+#: lib/util.php:1309

 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:1182
+#: lib/util.php:1313

 #, 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:1185
+#: lib/util.php:1316

 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:1189
+#: lib/util.php:1320

 #, 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:1192
+#: lib/util.php:1323

 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:1196
+#: lib/util.php:1327

 #, 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:1199
+#: lib/util.php:1330

 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:1203
+#: lib/util.php:1334

 #, 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:1206
+#: lib/util.php:1337

 msgid "about a year ago"
 msgstr "約 1 年前"
 
 msgid "about a year ago"
 msgstr "約 1 年前"
 

-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%sは有効な色ではありません!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121

 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
 
 #. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
 #, fuzzy, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
 
 #. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.

-#: lib/xmppmanager.php:285
+#: 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.
 #, 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:404
+#: 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。"
 
 #, 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.
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.

-#: scripts/restoreuser.php:61
+#: scripts/restoreuser.php:62

 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 

-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
+#~ msgid "No such group"
+#~ msgstr "そのようなグループはありません。"
+

 #, fuzzy
 #, fuzzy

-msgid "No user specified; using backup user."
-msgstr "ユーザIDの記述がありません。"
+#~ msgid "HTTP method not supported"
+#~ msgstr "API メソッドが見つかりません。"

 
 

-#. 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
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
+#~ msgid "Reset"
+#~ msgstr "リセット"
+
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須で"
+#~ "す。"
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6文字以上。必須です。"
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "上のパスワードと同じです。 必須。"
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%sは有効な色ではありません!"