cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Dominik Schürmann
2014-08-27 19:28:46 +02:00
parent d795f8d4e2 cb2eb8aca2
commit c2f6aa09c5
8 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/res/values-ja/strings.xml
View File

@@ -555,8 +555,8 @@
<!--Keyring merging log entries-->
<string name="msg_mg_public">公開鍵の鍵輪 %s にマージ中</string>
<string name="msg_mg_secret">秘密鍵の鍵輪 %s にマージ中</string>
<string name="msg_mg_fatal_encode">署名のエンコードでの致命的なエラー</string>
<string name="msg_mg_heterogeneous">指紋が異なる鍵輪をマージしようとしています!</string>
<string name="msg_mg_error_encode">署名のエンコードでの致命的なエラー</string>
<string name="msg_mg_error_heterogeneous">指紋が異なる鍵輪をマージしようとしています!</string>
<string name="msg_mg_new_subkey">新しい副鍵 %s を追加中</string>
<string name="msg_mg_found_new">鍵輪に新しい検証を %s 発見</string>
<string name="msg_mg_unchanged">新しい証明がない</string>