Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vincent Breitmoser committed 2015-08-29 13:29:51 +02:00
commit e037b78248
5 files changed
+164 -75

No files matched your search

+2 -2
View File
@@ -1526,8 +1526,8 @@
<string name="error_loading_keys">"Error loading keys!"</string>
<string name="error_empty_log">"(error, empty log)"</string>
<string name="error_reading_text">"Could not read input to decrypt!"</string>
<string name="filename_unknown"><![CDATA[<no filename>]]></string>
<string name="filename_unknown_text"><![CDATA[<plain text data>]]></string>
<string name="filename_unknown">Unknown filename (click to open)</string>
<string name="filename_unknown_text">Text (click to show)</string>
<string name="intent_show">Show Signed/Encrypted Content</string>
<string name="view_internal">"View in OpenKeychain"</string>
<string name="error_preparing_data">"Error preparing data!"</string>