Merge branch 'master' into v/multi-decrypt
This commit is contained in:
Vincent Breitmoser committed
commit
7f3154ecea
9 files changed
+101
-79
No files matched your search
@@ -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>
|
||||
Reference in new issue
Block a user