Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop

This commit is contained in:
David A. Velasco 2014-03-19 16:58:10 +01:00
commit 68482e5f66

View file

@ -208,6 +208,8 @@
<string name="ssl_validator_label_validity_to">To:</string>
<string name="ssl_validator_label_signature">Signature:</string>
<string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
<string name="ssl_validator_null_cert">The certificate could not be shown.</string>
<string name="ssl_validator_no_info_about_error">- No information about the error</string>
<string name="placeholder_sentence">This is a placeholder</string>
<string name="placeholder_filename">placeholder.txt</string>
<string name="placeholder_filetype">PNG Image</string>