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

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
This commit is contained in:
Vincent Breitmoser
2015-03-02 18:34:51 +01:00
parent 5e53a5417c 145e793db1
commit e6af789bf5
25 changed files with 430 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,8 +360,7 @@
<string name="progress_con_reimport">"consolidate: reimporting…"</string>
<!-- action strings -->
<string name="hint_keyserver_search_hint">"Name/Email/Key ID…"</string>
<string name="hint_cloud_search_hint">"Name/Email/Proof/Key…"</string>
<string name="hint_cloud_search_hint">"Search via Name, Email…"</string>
<!-- key bit length selections -->
<string name="key_size_512">"512"</string>