Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release/3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
daniele-athome committed Jul 25, 2015
2 parents 457da0a + a84eb0c commit eb729db
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,6 @@ https://play.google.com/store/apps/details?id=org.kontalk</string>
<string name="title_nonetwork">インターネット接続がありません</string>
<string name="err_import_keypair_uid_mismatch">インポートしたキーが入力された電話番号と一致しません。</string>
<string name="err_audio_record_noaudio">録音された音声はありません。</string>
<string name="err_custom_background">背景の設定中にエラーが発生しました。別の画像を試してください。</string>
<string name="hint_ptt">押し続けると録音します。</string>
</resources>

0 comments on commit eb729db

Please sign in to comment.