Merge branch 'master' into v/multi-decrypt

This commit is contained in:
Vincent Breitmoser
2015-06-17 21:33:31 +02:00
9 changed files with 101 additions and 79 deletions

View File

@@ -1331,5 +1331,6 @@
<string name="snack_armor_off">"Output encoded as Binary."</string>
<string name="snack_compression_on">"Compression <b>enabled</b>."</string>
<string name="snack_compression_off">"Compression <b>disabled</b>."</string>
<string name="error_loading_keys">Error loading keys!</string>
</resources>