Merge branch 'spreed-speakfreely-japanese' of github.com:cfrisemo/spreed-speakfreely into cfrisemo-spreed-speakfreely-japanese

Conflicts:
	src/i18n/messages-ja.po

src/i18n/messages-ja.po

@@ -8,15 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spreed Speak Freely 1.0\n"
 "Report-Msgid-Bugs-To: simon@struktur.de\n"
-"POT-Creation-Date: 2014-04-14 16:16+0200\n"
-"PO-Revision-Date: 2014-04-09 14:43+0100\n"
+"POT-Creation-Date: 2014-04-08 21:20+0200\n"
+"PO-Revision-Date: 2014-04-23 22:25+0100\n"
 "Last-Translator: Curt Frisemo <curt.frisemo@spreed.com>\n"
 "Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
+"Language: ja\n"
+"X-Generator: Poedit 1.6.4\n"
 
 msgid "Share your screen"
 msgstr "画面を共有する."
@@ -111,12 +113,11 @@ msgstr "ルームを出る"
 msgid "Current room"
 msgstr "現在のルーム"
 
-#, fuzzy
 msgid "Screen sharing options"
-msgstr "メディアスクリーン共有"
+msgstr "画面共有オプション"
 
 msgid "Fit screen."
-msgstr ""
+msgstr "画面に合わせる"
 
 msgid "Your picture"
 msgstr "あなたの写真"
@@ -152,7 +153,7 @@ msgid "High"
 msgstr "高い"
 
 msgid "HD"
-msgstr ""
+msgstr "HD"
 
 msgid "Language"
 msgstr "言語"
@@ -278,8 +279,8 @@ msgid "Camera / microphone access required."
 msgstr "カメラ・マイクの接続が必要です."
 
 msgid ""
-"Please check your browser settings and allow camera and microphone access"
-" for this site."
+"Please check your browser settings and allow camera and microphone access "
+"for this site."
 msgstr "ブラウザ設定で、このサイトへのカメラ・マイクの接続を許可してください."
 
 msgid "Skip check"
@@ -289,11 +290,11 @@ msgid "Click here for help (Google Chrome)."
 msgstr "ここをクリックしてヘルプ表示(Google Chrome)"
 
 msgid "Please set your user details and settings."
-msgstr "あなたのユーザー情報とセッティングを設定してください."
+msgstr "あなたのプロフィールとアプリの動作を設定してください."
 
 msgid ""
-"Please note that some settings require you to reload or to make a new "
-"call to become effective."
+"Please note that some settings require you to reload or to make a new call "
+"to become effective."
 msgstr "いくつかの設定は、再読み込みもしくは次回の発信から有効です."
 
 msgid "Create your room"
@@ -369,7 +370,7 @@ msgid " does not pick up."
 msgstr "は電話にでません."
 
 msgid " tried to call you."
-msgstr ""
+msgstr "は電話しようとしました."
 
 msgid " called you."
 msgstr "から電話がありました."
@@ -393,9 +394,13 @@ msgstr "ブラウザがファイル転送をサポートしていません."
 msgid ""
 "Permission to start screen sharing was denied. Make sure to have enabled "
 "screen sharing access for your browser. Copy chrome://flags/#enable-"
-"usermedia-screen-capture and open it with your browser and enable the "
-"flag on top. Then restart the browser and you are ready to go."
+"usermedia-screen-capture and open it with your browser and enable the flag "
+"on top. Then restart the browser and you are ready to go."
 msgstr ""
+"画面共有は拒否されました.ブラウザの画面共有の設定を確認して下さい. Chromeのア"
+"ドレスバーに chrome://flags/#enable-usermedia-screen-capture を入力して開き、"
+"スクリーンキャプチャのサポートを有効にしてください。その後ブラウザを再起動し"
+"てください。"
 
 msgid "Use browser language"
 msgstr "ブラウザの言語を使用"
@@ -431,25 +436,20 @@ msgid "Please provide a valid access code."
 msgstr "有効なアクセスコードを入力してください."
 
 msgid ""
-"Failed to verify access code. Check your Internet connection and try "
-"again."
-msgstr "アクセスコードの確認に失敗しました.インターネット接続を確認してリトライしてください."
-
-#, fuzzy, python-format
-msgid "and %s"
+"Failed to verify access code. Check your Internet connection and try again."
 msgstr ""
+"アクセスコードの確認に失敗しました.インターネット接続を確認してリトライしてく"
+"ださい."
 
-#, python-format
-msgid "and %d others"
-msgstr ""
+msgid "and %2$s"
+msgid_plural "and %1$d others"
+msgstr[0] "と %2"
 
 msgid "User"
-msgstr ""
+msgstr "ユーザー"
 
 msgid "Someone"
-msgstr ""
+msgstr "誰か"
 
-#, fuzzy
 msgid "Me"
-msgstr "名前"
-
+msgstr "私"