aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values-ja
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-27 19:28:46 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-27 19:28:46 +0200
commitc2f6aa09c587d615adefcee968371ce29ef94f14 (patch)
treecd4114f765f61438ecea8c5af57b20abc36475f3 /OpenKeychain/src/main/res/values-ja
parentd795f8d4e240877861ab993608fb7f5aed0a2042 (diff)
parentcb2eb8aca2e7aab6243fd3e1a3313c941e3f1998 (diff)
downloadopen-keychain-c2f6aa09c587d615adefcee968371ce29ef94f14.tar.gz
open-keychain-c2f6aa09c587d615adefcee968371ce29ef94f14.tar.bz2
open-keychain-c2f6aa09c587d615adefcee968371ce29ef94f14.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/values-ja')
-rw-r--r--OpenKeychain/src/main/res/values-ja/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 6dfe65312..36cbe64b5 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -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>