improve CertifyResult, add custom notify

This commit is contained in:
Vincent Breitmoser
2014-10-04 16:01:24 +02:00
parent 0e0e3d8dd0
commit d004bf236b
15 changed files with 140 additions and 26 deletions

View File

@@ -387,6 +387,11 @@
<string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short (&lt; 16 characters)"</string>
<string name="import_qr_code_button">"Scan QR Code…"</string>
<!-- Generic result toast -->
<string name="view_log">"View Log"</string>
<string name="with_warnings">", with warnings"</string>
<string name="with_cancelled">", until cancelled"</string>
<!-- Import result toast -->
<plurals name="import_keys_added_and_updated_1">
<item quantity="one">"Successfully imported key"</item>
@@ -408,15 +413,26 @@
<item quantity="one">"Import failed for one key!"</item>
<item quantity="other">"Import failed for %d keys!"</item>
</plurals>
<string name="view_log">"View Log"</string>
<string name="import_error_nothing">"Nothing to import."</string>
<string name="import_error_nothing_cancelled">"Import cancelled."</string>
<string name="import_with_warnings">", with warnings"</string>
<string name="import_with_cancelled">", until cancelled"</string>
<plurals name="import_error">
<item quantity="one">"Import failed!"</item>
<item quantity="other">"Import of %d keys failed!"</item>
</plurals>
<string name="import_error_nothing">"Nothing to import."</string>
<string name="import_error_nothing_cancelled">"Import cancelled."</string>
<!-- Certify result toast -->
<plurals name="certify_keys_ok">
<item quantity="one">"Successfully certified key%2$s."</item>
<item quantity="other">"Successfully certified %1$d keys%2$s."</item>
</plurals>
<plurals name="certify_keys_with_errors">
<item quantity="one">"Certification failed!"</item>
<item quantity="other">"Certification failed for %d keys!"</item>
</plurals>
<plurals name="certify_error">
<item quantity="one">"Certification failed!"</item>
<item quantity="other">"Certification of %d keys failed!"</item>
</plurals>
<!-- Intent labels -->
<string name="intent_decrypt_file">"Decrypt File with OpenKeychain"</string>
@@ -882,6 +898,7 @@
<item quantity="other">"Certifying %1$d user ids for key %2$s"</item>
</plurals>
<string name="msg_crt_error_master_not_found">"Master key not found!"</string>
<string name="msg_crt_error_nothing">"No keys certified!"</string>
<string name="msg_crt_error_unlock">"Error unlocking master key!"</string>
<string name="msg_crt_fp_mismatch">"Fingerprint mismatch, not certifying!"</string>
<string name="msg_crt">"Certifying keyrings"</string>