Localisation updates for !StatusNet from !translatewiki.net !sntrans

[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 3063f953896aca1ec16cd79fe7a71499192eebc8..d70e8262de13c697f714b3fd6c95d0b5f7fe71d9 100644 (file)
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -1,6 +1,5 @@
 # Translation of StatusNet to Japanese
 #
 # Translation of StatusNet to Japanese
 #

-# Author@translatewiki.net: Aotake

 # Author@translatewiki.net: Fryed-peach
 # Author@translatewiki.net: Sonoda
 # Author@translatewiki.net: Whym
 # Author@translatewiki.net: Fryed-peach
 # Author@translatewiki.net: Sonoda
 # Author@translatewiki.net: Whym


@@ -11,75 +10,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-02-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:17+0000\n"
+"POT-Creation-Date: 2010-04-12 21:47+0000\n"
+"PO-Revision-Date: 2010-04-12 21:49:13+0000\n"

 "Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: out-statusnet\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\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 

-#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#. TRANS: Page title
+#. TRANS: Menu item for site administration
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375

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

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

 msgid "Site access settings"
 msgstr "サイトアクセス設定"
 
 msgid "Site access settings"
 msgstr "サイトアクセス設定"
 

-#: actions/accessadminpanel.php:158
+#. TRANS: Form legend for registration form.
+#: actions/accessadminpanel.php:161

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

-#: actions/accessadminpanel.php:161
-msgid "Private"
-msgstr "プライベート"
-
-#: actions/accessadminpanel.php:163
+#. TRANS: Checkbox instructions for admin setting "Private"
+#: actions/accessadminpanel.php:165

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

+#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.

 #: actions/accessadminpanel.php:167
 #: actions/accessadminpanel.php:167

-msgid "Invite only"
-msgstr "招待のみ"
+#, fuzzy
+msgctxt "LABEL"
+msgid "Private"
+msgstr "プライベート"

 
 

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

 msgid "Make registration invitation only."
 msgstr "招待のみ登録する"
 
 msgid "Make registration invitation only."
 msgstr "招待のみ登録する"
 

-#: actions/accessadminpanel.php:173
-msgid "Closed"
-msgstr "閉じられた"
+#. TRANS: Checkbox label for configuring site as invite only.
+#: actions/accessadminpanel.php:176
+msgid "Invite only"
+msgstr "招待のみ"

 
 

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

 msgid "Disable new registrations."
 msgstr "新規登録を無効。"
 
 msgid "Disable new registrations."
 msgstr "新規登録を無効。"
 

-#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
-#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
-#: lib/applicationeditform.php:334 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "保存"
+#. TRANS: Checkbox label for disabling new user registrations.
+#: actions/accessadminpanel.php:185
+msgid "Closed"
+msgstr "閉じられた"

 
 

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

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

-#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
-#: actions/showfavorites.php:137 actions/tag.php:51
-msgid "No such page"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Button label
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "保存"
+
+#. TRANS: Server error when page not found (404)
+#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
+#: actions/showfavorites.php:138 actions/tag.php:52
+#, fuzzy
+msgid "No such page."

 msgstr "そのようなページはありません。"
 
 msgstr "そのようなページはありません。"
 

-#: actions/all.php:74 actions/allrss.php:68
+#: actions/all.php:75 actions/allrss.php:68

 #: actions/apiaccountupdatedeliverydevice.php:113
 #: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
 #: actions/apiaccountupdatedeliverydevice.php:113
 #: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116


@@ -87,58 +101,64 @@ msgstr "そのようなページはありません。"
 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99

-#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72

 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87

-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78

 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58

-#: 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:91 actions/userrss.php:38 actions/xrds.php:71
-#: lib/command.php:163 lib/command.php:302 lib/command.php:355
-#: lib/command.php:401 lib/command.php:462 lib/command.php:518
-#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:76 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77

 msgid "No such user."
 msgstr "そのようなユーザはいません。"
 
 msgid "No such user."
 msgstr "そのようなユーザはいません。"
 

-#: actions/all.php:84
+#. TRANS: Page title. %1$s is user nickname, %2$d is page number
+#: actions/all.php:86

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

-#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#. TRANS: Page title. %1$s is user nickname
+#. TRANS: H1 text. %1$s is user nickname
+#. TRANS: Message is used as link title. %s is a user nickname.
+#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116

 #: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
 #: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s と友人"
 
 #: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
 #: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s と友人"
 

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

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

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

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

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

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

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

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

-#: actions/all.php:132
+#: actions/all.php:139

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


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

-#: actions/all.php:134
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
+#: actions/all.php:142

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


@@ -156,7 +177,7 @@ msgstr ""
 "プロフィールから [%1$s さんに合図](../%2$s) したり、[知らせたいことについて投"
 "稿](%%%%action.newnotice%%%%?status_textarea=%3$s) したりできます。"
 
 "プロフィールから [%1$s さんに合図](../%2$s) したり、[知らせたいことについて投"
 "稿](%%%%action.newnotice%%%%?status_textarea=%3$s) したりできます。"
 

-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:211
+#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211

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


@@ -165,12 +186,15 @@ msgstr ""
 "[アカウントを登録](%%%%action.register%%%%) して %s さんに合図したり、お知ら"
 "せを送ってみませんか。"
 
 "[アカウントを登録](%%%%action.register%%%%) して %s さんに合図したり、お知ら"
 "せを送ってみませんか。"
 

-#: actions/all.php:165
+#. TRANS: H1 text
+#: actions/all.php:178

 msgid "You and friends"
 msgstr "あなたと友人"
 
 msgid "You and friends"
 msgstr "あなたと友人"
 

-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
+#: actions/allrss.php:121 actions/apitimelinefriends.php:120
+#: actions/apitimelinehome.php:121

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


@@ -183,20 +207,20 @@ msgstr "%2$s に %1$s と友人からの更新があります！"
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
 #: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
 #: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100

-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138

 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155

-#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
+#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106

 #: actions/apigroupshow.php:115 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
 #: actions/apigroupshow.php:115 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112

-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141

 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111

-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151

 #: actions/apitimelineretweetedtome.php:121
 #: actions/apitimelineretweetedtome.php:121

-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101

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


@@ -209,15 +233,16 @@ msgstr "API メソッドが見つかりません。"
 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91

-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118

 msgid "This method requires a POST."
 msgstr "このメソッドには POST が必要です。"
 
 #: actions/apiaccountupdatedeliverydevice.php:105
 msgid "This method requires a POST."
 msgstr "このメソッドには POST が必要です。"
 
 #: actions/apiaccountupdatedeliverydevice.php:105

+#, fuzzy

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

-"none"
+"none."

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


@@ -230,8 +255,9 @@ msgstr "ユーザを更新できませんでした。"
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108

-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
+#: lib/profileaction.php:84

 msgid "User has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
 msgid "User has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 


@@ -240,9 +266,9 @@ msgid "Could not save profile."
 msgstr "プロフィールを保存できませんでした。"
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 msgstr "プロフィールを保存できませんでした。"
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:108

-#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80

 #: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
 #: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257

-#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/designadminpanel.php:123 actions/editapplication.php:118

 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format


@@ -257,7 +283,7 @@ msgstr ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174

-#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
+#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300

 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."


@@ -326,7 +352,7 @@ msgstr "そのＩＤのステータスが見つかりません。"
 msgid "This status is already a favorite."
 msgstr "このステータスはすでにお気に入りです。"
 
 msgid "This status is already a favorite."
 msgstr "このステータスはすでにお気に入りです。"
 

-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285

 msgid "Could not create favorite."
 msgstr "お気に入りを作成できません。"
 
 msgid "Could not create favorite."
 msgstr "お気に入りを作成できません。"
 


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

-#: actions/apigroupcreate.php:164 actions/editgroup.php:182
+#: actions/apigroupcreate.php:166 actions/editgroup.php:186

 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."


@@ -376,62 +402,61 @@ msgstr ""
 "ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
 "できません。"
 
 "ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
 "できません。"
 

-#: actions/apigroupcreate.php:173 actions/editgroup.php:186
+#: actions/apigroupcreate.php:175 actions/editgroup.php:190

 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 

-#: actions/apigroupcreate.php:180 actions/editgroup.php:189
+#: actions/apigroupcreate.php:182 actions/editgroup.php:193

 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 

-#: actions/apigroupcreate.php:196 actions/editapplication.php:215
-#: actions/editgroup.php:195 actions/newapplication.php:203
+#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/editgroup.php:199 actions/newapplication.php:203

 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 

-#: actions/apigroupcreate.php:205 actions/editgroup.php:198
+#: actions/apigroupcreate.php:207 actions/editgroup.php:202

 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "フルネームが長すぎます。（255字まで）"
 
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "フルネームが長すぎます。（255字まで）"
 

-#: actions/apigroupcreate.php:213 actions/editapplication.php:190
+#: actions/apigroupcreate.php:215 actions/editapplication.php:190

 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "記述が長すぎます。（最長140字）"
 
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "記述が長すぎます。（最長140字）"
 

-#: actions/apigroupcreate.php:224 actions/editgroup.php:204
+#: actions/apigroupcreate.php:226 actions/editgroup.php:208

 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "場所が長すぎます。（255字まで）"
 
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "場所が長すぎます。（255字まで）"
 

-#: actions/apigroupcreate.php:243 actions/editgroup.php:215
+#: actions/apigroupcreate.php:245 actions/editgroup.php:219

 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "別名が多すぎます! 最大 %d。"
 
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "別名が多すぎます! 最大 %d。"
 

-#: actions/apigroupcreate.php:264 actions/editgroup.php:224
-#: actions/newgroup.php:168
-#, php-format
-msgid "Invalid alias: \"%s\""
+#: actions/apigroupcreate.php:266
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\"."

 msgstr "不正な別名: \"%s\""
 
 msgstr "不正な別名: \"%s\""
 

-#: actions/apigroupcreate.php:273 actions/editgroup.php:228
+#: actions/apigroupcreate.php:275 actions/editgroup.php:232

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

-#: actions/apigroupcreate.php:286 actions/editgroup.php:234
+#: actions/apigroupcreate.php:288 actions/editgroup.php:238

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


@@ -439,18 +464,19 @@ msgstr "別名はニックネームと同じではいけません。"
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91

-msgid "Group not found!"
+#, fuzzy
+msgid "Group not found."

 msgstr "グループが見つかりません!"
 
 msgstr "グループが見つかりません!"
 

-#: actions/apigroupjoin.php:110 actions/joingroup.php:90
+#: actions/apigroupjoin.php:110 actions/joingroup.php:100

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

-#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327

 msgid "You have been blocked from that group by the admin."
 msgstr "管理者によってこのグループからブロックされています。"
 
 msgid "You have been blocked from that group by the admin."
 msgstr "管理者によってこのグループからブロックされています。"
 

-#: actions/apigroupjoin.php:138 actions/joingroup.php:124
+#: actions/apigroupjoin.php:138 actions/joingroup.php:134

 #, 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 に参加できません。"


@@ -459,22 +485,31 @@ msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
 msgid "You are not a member of this group."
 msgstr "このグループのメンバーではありません。"
 
 msgid "You are not a member of this group."
 msgstr "このグループのメンバーではありません。"
 

-#: actions/apigroupleave.php:124 actions/leavegroup.php:119
+#: actions/apigroupleave.php:124 actions/leavegroup.php:129

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

-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97

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

-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "グループ %s はメンバー"
+
+#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a page title. %s is a nick name.
+#: actions/apigrouplistall.php:91 actions/usergroups.php:63

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

-#: actions/apigrouplistall.php:94
+#: actions/apigrouplistall.php:95

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


@@ -488,18 +523,18 @@ msgid "Invalid token."
 msgstr "不正なトークン。"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 msgstr "不正なトークン。"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268

-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
-#: actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/groupblock.php:66 actions/grouplogo.php:312
+#: actions/groupunblock.php:66 actions/imsettings.php:227

 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138

-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350

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

-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166

 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."


@@ -531,12 +566,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "リクエストトークン%sは、拒否されて、取り消されました。"
 
 msgid "The request token %s has been denied and revoked."
 msgstr "リクエストトークン%sは、拒否されて、取り消されました。"
 

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

 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281

-#: actions/designadminpanel.php:103 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/designadminpanel.php:104 actions/editapplication.php:139
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121

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

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

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


@@ -556,20 +594,22 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 

-#: actions/apioauthauthorize.php:310 lib/action.php:441
+#. TRANS: Main menu option when logged in for access to user settings
+#: actions/apioauthauthorize.php:310 lib/action.php:440

 msgid "Account"
 msgstr "アカウント"
 
 #: actions/apioauthauthorize.php:313 actions/login.php:230
 #: actions/profilesettings.php:106 actions/register.php:424
 msgid "Account"
 msgstr "アカウント"
 
 #: actions/apioauthauthorize.php:313 actions/login.php:230
 #: actions/profilesettings.php:106 actions/register.php:424

-#: actions/showgroup.php:236 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94

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

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

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

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

 #: actions/apioauthauthorize.php:316 actions/login.php:233
 #: actions/apioauthauthorize.php:316 actions/login.php:233

-#: actions/register.php:429 lib/accountsettingsaction.php:116
+#: actions/register.php:429 lib/accountsettingsaction.php:125

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


@@ -620,9 +660,9 @@ msgstr "そのＩＤでのステータスはありません。"
 msgid "That's too long. Max notice size is %d chars."
 msgstr "長すぎます。つぶやきは最大 140 字までです。"
 
 msgid "That's too long. Max notice size is %d chars."
 msgstr "長すぎます。つぶやきは最大 140 字までです。"
 

-#: actions/apistatusesupdate.php:202
-msgid "Not found"
-msgstr "みつかりません"
+#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+msgid "Not found."
+msgstr "見つかりません。"

 
 #: actions/apistatusesupdate.php:225 actions/newnotice.php:178
 #, php-format
 
 #: actions/apistatusesupdate.php:225 actions/newnotice.php:178
 #, php-format


@@ -633,34 +673,22 @@ msgstr "つぶやきは URL を含めて最大 %d 字までです。"
 msgid "Unsupported format."
 msgstr "サポート外の形式です。"
 
 msgid "Unsupported format."
 msgstr "サポート外の形式です。"
 

-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109

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

-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:118

 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
 msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
 
 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
 msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
 

-#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
-#: actions/grouprss.php:131 actions/userrss.php:90
-#, php-format
-msgid "%s timeline"
-msgstr "%s のタイムライン"
-
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
-#: actions/userrss.php:92
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "%1$s から %2$s  上の更新をしました!"
-

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

-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130

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


@@ -670,7 +698,7 @@ msgstr "%2$s からアップデートに答える %1$s アップデート"
 msgid "%s public timeline"
 msgstr "%s のパブリックタイムライン"
 
 msgid "%s public timeline"
 msgstr "%s のパブリックタイムライン"
 

-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:112 actions/publicrss.php:105

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


@@ -680,25 +708,21 @@ msgstr "皆からの %s アップデート!"
 msgid "Repeated to %s"
 msgstr "%s への返信"
 
 msgid "Repeated to %s"
 msgstr "%s への返信"
 

-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114

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

-#: actions/apitimelinetag.php:102 actions/tag.php:66
+#: actions/apitimelinetag.php:104 actions/tag.php:67

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

-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65

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

-#: actions/apiusershow.php:96
-msgid "Not found."
-msgstr "見つかりません。"
-

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


@@ -706,8 +730,7 @@ msgstr "そのような添付はありません。"
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
 #: actions/grouplogo.php:86 actions/groupmembers.php:76
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
 #: actions/grouplogo.php:86 actions/groupmembers.php:76

-#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76
-#: actions/showgroup.php:121
+#: actions/grouprss.php:91 actions/showgroup.php:121

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


@@ -719,8 +742,9 @@ msgstr "サイズがありません。"
 msgid "Invalid size."
 msgstr "不正なサイズ。"
 
 msgid "Invalid size."
 msgstr "不正なサイズ。"
 

-#: actions/avatarsettings.php:67 actions/showgroup.php:221
-#: lib/accountsettingsaction.php:112
+#. TRANS: Link description in user account settings menu.
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
+#: lib/accountsettingsaction.php:118

 msgid "Avatar"
 msgstr "アバター"
 
 msgid "Avatar"
 msgstr "アバター"
 


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

-#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
-#: actions/userrss.php:103
-msgid "User without matching profile"
+#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:108
+msgid "User without matching profile."

 msgstr "合っているプロフィールのないユーザ"
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 msgstr "合っているプロフィールのないユーザ"
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197

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

 msgid "Avatar settings"
 msgstr "アバター設定"
 
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 msgid "Avatar settings"
 msgstr "アバター設定"
 
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205

-#: actions/grouplogo.php:199 actions/grouplogo.php:259
+#: actions/grouplogo.php:202 actions/grouplogo.php:262

 msgid "Original"
 msgstr "オリジナル"
 
 #: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 msgid "Original"
 msgstr "オリジナル"
 
 #: actions/avatarsettings.php:142 actions/avatarsettings.php:217

-#: actions/grouplogo.php:210 actions/grouplogo.php:271
+#: actions/grouplogo.php:213 actions/grouplogo.php:274

 msgid "Preview"
 msgstr "プレビュー"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
 msgid "Preview"
 msgstr "プレビュー"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252

-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:656

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

-#: actions/avatarsettings.php:166 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:236

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

-#: actions/avatarsettings.php:231 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:289

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

-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "プロファイル記述がありません。"
+
+#: actions/avatarsettings.php:332

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

-#: actions/avatarsettings.php:343 actions/grouplogo.php:377
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380

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

-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370

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

-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373

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

-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397

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


@@ -787,7 +816,7 @@ msgstr "アバターが削除されました。"
 msgid "You already blocked that user."
 msgstr "そのユーザはすでにブロック済みです。"
 
 msgid "You already blocked that user."
 msgstr "そのユーザはすでにブロック済みです。"
 

-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158

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


@@ -802,68 +831,91 @@ msgstr ""
 "たからフォローを外されるでしょう、将来、あなたにフォローできないで、あなたは"
 "どんな @-返信 についてもそれらから通知されないでしょう。"
 
 "たからフォローを外されるでしょう、将来、あなたにフォローできないで、あなたは"
 "どんな @-返信 についてもそれらから通知されないでしょう。"
 

-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:147
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152

 #: actions/groupblock.php:178
 #: actions/groupblock.php:178

+#, fuzzy
+msgctxt "BUTTON"

 msgid "No"
 msgstr "No"
 
 msgid "No"
 msgstr "No"
 

-#: actions/block.php:143 actions/deleteuser.php:147
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156

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

-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:148
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Yes"
 msgstr "Yes"
 
 msgid "Yes"
 msgstr "Yes"
 

-#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80

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

-#: actions/block.php:167
+#: actions/block.php:179

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

-#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
-#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
-#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
-#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/grouprss.php:98 actions/groupunblock.php:86
-#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
+#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
+#: actions/editgroup.php:100 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:86 actions/joingroup.php:82
+#: actions/joingroup.php:93 actions/leavegroup.php:82
+#: actions/leavegroup.php:93 actions/makeadmin.php:86
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368

 msgid "No such group."
 msgstr "そのようなグループはありません。"
 
 msgid "No such group."
 msgstr "そのようなグループはありません。"
 

-#: actions/blockedfromgroup.php:90
+#: actions/blockedfromgroup.php:97

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

-#: actions/blockedfromgroup.php:93
+#: actions/blockedfromgroup.php:100

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

-#: actions/blockedfromgroup.php:108
+#: actions/blockedfromgroup.php:115

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

-#: actions/blockedfromgroup.php:281
+#: actions/blockedfromgroup.php:288

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

-#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:69

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

-#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:80

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

-#: actions/bookmarklet.php:50
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"

 msgstr "投稿"
 
 #: actions/confirmaddress.php:75
 msgstr "投稿"
 
 #: actions/confirmaddress.php:75


@@ -878,33 +930,43 @@ msgstr "確認コードが見つかりません。"
 msgid "That confirmation code is not for you!"
 msgstr "その確認コードはあなたのものではありません！"
 
 msgid "That confirmation code is not for you!"
 msgstr "その確認コードはあなたのものではありません！"
 

-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
+#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:91
+#, fuzzy, php-format
+msgid "Unrecognized address type %s."

 msgstr "不明なアドレスタイプ %s"
 
 msgstr "不明なアドレスタイプ %s"
 

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

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

-#: actions/confirmaddress.php:114 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464

 msgid "Couldn't update user."
 msgstr "ユーザを更新できません"
 
 msgid "Couldn't update user."
 msgstr "ユーザを更新できません"
 

-#: actions/confirmaddress.php:126 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422

 msgid "Couldn't delete email confirmation."
 msgstr "メール承認を削除できません"
 
 msgid "Couldn't delete email confirmation."
 msgstr "メール承認を削除できません"
 

-#: actions/confirmaddress.php:144
+#: actions/confirmaddress.php:146

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

-#: actions/confirmaddress.php:159
+#: actions/confirmaddress.php:161

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


@@ -914,7 +976,7 @@ msgid "Conversation"
 msgstr "会話"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 msgstr "会話"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87

-#: lib/profileaction.php:216 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82

 msgid "Notices"
 msgstr "つぶやき"
 
 msgid "Notices"
 msgstr "つぶやき"
 


@@ -933,7 +995,7 @@ msgstr "このアプリケーションのオーナーではありません。"
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118

-#: lib/action.php:1195
+#: lib/action.php:1253

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


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

-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158

 msgid "Do not delete this application"
 msgstr "このアプリケーションを削除しないでください"
 
 msgid "Do not delete this application"
 msgstr "このアプリケーションを削除しないでください"
 

-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164

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

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

 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89

-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96

 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: actions/tagother.php:33 actions/unsubscribe.php:52

-#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:63

 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ログインしていません。"
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ログインしていません。"


@@ -989,11 +1054,13 @@ msgstr "つぶやき削除"
 msgid "Are you sure you want to delete this notice?"
 msgstr "本当にこのつぶやきを削除しますか？"
 
 msgid "Are you sure you want to delete this notice?"
 msgstr "本当にこのつぶやきを削除しますか？"
 

-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151

 msgid "Do not delete this notice"
 msgstr "このつぶやきを削除できません。"
 
 msgid "Do not delete this notice"
 msgstr "このつぶやきを削除できません。"
 

-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656

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


@@ -1009,7 +1076,7 @@ msgstr "ローカルユーザのみ削除できます。"
 msgid "Delete user"
 msgstr "ユーザ削除"
 
 msgid "Delete user"
 msgstr "ユーザ削除"
 

-#: actions/deleteuser.php:135
+#: actions/deleteuser.php:136

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


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

-#: actions/deleteuser.php:148 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77

 msgid "Delete this user"
 msgstr "このユーザを削除"
 
 msgid "Delete this user"
 msgstr "このユーザを削除"
 

-#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:316 lib/groupnav.php:119
+#. 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:139
+#: lib/groupnav.php:119

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

-#: actions/designadminpanel.php:73
+#: actions/designadminpanel.php:74

 msgid "Design settings for this StatusNet site."
 msgstr "この StatusNet サイトのデザイン設定。"
 
 msgid "Design settings for this StatusNet site."
 msgstr "この StatusNet サイトのデザイン設定。"
 

-#: actions/designadminpanel.php:275
+#: actions/designadminpanel.php:276

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

-#: actions/designadminpanel.php:279
-#, php-format
-msgid "Theme not available: %s"
+#: actions/designadminpanel.php:280
+#, fuzzy, php-format
+msgid "Theme not available: %s."

 msgstr "テーマが利用できません： %s"
 
 msgstr "テーマが利用できません： %s"
 

-#: actions/designadminpanel.php:375
+#: actions/designadminpanel.php:376

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

-#: actions/designadminpanel.php:380
+#: actions/designadminpanel.php:381

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

-#: actions/designadminpanel.php:387
+#: actions/designadminpanel.php:388

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

-#: actions/designadminpanel.php:404
+#: actions/designadminpanel.php:405

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

-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:406

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

-#: actions/designadminpanel.php:417 lib/designsettings.php:101
+#: actions/designadminpanel.php:418 lib/designsettings.php:101

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

-#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
+#: actions/designadminpanel.php:423 actions/designadminpanel.php:500

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

-#: actions/designadminpanel.php:427
+#: actions/designadminpanel.php:428

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


@@ -1077,55 +1147,68 @@ msgstr ""
 "このサイト用にバックグラウンドイメージをアップロードできます。最大ファイルサ"
 "イズは %1$s。"
 
 "このサイト用にバックグラウンドイメージをアップロードできます。最大ファイルサ"
 "イズは %1$s。"
 

-#: actions/designadminpanel.php:457 lib/designsettings.php:139
+#. TRANS: Used as radio button label to add a background image.
+#: actions/designadminpanel.php:459 lib/designsettings.php:139

 msgid "On"
 msgstr "オン"
 
 msgid "On"
 msgstr "オン"
 

-#: actions/designadminpanel.php:473 lib/designsettings.php:155
+#. TRANS: Used as radio button label to not add a background image.
+#: actions/designadminpanel.php:476 lib/designsettings.php:155

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

-#: actions/designadminpanel.php:474 lib/designsettings.php:156
+#: actions/designadminpanel.php:477 lib/designsettings.php:156

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

-#: actions/designadminpanel.php:479 lib/designsettings.php:161
+#: actions/designadminpanel.php:482 lib/designsettings.php:161

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

-#: actions/designadminpanel.php:488 lib/designsettings.php:170
+#: actions/designadminpanel.php:491 lib/designsettings.php:170

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

-#: actions/designadminpanel.php:510 lib/designsettings.php:191
+#: actions/designadminpanel.php:513 lib/designsettings.php:191

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

-#: actions/designadminpanel.php:523 lib/designsettings.php:204
+#: actions/designadminpanel.php:526 lib/designsettings.php:204

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

-#: actions/designadminpanel.php:536 lib/designsettings.php:217
+#: actions/designadminpanel.php:539 lib/designsettings.php:217

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

-#: actions/designadminpanel.php:549 lib/designsettings.php:230
+#: actions/designadminpanel.php:552 lib/designsettings.php:230

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

-#: actions/designadminpanel.php:577 lib/designsettings.php:247
+#: actions/designadminpanel.php:580 lib/designsettings.php:247

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

-#: actions/designadminpanel.php:578 lib/designsettings.php:248
+#: actions/designadminpanel.php:581 lib/designsettings.php:248

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

-#: actions/designadminpanel.php:584 lib/designsettings.php:254
+#: actions/designadminpanel.php:587 lib/designsettings.php:254

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

-#: actions/designadminpanel.php:587 lib/designsettings.php:257
+#. TRANS: Submit button title
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
+#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "保存"
+
+#: actions/designadminpanel.php:590 lib/designsettings.php:257

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


@@ -1216,57 +1299,74 @@ msgstr "%s グループを編集"
 msgid "You must be logged in to create a group."
 msgstr "グループを作るにはログインしていなければなりません。"
 
 msgid "You must be logged in to create a group."
 msgstr "グループを作るにはログインしていなければなりません。"
 

-#: actions/editgroup.php:103 actions/editgroup.php:168
-#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+#: actions/editgroup.php:107 actions/editgroup.php:172
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109

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

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

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

-#: actions/editgroup.php:201 actions/newgroup.php:145
+#: actions/editgroup.php:205 actions/newgroup.php:145

 #, php-format
 msgid "description is too long (max %d chars)."
 msgstr "記述が長すぎます。（最長 %d 字）"
 
 #, php-format
 msgid "description is too long (max %d chars)."
 msgstr "記述が長すぎます。（最長 %d 字）"
 

-#: actions/editgroup.php:253
+#: actions/editgroup.php:228 actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "不正な別名: \"%s\""
+
+#: actions/editgroup.php:258

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

-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:264 classes/User_group.php:496

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

-#: actions/editgroup.php:269
+#: actions/editgroup.php:280

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

-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61

 msgid "Email settings"
 msgstr "メール設定"
 
 msgid "Email settings"
 msgstr "メール設定"
 

-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76

 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% からのメールを管理。"
 
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% からのメールを管理。"
 

-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "住所"
+#. 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
+msgid "Email address"
+msgstr "メールアドレス"

 
 

-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112

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

-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender 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:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Remove"
 msgstr "削除"
 
 msgid "Remove"
 msgstr "削除"
 

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

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


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

-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:331
-#: lib/applicationeditform.php:332
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Cancel"
 msgstr "中止"
 
 msgid "Cancel"
 msgstr "中止"
 

-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "メールアドレス"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135

 msgid "Email address, like \"UserName@example.org\""
 msgstr "メールアドレス、\"UserName@example.org\" のような"
 
 msgid "Email address, like \"UserName@example.org\""
 msgstr "メールアドレス、\"UserName@example.org\" のような"
 

-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. 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:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Add"
 msgstr "追加"
 
 msgid "Add"
 msgstr "追加"
 

-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171

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

-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. 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:155 actions/smssettings.php:178

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

-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186

 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メールアドレスを作ります; 古い方を取り消します。"
 

-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. 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:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"

 msgid "New"
 msgstr "New"
 
 msgid "New"
 msgstr "New"
 

-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"

 msgstr "設定"
 
 msgstr "設定"
 

-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180

 msgid "Send me notices of new subscriptions through email."
 msgstr "メールで新規フォローの通知を私に送ってください。"
 
 msgid "Send me notices of new subscriptions through email."
 msgstr "メールで新規フォローの通知を私に送ってください。"
 

-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186

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

-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193

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

-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199

 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
 
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
 

-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205

 msgid "Allow friends to nudge me and send me an email."
 msgstr "友達が私に合図とメールを送ることを許可する。"
 
 msgid "Allow friends to nudge me and send me an email."
 msgstr "友達が私に合図とメールを送ることを許可する。"
 

-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212

 msgid "I want to post notices by email."
 msgstr "メールでつぶやきを投稿したい。"
 
 msgid "I want to post notices by email."
 msgstr "メールでつぶやきを投稿したい。"
 

-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219

 msgid "Publish a MicroID for my email address."
 msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 
 msgid "Publish a MicroID for my email address."
 msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 

-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "設定が保存されました。"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "デザイン設定が保存されました。"

 
 

-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353

 msgid "No email address."
 msgstr "メールアドレスがありません。"
 
 msgid "No email address."
 msgstr "メールアドレスがありません。"
 

-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361

 msgid "Cannot normalize that email address"
 msgstr "そのメールアドレスを正規化できません"
 
 msgid "Cannot normalize that email address"
 msgstr "そのメールアドレスを正規化できません"
 

-#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:143
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/siteadminpanel.php:144

 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
 
 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
 

-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370

 msgid "That is already your email address."
 msgstr "これはすでにあなたのメールアドレスです。"
 
 msgid "That is already your email address."
 msgstr "これはすでにあなたのメールアドレスです。"
 

-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374

 msgid "That email address already belongs to another user."
 msgstr "このメールアドレスは既に他の人が使っています。"
 
 msgid "That email address already belongs to another user."
 msgstr "このメールアドレスは既に他の人が使っています。"
 

-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. 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:391 actions/imsettings.php:348
+#: actions/smssettings.php:373

 msgid "Couldn't insert confirmation code."
 msgstr "承認コードを追加できません"
 
 msgid "Couldn't insert confirmation code."
 msgstr "承認コードを追加できません"
 

-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398

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


@@ -1385,43 +1520,56 @@ msgstr ""
 "ムボックス）にコードとそれをどう使うのかという指示が届いていないか確認してく"
 "ださい。"
 
 "ムボックス）にコードとそれをどう使うのかという指示が届いていないか確認してく"
 "ださい。"
 

-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. 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:419 actions/imsettings.php:383
+#: actions/smssettings.php:408

 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 
 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 

-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."

 msgstr "その IM アドレスは不正です。"
 
 msgstr "その IM アドレスは不正です。"
 

-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."

 msgstr "承認作業が中止されました。"
 
 msgstr "承認作業が中止されました。"
 

-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458

 msgid "That is not your email address."
 msgstr "これはあなたのメールアドレスではありません。"
 
 msgid "That is not your email address."
 msgstr "これはあなたのメールアドレスではありません。"
 

-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."

 msgstr "アドレスは削除されました。"
 
 msgstr "アドレスは削除されました。"
 

-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568

 msgid "No incoming email address."
 msgstr "入ってくるメールアドレスではありません。"
 
 msgid "No incoming email address."
 msgstr "入ってくるメールアドレスではありません。"
 

-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. 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:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602

 msgid "Couldn't update user record."
 msgstr "ユーザレコードを更新できません。"
 
 msgid "Couldn't update user record."
 msgstr "ユーザレコードを更新できません。"
 

-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581

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

-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605

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


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

-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
-msgid "Error updating remote profile"
+#: actions/finishremotesubscribe.php:138
+#, fuzzy
+msgid "Error updating remote profile."

 msgstr "リモートプロファイル更新エラー"
 
 #: actions/getfile.php:79
 msgstr "リモートプロファイル更新エラー"
 
 #: actions/getfile.php:79


@@ -1553,6 +1702,25 @@ msgstr "そのようなファイルはありません。"
 msgid "Cannot read file."
 msgstr "ファイルを読み込めません。"
 
 msgid "Cannot read file."
 msgstr "ファイルを読み込めません。"
 

+#: actions/grantrole.php:62 actions/revokerole.php:62
+#, fuzzy
+msgid "Invalid role."
+msgstr "不正なトークン。"
+
+#: actions/grantrole.php:66 actions/revokerole.php:66
+msgid "This role is reserved and cannot be set."
+msgstr ""
+
+#: actions/grantrole.php:75
+#, fuzzy
+msgid "You cannot grant user roles on this site."
+msgstr "あなたはこのサイトのサンドボックスユーザができません。"
+
+#: actions/grantrole.php:82
+#, fuzzy
+msgid "User already has this role."
+msgstr "ユーザは既に黙っています。"
+

 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
 #: lib/profileformaction.php:70
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
 #: lib/profileformaction.php:70


@@ -1582,11 +1750,11 @@ msgstr "ユーザはすでにグループからブロックされています。
 msgid "User is not a member of group."
 msgstr "ユーザはグループのメンバーではありません。"
 
 msgid "User is not a member of group."
 msgstr "ユーザはグループのメンバーではありません。"
 

-#: actions/groupblock.php:136 actions/groupmembers.php:316
+#: actions/groupblock.php:134 actions/groupmembers.php:360

 msgid "Block user from group"
 msgstr "グループからユーザをブロック"
 
 msgid "Block user from group"
 msgstr "グループからユーザをブロック"
 

-#: actions/groupblock.php:162
+#: actions/groupblock.php:160

 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "


@@ -1596,15 +1764,17 @@ msgstr ""
 "本当にユーザ %1$s をグループ %2$s からブロックしますか? 彼らはグループから削"
 "除される、投稿できない、グループをフォローできなくなります。"
 
 "本当にユーザ %1$s をグループ %2$s からブロックしますか? 彼らはグループから削"
 "除される、投稿できない、グループをフォローできなくなります。"
 

-#: actions/groupblock.php:178
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182

 msgid "Do not block this user from this group"
 msgstr "このグループからこのユーザをブロックしない"
 
 msgid "Do not block this user from this group"
 msgstr "このグループからこのユーザをブロックしない"
 

-#: actions/groupblock.php:179
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189

 msgid "Block this user from this group"
 msgstr "このグループからこのユーザをブロック"
 
 msgid "Block this user from this group"
 msgstr "このグループからこのユーザをブロック"
 

-#: actions/groupblock.php:196
+#: actions/groupblock.php:206

 msgid "Database error blocking user from group."
 msgstr "グループからのブロックユーザのデータベースエラー"
 
 msgid "Database error blocking user from group."
 msgstr "グループからのブロックユーザのデータベースエラー"
 


@@ -1616,11 +1786,11 @@ msgstr "ID がありません。"
 msgid "You must be logged in to edit a group."
 msgstr "グループを編集するにはログインしていなければなりません。"
 
 msgid "You must be logged in to edit a group."
 msgstr "グループを編集するにはログインしていなければなりません。"
 

-#: actions/groupdesignsettings.php:141
+#: actions/groupdesignsettings.php:144

 msgid "Group design"
 msgstr "グループデザイン"
 
 msgid "Group design"
 msgstr "グループデザイン"
 

-#: actions/groupdesignsettings.php:152
+#: actions/groupdesignsettings.php:155

 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."


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

-#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186

 #: lib/designsettings.php:391 lib/designsettings.php:413
 msgid "Couldn't update your design."
 msgstr "あなたのデザインを更新できません。"
 
 #: lib/designsettings.php:391 lib/designsettings.php:413
 msgid "Couldn't update your design."
 msgstr "あなたのデザインを更新できません。"
 

-#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231

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

-#: actions/grouplogo.php:139 actions/grouplogo.php:192
+#: actions/grouplogo.php:142 actions/grouplogo.php:195

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

-#: actions/grouplogo.php:150
+#: actions/grouplogo.php:153

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


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

-#: actions/grouplogo.php:178
-msgid "User without matching profile."
-msgstr "合っているプロフィールのないユーザ"
-
-#: actions/grouplogo.php:362
+#: actions/grouplogo.php:365

 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:396
+#: actions/grouplogo.php:399

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

-#: actions/grouplogo.php:398
+#: actions/grouplogo.php:401

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

-#: actions/groupmembers.php:93 lib/groupnav.php:92
+#: actions/groupmembers.php:100 lib/groupnav.php:92

 #, php-format
 msgid "%s group members"
 msgstr "%s グループメンバー"
 
 #, php-format
 msgid "%s group members"
 msgstr "%s グループメンバー"
 

-#: actions/groupmembers.php:96
+#: actions/groupmembers.php:103

 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s グループメンバー、ページ %2$d"
 
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s グループメンバー、ページ %2$d"
 

-#: actions/groupmembers.php:111
+#: actions/groupmembers.php:118

 msgid "A list of the users in this group."
 msgstr "このグループのユーザのリスト。"
 
 msgid "A list of the users in this group."
 msgstr "このグループのユーザのリスト。"
 

-#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
+#: actions/groupmembers.php:182 lib/groupnav.php:107

 msgid "Admin"
 msgstr "管理者"
 
 msgid "Admin"
 msgstr "管理者"
 

-#: actions/groupmembers.php:348 lib/blockform.php:69
+#: actions/groupmembers.php:392 lib/blockform.php:69

 msgid "Block"
 msgstr "ブロック"
 
 msgid "Block"
 msgstr "ブロック"
 

-#: actions/groupmembers.php:443
+#: actions/groupmembers.php:487

 msgid "Make user an admin of the group"
 msgstr "ユーザをグループの管理者にする"
 
 msgid "Make user an admin of the group"
 msgstr "ユーザをグループの管理者にする"
 

-#: actions/groupmembers.php:475
+#: actions/groupmembers.php:519

 msgid "Make Admin"
 msgstr "管理者にする"
 
 msgid "Make Admin"
 msgstr "管理者にする"
 

-#: actions/groupmembers.php:475
+#: actions/groupmembers.php:519

 msgid "Make this user an admin"
 msgstr "このユーザを管理者にする"
 
 msgid "Make this user an admin"
 msgstr "このユーザを管理者にする"
 

-#: actions/grouprss.php:133
+#. 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:62 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
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s 上の %1$s のメンバーから更新する"
 
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s 上の %1$s のメンバーから更新する"
 

-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249

 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "グループ"
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "グループ"


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

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

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


@@ -1781,11 +1957,15 @@ msgstr "ユーザはグループからブロックされていません。"
 msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
 
 msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
 

-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60

 msgid "IM settings"
 msgstr "IM設定"
 
 msgid "IM settings"
 msgstr "IM設定"
 

-#: actions/imsettings.php:70
+#. 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

 #, 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](%%"


@@ -1794,15 +1974,24 @@ msgstr ""
 "Jabber/GTalk [instant messages](%%doc.im%%)　経由で通知の送信、受信が可能で"
 "す。下のアドレスを設定して下さい。"
 
 "Jabber/GTalk [instant messages](%%doc.im%%)　経由で通知の送信、受信が可能で"
 "す。下のアドレスを設定して下さい。"
 

-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94

 msgid "IM is not available."
 msgstr "ＩＭ が利用不可。"
 
 msgid "IM is not available."
 msgstr "ＩＭ が利用不可。"
 

-#: actions/imsettings.php:106
+#. 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
+msgid "IM address"
+msgstr "IMアドレス"
+
+#: actions/imsettings.php:113

 msgid "Current confirmed Jabber/GTalk address."
 msgstr "確認された最新の　Jabber/GTakk アドレス"
 
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "確認された最新の　Jabber/GTakk アドレス"
 

-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124

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


@@ -1811,11 +2000,9 @@ msgstr ""
 "このアドレスは承認待ちです。Jabber か Gtalk のアカウントで追加の指示が書かれ"
 "たメッセージを確認してください。(%s を友人リストに追加しましたか？)"
 
 "このアドレスは承認待ちです。Jabber か Gtalk のアカウントで追加の指示が書かれ"
 "たメッセージを確認してください。(%s を友人リストに追加しましたか？)"
 

-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IMアドレス"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140

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


@@ -1824,45 +2011,67 @@ msgstr ""
 "\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%s を"
 "IMクライアントやGTalkに追加して下さい。"
 
 "\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%s を"
 "IMクライアントやGTalkに追加して下さい。"
 

-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "設定"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160

 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk で私に通知を送って下さい。"
 
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk で私に通知を送って下さい。"
 

-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166

 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 

-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172

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

-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179

 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 

-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "設定が保存されました。"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309

 msgid "No Jabber ID."
 msgstr "Jabbar ID はありません。"
 
 msgid "No Jabber ID."
 msgstr "Jabbar ID はありません。"
 

-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317

 msgid "Cannot normalize that Jabber ID"
 msgstr "その Jabbar ID を正規化できません"
 
 msgid "Cannot normalize that Jabber ID"
 msgstr "その Jabbar ID を正規化できません"
 

-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322

 msgid "Not a valid Jabber ID"
 msgstr "有効な Jabber ID ではありません。"
 
 msgid "Not a valid Jabber ID"
 msgstr "有効な Jabber ID ではありません。"
 

-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326

 msgid "That is already your Jabber ID."
 msgstr "その Jabber ID は既にあなたのものです。"
 
 msgid "That is already your Jabber ID."
 msgstr "その Jabber ID は既にあなたのものです。"
 

-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330

 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 

-#: actions/imsettings.php:327
+#. 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:358

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


@@ -1871,10 +2080,35 @@ msgstr ""
 "承認コードを入力された IM アドレスに送信しました。あなたにメッセージを送れる"
 "ようにするには%sを承認してください。"
 
 "承認コードを入力された IM アドレスに送信しました。あなたにメッセージを送れる"
 "ようにするには%sを承認してください。"
 

-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "その IM アドレスは不正です。"
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "メール承認を削除できません"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+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:424

 msgid "That is not your Jabber ID."
 msgstr "その Jabber ID はあなたのものではありません。"
 
 msgid "That is not your Jabber ID."
 msgstr "その Jabber ID はあなたのものではありません。"
 

+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "アドレスは削除されました。"
+

 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"


@@ -1895,8 +2129,8 @@ msgid "Invites have been disabled."
 msgstr "招待は無効にされました。"
 
 #: actions/invite.php:41
 msgstr "招待は無効にされました。"
 
 #: actions/invite.php:41

-#, php-format
-msgid "You must be logged in to invite other users to use %s"
+#, fuzzy, php-format
+msgid "You must be logged in to invite other users to use %s."

 msgstr "他のユーザが%sを使用するよう誘うためにはログインしなければなりません。"
 
 #: actions/invite.php:72
 msgstr "他のユーザが%sを使用するよう誘うためにはログインしなければなりません。"
 
 #: actions/invite.php:72


@@ -1916,7 +2150,9 @@ msgstr "新しいユーザを招待"
 msgid "You are already subscribed to these users:"
 msgstr "すでにこれらのユーザをフォローしています:"
 
 msgid "You are already subscribed to these users:"
 msgstr "すでにこれらのユーザをフォローしています:"
 

-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414

 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""


@@ -1962,16 +2198,21 @@ msgstr "パーソナルメッセージ"
 msgid "Optionally add a personal message to the invitation."
 msgstr "任意に招待にパーソナルメッセージを加えてください。"
 
 msgid "Optionally add a personal message to the invitation."
 msgstr "任意に招待にパーソナルメッセージを加えてください。"
 

-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
+#. TRANS: Send button for inviting friends
+#: actions/invite.php:198
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Send"
 msgstr "投稿"
 
 msgid "Send"
 msgstr "投稿"
 

-#: actions/invite.php:226
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228

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

-#: actions/invite.php:228
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231

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


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

-#: actions/joingroup.php:131
+#: actions/joingroup.php:88 actions/leavegroup.php:88
+#, fuzzy
+msgid "No nickname or ID."
+msgstr "ニックネームがありません。"
+
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346

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


@@ -2041,11 +2289,13 @@ msgstr "%1$s はグループ %2$s に参加しました"
 msgid "You must be logged in to leave a group."
 msgstr "グループから離れるにはログインしていなければなりません。"
 
 msgid "You must be logged in to leave a group."
 msgstr "グループから離れるにはログインしていなければなりません。"
 

-#: actions/leavegroup.php:90 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:373

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

-#: actions/leavegroup.php:127
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392

 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s はグループ %2$s に残りました。"
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s はグループ %2$s に残りました。"


@@ -2062,8 +2312,7 @@ msgstr "ユーザ名またはパスワードが間違っています。"
 msgid "Error setting user. You are probably not authorized."
 msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
 
 msgid "Error setting user. You are probably not authorized."
 msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
 

-#: actions/login.php:188 actions/login.php:241 lib/action.php:466
-#: lib/logingroupnav.php:79
+#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79

 msgid "Login"
 msgstr "ログイン"
 
 msgid "Login"
 msgstr "ログイン"
 


@@ -2120,7 +2369,8 @@ msgid "Can't make %1$s an admin for group %2$s."
 msgstr "%1$s をグループ %2$s の管理者にすることはできません"
 
 #: actions/microsummary.php:69
 msgstr "%1$s をグループ %2$s の管理者にすることはできません"
 
 #: actions/microsummary.php:69

-msgid "No current status"
+#, fuzzy
+msgid "No current status."

 msgstr "現在のステータスはありません"
 
 #: actions/newapplication.php:52
 msgstr "現在のステータスはありません"
 
 #: actions/newapplication.php:52


@@ -2155,12 +2405,12 @@ msgstr "このフォームを使って新しいグループを作成します。
 msgid "New message"
 msgstr "新しいメッセージ"
 
 msgid "New message"
 msgstr "新しいメッセージ"
 

-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481

 msgid "You can't send a message to this user."
 msgstr "このユーザにメッセージを送ることはできません。"
 
 msgid "You can't send a message to this user."
 msgstr "このユーザにメッセージを送ることはできません。"
 

-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555

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


@@ -2168,7 +2418,7 @@ msgstr "コンテンツがありません！"
 msgid "No recipient specified."
 msgstr "受取人が書かれていません。"
 
 msgid "No recipient specified."
 msgstr "受取人が書かれていません。"
 

-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:484

 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""


@@ -2183,7 +2433,7 @@ msgstr "メッセージを送りました"
 msgid "Direct message to %s sent."
 msgstr "ダイレクトメッセージを %s  に送りました"
 
 msgid "Direct message to %s sent."
 msgstr "ダイレクトメッセージを %s  に送りました"
 

-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189

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


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

-#: actions/newnotice.php:211
+#: actions/newnotice.php:217

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


@@ -2285,11 +2535,11 @@ msgid "You are not a user of that application."
 msgstr "あなたはそのアプリケーションのユーザではありません。"
 
 #: actions/oauthconnectionssettings.php:186
 msgstr "あなたはそのアプリケーションのユーザではありません。"
 
 #: actions/oauthconnectionssettings.php:186

-msgid "Unable to revoke access for app: "
+#, fuzzy, php-format
+msgid "Unable to revoke access for app: %s."

 msgstr "アプリケーションのための取消しアクセスができません: "
 
 #: actions/oauthconnectionssettings.php:198
 msgstr "アプリケーションのための取消しアクセスができません: "
 
 #: actions/oauthconnectionssettings.php:198

-#, php-format

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


@@ -2300,24 +2550,30 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr "開発者は彼らのアプリケーションのために登録設定を編集できます "
 
 #: actions/oembed.php:79 actions/shownotice.php:100
 msgstr "開発者は彼らのアプリケーションのために登録設定を編集できます "
 
 #: actions/oembed.php:79 actions/shownotice.php:100

-msgid "Notice has no profile"
+#, fuzzy
+msgid "Notice has no profile."

 msgstr "つぶやきにはプロファイルはありません。"
 
 msgstr "つぶやきにはプロファイルはありません。"
 

-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175

 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%2$s における %1$ のステータス"
 
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%2$s における %1$ のステータス"
 

-#: actions/oembed.php:157
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "Content type %s not supported."

 msgstr "内容種別 "
 
 msgstr "内容種別 "
 

-#: actions/oembed.php:160
-msgid "Only "
-msgstr "だけ "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s URLs over plain HTTP please."
+msgstr ""

 
 

-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#. TRANS: Client error on an API request with an unsupported data format.
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
+#: lib/apiaction.php:1098 lib/apiaction.php:1215

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


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

-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433

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


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

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

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


@@ -2458,7 +2714,8 @@ msgstr "新しいパスワードを保存できません。"
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 

-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
+#. TRANS: Menu item for site administration
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383

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


@@ -2467,23 +2724,23 @@ msgid "Path and server settings for this StatusNet site."
 msgstr "パスと StatusNet サイトのサーバー設定"
 
 #: actions/pathsadminpanel.php:157
 msgstr "パスと StatusNet サイトのサーバー設定"
 
 #: actions/pathsadminpanel.php:157

-#, php-format
-msgid "Theme directory not readable: %s"
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s."

 msgstr "テーマディレクトリが読み込めません: %s"
 
 #: actions/pathsadminpanel.php:163
 msgstr "テーマディレクトリが読み込めません: %s"
 
 #: actions/pathsadminpanel.php:163

-#, php-format
-msgid "Avatar directory not writable: %s"
+#, fuzzy, php-format
+msgid "Avatar directory not writable: %s."

 msgstr "アバターディレクトリに書き込みできません: %s"
 
 #: actions/pathsadminpanel.php:169
 msgstr "アバターディレクトリに書き込みできません: %s"
 
 #: actions/pathsadminpanel.php:169

-#, php-format
-msgid "Background directory not writable: %s"
+#, fuzzy, php-format
+msgid "Background directory not writable: %s."

 msgstr "バックグラウンドディレクトリに書き込みできません : %s"
 
 #: actions/pathsadminpanel.php:177
 msgstr "バックグラウンドディレクトリに書き込みできません : %s"
 
 #: actions/pathsadminpanel.php:177

-#, php-format
-msgid "Locales directory not readable: %s"
+#, fuzzy, php-format
+msgid "Locales directory not readable: %s."

 msgstr "場所ディレクトリが読み込めません: %s"
 
 #: actions/pathsadminpanel.php:183
 msgstr "場所ディレクトリが読み込めません: %s"
 
 #: actions/pathsadminpanel.php:183


@@ -2491,7 +2748,6 @@ msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "不正な SSL サーバー。最大 255 文字まで。"
 
 #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
 msgstr "不正な SSL サーバー。最大 255 文字まで。"
 
 #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58

-#: lib/adminpanelaction.php:311

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


@@ -2579,7 +2835,7 @@ msgstr "バックグラウンドディレクトリ"
 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
+#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202

 msgid "Never"
 msgstr ""
 
 msgid "Never"
 msgstr ""
 


@@ -2624,21 +2880,22 @@ msgstr ""
 msgid "People search"
 msgstr "ピープルサーチ"
 
 msgid "People search"
 msgstr "ピープルサーチ"
 

-#: actions/peopletag.php:70
-#, php-format
-msgid "Not a valid people tag: %s"
+#: actions/peopletag.php:68
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s."

 msgstr "正しいタグではありません： %s"
 
 msgstr "正しいタグではありません： %s"
 

-#: actions/peopletag.php:144
+#: actions/peopletag.php:142

 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "ユーザ自身がつけたタグ %1$s  - ページ %2$d"
 
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "ユーザ自身がつけたタグ %1$s  - ページ %2$d"
 

-#: actions/postnotice.php:84
-msgid "Invalid notice content"
+#: actions/postnotice.php:95
+#, fuzzy
+msgid "Invalid notice content."

 msgstr "不正なつぶやき内容"
 
 msgstr "不正なつぶやき内容"
 

-#: actions/postnotice.php:90
+#: actions/postnotice.php:101

 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""


@@ -2664,13 +2921,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
 #: actions/profilesettings.php:111 actions/register.php:448
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
 #: actions/profilesettings.php:111 actions/register.php:448

-#: actions/showgroup.php:247 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150

 msgid "Full name"
 msgstr "フルネーム"
 
 msgid "Full name"
 msgstr "フルネーム"
 

+#. TRANS: Form input field label.

 #: actions/profilesettings.php:115 actions/register.php:453
 #: actions/profilesettings.php:115 actions/register.php:453

-#: lib/applicationeditform.php:228 lib/groupeditform.php:161
+#: lib/applicationeditform.php:244 lib/groupeditform.php:161

 msgid "Homepage"
 msgstr "ホームページ"
 
 msgid "Homepage"
 msgstr "ホームページ"
 


@@ -2692,9 +2950,9 @@ msgid "Bio"
 msgstr "自己紹介"
 
 #: actions/profilesettings.php:132 actions/register.php:471
 msgstr "自己紹介"
 
 #: actions/profilesettings.php:132 actions/register.php:471

-#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112

 #: actions/userauthorization.php:166 lib/groupeditform.php:177
 #: actions/userauthorization.php:166 lib/groupeditform.php:177

-#: lib/userprofile.php:164
+#: lib/userprofile.php:165

 msgid "Location"
 msgstr "場所"
 
 msgid "Location"
 msgstr "場所"
 


@@ -2708,7 +2966,7 @@ msgstr "つぶやきを投稿するときには私の現在の場所を共有し
 
 #: actions/profilesettings.php:145 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 
 #: actions/profilesettings.php:145 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106

-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210

 msgid "Tags"
 msgstr "タグ"
 
 msgid "Tags"
 msgstr "タグ"
 


@@ -2719,7 +2977,7 @@ msgstr ""
 "自分自身についてのタグ (アルファベット、数字、-、.、_)、カンマまたは空白区切"
 "りで"
 
 "自分自身についてのタグ (アルファベット、数字、-、.、_)、カンマまたは空白区切"
 "りで"
 

-#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
+#: actions/profilesettings.php:151

 msgid "Language"
 msgstr "言語"
 
 msgid "Language"
 msgstr "言語"
 


@@ -2745,7 +3003,7 @@ msgstr "自分をフォローしている者を自動的にフォローする (B
 msgid "Bio is too long (max %d chars)."
 msgstr "自己紹介が長すぎます (最長140文字)。"
 
 msgid "Bio is too long (max %d chars)."
 msgstr "自己紹介が長すぎます (最長140文字)。"
 

-#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:151

 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 
 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 


@@ -2758,57 +3016,58 @@ msgstr "言語が長すぎます。(最大50字)"
 msgid "Invalid tag: \"%s\""
 msgstr "不正なタグ: \"%s\""
 
 msgid "Invalid tag: \"%s\""
 msgstr "不正なタグ: \"%s\""
 

-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306

 msgid "Couldn't update user for autosubscribe."
 msgstr "自動フォローのためのユーザを更新できませんでした。"
 
 msgid "Couldn't update user for autosubscribe."
 msgstr "自動フォローのためのユーザを更新できませんでした。"
 

-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363

 msgid "Couldn't save location prefs."
 msgstr "場所情報を保存できません。"
 
 msgid "Couldn't save location prefs."
 msgstr "場所情報を保存できません。"
 

-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375

 msgid "Couldn't save profile."
 msgstr "プロファイルを保存できません"
 
 msgid "Couldn't save profile."
 msgstr "プロファイルを保存できません"
 

-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383

 msgid "Couldn't save tags."
 msgstr "タグを保存できません。"
 
 msgid "Couldn't save tags."
 msgstr "タグを保存できません。"
 

-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:141

 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
 #: actions/public.php:83
 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
 #: actions/public.php:83

-#, php-format
-msgid "Beyond the page limit (%s)"
+#, fuzzy, php-format
+msgid "Beyond the page limit (%s)."

 msgstr "ページ制限を超えました (%s)"
 
 #: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "パブリックストリームを検索できません。"
 
 msgstr "ページ制限を超えました (%s)"
 
 #: actions/public.php:92
 msgid "Could not retrieve public stream."
 msgstr "パブリックストリームを検索できません。"
 

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

 #, php-format
 msgid "Public timeline, page %d"
 msgstr "パブリックタイムライン、ページ %d"
 
 #, php-format
 msgid "Public timeline, page %d"
 msgstr "パブリックタイムライン、ページ %d"
 

-#: actions/public.php:131 lib/publicgroupnav.php:79
+#: actions/public.php:132 lib/publicgroupnav.php:79

 msgid "Public timeline"
 msgstr "パブリックタイムライン"
 
 msgid "Public timeline"
 msgstr "パブリックタイムライン"
 

-#: actions/public.php:159
+#: actions/public.php:160

 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "パブリックストリームフィード (RSS 1.0)"
 
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr "パブリックストリームフィード (RSS 1.0)"
 

-#: actions/public.php:163
+#: actions/public.php:164

 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "パブリックストリームフィード (RSS 2.0)"
 
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr "パブリックストリームフィード (RSS 2.0)"
 

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

 msgid "Public Stream Feed (Atom)"
 msgstr "パブリックストリームフィード (Atom)"
 
 msgid "Public Stream Feed (Atom)"
 msgstr "パブリックストリームフィード (Atom)"
 

-#: actions/public.php:187
+#: actions/public.php:188

 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "


@@ -2817,11 +3076,11 @@ msgstr ""
 "これは %%site.name%% のパブリックタイムラインです、しかしまだ誰も投稿していま"
 "せん。"
 
 "これは %%site.name%% のパブリックタイムラインです、しかしまだ誰も投稿していま"
 "せん。"
 

-#: actions/public.php:190
+#: actions/public.php:191

 msgid "Be the first to post!"
 msgstr "投稿する1番目になってください!"
 
 msgid "Be the first to post!"
 msgstr "投稿する1番目になってください!"
 

-#: actions/public.php:194
+#: actions/public.php:195

 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"


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

-#: actions/public.php:241
+#: actions/public.php:242

 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"


@@ -2843,7 +3102,7 @@ msgstr ""
 "族そして同僚などについてのつぶやきを共有しましょう! ([もっと読む](%%doc.help%"
 "%))"
 
 "族そして同僚などについてのつぶやきを共有しましょう! ([もっと読む](%%doc.help%"
 "%))"
 

-#: actions/public.php:246
+#: actions/public.php:247

 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"


@@ -2950,7 +3209,7 @@ msgstr "パスワードをリセット"
 msgid "Recover password"
 msgstr "パスワードを回復"
 
 msgid "Recover password"
 msgstr "パスワードを回復"
 

-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335

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


@@ -2970,41 +3229,41 @@ msgstr "リセット"
 msgid "Enter a nickname or email address."
 msgstr "ニックネームかメールアドレスを入力してください。"
 
 msgid "Enter a nickname or email address."
 msgstr "ニックネームかメールアドレスを入力してください。"
 

-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282

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

-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299

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

-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313

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

-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338

 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:344
+#: actions/recoverpassword.php:357

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

-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365

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

-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369

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

-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248

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

-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395

 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 
 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 


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

-#: actions/register.php:114 actions/register.php:503 lib/action.php:463
-#: lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85

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


@@ -3042,8 +3300,9 @@ msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 
 #: actions/register.php:343
 msgstr "不正なユーザ名またはパスワード。"
 
 #: actions/register.php:343

+#, fuzzy

 msgid ""
 msgid ""

-"With this form you can create  a new account. You can then post notices and "
+"With this form you can create a new account. You can then post notices and "

 "link up to friends and colleagues. "
 msgstr ""
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
 "link up to friends and colleagues. "
 msgstr ""
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"


@@ -3062,8 +3321,9 @@ msgstr "6文字以上。必須です。"
 msgid "Same as password above. Required."
 msgstr "上のパスワードと同じです。 必須。"
 
 msgid "Same as password above. Required."
 msgstr "上のパスワードと同じです。 必須。"
 

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

 #: actions/register.php:438 actions/register.php:442
 #: actions/register.php:438 actions/register.php:442

-#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132

 msgid "Email"
 msgstr "メール"
 
 msgid "Email"
 msgstr "メール"
 


@@ -3076,20 +3336,13 @@ msgid "Longer name, preferably your \"real\" name"
 msgstr "長い名前"
 
 #: actions/register.php:494
 msgstr "長い名前"
 
 #: actions/register.php:494

-msgid "My text and files are available under "
-msgstr "次の下でテキスト及びファイルを利用可能 "
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
+#, fuzzy, php-format

 msgid ""
 msgid ""

-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."

 msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
 
 msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
 

-#: actions/register.php:538
+#: actions/register.php:542

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


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

-#: actions/register.php:562
+#: actions/register.php:566

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


@@ -3167,7 +3420,7 @@ msgid "URL of your profile on another compatible microblogging service"
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139

-#: lib/userprofile.php:365
+#: lib/userprofile.php:406

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


@@ -3206,7 +3459,7 @@ msgstr "自分のつぶやきは繰り返せません。"
 msgid "You already repeated that notice."
 msgstr "すでにそのつぶやきを繰り返しています。"
 
 msgid "You already repeated that notice."
 msgstr "すでにそのつぶやきを繰り返しています。"
 

-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:675

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


@@ -3214,33 +3467,33 @@ msgstr "繰り返された"
 msgid "Repeated!"
 msgstr "繰り返されました!"
 
 msgid "Repeated!"
 msgstr "繰り返されました!"
 

-#: actions/replies.php:125 actions/repliesrss.php:68
+#: actions/replies.php:126 actions/repliesrss.php:68

 #: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s への返信"
 
 #: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr "%s への返信"
 

-#: actions/replies.php:127
+#: actions/replies.php:128

 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "%1$s への返信、ページ %2$s"
 
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "%1$s への返信、ページ %2$s"
 

-#: actions/replies.php:144
+#: actions/replies.php:145

 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "%s の返信フィード (RSS 1.0)"
 
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr "%s の返信フィード (RSS 1.0)"
 

-#: actions/replies.php:151
+#: actions/replies.php:152

 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "%s の返信フィード (RSS 2.0)"
 
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr "%s の返信フィード (RSS 2.0)"
 

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

 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "%s の返信フィード (Atom)"
 
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "%s の返信フィード (Atom)"
 

-#: actions/replies.php:198
+#: actions/replies.php:199

 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "


@@ -3249,7 +3502,7 @@ msgstr ""
 "これは %1$s への返信を表示したタイムラインです、しかし %2$s はまだつぶやきを"
 "受け取っていません。"
 
 "これは %1$s への返信を表示したタイムラインです、しかし %2$s はまだつぶやきを"
 "受け取っていません。"
 

-#: actions/replies.php:203
+#: actions/replies.php:204

 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "


@@ -3258,7 +3511,7 @@ msgstr ""
 "あなたは、他のユーザを会話をするか、多くの人々をフォローするか、または [グ"
 "ループに加わる](%%action.groups%%)ことができます。"
 
 "あなたは、他のユーザを会話をするか、多くの人々をフォローするか、または [グ"
 "ループに加わる](%%action.groups%%)ことができます。"
 

-#: actions/replies.php:205
+#: actions/replies.php:206

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


@@ -3272,6 +3525,16 @@ 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 への返信!"
 

+#: actions/revokerole.php:75
+#, fuzzy
+msgid "You cannot revoke user roles on this site."
+msgstr "あなたはこのサイトでユーザを黙らせることができません。"
+
+#: actions/revokerole.php:82
+#, fuzzy
+msgid "User doesn't have this role."
+msgstr "合っているプロフィールのないユーザ"
+

 #: actions/rsd.php:146 actions/version.php:157
 msgid "StatusNet"
 msgstr "StatusNet"
 #: actions/rsd.php:146 actions/version.php:157
 msgid "StatusNet"
 msgstr "StatusNet"


@@ -3284,8 +3547,9 @@ msgstr "あなたはこのサイトのサンドボックスユーザができま
 msgid "User is already sandboxed."
 msgstr "ユーザはすでにサンドボックスです。"
 
 msgid "User is already sandboxed."
 msgstr "ユーザはすでにサンドボックスです。"
 

+#. TRANS: Menu item for site administration

 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170

-#: lib/adminpanelaction.php:336
+#: lib/adminpanelaction.php:391

 msgid "Sessions"
 msgstr "セッション"
 
 msgid "Sessions"
 msgstr "セッション"
 


@@ -3309,8 +3573,8 @@ msgstr "セッションデバッグ"
 msgid "Turn on debugging output for sessions."
 msgstr "セッションのためのデバッグ出力をオン。"
 
 msgid "Turn on debugging output for sessions."
 msgstr "セッションのためのデバッグ出力をオン。"
 

-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
-#: actions/useradminpanel.php:293
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/useradminpanel.php:294

 msgid "Save site settings"
 msgstr "サイト設定の保存"
 
 msgid "Save site settings"
 msgstr "サイト設定の保存"
 


@@ -3322,26 +3586,30 @@ msgstr "!!アプリケーションを見るためにはログインしていな
 msgid "Application profile"
 msgstr "アプリケーションプロファイル"
 
 msgid "Application profile"
 msgstr "アプリケーションプロファイル"
 

-#: actions/showapplication.php:159 lib/applicationeditform.php:180
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:159 lib/applicationeditform.php:182

 msgid "Icon"
 msgstr "アイコン"
 
 msgid "Icon"
 msgstr "アイコン"
 

+#. TRANS: Form input field label for application name.

 #: actions/showapplication.php:169 actions/version.php:195
 #: actions/showapplication.php:169 actions/version.php:195

-#: lib/applicationeditform.php:195
+#: lib/applicationeditform.php:199

 msgid "Name"
 msgstr "名前"
 
 msgid "Name"
 msgstr "名前"
 

-#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:235

 msgid "Organization"
 msgstr "組織"
 
 msgid "Organization"
 msgstr "組織"
 

+#. TRANS: Form input field label.

 #: actions/showapplication.php:187 actions/version.php:198
 #: actions/showapplication.php:187 actions/version.php:198

-#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#: lib/applicationeditform.php:216 lib/groupeditform.php:172

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

-#: actions/showapplication.php:192 actions/showgroup.php:429
-#: lib/profileaction.php:174
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187

 msgid "Statistics"
 msgstr "統計データ"
 
 msgid "Statistics"
 msgstr "統計データ"
 


@@ -3404,22 +3672,22 @@ msgstr "%1$s のお気に入りのつぶやき、ページ %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "お気に入りのつぶやきを検索できません。"
 
 msgid "Could not retrieve favorite notices."
 msgstr "お気に入りのつぶやきを検索できません。"
 

-#: actions/showfavorites.php:170
+#: actions/showfavorites.php:171

 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s のお気に入りのフィード (RSS 1.0)"
 
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s のお気に入りのフィード (RSS 1.0)"
 

-#: actions/showfavorites.php:177
+#: actions/showfavorites.php:178

 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s のお気に入りのフィード (RSS 2.0)"
 
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s のお気に入りのフィード (RSS 2.0)"
 

-#: actions/showfavorites.php:184
+#: actions/showfavorites.php:185

 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s のお気に入りのフィード (Atom)"
 
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s のお気に入りのフィード (Atom)"
 

-#: actions/showfavorites.php:205
+#: actions/showfavorites.php:206

 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."


@@ -3428,7 +3696,7 @@ msgstr ""
 "加するあなたがそれらがお気に入りのつぶやきのときにお気に入りボタンをクリック"
 "するか、またはそれらの上でスポットライトをはじいてください。"
 
 "加するあなたがそれらがお気に入りのつぶやきのときにお気に入りボタンをクリック"
 "するか、またはそれらの上でスポットライトをはじいてください。"
 

-#: actions/showfavorites.php:207
+#: actions/showfavorites.php:208

 #, php-format
 msgid ""
 "%s hasn't added any notices to his favorites yet. Post something interesting "
 #, php-format
 msgid ""
 "%s hasn't added any notices to his favorites yet. Post something interesting "


@@ -3437,7 +3705,7 @@ msgstr ""
 "%s はまだ彼のお気に入りに少しのつぶやきも加えていません。 彼らがお気に入りに"
 "加えることおもしろいものを投稿してください:)"
 
 "%s はまだ彼のお気に入りに少しのつぶやきも加えていません。 彼らがお気に入りに"
 "加えることおもしろいものを投稿してください:)"
 

-#: actions/showfavorites.php:211
+#: actions/showfavorites.php:212

 #, php-format
 msgid ""
 "%s hasn't added any notices to his favorites yet. Why not [register an "
 #, php-format
 msgid ""
 "%s hasn't added any notices to his favorites yet. Why not [register an "


@@ -3448,7 +3716,7 @@ msgstr ""
 "%%%action.register%%%%) しないのですか。そして、彼らがお気に入りに加えるおも"
 "しろい何かを投稿しませんか:)"
 
 "%%%action.register%%%%) しないのですか。そして、彼らがお気に入りに加えるおも"
 "しろい何かを投稿しませんか:)"
 

-#: actions/showfavorites.php:242
+#: actions/showfavorites.php:243

 msgid "This is a way to share what you like."
 msgstr "これは、あなたが好きなことを共有する方法です。"
 
 msgid "This is a way to share what you like."
 msgstr "これは、あなたが好きなことを共有する方法です。"
 


@@ -3462,67 +3730,67 @@ msgstr "%s グループ"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 
 msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 

-#: actions/showgroup.php:218
+#: actions/showgroup.php:227

 msgid "Group profile"
 msgstr "グループプロファイル"
 
 msgid "Group profile"
 msgstr "グループプロファイル"
 

-#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178

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

-#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195

 msgid "Note"
 msgstr "ノート"
 
 msgid "Note"
 msgstr "ノート"
 

-#: actions/showgroup.php:284 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184

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

-#: actions/showgroup.php:293
+#: actions/showgroup.php:302

 msgid "Group actions"
 msgstr "グループアクション"
 
 msgid "Group actions"
 msgstr "グループアクション"
 

-#: actions/showgroup.php:328
+#: actions/showgroup.php:338

 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s グループのつぶやきフィード (RSS 1.0)"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s グループのつぶやきフィード (RSS 1.0)"
 

-#: actions/showgroup.php:334
+#: actions/showgroup.php:344

 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s グループのつぶやきフィード (RSS 2.0)"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s グループのつぶやきフィード (RSS 2.0)"
 

-#: actions/showgroup.php:340
+#: actions/showgroup.php:350

 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s グループのつぶやきフィード (Atom)"
 
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s グループのつぶやきフィード (Atom)"
 

-#: actions/showgroup.php:345
+#: actions/showgroup.php:355

 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s グループの FOAF"
 
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s グループの FOAF"
 

-#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91

 msgid "Members"
 msgstr "メンバー"
 
 msgid "Members"
 msgstr "メンバー"
 

-#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71

 msgid "(None)"
 msgstr "(なし)"
 
 msgid "(None)"
 msgstr "(なし)"
 

-#: actions/showgroup.php:392
+#: actions/showgroup.php:404

 msgid "All members"
 msgstr "全てのメンバー"
 
 msgid "All members"
 msgstr "全てのメンバー"
 

-#: actions/showgroup.php:432
+#: actions/showgroup.php:447

 msgid "Created"
 msgstr "作成日"
 
 msgid "Created"
 msgstr "作成日"
 

-#: actions/showgroup.php:448
+#: actions/showgroup.php:463

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -3537,7 +3805,7 @@ msgstr ""
 "する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ"
 "のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))"
 
 "する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ"
 "のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))"
 

-#: actions/showgroup.php:454
+#: actions/showgroup.php:469

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -3550,7 +3818,7 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
 "する短いメッセージを共有します。"
 
 "wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
 "する短いメッセージを共有します。"
 

-#: actions/showgroup.php:482
+#: actions/showgroup.php:497

 msgid "Admins"
 msgstr "管理者"
 
 msgid "Admins"
 msgstr "管理者"
 


@@ -3672,190 +3940,213 @@ msgid "User is already silenced."
 msgstr "ユーザは既に黙っています。"
 
 #: actions/siteadminpanel.php:69
 msgstr "ユーザは既に黙っています。"
 
 #: actions/siteadminpanel.php:69

-msgid "Basic settings for this StatusNet site."
+#, fuzzy
+msgid "Basic settings for this StatusNet site"

 msgstr "この StatusNet サイトの基本設定。"
 
 msgstr "この StatusNet サイトの基本設定。"
 

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

 msgid "Site name must have non-zero length."
 msgstr "サイト名は長さ0ではいけません。"
 
 msgid "Site name must have non-zero length."
 msgstr "サイト名は長さ0ではいけません。"
 

-#: actions/siteadminpanel.php:140
+#: actions/siteadminpanel.php:141

 msgid "You must have a valid contact email address."
 msgstr "有効な連絡用メールアドレスがなければなりません。"
 
 msgid "You must have a valid contact email address."
 msgstr "有効な連絡用メールアドレスがなければなりません。"
 

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

 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "不明な言語 \"%s\""
 
 #: actions/siteadminpanel.php:165
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr "不明な言語 \"%s\""
 
 #: actions/siteadminpanel.php:165

-msgid "Invalid snapshot report URL."
-msgstr "不正なスナップショットレポートURL。"
-
-#: actions/siteadminpanel.php:171
-msgid "Invalid snapshot run value."
-msgstr "不正なスナップショットランバリュー"
-
-#: actions/siteadminpanel.php:177
-msgid "Snapshot frequency must be a number."
-msgstr "スナップショット頻度は数でなければなりません。"
-
-#: actions/siteadminpanel.php:183
-msgid "Minimum text limit is 140 characters."
+#, fuzzy
+msgid "Minimum text limit is 0 (unlimited)."

 msgstr "最小のテキスト制限は140字です。"
 
 msgstr "最小のテキスト制限は140字です。"
 

-#: actions/siteadminpanel.php:189
-msgid "Dupe limit must 1 or more seconds."
+#: actions/siteadminpanel.php:171
+#, fuzzy
+msgid "Dupe limit must be one or more seconds."

 msgstr "デュープ制限は1秒以上でなければなりません。"
 
 msgstr "デュープ制限は1秒以上でなければなりません。"
 

-#: actions/siteadminpanel.php:239
+#: actions/siteadminpanel.php:221

 msgid "General"
 msgstr "一般"
 
 msgid "General"
 msgstr "一般"
 

-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:224

 msgid "Site name"
 msgstr "サイト名"
 
 msgid "Site name"
 msgstr "サイト名"
 

-#: actions/siteadminpanel.php:243
+#: actions/siteadminpanel.php:225

 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "あなたのサイトの名前、\"Yourcompany Microblog\"のような。"
 
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr "あなたのサイトの名前、\"Yourcompany Microblog\"のような。"
 

-#: actions/siteadminpanel.php:247
+#: actions/siteadminpanel.php:229

 msgid "Brought by"
 msgstr "持って来られます"
 
 msgid "Brought by"
 msgstr "持って来られます"
 

-#: actions/siteadminpanel.php:248
+#: actions/siteadminpanel.php:230

 msgid "Text used for credits link in footer of each page"
 msgstr ""
 "クレジットに使用されるテキストは、それぞれのページのフッターでリンクされま"
 "す。"
 
 msgid "Text used for credits link in footer of each page"
 msgstr ""
 "クレジットに使用されるテキストは、それぞれのページのフッターでリンクされま"
 "す。"
 

-#: actions/siteadminpanel.php:252
+#: actions/siteadminpanel.php:234

 msgid "Brought by URL"
 msgstr "URLで、持って来られます"
 
 msgid "Brought by URL"
 msgstr "URLで、持って来られます"
 

-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:235

 msgid "URL used for credits link in footer of each page"
 msgstr ""
 "クレジットに使用されるURLは、それぞれのページのフッターでリンクされます。"
 
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 "クレジットに使用されるURLは、それぞれのページのフッターでリンクされます。"
 

-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:239

 msgid "Contact email address for your site"
 msgstr "あなたのサイトにコンタクトするメールアドレス"
 
 msgid "Contact email address for your site"
 msgstr "あなたのサイトにコンタクトするメールアドレス"
 

-#: actions/siteadminpanel.php:263
+#: actions/siteadminpanel.php:245

 msgid "Local"
 msgstr "ローカル"
 
 msgid "Local"
 msgstr "ローカル"
 

-#: actions/siteadminpanel.php:274
+#: actions/siteadminpanel.php:256

 msgid "Default timezone"
 msgstr "デフォルトタイムゾーン"
 
 msgid "Default timezone"
 msgstr "デフォルトタイムゾーン"
 

-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:257

 msgid "Default timezone for the site; usually UTC."
 msgstr "サイトのデフォルトタイムゾーン; 通常UTC。"
 
 msgid "Default timezone for the site; usually UTC."
 msgstr "サイトのデフォルトタイムゾーン; 通常UTC。"
 

-#: actions/siteadminpanel.php:281
-msgid "Default site language"
+#: actions/siteadminpanel.php:262
+#, fuzzy
+msgid "Default language"

 msgstr "デフォルトサイト言語"
 
 msgstr "デフォルトサイト言語"
 

-#: actions/siteadminpanel.php:289
-msgid "Snapshots"
-msgstr "スナップショット"
-
-#: actions/siteadminpanel.php:292
-msgid "Randomly during Web hit"
+#: actions/siteadminpanel.php:263
+msgid "Site language when autodetection from browser settings is not available"

 msgstr ""
 
 msgstr ""
 

-#: actions/siteadminpanel.php:293
-msgid "In a scheduled job"
-msgstr "予定されているジョブで"
-
-#: actions/siteadminpanel.php:295
-msgid "Data snapshots"
-msgstr "データスナップショット"
-
-#: actions/siteadminpanel.php:296
-msgid "When to send statistical data to status.net servers"
-msgstr "いつ status.net サーバに統計データを送りますか"
-
-#: actions/siteadminpanel.php:301
-msgid "Frequency"
-msgstr "頻度"
-
-#: actions/siteadminpanel.php:302
-msgid "Snapshots will be sent once every N web hits"
-msgstr "レポート URL"
-
-#: actions/siteadminpanel.php:307
-msgid "Report URL"
-msgstr "レポート URL"
-
-#: actions/siteadminpanel.php:308
-msgid "Snapshots will be sent to this URL"
-msgstr "このURLにスナップショットを送るでしょう"
-
-#: actions/siteadminpanel.php:315
+#: actions/siteadminpanel.php:271

 msgid "Limits"
 msgstr "制限"
 
 msgid "Limits"
 msgstr "制限"
 

-#: actions/siteadminpanel.php:318
+#: actions/siteadminpanel.php:274

 msgid "Text limit"
 msgstr "テキスト制限"
 
 msgid "Text limit"
 msgstr "テキスト制限"
 

-#: actions/siteadminpanel.php:318
+#: actions/siteadminpanel.php:274

 msgid "Maximum number of characters for notices."
 msgstr "つぶやきの文字の最大数"
 
 msgid "Maximum number of characters for notices."
 msgstr "つぶやきの文字の最大数"
 

-#: actions/siteadminpanel.php:322
+#: actions/siteadminpanel.php:278

 msgid "Dupe limit"
 msgstr "デュープ制限"
 
 msgid "Dupe limit"
 msgstr "デュープ制限"
 

-#: actions/siteadminpanel.php:322
+#: actions/siteadminpanel.php:278

 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "どれくらい長い間(秒)、ユーザは、再び同じものを投稿するのを待たなければならな"
 "いか。"
 
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "どれくらい長い間(秒)、ユーザは、再び同じものを投稿するのを待たなければならな"
 "いか。"
 

-#: actions/smssettings.php:58
+#: actions/sitenoticeadminpanel.php:56
+#, fuzzy
+msgid "Site Notice"
+msgstr "サイトつぶやき"
+
+#: actions/sitenoticeadminpanel.php:67
+#, fuzzy
+msgid "Edit site-wide message"
+msgstr "新しいメッセージ"
+
+#: actions/sitenoticeadminpanel.php:103
+#, fuzzy
+msgid "Unable to save site notice."
+msgstr "あなたのデザイン設定を保存できません。"
+
+#: actions/sitenoticeadminpanel.php:113
+msgid "Max length for the site-wide notice is 255 chars."
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:176
+#, fuzzy
+msgid "Site notice text"
+msgstr "サイトつぶやき"
+
+#: actions/sitenoticeadminpanel.php:178
+msgid "Site-wide notice text (255 chars max; HTML okay)"
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:198
+#, fuzzy
+msgid "Save site notice"
+msgstr "サイトつぶやき"
+
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59

 msgid "SMS settings"
 msgstr "SMS 設定"
 
 msgid "SMS settings"
 msgstr "SMS 設定"
 

-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74

 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "あなたは %%site.name%% からメールでSMSメッセージを受け取ることができます。"
 
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "あなたは %%site.name%% からメールでSMSメッセージを受け取ることができます。"
 

-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97

 msgid "SMS is not available."
 msgstr "SMS は利用できません。"
 
 msgid "SMS is not available."
 msgstr "SMS は利用できません。"
 

-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IMアドレス"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120

 msgid "Current confirmed SMS-enabled phone number."
 msgstr "現在の確認された SMS 可能な電話番号。"
 
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "現在の確認された SMS 可能な電話番号。"
 

-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133

 msgid "Awaiting confirmation on this phone number."
 msgstr "この電話番号は確認待ちです。"
 
 msgid "Awaiting confirmation on this phone number."
 msgstr "この電話番号は確認待ちです。"
 

-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142

 msgid "Confirmation code"
 msgstr "確認コード"
 
 msgid "Confirmation code"
 msgstr "確認コード"
 

-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144

 msgid "Enter the code you received on your phone."
 msgstr "あなたがあなたの電話で受け取ったコードを入れてください。"
 
 msgid "Enter the code you received on your phone."
 msgstr "あなたがあなたの電話で受け取ったコードを入れてください。"
 

-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "パスワード確認"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153

 msgid "SMS phone number"
 msgstr "SMS 電話番号"
 
 msgid "SMS phone number"
 msgstr "SMS 電話番号"
 

-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156

 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "電話番号、句読点またはスペースがない、市街番号付き"
 
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "電話番号、句読点またはスペースがない、市街番号付き"
 

-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "設定"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201

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


@@ -3863,23 +4154,34 @@ msgstr ""
 "SMSを通してつぶやきを私に送ってください; 私は、私のキャリアから法外な料金を被"
 "るかもしれないのを理解しています。"
 
 "SMSを通してつぶやきを私に送ってください; 私は、私のキャリアから法外な料金を被"
 "るかもしれないのを理解しています。"
 

-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "設定が保存されました。"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338

 msgid "No phone number."
 msgstr "電話番号がありません。"
 
 msgid "No phone number."
 msgstr "電話番号がありません。"
 

-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344

 msgid "No carrier selected."
 msgstr "キャリアが選択されていません。"
 
 msgid "No carrier selected."
 msgstr "キャリアが選択されていません。"
 

-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352

 msgid "That is already your phone number."
 msgstr "これはすでにあなたの電話番号です。"
 
 msgid "That is already your phone number."
 msgstr "これはすでにあなたの電話番号です。"
 

-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356

 msgid "That phone number already belongs to another user."
 msgstr "この電話番号はすでに他のユーザに使われています。"
 
 msgid "That phone number already belongs to another user."
 msgstr "この電話番号はすでに他のユーザに使われています。"
 

-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384

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


@@ -3887,23 +4189,42 @@ msgstr ""
 "あなたが加えた電話番号に確認コードを送りました。 どうそれを使用するかに関する"
 "コードと指示のために電話をチェックしてください。"
 
 "あなたが加えた電話番号に確認コードを送りました。 どうそれを使用するかに関する"
 "コードと指示のために電話をチェックしてください。"
 

-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413

 msgid "That is the wrong confirmation number."
 msgstr "それは間違った確認番号です。"
 
 msgid "That is the wrong confirmation number."
 msgstr "それは間違った確認番号です。"
 

-#: actions/smssettings.php:405
-msgid "That is not your phone number."
-msgstr "それはあなたの電話番号ではありません。"
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "承認作業が中止されました。"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
+msgid "That is not your phone number."
+msgstr "それはあなたの電話番号ではありません。"
+
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS 電話番号"

 
 

-#: actions/smssettings.php:465
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511

 msgid "Mobile carrier"
 msgstr "携帯電話会社"
 
 msgid "Mobile carrier"
 msgstr "携帯電話会社"
 

-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516

 msgid "Select a carrier"
 msgstr "キャリア選択"
 
 msgid "Select a carrier"
 msgstr "キャリア選択"
 

-#: actions/smssettings.php:476
+#. 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

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


@@ -3913,23 +4234,94 @@ msgstr ""
 "載されていないキャリアを知っているなら、メールを送って、%sで私たちに知らせて"
 "ください。"
 
 "載されていないキャリアを知っているなら、メールを送って、%sで私たちに知らせて"
 "ください。"
 

-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548

 msgid "No code entered"
 msgstr "コードが入力されていません"
 
 msgid "No code entered"
 msgstr "コードが入力されていません"
 

+#. TRANS: Menu item for site administration
+#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
+#: lib/adminpanelaction.php:407
+msgid "Snapshots"
+msgstr "スナップショット"
+
+#: actions/snapshotadminpanel.php:65
+#, fuzzy
+msgid "Manage snapshot configuration"
+msgstr "サイト設定の変更"
+
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr "不正なスナップショットランバリュー"
+
+#: actions/snapshotadminpanel.php:133
+msgid "Snapshot frequency must be a number."
+msgstr "スナップショット頻度は数でなければなりません。"
+
+#: actions/snapshotadminpanel.php:144
+msgid "Invalid snapshot report URL."
+msgstr "不正なスナップショットレポートURL。"
+
+#: actions/snapshotadminpanel.php:200
+msgid "Randomly during web hit"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:201
+msgid "In a scheduled job"
+msgstr "予定されているジョブで"
+
+#: actions/snapshotadminpanel.php:206
+msgid "Data snapshots"
+msgstr "データスナップショット"
+
+#: actions/snapshotadminpanel.php:208
+msgid "When to send statistical data to status.net servers"
+msgstr "いつ status.net サーバに統計データを送りますか"
+
+#: actions/snapshotadminpanel.php:217
+msgid "Frequency"
+msgstr "頻度"
+
+#: actions/snapshotadminpanel.php:218
+msgid "Snapshots will be sent once every N web hits"
+msgstr "レポート URL"
+
+#: actions/snapshotadminpanel.php:226
+msgid "Report URL"
+msgstr "レポート URL"
+
+#: actions/snapshotadminpanel.php:227
+msgid "Snapshots will be sent to this URL"
+msgstr "このURLにスナップショットを送るでしょう"
+
+#: actions/snapshotadminpanel.php:248
+#, fuzzy
+msgid "Save snapshot settings"
+msgstr "サイト設定の保存"
+

 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 

-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:132

 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 
 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 

-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "ローカルユーザではありません。"
+#: actions/subscribe.php:77
+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."
+msgstr "あなたはそのプロファイルにフォローされていません。"

 
 

-#: actions/subscribe.php:69
+#: actions/subscribe.php:145

 msgid "Subscribed"
 msgstr "フォローしている"
 
 msgid "Subscribed"
 msgstr "フォローしている"
 


@@ -3993,7 +4385,7 @@ msgstr "あなたがつぶやきを聞いている人"
 msgid "These are the people whose notices %s listens to."
 msgstr "%s がつぶやきを聞いている人"
 
 msgid "These are the people whose notices %s listens to."
 msgstr "%s がつぶやきを聞いている人"
 

-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126

 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "


@@ -4009,35 +4401,35 @@ msgstr ""
 "twittersettings%%)であれば、あなたは自動的に既にフォローしている人々をフォ"
 "ローできます。"
 
 "twittersettings%%)であれば、あなたは自動的に既にフォローしている人々をフォ"
 "ローできます。"
 

-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132

 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s はだれも言うことを聞いていません。"
 
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s はだれも言うことを聞いていません。"
 

-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:208

 msgid "Jabber"
 msgstr "Jabber"
 
 msgid "Jabber"
 msgstr "Jabber"
 

-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115

 msgid "SMS"
 msgstr "SMS"
 
 msgid "SMS"
 msgstr "SMS"
 

-#: actions/tag.php:68
+#: actions/tag.php:69

 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%1$s とタグ付けされたつぶやき、ページ %2$d"
 
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%1$s とタグ付けされたつぶやき、ページ %2$d"
 

-#: actions/tag.php:86
+#: actions/tag.php:87

 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s とタグ付けされたつぶやきフィード (RSS 1.0)"
 
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s とタグ付けされたつぶやきフィード (RSS 1.0)"
 

-#: actions/tag.php:92
+#: actions/tag.php:93

 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s とタグ付けされたつぶやきフィード (RSS 2.0)"
 
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s とタグ付けされたつぶやきフィード (RSS 2.0)"
 

-#: actions/tag.php:98
+#: actions/tag.php:99

 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s とタグ付けされたつぶやきフィード (Atom)"
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s とタグ付けされたつぶやきフィード (Atom)"


@@ -4051,12 +4443,12 @@ msgstr "ID引数がありません。"
 msgid "Tag %s"
 msgstr "タグ %s"
 
 msgid "Tag %s"
 msgstr "タグ %s"
 

-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76

 msgid "User profile"
 msgstr "ユーザプロファイル"
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
 msgid "User profile"
 msgstr "ユーザプロファイル"
 
 #: actions/tagother.php:81 actions/userauthorization.php:132

-#: lib/userprofile.php:102
+#: lib/userprofile.php:103

 msgid "Photo"
 msgstr "写真"
 
 msgid "Photo"
 msgstr "写真"
 


@@ -4090,7 +4482,7 @@ msgstr "このフォームを使用して、フォロー者かフォローにタ
 msgid "No such tag."
 msgstr "そのようなタグはありません。"
 
 msgid "No such tag."
 msgstr "そのようなタグはありません。"
 

-#: actions/twitapitrends.php:87
+#: actions/twitapitrends.php:85

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


@@ -4107,14 +4499,15 @@ msgid "User is not silenced."
 msgstr "ユーザはサイレンスではありません。"
 
 #: actions/unsubscribe.php:77
 msgstr "ユーザはサイレンスではありません。"
 
 #: actions/unsubscribe.php:77

-msgid "No profile id in request."
+#, fuzzy
+msgid "No profile ID in request."

 msgstr "リクエスト内にプロファイルIDがありません。"
 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "フォロー解除済み"
 
 msgstr "リクエスト内にプロファイルIDがありません。"
 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "フォロー解除済み"
 

-#: actions/updateprofile.php:62 actions/userauthorization.php:337
+#: actions/updateprofile.php:64 actions/userauthorization.php:337

 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."


@@ -4122,70 +4515,73 @@ msgstr ""
 "リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性があ"
 "りません。"
 
 "リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性があ"
 "りません。"
 

-#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
-#: lib/personalgroupnav.php:115
+#. TRANS: User admin panel title
+#: actions/useradminpanel.php:59
+#, fuzzy
+msgctxt "TITLE"

 msgid "User"
 msgstr "ユーザ"
 
 msgid "User"
 msgstr "ユーザ"
 

-#: actions/useradminpanel.php:69
+#: actions/useradminpanel.php:70

 msgid "User settings for this StatusNet site."
 msgstr "この StatusNet サイトのユーザ設定。"
 
 msgid "User settings for this StatusNet site."
 msgstr "この StatusNet サイトのユーザ設定。"
 

-#: actions/useradminpanel.php:148
+#: actions/useradminpanel.php:149

 msgid "Invalid bio limit. Must be numeric."
 msgstr "不正な自己紹介制限。数字である必要があります。"
 
 msgid "Invalid bio limit. Must be numeric."
 msgstr "不正な自己紹介制限。数字である必要があります。"
 

-#: actions/useradminpanel.php:154
+#: actions/useradminpanel.php:155

 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr "不正なウェルカムテキスト。最大長は255字です。"
 
 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr "不正なウェルカムテキスト。最大長は255字です。"
 

-#: actions/useradminpanel.php:164
+#: actions/useradminpanel.php:165

 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 

-#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111

 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "プロファイル"
 
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "プロファイル"
 

-#: actions/useradminpanel.php:221
+#: actions/useradminpanel.php:222

 msgid "Bio Limit"
 msgstr "自己紹介制限"
 
 msgid "Bio Limit"
 msgstr "自己紹介制限"
 

-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223

 msgid "Maximum length of a profile bio in characters."
 msgstr "プロファイル自己紹介の最大文字長。"
 
 msgid "Maximum length of a profile bio in characters."
 msgstr "プロファイル自己紹介の最大文字長。"
 

-#: actions/useradminpanel.php:230
+#: actions/useradminpanel.php:231

 msgid "New users"
 msgstr "新しいユーザ"
 
 msgid "New users"
 msgstr "新しいユーザ"
 

-#: actions/useradminpanel.php:234
+#: actions/useradminpanel.php:235

 msgid "New user welcome"
 msgstr "新しいユーザを歓迎"
 
 msgid "New user welcome"
 msgstr "新しいユーザを歓迎"
 

-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236

 msgid "Welcome text for new users (Max 255 chars)."
 msgstr "新しいユーザへのウェルカムテキスト (最大255字)。"
 
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr "新しいユーザへのウェルカムテキスト (最大255字)。"
 

-#: actions/useradminpanel.php:240
+#: actions/useradminpanel.php:241

 msgid "Default subscription"
 msgstr "デフォルトフォロー"
 
 msgid "Default subscription"
 msgstr "デフォルトフォロー"
 

-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242

 msgid "Automatically subscribe new users to this user."
 msgstr "自動的にこのユーザに新しいユーザをフォローしてください。"
 
 msgid "Automatically subscribe new users to this user."
 msgstr "自動的にこのユーザに新しいユーザをフォローしてください。"
 

-#: actions/useradminpanel.php:250
+#: actions/useradminpanel.php:251

 msgid "Invitations"
 msgstr "招待"
 
 msgid "Invitations"
 msgstr "招待"
 

-#: actions/useradminpanel.php:255
+#: actions/useradminpanel.php:256

 msgid "Invitations enabled"
 msgstr "招待が可能"
 
 msgid "Invitations enabled"
 msgstr "招待が可能"
 

-#: actions/useradminpanel.php:257
+#: actions/useradminpanel.php:258

 msgid "Whether to allow users to invite new users."
 msgstr "ユーザが新しいユーザを招待するのを許容するかどうか。"
 
 msgid "Whether to allow users to invite new users."
 msgstr "ユーザが新しいユーザを招待するのを許容するかどうか。"
 


@@ -4307,25 +4703,37 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr "あなたのhotdogを楽しんでください!"
 
 msgid "Enjoy your hotdog!"
 msgstr "あなたのhotdogを楽しんでください!"
 

-#: actions/usergroups.php:64
+#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
+#: actions/usergroups.php:66

 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 
 #, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 

-#: actions/usergroups.php:130
+#: actions/usergroups.php:132

 msgid "Search for more groups"
 msgstr "もっとグループを検索"
 
 msgid "Search for more groups"
 msgstr "もっとグループを検索"
 

-#: actions/usergroups.php:153
+#: actions/usergroups.php:159

 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s はどのグループのメンバーでもありません。"
 
 #, php-format
 msgid "%s is not a member of any group."
 msgstr "%s はどのグループのメンバーでもありません。"
 

-#: actions/usergroups.php:158
+#: actions/usergroups.php:164

 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "[グループを探して](%%action.groupsearch%%)それに加入してください。"
 
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "[グループを探して](%%action.groupsearch%%)それに加入してください。"
 

+#. 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 in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom user notice feed.
+#. TRANS: %1$s is a user name, %2$s is a site name.
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:69
+#: lib/atomusernoticefeed.php:75
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "%1$s から %2$s  上の更新をしました!"
+

 #: actions/version.php:73
 #, php-format
 msgid "StatusNet %s"
 #: actions/version.php:73
 #, php-format
 msgid "StatusNet %s"


@@ -4371,7 +4779,8 @@ msgstr ""
 msgid "Plugins"
 msgstr "プラグイン"
 
 msgid "Plugins"
 msgstr "プラグイン"
 

-#: actions/version.php:196 lib/action.php:747
+#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
+#: actions/version.php:196 lib/action.php:779

 msgid "Version"
 msgstr "バージョン"
 
 msgid "Version"
 msgstr "バージョン"
 


@@ -4379,7 +4788,7 @@ msgstr "バージョン"
 msgid "Author(s)"
 msgstr "作者"
 
 msgid "Author(s)"
 msgstr "作者"
 

-#: classes/File.php:144
+#: classes/File.php:169

 #, php-format
 msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
 #, php-format
 msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "


@@ -4389,13 +4798,13 @@ msgstr ""
 "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして"
 "ください。"
 
 "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして"
 "ください。"
 

-#: classes/File.php:154
+#: classes/File.php:179

 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。"
 
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。"
 

-#: classes/File.php:161
+#: classes/File.php:186

 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""


@@ -4413,6 +4822,11 @@ msgstr "グループの一部ではありません。"
 msgid "Group leave failed."
 msgstr "グループ脱退に失敗しました。"
 
 msgid "Group leave failed."
 msgstr "グループ脱退に失敗しました。"
 

+#: classes/Local_group.php:41
+#, fuzzy
+msgid "Could not update local group."
+msgstr "グループを更新できません。"
+

 #: classes/Login_token.php:76
 #, php-format
 msgid "Could not create login token for %s"
 #: classes/Login_token.php:76
 #, php-format
 msgid "Could not create login token for %s"


@@ -4430,26 +4844,27 @@ msgstr "メッセージを追加できません。"
 msgid "Could not update message with new URI."
 msgstr "新しいURIでメッセージをアップデートできませんでした。"
 
 msgid "Could not update message with new URI."
 msgstr "新しいURIでメッセージをアップデートできませんでした。"
 

-#: classes/Notice.php:157
-#, php-format
-msgid "DB error inserting hashtag: %s"
+#. TRANS: Server exception. %s are the error details.
+#: classes/Notice.php:176
+#, fuzzy, php-format
+msgid "Database error inserting hashtag: %s"

 msgstr "ハッシュタグ追加 ＤＢ エラー: %s"
 
 msgstr "ハッシュタグ追加 ＤＢ エラー: %s"
 

-#: classes/Notice.php:214
+#: classes/Notice.php:245

 msgid "Problem saving notice. Too long."
 msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
 
 msgid "Problem saving notice. Too long."
 msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
 

-#: classes/Notice.php:218
+#: classes/Notice.php:249

 msgid "Problem saving notice. Unknown user."
 msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
 
 msgid "Problem saving notice. Unknown user."
 msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
 

-#: classes/Notice.php:223
+#: classes/Notice.php:254

 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。"
 
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。"
 

-#: classes/Notice.php:229
+#: classes/Notice.php:260

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


@@ -4457,210 +4872,339 @@ msgstr ""
 "多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ"
 "い。"
 
 "多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ"
 "い。"
 

-#: classes/Notice.php:235
+#: classes/Notice.php:266

 msgid "You are banned from posting notices on this site."
 msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。"
 
 msgid "You are banned from posting notices on this site."
 msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。"
 

-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:332 classes/Notice.php:358

 msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 
 msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 

-#: classes/Notice.php:788
+#: classes/Notice.php:965

 msgid "Problem saving group inbox."
 msgstr "グループ受信箱を保存する際に問題が発生しました。"
 
 msgid "Problem saving group inbox."
 msgstr "グループ受信箱を保存する際に問題が発生しました。"
 

-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "返信を追加する際にデータベースエラー : %s"
-
-#: classes/Notice.php:1235
+#. 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:1513

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 

-#: classes/User.php:385
+#: classes/Subscription.php:74 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "あなたはフォローが禁止されました。"
+
+#: classes/Subscription.php:78
+msgid "Already subscribed!"
+msgstr "すでにフォローしています!"
+
+#: classes/Subscription.php:82
+msgid "User has blocked you."
+msgstr "ユーザはあなたをブロックしました。"
+
+#: classes/Subscription.php:167
+msgid "Not subscribed!"
+msgstr "フォローしていません！"
+
+#: classes/Subscription.php:173
+msgid "Couldn't delete self-subscription."
+msgstr "自己フォローを削除できません。"
+
+#: classes/Subscription.php:200
+#, fuzzy
+msgid "Couldn't delete subscription OMB token."
+msgstr "フォローを削除できません"
+
+#: classes/Subscription.php:211
+msgid "Couldn't delete subscription."
+msgstr "フォローを削除できません"
+
+#: classes/User.php:363

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 

-#: classes/User_group.php:380
+#: classes/User_group.php:480

 msgid "Could not create group."
 msgstr "グループを作成できません。"
 
 msgid "Could not create group."
 msgstr "グループを作成できません。"
 

-#: classes/User_group.php:409
+#: classes/User_group.php:489
+#, fuzzy
+msgid "Could not set group URI."
+msgstr "グループメンバーシップをセットできません。"
+
+#: classes/User_group.php:510

 msgid "Could not set group membership."
 msgstr "グループメンバーシップをセットできません。"
 
 msgid "Could not set group membership."
 msgstr "グループメンバーシップをセットできません。"
 

-#: lib/accountsettingsaction.php:108
+#: classes/User_group.php:524
+#, fuzzy
+msgid "Could not save local group info."
+msgstr "フォローを保存できません。"
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:109

 msgid "Change your profile settings"
 msgstr "プロファイル設定の変更"
 
 msgid "Change your profile settings"
 msgstr "プロファイル設定の変更"
 

-#: lib/accountsettingsaction.php:112
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:116

 msgid "Upload an avatar"
 msgstr "アバターのアップロード"
 
 msgid "Upload an avatar"
 msgstr "アバターのアップロード"
 

-#: lib/accountsettingsaction.php:116
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:123

 msgid "Change your password"
 msgstr "パスワードの変更"
 
 msgid "Change your password"
 msgstr "パスワードの変更"
 

-#: lib/accountsettingsaction.php:120
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:130

 msgid "Change email handling"
 msgstr "メールの扱いを変更"
 
 msgid "Change email handling"
 msgstr "メールの扱いを変更"
 

-#: lib/accountsettingsaction.php:124
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:137

 msgid "Design your profile"
 msgstr "あなたのプロファイルをデザイン"
 
 msgid "Design your profile"
 msgstr "あなたのプロファイルをデザイン"
 

-#: lib/accountsettingsaction.php:128
-msgid "Other"
-msgstr "その他"
-
-#: lib/accountsettingsaction.php:128
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144

 msgid "Other options"
 msgstr "その他のオプション"
 
 msgid "Other options"
 msgstr "その他のオプション"
 

-#: lib/action.php:144
+#. TRANS: Link description in user account settings menu.
+#: lib/accountsettingsaction.php:146
+msgid "Other"
+msgstr "その他"
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#: lib/action.php:145

 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 

-#: lib/action.php:159
+#. TRANS: Page title for a page without a title set.
+#: lib/action.php:161

 msgid "Untitled page"
 msgstr "名称未設定ページ"
 
 msgid "Untitled page"
 msgstr "名称未設定ページ"
 

-#: lib/action.php:433
+#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
+#: lib/action.php:426

 msgid "Primary site navigation"
 msgstr "プライマリサイトナビゲーション"
 
 msgid "Primary site navigation"
 msgstr "プライマリサイトナビゲーション"
 

-#: lib/action.php:439
-msgid "Home"
-msgstr "ホーム"
-
-#: lib/action.php:439
+#. TRANS: Tooltip for main menu option "Personal"
+#: lib/action.php:432
+#, fuzzy
+msgctxt "TOOLTIP"

 msgid "Personal profile and friends timeline"
 msgstr "パーソナルプロファイルと友人のタイムライン"
 
 msgid "Personal profile and friends timeline"
 msgstr "パーソナルプロファイルと友人のタイムライン"
 

-#: lib/action.php:441
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:435
+#, fuzzy
+msgctxt "MENU"
+msgid "Personal"
+msgstr "パーソナル"
+
+#. TRANS: Tooltip for main menu option "Account"
+#: lib/action.php:437
+#, fuzzy
+msgctxt "TOOLTIP"

 msgid "Change your email, avatar, password, profile"
 msgstr "メールアドレス、アバター、パスワード、プロパティの変更"
 
 msgid "Change your email, avatar, password, profile"
 msgstr "メールアドレス、アバター、パスワード、プロパティの変更"
 

-#: lib/action.php:444
-msgid "Connect"
-msgstr "接続"
-
-#: lib/action.php:444
+#. TRANS: Tooltip for main menu option "Services"
+#: lib/action.php:442
+#, fuzzy
+msgctxt "TOOLTIP"

 msgid "Connect to services"
 msgstr "サービスへ接続"
 
 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:445
+msgid "Connect"
+msgstr "接続"
+
+#. TRANS: Tooltip for menu option "Admin"

 #: lib/action.php:448
 #: lib/action.php:448

+#, fuzzy
+msgctxt "TOOLTIP"

 msgid "Change site configuration"
 msgstr "サイト設定の変更"
 
 msgid "Change site configuration"
 msgstr "サイト設定の変更"
 

-#: lib/action.php:452 lib/subgroupnav.php:105
-msgid "Invite"
-msgstr "招待"
+#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#: lib/action.php:451
+#, fuzzy
+msgctxt "MENU"
+msgid "Admin"
+msgstr "管理者"

 
 

-#: lib/action.php:453 lib/subgroupnav.php:106
-#, php-format
+#. TRANS: Tooltip for main menu option "Invite"
+#: lib/action.php:455
+#, fuzzy, php-format
+msgctxt "TOOLTIP"

 msgid "Invite friends and colleagues to join you on %s"
 msgstr "友人や同僚が %s で加わるよう誘ってください。"
 
 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:458
 #: lib/action.php:458

-msgid "Logout"
-msgstr "ログアウト"
+#, fuzzy
+msgctxt "MENU"
+msgid "Invite"
+msgstr "招待"

 
 

-#: lib/action.php:458
+#. TRANS: Tooltip for main menu option "Logout"
+#: lib/action.php:464
+#, fuzzy
+msgctxt "TOOLTIP"

 msgid "Logout from the site"
 msgstr "サイトからログアウト"
 
 msgid "Logout from the site"
 msgstr "サイトからログアウト"
 

-#: lib/action.php:463
+#. TRANS: Main menu option when logged in to log out the current user
+#: lib/action.php:467
+#, fuzzy
+msgctxt "MENU"
+msgid "Logout"
+msgstr "ログアウト"
+
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:472
+#, fuzzy
+msgctxt "TOOLTIP"

 msgid "Create an account"
 msgstr "アカウントを作成"
 
 msgid "Create an account"
 msgstr "アカウントを作成"
 

-#: lib/action.php:466
+#. TRANS: Main menu option when not logged in to register a new account
+#: lib/action.php:475
+#, fuzzy
+msgctxt "MENU"
+msgid "Register"
+msgstr "登録"
+
+#. TRANS: Tooltip for main menu option "Login"
+#: lib/action.php:478
+#, fuzzy
+msgctxt "TOOLTIP"

 msgid "Login to the site"
 msgstr "サイトへログイン"
 
 msgid "Login to the site"
 msgstr "サイトへログイン"
 

-#: lib/action.php:469 lib/action.php:732
-msgid "Help"
-msgstr "ヘルプ"
+#: lib/action.php:481
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "ログイン"

 
 

-#: lib/action.php:469
+#. TRANS: Tooltip for main menu option "Help"
+#: lib/action.php:484
+#, fuzzy
+msgctxt "TOOLTIP"

 msgid "Help me!"
 msgstr "助けて！"
 
 msgid "Help me!"
 msgstr "助けて！"
 

-#: lib/action.php:472 lib/searchaction.php:127
-msgid "Search"
-msgstr "検索"
+#: lib/action.php:487
+#, fuzzy
+msgctxt "MENU"
+msgid "Help"
+msgstr "ヘルプ"

 
 

-#: lib/action.php:472
+#. TRANS: Tooltip for main menu option "Search"
+#: lib/action.php:490
+#, fuzzy
+msgctxt "TOOLTIP"

 msgid "Search for people or text"
 msgstr "人々かテキストを検索"
 
 #: lib/action.php:493
 msgid "Search for people or text"
 msgstr "人々かテキストを検索"
 
 #: lib/action.php:493

+#, fuzzy
+msgctxt "MENU"
+msgid "Search"
+msgstr "検索"
+
+#. TRANS: DT element for site notice. String is hidden in default CSS.
+#. TRANS: Menu item for site administration
+#: lib/action.php:515 lib/adminpanelaction.php:399

 msgid "Site notice"
 msgstr "サイトつぶやき"
 
 msgid "Site notice"
 msgstr "サイトつぶやき"
 

-#: lib/action.php:559
+#. TRANS: DT element for local views block. String is hidden in default CSS.
+#: lib/action.php:582

 msgid "Local views"
 msgstr "ローカルビュー"
 
 msgid "Local views"
 msgstr "ローカルビュー"
 

-#: lib/action.php:625
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:649

 msgid "Page notice"
 msgstr "ページつぶやき"
 
 msgid "Page notice"
 msgstr "ページつぶやき"
 

-#: lib/action.php:727
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:752

 msgid "Secondary site navigation"
 msgstr "セカンダリサイトナビゲーション"
 
 msgid "Secondary site navigation"
 msgstr "セカンダリサイトナビゲーション"
 

-#: lib/action.php:734
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+#: lib/action.php:758
+msgid "Help"
+msgstr "ヘルプ"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+#: lib/action.php:761

 msgid "About"
 msgstr "About"
 
 msgid "About"
 msgstr "About"
 

-#: lib/action.php:736
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+#: lib/action.php:764

 msgid "FAQ"
 msgstr "よくある質問"
 
 msgid "FAQ"
 msgstr "よくある質問"
 

-#: lib/action.php:740
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+#: lib/action.php:769

 msgid "TOS"
 msgstr ""
 
 msgid "TOS"
 msgstr ""
 

-#: lib/action.php:743
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/action.php:773

 msgid "Privacy"
 msgstr "プライバシー"
 
 msgid "Privacy"
 msgstr "プライバシー"
 

-#: lib/action.php:745
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:776

 msgid "Source"
 msgstr "ソース"
 
 msgid "Source"
 msgstr "ソース"
 

-#: lib/action.php:749
+#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
+#: lib/action.php:782

 msgid "Contact"
 msgstr "連絡先"
 
 msgid "Contact"
 msgstr "連絡先"
 

-#: lib/action.php:751
+#: lib/action.php:784

 msgid "Badge"
 msgstr "バッジ"
 
 msgid "Badge"
 msgstr "バッジ"
 

-#: lib/action.php:779
+#. TRANS: DT element for StatusNet software license.
+#: lib/action.php:813

 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 
 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 

-#: lib/action.php:782
-#, php-format
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#: lib/action.php:817
+#, fuzzy, php-format

 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."

-"broughtby%%](%%site.broughtbyurl%%). "
+"broughtby%%](%%site.broughtbyurl%%)."

 msgstr ""
 "**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
 "イクロブログサービスです。 "
 
 msgstr ""
 "**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
 "イクロブログサービスです。 "
 

-#: lib/action.php:784
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#: lib/action.php:820

 #, php-format
 #, php-format

-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** はマイクロブログサービスです。 "
+msgid "**%%site.name%%** is a microblogging service."
+msgstr "**%%site.name%%** はマイクロブログサービスです。"

 
 

-#: lib/action.php:786
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#: lib/action.php:824

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


@@ -4671,175 +5215,284 @@ msgstr ""
 "いています。 ライセンス [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)。"
 
 "いています。 ライセンス [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)。"
 

-#: lib/action.php:801
+#. TRANS: DT element for StatusNet site content license.
+#: lib/action.php:840

 msgid "Site content license"
 msgstr "サイト内容ライセンス"
 
 msgid "Site content license"
 msgstr "サイト内容ライセンス"
 

-#: lib/action.php:806
+#. TRANS: Content license displayed when license is set to 'private'.
+#. TRANS: %1$s is the site name.
+#: lib/action.php:847

 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 

-#: lib/action.php:811
+#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
+#. TRANS: %1$s is the copyright owner.
+#: lib/action.php:854

 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 

-#: lib/action.php:814
+#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
+#: lib/action.php:858

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 

-#: lib/action.php:826
-msgid "All "
-msgstr "全て "
-
-#: lib/action.php:831
-msgid "license."
-msgstr "ライセンス。"
+#. TRANS: license message in footer. %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:871
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""

 
 

-#: lib/action.php:1130
+#. TRANS: DT element for pagination (previous/next, etc.).
+#: lib/action.php:1182

 msgid "Pagination"
 msgstr "ページ化"
 
 msgid "Pagination"
 msgstr "ページ化"
 

-#: lib/action.php:1139
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+#: lib/action.php:1193

 msgid "After"
 msgstr "<<後"
 
 msgid "After"
 msgstr "<<後"
 

-#: lib/action.php:1147
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: past than the currently displayed information.
+#: lib/action.php:1203

 msgid "Before"
 msgstr "前>>"
 
 msgid "Before"
 msgstr "前>>"
 

-#: lib/adminpanelaction.php:96
+#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
+#: lib/activity.php:121
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activityutils.php:236
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activityutils.php:240
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
+#: lib/adminpanelaction.php:98

 msgid "You cannot make changes to this site."
 msgstr "あなたはこのサイトへの変更を行うことができません。"
 
 msgid "You cannot make changes to this site."
 msgstr "あなたはこのサイトへの変更を行うことができません。"
 

-#: lib/adminpanelaction.php:107
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
+#: lib/adminpanelaction.php:110

 msgid "Changes to that panel are not allowed."
 msgstr "そのパネルへの変更は許可されていません。"
 
 msgid "Changes to that panel are not allowed."
 msgstr "そのパネルへの変更は許可されていません。"
 

-#: lib/adminpanelaction.php:206
+#. TRANS: Client error message.
+#: lib/adminpanelaction.php:229

 msgid "showForm() not implemented."
 msgstr "showForm() は実装されていません。"
 
 msgid "showForm() not implemented."
 msgstr "showForm() は実装されていません。"
 

-#: lib/adminpanelaction.php:235
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:259

 msgid "saveSettings() not implemented."
 msgstr "saveSettings() は実装されていません。"
 
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() は実装されていません。"
 

-#: lib/adminpanelaction.php:258
+#. TRANS: Client error message thrown if design settings could not be deleted in
+#. TRANS: the admin panel Design.
+#: lib/adminpanelaction.php:284

 msgid "Unable to delete design setting."
 msgstr "デザイン設定を削除できません。"
 
 msgid "Unable to delete design setting."
 msgstr "デザイン設定を削除できません。"
 

-#: lib/adminpanelaction.php:312
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:349

 msgid "Basic site configuration"
 msgstr "基本サイト設定"
 
 msgid "Basic site configuration"
 msgstr "基本サイト設定"
 

-#: lib/adminpanelaction.php:317
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:351
+#, fuzzy
+msgctxt "MENU"
+msgid "Site"
+msgstr "サイト"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:357

 msgid "Design configuration"
 msgstr "デザイン設定"
 
 msgid "Design configuration"
 msgstr "デザイン設定"
 

-#: lib/adminpanelaction.php:322
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:359
+#, fuzzy
+msgctxt "MENU"
+msgid "Design"
+msgstr "デザイン"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:365

 msgid "User configuration"
 msgstr "ユーザ設定"
 
 msgid "User configuration"
 msgstr "ユーザ設定"
 

-#: lib/adminpanelaction.php:327
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "ユーザ"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:373

 msgid "Access configuration"
 msgstr "アクセス設定"
 
 msgid "Access configuration"
 msgstr "アクセス設定"
 

-#: lib/adminpanelaction.php:332
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:381

 msgid "Paths configuration"
 msgstr "パス設定"
 
 msgid "Paths configuration"
 msgstr "パス設定"
 

-#: lib/adminpanelaction.php:337
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:389

 msgid "Sessions configuration"
 msgstr "セッション設定"
 
 msgid "Sessions configuration"
 msgstr "セッション設定"
 

+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:397
+#, fuzzy
+msgid "Edit site notice"
+msgstr "サイトつぶやき"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:405
+#, fuzzy
+msgid "Snapshots configuration"
+msgstr "パス設定"
+
+#. TRANS: Client error 401.

 #: lib/apiauth.php:95
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って"
 "いません。"
 
 #: lib/apiauth.php:95
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って"
 "いません。"
 

-#: lib/apiauth.php:273
-#, php-format
-msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
-msgstr ""
-
-#: lib/applicationeditform.php:136
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:137

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

-#: lib/applicationeditform.php:184
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:187

 msgid "Icon for this application"
 msgstr "このアプリケーションのアイコン"
 
 msgid "Icon for this application"
 msgstr "このアプリケーションのアイコン"
 

-#: lib/applicationeditform.php:204
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:209

 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "あなたのアプリケーションを %d 字以内記述"
 
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr "あなたのアプリケーションを %d 字以内記述"
 

-#: lib/applicationeditform.php:207
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:213

 msgid "Describe your application"
 msgstr "あなたのアプリケーションを記述"
 
 msgid "Describe your application"
 msgstr "あなたのアプリケーションを記述"
 

-#: lib/applicationeditform.php:216
-msgid "Source URL"
-msgstr "ソース URL"
-
-#: lib/applicationeditform.php:218
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:224

 msgid "URL of the homepage of this application"
 msgstr "このアプリケーションのホームページの URL"
 
 msgid "URL of the homepage of this application"
 msgstr "このアプリケーションのホームページの URL"
 

-#: lib/applicationeditform.php:224
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:226
+msgid "Source URL"
+msgstr "ソース URL"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:233

 msgid "Organization responsible for this application"
 msgstr "このアプリケーションに責任がある組織"
 
 msgid "Organization responsible for this application"
 msgstr "このアプリケーションに責任がある組織"
 

-#: lib/applicationeditform.php:230
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:242

 msgid "URL for the homepage of the organization"
 msgstr "組織のホームページのURL"
 
 msgid "URL for the homepage of the organization"
 msgstr "組織のホームページのURL"
 

-#: lib/applicationeditform.php:236
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:251

 msgid "URL to redirect to after authentication"
 msgstr "認証の後にリダイレクトするURL"
 
 msgid "URL to redirect to after authentication"
 msgstr "認証の後にリダイレクトするURL"
 

-#: lib/applicationeditform.php:258
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:278

 msgid "Browser"
 msgstr "ブラウザ"
 
 msgid "Browser"
 msgstr "ブラウザ"
 

-#: lib/applicationeditform.php:274
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:295

 msgid "Desktop"
 msgstr "デスクトップ"
 
 msgid "Desktop"
 msgstr "デスクトップ"
 

-#: lib/applicationeditform.php:275
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:297

 msgid "Type of application, browser or desktop"
 msgstr "アプリケーション、ブラウザ、またはデスクトップのタイプ"
 
 msgid "Type of application, browser or desktop"
 msgstr "アプリケーション、ブラウザ、またはデスクトップのタイプ"
 

-#: lib/applicationeditform.php:297
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:320

 msgid "Read-only"
 msgstr "リードオンリー"
 
 msgid "Read-only"
 msgstr "リードオンリー"
 

-#: lib/applicationeditform.php:315
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:339

 msgid "Read-write"
 msgstr "リードライト"
 
 msgid "Read-write"
 msgstr "リードライト"
 

-#: lib/applicationeditform.php:316
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:341

 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード"
 "ライト"
 
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード"
 "ライト"
 

-#: lib/applicationlist.php:154
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
+msgid "Cancel"
+msgstr "中止"
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:136
+#, fuzzy
+msgid "read-write"
+msgstr "リードライト"
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:138
+#, fuzzy
+msgid "read-only"
+msgstr "リードオンリー"
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
+#: lib/applicationlist.php:144
+#, php-format
+msgid "Approved %1$s - \"%2$s\" access."
+msgstr ""
+
+#. TRANS: Button label
+#: lib/applicationlist.php:159
+#, fuzzy
+msgctxt "BUTTON"

 msgid "Revoke"
 msgstr "取消し"
 
 msgid "Revoke"
 msgstr "取消し"
 

-#: lib/attachmentlist.php:87
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88

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

+#. TRANS: DT element label in attachment list item.

 #: lib/attachmentlist.php:265
 msgid "Author"
 msgstr "作者"
 
 #: lib/attachmentlist.php:265
 msgid "Author"
 msgstr "作者"
 

-#: lib/attachmentlist.php:278
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:279

 msgid "Provider"
 msgstr "プロバイダ"
 
 msgid "Provider"
 msgstr "プロバイダ"
 


@@ -4851,45 +5504,64 @@ msgstr "この添付が現れるつぶやき"
 msgid "Tags for this attachment"
 msgstr "この添付のタグ"
 
 msgid "Tags for this attachment"
 msgstr "この添付のタグ"
 

-#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
+#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225

 msgid "Password changing failed"
 msgstr "パスワード変更に失敗しました"
 
 msgid "Password changing failed"
 msgstr "パスワード変更に失敗しました"
 

-#: lib/authenticationplugin.php:233
+#: lib/authenticationplugin.php:235

 msgid "Password changing is not allowed"
 msgstr "パスワード変更は許可されていません"
 
 msgid "Password changing is not allowed"
 msgstr "パスワード変更は許可されていません"
 

-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177

 msgid "Command results"
 msgstr "コマンド結果"
 
 msgid "Command results"
 msgstr "コマンド結果"
 

-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142

 msgid "Command complete"
 msgstr "コマンド完了"
 
 msgid "Command complete"
 msgstr "コマンド完了"
 

-#: lib/channel.php:221
+#: lib/channel.php:240

 msgid "Command failed"
 msgstr "コマンド失敗"
 
 msgid "Command failed"
 msgstr "コマンド失敗"
 

-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "すみません、このコマンドはまだ実装されていません。"
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr "その ID によるつぶやきは存在していません"
+
+#: lib/command.php:99 lib/command.php:596
+msgid "User has no last notice"
+msgstr "ユーザはまだつぶやいていません"

 
 

-#: lib/command.php:88
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127

 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ユーザを更新できません"
 
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ユーザを更新できません"
 

-#: lib/command.php:92
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "ユーザを更新できません"
+
+#: lib/command.php:180
+msgid "Sorry, this command is not yet implemented."
+msgstr "すみません、このコマンドはまだ実装されていません。"
+
+#: lib/command.php:225

 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "それは自分自身への合図で多くは意味がありません!"
 
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "それは自分自身への合図で多くは意味がありません!"
 

-#: lib/command.php:99
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234

 #, php-format
 msgid "Nudge sent to %s"
 msgstr "%s へ合図を送りました"
 
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "%s へ合図を送りました"
 

-#: lib/command.php:126
+#: lib/command.php:260

 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"


@@ -4900,183 +5572,197 @@ msgstr ""
 "フォローされている: %2$s\n"
 "つぶやき: %3$s"
 
 "フォローされている: %2$s\n"
 "つぶやき: %3$s"
 

-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-msgid "Notice with that id does not exist"
-msgstr "その ID によるつぶやきは存在していません"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "ユーザはまだつぶやいていません"
-
-#: lib/command.php:190
+#: lib/command.php:302

 msgid "Notice marked as fave."
 msgstr "お気に入りにされているつぶやき。"
 
 msgid "Notice marked as fave."
 msgstr "お気に入りにされているつぶやき。"
 

-#: lib/command.php:217
+#: lib/command.php:323

 msgid "You are already a member of that group"
 msgstr "あなたは既にそのグループに参加しています。"
 
 msgid "You are already a member of that group"
 msgstr "あなたは既にそのグループに参加しています。"
 

-#: lib/command.php:231
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "ユーザ %s はグループ %s に参加できません"
-
-#: lib/command.php:236
+#. 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.
+#: lib/command.php:339

 #, php-format
 #, php-format

-msgid "%s joined group %s"
-msgstr "%s はグループ %s に参加しました"
-
-#: lib/command.php:275
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "ユーザ %s をグループ %s から削除することができません"
+msgid "Could not join user %1$s to group %2$s"
+msgstr "ユーザ %1$s はグループ %2$s に参加できません。"

 
 

-#: lib/command.php:280
-#, php-format
-msgid "%s left group %s"
-msgstr "%s はグループ %s に残りました。"
+#. 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.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %1$s from group %2$s"
+msgstr "ユーザ %1$s をグループ %2$s から削除できません。"

 
 

-#: lib/command.php:309
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418

 #, php-format
 msgid "Fullname: %s"
 msgstr "フルネーム： %s"
 
 #, php-format
 msgid "Fullname: %s"
 msgstr "フルネーム： %s"
 

-#: lib/command.php:312 lib/mail.php:254
+#. TRANS: Whois output. %s is the location of the queried user.
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:422 lib/mail.php:263

 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
 

-#: lib/command.php:315 lib/mail.php:256
+#. TRANS: Whois output. %s is the homepage of the queried user.
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:426 lib/mail.php:266

 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
 
 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
 

-#: lib/command.php:318
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430

 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 

-#: lib/command.php:349
+#: lib/command.php:457

 #, php-format
 #, php-format

-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "メッセージが長すぎます - 最大 %d 字、あなたが送ったのは %d"
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"

 
 

-#: lib/command.php:367
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492

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

-#: lib/command.php:369
+#: lib/command.php:494

 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ送信エラー。"
 
 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ送信エラー。"
 

-#: lib/command.php:413
+#: lib/command.php:514

 msgid "Cannot repeat your own notice"
 msgstr "自分のつぶやきを繰り返すことはできません"
 
 msgid "Cannot repeat your own notice"
 msgstr "自分のつぶやきを繰り返すことはできません"
 

-#: lib/command.php:418
+#: lib/command.php:519

 msgid "Already repeated that notice"
 msgstr "すでにこのつぶやきは繰り返されています"
 
 msgid "Already repeated that notice"
 msgstr "すでにこのつぶやきは繰り返されています"
 

-#: lib/command.php:426
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529

 #, php-format
 msgid "Notice from %s repeated"
 msgstr "%s からつぶやきが繰り返されています"
 
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "%s からつぶやきが繰り返されています"
 

-#: lib/command.php:428
+#: lib/command.php:531

 msgid "Error repeating notice."
 msgstr "つぶやき繰り返しエラー"
 
 msgid "Error repeating notice."
 msgstr "つぶやき繰り返しエラー"
 

-#: lib/command.php:482
+#: lib/command.php:562

 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"
 
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"
 

-#: lib/command.php:491
+#: lib/command.php:571

 #, php-format
 msgid "Reply to %s sent"
 msgstr "%s へ返信を送りました"
 
 #, php-format
 msgid "Reply to %s sent"
 msgstr "%s へ返信を送りました"
 

-#: lib/command.php:493
+#: lib/command.php:573

 msgid "Error saving notice."
 msgstr "つぶやき保存エラー。"
 
 msgid "Error saving notice."
 msgstr "つぶやき保存エラー。"
 

-#: lib/command.php:547
+#: lib/command.php:620

 msgid "Specify the name of the user to subscribe to"
 msgstr "フォローするユーザの名前を指定してください"
 
 msgid "Specify the name of the user to subscribe to"
 msgstr "フォローするユーザの名前を指定してください"
 

-#: lib/command.php:554
+#: lib/command.php:628
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "あなたはそのプロファイルにフォローされていません。"
+
+#: lib/command.php:634

 #, php-format
 msgid "Subscribed to %s"
 msgstr "%s をフォローしました"
 
 #, php-format
 msgid "Subscribed to %s"
 msgstr "%s をフォローしました"
 

-#: lib/command.php:575
+#: lib/command.php:655 lib/command.php:754

 msgid "Specify the name of the user to unsubscribe from"
 msgstr "フォローをやめるユーザの名前を指定してください"
 
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "フォローをやめるユーザの名前を指定してください"
 

-#: lib/command.php:582
+#: lib/command.php:664

 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "%s のフォローをやめる"
 
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "%s のフォローをやめる"
 

-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:682 lib/command.php:705

 msgid "Command not yet implemented."
 msgstr "コマンドはまだ実装されていません。"
 
 msgid "Command not yet implemented."
 msgstr "コマンドはまだ実装されていません。"
 

-#: lib/command.php:603
+#: lib/command.php:685

 msgid "Notification off."
 msgstr "通知オフ。"
 
 msgid "Notification off."
 msgstr "通知オフ。"
 

-#: lib/command.php:605
+#: lib/command.php:687

 msgid "Can't turn off notification."
 msgstr "通知をオフできません。"
 
 msgid "Can't turn off notification."
 msgstr "通知をオフできません。"
 

-#: lib/command.php:626
+#: lib/command.php:708

 msgid "Notification on."
 msgstr "通知オン。"
 
 msgid "Notification on."
 msgstr "通知オン。"
 

-#: lib/command.php:628
+#: lib/command.php:710

 msgid "Can't turn on notification."
 msgstr "通知をオンできません。"
 
 msgid "Can't turn on notification."
 msgstr "通知をオンできません。"
 

-#: lib/command.php:641
+#: lib/command.php:723

 msgid "Login command is disabled"
 msgstr "ログインコマンドが無効になっています。"
 
 msgid "Login command is disabled"
 msgstr "ログインコマンドが無効になっています。"
 

-#: lib/command.php:652
+#: lib/command.php:734

 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr "このリンクは、かつてだけ使用可能であり、2分間だけ良いです: %s"
 
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr "このリンクは、かつてだけ使用可能であり、2分間だけ良いです: %s"
 

-#: lib/command.php:668
+#: lib/command.php:761
+#, fuzzy, php-format
+msgid "Unsubscribed  %s"
+msgstr "%s のフォローをやめる"
+
+#: lib/command.php:778

 msgid "You are not subscribed to anyone."
 msgstr "あなたはだれにもフォローされていません。"
 
 msgid "You are not subscribed to anyone."
 msgstr "あなたはだれにもフォローされていません。"
 

-#: lib/command.php:670
+#: lib/command.php:780

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "あなたはこの人にフォローされています:"
 
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "あなたはこの人にフォローされています:"
 

-#: lib/command.php:690
+#: lib/command.php:800

 msgid "No one is subscribed to you."
 msgstr "誰もフォローしていません。"
 
 msgid "No one is subscribed to you."
 msgstr "誰もフォローしていません。"
 

-#: lib/command.php:692
+#: lib/command.php:802

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "この人はあなたにフォローされている:"
 
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "この人はあなたにフォローされている:"
 

-#: lib/command.php:712
+#: lib/command.php:822

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

-#: lib/command.php:714
+#: lib/command.php:824

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "あなたはこのグループのメンバーではありません:"
 
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "あなたはこのグループのメンバーではありません:"
 

-#: lib/command.php:728
+#: lib/command.php:838

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -5090,6 +5776,7 @@ msgid ""
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
 "whois <nickname> - get profile info on user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
 "whois <nickname> - get profile info on user\n"

+"lose <nickname> - force user to stop following you\n"

 "fav <nickname> - add user's last notice as a 'fave'\n"
 "fav #<notice_id> - add notice with the given id as a 'fave'\n"
 "repeat #<notice_id> - repeat a notice with a given id\n"
 "fav <nickname> - add user's last notice as a 'fave'\n"
 "fav #<notice_id> - add notice with the given id as a 'fave'\n"
 "repeat #<notice_id> - repeat a notice with a given id\n"


@@ -5230,6 +5917,11 @@ msgstr "タグを選んで、リストを狭くしてください"
 msgid "Go"
 msgstr "移動"
 
 msgid "Go"
 msgstr "移動"
 

+#: lib/grantroleform.php:91
+#, php-format
+msgid "Grant this user the \"%s\" role"
+msgstr ""
+

 #: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "グループやトピックのホームページやブログの URL"
 #: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "グループやトピックのホームページやブログの URL"


@@ -5298,53 +5990,54 @@ msgstr "投稿が多いグループ"
 msgid "Tags in %s group's notices"
 msgstr "%s グループのつぶやきにあるタグ"
 
 msgid "Tags in %s group's notices"
 msgstr "%s グループのつぶやきにあるタグ"
 

-#: lib/htmloutputter.php:103
+#. TRANS: Client exception 406
+#: lib/htmloutputter.php:104

 msgid "This page is not available in a media type you accept"
 msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
 msgid "This page is not available in a media type you accept"
 msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 

-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "サポート外の画像形式です。"
+
+#: lib/imagefile.php:88

 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。"
 
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。"
 

-#: lib/imagefile.php:80
+#: lib/imagefile.php:93

 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 
 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 

-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170

 msgid "System error uploading file."
 msgstr "ファイルのアップロードでシステムエラー"
 
 msgid "System error uploading file."
 msgstr "ファイルのアップロードでシステムエラー"
 

-#: lib/imagefile.php:96
+#: lib/imagefile.php:109

 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
 
 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
 

-#: lib/imagefile.php:105
-msgid "Unsupported image file format."
-msgstr "サポート外の画像形式です。"
-
-#: lib/imagefile.php:118
+#: lib/imagefile.php:122

 msgid "Lost our file."
 msgstr "ファイルを紛失。"
 
 msgid "Lost our file."
 msgstr "ファイルを紛失。"
 

-#: lib/imagefile.php:150 lib/imagefile.php:197
+#: lib/imagefile.php:163 lib/imagefile.php:224

 msgid "Unknown file type"
 msgstr "不明なファイルタイプ"
 
 msgid "Unknown file type"
 msgstr "不明なファイルタイプ"
 

-#: lib/imagefile.php:217
+#: lib/imagefile.php:244

 msgid "MB"
 msgstr "MB"
 
 msgid "MB"
 msgstr "MB"
 

-#: lib/imagefile.php:219
+#: lib/imagefile.php:246

 msgid "kB"
 msgstr "kB"
 
 msgid "kB"
 msgstr "kB"
 

-#: lib/jabber.php:220
+#: lib/jabber.php:387

 #, php-format
 msgid "[%s]"
 msgstr ""
 
 #, php-format
 msgid "[%s]"
 msgstr ""
 

-#: lib/jabber.php:400
+#: lib/jabber.php:567

 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "不明な受信箱のソース %d。"
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr "不明な受信箱のソース %d。"


@@ -5365,11 +6058,13 @@ msgstr "ユーザ名とパスワードでログイン"
 msgid "Sign up for a new account"
 msgstr "新しいアカウントでサインアップ"
 
 msgid "Sign up for a new account"
 msgstr "新しいアカウントでサインアップ"
 

-#: lib/mail.php:172
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174

 msgid "Email address confirmation"
 msgstr "メールアドレス確認"
 
 msgid "Email address confirmation"
 msgstr "メールアドレス確認"
 

-#: lib/mail.php:174
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177

 #, php-format
 msgid ""
 "Hey, %s.\n"
 #, php-format
 msgid ""
 "Hey, %s.\n"


@@ -5398,12 +6093,14 @@ msgstr ""
 "ありがとうございます。\n"
 "%s\n"
 
 "ありがとうございます。\n"
 "%s\n"
 

-#: lib/mail.php:236
+#. TRANS: Subject of new-subscriber notification e-mail
+#: lib/mail.php:243

 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 

-#: lib/mail.php:241
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249

 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"


@@ -5428,17 +6125,20 @@ msgstr ""
 "----\n"
 "%8$s でメールアドレスか通知オプションを変えてください。\n"
 
 "----\n"
 "%8$s でメールアドレスか通知オプションを変えてください。\n"
 

-#: lib/mail.php:258
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269

 #, php-format
 msgid "Bio: %s"
 msgstr "自己紹介: %s"
 
 #, php-format
 msgid "Bio: %s"
 msgstr "自己紹介: %s"
 

-#: lib/mail.php:286
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298

 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s へ投稿のための新しいメールアドレス"
 
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s へ投稿のための新しいメールアドレス"
 

-#: lib/mail.php:289
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302

 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"


@@ -5459,21 +6159,31 @@ msgstr ""
 "忠実である、あなたのもの、\n"
 "%4$s"
 
 "忠実である、あなたのもの、\n"
 "%4$s"
 

-#: lib/mail.php:413
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427

 #, php-format
 msgid "%s status"
 msgstr "%s の状態"
 
 #, php-format
 msgid "%s status"
 msgstr "%s の状態"
 

-#: lib/mail.php:439
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454

 msgid "SMS confirmation"
 msgstr "SMS確認"
 
 msgid "SMS confirmation"
 msgstr "SMS確認"
 

-#: lib/mail.php:463
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "この電話番号は確認待ちです。"
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478

 #, php-format
 msgid "You've been nudged by %s"
 msgstr "あなたは %s に合図されています"
 
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "あなたは %s に合図されています"
 

-#: lib/mail.php:467
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483

 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "


@@ -5500,12 +6210,14 @@ msgstr ""
 "敬具\n"
 "%4$s\n"
 
 "敬具\n"
 "%4$s\n"
 

-#: lib/mail.php:510
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530

 #, php-format
 msgid "New private message from %s"
 msgstr "%s からの新しいプライベートメッセージ"
 
 #, php-format
 msgid "New private message from %s"
 msgstr "%s からの新しいプライベートメッセージ"
 

-#: lib/mail.php:514
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535

 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"


@@ -5538,12 +6250,14 @@ msgstr ""
 "敬具\n"
 "%5$s\n"
 
 "敬具\n"
 "%5$s\n"
 

-#: lib/mail.php:559
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583

 #, php-format
 msgid "%s (@%s) added your notice as a favorite"
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 
 #, php-format
 msgid "%s (@%s) added your notice as a favorite"
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 

-#: lib/mail.php:561
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586

 #, fuzzy, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 #, fuzzy, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"


@@ -5581,12 +6295,22 @@ msgstr ""
 "忠実である、あなたのもの、\n"
 "%6%s\n"
 
 "忠実である、あなたのもの、\n"
 "%6%s\n"
 

-#: lib/mail.php:624
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651

 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
 msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
 
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
 msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
 

-#: lib/mail.php:626
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654

 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"


@@ -5599,17 +6323,19 @@ msgid ""
 "\n"
 "\t%4$s\n"
 "\n"
 "\n"
 "\t%4$s\n"
 "\n"

-msgstr ""
-"%1$s (@%9$s) はあなた宛てに(@-返信) %2$s でつぶやきを送りました。\n"
+"%5$sYou can reply back here:\n"

 "\n"
 "\n"

-"つぶやきはここ:\n"
+"\t%6$s\n"

 "\n"
 "\n"

-"%3$s\n"
+"The list of all @-replies for you here:\n"

 "\n"
 "\n"

-"これを読む:\n"
+"%7$s\n"

 "\n"
 "\n"

-"%4$s\n"
+"Faithfully yours,\n"
+"%2$s\n"

 "\n"
 "\n"

+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""

 
 #: lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."
 
 #: lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."


@@ -5624,7 +6350,7 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 

-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:494

 msgid "from"
 msgstr "from"
 
 msgid "from"
 msgstr "from"
 


@@ -5719,6 +6445,12 @@ msgstr "To"
 msgid "Available characters"
 msgstr "利用可能な文字"
 
 msgid "Available characters"
 msgstr "利用可能な文字"
 

+#: lib/messageform.php:178 lib/noticeform.php:236
+#, fuzzy
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "投稿"
+

 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "つぶやきを送る"
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "つぶやきを送る"


@@ -5752,52 +6484,56 @@ msgstr ""
 "すみません、あなたの位置を検索するのが予想より長くかかっています、後でもう一"
 "度試みてください"
 
 "すみません、あなたの位置を検索するのが予想より長くかかっています、後でもう一"
 "度試みてください"
 

-#: lib/noticelist.php:428
-#, php-format
-msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
-
-#: lib/noticelist.php:429
+#. TRANS: Used in coordinates as abbreviation of north
+#: lib/noticelist.php:430

 #, fuzzy
 msgid "N"
 msgstr "北"
 
 #, fuzzy
 msgid "N"
 msgstr "北"
 

-#: lib/noticelist.php:429
+#. TRANS: Used in coordinates as abbreviation of south
+#: lib/noticelist.php:432

 #, fuzzy
 msgid "S"
 msgstr "南"
 
 #, fuzzy
 msgid "S"
 msgstr "南"
 

-#: lib/noticelist.php:430
+#. TRANS: Used in coordinates as abbreviation of east
+#: lib/noticelist.php:434

 #, fuzzy
 msgid "E"
 msgstr "東"
 
 #, fuzzy
 msgid "E"
 msgstr "東"
 

-#: lib/noticelist.php:430
+#. TRANS: Used in coordinates as abbreviation of west
+#: lib/noticelist.php:436

 #, fuzzy
 msgid "W"
 msgstr "西"
 
 #, fuzzy
 msgid "W"
 msgstr "西"
 

-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:447

 msgid "at"
 msgstr "at"
 
 msgid "at"
 msgstr "at"
 

-#: lib/noticelist.php:547
+#: lib/noticelist.php:567

 msgid "in context"
 msgstr ""
 
 msgid "in context"
 msgstr ""
 

-#: lib/noticelist.php:572
+#: lib/noticelist.php:602

 msgid "Repeated by"
 msgstr ""
 
 msgid "Repeated by"
 msgstr ""
 

-#: lib/noticelist.php:598
+#: lib/noticelist.php:629

 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 
 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 

-#: lib/noticelist.php:599
+#: lib/noticelist.php:630

 msgid "Reply"
 msgstr "返信"
 
 msgid "Reply"
 msgstr "返信"
 

-#: lib/noticelist.php:641
+#: lib/noticelist.php:674

 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 


@@ -5821,6 +6557,10 @@ msgstr "プロファイル追加エラー"
 msgid "Error inserting avatar"
 msgstr "アバター追加エラー"
 
 msgid "Error inserting avatar"
 msgstr "アバター追加エラー"
 

+#: lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "リモートプロファイル更新エラー"
+

 #: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "リモートプロファイル追加エラー"
 #: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "リモートプロファイル追加エラー"


@@ -5829,10 +6569,6 @@ msgstr "リモートプロファイル追加エラー"
 msgid "Duplicate notice"
 msgstr "重複したつぶやき"
 
 msgid "Duplicate notice"
 msgstr "重複したつぶやき"
 

-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "あなたはフォローが禁止されました。"
-

 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"


@@ -5874,7 +6610,7 @@ msgstr "%s のつぶやきのタグ"
 msgid "Unknown"
 msgstr "不明"
 
 msgid "Unknown"
 msgstr "不明"
 

-#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82

 msgid "Subscriptions"
 msgstr "フォロー"
 
 msgid "Subscriptions"
 msgstr "フォロー"
 


@@ -5882,31 +6618,32 @@ msgstr "フォロー"
 msgid "All subscriptions"
 msgstr "すべてのフォロー"
 
 msgid "All subscriptions"
 msgstr "すべてのフォロー"
 

-#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90

 msgid "Subscribers"
 msgstr "フォローされている"
 
 msgid "Subscribers"
 msgstr "フォローされている"
 

-#: lib/profileaction.php:157
+#: lib/profileaction.php:161

 msgid "All subscribers"
 msgstr "すべてのフォローされている"
 
 msgid "All subscribers"
 msgstr "すべてのフォローされている"
 

-#: lib/profileaction.php:178
+#: lib/profileaction.php:191

 msgid "User ID"
 msgstr "ユーザＩＤ"
 
 msgid "User ID"
 msgstr "ユーザＩＤ"
 

-#: lib/profileaction.php:183
+#: lib/profileaction.php:196

 msgid "Member since"
 msgstr "利用開始日"
 
 msgid "Member since"
 msgstr "利用開始日"
 

-#: lib/profileaction.php:245
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:264

 msgid "All groups"
 msgstr "全てのグループ"
 
 msgid "All groups"
 msgstr "全てのグループ"
 

-#: lib/profileformaction.php:123
-msgid "No return-to arguments."
-msgstr "return-to 引数がありません。"
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114

 msgid "Unimplemented method."
 msgstr "未実装のメソッド。"
 
 msgid "Unimplemented method."
 msgstr "未実装のメソッド。"
 


@@ -5930,15 +6667,28 @@ msgstr "フィーチャーされた"
 msgid "Popular"
 msgstr "人気"
 
 msgid "Popular"
 msgstr "人気"
 

+#: lib/redirectingaction.php:94
+msgid "No return-to arguments."
+msgstr "return-to 引数がありません。"
+

 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "このつぶやきを繰り返しますか?"
 
 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "このつぶやきを繰り返しますか?"
 

+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Yes"
+

 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "このつぶやきを繰り返す"
 
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "このつぶやきを繰り返す"
 

-#: lib/router.php:665
+#: lib/revokeroleform.php:91
+#, fuzzy, php-format
+msgid "Revoke the \"%s\" role from this user"
+msgstr "このグループからこのユーザをブロック"
+
+#: lib/router.php:704

 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 
 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 


@@ -5958,6 +6708,10 @@ msgstr "サイト検索"
 msgid "Keyword(s)"
 msgstr "キーワード"
 
 msgid "Keyword(s)"
 msgstr "キーワード"
 

+#: lib/searchaction.php:127
+msgid "Search"
+msgstr "検索"
+

 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr "ヘルプ検索"
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr "ヘルプ検索"


@@ -6009,33 +6763,14 @@ msgstr "人々は %s をフォローしました。"
 msgid "Groups %s is a member of"
 msgstr "グループ %s はメンバー"
 
 msgid "Groups %s is a member of"
 msgstr "グループ %s はメンバー"
 

-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "すでにフォローしています!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "ユーザはあなたをブロックしました。"
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "フォローできません。"
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "他の人があなたをフォローできません。"
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "フォローしていません！"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "自己フォローを削除できません。"
+#: lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "招待"

 
 

-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "フォローを削除できません"
+#: lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "友人や同僚が %s で加わるよう誘ってください。"

 
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48


@@ -6079,76 +6814,112 @@ msgstr "この利用者からのフォローを解除する"
 msgid "Unsubscribe"
 msgstr "フォロー解除"
 
 msgid "Unsubscribe"
 msgstr "フォロー解除"
 

-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "ユーザはプロフィールをもっていません。"
+
+#: lib/userprofile.php:117

 msgid "Edit Avatar"
 msgstr "アバターを編集する"
 
 msgid "Edit Avatar"
 msgstr "アバターを編集する"
 

-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248

 msgid "User actions"
 msgstr "利用者アクション"
 
 msgid "User actions"
 msgstr "利用者アクション"
 

-#: lib/userprofile.php:248
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263

 msgid "Edit profile settings"
 msgstr "プロファイル設定編集"
 
 msgid "Edit profile settings"
 msgstr "プロファイル設定編集"
 

-#: lib/userprofile.php:249
+#: lib/userprofile.php:264

 msgid "Edit"
 msgstr "編集"
 
 msgid "Edit"
 msgstr "編集"
 

-#: lib/userprofile.php:272
+#: lib/userprofile.php:287

 msgid "Send a direct message to this user"
 msgstr "この利用者にダイレクトメッセージを送る"
 
 msgid "Send a direct message to this user"
 msgstr "この利用者にダイレクトメッセージを送る"
 

-#: lib/userprofile.php:273
+#: lib/userprofile.php:288

 msgid "Message"
 msgstr "メッセージ"
 
 msgid "Message"
 msgstr "メッセージ"
 

-#: lib/userprofile.php:311
+#: lib/userprofile.php:326

 #, fuzzy
 msgid "Moderate"
 msgstr "管理"
 
 #, fuzzy
 msgid "Moderate"
 msgstr "管理"
 

-#: lib/util.php:870
+#: lib/userprofile.php:364
+#, fuzzy
+msgid "User role"
+msgstr "ユーザプロファイル"
+
+#: lib/userprofile.php:366
+#, fuzzy
+msgctxt "role"
+msgid "Administrator"
+msgstr "管理者"
+
+#: lib/userprofile.php:367
+#, fuzzy
+msgctxt "role"
+msgid "Moderator"
+msgstr "管理"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054

 msgid "a few seconds ago"
 msgstr "数秒前"
 
 msgid "a few seconds ago"
 msgstr "数秒前"
 

-#: lib/util.php:872
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057

 msgid "about a minute ago"
 msgstr "約 1 分前"
 
 msgid "about a minute ago"
 msgstr "約 1 分前"
 

-#: lib/util.php:874
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061

 #, php-format
 msgid "about %d minutes ago"
 msgstr "約 %d 分前"
 
 #, php-format
 msgid "about %d minutes ago"
 msgstr "約 %d 分前"
 

-#: lib/util.php:876
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064

 msgid "about an hour ago"
 msgstr "約 1 時間前"
 
 msgid "about an hour ago"
 msgstr "約 1 時間前"
 

-#: lib/util.php:878
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068

 #, php-format
 msgid "about %d hours ago"
 msgstr "約 %d 時間前"
 
 #, php-format
 msgid "about %d hours ago"
 msgstr "約 %d 時間前"
 

-#: lib/util.php:880
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071

 msgid "about a day ago"
 msgstr "約 1 日前"
 
 msgid "about a day ago"
 msgstr "約 1 日前"
 

-#: lib/util.php:882
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075

 #, php-format
 msgid "about %d days ago"
 msgstr "約 %d 日前"
 
 #, php-format
 msgid "about %d days ago"
 msgstr "約 %d 日前"
 

-#: lib/util.php:884
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078

 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 

-#: lib/util.php:886
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082

 #, php-format
 msgid "about %d months ago"
 msgstr "約 %d ヵ月前"
 
 #, php-format
 msgid "about %d months ago"
 msgstr "約 %d ヵ月前"
 

-#: lib/util.php:888
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085

 msgid "about a year ago"
 msgstr "約 1 年前"
 
 msgid "about a year ago"
 msgstr "約 1 年前"
 


@@ -6162,7 +6933,7 @@ msgstr "%sは有効な色ではありません!"
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
 
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
 

-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403

 #, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
 #, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"