diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:02 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:58 +0100 |
| commit | f9ef1160ca764d508dafcb45fbf65f18911fff9c (patch) | |
| tree | 816564326b238848669d7a0713f48c84791cd13b /OpenKeychain/src/main/res/values-ja/strings.xml | |
| parent | fe32e7bff4e724d37903d07cd3b4f0287ec85879 (diff) | |
| parent | 8b4388e1a2d5cb2b7f0524c18ad3383e3375ba7b (diff) | |
| download | open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.gz open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.bz2 open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/values-ja/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values-ja/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 183938811..16b9c3cc4 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -89,7 +89,7 @@ <string name="menu_help">ヘルプ</string> <string name="menu_export_key">ファイルへのエクスポート</string> <string name="menu_delete_key">鍵の削除</string> - <string name="menu_create_key">自分の鍵の生成</string> + <string name="menu_manage_keys">自分の鍵の生成</string> <string name="menu_import_existing_key">ファイルからインポート</string> <string name="menu_search">検索</string> <string name="menu_nfc_preferences">NFC設定</string> |