diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
256 files changed, 1997 insertions, 706 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 000000000..694179bd4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_add_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png Binary files differindex 37931a0ad..d9a5ebedf 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png Binary files differindex 5fa494878..a2051cef9 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_circle_black_48dp.png Binary files differnew file mode 100644 index 000000000..1c2ddcd5f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_circle_black_48dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png Binary files differindex f42a0e2d2..729f29010 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_black_24dp.png Binary files differindex d5a928783..1a9cd75a0 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png Binary files differindex 0fd15563a..ceb1a1eeb 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png Binary files differindex dc8c85cce..9a9e5706f 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..4a9f76947 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png Binary files differindex 35e3b426f..57139a78a 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png Binary files differindex ed993f35d..9625f148f 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png Binary files differindex 9f5c75609..02ea533a8 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png Binary files differindex 05be749c3..374fafd7f 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png Binary files differindex 0888c6173..de5029591 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png Binary files differindex b94735ecb..cd4f04aa1 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png Binary files differindex 3ee3e1720..595ff10ac 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png Binary files differindex 164385d04..57c9fa546 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png Binary files differindex cd16fdd50..ffa7be933 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_reorder_grey_500_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_reorder_grey_500_24dp.png Binary files differnew file mode 100644 index 000000000..58fe2c52e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_reorder_grey_500_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png Binary files differindex 612e73458..81c5be793 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_save_white_24dp.png Binary files differindex 8c9e9cec0..dd3f10664 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_save_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_save_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png Binary files differindex a2fc5b2e7..bbfbc96cb 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png Binary files differindex b16209fc1..acf1ddf85 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png Binary files differindex 2839b1352..20ba48063 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png Binary files differindex dc20b0f03..dc20b0f03 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png Binary files differindex 76944469c..76944469c 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png Binary files differindex c900b8ec7..e05e76ffc 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 000000000..3856041d7 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_add_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png Binary files differindex 5b1fd7766..aaadd5c46 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png Binary files differindex 9e662f6d4..d571552fb 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_circle_black_48dp.png Binary files differnew file mode 100644 index 000000000..86bf38e98 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_circle_black_48dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png Binary files differindex e91f9048b..dfcb55d02 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_black_24dp.png Binary files differindex 4ebf8a227..40a1a84e3 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png Binary files differindex e80681aeb..af7f8288d 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png Binary files differindex 4ad9e552d..c94cc28f1 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..e2f5f3555 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png Binary files differindex a5ab2c5d3..08c16a328 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png Binary files differindex 73fc3b422..feb85a775 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png Binary files differindex 1c5797c9e..831d723ba 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png Binary files differindex f3743dc20..f6e789ba1 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png Binary files differindex d18d4b667..3a4a1586e 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png Binary files differindex 381b6a118..1127f87f7 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png Binary files differindex 85cff0b91..12b09f1d9 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png Binary files differindex 8d1e433a5..c61e948bb 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png Binary files differindex 235c84f1e..97e42b525 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_reorder_grey_500_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_reorder_grey_500_24dp.png Binary files differnew file mode 100644 index 000000000..d6abf0936 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_reorder_grey_500_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png Binary files differindex 8a2b641ca..b1c2e04ab 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_save_white_24dp.png Binary files differindex bb26bc075..015062ed3 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_save_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_save_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png Binary files differindex dff1e3a8a..faefc59c8 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png Binary files differindex 3405c951d..c59419c02 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png Binary files differindex f0ff945b8..f02d360aa 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png Binary files differindex 262d53027..262d53027 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png Binary files differindex e16ec810a..e16ec810a 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png Binary files differindex 5e8781731..f7ac2a184 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 000000000..67bb598e5 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_add_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png Binary files differindex c8187799b..22f12110e 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png Binary files differindex addbfc886..ce5b878b0 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_circle_black_48dp.png Binary files differnew file mode 100644 index 000000000..872b578c8 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_circle_black_48dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png Binary files differindex e5024472a..3b2b65d26 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_black_24dp.png Binary files differindex ed2b2525f..6bc437298 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png Binary files differindex 76e07f097..b7c7ffd0e 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png Binary files differindex c6f0e6b85..1cf76a960 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..388b5b060 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png Binary files differindex 47c7b52a1..323360ead 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png Binary files differindex 45d30d999..d3ee65e9a 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png Binary files differindex e5f54cef0..71a5a137c 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png Binary files differindex 87095ef26..d3542c6bc 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png Binary files differindex 8856c70df..2a166945a 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png Binary files differindex c5e9d0b49..ad8d91a99 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png Binary files differindex 7f0ea51bf..5a06bff5a 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png Binary files differindex a55d19922..a3c80e73d 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png Binary files differindex 5f89fc257..1989184b1 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_reorder_grey_500_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_reorder_grey_500_24dp.png Binary files differnew file mode 100644 index 000000000..0af0cb76d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_reorder_grey_500_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png Binary files differindex 729220066..ad8b8c0df 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_white_24dp.png Binary files differindex aa0332092..adda09575 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_save_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png Binary files differindex 043759acd..bfc3e3939 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png Binary files differindex 2b775b646..e84e188a1 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png Binary files differindex 4b3675766..81c80b700 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png Binary files differindex fc7ba24a3..fc7ba24a3 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png Binary files differindex e2aef1177..e2aef1177 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png Binary files differindex ccbdce4ab..a8761c90a 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 000000000..0fdced8fc --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png Binary files differindex 626543b47..6d0fe2c00 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png Binary files differindex 4057cc545..746d77579 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_circle_black_48dp.png Binary files differnew file mode 100644 index 000000000..6d3b6449c --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_circle_black_48dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png Binary files differindex 6e03d54cf..2c2ad771f 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png Binary files differindex 08f59ea1e..51b4401ca 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png Binary files differindex 0eb9d8b08..6b717e0dd 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png Binary files differindex 081fbec5b..074ea8807 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..3fcdfdb55 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png Binary files differindex 0470e3f02..ee92f4ecd 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png Binary files differindex aadd04af6..5cd142c1d 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png Binary files differindex 0d1ac4876..b93d5a1e4 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png Binary files differindex f32d7e708..645822e83 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png Binary files differindex c49d420e0..a7caa2db8 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png Binary files differindex 0dcada814..0e52c7c75 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png Binary files differindex 34ec7092f..02e19d045 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png Binary files differindex 043acd808..547ef30aa 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png Binary files differindex 72128fe69..1692d8a24 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_reorder_grey_500_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_reorder_grey_500_24dp.png Binary files differnew file mode 100644 index 000000000..1d9c88d10 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_reorder_grey_500_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png Binary files differindex 63f8de50f..5de7a2951 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png Binary files differindex 6c87e1358..3e0ce1a5f 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png Binary files differindex 0bbeab150..abbb98951 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png Binary files differindex 47f0e0d82..3023ff8da 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png Binary files differindex 09d4df6af..784933ad5 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png Binary files differindex bc71d3a65..bc71d3a65 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png Binary files differindex 501a75d63..501a75d63 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png Binary files differindex 736bde37a..16b1e4e24 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 000000000..d64c22e9e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png Binary files differindex d12d2e796..bfbe789c3 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png Binary files differindex 02f2f6fe8..fb06e1d48 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_circle_black_48dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_circle_black_48dp.png Binary files differnew file mode 100644 index 000000000..0e3b23964 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_circle_black_48dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png Binary files differindex 87892840e..d670618c7 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png Binary files differindex c5d79caff..df42feecb 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png Binary files differindex 7b2a480a0..396419219 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png Binary files differindex 04c07fb56..1f6af72d0 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..8d322aa9b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png Binary files differindex 08ae54533..99c6e3e1c 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png Binary files differindex 228b2a982..ad852e3e6 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png Binary files differindex 7a3c198ee..a1afbe9da 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png Binary files differindex a4286b54c..7c4823055 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png Binary files differindex db080df4e..e66dd967d 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png Binary files differindex a70c55b7e..a55147be1 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png Binary files differindex 9380370f4..d6668a051 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png Binary files differindex 7cc008475..be5c062b5 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png Binary files differindex d271d8e03..f5beca251 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png Binary files differindex f3c284330..c7f3072ee 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png Binary files differindex 51998492c..bd80bf1f7 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png Binary files differindex 70c21baf7..dd5adfc7f 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png Binary files differindex bce161d00..476d5c978 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png Binary files differindex 0fe15fc05..5a8544ce5 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png Binary files differindex 3451d9855..f04166536 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable/cardview_header.xml b/OpenKeychain/src/main/res/drawable/cardview_header.xml index 9bab96ea9..ff08f9fe3 100644 --- a/OpenKeychain/src/main/res/drawable/cardview_header.xml +++ b/OpenKeychain/src/main/res/drawable/cardview_header.xml @@ -6,6 +6,6 @@ android:height="1dp" android:width="1000dp" /> - <solid android:color="@color/bg_gray" /> + <solid android:color="?attr/colorCardViewHeaderDivider" /> -</shape>
\ No newline at end of file +</shape> diff --git a/OpenKeychain/src/main/res/drawable/fab_label_background.xml b/OpenKeychain/src/main/res/drawable/fab_label_background.xml index 0d8c05b11..aa5e0a88e 100644 --- a/OpenKeychain/src/main/res/drawable/fab_label_background.xml +++ b/OpenKeychain/src/main/res/drawable/fab_label_background.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/black_semi_transparent"/> + <solid android:color="?attr/colorFabBackground"/> <padding android:left="16dp" android:top="4dp" @@ -8,4 +8,4 @@ android:bottom="4dp"/> <corners android:radius="2dp"/> -</shape>
\ No newline at end of file +</shape> diff --git a/OpenKeychain/src/main/res/drawable/section_header.xml b/OpenKeychain/src/main/res/drawable/section_header.xml index 04d3d4957..4bee8049b 100644 --- a/OpenKeychain/src/main/res/drawable/section_header.xml +++ b/OpenKeychain/src/main/res/drawable/section_header.xml @@ -6,6 +6,6 @@ android:height="2dp" android:width="1000dp" /> - <solid android:color="@color/header_text" /> + <solid android:color="?attr/colorHeaderText" /> -</shape>
\ No newline at end of file +</shape> diff --git a/OpenKeychain/src/main/res/drawable/selector_transparent_button.xml b/OpenKeychain/src/main/res/drawable/selector_transparent_button.xml deleted file mode 100644 index ed856f281..000000000 --- a/OpenKeychain/src/main/res/drawable/selector_transparent_button.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- Borderless Buttons for API < 11, see http://stackoverflow.com/a/14663170 --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@color/bg_gray" /> - <item android:drawable="@android:color/transparent" /> -</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/yubikey_phone.png b/OpenKeychain/src/main/res/drawable/yubikey_phone.png Binary files differindex 6a03501c6..3cdfbba0f 100644 --- a/OpenKeychain/src/main/res/drawable/yubikey_phone.png +++ b/OpenKeychain/src/main/res/drawable/yubikey_phone.png diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml index ffb7493f6..b3969a2bd 100644 --- a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml @@ -29,7 +29,7 @@ android:id="@+id/add_user_id_comment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="@color/tertiary_text_light" + android:textColor="?attr/colorTertiaryText" android:singleLine="true" android:lines="1" android:maxLines="1" diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml index c3f6e33cb..ea20b77b3 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -117,7 +117,7 @@ android:layout_height="wrap_content" android:elevation="4dp" fab:fab_icon="@drawable/ic_play_arrow_white_24dp" - fab:fab_colorNormal="@color/fab" - fab:fab_colorPressed="@color/fab_pressed" /> + fab:fab_colorNormal="?attr/colorFab" + fab:fab_colorPressed="?attr/colorFabPressed" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml index 1ea0a520d..20abb3965 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml @@ -53,11 +53,11 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/api_settings_package_signature" + android:text="@string/api_settings_package_certificate" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/api_app_settings_package_signature" + android:id="@+id/api_app_settings_package_certificate" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Base64 encoded hash of signature" diff --git a/OpenKeychain/src/main/res/layout/backup_fragment.xml b/OpenKeychain/src/main/res/layout/backup_fragment.xml new file mode 100644 index 000000000..96fba954b --- /dev/null +++ b/OpenKeychain/src/main/res/layout/backup_fragment.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="24dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="8dip" + android:text="@string/backup_text" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/backup_section" /> + + <TextView + android:id="@+id/backup_all" + style="?android:attr/borderlessButtonStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clickable="true" + android:drawablePadding="8dp" + android:drawableRight="@drawable/ic_save_grey_24dp" + android:gravity="center_vertical" + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:text="@string/backup_all" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <TextView + android:id="@+id/backup_public_keys" + style="?android:attr/borderlessButtonStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clickable="true" + android:drawablePadding="8dp" + android:drawableRight="@drawable/ic_save_grey_24dp" + android:gravity="center_vertical" + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:text="@string/backup_public_keys" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginBottom="8dp" + android:background="?android:attr/listDivider" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml index 9b6b35012..bd7b00823 100644 --- a/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml +++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml @@ -28,7 +28,7 @@ android:id="@+id/certify_fingerprint_card" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="@android:color/white" + app:cardBackgroundColor="?attr/colorCardViewBackground" app:cardUseCompatPadding="true" app:cardCornerRadius="4dp" android:layout_gravity="top"> @@ -151,4 +151,4 @@ -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml index 17cfe54ac..d4ece38ac 100644 --- a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml @@ -51,7 +51,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:id="@+id/create_key_buttons"> <TextView @@ -88,4 +88,4 @@ android:clickable="true" style="?android:attr/borderlessButtonStyle" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index e085fcb09..9a6c33f82 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:text="@string/label_name" - android:textColor="@color/tertiary_text_light" + android:textColor="?attr/colorTertiaryText" android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:text="@string/label_email" - android:textColor="@color/tertiary_text_light" + android:textColor="?attr/colorTertiaryText" android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/create_key_rsa" - android:textColor="@color/android_green_light" + android:textColor="?attr/colorPrimary" android:textAppearance="?android:attr/textAppearanceMedium" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" @@ -129,7 +129,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:text="@string/create_key_final_robot_text" - android:textColor="@color/android_green_light" + android:textColor="?attr/colorPrimary" android:textAppearance="?android:attr/textAppearanceMedium" android:drawableLeft="@drawable/create_key_robot" android:drawablePadding="8dp" /> @@ -144,7 +144,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:id="@+id/create_key_buttons"> <TextView @@ -182,4 +182,4 @@ style="?android:attr/borderlessButtonStyle" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml index a2f81f74c..7b8ba3fc1 100644 --- a/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_name_fragment.xml @@ -45,7 +45,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:id="@+id/create_key_buttons"> <TextView @@ -82,4 +82,4 @@ android:clickable="true" style="?android:attr/borderlessButtonStyle" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml index abfb2861b..9d10bbe70 100644 --- a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml @@ -64,7 +64,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:id="@+id/create_key_buttons"> <TextView @@ -101,4 +101,4 @@ android:clickable="true" style="?android:attr/borderlessButtonStyle" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml index 2db147475..20c434c02 100644 --- a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml @@ -30,7 +30,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:id="@+id/create_key_buttons"> <TextView diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml index 864e3aecf..ca203d0b5 100644 --- a/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml @@ -34,7 +34,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:id="@+id/create_key_buttons"> <TextView @@ -73,4 +73,4 @@ style="?android:attr/borderlessButtonStyle" android:layout_gravity="center_vertical" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml index e70188e49..838ee37b4 100644 --- a/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_import_fragment.xml @@ -84,7 +84,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:id="@+id/create_key_buttons"> <TextView @@ -123,4 +123,4 @@ </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml new file mode 100644 index 000000000..393ec76d4 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" + android:layout_above="@+id/create_key_buttons"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/create_key_yubi_key_pin_text" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/create_key_yubi_key_pin" /> + + <TextView + android:id="@+id/create_yubi_key_pin" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceLarge" + tools:text="123456" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/create_key_yubi_key_admin_pin" /> + + <TextView + android:id="@+id/create_yubi_key_admin_pin" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginLeft="8dp" + android:textAppearance="?android:attr/textAppearanceLarge" + tools:text="12345678" /> + + </LinearLayout> + </ScrollView> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:background="?attr/colorButtonRow" + android:id="@+id/create_key_buttons"> + + <TextView + android:id="@+id/create_key_back_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_back" + android:textAllCaps="true" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" /> + + <TextView + android:id="@+id/create_key_next_button" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/btn_next" + android:textAllCaps="true" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_chevron_right_grey_24dp" + android:drawablePadding="8dp" + android:gravity="right|center_vertical" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" /> + </LinearLayout> +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml new file mode 100644 index 000000000..d233398ca --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/create_key_buttons" + android:fillViewport="true"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginTop="16dp" + android:text="@string/create_key_yubi_key_pin_repeat_text" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginTop="16dp" + android:text="@string/create_key_yubi_key_pin" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <EditText + android:id="@+id/create_yubi_key_pin_repeat" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="8dp" + android:ems="10" + android:hint="@string/create_key_yubi_key_pin_repeat" + android:inputType="numberPassword" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginTop="16dp" + android:text="@string/create_key_yubi_key_admin_pin" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <EditText + android:id="@+id/create_yubi_key_admin_pin_repeat" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="8dp" + android:ems="10" + android:hint="@string/create_key_yubi_key_admin_pin_repeat" + android:inputType="numberPassword" /> + + </LinearLayout> + </ScrollView> + + <LinearLayout + android:id="@+id/create_key_buttons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:background="?attr/colorButtonRow" + android:orientation="horizontal"> + + <TextView + android:id="@+id/create_key_back_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:clickable="true" + android:drawableLeft="@drawable/ic_chevron_left_grey_24dp" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:text="@string/btn_back" + android:textAllCaps="true" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/create_key_next_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:clickable="true" + android:drawablePadding="8dp" + android:drawableRight="@drawable/ic_chevron_right_grey_24dp" + android:gravity="right|center_vertical" + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:text="@string/btn_next" + android:textAllCaps="true" + android:textAppearance="?android:attr/textAppearanceMedium" /> + </LinearLayout> +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml index 4e4b53118..a000dc82e 100644 --- a/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml @@ -40,7 +40,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:id="@+id/create_key_buttons"> <TextView @@ -79,4 +79,4 @@ </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml index d58542e62..048595dd8 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml @@ -7,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="4dp" - custom:cardBackgroundColor="@android:color/white" + custom:cardBackgroundColor="?attr/colorCardViewBackground" custom:cardElevation="2dp" custom:cardUseCompatPadding="true" custom:cardCornerRadius="4dp" @@ -286,6 +286,38 @@ </LinearLayout> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:orientation="horizontal"> + + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginLeft="8dp" + android:layout_marginStart="8dp" + android:layout_gravity="center_vertical" + android:drawablePadding="12dp" + android:text="@string/msg_cancelled" + android:drawableLeft="@drawable/status_signature_invalid_cutout_24dp" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + + <ImageView + android:id="@+id/cancel_retry" + android:scaleType="center" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:clickable="true" + android:padding="6dp" + android:background="?android:selectableItemBackground" + android:src="@drawable/ic_repeat_grey_24dp" + android:layout_gravity="center_vertical" /> + + </LinearLayout> + </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> -</android.support.v7.widget.CardView>
\ No newline at end of file +</android.support.v7.widget.CardView> diff --git a/OpenKeychain/src/main/res/layout/del_rev_dialog.xml b/OpenKeychain/src/main/res/layout/del_rev_dialog.xml new file mode 100644 index 000000000..053f98627 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/del_rev_dialog.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="16dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:orientation="vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/del_rev_dialog_message" + android:textAppearance="@style/TextAppearance.AppCompat.Medium" + android:layout_marginBottom="16dp"/> + + <Spinner + android:id="@+id/spinner" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:drawSelectorOnTop="true" + android:entries="@array/rev_del_dialog_entries"/> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml deleted file mode 100644 index 86465db98..000000000 --- a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center" - android:background="@color/primary"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/app_name" - android:textColor="@color/white" - android:layout_gravity="center_horizontal" /> -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml index 394f14a34..7bd919abc 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml @@ -1,120 +1,127 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:paddingTop="4dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> - <TextView - style="@style/SectionHeader" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:text="@string/section_encrypt" /> - - <TextView - android:id="@+id/encrypt_files" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:text="@string/btn_encrypt_files" - android:drawableRight="@drawable/ic_folder_grey_24dp" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> + android:paddingTop="4dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical" + > - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <TextView - android:id="@+id/encrypt_text" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:text="@string/btn_encrypt_text" - android:drawableRight="@drawable/ic_comment_text_grey600_24dp" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> + <TextView + style="@style/SectionHeader" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/section_encrypt" /> - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> + <TextView + android:id="@+id/encrypt_files" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" + android:text="@string/btn_encrypt_files" + android:drawableRight="@drawable/ic_folder_grey_24dp" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> - <TextView - style="@style/SectionHeader" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:text="@string/section_decrypt" /> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> - <TextView - android:id="@+id/decrypt_files" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:text="@string/btn_decrypt_files" - android:drawableRight="@drawable/ic_folder_grey_24dp" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> + <TextView + android:id="@+id/encrypt_text" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" + android:text="@string/btn_encrypt_text" + android:drawableRight="@drawable/ic_comment_text_grey600_24dp" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> - <LinearLayout - android:id="@+id/decrypt_from_clipboard" - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:clickable="true" - style="?android:attr/borderlessButtonStyle" - android:orientation="horizontal" - android:paddingLeft="8dp" - android:paddingRight="0dp" - tools:ignore="UseCompoundDrawables"> + <TextView + style="@style/SectionHeader" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/section_decrypt" /> <TextView + android:id="@+id/decrypt_files" + android:paddingLeft="8dp" + android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:text="@string/btn_decrypt_clipboard" /> + android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" + android:text="@string/btn_decrypt_files" + android:drawableRight="@drawable/ic_folder_grey_24dp" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> - <ImageView - android:id="@+id/clipboard_icon" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="8dp" - android:src="@drawable/ic_content_paste_grey_24dp" - android:layout_gravity="center_vertical" /> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> - </LinearLayout> + <LinearLayout + android:id="@+id/decrypt_from_clipboard" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:clickable="true" + style="?android:attr/borderlessButtonStyle" + android:orientation="horizontal" + android:paddingLeft="8dp" + android:paddingRight="0dp" + tools:ignore="UseCompoundDrawables"> - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:layout_marginBottom="8dp" /> + <TextView + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:text="@string/btn_decrypt_clipboard" /> + + <ImageView + android:id="@+id/clipboard_icon" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_content_paste_grey_24dp" + android:layout_gravity="center_vertical" /> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_marginBottom="8dp" /> + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</ScrollView> diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml index 7f0e1e89e..e1b03f8ae 100644 --- a/OpenKeychain/src/main/res/layout/file_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml @@ -55,4 +55,4 @@ android:clickable="true" android:layout_centerVertical="true" android:background="?android:selectableItemBackground" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index 773a9d416..a7b1e6a53 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:text="@string/none" android:layout_gravity="center_vertical" - android:textColor="@color/header_text" /> + android:textColor="?attr/colorHeaderText" /> </LinearLayout> <LinearLayout @@ -34,4 +34,4 @@ android:layout_height="wrap_content" android:orientation="vertical" android:visibility="gone" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/help_about_fragment.xml b/OpenKeychain/src/main/res/layout/help_about_fragment.xml index 6afab2e12..dbcd97bfd 100644 --- a/OpenKeychain/src/main/res/layout/help_about_fragment.xml +++ b/OpenKeychain/src/main/res/layout/help_about_fragment.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent" + android:paddingBottom="0dp" + android:paddingLeft="0dp" + android:paddingRight="0dp" + android:paddingTop="0dp"> <LinearLayout android:layout_width="match_parent" @@ -11,17 +15,17 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingTop="16dp" - android:scrollbars="vertical" > + android:scrollbars="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="horizontal" > + android:orientation="horizontal"> <LinearLayout android:layout_width="wrap_content" android:layout_height="match_parent" - android:orientation="vertical" > + android:orientation="vertical"> <ImageView android:layout_width="wrap_content" @@ -34,7 +38,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" > + android:orientation="vertical"> <TextView android:layout_width="wrap_content" @@ -51,12 +55,13 @@ </LinearLayout> </LinearLayout> - <org.sufficientlysecure.htmltextview.HtmlTextView + <org.sufficientlysecure.htmltextview.HtmlTextView android:id="@+id/help_about_text" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:layout_marginTop="16dp" android:textAppearance="@android:style/TextAppearance.Small" /> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index 332b95ce5..28bb8a0b8 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -25,21 +25,11 @@ android:id="@+id/import_keys_top_container" android:layout_width="match_parent" android:layout_height="64dp" - android:orientation="vertical" - android:background="@android:color/white" /> + android:orientation="vertical" /> <View android:layout_width="match_parent" - android:layout_height="2dip" - android:background="?android:attr/listDivider" /> - - <View - android:layout_width="match_parent" - android:layout_height="16dp" /> - - <View - android:layout_width="match_parent" - android:layout_height="2dip" + android:layout_height="1dip" android:background="?android:attr/listDivider" /> <FrameLayout @@ -47,22 +37,18 @@ android:layout_width="match_parent" android:layout_height="0dp" android:orientation="vertical" - android:layout_weight="1" - android:background="@android:color/white" /> + android:layout_weight="1" /> <RelativeLayout android:id="@+id/import_footer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:background="@android:color/white"> + android:orientation="vertical"> <View android:id="@+id/import_divider" android:layout_width="match_parent" android:layout_height="1dip" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" android:background="?android:attr/listDivider" /> <TextView @@ -91,4 +77,4 @@ </RelativeLayout> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml index bd0239da7..146367082 100644 --- a/OpenKeychain/src/main/res/layout/key_list_content.xml +++ b/OpenKeychain/src/main/res/layout/key_list_content.xml @@ -23,7 +23,7 @@ <!--<LinearLayout android:orientation="vertical" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index ea3426f90..9c41590db 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -45,8 +45,8 @@ android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" - fab:fab_addButtonColorNormal="@color/primary" - fab:fab_addButtonColorPressed="@color/primary_dark" + fab:fab_addButtonColorNormal="?attr/colorPrimary" + fab:fab_addButtonColorPressed="?attr/colorPrimaryDark" fab:fab_addButtonSize="normal" fab:fab_addButtonPlusIconColor="@color/icons" fab:fab_expandDirection="up" @@ -61,8 +61,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" fab:fab_icon="@drawable/ic_qrcode_white_24dp" - fab:fab_colorNormal="@color/primary" - fab:fab_colorPressed="@color/primary_dark" + fab:fab_colorNormal="?attr/colorPrimary" + fab:fab_colorPressed="?attr/colorPrimaryDark" fab:fab_title="Scan QR Code" fab:fab_size="mini" /> @@ -71,8 +71,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" fab:fab_icon="@drawable/ic_cloud_search_24dp" - fab:fab_colorNormal="@color/primary" - fab:fab_colorPressed="@color/primary_dark" + fab:fab_colorNormal="?attr/colorPrimary" + fab:fab_colorPressed="?attr/colorPrimaryDark" fab:fab_title="Search Cloud" fab:fab_size="mini" /> @@ -81,10 +81,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" fab:fab_icon="@drawable/ic_folder_white_24dp" - fab:fab_colorNormal="@color/primary" - fab:fab_colorPressed="@color/primary_dark" + fab:fab_colorNormal="?attr/colorPrimary" + fab:fab_colorPressed="?attr/colorPrimaryDark" fab:fab_title="Import from File" fab:fab_size="mini" /> </com.getbase.floatingactionbutton.FloatingActionsMenu> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml index 5319a3ec0..570d57d9b 100644 --- a/OpenKeychain/src/main/res/layout/key_server_preference.xml +++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml @@ -1,94 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical"> <include android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> - <LinearLayout - android:layout_below="@id/toolbar_include" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - - <LinearLayout - android:id="@+id/text_layout" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:minHeight="?android:attr/listPreferredItemHeight" - android:orientation="horizontal"> - - <LinearLayout - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_marginBottom="6sp" - android:layout_marginLeft="16sp" - android:layout_marginRight="6sp" - android:layout_marginTop="6sp" - android:layout_weight="1" - android:background="@android:drawable/menuitem_background" - android:orientation="vertical" - android:focusable="true"> - - <TextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:focusable="true" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceLarge" /> - - <TextView - android:id="@+id/summary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - - <Button - android:id="@+id/rotate" - android:layout_width="wrap_content" - android:layout_height="31dp" - android:layout_gravity="center_vertical" - android:layout_marginLeft="4dip" - android:layout_marginRight="6dip" - android:text="rotate" - android:textColor="#ffffffff" - android:textStyle="bold" - android:background="@drawable/button_rounded_blue" /> - - <ImageButton - android:id="@+id/add" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_margin="10dp" - android:src="@drawable/plus" - android:background="@drawable/button_rounded_green" /> - </LinearLayout> - - <View - android:id="@+id/separator" - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <ScrollView - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:orientation="vertical"> - - <LinearLayout - android:id="@+id/editors" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> - </ScrollView> - - </LinearLayout> - -</RelativeLayout>
\ No newline at end of file + <TextView + android:layout_marginLeft="6sp" + android:layout_marginRight="6sp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge" + android:text="@string/label_keyservers_title"/> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="6sp" + android:layout_marginRight="6sp" + android:layout_marginBottom="6sp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/label_keyserver_settings_hint"/> + + <View + style="@style/Divider"/> + + <FrameLayout + android:id="@+id/keyserver_settings_fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/log_display_item.xml b/OpenKeychain/src/main/res/layout/log_display_item.xml index d35413185..25249003f 100644 --- a/OpenKeychain/src/main/res/layout/log_display_item.xml +++ b/OpenKeychain/src/main/res/layout/log_display_item.xml @@ -15,7 +15,7 @@ android:layout_height="match_parent" android:id="@+id/log_img" android:minWidth="10dp" - android:background="@color/bg_gray" /> + android:background="?attr/colorLogBackground" /> <TextView android:layout_width="0dp" @@ -53,7 +53,7 @@ android:layout_height="match_parent" android:id="@+id/log_second_img" android:minWidth="10dp" - android:background="@color/bg_gray" /> + android:background="?attr/colorLogBackground" /> <TextView android:layout_width="0dp" @@ -67,4 +67,4 @@ android:layout_gravity="center_vertical"/> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml deleted file mode 100644 index 9acd0676c..000000000 --- a/OpenKeychain/src/main/res/layout/nfc_activity.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include - android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone" /> - - <LinearLayout - android:layout_below="@id/toolbar_include" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="16dp" - android:paddingBottom="16dp"> - - <TextView - android:text="@string/nfc_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="@android:style/TextAppearance.Large" - android:id="@+id/nfc_text" - android:gravity="center" - android:layout_gravity="center" /> - - <ImageView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/yubikey_phone" /> - - </LinearLayout> -</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml new file mode 100644 index 000000000..8b043861f --- /dev/null +++ b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator + android:id="@+id/view_animator" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:animateLayoutChanges="true" + android:inAnimation="@anim/fade_in" + android:measureAllChildren="false" + android:minHeight="?listPreferredItemHeightSmall" + android:outAnimation="@anim/fade_out" + custom:initialView="3"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/nfc_activity_0_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="24dp" + android:layout_marginRight="24dp" + android:layout_marginTop="24dp" + android:text="@string/nfc_text" + android:textAppearance="@android:style/TextAppearance.Medium" /> + + <ImageView + android:id="@+id/nfc_activity_0_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_below="@+id/nfc_activity_0_text" + android:layout_margin="24dp" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:src="@drawable/yubikey_phone" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/nfc_activity_1_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="24dp" + android:layout_marginRight="24dp" + android:layout_marginTop="24dp" + android:text="@string/nfc_wait" + android:textAppearance="@android:style/TextAppearance.Medium" /> + + <ProgressBar + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:padding="8dp" /> + + <!-- placeholder to retain dialog size --> + <ImageView + android:id="@+id/nfc_activity_1_placeholder" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_below="@+id/nfc_activity_1_text" + android:layout_margin="24dp" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:src="@drawable/yubikey_phone" + android:visibility="invisible" /> + + </RelativeLayout> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/nfc_activity_2_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="24dp" + android:layout_marginRight="24dp" + android:layout_marginTop="24dp" + android:text="@string/nfc_finished" + android:textAppearance="@android:style/TextAppearance.Medium" /> + + <!-- placeholder to retain dialog size --> + <ImageView + android:id="@+id/nfc_activity_2_placeholder" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_below="@+id/nfc_activity_2_text" + android:layout_margin="24dp" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:src="@drawable/yubikey_phone" + android:visibility="invisible" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:src="@drawable/ic_check_circle_black_48dp" /> + + </RelativeLayout> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/nfc_activity_3_text_placeholder" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignEnd="@+id/nfc_activity_3_placeholder" + android:layout_alignRight="@+id/nfc_activity_3_placeholder" + android:layout_marginLeft="24dp" + android:layout_marginTop="24dp" + android:text="" + android:textAppearance="@android:style/TextAppearance.Medium" /> + + <!-- placeholder to retain dialog size --> + <ImageView + android:id="@+id/nfc_activity_3_placeholder" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_below="@+id/nfc_activity_3_text_placeholder" + android:layout_margin="24dp" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:src="@drawable/yubikey_phone" + android:visibility="invisible" /> + + <TextView + android:id="@+id/nfc_activity_3_error_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:layout_margin="24dp" + android:textAppearance="@android:style/TextAppearance.Medium" + android:textColor="@color/android_red_dark" + tools:text="Error text" /> + + <Button + android:id="@+id/nfc_activity_3_error_try_again" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="48dp" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_below="@+id/nfc_activity_3_placeholder" + android:layout_margin="8dp" + android:text="@string/error_nfc_try_again" + android:textColor="@color/accent" /> + + </RelativeLayout> + + </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml index ffc5266b5..9ce8f01fa 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml @@ -40,9 +40,9 @@ android:layout_gravity="end|center_vertical" custom:strength="medium" custom:showGuides="false" - custom:color_fail="@color/android_red_light" - custom:color_weak="@color/android_orange_light" - custom:color_strong="@color/android_green_light" /> + custom:color_fail="@color/password_strength_low" + custom:color_weak="@color/password_strength_medium" + custom:color_strong="@color/password_strength_high" /> </FrameLayout> @@ -57,4 +57,4 @@ android:ems="10" android:layout_gravity="center_horizontal" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml index a9e86057c..2b39cf54c 100644 --- a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml @@ -60,4 +60,4 @@ tools:src="@drawable/status_signature_revoked_cutout_24dp" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/settings_keyserver_fragment.xml b/OpenKeychain/src/main/res/layout/settings_keyserver_fragment.xml new file mode 100644 index 000000000..57c81a433 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/settings_keyserver_fragment.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> + +<android.support.v7.widget.RecyclerView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/keyserver_recycler_view" + android:layout_width="match_parent" + android:layout_height="match_parent" />
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/settings_keyserver_item.xml b/OpenKeychain/src/main/res/layout/settings_keyserver_item.xml new file mode 100644 index 000000000..338104bda --- /dev/null +++ b/OpenKeychain/src/main/res/layout/settings_keyserver_item.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/outer_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?listPreferredItemHeight"> + + <LinearLayout + android:id="@+id/keyserver_layout" + android:padding="6sp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/drag_handle" + android:orientation="vertical"> + + <TextView + android:id="@+id/selected_keyserver_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/label_selected_keyserver_title" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textStyle="bold" + android:visibility="gone"/> + + <TextView + android:id="@+id/keyserver_tv" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" /> + </LinearLayout> + + <ImageView + android:id="@+id/drag_handle" + android:layout_width="?listPreferredItemHeight" + android:layout_height="?listPreferredItemHeight" + android:scaleType="center" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:src="@drawable/ic_reorder_grey_500_24dp" /> + + <View + android:layout_alignParentBottom="true" + style="@style/Divider"/> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml b/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml index 4f9b5d373..1afa76b60 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/toolbar_include" android:elevation="4dp" - android:background="@color/white" + android:background="?attr/colorBrightToolbar" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml index d4269c2ba..8fddfe4ba 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml @@ -2,7 +2,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/toolbar_include" android:elevation="4dp" - android:background="@color/white" + android:background="?attr/colorBrightToolbar" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/OpenKeychain/src/main/res/layout/toolbar_tabs.xml b/OpenKeychain/src/main/res/layout/toolbar_tabs.xml index 91efda682..ed42ef52e 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_tabs.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_tabs.xml @@ -17,8 +17,8 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" - android:textColor="@color/tab_text" - app:pstsTextColorSelected="@color/tab_text_selected" - app:pstsIndicatorColor="@color/tab_indicator" /> + android:textColor="?attr/colorTabText" + app:pstsTextColorSelected="?attr/colorTabTextSelected" + app:pstsIndicatorColor="?attr/colorTabIndicator" /> </RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index b3f4e721d..8e04f6899 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -75,7 +75,7 @@ android:layout_marginEnd="48dp" android:text="" tools:text="My Key" - android:textColor="@color/tab_text" + android:textColor="?attr/colorTabText" android:textAppearance="?android:attr/textAppearanceSmall" android:layout_above="@+id/toolbar2" /> @@ -200,7 +200,7 @@ tools:visibility="visible" android:elevation="4dp" fab:fab_icon="@drawable/ic_qrcode_white_24dp" - fab:fab_colorNormal="@color/fab" - fab:fab_colorPressed="@color/fab_pressed" /> + fab:fab_colorNormal="?attr/colorFab" + fab:fab_colorPressed="?attr/colorFabPressed" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml index d512477aa..3b9215d50 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml @@ -10,7 +10,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:padding="8dp" android:textAppearance="?android:attr/textAppearanceSmall" android:text="@string/certs_text" @@ -45,4 +45,4 @@ </FrameLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml index b6679524f..eecb19000 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml @@ -7,7 +7,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/holo_gray_bright" + android:background="?attr/colorButtonRow" android:padding="8dp" android:textAppearance="?android:attr/textAppearanceSmall" android:text="@string/key_trust_header_text" @@ -123,4 +123,4 @@ </LinearLayout> </ScrollView> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml index c08d66cc1..d82506e74 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml @@ -126,6 +126,23 @@ android:background="?android:attr/listDivider" /> <ImageButton + android:id="@+id/view_key_action_key_export" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_save_grey_24dp" + android:layout_gravity="center_vertical" + android:background="?android:selectableItemBackground" /> + + <View + android:layout_width="1dip" + android:layout_height="match_parent" + android:gravity="right" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:background="?android:attr/listDivider" /> + + <ImageButton android:id="@+id/view_key_action_key_nfc" android:layout_width="wrap_content" android:layout_height="match_parent" diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml index 1c55a1446..a9ebe43d3 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml @@ -34,7 +34,7 @@ android:id="@+id/user_id_item_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/tertiary_text_light" + android:textColor="?attr/colorTertiaryText" android:text="comment" android:textAppearance="?android:attr/textAppearanceSmall" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index a71eb5880..8c1023427 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -17,7 +17,7 @@ android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" - card_view:cardBackgroundColor="@android:color/white" + card_view:cardBackgroundColor="?attr/colorCardViewBackground" card_view:cardElevation="2dp" card_view:cardUseCompatPadding="true" card_view:cardCornerRadius="4dp"> @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" - card_view:cardBackgroundColor="@android:color/white" + card_view:cardBackgroundColor="?attr/colorCardViewBackground" card_view:cardElevation="2dp" card_view:cardUseCompatPadding="true" card_view:cardCornerRadius="4dp"> diff --git a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml index 83272ef4e..57f93493d 100644 --- a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml +++ b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:transitionName="card" - card_view:cardBackgroundColor="@android:color/white" + card_view:cardBackgroundColor="?attr/colorCardViewBackground" card_view:cardElevation="2dp" card_view:cardUseCompatPadding="true" card_view:cardCornerRadius="4dp" diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml index c4797d5f7..d3a2bd0fd 100644 --- a/OpenKeychain/src/main/res/menu/key_list.xml +++ b/OpenKeychain/src/main/res/menu/key_list.xml @@ -10,11 +10,6 @@ app:showAsAction="collapseActionView|always" /> <item - android:id="@+id/menu_key_list_export" - android:title="@string/menu_export_all_keys" - app:showAsAction="never" /> - - <item android:id="@+id/menu_key_list_create" android:title="@string/menu_manage_keys" app:showAsAction="never" /> diff --git a/OpenKeychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml index 7fdf4a5c1..26bc9f98f 100644 --- a/OpenKeychain/src/main/res/menu/key_list_multi.xml +++ b/OpenKeychain/src/main/res/menu/key_list_multi.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> <item android:id="@+id/menu_key_list_multi_encrypt" @@ -8,21 +8,8 @@ android:title="@string/menu_encrypt_to" /> <item - android:id="@+id/menu_key_list_multi_export" - android:showAsAction="never" - tools:ignore="AppCompatResource" - android:title="@string/menu_export_key" /> - - <item android:id="@+id/menu_key_list_multi_delete" - android:showAsAction="never" - tools:ignore="AppCompatResource" + android:icon="@drawable/ic_delete_white_24dp" android:title="@string/menu_delete_key" /> - <item - android:id="@+id/menu_key_list_multi_select_all" - android:showAsAction="never" - tools:ignore="AppCompatResource" - android:title="@string/menu_select_all" /> - </menu> diff --git a/OpenKeychain/src/main/res/menu/keyserver_pref_menu.xml b/OpenKeychain/src/main/res/menu/keyserver_pref_menu.xml new file mode 100644 index 000000000..c4002a682 --- /dev/null +++ b/OpenKeychain/src/main/res/menu/keyserver_pref_menu.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/menu_add_keyserver" + android:title="@string/menu_search" + android:icon="@drawable/ic_add_white_24dp" + app:showAsAction="always" /> +</menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/raw-ar/help_changelog.md b/OpenKeychain/src/main/res/raw-ar/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-ar/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-ar/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-bg/help_changelog.md b/OpenKeychain/src/main/res/raw-bg/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-bg/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-bg/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.md b/OpenKeychain/src/main/res/raw-cs/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-cs/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.md b/OpenKeychain/src/main/res/raw-de/help_changelog.md index 8b845a6b2..80551b8d7 100644 --- a/OpenKeychain/src/main/res/raw-de/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-de/help_changelog.md @@ -1,11 +1,16 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 - * New decryption screen - * Decryption of multiple files at once - * Better handling of YubiKey errors + * Neuer Entschlüsselungsbildschirm + * Entschlüsselung mehrerer Dateien gleichzeitig + * Bessere Behandlung von YubiKey-Fehlern ## 3.2 @@ -81,37 +86,37 @@ * Experimental YubiKey support: Preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain * Nutzung gekürzter Schlüssel repariert * Standardmäßig SHA256 aufgrund von Kompatibilität - * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API - * OpenPGP API now handles revoked/expired keys and returns all user ids + * Intent-API hat sich geändert, siehe https://github.com/open-keychain/open-keychain/wiki/Intent-API + * OpenPGP-API bearbeitet ab jetzt widerrufene/abgelaufene Schlüssel und gibt alle Benutzer-IDs zurück ## 2.9 - * Fixing crashes introduced in v2.8 + * Behebt Abstürze aus v2.8 * Experimentelle ECC-Unterstützung - * Experimental YubiKey support: Only signing with imported keys + * Experimentelle YubiKey-Unterstützung (nur Unterschreiben mit importierten Schlüsseln) ## 2.8 - * So many bugs have been fixed in this release that we focus on the main new features - * Key edit: awesome new design, key revocation - * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records + * In diesem Release wurden so viele Fehler behoben, dass wir uns lieber auf die neuen Funktionen konzentrieren + * Schlüsselbearbeitung: Fantastisches neues Design, Schlüsselwiderruf + * Schlüsselimport: Fantastisches neues Design, sichere Verbindungen zu Keyservern über hkps, Namensauflösung der Schlüsselserver über DNS SRV-Einträge * Neuer Bildschirm bei der ersten Öffnung - * New key creation screen: autocompletion of name and email based on your personal Android accounts - * File encryption: awesome new design, support for encrypting multiple files - * New icons to show status of key (by Brennan Novak) - * Important bug fix: Importing of large key collections from a file is now possible - * Notification showing cached passphrases - * Keys are connected to Android's contacts + * Neuer Schlüsselerstellungsbildschirm: Autovervollständigung von Name und E-Mail basierend auf Deinen persönlichen Android-Konten + * Dateiverschlüsselung: fantastisches neues Design, Unterstützung für die Verschlüsselung mehrerer Dateien + * Neue Symbile zum Anzeigen des Schlüsselstatus (von Brennan Novak) + * Wichtiger Fehler behoben: Import großer Schlüsselsammlungen aus einer Datei ist nun möglich + * Benachrichtigung, die zwischengespeicherte Passwörter anzeigt + * Schlüssel sind mit den Kontakten verbunden -This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar +Dieser Release wäre ohne die Arbeit von Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray und Thialfihar nicht möglich gewesen ## 2.7 * Lila! (Dominik, Vincent) - * New key view design (Dominik, Vincent) - * New flat Android buttons (Dominik, Vincent) + * Neues Schlüsselansichtsdesign (Dominik, Vincent) + * Neue flache Android-Knöpfe (Dominik, Vincent) * API-Korrekturen (Dominik) * Import aus keybase.io (Tim Bray) @@ -123,28 +128,28 @@ This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2 ## 2.6 - * Key certifications (thanks to Vincent Breitmoser) - * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser) - * New design for signature verification + * Schlüsselbeglaubigungen (dank Vincent Breitmoser) + * Unterstützung für GnuPG-Teilschlüssel (danke an Vincent Breitmoser) + * Neues Design für Signaturprüfung * Benutzerdefinierte Schlüssellänge (Dank an Greg Witczak) - * Fix share-functionality from other apps + * Fehler bei der Teilen-Funktionalität aus anderen Apps behoben ## 2.5 - * Fix decryption of symmetric OpenPGP messages/files - * Refactored key edit screen (thanks to Ash Hughes) - * New modern design for encrypt/decrypt screens - * OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup) + * Fehler bei der Entschlüsselung symmetrischer OpenPGP-Nachrichten/Dateien behoben + * Umgestaltung des Schlüsselbearbeitungsbildschirms (Dank an Ash Hughes) + * Neues modernes Design für Verschlüsselungs-/Entschlüsselungsbildschirme + * OpenPGP-API Version 3 (mehrere API-Konten, interne Fehlerbehebungen, Schlüsselsuche) ## 2.4 -Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! -Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Dank an alle Bewerber bei Google Summer of Code 2014, welche diesen Release funktionsreich und fehlerfrei gemacht haben! +Neben einigen kleinen Fehlerbehebungen wurden bemerkenswert viele Patches durch die folgenden Personen beigesteuert (alphabetisch sortiert): Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser. - * New unified key list - * Colorized key fingerprint + * Neue einheitliche Schlüsselliste + * Eingefärbter Schlüsselfingerabdruck * Support for keyserver ports * Deactivate possibility to generate weak keys * Much more internal work on the API diff --git a/OpenKeychain/src/main/res/raw-es/help_about.md b/OpenKeychain/src/main/res/raw-es/help_about.md index de39a8146..fdf0e7063 100644 --- a/OpenKeychain/src/main/res/raw-es/help_about.md +++ b/OpenKeychain/src/main/res/raw-es/help_about.md @@ -57,7 +57,7 @@ Licencia: GPLv3+ * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licencia Apache v2) * [ZXing](https://github.com/zxing/zxing) (Licencia Apache v2) * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Licencia Apache v2) - * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) + * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Licencia Apache v2) * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Licencia Apache v2) * [Snackbar](https://github.com/nispok/snackbar) (Licencia MIT) * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licencia Apache v2) diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.md b/OpenKeychain/src/main/res/raw-es/help_changelog.md index 087392cdf..909a95fa9 100644 --- a/OpenKeychain/src/main/res/raw-es/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-es/help_changelog.md @@ -1,11 +1,16 @@ [//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 - * New decryption screen - * Decryption of multiple files at once - * Better handling of YubiKey errors + * Nueva pantalla de descifrado + * Descifrado de múltiples ficheros a la vez + * Mejor manejo de errores de YubiKey ## 3.2 diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.md b/OpenKeychain/src/main/res/raw-et/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-et/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-et/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-eu/help_about.md b/OpenKeychain/src/main/res/raw-eu/help_about.md index 06f2e3fd1..ce443f234 100644 --- a/OpenKeychain/src/main/res/raw-eu/help_about.md +++ b/OpenKeychain/src/main/res/raw-eu/help_about.md @@ -57,7 +57,7 @@ Baimena: GPLv3+ * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache Baimena v2) * [ZXing](https://github.com/zxing/zxing) (Apache Baimena v2) * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache Baimena v2) - * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) + * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Diseinua) (Apache Baimena 2 bertsioa) * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache Baimena v2) * [Snackbar](https://github.com/nispok/snackbar) (MIT Baimena) * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache Baimena v2) diff --git a/OpenKeychain/src/main/res/raw-eu/help_changelog.md b/OpenKeychain/src/main/res/raw-eu/help_changelog.md index 04771c696..f7af66c5b 100644 --- a/OpenKeychain/src/main/res/raw-eu/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-eu/help_changelog.md @@ -1,15 +1,20 @@ [//]: # (OHARRA: Meseez jarri esaldi bakoitza bere lerroan, Transifex-ek lerroak bere itzulpen eremuan jartzen ditu!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 - * New decryption screen - * Decryption of multiple files at once - * Better handling of YubiKey errors + * Azalpen ikusleiho berria + * Agiri ugariren azalpena aldiberean + * YubiKey akatsen kudeaketa hobea ## 3.2 - * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,... + * Lehen bertsioa YubiKey sostengu osoarekin eskuragarri erabiltzaile interfazetik: Editatu giltzak, lotu YubiKey giltzekin,... Material diseinua * QR Kode eskaneatzea baterapena (Baimen berriak beharrezkoak) * Hobetuta giltza sortze laguntzailea @@ -55,10 +60,10 @@ ## 3.0 - * Propose installable compatible apps in apps list + * Eskaini bateragarritasun ezegonkorreko aplikazioak aplikazio zerrendan * Diseinu berria dekriptaketa ikusleihoentzat * Zuzenketa ugari giltza inportatzean, zuzenduta baita ere giltzen zuriketa - * Honor and display key authenticate flags + * Ohoretu eta erakutsi giltza egiaztapen ikurrak * Erabiltzaile interfazea norbere giltzak sortzeko * Zuzenduta erabiltzaile id ukatze egiaztagiriak * Hodei bilaketa berria (ohiko giltza-zerbitzari eta keybase.io gain bilatzen da) @@ -68,8 +73,8 @@ ## 2.9.2 - * Fix keys broken in 2.9.1 - * Experimental YubiKey support: Decryption now working via API + * Zuzenduta 2.9.1-ko giltza haustea + * YubiKey sostengu esperimentala. Dekriptaketak orain API bidez egiten du lan ## 2.9.1 diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.md b/OpenKeychain/src/main/res/raw-fi/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-fi/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-fi/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-fr/help_about.md b/OpenKeychain/src/main/res/raw-fr/help_about.md index a93d250a5..0eb1e9823 100644 --- a/OpenKeychain/src/main/res/raw-fr/help_about.md +++ b/OpenKeychain/src/main/res/raw-fr/help_about.md @@ -57,7 +57,7 @@ Licence : GPLv3+ * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licence Apache v2) * [ZXing](https://github.com/zxing/zxing) (Licence Apache v2) * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Licence Apache v2) - * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) + * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Conception matérielle)</a> (Licence Apache v2) * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Licence Apache v2) * [Snackbar](https://github.com/nispok/snackbar) (Licence MIT) * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licence Apache v2) diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.md b/OpenKeychain/src/main/res/raw-fr/help_changelog.md index c6275e322..4bbea2d1b 100644 --- a/OpenKeychain/src/main/res/raw-fr/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.md @@ -1,15 +1,20 @@ [//] : # (NOTE : veuillez mettre chaque phrase sur sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 - * New decryption screen - * Decryption of multiple files at once - * Better handling of YubiKey errors + * Nouvel écran de déchiffrement + * Déchiffrement simultané de plusieurs fichiers + * Meilleure gestion des erreurs ClefYubi ## 3.2 - * Première version avec prise en charge complète de la clef Yubi, proposée dans l'interface utilisateur : modifier les clefs, relier la clef Yubi au clefs... + * Première version avec prise en charge complète de la ClefYubi, proposée dans l'interface utilisateur : modifier les clefs, relier la clef Yubi au clefs... * Conception matérielle * Intégration de la lecture de code QR (nouvelles permissions exigées) * Amélioration de l'assistant de création de clef @@ -44,7 +49,7 @@ * Écran de déchiffrement redessiné * Nouveaux agencement et couleurs d'icônes * Importation des clefs secrètes corrigée de Symantec Encryption Desktop - * Prise en charge expérimentale des clefs Yubi : les ID de sous-clefs sont maintenant vérifiés correctement + * Prise en charge expérimentale de la ClefYubi : les ID de sous-clefs sont maintenant vérifiés correctement ## 3.0.1 @@ -63,13 +68,13 @@ * Corrigé - Certificats de révocation des ID utilisateurs * Nouvelle recherche nuagique (dans les serveurs traditionnels et dans keybase.io) * Prise en charge du dépouillement des clefs dans OpenKeychain - * Prise en charge expérimentale des clefs Yubi : prise en charge de la génération de signature et le déchiffrement + * Prise en charge expérimentale de la ClefYubi : prise en charge de la génération de signature et le déchiffrement ## 2.9.2 * Correctif - Clefs brisées dans 2.9.1 - * Prise en charge expérimentale des clefs Yubi : le déchiffrement fonctionne maintenant avec l'API + * Prise en charge expérimentale de la ClefYubi : le déchiffrement fonctionne maintenant avec l'API ## 2.9.1 @@ -78,7 +83,7 @@ * Correctif - Gestion des drapeaux de clefs (prend maintenant en charge les clefs Mailvelope 0.7) * Gestion des phrases de passe améliorée * Partage de clefs par SafeSlinger - * Prise en charge expérimentale des clefs Yubi : préférence pour permettre d'autres NIP, seule la signature par l'API OpenPGP fonctionne actuellement, mais pas dans OpenKeychain + * Prise en charge expérimentale de la ClefYubi : préférence pour permettre d'autres NIP, seule la signature par l'API OpenPGP fonctionne actuellement, mais pas dans OpenKeychain * Correctif - Utilisation de clefs dépouillées * SHA256 par défaut pour la compatibilité * L'API des intentions a changé, voir https://github.com/open-keychain/open-keychain/wiki/Intent-API @@ -89,7 +94,7 @@ * Correction des plantages présents dans v2.8 * Prise en charge expérimentale CCE - * Prise en charge expérimentale des clefs Yubi : signature seulement avec les clefs importées + * Prise en charge expérimentale de la ClefYubi : signature seulement avec les clefs importées ## 2.8 diff --git a/OpenKeychain/src/main/res/raw-is/help_changelog.md b/OpenKeychain/src/main/res/raw-is/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-is/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-is/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-it/help_about.md b/OpenKeychain/src/main/res/raw-it/help_about.md index 844fb51ca..d69eaaf89 100644 --- a/OpenKeychain/src/main/res/raw-it/help_about.md +++ b/OpenKeychain/src/main/res/raw-it/help_about.md @@ -57,7 +57,7 @@ Licenza: GPLv3+ * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2) * [ZXing](https://github.com/zxing/zxing) (Apache License v2) * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2) - * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) + * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Design materiale) (Apache License v2) * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache License v2) * [Snackbar](https://github.com/nispok/snackbar) (MIT License) * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2) diff --git a/OpenKeychain/src/main/res/raw-it/help_changelog.md b/OpenKeychain/src/main/res/raw-it/help_changelog.md index 2cc690901..21b05c8d2 100644 --- a/OpenKeychain/src/main/res/raw-it/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-it/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTA: Si prega di mettere ogni frase in una propria linea, Transifex mette ogni riga nel proprio campo di traduzione!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.md b/OpenKeychain/src/main/res/raw-ja/help_changelog.md index c5ab2b2c1..9c6dc7208 100644 --- a/OpenKeychain/src/main/res/raw-ja/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.md @@ -1,11 +1,16 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 - * New decryption screen - * Decryption of multiple files at once - * Better handling of YubiKey errors + * 新しい復号画面 + * 一度に複数のファイルの復号 + * YubiKeyのエラーについてよりよい扱い ## 3.2 diff --git a/OpenKeychain/src/main/res/raw-kn/help_changelog.md b/OpenKeychain/src/main/res/raw-kn/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-kn/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-kn/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-nl/help_about.md b/OpenKeychain/src/main/res/raw-nl/help_about.md index 6f64c0fd8..e5206fd84 100644 --- a/OpenKeychain/src/main/res/raw-nl/help_about.md +++ b/OpenKeychain/src/main/res/raw-nl/help_about.md @@ -57,7 +57,7 @@ Licentie: GPLv3+ * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache licentie v2) * [ZXing](https://github.com/zxing/zxing) (Apache licentie v2) * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache licentie v2) - * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) + * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache licentie v2) * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Apache licentie v2) * [Snackbar](https://github.com/nispok/snackbar) (MIT licentie) * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache licentie v2) diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.md b/OpenKeychain/src/main/res/raw-nl/help_changelog.md index 577ff26b0..88b23916b 100644 --- a/OpenKeychain/src/main/res/raw-nl/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.md @@ -1,11 +1,16 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 - * New decryption screen - * Decryption of multiple files at once - * Better handling of YubiKey errors + * Nieuw ontsleutelingsscherm + * Ontsleuteling van meerdere bestanden tegelijk + * Beter verwerken van YubiKey-fouten ## 3.2 diff --git a/OpenKeychain/src/main/res/raw-pl/help_about.md b/OpenKeychain/src/main/res/raw-pl/help_about.md index e80a2c766..eb3328cfa 100644 --- a/OpenKeychain/src/main/res/raw-pl/help_about.md +++ b/OpenKeychain/src/main/res/raw-pl/help_about.md @@ -2,12 +2,12 @@ [http://www.openkeychain.org](http://www.openkeychain.org) -[OpenKeychain](http://www.openkeychain.org) is an OpenPGP implementation for Android. +[OpenKeychain](http://www.openkeychain.org) jest implementacją OpenPGP dla Androida. -License: GPLv3+ +Licencja: GPLv3+ -## Main Developers - * Dominik Schürmann (Maintainer) +## Główni deweloperzy + * Dominik Schürmann (Opiekun projektu) * Vincent Breitmoser ## Contributors @@ -47,7 +47,7 @@ License: GPLv3+ * 'Thialfihar' (APG developer) * Tim Bray -## Libraries +## Biblioteki * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License) * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License) * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2) diff --git a/OpenKeychain/src/main/res/raw-pl/help_certification.md b/OpenKeychain/src/main/res/raw-pl/help_certification.md index 3518adf73..8031f7a87 100644 --- a/OpenKeychain/src/main/res/raw-pl/help_certification.md +++ b/OpenKeychain/src/main/res/raw-pl/help_certification.md @@ -1,8 +1,8 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## Key Confirmation -Without confirmation, you cannot be sure if a key really corresponds to a specific person. -The simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC. +## Potwiedzenie klucza +Bez potwierdzenia nie masz pewności czy klucz odpowiada danej osobie. +Najłatwiejszą drogą potwierdzenia klucza jest zeskanowanie kodu QR lub wysłanie go przez NFC To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys. ## Key Status diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.md b/OpenKeychain/src/main/res/raw-pl/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-pl/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-pt/help_changelog.md b/OpenKeychain/src/main/res/raw-pt/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-pt/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-pt/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-ro/help_changelog.md b/OpenKeychain/src/main/res/raw-ro/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-ro/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-ro/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.md b/OpenKeychain/src/main/res/raw-ru/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-ru/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.md b/OpenKeychain/src/main/res/raw-sl/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-sl/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-sr/help_about.md b/OpenKeychain/src/main/res/raw-sr/help_about.md index a6ba4ba2c..d4b6ba700 100644 --- a/OpenKeychain/src/main/res/raw-sr/help_about.md +++ b/OpenKeychain/src/main/res/raw-sr/help_about.md @@ -57,7 +57,7 @@ * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Апачи лиценца в2) * [ZXing](https://github.com/zxing/zxing) (Апачи лиценца в2) * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Апачи лиценца в2) - * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) + * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Материјал дизајн) (Апачи лиценца в2) * [MaterialDrawer](https://github.com/mikepenz/MaterialDrawer) (Апачи лиценца в2) * [Snackbar](https://github.com/nispok/snackbar) (МИТ лиценца) * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Апачи лиценца в2) diff --git a/OpenKeychain/src/main/res/raw-sr/help_changelog.md b/OpenKeychain/src/main/res/raw-sr/help_changelog.md index bb230ab96..3fe45259b 100644 --- a/OpenKeychain/src/main/res/raw-sr/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-sr/help_changelog.md @@ -1,11 +1,16 @@ [//]: # +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 - * New decryption screen - * Decryption of multiple files at once - * Better handling of YubiKey errors + * Нови екран дешифровања + * Дешифровање више фајлова одједном + * Боље руковање грешкама Јубикључа ## 3.2 @@ -21,7 +26,7 @@ * Поправка: неки од важећих кључева су били приказивани као опозвани или истекли * Не прихатај потписе од истеклих или опозваних кључева * Keybase.io подршка у напредном приказу - * метода ажурирања свих кључева одједном + * Метода ажурирања свих кључева одједном ## 3.1.2 diff --git a/OpenKeychain/src/main/res/raw-sv/help_changelog.md b/OpenKeychain/src/main/res/raw-sv/help_changelog.md index b80e08e6e..83e4a8e06 100644 --- a/OpenKeychain/src/main/res/raw-sv/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-sv/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTERING: Var vänlig och sätt varje mening på sin egen rad, Transifex sätter varje rad i sitt eget fält för översättningar!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.md b/OpenKeychain/src/main/res/raw-tr/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-tr/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.md b/OpenKeychain/src/main/res/raw-uk/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-uk/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-vi/help_changelog.md b/OpenKeychain/src/main/res/raw-vi/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-vi/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-vi/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md index da95f2184..ad9be42be 100644 --- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.md b/OpenKeychain/src/main/res/raw-zh/help_changelog.md index d45ce636b..45ac104e0 100644 --- a/OpenKeychain/src/main/res/raw-zh/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/raw/help_changelog.md b/OpenKeychain/src/main/res/raw/help_changelog.md index 1c9d27629..df61f3472 100644 --- a/OpenKeychain/src/main/res/raw/help_changelog.md +++ b/OpenKeychain/src/main/res/raw/help_changelog.md @@ -1,5 +1,10 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) +## 3.4 + + * Anonymous key download over Tor + * Proxy support + * Better YubiKey error handling ## 3.3 diff --git a/OpenKeychain/src/main/res/values-ar/strings.xml b/OpenKeychain/src/main/res/values-ar/strings.xml index 8f84af665..0713e39ad 100644 --- a/OpenKeychain/src/main/res/values-ar/strings.xml +++ b/OpenKeychain/src/main/res/values-ar/strings.xml @@ -7,6 +7,11 @@ <!--button--> <!--menu--> <!--label--> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <!--choice--> <!--key flags--> <!--sentences--> @@ -42,7 +47,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -61,6 +66,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-bg/strings.xml b/OpenKeychain/src/main/res/values-bg/strings.xml index 8f84af665..0713e39ad 100644 --- a/OpenKeychain/src/main/res/values-bg/strings.xml +++ b/OpenKeychain/src/main/res/values-bg/strings.xml @@ -7,6 +7,11 @@ <!--button--> <!--menu--> <!--label--> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <!--choice--> <!--key flags--> <!--sentences--> @@ -42,7 +47,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -61,6 +66,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml index 545778ff7..4b367a5b3 100644 --- a/OpenKeychain/src/main/res/values-cs/strings.xml +++ b/OpenKeychain/src/main/res/values-cs/strings.xml @@ -111,7 +111,6 @@ <string name="label_use_default_yubikey_pin">Použít výchozí YubiKey PIN</string> <string name="label_use_num_keypad_for_yubikey_pin">Použít numerickou klávesnici pro YubiKey PIN</string> <string name="label_label_use_default_yubikey_pin_summary">Používá základní PIN (123456) pro přístup k YubiKey přes NFC</string> - <string name="label_asymmetric_from">Podepsáno:</string> <string name="label_to">Zašifrovat pro:</string> <string name="label_delete_after_encryption">Smazat soubory po zašifrování</string> <string name="label_delete_after_decryption">Smazat po rozšifrování</string> @@ -135,7 +134,6 @@ <string name="label_send_key">Synchronizovat s cloudem</string> <string name="label_fingerprint">Otisk</string> <string name="expiry_date_dialog_title">Nastavit datum expirace</string> - <string name="label_first_keyserver_is_used">(Výchozí je první keyserver)</string> <string name="label_preferred">upřednostněno</string> <string name="label_enable_compression">Zapnout kompresi</string> <string name="label_encrypt_filenames">Zašifrovat jména souborů</string> @@ -146,6 +144,11 @@ <string name="pref_keyserver_summary">Vyhledat klíče na vybraném OpenPGP keyserveru (protokol HKP)</string> <string name="pref_keybase">keybase.io</string> <string name="pref_keybase_summary">Hledat klíče na keybase.io</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><beze jména></string> <string name="none"><žádný></string> <plurals name="n_keys"> @@ -195,7 +198,6 @@ <string name="passphrase_for">Zadejte heslo pro \'%s\'</string> <string name="pin_for">Zadejte PIN pro \'%s\'</string> <string name="yubikey_pin_for">Zadejte PIN pro přístup k YubiKey pro \'%s\'</string> - <string name="nfc_text">Přidržte YubiKey u zadní strany vašeho přístroje.</string> <string name="file_delete_confirmation_title">Smazat původní soubory?</string> <string name="file_delete_confirmation">Následjící soubory budou vymazány:%s</string> <string name="file_delete_successful">%1$d z %2$d souborů bylo vymazáno.%3$s</string> @@ -204,7 +206,7 @@ <string name="select_encryption_key">Vyberte alespoň jeden šifrovací klíč.</string> <string name="specify_file_to_encrypt_to">Prosím specifikujte do kterého souboru zašifrovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string> <string name="specify_file_to_decrypt_to">Prosím specifikujte do kterého souboru rozšifrovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string> - <string name="specify_file_to_export_to">Prosím specifikujte do kterého souboru exportovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string> + <string name="specify_backup_dest">Prosím specifikujte do kterého souboru exportovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string> <string name="key_deletion_confirmation_multi">Opravdu chcete smazat všechny vybrané soubory?</string> <string name="secret_key_deletion_confirmation">Po smazání již nebudete schopni přečíst zprávy zašifrované tímto klíčem a stratíte všechny potvrzení udělané tímto klíčem!</string> <string name="public_key_deletetion_confirmation">Smazat klíč \'%s\'?</string> @@ -387,7 +389,7 @@ <string name="api_settings_start">Spustit aplikaci</string> <string name="api_settings_delete_account">Smazat účet</string> <string name="api_settings_package_name">Jméno balíčku</string> - <string name="api_settings_package_signature">SHA-256 z podpisu balíčku</string> + <string name="api_settings_package_certificate">SHA-256 z podpisu balíčku</string> <string name="api_settings_settings">Nastavení</string> <string name="api_settings_key">Klíč účtu:</string> <string name="api_settings_accounts_empty">Žádné účty nejsou specifikovány pro tuto appku.</string> @@ -502,7 +504,7 @@ <string name="view_key_verified">Potvrzený klíč</string> <string name="view_key_unverified">Nepotvrzen: Naskenujte QR kód abyste ho potvrdili!</string> <string name="view_key_fragment_no_system_contact"><žádný></string> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Přidat keyserver</string> <string name="add_keyserver_verified">Keyserver ověřen!</string> <string name="add_keyserver_without_verification">Keyserver přidán bez verifikace.</string> @@ -656,6 +658,7 @@ <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> <string name="msg_acc_saved">Účet uložen</string> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index b5990a82e..fe9963a91 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -48,12 +48,16 @@ <string name="section_key_server">Schlüsselserver</string> <string name="section_fingerprint">Fingerabdruck</string> <string name="section_encrypt">Verschlüsseln</string> + <string name="section_decrypt">Entschlüsseln / Verifizieren</string> <string name="section_current_expiry">Aktuelles Ablaufdatum</string> <string name="section_new_expiry">Neues Ablaufdatum</string> <!--button--> <string name="btn_decrypt_verify_file">Datei entschlüsseln, verifizieren und speichern</string> <string name="btn_encrypt_share_file">Datei verschlüsseln und teilen</string> <string name="btn_encrypt_save_file">Datei verschlüsseln und speichern</string> + <string name="btn_save_file">Datei speichern</string> + <string name="btn_save">Speichern</string> + <string name="btn_view_log">Log ansehen</string> <string name="btn_do_not_save">Abbrechen</string> <string name="btn_delete">Löschen</string> <string name="btn_no_date">Kein Ablaufdatum</string> @@ -70,6 +74,8 @@ <string name="btn_add_files">Datei(en) hinzufügen</string> <string name="btn_share_decrypted_text">Entschlüsselten Text teilen</string> <string name="btn_copy_decrypted_text">Entschlüsselten Text kopieren</string> + <string name="btn_decrypt_clipboard">Aus Zwischenablage lesen</string> + <string name="btn_decrypt_files">Input Datei auswählen.</string> <string name="btn_encrypt_files">Dateien verschlüsseln</string> <string name="btn_encrypt_text">Text verschlüsseln</string> <string name="btn_add_email">Weitere E-Mail-Adresse hinzufügen</string> @@ -111,7 +117,6 @@ <string name="label_use_default_yubikey_pin">Standard-YubiKey-PIN verwenden</string> <string name="label_use_num_keypad_for_yubikey_pin">Zifferntastatur für YubiKey PIN verwenden</string> <string name="label_label_use_default_yubikey_pin_summary">Verwendet zum Zugriff auf YubiKeys über NFC die Standard-PIN (123456)</string> - <string name="label_asymmetric_from">Signiert von:</string> <string name="label_to">Verschlüsselt an:</string> <string name="label_delete_after_encryption">Dateien nach Verschlüsselung löschen</string> <string name="label_delete_after_decryption">Nach Entschlüsselung löschen</string> @@ -135,7 +140,6 @@ <string name="label_send_key">Mit der Cloud synchronisieren</string> <string name="label_fingerprint">Fingerabdruck</string> <string name="expiry_date_dialog_title">Ablaufdatum festsetzen</string> - <string name="label_first_keyserver_is_used">(Oberster Schlüsselserver wird bevorzugt)</string> <string name="label_preferred">bevorzugt</string> <string name="label_enable_compression">Komprimierung aktivieren</string> <string name="label_encrypt_filenames">Dateinamen verschlüsseln</string> @@ -146,6 +150,11 @@ <string name="pref_keyserver_summary">Schlüssel auf ausgewählten OpenPGP-Schlüsselservern suchen (HKP-Protokoll)</string> <string name="pref_keybase">keybase.io</string> <string name="pref_keybase_summary">Schlüssel auf keybase.io suchen</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><kein Name></string> <string name="none"><keine></string> <plurals name="n_keys"> @@ -193,16 +202,16 @@ <string name="passphrase_for">Passwort für \'%s\' eingeben</string> <string name="pin_for">PIN für \'%s\' eingeben</string> <string name="yubikey_pin_for">PIN für Zugriff auf Yubikey für \'%s\' eingeben</string> - <string name="nfc_text">Halte YubiKey gegen die Rückseite Deines Geräts.</string> <string name="file_delete_confirmation_title">Originaldateien löschen?</string> <string name="file_delete_confirmation">Die folgenden Dateien werden gelöscht: %s</string> <string name="file_delete_successful">%1$d von %2$d Dateien wurden gelöscht.%3$s</string> + <string name="no_file_selected">Keine Datei ausgewählt.</string> <string name="encrypt_sign_successful">Erfolgreich signiert und/oder verschlüsselt.</string> <string name="encrypt_sign_clipboard_successful">Erfolgreich in die Zwischenablage signiert und/oder verschlüsselt.</string> <string name="select_encryption_key">Mindestens einen Schlüssel zum Verschlüsseln auswählen.</string> <string name="specify_file_to_encrypt_to">Bitte angeben in welche Datei verschlüsselt werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert.</string> <string name="specify_file_to_decrypt_to">Bitte angeben in welche Datei entschlüsselt werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert.</string> - <string name="specify_file_to_export_to">Bitte angeben in welche Datei exportiert werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert.</string> + <string name="specify_backup_dest">Bitte angeben in welche Datei exportiert werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert.</string> <string name="key_deletion_confirmation_multi">Möchtest du wirklich alle ausgewählten Schlüssel löschen?</string> <string name="secret_key_deletion_confirmation">Nach dem Löschen wird es dir nicht mehr möglich sein mit diesem Schlüssel verschlüsselte Nachrichten zu lesen und zudem wirst du alle damit getätigten Bestätigungen verlieren!</string> <string name="public_key_deletetion_confirmation">Schlüssel \'%s\' löschen?</string> @@ -368,6 +377,7 @@ <!--Import from URL--> <string name="import_url_warn_no_search_parameter">Kein Suchbegriff angegeben. Sie können trotzdem manuell auf dem Keyserver suchen.</string> <!--Generic result toast--> + <string name="snackbar_details">Details</string> <string name="with_warnings">, mit Warnungen</string> <string name="with_cancelled">. bis abgebrochen wurde</string> <!--Import result toast--> @@ -449,7 +459,7 @@ <string name="api_settings_start">Starte Anwendung</string> <string name="api_settings_delete_account">Benutzerkonto löschen</string> <string name="api_settings_package_name">Paketname</string> - <string name="api_settings_package_signature">SHA-256 der Paketsignatur</string> + <string name="api_settings_package_certificate">SHA-256 der Paketsignatur</string> <string name="api_settings_accounts">Benutzerkonten (veraltete API)</string> <string name="api_settings_advanced">Erweiterte Informationen</string> <string name="api_settings_allowed_keys">Erlaubte Schlüssel</string> @@ -594,7 +604,7 @@ <string name="view_key_verified">Bestätigter Schlüssel</string> <string name="view_key_unverified">Unbestätigt: QR-Code scannen, um den Schlüssel zu bestätigen!</string> <string name="view_key_fragment_no_system_contact"><keine></string> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Schlüsselserver hinzufügen</string> <string name="add_keyserver_verified">Schlüsselserver bestätigt!</string> <string name="add_keyserver_without_verification">Schlüsselserver ohne Überprüfung hinzugefügt.</string> @@ -954,7 +964,6 @@ <string name="msg_dc_error_integrity_check">Integritätsprüfungsfehler!</string> <string name="msg_dc_error_integrity_missing">Fehlende Integritätsprüfung Dies kann passieren, wenn die Verschlüsselungsanwendung veraltet ist oder durch einen Downgrade-Angriff.</string> <string name="msg_dc_error_invalid_data">Kein gültiger OpenPGP-verschlüsselter oder -signierter Inhalt!</string> - <string name="msg_dc_error_io">Ein-/Ausgabefehler während Vorgang aufgetreten!</string> <string name="msg_dc_error_no_data">Keine verschlüsselten Daten in Datenstrom gefunden!</string> <string name="msg_dc_error_no_key">Keine verschlüsselten Daten mit bekanntem geheimen Schlüssel in Datenstrom gefunden!</string> <string name="msg_dc_error_pgp_exception">Es ist ein OpenPGP-Ausnahmefehler während des Vorgangs aufgetreten!</string> @@ -1109,6 +1118,10 @@ <string name="msg_download_too_many_responses">Schlüsselsuchanfrage lieferte zu viele Kandidaten, bitte die Suchanfrage verfeinern!</string> <string name="msg_download_query_too_short_or_too_many_responses">Entweder keine oder zu viele Schlüssel wurden gefunden, bitte die Suchanfrage präzisieren!</string> <string name="msg_download_query_failed">Beim Suchen der Schlüssel ist ein Fehler aufgetreten.</string> + <!--Messages for Keybase Verification operation--> + <string name="msg_keybase_error_no_prover">Kein Nachweis-Prüfer gefunden für %s</string> + <string name="msg_keybase_error_fetching_evidence">Problem beim Holen des Nachweises</string> + <string name="msg_keybase_error_key_mismatch">Schlüssel-Fingerabdruck stimmt nicht mit dem Fingerabdruck im Nachweis überein</string> <!--Messages for Export Log operation--> <string name="msg_export_log_start">Exportiere Protokoll</string> <string name="msg_export_log_error_fopen">Fehler beim Öffnen der Datei</string> @@ -1123,6 +1136,7 @@ <string name="first_time_import_key">Schlüssel aus Datei importieren</string> <string name="first_time_yubikey">YubiKey NEO verwenden</string> <string name="first_time_skip">Setup überspringen</string> + <string name="first_time_blank_yubikey_yes">Diesen YubiKey verwenden</string> <!--unsorted--> <string name="section_certifier_id">Beglaubiger</string> <string name="section_cert">Beglaubigungsdetails</string> @@ -1147,7 +1161,7 @@ <string name="unknown_algorithm">unbekannt</string> <string name="can_sign_not">Kann nicht unterschreiben</string> <string name="error_no_encrypt_subkey">Kein Unterschlüssel zum Verschlüsseln verfügbar!</string> - <string name="info_no_manual_account_creation">Erstelle OpenKeychain-Benutzerkonten nicht manuell.\nFür mehr Informationen sieh in die Hilfe.</string> + <string name="account_no_manual_account_creation">Erstelle OpenKeychain-Benutzerkonten nicht manuell.\nFür mehr Informationen sieh in die Hilfe.</string> <string name="contact_show_key">Schlüssel anzeigen (%s)</string> <string name="swipe_to_update">Nach unten wischen um von Schlüsselserver zu aktualisieren</string> <string name="error_no_file_selected">Mindestens eine Datei zum Verschlüsseln auswählen!</string> @@ -1195,15 +1209,9 @@ <string name="btn_import">Import</string> <string name="snack_yubi_other">Anderer Schlüssel auf YubiKey gespeichert!</string> <string name="error_nfc">NFC-Fehler: %s</string> - <string name="error_pin">NFC: Falsche PIN, %d Versuche verbleibend</string> - <string name="error_nfc_wrong_length">NFC: Falsche Länge für gesendete/empfangene Daten</string> - <string name="error_nfc_security_not_satisfied">NFC: Sicherheitsstatus nicht zufriedenstellend</string> - <string name="error_nfc_authentication_blocked">NFC: PIN nach zu vielen Versuchen gesperrt</string> - <string name="error_nfc_data_not_found">NFC: Schlüssel oder Objekt nicht gefunden</string> - <string name="error_nfc_unknown">NFC: Unbekannter Fehler</string> - <string name="error_nfc_bad_data">NFC: Karte meldete ungültige Daten</string> - <string name="error_nfc_header">NFC: Karte meldete ungültige %s Byte</string> <string name="error_pin_nodefault">Standard-PIN abgelehnt</string> + <string name="error_temp_file">Erstellen der temporären Datei fehlgeschlagen.</string> + <string name="btn_delete_original">Original Datei löschen</string> <string name="snack_encrypt_filenames_on">Dateinamen <b>sind</b> verschlüsselt.</string> <string name="snack_encrypt_filenames_off">Dateinamen <b>sind nicht</b> verschlüsselt.</string> <string name="snack_armor_on">Ausgabe als Text kodiert.</string> @@ -1212,4 +1220,14 @@ <string name="snack_compression_off">Komprimierung <b>deaktiviert</b>.</string> <string name="error_loading_keys">Fehler beim Laden der Schlüssel!</string> <string name="error_empty_log">(Fehler, leeres Protokoll)</string> + <string name="view_internal">In OpenKeychain ansehen</string> + <string name="error_preparing_data">Fehler beim Vorbereiten der Daten!</string> + <string name="label_clip_title">Verschlüsselte Daten</string> + <string name="progress_processing">Verarbeiten...</string> + <string name="error_saving_file">Fehler beim Speichern der Datei!</string> + <string name="file_saved">Datei gespeichert!</string> + <string name="file_delete_ok">Original Datei gelöscht</string> + <string name="file_delete_none">Keine Datei gelöscht! (bereits gelöscht?)</string> + <string name="file_delete_exception">Original Datei konnte nicht gelöscht werden!</string> + <string name="error_clipboard_empty">Zwischenablage ist leer!</string> </resources> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index f120f411d..2287ac121 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -43,6 +43,7 @@ <string name="section_keys">Subclaves</string> <string name="section_cloud_search">Búsqueda en la nube</string> <string name="section_passphrase_cache">Manejo de contraseña/PIN</string> + <string name="section_proxy_settings">Configuración para proxy</string> <string name="section_certify">Confirmar</string> <string name="section_actions">Acciones</string> <string name="section_share_key">Clave</string> @@ -56,6 +57,8 @@ <string name="btn_decrypt_verify_file">Desencriptar, verificar, y guardar fichero</string> <string name="btn_encrypt_share_file">Encriptar y compartir fichero</string> <string name="btn_encrypt_save_file">Encriptar y guardar fichero</string> + <string name="btn_save_file">Guardar fichero</string> + <string name="btn_save">Guardar</string> <string name="btn_view_log">Ver registro (log)</string> <string name="btn_do_not_save">Cancelar</string> <string name="btn_delete">Eliminar</string> @@ -98,6 +101,7 @@ <string name="menu_advanced">Información extendida</string> <string name="menu_certify_fingerprint">Confirmar mediante comparación de la huella digital</string> <string name="menu_export_log">Exportar registro</string> + <string name="menu_keyserver_add">Añadir</string> <!--label--> <string name="label_message">Texto</string> <string name="label_file">Archivo</string> @@ -116,7 +120,6 @@ <string name="label_use_default_yubikey_pin">Utilizar PIN predeterminado de la YubiKey</string> <string name="label_use_num_keypad_for_yubikey_pin">Utilizar teclado numérico para el PIN de la YubiKey</string> <string name="label_label_use_default_yubikey_pin_summary">Utiliza el PIN predeterminado (123456) para acceder a las YubiKeys sobre NFC</string> - <string name="label_asymmetric_from">Firmado por:</string> <string name="label_to">Cifrar hacia:</string> <string name="label_delete_after_encryption">Borrar ficheros después del cifrado</string> <string name="label_delete_after_decryption">Eliminar fichero después del descifrado</string> @@ -142,17 +145,49 @@ <string name="label_send_key">Sincronizar con la nube</string> <string name="label_fingerprint">Huella digital</string> <string name="expiry_date_dialog_title">Establer la fecha de vencimiento</string> - <string name="label_first_keyserver_is_used">(Se prefiere el primer servidor de claves listado)</string> + <string name="label_keyservers_title">Servidores de claves</string> + <string name="label_keyserver_settings_hint">Arrastrar para cambiar orden, pulsar para editar/borrar</string> + <string name="label_selected_keyserver_title">Servidor de claves seleccionado</string> <string name="label_preferred">preferido</string> <string name="label_enable_compression">Habilitar compresión</string> <string name="label_encrypt_filenames">Cifrar nombres de ficheros</string> <string name="label_hidden_recipients">Ocultar receptores</string> <string name="label_verify_keyserver">Verificar servidor de claves</string> <string name="label_enter_keyserver_url">Introduzca URL de servidor de claves</string> + <string name="label_keyserver_dialog_delete">Borrar servidor de claves</string> <string name="pref_keyserver">Servidores de claves OpenPGP</string> <string name="pref_keyserver_summary">Busca claves en los servidores de claves OpenPGP seleccionados (protocolo HKP)</string> <string name="pref_keybase">keybase.io</string> <string name="pref_keybase_summary">Busca claves en keybase.io</string> + <!--Proxy Preferences--> + <string name="pref_proxy_tor_title">Habilitar Tor</string> + <string name="pref_proxy_tor_summary">Requiere que Orbot esté instalado</string> + <string name="pref_proxy_normal_title">Habilitar otro proxy</string> + <string name="pref_proxy_host_title">Servidor proxy</string> + <string name="pref_proxy_host_err_invalid">El servidor proxy (interpuesto) no puede estar vacío</string> + <string name="pref_proxy_port_title">Puerto de proxy</string> + <string name="pref_proxy_port_err_invalid">Número de puerto introducido no válido</string> + <string name="pref_proxy_type_title">Tipo de proxy</string> + <!--proxy type choices and values--> + <string name="pref_proxy_type_choice_http">HTTP</string> + <string name="pref_proxy_type_choice_socks">SOCKS</string> + <string name="pref_proxy_type_value_http">proxyHttp</string> + <string name="pref_proxy_type_value_socks">proxySocks</string> + <!--OrbotHelper strings--> + <string name="orbot_ignore_tor">No usar Tor</string> + <!--InstallDialogFragment strings--> + <string name="orbot_install_dialog_title">¿Instalar Orbot para usar Tor?</string> + <string name="orbot_install_dialog_install">Instalar</string> + <string name="orbot_install_dialog_content">Tiene que tener Orbot instalado y activado para proxyficar el tráfico a través de él. ¿Desea instalarlo?</string> + <string name="orbot_install_dialog_cancel">Cancelar</string> + <string name="orbot_install_dialog_ignore_tor">No usar Tor</string> + <!--StartOrbotDialogFragment strings--> + <string name="orbot_start_dialog_title">¿Iniciar Orbot?</string> + <string name="orbot_start_dialog_content">Orbot no parece estar corriendo. ¿Desea iniciarlo y conectar a Tor?</string> + <string name="orbot_start_btn">Iniciar Orbot</string> + <string name="orbot_start_dialog_start">Iniciar Orbot</string> + <string name="orbot_start_dialog_cancel">Cancelar</string> + <string name="orbot_start_dialog_ignore_tor">No usar Tor</string> <string name="user_id_no_name"><sin nombre></string> <string name="none"><ninguna></string> <plurals name="n_keys"> @@ -200,7 +235,8 @@ <string name="passphrase_for">Introduzca contraseña para \'%s\'</string> <string name="pin_for">Introduzca el PIN para \'%s\'</string> <string name="yubikey_pin_for">Introduzca el PIN para acceder a la YubiKey para \'%s\'</string> - <string name="nfc_text">Sostenga la YubiKey contra el reverso de su dispositivo.</string> + <string name="nfc_text">Sostenga la YubiKey contra el marcador NFC en el reverso de su dispositivo.</string> + <string name="nfc_wait">¡Mantenga la YubiKey en el reverso!</string> <string name="file_delete_confirmation_title">¿Borrar ficheros originales?</string> <string name="file_delete_confirmation">Los siguientes ficheros se borrarán:%s</string> <string name="file_delete_successful">%1$d de %2$d ficheros han sido borrados.%3$s</string> @@ -211,7 +247,7 @@ <string name="error_no_encryption_or_signature_key">Seleccionar al menos una clave de cifrado o una clave de firma.</string> <string name="specify_file_to_encrypt_to">Por favor especifique hacia qué fichero cifrar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe!</string> <string name="specify_file_to_decrypt_to">Por favor especifique hacia qué fichero descifrar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe!</string> - <string name="specify_file_to_export_to">Por favor especifique hacia qué fichero exportar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe!</string> + <string name="specify_backup_dest">Por favor especifique hacia qué fichero exportar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe!</string> <string name="key_deletion_confirmation_multi">¿De verdad quiere borrar todas las claves seleccionadas?</string> <string name="secret_key_deletion_confirmation">¡Después del borrado no podrá leer mensajes cifrados con esta clave y perderá todas las confirmaciones de clave hechas con ella!</string> <string name="public_key_deletetion_confirmation">¿Borrar clave \'%s\'?</string> @@ -304,6 +340,8 @@ <string name="progress_modify_subkeystrip">desnudando claves...</string> <string name="progress_modify_subkeyadd">añadiendo subclaves...</string> <string name="progress_modify_passphrase">cambiando contraseña...</string> + <string name="progress_modify_pin">cambiando PIN...</string> + <string name="progress_modify_admin_pin">cambiando el PIN de Admin...</string> <plurals name="progress_exporting_key"> <item quantity="one">exportando clave...</item> <item quantity="other">exportando claves...</item> @@ -459,7 +497,7 @@ <string name="api_settings_start">Iniciar aplicación</string> <string name="api_settings_delete_account">Borrar cuenta</string> <string name="api_settings_package_name">Nombre de paquete</string> - <string name="api_settings_package_signature">SHA-256 de firma de paquete</string> + <string name="api_settings_package_certificate">SHA-256 de firma de paquete</string> <string name="api_settings_accounts">Cuentas (API antigua)</string> <string name="api_settings_advanced">Información extendida</string> <string name="api_settings_allowed_keys">Claves permitidas</string> @@ -596,6 +634,13 @@ <string name="create_key_add_email_text">Las direcciones adicionales de correo electrónico también están asociadas a esta clave y pueden utilizarse para asegurar la comunicación.</string> <string name="create_key_email_already_exists_text">Esta dirección de correo electrónico ya fue añadida</string> <string name="create_key_email_invalid_email">El formato de la dirección de correo no es válido</string> + <string name="create_key_yubi_key_pin_text">Por favor, recuerde el PIN, se requiere para usar su YubiKey más tarde. Por favor, escriba el PIN de Admin y guárdelo en un lugar seguro.</string> + <string name="create_key_yubi_key_pin">PIN</string> + <string name="create_key_yubi_key_admin_pin">PIN de Admin</string> + <string name="create_key_yubi_key_pin_repeat_text">Por favor, introduzca el PIN y el PIN de Admin para proceder.</string> + <string name="create_key_yubi_key_pin_repeat">Repita el PIN</string> + <string name="create_key_yubi_key_admin_pin_repeat">Repita el PIN de Admin</string> + <string name="create_key_yubi_key_pin_not_correct">¡El PIN no es correcto!</string> <!--View key--> <string name="view_key_revoked">Revocada: ¡La clave no debe volver a ser usada!</string> <string name="view_key_expired">Caducada: ¡El contacto necesita extender la vigencia de la clave!</string> @@ -604,12 +649,15 @@ <string name="view_key_verified">Clave confirmada</string> <string name="view_key_unverified">No confirmada: ¡Escanee el código QR para confirmar clave!</string> <string name="view_key_fragment_no_system_contact"><ninguno></string> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Añadir servidor de claves</string> + <string name="edit_keyserver_dialog_title">Editar servidor de claves</string> <string name="add_keyserver_verified">¡Servidor de claves verificado!</string> <string name="add_keyserver_without_verification">Servidor de claves añadido sin verificación</string> <string name="add_keyserver_invalid_url">¡URL no válida!</string> <string name="add_keyserver_connection_failed">Fallo al conectar al servidor de claves. Por favor, compuebe la URL y su conexión a Internet.</string> + <string name="keyserver_preference_deleted">%s borrado</string> + <string name="keyserver_preference_cannot_delete_last">No se puede borrar el último servidor de claves. ¡Se requiere al menos uno!</string> <!--Navigation Drawer--> <string name="nav_keys">Claves</string> <string name="nav_encrypt_decrypt">Cifrar/Descifrar</string> @@ -868,6 +916,8 @@ <string name="msg_mf_notation_empty">Añadiendo paquete de notación vacío</string> <string name="msg_mf_notation_pin">Añadiendo paquete de notación de PIN</string> <string name="msg_mf_passphrase">Cambiando contraseña para el juego de claves</string> + <string name="msg_mf_pin">Cambiando el PIN en la tarjeta</string> + <string name="msg_mf_admin_pin">Cambiando el PIN de Admin en la tarjeta</string> <string name="msg_mf_passphrase_key">Re-cifrando subclave %s con la nueva contraseña</string> <string name="msg_mf_passphrase_empty_retry">El establecimiento de la nueva contraseña falló, volviéndolo a intentar con una contraseña antigua vacía.</string> <string name="msg_mf_passphrase_fail">¡La contraseña para la subclave no se pudo cambiar! (¿Tiene una contraseña diferente a la del resto de las claves?)</string> @@ -968,7 +1018,8 @@ <string name="msg_dc_error_integrity_check">¡Error de comprobación de integridad!</string> <string name="msg_dc_error_integrity_missing">¡Verificación de integridad ausente! Esto puede ocurrir porque la aplicación de cifrado no está actualizada, o debido a un ataque desactualización.</string> <string name="msg_dc_error_invalid_data">¡No se encontraron datos firmados o cifrados con OpenPGP válidos!</string> - <string name="msg_dc_error_io">¡Se encontró Excepción de E/S durante la operación!</string> + <string name="msg_dc_error_io">¡Se encontró un error al leer los datos de entrada!</string> + <string name="msg_dc_error_input">¡Error al abrir el flujo de datos de entrada!</string> <string name="msg_dc_error_no_data">¡No se encontraron datos cifrados en el flujo de datos (`stream`)!</string> <string name="msg_dc_error_no_key">¡No se encontraron datos cifrados con clave secreta (privada) conocida en el flujo de datos (`stream`)!</string> <string name="msg_dc_error_pgp_exception">¡Se encontró una excepción OpenPGP durante la operación!</string> @@ -1058,6 +1109,7 @@ <string name="msg_crt_warn_not_found">¡Clave no encontrada!</string> <string name="msg_crt_warn_cert_failed">¡La generación de certificado falló!</string> <string name="msg_crt_warn_save_failed">¡La operación de guardado falló!</string> + <string name="msg_crt_warn_upload_failed">¡Fallo en la operación de subida!</string> <string name="msg_crt_upload_success">Clave subida al servidor con éxito</string> <plurals name="msg_import"> <item quantity="one">Importando clave</item> @@ -1084,6 +1136,7 @@ </plurals> <string name="msg_export_all">Exportando todas las claves</string> <string name="msg_export_public">Exportando clave pública %s</string> + <string name="msg_export_upload_public">Subiendo clave pública %s</string> <string name="msg_export_secret">Exportando clave secreta (privada) %s</string> <string name="msg_export_error_no_file">¡No se especificó nombre de fichero!</string> <string name="msg_export_error_fopen">¡Error al abrir el fichero!</string> @@ -1093,7 +1146,9 @@ <string name="msg_export_error_db">¡Error de base de datos!</string> <string name="msg_export_error_io">¡Error de entrada/salida!</string> <string name="msg_export_error_key">¡Error al preprocesar los datos de la clave!</string> + <string name="msg_export_error_upload">¡Error al subir clave al servidor! Por favor, compruebe su conexión a Internet</string> <string name="msg_export_success">Operación de exportado exitosa</string> + <string name="msg_export_upload_success">Subida al servidor de claves completada</string> <string name="msg_del_error_empty">¡No hay nada que borrar!</string> <string name="msg_del_error_multi_secret">¡Las claves secretas (privadas) sólo se pueden borrar individualmente!</string> <plurals name="msg_del"> @@ -1123,6 +1178,14 @@ <string name="msg_download_too_many_responses">La solicitud de búsqueda de clave devolvió demasiados candidatos. ¡Por favor refine su petición!</string> <string name="msg_download_query_too_short_or_too_many_responses">O bien no hay claves o se han encontrado demasiadas. ¡Por favor mejore su petición!</string> <string name="msg_download_query_failed">Ocurrió un error al buscar claves.</string> + <!--Messages for Keybase Verification operation--> + <string name="msg_keybase_verification">Intentando la verificación con Keybase para %s</string> + <string name="msg_keybase_error_no_prover">No se encontró prueba verificadora para %s</string> + <string name="msg_keybase_error_fetching_evidence">Problema al descargar prueba</string> + <string name="msg_keybase_error_key_mismatch">La huella de validación (fingerprint) de la clave no coincide con la prueba publicada</string> + <string name="msg_keybase_error_dns_fail">Fallo al obtener Registro DNS TXT</string> + <string name="msg_keybase_error_specific">%s</string> + <string name="msg_keybase_error_msg_payload_mismatch">La prueba descifrada publicada no coincide con el valor esperado</string> <!--Messages for Export Log operation--> <string name="msg_export_log_start">Exportando registro (log)</string> <string name="msg_export_log_error_fopen">Error abriendo fichero</string> @@ -1144,6 +1207,8 @@ <string name="first_time_import_key">Importar clave desde fichero</string> <string name="first_time_yubikey">Usar Yubikey NEO</string> <string name="first_time_skip">Omitir configuración</string> + <string name="first_time_blank_yubikey">¿Desea usar esta YubiKey NEO en blanco con OpenKeychain?\n\n¡Por favor, retire ahora la YubiKey, se le solicitará cuando sea necesaria de nuevo!</string> + <string name="first_time_blank_yubikey_yes">Usar esta YubiKey</string> <!--unsorted--> <string name="section_certifier_id">Certificador</string> <string name="section_cert">Detalles del certificado</string> @@ -1168,7 +1233,7 @@ <string name="unknown_algorithm">desconocido</string> <string name="can_sign_not">no puede firmarse</string> <string name="error_no_encrypt_subkey">¡No hay subclave de cifrado disponible!</string> - <string name="info_no_manual_account_creation">No crear Cuentas-OpenKeychain manualmente.\nPara más información, vea la Ayuda.</string> + <string name="account_no_manual_account_creation">No crear Cuentas-OpenKeychain manualmente.\nPara más información, vea la Ayuda.</string> <string name="contact_show_key">Mostrar clave (%s)</string> <string name="swipe_to_update">Gesto de barrido hacia abajo para actualizar desde el servidor de claves</string> <string name="error_no_file_selected">¡Seleccione al menos un fichero a cifrar!</string> @@ -1219,18 +1284,8 @@ <string name="btn_import">Importar</string> <string name="snack_yubi_other">¡Clave almacenada en YubiKey distinta!</string> <string name="error_nfc">Error de NFC: %s</string> - <string name="error_pin">NFC: PIN incorrecto; %d intentos restantes.</string> - <string name="error_nfc_terminated">NFC: Tarjeta inteligente caducada</string> - <string name="error_nfc_wrong_length">NFC: Distancia incorrecta para envío / recepción de datos</string> - <string name="error_nfc_conditions_not_satisfied">NFC: Condiciones de uso no satisfechas</string> - <string name="error_nfc_security_not_satisfied">NFC: Estado de seguridad no satisfecho</string> - <string name="error_nfc_authentication_blocked">NFC: PIN bloqueado tras demasiados intentos</string> - <string name="error_nfc_data_not_found">NFC: Clave u objeto no encontrado</string> - <string name="error_nfc_unknown">NFC: Error desconocido</string> - <string name="error_nfc_bad_data">NFC: La tarjeta informó de datos no válidos</string> - <string name="error_nfc_chaining_error">NFC: La tarjeta esperaba el último comando en una cadena</string> - <string name="error_nfc_header">NFC: La tarjeta informó de byte %s no válido</string> <string name="error_pin_nodefault">¡El PIN por defecto fue rechazado!</string> + <string name="error_temp_file">Error al crear fichero temporal.</string> <string name="btn_delete_original">Borrar fichero original</string> <string name="snack_encrypt_filenames_on">Los nombres de fichero <b>están</b> cifrados.</string> <string name="snack_encrypt_filenames_off">Los nombres de fichero <b>no están</b> cifrados.</string> @@ -1253,4 +1308,6 @@ <string name="file_delete_ok">Fichero original borrado.</string> <string name="file_delete_none">¡No se borró ningún fichero! (¿ya se había borrado?)</string> <string name="file_delete_exception">¡No se pudo borrar el fichero original!</string> + <string name="error_clipboard_empty">¡Portapapeles vacío!</string> + <string name="error_clipboard_copy">¡Error al copiar datos al portapapeles!</string> </resources> diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml index 01f98c8e7..8a0481cac 100644 --- a/OpenKeychain/src/main/res/values-et/strings.xml +++ b/OpenKeychain/src/main/res/values-et/strings.xml @@ -32,6 +32,11 @@ <string name="label_name">Nimi</string> <string name="label_comment">Kommentaar</string> <string name="label_email">E-mail</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="secret_key">Salajane võti:</string> <!--choice--> <string name="choice_15secs">15 sekundit</string> @@ -86,7 +91,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -105,6 +110,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index e58a81911..ca17e0d61 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -42,18 +42,24 @@ <string name="section_cloud_evidence">Hodeiko probak</string> <string name="section_keys">Azpigiltzak</string> <string name="section_cloud_search">Hodei bilaketa</string> + <string name="section_passphrase_cache">Sarhitz/PIN Kudeaketa</string> + <string name="section_proxy_settings">Proxy Ezarpenak</string> <string name="section_certify">Baieztatu</string> <string name="section_actions">Ekintzak</string> <string name="section_share_key">Giltza</string> <string name="section_key_server">Giltza-zerbitzaria</string> <string name="section_fingerprint">Hatz-aztarna</string> <string name="section_encrypt">Enkriptatu</string> + <string name="section_decrypt">Dekriptatu / Egiaztatu</string> <string name="section_current_expiry">Oraingo epemuga</string> <string name="section_new_expiry">Epemuga berria</string> <!--button--> <string name="btn_decrypt_verify_file">Dekriptatu, egiaztatu eta gorde agiria</string> <string name="btn_encrypt_share_file">Enkriptatu eta elkarbanatu agiria</string> <string name="btn_encrypt_save_file">Enkriptatu eta gorde agiria</string> + <string name="btn_save_file">Gorde agiria</string> + <string name="btn_save">Gorde</string> + <string name="btn_view_log">Ikusi oharra</string> <string name="btn_do_not_save">Ezeztatu</string> <string name="btn_delete">Ezabatu</string> <string name="btn_no_date">Epemuga gabe</string> @@ -70,6 +76,8 @@ <string name="btn_add_files">Gehitu agiria(k)</string> <string name="btn_share_decrypted_text">Elkarbanatu dekriptaturiko idazkia</string> <string name="btn_copy_decrypted_text">Kopiatu dekriptaturiko idazkia</string> + <string name="btn_decrypt_clipboard">Irakurri gakotik</string> + <string name="btn_decrypt_files">Hautatu sarrera agiria</string> <string name="btn_encrypt_files">Enkriptatu agiriak</string> <string name="btn_encrypt_text">Enkriptatu idazkia</string> <string name="btn_add_email">Gehitu post@ helbide gehigarriak</string> @@ -93,6 +101,7 @@ <string name="menu_advanced">Argibide Hedatuak</string> <string name="menu_certify_fingerprint">Baieztatu hatz-aztarna alderaketa bidez</string> <string name="menu_export_log">Esportatu Oharra</string> + <string name="menu_keyserver_add">Gehitu</string> <!--label--> <string name="label_message">Idazkia</string> <string name="label_file">Agiria</string> @@ -107,16 +116,17 @@ <string name="label_ascii_armor">ASCII Armor agiria</string> <string name="label_file_ascii_armor">Gaitu ASCII Armor</string> <string name="label_write_version_header">Jakinarazi besteei OpenKeychain erabiltzen ari zarela</string> + <string name="label_write_version_header_summary">\'OpenKeychain v2.7\' idazten du OpenPGP sinadura, idazkia zifratzen du eta giltzak esportatzen ditu</string> <string name="label_use_default_yubikey_pin">Erabili berezko YubiKey PIN-a</string> <string name="label_use_num_keypad_for_yubikey_pin">Erabili zenbaki teklatua YubiKey PIN-erako</string> <string name="label_label_use_default_yubikey_pin_summary">Berezko PIN (123456) erabiltzen du NFC bidezko YubiKeys sarbiderako </string> - <string name="label_asymmetric_from">Sinatzailea:</string> <string name="label_to">Enkriptatu hona:</string> <string name="label_delete_after_encryption">Ezabatu agiriak enkriptatu ondoren</string> <string name="label_delete_after_decryption">Ezabatu dekriptatu ondoren</string> <string name="label_encryption_algorithm">Enkriptaketa algoritmoa</string> <string name="label_hash_algorithm">Hash algoritmoa</string> <string name="label_symmetric">Enkriptatu sarhitzarekin</string> + <string name="label_passphrase_cache_subs">Gogoratu sarhitzak azpigiltzaz</string> <string name="label_message_compression">Idazki konpresioa</string> <string name="label_file_compression">Agiri konpresioa</string> <string name="label_keyservers">Hautatu OpenPGP giltza-zerbitzariak</string> @@ -134,17 +144,49 @@ <string name="label_send_key">Aldiberetu hodeiarekin</string> <string name="label_fingerprint">Hatz-aztarna</string> <string name="expiry_date_dialog_title">Ezarri epemuga eguna</string> - <string name="label_first_keyserver_is_used">(Zerrendako lehen giltza-zerbitzaria da hobetsia)</string> + <string name="label_keyservers_title">Giltza-zerbitzariak</string> + <string name="label_keyserver_settings_hint">Arrastatu hurrenkera aldatzeko, ikutu editatu/ezabatzeko</string> + <string name="label_selected_keyserver_title">Giltza-zerbitzaria hautatuta</string> <string name="label_preferred">hobetsia</string> <string name="label_enable_compression">Gaitu konpresioa</string> <string name="label_encrypt_filenames">Enkriptatu agirizenak</string> <string name="label_hidden_recipients">Ezkutatu jasotzaileak</string> <string name="label_verify_keyserver">Egiaztatu giltza-zerbitzaria</string> <string name="label_enter_keyserver_url">Sartu giltza-zerbitzariaren URL-a</string> + <string name="label_keyserver_dialog_delete">Ezabatu giltza-zerbitzaria</string> <string name="pref_keyserver">OpenPGP giltza-zerbitzariak</string> <string name="pref_keyserver_summary">Bilatu giltzak hautaturiko OpenPGP giltza-zerbitzarietan (HKP protokoloa)</string> <string name="pref_keybase">keybase.io</string> <string name="pref_keybase_summary">Bilatu giltzak keybase.io-an</string> + <!--Proxy Preferences--> + <string name="pref_proxy_tor_title">Gaitu Tor</string> + <string name="pref_proxy_tor_summary">Orbot ezarrita egotea behar du</string> + <string name="pref_proxy_normal_title">Gaitu beste proxy bat</string> + <string name="pref_proxy_host_title">Proxy Hostalaria</string> + <string name="pref_proxy_host_err_invalid">Proxy hostalaria ezin da hutsik egon</string> + <string name="pref_proxy_port_title">Proxy Ataka</string> + <string name="pref_proxy_port_err_invalid">Ataka zenbaki baliogabea sartu da</string> + <string name="pref_proxy_type_title">Proxy Mota</string> + <!--proxy type choices and values--> + <string name="pref_proxy_type_choice_http">HTTP</string> + <string name="pref_proxy_type_choice_socks">SOCKS</string> + <string name="pref_proxy_type_value_http">proxyHttp</string> + <string name="pref_proxy_type_value_socks">proxySocks</string> + <!--OrbotHelper strings--> + <string name="orbot_ignore_tor">Ez erabili Tor</string> + <!--InstallDialogFragment strings--> + <string name="orbot_install_dialog_title">Ezarri Orbot edo erabili Tor?</string> + <string name="orbot_install_dialog_install">Ezarri</string> + <string name="orbot_install_dialog_content">Orbot ezarrita eta proxy trafiko igaropena gaituta eduki behar duzu. Nahi duzu ezartzea?</string> + <string name="orbot_install_dialog_cancel">Ezeztatu</string> + <string name="orbot_install_dialog_ignore_tor">Ez erabili Tor</string> + <!--StartOrbotDialogFragment strings--> + <string name="orbot_start_dialog_title">Abiarazi Orbot?</string> + <string name="orbot_start_dialog_content">Ez dirudi Orbot ekinean dagoenik. Nahi duzu abiaraztea eta Tor-era elkartzea?</string> + <string name="orbot_start_btn">Abiarazi Orbot</string> + <string name="orbot_start_dialog_start">Abiarazi Orbot</string> + <string name="orbot_start_dialog_cancel">Ezeztatu</string> + <string name="orbot_start_dialog_ignore_tor">Ez erabili Tor</string> <string name="user_id_no_name"><izen gabe></string> <string name="none"><ezer ez></string> <plurals name="n_keys"> @@ -192,20 +234,23 @@ <string name="passphrase_for">Sartu \'%s\'-rako sarhitza</string> <string name="pin_for">Sartu PIN-a \'%s\'-rako</string> <string name="yubikey_pin_for">Sartu PIN-a YubKey-ra sartzeko \'%s\'-rentzat</string> - <string name="nfc_text">Jarri YubiKey zure gailuaren atzealdean.</string> + <string name="nfc_wait">Eduki YubiKey atzealdean!</string> <string name="file_delete_confirmation_title">Ezabatu jatorrizko agiriak?</string> <string name="file_delete_confirmation">Hurrengo agiriak ezabatu egingo dira: %s</string> <string name="file_delete_successful">%1$d -> %2$d-tik agiri ezbatu dira.%3$s</string> + <string name="no_file_selected">Ez da agiririk hautatu</string> <string name="encrypt_sign_successful">Ongi sinatu eta/edo enkriptatu da.</string> <string name="encrypt_sign_clipboard_successful">Ongi sinatu eta/edo enkriptatu da gakora.</string> <string name="select_encryption_key">Hautatu enkriptaketa giltza bat gutxienez.</string> + <string name="error_no_encryption_or_signature_key">Hautatu gutxienez enkriptaketa giltza bat edo sinadura giltza bat.</string> <string name="specify_file_to_encrypt_to">Mesedez adierazi zein agirira enkriptatu.\nKONTUZ: Agiria gainidatzi egingo da egonez gero!</string> <string name="specify_file_to_decrypt_to">Mesedez adierazi zein agirira dekriptatu.\nKONTUZ: Agiria gainidatzi egingo da egonez gero!</string> - <string name="specify_file_to_export_to">Mesedez adierazi zein agirira esportatu.\nKONTUZ: Agiria gainidatzi egingo da egonez gero!</string> + <string name="specify_backup_dest">Mesedez adierazi zein agirira esportatu.\nKONTUZ: Agiria gainidatzi egingo da egonez gero!</string> <string name="key_deletion_confirmation_multi">Egitan nahi duzu hautaturiko giltzak ezabatzea?</string> <string name="secret_key_deletion_confirmation">Ezabatu ondoren ezingo dituzu giltza honekin enkriptatutako mezuak irakurri eta berarekin egindako giltza baieztapen guztiak galduko dira!</string> <string name="public_key_deletetion_confirmation">Ezabatu \'%s\' giltza?</string> <string name="also_export_secret_keys">Esportatu giltza sekretuak ere</string> + <string name="reinstall_openkeychain">Akats ezagun bat aurkitu duzu Android-rekin. Mesedez ezarri berriro OpenKeychain zure harremanak giltzekin lotzea nahi badituzu.</string> <string name="key_exported">Ongi esportatu da 1 giltza</string> <string name="keys_exported">Ongi esportatu dira %d giltza</string> <string name="no_keys_exported">Ez da giltzarik esportatu.</string> @@ -286,6 +331,8 @@ <string name="progress_modify_subkeyrevoke">azpigiltzak ukatzen...</string> <string name="progress_modify_subkeyadd">azpigiltzak gehitzen...</string> <string name="progress_modify_passphrase">sarhitza aldatzen...</string> + <string name="progress_modify_pin">PIN-a aldatzen...</string> + <string name="progress_modify_admin_pin">Administrari PIN-a aldatzen...</string> <plurals name="progress_exporting_key"> <item quantity="one">giltza esportatzen</item> <item quantity="other">giltzak esportatzen</item> @@ -359,7 +406,9 @@ <!--Import from URL--> <string name="import_url_warn_no_search_parameter">Ez da bilaketa eskaerarik zehaztu. Oraindik eskuz bilatu dezakezu giltza-zerbitzari honetan.</string> <!--Generic result toast--> + <string name="snackbar_details">Xehetasunak</string> <string name="with_warnings">, kontuz oharrekin</string> + <string name="with_cancelled">, ezeztatu arte</string> <!--Import result toast--> <plurals name="import_keys_added_and_updated_1"> <item quantity="one">Ongi inportatuta 1 giltza</item> @@ -381,6 +430,10 @@ <item quantity="one">Inportatze hutsegitea 1 giltzarentzat!</item> <item quantity="other">Inportatze hutsegitea %d giltzentzat!</item> </plurals> + <plurals name="import_error"> + <item quantity="one">Inportazio hutsegitea!</item> + <item quantity="other">Hutsegitea %d giltza inportatzerakoan!</item> + </plurals> <string name="import_error_nothing">Ez dago ezer inportatzeko.</string> <string name="import_error_nothing_cancelled">Inportazioa ezeztatuta.</string> <!--Delete result toast--> @@ -419,7 +472,7 @@ <string name="api_settings_start">Abiarazi aplikazioa</string> <string name="api_settings_delete_account">Ezabatu kontua</string> <string name="api_settings_package_name">Pakete Izena</string> - <string name="api_settings_package_signature">Sinadura Paketearen SHA-256</string> + <string name="api_settings_package_certificate">Sinadura Paketearen SHA-256</string> <string name="api_settings_accounts">Kontuak (API zaharra)</string> <string name="api_settings_advanced">Argibide Hedatuak</string> <string name="api_settings_allowed_keys">Ahalbidetutako Giltzak</string> @@ -435,6 +488,7 @@ <string name="api_select_pub_keys_dublicates_text">Giltza bat baino gehiago dago nortasun hauentzat:</string> <string name="api_select_pub_keys_text">Mesedz berrikusi jasotzaile zerrenda!</string> <string name="api_select_pub_keys_text_no_user_ids">Mesedez hautatu jasotzaileak!</string> + <string name="api_error_wrong_signature">Sinadura egiaztapen hutsegitea! Aplikazio hau beste iturubur batetik duzu ezarrita? Zihur bazaude hau ez dela eraso bat, ukatu aplikazio honen erregistrazioa OpenKeychain eta orduan erregistratu aplikazioa berriro.</string> <string name="api_select_sign_key_text">Mesedez hautatu zure giltzetako bat edo sortu berri bat.</string> <string name="api_select_keys_text">Ahalbidetutako giltza batek ere ezin du edukia dekriptatu. Mesedez hautatu ahalbidetutako giltzak.</string> <!--Share--> @@ -549,6 +603,13 @@ <string name="create_key_add_email_text">Post@ helbide gehigarriak ere giltza honekin elkartzen dira eta komunikazio segururako erabili daitezke.</string> <string name="create_key_email_already_exists_text">Post@ helbidea jadanik gehituta dago</string> <string name="create_key_email_invalid_email">Post@ heuskarria baliogabea da</string> + <string name="create_key_yubi_key_pin_text">Mesedez gogoratu PIN-a, beharrezkoa da gero zure YubiKey erabiltzeko. Mesedez idatzi behean Administrari PIN-a eta biltegiratu toki seguru batean.</string> + <string name="create_key_yubi_key_pin">PIN-a</string> + <string name="create_key_yubi_key_admin_pin">Administrari PIN-a</string> + <string name="create_key_yubi_key_pin_repeat_text">Mesedez sartu PIN-a eta Administrari PIN-a jarraitzeko.</string> + <string name="create_key_yubi_key_pin_repeat">Berridatzi PIN-a</string> + <string name="create_key_yubi_key_admin_pin_repeat">Berridatzi Administrari PIN-a</string> + <string name="create_key_yubi_key_pin_not_correct">PIN-a ez da zuzena!</string> <!--View key--> <string name="view_key_revoked">Ukatuta: Giltza ezin da gehiago erabili!</string> <string name="view_key_expired">Iraungitua: Harremanak giltzaren baliotasuna luzatu behar du!</string> @@ -557,12 +618,15 @@ <string name="view_key_verified">Baieztatutako Giltza</string> <string name="view_key_unverified">Baieztatugabe: Eskaneatu QR Kodea giltza baieztatzeko!</string> <string name="view_key_fragment_no_system_contact"><ezer ez></string> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Gehitu giltza-zerbitzaria</string> + <string name="edit_keyserver_dialog_title">Editatu giltza-zerbitzaria</string> <string name="add_keyserver_verified">Giltza-zerbitzaria egiaztatuta!</string> <string name="add_keyserver_without_verification">Giltza-zerbitzaria gehituta egiaztapen gabe.</string> <string name="add_keyserver_invalid_url">URL baliogabea!</string> <string name="add_keyserver_connection_failed">Hutsegitea giltza-zerbitzariarekin elkartzerakoan. Mesedez egiaztatu URL-a eta zure internet elkarketa.</string> + <string name="keyserver_preference_deleted">%s ezabatuta</string> + <string name="keyserver_preference_cannot_delete_last">Ezin da azken giltza-zerbitzaria ezabatu. Gutxienez bat behar da!</string> <!--Navigation Drawer--> <string name="nav_keys">Giltzak</string> <string name="nav_encrypt_decrypt">Enkriptatu/Dekriptatu</string> @@ -652,6 +716,7 @@ <string name="msg_ip_uid_revoked">Erabiltzaile ID-a ukatua dago</string> <string name="msg_ip_uat_cert_bad">Egiaztagiri gaitza aurkitu da!</string> <string name="msg_ip_uat_cert_error">Akatsa egiaztagiria prozesatzerakoan!</string> + <string name="msg_ip_uat_cert_nonrevoke">Jadanik badu ez-ukatu egiaztagiri bat, jauzi egiten.</string> <string name="msg_ip_uat_cert_old">Egiaztagiria aurrekoa baino zaharragoa da, jauzi egiten.</string> <string name="msg_ip_uat_cert_new">Egiaztagiria berriagoa da, aurrekoa ordezten.</string> <string name="msg_ip_uat_cert_good">Egiaztagiri ona aurkitu da %1$s-rako</string> @@ -716,6 +781,8 @@ <string name="msg_mf_master">Maisu egiaztagiriak aldatzen</string> <string name="msg_mf_notation_pin">PIN jakinarazpen paketea gehitzen</string> <string name="msg_mf_passphrase">Giltza-uztaiaren sarhitza aldatzen</string> + <string name="msg_mf_pin">PIN-a aldatzen txartelean</string> + <string name="msg_mf_admin_pin">Administrari PIN-a aldatzen txartelean</string> <string name="msg_mf_passphrase_key">%s azpigiltza ber-enkriptatzen sarhitz berriarekin</string> <string name="msg_mf_passphrase_empty_retry">Hutsegitea sarhitz berria ezartzerakoan, berriro saiatzen sarhitz zahar huts batekin</string> <string name="msg_mf_restricted_mode">Eragiketa modu murriztura aldatzen</string> @@ -784,7 +851,6 @@ <string name="msg_dc_error_extract_key">Akats ezezaguna giltza desblokeatzerakoan!</string> <string name="msg_dc_error_integrity_check">Osotasun egiaztapen akatsa!</string> <string name="msg_dc_error_invalid_data">OpenPGP eduki enkriptatu edo sinatu baliogabea!</string> - <string name="msg_dc_error_io">SI Salbuespen bat aurkitu da eragiketan zehar!</string> <string name="msg_dc_error_no_data">Ez da datu enkriptaturik aurkitu jarioan!</string> <string name="msg_dc_error_no_key">Ez da enkriptatutako daturik giltza sekretu ezagunarekin aurkitu jarioan!</string> <string name="msg_dc_error_pgp_exception">OpenPGP Salbuespen bat aurkitu da eragiketan zehar!</string> @@ -798,6 +864,7 @@ <string name="msg_dc">Dekriptaketa eragiketa abiatzen...</string> <string name="msg_dc_sym_skip">Datu simetrikoak ez daude ahalbidetuta, jauzi egiten...</string> <string name="msg_dc_unlocking">Giltza sekretua desblokeatzen</string> + <string name="msg_dc_old_symmetric_encryption_algo">Potentzialki segurtasun gabea den enkriptaketa algoritmoa erabili da!</string> <!--Messages for VerifySignedLiteralData operation--> <string name="msg_vl">Sinadura egiaztapena abiatzen</string> <string name="msg_vl_error_wrong_key">Mezua ez dago giltza zuzenarekin sinatuta</string> @@ -814,18 +881,24 @@ <string name="msg_se_error_no_input">Ez da sarrerarik eman!</string> <string name="msg_se_error_input_uri_not_found">Akatsa URI-a irakurtzeko irekitzerakoan!</string> <string name="msg_se_error_output_uri_not_found">Akatsa URI-a idazteko irekitzerakoan!</string> + <string name="msg_se_error_too_many_inputs">Irteera baino sarrera gehiago adierazi dira! Hau zihurrenik programazio akats bat da, mesedez jakinarazi!</string> <string name="msg_se_success">Sinadura/enkriptaketa eragiketa ongi</string> <!--Messages for PgpSignEncrypt operation--> <string name="msg_pse_asymmetric">Giltza publikoak gertatzen enkriptaketarako</string> <string name="msg_pse_compressing">Konpresioa gertatzen</string> <string name="msg_pse_encrypting">Datuak enkriptatzen</string> <string name="msg_pse_error_bad_passphrase">Sarhitz gaitza!</string> + <string name="msg_pse_error_hash_algo">Eskatutako hash algoritmoa ez dago sostengatuta giltza honetan!</string> + <string name="msg_pse_error_io">SI Salbuespen bat aurkitu da eragiketan zehar!</string> + <string name="msg_pse_error_key_sign">Hautaturiko sinatze giltzak ezin du daturik sinatu!</string> <string name="msg_pse_error_sign_key">Akatsa giltza sinatua lortzerakoan!</string> <string name="msg_pse_error_nfc">NFC datu akatsa!</string> <string name="msg_pse_error_no_passphrase">Ez da sarhitzik eman!</string> <string name="msg_pse_error_pgp">Barneko OpenPGP akatsa!</string> <string name="msg_pse_error_sig">OpenPGP sinadura salbuespena aurkitu da!</string> <string name="msg_pse_error_unlock">Akats ezezaguna giltza desblokeatzerakoan!</string> + <string name="msg_pse_key_ok">Enkriptatzen giltzarako: %s</string> + <string name="msg_pse_key_unknown">Ez dago enkriptaketarako giltza: %s</string> <string name="msg_pse_key_warn">Giltza gaitza enkriptaketarako: %s</string> <string name="msg_pse_ok">Sinadura/enkriptaketa eragiketa ongi</string> <string name="msg_pse_pending_nfc">NFC ezagutarazlea beharrezkoa, erabiltzaile sarrera eskatzen...</string> @@ -843,14 +916,23 @@ <string name="msg_crt">Giltza-uztaiak egiaztagiritzen</string> <string name="msg_crt_master_fetch">Maisu giltza egiaztagiritua lortzen</string> <string name="msg_crt_nfc_return">NFC ikusleihora itzultzen</string> + <string name="msg_crt_save">%s giltza egiaztagiritua gordetzen</string> <string name="msg_crt_saving">Giltza-uztaiak gordetzen</string> <string name="msg_crt_unlock">Maisu giltza desblokeatzen</string> <string name="msg_crt_success">Nortasunak ongi egiaztagiritu dira</string> <string name="msg_crt_warn_not_found">Giltza ez da aurkitu!</string> <string name="msg_crt_warn_cert_failed">Egiaztagiri sortze hutsegitea!</string> <string name="msg_crt_warn_save_failed">Gordetze eragiketa hutsegitea!</string> + <string name="msg_crt_warn_upload_failed">Igoera eragiketa hutsegitea!</string> <string name="msg_crt_upload_success">Giltza ongi igo da zerbitzarira</string> + <plurals name="msg_import"> + <item quantity="one">Giltza inportatzen</item> + <item quantity="other">%d giltza inportatzen</item> + </plurals> <string name="msg_import_fetch_error_decode">Akatsa berreskuratutako giltza-uztai dekodeatzerakoan!</string> + <string name="msg_import_fetch_error">Giltza ezin da berreskuratu! (Sare arazoak?)</string> + <string name="msg_import_fetch_keybase">keybase.io-tik berreskuratzen: %s</string> + <string name="msg_import_fetch_keyserver_error">Ezin da giltza giltza-zerbitzarietatik berreskuratu: %s</string> <string name="msg_import_fetch_keyserver">Giltza-zerbitzaritik berreskuratzen: %s</string> <string name="msg_import_fetch_keyserver_ok">Giltza ongi berreskuratu da</string> <string name="msg_import_keyserver">%s giltza-zerbitzaria erabiltzen</string> @@ -862,8 +944,14 @@ <string name="msg_import_error_io">Eragiketa hutsegitea s/i akats bategaitik!</string> <string name="msg_import_partial">Inportatze eragiketa ongi burutu da, akatsekin!</string> <string name="msg_import_success">Inportatze eragiketa ongi burutu da!</string> + <plurals name="msg_export"> + <item quantity="one">Giltza bat esportatzen</item> + <item quantity="other">%d giltza esportatzen</item> + </plurals> <string name="msg_export_all">Giltza guztiak esportatzen</string> <string name="msg_export_public">Giltza publikoa esportatzen %s</string> + <string name="msg_export_upload_public">%s giltza publikoa igotzen</string> + <string name="msg_export_secret">%s giltza sekretua esportatzen</string> <string name="msg_export_error_no_file">Ez da agirizenik adierazi!</string> <string name="msg_export_error_fopen">Akatsa agiria irekitzen!</string> <string name="msg_export_error_no_uri">Ez da URI-rik adierazi!</string> @@ -872,9 +960,15 @@ <string name="msg_export_error_db">Datubase akatsa!</string> <string name="msg_export_error_io">Sarrera/irteera akatsa!</string> <string name="msg_export_error_key">Akatsa giltza datuak aurre-prozesatzerakoan!</string> + <string name="msg_export_error_upload">Hutsegitea giltza zerbitzara igotzean! Mesedez egiaztatu zure internet elkarketa.</string> <string name="msg_export_success">Esportatze eragiketa ongi burutu da!</string> + <string name="msg_export_upload_success">Giltza-zerbitzarira igotzea ongi!</string> <string name="msg_del_error_empty">Ez dago ezer ezabatzeko!</string> <string name="msg_del_error_multi_secret">Giltza sekretuak banaka bakarrik ezabatu daitezke!</string> + <plurals name="msg_del"> + <item quantity="one">Giltza bat ezabatzen</item> + <item quantity="other">%d giltza ezabatzen</item> + </plurals> <string name="msg_del_key">%s giltza ezabatzen</string> <string name="msg_del_key_fail">Hutsegitea %s giltza ezabatzerakoan</string> <string name="msg_del_consolidate">Datubasea sendotzen giltza sekretua ezabatu ondoren</string> @@ -882,10 +976,17 @@ <item quantity="one">Ongi ezabatuta giltza</item> <item quantity="other">Ongi ezabatuta %d giltza</item> </plurals> + <plurals name="msg_del_fail"> + <item quantity="one">Hutsegitea giltza bat ezabatzerakoan</item> + <item quantity="other">Hutsegitea %d giltza ezabatzerakoan</item> + </plurals> <string name="msg_acc_saved">Kontua gordeta</string> <string name="msg_download_success">Ongi jeitsi da!</string> <string name="msg_download_no_valid_keys">Ez da baliozko giltzarik aurkitu agiri/gakoan!</string> <string name="msg_download_query_failed">Akats bat gertatu da giltzak bilatzerakoan.</string> + <!--Messages for Keybase Verification operation--> + <string name="msg_keybase_error_dns_fail">DNS TXT Grabaketa berreskurapen hutsegitea</string> + <string name="msg_keybase_error_specific">%s</string> <!--Messages for Export Log operation--> <string name="msg_export_log_start">Esportatze oharra</string> <string name="msg_export_log_error_fopen">Akatsa agiria irekitzerakoan</string> @@ -893,6 +994,13 @@ <string name="msg_export_log_error_writing">S/I akatsa agirira idazterakoan!</string> <string name="msg_export_log_success">Oharra ongi esportatu da!</string> <!--PassphraseCache--> + <string name="passp_cache_notif_click_to_clear">Ikutu sarhitzak garbitzeko</string> + <plurals name="passp_cache_notif_n_keys"> + <item quantity="one">%d sarhitz gogoratuta</item> + <item quantity="other">%d sarhitz gogoratuta</item> + </plurals> + <string name="passp_cache_notif_keys">Gogoratutako sarhitzak</string> + <string name="passp_cache_notif_clear">Garbitu Sarhitzak</string> <string name="passp_cache_notif_pwd">Sarhitza</string> <!--First Time--> <string name="first_time_text1">Berreskuratu zure pribatutasuna OpenKeychain-ekin!</string> @@ -900,11 +1008,19 @@ <string name="first_time_import_key">Inportatu giltza agiritik</string> <string name="first_time_yubikey">Erabili YubiKey NEO</string> <string name="first_time_skip">Jauzi Ezarpena</string> + <string name="first_time_blank_yubikey">YubiKey huts hau erabiltzea nahi duzu OpenKeychain-ekin?\n\nMesedez irten Yubikey-tik orain, berriro galdetuko zaizu beharrezkoa denean!</string> + <string name="first_time_blank_yubikey_yes">Erabili YubiKey hau</string> <!--unsorted--> <string name="section_certifier_id">Egiaztatzailea</string> <string name="section_cert">Egiaztagiriaren Xehetasunak</string> <string name="label_user_id">Nortasuna</string> + <string name="unknown_uid"><ezezaguna></string> <string name="empty_certs">Ez dago egiaztagiririk giltza honentzat</string> + <string name="certs_text">Hemen balioztatutako berez-egiaztagiriak eta zeure giltzekin sortutako egiaztagiri balioztatuak bakarrik erakusten dira.</string> + <string name="section_uids_to_certify">Nortasunak honako</string> + <string name="certify_text">Inportatzen ari zaren giltzek \"nortasunak\":izenak eta posta helbideak dituzte. Hautatu zehatz-mehatz hauek itxaroten duzunarekin bat datozela baieztatzeko.</string> + <string name="certify_fingerprint_text">Alderatu erakutsitako hatz-aztarnak, hizkiz-hizki, zure gailuko ereduek erakusten duten batekin.</string> + <string name="certify_fingerprint_text2">Erakutsitako hatz-aztarnak bat datoz?</string> <string name="label_revocation">Ukatze Zergaitia</string> <string name="label_cert_type">Mota</string> <string name="error_key_not_found">Giltza ez da aurkitu!</string> @@ -916,9 +1032,13 @@ <string name="unknown_algorithm">ezezaguna</string> <string name="can_sign_not">ezin da sinatu</string> <string name="error_no_encrypt_subkey">Ez dago enkriptaketa azpigiltzarik eskuragarri!</string> + <string name="account_no_manual_account_creation">Ez sortu OpenKeychain-Kontuak eskuz.\n.Argibide gehiagorako, ikusi Laguntza.</string> <string name="contact_show_key">Erakutsi (%s) giltza</string> <string name="swipe_to_update">Irristatu behera giltza-zerbitzaritik eguneratzeko</string> <string name="error_no_file_selected">Hautatu agiri bat gutxienez enkriptatzeko!</string> + <string name="error_multi_files">Agiri ugari gordetzea ez dago sostengatuta. Hau oraingo Androiden muga bat da.</string> + <string name="error_multi_clipboard">Agiri anitz gakora enkriptatzea ez dago sostengatuta.</string> + <string name="error_detached_signature">Agiri binarioen sinatzea-bakarrik eragiketa ez dago sostengatuta, hautatu gutxienez enkriptaketa giltza bat.</string> <string name="error_empty_text">Idatzi idazkiren bat enkriptatzeko!</string> <string name="key_colon">Giltza:</string> <string name="exchange_description">Giltza trukatzea bat hasteko, hautatu eskuinaldean kide zenbatekoa, orduan sakatu \"Hasi trukatzea\" botoia.\n\nBeste bi galdera egingo zaizkizu kide zuzenek besterik ez dutela eskuhartzen eta beren hatz-aztarnak zuzenak direla zihurtatzeko.</string> @@ -953,19 +1073,11 @@ <string name="yubikey_serno">Serie Zbk: %s</string> <string name="yubikey_create">Jarri YubiKey zure gailuaren atzealdean.</string> <string name="btn_import">Inportatu</string> + <string name="snack_yubi_other">Giltza ezberdina biltegiratuta YubiKey-n!</string> <string name="error_nfc">NFC Akatsa: %s</string> - <string name="error_pin">NFC: PIN okerra; %d saiakera gelditzen dira.</string> - <string name="error_nfc_terminated">NFC: Txartel adimentsua amaiera egoeran</string> - <string name="error_nfc_wrong_length">NFC: Luzer okerra datuak bidaltzeko / jasotzeko</string> - <string name="error_nfc_conditions_not_satisfied">NFC: Ez dira erabilpen baldaintzak betetzen</string> - <string name="error_nfc_security_not_satisfied">NFC: Ez da segurtasun egoera betetzen</string> - <string name="error_nfc_authentication_blocked">NFC: PIN-a blokeatuta saiakera gehiegiren ondoren</string> - <string name="error_nfc_data_not_found">NFC: Gailtza edo objetua ez da aurkitu</string> - <string name="error_nfc_unknown">NFC: Akats Ezezaguna</string> - <string name="error_nfc_bad_data">NFC: Txartelak datu baliogabeak jakinarazi ditu</string> - <string name="error_nfc_chaining_error">NFC: Txartelak itxaroten azken agindua kate batean</string> - <string name="error_nfc_header">NFC: Txartelak %s byte baliogabea jakinarazi du</string> <string name="error_pin_nodefault">Berezko PIN-a baztertua izan da!</string> + <string name="error_temp_file">Akatsa aldibaterako agiria sortzerakoan.</string> + <string name="btn_delete_original">Ezabatu jatorrizko agiria</string> <string name="snack_encrypt_filenames_on">Agirizenak enkriptatuta <b>daude</b>.</string> <string name="snack_encrypt_filenames_off">Agirizenak <b>ez daude</b> enkriptatuta.</string> <string name="snack_armor_on">Irteera kodeaketa Idazki bezala.</string> @@ -974,4 +1086,18 @@ <string name="snack_compression_off">Konpresioa <b>ezgaituta</b>.</string> <string name="error_loading_keys">Akatsa giltzak gertatzerakoan!</string> <string name="error_empty_log">(akatsa, oharra hutsik)</string> + <string name="error_reading_text">Ezin da irakurri sarrera dekriptatzeko!</string> + <string name="filename_unknown"><agirizenik ez></string> + <string name="filename_unknown_text"><idazki lau datuak></string> + <string name="intent_show">Erakutsi Sinatutako/Enkriptatutako Edukia</string> + <string name="view_internal">Ikusi OpenKeychain-en</string> + <string name="error_preparing_data">Akatsa datuak gertatzerakoan!</string> + <string name="label_clip_title">Enkriptatutatako Datuak</string> + <string name="progress_processing">Prozesatzen...</string> + <string name="error_saving_file">Akatsa agiria gordetzerakoan!</string> + <string name="file_saved">Agiria gordeta!</string> + <string name="file_delete_ok">Jatorrizko agiria ezabatuta.</string> + <string name="file_delete_none">Ez da agiria ezabatu! (Jadanik ezabatuta?)</string> + <string name="file_delete_exception">Jatorrizko agiria ezin da ezabatu!</string> + <string name="error_clipboard_empty">Gakoa hutsik dago!</string> </resources> diff --git a/OpenKeychain/src/main/res/values-fi/strings.xml b/OpenKeychain/src/main/res/values-fi/strings.xml index 6b0d7bfb8..724cd7b5c 100644 --- a/OpenKeychain/src/main/res/values-fi/strings.xml +++ b/OpenKeychain/src/main/res/values-fi/strings.xml @@ -66,7 +66,6 @@ <string name="label_use_default_yubikey_pin">Käytä vakiota YubiKey PIN:iä</string> <string name="label_use_num_keypad_for_yubikey_pin">Käytä numeerista näppäimistöä YuniKey PIN:iin</string> <string name="label_label_use_default_yubikey_pin_summary">Käyttää vakio-PIN:iä (123456) käyttääkseen YubiKeyssejä NFC kautta</string> - <string name="label_asymmetric_from">Allekirjoittaja:</string> <string name="label_to">Salaa:</string> <string name="label_delete_after_decryption">Poista salauksen purkamisen jälkeen</string> <string name="label_encryption_algorithm">Salausalgoritmi</string> @@ -85,8 +84,12 @@ <string name="label_send_key">Synkronoi pilveen</string> <string name="label_fingerprint">Sormenjälki</string> <string name="expiry_date_dialog_title">Aseta umpeutumispäivämäärä</string> - <string name="label_first_keyserver_is_used">(Ensimmäinen avainpalvelin listalla on ensisijainen)</string> <string name="label_preferred">ensisijainen</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><ei nimeä></string> <string name="none"><ei mitään></string> <plurals name="n_keys"> @@ -161,7 +164,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -180,6 +183,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index d5210379e..96e7b9aba 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -35,7 +35,7 @@ <string name="title_manage_my_keys">Gérer mes clefs</string> <!--section--> <string name="section_user_ids">identités</string> - <string name="section_yubikey">Clef Yubi</string> + <string name="section_yubikey">ClefYubi</string> <string name="section_linked_system_contact">Contact système relié</string> <string name="section_should_you_trust">Devriez-vous faire confiance à cette clef ?</string> <string name="section_proof_details">Vérification de preuve</string> @@ -56,6 +56,8 @@ <string name="btn_decrypt_verify_file">Déchiffrer, vérifier et enregistrer le fichier</string> <string name="btn_encrypt_share_file">Chiffrer et partager le fichier</string> <string name="btn_encrypt_save_file">Chiffrer et enregistrer un fichier</string> + <string name="btn_save_file">Enregistrer le fichier</string> + <string name="btn_save">Enregistrer</string> <string name="btn_view_log">Visualiser le journal</string> <string name="btn_do_not_save">Annuler</string> <string name="btn_delete">Supprimer</string> @@ -98,6 +100,7 @@ <string name="menu_advanced">Informations détaillées</string> <string name="menu_certify_fingerprint">Confirmer par une comparaison d\'empreinte</string> <string name="menu_export_log">Exporter le journal</string> + <string name="menu_keyserver_add">Ajouter</string> <!--label--> <string name="label_message">Texte</string> <string name="label_file">Fichier</string> @@ -113,10 +116,9 @@ <string name="label_file_ascii_armor">Activer l\'armure ASCII</string> <string name="label_write_version_header">Faire savoir aux autres que vous utilisez OpenKeychain</string> <string name="label_write_version_header_summary">Ajoute « OpenKeychain v2.7 » aux signatures OpenPGP, aux cryptogrammes et aux clefs exportées</string> - <string name="label_use_default_yubikey_pin">Utiliser le NIP par défaut de la clef Yubi</string> - <string name="label_use_num_keypad_for_yubikey_pin">Utiliser le pavé numérique pour le NIP de la clef Yubi</string> - <string name="label_label_use_default_yubikey_pin_summary">Utilise le NIP par défaut (123456) pour accéder aux clefs Yubi par la NFC</string> - <string name="label_asymmetric_from">Signé par :</string> + <string name="label_use_default_yubikey_pin">Utiliser le NIP par défaut de la ClefYubi</string> + <string name="label_use_num_keypad_for_yubikey_pin">Utiliser le pavé numérique pour le NIP de la ClefYubi</string> + <string name="label_label_use_default_yubikey_pin_summary">Utilise le NIP par défaut (123456) pour accéder aux ClefsYubi par la NFC</string> <string name="label_to">Chiffrer pour :</string> <string name="label_delete_after_encryption">Supprimer les fichiers après chiffrement</string> <string name="label_delete_after_decryption">Supprimer le fichier après le déchiffrement</string> @@ -142,17 +144,25 @@ <string name="label_send_key">Synchroniser avec le nuage</string> <string name="label_fingerprint">Empreinte</string> <string name="expiry_date_dialog_title">Définir une date d\'expiration</string> - <string name="label_first_keyserver_is_used">(Le premier serveur de clefs listé est préféré)</string> + <string name="label_keyservers_title">Serveurs de clefs</string> + <string name="label_keyserver_settings_hint">Glisser pour changer l\'ordre, toquer pour éditer/supprimer</string> + <string name="label_selected_keyserver_title">Serveurs de clefs sélectionnés</string> <string name="label_preferred">préféré</string> <string name="label_enable_compression">Activer la compression</string> <string name="label_encrypt_filenames">Chiffrer les nom de fichier</string> <string name="label_hidden_recipients">Cacher les destinataires</string> <string name="label_verify_keyserver">Vérifier le serveur de clefs</string> <string name="label_enter_keyserver_url">Saisir l\'URL du serveur de clefs</string> + <string name="label_keyserver_dialog_delete">Supprimer le serveur de clefs</string> <string name="pref_keyserver">Serveurs de clefs OpenPGP</string> <string name="pref_keyserver_summary">Rechercher les clefs dans les serveurs de clefs OpenPGP choisis (protocole HKP)</string> <string name="pref_keybase">keybase.io</string> <string name="pref_keybase_summary">Rechercher les clefs sur keybase.io</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><aucun nom></string> <string name="none"><aucune></string> <plurals name="n_keys"> @@ -199,8 +209,8 @@ <string name="passphrase_for_symmetric_encryption">Chriffrement symétrique.</string> <string name="passphrase_for">Saisir le mot de passe pour « %s »</string> <string name="pin_for">Saisir le NIP pour « %s »</string> - <string name="yubikey_pin_for">Saisir le NIP pour accéder à la clef Yubi pour « %s »</string> - <string name="nfc_text">Tenez la clef Yubi contre le dos de votre appareil.</string> + <string name="yubikey_pin_for">Saisir le NIP pour accéder à la ClefYubi pour « %s »</string> + <string name="nfc_text">Tenez la ClefYubi contre le logo NFC au dos de votre appareil.</string> <string name="file_delete_confirmation_title">Supprimer les fichiers originaux ?</string> <string name="file_delete_confirmation">Les fichiers suivants seront détruits : %s</string> <string name="file_delete_successful">%1$d fichiers sur %2$d ont déjà été supprimés. %3$s</string> @@ -211,7 +221,7 @@ <string name="error_no_encryption_or_signature_key">Choisir au moins une clef de chiffrement ou une clef de signature.</string> <string name="specify_file_to_encrypt_to">Veuillez spécifier vers quel fichier chiffrer.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe !</string> <string name="specify_file_to_decrypt_to">Veuillez spécifier vers quel fichier déchiffrer.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe !</string> - <string name="specify_file_to_export_to">Veuillez spécifier vers quel fichier exporter.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe !</string> + <string name="specify_backup_dest">Veuillez spécifier vers quel fichier exporter.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe !</string> <string name="key_deletion_confirmation_multi">Voulez-vous vraiment supprimer toutes les clefs sélectionnées ?</string> <string name="secret_key_deletion_confirmation">Après suppression vous ne pourrez plus lire les messages chiffrés avec cette clef et vous perdrez toutes les confirmations de clefs faites avec elle !</string> <string name="public_key_deletetion_confirmation">Supprimer la clef \'%s\' ?</string> @@ -258,7 +268,7 @@ <string name="error_beam_needed">Beam doit être activé !</string> <string name="error_nothing_import">Aucune clef trouvée !</string> <string name="error_nothing_import_selected">Aucune clef sélectionnée pour l\'importation !</string> - <string name="error_contacts_key_id_missing">Échec lors de la récupération de l\'ID de clef à partir des contacts !</string> + <string name="error_contacts_key_id_missing">Échec de récupération de l\'ID de clef des contacts !</string> <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau rapport de bogue pour OpenKeychain.</string> <!--results shown after decryption/verification--> <string name="decrypt_result_no_signature">Non signé</string> @@ -304,6 +314,8 @@ <string name="progress_modify_subkeystrip">dépouillement des sous-clefs...</string> <string name="progress_modify_subkeyadd">ajout des sous-clefs...</string> <string name="progress_modify_passphrase">modification du mot passe...</string> + <string name="progress_modify_pin">changement du NIP...</string> + <string name="progress_modify_admin_pin">changement du NIP d\'admin....</string> <plurals name="progress_exporting_key"> <item quantity="one">exportation de la clef...</item> <item quantity="other">exportation des clefs...</item> @@ -413,8 +425,8 @@ <item quantity="other">%1$d clefs ont été supprimées avec succès</item> </plurals> <plurals name="delete_ok_but_fail_2"> - <item quantity="one">, mais échec lors de la suppression d\'une key%2$s.</item> - <item quantity="other">, mais échec lors de la suppression de %1$d key%2$s.</item> + <item quantity="one">, mais échec de suppression d\'une key%2$s.</item> + <item quantity="other">, mais échec de suppression de %1$d key%2$s.</item> </plurals> <plurals name="delete_ok"> <item quantity="one">Une key%2$s supprimée avec succès.</item> @@ -459,7 +471,7 @@ <string name="api_settings_start">Lancer l\'application</string> <string name="api_settings_delete_account">Supprimer le compte</string> <string name="api_settings_package_name">Nom du paquet</string> - <string name="api_settings_package_signature">SHA-256 de la signature du paquet</string> + <string name="api_settings_package_certificate">SHA-256 de la signature du paquet</string> <string name="api_settings_accounts">Comptes (ancienne API)</string> <string name="api_settings_advanced">Informations détaillées</string> <string name="api_settings_allowed_keys">Clefs autorisées</string> @@ -536,7 +548,7 @@ <string name="keybase_unknown_proof_failure">Problème inconnu avec le vérificateur de preuve</string> <string name="keybase_problem_fetching_evidence">Problème avec la preuve</string> <string name="keybase_key_mismatch">L\'empreinte de clef ne correspondant pas à celle du billet de preuve</string> - <string name="keybase_dns_query_failure">Échec lors de la récupération de l\'enregistrement DNS TXT</string> + <string name="keybase_dns_query_failure">Échec de récupération de l\'enregistrement DNS TXT</string> <string name="keybase_no_prover_found">Aucun vérificateur de preuve trouvé pour</string> <string name="keybase_message_payload_mismatch">Le billet de preuve déchiffré ne correspond pas à la valeur attendue</string> <string name="keybase_message_fetching_data">Récupération de la preuve</string> @@ -570,7 +582,7 @@ <item>Changer l\'expiration</item> <item>Révoquer la sous-clef</item> <item>Dépouiller la sous-clef</item> - <item>Déplacer la sous-clef vers la clef Yubi / carte à puce</item> + <item>Déplacer la sous-clef vers la ClefYubi / carte à puce</item> </string-array> <string name="edit_key_new_subkey">nouvelle sous-clef</string> <string name="edit_key_select_flag">Veuillez sélectionner au moins un drapeau !</string> @@ -596,6 +608,13 @@ <string name="create_key_add_email_text">Des adresses courriel supplémentaires sont aussi associées à cette clef et peuvent être utilisées pour des communications sécurisées.</string> <string name="create_key_email_already_exists_text">L\'adresse courriel a déjà été ajoutée</string> <string name="create_key_email_invalid_email">Le format de l\'adresse courriel est invalide</string> + <string name="create_key_yubi_key_pin_text">Veuillez mémoriser le NIP. Il sera exigé pour une utilisation ultérieure de votre ClefYubi. Prenez si possible le NIP d\'admin. en note et stockez-le dans un endroit sûr</string> + <string name="create_key_yubi_key_pin">NIP</string> + <string name="create_key_yubi_key_admin_pin">NIP d\'admin.</string> + <string name="create_key_yubi_key_pin_repeat_text">Veuillez saisir le NIP et le NIP d\'admin. pour continuer.</string> + <string name="create_key_yubi_key_pin_repeat">Répéter le NIP</string> + <string name="create_key_yubi_key_admin_pin_repeat">Répéter le NIP d\'admin.</string> + <string name="create_key_yubi_key_pin_not_correct">NIP erroné !</string> <!--View key--> <string name="view_key_revoked">Révoquée : la clef ne doit plus être utilisée !</string> <string name="view_key_expired">Expirée : le contact doit prolonger la validité de la clef !</string> @@ -604,12 +623,15 @@ <string name="view_key_verified">Clef confirmée</string> <string name="view_key_unverified">Non confirmée : lisez le code QR pour confirmer la clef !</string> <string name="view_key_fragment_no_system_contact"><aucun></string> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Ajouter un serveur de clefs</string> + <string name="edit_keyserver_dialog_title">Modifier le serveur de clefs</string> <string name="add_keyserver_verified">Le serveur de clefs a été vérifié !</string> <string name="add_keyserver_without_verification">Le serveur de clefs a été ajouté sans vérification.</string> <string name="add_keyserver_invalid_url">URL invalide !</string> <string name="add_keyserver_connection_failed">Échec de connexion au serveur de clefs. Veuillez vérifier l\'URL et votre connexion Internet.</string> + <string name="keyserver_preference_deleted">%s supprimé</string> + <string name="keyserver_preference_cannot_delete_last">Impossible de supprimer le dernier serveur de clefs. Il en faut au moins un !</string> <!--Navigation Drawer--> <string name="nav_keys">Clefs</string> <string name="nav_encrypt_decrypt">Chiffrer/déchiffrer</string> @@ -868,8 +890,10 @@ <string name="msg_mf_notation_empty">Ajout d\'un paquet de notation vide</string> <string name="msg_mf_notation_pin">Ajout d\'un paquet de notation NIP</string> <string name="msg_mf_passphrase">Changement de mot de passe pour le trousseau</string> + <string name="msg_mf_pin">Changement du NIP sur la carte</string> + <string name="msg_mf_admin_pin">Changement du NIP d\'admin. sur la carte</string> <string name="msg_mf_passphrase_key">Rechiffrement de la sous-clef %s avec un nouveau mot de passe</string> - <string name="msg_mf_passphrase_empty_retry">Échec lors de la définition du nouveau mot de passe, nouvel essai avec un ancien mot de passe vide</string> + <string name="msg_mf_passphrase_empty_retry">Échec de définition du nouveau mot de passe, nouvel essai avec un ancien mot de passe vide</string> <string name="msg_mf_passphrase_fail">Le mot de passe de la sous-clef n\'a pas pu être changé ! (Est-il différent des autres clefs ?)</string> <string name="msg_mf_primary_replace_old">Remplacement du certificat de l\'ID utilisateur principal précédent</string> <string name="msg_mf_primary_new">Génération d\'un nouveau certificat pour le nouvel ID utilisateur principal</string> @@ -924,8 +948,8 @@ <item quantity="other">Réimportation de %d clefs secrètes</item> </plurals> <string name="msg_con_reimport_secret_skip">Aucune clef secrète à réimporter, étape ignorée...</string> - <string name="msg_con_warn_delete_public">Une exception a eu lieu lors de la suppression du fichier de cache public</string> - <string name="msg_con_warn_delete_secret">Une exception a eu lieu lors de la suppression du fichier de cache secret</string> + <string name="msg_con_warn_delete_public">Exception de suppression du fichier de cache public</string> + <string name="msg_con_warn_delete_secret">Exception de suppression du fichier de cache secret</string> <!--Edit Key (higher level than modify)--> <string name="msg_ed">Exécution de l\'opération sur la clef</string> <string name="msg_ed_caching_new">Mise en cache du nouveau mot de passe</string> @@ -939,7 +963,7 @@ <string name="msg_pr_error_key_not_found">Clef introuvable !</string> <string name="msg_pr_fetching">Obtention de la clef à modifier (%s)</string> <string name="msg_pr_subkey_match">Promotion de la sous-clef : %s</string> - <string name="msg_pr_subkey_nomatch">La sous-clef n\'est pas sur la clef Yubi : %s</string> + <string name="msg_pr_subkey_nomatch">La sous-clef n\'est pas sur la ClefYubi : %s</string> <string name="msg_pr_success">Clef promue avec succès</string> <!--Other messages used in OperationLogs--> <string name="msg_ek_error_dummy">Impossible de modifier un trousseau avec une clef maîtresse dépouillée !</string> @@ -968,7 +992,6 @@ <string name="msg_dc_error_integrity_check">Erreur de vérification de l\'intégrité !</string> <string name="msg_dc_error_integrity_missing">Vérification de l\'intégrité absente ! Ceci peut arriver car l\'application n\'est pas à jour, ou à cause d\'une attaque par mise à niveau inférieur.</string> <string name="msg_dc_error_invalid_data">Aucune donnée OpenPGP valide chiffrée ou signée n\'a été trouvée !</string> - <string name="msg_dc_error_io">Une exception E/S a été rencontrée durant l\'opération !</string> <string name="msg_dc_error_no_data">Aucune donnée chiffrée n\'a été trouvée dans le flux !</string> <string name="msg_dc_error_no_key">Aucune donnée chiffrée avec une clef secrète connue n\'a été trouvée dans le flux !</string> <string name="msg_dc_error_pgp_exception">Une exception OpenPGP a été rencontrée durant l\'opération !</string> @@ -1056,8 +1079,8 @@ <string name="msg_crt_unlock">Déverrouillage de la clef maîtresse</string> <string name="msg_crt_success">Identités certifiées avec succès</string> <string name="msg_crt_warn_not_found">Clef introuvable !</string> - <string name="msg_crt_warn_cert_failed">Échec lors de la génération du certificat !</string> - <string name="msg_crt_warn_save_failed">Échec lors de l\'opération d\'enregistrement !</string> + <string name="msg_crt_warn_cert_failed">Échec de génération du certificat !</string> + <string name="msg_crt_warn_save_failed">Échec de l\'opération d\'enregistrement !</string> <string name="msg_crt_upload_success">Clef téléversée vers le serveur avec succès</string> <plurals name="msg_import"> <item quantity="one">Importation de la clef</item> @@ -1074,7 +1097,7 @@ <string name="msg_import_fingerprint_ok">Vérification de l\'empreinte OK !</string> <string name="msg_import_merge">Fusion des données récupérées</string> <string name="msg_import_merge_error">Erreur de fusion des données récupérées !</string> - <string name="msg_import_error">Échec lors de l\'opération d\'importation !</string> + <string name="msg_import_error">Échec de l\'opération d\'importation !</string> <string name="msg_import_error_io">Échec de l\'opération causé par une erreur d\'E/S !</string> <string name="msg_import_partial">Opération d\'importation réussie, avec des erreurs !</string> <string name="msg_import_success">Opération d\'importation réussie !</string> @@ -1101,15 +1124,15 @@ <item quantity="other">Suppression de %d clefs</item> </plurals> <string name="msg_del_key">Suppression de la clef %s</string> - <string name="msg_del_key_fail">Échec lors de la suppression de la clef %s</string> + <string name="msg_del_key_fail">Échec de suppression de la clef %s</string> <string name="msg_del_consolidate">Consolidation de la base de données après la suppression de la clef secrète</string> <plurals name="msg_del_ok"> <item quantity="one">Suppression de la clef réussie</item> <item quantity="other">Suppression de %d clefs réussie</item> </plurals> <plurals name="msg_del_fail"> - <item quantity="one">Échec lors de la suppression d\'une clef</item> - <item quantity="other">Échec lors de la suppression de %d clefs</item> + <item quantity="one">Échec de suppression d\'une clef</item> + <item quantity="other">Échec de suppression de %d clefs</item> </plurals> <string name="msg_acc_saved">Compte enregistré</string> <string name="msg_download_success">Téléchargement réussi !</string> @@ -1123,6 +1146,14 @@ <string name="msg_download_too_many_responses">La requête de recherche de clef a retourné trop de candidats. Veuillez raffiner votre requête !</string> <string name="msg_download_query_too_short_or_too_many_responses">Soit aucune clef ou trop de clefs ont été trouvées. Veuillez améliorer votre requête !</string> <string name="msg_download_query_failed">Une erreur est survenue lors de la recherche de clefs.</string> + <!--Messages for Keybase Verification operation--> + <string name="msg_keybase_verification">Tentative de vérification « keybase » pour %s</string> + <string name="msg_keybase_error_no_prover">Aucun vérificateur de preuve trouvé pour %s</string> + <string name="msg_keybase_error_fetching_evidence">Problème de récupération de la preuve</string> + <string name="msg_keybase_error_key_mismatch">L\'empreinte de la clef ne correspond pas à celle du billet de preuve</string> + <string name="msg_keybase_error_dns_fail">Échec de récupération de l\'enregistrement DNS TXT</string> + <string name="msg_keybase_error_specific">%s</string> + <string name="msg_keybase_error_msg_payload_mismatch">Le billet de preuve déchiffré ne correspond pas à la valeur attendue</string> <!--Messages for Export Log operation--> <string name="msg_export_log_start">Exportation du journal</string> <string name="msg_export_log_error_fopen">Erreur d\'ouverture du fichier !</string> @@ -1142,8 +1173,10 @@ <string name="first_time_text1">Reprenez le contrôle de votre vie privée avec OpenKeychain |</string> <string name="first_time_create_key">Créer ma clef</string> <string name="first_time_import_key">Importer la clef d\'un fichier</string> - <string name="first_time_yubikey">Utiliser le NEO de la clef Yubi</string> + <string name="first_time_yubikey">Utiliser le NEO de la ClefYubi</string> <string name="first_time_skip">Ignorer le paramétrage</string> + <string name="first_time_blank_yubikey">Voulez-vous utiliser cette ClefYubi NEO vide avec OpenKeychain ?\n\nVeuillez retirer la ClefYubi maintenant, vous serez informé quand elle sera requise de nouveau !</string> + <string name="first_time_blank_yubikey_yes">Utiliser cette ClefYubi</string> <!--unsorted--> <string name="section_certifier_id">Certificateur</string> <string name="section_cert">Détails du certificat</string> @@ -1168,7 +1201,7 @@ <string name="unknown_algorithm">inconnu</string> <string name="can_sign_not">impossible de signer</string> <string name="error_no_encrypt_subkey">Aucune sous-clef de chiffrement n\'est proposée !</string> - <string name="info_no_manual_account_creation">Ne pas créer de comptes-OpenKeychain manuellement.\nPour plus d\'informations, consultez l\'Aide.</string> + <string name="account_no_manual_account_creation">Ne pas créer de comptes-OpenKeychain manuellement.\nPour plus d\'informations, consultez l\'Aide.</string> <string name="contact_show_key">Montrer la clef (%s)</string> <string name="swipe_to_update">Glisser vers le bas pour mettre à jour à partir du serveur de clefs</string> <string name="error_no_file_selected">Choisir au moins un fichier à chiffrer !</string> @@ -1212,25 +1245,15 @@ <string name="yubikey_serno">No de série : %s</string> <string name="yubikey_key_holder">Détenteur de la clef :</string> <string name="yubikey_key_holder_not_set">Détenteur de la clef : <not set></string> - <string name="yubikey_status_bound">La clef Yubi correspond et est reliée à la clef</string> - <string name="yubikey_status_unbound">La clef Yubi correspond et peut être reliée à la clef</string> - <string name="yubikey_status_partly">La clef Yubi correspond et est partiellement reliée à la clef</string> - <string name="yubikey_create">Tenez la clef Yubi contre le dos de votre appareil.</string> + <string name="yubikey_status_bound">La ClefYubi correspond et est reliée à la clef</string> + <string name="yubikey_status_unbound">La ClefYubi correspond et peut être reliée à la clef</string> + <string name="yubikey_status_partly">La ClefYubi correspond et est partiellement reliée à la clef</string> + <string name="yubikey_create">Tenez la ClefYubi contre le dos de votre appareil.</string> <string name="btn_import">Importer</string> - <string name="snack_yubi_other">Une clef différente est stockée sur la clef Yubi !</string> + <string name="snack_yubi_other">Une clef différente est stockée sur la ClefYubi !</string> <string name="error_nfc">Erreur NFC ; %s</string> - <string name="error_pin">NFC : NIP erroné ; il reste %d essais.</string> - <string name="error_nfc_terminated">NFC : carte à puce en état de fin d\'opération</string> - <string name="error_nfc_wrong_length">NFC : longueur erronée de données envoyées / reçues</string> - <string name="error_nfc_conditions_not_satisfied">NFC : les conditions d\'utilisation ne sont pas satisfaites</string> - <string name="error_nfc_security_not_satisfied">NFC : l\'état de sécurité n\'est pas satisfait</string> - <string name="error_nfc_authentication_blocked">NFC : NIP bloqué après trop d\'essais</string> - <string name="error_nfc_data_not_found">NFC : clef ou objet introuvable</string> - <string name="error_nfc_unknown">NFC : erreur inconnue</string> - <string name="error_nfc_bad_data">NFC : la carte a signalé des données invalides</string> - <string name="error_nfc_chaining_error">NFC : la carte attendait la dernière commande dans une chaîne</string> - <string name="error_nfc_header">NFC : la carte a signalé %s bytes invalides</string> <string name="error_pin_nodefault">Le NIP par défaut a été rejeté !</string> + <string name="error_temp_file">Erreur de création du fichier temporaire.</string> <string name="btn_delete_original">Supprimer le fichier original</string> <string name="snack_encrypt_filenames_on">Les noms de fichiers <b>sont</b> chiffrés.</string> <string name="snack_encrypt_filenames_off">Les noms de fichiers <b>ne sont pas</b> chiffrés.</string> @@ -1253,4 +1276,5 @@ <string name="file_delete_ok">Fichier original supprimé.</string> <string name="file_delete_none">Aucun fichier supprimé (déjà supprimé ?)</string> <string name="file_delete_exception">Impossible de supprimer le fichier original !</string> + <string name="error_clipboard_empty">Le presse-papiers est vide !</string> </resources> diff --git a/OpenKeychain/src/main/res/values-is/strings.xml b/OpenKeychain/src/main/res/values-is/strings.xml index 8f84af665..0713e39ad 100644 --- a/OpenKeychain/src/main/res/values-is/strings.xml +++ b/OpenKeychain/src/main/res/values-is/strings.xml @@ -7,6 +7,11 @@ <!--button--> <!--menu--> <!--label--> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <!--choice--> <!--key flags--> <!--sentences--> @@ -42,7 +47,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -61,6 +66,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index 3e05ffe2c..9a479c947 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -37,6 +37,8 @@ <string name="section_user_ids">Identità</string> <string name="section_yubikey">YubiKey</string> <string name="section_should_you_trust">Ci si potrà fidare di questa chiave?</string> + <string name="section_proof_details">Verifica prova</string> + <string name="section_cloud_evidence">Prova dalla cloud</string> <string name="section_keys">Sottochiavi</string> <string name="section_cloud_search">Ricerca</string> <string name="section_passphrase_cache">Trattamento Password/PIN</string> @@ -53,6 +55,8 @@ <string name="btn_decrypt_verify_file">Decodifica, verifica e salva su file</string> <string name="btn_encrypt_share_file">Codifica e condividi file</string> <string name="btn_encrypt_save_file">Codifica e salva file</string> + <string name="btn_save_file">Salva file</string> + <string name="btn_save">Salva</string> <string name="btn_view_log">Mostra log</string> <string name="btn_do_not_save">Annulla</string> <string name="btn_delete">Elimina</string> @@ -95,6 +99,7 @@ <string name="menu_advanced">Informazioni avanzate</string> <string name="menu_certify_fingerprint">Confermare tramite il confronto delle impronte digitali</string> <string name="menu_export_log">Esporta log</string> + <string name="menu_keyserver_add">Aggiungi</string> <!--label--> <string name="label_message">Testo</string> <string name="label_file">File</string> @@ -113,7 +118,6 @@ <string name="label_use_default_yubikey_pin">Utilizza il PIN predefinito di YubiKey</string> <string name="label_use_num_keypad_for_yubikey_pin">Utilizza la tastiera numerica per il PIN di YubiKey</string> <string name="label_label_use_default_yubikey_pin_summary">Usa PIN predefinito (123456) per accedere YubiKeys tramite NFC</string> - <string name="label_asymmetric_from">Firmato da:</string> <string name="label_to">Codifica per:</string> <string name="label_delete_after_encryption">Elimina file dopo la codifica</string> <string name="label_delete_after_decryption">Elimina dopo la decodifica</string> @@ -139,15 +143,25 @@ <string name="label_send_key">Sincronizza con il cloud</string> <string name="label_fingerprint">Impronta</string> <string name="expiry_date_dialog_title">Impostare la data di scadenza</string> - <string name="label_first_keyserver_is_used">(Primo server delle chiavi elencato è il preferito)</string> + <string name="label_keyservers_title">Server chiavi</string> + <string name="label_keyserver_settings_hint">Trascina per cambiare ordine, toccare per modificare/cancellare</string> + <string name="label_selected_keyserver_title">Server chiavi scelto</string> <string name="label_preferred">preferiti</string> <string name="label_enable_compression">Abilitare compressione</string> <string name="label_encrypt_filenames">Codifica nome dei file</string> <string name="label_hidden_recipients">Nascondi destinatari</string> <string name="label_verify_keyserver">Verificare server chiavi</string> <string name="label_enter_keyserver_url">Inserisci URL server chiavi</string> + <string name="label_keyserver_dialog_delete">Cancella server chiavi</string> <string name="pref_keyserver">Server chiavi OpenPGP</string> <string name="pref_keyserver_summary">Cerca chiavi su server chiavi OpenPGP selezionati (protocollo HKP)</string> + <string name="pref_keybase">keybase.io</string> + <string name="pref_keybase_summary">Ricerca chiavi su keybase.io</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><nessun nome></string> <string name="none"><nessuno></string> <plurals name="n_keys"> @@ -187,11 +201,28 @@ <string name="flag_encrypt">Codifica</string> <string name="flag_authenticate">Convalida</string> <!--sentences--> + <string name="wrong_passphrase">Password errata</string> <string name="no_filemanager_installed">Nessun gestore file compatibile installato.</string> + <string name="passphrases_do_not_match">Le password non corrispondono.</string> + <string name="passphrase_must_not_be_empty">Si prega di inserire una password.</string> <string name="passphrase_for_symmetric_encryption">Codifica Simmetrica.</string> + <string name="passphrase_for">Inserisci la password per \'%s\'</string> + <string name="pin_for">Inserisci il PIN per \'%s\'</string> + <string name="yubikey_pin_for">Inserisci il PIN per accedere a YubiKey con \'%s\'</string> + <string name="file_delete_confirmation_title">Eliminare i file originali?</string> + <string name="file_delete_confirmation">I seguenti file verranno cancellati:%s</string> + <string name="file_delete_successful">%1$d di %2$d file sono stati cancellati.%3$s</string> + <string name="no_file_selected">Nessun file selezionato.</string> <string name="encrypt_sign_successful">Firmato e/o codificato con successo.</string> <string name="encrypt_sign_clipboard_successful">Firmato e/o codificato con successo negli appunti.</string> <string name="select_encryption_key">Seleziona almeno una chiave di codifica.</string> + <string name="error_no_encryption_or_signature_key">Selezionare almeno una chiave per la cifratura o una chiave per la firma.</string> + <string name="specify_file_to_encrypt_to">Per favore specifica il file da codificare entro.\nATTENZIONE: Il file sarà sovrascritto se esistente.</string> + <string name="specify_file_to_decrypt_to">Per favore specifica il file da decifrare entro.\nATTENZIONE: Il file sarà sovrascritto se esistente.</string> + <string name="specify_backup_dest">Per favore specifica il file da esportare entro.\nATTENZIONE: Il file sarà sovrascritto se esistente.</string> + <string name="key_deletion_confirmation_multi">Vuoi veramente eliminare tutte le chiavi selezionate?</string> + <string name="secret_key_deletion_confirmation">Dopo la cancellazione non sarai in grado di leggere i messaggi cifrati con questa chiave e perderai tutte le conferme principali fatti con essa!</string> + <string name="public_key_deletetion_confirmation">Elimnina chiave \'%s\'?</string> <string name="also_export_secret_keys">Esporta anche chiave segreta</string> <string name="reinstall_openkeychain">Hai riscontrato un bug noto con Android. Si prega di reinstallare OpenKeychain se vuoi collegare i tuoi contatti con le chiavi.</string> <string name="key_exported">1 chiave esportata correttamente.</string> @@ -199,6 +230,7 @@ <string name="no_keys_exported">Nessuna chiave esportata.</string> <string name="key_creation_el_gamal_info">Nota: supporto sottochiavi solo per ElGamal.</string> <string name="key_not_found">Impossibile trovare la chiave %08X.</string> + <string name="specify_file_to_export_log_to">Per favore specifica il file da esportare entro.\nATTENZIONE: Il file sarà sovrascritto se esistente.</string> <plurals name="bad_keys_encountered"> <item quantity="one">%d chiave segreta corrotta ignorata. Tra l\'altro hai esportato con l\'opzione\n --export-secret-subkeys\nAssicurati di esportare con\n --export-secret-keys\ninvece.</item> <item quantity="other">%d chiavi segrete corrotte ignorate. Tra l\'altro hai esportato con l\'opzione\n --export-secret-subkeys\nAssicurati di esportare con\n --export-secret-keys\ninvece.</item> @@ -207,32 +239,47 @@ <string name="nfc_successful">Chiave correttamente inviata tramite NFC Beam!</string> <string name="key_copied_to_clipboard">Chiave copiata negli appunti!</string> <string name="fingerprint_copied_to_clipboard">Impronta copiata negli appunti!</string> + <string name="select_key_to_certify">Per favore seleziona una chiave da utilizzare per la conferma!</string> <string name="key_too_big_for_sharing">Chiave troppo grande per essere condivisa in questo modo!</string> <string name="text_copied_to_clipboard">Il testo è stato copiato sulla lavagna!</string> <!--errors no punctuation, all lowercase, they will be put after "error_message", e.g. "Error: file not found"--> + <string name="error_file_delete_failed">non sono stati cancellati. Cancellare manualmente!</string> + <string name="error_file_added_already">%s è già stato aggiunto.</string> <string name="error_file_not_found">File non trovato</string> <string name="error_no_secret_key_found">nessuna chiave privata adatta trovata</string> <string name="error_external_storage_not_ready">memoria esterna non pronta</string> <string name="error_key_size_minimum512bit">La grandezza della chiave deve essere almeno di 512bit</string> <string name="error_unknown_algorithm_choice">opzione algoritmo sconosciuta</string> + <string name="error_user_id_no_email">nessun indirizzo di posta elettronica trovato</string> <string name="error_key_needs_a_user_id">neccessaria almeno una identità</string> + <string name="error_no_signature_passphrase">nessuna password</string> <string name="error_no_signature_key">nessuna chiave di firma inserita</string> <string name="error_invalid_data">Contenuti OpenPGP firmati o codificati non validi!</string> <string name="error_integrity_check_failed">Controllo di integrita\' fallito! I dati sono stati modificati!</string> + <string name="error_wrong_passphrase">Password errata</string> <string name="error_could_not_extract_private_key">impossibile estrarre la chiave privata</string> <!--errors without preceeding Error:--> <string name="error_jelly_bean_needed">Devi avere Android 4.1 per usare Android NFC Beam!</string> + <string name="error_nfc_needed">NFC deve essere abilitato!</string> <string name="error_nothing_import">Nessuna chiave trovata!</string> + <string name="error_nothing_import_selected">Nessune chiavi selezionate per l\'importazione!</string> <string name="error_contacts_key_id_missing">Recupero dell\'ID della chiave dai contatti fallito!</string> <string name="error_generic_report_bug">Si è verificato un errore generico, si prega di creare una nuova segnalazione di errore per OpenKeychain.</string> <!--results shown after decryption/verification--> <string name="decrypt_result_no_signature">Non Firmato</string> <string name="decrypt_result_invalid_signature">Firma non valida!</string> + <string name="decrypt_result_signature_uncertified">Firmato da chiave <b> non confermata </b></string> + <string name="decrypt_result_signature_secret">Firmato con tua chiave</string> + <string name="decrypt_result_signature_certified">Firmato con chiave confermata</string> + <string name="decrypt_result_signature_expired_key">Firmato con chiave <b>scaduta</b>!</string> + <string name="decrypt_result_signature_revoked_key">Firmato con chiave <b>revocata</b>!</string> + <string name="decrypt_result_signature_missing_key">Firmato con chiave <b>pubblica sconusciuta</b></string> <string name="decrypt_result_encrypted">Codificato</string> <string name="decrypt_result_not_encrypted">Non Codificato</string> <string name="decrypt_result_action_show">Mostra</string> + <string name="decrypt_invalid_button">Capisco i rischi, visualizza!</string> <!--Add keys--> <string name="add_keys_my_key">Mia chiave:</string> <!--progress dialogs, usually ending in '…'--> @@ -259,6 +306,7 @@ <string name="progress_modify_subkeyrevoke">Revoca sottochiave...</string> <string name="progress_modify_subkeystrip">pulizia sottochiavi...</string> <string name="progress_modify_subkeyadd">Aggiunta sottochiave...</string> + <string name="progress_modify_passphrase">cambiando la password...</string> <plurals name="progress_exporting_key"> <item quantity="one">esportazione chiave...</item> <item quantity="other">esportazione chiavi...</item> @@ -310,6 +358,7 @@ <!--Help--> <string name="help_tab_start">Inizia</string> <string name="help_tab_faq">FAQ</string> + <string name="help_tab_wot">Conferma chiave</string> <string name="help_tab_nfc_beam">NFC Beam</string> <string name="help_tab_changelog">Novita\'</string> <string name="help_tab_about">Info</string> @@ -371,7 +420,7 @@ <string name="api_settings_start">Avvia applicazione</string> <string name="api_settings_delete_account">Cancella account</string> <string name="api_settings_package_name">Nome Pacchetto</string> - <string name="api_settings_package_signature">SHA-256 della Firma del Pacchetto</string> + <string name="api_settings_package_certificate">SHA-256 della Firma del Pacchetto</string> <string name="api_settings_settings">Impostazioni</string> <string name="api_settings_key">Chiave account:</string> <string name="api_settings_accounts_empty">Nessun account collegato a questa applicazione</string> @@ -445,7 +494,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars <string name="create_key_custom">(personalizza la configurazione della chiave)</string> <string name="create_key_edit">Cambia configurazione della chiave</string> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <string name="nav_keys">Chiavi</string> <string name="nav_apps">Apps</string> @@ -671,6 +720,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars <item quantity="one">parte del file caricato e\' un oggetto OpenPGP valido, ma non una chave OpenPGP</item> <item quantity="other">parti del file caricato sono oggetti OpenPGP validi, ma non chavi OpenPGP</item> </plurals> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> @@ -693,7 +743,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars <string name="unknown_algorithm">sconosciuto</string> <string name="can_sign_not">non può firmare</string> <string name="error_no_encrypt_subkey">Nessuna sottochiave di codifica disponibile!</string> - <string name="info_no_manual_account_creation">Non creare account OpenKeychain manualmente.\nPer ulteriori informazioni, vedere la Guida.</string> + <string name="account_no_manual_account_creation">Non creare account OpenKeychain manualmente.\nPer ulteriori informazioni, vedere la Guida.</string> <string name="contact_show_key">Mostra chiave (%s)</string> <string name="error_no_file_selected">Seleziona almeno un file da codificare!</string> <string name="key_colon">Chiave:</string> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 790913684..690fa0134 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -202,7 +202,7 @@ <string name="error_no_encryption_or_signature_key">少なくとも1つの暗号化鍵か署名鍵を選択して下さい。</string> <string name="specify_file_to_encrypt_to">どれのファイルを暗号化するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！</string> <string name="specify_file_to_decrypt_to">どれのファイルを暗号するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！</string> - <string name="specify_file_to_export_to">どれのファイルを復号化するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！</string> + <string name="specify_backup_dest">どれのファイルを復号化するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！</string> <string name="key_deletion_confirmation_multi">選択したすべての鍵を本当に削除してよいですか?</string> <string name="secret_key_deletion_confirmation">削除後はこの鍵で暗号化されたメッセージが読めなくなります、またその鍵で行われたすべての鍵確認を失います!</string> <string name="public_key_deletetion_confirmation">鍵 \'%s\' を削除しますか?</string> @@ -433,7 +433,7 @@ <string name="api_settings_start">アプリケーションを開始</string> <string name="api_settings_delete_account">アカウントを削除</string> <string name="api_settings_package_name">パッケージ名</string> - <string name="api_settings_package_signature">パッケージの署名 SHA-256</string> + <string name="api_settings_package_certificate">パッケージの署名 SHA-256</string> <string name="api_settings_accounts">アカウント(deprecated API)</string> <string name="api_settings_advanced">詳細情報</string> <string name="api_settings_allowed_keys">受け入れる鍵</string> @@ -1097,7 +1097,7 @@ <string name="unknown_algorithm">不明</string> <string name="can_sign_not">署名不可</string> <string name="error_no_encrypt_subkey">暗号化の副鍵がありません!</string> - <string name="info_no_manual_account_creation">OpenKeychainのアカウントを手動では生成できません. + <string name="account_no_manual_account_creation">OpenKeychainのアカウントを手動では生成できません. より詳細は、ヘルプを参照のこと。</string> <string name="contact_show_key">鍵 (%s) を表示</string> <string name="swipe_to_update">下スワイプでキーサーバから更新します</string> diff --git a/OpenKeychain/src/main/res/values-kn/strings.xml b/OpenKeychain/src/main/res/values-kn/strings.xml index 8f84af665..0713e39ad 100644 --- a/OpenKeychain/src/main/res/values-kn/strings.xml +++ b/OpenKeychain/src/main/res/values-kn/strings.xml @@ -7,6 +7,11 @@ <!--button--> <!--menu--> <!--label--> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <!--choice--> <!--key flags--> <!--sentences--> @@ -42,7 +47,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -61,6 +66,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index a9fbcae7f..cc00ebd63 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -43,6 +43,7 @@ <string name="section_keys">Subsleutels</string> <string name="section_cloud_search">Cloud zoeken</string> <string name="section_passphrase_cache">Verwerken van wachtwoorden/PINs</string> + <string name="section_proxy_settings">Proxy-instellingen</string> <string name="section_certify">Bevestigen</string> <string name="section_actions">Acties</string> <string name="section_share_key">Sleutel</string> @@ -56,6 +57,8 @@ <string name="btn_decrypt_verify_file">Ontsleutel, verifieer en sla bestand op</string> <string name="btn_encrypt_share_file">Bestand versleutelen en delen</string> <string name="btn_encrypt_save_file">Bestand versleutelen en opslaan</string> + <string name="btn_save_file">Bestand opslaan</string> + <string name="btn_save">Opslaa</string> <string name="btn_view_log">Bekijk log</string> <string name="btn_do_not_save">Annuleren</string> <string name="btn_delete">Verwijderen</string> @@ -98,6 +101,7 @@ <string name="menu_advanced">Uitgebreide informatie</string> <string name="menu_certify_fingerprint">Bevestigen door vingerafdrukken te vergelijken</string> <string name="menu_export_log">Log exporteren</string> + <string name="menu_keyserver_add">Toevoegen</string> <!--label--> <string name="label_message">Tekst</string> <string name="label_file">Bestand</string> @@ -116,7 +120,6 @@ <string name="label_use_default_yubikey_pin">Gebruik standaard YubiKey PIN</string> <string name="label_use_num_keypad_for_yubikey_pin">Gebruik numeriek toetsenbord voor YubiKey PIN</string> <string name="label_label_use_default_yubikey_pin_summary">Gebruikt standaard PIN (123456) om YubiKeys over NFC te bereiken</string> - <string name="label_asymmetric_from">Ondertekend door:</string> <string name="label_to">Versleutelen naar:</string> <string name="label_delete_after_encryption">Verwijder bestanden na versleuteling</string> <string name="label_delete_after_decryption">Verwijderen na ontsleuteling</string> @@ -142,17 +145,49 @@ <string name="label_send_key">Synchroniseren met de cloud</string> <string name="label_fingerprint">Vingerafdruk</string> <string name="expiry_date_dialog_title">Bepaal verloopdatum</string> - <string name="label_first_keyserver_is_used">(Voorkeur gaat uit naar de eerste keyserver in de lijst)</string> + <string name="label_keyservers_title">Sleutelservers</string> + <string name="label_keyserver_settings_hint">Sleep om de volgorde te wijzigen, tik om te bewerken/verwijderen</string> + <string name="label_selected_keyserver_title">Gekozen sleutelserver</string> <string name="label_preferred">voorkeur</string> <string name="label_enable_compression">Compressie aanzetten</string> <string name="label_encrypt_filenames">Versleutel bestandsnamen</string> <string name="label_hidden_recipients">Verberg ontvangers</string> <string name="label_verify_keyserver">Sleutelserver verifiëren</string> <string name="label_enter_keyserver_url">Voer sleutelserver-URL in</string> + <string name="label_keyserver_dialog_delete">Sleutelserver verwijderen</string> <string name="pref_keyserver">OpenPGP-sleutelservers</string> <string name="pref_keyserver_summary">Zoek sleutels op geselecteerde OpenPGP-sleutelservers (HKP-protocol)</string> <string name="pref_keybase">keybase.io</string> <string name="pref_keybase_summary">Zoek sleutels op keybase.io</string> + <!--Proxy Preferences--> + <string name="pref_proxy_tor_title">Tor aanzetten</string> + <string name="pref_proxy_tor_summary">Vereist dat Orbot geïnstalleerd is</string> + <string name="pref_proxy_normal_title">Andere proxy aanzetten</string> + <string name="pref_proxy_host_title">Proxy-host</string> + <string name="pref_proxy_host_err_invalid">Proxy-host kan niet leeg zijn</string> + <string name="pref_proxy_port_title">Proxy-poort</string> + <string name="pref_proxy_port_err_invalid">Ongeldig poortnummer opgegeven</string> + <string name="pref_proxy_type_title">Proxy-type</string> + <!--proxy type choices and values--> + <string name="pref_proxy_type_choice_http">HTTP</string> + <string name="pref_proxy_type_choice_socks">SOCKS</string> + <string name="pref_proxy_type_value_http">proxyHttp</string> + <string name="pref_proxy_type_value_socks">proxySocks</string> + <!--OrbotHelper strings--> + <string name="orbot_ignore_tor">Gebruik Tor niet</string> + <!--InstallDialogFragment strings--> + <string name="orbot_install_dialog_title">Orbot installeren om Tor te gebruiken?</string> + <string name="orbot_install_dialog_install">Installeren</string> + <string name="orbot_install_dialog_content">Orbot moet geïnstalleerd en ingesteld zijn om verkeer erdoor te proxyen. Wil je het installeren?</string> + <string name="orbot_install_dialog_cancel">Annuleren?</string> + <string name="orbot_install_dialog_ignore_tor">Gebruik Tor niet</string> + <!--StartOrbotDialogFragment strings--> + <string name="orbot_start_dialog_title">Orbot starten?</string> + <string name="orbot_start_dialog_content">Orbot wordt niet uitgevoerd. Wil je het opstarten en verbinden met Tor?</string> + <string name="orbot_start_btn">Orbot starten</string> + <string name="orbot_start_dialog_start">Orbot starten</string> + <string name="orbot_start_dialog_cancel">Annuleren</string> + <string name="orbot_start_dialog_ignore_tor">Gebruik Tor niet</string> <string name="user_id_no_name"><no naam></string> <string name="none"><geen></string> <plurals name="n_keys"> @@ -200,7 +235,8 @@ <string name="passphrase_for">Voer het wachtwoord in voor \'%s\'</string> <string name="pin_for">Voer PIN in voor \'%s\'</string> <string name="yubikey_pin_for">Voer PIN in om toegang te verkrijgen tot YubiKey voor \'%s\'</string> - <string name="nfc_text">Hou YubiKey tegen de achterkant van je toestel</string> + <string name="nfc_text">Hou de YubiKey tegen de NFC-aanduiding aan de achterkant van je toestel.</string> + <string name="nfc_wait">Hou de YubiKey tegen de achterkant!</string> <string name="file_delete_confirmation_title">Oorspronkelijke bestanden verwijderen?</string> <string name="file_delete_confirmation">De volgende bestanden zullen worden verwijderd:%s</string> <string name="file_delete_successful">%1$d van %2$d bestanden zijn verwijderd.%3$s</string> @@ -211,7 +247,7 @@ <string name="error_no_encryption_or_signature_key">Kies ten minste één versleutelingssleutel of een ondertekeningssleutel.</string> <string name="specify_file_to_encrypt_to">Gelieve aan te geven naar welk bestand versleuteld moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden!</string> <string name="specify_file_to_decrypt_to">Gelieve aan te geven naar welk bestand ontsleuteld moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden!</string> - <string name="specify_file_to_export_to">Gelieve aan te geven naar welk bestand geëxporteerd moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden!</string> + <string name="specify_backup_dest">Gelieve aan te geven naar welk bestand geëxporteerd moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden!</string> <string name="key_deletion_confirmation_multi">Ben je zeker dat je alle geselecteerde sleutels wil verwijderen?</string> <string name="secret_key_deletion_confirmation">Na verwijderen zal je niet langer berichten versleuteld met deze sleutel kunnen lezen, en alle sleutelbevestigingen die ermee gedaan zijn verliezen!</string> <string name="public_key_deletetion_confirmation">Sleutel \'%s\' verwijderen?</string> @@ -304,6 +340,8 @@ <string name="progress_modify_subkeystrip">bezig met strippen van subsleutels…</string> <string name="progress_modify_subkeyadd">bezig met toevoegen van subsleutels…</string> <string name="progress_modify_passphrase">bezig met veranderen van wachtwoord…</string> + <string name="progress_modify_pin">bezig met veranderen van PIN…</string> + <string name="progress_modify_admin_pin">bezig met veranderen van administrator-PIN…</string> <plurals name="progress_exporting_key"> <item quantity="one">sleutel exporteren…</item> <item quantity="other">sleutels exporteren…</item> @@ -459,7 +497,7 @@ <string name="api_settings_start">Start applicatie</string> <string name="api_settings_delete_account">Verwijder account</string> <string name="api_settings_package_name">Pakketnaam</string> - <string name="api_settings_package_signature">SHA-256 van Pakkethandtekening</string> + <string name="api_settings_package_certificate">SHA-256 van Pakkethandtekening</string> <string name="api_settings_accounts">Accounts (oude API)</string> <string name="api_settings_advanced">Uitgebreide informatie</string> <string name="api_settings_allowed_keys">Toegestane sleutels</string> @@ -596,6 +634,13 @@ <string name="create_key_add_email_text">Bijkomstige e-mailadressen zijn ook verbonden met deze sleutel en kunnen gebruikt worden voor veilige communicatie.</string> <string name="create_key_email_already_exists_text">E-mailadres is al toegevoegd</string> <string name="create_key_email_invalid_email">E-mailadresformaat is ongeldig</string> + <string name="create_key_yubi_key_pin_text">Onthou deze PIN, ze is nodig om je YubiKey later te gebruiken. Schrijf indien mogelijk de administrator-PIN ergens op en bewaar deze op een veilige plek.</string> + <string name="create_key_yubi_key_pin">PIN</string> + <string name="create_key_yubi_key_admin_pin">Administrator-PIN</string> + <string name="create_key_yubi_key_pin_repeat_text">Voer de PIN en administrator-PIN in om door te gaan.</string> + <string name="create_key_yubi_key_pin_repeat">Herhaal PIN</string> + <string name="create_key_yubi_key_admin_pin_repeat">Herhaal administrator-PIN</string> + <string name="create_key_yubi_key_pin_not_correct">PIN is niet correct!</string> <!--View key--> <string name="view_key_revoked">Ingetrokken: sleutel mag niet meer gebruikt worden!</string> <string name="view_key_expired">Verlopen: het contact moet de geldigheid van de sleutel verlengen!</string> @@ -604,12 +649,15 @@ <string name="view_key_verified">Bevestigde sleutel</string> <string name="view_key_unverified">Niet bevestigd: scan QR-code om de sleutel te bevestigen!</string> <string name="view_key_fragment_no_system_contact"><geen></string> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Sleutelserver toevoegen</string> + <string name="edit_keyserver_dialog_title">Sleutelserver bewerken</string> <string name="add_keyserver_verified">Sleutelserver geverifieerd!</string> <string name="add_keyserver_without_verification">Sleutelserver toegevoegd zonder verificatie.</string> <string name="add_keyserver_invalid_url">Ongeldige URL!</string> <string name="add_keyserver_connection_failed">Kon niet verbinden met sleutelserver. Controleer de URL en je internetverbinding.</string> + <string name="keyserver_preference_deleted">%s verwijderd</string> + <string name="keyserver_preference_cannot_delete_last">Kan laatste sleutelserver niet verwijderen, er is er minstens één nodig!</string> <!--Navigation Drawer--> <string name="nav_keys">Sleutels</string> <string name="nav_encrypt_decrypt">Versleutelen/Ontsleutelen</string> @@ -868,6 +916,8 @@ <string name="msg_mf_notation_empty">Bezig met toevoegen van leeg notatiepakket</string> <string name="msg_mf_notation_pin">Bezig met toevoegen van PIN-notatiepakket</string> <string name="msg_mf_passphrase">Bezig met wijzigen van wachtwoord voor sleutelbos</string> + <string name="msg_mf_pin">Bezig met veranderen van PIN op kaart</string> + <string name="msg_mf_admin_pin">Bezig met veranderen van administrator-PIN op kaart</string> <string name="msg_mf_passphrase_key">Bezig met opnieuw versleutelen van subsleutel %s met nieuw wachtwoord</string> <string name="msg_mf_passphrase_empty_retry">Instellen van nieuw wachtwoord mislukt, opnieuw proberen met leeg oud wachtwoord</string> <string name="msg_mf_passphrase_fail">Wachtwoord voor subsleutel kon niet gewijzigd worden! (Heeft het een ander wachtwoord dan de andere sleutels?)</string> @@ -968,7 +1018,6 @@ <string name="msg_dc_error_integrity_check">Fout bij integriteitscontrole!</string> <string name="msg_dc_error_integrity_missing">Integriteitscheck ontbreekt! Dit kan gebeuren omdat de versleutelingsapplicatie verouderd is, of door een downgrade-aanval.</string> <string name="msg_dc_error_invalid_data">Geen geldige OpenPGP-versleutelde of ondertekende inhoud gevonden!</string> - <string name="msg_dc_error_io">I/O-uitzondering tegengekomen tijdens bewerking!</string> <string name="msg_dc_error_no_data">Geen versleutelde gegevens gevonden!</string> <string name="msg_dc_error_no_key">Geen versleutelde gegevens met bekende geheime sleutel gevonden!</string> <string name="msg_dc_error_pgp_exception">OpenPGP-uitzondering tegengekomen tijdens bewerking!</string> @@ -1058,6 +1107,7 @@ <string name="msg_crt_warn_not_found">Sleutel niet gevonden!</string> <string name="msg_crt_warn_cert_failed">Aanmaken van certificaat mislukt!</string> <string name="msg_crt_warn_save_failed">Opslaan mislukt!</string> + <string name="msg_crt_warn_upload_failed">Uploaden mislukt!</string> <string name="msg_crt_upload_success">Sleutel succesvol geüpload naar server</string> <plurals name="msg_import"> <item quantity="one">Bezig met importeren van sleutel</item> @@ -1084,6 +1134,7 @@ </plurals> <string name="msg_export_all">Bezig met exporteren van alle sleutels</string> <string name="msg_export_public">Bezig met exporteren van publieke sleutel %s</string> + <string name="msg_export_upload_public">Bezig met uploaden van publieke sleutel %s</string> <string name="msg_export_secret">Bezig met exporteren van geheime sleutel %s</string> <string name="msg_export_error_no_file">Geen bestandsnaam opgegeven!</string> <string name="msg_export_error_fopen">Fout bij openen van bestand!</string> @@ -1093,7 +1144,9 @@ <string name="msg_export_error_db">Databasefout!</string> <string name="msg_export_error_io">Input/output-fout!</string> <string name="msg_export_error_key">Fout bij voorwerken van sleutelgegevens!</string> + <string name="msg_export_error_upload">Fout bij uploaden van sleutel naar server! Controleer je internetverbinding</string> <string name="msg_export_success">Exporteren geslaagd</string> + <string name="msg_export_upload_success">Uploaden naar sleutelserver geslaagd</string> <string name="msg_del_error_empty">Niets om te verwijderen!</string> <string name="msg_del_error_multi_secret">Geheime sleutels kunnen enkel individueel verwijderd worden!</string> <plurals name="msg_del"> @@ -1123,6 +1176,14 @@ <string name="msg_download_too_many_responses">Zoekopdracht gaf te veel kandidaten. Gelieve je zoekopdracht te verfijnen!</string> <string name="msg_download_query_too_short_or_too_many_responses">Geen of te veel sleutels werden gevonden. Gelieve je zoekopdracht te verfijnen!</string> <string name="msg_download_query_failed">Er trad een fout op bij het zoeken naar sleutels.</string> + <!--Messages for Keybase Verification operation--> + <string name="msg_keybase_verification">Keybaseverificatie voor %s wordt geprobeerd</string> + <string name="msg_keybase_error_no_prover">Geen bewijschecker gevonden voor %s</string> + <string name="msg_keybase_error_fetching_evidence">Probleem bij ophalen van bewijs</string> + <string name="msg_keybase_error_key_mismatch">Sleutelvingerafdruk komt niet overeen met die in bewijspost</string> + <string name="msg_keybase_error_dns_fail">DNS TXT record ophalen mislukt</string> + <string name="msg_keybase_error_specific">%s</string> + <string name="msg_keybase_error_msg_payload_mismatch">Ontsleuteld bewijs komt niet overeen met verwachte waarde</string> <!--Messages for Export Log operation--> <string name="msg_export_log_start">Bezig met exporteren van log</string> <string name="msg_export_log_error_fopen">Fout bij openen van bestand</string> @@ -1144,6 +1205,8 @@ <string name="first_time_import_key">Sleutel importeren uit bestand</string> <string name="first_time_yubikey">Gebruik YubiKey NEO</string> <string name="first_time_skip">Setup overslaan</string> + <string name="first_time_blank_yubikey">Wil je deze lege YubiKey NEO gebruiken met OpenKeychain?\n\nNeem de YubiKey nu weg, je zal gevraagd worden deze terug boven te halen wanneer nodig!</string> + <string name="first_time_blank_yubikey_yes">Gebruik deze YubiKey</string> <!--unsorted--> <string name="section_certifier_id">Certificeer</string> <string name="section_cert">Certificaat Details</string> @@ -1168,7 +1231,7 @@ <string name="unknown_algorithm">onbekend</string> <string name="can_sign_not">kan niet ondertekenen</string> <string name="error_no_encrypt_subkey">Geen codeer-subsleutel beschikbaar!</string> - <string name="info_no_manual_account_creation">Maak OpenKeychain-accounts niet handmatig aan.\nVoor meer informatie, zie Help.</string> + <string name="account_no_manual_account_creation">Maak OpenKeychain-accounts niet handmatig aan.\nVoor meer informatie, zie Help.</string> <string name="contact_show_key">Toon sleutel (%s)</string> <string name="swipe_to_update">Veeg naar beneden om van sleutelserver te updaten</string> <string name="error_no_file_selected">Selecteer minstens een bestand om te versleutelen!</string> @@ -1219,18 +1282,8 @@ <string name="btn_import">Importeren</string> <string name="snack_yubi_other">Andere sleutel opgeslagen op YubiKey!</string> <string name="error_nfc">NFC-fout: %s</string> - <string name="error_pin">NFC: ongeldige PIN; %d resterende pogingen.</string> - <string name="error_nfc_terminated">NFC: smartcard in beëindigingsstaat</string> - <string name="error_nfc_wrong_length">NFC: verkeerde lengte voor verzonden / ontvangen gegevens</string> - <string name="error_nfc_conditions_not_satisfied">NFC: gebruiksvoorwaarden niet voldaan</string> - <string name="error_nfc_security_not_satisfied">NFC: veiligheidsstatus niet voldaan</string> - <string name="error_nfc_authentication_blocked">NFC: PIN geblokkeerd na te veel pogingen</string> - <string name="error_nfc_data_not_found">NFC: sleutel of object niet gevonden</string> - <string name="error_nfc_unknown">NFC: onbekende fout</string> - <string name="error_nfc_bad_data">NFC: kaart gaf ongeldige gegevens weer</string> - <string name="error_nfc_chaining_error">NFC: kaart verwachtte laatste commando in een reeks</string> - <string name="error_nfc_header">NFC: kaart gaf ongeldige %s byte weer</string> <string name="error_pin_nodefault">Standaard-PIN geweigerd!</string> + <string name="error_temp_file">Fout bij aanmaken van tijdelijk bestand.</string> <string name="btn_delete_original">Oorspronkelijk bestand verwijderen</string> <string name="snack_encrypt_filenames_on">Bestandsnamen <b>zijn</b> versleuteld.</string> <string name="snack_encrypt_filenames_off">Bestandsnamen <b>zijn niet</b> versleuteld.</string> @@ -1253,4 +1306,5 @@ <string name="file_delete_ok">Oorspronkelijk bestand verwijderd.</string> <string name="file_delete_none">Geen bestand verwijderd! (Misschien was het al verwijderd?)</string> <string name="file_delete_exception">Oorspronkelijk bestand kon niet worden verwijderd!</string> + <string name="error_clipboard_empty">Klembord is leeg!</string> </resources> diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml index 1cf1c9958..db15b3e67 100644 --- a/OpenKeychain/src/main/res/values-pl/strings.xml +++ b/OpenKeychain/src/main/res/values-pl/strings.xml @@ -77,7 +77,6 @@ <string name="label_use_default_yubikey_pin">Użyj domyślnego PIN-u YubiKey</string> <string name="label_use_num_keypad_for_yubikey_pin">Użyj klawiatury numerycznej dla PIN-u YubiKey</string> <string name="label_label_use_default_yubikey_pin_summary">Używa domyślnego PIN-u (123456) do dostępu do YubiKeys przez NFC</string> - <string name="label_asymmetric_from">Podpisane przez:</string> <string name="label_to">Szyfruj do:</string> <string name="label_delete_after_decryption">Usuń po odszyfrowaniu</string> <string name="label_encryption_algorithm">Algorytm szyfrowania</string> @@ -96,8 +95,12 @@ <string name="label_send_key">Synchronizuj z chmurą</string> <string name="label_fingerprint">Odcisk</string> <string name="expiry_date_dialog_title">Ustaw datę wygaśnięcia</string> - <string name="label_first_keyserver_is_used">(Pierwszy serwer kluczy jest preferowany)</string> <string name="label_preferred">preferowany</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><bez nazwy></string> <string name="none"><żaden></string> <plurals name="n_keys"> @@ -142,7 +145,6 @@ <string name="no_filemanager_installed">Nie zainstalowano żadnego kompatybilnego menadżera plików.</string> <string name="passphrase_for_symmetric_encryption">Szyfrowanie symetryczne.</string> <string name="pin_for">Wpisz PIN dla \'%s\'</string> - <string name="nfc_text">Trzymaj YubiKey z tyłu Twojego urządzenia.</string> <string name="encrypt_sign_successful">Pomyślnie podpisano i/lub zaszyfrowano.</string> <string name="encrypt_sign_clipboard_successful">Pomyslnie podpisano i/lub zaszyfrowano do schowka.</string> <string name="select_encryption_key">Wybierz co najmniej jeden klucz szyfrujący.</string> @@ -370,7 +372,7 @@ <string name="api_settings_start">Uruchom aplikację</string> <string name="api_settings_delete_account">Usuń konto</string> <string name="api_settings_package_name">Nazwa paczki</string> - <string name="api_settings_package_signature">Skrót SHA-256 podpisu paczki</string> + <string name="api_settings_package_certificate">Skrót SHA-256 podpisu paczki</string> <string name="api_settings_settings">Ustawienia</string> <string name="api_settings_key">Klucz konta:</string> <string name="api_settings_accounts_empty">Brak kont połączonych z tą aplikacją.</string> @@ -451,7 +453,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw <string name="create_key_hint_full_name">Pełne imię lub przezwisko</string> <string name="create_key_edit">Zmień ustawienia klucza</string> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <string name="nav_keys">Klucze</string> <string name="nav_encrypt_decrypt">Zaszyfruj/Odszyfruj</string> @@ -560,6 +562,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw <item quantity="few">Część wczytanego pliku to poprawne obiekty OpenPGP, ale nie są kluczami OpenPGP</item> <item quantity="other">Część wczytanego pliku to poprawne obiekty OpenPGP, ale nie są kluczami OpenPGP</item> </plurals> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-pt/strings.xml b/OpenKeychain/src/main/res/values-pt/strings.xml index 8f84af665..0713e39ad 100644 --- a/OpenKeychain/src/main/res/values-pt/strings.xml +++ b/OpenKeychain/src/main/res/values-pt/strings.xml @@ -7,6 +7,11 @@ <!--button--> <!--menu--> <!--label--> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <!--choice--> <!--key flags--> <!--sentences--> @@ -42,7 +47,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -61,6 +66,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-ro/strings.xml b/OpenKeychain/src/main/res/values-ro/strings.xml index 8f84af665..0713e39ad 100644 --- a/OpenKeychain/src/main/res/values-ro/strings.xml +++ b/OpenKeychain/src/main/res/values-ro/strings.xml @@ -7,6 +7,11 @@ <!--button--> <!--menu--> <!--label--> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <!--choice--> <!--key flags--> <!--sentences--> @@ -42,7 +47,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -61,6 +66,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index e5e164c49..c13796795 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -367,7 +367,7 @@ <string name="api_settings_start">Запустить приложение</string> <string name="api_settings_delete_account">Удалить аккаунт</string> <string name="api_settings_package_name">Наименование пакета</string> - <string name="api_settings_package_signature">SHA-256 подписи пакета</string> + <string name="api_settings_package_certificate">SHA-256 подписи пакета</string> <string name="api_settings_accounts">Аккаунты (устаревший API)</string> <string name="api_settings_advanced">Подробная информация</string> <string name="api_settings_allowed_keys">Разрешённые ключи</string> diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml index 4498cccb3..ab3f009df 100644 --- a/OpenKeychain/src/main/res/values-sl/strings.xml +++ b/OpenKeychain/src/main/res/values-sl/strings.xml @@ -96,7 +96,6 @@ <string name="label_use_default_yubikey_pin">Uporabi privzeto YubiKey PIN kodo</string> <string name="label_use_num_keypad_for_yubikey_pin">Uporabi numerično tipkovnico za YubiKey PIN kodo</string> <string name="label_label_use_default_yubikey_pin_summary">Uporablja privzeto PIN kodo (123456) za dostop do ključev YubiKey preko NFC</string> - <string name="label_asymmetric_from">Podpisal:</string> <string name="label_to">Šifriraj za:</string> <string name="label_delete_after_encryption">Po dešifriranju izbriši datoteke</string> <string name="label_delete_after_decryption">Izbriši po dešifriranju</string> @@ -117,11 +116,15 @@ <string name="label_send_key">Sinhroniziraj z oblakom</string> <string name="label_fingerprint">Prstni odtis</string> <string name="expiry_date_dialog_title">Določi datum poteka veljavnosti</string> - <string name="label_first_keyserver_is_used">(Prednost ima prvi strežnik na seznamu)</string> <string name="label_preferred">prednostni</string> <string name="label_enable_compression">Omogoči kompresijo</string> <string name="label_encrypt_filenames">Šifriraj imena datotek</string> <string name="label_hidden_recipients">Skrij prejemnike</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><brez imena></string> <string name="none"><nič></string> <plurals name="n_keys"> @@ -169,7 +172,6 @@ <string name="passphrase_for_symmetric_encryption">Simetrično šifriranje.</string> <string name="pin_for">Vnesite PIN kodo za \'%s\'</string> <string name="yubikey_pin_for">Vnesite PIN kodo za dostop YubiKey za \'%s\'</string> - <string name="nfc_text">Prislonite YubiKey k hrbtišču mobilne naprave.</string> <string name="file_delete_confirmation_title">Izbrišem izvirne datoteke?</string> <string name="file_delete_confirmation">Izbrisane bodo naslednje datoteke:%s</string> <string name="file_delete_successful">Izbrisanih je bilo %1$d od %2$d datotek.%3$s</string> @@ -178,7 +180,7 @@ <string name="select_encryption_key">Izberite vsaj en šifrirni ključ.</string> <string name="specify_file_to_encrypt_to">Določite datoteko, v katero želite šifrirati vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana.</string> <string name="specify_file_to_decrypt_to">Določite datoteko, v katero želite dešifrirati vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana.</string> - <string name="specify_file_to_export_to">Določite datoteko, v katero želite izvoziti vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana.</string> + <string name="specify_backup_dest">Določite datoteko, v katero želite izvoziti vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana.</string> <string name="key_deletion_confirmation_multi">Ali zares želite izbrisati vse izbrane ključe?</string> <string name="secret_key_deletion_confirmation">Po izbrisu ne bo več mogoče prebirati sporočil šifriranih s tem ključem! Izgubljene bodo tudi vse z njim narejene potrditve.</string> <string name="public_key_deletetion_confirmation">Izbrišem ključ \'%s\'?</string> @@ -434,7 +436,7 @@ <string name="api_settings_start">Zaženi aplikacijo</string> <string name="api_settings_delete_account">Izbriši račun</string> <string name="api_settings_package_name">Ime paketa</string> - <string name="api_settings_package_signature">SHA-256 podpisa paketa</string> + <string name="api_settings_package_certificate">SHA-256 podpisa paketa</string> <string name="api_settings_allowed_keys">Dovoljeni ključi</string> <string name="api_settings_settings">Nastavitve</string> <string name="api_settings_key">Ključ računa:</string> @@ -560,7 +562,7 @@ <string name="view_key_verified">Potrjen ključ</string> <string name="view_key_unverified">Ključ ni potrjen: za potrditev skenirajte kodo QR!</string> <string name="view_key_fragment_no_system_contact"><brez></string> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <string name="nav_keys">Ključi</string> <string name="nav_encrypt_decrypt">Šifriraj/Dešifriraj</string> @@ -813,6 +815,7 @@ <item quantity="few">Deli naložene datoteke so veljavni objekti OpenPGP a niso ključi.</item> <item quantity="other">Deli naložene datoteke so veljavni objekti OpenPGP a niso ključi.</item> </plurals> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index ebacebb5f..ed385c9c2 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -212,7 +212,7 @@ <string name="error_no_encryption_or_signature_key">Изаберите бар један кључ за шифровање или потписивање.</string> <string name="specify_file_to_encrypt_to">Одредите у који фајл да шифрујем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји.</string> <string name="specify_file_to_decrypt_to">Одредите у који фајл да дешифрујем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји.</string> - <string name="specify_file_to_export_to">Одредите у који фајл да извезем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји.</string> + <string name="specify_backup_dest">Одредите у који фајл да извезем.\nУПОЗОРЕЊЕ: Фајл ће бити пребрисан ако постоји.</string> <string name="key_deletion_confirmation_multi">Желите ли заиста да обришете све изабране јавне кључеве?\nОво не можете да поништите!</string> <string name="secret_key_deletion_confirmation">Желите ли заиста да обришете ТАЈНИ кључ „%s“?\nОво не можете да поништите!</string> <string name="public_key_deletetion_confirmation">Желите ли заиста да обришете јавни кључ „%s“??\nОво не можете да поништите!</string> @@ -465,7 +465,7 @@ <string name="api_settings_start">Покрени апликацију</string> <string name="api_settings_delete_account">Обриши налог</string> <string name="api_settings_package_name">Име пакета</string> - <string name="api_settings_package_signature">СХА-256 потписа пакета</string> + <string name="api_settings_package_certificate">СХА-256 потписа пакета</string> <string name="api_settings_accounts">Налози (застарели АПИ)</string> <string name="api_settings_advanced">Напредни подаци</string> <string name="api_settings_allowed_keys">Дозвољени кључеви</string> @@ -1108,7 +1108,7 @@ <string name="unknown_algorithm">непознат</string> <string name="can_sign_not">не може да потпише</string> <string name="error_no_encrypt_subkey">Поткључ за шифровање није доступан!</string> - <string name="info_no_manual_account_creation">Не прави налоге Отвореног кључарника ручно.\nПогледајте Помоћ за више информација.</string> + <string name="account_no_manual_account_creation">Не прави налоге Отвореног кључарника ручно.\nПогледајте Помоћ за више информација.</string> <string name="contact_show_key">Прикажи кључ (%s)</string> <string name="swipe_to_update">Превуците прстом доле да ажурирате са сервера кључева</string> <string name="error_no_file_selected">Изаберите бар један фајл за шифровање!</string> diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index 8c9735d8f..0d9d4e205 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -111,7 +111,6 @@ <string name="label_use_default_yubikey_pin">Använd förvald YubiKey PIN</string> <string name="label_use_num_keypad_for_yubikey_pin">Använd numeriska tangentbordet för YubiKey PIN</string> <string name="label_label_use_default_yubikey_pin_summary">Använder förvald PIN (123456) för att få åtkomst till YubiKeys via NFC</string> - <string name="label_asymmetric_from">Signerat av:</string> <string name="label_to">Kryptera till:</string> <string name="label_delete_after_encryption">Radera filer efter kryptering</string> <string name="label_delete_after_decryption">Radera efter dekryptering</string> @@ -135,7 +134,6 @@ <string name="label_send_key">Synkronisera med molnet</string> <string name="label_fingerprint">Fingeravtryck</string> <string name="expiry_date_dialog_title">Ställ in utgångsdatum</string> - <string name="label_first_keyserver_is_used">(Nyckelservern först i listan är den som föredras)</string> <string name="label_preferred">föredraget</string> <string name="label_enable_compression">Aktivera kompression</string> <string name="label_encrypt_filenames">Kryptera filnamn</string> @@ -146,6 +144,11 @@ <string name="pref_keyserver_summary">Sök nycklar på valda OpenPGP nyckelservrar (HKP-protokollet)</string> <string name="pref_keybase">keybase.io</string> <string name="pref_keybase_summary">Sök nycklar på keybase.io</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><inget namn></string> <string name="none"><ingen></string> <plurals name="n_keys"> @@ -193,7 +196,6 @@ <string name="passphrase_for">Ange lösenord för \'%s\'</string> <string name="pin_for">Ange PIN för \'%s\'</string> <string name="yubikey_pin_for">Ange PIN för att få åtkomst till YubiKey för \'%s\'</string> - <string name="nfc_text">Håll YubiKey mot baksidan av din enhet.</string> <string name="file_delete_confirmation_title">Radera orginalfiler?</string> <string name="file_delete_confirmation">Följande filer kommer raderas:%s</string> <string name="file_delete_successful">%1$d av %2$d filer har raderats.%3$s</string> @@ -202,7 +204,7 @@ <string name="select_encryption_key">Välj åtminstone en krypteringsnyckel.</string> <string name="specify_file_to_encrypt_to">Ange vilken fil du vill kryptera till.\nVARNING: Om filen redan finns kommer den att skrivas över!</string> <string name="specify_file_to_decrypt_to">Ange vilken fil du vill kryptera till.\nVARNING: Om filen redan finns kommer den att skrivas över!</string> - <string name="specify_file_to_export_to">Ange vilken fil du vill exportera till.\nVARNING: Om filen redan finns kommer den att skrivas över!</string> + <string name="specify_backup_dest">Ange vilken fil du vill exportera till.\nVARNING: Om filen redan finns kommer den att skrivas över!</string> <string name="key_deletion_confirmation_multi">Vill du verkligen radera alla markerade nycklar?</string> <string name="secret_key_deletion_confirmation">Efter radering kommer du inte kunna läsa meddelande krypterade med den här nyckeln samt förlora alla nyckelbekräftningar som gjorts med den!</string> <string name="public_key_deletetion_confirmation">Radera nyckel \'%s\'?</string> @@ -442,7 +444,7 @@ <string name="api_settings_start">Starta app</string> <string name="api_settings_delete_account">Radera konto</string> <string name="api_settings_package_name">Paketnamn</string> - <string name="api_settings_package_signature">SHA-256 för paketsignatur</string> + <string name="api_settings_package_certificate">SHA-256 för paketsignatur</string> <string name="api_settings_accounts">Konton (gamla API:t)</string> <string name="api_settings_advanced">Utökad information</string> <string name="api_settings_allowed_keys">Tillåtna nycklar</string> @@ -570,7 +572,7 @@ <string name="view_key_verified">Bekräftad nyckel</string> <string name="view_key_unverified">Obekräftad: Skanna QR-kod för att bekräfta nyckeln!</string> <string name="view_key_fragment_no_system_contact"><ingen></string> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Lägg till nyckelserver</string> <string name="add_keyserver_verified">Nyckelserver verifierad!</string> <string name="add_keyserver_without_verification">Nyckelserver tillagd utan verifiering.</string> @@ -879,6 +881,7 @@ <item quantity="one">en del av den inlästa filen är ett giltigt OpenPGP-objekt men inte en OpenPGP-nyckel</item> <item quantity="other">delar av den inlästa filen är giltiga OpenPGP-objekt men inte OpenPGP-nycklar</item> </plurals> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> @@ -904,7 +907,7 @@ <string name="unknown_algorithm">okänd</string> <string name="can_sign_not">kan inte signera</string> <string name="error_no_encrypt_subkey">Ingen krypteringsundernyckel tillgänglig!</string> - <string name="info_no_manual_account_creation">Skapa inte OpenKeychain-konton manuellt. \nFör mer information, se Hjälp.</string> + <string name="account_no_manual_account_creation">Skapa inte OpenKeychain-konton manuellt. \nFör mer information, se Hjälp.</string> <string name="contact_show_key">Visa nyckel (%s)</string> <string name="swipe_to_update">Dra nedåt för att uppdatera från nyckelserver</string> <string name="error_no_file_selected">Välj åtminstone en fil att kryptera!</string> diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml index 77c5e1118..529e80aa7 100644 --- a/OpenKeychain/src/main/res/values-tr/strings.xml +++ b/OpenKeychain/src/main/res/values-tr/strings.xml @@ -66,7 +66,6 @@ <string name="label_use_default_yubikey_pin">Varsayılan YubiKey PIN\'ini kullan</string> <string name="label_use_num_keypad_for_yubikey_pin">YubiKey PIN\'i için sayısal klavyeyi kullan</string> <string name="label_label_use_default_yubikey_pin_summary">NFC üzerinden YubiKey\'e ulaşmak için varsayılan PIN\'i (123456) kullanır</string> - <string name="label_asymmetric_from">İmzalayan:</string> <string name="label_to">Şuna şifrele:</string> <string name="label_delete_after_decryption">Şifre çözme sonrasında sil</string> <string name="label_encryption_algorithm">Şifreleme algoritması</string> @@ -85,8 +84,12 @@ <string name="label_send_key">Bulut ile eşitle</string> <string name="label_fingerprint">Parmak izi</string> <string name="expiry_date_dialog_title">Zaman aşımı tarihini ayarla</string> - <string name="label_first_keyserver_is_used">(Listelenen ilk anahtar sunucu tercih edilecektir)</string> <string name="label_preferred">tercih edilen</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><isimsiz></string> <string name="none"><hiçbiri></string> <plurals name="n_keys"> @@ -128,7 +131,6 @@ <!--sentences--> <string name="no_filemanager_installed">Uyumlu dosya yöneticisi yüklenmedi.</string> <string name="passphrase_for_symmetric_encryption">Simetrik şifreleme.</string> - <string name="nfc_text">YubiKey\'inizi cihazınızın arkasında tutun.</string> <string name="encrypt_sign_successful">Başarıyla imzalandı ve/veya şifrelendi.</string> <string name="encrypt_sign_clipboard_successful">Kopyalama önbelleğine başarıyla imzalandı ve/veya şifrelendi.</string> <string name="select_encryption_key">En az bir şifreleme anahtarı seçiniz.</string> @@ -359,7 +361,7 @@ <string name="create_key_custom">(özel anahtar yapılandırması)</string> <string name="create_key_edit">Anahtar yapılandırmasını değiştir.</string> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <string name="nav_keys">Anahtarlar</string> <string name="nav_apps">Uygulamalar</string> @@ -415,6 +417,7 @@ <string name="msg_del_error_empty">Silinecek bir şey yok!</string> <string name="msg_acc_saved">Hesap kaydedildi</string> <string name="msg_download_success">Başarıyla indirildi!</string> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> @@ -436,7 +439,7 @@ <string name="unknown_algorithm">bilinmeyen</string> <string name="can_sign_not">imzalanamadı</string> <string name="error_no_encrypt_subkey">Şifreleme için kullanılabilecek altanahtar mevcut değil!</string> - <string name="info_no_manual_account_creation">OpenKeychain-hesaplarını kendiniz oluşturmayın.\nDaha fazla bilgi için Yardım bölümüne bakın.</string> + <string name="account_no_manual_account_creation">OpenKeychain-hesaplarını kendiniz oluşturmayın.\nDaha fazla bilgi için Yardım bölümüne bakın.</string> <string name="contact_show_key">Anahtarı göster (%s)</string> <string name="swipe_to_update">Anahtar sunucudan güncelleme almak için parmağınızı aşağıya doğru kaydırın</string> <string name="error_no_file_selected">Şifrelemek için en az bir dosya seçin!</string> diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml index bcda5026f..40d588bca 100644 --- a/OpenKeychain/src/main/res/values-uk/strings.xml +++ b/OpenKeychain/src/main/res/values-uk/strings.xml @@ -66,7 +66,6 @@ <string name="label_use_default_yubikey_pin">Вживати типовий YubiKey PIN</string> <string name="label_use_num_keypad_for_yubikey_pin">Вживати цифрову клавіатуру для YubiKey PIN</string> <string name="label_label_use_default_yubikey_pin_summary">Вживається типовий PIN (123456) для доступу до YubiKey чреез NFC</string> - <string name="label_asymmetric_from">Підписано:</string> <string name="label_to">Зашифрувати до:</string> <string name="label_delete_after_decryption">Вилучити після розшифрування</string> <string name="label_encryption_algorithm">Алгоритм шифрування</string> @@ -85,8 +84,12 @@ <string name="label_send_key">Синхронізувати із хмарою</string> <string name="label_fingerprint">Відбиток</string> <string name="expiry_date_dialog_title">Задати термін дії</string> - <string name="label_first_keyserver_is_used">(Перший наведений сервер ключів є бажаний)</string> <string name="label_preferred">бажаний</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><без імені></string> <string name="none"><жоден></string> <plurals name="n_keys"> @@ -305,7 +308,7 @@ <string name="api_settings_start">Запустити програму</string> <string name="api_settings_delete_account">Видалити профіль</string> <string name="api_settings_package_name">Назва пакунку</string> - <string name="api_settings_package_signature">SHA-256 підписку пакунку</string> + <string name="api_settings_package_certificate">SHA-256 підписку пакунку</string> <string name="api_settings_settings">Параметри</string> <string name="api_settings_accounts_empty">Немає облікового запису приєднаного до цієї програми.</string> <string name="api_register_allow">Дозволити доступ</string> @@ -361,7 +364,7 @@ <string name="create_key_empty">Це поле - обов\'язкове</string> <string name="create_key_final_text">Ви ввели наступну сутність:</string> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <string name="nav_keys">Ключі</string> <string name="nav_apps">Програми</string> @@ -504,6 +507,7 @@ <item quantity="few">частини завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item> <item quantity="other">частин завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item> </plurals> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml index b47026e5b..dab38f97a 100644 --- a/OpenKeychain/src/main/res/values-v21/themes.xml +++ b/OpenKeychain/src/main/res/values-v21/themes.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="KeychainTheme" parent="KeychainTheme.Base"> + <style name="LightTheme" parent="LightBaseTheme"> <item name="android:windowTranslucentStatus">true</item> <!-- enable window content transitions --> @@ -12,4 +12,17 @@ <item name="android:windowSharedElementExitTransition">@android:transition/move</item> </style> -</resources>
\ No newline at end of file + + <style name="DarkTheme" parent="DarkBaseTheme"> + <item name="android:windowTranslucentStatus">true</item> + + <!-- enable window content transitions --> + <item name="android:windowContentTransitions">true</item> + <item name="android:windowAllowEnterTransitionOverlap">true</item> + <item name="android:windowAllowReturnTransitionOverlap">true</item> + <item name="android:windowSharedElementEnterTransition">@android:transition/move</item> + <item name="android:windowSharedElementExitTransition">@android:transition/move</item> + + </style> + +</resources> diff --git a/OpenKeychain/src/main/res/values-vi/strings.xml b/OpenKeychain/src/main/res/values-vi/strings.xml index 8f84af665..0713e39ad 100644 --- a/OpenKeychain/src/main/res/values-vi/strings.xml +++ b/OpenKeychain/src/main/res/values-vi/strings.xml @@ -7,6 +7,11 @@ <!--button--> <!--menu--> <!--label--> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <!--choice--> <!--key flags--> <!--sentences--> @@ -42,7 +47,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -61,6 +66,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index f316ea65d..7005543bc 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -97,7 +97,6 @@ <string name="label_use_default_yubikey_pin">使用預設的 Yubikey PIN</string> <string name="label_use_num_keypad_for_yubikey_pin">輸入 YubiKey PIN 時使用數字鍵盤</string> <string name="label_label_use_default_yubikey_pin_summary">使用預設的 PIN (123456) 來使用 NFC 存取 Yubikeys</string> - <string name="label_asymmetric_from">簽名自:</string> <string name="label_to">加密給:</string> <string name="label_delete_after_encryption">加密後刪除檔案</string> <string name="label_delete_after_decryption">解密後刪除檔案</string> @@ -118,11 +117,15 @@ <string name="label_send_key">與雲端同步</string> <string name="label_fingerprint">指紋</string> <string name="expiry_date_dialog_title">設定效期</string> - <string name="label_first_keyserver_is_used">(先列出的金鑰伺服器爲優先)</string> <string name="label_preferred">優先</string> <string name="label_enable_compression">啓用壓縮</string> <string name="label_encrypt_filenames">加密檔名</string> <string name="label_hidden_recipients">隱藏收件人</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <string name="user_id_no_name"><無名></string> <string name="none"><無></string> <plurals name="n_keys"> @@ -172,7 +175,7 @@ <string name="select_encryption_key">選擇至少一把加密金鑰。</string> <string name="specify_file_to_encrypt_to">請指定欲加密的檔案。\n警告：已經存在的檔案將被覆蓋。</string> <string name="specify_file_to_decrypt_to">請指定欲解密的檔案。\n警告：已經存在的檔案將被覆蓋。</string> - <string name="specify_file_to_export_to">請指定欲輸出的檔案。\n警告：已經存在的檔案將被覆蓋。</string> + <string name="specify_backup_dest">請指定欲輸出的檔案。\n警告：已經存在的檔案將被覆蓋。</string> <string name="key_deletion_confirmation_multi">您真的想要刪除所有已選金鑰嗎？</string> <string name="secret_key_deletion_confirmation">刪除之後您將無法閱讀以這把金鑰加密的訊息，而且所有用這把金鑰做的認證都會失效！</string> <string name="public_key_deletetion_confirmation">刪除金鑰 \'%s\' ？</string> @@ -391,7 +394,7 @@ <string name="api_settings_start">開啟應用程式</string> <string name="api_settings_delete_account">移除帳戶</string> <string name="api_settings_package_name">打包名稱</string> - <string name="api_settings_package_signature">SHA-256 所打包的簽章</string> + <string name="api_settings_package_certificate">SHA-256 所打包的簽章</string> <string name="api_settings_accounts">帳戶(舊版API)</string> <string name="api_settings_advanced">延伸資訊</string> <string name="api_settings_allowed_keys">允許的金鑰</string> @@ -499,7 +502,7 @@ <string name="view_key_verified">已確認金鑰</string> <string name="view_key_unverified">未確認：掃描QR條碼來確認該金鑰！</string> <string name="view_key_fragment_no_system_contact"><無></string> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <string name="add_keyserver_invalid_url">URL無效！</string> <!--Navigation Drawer--> <string name="nav_keys">金鑰</string> @@ -609,6 +612,7 @@ <string name="msg_download_success">下載成功！</string> <string name="msg_download_no_valid_keys">在檔案/剪貼簿中找不到有效的金鑰！</string> <string name="msg_download_query_failed">查詢金鑰的時候發生錯誤。</string> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> @@ -626,7 +630,7 @@ <string name="title_view_cert">查看認證內容</string> <string name="unknown_algorithm">未知</string> <string name="error_no_encrypt_subkey">沒有可供加密的子金鑰！</string> - <string name="info_no_manual_account_creation">請不要自行建立OpenKeychain帳戶。\n更多資訊請參考說明。</string> + <string name="account_no_manual_account_creation">請不要自行建立OpenKeychain帳戶。\n更多資訊請參考說明。</string> <string name="exchange_description">要發起金鑰交換，先在右邊選擇與會人數，然後點選〝開始交換〞。\n\n接下來會詢問你兩個問題，以確保會議成員與交換的指紋是正確的。</string> <string name="btn_start_exchange">開始交換</string> <!--Passphrase wizard--> diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml index 069e3f0bd..180167e3e 100644 --- a/OpenKeychain/src/main/res/values-zh/strings.xml +++ b/OpenKeychain/src/main/res/values-zh/strings.xml @@ -106,9 +106,13 @@ <string name="label_email">电子邮件</string> <string name="label_fingerprint">指纹</string> <string name="expiry_date_dialog_title">有效期</string> - <string name="label_first_keyserver_is_used">首选服务器</string> <string name="label_encrypt_filenames">加密文件名</string> <string name="pref_keyserver">OpenPGP 密钥服务器</string> + <!--Proxy Preferences--> + <!--proxy type choices and values--> + <!--OrbotHelper strings--> + <!--InstallDialogFragment strings--> + <!--StartOrbotDialogFragment strings--> <plurals name="n_keys"> <item quantity="other">其他</item> </plurals> @@ -234,7 +238,7 @@ <!--Edit key--> <!--Create key--> <!--View key--> - <!--Add keyserver--> + <!--Add/Edit keyserver--> <!--Navigation Drawer--> <!--hints--> <!--certs--> @@ -253,6 +257,7 @@ <!--Messages for VerifySignedLiteralData operation--> <!--Messages for SignEncrypt operation--> <!--Messages for PgpSignEncrypt operation--> + <!--Messages for Keybase Verification operation--> <!--Messages for Export Log operation--> <!--PassphraseCache--> <!--First Time--> diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml index 44bbe00cc..ef3970672 100644 --- a/OpenKeychain/src/main/res/values/arrays.xml +++ b/OpenKeychain/src/main/res/values/arrays.xml @@ -29,6 +29,18 @@ <item>28800</item> <item>-1</item> </string-array> + <string-array name="pref_proxy_type_entries" translatable="false"> + <item>@string/pref_proxy_type_choice_http</item> + <item>@string/pref_proxy_type_choice_socks</item> + </string-array> + <string-array name="pref_proxy_type_values" translatable="false"> + <item>@string/pref_proxy_type_value_http</item> + <item>@string/pref_proxy_type_value_socks</item> + </string-array> + <string-array name="rev_del_dialog_entries" translatable="true"> + <item>@string/del_rev_dialog_choice_rev_upload</item> + <item>@string/del_rev_dialog_choice_delete</item> + </string-array> <string-array name="rsa_key_size_spinner_values" translatable="false"> <item>@string/key_size_2048</item> <item>@string/key_size_4096</item> @@ -49,4 +61,12 @@ <item>@string/key_size_custom</item> </string-array> + <string-array name="theme_entries" translatable="false"> + <item>@string/theme_dark</item> + <item>@string/theme_light</item> + </string-array> + <string-array name="theme_values" translatable="false"> + <item>"dark"</item> + <item>"ligh"</item> + </string-array> </resources> diff --git a/OpenKeychain/src/main/res/values/attrs.xml b/OpenKeychain/src/main/res/values/attrs.xml new file mode 100644 index 000000000..5c570e62b --- /dev/null +++ b/OpenKeychain/src/main/res/values/attrs.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <declare-styleable name="CustomTheme"> + <attr name="colorFab" format="color" /> + <attr name="colorFabPressed" format="color" /> + <attr name="colorFabBackground" format="color" /> + <attr name="colorFabText" format="color" /> + <attr name="colorEmphasis" format="color" /> + <attr name="colorHeaderText" format="color" /> + <attr name="colorTertiaryText" format="color" /> + <attr name="colorButtonRow" format="color" /> + <attr name="colorLogBackground" format="color" /> + <attr name="colorCardViewHeaderDivider" format="color" /> + <attr name="colorText" format="color" /> + <attr name="colorBrightToolbar" format="color" /> + <attr name="colorCardViewBackground" format="color" /> + <attr name="colorTabText" format="color" /> + <attr name="colorTabTextSelected" format="color" /> + <attr name="colorTabIndicator" format="color" /> + </declare-styleable> +</resources> diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index ead006a63..5db66b945 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -1,54 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- Main theme colors --> - - <!-- green colors from OpenKeychain logo bottom right --> - <!-- your app branding color for the app bar --> <color name="primary">#7bad45</color> - <!-- darker variant for the status bar and contextual app bars --> - <color name="primary_dark">#6c983d</color> - <!-- theme UI controls like checkboxes and text fields --> - <color name="accent">#2196F3</color> - - <!-- Other colors --> - - <color name="black">#000000</color> - - <color name="primary_light">#C8E6C9</color> - <color name="fab">@color/accent</color> - <color name="fab_pressed">#1976D2</color> - <color name="primary_text">#212121</color> - <color name="secondary_text">#727272</color> - <color name="icons">#FFFFFF</color> - <color name="divider">#B6B6B6</color> - <color name="transparent">#00FFFFFF</color> - - <color name="header_text">#212121</color> - <!-- item selection, search highlight --> - <color name="emphasis">@color/accent</color> - - <color name="bg_gray">#cecbce</color> - <color name="tertiary_text_light">#808080</color> - <color name="alert">#ffdd3333</color> - - <color name="holo_gray_light">#33999999</color> - <color name="holo_gray_bright">#33CCCCCC</color> - <!-- tabs --> - <color name="tab_text">#70FFFFFF</color> - <color name="tab_text_selected">#FFFFFF</color> - <color name="tab_indicator">#FFFFFF</color> + <color name="icons">#ffffff</color> + <color name="transparent">#00ffffff</color> + <color name="key_flag_gray">#808080</color> + <color name="key_flag_red">#f44336</color> + <color name="key_flag_orange">#ff9800</color> + <color name="key_flag_green">#7bad45</color> - <!-- floating action buttons --> - <color name="black_semi_transparent">#B2000000</color> - <color name="background">#e5e5e5</color> - <color name="half_black">#808080</color> - <color name="white">#fafafa</color> - <color name="white_pressed">#f1f1f1</color> + <color name="password_strength_low">#f44336</color> + <color name="password_strength_medium">#ff9800</color> + <color name="password_strength_high">#7bad45</color> <!-- + Standard Android colors: http://www.google.com/design/spec/style/color.html#color-color-palette light = normal color dark = 900 @@ -58,10 +26,7 @@ <color name="android_red_light">#f44336</color> <color name="android_red_dark">#b71c1c</color> <color name="android_orange_light">#ff9800</color> - <color name="android_orange_dark">#e65100</color> - <color name="android_green_light">@color/primary</color> - <color name="android_green_dark">@color/primary_dark</color> - <color name="android_purple_light">#673ab7</color> - <color name="android_purple_dark">#311b92</color> + <color name="android_green_light">#7bad45</color> + <color name="android_green_dark">#6c983d</color> </resources> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index a62df862f..0c394bda7 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -25,8 +25,8 @@ <string name="title_encrypt_to_file">"Encrypt To File"</string> <string name="title_decrypt_to_file">"Decrypt To File"</string> <string name="title_import_keys">"Import Keys"</string> - <string name="title_export_key">"Export Key"</string> - <string name="title_export_keys">"Export Keys"</string> + <string name="title_export_key">"Backup Key"</string> + <string name="title_export_keys">"Backup Keys"</string> <string name="title_key_not_found">"Key Not Found"</string> <string name="title_send_key">"Upload to Keyserver"</string> <string name="title_certify_key">"Confirm Key"</string> @@ -49,6 +49,8 @@ <string name="section_keys">"Subkeys"</string> <string name="section_cloud_search">"Cloud search"</string> <string name="section_passphrase_cache">"Password/PIN Handling"</string> + <string name="section_proxy_settings">"Proxy Settings"</string> + <string name="section_gui">"Interface"</string> <string name="section_certify">"Confirm"</string> <string name="section_actions">"Actions"</string> <string name="section_share_key">"Key"</string> @@ -95,7 +97,7 @@ <!-- menu --> <string name="menu_preferences">"Settings"</string> <string name="menu_help">"Help"</string> - <string name="menu_export_key">"Export to file"</string> + <string name="menu_export_key">"Backup to file"</string> <string name="menu_delete_key">"Delete key"</string> <string name="menu_manage_keys">"Manage my keys"</string> <string name="menu_search">"Search"</string> @@ -109,6 +111,8 @@ <string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string> <string name="menu_export_log">"Export Log"</string> + <string name="menu_keyserver_add">"Add"</string> + <!-- label --> <string name="label_message">"Text"</string> <string name="label_file">"File"</string> @@ -127,7 +131,7 @@ <string name="label_use_default_yubikey_pin">"Use default YubiKey PIN"</string> <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for YubiKey PIN</string> <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access YubiKeys over NFC"</string> - <string name="label_asymmetric_from">"Signed by:"</string> + <string name="label_asymmetric_from">"Sign with:"</string> <string name="label_to">"Encrypt to:"</string> <string name="label_delete_after_encryption">"Delete files after encryption"</string> <string name="label_delete_after_decryption">"Delete after decryption"</string> @@ -153,19 +157,59 @@ <string name="label_send_key">"Synchronize with the cloud"</string> <string name="label_fingerprint">"Fingerprint"</string> <string name="expiry_date_dialog_title">"Set expiry date"</string> - <string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string> + <string name="label_keyservers_title">"Keyservers"</string> + <string name="label_keyserver_settings_hint">"Drag to change order, tap to edit/delete"</string> + <string name="label_selected_keyserver_title">"Selected keyserver"</string> <string name="label_preferred">"preferred"</string> <string name="label_enable_compression">"Enable compression"</string> <string name="label_encrypt_filenames">"Encrypt filenames"</string> <string name="label_hidden_recipients">"Hide recipients"</string> + <string name="label_verify_keyserver">"Verify keyserver"</string> <string name="label_enter_keyserver_url">"Enter keyserver URL"</string> + <string name="label_keyserver_dialog_delete">"Delete keyserver"</string> + <string name="label_theme">"Theme"</string> <string name="pref_keyserver">"OpenPGP keyservers"</string> <string name="pref_keyserver_summary">"Search keys on selected OpenPGP keyservers (HKP protocol)"</string> <string name="pref_keybase">"keybase.io"</string> <string name="pref_keybase_summary">"Search keys on keybase.io"</string> + <!-- Proxy Preferences --> + <string name="pref_proxy_tor_title">"Enable Tor"</string> + <string name="pref_proxy_tor_summary">"Requires Orbot to be installed"</string> + <string name="pref_proxy_normal_title">"Enable other proxy"</string> + <string name="pref_proxy_host_title">"Proxy Host"</string> + <string name="pref_proxy_host_err_invalid">"Proxy host cannot be empty"</string> + <string name="pref_proxy_port_title">"Proxy Port"</string> + <string name="pref_proxy_port_err_invalid">"Invalid port number entered"</string> + <string name="pref_proxy_type_title">"Proxy Type"</string> + + <!-- proxy type choices and values --> + <string name="pref_proxy_type_choice_http">"HTTP"</string> + <string name="pref_proxy_type_choice_socks">"SOCKS"</string> + <string name="pref_proxy_type_value_http">"proxyHttp"</string> + <string name="pref_proxy_type_value_socks">"proxySocks"</string> + + <!-- OrbotHelper strings --> + <string name="orbot_ignore_tor">"Don\'t use Tor"</string> + + <!-- InstallDialogFragment strings --> + <string name="orbot_install_dialog_title">Install Orbot to use Tor?</string> + <string name="orbot_install_dialog_install">"Install"</string> + <string name="orbot_install_dialog_content">You must have Orbot installed and activated to proxy traffic through it. Would you like to install it?</string> + <string name="orbot_install_dialog_cancel">"Cancel"</string> + <string name="orbot_install_dialog_ignore_tor">"Don\'t use Tor"</string> + + <!-- StartOrbotDialogFragment strings --> + <string name="orbot_start_dialog_title">Start Orbot?</string> + <string name="orbot_start_dialog_content">"Orbot doesn\'t appear to be running. Would you like to start it up and connect to Tor?"</string> + <string name="orbot_start_btn">"Start Orbot"</string> + <string name="orbot_start_dialog_start">"Start Orbot"</string> + <string name="orbot_start_dialog_cancel">"Cancel"</string> + <string name="orbot_start_dialog_ignore_tor">"Don\'t use Tor"</string> + + <string name="user_id_no_name">"<no name>"</string> <string name="none">"<none>"</string> @@ -203,6 +247,8 @@ <string name="filemanager_title_open">"Open…"</string> <string name="error">"Error"</string> <string name="error_message">"Error: %s"</string> + <string name="theme_dark">"Dark"</string> + <string name="theme_light">"Light"</string> <!-- key flags --> <string name="flag_certify">"Certify"</string> @@ -219,7 +265,10 @@ <string name="passphrase_for">"Enter password for '%s'"</string> <string name="pin_for">"Enter PIN for '%s'"</string> <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string> - <string name="nfc_text">"Hold YubiKey against the back of your device."</string> + <string name="nfc_text">"Hold YubiKey against the NFC marker at the back of your device."</string> + <string name="nfc_wait">"Keep the YubiKey at the back!"</string> + <string name="nfc_finished">"Take away the YubiKey now."</string> + <string name="nfc_try_again_text">"Take away the YubiKey now and press TRY AGAIN."</string> <string name="file_delete_confirmation_title">"Delete original files?"</string> <string name="file_delete_confirmation">"The following files will be deleted:%s"</string> <string name="file_delete_successful">"%1$d out of %2$d files have been deleted.%3$s"</string> @@ -230,7 +279,10 @@ <string name="error_no_encryption_or_signature_key">"Select at least one encryption key or a signature key."</string> <string name="specify_file_to_encrypt_to">"Please specify which file to encrypt to.\nWARNING: File will be overwritten if it exists!"</string> <string name="specify_file_to_decrypt_to">"Please specify which file to decrypt to.\nWARNING: File will be overwritten if it exists!"</string> - <string name="specify_file_to_export_to">"Please specify which file to export to.\nWARNING: File will be overwritten if it exists!"</string> + <string name="specify_backup_dest">"A backup excluding your keys will be made, please specify a destination file.\nWARNING: File will be overwritten if it exists!"</string> + <string name="specify_backup_dest_single">"This key will be shared, please specify a destination file.\nWARNING: File will be overwritten if it exists!"</string> + <string name="specify_backup_dest_secret_single">"A full backup of your key will be made, please specify a destination file.\nWARNING: File will be overwritten if it exists!"</string> + <string name="specify_backup_dest_secret">"A full backup of all keys including yours will be made, please specify a destination file.\nWARNING: File will be overwritten if it exists!"</string> <string name="key_deletion_confirmation_multi">"Do you really want to delete all selected keys?"</string> <string name="secret_key_deletion_confirmation">"After deletion you will not be able to read messages encrypted with this key and lose all key confirmations done with it!"</string> <string name="public_key_deletetion_confirmation">"Delete key '%s'?"</string> @@ -313,6 +365,7 @@ <string name="progress_cancelling">"cancelling…"</string> <string name="progress_saving">"saving…"</string> <string name="progress_importing">"importing…"</string> + <string name="progress_revoking_uploading">"Revoking and uploading key…"</string> <string name="progress_updating">"Updating keys…"</string> <string name="progress_exporting">"exporting…"</string> <string name="progress_uploading">"uploading…"</string> @@ -336,6 +389,8 @@ <string name="progress_modify_subkeystrip">"stripping subkeys…"</string> <string name="progress_modify_subkeyadd">"adding subkeys…"</string> <string name="progress_modify_passphrase">"changing password…"</string> + <string name="progress_modify_pin">"changing PIN…"</string> + <string name="progress_modify_admin_pin">"changing Admin PIN…"</string> <plurals name="progress_exporting_key"> <item quantity="one">"exporting key…"</item> @@ -474,6 +529,12 @@ <string name="delete_nothing">"Nothing to delete."</string> <string name="delete_cancelled">"Delete operation cancelled."</string> + <!-- Revoke result toast (snackbar) --> + <string name="revoke_ok">"Successfully revoked key."</string> + <string name="revoke_fail">"Error revoking key!"</string> + <string name="revoke_nothing">"Nothing to revoke."</string> + <string name="revoke_cancelled">"Revoke operation cancelled."</string> + <!-- Certify result toast --> <plurals name="certify_keys_ok"> <item quantity="one">"Successfully certified key%2$s."</item> @@ -509,7 +570,7 @@ <string name="api_settings_start">"Start application"</string> <string name="api_settings_delete_account">"Delete account"</string> <string name="api_settings_package_name">"Package Name"</string> - <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string> + <string name="api_settings_package_certificate">"SHA-256 of Package Certificate"</string> <string name="api_settings_accounts">"Accounts (old API)"</string> <string name="api_settings_advanced">"Extended Information"</string> <string name="api_settings_allowed_keys">"Allowed Keys"</string> @@ -522,8 +583,8 @@ <string name="api_register_allow">"Allow access"</string> <string name="api_register_disallow">"Disallow access"</string> <string name="api_register_error_select_key">"Please select a key!"</string> - <string name="api_select_pub_keys_missing_text">"No keys were found for these identities:"</string> - <string name="api_select_pub_keys_dublicates_text">"More than one key exist for these identities:"</string> + <string name="api_select_pub_keys_missing_text">"No keys were found for these email addresses:"</string> + <string name="api_select_pub_keys_dublicates_text">"More than one key exist for these email addresses:"</string> <string name="api_select_pub_keys_text">"Please review the list of recipients!"</string> <string name="api_select_pub_keys_text_no_user_ids">"Please select the recipients!"</string> <string name="api_error_wrong_signature">"Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app's registration in OpenKeychain and then register the app again."</string> @@ -534,6 +595,23 @@ <string name="share_qr_code_dialog_title">"Share with QR Code"</string> <string name="share_nfc_dialog">"Share with NFC"</string> + <!-- retry upload dialog --> + <string name="retry_up_dialog_title">"Upload failed"</string> + <string name="retry_up_dialog_message">"Upload failed. Would you like to retry the operation?"</string> + <string name="retry_up_dialog_btn_reupload">"Retry Operation"</string> + <string name="retry_up_dialog_btn_cancel">"Cancel Operation"</string> + + <!-- Delete or revoke private key dialog --> + <string name="del_rev_dialog_message">"If you would no longer like to use this key, it should be revoked and uploaded. Select delete only if you wish to remove the key from OpenKeychain but continue to use it from somewhere else."</string> + <string name="del_rev_dialog_title">"Revoke/Delete key \"%s\""</string> + <string name="del_rev_dialog_btn_revoke">"Revoke and upload"</string> + <string name="del_rev_dialog_btn_delete">"Delete only"</string> + + <!-- Delete Or Revoke Dialog spinner --> + <string name="del_rev_dialog_choice_delete">"Delete only"</string> + <string name="del_rev_dialog_choice_rev_upload">"Revoke and Upload"</string> + + <!-- Key list --> <plurals name="key_list_selected_keys"> <item quantity="one">"1 key selected."</item> @@ -654,6 +732,13 @@ <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string> <string name="create_key_email_already_exists_text">"Email address has already been added"</string> <string name="create_key_email_invalid_email">"Email address format is invalid"</string> + <string name="create_key_yubi_key_pin_text">"Please remember the PIN, it is required to use your YubiKey later. Please write down the Admin PIN and store it in a safe place."</string> + <string name="create_key_yubi_key_pin">"PIN"</string> + <string name="create_key_yubi_key_admin_pin">"Admin PIN"</string> + <string name="create_key_yubi_key_pin_repeat_text">"Please enter the PIN and Admin PIN to proceed."</string> + <string name="create_key_yubi_key_pin_repeat">"Repeat PIN"</string> + <string name="create_key_yubi_key_admin_pin_repeat">"Repeat Admin PIN"</string> + <string name="create_key_yubi_key_pin_not_correct">"PIN is not correct!"</string> <!-- View key --> <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string> @@ -665,12 +750,15 @@ <string name="view_key_fragment_no_system_contact">"<none>"</string> - <!-- Add keyserver --> + <!-- Add/Edit keyserver --> <string name="add_keyserver_dialog_title">"Add keyserver"</string> + <string name="edit_keyserver_dialog_title">"Edit keyserver"</string> <string name="add_keyserver_verified">"Keyserver verified!"</string> <string name="add_keyserver_without_verification">"Keyserver added without verification."</string> <string name="add_keyserver_invalid_url">"Invalid URL!"</string> <string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string> + <string name="keyserver_preference_deleted">"%s deleted"</string> + <string name="keyserver_preference_cannot_delete_last">"Cannot delete last keyserver. At least one is required!"</string> <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> @@ -679,6 +767,7 @@ <string name="drawer_open">"Open navigation drawer"</string> <string name="drawer_close">"Close navigation drawer"</string> <string name="my_keys">"My Keys"</string> + <string name="nav_backup">"Backup"</string> <!-- hints --> <string name="encrypt_content_edit_text_hint">"Type text"</string> @@ -919,6 +1008,7 @@ <!-- modifySecretKeyRing --> <string name="msg_mr">"Modifying keyring %s"</string> <string name="msg_mf_divert">"Will divert to smart card for crypto operations"</string> + <string name="msg_mf_error_divert_newsub">"Creation of new subkeys is not supported for 'divert-to-card' primary keys!"</string> <string name="msg_mf_error_divert_serial">"The serial number of a 'divert-to-card' key must be 16 bytes! This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_encode">"Encoding exception!"</string> <string name="msg_mf_error_fingerprint">"Actual key fingerprint does not match the expected one!"</string> @@ -934,6 +1024,7 @@ <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string> <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string> <string name="msg_mf_error_sig">"Signature exception!"</string> + <string name="msg_mf_error_sub_stripped">"Cannot modify stripped subkey %s!"</string> <string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string> <string name="msg_mf_error_conflicting_nfc_commands">"Cannot move key to smart card in same operation that creates an on-card signature."</string> <string name="msg_mf_error_duplicate_keytocard_for_slot">"Smart card supports only one slot per key type."</string> @@ -942,6 +1033,8 @@ <string name="msg_mf_notation_empty">"Adding empty notation packet"</string> <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string> <string name="msg_mf_passphrase">"Changing password for keyring"</string> + <string name="msg_mf_pin">"Changing PIN on card"</string> + <string name="msg_mf_admin_pin">"Changing Admin PIN on card"</string> <string name="msg_mf_passphrase_key">"Re-encrypting subkey %s with new password"</string> <string name="msg_mf_passphrase_empty_retry">"Setting new password failed, trying again with empty old password"</string> <string name="msg_mf_passphrase_fail">"Password for subkey could not be changed! (Does it have a different one from the other keys?)"</string> @@ -1007,6 +1100,7 @@ <string name="msg_ed_caching_new">"Caching new password"</string> <string name="msg_ed_error_no_parcel">"Missing SaveKeyringParcel! (this is a bug, please report)"</string> <string name="msg_ed_error_key_not_found">"Key not found!"</string> + <string name="msg_ed_error_extract_public_upload">"Error extracting public key for upload!"</string> <string name="msg_ed_fetching">"Fetching key to modify (%s)"</string> <string name="msg_ed_success">"Key operation successful"</string> @@ -1042,12 +1136,14 @@ <string name="msg_dc_clear_signature">"Saving signature data for later"</string> <string name="msg_dc_clear">"Processing cleartext data"</string> <string name="msg_dc_error_bad_passphrase">"Error unlocking key, bad password!"</string> + <string name="msg_dc_error_sym_passphrase">"Error decrypting data! (Bad passphrase?)"</string> <string name="msg_dc_error_corrupt_data">"Data is corrupt!"</string> <string name="msg_dc_error_extract_key">"Unknown error unlocking key!"</string> <string name="msg_dc_error_integrity_check">"Integrity check error!"</string> <string name="msg_dc_error_integrity_missing">"Missing integrity check! This can happen because the encrypting application is out of date, or from a downgrade attack."</string> <string name="msg_dc_error_invalid_data">"No valid OpenPGP encrypted or signed data found!"</string> - <string name="msg_dc_error_io">"Encountered IO Exception during operation!"</string> + <string name="msg_dc_error_io">"Encountered an error reading input data!"</string> + <string name="msg_dc_error_input">"Error opening input data stream!"</string> <string name="msg_dc_error_no_data">"No encrypted data found in stream!"</string> <string name="msg_dc_error_no_key">"No encrypted data with known secret key found in stream!"</string> <string name="msg_dc_error_pgp_exception">"Encountered OpenPGP Exception during operation!"</string> @@ -1141,6 +1237,7 @@ <string name="msg_crt_warn_not_found">"Key not found!"</string> <string name="msg_crt_warn_cert_failed">"Certificate generation failed!"</string> <string name="msg_crt_warn_save_failed">"Save operation failed!"</string> + <string name="msg_crt_warn_upload_failed">"Upload operation failed!"</string> <string name="msg_crt_upload_success">"Successfully uploaded key to server"</string> @@ -1170,6 +1267,7 @@ </plurals> <string name="msg_export_all">"Exporting all keys"</string> <string name="msg_export_public">"Exporting public key %s"</string> + <string name="msg_export_upload_public">"Uploading public key %s"</string> <string name="msg_export_secret">"Exporting secret key %s"</string> <string name="msg_export_error_no_file">"No filename specified!"</string> <string name="msg_export_error_fopen">"Error opening file!"</string> @@ -1179,7 +1277,9 @@ <string name="msg_export_error_db">"Database error!"</string> <string name="msg_export_error_io">"Input/output error!"</string> <string name="msg_export_error_key">"Error preprocessing key data!"</string> + <string name="msg_export_error_upload">"Error uploading key to server! Please check your internet connection"</string> <string name="msg_export_success">"Export operation successful"</string> + <string name="msg_export_upload_success">"Upload to keyserver successful"</string> <string name="msg_del_error_empty">"Nothing to delete!"</string> <string name="msg_del_error_multi_secret">"Secret keys can only be deleted individually!"</string> @@ -1199,6 +1299,13 @@ <item quantity="other">"Failed to delete %d keys"</item> </plurals> + <string name="msg_revoke_error_empty">"Nothing to revoke!"</string> + <string name="msg_revoke_error_multi_secret">"Secret keys can only be revoked individually!"</string> + <string name="msg_revoke_error_not_found">"Cannot find key to revoke!"</string> + <string name="msg_revoke_key">"Revoking key %s"</string> + <string name="msg_revoke_key_fail">"Failed revoking key"</string> + <string name="msg_revoke_ok">"Successfully revoked key"</string> + <string name="msg_acc_saved">"Account saved"</string> <string name="msg_download_success">"Downloaded successfully!"</string> @@ -1249,6 +1356,11 @@ <string name="first_time_blank_yubikey">"Would you like to use this blank YubiKey NEO with OpenKeychain?\n\nPlease take away the YubiKey now, you will be prompted when it is needed again!"</string> <string name="first_time_blank_yubikey_yes">"Use this YubiKey"</string> + <string name="backup_text">"Backups that include your own keys must never be shared with other people!"</string> + <string name="backup_all">"All keys + your own keys"</string> + <string name="backup_public_keys">"All keys"</string> + <string name="backup_section">"Backup"</string> + <!-- unsorted --> <string name="section_certifier_id">"Certifier"</string> <string name="section_cert">"Certificate Details"</string> @@ -1273,7 +1385,6 @@ <string name="unknown_algorithm">"unknown"</string> <string name="can_sign_not">"cannot sign"</string> <string name="error_no_encrypt_subkey">"No encryption subkey available!"</string> - <string name="info_no_manual_account_creation">"Do not create OpenKeychain-Accounts manually.\nFor more information, see Help."</string> <string name="contact_show_key">"Show key (%s)"</string> <string name="swipe_to_update">"Swipe down to update from keyserver"</string> <string name="error_no_file_selected">"Select at least one file to encrypt!"</string> @@ -1286,6 +1397,11 @@ <string name="btn_start_exchange">"Start exchange"</string> <string name="user_id_none"><![CDATA[<none>]]></string> + <!-- Android Account --> + <string name="account_no_manual_account_creation">"You can not create OpenKeychain accounts manually."</string> + <string name="account_privacy_title">"Privacy"</string> + <string name="account_privacy_text">"OpenKeychain does not synchronize your contacts with the Internet. It only links contacts to keys based on names and email addresses. It does this offline on your device."</string> + <!-- Passphrase wizard --> <!-- TODO: rename all the things! --> <string name="title_unlock_method">Choose an unlock method</string> @@ -1325,17 +1441,22 @@ <string name="btn_import">"Import"</string> <string name="snack_yubi_other">Different key stored on YubiKey!</string> <string name="error_nfc">"NFC Error: %s"</string> - <string name="error_pin">"NFC: Incorrect PIN; %d tries remaining."</string> - <string name="error_nfc_terminated">"NFC: Smart card in termination state"</string> - <string name="error_nfc_wrong_length">"NFC: Wrong length for sent / received data"</string> - <string name="error_nfc_conditions_not_satisfied">"NFC: Conditions of use not satisfied"</string> - <string name="error_nfc_security_not_satisfied">"NFC: Security status not satisfied"</string> - <string name="error_nfc_authentication_blocked">"NFC: PIN blocked after too many attempts"</string> - <string name="error_nfc_data_not_found">"NFC: Key or object not found"</string> - <string name="error_nfc_unknown">"NFC: Unknown Error"</string> - <string name="error_nfc_bad_data">"NFC: Card reported invalid data"</string> - <string name="error_nfc_chaining_error">"NFC: Card expected last command in a chain"</string> - <string name="error_nfc_header">"NFC: Card reported invalid %s byte"</string> + <plurals name="error_pin"> + <item quantity="one">"Incorrect PIN!\n%d try remaining."</item> + <item quantity="other">"Incorrect PIN!\n%d tries remaining."</item> + </plurals> + <string name="error_nfc_terminated">"YubiKey in termination state."</string> + <string name="error_nfc_wrong_length">"Entered PIN is too short. PINs are at least 6 digits long."</string> + <string name="error_nfc_conditions_not_satisfied">"Conditions of use not satisfied."</string> + <string name="error_nfc_security_not_satisfied">"Security status not satisfied."</string> + <string name="error_nfc_authentication_blocked">"PIN blocked after too many attempts."</string> + <string name="error_nfc_data_not_found">"Key or object not found."</string> + <string name="error_nfc_unknown">"Unknown Error"</string> + <string name="error_nfc_bad_data">"YubiKey reported invalid data."</string> + <string name="error_nfc_chaining_error">"YubiKey expected last command in a chain."</string> + <string name="error_nfc_header">"YubiKey reported invalid %s byte."</string> + <string name="error_nfc_tag_lost">"YubiKey has been taken off too early. Keep the YubiKey at the back until the operation finishes."</string> + <string name="error_nfc_try_again">"Try again"</string> <string name="error_pin_nodefault">Default PIN was rejected!</string> <string name="error_temp_file">Error creating temporary file.</string> <string name="btn_delete_original">Delete original file</string> @@ -1362,5 +1483,9 @@ <string name="file_delete_none">"No file deleted! (Already deleted?)"</string> <string name="file_delete_exception">"Original file could not be deleted!"</string> <string name="error_clipboard_empty">"Clipboard is empty!"</string> + <string name="error_clipboard_copy">"Error copying data to clipboard!"</string> + <string name="error_scan_fp">"Error scanning fingerprint!"</string> + <string name="error_scan_match">"Fingerprints did not match!"</string> + <string name="error_expiry_past">"Expiry date is in the past!"</string> </resources> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 9ac60c397..73a594ac4 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -7,7 +7,7 @@ <item name="android:layout_marginTop">16dp</item> <item name="android:paddingLeft">16dp</item> <item name="android:textStyle">normal</item> - <item name="android:textColor">@color/header_text</item> + <item name="android:textColor">?attr/colorHeaderText</item> <item name="android:textSize">17sp</item> </style> @@ -17,13 +17,21 @@ <item name="android:layout_marginTop">8dp</item> <item name="android:paddingLeft">8dp</item> <item name="android:textStyle">bold</item> - <item name="android:textColor">@color/header_text</item> + <item name="android:textColor">?attr/colorHeaderText</item> <item name="android:textSize">14sp</item> </style> <style name="FabMenuStyle"> <item name="android:background">@drawable/fab_label_background</item> - <item name="android:textColor">@color/white</item> + <item name="android:textColor">?attr/colorFabText</item> </style> -</resources>
\ No newline at end of file + <!-- This style is for use with our drag and drop RecyclerView since ItemDecoration did not + move with the drag --> + <style name="Divider"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">2dp</item> + <item name="android:background">?android:attr/listDivider</item> + </style> + +</resources> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 6ac09c5d7..3bdbf811d 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -1,12 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="KeychainTheme" parent="KeychainTheme.Base" /> + <style name="LightBaseTheme" parent="Theme.AppCompat.Light"> + <item name="colorPrimary">#7bad45</item> + <item name="colorPrimaryDark">#6c983d</item> + <item name="colorAccent">#2196f3</item> + <item name="colorBrightToolbar">#dddddd</item> - <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light"> - <item name="colorPrimary">@color/primary</item> - <item name="colorPrimaryDark">@color/primary_dark</item> - <item name="colorAccent">@color/accent</item> + <item name="colorFab">#2196f3</item> + <item name="colorFabPressed">#1976d2</item> + <item name="colorFabBackground">#b2000000</item> + <item name="colorFabText">#fafafa</item> + + <item name="colorTabText">#70ffffff</item> + <item name="colorTabTextSelected">#ffffff</item> + <item name="colorTabIndicator">#ffffff</item> + + <item name="colorEmphasis">#2196f3</item> + <item name="colorButtonRow">#33cccccc</item> + <item name="colorLogBackground">#cecbce</item> + <item name="colorCardViewHeaderDivider">#808080</item> + <item name="colorCardViewBackground">#ffffff</item> + + <item name="colorText">#000000</item> + <item name="colorHeaderText">#212121</item> + <item name="colorTertiaryText">#808080</item> <!-- remove actionbar and title, we use toolbar! --> <item name="windowNoTitle">true</item> @@ -16,6 +34,47 @@ <item name="searchViewStyle">@style/MySearchViewStyle</item> </style> + <style name="DarkBaseTheme" parent="MaterialDrawerTheme.ActionBar"> + <item name="colorPrimary">#268bd2</item> + <item name="colorPrimaryDark">#166bb2</item> + <item name="colorAccent">#2196f3</item> + <item name="colorBrightToolbar">#808080</item> + + <item name="colorFab">#2196f3</item> + <item name="colorFabPressed">#1976d2</item> + <item name="colorFabBackground">#b2000000</item> + <item name="colorFabText">#fafafa</item> + + <item name="colorTabText">#70ffffff</item> + <item name="colorTabTextSelected">#ffffff</item> + <item name="colorTabIndicator">#ffffff</item> + + <item name="colorEmphasis">#2196f3</item> + <item name="colorButtonRow">#33cccccc</item> + <item name="colorLogBackground">#303030</item> + <item name="colorCardViewHeaderDivider">#808080</item> + <item name="colorCardViewBackground">#505050</item> + + <item name="colorText">#ffffff</item> + <item name="colorHeaderText">#d0d0d0</item> + <item name="colorTertiaryText">#808080</item> + + <item name="material_drawer_selected_text">#268bd2</item> + + <!-- remove actionbar and title, we use toolbar! --> + <item name="windowNoTitle">true</item> + <item name="windowActionBar">false</item> + <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> + <item name="windowActionModeOverlay">true</item> + <item name="searchViewStyle">@style/MySearchViewStyle</item> + </style> + + <style name="LightTheme" parent="LightBaseTheme"> + </style> + + <style name="DarkTheme" parent="DarkBaseTheme"> + </style> + <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> <style name="MySearchViewStyle" parent="Widget.AppCompat.SearchView"> <!-- Background for the search query section (e.g. EditText) --> @@ -35,4 +94,9 @@ <!-- Layout for query suggestion rows --> <!--<item name="suggestionRowLayout">...</item>--> </style> -</resources>
\ No newline at end of file + + <style name="KeychainTheme.YubiKeyDialog" parent="@style/Theme.AppCompat.Light.Dialog.MinWidth"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> + </style> +</resources> diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml index 6d8d76b02..e04160c5c 100644 --- a/OpenKeychain/src/main/res/xml/account_desc.xml +++ b/OpenKeychain/src/main/res/xml/account_desc.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android" + android:accountPreferences="@xml/account_preferences" android:accountType="@string/account_type" android:icon="@drawable/ic_launcher" android:label="@string/app_name" /> diff --git a/OpenKeychain/src/main/res/xml/account_preferences.xml b/OpenKeychain/src/main/res/xml/account_preferences.xml new file mode 100644 index 000000000..3fdb54f1e --- /dev/null +++ b/OpenKeychain/src/main/res/xml/account_preferences.xml @@ -0,0 +1,10 @@ +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + + <PreferenceCategory android:title="@string/account_privacy_title" /> + + <Preference + android:persistent="false" + android:selectable="false" + android:summary="@string/account_privacy_text" /> + +</PreferenceScreen>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/xml/gui_preferences.xml b/OpenKeychain/src/main/res/xml/gui_preferences.xml new file mode 100644 index 000000000..cda7beeef --- /dev/null +++ b/OpenKeychain/src/main/res/xml/gui_preferences.xml @@ -0,0 +1,10 @@ +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <ListPreference + android:persistent="false" + android:key="theme" + android:title="@string/label_theme" + android:entries="@array/theme_entries" + android:entryValues="@array/theme_values" + android:dialogTitle="@string/label_theme" /> + +</PreferenceScreen> diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index e3447ff48..b7512b062 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -1,8 +1,14 @@ <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> + <!--<header--> + <!--android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$GuiPrefsFragment"--> + <!--android:title="@string/section_gui" />--> <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$CloudSearchPrefsFragment" android:title="@string/section_cloud_search" /> <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment" android:title="@string/section_passphrase_cache" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment" + android:title="@string/section_proxy_settings" /> </preference-headers> diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml new file mode 100644 index 000000000..94e101cb6 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <CheckBoxPreference + android:key="useTorProxy" + android:persistent="true" + android:title="@string/pref_proxy_tor_title" + android:summary="@string/pref_proxy_tor_summary" /> + <CheckBoxPreference + android:key="useNormalProxy" + android:persistent="true" + android:title="@string/pref_proxy_normal_title" /> + <EditTextPreference + android:key="proxyHost" + android:persistent="true" + android:defaultValue="127.0.0.1" + android:title="@string/pref_proxy_host_title" + android:cursorVisible="true" + android:textCursorDrawable="@null" + android:inputType="textEmailAddress"/> + <EditTextPreference + android:key="proxyPort" + android:defaultValue="8118" + android:persistent="true" + android:title="@string/pref_proxy_port_title" + android:textCursorDrawable="@null" + android:inputType="number" /> + <ListPreference + android:entries="@array/pref_proxy_type_entries" + android:entryValues="@array/pref_proxy_type_values" + android:defaultValue="@string/pref_proxy_type_value_http" + android:key="proxyType" + android:persistent="true" + android:title="@string/pref_proxy_type_title" /> +</PreferenceScreen> |
