From 7b7db9e90c24ef93fc84ad03fd2c584f46ebe171 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 15 Oct 2013 08:22:43 -0500 Subject: [PATCH] Remove history comments --- .../todoroo/astrid/adapter/UpdateAdapter.java | 432 +----------------- .../astrid/notes/EditNoteActivity.java | 42 +- astrid/src/main/res/values-ca/strings.xml | 3 - astrid/src/main/res/values-cs/strings.xml | 3 - astrid/src/main/res/values-da/strings.xml | 2 - astrid/src/main/res/values-de/strings.xml | 40 -- astrid/src/main/res/values-es/strings.xml | 27 -- astrid/src/main/res/values-fr/strings.xml | 67 --- astrid/src/main/res/values-it/strings.xml | 10 - astrid/src/main/res/values-iw/strings.xml | 68 --- astrid/src/main/res/values-ja/strings.xml | 8 - astrid/src/main/res/values-ko/strings.xml | 68 --- astrid/src/main/res/values-nb/strings.xml | 2 - astrid/src/main/res/values-nl/strings.xml | 68 --- astrid/src/main/res/values-pl/strings.xml | 50 -- astrid/src/main/res/values-pt-rBR/strings.xml | 10 - astrid/src/main/res/values-pt/strings.xml | 2 - astrid/src/main/res/values-ru/strings.xml | 37 -- astrid/src/main/res/values-sv/strings.xml | 5 - astrid/src/main/res/values-th/strings.xml | 2 - astrid/src/main/res/values-tr/strings.xml | 14 - astrid/src/main/res/values-uk/strings.xml | 19 - astrid/src/main/res/values-zh-rCN/strings.xml | 5 - astrid/src/main/res/values-zh-rTW/strings.xml | 5 - astrid/src/main/res/values/strings-core.xml | 3 - astrid/src/main/res/values/strings-repeat.xml | 10 +- .../src/main/res/values/strings-updates.xml | 68 --- 27 files changed, 20 insertions(+), 1050 deletions(-) delete mode 100644 astrid/src/main/res/values/strings-updates.xml diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java index 3482a082c..fd3f085c0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java @@ -5,19 +5,6 @@ */ package com.todoroo.astrid.adapter; -import java.io.IOException; -import java.text.ParseException; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -25,14 +12,10 @@ import android.database.Cursor; import android.graphics.Bitmap; import android.support.v4.app.Fragment; import android.text.Html; -import android.text.SpannableString; -import android.text.SpannableStringBuilder; import android.text.Spanned; -import android.text.TextPaint; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.method.LinkMovementMethod; -import android.text.style.ClickableSpan; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; @@ -42,12 +25,10 @@ import android.view.ViewGroup.LayoutParams; import android.widget.CursorAdapter; import android.widget.TextView; -import org.tasks.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; @@ -60,6 +41,10 @@ import com.todoroo.astrid.data.User; import com.todoroo.astrid.data.UserActivity; import com.todoroo.astrid.helper.AsyncImageView; +import org.tasks.R; + +import java.io.IOException; + import edu.mit.mobile.android.imagecache.ImageCache; /** @@ -88,7 +73,6 @@ public class UpdateAdapter extends CursorAdapter { public static final StringProperty ACTIVITY_TYPE_PROPERTY = new StringProperty(null, "'" + NameMaps.TABLE_ID_USER_ACTIVITY + "' as type"); //$NON-NLS-1$//$NON-NLS-2$ public static final StringProperty HISTORY_TYPE_PROPERTY = new StringProperty(null, "'" + NameMaps.TABLE_ID_HISTORY + "'"); //$NON-NLS-1$ //$NON-NLS-2$ - public static final StringProperty PADDING_PROPERTY = new StringProperty(null, "'0'"); //$NON-NLS-1$ public static final Property[] USER_PROPERTIES = { USER_PICTURE, @@ -126,10 +110,6 @@ public class UpdateAdapter extends CursorAdapter { public static final int TYPE_PROPERTY_INDEX = USER_ACTIVITY_PROPERTIES.length - 1; - private static final String TARGET_LINK_PREFIX = "$link_"; //$NON-NLS-1$ - private static final Pattern TARGET_LINK_PATTERN = Pattern.compile("\\" + TARGET_LINK_PREFIX + "(\\w*)"); //$NON-NLS-1$//$NON-NLS-2$ - private static final String TASK_LINK_TYPE = "task"; //$NON-NLS-1$ - public static final String FROM_TAG_VIEW = "from_tag"; //$NON-NLS-1$ public static final String FROM_TASK_VIEW = "from_task"; //$NON-NLS-1$ public static final String FROM_RECENT_ACTIVITY_VIEW = "from_recent_activity"; //$NON-NLS-1$ @@ -137,7 +117,6 @@ public class UpdateAdapter extends CursorAdapter { private final User self; private final int color; - private final int grayColor; /** * Constructor @@ -171,7 +150,6 @@ public class UpdateAdapter extends CursorAdapter { color = tv.data; fragment.getActivity().getTheme().resolveAttribute(R.attr.asDueDateColor, tv, false); - grayColor = tv.data; } public static User getSelfUser() { @@ -287,10 +265,7 @@ public class UpdateAdapter extends CursorAdapter { // picture if (NameMaps.TABLE_ID_USER_ACTIVITY.equals(type)) { setupUserActivityRow(view, activity, user); - } else if (NameMaps.TABLE_ID_HISTORY.equals(type)) { - setupHistoryRow(view, history, user); } - } private void setupUserActivityRow(View view, UserActivity activity, User user) { @@ -322,23 +297,6 @@ public class UpdateAdapter extends CursorAdapter { } } - private void setupHistoryRow(View view, History history, User user) { - final AsyncImageView commentPictureView = (AsyncImageView)view.findViewById(R.id.comment_picture); - commentPictureView.setVisibility(View.GONE); - - final TextView nameView = (TextView)view.findViewById(R.id.title); { - nameView.setText(getHistoryComment((AstridActivity) fragment.getActivity(), history, user, linkColor, fromView)); - nameView.setTextColor(grayColor); - } - - final TextView date = (TextView)view.findViewById(R.id.date); { - CharSequence dateString = DateUtils.getRelativeTimeSpanString(history.getValue(History.CREATED_AT), - DateUtilities.now(), DateUtils.MINUTE_IN_MILLIS, - DateUtils.FORMAT_ABBREV_RELATIVE); - date.setText(dateString); - } - } - @Override public boolean isEnabled(int position) { return false; @@ -392,390 +350,8 @@ public class UpdateAdapter extends CursorAdapter { } } - public static String linkify (String string, String linkColor) { - return String.format("%s", linkColor, string); //$NON-NLS-1$ - } - public static Spanned getUpdateComment(final AstridActivity context, UserActivity activity, User user, String linkColor, String fromView) { String message = activity.getValue(UserActivity.MESSAGE); return Html.fromHtml(message); } - - public static String getHistoryComment(final AstridActivity context, History history, User user, String linkColor, String fromView) { - boolean hasTask = false; - JSONArray taskAttrs = null; - if (!TextUtils.isEmpty(history.getValue(History.TASK))) { - try { - taskAttrs = new JSONArray(history.getValue(History.TASK)); - hasTask = true; - } catch (JSONException e) { - // - } - } - - String item; - String itemPosessive; - if (FROM_TASK_VIEW.equals(fromView)) { - item = context.getString(R.string.history_this_task); - } else if (hasTask && taskAttrs != null) { - item = taskAttrs.optString(1); - } else { - item = context.getString(R.string.history_this_list); - } - itemPosessive = item + "'s"; - - String oldValue = history.getValue(History.OLD_VALUE); - String newValue = history.getValue(History.NEW_VALUE); - - String result = ""; - String column = history.getValue(History.COLUMN); - try { - if (History.COL_TAG_ADDED.equals(column) || History.COL_TAG_REMOVED.equals(column)) { - JSONArray tagObj = new JSONArray(newValue); - String tagName = tagObj.getString(1); - if (History.COL_TAG_ADDED.equals(column)) { - result = context.getString(R.string.history_tag_added, item, tagName); - } else { - result = context.getString(R.string.history_tag_removed, item, tagName); - } - - } else if (History.COL_ATTACHMENT_ADDED.equals(column) || History.COL_ATTACHMENT_REMOVED.equals(column)) { - JSONArray attachmentArray = new JSONArray(newValue); - String attachmentName = attachmentArray.getString(0); - if (History.COL_ATTACHMENT_ADDED.equals(column)) { - result = context.getString(R.string.history_attach_added, attachmentName, item); - } else { - result = context.getString(R.string.history_attach_removed, attachmentName, item); - } - } else if (History.COL_ACKNOWLEDGED.equals(column)) { - result = context.getString(R.string.history_acknowledged, item); - } else if (History.COL_SHARED_WITH.equals(column) || History.COL_UNSHARED_WITH.equals(column)) { - JSONArray members = new JSONArray(newValue); - String userId = history.getValue(History.USER_UUID); - StringBuilder memberList = new StringBuilder(); - for (int i = 0; i < members.length(); i++) { - JSONObject m = members.getJSONObject(i); - memberList.append(userDisplay(context, userId, m)); - if (i != members.length() - 1) { - memberList.append(", "); - } - } - - if (History.COL_SHARED_WITH.equals(column)) { - result = context.getString(R.string.history_shared_with, item, memberList); - } else { - result = context.getString(R.string.history_unshared_with, item, memberList); - } - } else if (History.COL_MEMBER_ADDED.equals(column) || History.COL_MEMBER_REMOVED.equals(column)) { - JSONObject userValue = new JSONObject(newValue); - if (history.getValue(History.USER_UUID).equals(userValue.optString("id")) && History.COL_MEMBER_REMOVED.equals(column)) { - result = context.getString(R.string.history_left_list, item); - } else { - String userDisplay = userDisplay(context, history.getValue(History.USER_UUID), userValue); - if (History.COL_MEMBER_ADDED.equals(column)) { - result = context.getString(R.string.history_added_user, userDisplay, item); - } else { - result = context.getString(R.string.history_removed_user, userDisplay, item); - } - } - } else if (History.COL_COMPLETED_AT.equals(column)) { - if (!TextUtils.isEmpty(newValue) && !"null".equals(newValue)) { - result = context.getString(R.string.history_completed, item); - } else { - result = context.getString(R.string.history_uncompleted, item); - } - } else if (History.COL_DELETED_AT.equals(column)) { - if (!TextUtils.isEmpty(newValue) && !"null".equals(newValue)) { - result = context.getString(R.string.history_deleted, item); - } else { - result = context.getString(R.string.history_undeleted, item); - } - } else if (History.COL_IMPORTANCE.equals(column)) { - int oldPriority = AndroidUtilities.tryParseInt(oldValue, 0); - int newPriority = AndroidUtilities.tryParseInt(newValue, 0); - - result = context.getString(R.string.history_importance_changed, itemPosessive, priorityString(oldPriority), priorityString(newPriority)); - } else if (History.COL_NOTES_LENGTH.equals(column)) { - int oldLength = AndroidUtilities.tryParseInt(oldValue, 0); - int newLength = AndroidUtilities.tryParseInt(newValue, 0); - - if (oldLength > 0 && newLength > oldLength) { - result = context.getString(R.string.history_added_description_characters, (newLength - oldLength), itemPosessive); - } else if (newLength == 0) { - result = context.getString(R.string.history_removed_description, itemPosessive); - } else if (oldLength > 0 && newLength < oldLength) { - result = context.getString(R.string.history_removed_description_characters, (oldLength - newLength), itemPosessive); - } else if (oldLength > 0 && oldLength == newLength) { - result = context.getString(R.string.history_updated_description, itemPosessive); - } - } else if (History.COL_PUBLIC.equals(column)) { - int value = AndroidUtilities.tryParseInt(newValue, 0); - if (value > 0) { - result = context.getString(R.string.history_made_public, item); - } else { - result = context.getString(R.string.history_made_private, item); - } - } else if (History.COL_DUE.equals(column)) { - if (!TextUtils.isEmpty(oldValue) && !TextUtils.isEmpty(newValue) - && !"null".equals(oldValue) && !"null".equals(newValue)) { - result = context.getString(R.string.history_changed_due_date, itemPosessive, dateString(context, oldValue, newValue), dateString(context, newValue, oldValue)); - } else if (!TextUtils.isEmpty(newValue) && !"null".equals(newValue)) { - result = context.getString(R.string.history_set_due_date, itemPosessive, dateString(context, newValue, DateUtilities.timeToIso8601(DateUtilities.now(), true))); - } else { - result = context.getString(R.string.history_removed_due_date, itemPosessive); - } - } else if (History.COL_REPEAT.equals(column)) { - String repeatString = getRepeatString(context, newValue); - if (!TextUtils.isEmpty(repeatString)) { - result = context.getString(R.string.history_changed_repeat, itemPosessive, repeatString); - } else { - result = context.getString(R.string.history_removed_repeat, itemPosessive); - } - } else if (History.COL_TASK_REPEATED.equals(column)) { - result = context.getString(R.string.history_completed_repeating_task, item, dateString(context, newValue, oldValue)); - } else if (History.COL_TITLE.equals(column)) { - if (!TextUtils.isEmpty(oldValue) && !"null".equals(oldValue)) { - result = context.getString(R.string.history_title_changed, itemPosessive, oldValue, newValue); - } else { - result = context.getString(R.string.history_title_set, itemPosessive, newValue); - } - } else if (History.COL_NAME.equals(column)) { - if (!TextUtils.isEmpty(oldValue) && !"null".equals(oldValue)) { - result = context.getString(R.string.history_name_changed, oldValue, newValue); - } else { - result = context.getString(R.string.history_name_set, newValue); - } - } else if (History.COL_DESCRIPTION.equals(column)) { - if (!TextUtils.isEmpty(oldValue) && !"null".equals(oldValue)) { - result = context.getString(R.string.history_description_changed, oldValue, newValue); - } else { - result = context.getString(R.string.history_description_set, newValue); - } - } else if (History.COL_PICTURE_ID.equals(column) || History.COL_DEFAULT_LIST_IMAGE_ID.equals(column)) { - result = context.getString(R.string.history_changed_list_picture); - } else if (History.COL_IS_SILENT.equals(column)) { - int value = AndroidUtilities.tryParseInt(newValue, 0); - if (value > 0) { - result = context.getString(R.string.history_silenced, item); - } else { - result = context.getString(R.string.history_unsilenced, item); - } - } else if (History.COL_IS_FAVORITE.equals(column)) { - int value = AndroidUtilities.tryParseInt(newValue, 0); - if (value > 0) { - result = context.getString(R.string.history_favorited, item); - } else { - result = context.getString(R.string.history_unfavorited, item); - } - } else if (History.COL_USER_ID.equals(column)) { - String userId = history.getValue(History.USER_UUID); - JSONObject userValue = new JSONObject(newValue); - if (FROM_TAG_VIEW.equals(fromView) && !hasTask) { - if (!TextUtils.isEmpty(oldValue) && !"null".equals(oldValue)) { - result = context.getString(R.string.history_changed_list_owner, userDisplay(context, userId, userValue)); - } else { - result = context.getString(R.string.history_created_this_list); - } - } else if (!TextUtils.isEmpty(oldValue) && !"null".equals(oldValue) && Task.USER_ID_UNASSIGNED.equals(userValue)) { - result = context.getString(R.string.history_unassigned, item); - } else if (Task.USER_ID_UNASSIGNED.equals(oldValue) && userValue.optString("id").equals(ActFmPreferenceService.userId())) { - result = context.getString(R.string.history_claimed, item); - } else if (!TextUtils.isEmpty(oldValue) && !"null".equals(oldValue)) { - result = context.getString(R.string.history_assigned_to, item, userDisplay(context, userId, userValue)); - } else if (!userValue.optString("id").equals(ActFmPreferenceService.userId()) && !Task.USER_ID_UNASSIGNED.equals(userValue.optString("id"))) { - result = context.getString(R.string.history_created_for, item, userDisplay(context, userId, userValue)); - } else { - result = context.getString(R.string.history_created, item); - } - } else { - result = context.getString(R.string.history_default, column, newValue); - } - } catch (Exception e) { - e.printStackTrace(); - result = context.getString(R.string.history_default, column, newValue); - } - - if (TextUtils.isEmpty(result)) { - result = context.getString(R.string.history_default, column, newValue); - } - - String userDisplay; - if (history.getValue(History.USER_UUID).equals(Task.USER_ID_SELF) || history.getValue(History.USER_UUID).equals(ActFmPreferenceService.userId())) { - userDisplay = context.getString(R.string.update_string_user_self); - } else if (user == null) { - userDisplay = context.getString(R.string.ENA_no_user); - } else { - userDisplay = user.getDisplayName(USER_NAME, USER_FIRST_NAME, USER_LAST_NAME); - } - - return userDisplay + " " + result; - } - - private static String dateString(Context context, String value, String other) { - boolean includeYear = (!TextUtils.isEmpty(other) && !value.substring(0, 4).equals(other.substring(0, 4))); - boolean hasTime = DateUtilities.isoStringHasTime(value); - - long time = 0; - try { - time = DateUtilities.parseIso8601(value); - Date date = new Date(time); - String result = DateUtilities.getDateString(context, date, includeYear); - if (hasTime) { - result += ", " + DateUtilities.getTimeString(context, date, false); //$NON-NLS-1$ - } - return result; - } catch (ParseException e) { - return value; - } - - } - - private static final HashMap INTERVAL_LABELS = new HashMap(); - static { - INTERVAL_LABELS.put("DAILY", R.string.repeat_days); //$NON-NLS-1$ - INTERVAL_LABELS.put("WEEKDAYS", R.string.repeat_weekdays); //$NON-NLS-1$ - INTERVAL_LABELS.put("WEEKLY", R.string.repeat_weeks); //$NON-NLS-1$ - INTERVAL_LABELS.put("MONTHLY", R.string.repeat_months); //$NON-NLS-1$ - INTERVAL_LABELS.put("YEARLY", R.string.repeat_years); //$NON-NLS-1$ - INTERVAL_LABELS.put("HOURLY", R.string.repeat_hours); //$NON-NLS-1$ - INTERVAL_LABELS.put("MINUTELY", R.string.repeat_minutes); //$NON-NLS-1$ - } - - private static final String[] SORTED_WEEKDAYS = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" }; - - private static String getRepeatString(Context context, String value) { - if (TextUtils.isEmpty(value) || "null".equals(value)) { - return null; - } - - try { - JSONObject repeat = new JSONObject(value); - boolean weekdays = false; - if (repeat.has("freq")) { - String freq = repeat.getString("freq"); - int interval = repeat.getInt("interval"); - JSONArray byDay = repeat.optJSONArray("byday"); - String[] byDayStrings = null; - if (byDay != null) { - byDayStrings = new String[byDay.length()]; - for (int i = 0; i < byDay.length(); i++) { - byDayStrings[i] = byDay.getString(i); - } - } - String result = ""; - if ("WEEKLY".equals(freq) && byDay != null && byDayStrings != null) { - Arrays.sort(byDayStrings); - StringBuilder daysString = new StringBuilder(); - daysString.append("["); - for (String s : byDayStrings) { - daysString.append("\"").append(s).append("\"").append(","); - } - daysString.deleteCharAt(daysString.length() - 1); - daysString.append("]"); - - if (daysString.toString().equals("[\"FR\",\"MO\",\"TH\",\"TU\",\"WE\"]")) { - result = context.getString(R.string.repeat_weekdays); - weekdays = true; - } - } - - if (!weekdays) { - if (interval == 1) { - result = context.getString(INTERVAL_LABELS.get(freq)); - result = result.substring(0, result.length() - 1); - } else { - result = interval + " " + context.getString(INTERVAL_LABELS.get(freq)); - } - } - - result = context.getString(R.string.history_repeat_every, result); - if ("WEEKLY".equals(freq) && !weekdays && byDay != null && byDay.length() > 0 && byDayStrings != null) { - Arrays.sort(byDayStrings, new Comparator() { - @Override - public int compare(String lhs, String rhs) { - int lhIndex = AndroidUtilities.indexOf(SORTED_WEEKDAYS, lhs); - int rhIndex = AndroidUtilities.indexOf(SORTED_WEEKDAYS, rhs); - if (lhIndex < rhIndex) { - return -1; - } else if (lhIndex > rhIndex) { - return 1; - } else { - return 0; - } - } - }); - - StringBuilder byDayDisplay = new StringBuilder(); - for (String s : byDayStrings) { - byDayDisplay.append(s).append(", "); - } - byDayDisplay.delete(byDayDisplay.length() - 2, byDayDisplay.length()); - - result += (" " + context.getString(R.string.history_repeat_on, byDayDisplay.toString())); - } - - if ("COMPLETION".equals(repeat.optString("from"))) { - result += (" " + context.getString(R.string.history_repeat_from_completion)); - } - - return result; - } else { - return null; - } - } catch (JSONException e) { - return null; - } - } - - private static String userDisplay(Context context, String historyUserId, JSONObject userJson) { - try { - String id = userJson.getString("id"); - String name = userJson.getString("name"); - - if (historyUserId.equals(id) && ActFmPreferenceService.userId().equals(id)) { - return context.getString(R.string.history_yourself); - } else if (ActFmPreferenceService.userId().equals(id)) { - return context.getString(R.string.history_you); - } else if (RemoteModel.isValidUuid(id)) { - return name; - } else { - return context.getString(R.string.history_a_deleted_user); - } - } catch (JSONException e) { - return context.getString(R.string.ENA_no_user).toLowerCase(); - } - } - - private static final String[] PRIORITY_STRINGS = { "!!!", "!!", "!", "o" }; - private static String priorityString(int priority) { - return PRIORITY_STRINGS[priority]; - } - - private static CharSequence getLinkSpan(final AstridActivity activity, UserActivity update, String targetName, String linkColor, String linkType) { - if (TASK_LINK_TYPE.equals(linkType)) { - final String taskId = update.getValue(UserActivity.TARGET_ID); - if (RemoteModel.isValidUuid(taskId)) { - SpannableString taskSpan = new SpannableString(targetName); - taskSpan.setSpan(new ClickableSpan() { - @Override - public void onClick(View widget) { - if (activity != null) // TODO: This shouldn't happen, but sometimes does - { - activity.onTaskListItemClicked(taskId); - } - } - - @Override - public void updateDrawState(TextPaint ds) { - super.updateDrawState(ds); - ds.setUnderlineText(false); - } - }, 0, targetName.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); - return taskSpan; - } else { - return Html.fromHtml(linkify(targetName, linkColor)); - } - } - return null; - } } diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java index 734a7f4c6..bf21cb1dc 100644 --- a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java @@ -14,7 +14,6 @@ import android.graphics.Color; import android.support.v4.app.Fragment; import android.text.Editable; import android.text.Html; -import android.text.SpannableString; import android.text.Spanned; import android.text.TextUtils; import android.text.TextWatcher; @@ -501,27 +500,22 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene long createdAt = 0; String type = null; - if (u != null) { - pictureThumb = u.getPictureUrl(UserActivity.PICTURE, RemoteModel.PICTURE_MEDIUM); - pictureFull = u.getPictureUrl(UserActivity.PICTURE, RemoteModel.PICTURE_LARGE); - if (TextUtils.isEmpty(pictureThumb)) { - commentBitmap = u.getPictureBitmap(UserActivity.PICTURE); - } - title = UpdateAdapter.getUpdateComment(context, u, user, linkColor, UpdateAdapter.FROM_TASK_VIEW); - userImage = ""; //$NON-NLS-1$ - if (user.containsNonNullValue(UpdateAdapter.USER_PICTURE)) { - userImage = user.getPictureUrl(UpdateAdapter.USER_PICTURE, RemoteModel.PICTURE_THUMB); - } - createdAt = u.getValue(UserActivity.CREATED_AT); - type = NameMaps.TABLE_ID_USER_ACTIVITY; - } else { - if (user.containsNonNullValue(UpdateAdapter.USER_PICTURE)) { - userImage = user.getPictureUrl(UpdateAdapter.USER_PICTURE, RemoteModel.PICTURE_THUMB); - } - title = new SpannableString(UpdateAdapter.getHistoryComment(context, history, user, linkColor, UpdateAdapter.FROM_TASK_VIEW)); - createdAt = history.getValue(History.CREATED_AT); - type = NameMaps.TABLE_ID_HISTORY; + if(u == null) { + throw new RuntimeException("UserActivity should never be null"); + } + + pictureThumb = u.getPictureUrl(UserActivity.PICTURE, RemoteModel.PICTURE_MEDIUM); + pictureFull = u.getPictureUrl(UserActivity.PICTURE, RemoteModel.PICTURE_LARGE); + if (TextUtils.isEmpty(pictureThumb)) { + commentBitmap = u.getPictureBitmap(UserActivity.PICTURE); + } + title = UpdateAdapter.getUpdateComment(context, u, user, linkColor, UpdateAdapter.FROM_TASK_VIEW); + userImage = ""; //$NON-NLS-1$ + if (user.containsNonNullValue(UpdateAdapter.USER_PICTURE)) { + userImage = user.getPictureUrl(UpdateAdapter.USER_PICTURE, RemoteModel.PICTURE_THUMB); } + createdAt = u.getValue(UserActivity.CREATED_AT); + type = NameMaps.TABLE_ID_USER_ACTIVITY; return new NoteOrUpdate(userImage, title, @@ -538,12 +532,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene listeners.add(listener); } - public void removeListener(UpdatesChangedListener listener) { - if (listeners.contains(listener)) { - listeners.remove(listener); - } - } - @Override public void timerStarted(Task t) { addComment(String.format("%s %s", //$NON-NLS-1$ diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml index 8e417f4ea..8582f04ad 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/astrid/src/main/res/values-ca/strings.xml @@ -58,7 +58,6 @@ Cancel·la Desfés Prem per establir - Algú Actualitza els comentaris No teniu tasques! \n Voleu afegir alguna cosa? Ordenació i subtasques @@ -313,6 +312,4 @@ Tasques sent cronometrades inici d\'aquesta tasca: finalització d\'aquesta tasca: - \ No newline at end of file diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml index 5ebbed503..fe8be95e1 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/astrid/src/main/res/values-cs/strings.xml @@ -55,7 +55,6 @@ Storno Vrátit změny Klikni pro nastavení - Kdosi Obnovit komentáře Žádné úkoly! Třídit & skryté @@ -435,7 +434,5 @@ Settings: Aktivní časovače pro %s! Úkol je časován - Mluvte pro vytvoření úkolu \ No newline at end of file diff --git a/astrid/src/main/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml index cc125d5b1..da84e1b1f 100644 --- a/astrid/src/main/res/values-da/strings.xml +++ b/astrid/src/main/res/values-da/strings.xml @@ -198,6 +198,4 @@ In Two Weeks Next Month - \ No newline at end of file diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml index b7a07f860..54033e032 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/astrid/src/main/res/values-de/strings.xml @@ -50,7 +50,6 @@ Abbrechen Rückgängig Klicken zur Bestätigung - Irgendjemand Kommentare aktualisieren Sie haben keine Aufgaben! \n Möchten Sie welche hinzufügen? Sortieren @@ -625,13 +624,6 @@ Minute(n) Jahr(e) - Tage - Wochentage - Wochen - Monate - Jahre - Stunden - Minuten Für immer Bestimmter Tag @@ -685,38 +677,6 @@ Aufgabe begonnen: Bearbeitung abgebrochen: Benötigte Zeit: - - %1$s hat kommentiert: %3$s - %1$s in $link_task: %3$s - %1$s in %2$s: %3$s - Sie - Du selbst - Sie - (Ein gelöschter Nutzer) - diese Liste - diese Aufgabe - füge %1$s zu %2$s hinzu - lösche %1$s von %2$s - %s übrig - %s gelöscht - %s wieder hergestellt - %s abgeschlossen - nicht erledigte %s - Name von %1$s nach %2$s geändert - %s freigeben - %s Freigabe widerrufen - %s geschwiegen - Listenbild ändern - %s Beschreibung aktualisiert - hat den Eigentümer der Liste auf %s geändert - hat diese Liste erstellt - haben/hat das Fälligkeitsdatum von %1$s auf %2$s gesetzt. - %1$s wurde zu %2$s hinzugefügt - %1$s wurde aus %2$s entfernt - Jede(n) %s - am %s - nach abschluss Sprechen Sie, um eine Aufgabe anzulegen Sprechen Sie, um einen Auftragsnamen zu vergeben Sprechen Sie, um Aufgabennotizen zu setzen diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index aa61ab080..74625b691 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -56,7 +56,6 @@ Cancelar Deshacer Pulsar para establecer - Alguien Actualizar Comentarios No tienes tareas! \n Quieres agregar alguna? Ordenar @@ -616,13 +615,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n Minuto(s) Año(s) - días - días laborales - semanas - meses - años - horas - minutos Por siempre Día específico @@ -676,25 +668,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n comenzó esta tarea: dejó de hacer esta tarea: Tiempo dedicado: - - %1$s comentó: %3$s - Tú - tú mismo - tú - (un usuario borrado) - esta lista - esta tarea - izquierda %s - borrado %s - recuperado %s - completado %s - incompleto %s - silenciado %s - no asignado %s - reclamado %s - cada %s - en %s Hable para crear una tarea Hable para establecer título de tarea Hable para establecer notas de tarea diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index 19f967bd8..14134bfef 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -54,7 +54,6 @@ Annuler Annuler Action Cliquez pour définir - Quelqu\'un Mettre à jour les commentaires Aucune tâche ! n Voulez vous en créer une ? Trier @@ -638,12 +637,6 @@ Minute(s) Année(s) - jours - Jours de la semaine - Semaines - Mois - Annees - Heures Indéfiniment Jour précis @@ -697,66 +690,6 @@ Cette tâche est commencée : Cette tâche a été arretée : Temps passé : - - %1$s a commenté : %3$s - %1$s sur $link_task: %3$Taw94mwdPH6z9cbs - %1$s sur %2$s: %3$s - Vous - vous-même - vous - (un utilisateur supprimé) - cette liste - cette tâche - %1$s ajouté à %2$s - %1$s supprimé de %2$s - %1$s joint à %2$s - %1$s supprimé de %2$s - %s abandonné - %s supprimé - non supprimé %s - %s complété - non complété %s - la priorité de %1$s a été changée de %2$s à %3$s - la titre de %1$s a été changé de %2$s à %3$s - donner le titre de %1$s à %2$s - la nom a été changé de %1$s à %2$s - nommer %2$s - la description a été changée de %1$s à %2$s - appliquer la description à %2$s - %s est rendu publique - %s est privé - %s est silencieux - %s n\'est pas silencieux - %s est favori - %s n\'est pas favori - changer l\'image de cette liste - les caractères de %1$d ont été ajoutés à la description de %2$s - la description %s a été supprimée - les caractères de %1$d ont été supprimés de la description de %2$s - la description de %s a été mise à jour - la liste des propriétaires à été changée en %s - cette liste a été créée - %s non attribué - %s demandé - %1$s assigné à %2$s - %1$s créé pour %2$s - %s créé - la date d\'échéance de %1$s a été changée de %2$s à %3$s - Définir la date d\'échéance de %1$s à %2$s - date d\'échéance de %s supprimée - %1$s complété (maintenant attendue sur %2$s) - %1$s ajoutée à %2$s - %1$s supprimé de %2$s - %1$s changé, répété sur %2$s - répétition %s supprimée - %1$s partagée avec %2$s - %1$s non partagée avec %2$s - Chaque %s - sur %s - après achèvement - %s vu - %1$s changé en %2$s Parlez pour créer une nouvelle tâche Parlez pour définir un titre Parlez pour définir les notes de la tâche diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml index 8a70a30a2..8024f5290 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/astrid/src/main/res/values-it/strings.xml @@ -54,7 +54,6 @@ Annulla Annulla l\'ultima azione Clicca per Impostare - Qualcuno Aggiorna i commenti Nessuna Attività! Sincronizza Ora @@ -511,8 +510,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Minuto(i) Anno(i) - giorni - minuti Forever Specific Day @@ -564,13 +561,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat inizio attività fine attività Tempo speso: - - %1$s ha commentato: %3$s - Tu - tu - Questa lista - Questa attività Parla per creare un\'attività Parla per aggiungere il titolo Parla per aggiungere le note diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index 5421d3d06..a03f48f1c 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -56,7 +56,6 @@ בטל בטל פעולה אחרונה הקלק כדי לקבוע - מישהו רַעְנֵן הערות אין לך משימות!\n הֲתִּרְצֶה להוסיף משימה? מיון @@ -621,13 +620,6 @@ דקה/דקות שנה/שנים - ימים - ימי עבודה - שבועות - חודשים - שנים - שעות - דקות לנצח תאריך מסויים @@ -681,66 +673,6 @@ התחיל משימה זו: הפסק ביצוע של משימה זו: זמן שהושקע: - - %1$s הוסיף: %3$s - %1$s על $link_task: %3$s - %1$s על %2$s: %3$s - את/אתה - אתה - אתה - (משתמש שנמחק) - רשימה זו - משימה זו - הוסיף את %1$s ל%2$s - הסיר את %1$s מ%2$s - צירף את %1$s ל %2$s - הסיר את %1$s מ %2$s - %s: נותרה - %s: נמחקה - %s: מחיקה בוטלה - %s: בוצעה - %s: לא בוצעה - שינה את העדיפות של %1$s מ %2$s ל %3$s - שינה את הכותרת של %1$s מ %2$s ל %3$s - קבע את הכותרת של %1$s ל %2$s - שינה את השם מ %1$s ל %2$s - קבע את השם ל %2$s - שינה את התיאור מ %1$s ל %2$s - קבע את התיאור ל %2$s - הפך את %s לציבורית - הפך את %s לפרטית - החריש את %s - ביטל את ההחרשה של %s - הפך את %s למועדפת - ביטל את ההעדפה של %s - שינה את התמונה של רשימה זו - הוסיף %1$d תווים לתיאור של %2$s - הסיר את התיאור של %s - הסיר %1$d תווים מהתיאור של %2$s - עדכן את התיאור של %s - שינה את הבעלים של הרשימה ל %s - יצר רשימה זו - ביטל את ההטלה של %s - %s תפס בעלות - הטיל את %1$s על %2$s - יצר את %1$s בעבור %2$s - יצר את %s - שינה את תאריך היעד של %1$s מ- %2$s ל %3$s - קבע %1$s תאריך היעד ל %2$s - הסיר את תאריך היעד של %s - ביצע את %1$s (מועד יעד כעת: %2$s) - הוסיף את %1$s ל %2$s - הסיר את %1$s מ %2$s - שינה את החזרות של %1$s ל %2$s - %s: הוסרו חזרות - שיתף את %1$s עם %2$s - ביטל את השיתוף של %1$s עם %2$s - כל %s - על %s - אחרי ביצוע - הציג את %s - שינה את %1$s ל %2$s דַּבֵּר כדי ליצור משימה דַּבֵּר כדי לקבוע את כותרת המשימה דַּבֵּר כדי לקבוע את ההערות למשימה diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml index beb73fde8..f0a636e18 100644 --- a/astrid/src/main/res/values-ja/strings.xml +++ b/astrid/src/main/res/values-ja/strings.xml @@ -343,8 +343,6 @@ Minute(s) Year(s) - 日々 - 分 期限から 完了日から @@ -357,10 +355,4 @@ リスト 変更されませんでした Settings: - - あなた - あなた - このリスト - このタスク \ No newline at end of file diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index e297a9871..051d99e70 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -59,7 +59,6 @@ 취소 실행 취소 누르세요 - 누군가 댓글 새로고침 일정이 없네요!\n추가할까요? 정렬 @@ -652,13 +651,6 @@ 분마다 년마다 - 일 - 주중 - 주 - 달 - 년 - 시 - 분 영원히 특정일 @@ -712,66 +704,6 @@ 이 일정 시작: 이 일정 중지: 소요 시간: - - %1$s의 댓글: %3$s - $link_task 의 %1$s: %3$s - %2$s의 %1$s: %3$s - 당신 - 스스로 - 당신 - (삭제한 사용자) - 이 목록 - 이 일정 - %1$s 를 %2$s 에 추가함 - %1$s 을 %2$s 에서 제거함 - %1$s 을 %2$s 에 첨부함 - %1$s 을 %2$s 에서 제거함 - %s 를 탈퇴함 - %s 을 삭제함 - %s 를 복구함 - %s 를 완료함 - %s 를 미완료 - 우선순위 %1$s 를 %2$s 에서 %3$s 로 변경함 - 제목 %1$s 를 %2$s 에서 %3$s 로 변경함 - 제목 %1$s 를 %2$s 로 설정함 - 이름을 %1$s 에서 %2$s 로 변경함 - 이름을 %2$s 로 설정하기 - 설명을 %1$s 에서 %2$s 로 변경함 - 설명을 %2$s 로 설정함 - %s 를 공개합니다 - %s 를 비공개합니다 - %s 를 침묵시켰습니다 - %s 의 침묵을 해제했습니다 - %s 를 즐겨찾기 했습니다 - %s 의 즐겨찾기를 해제했습니다 - 이 목록의 사진을 변경하기 - %1$d 문자를 %2$s 설명에 추가했습니다 - %s 설명을 삭제했습니다 - %1$d 문자를 %2$s 설명에서 삭제했습니다 - %s 설명을 업데이트 했습니다 - 목록 소유자를 %s 로 변경했습니다 - 이 목록을 만들었습니다 - 미할당 %s - %s 를 요구했습니다 - %1$s 를 %2$s 로 할당함 - %2$s 에 대해 %1$s 을 만들었습니다 - %s 를 만들었습니다 - %1$s 마감일 변경: %2$s -> %3$s - %1$s 마감일 설정: %2$s - %s 마감일을 삭제했습니다 - %1$s 를 완료했습니다 (이제 %2$s 까지) - %1$s 를 %2$s 에 추가했습니다 - %1$s 를 %2$s 에서 삭제했습니다 - %1$s 반복을 %2$s 으로 변경했습니다 - %s 반복을 삭제했습니다 - %1$s 를 %2$s 님과 공유했습니다 - %1$s 를 %2$s 님과 공유를 중단했습니다 - 매 %s - : %s - 완료 후 - %s 를 열람했습니다 - %1$s 를 %2$s 로 변경했습니다 일정을 만들려면 말하세요 일정 제목을 말하세요 일정의 내용을 말하세요 diff --git a/astrid/src/main/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml index 3a1bcd22a..f4dbbfd47 100644 --- a/astrid/src/main/res/values-nb/strings.xml +++ b/astrid/src/main/res/values-nb/strings.xml @@ -214,8 +214,6 @@ Settings: Tidtaker aktiv for %s! Oppgaver med tidtaker - Snakk for å skape en oppgave Snakk for å sette tittelen til oppgaven Snakk for å sette oppgavenotater diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index a4d5a60e1..bbe230d17 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -54,7 +54,6 @@ Annuleren Ongedaan Maken Klikken om in te stellen - Iemand Opmerkingen vernieuwen U heeft geen taken! \n Taak toevoegen? Sorteren @@ -637,13 +636,6 @@ Minu(u)t(en) Ja(a)r(en) - dagen - weekdagen - weken - maanden - jaren - uren - minuten Altijd Specifieke dag @@ -697,66 +689,6 @@ taak begonnen: taak gestopt: Gebruikte tijd: - - %1$s heeft gereageerd: %3$s - %1$s op $link_task: %3$s - %1$s op %2$s: %3$s - Jij - jijzelf - jij - (een verwijderde gebruiker) - deze lijst - deze taak - %1$s toegevoegd aan %2$s - %1$s verwijderd van %2$s - %1$s bijgevoegd aan %2$s - %1$s verwijderd van %2$s - resterend %s - verwijderd %s - herstelde %s - voltooid %s - onvoltooid %s - prioriteit %1$s veranderd van %2$s naar %3$s - %1$s titel veranderd van %2$s naar %3$s - %1$s tiltel ingesteld op %2$s - naam van %1$s veranderd in %2$s - naam ingesteld op %2$s - omschrijving %1$s veranderd in %2$s - omschrijving ingesteld op %2$s - %s openbaar gemaakt - %s prive gemaakt - %s gedempt - %s niet langer gedempt - %s gemarkeerd als favoriet - %s verwijderd als favoriet - veranderd de afbeelding van deze lijst - %1$d tekens toegevoegd aan de omschrijving van %2$s - omschrijving van %s verwijderd - %1$d tekens van de omschrijving van %2$s verwijderd - omschrijving van %s bijgewerkt - lijst eigenaar van %s bijgewerkt - deze lijst aangemaakt - niet toegewezen %s - %s geclaimed - %1$s toegewezen aan %2$s - %1$s aangemaakt voor %2$s - %s aangemaakt - einddatum %1$s veranderd van %2$s naar %3$s - %1$s einddatum ingesteld op %2$s - einddatum %s verwijderd - voltooid %1$s (verloopt nu op %2$s) - %1$s toegevoegd aan %2$s - %1$s verwijderd van %2$s - herhaling van %1$s gewijzigd in %2$s - herhaling van %s verwijderd - %1$s gedeeld met %2$s - %1$s niet langer gedeeld met %2$s - elke %s - op %s - na voltooing - %s bekeken - %1$s veranderd in %2$s Spreek om taak te maken Spreek titel van taak in Spreek notities van taak in diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index 1dc45ae46..1e2683da5 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -52,7 +52,6 @@ Anuluj Cofnij Kliknij, aby ustawić - Ktoś Odśwież komentarze Brak zadań! Sortowanie @@ -624,13 +623,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g Minut(a/y) Year(s) - dni - dni robocze - tygodnie - miesiące - lata - godziny - minuty Zawsze Konkretny dzień @@ -685,48 +677,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g rozpoczęto zadanie: zakończono zadanie: Czas spędzony: - - %1$s skomentował: %3$s - Ty - Ty - (usunięty użytkownik) - tej listy - to zadanie - dodano %1$s do %2$s - usunięto %s - przywrócono %s - ukończono %s - cofnięto ukończenie %s - zmieniono priorytet %1$s z %2$s na %3$s - zmieniono tytuł %1$s z %2$s na %3$s - ustawiono tytuł %1$s na %2$s - zmień nazwę z %1$s na %2$s - zmień opis z %1$s na %2$s - zmieniono %s na publiczne - zmieniono %s na prywatne - wyciszono %s - cofnięto wyciszenie %s - dodano %s do ulubionych - usunięto %s z ulubionych - Zmień obrazek tej listy - usunięto opis %s - uaktualniono opis %s - zmieniono właściciela listy na %s - utworzono tę listę - nieprzypisane %s - przypisano %1$s do %2$s - utworzono %s - zmieniono termin %1$s z %2$s na %3$s - ustawiono termin %1$s na %2$s - usunięto termin z %s - ukończono %1$s (nowy termin to %2$s) - dodano %1$s do %2$s - usunięto %1$s z %2$s - usunięto powtarzanie %s - Co %s - po ukończeniu - zmieniono %1$s na %2$s Mów by utworzyć zadanie Mów by ustawić tytuł zadania Mów by ustawić notatkę zadania diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml index a91d4321a..eb612145f 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/astrid/src/main/res/values-pt-rBR/strings.xml @@ -54,7 +54,6 @@ Cancelar Desfazer Toque para definir - Alguém Atualizar comentários Você não tem tarefas! \n Deseja inserir alguma? Ordenar @@ -538,8 +537,6 @@ Minuto(s) Ano(s) - dias - minutos Para sempre Dia Específico @@ -592,13 +589,6 @@ iniciou a tarefa parou a tarefa: Tempo gasto: - - %1$s : %3$s - Você - você - esta lista - esta tarefa Fale para criar uma tarefa Fale para completar o título Fale para completar as notas da tarefa diff --git a/astrid/src/main/res/values-pt/strings.xml b/astrid/src/main/res/values-pt/strings.xml index 205cba033..ead2bc36c 100644 --- a/astrid/src/main/res/values-pt/strings.xml +++ b/astrid/src/main/res/values-pt/strings.xml @@ -154,6 +154,4 @@ Tasks might not let you know when your tasks are due.\n Listas Listas Settings: - \ No newline at end of file diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index b229314a2..329693927 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -55,7 +55,6 @@ Отмена Отмена Нажмите для установки - Кто-нибудь Обновить комментарии Нет задач! \n Добавить? Сортировка @@ -620,13 +619,6 @@ Минута(ы) Лет (Года) - дни - Дни недели - недели - месяцы - годы - часы - минуты Всегда Определённый день @@ -681,35 +673,6 @@ задача началась: зада завершилась: Времени потрачено: - - %1$s прокомментировал(а): %3$s - Вы - себя - Вы - (удаленный пользователь) - этот список - это задание - добавлен %1$s в %2$s - удален %1$s из %2$s - удален %1$s из %2$s - осталось %s - удалено %s - востановлено %s - выполнено %s - не выполнено %s - изменил %1$s приоритет с %2$s на %3$s - установил %1$s заголовок %2$s - изменил имя с %1$s на %2$s - сделано %s частными - изменить изображение этого листа - создал этот список - не назначенный %s - заявлен %s - создано %s - каждый %s - после завершения - просмотрен %s Говорите чтобы создать задачу Произнесите название задачи Произнесите заметки задачи diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml index 175e429bc..51662d15a 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/astrid/src/main/res/values-sv/strings.xml @@ -51,7 +51,6 @@ Avbryt Ångra Klicka för att ställa - Någon Uppdatera kommentarer Du har inga uppgifter!\n Vill du lägga till någonting? Sortera @@ -559,7 +558,6 @@ och återställer dina aktuella uppgifter från en backup Minut(er) År - dagar Repetera tills... Fortsätt @@ -601,9 +599,6 @@ och återställer dina aktuella uppgifter från en backup påbörjade uppgiften: slutade arbeta med uppgiften: Nedlagt tid: - - %1$s kommenterade: %3$s Prata för att skapa uppgift Prata för att sätta uppgiftens titel Prata för att sätta uppgiftens anteckningar diff --git a/astrid/src/main/res/values-th/strings.xml b/astrid/src/main/res/values-th/strings.xml index e8368e308..a035b4ee3 100644 --- a/astrid/src/main/res/values-th/strings.xml +++ b/astrid/src/main/res/values-th/strings.xml @@ -141,6 +141,4 @@ Tasks might not let you know when your tasks are due.\n Next Month Settings: - \ No newline at end of file diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml index c69ed292f..25460f1fa 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/astrid/src/main/res/values-tr/strings.xml @@ -53,7 +53,6 @@ Vazgeç Geri al Ayar İçin Dokun - Herhangi biri Yorumları Yenile Hiç göreviniz yok! \n Bir şeyler eklemek nasıl olur? Şimdi Eşle @@ -618,19 +617,6 @@ başlanan görev: bu görevden vazgeç: Harcanan zaman: - - %1$s şunu yorumladı: %3$s - kendiniz - siz - silinmiş kullanıcı - bu liste - bu görev - kaldı %s - silindi %s - silinmemiş %s - tamamlandı %s - tamamlanmamış %s Yeni görev için konuş Görev başlığı için konuş Görev notları için konuş diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml index 1d362c752..f02a2e5eb 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/astrid/src/main/res/values-uk/strings.xml @@ -59,7 +59,6 @@ Відміна Відмінити Натисніть для установки - Хтось Оновити коментарі У Вас немає завдань! \n Бажаєте щось додати? Сортувати @@ -539,13 +538,6 @@ хв. р. - днів - Дні тижня - тижнів - Місяці - Роки - \"год.\" - \"хв.\" Forever Specific Day @@ -589,17 +581,6 @@ Список %1$s був видалений, разом з %2$d завданнями Для %s діють таймери! Таймер - - (видалений користувач) - видалено %s - відновлено %s - створив цей список - створено %1$s для %2$s - створено %s - змінена %1$s дата закінчення з %2$s на %3$s - встановлена %1$s дата закінчення до %2$s - видалена %s дата закінчення Горовіть щоб створити завдання Голосове введення не встановлено. \n Хочете перейти на Market і встановити? Голосове введення diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml index d2ae93533..2daa93774 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/astrid/src/main/res/values-zh-rCN/strings.xml @@ -56,7 +56,6 @@ 取消 撤消 点选 - 某人 刷新留言 你没有任务 立即同步 @@ -605,10 +604,6 @@ 已经开始了这项任务： 已经停止了这项任务： 已经花费时间： - - %1$s 发表道：%3$s - 您 请说话以建立任务 请说话以设定任务主旨 请说话以设定任务备注 diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml index 383422b2e..0aa09f1a2 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/astrid/src/main/res/values-zh-rTW/strings.xml @@ -56,7 +56,6 @@ 取消 撤消 點選 - 某人 刷新留言 無工作! 立即同步 @@ -627,10 +626,6 @@ 已經開始了這項任務工作： 已經停止了這項任務工作： 已經花費時間： - - %1$s 發表道：%3$s - 您 請說話以建立工作 請說話以設定工作主旨 請說話以設定工作備註 diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index c3ee4b452..6a362a0d8 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -51,9 +51,6 @@ - - Someone - Refresh Comments diff --git a/astrid/src/main/res/values/strings-repeat.xml b/astrid/src/main/res/values/strings-repeat.xml index 3e702af17..cce1affc3 100644 --- a/astrid/src/main/res/values/strings-repeat.xml +++ b/astrid/src/main/res/values/strings-repeat.xml @@ -42,15 +42,7 @@ Minute(s) Year(s) - - days - weekdays - weeks - months - years - hours - minutes - + Forever Specific Day diff --git a/astrid/src/main/res/values/strings-updates.xml b/astrid/src/main/res/values/strings-updates.xml deleted file mode 100644 index a8ed9cfe3..000000000 --- a/astrid/src/main/res/values/strings-updates.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - You - - yourself - you - (a deleted user) - - this list - this task - added %1$s to %2$s - removed %1$s from %2$s - attached %1$s to %2$s - removed %1$s from %2$s - left %s - deleted %s - undeleted %s - completed %s - uncompleted %s - changed %1$s priority from %2$s to %3$s - changed %1$s title from %2$s to %3$s - set %1$s title to %2$s - changed name from %1$s to %2$s - set name to %2$s - changed description from %1$s to %2$s - set description to %2$s - made %s public - made %s private - silenced %s - unsilenced %s - favorited %s - unfavorited %s - change this list\'s picture - added %1$d characters to %2$s description - removed %s description - removed %1$d characters from %2$s description - updated %s description - changed list owner to %s - created this list - unassigned %s - claimed %s - assigned %1$s to %2$s - created %1$s for %2$s - created %s - changed %1$s due date from %2$s to %3$s - set %1$s due date to %2$s - removed %s due date - completed %1$s (now due on %2$s) - added %1$s to %2$s - removed %1$s from %2$s - changed %1$s repeat to %2$s - removed %s repeat - shared %1$s with %2$s - unshared %1$s with %2$s - every %s - on %s - after completion - viewed %s - - changed %1$s to %2$s -