Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Role_Selection_Dropdown

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
#	WordPress/src/main/res/layout/people_invite_fragment.xml

66 files changed, 421 insertions, 248 deletions

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index a098a4388..05e2d445f 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'io.fabric.tools:gradle:1.+'
     }
 }
@@ -34,8 +34,8 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.android"
-        versionName "alpha-21"
-        versionCode 300
+        versionName "alpha-22"
+        versionCode 306
         minSdkVersion 16
         targetSdkVersion 24
 
@@ -84,16 +84,16 @@ dependencies {
     compile 'com.google.code.gson:gson:2.6.+'
     compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
 
-    compile 'com.android.support:support-compat:24.2.0'
-    compile 'com.android.support:support-core-ui:24.2.0'
-    compile 'com.android.support:support-fragment:24.2.0'
+    compile 'com.android.support:support-compat:24.2.1'
+    compile 'com.android.support:support-core-ui:24.2.1'
+    compile 'com.android.support:support-fragment:24.2.1'
 
     compile 'com.android.support:multidex:1.0.1'
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    compile 'com.android.support:cardview-v7:24.2.0'
-    compile 'com.android.support:recyclerview-v7:24.2.0'
-    compile 'com.android.support:design:24.2.0'
-    compile 'com.android.support:percent:24.2.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:cardview-v7:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:percent:24.2.1'
 
     compile 'com.google.android.gms:play-services-gcm:9.0.2'
     compile 'com.google.android.gms:play-services-auth:9.0.2'
diff --git a/WordPress/gradle.properties-example b/WordPress/gradle.properties-example
deleted file mode 100644
index f80f9dec1..000000000
--- a/WordPress/gradle.properties-example
+++ /dev/null
@@ -1,16 +0,0 @@
-wp.oauth.app_id = wordpress
-wp.oauth.app_secret = wordpress
-wp.oauth.redirect_uri = http://android.wordpress.org/
-wp.gcm.id = wordpress
-wp.db_secret = wordpress
-wp.mixpanel_token = wordpress
-wp.simperium.app_secret = wordpress
-wp.simperium.app_name = wordpress
-wp.helpshift.api.key = wordpress
-wp.helpshift.api.domain = wordpress.org
-wp.helpshift.api.id = wordpress
-wp.app_license_key = wordpress
-
-# Optional: used to autofill username and password fields at login on debug build only
-wp.debug.dotcom_login_username =
-wp.debug.dotcom_login_password =
diff --git a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java
index 288ad522f..de0e92aa9 100644
--- a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java
+++ b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java
@@ -16,12 +16,15 @@ import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 
 import com.google.android.gms.gcm.GcmListenerService;
+import com.simperium.client.BucketObjectMissingException;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.analytics.AnalyticsTrackerMixpanel;
 import org.wordpress.android.models.AccountHelper;
+import org.wordpress.android.models.CommentStatus;
+import org.wordpress.android.models.Note;
 import org.wordpress.android.ui.main.WPMainActivity;
 import org.wordpress.android.ui.notifications.NotificationDismissBroadcastReceiver;
 import org.wordpress.android.ui.notifications.NotificationEvents;
@@ -70,13 +73,18 @@ public class GCMMessageService extends GcmListenerService {
     private static final String PUSH_TYPE_PUSH_AUTH = "push_auth";
     private static final String PUSH_TYPE_BADGE_RESET = "badge-reset";
 
+    private static final String KEY_CATEGORY_COMMENT_LIKE = "comment-like";
+    private static final String KEY_CATEGORY_COMMENT_REPLY = "comment-reply";
+    private static final String KEY_CATEGORY_COMMENT_MODERATE = "comment-moderate";
+
+
     // Add to the analytics properties map a subset of the push notification payload.
     private static String[] propertiesToCopyIntoAnalytics = {PUSH_ARG_NOTE_ID, PUSH_ARG_TYPE, "blog_id", "post_id",
             "comment_id"};
 
     private void synchronizedHandleDefaultPush(String from, @NonNull Bundle data) {
         // sActiveNotificationsMap being static, we can't just synchronize the method
-        synchronized (sActiveNotificationsMap) {
+        synchronized (GCMMessageService.class) {
             handleDefaultPush(from, data);
         }
     }
@@ -207,13 +215,47 @@ public class GCMMessageService extends GcmListenerService {
 
     private void addActionsForCommentNotification(NotificationCompat.Builder builder, String noteId) {
         // Add some actions if this is a comment notification
-        Intent commentReplyIntent = new Intent(this, WPMainActivity.class);
-        commentReplyIntent.putExtra(WPMainActivity.ARG_OPENED_FROM_PUSH, true);
-        commentReplyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK
-                | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        commentReplyIntent.setAction("android.intent.action.MAIN");
-        commentReplyIntent.addCategory("android.intent.category.LAUNCHER");
-        commentReplyIntent.addCategory("comment-reply");
+
+        boolean areActionsSet = false;
+
+        if (SimperiumUtils.getNotesBucket() != null) {
+            try {
+                Note note = SimperiumUtils.getNotesBucket().get(noteId);
+                if (note != null) {
+                    //if note can be replied to, we'll always add this action first
+                    if (note.canReply()) {
+                        addCommentReplyActionForCommentNotification(builder, noteId);
+                    }
+
+                    // if the comment is lacking approval, offer moderation actions
+                    if (note.getCommentStatus().equals(CommentStatus.UNAPPROVED)) {
+                        if (note.canModerate()) {
+                            addCommentApproveActionForCommentNotification(builder, noteId);
+                        }
+                    } else {
+                        //else offer REPLY / LIKE actions
+                        if (note.canLike()) {
+                            addCommentLikeActionForCommentNotification(builder, noteId);
+                        }
+                    }
+                }
+                areActionsSet = true;
+            } catch (BucketObjectMissingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        // if we could not set the actions, set the default ones REPLY / LIKE
+        if (!areActionsSet) {
+            addCommentReplyActionForCommentNotification(builder, noteId);
+            addCommentLikeActionForCommentNotification(builder, noteId);
+        }
+    }
+
+    private void addCommentReplyActionForCommentNotification(NotificationCompat.Builder builder, String noteId) {
+        // adding comment reply action
+        Intent commentReplyIntent = getCommentActionIntent();
+        commentReplyIntent.addCategory(KEY_CATEGORY_COMMENT_REPLY);
         commentReplyIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, true);
         if (noteId != null) {
             commentReplyIntent.putExtra(NotificationsListFragment.NOTE_ID_EXTRA, noteId);
@@ -224,6 +266,44 @@ public class GCMMessageService extends GcmListenerService {
                 commentReplyPendingIntent);
     }
 
+    private void addCommentLikeActionForCommentNotification(NotificationCompat.Builder builder, String noteId) {
+        // adding comment like action
+        Intent commentLikeIntent = getCommentActionIntent();
+        commentLikeIntent.addCategory(KEY_CATEGORY_COMMENT_LIKE);
+        commentLikeIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_LIKE_EXTRA, true);
+        if (noteId != null) {
+            commentLikeIntent.putExtra(NotificationsListFragment.NOTE_ID_EXTRA, noteId);
+        }
+        PendingIntent commentLikePendingIntent = PendingIntent.getActivity(this, 0, commentLikeIntent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+        builder.addAction(R.drawable.ic_action_like, getText(R.string.like),
+                commentLikePendingIntent);
+    }
+
+    private void addCommentApproveActionForCommentNotification(NotificationCompat.Builder builder, String noteId) {
+        // adding comment approve action
+        Intent commentApproveIntent = getCommentActionIntent();
+        commentApproveIntent.addCategory(KEY_CATEGORY_COMMENT_MODERATE);
+        commentApproveIntent.putExtra(NotificationsListFragment.NOTE_INSTANT_APPROVE_EXTRA, true);
+        if (noteId != null) {
+            commentApproveIntent.putExtra(NotificationsListFragment.NOTE_ID_EXTRA, noteId);
+        }
+        PendingIntent commentApprovePendingIntent = PendingIntent.getActivity(this, 0, commentApproveIntent,
+                PendingIntent.FLAG_CANCEL_CURRENT);
+        builder.addAction(R.drawable.ic_action_approve, getText(R.string.approve),
+                commentApprovePendingIntent);
+    }
+
+    private Intent getCommentActionIntent(){
+        Intent intent = new Intent(this, WPMainActivity.class);
+        intent.putExtra(WPMainActivity.ARG_OPENED_FROM_PUSH, true);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        intent.setAction("android.intent.action.MAIN");
+        intent.addCategory("android.intent.category.LAUNCHER");
+        return intent;
+    }
+
     private Bitmap getLargeIconBitmap(String iconUrl, boolean shouldCircularizeIcon){
         Bitmap largeIconBitmap = null;
         if (iconUrl != null) {
@@ -407,7 +487,9 @@ public class GCMMessageService extends GcmListenerService {
 
                 String noteType = StringUtils.notNullStr(remainingNote.getString(PUSH_ARG_TYPE));
                 String noteId = remainingNote.getString(PUSH_ARG_NOTE_ID, "");
-                showIndividualNotificationForBuilder(builder, noteType, noteId, sActiveNotificationsMap.keyAt(0));
+                if (!sActiveNotificationsMap.isEmpty()) {
+                    showIndividualNotificationForBuilder(builder, noteType, noteId, sActiveNotificationsMap.keyAt(0));
+                }
             }
         }
 
@@ -442,7 +524,7 @@ public class GCMMessageService extends GcmListenerService {
             return;
         }
 
-        removeNotificationWithNoteIdFromSystemBar(this, data);
+        removeNotificationWithNoteIdFromSystemBar(this, data.getString(PUSH_ARG_NOTE_ID, ""));
         //now that we cleared the specific notif, we can check and make any visual updates
         if (sActiveNotificationsMap.size() > 0) {
             rebuildAndUpdateNotificationsOnSystemBar(data);
@@ -570,13 +652,8 @@ public class GCMMessageService extends GcmListenerService {
     }
 
     // Removes a specific notification from the system bar
-    public static synchronized void removeNotificationWithNoteIdFromSystemBar(Context context, Bundle data) {
-        if (context == null || data == null || !hasNotifications()) {
-            return;
-        }
-
-        String noteID = data.getString(PUSH_ARG_NOTE_ID, "");
-        if (TextUtils.isEmpty(noteID)) {
+    public static synchronized void removeNotificationWithNoteIdFromSystemBar(Context context, String noteID) {
+        if (context == null || TextUtils.isEmpty(noteID) || !hasNotifications()) {
             return;
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/models/Note.java b/WordPress/src/main/java/org/wordpress/android/models/Note.java
index 78fe414d9..7dc1a463b 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Note.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Note.java
@@ -148,6 +148,37 @@ public class Note extends Syncable {
         return isLikeType() || isCommentLikeType() || isFollowType() || isReblogType();
     }
 
+    /*
+     * does user have permission to moderate/reply/spam this comment?
+     */
+    public boolean canModerate() {
+        EnumSet<EnabledActions> enabledActions = getEnabledActions();
+        return enabledActions != null && (enabledActions.contains(EnabledActions.ACTION_APPROVE) || enabledActions.contains(EnabledActions.ACTION_UNAPPROVE));
+    }
+
+    public boolean canMarkAsSpam() {
+        EnumSet<EnabledActions> enabledActions = getEnabledActions();
+        return (enabledActions != null && enabledActions.contains(EnabledActions.ACTION_SPAM));
+    }
+
+    public boolean canReply() {
+        EnumSet<EnabledActions> enabledActions = getEnabledActions();
+        return (enabledActions != null && enabledActions.contains(EnabledActions.ACTION_REPLY));
+    }
+
+    public boolean canTrash() {
+        return canModerate();
+    }
+
+    public boolean canEdit(int localBlogId) {
+        return (localBlogId > 0 && canModerate());
+    }
+
+    public boolean canLike() {
+        EnumSet<EnabledActions> enabledActions = getEnabledActions();
+        return (enabledActions != null && enabledActions.contains(EnabledActions.ACTION_LIKE));
+    }
+
     private String getLocalStatus() {
         return StringUtils.notNullStr(mLocalStatus);
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/models/Role.java b/WordPress/src/main/java/org/wordpress/android/models/Role.java
index a13449b0c..4266ba561 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Role.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Role.java
@@ -4,6 +4,8 @@ import android.support.annotation.StringRes;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.CrashlyticsUtils;
 
 public enum Role {
     ADMIN(R.string.role_admin),
@@ -38,7 +40,12 @@ public enum Role {
             case "viewer":
                 return VIEWER;
         }
-        throw new IllegalArgumentException("All roles must be handled");
+        Exception e = new IllegalArgumentException("All roles must be handled: " + role);
+        CrashlyticsUtils.logException(e, CrashlyticsUtils.ExceptionType.SPECIFIC, AppLog.T.PEOPLE);
+
+        // All roles should have been handled, but in case an edge case occurs,
+        // using "Contributor" role is the safest option
+        return CONTRIBUTOR;
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java
index e1a7b9eb0..eafe02723 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java
@@ -112,10 +112,13 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
     private String mRestoredNoteId;
     private boolean mIsUsersBlog = false;
     private boolean mShouldFocusReplyField;
+    private boolean mShouldLikeInstantly;
+    private boolean mShouldApproveInstantly;
+
     /*
-         * Used to request a comment from a note using its site and comment ids, rather than build
-         * the comment with the content in the note. See showComment()
-         */
+     * Used to request a comment from a note using its site and comment ids, rather than build
+     * the comment with the content in the note. See showComment()
+     */
     private boolean mShouldRequestCommentFromNote = false;
     private boolean mIsSubmittingReply = false;
     private NotificationsDetailListFragment mNotificationsDetailListFragment;
@@ -149,6 +152,26 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
     }
 
     /*
+     * used when called from a comment notification 'like' action
+     */
+    public static CommentDetailFragment newInstanceForInstantLike(final String noteId) {
+        CommentDetailFragment fragment = newInstance(noteId);
+        //here tell the fragment to trigger the Like action when ready
+        fragment.setLikeCommentWhenReady();
+        return fragment;
+    }
+
+    /*
+     * used when called from a comment notification 'approve' action
+     */
+    public static CommentDetailFragment newInstanceForInstantApprove(final String noteId) {
+        CommentDetailFragment fragment = newInstance(noteId);
+        //here tell the fragment to trigger the Like action when ready
+        fragment.setApproveCommentWhenReady();
+        return fragment;
+    }
+
+    /*
      * used when called from notifications to load a comment that doesn't already exist in the note
      */
     public static CommentDetailFragment newInstanceForRemoteNoteComment(final String noteId) {
@@ -311,7 +334,7 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
         mBtnLikeComment.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                likeComment();
+                likeComment(false);
             }
         });
 
@@ -330,6 +353,15 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
             setNoteWithNoteId(mRestoredNoteId);
             mRestoredNoteId = null;
         }
+
+        if (mShouldLikeInstantly) {
+            mShouldLikeInstantly = false;
+            likeComment(true);
+        } else if (mShouldApproveInstantly) {
+            mShouldApproveInstantly = false;
+            performModerateAction();
+        }
+
     }
 
     private void setupSuggestionServiceAndAdapter() {
@@ -776,7 +808,9 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
             public void onActionResult(CommentActionResult result) {
                 if (!isAdded()) return;
 
-                if (!result.isSuccess()) {
+                if (result.isSuccess()) {
+                    ToastUtils.showToast(getActivity(), R.string.comment_moderated_approved, ToastUtils.Duration.SHORT);
+                } else {
                     mComment.setStatus(CommentStatus.toString(oldStatus));
                     updateStatusViews();
                     ToastUtils.showToast(getActivity(), R.string.error_moderate_comment);
@@ -916,19 +950,7 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
             mBtnModerateComment.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if (!hasComment() || !isAdded() || !NetworkUtils.checkConnection(getActivity())) {
-                        return;
-                    }
-
-                    CommentStatus newStatus = CommentStatus.APPROVED;
-                    if (mComment.getStatusEnum() == CommentStatus.APPROVED) {
-                        newStatus = CommentStatus.UNAPPROVED;
-                    }
-
-                    mComment.setStatus(newStatus.toString());
-                    setModerateButtonForStatus(newStatus);
-                    AniUtils.startAnimation(mBtnModerateIcon, R.anim.notifications_button_scale);
-                    moderateComment(newStatus);
+                    performModerateAction();
                 }
             });
             mBtnModerateComment.setVisibility(View.VISIBLE);
@@ -964,6 +986,22 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
         mLayoutButtons.setVisibility(View.VISIBLE);
     }
 
+    private void performModerateAction(){
+        if (!hasComment() || !isAdded() || !NetworkUtils.checkConnection(getActivity())) {
+            return;
+        }
+
+        CommentStatus newStatus = CommentStatus.APPROVED;
+        if (mComment.getStatusEnum() == CommentStatus.APPROVED) {
+            newStatus = CommentStatus.UNAPPROVED;
+        }
+
+        mComment.setStatus(newStatus.toString());
+        setModerateButtonForStatus(newStatus);
+        AniUtils.startAnimation(mBtnModerateIcon, R.anim.notifications_button_scale);
+        moderateComment(newStatus);
+    }
+
     private void setModerateButtonForStatus(CommentStatus status) {
         if (status == CommentStatus.APPROVED) {
             mBtnModerateIcon.setImageResource(R.drawable.ic_action_approve_active);
@@ -1058,9 +1096,19 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
         getFragmentManager().invalidateOptionsMenu();
     }
 
+    private void setLikeCommentWhenReady() {
+        mShouldLikeInstantly = true;
+    }
+
+    private void setApproveCommentWhenReady() {
+        mShouldApproveInstantly = true;
+    }
+
     // Like or unlike a comment via the REST API
-    private void likeComment() {
+    private void likeComment(boolean forceLike) {
         if (mNote == null) return;
+        if (!isAdded()) return;
+        if (forceLike && mBtnLikeComment.isActivated()) return;
 
         toggleLikeButton(!mBtnLikeComment.isActivated());
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
index 0e41c200f..a29e624f1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
@@ -265,19 +265,29 @@ public class WPMainActivity extends AppCompatActivity implements Bucket.Listener
 
         mViewPager.setCurrentItem(WPMainTabAdapter.TAB_NOTIFS);
 
-        boolean shouldShowKeyboard = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, false);
         if (GCMMessageService.getNotificationsCount() == 1) {
             String noteId = getIntent().getStringExtra(NotificationsListFragment.NOTE_ID_EXTRA);
             if (!TextUtils.isEmpty(noteId)) {
                 GCMMessageService.bumpPushNotificationsTappedAnalytics(noteId);
-                NotificationsListFragment.openNote(this, noteId, shouldShowKeyboard);
+                boolean doLikeNote = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_LIKE_EXTRA, false);
+                if (doLikeNote) {
+                    NotificationsListFragment.openNoteForLike(this, noteId);
+                } else {
+                    boolean doApproveNote = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_APPROVE_EXTRA, false);
+                    if (doApproveNote) {
+                        NotificationsListFragment.openNoteForApprove(this, noteId);
+                    } else {
+                        boolean shouldShowKeyboard = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, false);
+                        NotificationsListFragment.openNoteForReply(this, noteId, shouldShowKeyboard);
+                    }
+                }
             }
         } else {
           // mark all tapped here
             GCMMessageService.bumpPushNotificationsTappedAllAnalytics();
         }
 
-        GCMMessageService.clearNotifications();
+        GCMMessageService.removeAllNotifications(this);
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
index 4326e0ae6..408194613 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
@@ -90,6 +90,9 @@ public class NotificationsDetailActivity extends AppCompatActivity implements
                     return;
                 }
             }
+
+            GCMMessageService.removeNotificationWithNoteIdFromSystemBar(this, noteId);//clearNotifications();
+
         } else if (savedInstanceState.containsKey(ARG_TITLE) && getSupportActionBar() != null) {
             getSupportActionBar().setTitle(StringUtils.notNullStr(savedInstanceState.getString(ARG_TITLE)));
         }
@@ -99,7 +102,6 @@ public class NotificationsDetailActivity extends AppCompatActivity implements
             getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         }
 
-        GCMMessageService.clearNotifications();
     }
 
     @Override
@@ -138,7 +140,13 @@ public class NotificationsDetailActivity extends AppCompatActivity implements
         Fragment fragment;
         if (note.isCommentType()) {
             // show comment detail for comment notifications
-            fragment = CommentDetailFragment.newInstance(note.getId());
+            boolean isInstantLike = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_LIKE_EXTRA, false);
+            boolean isInstantApprove = getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_APPROVE_EXTRA, false);
+            fragment = isInstantLike ?
+                        CommentDetailFragment.newInstanceForInstantLike(note.getId()) :
+                        isInstantApprove ?
+                            CommentDetailFragment.newInstanceForInstantApprove(note.getId()) :
+                            CommentDetailFragment.newInstance(note.getId());
         } else if (note.isAutomattcherType()) {
             // show reader post detail for automattchers about posts - note that comment
             // automattchers are handled by note.isCommentType() above
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java
index 716b52389..8ad48256c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.java
@@ -40,6 +40,8 @@ public class NotificationsListFragment extends Fragment
                    WPMainActivity.OnScrollToTopListener, RadioGroup.OnCheckedChangeListener {
     public static final String NOTE_ID_EXTRA = "noteId";
     public static final String NOTE_INSTANT_REPLY_EXTRA = "instantReply";
+    public static final String NOTE_INSTANT_LIKE_EXTRA = "instantLike";
+    public static final String NOTE_INSTANT_APPROVE_EXTRA = "instantApprove";
     public static final String NOTE_MODERATE_ID_EXTRA = "moderateNoteId";
     public static final String NOTE_MODERATE_STATUS_EXTRA = "moderateNoteStatus";
 
@@ -175,16 +177,23 @@ public class NotificationsListFragment extends Fragment
             // open the latest version of this note just in case it has changed - this can
             // happen if the note was tapped from the list fragment after it was updated
             // by another fragment (such as NotificationCommentLikeFragment)
-            openNote(getActivity(), noteId, false);
+            openNoteForReply(getActivity(), noteId, false);
         }
     };
 
+    private static Intent getOpenNoteIntent(Activity activity,
+                                String noteId) {
+        Intent detailIntent = new Intent(activity, NotificationsDetailActivity.class);
+        detailIntent.putExtra(NOTE_ID_EXTRA, noteId);
+        return detailIntent;
+    }
+
     /**
      * Open a note fragment based on the type of note
      */
-    public static void openNote(Activity activity,
-                                String noteId,
-                                boolean shouldShowKeyboard) {
+    public static void openNoteForReply(Activity activity,
+                                        String noteId,
+                                        boolean shouldShowKeyboard) {
         if (noteId == null || activity == null) {
             return;
         }
@@ -193,12 +202,47 @@ public class NotificationsListFragment extends Fragment
             return;
         }
 
-        Intent detailIntent = new Intent(activity, NotificationsDetailActivity.class);
-        detailIntent.putExtra(NOTE_ID_EXTRA, noteId);
+        Intent detailIntent = getOpenNoteIntent(activity, noteId);
         detailIntent.putExtra(NOTE_INSTANT_REPLY_EXTRA, shouldShowKeyboard);
         activity.startActivityForResult(detailIntent, RequestCodes.NOTE_DETAIL);
     }
 
+    /**
+     * Open a note fragment based on the type of note, signaling to issue a like action immediately
+     */
+    public static void openNoteForLike(Activity activity,
+                                       String noteId) {
+        if (noteId == null || activity == null) {
+            return;
+        }
+
+        if (activity.isFinishing()) {
+            return;
+        }
+
+        Intent detailIntent = getOpenNoteIntent(activity, noteId);
+        detailIntent.putExtra(NOTE_INSTANT_LIKE_EXTRA, true);
+        activity.startActivityForResult(detailIntent, RequestCodes.NOTE_DETAIL);
+    }
+
+    /**
+     * Open a note fragment based on the type of note, signaling to issue a moderate:approve action immediately
+     */
+    public static void openNoteForApprove(Activity activity,
+                                       String noteId) {
+        if (noteId == null || activity == null) {
+            return;
+        }
+
+        if (activity.isFinishing()) {
+            return;
+        }
+
+        Intent detailIntent = getOpenNoteIntent(activity, noteId);
+        detailIntent.putExtra(NOTE_INSTANT_APPROVE_EXTRA, true);
+        activity.startActivityForResult(detailIntent, RequestCodes.NOTE_DETAIL);
+    }
+
     private void setNoteIsHidden(String noteId, boolean isHidden) {
         if (mNotesAdapter == null) return;
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
index 0beb7d2e1..32e8d2341 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
@@ -61,6 +61,7 @@ public class PeopleInviteFragment extends Fragment implements
     private MultiUsernameEditText mUsernameEditText;
     private TextView mRoleTextView;
     private EditText mCustomMessageEditText;
+
     private Role mRole;
     private String mCustomMessage = "";
     private boolean mInviteOperationInProgress = false;
@@ -345,9 +346,7 @@ public class PeopleInviteFragment extends Fragment implements
         mUsernameResults.remove(username);
         usernamesView.removeView(removedButton);
 
-        final ViewGroup usernamesContainer = (ViewGroup) getView().findViewById(R.id.usernames_container);
-        View removedErrorView = mUsernameErrorViews.remove(username);
-        usernamesContainer.removeView(removedErrorView);
+        updateUsernameError(username, null);
     }
 
     private boolean isUserInInvitees(String username) {
@@ -377,6 +376,13 @@ public class PeopleInviteFragment extends Fragment implements
     @Override
     public void onRoleSelected(Role newRole) {
         setRole(newRole);
+
+        if (!mUsernameButtons.keySet().isEmpty()) {
+            // clear the username results list and let the 'validate' routine do the updates
+            mUsernameResults.clear();
+
+            validateAndStyleUsername(mUsernameButtons.keySet(), null);
+        }
     }
 
     private void setRole(Role newRole) {
@@ -386,28 +392,24 @@ public class PeopleInviteFragment extends Fragment implements
 
     private void validateAndStyleUsername(Collection<String> usernames, final ValidationEndListener validationEndListener) {
         List<String> usernamesToCheck = new ArrayList<>();
-        List<String> usernamesChecked = new ArrayList<>();
 
         for (String username : usernames) {
             if (mUsernameResults.containsKey(username)) {
-                usernamesChecked.add(username);
+                String resultMessage = mUsernameResults.get(username);
+                styleButton(username, resultMessage);
+                updateUsernameError(username, resultMessage);
             } else {
-                usernamesToCheck.add(username);
-            }
-        }
+                styleButton(username, null);
+                updateUsernameError(username, null);
 
-        for (String username : usernamesChecked) {
-            String resultMessage = mUsernameResults.get(username);
-            if (!resultMessage.equals(FLAG_SUCCESS)) {
-                styleButton(username, resultMessage);
-                appendError(username, resultMessage);
+                usernamesToCheck.add(username);
             }
         }
 
         if (usernamesToCheck.size() > 0) {
 
             String dotComBlogId = getArguments().getString(ARG_BLOGID);
-            PeopleUtils.validateUsernames(usernamesToCheck, dotComBlogId, new PeopleUtils.ValidateUsernameCallback() {
+            PeopleUtils.validateUsernames(usernamesToCheck, mRole, dotComBlogId, new PeopleUtils.ValidateUsernameCallback() {
                 @Override
                 public void onUsernameValidation(String username, ValidationResult validationResult) {
                     if (!isAdded()) {
@@ -422,10 +424,8 @@ public class PeopleInviteFragment extends Fragment implements
                     final String usernameResultString = getValidationErrorString(username, validationResult);
                     mUsernameResults.put(username, usernameResultString);
 
-                    if (validationResult != ValidationResult.USER_FOUND) {
-                        styleButton(username, usernameResultString);
-                        appendError(username, usernameResultString);
-                    }
+                    styleButton(username, usernameResultString);
+                    updateUsernameError(username, usernameResultString);
                 }
 
                 @Override
@@ -447,18 +447,15 @@ public class PeopleInviteFragment extends Fragment implements
         }
     }
 
-    private void styleButton(String username, String validationResultMessage) {
+    private void styleButton(String username, @Nullable String validationResultMessage) {
         if (!isAdded()) {
             return;
         }
 
         TextView textView = (TextView) mUsernameButtons.get(username).findViewById(R.id.username);
-
-        if (!validationResultMessage.equals(FLAG_SUCCESS)) {
-            textView.setTextColor(ContextCompat.getColor(getActivity(), R.color.alert_red));
-        } else {
-            // properly style the button
-        }
+        textView.setTextColor(ContextCompat.getColor(getActivity(),
+                validationResultMessage == null ? R.color.grey_dark :
+                        (validationResultMessage.equals(FLAG_SUCCESS) ? R.color.blue_wordpress : R.color.alert_red)));
     }
 
     private
@@ -469,6 +466,10 @@ public class PeopleInviteFragment extends Fragment implements
                 return getString(R.string.invite_username_not_found, username);
             case ALREADY_MEMBER:
                 return getString(R.string.invite_already_a_member, username);
+            case ALREADY_FOLLOWING:
+                return getString(R.string.invite_already_following, username);
+            case BLOCKED_INVITES:
+                return getString(R.string.invite_user_blocked_invites, username);
             case INVALID_EMAIL:
                 return getString(R.string.invite_invalid_email, username);
             case USER_FOUND:
@@ -478,17 +479,37 @@ public class PeopleInviteFragment extends Fragment implements
         return null;
     }
 
-    private void appendError(String username, String error) {
-        if (!isAdded() || error == null) {
+    private void updateUsernameError(String username, @Nullable String usernameResult) {
+        if (!isAdded()) {
             return;
         }
 
-        final ViewGroup usernamesContainer = (ViewGroup) getView().findViewById(R.id.usernames_container);
-        final TextView usernameError = (TextView) LayoutInflater.from(getActivity()).inflate(R.layout
-                .people_invite_error_view, null);
-        usernameError.setText(error);
-        usernamesContainer.addView(usernameError);
-        mUsernameErrorViews.put(username, usernameError);
+        TextView usernameErrorTextView;
+        if (mUsernameErrorViews.containsKey(username)) {
+            usernameErrorTextView = (TextView) mUsernameErrorViews.get(username);
+
+            if (usernameResult == null || usernameResult.equals(FLAG_SUCCESS)) {
+                // no error so we need to remove the existing error view
+                ((ViewGroup) usernameErrorTextView.getParent()).removeView(usernameErrorTextView);
+                mUsernameErrorViews.remove(username);
+                return;
+            }
+        } else {
+            if (usernameResult == null || usernameResult.equals(FLAG_SUCCESS)) {
+                // no error so no need to create a new error view
+                return;
+            }
+
+            usernameErrorTextView = (TextView) LayoutInflater.from(getActivity())
+                    .inflate(R.layout.people_invite_error_view, null);
+
+            final ViewGroup usernameErrorsContainer = (ViewGroup) getView()
+                    .findViewById(R.id.username_errors_container);
+            usernameErrorsContainer.addView(usernameErrorTextView);
+
+            mUsernameErrorViews.put(username, usernameErrorTextView);
+        }
+        usernameErrorTextView.setText(usernameResult);
     }
 
     private void clearUsernames(Collection<String> usernames) {
@@ -568,8 +589,8 @@ public class PeopleInviteFragment extends Fragment implements
         enableSendButton(false);
 
         String dotComBlogId = getArguments().getString(ARG_BLOGID);
-        PeopleUtils.sendInvitations(new ArrayList<>(mUsernameButtons.keySet()), mRole, mCustomMessage,
-                dotComBlogId, new PeopleUtils.InvitationsSendCallback() {
+        PeopleUtils.sendInvitations(new ArrayList<>(mUsernameButtons.keySet()), mRole, mCustomMessage, dotComBlogId,
+                new PeopleUtils.InvitationsSendCallback() {
                     @Override
                     public void onSent(List<String> succeededUsernames, Map<String, String> failedUsernameErrors) {
                         if (!isAdded()) {
@@ -590,7 +611,8 @@ public class PeopleInviteFragment extends Fragment implements
 
                             populateUsernameButtons(failedUsernameErrors.keySet());
 
-                            ToastUtils.showToast(getActivity(), R.string.invite_error_some_failed);
+                            ToastUtils.showToast(getActivity(), succeededUsernames.isEmpty()
+                                    ? R.string.invite_error_sending : R.string.invite_error_some_failed);
                         } else {
                             ToastUtils.showToast(getActivity(), R.string.invite_sent, ToastUtils.Duration.LONG);
                         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java
index 345d617ee..ca878b3cf 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java
@@ -345,9 +345,10 @@ public class PeopleListFragment extends Fragment {
                 peopleViewHolder.imgAvatar.setImageUrl(avatarUrl, WPNetworkImageView.ImageType.AVATAR);
                 peopleViewHolder.txtDisplayName.setText(StringUtils.unescapeHTML(person.getDisplayName()));
                 if (person.getRole() != null) {
+                    peopleViewHolder.txtRole.setVisibility(View.VISIBLE);
                     peopleViewHolder.txtRole.setText(StringUtils.capitalize(person.getRole().toDisplayString()));
                 } else {
-                    peopleViewHolder.txtRole.setText("");
+                    peopleViewHolder.txtRole.setVisibility(View.GONE);
                 }
                 if (!person.getUsername().isEmpty()) {
                     peopleViewHolder.txtUsername.setVisibility(View.VISIBLE);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java
index 16463981f..5c01c6ddf 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java
@@ -342,7 +342,7 @@ public class PeopleUtils {
         void onError();
     }
 
-    public static void validateUsernames(final List<String> usernames, String dotComBlogId, final
+    public static void validateUsernames(final List<String> usernames, Role role, String dotComBlogId, final
             ValidateUsernameCallback callback) {
         com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
             @Override
@@ -376,6 +376,12 @@ public class PeopleUtils {
                                 case "invalid_input_has_role":
                                     callback.onUsernameValidation(username, ValidationResult.ALREADY_MEMBER);
                                     continue;
+                                case "invalid_input_following":
+                                    callback.onUsernameValidation(username, ValidationResult.ALREADY_FOLLOWING);
+                                    continue;
+                                case "invalid_user_blocked_invites":
+                                    callback.onUsernameValidation(username, ValidationResult.BLOCKED_INVITES);
+                                    continue;
                             }
 
                             callback.onError();
@@ -426,7 +432,7 @@ public class PeopleUtils {
         for (String username : usernames) {
             params.put("invitees[" + username + "]", username); // specify an array key so to make the map key unique
         }
-        params.put("role", "follower"); // the specific role is not important, just needs to be a valid one
+        params.put("role", role.toRESTString());
         WordPress.getRestClientUtilsV1_1().post(path, params, null, listener, errorListener);
     }
 
@@ -434,6 +440,8 @@ public class PeopleUtils {
         enum ValidationResult {
             USER_NOT_FOUND,
             ALREADY_MEMBER,
+            ALREADY_FOLLOWING,
+            BLOCKED_INVITES,
             INVALID_EMAIL,
             USER_FOUND
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
index 276383909..e670d7cd7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -1439,34 +1439,21 @@ public class EditPostActivity extends AppCompatActivity implements EditorFragmen
      * Media
      */
 
-    private void fetchMedia(final List<Uri> mediaUris) {
-        new AsyncTask<List<Uri>, Boolean, Void>() {
-            @Override
-            protected Void doInBackground(List<Uri>... lists) {
-                for (Uri mediaUri : mediaUris) {
-                    if (mediaUri == null) {
-                        publishProgress(false);
-                        continue;
-                    }
-
-                    if (!addMedia(mediaUri)) {
-                        publishProgress(false);
-                    }
-                }
-
-                return null;
+    private void fetchMedia(List<Uri> mediaUris) {
+        for (Uri mediaUri : mediaUris) {
+            if (mediaUri == null) {
+                Toast.makeText(EditPostActivity.this,
+                        getResources().getText(R.string.gallery_error), Toast.LENGTH_SHORT).show();
+                continue;
             }
 
-            @Override
-            protected void onProgressUpdate(Boolean... values) {
-                // use onProgressUpdate to Toast on error
+            if (!addMedia(mediaUri)) {
                 Toast.makeText(EditPostActivity.this, getResources().getText(R.string.gallery_error),
                         Toast.LENGTH_SHORT).show();
             }
-        }.execute(mediaUris);
+        }
     }
 
-
     private void updateMediaFileOnServer(WPImageSpan wpIS) {
         Blog currentBlog = WordPress.getCurrentBlog();
         if (currentBlog == null || wpIS == null)
diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml
index fd426ca61..81ead88b0 100644
--- a/WordPress/src/main/res/layout/people_invite_fragment.xml
+++ b/WordPress/src/main/res/layout/people_invite_fragment.xml
@@ -56,7 +56,7 @@
                     android:paddingRight="@dimen/margin_medium"
                     android:paddingTop="@dimen/margin_large"
                     android:singleLine="true"
-                    android:textColor="#444444"
+                    android:textColor="@color/grey_dark"
                     android:textColorHint="#AAAAAA"
                     android:textSize="@dimen/text_sz_medium"
                     tools:text="sdfwefef" />
@@ -66,10 +66,18 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="5dp"
-                android:text="@string/invite_message_usernames_limit"
                 android:textColor="@color/grey_lighten_10"
                 android:textSize="@dimen/text_sz_small"
-                android:textStyle="italic" />
+                android:textStyle="italic"
+                android:text="@string/invite_message_usernames_limit"/>
+
+            <LinearLayout
+                android:id="@+id/username_errors_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:animateLayoutChanges="true"
+                android:orientation="vertical" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/WordPress/src/main/res/layout/reader_listitem_suggestion.xml b/WordPress/src/main/res/layout/reader_listitem_suggestion.xml
index 26a21340c..caa405f8d 100644
--- a/WordPress/src/main/res/layout/reader_listitem_suggestion.xml
+++ b/WordPress/src/main/res/layout/reader_listitem_suggestion.xml
@@ -20,6 +20,7 @@
         android:lines="1"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:textColor="@color/grey_dark"
         tools:text="Suggestion" />
 
     <ImageView
diff --git a/WordPress/src/main/res/values-ar/strings.xml b/WordPress/src/main/res/values-ar/strings.xml
index a5f266109..4e41cd1a8 100644
--- a/WordPress/src/main/res/values-ar/strings.xml
+++ b/WordPress/src/main/res/values-ar/strings.xml
@@ -973,7 +973,6 @@
 	<string name="select_from_media_library">اختر من مكتبة الوسائط</string>
 	<string name="jetpack_message">مطلوب اضافة الـ Jetpack للإحصائيات , هل تريد تثبيت الـ Jetpack ؟</string>
 	<string name="jetpack_not_found">اضافة Jetpack غير موجودة</string>
-	<string name="reader_timespan_now">الان</string>
 	<string name="reader_untitled_post">( بدون اسم )</string>
 	<string name="reader_share_subject">تمت المشاركة من %s</string>
 	<string name="reader_btn_share">مشاركة</string>
diff --git a/WordPress/src/main/res/values-az/strings.xml b/WordPress/src/main/res/values-az/strings.xml
index 3455f2a61..7893297df 100644
--- a/WordPress/src/main/res/values-az/strings.xml
+++ b/WordPress/src/main/res/values-az/strings.xml
@@ -493,7 +493,6 @@
 	<string name="username_invalid">Keçərsiz istifadəçi adı</string>
 	<string name="nux_tutorial_get_started_title">Başlayın!</string>
 	<string name="jetpack_message">Statistikalar üçün Jetpack plaqininə ehtiyac var. Jetpack plaqinini qurmaq istəyirsinizmi?</string>
-	<string name="reader_timespan_now">indi</string>
 	<string name="reader_untitled_post">(adsız)</string>
 	<string name="reader_share_subject">Paylaşılan %s</string>
 	<string name="reader_label_added_tag"> %s əlavə edildi</string>
diff --git a/WordPress/src/main/res/values-bg/strings.xml b/WordPress/src/main/res/values-bg/strings.xml
index 6ee6660f3..042689ce9 100644
--- a/WordPress/src/main/res/values-bg/strings.xml
+++ b/WordPress/src/main/res/values-bg/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Без</string>
 	<string name="alignment_left">Ляво</string>
 	<string name="alignment_right">Дясно</string>
-	<string name="site_settings_list_editor_action_mode_title">Избрано %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Избрано %1$d</string>
 	<string name="error_fetch_users_list">Неуспешно извикване на потребителите</string>
 	<string name="plans_manage">Управление на плана ви\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Все още нямате потребители.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Последователите ще спрат да получават известия за сайта ако ги премахнете, освен ако не го добавят отново.\n\nЖелаете ли да продължите с премахването?</string>
 	<string name="follower_subscribed_since">От %1$s</string>
 	<string name="reader_label_view_gallery">Преглед</string>
-	<string name="reader_label_image_count">%d снимки</string>
 	<string name="error_remove_follower">Неуспешно премахване на последователя</string>
 	<string name="error_remove_viewer">Неуспешно премахване на потребителя</string>
 	<string name="error_fetch_email_followers_list">Неуспешно показване на последователите по имейл.</string>
@@ -978,7 +977,6 @@
 	<string name="select_from_media_library">Избор от медийната библиотека</string>
 	<string name="jetpack_message">Jetpack е нужен за извличане на статистиката. Искате ли да инсталирате Jetpack?</string>
 	<string name="jetpack_not_found">Jetpack не беше намерен</string>
-	<string name="reader_timespan_now">сега</string>
 	<string name="reader_untitled_post">(Неозаглавен)</string>
 	<string name="reader_share_subject">Споделено от %s</string>
 	<string name="reader_btn_share">Споделяне</string>
diff --git a/WordPress/src/main/res/values-cs/strings.xml b/WordPress/src/main/res/values-cs/strings.xml
index d5804142b..bc0f734be 100644
--- a/WordPress/src/main/res/values-cs/strings.xml
+++ b/WordPress/src/main/res/values-cs/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Žádné</string>
 	<string name="alignment_left">Doleva</string>
 	<string name="alignment_right">Doprava</string>
-	<string name="site_settings_list_editor_action_mode_title">Vyberte %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Vyberte %1$d</string>
 	<string name="error_fetch_users_list">Nelze načíst uživatele webu</string>
 	<string name="plans_manage">Spravuj svůj plán na\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Nemáte ještě nějaké otázky.</string>
@@ -28,7 +28,6 @@
 	<string name="viewer_remove_confirmation_message">Chcete odstranit tento prohlížeč, pak už nikdo nebude moct navštívit tuto webovou stránku.\n\nChcete určitě odstranit tento prohlížeč?</string>
 	<string name="follower_remove_confirmation_message">Pokud odstraníte tohoto fanouška, nebude už dostávat žádné upozornění z tohoto webu..\n\nChcete určitě odstranit tohoto fanouška?</string>
 	<string name="follower_subscribed_since">Od %1$s</string>
-	<string name="reader_label_image_count">%d obrázků</string>
 	<string name="reader_label_view_gallery">Zobrazit galerii</string>
 	<string name="error_remove_follower">Nepodařilo se odstranit fanouška</string>
 	<string name="error_remove_viewer">Nepodařilo se odstranit zobrazení</string>
@@ -980,7 +979,6 @@
 	<string name="empty_list_default">Tento seznam je prázdný</string>
 	<string name="select_from_media_library">Vyberte z knihovny medií</string>
 	<string name="jetpack_not_found">Plugin Jetpack nebyl nalezen</string>
-	<string name="reader_timespan_now">nyní</string>
 	<string name="reader_untitled_post">(bez názvu)</string>
 	<string name="reader_share_subject">Sdíleno z %s</string>
 	<string name="reader_btn_follow">Sledovat</string>
diff --git a/WordPress/src/main/res/values-cy/strings.xml b/WordPress/src/main/res/values-cy/strings.xml
index a05d684eb..ef89695a7 100644
--- a/WordPress/src/main/res/values-cy/strings.xml
+++ b/WordPress/src/main/res/values-cy/strings.xml
@@ -933,7 +933,6 @@
 	<string name="select_from_media_library">Dewiswch o\'r llyfrgell cyfryngau</string>
 	<string name="jetpack_message">Mae angen yr ategyn Jetpack ar gyfer adrodd ar yr ystadegau. Hoffech chi osod Jetpack?</string>
 	<string name="jetpack_not_found">Heb ganfod ategyn jetpack</string>
-	<string name="reader_timespan_now">nawr</string>
 	<string name="reader_untitled_post">(Dideitl)</string>
 	<string name="reader_share_subject">Rhannu o %s</string>
 	<string name="reader_btn_share">Rhannu</string>
diff --git a/WordPress/src/main/res/values-da/strings.xml b/WordPress/src/main/res/values-da/strings.xml
index 574ac0fd4..049a06343 100644
--- a/WordPress/src/main/res/values-da/strings.xml
+++ b/WordPress/src/main/res/values-da/strings.xml
@@ -480,7 +480,6 @@
 	<string name="media_add_new_media_gallery">Opret galleri</string>
 	<string name="empty_list_default">Listen er tom</string>
 	<string name="select_from_media_library">Vælg fra mediebiblioteket</string>
-	<string name="reader_timespan_now">nu</string>
 	<string name="reader_label_added_tag">Tilføjede %s</string>
 	<string name="reader_label_removed_tag">Fjernede %s</string>
 	<string name="reader_likes_only_you">Du synes godt om dette</string>
diff --git a/WordPress/src/main/res/values-de/strings.xml b/WordPress/src/main/res/values-de/strings.xml
index e6fe09a7f..cd6082832 100644
--- a/WordPress/src/main/res/values-de/strings.xml
+++ b/WordPress/src/main/res/values-de/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Keine</string>
 	<string name="alignment_left">Links</string>
 	<string name="alignment_right">Rechts</string>
-	<string name="site_settings_list_editor_action_mode_title">Ausgewählt %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Ausgewählt %1$d</string>
 	<string name="error_fetch_users_list">Website-Benutzer konnten nicht abgerufen werden</string>
 	<string name="plans_manage">Verwalte deinen Tarif auf\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Du hast noch keine Besucher.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Nach dem Entfernen bekommt der Follower keine Mitteilungen über dieser Website mehr, bis er wieder folgt.\n\nMöchtest du diesen Follower noch immer entfernen?</string>
 	<string name="follower_subscribed_since">Seit %1$s</string>
 	<string name="reader_label_view_gallery">Galerie anzeigen</string>
-	<string name="reader_label_image_count">%d Bilder</string>
 	<string name="error_remove_follower">Konnte Follower nicht entfernen</string>
 	<string name="error_remove_viewer">Konnte Besucher nicht entfernen</string>
 	<string name="error_fetch_email_followers_list">Konnte E-Mail-Follower der Website nicht abrufen</string>
@@ -978,7 +977,6 @@
 	<string name="select_from_media_library">Aus der Mediathek auswählen</string>
 	<string name="jetpack_message">Das Jetpack-Plugin ist erforderlich für Statistiken. Möchtest Du Jetpack installieren?</string>
 	<string name="jetpack_not_found">Jetpack Plugin nicht gefunden</string>
-	<string name="reader_timespan_now">jetzt</string>
 	<string name="reader_untitled_post">(Ohne Titel)</string>
 	<string name="reader_share_subject">Geteilt von %s</string>
 	<string name="reader_btn_share">Teilen</string>
diff --git a/WordPress/src/main/res/values-el/strings.xml b/WordPress/src/main/res/values-el/strings.xml
index 1543fadf7..e002f9e8b 100644
--- a/WordPress/src/main/res/values-el/strings.xml
+++ b/WordPress/src/main/res/values-el/strings.xml
@@ -933,7 +933,6 @@
 	<string name="select_from_media_library">Διαλέξτε από την βιβλιοθήκη πολυμέσων</string>
 	<string name="jetpack_message">Το Jetpack plugin είναι αναγκαίο για την συλλογή στατιστικών στοιχείων. Θέλετε να εγκαταστήσετε το Jetpack;</string>
 	<string name="jetpack_not_found">Δεν βρέθηκε το Jetpack plugin</string>
-	<string name="reader_timespan_now">τώρα</string>
 	<string name="reader_untitled_post">Ανώνυμο</string>
 	<string name="reader_share_subject">Μοιράστηκε από %s</string>
 	<string name="reader_btn_share">Μοιράσου</string>
diff --git a/WordPress/src/main/res/values-en-rAU/strings.xml b/WordPress/src/main/res/values-en-rAU/strings.xml
index ae9f7969f..af26e0b14 100644
--- a/WordPress/src/main/res/values-en-rAU/strings.xml
+++ b/WordPress/src/main/res/values-en-rAU/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">None</string>
 	<string name="alignment_left">Left</string>
 	<string name="alignment_right">Right</string>
-	<string name="site_settings_list_editor_action_mode_title">Selected %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Selected %1$d</string>
 	<string name="error_fetch_users_list">Couldn\'t retrieve site users</string>
 	<string name="plans_manage">Manage your plan at\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">You don\'t have any viewers yet.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower?</string>
 	<string name="follower_subscribed_since">Since %1$s</string>
 	<string name="reader_label_view_gallery">View Gallery</string>
-	<string name="reader_label_image_count">%d images</string>
 	<string name="error_remove_follower">Couldn\'t remove follower</string>
 	<string name="error_remove_viewer">Couldn\'t remove viewer</string>
 	<string name="error_fetch_email_followers_list">Couldn\'t retrieve site email followers</string>
@@ -978,7 +977,6 @@
 	<string name="select_from_media_library">Select from media library</string>
 	<string name="jetpack_message">The Jetpack plugin is required for stats. Do you want to install Jetpack?</string>
 	<string name="jetpack_not_found">Jetpack plugin not found</string>
-	<string name="reader_timespan_now">now</string>
 	<string name="reader_untitled_post">(Untitled)</string>
 	<string name="reader_share_subject">Shared from %s</string>
 	<string name="reader_btn_share">Share</string>
diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml
index 972777722..7f619d777 100644
--- a/WordPress/src/main/res/values-en-rCA/strings.xml
+++ b/WordPress/src/main/res/values-en-rCA/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">None</string>
 	<string name="alignment_left">Left</string>
 	<string name="alignment_right">Right</string>
-	<string name="site_settings_list_editor_action_mode_title">Selected %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Selected %1$d</string>
 	<string name="error_fetch_users_list">Couldn\'t retrieve site users</string>
 	<string name="plans_manage">Manage your plan at\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">You don\'t have any viewers yet.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower?</string>
 	<string name="follower_subscribed_since">Since %1$s</string>
 	<string name="reader_label_view_gallery">View Gallery</string>
-	<string name="reader_label_image_count">%d images</string>
 	<string name="error_remove_follower">Couldn\'t remove follower</string>
 	<string name="error_remove_viewer">Couldn\'t remove viewer</string>
 	<string name="error_fetch_email_followers_list">Couldn\'t retrieve site email followers</string>
@@ -978,7 +977,6 @@
 	<string name="select_from_media_library">Select from media library</string>
 	<string name="jetpack_message">The Jetpack plugin is required for stats. Do you want to install Jetpack?</string>
 	<string name="jetpack_not_found">Jetpack plugin not found</string>
-	<string name="reader_timespan_now">now</string>
 	<string name="reader_untitled_post">(Untitled)</string>
 	<string name="reader_share_subject">Shared from %s</string>
 	<string name="reader_btn_share">Share</string>
diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml
index 428b6af15..97ddbf428 100644
--- a/WordPress/src/main/res/values-en-rGB/strings.xml
+++ b/WordPress/src/main/res/values-en-rGB/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">None</string>
 	<string name="alignment_left">Left</string>
 	<string name="alignment_right">Right</string>
-	<string name="site_settings_list_editor_action_mode_title">Selected %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Selected %1$d</string>
 	<string name="error_fetch_users_list">Couldn\'t retrieve site users</string>
 	<string name="plans_manage">Manage your plan at\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">You don\'t have any viewers yet.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower?</string>
 	<string name="follower_subscribed_since">Since %1$s</string>
 	<string name="reader_label_view_gallery">View Gallery</string>
-	<string name="reader_label_image_count">%d images</string>
 	<string name="error_remove_follower">Couldn\'t remove follower</string>
 	<string name="error_remove_viewer">Couldn\'t remove viewer</string>
 	<string name="error_fetch_email_followers_list">Couldn\'t retrieve site email followers</string>
@@ -978,7 +977,6 @@
 	<string name="select_from_media_library">Select from media library</string>
 	<string name="jetpack_message">The Jetpack plugin is required for stats. Do you want to install Jetpack?</string>
 	<string name="jetpack_not_found">Jetpack plugin not found</string>
-	<string name="reader_timespan_now">now</string>
 	<string name="reader_untitled_post">(Untitled)</string>
 	<string name="reader_share_subject">Shared from %s</string>
 	<string name="reader_btn_share">Share</string>
diff --git a/WordPress/src/main/res/values-es-rCL/strings.xml b/WordPress/src/main/res/values-es-rCL/strings.xml
index 8a9498983..f2d77a687 100644
--- a/WordPress/src/main/res/values-es-rCL/strings.xml
+++ b/WordPress/src/main/res/values-es-rCL/strings.xml
@@ -565,7 +565,6 @@
 	<string name="select_from_media_library">Seleccionar de la biblioteca multimedia</string>
 	<string name="jetpack_message">Necesitas el pluging Jetpack para tener estadísticas estadísticas. ¿Quieres instalar Jetpack?</string>
 	<string name="jetpack_not_found">No se ha encontrado el plugin Jetpack</string>
-	<string name="reader_timespan_now">ahora</string>
 	<string name="reader_untitled_post">Sin título</string>
 	<string name="reader_share_subject">Compartido desde %s</string>
 	<string name="reader_btn_share">Compartir</string>
diff --git a/WordPress/src/main/res/values-es-rVE/strings.xml b/WordPress/src/main/res/values-es-rVE/strings.xml
index 1a4d761e6..2752d6bc2 100644
--- a/WordPress/src/main/res/values-es-rVE/strings.xml
+++ b/WordPress/src/main/res/values-es-rVE/strings.xml
@@ -870,7 +870,6 @@
 	<string name="select_from_media_library">Seleccionar de la biblioteca multimedia</string>
 	<string name="jetpack_message">Necesitas el pluging Jetpack para tener estadísticas estadísticas. ¿Quieres instalar Jetpack?</string>
 	<string name="jetpack_not_found">No se ha encontrado el plugin Jetpack</string>
-	<string name="reader_timespan_now">ahora</string>
 	<string name="reader_untitled_post">Sin título</string>
 	<string name="reader_share_subject">Compartido desde %s</string>
 	<string name="reader_btn_share">Compartir</string>
diff --git a/WordPress/src/main/res/values-es/strings.xml b/WordPress/src/main/res/values-es/strings.xml
index 9696f6d45..e28c99028 100644
--- a/WordPress/src/main/res/values-es/strings.xml
+++ b/WordPress/src/main/res/values-es/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Ninguna</string>
 	<string name="alignment_left">Izquierda</string>
 	<string name="alignment_right">Derecha</string>
-	<string name="site_settings_list_editor_action_mode_title">Elegido %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Elegido %1$d</string>
 	<string name="error_fetch_users_list">No se pudieron recuperar los usuarios del sitio</string>
 	<string name="plans_manage">Gestiona tu plan en\nWordPress.com/plans</string>
 	<string name="title_follower">Seguidor</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Si lo eliminas, este seguidor dejará de recibir informaciones de tu sitio, a no ser que vuelta a seguirte. \n\n¿Todavía quieres eliminar a este seguidor? </string>
 	<string name="follower_subscribed_since">Desde %1$s</string>
 	<string name="reader_label_view_gallery">Ver galería</string>
-	<string name="reader_label_image_count">%d imágenes</string>
 	<string name="error_remove_follower">No se pudo quitar al seguidor</string>
 	<string name="error_remove_viewer">No se pudo quitar el espectador</string>
 	<string name="error_fetch_email_followers_list">No se pudieron recuperar los correos electrónicos de los seguidores del sitio</string>
@@ -991,7 +990,6 @@
 	<string name="reader_label_removed_tag">Eliminado %s</string>
 	<string name="media_add_new_media_gallery">Crear galería</string>
 	<string name="empty_list_default">Esta lista esta vacía</string>
-	<string name="reader_timespan_now">ahora</string>
 	<string name="reader_untitled_post">Sin título</string>
 	<string name="reader_share_subject">Compartido desde %s</string>
 	<string name="reader_btn_share">Compartir</string>
diff --git a/WordPress/src/main/res/values-eu/strings.xml b/WordPress/src/main/res/values-eu/strings.xml
index 6158ba83d..604310475 100644
--- a/WordPress/src/main/res/values-eu/strings.xml
+++ b/WordPress/src/main/res/values-eu/strings.xml
@@ -25,7 +25,6 @@
 	<string name="people_dropdown_item_team">Taldea</string>
 	<string name="follower_subscribed_since">%1$s-(e)tik</string>
 	<string name="reader_label_view_gallery">Ikusi galeria</string>
-	<string name="reader_label_image_count">%d irudi</string>
 	<string name="error_remove_follower">Ezin izan da jarraitzailea kendu</string>
 	<string name="error_remove_viewer">Ezin izan da ikuslea kendu</string>
 	<string name="error_fetch_email_followers_list">Ezin izan dira guneko e-posta jarraitzaileak eskuratu</string>
@@ -629,7 +628,6 @@
 	<string name="reader_toast_err_url_intent">Ezin izan da %s ireki</string>
 	<string name="nux_tutorial_get_started_title">Hasi!</string>
 	<string name="empty_list_default">Zerrenda hau hutsik dago</string>
-	<string name="reader_timespan_now">orain</string>
 	<string name="reader_share_subject">%s-tik partekatua</string>
 	<string name="reader_btn_share">Partekatu</string>
 	<string name="reader_btn_follow">Jarraitu</string>
diff --git a/WordPress/src/main/res/values-fr/strings.xml b/WordPress/src/main/res/values-fr/strings.xml
index 7ea5126a1..b215e3b40 100644
--- a/WordPress/src/main/res/values-fr/strings.xml
+++ b/WordPress/src/main/res/values-fr/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Aucun</string>
 	<string name="alignment_left">Gauche</string>
 	<string name="alignment_right">Droit</string>
-	<string name="site_settings_list_editor_action_mode_title">Sélectionné %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Sélectionné %1$d</string>
 	<string name="error_fetch_users_list">Impossible de récupérer les utilisateurs du site</string>
 	<string name="plans_manage">Gérez votre plan sur\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Vous n\'avez pas encore de lecteur.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Une fois supprimé, cet abonné ne recevra plus de notifications à propos de ce site, à moins de se réabonner.\n\nVoulez-vous vraiment supprimer cet abonné ?</string>
 	<string name="follower_subscribed_since">Depuis le %1$s</string>
 	<string name="reader_label_view_gallery">Afficher la galerie</string>
-	<string name="reader_label_image_count">%d images</string>
 	<string name="error_remove_follower">Impossible de supprimer l\'abonné</string>
 	<string name="error_remove_viewer">Impossible de supprimer le lecteur</string>
 	<string name="error_fetch_email_followers_list">Impossible de récupérer les abonnés par e-mail</string>
@@ -978,7 +977,6 @@
 	<string name="select_from_media_library">Sélectionner depuis la bibliothèque média</string>
 	<string name="jetpack_message">Le module Jetpack est requis pour afficher les statistiques. Voulez-vous installer Jetpack ?</string>
 	<string name="jetpack_not_found">Le module Jetpack est introuvable</string>
-	<string name="reader_timespan_now">actuellement</string>
 	<string name="reader_untitled_post">(Sans Titre)</string>
 	<string name="reader_share_subject">Partagé depuis %s</string>
 	<string name="reader_btn_share">Partager</string>
diff --git a/WordPress/src/main/res/values-gd/strings.xml b/WordPress/src/main/res/values-gd/strings.xml
index 7a2044a72..7c531f49b 100644
--- a/WordPress/src/main/res/values-gd/strings.xml
+++ b/WordPress/src/main/res/values-gd/strings.xml
@@ -17,7 +17,6 @@
 	<string name="follower_remove_confirmation_message">Ma bheir thu an cleachdaiche seo air falbh, chan fhaigh iad brathan mun làrach seo tuilleadh ach ma nì iad leantainn às ùr.\n\nA bheil thu cinnteach gu bheil thu airson an neach-leantainn seo a thoirt air falbh?</string>
 	<string name="follower_subscribed_since">A-mach o %1$s</string>
 	<string name="reader_label_view_gallery">Seall an gailearaidh</string>
-	<string name="reader_label_image_count">%d dealbh(an)</string>
 	<string name="error_remove_follower">Cha b’ urrainn dhuinn an neach-leantainn a thoirt air falbh</string>
 	<string name="error_remove_viewer">Cha b’ urrainn dhuinn an neach-coimhid a thoirt air falbh</string>
 	<string name="error_fetch_email_followers_list">Cha b’ urrainn dhuinn na daoine a leanas an làrach slighe puist-d fhaighinn</string>
@@ -516,7 +515,6 @@
 	<string name="select_from_media_library">Tagh o leabhar-lann nam meadhanan</string>
 	<string name="jetpack_message">Tha feum air plugan Jetpack mus fhaigh thu na stats. A bheil thu airson Jetpack a stàladh?</string>
 	<string name="jetpack_not_found">Cha deach am plugan Jetpack a lorg</string>
-	<string name="reader_timespan_now">an-dràsta</string>
 	<string name="reader_untitled_post">(Gun tiotal)</string>
 	<string name="reader_share_subject">Air a cho-roinneadh o %s</string>
 	<string name="reader_btn_share">Co-roinn</string>
diff --git a/WordPress/src/main/res/values-he/strings.xml b/WordPress/src/main/res/values-he/strings.xml
index b4bff0b69..da9ed339b 100644
--- a/WordPress/src/main/res/values-he/strings.xml
+++ b/WordPress/src/main/res/values-he/strings.xml
@@ -7,7 +7,7 @@
 	<string name="role_follower">עוקב</string>
 	<string name="role_viewer">צופה</string>
 	<string name="error_post_my_profile_no_connection">אין חיבור, הפרופיל לא נשמר</string>
-	<string name="site_settings_list_editor_action_mode_title">%1$s נבחרו</string>
+	<string name="site_settings_list_editor_action_mode_title">%1$d נבחרו</string>
 	<string name="plans_manage">ניהול התוכנית שלך בכתובת\nWordPress.com/plans</string>
 	<string name="title_follower">עוקב</string>
 	<string name="people_empty_list_filtered_viewers">אין לך צופים עדיין.</string>
@@ -23,7 +23,6 @@
 	<string name="viewer_remove_confirmation_message">לאחר הסרת צופה זה, הוא או היא לא יוכלו לבקר יותר באתר זה.\n\nבחרת להסיר צופה זה - האם ההחלטה סופית?</string>
 	<string name="follower_remove_confirmation_message">לאחר הסרת עוקב זה, הוא יפסיק לקבל הודעות לגבי אתר זה, אלא אם יגדיר מעקב מחדש.\n\nבחרת להסיר עוקב זה - האם ההחלטה סופית?</string>
 	<string name="follower_subscribed_since">מאז %1$s</string>
-	<string name="reader_label_image_count">%d תמונות</string>
 	<string name="reader_label_view_gallery">הצגת גלריה</string>
 	<string name="error_remove_follower">לא ניתן היה להסיר עוקב</string>
 	<string name="error_remove_viewer">לא ניתן היה להסיר צופה</string>
@@ -971,7 +970,6 @@
 	<string name="select_from_media_library">בחר מתוך ספריית מדיה</string>
 	<string name="jetpack_message">התוסף Jetpack נדרש לקבלת נתונים סטטיסטיים. אתה מעוניין להתקין את Jetpack?</string>
 	<string name="jetpack_not_found">התוסף Jetpack לא נמצא</string>
-	<string name="reader_timespan_now">עכשיו</string>
 	<string name="reader_untitled_post">(ללא כותרת)</string>
 	<string name="reader_share_subject">שיתוף מ-%s</string>
 	<string name="reader_btn_share">שתף</string>
diff --git a/WordPress/src/main/res/values-hi/strings.xml b/WordPress/src/main/res/values-hi/strings.xml
index 0764b44d6..9d1cf7284 100644
--- a/WordPress/src/main/res/values-hi/strings.xml
+++ b/WordPress/src/main/res/values-hi/strings.xml
@@ -435,7 +435,6 @@
 	<string name="media_add_new_media_gallery">गैलरी बनाएं</string>
 	<string name="username_invalid">अमान्य उपयोगकर्ता नाम</string>
 	<string name="jetpack_not_found">जेटपैक प्लगइन नहीं मिला</string>
-	<string name="reader_timespan_now">अब</string>
 	<string name="reader_likes_one">एक व्यक्ति ने पसंद किया</string>
 	<string name="reader_btn_share">साझा करे</string>
 	<string name="reader_likes_only_you">आपने इसे पसंद किया</string>
diff --git a/WordPress/src/main/res/values-hr/strings.xml b/WordPress/src/main/res/values-hr/strings.xml
index 8dd6697f0..19a2dc49b 100644
--- a/WordPress/src/main/res/values-hr/strings.xml
+++ b/WordPress/src/main/res/values-hr/strings.xml
@@ -727,7 +727,6 @@
 	<string name="empty_list_default">Popis je prazan</string>
 	<string name="select_from_media_library">Odaberi iz medijskih zapisa</string>
 	<string name="jetpack_not_found">Dodatak Jetpack nije pronađen</string>
-	<string name="reader_timespan_now">sad</string>
 	<string name="reader_untitled_post">(Bez naslova)</string>
 	<string name="reader_btn_share">Podjeli</string>
 	<string name="reader_btn_unfollow">Prati se</string>
diff --git a/WordPress/src/main/res/values-id/strings.xml b/WordPress/src/main/res/values-id/strings.xml
index cc26d2e69..1010ca7ac 100644
--- a/WordPress/src/main/res/values-id/strings.xml
+++ b/WordPress/src/main/res/values-id/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Tak ada</string>
 	<string name="alignment_left">Kiri</string>
 	<string name="alignment_right">Kanan</string>
-	<string name="site_settings_list_editor_action_mode_title">Memilih %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Memilih %1$d</string>
 	<string name="error_fetch_users_list">Gagal menampilkan pengguna situs</string>
 	<string name="plans_manage">Kelola paket Anda di \nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Anda belum memiliki satupun pengunjung.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Jika dihapus, pengunjung ini akan berhenti menerima notifikasi mengenai situs ini, kecuali mereka mengikuti lagi.\n\nApakah Anda masih ingin menghapus pengunjung ini?</string>
 	<string name="follower_subscribed_since">Sejak %1$s</string>
 	<string name="reader_label_view_gallery">Lihat Galeri</string>
-	<string name="reader_label_image_count">%d gambar</string>
 	<string name="error_remove_follower">Gagal menghapus pengikut</string>
 	<string name="error_remove_viewer">Gagal menghapus pengunjung</string>
 	<string name="error_fetch_email_followers_list">Gagal menampilkan pengikut email situs</string>
@@ -978,7 +977,6 @@
 	<string name="select_from_media_library">Pilih dari pustaka media</string>
 	<string name="jetpack_message">Plugin Jetpack diperlukan untuk Statistik. Apakah anda akan menginstall Jetpack ?</string>
 	<string name="jetpack_not_found">Plugin Jetpack tidak ditemukan</string>
-	<string name="reader_timespan_now">Sekarang</string>
 	<string name="reader_untitled_post">(Tanpa Judul)</string>
 	<string name="reader_share_subject">di sebarkan dari %s</string>
 	<string name="reader_btn_share">Bagikan</string>
diff --git a/WordPress/src/main/res/values-it/strings.xml b/WordPress/src/main/res/values-it/strings.xml
index 7db7039bd..a10f26ff7 100644
--- a/WordPress/src/main/res/values-it/strings.xml
+++ b/WordPress/src/main/res/values-it/strings.xml
@@ -17,7 +17,6 @@
 	<string name="follower_remove_confirmation_message">Se rimosso, questo follower smetterà di ricevere notifiche da questo sito, a meno che non si iscriva di nuovo.\n\nVuoi ancora di rimuovere questo follower?</string>
 	<string name="follower_subscribed_since">Dal %1$s</string>
 	<string name="reader_label_view_gallery">Visualizza galleria</string>
-	<string name="reader_label_image_count">%d imagini</string>
 	<string name="error_remove_follower">Non è possibile rimuovere il follower</string>
 	<string name="error_remove_viewer">Non è possibile rimuovere il visitatore</string>
 	<string name="error_fetch_email_followers_list">Non è possibile recuperare l\'email dei follower del sito</string>
@@ -968,7 +967,6 @@
 	<string name="reader_label_removed_tag">Rimosso %s</string>
 	<string name="reader_likes_one">Ad una persona piace questo</string>
 	<string name="reader_likes_only_you">Ti piace questo</string>
-	<string name="reader_timespan_now">adesso</string>
 	<string name="reader_untitled_post">(Senza titolo)</string>
 	<string name="reader_share_subject">Condividi da %s</string>
 	<string name="reader_btn_share">Condividi</string>
diff --git a/WordPress/src/main/res/values-ja/strings.xml b/WordPress/src/main/res/values-ja/strings.xml
index 5956e5f59..624704dd6 100644
--- a/WordPress/src/main/res/values-ja/strings.xml
+++ b/WordPress/src/main/res/values-ja/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">なし</string>
 	<string name="alignment_left">左</string>
 	<string name="alignment_right">右</string>
-	<string name="site_settings_list_editor_action_mode_title">%1$s が選択されています</string>
+	<string name="site_settings_list_editor_action_mode_title">%1$d が選択されています</string>
 	<string name="error_fetch_users_list">サイトのユーザーを取得できませんでした</string>
 	<string name="plans_manage">プランの管理は次で行います\nWordPress.com/plans</string>
 	<string name="title_follower">フォロワー</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">削除すると、このフォロワーが再度フォローしない限り、このサイトの通知を受け取れなくなります。\n\n本当にこのフォロワーを削除しますか ?</string>
 	<string name="follower_subscribed_since">購読日: %1$s</string>
 	<string name="reader_label_view_gallery">ギャラリーを表示</string>
-	<string name="reader_label_image_count">%d枚の画像</string>
 	<string name="error_remove_follower">フォロワーを削除できませんでした。</string>
 	<string name="error_remove_viewer">閲覧者を削除できませんでした。</string>
 	<string name="error_fetch_email_followers_list">サイトのメールフォロワーを取得できませんでした。</string>
@@ -995,7 +994,6 @@
 	<string name="reader_empty_followed_tags">現在何もタグをフォローしていません</string>
 	<string name="create_account_wpcom">WordPress.com でアカウントを作成</string>
 	<string name="jetpack_message">統計情報を表示するには Jetpack プラグインが必要です。Jetpack をインストールしますか ?</string>
-	<string name="reader_timespan_now">今</string>
 	<string name="reader_likes_one">1人がいいねをつけました</string>
 	<string name="reader_toast_err_comment_failed">コメントを投稿できませんでした</string>
 	<string name="connecting_wpcom">WordPress.com に接続中</string>
diff --git a/WordPress/src/main/res/values-ko/strings.xml b/WordPress/src/main/res/values-ko/strings.xml
index 39e74a58b..237176ceb 100644
--- a/WordPress/src/main/res/values-ko/strings.xml
+++ b/WordPress/src/main/res/values-ko/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">없음</string>
 	<string name="alignment_left">왼쪽</string>
 	<string name="alignment_right">오른쪽</string>
-	<string name="site_settings_list_editor_action_mode_title">%1$s 선택</string>
+	<string name="site_settings_list_editor_action_mode_title">%1$d 선택</string>
 	<string name="error_fetch_users_list">사이트 사용자를 가져올 수 없습니다.</string>
 	<string name="plans_manage">요금제 관리:\n워드프레스닷컴/요금제</string>
 	<string name="people_empty_list_filtered_viewers">아직 방문자가 없습니다.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">이 팔로워가 제거된 경우 해당 팔로워는 다시 팔로우하지 않는 한 이 사이트에 대한 알림을 수신할 수 없게 됩니다.\n\n이 팔로워를 제거하시겠습니까?</string>
 	<string name="follower_subscribed_since">%1$s 이후</string>
 	<string name="reader_label_view_gallery">갤러리 보기</string>
-	<string name="reader_label_image_count">%d개의 이미지</string>
 	<string name="error_remove_follower">팔로워를 제거할 수 없습니다.</string>
 	<string name="error_remove_viewer">방문자를 제거할 수 없습니다.</string>
 	<string name="error_fetch_email_followers_list">사이트 이메일 팔로워를 가져올 수 없습니다.</string>
@@ -964,7 +963,6 @@
 	<string name="signing_in">로그인 중...</string>
 	<string name="media_add_new_media_gallery">갤러리 만들기</string>
 	<string name="select_from_media_library">미디어 라이브러리에서 선택</string>
-	<string name="reader_timespan_now">지금</string>
 	<string name="reader_btn_share">공유</string>
 	<string name="reader_btn_follow">팔로우</string>
 	<string name="reader_toast_err_url_intent">%s를 열 수 없습니다</string>
diff --git a/WordPress/src/main/res/values-mk/strings.xml b/WordPress/src/main/res/values-mk/strings.xml
index 67c1d3636..af97559b4 100644
--- a/WordPress/src/main/res/values-mk/strings.xml
+++ b/WordPress/src/main/res/values-mk/strings.xml
@@ -349,7 +349,6 @@
 	<string name="select_from_media_library">Избери медиа од библиотеката</string>
 	<string name="jetpack_message">Jetpack додатокот е задолжителен за статистиката. Дали сакате да инсталирате Jetpack?</string>
 	<string name="jetpack_not_found">Jetpack додатокот не е пронајден</string>
-	<string name="reader_timespan_now">сега</string>
 	<string name="reader_untitled_post">(без наслов)</string>
 	<string name="reader_share_subject">Споделено од %s</string>
 	<string name="reader_btn_share">Сподели</string>
diff --git a/WordPress/src/main/res/values-ms/strings.xml b/WordPress/src/main/res/values-ms/strings.xml
index 7e59c4a9d..beda81908 100644
--- a/WordPress/src/main/res/values-ms/strings.xml
+++ b/WordPress/src/main/res/values-ms/strings.xml
@@ -17,7 +17,6 @@
 	<string name="follower_remove_confirmation_message">Jika dibuang, pengikut ini akan berhenti menerima pemberitahuan tentang laman ini, kecuali jika mereka mengikut kembali.\n\nAnda masih ingin membuang pengikut ini?</string>
 	<string name="follower_subscribed_since">Sejak %1$s</string>
 	<string name="reader_label_view_gallery">Lihat Galeri</string>
-	<string name="reader_label_image_count">%d imej</string>
 	<string name="error_remove_follower">Tidak dapat membuang pengikut</string>
 	<string name="error_remove_viewer">Tidak dapat membuang penonton</string>
 	<string name="error_fetch_email_followers_list">Tidak boleh mendapatkan pengikut emel laman</string>
@@ -963,7 +962,6 @@
 	<string name="select_from_media_library">Pilih dari perpustakaan media</string>
 	<string name="jetpack_message">Pemalam Jetpack diperlukan bagi statistik. Anda ingin memasang Jetpack?</string>
 	<string name="jetpack_not_found">Pemalam Jetpack tidak dijumpai</string>
-	<string name="reader_timespan_now">sekarang</string>
 	<string name="reader_untitled_post">(Tanpa tajuk)</string>
 	<string name="reader_share_subject">Dikongsi dari %s</string>
 	<string name="reader_btn_share">Kongsi</string>
diff --git a/WordPress/src/main/res/values-nb/strings.xml b/WordPress/src/main/res/values-nb/strings.xml
index 6b200d7e3..d2a03fcb5 100644
--- a/WordPress/src/main/res/values-nb/strings.xml
+++ b/WordPress/src/main/res/values-nb/strings.xml
@@ -238,7 +238,6 @@
 	<string name="nux_welcome_create_account">Opprett konto</string>
 	<string name="nux_oops_not_selfhosted_blog">Logg inn på WordPress.com</string>
 	<string name="signing_in">Logger inn …</string>
-	<string name="reader_timespan_now">nå</string>
 	<string name="reader_btn_share">Del</string>
 	<string name="reader_btn_follow">Følg</string>
 	<string name="jetpack_not_found">Fant ikke utvidelsen Jetpack</string>
diff --git a/WordPress/src/main/res/values-nl/strings.xml b/WordPress/src/main/res/values-nl/strings.xml
index 15c955fa6..b5270459f 100644
--- a/WordPress/src/main/res/values-nl/strings.xml
+++ b/WordPress/src/main/res/values-nl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="role_viewer">Lezer</string>
-	<string name="site_settings_list_editor_action_mode_title">Geselecteerde %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Geselecteerde %1$d</string>
 	<string name="error_fetch_users_list">Site-gebruikers ophalen mislukt</string>
 	<string name="plans_manage">Beheer je abonnement op\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Je hebt nog geen volgers.</string>
@@ -957,7 +957,6 @@
 	<string name="reader_toast_err_share_intent">Onmogelijk te delen</string>
 	<string name="reader_toast_err_view_image">Onmogelijk afbeelding te bekijken</string>
 	<string name="reader_empty_followed_tags">Je volgt geen enkele tags</string>
-	<string name="reader_timespan_now">Nu</string>
 	<string name="jetpack_message">De Jetpack plugin is nodig voor statistieken. Wil je Jetpack installeren?</string>
 	<string name="empty_list_default">Deze lijst is leeg</string>
 	<string name="media_add_new_media_gallery">Een nieuwe galerij aanmaken</string>
diff --git a/WordPress/src/main/res/values-pl/strings.xml b/WordPress/src/main/res/values-pl/strings.xml
index a798b3532..7e00cb008 100644
--- a/WordPress/src/main/res/values-pl/strings.xml
+++ b/WordPress/src/main/res/values-pl/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_right">Wyrównaj do prawej</string>
 	<string name="alignment_left">Wyrównaj do lewej</string>
 	<string name="alignment_none">Brak wyrównania</string>
-	<string name="site_settings_list_editor_action_mode_title">Wybrano %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Wybrano %1$d</string>
 	<string name="error_fetch_users_list">Nie można pobrać użytkowników witryny</string>
 	<string name="plans_manage">Zarządzaj swoim planem na\nWorPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Witryna nie ma jeszcze oglądających</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Jeśli usuniesz tego obserwującego, przestanie on otrzymywać powiadomienia o tej witrynie, chyba że zacznie ponownie obserwować.\nCzy wciąż chcesz usunąć tego obserwującego?</string>
 	<string name="follower_subscribed_since">Od %1$s</string>
 	<string name="reader_label_view_gallery">Zabacz Galerię</string>
-	<string name="reader_label_image_count">%d obrazków</string>
 	<string name="error_remove_follower">Nie można usunąć obserwującego</string>
 	<string name="error_remove_viewer">Nie można usunąć oglądającego</string>
 	<string name="error_fetch_email_followers_list">Nie można pobrać obserwujących witrynę przez e-mail</string>
@@ -977,7 +976,6 @@
 	<string name="empty_list_default">Lista jest pusta</string>
 	<string name="jetpack_not_found">Wtyczka Jetpack nie została znaleziona</string>
 	<string name="reader_untitled_post">(Brak tytułu)</string>
-	<string name="reader_timespan_now">teraz</string>
 	<string name="jetpack_message">Wtyczka Jetpack jest wymagana, aby uzyskać dostęp do statystyk. Zainstalować wtyczkę?</string>
 	<string name="reader_share_subject">Udostępnione przez %s</string>
 	<string name="reader_btn_share">Udostępnij</string>
diff --git a/WordPress/src/main/res/values-pt-rBR/strings.xml b/WordPress/src/main/res/values-pt-rBR/strings.xml
index 992a9540f..6cde5666f 100644
--- a/WordPress/src/main/res/values-pt-rBR/strings.xml
+++ b/WordPress/src/main/res/values-pt-rBR/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_left">Esquerda</string>
 	<string name="alignment_right">Direita</string>
 	<string name="alignment_none">Nenhum</string>
-	<string name="site_settings_list_editor_action_mode_title">Selecionado %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Selecionado %1$d</string>
 	<string name="error_fetch_users_list">Não foi possível recuperar os usuários do site</string>
 	<string name="plans_manage">Gerenciar o seu plano em\nWordPress.com/plans</string>
 	<string name="title_follower">Seguidor</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Caso removido, este seguidor irá parar de receber notificações sobre este site, menos que ele comece a seguir novamente.\n\nVocê gostaria ainda de remover este seguidor?</string>
 	<string name="follower_subscribed_since">Desde de %1$s</string>
 	<string name="reader_label_view_gallery">Ver galeria</string>
-	<string name="reader_label_image_count">%d imagens</string>
 	<string name="error_remove_follower">Não foi possível remover o seguidor</string>
 	<string name="error_remove_viewer">Não foi possível remover o espectador</string>
 	<string name="error_fetch_email_followers_list">Não foi possível recuperar os seguidores por e-mail do site</string>
@@ -978,7 +977,6 @@
 	<string name="jetpack_message">O plugin Jetpack é necessário para as estatísticas. Você quer instalar o Jetpack?</string>
 	<string name="jetpack_not_found">Plugin Jetpack não encontrado</string>
 	<string name="reader_btn_follow">Seguir </string>
-	<string name="reader_timespan_now">agora</string>
 	<string name="reader_btn_share">Compartilhar</string>
 	<string name="reader_label_removed_tag">Excluído %s</string>
 	<string name="reader_likes_one">Uma pessoa curte isto</string>
diff --git a/WordPress/src/main/res/values-ro/strings.xml b/WordPress/src/main/res/values-ro/strings.xml
index 9fa8cf004..383034eab 100644
--- a/WordPress/src/main/res/values-ro/strings.xml
+++ b/WordPress/src/main/res/values-ro/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Niciuna</string>
 	<string name="alignment_left">Stânga</string>
 	<string name="alignment_right">Dreapta</string>
-	<string name="site_settings_list_editor_action_mode_title">Selectate %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Selectate %1$d</string>
 	<string name="error_fetch_users_list">N-am putut aduce utilizatorii sitului</string>
 	<string name="plans_manage">Administrează-ți planul la\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Nu ai încă niciun vizitator.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Dacă-l înlături, acest urmăritor nu va mai primi notificări despre acest sit, decât dacă-l reurmărește.\n\nMai vrei să înlături acest urmăritor?</string>
 	<string name="follower_subscribed_since">De la %1$s</string>
 	<string name="reader_label_view_gallery">Vizualizează galeria</string>
-	<string name="reader_label_image_count">%d imagini</string>
 	<string name="error_remove_follower">N-am putut înlătura urmăritorul</string>
 	<string name="error_remove_viewer">N-am putut înlătura vizitatorul</string>
 	<string name="error_fetch_email_followers_list">N-am putut aduce urmăritorii prin email ai sitului</string>
@@ -987,7 +986,6 @@
 	<string name="reader_label_added_tag">%s adăugat</string>
 	<string name="reader_btn_unfollow">Urmăresc</string>
 	<string name="reader_btn_follow">Urmărește</string>
-	<string name="reader_timespan_now">acum</string>
 	<string name="reader_untitled_post">(Fără titlu)</string>
 	<string name="jetpack_not_found">Modulul Jetpack nu e găsit</string>
 	<string name="select_from_media_library">Selectează din biblioteca media</string>
diff --git a/WordPress/src/main/res/values-ru/strings.xml b/WordPress/src/main/res/values-ru/strings.xml
index 4c048392f..e48d32e43 100644
--- a/WordPress/src/main/res/values-ru/strings.xml
+++ b/WordPress/src/main/res/values-ru/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Нет</string>
 	<string name="alignment_left">Слева</string>
 	<string name="alignment_right">Справа</string>
-	<string name="site_settings_list_editor_action_mode_title">Выбрано %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Выбрано %1$d</string>
 	<string name="error_fetch_users_list">Не удалось получить список пользователей сайта</string>
 	<string name="plans_manage">Управление тарифными планами:\nwordpress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">У вас пока нет обозревателей.</string>
@@ -28,7 +28,6 @@
 	<string name="viewer_remove_confirmation_message">Если удалить этого обозревателя, он больше не сможет зайти на ваш сайт.\n\nВсё равно удалить этого обозревателя?</string>
 	<string name="follower_remove_confirmation_message">Если удалить этого читателя, он больше не будет получать уведомления об изменениях на этом сайте, пока не восстановит подписку.\n\nВсё равно удалить этого читателя?</string>
 	<string name="reader_label_view_gallery">Просмотр галереи</string>
-	<string name="reader_label_image_count">%d изображ</string>
 	<string name="error_remove_follower">Не удалось удалить читателя</string>
 	<string name="error_remove_viewer">Не удалось удалить обозревателя</string>
 	<string name="error_fetch_email_followers_list">Не удалось получить список подписчиков по электронной почте</string>
@@ -975,7 +974,6 @@
 	<string name="select_from_media_library">Выбрать из медиа-библиотеки</string>
 	<string name="jetpack_message">Для статистики нужен плагин Jetpack. Хотите установить его?</string>
 	<string name="jetpack_not_found">Плагин Jetpack не найден</string>
-	<string name="reader_timespan_now">сейчас</string>
 	<string name="reader_untitled_post">(Без названия)</string>
 	<string name="reader_share_subject">Поделиться через %s</string>
 	<string name="reader_btn_share">Поделиться</string>
diff --git a/WordPress/src/main/res/values-sk/strings.xml b/WordPress/src/main/res/values-sk/strings.xml
index 07f0be70a..955a2afb2 100644
--- a/WordPress/src/main/res/values-sk/strings.xml
+++ b/WordPress/src/main/res/values-sk/strings.xml
@@ -646,7 +646,6 @@
 	<string name="username_invalid">Nesprávne použivateľské meno</string>
 	<string name="reader_toast_err_url_intent">Nie je možné otvoriť %s</string>
 	<string name="reader_btn_share">Zdielať</string>
-	<string name="reader_timespan_now">teraz</string>
 	<string name="empty_list_default">Tento zoznam je prázdny</string>
 	<string name="media_add_new_media_gallery">Vytvoriť galériu</string>
 	<string name="media_add_popup_title">Pridať do knižnice súborov</string>
diff --git a/WordPress/src/main/res/values-sq/strings.xml b/WordPress/src/main/res/values-sq/strings.xml
index 5a3e0d02e..b1e79f7ab 100644
--- a/WordPress/src/main/res/values-sq/strings.xml
+++ b/WordPress/src/main/res/values-sq/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Pa drejtim</string>
 	<string name="alignment_left">Majtas</string>
 	<string name="alignment_right">Djathtas</string>
-	<string name="site_settings_list_editor_action_mode_title">U përzgjodh %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">U përzgjodh %1$d</string>
 	<string name="error_fetch_users_list">S&amp;#8217;u morën dot përdorues të sajtit</string>
 	<string name="plans_manage">Administroni planin tuaj te\nWordPress.com/plans</string>
 	<string name="people_fetching">Po sillen përdoruesit…</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Në u heqtë, ku ndjekës do të reshtë së marri njoftime mbi këtë sajt, veç në u ribëftë ndjekës.\n\nDo të donit ta hiqnit këtë ndjekës, sido qoftë?</string>
 	<string name="follower_subscribed_since">Që prej %1$s</string>
 	<string name="reader_label_view_gallery">Shihni Galerinë</string>
-	<string name="reader_label_image_count">%d figura</string>
 	<string name="error_remove_follower">S&amp;#8217;u hoq dot ndjekësi</string>
 	<string name="error_remove_viewer">S&amp;#8217;u hoq dot shikuesi</string>
 	<string name="error_fetch_email_followers_list">S&amp;#8217;u morën dot ndjekës të sajtit me email</string>
@@ -994,7 +993,6 @@
 	<string name="limit_reached">U mbërrit në kufi. Mund të riprovoni pas 1 minute. Riprovimi para kësaj vetëm sa do të shtojë kohën që ju duhet të prisni para se të hiqet përzënia. Nëse mendoni se ky është një gabim, lidhuni me asistencën.</string>
 	<string name="button_next">Pasuesi</string>
 	<string name="jetpack_not_found">S&amp;#8217;u gjet shtojcë Jetpack</string>
-	<string name="reader_timespan_now">tani</string>
 	<string name="reader_btn_unfollow">Ndjekur prej jush</string>
 	<string name="reader_toast_err_comment_failed">S&amp;#8217;u postua dot komenti juaj</string>
 	<string name="reader_toast_err_tag_invalid">Kjo s&amp;#8217;është etiketë e vlefshme</string>
diff --git a/WordPress/src/main/res/values-sr/strings.xml b/WordPress/src/main/res/values-sr/strings.xml
index 5cb18131e..356a74598 100644
--- a/WordPress/src/main/res/values-sr/strings.xml
+++ b/WordPress/src/main/res/values-sr/strings.xml
@@ -522,7 +522,6 @@
 	<string name="reader_btn_share">Поделите</string>
 	<string name="reader_share_subject">Подељено од стране %s</string>
 	<string name="reader_untitled_post">(Без наслова)</string>
-	<string name="reader_timespan_now">сада</string>
 	<string name="jetpack_not_found">Додатак Џетпек није пронађен</string>
 	<string name="jetpack_message">Џетпек додатак је неопходан за статистике. Да ли желите да инсталирате Џетпек?</string>
 	<string name="reader_toast_err_share_intent">Није могуће делити</string>
diff --git a/WordPress/src/main/res/values-sv/strings.xml b/WordPress/src/main/res/values-sv/strings.xml
index 9bac79d29..a4e3474a9 100644
--- a/WordPress/src/main/res/values-sv/strings.xml
+++ b/WordPress/src/main/res/values-sv/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Ingen</string>
 	<string name="alignment_left">Vänster</string>
 	<string name="alignment_right">Höger</string>
-	<string name="site_settings_list_editor_action_mode_title">Vald %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">Vald %1$d</string>
 	<string name="error_fetch_users_list">Kunde inte hämta webbplatsens användare</string>
 	<string name="plans_manage">Uppgradera ditt paket på\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Du har inga läsare än.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Om följaren tas bort kommer hen inte längre få notiser från denna webbplats såvida de inte följer webbplatsen på nytt.\n\nVill du fortfarande ta bort denna följare?</string>
 	<string name="follower_subscribed_since">Sedan %1$s</string>
 	<string name="reader_label_view_gallery">Visa galleri</string>
-	<string name="reader_label_image_count">%d bilder</string>
 	<string name="error_remove_follower">Kunde inte ta bort följare</string>
 	<string name="error_remove_viewer">Kunde inte ta bort läsare</string>
 	<string name="error_fetch_email_followers_list">Kunde inte hämta följare via e-post</string>
@@ -978,7 +977,6 @@
 	<string name="select_from_media_library">Välj från mediebiblioteket</string>
 	<string name="jetpack_message">Jetpack-tillägget behövs för att visa statistik. Vill du installera Jetpack?</string>
 	<string name="jetpack_not_found">Jetpack-tillägget kunde inte hittas</string>
-	<string name="reader_timespan_now">nu</string>
 	<string name="reader_untitled_post">(Ingen titel)</string>
 	<string name="reader_share_subject">Delad från %s</string>
 	<string name="reader_btn_share">Dela</string>
diff --git a/WordPress/src/main/res/values-th/strings.xml b/WordPress/src/main/res/values-th/strings.xml
index 32e1d9c07..57fbeb192 100644
--- a/WordPress/src/main/res/values-th/strings.xml
+++ b/WordPress/src/main/res/values-th/strings.xml
@@ -682,7 +682,6 @@
 	<string name="reader_btn_unfollow">กำลังติดตาม</string>
 	<string name="jetpack_message">การใช้งานสถิติต้องใช้ปลั๊กอิน Jetpack  คุณต้องการติดตั้ง Jetpack หรือไม่</string>
 	<string name="jetpack_not_found">ไม่พบปลั๊กอิน Jetpack</string>
-	<string name="reader_timespan_now">ตอนนี้</string>
 	<string name="reader_untitled_post">(ไม่มีหัวข้อ)</string>
 	<string name="reader_share_subject">แบ่งปันจาก %s แล้ว</string>
 	<string name="media_add_popup_title">เพิ่มไปยังคลังสื่อ</string>
diff --git a/WordPress/src/main/res/values-tr/strings.xml b/WordPress/src/main/res/values-tr/strings.xml
index c068b51be..110e0013f 100644
--- a/WordPress/src/main/res/values-tr/strings.xml
+++ b/WordPress/src/main/res/values-tr/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">Hiçbiri</string>
 	<string name="alignment_left">Sol</string>
 	<string name="alignment_right">Sağ</string>
-	<string name="site_settings_list_editor_action_mode_title">%1$s seçildi</string>
+	<string name="site_settings_list_editor_action_mode_title">%1$d seçildi</string>
 	<string name="error_fetch_users_list">Site kullanıcıları getirilemedi</string>
 	<string name="plans_manage">Planınızı yönetin:\nWordPress.com/plans</string>
 	<string name="people_empty_list_filtered_viewers">Henüz hiç izleyiciniz yok.</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">Eğer kaldırılırsa, bu takipçi site hakkındaki bildirimleri almayı kesecek, tabi tekrar takibe başlayana kadar.\n\nHala bu takipçiyi kaldırmak istiyor musunuz?</string>
 	<string name="follower_subscribed_since">%1$s tarihinden beri</string>
 	<string name="reader_label_view_gallery">Galeriyi görüntüle</string>
-	<string name="reader_label_image_count">%d görsel</string>
 	<string name="error_remove_follower">Takipçi kaldırılamıyor</string>
 	<string name="error_remove_viewer">İzleyici kaldırılamıyor</string>
 	<string name="error_fetch_email_followers_list">Sitenin e-posta takipçileri getirilemedi</string>
@@ -994,7 +993,6 @@
 	<string name="reader_btn_follow">Takip et</string>
 	<string name="reader_btn_unfollow">Takipte</string>
 	<string name="reader_toast_err_comment_failed">Yorumunuz gönderilemedi</string>
-	<string name="reader_timespan_now">şuan</string>
 	<string name="reader_label_added_tag">%s eklendi</string>
 	<string name="reader_label_removed_tag">%s kaldırıldı</string>
 	<string name="reader_toast_err_view_image">Imaj görüntülenemedi</string>
diff --git a/WordPress/src/main/res/values-uz/strings.xml b/WordPress/src/main/res/values-uz/strings.xml
index 11b7d83aa..4299b1baf 100644
--- a/WordPress/src/main/res/values-uz/strings.xml
+++ b/WordPress/src/main/res/values-uz/strings.xml
@@ -24,7 +24,6 @@
 	<string name="nux_welcome_create_account">Akkaunt ochish</string>
 	<string name="media_add_new_media_gallery">Yangi galereya</string>
 	<string name="reader_untitled_post">(Nomsiz)</string>
-	<string name="reader_timespan_now">hozir</string>
 	<string name="jetpack_not_found">Jetpack plagini topilmadi</string>
 	<string name="media_add_popup_title">Media kutubxonasiga qo‘sh</string>
 	<string name="empty_list_default">Ushbu ro‘yxat bo‘sh</string>
diff --git a/WordPress/src/main/res/values-zh-rCN/strings.xml b/WordPress/src/main/res/values-zh-rCN/strings.xml
index eb0db30af..5b92da2c1 100644
--- a/WordPress/src/main/res/values-zh-rCN/strings.xml
+++ b/WordPress/src/main/res/values-zh-rCN/strings.xml
@@ -10,7 +10,7 @@
 	<string name="alignment_none">无</string>
 	<string name="alignment_left">左</string>
 	<string name="alignment_right">右</string>
-	<string name="site_settings_list_editor_action_mode_title">已选择 %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">已选择 %1$d</string>
 	<string name="error_fetch_users_list">无法检索站点用户</string>
 	<string name="plans_manage">在 WordPress.com/plans 上\n管理您的套餐</string>
 	<string name="people_empty_list_filtered_viewers">您目前没有任何查看者。</string>
@@ -29,7 +29,6 @@
 	<string name="follower_remove_confirmation_message">如果删除该粉丝，则此人将不会再收到关于此站点的通知，除非其重新关注此站点。\n\n是否仍要删除该粉丝？</string>
 	<string name="follower_subscribed_since">从 %1$s开始</string>
 	<string name="reader_label_view_gallery">查看图库</string>
-	<string name="reader_label_image_count">%d 张图片</string>
 	<string name="error_remove_follower">无法删除粉丝</string>
 	<string name="error_remove_viewer">无法删除查看者</string>
 	<string name="error_fetch_email_followers_list">无法检索站点电子邮件粉丝</string>
@@ -968,7 +967,6 @@
 	<string name="select_from_media_library">从媒体库选择</string>
 	<string name="jetpack_message">统计需要Jetpack插件，您希望安装Jetpack吗？</string>
 	<string name="jetpack_not_found">没有找到Jetpack插件</string>
-	<string name="reader_timespan_now">现在</string>
 	<string name="reader_untitled_post">(未命名)</string>
 	<string name="reader_share_subject">从 %s 共享</string>
 	<string name="reader_btn_share">共享</string>
diff --git a/WordPress/src/main/res/values-zh-rHK/strings.xml b/WordPress/src/main/res/values-zh-rHK/strings.xml
index a160c0bf3..7f823de4b 100644
--- a/WordPress/src/main/res/values-zh-rHK/strings.xml
+++ b/WordPress/src/main/res/values-zh-rHK/strings.xml
@@ -10,12 +10,11 @@
 	<string name="alignment_none">無</string>
 	<string name="alignment_left">左</string>
 	<string name="alignment_right">右</string>
-	<string name="site_settings_list_editor_action_mode_title">已選取 %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">已選取 %1$d</string>
 	<string name="viewer_remove_confirmation_message">如果移除這位瀏覽者，對方將無法造訪此網站。\n\n仍要移除這位瀏覽者嗎？</string>
 	<string name="follower_remove_confirmation_message">移除後，這位關注者如果沒有重新關注，就會停止收到此網站的通知。\n\n仍要移除這位關注者嗎？</string>
 	<string name="follower_subscribed_since">自 %1$s 開始</string>
 	<string name="reader_label_view_gallery">檢視圖庫</string>
-	<string name="reader_label_image_count">%d 張圖片</string>
 	<string name="error_remove_follower">無法移除關注者</string>
 	<string name="error_remove_viewer">無法移除瀏覽者</string>
 	<string name="error_fetch_email_followers_list">無法擷取網站電子郵件關注者</string>
@@ -954,7 +953,6 @@
 	<string name="select_from_media_library">從媒體庫選擇</string>
 	<string name="jetpack_not_found">找不到 Jetpack</string>
 	<string name="jetpack_message">Jetpack 外掛需要統計資訊。你想要安裝 Jetpack 嗎？</string>
-	<string name="reader_timespan_now">現在</string>
 	<string name="reader_untitled_post">（未命名）</string>
 	<string name="reader_share_subject">從 %s 分享</string>
 	<string name="reader_btn_unfollow">追蹤</string>
diff --git a/WordPress/src/main/res/values-zh-rTW/strings.xml b/WordPress/src/main/res/values-zh-rTW/strings.xml
index 3cbf4858e..daea17395 100644
--- a/WordPress/src/main/res/values-zh-rTW/strings.xml
+++ b/WordPress/src/main/res/values-zh-rTW/strings.xml
@@ -10,12 +10,11 @@
 	<string name="alignment_none">無</string>
 	<string name="alignment_left">左</string>
 	<string name="alignment_right">右</string>
-	<string name="site_settings_list_editor_action_mode_title">已選取 %1$s</string>
+	<string name="site_settings_list_editor_action_mode_title">已選取 %1$d</string>
 	<string name="viewer_remove_confirmation_message">如果移除這位瀏覽者，對方將無法造訪此網站。\n\n仍要移除這位瀏覽者嗎？</string>
 	<string name="follower_remove_confirmation_message">移除後，這位關注者如果沒有重新關注，就會停止收到此網站的通知。\n\n仍要移除這位關注者嗎？</string>
 	<string name="follower_subscribed_since">自 %1$s 開始</string>
 	<string name="reader_label_view_gallery">檢視圖庫</string>
-	<string name="reader_label_image_count">%d 張圖片</string>
 	<string name="error_remove_follower">無法移除關注者</string>
 	<string name="error_remove_viewer">無法移除瀏覽者</string>
 	<string name="error_fetch_email_followers_list">無法擷取網站電子郵件關注者</string>
@@ -954,7 +953,6 @@
 	<string name="select_from_media_library">從媒體庫選擇</string>
 	<string name="jetpack_message">Jetpack 外掛需要統計資訊。你想要安裝 Jetpack 嗎？</string>
 	<string name="jetpack_not_found">找不到 Jetpack</string>
-	<string name="reader_timespan_now">現在</string>
 	<string name="reader_untitled_post">（未命名）</string>
 	<string name="reader_share_subject">從 %s 分享</string>
 	<string name="reader_btn_share">分享</string>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 35f18020d..32637527b 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -324,6 +324,9 @@
     <!-- comment actions -->
     <string name="reply">Reply</string>
     <string name="trash">Trash</string>
+    <string name="like">Like</string>
+    <string name="approve">Approve</string>
+    <string name="comment_moderated_approved">Comment approved!</string>
 
     <!-- edit comment view -->
     <string name="author_name">Author name</string>
@@ -585,7 +588,7 @@
     <string name="site_settings_list_editor_summary_one">1 item</string>
     <string name="site_settings_list_editor_summary_other">%d items</string>
 
-    <string name="site_settings_list_editor_action_mode_title">Selected %1$s</string>
+    <string name="site_settings_list_editor_action_mode_title">Selected %1$d</string>
     <string name="site_settings_list_editor_no_items_text">No items</string>
     <string name="site_settings_list_editor_input_hint">Enter a word or phrase</string>
     <string name="site_settings_hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
@@ -1413,9 +1416,11 @@
     <string name="invite_names_title">Usernames or Emails</string>
     <string name="invite">Invite</string>
     <string name="button_invite" translatable="false">@string/invite</string>
-    <string name="invite_username_not_found">No user was found for username \'%s\'</string>
-    <string name="invite_already_a_member">There\'s already a member with username \'%s\'</string>
-    <string name="invite_invalid_email">The email address \'%s\' is invalid</string>
+    <string name="invite_username_not_found">%s: User not found</string>
+    <string name="invite_already_a_member">%s: Already a member</string>
+    <string name="invite_already_following">%s: Already following</string>
+    <string name="invite_user_blocked_invites">%s: User blocked invites</string>
+    <string name="invite_invalid_email">%s: Invalid email</string>
     <string name="invite_message_title">Custom Message</string>
     <string name="invite_message_remaining_zero">0 characters remaining</string>
     <string name="invite_message_remaining_one">1 character remaining</string>
diff --git a/WordPress/src/main/res/xml/site_settings.xml b/WordPress/src/main/res/xml/site_settings.xml
index 3bc42741e..b017142eb 100644
--- a/WordPress/src/main/res/xml/site_settings.xml
+++ b/WordPress/src/main/res/xml/site_settings.xml
@@ -149,19 +149,19 @@
                 android:title="@string/site_settings_discussion_new_posts_header">
 
                 <org.wordpress.android.ui.prefs.WPSwitchPreference
-                    android:id="@+id/pref_allow_comments"
+                    android:id="@+id/pref_allow_comments_nested"
                     android:key="@string/pref_key_site_allow_comments_nested"
                     android:title="@string/site_settings_allow_comments_title"
                     app:longClickHint="@string/site_settings_allow_comments_hint" />
 
                 <org.wordpress.android.ui.prefs.WPSwitchPreference
-                    android:id="@+id/pref_send_pingbacks"
+                    android:id="@+id/pref_send_pingbacks_nested"
                     android:key="@string/pref_key_site_send_pingbacks_nested"
                     android:title="@string/site_settings_send_pingbacks_title"
                     app:longClickHint="@string/site_settings_send_pingbacks_hint" />
 
                 <org.wordpress.android.ui.prefs.WPSwitchPreference
-                    android:id="@+id/pref_receive_pingbacks"
+                    android:id="@+id/pref_receive_pingbacks_nested"
                     android:key="@string/pref_key_site_receive_pingbacks_nested"
                     android:title="@string/site_settings_receive_pingbacks_title"
                     app:longClickHint="@string/site_settings_receive_pingbacks_hint" />
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d3b83982b..3baa851b2 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 29ddea19f..76f244240 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 16 16:49:36 CEST 2016
+#Thu Sep 22 11:02:09 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
diff --git a/libs/analytics/WordPressAnalytics/build.gradle b/libs/analytics/WordPressAnalytics/build.gradle
index e7949266f..6332955f4 100644
--- a/libs/analytics/WordPressAnalytics/build.gradle
+++ b/libs/analytics/WordPressAnalytics/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
@@ -40,7 +40,7 @@ archivesBaseName = "analytics"
 
 signing {
     required {
-        has("release") && project.properties.containsKey("signing.keyId") && project.properties.containsKey("signing.secretKeyRingFile")
+        project.properties.containsKey("signing.keyId") && project.properties.containsKey("signing.secretKeyRingFile")
     }
     sign configurations.archives
 }
diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle
index 17e88bb72..ccfb60927 100644
--- a/libs/editor/WordPressEditor/build.gradle
+++ b/libs/editor/WordPressEditor/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
@@ -45,9 +45,9 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile 'com.android.support:support-v4:24.1.1'
-    compile 'com.android.support:design:24.1.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:support-v4:24.2.1'
+    compile 'com.android.support:design:24.2.1'
     compile 'org.wordpress:utils:1.11.0'
 }
 
diff --git a/libs/editor/example/build.gradle b/libs/editor/example/build.gradle
index 091d578a1..d45489a35 100644
--- a/libs/editor/example/build.gradle
+++ b/libs/editor/example/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
diff --git a/libs/networking/WordPressNetworking/build.gradle b/libs/networking/WordPressNetworking/build.gradle
index 038e9362b..c0e937773 100644
--- a/libs/networking/WordPressNetworking/build.gradle
+++ b/libs/networking/WordPressNetworking/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle
index 316210576..96191a5d0 100644
--- a/libs/utils/WordPressUtils/build.gradle
+++ b/libs/utils/WordPressUtils/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
@@ -20,7 +20,7 @@ dependencies {
         exclude group: 'commons-logging'
     }
     compile 'com.mcxiaoke.volley:library:1.0.18'
-    compile 'com.android.support:support-v13:24.1.1'
+    compile 'com.android.support:support-v13:24.2.1'
 }
 
 android {