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

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

Browse Source
This commit is contained in:
Dominik Schürmann
2015-07-02 17:39:58 +02:00
parent 9dac8ddbac 8b2ae99412
commit 0454c57431
13 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png → OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 942 B

After

Width:  |  Height:  |  Size: 942 B

0
OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png → OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png → OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 647 B

After

Width:  |  Height:  |  Size: 647 B

0
OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png → OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 862 B

After

Width:  |  Height:  |  Size: 862 B

0
OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png → OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png → OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png → OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png → OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

3
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -687,7 +687,8 @@
<string name="add_keyserver_without_verification">"Keyserver added without verification."</string>
<string name="add_keyserver_invalid_url">"Invalid URL!"</string>
<string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string>
<string name="keyserver_deleted">"%s deleted"</string>
<string name="keyserver_preference_deleted">"%s deleted"</string>
<string name="keyserver_preference_cannot_delete_last">"Cannot delete last keyserver. At least one is required!"</string>
<!-- Navigation Drawer -->
<string name="nav_keys">"Keys"</string>