moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 08:28:50 -05:00
Code Issues Releases Wiki Activity

language fixes

Browse Source
This commit is contained in:
Dominik Schürmann 2014-02-08 15:42:31 +01:00
parent 616c903a2a
commit 76806ebd57
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
View File

@ -313,7 +313,8 @@ public class KeyListPublicFragment extends Fragment implements AdapterView.OnIte
for (String userId : notDeleted) { for (String userId : notDeleted) {
notDeletedMsg += userId + "\n"; notDeletedMsg += userId + "\n";
} }
Toast.makeText(getActivity(), getString(R.string.error_can_not_delete_contacts, notDeletedMsg), Toast.makeText(getActivity(), getString(R.string.error_can_not_delete_contacts, notDeletedMsg)
+ getResources().getQuantityString(R.plurals.error_can_not_delete_info, notDeleted.size()),
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
mode.finish(); mode.finish();

4
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@ -475,7 +475,9 @@ public class ViewKeyActivity extends ActionBarActivity implements
if (returnData != null if (returnData != null
&& returnData.containsKey(DeleteKeyDialogFragment.MESSAGE_NOT_DELETED)) { && returnData.containsKey(DeleteKeyDialogFragment.MESSAGE_NOT_DELETED)) {
// we delete only this key, so MESSAGE_NOT_DELETED will solely contain this key // we delete only this key, so MESSAGE_NOT_DELETED will solely contain this key
Toast.makeText(ViewKeyActivity.this, R.string.error_can_not_delete_contact, Toast.makeText(ViewKeyActivity.this,
getString(R.string.error_can_not_delete_contact)
+ getResources().getQuantityString(R.plurals.error_can_not_delete_info, 1),
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
} else { } else {
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);

10
OpenPGP-Keychain/src/main/res/values/strings.xml
View File

@ -283,8 +283,12 @@
<string name="error_nfc_needed">NFC is not available on your device!</string> <string name="error_nfc_needed">NFC is not available on your device!</string>
<string name="error_nothing_import">Nothing to import!</string> <string name="error_nothing_import">Nothing to import!</string>
<string name="error_expiry_must_come_after_creation">expiry date must come after creation date</string> <string name="error_expiry_must_come_after_creation">expiry date must come after creation date</string>
<string name="error_can_not_delete_contact">you can not delete this contact because it is your own. Please delete it from the \'My Keys\' screen!</string> <string name="error_can_not_delete_contact">you can not delete this contact because it is your own.</string>
<string name="error_can_not_delete_contacts">you can not delete the following contacts because they are your own:\n%sPlease delete them from the \'My Keys\' screen!</string> <string name="error_can_not_delete_contacts">you can not delete the following contacts because they are your own:\n%s</string>
<plurals name="error_can_not_delete_info">
<item quantity="one">Please delete it from the \'My Keys\' screen!</item>
<item quantity="other">Please delete them from the \'My Keys\' screen!</item>
</plurals>
<!-- progress dialogs, usually ending in '…' --> <!-- progress dialogs, usually ending in '…' -->
<string name="progress_done">done.</string> <string name="progress_done">done.</string>
@ -409,7 +413,7 @@
<!-- Key view --> <!-- Key view -->
<string name="key_view_action_encrypt">Encrypt to this contact</string> <string name="key_view_action_encrypt">Encrypt to this contact</string>
<string name="key_view_action_certify">Certify key of this contact</string> <string name="key_view_action_certify">Certify this contact's key</string>
<!-- Navigation Drawer --> <!-- Navigation Drawer -->
<string name="nav_contacts">Contacts</string> <string name="nav_contacts">Contacts</string>