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("<font color=%s>%s</font>", 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<String, Integer> INTERVAL_LABELS = new HashMap<String, Integer>();
-    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<String>() {
-                        @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 @@
 	<string name="DLG_cancel">Cancel·la</string>
 	<string name="DLG_undo">Desfés</string>
 	<string name="WID_dateButtonUnset">Prem per establir</string>
-	<string name="ENA_no_user">Algú</string>
 	<string name="ENA_refresh_comments">Actualitza els comentaris</string>
 	<string name="TLA_no_items">No teniu tasques! \n Voleu afegir alguna cosa?</string>
 	<string name="TLA_menu_sort">Ordenació i subtasques</string>
@@ -313,6 +312,4 @@
 	<string name="TFE_workingOn">Tasques sent cronometrades</string>
 	<string name="TEA_timer_comment_started">inici d\'aquesta tasca:</string>
 	<string name="TEA_timer_comment_stopped">finalització d\'aquesta tasca:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
 </resources>
\ 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 @@
 	<string name="DLG_cancel">Storno</string>
 	<string name="DLG_undo">Vrátit změny</string>
 	<string name="WID_dateButtonUnset">Klikni pro nastavení</string>
-	<string name="ENA_no_user">Kdosi</string>
 	<string name="ENA_refresh_comments">Obnovit komentáře</string>
 	<string name="TLA_no_items">Žádné úkoly!</string>
 	<string name="TLA_menu_sort">Třídit &amp; skryté</string>
@@ -435,7 +434,5 @@
 	<string name="tag_settings_title">Settings:</string>
 	<string name="TPl_notification">Aktivní časovače pro %s!</string>
 	<string name="TFE_workingOn">Úkol je časován</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
 	<string name="voice_create_prompt">Mluvte pro vytvoření úkolu</string>
 </resources>
\ 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 @@
 		<item>In Two Weeks</item>
 		<item>Next Month</item>
 	</string-array>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
 </resources>
\ 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 @@
 	<string name="DLG_cancel">Abbrechen</string>
 	<string name="DLG_undo">Rückgängig</string>
 	<string name="WID_dateButtonUnset">Klicken zur Bestätigung</string>
-	<string name="ENA_no_user">Irgendjemand</string>
 	<string name="ENA_refresh_comments">Kommentare aktualisieren</string>
 	<string name="TLA_no_items">Sie haben keine Aufgaben! \n Möchten Sie welche hinzufügen?</string>
 	<string name="TLA_menu_sort">Sortieren</string>
@@ -625,13 +624,6 @@
 		<item>Minute(n)</item>
 		<item>Jahr(e)</item>
 	</string-array>
-	<string name="repeat_days">Tage</string>
-	<string name="repeat_weekdays">Wochentage</string>
-	<string name="repeat_weeks">Wochen</string>
-	<string name="repeat_months">Monate</string>
-	<string name="repeat_years">Jahre</string>
-	<string name="repeat_hours">Stunden</string>
-	<string name="repeat_minutes">Minuten</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>Für immer</item>
 		<item>Bestimmter Tag</item>
@@ -685,38 +677,6 @@
 	<string name="TEA_timer_comment_started">Aufgabe begonnen:</string>
 	<string name="TEA_timer_comment_stopped">Bearbeitung abgebrochen:</string>
 	<string name="TEA_timer_comment_spent">Benötigte Zeit:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s hat kommentiert: %3$s</string>
-	<string name="update_string_task_comment">%1$s in $link_task: %3$s</string>
-	<string name="update_string_tag_comment">%1$s in %2$s: %3$s</string>
-	<string name="update_string_user_self">Sie</string>
-	<string name="history_yourself">Du selbst</string>
-	<string name="history_you">Sie</string>
-	<string name="history_a_deleted_user">(Ein gelöschter Nutzer)</string>
-	<string name="history_this_list">diese Liste</string>
-	<string name="history_this_task">diese Aufgabe</string>
-	<string name="history_tag_added">füge %1$s zu %2$s hinzu</string>
-	<string name="history_tag_removed">lösche %1$s von %2$s</string>
-	<string name="history_left_list">%s übrig</string>
-	<string name="history_deleted">%s gelöscht</string>
-	<string name="history_undeleted">%s wieder hergestellt</string>
-	<string name="history_completed">%s abgeschlossen</string>
-	<string name="history_uncompleted">nicht erledigte %s</string>
-	<string name="history_name_changed">Name von %1$s nach %2$s geändert</string>
-	<string name="history_made_public">%s freigeben</string>
-	<string name="history_made_private">%s Freigabe widerrufen</string>
-	<string name="history_silenced">%s geschwiegen</string>
-	<string name="history_changed_list_picture">Listenbild ändern</string>
-	<string name="history_updated_description">%s Beschreibung aktualisiert</string>
-	<string name="history_changed_list_owner">hat den Eigentümer der Liste auf %s geändert</string>
-	<string name="history_created_this_list">hat diese Liste erstellt</string>
-	<string name="history_set_due_date">haben/hat das Fälligkeitsdatum von %1$s auf %2$s gesetzt.</string>
-	<string name="history_added_user">%1$s wurde zu %2$s hinzugefügt</string>
-	<string name="history_removed_user">%1$s wurde aus %2$s entfernt</string>
-	<string name="history_repeat_every">Jede(n) %s</string>
-	<string name="history_repeat_on">am %s</string>
-	<string name="history_repeat_from_completion">nach abschluss</string>
 	<string name="voice_create_prompt">Sprechen Sie, um eine Aufgabe anzulegen</string>
 	<string name="voice_edit_title_prompt">Sprechen Sie, um einen Auftragsnamen zu vergeben</string>
 	<string name="voice_edit_note_prompt">Sprechen Sie, um Aufgabennotizen zu setzen</string>
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 @@
 	<string name="DLG_cancel">Cancelar</string>
 	<string name="DLG_undo">Deshacer</string>
 	<string name="WID_dateButtonUnset">Pulsar para establecer</string>
-	<string name="ENA_no_user">Alguien</string>
 	<string name="ENA_refresh_comments">Actualizar Comentarios</string>
 	<string name="TLA_no_items">No tienes tareas! \n Quieres agregar alguna?</string>
 	<string name="TLA_menu_sort">Ordenar</string>
@@ -616,13 +615,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n</string>
 		<item>Minuto(s)</item>
 		<item>Año(s)</item>
 	</string-array>
-	<string name="repeat_days">días</string>
-	<string name="repeat_weekdays">días laborales</string>
-	<string name="repeat_weeks">semanas</string>
-	<string name="repeat_months">meses</string>
-	<string name="repeat_years">años</string>
-	<string name="repeat_hours">horas</string>
-	<string name="repeat_minutes">minutos</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>Por siempre</item>
 		<item>Día específico</item>
@@ -676,25 +668,6 @@ Tasks podría no avisarle cuanto venza una tarea.\n</string>
 	<string name="TEA_timer_comment_started">comenzó esta tarea:</string>
 	<string name="TEA_timer_comment_stopped">dejó de hacer esta tarea:</string>
 	<string name="TEA_timer_comment_spent">Tiempo dedicado:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s comentó: %3$s</string>
-	<string name="update_string_user_self">Tú</string>
-	<string name="history_yourself">tú mismo</string>
-	<string name="history_you">tú</string>
-	<string name="history_a_deleted_user">(un usuario borrado)</string>
-	<string name="history_this_list">esta lista</string>
-	<string name="history_this_task">esta tarea</string>
-	<string name="history_left_list">izquierda %s</string>
-	<string name="history_deleted">borrado %s</string>
-	<string name="history_undeleted">recuperado %s</string>
-	<string name="history_completed">completado %s</string>
-	<string name="history_uncompleted">incompleto %s</string>
-	<string name="history_silenced">silenciado %s</string>
-	<string name="history_unassigned">no asignado %s</string>
-	<string name="history_claimed">reclamado %s</string>
-	<string name="history_repeat_every">cada %s</string>
-	<string name="history_repeat_on">en %s</string>
 	<string name="voice_create_prompt">Hable para crear una tarea</string>
 	<string name="voice_edit_title_prompt">Hable para establecer título de tarea</string>
 	<string name="voice_edit_note_prompt">Hable para establecer notas de tarea</string>
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 @@
 	<string name="DLG_cancel">Annuler</string>
 	<string name="DLG_undo">Annuler Action</string>
 	<string name="WID_dateButtonUnset">Cliquez pour définir</string>
-	<string name="ENA_no_user">Quelqu\'un</string>
 	<string name="ENA_refresh_comments">Mettre à jour les commentaires</string>
 	<string name="TLA_no_items">Aucune tâche ! n Voulez vous en créer une ?</string>
 	<string name="TLA_menu_sort">Trier</string>
@@ -638,12 +637,6 @@
 		<item>Minute(s)</item>
 		<item>Année(s)</item>
 	</string-array>
-	<string name="repeat_days">jours</string>
-	<string name="repeat_weekdays">Jours de la semaine</string>
-	<string name="repeat_weeks">Semaines</string>
-	<string name="repeat_months">Mois</string>
-	<string name="repeat_years">Annees</string>
-	<string name="repeat_hours">Heures</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>Indéfiniment</item>
 		<item>Jour précis</item>
@@ -697,66 +690,6 @@
 	<string name="TEA_timer_comment_started">Cette tâche est commencée :</string>
 	<string name="TEA_timer_comment_stopped">Cette tâche a été arretée :</string>
 	<string name="TEA_timer_comment_spent">Temps passé :</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s a commenté : %3$s</string>
-	<string name="update_string_task_comment">%1$s sur $link_task: %3$Taw94mwdPH6z9cbs</string>
-	<string name="update_string_tag_comment">%1$s sur %2$s: %3$s</string>
-	<string name="update_string_user_self">Vous</string>
-	<string name="history_yourself">vous-même</string>
-	<string name="history_you">vous</string>
-	<string name="history_a_deleted_user">(un utilisateur supprimé)</string>
-	<string name="history_this_list">cette liste</string>
-	<string name="history_this_task">cette tâche</string>
-	<string name="history_tag_added">%1$s ajouté à %2$s</string>
-	<string name="history_tag_removed">%1$s supprimé de %2$s</string>
-	<string name="history_attach_added">%1$s joint à %2$s</string>
-	<string name="history_attach_removed">%1$s supprimé de %2$s</string>
-	<string name="history_left_list">%s abandonné</string>
-	<string name="history_deleted">%s supprimé</string>
-	<string name="history_undeleted">non supprimé %s</string>
-	<string name="history_completed">%s complété</string>
-	<string name="history_uncompleted">non complété %s</string>
-	<string name="history_importance_changed">la priorité de %1$s a été changée de %2$s à %3$s</string>
-	<string name="history_title_changed">la titre de %1$s a été changé de %2$s à %3$s</string>
-	<string name="history_title_set">donner le titre de %1$s à %2$s </string>
-	<string name="history_name_changed">la nom a été changé de %1$s à %2$s</string>
-	<string name="history_name_set">nommer  %2$s</string>
-	<string name="history_description_changed">la description a été changée de %1$s à %2$s</string>
-	<string name="history_description_set">appliquer la description à %2$s</string>
-	<string name="history_made_public">%s est rendu publique</string>
-	<string name="history_made_private">%s est privé</string>
-	<string name="history_silenced">%s est silencieux</string>
-	<string name="history_unsilenced">%s n\'est pas silencieux</string>
-	<string name="history_favorited">%s est favori</string>
-	<string name="history_unfavorited">%s n\'est pas favori</string>
-	<string name="history_changed_list_picture">changer l\'image de cette liste</string>
-	<string name="history_added_description_characters">les caractères de %1$d ont été ajoutés à la description de %2$s</string>
-	<string name="history_removed_description">la description %s a été supprimée</string>
-	<string name="history_removed_description_characters">les caractères de %1$d ont été supprimés de la description de %2$s</string>
-	<string name="history_updated_description">la description de %s a été mise à jour</string>
-	<string name="history_changed_list_owner">la liste des propriétaires à été changée en %s</string>
-	<string name="history_created_this_list">cette liste a été créée</string>
-	<string name="history_unassigned">%s non attribué</string>
-	<string name="history_claimed">%s demandé</string>
-	<string name="history_assigned_to">%1$s assigné à %2$s</string>
-	<string name="history_created_for">%1$s créé pour %2$s</string>
-	<string name="history_created">%s créé</string>
-	<string name="history_changed_due_date">la date d\'échéance de %1$s a été changée de %2$s à %3$s</string>
-	<string name="history_set_due_date">Définir la date d\'échéance de %1$s à %2$s</string>
-	<string name="history_removed_due_date">date d\'échéance de %s supprimée</string>
-	<string name="history_completed_repeating_task">%1$s complété (maintenant attendue sur %2$s)</string>
-	<string name="history_added_user">%1$s ajoutée à %2$s</string>
-	<string name="history_removed_user">%1$s supprimé de %2$s</string>
-	<string name="history_changed_repeat">%1$s changé, répété sur %2$s</string>
-	<string name="history_removed_repeat">répétition %s supprimée</string>
-	<string name="history_shared_with">%1$s partagée avec %2$s</string>
-	<string name="history_unshared_with">%1$s non partagée avec %2$s</string>
-	<string name="history_repeat_every">Chaque %s</string>
-	<string name="history_repeat_on">sur %s</string>
-	<string name="history_repeat_from_completion">après achèvement</string>
-	<string name="history_acknowledged">%s vu</string>
-	<string name="history_default">%1$s changé en %2$s</string>
 	<string name="voice_create_prompt">Parlez pour créer une nouvelle tâche</string>
 	<string name="voice_edit_title_prompt">Parlez pour définir un titre</string>
 	<string name="voice_edit_note_prompt">Parlez pour définir les notes de la tâche</string>
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 @@
 	<string name="DLG_cancel">Annulla</string>
 	<string name="DLG_undo">Annulla l\'ultima azione</string>
 	<string name="WID_dateButtonUnset">Clicca per Impostare</string>
-	<string name="ENA_no_user">Qualcuno</string>
 	<string name="ENA_refresh_comments">Aggiorna i commenti</string>
 	<string name="TLA_no_items">Nessuna Attività!</string>
 	<string name="TLA_menu_sync">Sincronizza Ora</string>
@@ -511,8 +510,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
 		<item>Minuto(i)</item>
 		<item>Anno(i)</item>
 	</string-array>
-	<string name="repeat_days">giorni</string>
-	<string name="repeat_minutes">minuti</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>Forever</item>
 		<item>Specific Day</item>
@@ -564,13 +561,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
 	<string name="TEA_timer_comment_started">inizio attività</string>
 	<string name="TEA_timer_comment_stopped">fine attività</string>
 	<string name="TEA_timer_comment_spent">Tempo speso:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s ha commentato: %3$s</string>
-	<string name="update_string_user_self">Tu</string>
-	<string name="history_you">tu</string>
-	<string name="history_this_list">Questa lista</string>
-	<string name="history_this_task">Questa attività</string>
 	<string name="voice_create_prompt">Parla per creare un\'attività</string>
 	<string name="voice_edit_title_prompt">Parla per aggiungere il titolo</string>
 	<string name="voice_edit_note_prompt">Parla per aggiungere le note</string>
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 @@
 	<string name="DLG_cancel">בטל</string>
 	<string name="DLG_undo">בטל פעולה אחרונה</string>
 	<string name="WID_dateButtonUnset">הקלק כדי לקבוע</string>
-	<string name="ENA_no_user">מישהו</string>
 	<string name="ENA_refresh_comments">רַעְנֵן הערות</string>
 	<string name="TLA_no_items">אין לך משימות!\n הֲתִּרְצֶה להוסיף משימה?</string>
 	<string name="TLA_menu_sort">מיון</string>
@@ -621,13 +620,6 @@
 		<item>דקה/דקות</item>
 		<item>שנה/שנים</item>
 	</string-array>
-	<string name="repeat_days">ימים</string>
-	<string name="repeat_weekdays">ימי עבודה</string>
-	<string name="repeat_weeks">שבועות</string>
-	<string name="repeat_months">חודשים</string>
-	<string name="repeat_years">שנים</string>
-	<string name="repeat_hours">שעות</string>
-	<string name="repeat_minutes">דקות</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>לנצח</item>
 		<item>תאריך מסויים</item>
@@ -681,66 +673,6 @@
 	<string name="TEA_timer_comment_started">התחיל משימה זו:</string>
 	<string name="TEA_timer_comment_stopped">הפסק ביצוע של משימה זו:</string>
 	<string name="TEA_timer_comment_spent">זמן שהושקע:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s הוסיף: %3$s</string>
-	<string name="update_string_task_comment">%1$s על $link_task: %3$s</string>
-	<string name="update_string_tag_comment">%1$s על %2$s: %3$s</string>
-	<string name="update_string_user_self">את/אתה</string>
-	<string name="history_yourself">אתה</string>
-	<string name="history_you">אתה</string>
-	<string name="history_a_deleted_user">(משתמש שנמחק)</string>
-	<string name="history_this_list">רשימה זו</string>
-	<string name="history_this_task">משימה זו</string>
-	<string name="history_tag_added">הוסיף את  %1$s ל%2$s</string>
-	<string name="history_tag_removed">הסיר את %1$s מ%2$s</string>
-	<string name="history_attach_added">צירף את %1$s ל %2$s</string>
-	<string name="history_attach_removed">הסיר את %1$s מ %2$s</string>
-	<string name="history_left_list">%s: נותרה</string>
-	<string name="history_deleted">%s: נמחקה</string>
-	<string name="history_undeleted">%s: מחיקה בוטלה</string>
-	<string name="history_completed">%s: בוצעה</string>
-	<string name="history_uncompleted">%s: לא בוצעה</string>
-	<string name="history_importance_changed">שינה את העדיפות של %1$s מ %2$s   ל %3$s</string>
-	<string name="history_title_changed">שינה את הכותרת של  %1$s מ   %2$s ל %3$s </string>
-	<string name="history_title_set">קבע את הכותרת של  %1$s ל %2$s</string>
-	<string name="history_name_changed">שינה את השם מ  %1$s  ל  %2$s</string>
-	<string name="history_name_set">קבע את השם ל %2$s</string>
-	<string name="history_description_changed">שינה את התיאור מ %1$s ל %2$s</string>
-	<string name="history_description_set">קבע את התיאור ל %2$s</string>
-	<string name="history_made_public">הפך את %s לציבורית</string>
-	<string name="history_made_private">הפך את %s לפרטית</string>
-	<string name="history_silenced">החריש את %s</string>
-	<string name="history_unsilenced">ביטל את ההחרשה של %s</string>
-	<string name="history_favorited">הפך את  %s למועדפת</string>
-	<string name="history_unfavorited">ביטל את ההעדפה של %s</string>
-	<string name="history_changed_list_picture">שינה את התמונה של רשימה זו</string>
-	<string name="history_added_description_characters">הוסיף %1$d תווים לתיאור של  %2$s </string>
-	<string name="history_removed_description">הסיר את התיאור של %s</string>
-	<string name="history_removed_description_characters">הסיר %1$d תווים מהתיאור של %2$s</string>
-	<string name="history_updated_description">עדכן את התיאור של %s</string>
-	<string name="history_changed_list_owner">שינה את הבעלים של הרשימה ל %s</string>
-	<string name="history_created_this_list">יצר רשימה זו</string>
-	<string name="history_unassigned">ביטל את ההטלה של %s</string>
-	<string name="history_claimed">%s תפס בעלות</string>
-	<string name="history_assigned_to">הטיל את %1$s על %2$s</string>
-	<string name="history_created_for">יצר את %1$s בעבור %2$s</string>
-	<string name="history_created">יצר את %s</string>
-	<string name="history_changed_due_date">שינה את תאריך היעד של  %1$s מ- %2$s ל %3$s</string>
-	<string name="history_set_due_date">קבע %1$s תאריך היעד ל %2$s</string>
-	<string name="history_removed_due_date">הסיר את תאריך היעד של %s</string>
-	<string name="history_completed_repeating_task">ביצע את %1$s (מועד יעד כעת: %2$s)</string>
-	<string name="history_added_user">הוסיף את %1$s ל %2$s</string>
-	<string name="history_removed_user">הסיר את %1$s מ %2$s</string>
-	<string name="history_changed_repeat">שינה את החזרות של %1$s ל %2$s</string>
-	<string name="history_removed_repeat">%s: הוסרו חזרות</string>
-	<string name="history_shared_with">שיתף את %1$s עם %2$s</string>
-	<string name="history_unshared_with">ביטל את השיתוף של %1$s עם %2$s</string>
-	<string name="history_repeat_every">כל %s</string>
-	<string name="history_repeat_on">על %s</string>
-	<string name="history_repeat_from_completion">אחרי ביצוע</string>
-	<string name="history_acknowledged">הציג את %s</string>
-	<string name="history_default">שינה את %1$s ל %2$s</string>
 	<string name="voice_create_prompt">דַּבֵּר כדי ליצור משימה</string>
 	<string name="voice_edit_title_prompt">דַּבֵּר כדי לקבוע את כותרת המשימה</string>
 	<string name="voice_edit_note_prompt">דַּבֵּר כדי לקבוע את ההערות למשימה</string>
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 @@
 		<item>Minute(s)</item>
 		<item>Year(s)</item>
 	</string-array>
-	<string name="repeat_days">日々</string>
-	<string name="repeat_minutes">分</string>
 	<string-array name="repeat_type">
 		<item>期限から</item>
 		<item>完了日から</item>
@@ -357,10 +355,4 @@
 	<string name="tag_FEx_header">リスト</string>
 	<string name="TEA_no_tags_modified">変更されませんでした</string>
 	<string name="tag_settings_title">Settings:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_user_self">あなた</string>
-	<string name="history_you">あなた</string>
-	<string name="history_this_list">このリスト</string>
-	<string name="history_this_task">このタスク</string>
 </resources>
\ 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 @@
 	<string name="DLG_cancel">취소</string>
 	<string name="DLG_undo">실행 취소</string>
 	<string name="WID_dateButtonUnset">누르세요</string>
-	<string name="ENA_no_user">누군가</string>
 	<string name="ENA_refresh_comments">댓글 새로고침</string>
 	<string name="TLA_no_items">일정이 없네요!\n추가할까요?</string>
 	<string name="TLA_menu_sort">정렬</string>
@@ -652,13 +651,6 @@
 		<item>분마다</item>
 		<item>년마다</item>
 	</string-array>
-	<string name="repeat_days">일</string>
-	<string name="repeat_weekdays">주중</string>
-	<string name="repeat_weeks">주</string>
-	<string name="repeat_months">달</string>
-	<string name="repeat_years">년</string>
-	<string name="repeat_hours">시</string>
-	<string name="repeat_minutes">분</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>영원히</item>
 		<item>특정일</item>
@@ -712,66 +704,6 @@
 	<string name="TEA_timer_comment_started">이 일정 시작:</string>
 	<string name="TEA_timer_comment_stopped">이 일정 중지:</string>
 	<string name="TEA_timer_comment_spent">소요 시간:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s의 댓글: %3$s</string>
-	<string name="update_string_task_comment">$link_task 의 %1$s: %3$s</string>
-	<string name="update_string_tag_comment">%2$s의 %1$s: %3$s</string>
-	<string name="update_string_user_self">당신</string>
-	<string name="history_yourself">스스로</string>
-	<string name="history_you">당신</string>
-	<string name="history_a_deleted_user">(삭제한 사용자)</string>
-	<string name="history_this_list">이 목록</string>
-	<string name="history_this_task">이 일정</string>
-	<string name="history_tag_added">%1$s 를 %2$s 에 추가함</string>
-	<string name="history_tag_removed">%1$s 을 %2$s 에서 제거함</string>
-	<string name="history_attach_added">%1$s 을 %2$s 에 첨부함</string>
-	<string name="history_attach_removed">%1$s 을 %2$s 에서 제거함</string>
-	<string name="history_left_list">%s 를 탈퇴함</string>
-	<string name="history_deleted">%s 을 삭제함</string>
-	<string name="history_undeleted">%s 를 복구함</string>
-	<string name="history_completed">%s 를 완료함</string>
-	<string name="history_uncompleted">%s 를 미완료</string>
-	<string name="history_importance_changed">우선순위 %1$s 를 %2$s 에서 %3$s 로 변경함</string>
-	<string name="history_title_changed">제목 %1$s 를 %2$s 에서 %3$s 로 변경함</string>
-	<string name="history_title_set">제목 %1$s 를 %2$s 로 설정함</string>
-	<string name="history_name_changed">이름을 %1$s 에서 %2$s 로 변경함</string>
-	<string name="history_name_set">이름을 %2$s 로 설정하기</string>
-	<string name="history_description_changed">설명을 %1$s 에서 %2$s 로 변경함</string>
-	<string name="history_description_set">설명을 %2$s 로 설정함</string>
-	<string name="history_made_public">%s 를 공개합니다</string>
-	<string name="history_made_private">%s 를 비공개합니다</string>
-	<string name="history_silenced">%s 를 침묵시켰습니다</string>
-	<string name="history_unsilenced">%s 의 침묵을 해제했습니다</string>
-	<string name="history_favorited">%s 를 즐겨찾기 했습니다</string>
-	<string name="history_unfavorited">%s 의 즐겨찾기를 해제했습니다</string>
-	<string name="history_changed_list_picture">이 목록의 사진을 변경하기</string>
-	<string name="history_added_description_characters">%1$d 문자를 %2$s 설명에 추가했습니다</string>
-	<string name="history_removed_description">%s 설명을 삭제했습니다</string>
-	<string name="history_removed_description_characters">%1$d 문자를 %2$s 설명에서 삭제했습니다</string>
-	<string name="history_updated_description">%s 설명을 업데이트 했습니다</string>
-	<string name="history_changed_list_owner">목록 소유자를  %s 로 변경했습니다</string>
-	<string name="history_created_this_list">이 목록을 만들었습니다</string>
-	<string name="history_unassigned">미할당 %s</string>
-	<string name="history_claimed">%s 를 요구했습니다</string>
-	<string name="history_assigned_to">%1$s 를 %2$s 로 할당함</string>
-	<string name="history_created_for">%2$s 에 대해 %1$s 을 만들었습니다</string>
-	<string name="history_created">%s 를 만들었습니다</string>
-	<string name="history_changed_due_date">%1$s 마감일 변경: %2$s -&gt; %3$s</string>
-	<string name="history_set_due_date">%1$s 마감일 설정: %2$s</string>
-	<string name="history_removed_due_date">%s 마감일을 삭제했습니다</string>
-	<string name="history_completed_repeating_task">%1$s 를 완료했습니다 (이제 %2$s 까지)</string>
-	<string name="history_added_user">%1$s 를 %2$s 에 추가했습니다</string>
-	<string name="history_removed_user">%1$s 를 %2$s 에서 삭제했습니다</string>
-	<string name="history_changed_repeat">%1$s 반복을 %2$s 으로 변경했습니다</string>
-	<string name="history_removed_repeat">%s 반복을 삭제했습니다</string>
-	<string name="history_shared_with">%1$s 를 %2$s 님과 공유했습니다</string>
-	<string name="history_unshared_with">%1$s 를 %2$s 님과 공유를 중단했습니다</string>
-	<string name="history_repeat_every">매 %s</string>
-	<string name="history_repeat_on">: %s</string>
-	<string name="history_repeat_from_completion">완료 후</string>
-	<string name="history_acknowledged">%s 를 열람했습니다</string>
-	<string name="history_default">%1$s 를 %2$s 로 변경했습니다</string>
 	<string name="voice_create_prompt">일정을 만들려면 말하세요</string>
 	<string name="voice_edit_title_prompt">일정 제목을 말하세요</string>
 	<string name="voice_edit_note_prompt">일정의 내용을 말하세요</string>
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 @@
 	<string name="tag_settings_title">Settings:</string>
 	<string name="TPl_notification">Tidtaker aktiv for %s!</string>
 	<string name="TFE_workingOn">Oppgaver med tidtaker</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
 	<string name="voice_create_prompt">Snakk for å skape en oppgave</string>
 	<string name="voice_edit_title_prompt">Snakk for å sette tittelen til oppgaven</string>
 	<string name="voice_edit_note_prompt">Snakk for å sette oppgavenotater</string>
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 @@
 	<string name="DLG_cancel">Annuleren</string>
 	<string name="DLG_undo">Ongedaan Maken</string>
 	<string name="WID_dateButtonUnset">Klikken om in te stellen</string>
-	<string name="ENA_no_user">Iemand</string>
 	<string name="ENA_refresh_comments">Opmerkingen vernieuwen</string>
 	<string name="TLA_no_items">U heeft geen taken! \n Taak toevoegen?</string>
 	<string name="TLA_menu_sort">Sorteren</string>
@@ -637,13 +636,6 @@
 		<item>Minu(u)t(en)</item>
 		<item>Ja(a)r(en)</item>
 	</string-array>
-	<string name="repeat_days">dagen </string>
-	<string name="repeat_weekdays">weekdagen</string>
-	<string name="repeat_weeks">weken</string>
-	<string name="repeat_months">maanden</string>
-	<string name="repeat_years">jaren</string>
-	<string name="repeat_hours">uren</string>
-	<string name="repeat_minutes">minuten</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>Altijd</item>
 		<item>Specifieke dag</item>
@@ -697,66 +689,6 @@
 	<string name="TEA_timer_comment_started">taak begonnen:</string>
 	<string name="TEA_timer_comment_stopped">taak gestopt:</string>
 	<string name="TEA_timer_comment_spent">Gebruikte tijd:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s heeft gereageerd: %3$s</string>
-	<string name="update_string_task_comment">%1$s op $link_task: %3$s</string>
-	<string name="update_string_tag_comment">%1$s op %2$s: %3$s</string>
-	<string name="update_string_user_self">Jij</string>
-	<string name="history_yourself">jijzelf</string>
-	<string name="history_you">jij</string>
-	<string name="history_a_deleted_user">(een verwijderde gebruiker)</string>
-	<string name="history_this_list">deze lijst</string>
-	<string name="history_this_task">deze taak</string>
-	<string name="history_tag_added">%1$s toegevoegd aan %2$s</string>
-	<string name="history_tag_removed">%1$s verwijderd van %2$s</string>
-	<string name="history_attach_added">%1$s bijgevoegd aan %2$s</string>
-	<string name="history_attach_removed">%1$s verwijderd van %2$s</string>
-	<string name="history_left_list">resterend %s</string>
-	<string name="history_deleted">verwijderd %s</string>
-	<string name="history_undeleted">herstelde %s</string>
-	<string name="history_completed">voltooid %s</string>
-	<string name="history_uncompleted">onvoltooid %s</string>
-	<string name="history_importance_changed">prioriteit %1$s veranderd van %2$s naar %3$s</string>
-	<string name="history_title_changed">%1$s titel veranderd van %2$s naar %3$s</string>
-	<string name="history_title_set">%1$s tiltel ingesteld op %2$s</string>
-	<string name="history_name_changed">naam van %1$s veranderd in %2$s</string>
-	<string name="history_name_set">naam ingesteld op %2$s</string>
-	<string name="history_description_changed">omschrijving %1$s veranderd in %2$s</string>
-	<string name="history_description_set">omschrijving ingesteld op %2$s</string>
-	<string name="history_made_public">%s openbaar gemaakt</string>
-	<string name="history_made_private">%s prive gemaakt</string>
-	<string name="history_silenced">%s gedempt</string>
-	<string name="history_unsilenced">%s niet langer gedempt</string>
-	<string name="history_favorited">%s gemarkeerd als favoriet</string>
-	<string name="history_unfavorited">%s verwijderd als favoriet</string>
-	<string name="history_changed_list_picture">veranderd de afbeelding van deze lijst</string>
-	<string name="history_added_description_characters">%1$d tekens toegevoegd aan de omschrijving van %2$s</string>
-	<string name="history_removed_description">omschrijving van %s verwijderd</string>
-	<string name="history_removed_description_characters">%1$d tekens van de omschrijving van %2$s verwijderd</string>
-	<string name="history_updated_description">omschrijving van %s bijgewerkt</string>
-	<string name="history_changed_list_owner">lijst eigenaar van %s bijgewerkt</string>
-	<string name="history_created_this_list">deze lijst aangemaakt</string>
-	<string name="history_unassigned">niet toegewezen %s</string>
-	<string name="history_claimed">%s geclaimed</string>
-	<string name="history_assigned_to">%1$s toegewezen aan %2$s</string>
-	<string name="history_created_for">%1$s aangemaakt voor %2$s</string>
-	<string name="history_created">%s aangemaakt</string>
-	<string name="history_changed_due_date">einddatum %1$s veranderd van %2$s naar %3$s</string>
-	<string name="history_set_due_date">%1$s einddatum ingesteld op %2$s</string>
-	<string name="history_removed_due_date">einddatum %s verwijderd</string>
-	<string name="history_completed_repeating_task">voltooid %1$s (verloopt nu op %2$s)</string>
-	<string name="history_added_user">%1$s toegevoegd aan %2$s</string>
-	<string name="history_removed_user">%1$s verwijderd van %2$s</string>
-	<string name="history_changed_repeat">herhaling van %1$s gewijzigd in %2$s</string>
-	<string name="history_removed_repeat">herhaling van %s verwijderd</string>
-	<string name="history_shared_with">%1$s gedeeld met %2$s</string>
-	<string name="history_unshared_with">%1$s niet langer gedeeld met %2$s</string>
-	<string name="history_repeat_every">elke %s</string>
-	<string name="history_repeat_on">op %s</string>
-	<string name="history_repeat_from_completion">na voltooing</string>
-	<string name="history_acknowledged">%s bekeken</string>
-	<string name="history_default">%1$s veranderd in %2$s</string>
 	<string name="voice_create_prompt">Spreek om taak te maken</string>
 	<string name="voice_edit_title_prompt">Spreek titel van taak in</string>
 	<string name="voice_edit_note_prompt">Spreek notities van taak in</string>
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 @@
 	<string name="DLG_cancel">Anuluj</string>
 	<string name="DLG_undo">Cofnij</string>
 	<string name="WID_dateButtonUnset">Kliknij, aby ustawić</string>
-	<string name="ENA_no_user">Ktoś</string>
 	<string name="ENA_refresh_comments">Odśwież komentarze</string>
 	<string name="TLA_no_items">Brak zadań!</string>
 	<string name="TLA_menu_sort">Sortowanie</string>
@@ -624,13 +623,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
 		<item>Minut(a/y)</item>
 		<item>Year(s)</item>
 	</string-array>
-	<string name="repeat_days">dni</string>
-	<string name="repeat_weekdays">dni robocze</string>
-	<string name="repeat_weeks">tygodnie</string>
-	<string name="repeat_months">miesiące</string>
-	<string name="repeat_years">lata</string>
-	<string name="repeat_hours">godziny</string>
-	<string name="repeat_minutes">minuty</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>Zawsze</item>
 		<item>Konkretny dzień</item>
@@ -685,48 +677,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
 	<string name="TEA_timer_comment_started">rozpoczęto zadanie:</string>
 	<string name="TEA_timer_comment_stopped">zakończono zadanie:</string>
 	<string name="TEA_timer_comment_spent">Czas spędzony:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s skomentował: %3$s</string>
-	<string name="update_string_user_self">Ty</string>
-	<string name="history_you">Ty</string>
-	<string name="history_a_deleted_user">(usunięty użytkownik)</string>
-	<string name="history_this_list">tej listy</string>
-	<string name="history_this_task">to zadanie</string>
-	<string name="history_tag_added">dodano %1$s do %2$s</string>
-	<string name="history_deleted">usunięto %s</string>
-	<string name="history_undeleted">przywrócono %s</string>
-	<string name="history_completed">ukończono %s</string>
-	<string name="history_uncompleted">cofnięto ukończenie %s</string>
-	<string name="history_importance_changed">zmieniono priorytet %1$s z %2$s na %3$s</string>
-	<string name="history_title_changed">zmieniono tytuł %1$s z %2$s na %3$s</string>
-	<string name="history_title_set">ustawiono tytuł %1$s na %2$s</string>
-	<string name="history_name_changed">zmień nazwę z %1$s na %2$s</string>
-	<string name="history_description_changed">zmień opis z %1$s na %2$s</string>
-	<string name="history_made_public">zmieniono %s na publiczne</string>
-	<string name="history_made_private">zmieniono %s na prywatne</string>
-	<string name="history_silenced">wyciszono %s</string>
-	<string name="history_unsilenced">cofnięto wyciszenie %s</string>
-	<string name="history_favorited">dodano %s do ulubionych</string>
-	<string name="history_unfavorited">usunięto %s z ulubionych</string>
-	<string name="history_changed_list_picture">Zmień obrazek tej listy</string>
-	<string name="history_removed_description">usunięto opis %s</string>
-	<string name="history_updated_description">uaktualniono opis %s</string>
-	<string name="history_changed_list_owner">zmieniono właściciela listy na %s</string>
-	<string name="history_created_this_list">utworzono tę listę</string>
-	<string name="history_unassigned">nieprzypisane %s</string>
-	<string name="history_assigned_to">przypisano %1$s do %2$s</string>
-	<string name="history_created">utworzono %s</string>
-	<string name="history_changed_due_date">zmieniono termin %1$s z %2$s na %3$s</string>
-	<string name="history_set_due_date">ustawiono termin %1$s na %2$s</string>
-	<string name="history_removed_due_date">usunięto termin z %s</string>
-	<string name="history_completed_repeating_task">ukończono %1$s (nowy termin to %2$s)</string>
-	<string name="history_added_user">dodano %1$s do %2$s</string>
-	<string name="history_removed_user">usunięto %1$s z %2$s</string>
-	<string name="history_removed_repeat">usunięto powtarzanie %s</string>
-	<string name="history_repeat_every">Co %s</string>
-	<string name="history_repeat_from_completion">po ukończeniu</string>
-	<string name="history_default">zmieniono %1$s na %2$s</string>
 	<string name="voice_create_prompt">Mów by utworzyć zadanie</string>
 	<string name="voice_edit_title_prompt">Mów by ustawić tytuł zadania</string>
 	<string name="voice_edit_note_prompt">Mów by ustawić notatkę zadania</string>
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 @@
 	<string name="DLG_cancel">Cancelar</string>
 	<string name="DLG_undo">Desfazer</string>
 	<string name="WID_dateButtonUnset">Toque para definir</string>
-	<string name="ENA_no_user">Alguém</string>
 	<string name="ENA_refresh_comments">Atualizar comentários</string>
 	<string name="TLA_no_items">Você não tem tarefas! \n Deseja inserir alguma?</string>
 	<string name="TLA_menu_sort">Ordenar</string>
@@ -538,8 +537,6 @@
 		<item>Minuto(s)</item>
 		<item>Ano(s)</item>
 	</string-array>
-	<string name="repeat_days">dias</string>
-	<string name="repeat_minutes">minutos</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>Para sempre</item>
 		<item>Dia Específico</item>
@@ -592,13 +589,6 @@
 	<string name="TEA_timer_comment_started">iniciou a tarefa</string>
 	<string name="TEA_timer_comment_stopped">parou a tarefa:</string>
 	<string name="TEA_timer_comment_spent">Tempo gasto:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s : %3$s</string>
-	<string name="update_string_user_self">Você</string>
-	<string name="history_you">você</string>
-	<string name="history_this_list">esta lista</string>
-	<string name="history_this_task">esta tarefa</string>
 	<string name="voice_create_prompt">Fale para criar uma tarefa</string>
 	<string name="voice_edit_title_prompt">Fale para completar o título</string>
 	<string name="voice_edit_note_prompt">Fale para completar as notas da tarefa</string>
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</string>
 	<string name="TEA_tags_label">Listas</string>
 	<string name="tag_FEx_header">Listas</string>
 	<string name="tag_settings_title">Settings:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
 </resources>
\ 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 @@
 	<string name="DLG_cancel">Отмена</string>
 	<string name="DLG_undo">Отмена</string>
 	<string name="WID_dateButtonUnset">Нажмите для установки</string>
-	<string name="ENA_no_user">Кто-нибудь</string>
 	<string name="ENA_refresh_comments">Обновить комментарии</string>
 	<string name="TLA_no_items">Нет задач! \n Добавить?</string>
 	<string name="TLA_menu_sort">Сортировка</string>
@@ -620,13 +619,6 @@
 		<item>Минута(ы)</item>
 		<item>Лет (Года)</item>
 	</string-array>
-	<string name="repeat_days">дни</string>
-	<string name="repeat_weekdays">Дни недели</string>
-	<string name="repeat_weeks">недели</string>
-	<string name="repeat_months">месяцы</string>
-	<string name="repeat_years">годы</string>
-	<string name="repeat_hours">часы</string>
-	<string name="repeat_minutes">минуты</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>Всегда</item>
 		<item>Определённый день</item>
@@ -681,35 +673,6 @@
 	<string name="TEA_timer_comment_started">задача началась:</string>
 	<string name="TEA_timer_comment_stopped">зада завершилась:</string>
 	<string name="TEA_timer_comment_spent">Времени потрачено:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s прокомментировал(а): %3$s</string>
-	<string name="update_string_user_self">Вы</string>
-	<string name="history_yourself">себя</string>
-	<string name="history_you">Вы</string>
-	<string name="history_a_deleted_user">(удаленный пользователь)</string>
-	<string name="history_this_list">этот список</string>
-	<string name="history_this_task">это задание</string>
-	<string name="history_tag_added">добавлен %1$s  в  %2$s</string>
-	<string name="history_tag_removed">удален %1$s из %2$s</string>
-	<string name="history_attach_removed">удален %1$s из %2$s</string>
-	<string name="history_left_list">осталось %s</string>
-	<string name="history_deleted">удалено %s</string>
-	<string name="history_undeleted">востановлено %s</string>
-	<string name="history_completed">выполнено %s</string>
-	<string name="history_uncompleted">не выполнено %s</string>
-	<string name="history_importance_changed">изменил %1$s приоритет с  %2$s на %3$s</string>
-	<string name="history_title_set">установил %1$s заголовок %2$s</string>
-	<string name="history_name_changed">изменил имя с %1$s на %2$s</string>
-	<string name="history_made_private">сделано %s частными</string>
-	<string name="history_changed_list_picture">изменить изображение этого листа</string>
-	<string name="history_created_this_list">создал этот список</string>
-	<string name="history_unassigned">не назначенный %s</string>
-	<string name="history_claimed">заявлен %s</string>
-	<string name="history_created">создано %s</string>
-	<string name="history_repeat_every">каждый %s</string>
-	<string name="history_repeat_from_completion">после завершения</string>
-	<string name="history_acknowledged">просмотрен %s</string>
 	<string name="voice_create_prompt">Говорите чтобы создать задачу</string>
 	<string name="voice_edit_title_prompt">Произнесите название задачи</string>
 	<string name="voice_edit_note_prompt">Произнесите заметки задачи</string>
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 @@
 	<string name="DLG_cancel">Avbryt</string>
 	<string name="DLG_undo">Ångra</string>
 	<string name="WID_dateButtonUnset">Klicka för att ställa</string>
-	<string name="ENA_no_user">Någon</string>
 	<string name="ENA_refresh_comments">Uppdatera kommentarer</string>
 	<string name="TLA_no_items">Du har inga uppgifter!\n Vill du lägga till någonting?</string>
 	<string name="TLA_menu_sort">Sortera</string>
@@ -559,7 +558,6 @@ och återställer dina aktuella uppgifter från en backup
 		<item>Minut(er)</item>
 		<item>År</item>
 	</string-array>
-	<string name="repeat_days">dagar</string>
 	<string name="repeat_until_title">Repetera tills...</string>
 	<string name="repeat_keep_going">Fortsätt</string>
 	<string-array name="repeat_type">
@@ -601,9 +599,6 @@ och återställer dina aktuella uppgifter från en backup
 	<string name="TEA_timer_comment_started">påbörjade uppgiften:</string>
 	<string name="TEA_timer_comment_stopped">slutade arbeta med uppgiften:</string>
 	<string name="TEA_timer_comment_spent">Nedlagt tid:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s kommenterade: %3$s</string>
 	<string name="voice_create_prompt">Prata för att skapa uppgift</string>
 	<string name="voice_edit_title_prompt">Prata för att sätta uppgiftens titel</string>
 	<string name="voice_edit_note_prompt">Prata för att sätta uppgiftens anteckningar</string>
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</string>
 		<item>Next Month</item>
 	</string-array>
 	<string name="tag_settings_title">Settings:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
 </resources>
\ 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 @@
 	<string name="DLG_cancel">Vazgeç</string>
 	<string name="DLG_undo">Geri al</string>
 	<string name="WID_dateButtonUnset">Ayar İçin Dokun</string>
-	<string name="ENA_no_user">Herhangi biri</string>
 	<string name="ENA_refresh_comments">Yorumları Yenile</string>
 	<string name="TLA_no_items">Hiç göreviniz yok! \n Bir şeyler eklemek nasıl olur?</string>
 	<string name="TLA_menu_sync">Şimdi Eşle</string>
@@ -618,19 +617,6 @@
 	<string name="TEA_timer_comment_started">başlanan görev:</string>
 	<string name="TEA_timer_comment_stopped">bu görevden vazgeç:</string>
 	<string name="TEA_timer_comment_spent">Harcanan zaman:</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s şunu yorumladı: %3$s</string>
-	<string name="history_yourself">kendiniz</string>
-	<string name="history_you">siz</string>
-	<string name="history_a_deleted_user">silinmiş kullanıcı</string>
-	<string name="history_this_list">bu liste</string>
-	<string name="history_this_task">bu görev</string>
-	<string name="history_left_list">kaldı %s</string>
-	<string name="history_deleted">silindi %s</string>
-	<string name="history_undeleted">silinmemiş %s</string>
-	<string name="history_completed">tamamlandı %s</string>
-	<string name="history_uncompleted">tamamlanmamış %s</string>
 	<string name="voice_create_prompt">Yeni görev için konuş</string>
 	<string name="voice_edit_title_prompt">Görev başlığı için konuş</string>
 	<string name="voice_edit_note_prompt">Görev notları için konuş</string>
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 @@
 	<string name="DLG_cancel">Відміна</string>
 	<string name="DLG_undo">Відмінити</string>
 	<string name="WID_dateButtonUnset">Натисніть для установки</string>
-	<string name="ENA_no_user">Хтось</string>
 	<string name="ENA_refresh_comments">Оновити коментарі</string>
 	<string name="TLA_no_items">У Вас немає завдань! \n Бажаєте щось додати?</string>
 	<string name="TLA_menu_sort">Сортувати</string>
@@ -539,13 +538,6 @@
 		<item>хв.</item>
 		<item>р.</item>
 	</string-array>
-	<string name="repeat_days">днів</string>
-	<string name="repeat_weekdays">Дні тижня</string>
-	<string name="repeat_weeks">тижнів</string>
-	<string name="repeat_months">Місяці</string>
-	<string name="repeat_years">Роки</string>
-	<string name="repeat_hours">\"год.\"</string>
-	<string name="repeat_minutes">\"хв.\"</string>
 	<string-array name="repeat_until_shortcuts">
 		<item>Forever</item>
 		<item>Specific Day</item>
@@ -589,17 +581,6 @@
 	<string name="TEA_tags_deleted">Список %1$s був видалений, разом з %2$d завданнями</string>
 	<string name="TPl_notification">Для %s діють таймери!</string>
 	<string name="TEA_timer_controls">Таймер</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="history_a_deleted_user">(видалений користувач)</string>
-	<string name="history_deleted">видалено %s</string>
-	<string name="history_undeleted">відновлено %s</string>
-	<string name="history_created_this_list">створив цей список</string>
-	<string name="history_created_for">створено %1$s для %2$s</string>
-	<string name="history_created">створено %s</string>
-	<string name="history_changed_due_date">змінена %1$s дата закінчення з %2$s на %3$s</string>
-	<string name="history_set_due_date">встановлена %1$s дата закінчення до %2$s</string>
-	<string name="history_removed_due_date">видалена %s дата закінчення</string>
 	<string name="voice_create_prompt">Горовіть щоб створити завдання</string>
 	<string name="EPr_voiceInputInstall_dlg">Голосове введення не встановлено. \n Хочете перейти на Market і встановити?</string>
 	<string name="EPr_voiceInputEnabled_title">Голосове введення</string>
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 @@
 	<string name="DLG_cancel">取消</string>
 	<string name="DLG_undo">撤消</string>
 	<string name="WID_dateButtonUnset">点选</string>
-	<string name="ENA_no_user">某人</string>
 	<string name="ENA_refresh_comments">刷新留言</string>
 	<string name="TLA_no_items">你没有任务</string>
 	<string name="TLA_menu_sync">立即同步</string>
@@ -605,10 +604,6 @@
 	<string name="TEA_timer_comment_started">已经开始了这项任务：</string>
 	<string name="TEA_timer_comment_stopped">已经停止了这项任务：</string>
 	<string name="TEA_timer_comment_spent">已经花费时间：</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s 发表道：%3$s</string>
-	<string name="history_you">您</string>
 	<string name="voice_create_prompt">请说话以建立任务</string>
 	<string name="voice_edit_title_prompt">请说话以设定任务主旨</string>
 	<string name="voice_edit_note_prompt">请说话以设定任务备注</string>
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 @@
 	<string name="DLG_cancel">取消</string>
 	<string name="DLG_undo">撤消</string>
 	<string name="WID_dateButtonUnset">點選</string>
-	<string name="ENA_no_user">某人</string>
 	<string name="ENA_refresh_comments">刷新留言</string>
 	<string name="TLA_no_items">無工作!</string>
 	<string name="TLA_menu_sync">立即同步</string>
@@ -627,10 +626,6 @@
 	<string name="TEA_timer_comment_started">已經開始了這項任務工作：</string>
 	<string name="TEA_timer_comment_stopped">已經停止了這項任務工作：</string>
 	<string name="TEA_timer_comment_spent">已經花費時間：</string>
-	<!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-	<string name="update_string_default_comment">%1$s 發表道：%3$s</string>
-	<string name="history_you">您</string>
 	<string name="voice_create_prompt">請說話以建立工作</string>
 	<string name="voice_edit_title_prompt">請說話以設定工作主旨</string>
 	<string name="voice_edit_note_prompt">請說話以設定工作備註</string>
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 @@
   
   <!--  ============================================================= notes -->
   
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Someone</string>
-  
   <!-- EditNoteActivity - refresh comments -->
   <string name="ENA_refresh_comments">Refresh Comments</string>
   
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 @@
     <item>Minute(s)</item>
     <item>Year(s)</item>
   </string-array>
-  
-  <string name="repeat_days">days</string>
-  <string name="repeat_weekdays">weekdays</string>
-  <string name="repeat_weeks">weeks</string>
-  <string name="repeat_months">months</string>
-  <string name="repeat_years">years</string>
-  <string name="repeat_hours">hours</string>
-  <string name="repeat_minutes">minutes</string>
-  
+
   <string-array name="repeat_until_shortcuts">
       <item>Forever</item>
       <item>Specific Day</item>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
-    <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
-    Please do not translate this part of the string. -->
-    
-    <!-- These are still in use -->
-    <string name="update_string_user_self">You</string>
-    
-    <string name="history_yourself">yourself</string>
-    <string name="history_you">you</string>
-    <string name="history_a_deleted_user">(a deleted user)</string>
-    
-    <string name="history_this_list">this list</string>
-    <string name="history_this_task">this task</string>
-    <string name="history_tag_added">added %1$s to %2$s</string>
-    <string name="history_tag_removed">removed %1$s from %2$s</string>
-    <string name="history_attach_added">attached %1$s to %2$s</string>
-    <string name="history_attach_removed">removed %1$s from %2$s</string>
-    <string name="history_left_list">left %s</string>
-    <string name="history_deleted">deleted %s</string>
-    <string name="history_undeleted">undeleted %s</string>
-    <string name="history_completed">completed %s</string>
-    <string name="history_uncompleted">uncompleted %s</string>
-    <string name="history_importance_changed">changed %1$s priority from %2$s to %3$s</string>
-    <string name="history_title_changed">changed %1$s title from %2$s to %3$s</string>
-    <string name="history_title_set">set %1$s title to %2$s</string>
-    <string name="history_name_changed">changed name from %1$s to %2$s</string>
-    <string name="history_name_set">set name to %2$s</string>
-    <string name="history_description_changed">changed description from %1$s to %2$s</string>
-    <string name="history_description_set">set description to %2$s</string>
-    <string name="history_made_public">made %s public</string>
-    <string name="history_made_private">made %s private</string>
-    <string name="history_silenced">silenced %s</string>
-    <string name="history_unsilenced">unsilenced %s</string>
-    <string name="history_favorited">favorited %s</string>
-    <string name="history_unfavorited">unfavorited %s</string>
-    <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
-    <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
-    <string name="history_updated_description">updated %s description</string>
-    <string name="history_changed_list_owner">changed list owner to %s</string>
-    <string name="history_created_this_list">created this list</string>
-    <string name="history_unassigned">unassigned %s</string>
-    <string name="history_claimed">claimed %s</string>
-    <string name="history_assigned_to">assigned %1$s to %2$s</string>
-    <string name="history_created_for">created %1$s for %2$s</string>
-    <string name="history_created">created %s</string>
-    <string name="history_changed_due_date">changed %1$s due date from %2$s to %3$s</string>
-    <string name="history_set_due_date">set %1$s due date to %2$s</string>
-    <string name="history_removed_due_date">removed %s due date</string>
-    <string name="history_completed_repeating_task">completed %1$s (now due on %2$s)</string>
-    <string name="history_added_user">added %1$s to %2$s</string>
-    <string name="history_removed_user">removed %1$s from %2$s</string>
-    <string name="history_changed_repeat">changed %1$s repeat to %2$s</string>
-    <string name="history_removed_repeat">removed %s repeat</string>
-    <string name="history_shared_with">shared %1$s with %2$s</string>
-    <string name="history_unshared_with">unshared %1$s with %2$s</string>
-    <string name="history_repeat_every">every %s</string>
-    <string name="history_repeat_on">on %s</string>
-    <string name="history_repeat_from_completion">after completion</string>
-    <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-</resources>