cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of github.com:open-keychain/open-keychain into development

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml
This commit is contained in:
Vincent Breitmoser
2014-12-30 13:09:27 +01:00
parent 2223cdd405 ccde6add70
commit 9e663237b6
25 changed files with 131 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/res/values-sv/strings.xml
View File

@@ -9,7 +9,7 @@
<string name="title_encrypt_text">Kryptera text</string>
<string name="title_encrypt_files">Kryptera filer</string>
<string name="title_decrypt">Dekryptera</string>
<string name="title_authentication">Lösenordsfras</string>
<string name="title_unlock">Lösenordsfras</string>
<string name="title_add_subkey">Lägg till undernyckel</string>
<string name="title_edit_key">Redigera nyckel</string>
<string name="title_preferences">Inställningar</string>
@@ -180,7 +180,7 @@
<string name="passphrase_must_not_be_empty">Ange en lösenordsfras.</string>
<string name="passphrase_for_symmetric_encryption">Symmetrisk kryptering.</string>
<string name="passphrase_for">Ange lösenordsfras för \'%s\'</string>
<string name="yubikey_pin">Ange PIN för att få åtkomst till Yubikey för \'%s\'</string>
<string name="yubikey_pin_for">Ange PIN för att få åtkomst till Yubikey för \'%s\'</string>
<string name="file_delete_confirmation">Vill du verkligen radera\n%s?</string>
<string name="file_delete_successful">Raderades.</string>
<string name="no_file_selected">Välj en nyckel först.</string>