Localisation updates from http://translatewiki.net

[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 d70e8262de13c697f714b3fd6c95d0b5f7fe71d9..c94c24a7bcdc80b9b9178980ae2f357924500092 100644 (file)
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -1,29 +1,32 @@
-# Translation of StatusNet to Japanese
+# Translation of StatusNet - Core to Japanese (日本語)
+# Expored from translatewiki.net

 #
 #

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

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

-"Project-Id-Version: StatusNet\n"
+"Project-Id-Version: StatusNet - Core\n"

 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:04+0000\n"
+"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"

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

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

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"

-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet-core\n"

 "Plural-Forms: nplurals=1; plural=0;\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

+"X-POT-Import-Date: 2010-10-01 20:37:46+0000\n"

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

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

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


@@ -44,10 +47,9 @@ msgstr "匿名ユーザー(ログインしていません)がサイトを見る
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:167
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:167

-#, fuzzy

 msgctxt "LABEL"
 msgid "Private"
 msgctxt "LABEL"
 msgid "Private"

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

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


@@ -77,48 +79,48 @@ msgstr "アクセス設定の保存"
 #. 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 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
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:355

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
 
 #. TRANS: Server error when page not found (404)
 #, 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/all.php:68 actions/public.php:98 actions/replies.php:93

 #: actions/showfavorites.php:138 actions/tag.php:52
 #: actions/showfavorites.php:138 actions/tag.php:52

-#, fuzzy

 msgid "No such page."
 msgid "No such page."

-msgstr "そのようなページはありません。"
-
-#: actions/all.php:75 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:113
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: 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:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
-#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
-#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
+msgstr "そのようなタグはありません。"
+
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75

 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
 #: actions/otp.php:76 actions/remotesubscribe.php:145
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
 #: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
 #: actions/otp.php:76 actions/remotesubscribe.php:145
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40

-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59

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

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

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


@@ -126,39 +128,39 @@ msgstr "%1$s と友人、ページ %2$d"
 #. 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.
 #. 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
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116

 #: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s と友人"
 
 #. TRANS: %1$s is user nickname
 #: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s と友人"
 
 #. TRANS: %1$s is user nickname

-#: actions/all.php:103
+#: actions/all.php:107

 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%s の友人のフィード (RSS 1.0)"
 
 #. TRANS: %1$s is user nickname
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "%s の友人のフィード (RSS 1.0)"
 
 #. TRANS: %1$s is user nickname

-#: actions/all.php:112
+#: actions/all.php:116

 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%s の友人のフィード (RSS 2.0)"
 
 #. TRANS: %1$s is user nickname
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "%s の友人のフィード (RSS 2.0)"
 
 #. TRANS: %1$s is user nickname

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

 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%s の友人のフィード (Atom)"
 
 #. TRANS: %1$s is user nickname
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "%s の友人のフィード (Atom)"
 
 #. TRANS: %1$s is user nickname

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

 #, 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:139
+#: actions/all.php:143

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


@@ -168,77 +170,79 @@ msgstr ""
 "してみたり、何か投稿してみましょう。"
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 "してみたり、何か投稿してみましょう。"
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"

-#: actions/all.php:142
+#: actions/all.php:146

 #, php-format
 msgid ""
 #, php-format
 msgid ""

-"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
-"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."

 msgstr ""
 msgstr ""

-"プロフィールから [%1$s さんに合図](../%2$s) したり、[知らせたいことについて投"
-"稿](%%%%action.newnotice%%%%?status_textarea=%3$s) したりできます。"
+"最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
+"ください!"

 
 

-#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 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 "

-"post a notice to his or her attention."
+"post a notice to them."

 msgstr ""
 msgstr ""

-"[アカウントを登録](%%%%action.register%%%%) して %s さんに合図したり、お知ら"
-"ã\81\9bã\82\92é\80\81ã\81£ã\81¦ã\81¿ã\81¾ã\81\9bã\82\93ã\81\8bã\80\82"
+"なぜ [アカウント登録](%%action.register%%) しないのですか。そして最初の投稿を"
+"ã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84!"

 
 #. TRANS: H1 text
 
 #. TRANS: H1 text

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

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

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

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

-#: actions/apiaccountratelimitstatus.php:70
-#: actions/apiaccountupdatedeliverydevice.php:93
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119

 #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
 #: actions/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:138
-#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: 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/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141

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

-#: 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/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241

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

-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
-#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101

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

-#: actions/apiaccountupdatedeliverydevice.php:85
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117
-#: 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/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199

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

-#: actions/apiaccountupdatedeliverydevice.php:105
+#: actions/apiaccountupdatedeliverydevice.php:107

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


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

-#: actions/apiaccountupdatedeliverydevice.php:132
+#: actions/apiaccountupdatedeliverydevice.php:134

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

-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108

 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
 #: 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 "ユーザはプロフィールをもっていません。"
 

-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148

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

-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257

 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283


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

-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175

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

-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143

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

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

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

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

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

-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115

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


@@ -326,64 +330,66 @@ msgstr "%s へのダイレクトメッセージ"
 msgid "All the direct messages sent to %s"
 msgstr "%s へ送った全てのダイレクトメッセージ"
 
 msgid "All the direct messages sent to %s"
 msgstr "%s へ送った全てのダイレクトメッセージ"
 

-#: actions/apidirectmessagenew.php:126
+#: actions/apidirectmessagenew.php:119

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

-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150

 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "長すぎます。メッセージは最大 %d 字までです。"
 
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "長すぎます。メッセージは最大 %d 字までです。"
 

-#: actions/apidirectmessagenew.php:146
+#: actions/apidirectmessagenew.php:139

 msgid "Recipient user not found."
 msgstr "受け取り手のユーザが見つかりません。"
 
 msgid "Recipient user not found."
 msgstr "受け取り手のユーザが見つかりません。"
 

-#: actions/apidirectmessagenew.php:150
+#: actions/apidirectmessagenew.php:143

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

-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
-#: actions/apistatusesdestroy.php:113
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
+#: actions/apistatusesdestroy.php:121

 msgid "No status found with that ID."
 msgstr "そのＩＤのステータスが見つかりません。"
 
 msgid "No status found with that ID."
 msgstr "そのＩＤのステータスが見つかりません。"
 

-#: actions/apifavoritecreate.php:119
+#: actions/apifavoritecreate.php:121

 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:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294

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

-#: actions/apifavoritedestroy.php:122
+#: actions/apifavoritedestroy.php:124

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

-#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87

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

-#: actions/apifriendshipscreate.php:109
-msgid "Could not follow user: User not found."
-msgstr "ã\83¦ã\83¼ã\82¶ã\82\92ã\83\95ã\82©ã\83­ã\83¼できませんでした: ユーザが見つかりません。"
+#: actions/apifriendshipscreate.php:110
+msgid "Could not follow user: profile not found."
+msgstr "ã\83¦ã\83¼ã\82¶ã\81®ã\83\95ã\82©ã\83­ã\83¼ã\82\92å\81\9cæ­¢できませんでした: ユーザが見つかりません。"

 
 

-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119

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

-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110

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

-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121

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

-#: actions/apifriendshipsexists.php:94
-msgid "Two user ids or screen_names must be supplied."
+#: actions/apifriendshipsexists.php:91
+#, fuzzy
+msgid "Two valid IDs or screen_names must be supplied."

 msgstr "ふたつのＩＤかスクリーンネームが必要です。"
 
 #: actions/apifriendshipsshow.php:134
 msgstr "ふたつのＩＤかスクリーンネームが必要です。"
 
 #: actions/apifriendshipsshow.php:134


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

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

 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/newgroup.php:126 actions/profilesettings.php:215

-#: actions/register.php:205
+#: actions/register.php:212

 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
 "できません。"
 
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
 "できません。"
 

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

 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/newgroup.php:130 actions/profilesettings.php:238

-#: actions/register.php:208
+#: actions/register.php:215

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

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

 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/newgroup.php:133 actions/profilesettings.php:218

-#: actions/register.php:210
+#: actions/register.php:217

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

-#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215

 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222

-#: actions/register.php:217
+#: actions/register.php:224

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

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

 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/newgroup.php:142 actions/profilesettings.php:225

-#: actions/register.php:220
+#: actions/register.php:227

 msgid "Full name is too long (max 255 chars)."
 msgstr "フルネームが長すぎます。（255字まで）"
 
 msgid "Full name is too long (max 255 chars)."
 msgstr "フルネームが長すぎます。（255字まで）"
 

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

 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."

-msgstr "記述が長すぎます。（最長140字）"
+msgstr "記述が長すぎます。（最長%d字）"

 
 

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

 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/newgroup.php:148 actions/profilesettings.php:232

-#: actions/register.php:227
+#: actions/register.php:234

 msgid "Location is too long (max 255 chars)."
 msgstr "場所が長すぎます。（255字まで）"
 
 msgid "Location is too long (max 255 chars)."
 msgstr "場所が長すぎます。（255字まで）"
 

-#: actions/apigroupcreate.php:245 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 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:266
+#: actions/apigroupcreate.php:268

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

-#: actions/apigroupcreate.php:275 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 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:288 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 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 "別名はニックネームと同じではいけません。"
 

-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92

 msgid "Group not found."
 msgid "Group not found."

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

 
 

-#: actions/apigroupjoin.php:110 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:333

 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:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338

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

-#: actions/apigroupjoin.php:138 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:350

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

-#: actions/apigroupleave.php:114
+#: actions/apigroupleave.php:116

 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:129
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
+#: lib/command.php:398

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

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

 #, php-format
 msgid "%s's groups"
 msgstr "%s のグループ"
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #, php-format
 msgid "%s's groups"
 msgstr "%s のグループ"
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s

-#: actions/apigrouplist.php:107
+#: actions/apigrouplist.php:108

 #, 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.
 #, 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
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63

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

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

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

+#: actions/apimediaupload.php:100
+#, fuzzy
+msgid "Upload failed."
+msgstr "ファイルアップロード"
+

 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "oauth_token パラメータは提供されませんでした。"
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "oauth_token パラメータは提供されませんでした。"


@@ -524,15 +541,15 @@ msgstr "不正なトークン。"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74

-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55

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

-#: actions/groupunblock.php:66 actions/imsettings.php:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/groupunblock.php:66 actions/imsettings.php:230
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66

 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350

-#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/register.php:172 actions/remotesubscribe.php:77

 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: 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


@@ -571,8 +588,8 @@ msgstr "リクエストトークン%sは、拒否されて、取り消されま
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139

-#: actions/emailsettings.php:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121

 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."


@@ -595,12 +612,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to user settings
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to user settings

-#: actions/apioauthauthorize.php:310 lib/action.php:440
+#: actions/apioauthauthorize.php:310 lib/action.php:462

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

-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431

 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:132
 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:132


@@ -608,8 +625,8 @@ msgid "Nickname"
 msgstr "ニックネーム"
 
 #. TRANS: Link description in user account settings menu.
 msgstr "ニックネーム"
 
 #. TRANS: Link description in user account settings menu.

-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120

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


@@ -625,80 +642,86 @@ msgstr "許可"
 msgid "Allow or deny access to your account information."
 msgstr "アカウント情報へのアクセスを許可するか、または拒絶してください。"
 
 msgid "Allow or deny access to your account information."
 msgstr "アカウント情報へのアクセスを許可するか、または拒絶してください。"
 

-#: actions/apistatusesdestroy.php:107
+#: actions/apistatusesdestroy.php:112

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

-#: actions/apistatusesdestroy.php:130
+#: actions/apistatusesdestroy.php:135

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

-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72

 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "そのようなつぶやきはありません。"
 
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "そのようなつぶやきはありません。"
 

-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:84 lib/command.php:535

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

-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:92 lib/command.php:541

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

-#: actions/apistatusesshow.php:138
+#: actions/apistatusesshow.php:139

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

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

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

-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:222
+msgid "Client must provide a 'status' parameter with a value."
+msgstr ""
+
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157

 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."

-msgstr "長すぎます。つぶやきは最大 140 字までです。"
+msgstr "長すぎます。つぶやきは最大 %d 字までです。"

 
 

-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96

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

-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181

 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "つぶやきは URL を含めて最大 %d 字までです。"
 
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "つぶやきは URL を含めて最大 %d 字までです。"
 

-#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263

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

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

 #, 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:118
+#: actions/apitimelinefavorites.php:119

 #, 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/apitimelinementions.php:117
+#: actions/apitimelinementions.php:118

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

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

 #, 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 アップデート"
 

-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103

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

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

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


@@ -713,16 +736,20 @@ msgstr "%s への返信"
 msgid "Repeats of %s"
 msgstr "%s の返信"
 
 msgid "Repeats of %s"
 msgstr "%s の返信"
 

-#: actions/apitimelinetag.php:104 actions/tag.php:67
+#: actions/apitimelinetag.php:105 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:106 actions/tagrss.php:65
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65

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

+#: actions/apitrends.php:87
+msgid "API method under construction."
+msgstr "API メソッドが工事中です。"
+

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


@@ -744,7 +771,7 @@ msgstr "不正なサイズ。"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/avatarsettings.php:67 actions/showgroup.php:230
 
 #. TRANS: Link description in user account settings menu.
 #: actions/avatarsettings.php:67 actions/showgroup.php:230

-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:113

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


@@ -775,7 +802,7 @@ msgid "Preview"
 msgstr "プレビュー"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
 msgstr "プレビュー"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252

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

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


@@ -816,11 +843,11 @@ 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:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158

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

-#: actions/block.php:130
+#: actions/block.php:138

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


@@ -836,17 +863,16 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.

-#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/block.php:153 actions/deleteapplication.php:154

 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178

-#, fuzzy

 msgctxt "BUTTON"
 msgid "No"
 msgctxt "BUTTON"
 msgid "No"

-msgstr "No"
+msgstr "ノート"

 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
 
 #. 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
+#: actions/block.php:157 actions/deleteuser.php:156

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


@@ -855,7 +881,7 @@ msgstr "このユーザをアンブロックする"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.

-#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/block.php:160 actions/deleteapplication.php:161

 #: actions/deletenotice.php:154 actions/deleteuser.php:159
 #: actions/groupblock.php:185
 #, fuzzy
 #: actions/deletenotice.php:154 actions/deleteuser.php:159
 #: actions/groupblock.php:185
 #, fuzzy


@@ -864,14 +890,17 @@ msgid "Yes"
 msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 msgstr "Yes"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.

-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 lib/blockform.php:79

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

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

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

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

 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: 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


@@ -881,8 +910,8 @@ msgstr "ブロック情報の保存に失敗しました。"
 #: 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/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
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:168
+#: lib/command.php:380

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


@@ -904,19 +933,21 @@ msgstr "このグループへの参加をブロックされたユーザのリス
 msgid "Unblock user from group"
 msgstr "グループからのアンブロックユーザ"
 
 msgid "Unblock user from group"
 msgstr "グループからのアンブロックユーザ"
 

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70

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

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82

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

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

 msgid "Post to %s"
 msgid "Post to %s"

-msgstr "投稿"
+msgstr "%s 上のグループ"

 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."


@@ -947,9 +978,9 @@ msgstr "そのアドレスは既に承認されています。"
 #. 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.
 #. 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/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174

 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."


@@ -957,7 +988,7 @@ msgstr "ユーザを更新できません"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
 
 #. 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/confirmaddress.php:128 actions/emailsettings.php:437

 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "メール承認を削除できません"
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "メール承認を削除できません"


@@ -993,9 +1024,10 @@ msgstr "アプリケーションが見つかりません。"
 msgid "You are not the owner of this application."
 msgstr "このアプリケーションのオーナーではありません。"
 
 msgid "You are not the owner of this application."
 msgstr "このアプリケーションのオーナーではありません。"
 

+#. TRANS: Client error text when there is a problem with the session token.

 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118

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

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


@@ -1029,7 +1061,7 @@ msgstr "このアプリケーションを削除"
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52

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

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


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

-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:667

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


@@ -1091,54 +1123,62 @@ msgstr "このユーザを削除"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 
 #. 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
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134

 msgid "Design"
 msgstr "デザイン"
 
 #: actions/designadminpanel.php:74
 msgid "Design"
 msgstr "デザイン"
 
 #: actions/designadminpanel.php:74

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

 
 

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

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

-#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#: actions/designadminpanel.php:335
+#, php-format

 msgid "Theme not available: %s."
 msgid "Theme not available: %s."

-msgstr "テーマが利用できません： %s"
+msgstr "ＩＭ が利用不可。"

 
 

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

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

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

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

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

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

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

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

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

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

-#: actions/designadminpanel.php:418 lib/designsettings.php:101
+#: actions/designadminpanel.php:480
+#, fuzzy
+msgid "Custom theme"
+msgstr "サイトテーマ"
+
+#: actions/designadminpanel.php:484
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#: actions/designadminpanel.php:499 lib/designsettings.php:101

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

-#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: actions/designadminpanel.php:580 lib/designsettings.php:247
+#: actions/designadminpanel.php:664
+msgid "Advanced"
+msgstr ""
+
+#: actions/designadminpanel.php:668
+msgid "Custom CSS"
+msgstr ""
+
+#: actions/designadminpanel.php:689 lib/designsettings.php:247

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

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

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

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

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

-#. 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
+#. TRANS: Submit button title.
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
+#: lib/groupeditform.php:202

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

-#: actions/designadminpanel.php:590 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257

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


@@ -1286,7 +1335,7 @@ msgstr "コールバックが長すぎます。"
 msgid "Callback URL is not valid."
 msgstr "コールバックURLが不正です。"
 
 msgid "Callback URL is not valid."
 msgstr "コールバックURLが不正です。"
 

-#: actions/editapplication.php:258
+#: actions/editapplication.php:261

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


@@ -1322,7 +1371,8 @@ msgstr "不正な別名: \"%s\""
 msgid "Could not update group."
 msgstr "グループを更新できません。"
 
 msgid "Could not update group."
 msgstr "グループを更新できません。"
 

-#: actions/editgroup.php:264 classes/User_group.php:496
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/editgroup.php:264 classes/User_group.php:513

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


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

-#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/emailsettings.php:115 actions/emailsettings.php:162

 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180

-#, fuzzy

 msgctxt "BUTTON"
 msgid "Remove"
 msgctxt "BUTTON"
 msgid "Remove"

-msgstr "å\89\8aé\99¤"
+msgstr "å\9b\9e復"

 
 #: actions/emailsettings.php:122
 msgid ""
 
 #: actions/emailsettings.php:122
 msgid ""


@@ -1377,23 +1426,27 @@ msgstr ""
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label 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
+#. TRANS: Button label in the "Edit application" form.

 #: actions/emailsettings.php:127 actions/imsettings.php:131
 #: actions/emailsettings.php:127 actions/imsettings.php:131

-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:351

 #, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "中止"
 
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "中止"
 

-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139

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

-#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/emailsettings.php:143 actions/imsettings.php:151

 #: actions/smssettings.php:162
 #, fuzzy
 msgctxt "BUTTON"
 #: actions/smssettings.php:162
 #, fuzzy
 msgctxt "BUTTON"


@@ -1402,116 +1455,115 @@ msgstr "追加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.

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

 msgid "Incoming email"
 msgstr "入ってくるメール"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 msgid "Incoming email"
 msgstr "入ってくるメール"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.

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

 msgid "Send email to this address to post new notices."
 msgstr "新しいつぶやき投稿にこのアドレスへメールする"
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
 msgid "Send email to this address to post new notices."
 msgstr "新しいつぶやき投稿にこのアドレスへメールする"
 
 #. 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
+#: actions/emailsettings.php:168 actions/smssettings.php:186

 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。"
 
 #. 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.
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。"
 
 #. 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
+#: actions/emailsettings.php:172 actions/smssettings.php:189

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

-#: actions/emailsettings.php:174
-#, fuzzy
+#: actions/emailsettings.php:178

 msgid "Email preferences"
 msgid "Email preferences"

-msgstr "設定"
+msgstr "メールアドレス"

 
 #. TRANS: Checkbox label in e-mail preferences form.
 
 #. TRANS: Checkbox label in e-mail preferences form.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:370 actions/register.php:208

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

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

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

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

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

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

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

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

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


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

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

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

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

 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "その IM アドレスは不正です。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "その IM アドレスは不正です。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

-#: actions/emailsettings.php:438
-#, fuzzy
+#: actions/emailsettings.php:442

 msgid "Email confirmation cancelled."
 msgid "Email confirmation cancelled."

-msgstr "承認作業が中止されました。"
+msgstr "承認待ちのものはありません。"

 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.

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

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

-#: actions/emailsettings.php:479
-#, fuzzy
+#: actions/emailsettings.php:483

 msgid "The email address was removed."
 msgid "The email address was removed."

-msgstr "アドレスは削除されました。"
+msgstr "入ってくるメールアドレスは削除されました。"

 
 

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

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

-#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/emailsettings.php:508 actions/emailsettings.php:532

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

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

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

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

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


@@ -1577,7 +1627,7 @@ msgstr "新しい入ってくるメールアドレスが追加されました。
 msgid "This notice is already a favorite!"
 msgstr "このつぶやきはすでにお気に入りです!"
 
 msgid "This notice is already a favorite!"
 msgstr "このつぶやきはすでにお気に入りです!"
 

-#: actions/favor.php:92 lib/disfavorform.php:140
+#: actions/favor.php:92 lib/disfavorform.php:144

 msgid "Disfavor favorite"
 msgstr "お気に入りをやめる"
 
 msgid "Disfavor favorite"
 msgstr "お気に入りをやめる"
 


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

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

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


@@ -1723,13 +1773,13 @@ msgstr "ユーザは既に黙っています。"
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46

-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79

 msgid "No profile specified."
 msgstr "プロファイル記述がありません。"
 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
 msgid "No profile specified."
 msgstr "プロファイル記述がありません。"
 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46

-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86

 msgid "No profile with that ID."
 msgstr "そのＩＤのプロファイルがありません。"
 
 msgid "No profile with that ID."
 msgstr "そのＩＤのプロファイルがありません。"
 


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

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

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


@@ -1831,45 +1881,61 @@ msgstr "ロゴが更新されました。"
 msgid "Failed updating logo."
 msgstr "ロゴの更新に失敗しました。"
 
 msgid "Failed updating logo."
 msgstr "ロゴの更新に失敗しました。"
 

-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102

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

-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107

 #, 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:118
+#: actions/groupmembers.php:122

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

-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186

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

-#: actions/groupmembers.php:392 lib/blockform.php:69
+#. TRANS: Button text for the form that will block a user from a group.
+#: actions/groupmembers.php:399
+msgctxt "BUTTON"

 msgid "Block"
 msgid "Block"

-msgstr "ブロック"
+msgstr ""
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""

 
 

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

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

-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"

 msgid "Make Admin"
 msgid "Make Admin"

-msgstr "管理者にする"
+msgstr ""

 
 

-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"

 msgid "Make this user an admin"
 msgid "Make this user an admin"

-msgstr "このユーザを管理者にする"
+msgstr ""

 
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/grouprss.php:139 actions/userrss.php:94
 
 #. 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
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:68

 #, php-format
 msgid "%s timeline"
 msgstr "%s のタイムライン"
 #, php-format
 msgid "%s timeline"
 msgstr "%s のタイムライン"


@@ -2002,7 +2068,10 @@ msgstr ""
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.

-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143

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


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

-#: actions/imsettings.php:155
-#, fuzzy
+#: actions/imsettings.php:158

 msgid "IM preferences"
 msgid "IM preferences"

-msgstr "設定"
+msgstr "設定が保存されました。"

 
 #. TRANS: Checkbox label in IM preferences form.
 
 #. TRANS: Checkbox label in IM preferences form.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

 #, fuzzy
 msgid "Couldn't delete IM confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #, fuzzy
 msgid "Couldn't delete IM confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.

-#: actions/imsettings.php:402
-#, fuzzy
+#: actions/imsettings.php:405

 msgid "IM confirmation cancelled."
 msgid "IM confirmation cancelled."

-msgstr "承認作業が中止されました。"
+msgstr "確認コードがありません。"

 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.

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

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

-#: actions/imsettings.php:447
-#, fuzzy
+#: actions/imsettings.php:450

 msgid "The IM address was removed."
 msgid "The IM address was removed."

-msgstr "アドレスは削除されました。"
+msgstr "入ってくるメールアドレスは削除されました。"

 
 #: actions/inbox.php:59
 #, php-format
 
 #: actions/inbox.php:59
 #, php-format


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

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

 msgid "You must be logged in to invite other users to use %s."
 msgid "You must be logged in to invite other users to use %s."

-msgstr "他のユーザが%sを使用するよう誘うためにはログインしなければなりません。"
+msgstr "グループを編集するにはログインしていなければなりません。"

 
 #: actions/invite.php:72
 #, php-format
 
 #: actions/invite.php:72
 #, php-format


@@ -2152,10 +2218,10 @@ msgstr "すでにこれらのユーザをフォローしています:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
 
 #. 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
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:426

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

-msgstr ""
+msgstr "%1$s (%2$s)"

 
 #: actions/invite.php:136
 msgid ""
 
 #: actions/invite.php:136
 msgid ""


@@ -2278,9 +2344,7 @@ msgstr "グループに入るためにはログインしなければなりませ
 msgid "No nickname or ID."
 msgstr "ニックネームがありません。"
 
 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
+#: actions/joingroup.php:141

 #, 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 に参加しました"


@@ -2289,50 +2353,153 @@ 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:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:386

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

-#. 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
+#: actions/leavegroup.php:137

 #, 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 に残りました。"
 

-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr "プライベート"
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144

 msgid "Already logged in."
 msgstr "既にログインしています。"
 
 msgid "Already logged in."
 msgstr "既にログインしています。"
 

-#: actions/login.php:126
+#: actions/login.php:148

 msgid "Incorrect username or password."
 msgstr "ユーザ名またはパスワードが間違っています。"
 
 msgid "Incorrect username or password."
 msgstr "ユーザ名またはパスワードが間違っています。"
 

-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120

 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/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79

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

-#: actions/login.php:227
+#: actions/login.php:249

 msgid "Login to site"
 msgstr "サイトへログイン"
 
 msgid "Login to site"
 msgstr "サイトへログイン"
 

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

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

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

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

-#: actions/login.php:247
+#: actions/login.php:269

 msgid "Lost or forgotten password?"
 msgstr "パスワードを紛失、忘れた？"
 
 msgid "Lost or forgotten password?"
 msgstr "パスワードを紛失、忘れた？"
 

-#: actions/login.php:266
+#: actions/login.php:288

 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."


@@ -2340,11 +2507,15 @@ msgstr ""
 "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
 "て下さい。"
 
 "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
 "て下さい。"
 

-#: actions/login.php:270
-#, php-format
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "ユーザ名とパスワードでログイン"
+
+#: actions/login.php:295
+#, fuzzy, php-format

 msgid ""
 msgid ""

-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."

 msgstr ""
 "ユーザ名とパスワードで、ログインしてください。 まだユーザ名を持っていません"
 "か? 新しいアカウントを [登録](%%action.register%%)。"
 msgstr ""
 "ユーザ名とパスワードで、ログインしてください。 まだユーザ名を持っていません"
 "か? 新しいアカウントを [登録](%%action.register%%)。"


@@ -2369,9 +2540,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

-#, fuzzy

 msgid "No current status."
 msgid "No current status."

-msgstr "ç\8f¾å\9c¨ã\81®ã\82¹ã\83\86ã\83¼ã\82¿ã\82¹ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93"
+msgstr "çµ\90æ\9e\9cã\81ªã\81\97ã\80\82"

 
 #: actions/newapplication.php:52
 msgid "New Application"
 
 #: actions/newapplication.php:52
 msgid "New Application"


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

-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:499

 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:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:478
+#: lib/command.php:579

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


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

-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:503

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


@@ -2428,12 +2602,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "メッセージを送りました"
 
 msgid "Message sent"
 msgstr "メッセージを送りました"
 

-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:511

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

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

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


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

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

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


@@ -2491,8 +2667,9 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "\"%2$s\" 上の検索語 \"$1$s\" に一致するすべての更新"
 
 #: actions/nudge.php:85
 msgstr "\"%2$s\" 上の検索語 \"$1$s\" に一致するすべての更新"
 
 #: actions/nudge.php:85

+#, fuzzy

 msgid ""
 msgid ""

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

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


@@ -2527,8 +2704,8 @@ msgid "Connected applications"
 msgstr "接続されたアプリケーション"
 
 #: actions/oauthconnectionssettings.php:83
 msgstr "接続されたアプリケーション"
 
 #: actions/oauthconnectionssettings.php:83

-msgid "You have allowed the following applications to access you account."
-msgstr "あなたのアカウントにアクセスする以下のアプリケーションを許可しました。"
+msgid "You have allowed the following applications to access your account."
+msgstr ""

 
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."
 
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."


@@ -2549,31 +2726,30 @@ msgstr ""
 msgid "Developers can edit the registration settings for their applications "
 msgstr "開発者は彼らのアプリケーションのために登録設定を編集できます "
 
 msgid "Developers can edit the registration settings for their applications "
 msgstr "開発者は彼らのアプリケーションのために登録設定を編集できます "
 

-#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
+#: actions/oembed.php:80 actions/shownotice.php:100

 msgid "Notice has no profile."
 msgid "Notice has no profile."

-msgstr "ã\81¤ã\81¶ã\82\84ã\81\8dã\81«ã\81¯ã\83\97ã\83­ã\83\95ã\82¡ã\82¤ã\83«ã\81¯ã\81\82ã\82\8aません。"
+msgstr "ã\83¦ã\83¼ã\82¶ã\81¯ã\83\97ã\83­ã\83\95ã\82£ã\83¼ã\83«ã\82\92ã\82\82ã\81£ã\81¦ã\81\84ません。"

 
 

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

 #, php-format
 msgid "%1$s's status on %2$s"
 #, php-format
 msgid "%1$s's status on %2$s"

-msgstr "%2$s における %1$ のステータス"
+msgstr "%2$s における %1$s のステータス"

 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')

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

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

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

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

-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
+#: lib/apiaction.php:1227 lib/apiaction.php:1350

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


@@ -2678,7 +2854,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/register.php:440

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


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

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

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

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

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


@@ -2715,28 +2891,28 @@ msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
 #. TRANS: Menu item for site administration
 msgstr "パスワードが保存されました。"
 
 #. TRANS: Menu item for site administration

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

 msgid "Paths"
 msgstr "パス"
 
 #: actions/pathsadminpanel.php:70
 msgid "Paths"
 msgstr "パス"
 
 #: actions/pathsadminpanel.php:70

-msgid "Path and server settings for this StatusNet site."
-msgstr "パスと StatusNet サイトのサーバー設定"
+msgid "Path and server settings for this StatusNet site"
+msgstr ""

 
 #: actions/pathsadminpanel.php:157
 
 #: actions/pathsadminpanel.php:157

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

 msgid "Theme directory not readable: %s."
 msgid "Theme directory not readable: %s."

-msgstr "テーマディレクトリが読み込めません: %s"
+msgstr "テーマディレクトリ"

 
 #: actions/pathsadminpanel.php:163
 
 #: actions/pathsadminpanel.php:163

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

 msgid "Avatar directory not writable: %s."
 msgid "Avatar directory not writable: %s."

-msgstr "アバターディレクトリに書き込みできません: %s"
+msgstr "アバターディレクトリ"

 
 #: actions/pathsadminpanel.php:169
 
 #: actions/pathsadminpanel.php:169

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

 msgid "Background directory not writable: %s."
 msgid "Background directory not writable: %s."

-msgstr "バックグラウンドディレクトリに書き込みできません : %s"
+msgstr "バックグラウンドディレクトリ"

 
 #: actions/pathsadminpanel.php:177
 #, fuzzy, php-format
 
 #: actions/pathsadminpanel.php:177
 #, fuzzy, php-format


@@ -2881,9 +3057,9 @@ msgid "People search"
 msgstr "ピープルサーチ"
 
 #: actions/peopletag.php:68
 msgstr "ピープルサーチ"
 
 #: actions/peopletag.php:68

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

 msgid "Not a valid people tag: %s."
 msgid "Not a valid people tag: %s."

-msgstr "æ­£ã\81\97ã\81\84ã\82¿ã\82°ã\81§ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ï¼\9a %s"
+msgstr "æ\9c\89å\8a¹ã\81ªã\83¡ã\83¼ã\83«ã\82¢ã\83\89ã\83¬ã\82¹ã\81§ã\81¯ã\81\82ã\82\8aã\81¾ã\81\9bã\82\93ã\80\82"

 
 #: actions/peopletag.php:142
 #, php-format
 
 #: actions/peopletag.php:142
 #, php-format


@@ -2891,9 +3067,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "ユーザ自身がつけたタグ %1$s  - ページ %2$d"
 
 #: actions/postnotice.php:95
 msgstr "ユーザ自身がつけたタグ %1$s  - ページ %2$d"
 
 #: actions/postnotice.php:95

-#, fuzzy

 msgid "Invalid notice content."
 msgid "Invalid notice content."

-msgstr "ä¸\8dæ­£ã\81ªã\81¤ã\81¶ã\82\84ã\81\8då\86\85容"
+msgstr "ä¸\8dæ­£ã\81ªã\83\88ã\83¼ã\82¯ã\83³ã\80\82"

 
 #: actions/postnotice.php:101
 #, php-format
 
 #: actions/postnotice.php:101
 #, php-format


@@ -2920,43 +3095,43 @@ msgstr "プロファイル情報"
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 

-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455

 #: actions/showgroup.php:256 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:150
 msgid "Full name"
 msgstr "フルネーム"
 
 #. TRANS: Form input field label.
 #: actions/showgroup.php:256 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:150
 msgid "Full name"
 msgstr "フルネーム"
 
 #. TRANS: Form input field label.

-#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: actions/profilesettings.php:115 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161

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

-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462

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

-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468

 #, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "%d字以内で自分自身と自分の興味について書いてください"
 
 #, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "%d字以内で自分自身と自分の興味について書いてください"
 

-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471

 msgid "Describe yourself and your interests"
 msgstr "自分自身と自分の興味について書いてください"
 
 msgid "Describe yourself and your interests"
 msgstr "自分自身と自分の興味について書いてください"
 

-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473

 msgid "Bio"
 msgstr "自己紹介"
 
 msgid "Bio"
 msgstr "自己紹介"
 

-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478

 #: actions/showgroup.php:265 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:177
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "場所"
 
 #: actions/showgroup.php:265 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:177
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "場所"
 

-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480

 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 


@@ -2998,10 +3173,10 @@ msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)"
 
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)"
 

-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230

 #, php-format
 msgid "Bio is too long (max %d chars)."
 #, php-format
 msgid "Bio is too long (max %d chars)."

-msgstr "自己紹介が長すぎます (最長140文字)。"
+msgstr "自己紹介が長すぎます (最長%d文字)。"

 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."


@@ -3033,7 +3208,7 @@ msgid "Couldn't save tags."
 msgstr "タグを保存できません。"
 
 #. TRANS: Message after successful saving of administrative settings.
 msgstr "タグを保存できません。"
 
 #. TRANS: Message after successful saving of administrative settings.

-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138

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


@@ -3259,7 +3434,7 @@ msgstr "パスワードは6字以上でなければいけません。"
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 

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

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


@@ -3267,39 +3442,39 @@ msgstr "ユーザ設定エラー"
 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 
 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 

-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412

 msgid "Sorry, only invited people can register."
 msgstr "すみません、招待された人々だけが登録できます。"
 
 msgid "Sorry, only invited people can register."
 msgstr "すみません、招待された人々だけが登録できます。"
 

-#: actions/register.php:92
+#: actions/register.php:99

 msgid "Sorry, invalid invitation code."
 msgstr "すみません、不正な招待コード。"
 
 msgid "Sorry, invalid invitation code."
 msgstr "すみません、不正な招待コード。"
 

-#: actions/register.php:112
+#: actions/register.php:119

 msgid "Registration successful"
 msgstr "登録成功"
 
 msgid "Registration successful"
 msgstr "登録成功"
 

-#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85

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

-#: actions/register.php:135
+#: actions/register.php:142

 msgid "Registration not allowed."
 msgstr "登録は許可されていません。"
 
 msgid "Registration not allowed."
 msgstr "登録は許可されていません。"
 

-#: actions/register.php:198
+#: actions/register.php:205

 msgid "You can't register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 
 msgid "You can't register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 

-#: actions/register.php:212
+#: actions/register.php:219

 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 
 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 

-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272

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

-#: actions/register.php:343
+#: actions/register.php:350

 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 #, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "


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

-#: actions/register.php:425
+#: actions/register.php:432

 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
 
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
 

-#: actions/register.php:430
+#: actions/register.php:437

 msgid "6 or more characters. Required."
 msgstr "6文字以上。必須です。"
 
 msgid "6 or more characters. Required."
 msgstr "6文字以上。必須です。"
 

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

 msgid "Same as password above. Required."
 msgstr "上のパスワードと同じです。 必須。"
 
 #. TRANS: Link description in user account settings menu.
 msgid "Same as password above. Required."
 msgstr "上のパスワードと同じです。 必須。"
 
 #. TRANS: Link description in user account settings menu.

-#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/register.php:445 actions/register.php:449
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127

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

-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450

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

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

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

-#: actions/register.php:494
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540

 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
 
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
 

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

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


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

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

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


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

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

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


@@ -3497,10 +3694,8 @@ msgstr "%s の返信フィード (Atom)"
 #, 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 "

-"notice to his attention yet."
-msgstr ""
-"これは %1$s への返信を表示したタイムラインです、しかし %2$s はまだつぶやきを"
-"受け取っていません。"
+"notice to them yet."
+msgstr "これは %1$s のタイムラインですが、%2$s はまだなにも投稿していません。"

 
 #: actions/replies.php:204
 #, php-format
 
 #: actions/replies.php:204
 #, php-format


@@ -3514,11 +3709,11 @@ msgstr ""
 #: actions/replies.php:206
 #, php-format
 msgid ""
 #: actions/replies.php:206
 #, php-format
 msgid ""

-"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
-"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."

 msgstr ""
 msgstr ""

-"あなたは [%1$s に合図](../%2$s) するか、[その人宛てに何かを投稿](%%%%action."
-"newnotice%%%%?status_textarea=%3$s)することができます。"
+"最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
+"ください!"

 
 #: actions/repliesrss.php:72
 #, php-format
 
 #: actions/repliesrss.php:72
 #, php-format


@@ -3535,7 +3730,7 @@ msgstr "あなたはこのサイトでユーザを黙らせることができま
 msgid "User doesn't have this role."
 msgstr "合っているプロフィールのないユーザ"
 
 msgid "User doesn't have this role."
 msgstr "合っているプロフィールのないユーザ"
 

-#: actions/rsd.php:146 actions/version.php:157
+#: actions/rsd.php:146 actions/version.php:159

 msgid "StatusNet"
 msgstr "StatusNet"
 
 msgid "StatusNet"
 msgstr "StatusNet"
 


@@ -3549,13 +3744,13 @@ msgstr "ユーザはすでにサンドボックスです。"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170

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

 msgid "Sessions"
 msgstr "セッション"
 
 #: actions/sessionsadminpanel.php:65
 msgid "Sessions"
 msgstr "セッション"
 
 #: actions/sessionsadminpanel.php:65

-msgid "Session settings for this StatusNet site."
-msgstr "この StatusNet サイトのセッション設定。"
+msgid "Session settings for this StatusNet site"
+msgstr ""

 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"


@@ -3574,7 +3769,6 @@ msgid "Turn on debugging output for sessions."
 msgstr "セッションのためのデバッグ出力をオン。"
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 msgstr "セッションのためのデバッグ出力をオン。"
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292

-#: actions/useradminpanel.php:294

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


@@ -3587,28 +3781,28 @@ msgid "Application profile"
 msgstr "アプリケーションプロファイル"
 
 #. TRANS: Form input field label for application icon.
 msgstr "アプリケーションプロファイル"
 
 #. TRANS: Form input field label for application icon.

-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173

 msgid "Icon"
 msgstr "アイコン"
 
 #. TRANS: Form input field label for application name.
 msgid "Icon"
 msgstr "アイコン"
 
 #. TRANS: Form input field label for application name.

-#: actions/showapplication.php:169 actions/version.php:195
-#: lib/applicationeditform.php:199
+#: actions/showapplication.php:169 actions/version.php:197
+#: lib/applicationeditform.php:190

 msgid "Name"
 msgstr "名前"
 
 #. TRANS: Form input field label.
 msgid "Name"
 msgstr "名前"
 
 #. TRANS: Form input field label.

-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:227

 msgid "Organization"
 msgstr "組織"
 
 #. TRANS: Form input field label.
 msgid "Organization"
 msgstr "組織"
 
 #. TRANS: Form input field label.

-#: actions/showapplication.php:187 actions/version.php:198
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: actions/showapplication.php:187 actions/version.php:200
+#: lib/applicationeditform.php:208 lib/groupeditform.php:172

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

-#: actions/showapplication.php:192 actions/showgroup.php:444
+#: actions/showapplication.php:192 actions/showgroup.php:436

 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "統計データ"
 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "統計データ"


@@ -3697,10 +3891,10 @@ msgstr ""
 "するか、またはそれらの上でスポットライトをはじいてください。"
 
 #: actions/showfavorites.php:208
 "するか、またはそれらの上でスポットライトをはじいてください。"
 
 #: actions/showfavorites.php:208

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

 msgid ""
 msgid ""

-"%s hasn't added any notices to his favorites yet. Post something interesting "
-"they would add to their favorites :)"
+"%s hasn't added any favorite notices yet. Post something interesting they "
+"would add to their favorites :)"

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


@@ -3708,19 +3902,18 @@ msgstr ""
 #: actions/showfavorites.php:212
 #, php-format
 msgid ""
 #: actions/showfavorites.php:212
 #, php-format
 msgid ""

-"%s hasn't added any notices to his favorites yet. Why not [register an "
-"account](%%%%action.register%%%%) and then post something interesting they "
-"would add to their favorites :)"
+"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
+"action.register%%%%) and then post something interesting they would add to "
+"their favorites :)"

 msgstr ""
 msgstr ""

-"%s はまだお気に入りに少しのつぶやきも加えていません。 なぜ [アカウント登録](%"
-"%%%action.register%%%%) しないのですか。そして、彼らがお気に入りに加えるおも"
-"しろい何かを投稿しませんか:)"
+"なぜ [アカウント登録](%%action.register%%) しないのですか、そして、あなたのお"
+"気に入りにつぶやきを加える最初になりましょう!"

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

-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82

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


@@ -3772,7 +3965,7 @@ msgstr "%s グループのつぶやきフィード (Atom)"
 msgid "FOAF for %s group"
 msgstr "%s グループの FOAF"
 
 msgid "FOAF for %s group"
 msgstr "%s グループの FOAF"
 

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

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


@@ -3786,11 +3979,11 @@ msgstr "(なし)"
 msgid "All members"
 msgstr "全てのメンバー"
 
 msgid "All members"
 msgstr "全てのメンバー"
 

-#: actions/showgroup.php:447
+#: actions/showgroup.php:439

 msgid "Created"
 msgstr "作成日"
 
 msgid "Created"
 msgstr "作成日"
 

-#: actions/showgroup.php:463
+#: actions/showgroup.php:455

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


@@ -3805,7 +3998,7 @@ msgstr ""
 "する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ"
 "のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))"
 
 "する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ"
 "のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))"
 

-#: actions/showgroup.php:469
+#: actions/showgroup.php:461

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


@@ -3818,7 +4011,7 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
 "する短いメッセージを共有します。"
 
 "wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
 "する短いメッセージを共有します。"
 

-#: actions/showgroup.php:497
+#: actions/showgroup.php:489

 msgid "Admins"
 msgstr "管理者"
 
 msgid "Admins"
 msgstr "管理者"
 


@@ -3895,11 +4088,11 @@ msgstr ""
 #: actions/showstream.php:207
 #, php-format
 msgid ""
 #: actions/showstream.php:207
 #, php-format
 msgid ""

-"You can try to nudge %1$s or [post something to his or her attention](%%%%"
-"action.newnotice%%%%?status_textarea=%2$s)."
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."

 msgstr ""
 msgstr ""

-"あなたは、%1$s に合図するか、[またはその人宛に何かを投稿](%%%%action."
-"newnotice%%%%?status_textarea=%2$s) することができます。"
+"最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
+"ください!"

 
 #: actions/showstream.php:243
 #, php-format
 
 #: actions/showstream.php:243
 #, php-format


@@ -3940,9 +4133,8 @@ msgid "User is already silenced."
 msgstr "ユーザは既に黙っています。"
 
 #: actions/siteadminpanel.php:69
 msgstr "ユーザは既に黙っています。"
 
 #: actions/siteadminpanel.php:69

-#, fuzzy

 msgid "Basic settings for this StatusNet site"
 msgid "Basic settings for this StatusNet site"

-msgstr "この StatusNet サイトの基本設定。"
+msgstr "この StatusNet サイトのデザイン設定。"

 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."


@@ -4015,9 +4207,8 @@ msgid "Default timezone for the site; usually UTC."
 msgstr "サイトのデフォルトタイムゾーン; 通常UTC。"
 
 #: actions/siteadminpanel.php:262
 msgstr "サイトのデフォルトタイムゾーン; 通常UTC。"
 
 #: actions/siteadminpanel.php:262

-#, fuzzy

 msgid "Default language"
 msgid "Default language"

-msgstr "ã\83\87ã\83\95ã\82©ã\83«ã\83\88ã\82µã\82¤ã\83\88言語"
+msgstr "ã\81\94å¸\8cæ\9c\9bã\81®言語"

 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"


@@ -4141,9 +4332,8 @@ msgstr "電話番号、句読点またはスペースがない、市街番号付
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195

-#, fuzzy

 msgid "SMS preferences"
 msgid "SMS preferences"

-msgstr "設定"
+msgstr "設定が保存されました。"

 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201


@@ -4196,9 +4386,8 @@ msgstr "それは間違った確認番号です。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427

-#, fuzzy

 msgid "SMS confirmation cancelled."
 msgid "SMS confirmation cancelled."

-msgstr "承認作業が中止されました。"
+msgstr "SMS確認"

 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.


@@ -4241,14 +4430,13 @@ msgstr "コードが入力されていません"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196

-#: lib/adminpanelaction.php:407
+#: lib/adminpanelaction.php:395

 msgid "Snapshots"
 msgstr "スナップショット"
 
 #: actions/snapshotadminpanel.php:65
 msgid "Snapshots"
 msgstr "スナップショット"
 
 #: actions/snapshotadminpanel.php:65

-#, fuzzy

 msgid "Manage snapshot configuration"
 msgid "Manage snapshot configuration"

-msgstr "ã\82µã\82¤ã\83\88設å®\9aã\81®å¤\89æ\9b´"
+msgstr "ã\82»ã\83\83ã\82·ã\83§ã\83³è¨­å®\9a"

 
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."


@@ -4303,7 +4491,8 @@ msgstr "サイト設定の保存"
 msgid "You are not subscribed to that profile."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 msgid "You are not subscribed to that profile."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 

-#: actions/subedit.php:83 classes/Subscription.php:132
+#. TRANS: Exception thrown when a subscription could not be stored on the server.
+#: actions/subedit.php:83 classes/Subscription.php:136

 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 
 msgid "Could not save subscription."
 msgstr "フォローを保存できません。"
 


@@ -4410,7 +4599,7 @@ msgstr "%s はだれも言うことを聞いていません。"
 msgid "Jabber"
 msgstr "Jabber"
 
 msgid "Jabber"
 msgstr "Jabber"
 

-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222

 msgid "SMS"
 msgstr "SMS"
 
 msgid "SMS"
 msgstr "SMS"
 


@@ -4482,10 +4671,6 @@ msgstr "このフォームを使用して、フォロー者かフォローにタ
 msgid "No such tag."
 msgstr "そのようなタグはありません。"
 
 msgid "No such tag."
 msgstr "そのようなタグはありません。"
 

-#: actions/twitapitrends.php:85
-msgid "API method under construction."
-msgstr "API メソッドが工事中です。"
-

 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "あなたはそのユーザをブロックしていません。"
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "あなたはそのユーザをブロックしていません。"


@@ -4499,9 +4684,8 @@ msgid "User is not silenced."
 msgstr "ユーザはサイレンスではありません。"
 
 #: actions/unsubscribe.php:77
 msgstr "ユーザはサイレンスではありません。"
 
 #: actions/unsubscribe.php:77

-#, fuzzy

 msgid "No profile ID in request."
 msgid "No profile ID in request."

-msgstr "ã\83ªã\82¯ã\82¨ã\82¹ã\83\88å\86\85ã\81«ã\83\97ã\83­ã\83\95ã\82¡ã\82¤ã\83«IDã\81\8cã\81\82ã\82\8aません。"
+msgstr "ã\83­ã\82°ã\82¤ã\83³ã\83\88ã\83¼ã\82¯ã\83³ã\81\8cè¦\81æ±\82ã\81\95ã\82\8cã\81¦ã\81\84ません。"

 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"


@@ -4516,75 +4700,79 @@ msgstr ""
 "りません。"
 
 #. TRANS: User admin panel title
 "りません。"
 
 #. TRANS: User admin panel title

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

 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "ユーザ"
 
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "ユーザ"
 

-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "この StatusNet サイトのユーザ設定。"
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""

 
 

-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150

 msgid "Invalid bio limit. Must be numeric."
 msgstr "不正な自己紹介制限。数字である必要があります。"
 
 msgid "Invalid bio limit. Must be numeric."
 msgstr "不正な自己紹介制限。数字である必要があります。"
 

-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156

 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:165
+#: actions/useradminpanel.php:166

 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 
 #. TRANS: Link description in user account settings menu.
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 
 #. TRANS: Link description in user account settings menu.

-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106

 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "プロファイル"
 
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "プロファイル"
 

-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223

 msgid "Bio Limit"
 msgstr "自己紹介制限"
 
 msgid "Bio Limit"
 msgstr "自己紹介制限"
 

-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224

 msgid "Maximum length of a profile bio in characters."
 msgstr "プロファイル自己紹介の最大文字長。"
 
 msgid "Maximum length of a profile bio in characters."
 msgstr "プロファイル自己紹介の最大文字長。"
 

-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232

 msgid "New users"
 msgstr "新しいユーザ"
 
 msgid "New users"
 msgstr "新しいユーザ"
 

-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236

 msgid "New user welcome"
 msgstr "新しいユーザを歓迎"
 
 msgid "New user welcome"
 msgstr "新しいユーザを歓迎"
 

-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237

 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:241
+#: actions/useradminpanel.php:242

 msgid "Default subscription"
 msgstr "デフォルトフォロー"
 
 msgid "Default subscription"
 msgstr "デフォルトフォロー"
 

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

 msgid "Automatically subscribe new users to this user."
 msgstr "自動的にこのユーザに新しいユーザをフォローしてください。"
 
 msgid "Automatically subscribe new users to this user."
 msgstr "自動的にこのユーザに新しいユーザをフォローしてください。"
 

-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252

 msgid "Invitations"
 msgstr "招待"
 
 msgid "Invitations"
 msgstr "招待"
 

-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257

 msgid "Invitations enabled"
 msgstr "招待が可能"
 
 msgid "Invitations enabled"
 msgstr "招待が可能"
 

-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259

 msgid "Whether to allow users to invite new users."
 msgstr "ユーザが新しいユーザを招待するのを許容するかどうか。"
 
 msgid "Whether to allow users to invite new users."
 msgstr "ユーザが新しいユーザを招待するのを許容するかどうか。"
 

+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+

 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "フォローを承認"
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "フォローを承認"


@@ -4598,7 +4786,9 @@ msgstr ""
 "ユーザのつぶやきをフォローするには詳細を確認して下さい。だれかのつぶやきを"
 "フォローするために尋ねない場合は、\"Reject\" をクリックして下さい。"
 
 "ユーザのつぶやきをフォローするには詳細を確認して下さい。だれかのつぶやきを"
 "フォローするために尋ねない場合は、\"Reject\" をクリックして下さい。"
 

-#: actions/userauthorization.php:196 actions/version.php:165
+#. TRANS: Menu item for site administration
+#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403

 msgid "License"
 msgstr "ライセンス"
 
 msgid "License"
 msgstr "ライセンス"
 


@@ -4728,18 +4918,18 @@ msgstr "[グループを探して](%%action.groupsearch%%)それに加入して
 #. 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.
 #. 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
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70

 #: lib/atomusernoticefeed.php:75
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%1$s から %2$s  上の更新をしました!"
 
 #: lib/atomusernoticefeed.php:75
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%1$s から %2$s  上の更新をしました!"
 

-#: actions/version.php:73
+#: actions/version.php:75

 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 
 #, php-format
 msgid "StatusNet %s"
 msgstr "StatusNet %s"
 

-#: actions/version.php:153
+#: actions/version.php:155

 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 #, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "


@@ -4748,11 +4938,11 @@ msgstr ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 

-#: actions/version.php:161
+#: actions/version.php:163

 msgid "Contributors"
 msgstr "コントリビュータ"
 
 msgid "Contributors"
 msgstr "コントリビュータ"
 

-#: actions/version.php:168
+#: actions/version.php:170

 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "


@@ -4760,7 +4950,7 @@ msgid ""
 "any later version. "
 msgstr ""
 
 "any later version. "
 msgstr ""
 

-#: actions/version.php:174
+#: actions/version.php:176

 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "


@@ -4768,103 +4958,182 @@ msgid ""
 "for more details. "
 msgstr ""
 
 "for more details. "
 msgstr ""
 

-#: actions/version.php:180
+#: actions/version.php:182

 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
 
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
 

-#: actions/version.php:189
+#: actions/version.php:191

 msgid "Plugins"
 msgstr "プラグイン"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 msgid "Plugins"
 msgstr "プラグイン"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.

-#: actions/version.php:196 lib/action.php:779
+#: actions/version.php:198 lib/action.php:802

 msgid "Version"
 msgstr "バージョン"
 
 msgid "Version"
 msgstr "バージョン"
 

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

 msgid "Author(s)"
 msgstr "作者"
 
 msgid "Author(s)"
 msgstr "作者"
 

-#: classes/File.php:169
+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:148 lib/favorform.php:143
+msgid "Favor"
+msgstr "お気に入り"
+
+#. TRANS: Server exception thrown when a URL cannot be processed.
+#: classes/File.php:142

 #, php-format
 #, php-format

+msgid "Cannot process URL '%s'"
+msgstr ""
+
+#. TRANS: Server exception thrown when... Robin thinks something is impossible!
+#: classes/File.php:174
+msgid "Robin thinks something is impossible."
+msgstr ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#: classes/File.php:189
+#, fuzzy, php-format

 msgid ""
 msgid ""

-"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
-"to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."

 msgstr ""
 "どんなファイルも %d バイトより大きくてはいけません、そして、あなたが送った"
 "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして"
 "ください。"
 
 msgstr ""
 "どんなファイルも %d バイトより大きくてはいけません、そして、あなたが送った"
 "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして"
 "ください。"
 

-#: classes/File.php:179
+#. TRANS: Message given if an upload would exceed user quota.
+#. TRANS: %d (number) is the user quota in bytes.
+#: classes/File.php:201

 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。"
 
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr ""
 "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。"
 

-#: classes/File.php:186
+#. TRANS: Message given id an upload would exceed a user's monthly quota.
+#. TRANS: $d (number) is the monthly user quota in bytes.
+#: classes/File.php:210

 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 "これほど大きいファイルはあなたの%dバイトの毎月の割当てを超えているでしょう。"
 
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 "これほど大きいファイルはあなたの%dバイトの毎月の割当てを超えているでしょう。"
 

-#: classes/Group_member.php:41
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:247 classes/File.php:262
+#, fuzzy
+msgid "Invalid filename."
+msgstr "不正なサイズ。"
+
+#. TRANS: Exception thrown when joining a group fails.
+#: classes/Group_member.php:42

 msgid "Group join failed."
 msgstr "グループ参加に失敗しました。"
 
 msgid "Group join failed."
 msgstr "グループ参加に失敗しました。"
 

-#: classes/Group_member.php:53
+#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
+#: classes/Group_member.php:55

 msgid "Not part of group."
 msgstr "グループの一部ではありません。"
 
 msgid "Not part of group."
 msgstr "グループの一部ではありません。"
 

-#: classes/Group_member.php:60
+#. TRANS: Exception thrown when trying to leave a group fails.
+#: classes/Group_member.php:63

 msgid "Group leave failed."
 msgstr "グループ脱退に失敗しました。"
 
 msgid "Group leave failed."
 msgstr "グループ脱退に失敗しました。"
 

-#: classes/Local_group.php:41
+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#: classes/Group_member.php:76
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr ""
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#: classes/Group_member.php:89
+#, fuzzy, php-format
+msgid "Group ID %s is invalid."
+msgstr "ユーザ保存エラー; 不正なユーザ"
+
+#. TRANS: Activity title.
+#: classes/Group_member.php:113 lib/joinform.php:114
+msgid "Join"
+msgstr "参加"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:117
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
+#. TRANS: Server exception thrown when updating a local group fails.
+#: classes/Local_group.php:42

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

-#: classes/Login_token.php:76
+#. TRANS: Exception thrown when trying creating a login token failed.
+#. TRANS: %s is the user nickname for which token creation failed.
+#: classes/Login_token.php:78

 #, php-format
 msgid "Could not create login token for %s"
 msgstr "%s 用のログイン・トークンを作成できませんでした"
 
 #, php-format
 msgid "Could not create login token for %s"
 msgstr "%s 用のログイン・トークンを作成できませんでした"
 

+#. TRANS: Exception thrown when database name or Data Source Name could not be found.
+#: classes/Memcached_DataObject.php:533
+msgid "No database name or DSN found anywhere."
+msgstr ""
+
+#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.

 #: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "あなたはダイレクトメッセージを送るのが禁止されています。"
 
 #: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "あなたはダイレクトメッセージを送るのが禁止されています。"
 

-#: classes/Message.php:61
+#. TRANS: Message given when a message could not be stored on the server.
+#: classes/Message.php:62

 msgid "Could not insert message."
 msgstr "メッセージを追加できません。"
 
 msgid "Could not insert message."
 msgstr "メッセージを追加できません。"
 

-#: classes/Message.php:71
+#. TRANS: Message given when a message could not be updated on the server.
+#: classes/Message.php:73

 msgid "Could not update message with new URI."
 msgstr "新しいURIでメッセージをアップデートできませんでした。"
 
 msgid "Could not update message with new URI."
 msgstr "新しいURIでメッセージをアップデートできませんでした。"
 

+#. TRANS: Server exception thrown when a user profile for a notice cannot be found.
+#. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
+#: classes/Notice.php:98
+#, php-format
+msgid "No such profile (%1$d) for notice (%2$d)."
+msgstr ""
+

 #. TRANS: Server exception. %s are the error details.
 #. TRANS: Server exception. %s are the error details.

-#: classes/Notice.php:176
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format

 msgid "Database error inserting hashtag: %s"
 msgid "Database error inserting hashtag: %s"

-msgstr "ハッシュタグ追加 ＤＢ エラー: %s"
+msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"

 
 

-#: classes/Notice.php:245
+#. TRANS: Client exception thrown if a notice contains too many characters.
+#: classes/Notice.php:265

 msgid "Problem saving notice. Too long."
 msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
 
 msgid "Problem saving notice. Too long."
 msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
 

-#: classes/Notice.php:249
+#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
+#: classes/Notice.php:270

 msgid "Problem saving notice. Unknown user."
 msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
 
 msgid "Problem saving notice. Unknown user."
 msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
 

-#: classes/Notice.php:254
+#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
+#: classes/Notice.php:276

 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:260
+#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
+#: classes/Notice.php:283

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


@@ -4872,251 +5141,294 @@ msgstr ""
 "多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ"
 "い。"
 
 "多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ"
 "い。"
 

-#: classes/Notice.php:266
+#. TRANS: Client exception thrown when a user tries to post while being banned.
+#: classes/Notice.php:291

 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:332 classes/Notice.php:358
+#. TRANS: Server exception thrown when a notice cannot be saved.
+#. TRANS: Server exception thrown when a notice cannot be updated.
+#: classes/Notice.php:358 classes/Notice.php:385

 msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 
 msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 

-#: classes/Notice.php:965
+#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
+#: classes/Notice.php:907
+msgid "Bad type provided to saveKnownGroups"
+msgstr ""
+
+#. TRANS: Server exception thrown when an update for a group inbox fails.
+#: classes/Notice.php:1006

 msgid "Problem saving group inbox."
 msgstr "グループ受信箱を保存する際に問題が発生しました。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 msgid "Problem saving group inbox."
 msgstr "グループ受信箱を保存する際に問題が発生しました。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.

-#: classes/Notice.php:1513
+#: classes/Notice.php:1822

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 

-#: classes/Subscription.php:74 lib/oauthstore.php:465
+#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#: classes/Profile.php:785
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#: classes/Profile.php:794
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
+msgstr ""
+
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+#, fuzzy
+msgid "Missing profile."
+msgstr "ユーザはプロフィールをもっていません。"
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+#: classes/Status_network.php:338
+msgid "Unable to save tag."
+msgstr "タグをを保存できません。"
+
+#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
+#: classes/Subscription.php:75 lib/oauthstore.php:466

 msgid "You have been banned from subscribing."
 msgstr "あなたはフォローが禁止されました。"
 
 msgid "You have been banned from subscribing."
 msgstr "あなたはフォローが禁止されました。"
 

-#: classes/Subscription.php:78
+#. TRANS: Exception thrown when trying to subscribe while already subscribed.
+#: classes/Subscription.php:80

 msgid "Already subscribed!"
 msgstr "すでにフォローしています!"
 
 msgid "Already subscribed!"
 msgstr "すでにフォローしています!"
 

-#: classes/Subscription.php:82
+#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
+#: classes/Subscription.php:85

 msgid "User has blocked you."
 msgstr "ユーザはあなたをブロックしました。"
 
 msgid "User has blocked you."
 msgstr "ユーザはあなたをブロックしました。"
 

-#: classes/Subscription.php:167
+#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
+#: classes/Subscription.php:171

 msgid "Not subscribed!"
 msgstr "フォローしていません！"
 
 msgid "Not subscribed!"
 msgstr "フォローしていません！"
 

-#: classes/Subscription.php:173
-msgid "Couldn't delete self-subscription."
-msgstr "自己フォローを削除できません。"
+#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
+#: classes/Subscription.php:178
+msgid "Could not delete self-subscription."
+msgstr "フォローを保存できません。"

 
 

-#: classes/Subscription.php:200
-#, fuzzy
-msgid "Couldn't delete subscription OMB token."
-msgstr "フォローを削除できません"
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+#: classes/Subscription.php:206
+msgid "Could not delete subscription OMB token."
+msgstr "フォローを保存できません。"
+
+#. TRANS: Exception thrown when a subscription could not be deleted on the server.
+#: classes/Subscription.php:218
+msgid "Could not delete subscription."
+msgstr "フォローを保存できません。"

 
 

-#: classes/Subscription.php:211
-msgid "Couldn't delete subscription."
-msgstr "フォローを削除できません"
+#. TRANS: Activity tile when subscribing to another person.
+#: classes/Subscription.php:255
+msgid "Follow"
+msgstr ""

 
 

-#: classes/User.php:363
+#. TRANS: Notice given on user registration.
+#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
+#: classes/User.php:384

 #, 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:480
+#. TRANS: Server exception thrown when creating a group failed.
+#: classes/User_group.php:495

 msgid "Could not create group."
 msgstr "グループを作成できません。"
 
 msgid "Could not create group."
 msgstr "グループを作成できません。"
 

-#: classes/User_group.php:489
-#, fuzzy
+#. TRANS: Server exception thrown when updating a group URI failed.
+#: classes/User_group.php:505

 msgid "Could not set group URI."
 msgid "Could not set group URI."

-msgstr "ã\82°ã\83«ã\83¼ã\83\97ã\83¡ã\83³ã\83\90ã\83¼ã\82·ã\83\83ã\83\97ã\82\92ã\82»ã\83\83ã\83\88できません。"
+msgstr "ã\82°ã\83«ã\83¼ã\83\97ã\82\92ä½\9cæ\88\90できません。"

 
 

-#: classes/User_group.php:510
+#. TRANS: Server exception thrown when setting group membership failed.
+#: classes/User_group.php:528

 msgid "Could not set group membership."
 msgstr "グループメンバーシップをセットできません。"
 
 msgid "Could not set group membership."
 msgstr "グループメンバーシップをセットできません。"
 

-#: classes/User_group.php:524
+#. TRANS: Server exception thrown when saving local group information failed.
+#: classes/User_group.php:543

 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Link title attribute in user account settings menu.
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104

 msgid "Change your profile settings"
 msgstr "プロファイル設定の変更"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change your profile settings"
 msgstr "プロファイル設定の変更"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:116
+#: lib/accountsettingsaction.php:111

 msgid "Upload an avatar"
 msgstr "アバターのアップロード"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Upload an avatar"
 msgstr "アバターのアップロード"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:118

 msgid "Change your password"
 msgstr "パスワードの変更"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change your password"
 msgstr "パスワードの変更"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:125

 msgid "Change email handling"
 msgstr "メールの扱いを変更"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change email handling"
 msgstr "メールの扱いを変更"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:137
+#: lib/accountsettingsaction.php:132

 msgid "Design your profile"
 msgstr "あなたのプロファイルをデザイン"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Design your profile"
 msgstr "あなたのプロファイルをデザイン"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:139

 msgid "Other options"
 msgstr "その他のオプション"
 
 #. TRANS: Link description in user account settings menu.
 msgid "Other options"
 msgstr "その他のオプション"
 
 #. TRANS: Link description in user account settings menu.

-#: lib/accountsettingsaction.php:146
+#: lib/accountsettingsaction.php:141

 msgid "Other"
 msgstr "その他"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 msgid "Other"
 msgstr "その他"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.

-#: lib/action.php:145
+#: lib/action.php:148

 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.

-#: lib/action.php:161
+#: lib/action.php:164

 msgid "Untitled page"
 msgstr "名称未設定ページ"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 msgid "Untitled page"
 msgstr "名称未設定ページ"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:426
+#: lib/action.php:448

 msgid "Primary site navigation"
 msgstr "プライマリサイトナビゲーション"
 
 #. TRANS: Tooltip for main menu option "Personal"
 msgid "Primary site navigation"
 msgstr "プライマリサイトナビゲーション"
 
 #. TRANS: Tooltip for main menu option "Personal"

-#: lib/action.php:432
+#: lib/action.php:454

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "パーソナルプロファイルと友人のタイムライン"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "パーソナルプロファイルと友人のタイムライン"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline

-#: lib/action.php:435
+#: lib/action.php:457

 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "パーソナル"
 
 #. TRANS: Tooltip for main menu option "Account"
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "パーソナル"
 
 #. TRANS: Tooltip for main menu option "Account"

-#: lib/action.php:437
-#, fuzzy
+#: lib/action.php:459

 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"

-msgstr "ã\83¡ã\83¼ã\83«ã\82¢ã\83\89ã\83¬ã\82¹ã\80\81ã\82¢ã\83\90ã\82¿ã\83¼ã\80\81ã\83\91ã\82¹ã\83¯ã\83¼ã\83\89ã\80\81ã\83\97ã\83­ã\83\91ã\83\86ã\82£の変更"
+msgstr "ã\83\91ã\82¹ã\83¯ã\83¼ã\83\89の変更"

 
 #. TRANS: Tooltip for main menu option "Services"
 
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:442
-#, fuzzy
+#: lib/action.php:464

 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgctxt "TOOLTIP"
 msgid "Connect to services"

-msgstr "サービスへ接続"
+msgstr "接続"

 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services

-#: lib/action.php:445
+#: lib/action.php:467

 msgid "Connect"
 msgstr "接続"
 
 #. TRANS: Tooltip for menu option "Admin"
 msgid "Connect"
 msgstr "接続"
 
 #. TRANS: Tooltip for menu option "Admin"

-#: lib/action.php:448
-#, fuzzy
+#: lib/action.php:470

 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgctxt "TOOLTIP"
 msgid "Change site configuration"

-msgstr "サイト設定の変更"
+msgstr "基本サイト設定"

 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration

-#: lib/action.php:451
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:473 lib/groupnav.php:117

 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理者"
 
 #. TRANS: Tooltip for main menu option "Invite"
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理者"
 
 #. TRANS: Tooltip for main menu option "Invite"

-#: lib/action.php:455
+#: lib/action.php:477

 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "友人や同僚が %s で加わるよう誘ってください。"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "友人や同僚が %s で加わるよう誘ってください。"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users

-#: lib/action.php:458
+#: lib/action.php:480

 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "招待"
 
 #. TRANS: Tooltip for main menu option "Logout"
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "招待"
 
 #. TRANS: Tooltip for main menu option "Logout"

-#: lib/action.php:464
-#, fuzzy
+#: lib/action.php:486

 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgctxt "TOOLTIP"
 msgid "Logout from the site"

-msgstr "ã\82µã\82¤ã\83\88ã\81\8bã\82\89ã\83­ã\82°ã\82¢ã\82¦ã\83\88"
+msgstr "ã\82µã\82¤ã\83\88ã\81®ã\83\86ã\83¼ã\83\9e"

 
 #. TRANS: Main menu option when logged in to log out the current user
 
 #. TRANS: Main menu option when logged in to log out the current user

-#: lib/action.php:467
-#, fuzzy
+#: lib/action.php:489

 msgctxt "MENU"
 msgid "Logout"
 msgctxt "MENU"
 msgid "Logout"

-msgstr "ã\83­ã\82°ã\82¢ã\82¦ã\83\88"
+msgstr "ã\83­ã\82´"

 
 #. TRANS: Tooltip for main menu option "Register"
 
 #. TRANS: Tooltip for main menu option "Register"

-#: lib/action.php:472
-#, fuzzy
+#: lib/action.php:494

 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgctxt "TOOLTIP"
 msgid "Create an account"

-msgstr "アカウントを作成"
+msgstr "新しいグループを作成"

 
 #. TRANS: Main menu option when not logged in to register a new account
 
 #. TRANS: Main menu option when not logged in to register a new account

-#: lib/action.php:475
+#: lib/action.php:497

 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "登録"
 
 #. TRANS: Tooltip for main menu option "Login"
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "登録"
 
 #. TRANS: Tooltip for main menu option "Login"

-#: lib/action.php:478
+#: lib/action.php:500

 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "サイトへログイン"
 
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "サイトへログイン"
 

-#: lib/action.php:481
+#: lib/action.php:503

 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANS: Tooltip for main menu option "Help"
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANS: Tooltip for main menu option "Help"

-#: lib/action.php:484
-#, fuzzy
+#: lib/action.php:506

 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgctxt "TOOLTIP"
 msgid "Help me!"

-msgstr "助けて！"
+msgstr "ヘルプ"

 
 

-#: lib/action.php:487
+#: lib/action.php:509

 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Tooltip for main menu option "Search"
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Tooltip for main menu option "Search"

-#: lib/action.php:490
-#, fuzzy
+#: lib/action.php:512

 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgctxt "TOOLTIP"
 msgid "Search for people or text"

-msgstr "人々かテキストを検索"
+msgstr "もっとグループを検索"

 
 

-#: lib/action.php:493
+#: lib/action.php:515

 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"


@@ -5124,71 +5436,75 @@ msgstr "検索"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration

-#: lib/action.php:515 lib/adminpanelaction.php:399
+#: lib/action.php:537 lib/adminpanelaction.php:387

 msgid "Site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 msgid "Site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.

-#: lib/action.php:582
+#: lib/action.php:604

 msgid "Local views"
 msgstr "ローカルビュー"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 msgid "Local views"
 msgstr "ローカルビュー"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.

-#: lib/action.php:649
+#: lib/action.php:674

 msgid "Page notice"
 msgstr "ページつぶやき"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 msgid "Page notice"
 msgstr "ページつぶやき"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.

-#: lib/action.php:752
+#: lib/action.php:775

 msgid "Secondary site navigation"
 msgstr "セカンダリサイトナビゲーション"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 msgid "Secondary site navigation"
 msgstr "セカンダリサイトナビゲーション"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.

-#: lib/action.php:758
+#: lib/action.php:781

 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.

-#: lib/action.php:761
+#: lib/action.php:784

 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.

-#: lib/action.php:764
+#: lib/action.php:787

 msgid "FAQ"
 msgstr "よくある質問"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
 msgid "FAQ"
 msgstr "よくある質問"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.

-#: lib/action.php:769
+#: lib/action.php:792

 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.

-#: lib/action.php:773
+#: lib/action.php:796

 msgid "Privacy"
 msgstr "プライバシー"
 
 #. TRANS: Secondary navigation menu option.
 msgid "Privacy"
 msgstr "プライバシー"
 
 #. TRANS: Secondary navigation menu option.

-#: lib/action.php:776
+#: lib/action.php:799

 msgid "Source"
 msgstr "ソース"
 
 #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
 msgid "Source"
 msgstr "ソース"
 
 #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.

-#: lib/action.php:782
+#: lib/action.php:805

 msgid "Contact"
 msgstr "連絡先"
 
 msgid "Contact"
 msgstr "連絡先"
 

-#: lib/action.php:784
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:808

 msgid "Badge"
 msgstr "バッジ"
 
 #. TRANS: DT element for StatusNet software license.
 msgid "Badge"
 msgstr "バッジ"
 
 #. TRANS: DT element for StatusNet software license.

-#: lib/action.php:813
+#: lib/action.php:837

 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.

-#: lib/action.php:817
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:844

 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."


@@ -5198,13 +5514,16 @@ msgstr ""
 "イクロブログサービスです。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 "イクロブログサービスです。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.

-#: lib/action.php:820
+#: lib/action.php:847

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** はマイクロブログサービスです。"
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** はマイクロブログサービスです。"
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.

-#: lib/action.php:824
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:854

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


@@ -5216,352 +5535,429 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)。"
 
 #. TRANS: DT element for StatusNet site content license.
 "org/licensing/licenses/agpl-3.0.html)。"
 
 #. TRANS: DT element for StatusNet site content license.

-#: lib/action.php:840
+#: lib/action.php:870

 msgid "Site content license"
 msgstr "サイト内容ライセンス"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 msgid "Site content license"
 msgstr "サイト内容ライセンス"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.

-#: lib/action.php:847
+#: lib/action.php:877

 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.

-#: lib/action.php:854
+#: lib/action.php:884

 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.

-#: lib/action.php:858
+#: lib/action.php:888

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 msgid "Content and data copyright by contributors. All rights reserved."
 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
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:902

 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).

-#: lib/action.php:1182
+#: lib/action.php:1238

 msgid "Pagination"
 msgstr "ページ化"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 msgid "Pagination"
 msgstr "ページ化"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.

-#: lib/action.php:1193
+#: lib/action.php:1249

 msgid "After"
 msgstr "<<後"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 msgid "After"
 msgstr "<<後"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.

-#: lib/action.php:1203
+#: lib/action.php:1259

 msgid "Before"
 msgstr "前>>"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 msgid "Before"
 msgstr "前>>"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.

-#: lib/activity.php:121
+#: lib/activity.php:120

 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 

-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:200

 msgid "Can't handle remote content yet."
 msgstr ""
 
 msgid "Can't handle remote content yet."
 msgstr ""
 

-#: lib/activityutils.php:236
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:237

 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 

-#: lib/activityutils.php:240
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:242

 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.
 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
+#: lib/adminpanelaction.php:96

 msgid "You cannot make changes to this site."
 msgstr "あなたはこのサイトへの変更を行うことができません。"
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 msgid "You cannot make changes to this site."
 msgstr "あなたはこのサイトへの変更を行うことができません。"
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.

-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108

 msgid "Changes to that panel are not allowed."
 msgstr "そのパネルへの変更は許可されていません。"
 
 #. TRANS: Client error message.
 msgid "Changes to that panel are not allowed."
 msgstr "そのパネルへの変更は許可されていません。"
 
 #. TRANS: Client error message.

-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222

 msgid "showForm() not implemented."
 msgstr "showForm() は実装されていません。"
 
 #. TRANS: Client error message
 msgid "showForm() not implemented."
 msgstr "showForm() は実装されていません。"
 
 #. TRANS: Client error message

-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250

 msgid "saveSettings() not implemented."
 msgstr "saveSettings() は実装されていません。"
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() は実装されていません。"
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.

-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274

 msgid "Unable to delete design setting."
 msgstr "デザイン設定を削除できません。"
 
 #. TRANS: Menu item title/tooltip
 msgid "Unable to delete design setting."
 msgstr "デザイン設定を削除できません。"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:349
+#: lib/adminpanelaction.php:337

 msgid "Basic site configuration"
 msgstr "基本サイト設定"
 
 #. TRANS: Menu item for site administration
 msgid "Basic site configuration"
 msgstr "基本サイト設定"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:351
+#: lib/adminpanelaction.php:339

 #, fuzzy
 msgctxt "MENU"
 msgid "Site"
 msgstr "サイト"
 
 #. TRANS: Menu item title/tooltip
 #, fuzzy
 msgctxt "MENU"
 msgid "Site"
 msgstr "サイト"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:357
+#: lib/adminpanelaction.php:345

 msgid "Design configuration"
 msgstr "デザイン設定"
 
 #. TRANS: Menu item for site administration
 msgid "Design configuration"
 msgstr "デザイン設定"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:359
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135

 #, fuzzy
 msgctxt "MENU"
 msgid "Design"
 msgstr "デザイン"
 
 #. TRANS: Menu item title/tooltip
 #, fuzzy
 msgctxt "MENU"
 msgid "Design"
 msgstr "デザイン"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:365
+#: lib/adminpanelaction.php:353

 msgid "User configuration"
 msgstr "ユーザ設定"
 
 #. TRANS: Menu item for site administration
 msgid "User configuration"
 msgstr "ユーザ設定"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115

 msgid "User"
 msgstr "ユーザ"
 
 #. TRANS: Menu item title/tooltip
 msgid "User"
 msgstr "ユーザ"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:373
+#: lib/adminpanelaction.php:361

 msgid "Access configuration"
 msgstr "アクセス設定"
 
 #. TRANS: Menu item title/tooltip
 msgid "Access configuration"
 msgstr "アクセス設定"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:381
+#: lib/adminpanelaction.php:369

 msgid "Paths configuration"
 msgstr "パス設定"
 
 #. TRANS: Menu item title/tooltip
 msgid "Paths configuration"
 msgstr "パス設定"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:389
+#: lib/adminpanelaction.php:377

 msgid "Sessions configuration"
 msgstr "セッション設定"
 
 #. TRANS: Menu item title/tooltip
 msgid "Sessions configuration"
 msgstr "セッション設定"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:397
+#: lib/adminpanelaction.php:385

 #, fuzzy
 msgid "Edit site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: Menu item title/tooltip
 #, fuzzy
 msgid "Edit site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:405
+#: lib/adminpanelaction.php:393

 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "パス設定"
 
 #, fuzzy
 msgid "Snapshots configuration"
 msgstr "パス設定"
 

+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+

 #. TRANS: Client error 401.
 #. TRANS: Client error 401.

-#: lib/apiauth.php:95
+#: lib/apiauth.php:111

 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って"
 "いません。"
 
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って"
 "いません。"
 

+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr ""
+
+#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails.
+#: lib/apiauth.php:258 lib/apiauth.php:290
+msgid "Could not authenticate you."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:183
+msgid "Failed to delete revoked token."
+msgstr ""
+

 #. TRANS: Form legend.
 #. TRANS: Form legend.

-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129

 msgid "Edit application"
 msgstr "アプリケーション編集"
 
 #. TRANS: Form guide.
 msgid "Edit application"
 msgstr "アプリケーション編集"
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178

 msgid "Icon for this application"
 msgstr "このアプリケーションのアイコン"
 
 #. TRANS: Form input field instructions.
 msgid "Icon for this application"
 msgstr "このアプリケーションのアイコン"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
-msgstr "あなたのアプリケーションを %d 字以内記述"
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201
+#, fuzzy, php-format
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] "あなたのアプリケーションを %d 字以内記述"

 
 #. TRANS: Form input field instructions.
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:205

 msgid "Describe your application"
 msgstr "あなたのアプリケーションを記述"
 
 #. TRANS: Form input field instructions.
 msgid "Describe your application"
 msgstr "あなたのアプリケーションを記述"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:216

 msgid "URL of the homepage of this application"
 msgstr "このアプリケーションのホームページの URL"
 
 #. TRANS: Form input field label.
 msgid "URL of the homepage of this application"
 msgstr "このアプリケーションのホームページの URL"
 
 #. TRANS: Form input field label.

-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:218

 msgid "Source URL"
 msgstr "ソース URL"
 
 #. TRANS: Form input field instructions.
 msgid "Source URL"
 msgstr "ソース URL"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:225

 msgid "Organization responsible for this application"
 msgstr "このアプリケーションに責任がある組織"
 
 #. TRANS: Form input field instructions.
 msgid "Organization responsible for this application"
 msgstr "このアプリケーションに責任がある組織"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:234

 msgid "URL for the homepage of the organization"
 msgstr "組織のホームページのURL"
 
 #. TRANS: Form input field instructions.
 msgid "URL for the homepage of the organization"
 msgstr "組織のホームページのURL"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:243

 msgid "URL to redirect to after authentication"
 msgstr "認証の後にリダイレクトするURL"
 
 #. TRANS: Radio button label for application type
 msgid "URL to redirect to after authentication"
 msgstr "認証の後にリダイレクトするURL"
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:271

 msgid "Browser"
 msgstr "ブラウザ"
 
 #. TRANS: Radio button label for application type
 msgid "Browser"
 msgstr "ブラウザ"
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:288

 msgid "Desktop"
 msgstr "デスクトップ"
 
 #. TRANS: Form guide.
 msgid "Desktop"
 msgstr "デスクトップ"
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:290

 msgid "Type of application, browser or desktop"
 msgstr "アプリケーション、ブラウザ、またはデスクトップのタイプ"
 
 #. TRANS: Radio button label for access type.
 msgid "Type of application, browser or desktop"
 msgstr "アプリケーション、ブラウザ、またはデスクトップのタイプ"
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:314

 msgid "Read-only"
 msgstr "リードオンリー"
 
 #. TRANS: Radio button label for access type.
 msgid "Read-only"
 msgstr "リードオンリー"
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:334

 msgid "Read-write"
 msgstr "リードライト"
 
 #. TRANS: Form guide.
 msgid "Read-write"
 msgstr "リードライト"
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:336

 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード"
 "ライト"
 
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード"
 "ライト"
 

-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:353

 msgid "Cancel"
 msgstr "中止"
 
 #. TRANS: Application access type
 msgid "Cancel"
 msgstr "中止"
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:134

 #, fuzzy
 msgid "read-write"
 msgstr "リードライト"
 
 #. TRANS: Application access type
 #, fuzzy
 msgid "read-write"
 msgstr "リードライト"
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:136

 #, fuzzy
 msgid "read-only"
 msgstr "リードオンリー"
 
 #, 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
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#: lib/applicationlist.php:142

 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Button label

-#: lib/applicationlist.php:159
-#, fuzzy
+#: lib/applicationlist.php:157

 msgctxt "BUTTON"
 msgid "Revoke"
 msgctxt "BUTTON"
 msgid "Revoke"

-msgstr "取消し"
+msgstr "回復"
+
+#: lib/atom10feed.php:112
+msgid "author element must contain a name element."
+msgstr ""

 
 #. TRANS: DT element label in attachment list.
 
 #. TRANS: DT element label in attachment list.

-#: lib/attachmentlist.php:88
+#: lib/attachmentlist.php:85

 msgid "Attachments"
 msgstr "添付"
 
 #. TRANS: DT element label in attachment list item.
 msgid "Attachments"
 msgstr "添付"
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:256

 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.
 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:279
+#: lib/attachmentlist.php:270

 msgid "Provider"
 msgstr "プロバイダ"
 
 msgid "Provider"
 msgstr "プロバイダ"
 

+#. TRANS: Title.

 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "この添付が現れるつぶやき"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "この添付が現れるつぶやき"
 

+#. TRANS: Title.

 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "この添付のタグ"
 
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "この添付のタグ"
 

-#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
-msgid "Password changing failed"
+#. TRANS: Exception thrown when a password change fails.
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
+#, fuzzy
+msgid "Password changing failed."

 msgstr "パスワード変更に失敗しました"
 
 msgstr "パスワード変更に失敗しました"
 

-#: lib/authenticationplugin.php:235
-msgid "Password changing is not allowed"
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+#: lib/authenticationplugin.php:238
+#, fuzzy
+msgid "Password changing is not allowed."

 msgstr "パスワード変更は許可されていません"
 
 msgstr "パスワード変更は許可されていません"
 

-#: lib/channel.php:157 lib/channel.php:177
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:68
+msgid "Block"
+msgstr "ブロック"
+
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181

 msgid "Command results"
 msgstr "コマンド結果"
 
 msgid "Command results"
 msgstr "コマンド結果"
 

-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+#, fuzzy
+msgid "AJAX error"
+msgstr "Ajax エラー"
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:142

 msgid "Command complete"
 msgstr "コマンド完了"
 
 msgid "Command complete"
 msgstr "コマンド完了"
 

-#: lib/channel.php:240
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244

 msgid "Command failed"
 msgstr "コマンド失敗"
 
 msgid "Command failed"
 msgstr "コマンド失敗"
 

-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:82 lib/command.php:106
+#, fuzzy
+msgid "Notice with that id does not exist."

 msgstr "その ID によるつぶやきは存在していません"
 
 msgstr "その ID によるつぶやきは存在していません"
 

-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "ユーザはまだつぶやいていません"
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:99 lib/command.php:626
+#, fuzzy
+msgid "User has no last notice."
+msgstr "利用者はまだつぶやいていません"

 
 #. 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.
 
 #. 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"
+#: lib/command.php:128
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s."

 msgstr "ユーザを更新できません"
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
 msgstr "ユーザを更新できません"
 
 #. 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:148
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr ""

 
 

-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:183

 msgid "Sorry, this command is not yet implemented."
 msgstr "すみません、このコマンドはまだ実装されていません。"
 
 msgid "Sorry, this command is not yet implemented."
 msgstr "すみません、このコマンドはまだ実装されていません。"
 

-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:229

 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "それは自分自身への合図で多くは意味がありません!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "それは自分自身への合図で多くは意味がありません!"
 
 #. 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"
+#: lib/command.php:238
+#, fuzzy, php-format
+msgid "Nudge sent to %s."

 msgstr "%s へ合図を送りました"
 
 msgstr "%s へ合図を送りました"
 

-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:268

 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"


@@ -5572,55 +5968,54 @@ msgstr ""
 "フォローされている: %2$s\n"
 "つぶやき: %3$s"
 
 "フォローされている: %2$s\n"
 "つぶやき: %3$s"
 

-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:312

 msgid "Notice marked as fave."
 msgstr "お気に入りにされているつぶやき。"
 
 msgid "Notice marked as fave."
 msgstr "お気に入りにされているつぶやき。"
 

-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "あなたは既にそのグループに参加しています。"
-
-#. TRANS: Message given having failed to add a user to a group.
+#. 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:339
+#: lib/command.php:357

 #, php-format
 #, php-format

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

 
 

-#. TRANS: Message given having failed to remove a user from a group.
+#. 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.
 #. 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:405
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr ""

 
 #. TRANS: Whois output. %s is the full name of the queried user.
 
 #. TRANS: Whois output. %s is the full name of the queried user.

-#: lib/command.php:418
+#: lib/command.php:430

 #, php-format
 msgid "Fullname: %s"
 msgstr "フルネーム： %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #, php-format
 msgid "Fullname: %s"
 msgstr "フルネーム： %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/command.php:422 lib/mail.php:263
+#: lib/command.php:434 lib/mail.php:268

 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/command.php:426 lib/mail.php:266
+#: lib/command.php:438 lib/mail.php:271

 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.

-#: lib/command.php:430
+#: lib/command.php:442

 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 

-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471

 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "


@@ -5629,140 +6024,169 @@ 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.
 
 #. 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。"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:488 lib/xmppmanager.php:403

 #, php-format
 #, php-format

-msgid "Direct message to %s sent"
-msgstr "ã\83\80ã\82¤ã\83¬ã\82¯ã\83\88ã\83¡ã\83\83ã\82»ã\83¼ã\82¸ã\82\92 %s  ã\81«é\80\81ã\82\8aã\81¾ã\81\97ã\81\9f"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "ã\83¡ã\83\83ã\82»ã\83¼ã\82¸ã\81\8cé\95·ã\81\99ã\81\8eã\81¾ã\81\99 - æ\9c\80大 %1$d å­\97ã\80\81ã\81\82ã\81ªã\81\9fã\81\8cé\80\81ã\81£ã\81\9fã\81®ã\81¯ %2$dã\80\82"

 
 

-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:514

 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ送信エラー。"
 
 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ送信エラー。"
 

-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "自分のつぶやきを繰り返すことはできません"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "すでにこのつぶやきは繰り返されています"
-

 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 #. 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"
+#: lib/command.php:551
+#, fuzzy, php-format
+msgid "Notice from %s repeated."

 msgstr "%s からつぶやきが繰り返されています"
 
 msgstr "%s からつぶやきが繰り返されています"
 

-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:554

 msgid "Error repeating notice."
 msgstr "つぶやき繰り返しエラー"
 
 msgid "Error repeating notice."
 msgstr "つぶやき繰り返しエラー"
 

-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:589
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."

 msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"
 
 msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"
 

-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:600
+#, fuzzy, php-format
+msgid "Reply to %s sent."

 msgstr "%s へ返信を送りました"
 
 msgstr "%s へ返信を送りました"
 

-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:603

 msgid "Error saving notice."
 msgstr "つぶやき保存エラー。"
 
 msgid "Error saving notice."
 msgstr "つぶやき保存エラー。"
 

-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "フォローするユーザの名前を指定してください"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:650
+#, fuzzy
+msgid "Specify the name of the user to subscribe to."
+msgstr "フォローする利用者の名前を指定してください"

 
 

-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:659

 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 

-#: lib/command.php:634
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:667

 #, php-format
 #, php-format

-msgid "Subscribed to %s"
-msgstr "%s をフォローしました"
+msgid "Subscribed to %s."
+msgstr ""

 
 

-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:688 lib/command.php:799
+#, fuzzy
+msgid "Specify the name of the user to unsubscribe from."

 msgstr "フォローをやめるユーザの名前を指定してください"
 
 msgstr "フォローをやめるユーザの名前を指定してください"
 

-#: lib/command.php:664
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:699

 #, php-format
 #, php-format

-msgid "Unsubscribed from %s"
-msgstr "%s のフォローをやめる"
+msgid "Unsubscribed from %s."
+msgstr ""

 
 

-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:719 lib/command.php:745

 msgid "Command not yet implemented."
 msgstr "コマンドはまだ実装されていません。"
 
 msgid "Command not yet implemented."
 msgstr "コマンドはまだ実装されていません。"
 

-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:723

 msgid "Notification off."
 msgstr "通知オフ。"
 
 msgid "Notification off."
 msgstr "通知オフ。"
 

-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:726

 msgid "Can't turn off notification."
 msgstr "通知をオフできません。"
 
 msgid "Can't turn off notification."
 msgstr "通知をオフできません。"
 

-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:749

 msgid "Notification on."
 msgstr "通知オン。"
 
 msgid "Notification on."
 msgstr "通知オン。"
 

-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:752

 msgid "Can't turn on notification."
 msgstr "通知をオンできません。"
 
 msgid "Can't turn on notification."
 msgstr "通知をオンできません。"
 

-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:766
+#, fuzzy
+msgid "Login command is disabled."

 msgstr "ログインコマンドが無効になっています。"
 
 msgstr "ログインコマンドが無効になっています。"
 

-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:779

 #, php-format
 #, php-format

-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "このリンクは、かつてだけ使用可能であり、2分間だけ良いです: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""

 
 

-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "%s のフォローをやめる"
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:808
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""

 
 

-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:826

 msgid "You are not subscribed to anyone."
 msgstr "あなたはだれにもフォローされていません。"
 
 msgid "You are not subscribed to anyone."
 msgstr "あなたはだれにもフォローされていません。"
 

-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:831

 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:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:853

 msgid "No one is subscribed to you."
 msgstr "誰もフォローしていません。"
 
 msgid "No one is subscribed to you."
 msgstr "誰もフォローしていません。"
 

-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:858

 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:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:880

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

-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:885

 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:838
+#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
+#: lib/command.php:900

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -5804,41 +6228,63 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
 "tracking - not yet implemented.\n"
 msgstr ""
 

-#: lib/common.php:135
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:136

 msgid "No configuration file found. "
 msgstr "コンフィギュレーションファイルがありません。 "
 
 msgid "No configuration file found. "
 msgstr "コンフィギュレーションファイルがありません。 "
 

-#: lib/common.php:136
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+#: lib/common.php:139

 msgid "I looked for configuration files in the following places: "
 msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
 
 msgid "I looked for configuration files in the following places: "
 msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
 

-#: lib/common.php:138
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:142

 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
 "ん。"
 
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
 "ん。"
 

-#: lib/common.php:139
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+#: lib/common.php:146

 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 

-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+#, fuzzy
+msgctxt "MENU"

 msgid "IM"
 msgstr "IM"
 
 msgid "IM"
 msgstr "IM"
 

-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108

 msgid "Updates by instant messenger (IM)"
 msgstr "インスタントメッセンジャー(IM)での更新"
 
 msgid "Updates by instant messenger (IM)"
 msgstr "インスタントメッセンジャー(IM)での更新"
 

-#: lib/connectsettingsaction.php:116
+#. TRANS: Menu item for Short Message Service settings.
+#: lib/connectsettingsaction.php:113
+#, fuzzy
+msgctxt "MENU"
+msgid "SMS"
+msgstr "SMS"
+
+#. TRANS: Tooltip for Short Message Service menu item.
+#: lib/connectsettingsaction.php:115

 msgid "Updates by SMS"
 msgstr "SMSでの更新"
 
 msgid "Updates by SMS"
 msgstr "SMSでの更新"
 

+#. TRANS: Menu item for OAth connection settings.

 #: lib/connectsettingsaction.php:120
 #: lib/connectsettingsaction.php:120

+#, fuzzy
+msgctxt "MENU"

 msgid "Connections"
 msgstr "接続"
 
 msgid "Connections"
 msgstr "接続"
 

-#: lib/connectsettingsaction.php:121
+#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#: lib/connectsettingsaction.php:122

 msgid "Authorized connected applications"
 msgstr "承認された接続アプリケーション"
 
 msgid "Authorized connected applications"
 msgstr "承認された接続アプリケーション"
 


@@ -5861,18 +6307,14 @@ msgstr ""
 msgid "Design defaults restored."
 msgstr "デフォルトのデザインを回復。"
 
 msgid "Design defaults restored."
 msgstr "デフォルトのデザインを回復。"
 

-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:144

 msgid "Disfavor this notice"
 msgstr "このつぶやきのお気に入りをやめる"
 
 msgid "Disfavor this notice"
 msgstr "このつぶやきのお気に入りをやめる"
 

-#: lib/favorform.php:114 lib/favorform.php:140
+#: lib/favorform.php:114 lib/favorform.php:143

 msgid "Favor this notice"
 msgstr "このつぶやきをお気に入りにする"
 
 msgid "Favor this notice"
 msgstr "このつぶやきをお気に入りにする"
 

-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "お気に入り"
-

 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"


@@ -5889,9 +6331,9 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
 msgid "FOAF"
 msgstr "FOAF"
 

-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "データのエクスポート"
+#: lib/feedlist.php:66
+msgid "Feeds"
+msgstr ""

 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"


@@ -5945,37 +6387,77 @@ msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "グループのエクストラニックネーム、カンマまたはスペース区切り、最大 %d"
 
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "グループのエクストラニックネーム、カンマまたはスペース区切り、最大 %d"
 

-#: lib/groupnav.php:85
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+msgctxt "MENU"

 msgid "Group"
 msgid "Group"

-msgstr "グループ"
+msgstr ""

 
 

-#: lib/groupnav.php:101
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:89
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:95
+msgctxt "MENU"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:98
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group members"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:108
+msgctxt "MENU"

 msgid "Blocked"
 msgid "Blocked"

-msgstr "ブロック"
+msgstr ""

 
 

-#: lib/groupnav.php:102
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:111

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "%s blocked users"
 msgid "%s blocked users"

-msgstr "%s ブロックユーザ"
+msgstr ""

 
 

-#: lib/groupnav.php:108
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Edit %s group properties"
 msgid "Edit %s group properties"

-msgstr "%s グループプロパティを編集"
+msgstr ""

 
 

-#: lib/groupnav.php:113
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:126
+msgctxt "MENU"

 msgid "Logo"
 msgid "Logo"

-msgstr "ロゴ"
+msgstr ""

 
 

-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Add or edit %s logo"
 msgid "Add or edit %s logo"

-msgstr "%s ロゴの追加や編集"
+msgstr ""

 
 

-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Add or edit %s design"
 msgid "Add or edit %s design"

-msgstr "%s デザインの追加や編集"
+msgstr ""

 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"


@@ -6008,7 +6490,8 @@ msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 
 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 
 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 

-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179

 msgid "System error uploading file."
 msgstr "ファイルのアップロードでシステムエラー"
 
 msgid "System error uploading file."
 msgstr "ファイルのアップロードでシステムエラー"
 


@@ -6042,10 +6525,6 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr "不明な受信箱のソース %d。"
 
 msgid "Unknown inbox source %d."
 msgstr "不明な受信箱のソース %d。"
 

-#: lib/joinform.php:114
-msgid "Join"
-msgstr "参加"
-

 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "離れる"
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "離れる"


@@ -6099,8 +6578,15 @@ msgstr ""
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
 

+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+

 #. TRANS: Main body of new-subscriber notification e-mail
 #. TRANS: Main body of new-subscriber notification e-mail

-#: lib/mail.php:249
+#: lib/mail.php:254

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


@@ -6126,19 +6612,19 @@ msgstr ""
 "%8$s でメールアドレスか通知オプションを変えてください。\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 "%8$s でメールアドレスか通知オプションを変えてください。\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/mail.php:269
+#: lib/mail.php:274

 #, php-format
 msgid "Bio: %s"
 msgstr "自己紹介: %s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #, php-format
 msgid "Bio: %s"
 msgstr "自己紹介: %s"
 
 #. TRANS: Subject of notification mail for new posting email address

-#: lib/mail.php:298
+#: lib/mail.php:304

 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s へ投稿のための新しいメールアドレス"
 
 #. TRANS: Body of notification mail for new posting email address
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s へ投稿のための新しいメールアドレス"
 
 #. TRANS: Body of notification mail for new posting email address

-#: lib/mail.php:302
+#: lib/mail.php:308

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


@@ -6160,30 +6646,30 @@ msgstr ""
 "%4$s"
 
 #. TRANS: Subject line for SMS-by-email notification messages
 "%4$s"
 
 #. TRANS: Subject line for SMS-by-email notification messages

-#: lib/mail.php:427
+#: lib/mail.php:433

 #, php-format
 msgid "%s status"
 msgstr "%s の状態"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message
 #, php-format
 msgid "%s status"
 msgstr "%s の状態"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message

-#: lib/mail.php:454
+#: lib/mail.php:460

 msgid "SMS confirmation"
 msgstr "SMS確認"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 msgid "SMS confirmation"
 msgstr "SMS確認"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message

-#: lib/mail.php:457
+#: lib/mail.php:463

 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "この電話番号は確認待ちです。"
 
 #. TRANS: Subject for 'nudge' notification email
 #, 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
+#: lib/mail.php:484

 #, php-format
 msgid "You've been nudged by %s"
 msgstr "あなたは %s に合図されています"
 
 #. TRANS: Body for 'nudge' notification email
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "あなたは %s に合図されています"
 
 #. TRANS: Body for 'nudge' notification email

-#: lib/mail.php:483
+#: lib/mail.php:489

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


@@ -6211,13 +6697,13 @@ msgstr ""
 "%4$s\n"
 
 #. TRANS: Subject for direct-message notification email
 "%4$s\n"
 
 #. TRANS: Subject for direct-message notification email

-#: lib/mail.php:530
+#: lib/mail.php:536

 #, php-format
 msgid "New private message from %s"
 msgstr "%s からの新しいプライベートメッセージ"
 
 #. TRANS: Body for direct-message notification email
 #, php-format
 msgid "New private message from %s"
 msgstr "%s からの新しいプライベートメッセージ"
 
 #. TRANS: Body for direct-message notification email

-#: lib/mail.php:535
+#: lib/mail.php:541

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


@@ -6251,13 +6737,13 @@ msgstr ""
 "%5$s\n"
 
 #. TRANS: Subject for favorite notification email
 "%5$s\n"
 
 #. TRANS: Subject for favorite notification email

-#: lib/mail.php:583
+#: lib/mail.php:589

 #, php-format
 msgid "%s (@%s) added your notice as a favorite"
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 
 #. TRANS: Body for favorite notification email
 #, php-format
 msgid "%s (@%s) added your notice as a favorite"
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
 
 #. TRANS: Body for favorite notification email

-#: lib/mail.php:586
+#: lib/mail.php:592

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


@@ -6296,7 +6782,7 @@ msgstr ""
 "%6%s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 "%6%s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.

-#: lib/mail.php:645
+#: lib/mail.php:651

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -6304,13 +6790,13 @@ msgid ""
 "\t%s"
 msgstr ""
 
 "\t%s"
 msgstr ""
 

-#: lib/mail.php:651
+#: lib/mail.php:657

 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
 msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
 
 #. TRANS: Body of @-reply notification e-mail.
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
 msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
 
 #. TRANS: Body of @-reply notification e-mail.

-#: lib/mail.php:654
+#: lib/mail.php:660

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


@@ -6350,7 +6836,7 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 

-#: lib/mailbox.php:227 lib/noticelist.php:494
+#: lib/mailbox.php:228 lib/noticelist.php:516

 msgid "from"
 msgstr "from"
 
 msgid "from"
 msgstr "from"
 


@@ -6375,19 +6861,22 @@ msgstr "すみません、入ってくるメールは許可されていません
 msgid "Unsupported message type: %s"
 msgstr "サポート外のメッセージタイプ: %s"
 
 msgid "Unsupported message type: %s"
 msgstr "サポート外のメッセージタイプ: %s"
 

-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125

 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "データベースエラーがあなたのファイルを保存しているときにありました。 再試行し"
 "てください。"
 
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "データベースエラーがあなたのファイルを保存しているときにありました。 再試行し"
 "てください。"
 

-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145

 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "アップロードされたファイルは php.ini の upload_max_filesize ディレクティブを"
 "超えています。"
 
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 "アップロードされたファイルは php.ini の upload_max_filesize ディレクティブを"
 "超えています。"
 

-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151

 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."


@@ -6395,43 +6884,59 @@ msgstr ""
 "アップロードされたファイルはHTMLフォームで指定された MAX_FILE_SIZE ディレク"
 "ティブを超えています。"
 
 "アップロードされたファイルはHTMLフォームで指定された MAX_FILE_SIZE ディレク"
 "ティブを超えています。"
 

-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157

 msgid "The uploaded file was only partially uploaded."
 msgstr "アップロードされたファイルは部分的にアップロードされていただけです。"
 
 msgid "The uploaded file was only partially uploaded."
 msgstr "アップロードされたファイルは部分的にアップロードされていただけです。"
 

-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165

 msgid "Missing a temporary folder."
 msgstr "一時フォルダを失いました。"
 
 msgid "Missing a temporary folder."
 msgstr "一時フォルダを失いました。"
 

-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169

 msgid "Failed to write file to disk."
 msgstr "ディスクへのファイル書き込みに失敗しました。"
 
 msgid "Failed to write file to disk."
 msgstr "ディスクへのファイル書き込みに失敗しました。"
 

-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173

 msgid "File upload stopped by extension."
 msgstr "エクステンションによってファイルアップロードを中止しました。"
 
 msgid "File upload stopped by extension."
 msgstr "エクステンションによってファイルアップロードを中止しました。"
 

-#: lib/mediafile.php:179 lib/mediafile.php:216
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232

 msgid "File exceeds user's quota."
 msgstr "ファイルはユーザの割当てを超えています。"
 
 msgid "File exceeds user's quota."
 msgstr "ファイルはユーザの割当てを超えています。"
 

-#: lib/mediafile.php:196 lib/mediafile.php:233
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251

 msgid "File could not be moved to destination directory."
 msgstr "ファイルを目的ディレクトリに動かすことができませんでした。"
 
 msgid "File could not be moved to destination directory."
 msgstr "ファイルを目的ディレクトリに動かすことができませんでした。"
 

-#: lib/mediafile.php:201 lib/mediafile.php:237
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257

 msgid "Could not determine file's MIME type."
 msgstr "ファイルのMIMEタイプを決定できません。"
 
 msgid "Could not determine file's MIME type."
 msgstr "ファイルのMIMEタイプを決定できません。"
 

-#: lib/mediafile.php:270
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340

 #, php-format
 #, php-format

-msgid " Try using another %s format."
-msgstr "別の %s フォーマットを試してください。"
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
+msgstr ""

 
 

-#: lib/mediafile.php:275
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345

 #, php-format
 #, php-format

-msgid "%s is not a supported file type on this server."
-msgstr "%s はこのサーバのサポートしているファイルタイプではありません。"
+msgid "\"%s\" is not a supported file type on this server."
+msgstr ""

 
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 
 #: lib/messageform.php:120
 msgid "Send a direct notice"


@@ -6441,11 +6946,11 @@ msgstr "直接つぶやきを送る"
 msgid "To"
 msgstr "To"
 
 msgid "To"
 msgstr "To"
 

-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186

 msgid "Available characters"
 msgstr "利用可能な文字"
 
 msgid "Available characters"
 msgstr "利用可能な文字"
 

-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237

 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"


@@ -6455,28 +6960,28 @@ msgstr "投稿"
 msgid "Send a notice"
 msgstr "つぶやきを送る"
 
 msgid "Send a notice"
 msgstr "つぶやきを送る"
 

-#: lib/noticeform.php:173
+#: lib/noticeform.php:174

 #, php-format
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 
 #, php-format
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 

-#: lib/noticeform.php:192
+#: lib/noticeform.php:193

 msgid "Attach"
 msgstr "添付"
 
 msgid "Attach"
 msgstr "添付"
 

-#: lib/noticeform.php:196
+#: lib/noticeform.php:197

 msgid "Attach a file"
 msgstr "ファイル添付"
 
 msgid "Attach a file"
 msgstr "ファイル添付"
 

-#: lib/noticeform.php:212
+#: lib/noticeform.php:213

 msgid "Share my location"
 msgstr "あなたの場所を共有する"
 
 msgid "Share my location"
 msgstr "あなたの場所を共有する"
 

-#: lib/noticeform.php:215
+#: lib/noticeform.php:216

 msgid "Do not share my location"
 msgstr "あなたの場所を共有しない"
 
 msgid "Do not share my location"
 msgstr "あなたの場所を共有しない"
 

-#: lib/noticeform.php:216
+#: lib/noticeform.php:217

 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"


@@ -6485,55 +6990,59 @@ msgstr ""
 "度試みてください"
 
 #. TRANS: Used in coordinates as abbreviation of north
 "度試みてください"
 
 #. TRANS: Used in coordinates as abbreviation of north

-#: lib/noticelist.php:430
+#: lib/noticelist.php:446

 #, fuzzy
 msgid "N"
 msgstr "北"
 
 #. TRANS: Used in coordinates as abbreviation of south
 #, fuzzy
 msgid "N"
 msgstr "北"
 
 #. TRANS: Used in coordinates as abbreviation of south

-#: lib/noticelist.php:432
+#: lib/noticelist.php:448

 #, fuzzy
 msgid "S"
 msgstr "南"
 
 #. TRANS: Used in coordinates as abbreviation of east
 #, fuzzy
 msgid "S"
 msgstr "南"
 
 #. TRANS: Used in coordinates as abbreviation of east

-#: lib/noticelist.php:434
+#: lib/noticelist.php:450

 #, fuzzy
 msgid "E"
 msgstr "東"
 
 #. TRANS: Used in coordinates as abbreviation of west
 #, fuzzy
 msgid "E"
 msgstr "東"
 
 #. TRANS: Used in coordinates as abbreviation of west

-#: lib/noticelist.php:436
+#: lib/noticelist.php:452

 #, fuzzy
 msgid "W"
 msgstr "西"
 
 #, fuzzy
 msgid "W"
 msgstr "西"
 

-#: lib/noticelist.php:438
+#: lib/noticelist.php:454

 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 

-#: lib/noticelist.php:447
+#: lib/noticelist.php:463

 msgid "at"
 msgstr "at"
 
 msgid "at"
 msgstr "at"
 

-#: lib/noticelist.php:567
+#: lib/noticelist.php:512
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:578

 msgid "in context"
 msgstr ""
 
 msgid "in context"
 msgstr ""
 

-#: lib/noticelist.php:602
+#: lib/noticelist.php:613

 msgid "Repeated by"
 msgstr ""
 
 msgid "Repeated by"
 msgstr ""
 

-#: lib/noticelist.php:629
+#: lib/noticelist.php:640

 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 
 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 

-#: lib/noticelist.php:630
+#: lib/noticelist.php:641

 msgid "Reply"
 msgstr "返信"
 
 msgid "Reply"
 msgstr "返信"
 

-#: lib/noticelist.php:674
+#: lib/noticelist.php:685

 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 


@@ -6550,26 +7059,23 @@ msgid "Send a nudge to this user"
 msgstr "このユーザへ合図を送る"
 
 #: lib/oauthstore.php:283
 msgstr "このユーザへ合図を送る"
 
 #: lib/oauthstore.php:283

-msgid "Error inserting new profile"
-msgstr "プロファイル追加エラー"
+msgid "Error inserting new profile."
+msgstr ""

 
 #: lib/oauthstore.php:291
 
 #: lib/oauthstore.php:291

-msgid "Error inserting avatar"
-msgstr "アバター追加エラー"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "リモートプロファイル更新エラー"
+msgid "Error inserting avatar."
+msgstr ""

 
 #: lib/oauthstore.php:311
 
 #: lib/oauthstore.php:311

-msgid "Error inserting remote profile"
-msgstr "リモートプロファイル追加エラー"
+msgid "Error inserting remote profile."
+msgstr ""

 
 

-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "重複したつぶやき"
+#. TRANS: Exception thrown when a notice is denied because it has been sent before.
+#: lib/oauthstore.php:346
+msgid "Duplicate notice."
+msgstr ""

 
 

-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491

 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 


@@ -6606,7 +7112,8 @@ msgstr "あなたが送ったメッセージ"
 msgid "Tags in %s's notices"
 msgstr "%s のつぶやきのタグ"
 
 msgid "Tags in %s's notices"
 msgstr "%s のつぶやきのタグ"
 

-#: lib/plugin.php:114
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:121

 msgid "Unknown"
 msgstr "不明"
 
 msgid "Unknown"
 msgstr "不明"
 


@@ -6643,7 +7150,7 @@ msgstr ""
 msgid "All groups"
 msgstr "全てのグループ"
 
 msgid "All groups"
 msgstr "全てのグループ"
 

-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123

 msgid "Unimplemented method."
 msgstr "未実装のメソッド。"
 
 msgid "Unimplemented method."
 msgstr "未実装のメソッド。"
 


@@ -6667,7 +7174,7 @@ msgstr "フィーチャーされた"
 msgid "Popular"
 msgstr "人気"
 
 msgid "Popular"
 msgstr "人気"
 

-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95

 msgid "No return-to arguments."
 msgstr "return-to 引数がありません。"
 
 msgid "No return-to arguments."
 msgstr "return-to 引数がありません。"
 


@@ -6688,7 +7195,7 @@ msgstr "このつぶやきを繰り返す"
 msgid "Revoke the \"%s\" role from this user"
 msgstr "このグループからこのユーザをブロック"
 
 msgid "Revoke the \"%s\" role from this user"
 msgstr "このグループからこのユーザをブロック"
 

-#: lib/router.php:704
+#: lib/router.php:711

 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 
 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 


@@ -6700,19 +7207,24 @@ msgstr "サンドボックス"
 msgid "Sandbox this user"
 msgstr "このユーザをサンドボックス"
 
 msgid "Sandbox this user"
 msgstr "このユーザをサンドボックス"
 

-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121

 msgid "Search site"
 msgstr "サイト検索"
 
 msgid "Search site"
 msgstr "サイト検索"
 

-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129

 msgid "Keyword(s)"
 msgstr "キーワード"
 
 msgid "Keyword(s)"
 msgstr "キーワード"
 

-#: lib/searchaction.php:127
+#: lib/searchaction.php:130
+msgctxt "BUTTON"

 msgid "Search"
 msgid "Search"

-msgstr "検索"
+msgstr ""

 
 

-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170

 msgid "Search help"
 msgstr "ヘルプ検索"
 
 msgid "Search help"
 msgstr "ヘルプ検索"
 


@@ -6786,6 +7298,53 @@ msgstr "タグ付けとしての人々タグクラウド"
 msgid "None"
 msgstr "なし"
 
 msgid "None"
 msgstr "なし"
 

+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "The theme file is missing or the upload failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "アバターの更新に失敗しました。"
+
+#: lib/themeuploader.php:147
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:218
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#: lib/themeuploader.php:241
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:259
+msgid "Error opening theme archive."
+msgstr "ブロックの削除エラー"
+

 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "上位投稿者"
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "上位投稿者"


@@ -6814,11 +7373,6 @@ msgstr "この利用者からのフォローを解除する"
 msgid "Unsubscribe"
 msgstr "フォロー解除"
 
 msgid "Unsubscribe"
 msgstr "フォロー解除"
 

-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "ユーザはプロフィールをもっていません。"
-

 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "アバターを編集する"
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "アバターを編集する"


@@ -6870,56 +7424,60 @@ msgid "Moderator"
 msgstr "管理"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr "管理"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1054
+#: lib/util.php:1126

 msgid "a few seconds ago"
 msgstr "数秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
 msgstr "数秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1057
+#: lib/util.php:1129

 msgid "about a minute ago"
 msgstr "約 1 分前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a minute ago"
 msgstr "約 1 分前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1061
+#: lib/util.php:1133

 #, php-format
 #, php-format

-msgid "about %d minutes ago"
-msgstr "約 %d 分前"
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1064
+#: lib/util.php:1136

 msgid "about an hour ago"
 msgstr "約 1 時間前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
 msgstr "約 1 時間前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1068
+#: lib/util.php:1140

 #, php-format
 #, php-format

-msgid "about %d hours ago"
-msgstr "約 %d 時間前"
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1071
+#: lib/util.php:1143

 msgid "about a day ago"
 msgstr "約 1 日前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
 msgstr "約 1 日前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1075
+#: lib/util.php:1147

 #, php-format
 #, php-format

-msgid "about %d days ago"
-msgstr "約 %d 日前"
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1078
+#: lib/util.php:1150

 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1082
+#: lib/util.php:1154

 #, php-format
 #, php-format

-msgid "about %d months ago"
-msgstr "約 %d ヵ月前"
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] ""

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1085
+#: lib/util.php:1157

 msgid "about a year ago"
 msgstr "約 1 年前"
 
 msgid "about a year ago"
 msgstr "約 1 年前"
 


@@ -6933,7 +7491,17 @@ 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:403
+#: scripts/restoreuser.php:82

 #, php-format
 #, php-format

-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
+msgid "Backup file for user %s (%s)"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+#, fuzzy
+msgid "No user specified; using backup user."
+msgstr "ユーザIDの記述がありません。"
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup."
+msgstr ""