Merge branch 'master' into v/multi-decrypt

This commit is contained in:
Vincent Breitmoser
2015-06-18 13:19:44 +02:00
4 changed files with 45 additions and 27 deletions

View File

@@ -1332,5 +1332,6 @@
<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>
<string name="error_empty_log">(error, empty log)</string>
</resources>