moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-23 14:41:54 -05:00
Code Issues Releases Wiki Activity

small language fix

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-01-16 16:24:34 +01:00
parent 6c153b1543
commit aa22a0defc
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
View File

@ -39,28 +39,32 @@ import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import java.util.ArrayList; import java.util.ArrayList;
public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemClickListener { public class UserAttributesAdapter extends CursorAdapter implements AdapterView.OnItemClickListener {
private LayoutInflater mInflater; private LayoutInflater mInflater;
private final ArrayList<Boolean> mCheckStates; private final ArrayList<Boolean> mCheckStates;
private SaveKeyringParcel mSaveKeyringParcel; private SaveKeyringParcel mSaveKeyringParcel;
public static final String[] USER_IDS_PROJECTION = new String[]{ public static final String[] USER_PACKETS_PROJECTION = new String[]{
UserPackets._ID, UserPackets._ID,
UserPackets.TYPE,
UserPackets.USER_ID, UserPackets.USER_ID,
UserPackets.ATTRIBUTE_DATA,
UserPackets.RANK, UserPackets.RANK,
UserPackets.VERIFIED, UserPackets.VERIFIED,
UserPackets.IS_PRIMARY, UserPackets.IS_PRIMARY,
UserPackets.IS_REVOKED UserPackets.IS_REVOKED
}; };
private static final int INDEX_ID = 0; private static final int INDEX_ID = 0;
private static final int INDEX_USER_ID = 1; private static final int INDEX_TYPE = 1;
private static final int INDEX_RANK = 2; private static final int INDEX_USER_ID = 2;
private static final int INDEX_VERIFIED = 3; private static final int INDEX_ATTRIBUTE_DATA = 3;
private static final int INDEX_IS_PRIMARY = 4; private static final int INDEX_RANK = 4;
private static final int INDEX_IS_REVOKED = 5; private static final int INDEX_VERIFIED = 5;
private static final int INDEX_IS_PRIMARY = 6;
private static final int INDEX_IS_REVOKED = 7;
public UserIdsAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes, public UserAttributesAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes,
SaveKeyringParcel saveKeyringParcel) { SaveKeyringParcel saveKeyringParcel) {
super(context, c, flags); super(context, c, flags);
mInflater = LayoutInflater.from(context); mInflater = LayoutInflater.from(context);
@ -68,15 +72,15 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
mSaveKeyringParcel = saveKeyringParcel; mSaveKeyringParcel = saveKeyringParcel;
} }
public UserIdsAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes) { public UserAttributesAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes) {
this(context, c, flags, showCheckBoxes, null); this(context, c, flags, showCheckBoxes, null);
} }
public UserIdsAdapter(Context context, Cursor c, int flags, SaveKeyringParcel saveKeyringParcel) { public UserAttributesAdapter(Context context, Cursor c, int flags, SaveKeyringParcel saveKeyringParcel) {
this(context, c, flags, false, saveKeyringParcel); this(context, c, flags, false, saveKeyringParcel);
} }
public UserIdsAdapter(Context context, Cursor c, int flags) { public UserAttributesAdapter(Context context, Cursor c, int flags) {
this(context, c, flags, false, null); this(context, c, flags, false, null);
} }

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

@ -403,11 +403,11 @@
<!-- Import result toast --> <!-- Import result toast -->
<plurals name="import_keys_added_and_updated_1"> <plurals name="import_keys_added_and_updated_1">
<item quantity="one">"Successfully imported key"</item> <item quantity="one">"Successfully imported one key"</item>
<item quantity="other">"Successfully imported %1$d keys"</item> <item quantity="other">"Successfully imported %1$d keys"</item>
</plurals> </plurals>
<plurals name="import_keys_added_and_updated_2"> <plurals name="import_keys_added_and_updated_2">
<item quantity="one">"and updated key%2$s."</item> <item quantity="one">"and updated one key%2$s."</item>
<item quantity="other">"and updated %1$d keys%2$s."</item> <item quantity="other">"and updated %1$d keys%2$s."</item>
</plurals> </plurals>
<plurals name="import_keys_added"> <plurals name="import_keys_added">