X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=locale%2Fja%2FLC_MESSAGES%2Fstatusnet.po;h=37e3467bea9e0caf01ad985ad79894fd5dd82b31;hb=2a59453d4c07ac4bb804a64e8252dd4960983595;hp=ca9c2e0faecac63e5b434dc8461fa02726f060ab;hpb=2503c33502607ad81da69dece32c6b981a4db335;p=quix0rs-gnu-social.git

diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index ca9c2e0fae..37e3467bea 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -6,6 +6,7 @@
 # Author: Fryed-peach
 # Author: Sonoda
 # Author: Whym
+# Author: 青子守歌
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -13,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:10+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:57+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"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); 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-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -44,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?"
-msgstr "匿名ユーザー(ログインしていません)がサイトを見るのを禁止しますか?"
+msgstr ""
+"匿名ユーザー（ログインしていないユーザー）がサイトを見るのを禁止しますか？"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
-msgstr "プライバシー"
+msgstr "プライベート"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
 #: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
-msgstr "招待のみ登録する"
+msgstr "招待のみ登録させる。"
 
 #. TRANS: Checkbox label for configuring site as invite only.
 #: actions/accessadminpanel.php:166
@@ -89,14 +91,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.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
 #: 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
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
@@ -106,7 +107,7 @@ 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."
-msgstr "そのようなタグはありません。"
+msgstr "そのようなページはありません。"
 
 #. TRANS: Client error when user not found for an action.
 #. TRANS: Client error when user not found for an rss related action.
@@ -159,7 +160,7 @@ msgstr "そのようなユーザはいません。"
 #: 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.
@@ -170,32 +171,32 @@ msgstr "%1$s と友人、ページ %2$d"
 #: 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)"
-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)"
-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)"
-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."
-msgstr "これは %s と友人のタイムラインです。まだ誰も投稿していません。"
+msgstr "これは%sとその友人のタイムラインですが、まだ誰も投稿していません。"
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
@@ -280,7 +281,7 @@ 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/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
@@ -328,7 +329,8 @@ msgstr "ユーザを更新できませんでした。"
 #: 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
@@ -381,20 +383,38 @@ msgstr "あなたのデザイン設定を保存できません。"
 msgid "Could not update your design."
 msgstr "デザインを更新できませんでした。"
 
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
 msgid "Main"
 msgstr ""
 
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/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: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s フォローしている"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "お気に入り"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s グループメンバー"
+
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
 msgid "You cannot block yourself!"
@@ -540,7 +560,7 @@ msgstr "ターゲットユーザーを見つけられません。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
@@ -550,7 +570,7 @@ msgstr "そのニックネームは既に使用されています。他のもの
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
@@ -562,7 +582,7 @@ msgstr "有効なニックネームではありません。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
@@ -572,7 +592,7 @@ msgstr "ホームページのURLが不適切です。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -588,7 +608,7 @@ msgstr "フルネームが長すぎます。（255字まで）"
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -599,7 +619,7 @@ msgstr[0] "記述が長すぎます。（最長%d字）"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -612,7 +632,7 @@ msgstr "場所が長すぎます。（255字まで）"
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -630,7 +650,7 @@ msgstr "不正な別名: \"%s\""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "別名 \"%s\" は既に使用されています。他のものを試してみて下さい。"
@@ -639,7 +659,7 @@ msgstr "別名 \"%s\" は既に使用されています。他のものを試し
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "別名はニックネームと同じではいけません。"
 
@@ -748,7 +768,7 @@ msgstr "認証されていません。"
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 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/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -785,7 +805,7 @@ msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 #. TRANS: Unknown form validation error in design settings form.
 #: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
 #: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 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
@@ -854,7 +874,7 @@ 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.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
 #: actions/imsettings.php:131 actions/smssettings.php:137
 #: lib/applicationeditform.php:351
 #, fuzzy
@@ -932,7 +952,8 @@ msgstr "他のユーザのステータスを消すことはできません。"
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "そのようなつぶやきはありません。"
 
@@ -948,7 +969,11 @@ msgstr "あなたのつぶやきを繰り返せません。"
 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 
-#: actions/apistatusesshow.php:117
+#. TRANS: Client error shown when using a non-supported HTTP method.
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:122
+#: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API メソッドが見つかりません。"
@@ -968,16 +993,16 @@ msgstr "ステータスを削除しました。"
 msgid "No status with that ID found."
 msgstr "そのＩＤでのステータスはありません。"
 
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
 msgid "Can only delete using the Atom format."
 msgstr ""
 
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "このつぶやきを削除できません。"
 
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
 #, fuzzy, php-format
 msgid "Deleted notice %d"
 msgstr "つぶやき削除"
@@ -1033,7 +1058,7 @@ msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
 
 #. 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 "グループを更新できません。"
@@ -1098,34 +1123,58 @@ msgstr "%s とタグ付けされたつぶやき"
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s に %1$s による更新があります！"
 
-#: actions/apitimelineuser.php:300
+#. 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 "ユーザだけがかれら自身のメールボックスを読むことができます。"
 
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:316
-msgid "Atom post must be an Atom entry."
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
 msgstr ""
 
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
+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:334
+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:345
 #, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:378
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "つぶやきの内容を探す"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "その ID によるつぶやきは存在していません"
 
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1136,11 +1185,157 @@ 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 メソッドが見つかりません。"
 
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "そのようなファイルはありません。"
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "サブスクリプションを追加できません"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "つぶやきの内容を探す"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "不明"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "お気に入りに加える"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "そのようなファイルはありません。"
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s グループメンバー"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "グループ %s はメンバー"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "不明"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "全てのメンバー"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "そのようなファイルはありません。"
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "お気に入りを取り消すことができません。"
+
+#: actions/atompubshowmembership.php:81
+msgid "No such group"
+msgstr "そのようなグループはありません。"
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "全てのメンバー"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "API メソッドが見つかりません。"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't 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 "フォローを保存できません。"
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "人々は %s をフォローしました。"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, 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."
@@ -1211,14 +1406,16 @@ 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.
-#: 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"
@@ -1262,6 +1459,38 @@ msgstr "アバターの更新に失敗しました。"
 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "ログインユーザだけがつぶやきを繰り返せます。"
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+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 ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "バックグラウンド"
+
+#: actions/backupaccount.php:258
+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."
@@ -1313,10 +1542,9 @@ msgstr "このユーザをアンブロックする"
 #: actions/block.php:161 actions/deleteapplication.php:164
 #: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
-msgstr "Yes"
+msgstr "はい"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #. TRANS: Description of the form to block a user.
@@ -1433,8 +1661,8 @@ msgstr "そのアドレスは既に承認されています。"
 #. 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:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
 #: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
@@ -1471,6 +1699,77 @@ 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.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, 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.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+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."
@@ -1625,7 +1924,7 @@ msgid "Do not delete this notice"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "このつぶやきを削除"
 
@@ -1934,7 +2233,7 @@ msgstr "このフォームを使ってグループを編集します。"
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "不正な別名: \"%s\""
@@ -1946,7 +2245,7 @@ msgstr "グループを更新できません。"
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "別名を作成できません。"
 
@@ -1969,12 +2268,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.
-#: 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.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
 msgid "Current confirmed email address."
 msgstr "現在確認されているメールアドレス。"
 
@@ -1983,14 +2282,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.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 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."
@@ -2003,14 +2302,14 @@ 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.
-#: 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.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
 #: actions/smssettings.php:162
 #, fuzzy
 msgctxt "BUTTON"
@@ -2019,115 +2318,122 @@ msgstr "追加"
 
 #. 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:171
 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.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
 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.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
 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.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
 #, 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.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
 msgid "Send me notices of new subscriptions through email."
 msgstr "メールで新規フォローの通知を私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: 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.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "だれかがプライベート・メッセージを私に送るときには、メールを私に送ってくださ"
 "い。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
 msgid "Allow friends to nudge me and send me an email."
 msgstr "友達が私に合図とメールを送ることを許可する。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "メールでつぶやきを投稿したい。"
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
 msgid "Publish a MicroID for my email address."
 msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "デザイン設定が保存されました。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
 msgid "No email address."
 msgstr "メールアドレスがありません。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
 msgid "Cannot normalize that email address"
 msgstr "そのメールアドレスを正規化できません"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: 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/emailsettings.php:383
+#: 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.
-#: actions/emailsettings.php:387
+#: 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.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "承認コードを追加できません"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: 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."
@@ -2139,57 +2445,57 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: 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.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: 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.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
 msgid "That is not your email address."
 msgstr "これはあなたのメールアドレスではありません。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
 msgid "The email address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "入ってくるメールアドレスではありません。"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "新しい入ってくるメールアドレスが追加されました。"
 
@@ -3182,8 +3488,14 @@ 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.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "このフォームを使って新しいグループを作成します。"
 
@@ -3505,11 +3817,6 @@ msgstr "新しいパスワード"
 msgid "6 or more characters"
 msgstr "6文字以上"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "パスワード確認"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "上と同じパスワード"
@@ -4042,6 +4349,12 @@ msgstr "タグを保存できません。"
 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#, fuzzy
+msgid "Restore account"
+msgstr "新しいグループを作成"
+
 #: actions/public.php:83
 #, fuzzy, php-format
 msgid "Beyond the page limit (%s)."
@@ -4504,7 +4817,7 @@ msgstr "自分のつぶやきは繰り返せません。"
 msgid "You already repeated that notice."
 msgstr "すでにそのつぶやきを繰り返しています。"
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "繰り返された"
 
@@ -4568,6 +4881,97 @@ msgstr ""
 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."
@@ -4670,7 +5074,7 @@ msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "削除"
 
@@ -5422,7 +5826,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.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 
@@ -5430,11 +5834,6 @@ 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."
@@ -5502,13 +5901,6 @@ msgstr ""
 "%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
@@ -5558,13 +5950,18 @@ msgstr ""
 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.
-#: 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.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
 msgid "SMS"
 msgstr "SMS"
 
@@ -5964,13 +6361,13 @@ msgid "Author(s)"
 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.
-#: classes/Fave.php:151
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
@@ -6027,42 +6424,42 @@ 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.
-#: 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.
-#: 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.
-#: 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.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
 #, 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.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
@@ -6081,7 +6478,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.
-#: classes/Memcached_DataObject.php:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6091,12 +6488,12 @@ msgid "You are banned from sending direct messages."
 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.
-#: classes/Message.php:73
+#: classes/Message.php:80
 msgid "Could not update message with new URI."
 msgstr "新しいURIでメッセージをアップデートできませんでした。"
 
@@ -6108,30 +6505,30 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 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.
-#: 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.
-#: 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.
-#: 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.
-#: 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."
@@ -6140,42 +6537,42 @@ msgstr ""
 "い。"
 
 #. 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.
-#: 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().
-#: classes/Notice.php:909
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: 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.
-#: classes/Notice.php:1122
+#: 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.
-#: classes/Notice.php:1853
+#: 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
-#: classes/Profile.php:172 classes/User_group.php:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6183,14 +6580,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).
-#: classes/Profile.php:845
+#: 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).
-#: classes/Profile.php:854
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6207,48 +6604,48 @@ msgid "Unable to save tag."
 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.
-#: 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.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
 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.
-#: 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.
-#: 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.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
 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.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
 #, fuzzy, php-format
 msgid "%1$s is now following %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
@@ -6261,32 +6658,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 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.
-#: 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.
-#: 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.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"
@@ -6627,10 +7024,61 @@ 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 ""
 
+#. 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."
@@ -6921,10 +7369,16 @@ msgctxt "BUTTON"
 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 ""
 
+#. 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.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7315,20 +7769,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
@@ -7336,7 +7790,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.
-#: lib/common.php:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
@@ -7444,6 +7898,19 @@ msgstr "Atom"
 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"
@@ -7623,11 +8090,6 @@ msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 
 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:228
-msgid "System error uploading file."
-msgstr "ファイルのアップロードでシステムエラー"
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
@@ -8016,7 +8478,7 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "from"
 
@@ -8048,42 +8510,6 @@ msgstr ""
 "データベースエラーがあなたのファイルを保存しているときにありました。 再試行し"
 "てください。"
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-msgstr "エクステンションによってファイルアップロードを中止しました。"
-
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8104,7 +8530,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8113,7 +8539,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8149,19 +8575,19 @@ msgid "Send"
 msgstr "投稿"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: 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:158
+#: 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:171
+#: 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."
@@ -8201,59 +8627,59 @@ msgstr ""
 "度試みてください"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 #, fuzzy
 msgid "N"
 msgstr "北"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 #, fuzzy
 msgid "S"
 msgstr "南"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 #, fuzzy
 msgid "E"
 msgstr "東"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 #, fuzzy
 msgid "W"
 msgstr "西"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "at"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "返信"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 
@@ -8395,7 +8821,7 @@ msgstr "このつぶやきを繰り返しますか?"
 
 #: lib/repeatform.php:132
 msgid "Yes"
-msgstr "Yes"
+msgstr "はい"
 
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
@@ -8407,7 +8833,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "このグループからこのユーザをブロック"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "API メソッドが見つかりません。"
@@ -8660,60 +9086,60 @@ msgid "Moderator"
 msgstr "管理"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "数秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: 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.
-#: lib/util.php:1283
+#: 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.
-#: lib/util.php:1286
+#: 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.
-#: lib/util.php:1290
+#: 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.
-#: lib/util.php:1293
+#: 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.
-#: lib/util.php:1297
+#: 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.
-#: lib/util.php:1300
+#: 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.
-#: lib/util.php:1304
+#: 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.
-#: lib/util.php:1307
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "約 1 年前"
 
@@ -8755,20 +9181,7 @@ msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:61
+#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-#, fuzzy
-msgid "No user specified; using backup user."
-msgstr "ユーザIDの記述がありません。"
-
-#. 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] ""