diff --git a/CHANGELOG.md b/CHANGELOG.md
index e86f1b0e8..035835839 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Wikimedia Commons for Android
 
+## v2.6.7
+- Added null checks to prevent frequent crashes in ModificationsSyncAdapter
+
 ## v2.6.6
 - Refactored Dagger to fix crashes encountered in production
 - Fixed "?" displaying in description of Nearby places
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..ee7f42e06
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1 @@
+Please see our guidelines in the wiki: https://github.com/commons-app/apps-android-commons/wiki/Volunteers-welcome%21
diff --git a/app/build.gradle b/app/build.gradle
index 284b07ecc..98693126e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,8 +83,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 81
-        versionName '2.6.6'
+        versionCode 82
+        versionName '2.6.7'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion project.minSdkVersion
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/AccountUtil.java b/app/src/main/java/fr/free/nrw/commons/auth/AccountUtil.java
index a020c1fb7..0513280b5 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/AccountUtil.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/AccountUtil.java
@@ -19,6 +19,8 @@ import static fr.free.nrw.commons.modifications.ModificationsContentProvider.MOD
 public class AccountUtil {
 
     public static final String ACCOUNT_TYPE = "fr.free.nrw.commons";
+    public static final String AUTH_COOKIE = "authCookie";
+    public static final String AUTH_TOKEN_TYPE = "CommonsAndroid";
     private final Context context;
 
     public AccountUtil(Context context) {
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
index e793d5eb9..e39528252 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
@@ -1,71 +1,29 @@
 package fr.free.nrw.commons.auth;
 
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerFuture;
 import android.os.Bundle;
 
 import javax.inject.Inject;
 
+import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
-import timber.log.Timber;
 
-import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
-import static fr.free.nrw.commons.auth.AccountUtil.ACCOUNT_TYPE;
+import static fr.free.nrw.commons.auth.AccountUtil.AUTH_COOKIE;
 
 public abstract class AuthenticatedActivity extends NavigationBaseActivity {
 
     @Inject SessionManager sessionManager;
-
+    @Inject
+    MediaWikiApi mediaWikiApi;
     private String authCookie;
 
-
-    private void getAuthCookie(Account account, AccountManager accountManager) {
-        Single.fromCallable(() -> accountManager.blockingGetAuthToken(account, "", false))
-                .subscribeOn(Schedulers.io())
-                .doOnError(Timber::e)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        this:: onAuthCookieAcquired,
-                        throwable -> onAuthFailure());
-    }
-
-    private void addAccount(AccountManager accountManager) {
-        Single.just(accountManager.addAccount(ACCOUNT_TYPE, null, null,
-                null, AuthenticatedActivity.this, null, null))
-                .subscribeOn(Schedulers.io())
-                .map(AccountManagerFuture::getResult)
-                .doOnEvent((bundle, throwable) -> {
-                    if (!bundle.containsKey(KEY_ACCOUNT_NAME)) {
-                        throw new RuntimeException("Bundle doesn't contain account-name key: "
-                                + KEY_ACCOUNT_NAME);
-                    }
-                })
-                .map(bundle -> bundle.getString(KEY_ACCOUNT_NAME))
-                .doOnError(Timber::e)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(s -> {
-                            Account[] allAccounts = accountManager.getAccountsByType(ACCOUNT_TYPE);
-                            Account curAccount = allAccounts[0];
-                            getAuthCookie(curAccount, accountManager);
-                        },
-                        throwable -> onAuthFailure());
-    }
-
     protected void requestAuthToken() {
         if (authCookie != null) {
             onAuthCookieAcquired(authCookie);
             return;
         }
-        AccountManager accountManager = AccountManager.get(this);
-        Account curAccount = sessionManager.getCurrentAccount();
-        if (curAccount == null) {
-            addAccount(accountManager);
-        } else {
-            getAuthCookie(curAccount, accountManager);
+        authCookie = sessionManager.getAuthCookie();
+        if (authCookie != null) {
+            onAuthCookieAcquired(authCookie);
         }
     }
 
@@ -74,14 +32,14 @@ public abstract class AuthenticatedActivity extends NavigationBaseActivity {
         super.onCreate(savedInstanceState);
 
         if (savedInstanceState != null) {
-            authCookie = savedInstanceState.getString("authCookie");
+            authCookie = savedInstanceState.getString(AUTH_COOKIE);
         }
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putString("authCookie", authCookie);
+        outState.putString(AUTH_COOKIE, authCookie);
     }
 
     protected abstract void onAuthCookieAcquired(String authCookie);
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index 780f4310b..c5707b970 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -1,6 +1,9 @@
 package fr.free.nrw.commons.auth;
 
+import android.accounts.Account;
 import android.accounts.AccountAuthenticatorActivity;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -8,6 +11,7 @@ import android.os.Bundle;
 import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
+import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.NavUtils;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatDelegate;
@@ -21,6 +25,8 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import java.io.IOException;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -36,10 +42,16 @@ import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import timber.log.Timber;
 
 import static android.view.KeyEvent.KEYCODE_ENTER;
+import static android.view.View.VISIBLE;
 import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
+import static fr.free.nrw.commons.auth.AccountUtil.ACCOUNT_TYPE;
+import static fr.free.nrw.commons.auth.AccountUtil.AUTH_TOKEN_TYPE;
 
 public class LoginActivity extends AccountAuthenticatorActivity {
 
@@ -58,6 +70,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     @BindView(R.id.loginTwoFactor) EditText twoFactorEdit;
     @BindView(R.id.error_message_container) ViewGroup errorMessageContainer;
     @BindView(R.id.error_message) TextView errorMessage;
+    @BindView(R.id.two_factor_container)TextInputLayout twoFactorContainer;
     ProgressDialog progressDialog;
     private AppCompatDelegate delegate;
     private LoginTextWatcher textWatcher = new LoginTextWatcher();
@@ -122,14 +135,109 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         super.onDestroy();
     }
 
-    private LoginTask getLoginTask() {
-        return new LoginTask(
-                this,
-                canonicializeUsername(usernameEdit.getText().toString()),
-                passwordEdit.getText().toString(),
-                twoFactorEdit.getText().toString(),
-                accountUtil, mwApi, defaultPrefs
-        );
+    private void performLogin() {
+        Timber.d("Login to start!");
+        final String username = canonicializeUsername(usernameEdit.getText().toString());
+        final String password = passwordEdit.getText().toString();
+        String twoFactorCode = twoFactorEdit.getText().toString();
+
+        showLoggingProgressBar();
+        Observable.fromCallable(() -> login(username, password, twoFactorCode))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(result -> handleLogin(username, password, result));
+    }
+
+    private String login(String username, String password, String twoFactorCode) {
+        try {
+            if (twoFactorCode.isEmpty()) {
+                return mwApi.login(username, password);
+            } else {
+                return mwApi.login(username, password, twoFactorCode);
+            }
+        } catch (IOException e) {
+            // Do something better!
+            return "NetworkFailure";
+        }
+    }
+
+    private void handleLogin(String username, String password, String result) {
+        Timber.d("Login done!");
+        if (result.equals("PASS")) {
+            handlePassResult(username, password);
+        } else {
+            handleOtherResults(result);
+        }
+    }
+
+    private void showLoggingProgressBar() {
+        progressDialog = new ProgressDialog(this);
+        progressDialog.setIndeterminate(true);
+        progressDialog.setTitle(getString(R.string.logging_in_title));
+        progressDialog.setMessage(getString(R.string.logging_in_message));
+        progressDialog.setCanceledOnTouchOutside(false);
+        progressDialog.show();
+    }
+
+    private void handlePassResult(String username, String password) {
+        showSuccessAndDismissDialog();
+        requestAuthToken();
+        AccountAuthenticatorResponse response = null;
+
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            Timber.d("Bundle of extras: %s", extras);
+            response = extras.getParcelable(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
+            if (response != null) {
+                Bundle authResult = new Bundle();
+                authResult.putString(AccountManager.KEY_ACCOUNT_NAME, username);
+                authResult.putString(AccountManager.KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
+                response.onResult(authResult);
+            }
+        }
+
+        accountUtil.createAccount(response, username, password);
+        startMainActivity();
+    }
+
+    protected void requestAuthToken() {
+        AccountManager accountManager = AccountManager.get(this);
+        Account curAccount = sessionManager.getCurrentAccount();
+        if (curAccount != null) {
+            accountManager.setAuthToken(curAccount, AUTH_TOKEN_TYPE, mwApi.getAuthCookie());
+        }
+    }
+
+    /**
+     * Match known failure message codes and provide messages.
+     *
+     * @param result String
+     */
+    private void handleOtherResults(String result) {
+        if (result.equals("NetworkFailure")) {
+            // Matches NetworkFailure which is created by the doInBackground method
+            showMessageAndCancelDialog(R.string.login_failed_network);
+        } else if (result.toLowerCase().contains("nosuchuser".toLowerCase()) || result.toLowerCase().contains("noname".toLowerCase())) {
+            // Matches nosuchuser, nosuchusershort, noname
+            showMessageAndCancelDialog(R.string.login_failed_username);
+            emptySensitiveEditFields();
+        } else if (result.toLowerCase().contains("wrongpassword".toLowerCase())) {
+            // Matches wrongpassword, wrongpasswordempty
+            showMessageAndCancelDialog(R.string.login_failed_password);
+            emptySensitiveEditFields();
+        } else if (result.toLowerCase().contains("throttle".toLowerCase())) {
+            // Matches unknown throttle error codes
+            showMessageAndCancelDialog(R.string.login_failed_throttled);
+        } else if (result.toLowerCase().contains("userblocked".toLowerCase())) {
+            // Matches login-userblocked
+            showMessageAndCancelDialog(R.string.login_failed_blocked);
+        } else if (result.equals("2FA")) {
+            askUserForTwoFactorAuth();
+        } else {
+            // Occurs with unhandled login failure codes
+            Timber.d("Login failed with reason: %s", result);
+            showMessageAndCancelDialog(R.string.login_failed_generic);
+        }
     }
 
     /**
@@ -181,12 +289,10 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     }
 
     public void askUserForTwoFactorAuth() {
-        if (BuildConfig.DEBUG) {
-            twoFactorEdit.setVisibility(View.VISIBLE);
-            showMessageAndCancelDialog(R.string.login_failed_2fa_needed);
-        } else {
-            showMessageAndCancelDialog(R.string.login_failed_2fa_not_supported);
-        }
+        progressDialog.dismiss();
+        twoFactorContainer.setVisibility(VISIBLE);
+        twoFactorEdit.setVisibility(VISIBLE);
+        showMessageAndCancelDialog(R.string.login_failed_2fa_needed);
     }
 
     public void showMessageAndCancelDialog(@StringRes int resId) {
@@ -209,12 +315,6 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         finish();
     }
 
-    private void performLogin() {
-        Timber.d("Login to start!");
-        LoginTask task = getLoginTask();
-        task.execute();
-    }
-
     private void signUp() {
         Intent intent = new Intent(this, SignupActivity.class);
         startActivity(intent);
@@ -238,7 +338,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     private void showMessage(@StringRes int resId, @ColorRes int colorResId) {
         errorMessage.setText(getString(resId));
         errorMessage.setTextColor(ContextCompat.getColor(this, colorResId));
-        errorMessageContainer.setVisibility(View.VISIBLE);
+        errorMessageContainer.setVisibility(VISIBLE);
     }
 
     private AppCompatDelegate getDelegate() {
@@ -260,7 +360,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         @Override
         public void afterTextChanged(Editable editable) {
             boolean enabled = usernameEdit.getText().length() != 0 && passwordEdit.getText().length() != 0
-                    && (BuildConfig.DEBUG || twoFactorEdit.getText().length() != 0 || twoFactorEdit.getVisibility() != View.VISIBLE);
+                    && (BuildConfig.DEBUG || twoFactorEdit.getText().length() != 0 || twoFactorEdit.getVisibility() != VISIBLE);
             loginButton.setEnabled(enabled);
         }
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java b/app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java
index 779b73b34..a7e62c34e 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java
@@ -2,15 +2,13 @@ package fr.free.nrw.commons.auth;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
 import android.content.Context;
-
-import java.io.IOException;
+import android.content.SharedPreferences;
 
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import io.reactivex.Completable;
 import io.reactivex.Observable;
+import timber.log.Timber;
 
 import static fr.free.nrw.commons.auth.AccountUtil.ACCOUNT_TYPE;
 
@@ -21,11 +19,13 @@ public class SessionManager {
     private final Context context;
     private final MediaWikiApi mediaWikiApi;
     private Account currentAccount; // Unlike a savings account...  ;-)
+    private SharedPreferences sharedPreferences;
 
-    public SessionManager(Context context, MediaWikiApi mediaWikiApi) {
+    public SessionManager(Context context, MediaWikiApi mediaWikiApi, SharedPreferences sharedPreferences) {
         this.context = context;
         this.mediaWikiApi = mediaWikiApi;
         this.currentAccount = null;
+        this.sharedPreferences = sharedPreferences;
     }
 
     /**
@@ -51,14 +51,28 @@ public class SessionManager {
         }
 
         accountManager.invalidateAuthToken(ACCOUNT_TYPE, mediaWikiApi.getAuthCookie());
-        try {
-            String authCookie = accountManager.blockingGetAuthToken(curAccount, "", false);
-            mediaWikiApi.setAuthCookie(authCookie);
-            return true;
-        } catch (OperationCanceledException | NullPointerException | IOException | AuthenticatorException e) {
-            e.printStackTrace();
+        String authCookie = getAuthCookie();
+
+        if (authCookie == null) {
             return false;
         }
+        mediaWikiApi.setAuthCookie(authCookie);
+        return true;
+    }
+
+    public String getAuthCookie() {
+        boolean isLoggedIn = sharedPreferences.getBoolean("isUserLoggedIn", false);
+
+        if (!isLoggedIn) {
+            Timber.e("User is not logged in");
+            return null;
+        } else {
+            String authCookie = sharedPreferences.getString("getAuthCookie", null);
+            if (authCookie == null) {
+                Timber.e("Auth cookie is null even after login");
+            }
+            return authCookie;
+        }
     }
 
     public Completable clearAllAccounts() {
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java
index c08e27966..78039f6a9 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java
@@ -5,53 +5,37 @@ import android.accounts.Account;
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.accounts.NetworkErrorException;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import java.io.IOException;
+import fr.free.nrw.commons.contributions.ContributionsContentProvider;
+import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
-
-import static android.accounts.AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION;
-import static android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE;
-import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
-import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE;
-import static android.accounts.AccountManager.KEY_AUTHTOKEN;
-import static android.accounts.AccountManager.KEY_BOOLEAN_RESULT;
-import static android.accounts.AccountManager.KEY_ERROR_CODE;
-import static android.accounts.AccountManager.KEY_ERROR_MESSAGE;
-import static android.accounts.AccountManager.KEY_INTENT;
 import static fr.free.nrw.commons.auth.AccountUtil.ACCOUNT_TYPE;
-import static fr.free.nrw.commons.auth.LoginActivity.PARAM_USERNAME;
+import static fr.free.nrw.commons.auth.AccountUtil.AUTH_TOKEN_TYPE;
 
 public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
+    private static final String[] SYNC_AUTHORITIES = {ContributionsContentProvider.CONTRIBUTION_AUTHORITY, ModificationsContentProvider.MODIFICATIONS_AUTHORITY};
 
+    @NonNull
     private final Context context;
-    private MediaWikiApi mediaWikiApi;
 
-    WikiAccountAuthenticator(Context context, MediaWikiApi mwApi) {
+    public WikiAccountAuthenticator(@NonNull Context context) {
         super(context);
         this.context = context;
-        this.mediaWikiApi = mwApi;
     }
 
-    private Bundle unsupportedOperation() {
+    @Override
+    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
         Bundle bundle = new Bundle();
-        bundle.putInt(KEY_ERROR_CODE, ERROR_CODE_UNSUPPORTED_OPERATION);
-
-        // HACK: the docs indicate that this is a required key bit it's not displayed to the user.
-        bundle.putString(KEY_ERROR_MESSAGE, "");
-
+        bundle.putString("test", "editProperties");
         return bundle;
     }
 
-    private boolean supportedAccountType(@Nullable String type) {
-        return ACCOUNT_TYPE.equals(type);
-    }
-
     @Override
     public Bundle addAccount(@NonNull AccountAuthenticatorResponse response,
                              @NonNull String accountType, @Nullable String authTokenType,
@@ -59,86 +43,48 @@ public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
             throws NetworkErrorException {
 
         if (!supportedAccountType(accountType)) {
-            return unsupportedOperation();
+            Bundle bundle = new Bundle();
+            bundle.putString("test", "addAccount");
+            return bundle;
         }
 
         return addAccount(response);
     }
 
-    private Bundle addAccount(AccountAuthenticatorResponse response) {
-        Intent Intent = new Intent(context, LoginActivity.class);
-        Intent.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
-
-        Bundle bundle = new Bundle();
-        bundle.putParcelable(KEY_INTENT, Intent);
-
-        return bundle;
-    }
-
     @Override
     public Bundle confirmCredentials(@NonNull AccountAuthenticatorResponse response,
                                      @NonNull Account account, @Nullable Bundle options)
             throws NetworkErrorException {
-        return unsupportedOperation();
+        Bundle bundle = new Bundle();
+        bundle.putString("test", "confirmCredentials");
+        return bundle;
     }
 
     @Override
-    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
-        return unsupportedOperation();
-    }
-
-    private String getAuthCookie(String username, String password) throws IOException {
-        //TODO add 2fa support here
-        String result = mediaWikiApi.login(username, password);
-        if (result.equals("PASS")) {
-            return mediaWikiApi.getAuthCookie();
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
-                               String authTokenType, Bundle options) throws NetworkErrorException {
-        // Extract the username and password from the Account Manager, and ask
-        // the server for an appropriate AuthToken.
-        final AccountManager am = AccountManager.get(context);
-        final String password = am.getPassword(account);
-        if (password != null) {
-            String authCookie;
-            try {
-                authCookie = getAuthCookie(account.name, password);
-            } catch (IOException e) {
-                // Network error!
-                e.printStackTrace();
-                throw new NetworkErrorException(e);
-            }
-            if (authCookie != null) {
-                final Bundle result = new Bundle();
-                result.putString(KEY_ACCOUNT_NAME, account.name);
-                result.putString(KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
-                result.putString(KEY_AUTHTOKEN, authCookie);
-                return result;
-            }
-        }
-
-        // If we get here, then we couldn't access the user's password - so we
-        // need to re-prompt them for their credentials. We do that by creating
-        // an intent to display our AuthenticatorActivity panel.
-        final Intent intent = new Intent(context, LoginActivity.class);
-        intent.putExtra(PARAM_USERNAME, account.name);
-        intent.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
-        final Bundle bundle = new Bundle();
-        bundle.putParcelable(KEY_INTENT, intent);
+    public Bundle getAuthToken(@NonNull AccountAuthenticatorResponse response,
+                               @NonNull Account account, @NonNull String authTokenType,
+                               @Nullable Bundle options)
+            throws NetworkErrorException {
+        Bundle bundle = new Bundle();
+        bundle.putString("test", "getAuthToken");
         return bundle;
     }
 
     @Nullable
     @Override
     public String getAuthTokenLabel(@NonNull String authTokenType) {
-        //Note: the wikipedia app actually returns a string here....
-        //return supportedAccountType(authTokenType) ? context.getString(R.string.wikimedia) : null;
-        return null;
+        return supportedAccountType(authTokenType) ? AUTH_TOKEN_TYPE : null;
+    }
+
+    @Nullable
+    @Override
+    public Bundle updateCredentials(@NonNull AccountAuthenticatorResponse response,
+                                    @NonNull Account account, @Nullable String authTokenType,
+                                    @Nullable Bundle options)
+            throws NetworkErrorException {
+        Bundle bundle = new Bundle();
+        bundle.putString("test", "updateCredentials");
+        return bundle;
     }
 
     @Nullable
@@ -147,16 +93,50 @@ public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
                               @NonNull Account account, @NonNull String[] features)
             throws NetworkErrorException {
         Bundle bundle = new Bundle();
-        bundle.putBoolean(KEY_BOOLEAN_RESULT, false);
+        bundle.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, false);
         return bundle;
     }
 
-    @Nullable
-    @Override
-    public Bundle updateCredentials(@NonNull AccountAuthenticatorResponse response,
-                                    @NonNull Account account, @Nullable String authTokenType,
-                                    @Nullable Bundle options) throws NetworkErrorException {
-        return unsupportedOperation();
+    private boolean supportedAccountType(@Nullable String type) {
+        return ACCOUNT_TYPE.equals(type);
     }
 
+    private Bundle addAccount(AccountAuthenticatorResponse response) {
+        Intent intent = new Intent(context, LoginActivity.class);
+        intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
+
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(AccountManager.KEY_INTENT, intent);
+
+        return bundle;
+    }
+
+    private Bundle unsupportedOperation() {
+        Bundle bundle = new Bundle();
+        bundle.putInt(AccountManager.KEY_ERROR_CODE, AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION);
+
+        // HACK: the docs indicate that this is a required key bit it's not displayed to the user.
+        bundle.putString(AccountManager.KEY_ERROR_MESSAGE, "");
+
+        return bundle;
+    }
+
+    @Override
+    public Bundle getAccountRemovalAllowed(AccountAuthenticatorResponse response,
+                                           Account account) throws NetworkErrorException {
+        Bundle result = super.getAccountRemovalAllowed(response, account);
+
+        if (result.containsKey(AccountManager.KEY_BOOLEAN_RESULT)
+                && !result.containsKey(AccountManager.KEY_INTENT)) {
+            boolean allowed = result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT);
+
+            if (allowed) {
+                for (String auth : SYNC_AUTHORITIES) {
+                    ContentResolver.cancelSync(account, auth);
+                }
+            }
+        }
+
+        return result;
+    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
index 6bc6de076..826f2ceee 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
@@ -1,30 +1,26 @@
 package fr.free.nrw.commons.auth;
 
+import android.accounts.AbstractAccountAuthenticator;
 import android.content.Intent;
 import android.os.IBinder;
-
-import javax.inject.Inject;
+import android.support.annotation.Nullable;
 
 import fr.free.nrw.commons.di.CommonsDaggerService;
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
-
-import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT;
 
 public class WikiAccountAuthenticatorService extends CommonsDaggerService {
 
-    @Inject MediaWikiApi mwApi;
-    private WikiAccountAuthenticator wikiAccountAuthenticator = null;
+    @Nullable
+    private AbstractAccountAuthenticator authenticator;
 
     @Override
-    public IBinder onBind(Intent intent) {
-        if (!intent.getAction().equals(ACTION_AUTHENTICATOR_INTENT)) {
-            return null;
-        }
-
-        if (wikiAccountAuthenticator == null) {
-            wikiAccountAuthenticator = new WikiAccountAuthenticator(this, mwApi);
-        }
-        return wikiAccountAuthenticator.getIBinder();
+    public void onCreate() {
+        super.onCreate();
+        authenticator = new WikiAccountAuthenticator(this);
     }
 
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return authenticator == null ? null : authenticator.getIBinder();
+    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
index f7e11dbf8..efc9c29b6 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
@@ -96,14 +96,15 @@ public class CommonsApplicationModule {
     @Provides
     @Singleton
     public SessionManager providesSessionManager(Context context,
-                                                 MediaWikiApi mediaWikiApi) {
-        return new SessionManager(context, mediaWikiApi);
+                                                 MediaWikiApi mediaWikiApi,
+                                                 @Named("default_preferences") SharedPreferences sharedPreferences) {
+        return new SessionManager(context, mediaWikiApi, sharedPreferences);
     }
 
     @Provides
     @Singleton
-    public MediaWikiApi provideMediaWikiApi(Context context) {
-        return new ApacheHttpClientMediaWikiApi(context, BuildConfig.WIKIMEDIA_API_HOST);
+    public MediaWikiApi provideMediaWikiApi(Context context, @Named("default_preferences") SharedPreferences sharedPreferences) {
+        return new ApacheHttpClientMediaWikiApi(context, BuildConfig.WIKIMEDIA_API_HOST, sharedPreferences);
     }
 
     @Provides
diff --git a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
index 85bfedcfa..5d716d738 100644
--- a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
@@ -1,9 +1,6 @@
 package fr.free.nrw.commons.modifications;
 
 import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
 import android.content.AbstractThreadedSyncAdapter;
 import android.content.ContentProviderClient;
 import android.content.Context;
@@ -16,7 +13,7 @@ import java.io.IOException;
 
 import javax.inject.Inject;
 
-import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.contributions.ContributionDao;
 import fr.free.nrw.commons.contributions.ContributionsContentProvider;
@@ -29,6 +26,8 @@ public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
     @Inject MediaWikiApi mwApi;
     @Inject ContributionDao contributionDao;
     @Inject ModifierSequenceDao modifierSequenceDao;
+    @Inject
+    SessionManager sessionManager;
 
     public ModificationsSyncAdapter(Context context, boolean autoInitialize) {
         super(context, autoInitialize);
@@ -56,16 +55,7 @@ public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
             return;
         }
 
-        String authCookie;
-        try {
-            authCookie = AccountManager.get(getContext()).blockingGetAuthToken(account, "", false);
-        } catch (OperationCanceledException | AuthenticatorException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
-            Timber.d("Could not authenticate :(");
-            return;
-        }
-
+        String authCookie = sessionManager.getAuthCookie();
         if (isNullOrWhiteSpace(authCookie)) {
             Timber.d("Could not authenticate :(");
             return;
@@ -92,22 +82,31 @@ public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
             while (!allModifications.isAfterLast()) {
                 ModifierSequence sequence = modifierSequenceDao.fromCursor(allModifications);
                 Contribution contrib;
-
                 Cursor contributionCursor;
+
+                if (contributionsClient == null) {
+                    Timber.e("ContributionsClient is null. This should not happen!");
+                    return;
+                }
+
                 try {
                     contributionCursor = contributionsClient.query(sequence.getMediaUri(), null, null, null, null);
                 } catch (RemoteException e) {
                     throw new RuntimeException(e);
                 }
-                contributionCursor.moveToFirst();
+
+                if (contributionCursor != null) {
+                    contributionCursor.moveToFirst();
+                }
+
                 contrib = contributionDao.fromCursor(contributionCursor);
 
-                if (contrib.getState() == Contribution.STATE_COMPLETED) {
+                if (contrib != null && contrib.getState() == Contribution.STATE_COMPLETED) {
                     String pageContent;
                     try {
                         pageContent = mwApi.revisionsByFilename(contrib.getFilename());
                     } catch (IOException e) {
-                        Timber.d("Network fuckup on modifications sync!");
+                        Timber.d("Network messed up on modifications sync!");
                         continue;
                     }
 
@@ -118,13 +117,13 @@ public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
                     try {
                         editResult = mwApi.edit(editToken, processedPageContent, contrib.getFilename(), sequence.getEditSummary());
                     } catch (IOException e) {
-                        Timber.d("Network fuckup on modifications sync!");
+                        Timber.d("Network messed up on modifications sync!");
                         continue;
                     }
 
                     Timber.d("Response is %s", editResult);
 
-                    if (!editResult.equals("Success")) {
+                    if (!"Success".equals(editResult)) {
                         // FIXME: Log this somewhere else
                         Timber.d("Non success result! %s", editResult);
                     } else {
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
index 09e89e7b4..fe9700ef5 100644
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.mwapi;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -60,8 +61,9 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
     private AbstractHttpClient httpClient;
     private MWApi api;
     private Context context;
+    private SharedPreferences sharedPreferences;
 
-    public ApacheHttpClientMediaWikiApi(Context context, String apiURL) {
+    public ApacheHttpClientMediaWikiApi(Context context, String apiURL, SharedPreferences sharedPreferences) {
         this.context = context;
         BasicHttpParams params = new BasicHttpParams();
         SchemeRegistry schemeRegistry = new SchemeRegistry();
@@ -69,9 +71,16 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
         final SSLSocketFactory sslSocketFactory = SSLSocketFactory.getSocketFactory();
         schemeRegistry.register(new Scheme("https", sslSocketFactory, 443));
         ClientConnectionManager cm = new ThreadSafeClientConnManager(params, schemeRegistry);
-        params.setParameter(CoreProtocolPNames.USER_AGENT, "Commons/" + BuildConfig.VERSION_NAME + " (https://mediawiki.org/wiki/Apps/Commons) Android/" + Build.VERSION.RELEASE);
+        params.setParameter(CoreProtocolPNames.USER_AGENT, getUserAgent());
         httpClient = new DefaultHttpClient(cm, params);
         api = new MWApi(apiURL, httpClient);
+        this.sharedPreferences = sharedPreferences;
+    }
+
+    @Override
+    @NonNull
+    public String getUserAgent() {
+        return "Commons/" + BuildConfig.VERSION_NAME + " (https://mediawiki.org/wiki/Apps/Commons) Android/" + Build.VERSION.RELEASE;
     }
 
     @VisibleForTesting
@@ -86,11 +95,13 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
      * @throws IOException On api request IO issue
      */
     public String login(String username, String password) throws IOException {
+        String loginToken = getLoginToken();
+        Timber.d("Login token is %s", loginToken);
         return getErrorCodeToReturn(api.action("clientlogin")
                 .param("rememberMe", "1")
                 .param("username", username)
                 .param("password", password)
-                .param("logintoken", getLoginToken())
+                .param("logintoken", loginToken)
                 .param("loginreturnurl", "https://commons.wikimedia.org")
                 .post());
     }
@@ -103,12 +114,14 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
      * @throws IOException On api request IO issue
      */
     public String login(String username, String password, String twoFactorCode) throws IOException {
+        String loginToken = getLoginToken();
+        Timber.d("Login token is %s", loginToken);
         return getErrorCodeToReturn(api.action("clientlogin")
-                .param("rememberMe", "1")
+                .param("rememberMe", "true")
                 .param("username", username)
                 .param("password", password)
-                .param("logintoken", getLoginToken())
-                .param("logincontinue", "1")
+                .param("logintoken", loginToken)
+                .param("logincontinue", "true")
                 .param("OATHToken", twoFactorCode)
                 .post());
     }
@@ -133,14 +146,17 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
         String status = loginApiResult.getString("/api/clientlogin/@status");
         if (status.equals("PASS")) {
             api.isLoggedIn = true;
+            setAuthCookieOnLogin(true);
             return status;
         } else if (status.equals("FAIL")) {
+            setAuthCookieOnLogin(false);
             return loginApiResult.getString("/api/clientlogin/@messagecode");
         } else if (
                 status.equals("UI")
                         && loginApiResult.getString("/api/clientlogin/requests/_v/@id").equals("TOTPAuthenticationRequest")
                         && loginApiResult.getString("/api/clientlogin/requests/_v/@provider").equals("Two-factor authentication (OATH).")
                 ) {
+            setAuthCookieOnLogin(false);
             return "2FA";
         }
 
@@ -148,6 +164,18 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
         return "genericerror-" + status;
     }
 
+    private void setAuthCookieOnLogin(boolean isLoggedIn) {
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        if (isLoggedIn) {
+            editor.putBoolean("isUserLoggedIn", true);
+            editor.putString("getAuthCookie", api.getAuthCookie());
+        } else {
+            editor.putBoolean("isUserLoggedIn", false);
+            editor.remove("getAuthCookie");
+        }
+        editor.apply();
+    }
+
     @Override
     public String getAuthCookie() {
         return api.getAuthCookie();
diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java
index 70ab38297..da9403b62 100644
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java
@@ -12,6 +12,8 @@ import io.reactivex.Observable;
 import io.reactivex.Single;
 
 public interface MediaWikiApi {
+    String getUserAgent();
+
     String getAuthCookie();
 
     void setAuthCookie(String authCookie);
diff --git a/app/src/main/res/menu/menu_nearby.xml b/app/src/main/res/menu/menu_nearby.xml
index 0143b9ef1..3cc771ea9 100644
--- a/app/src/main/res/menu/menu_nearby.xml
+++ b/app/src/main/res/menu/menu_nearby.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_toggle_view"
-        android:title="@string/refresh_button"
+        android:title="@string/toggle_view_button"
         android:icon="@drawable/ic_map_white_24dp"
         android:orderInCategory="1"
         app:showAsAction="ifRoom"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7ce350f66..0049119be 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">فشل رفع %1$s</string>
   <string name="upload_failed_notification_subtitle">انقر لتشاهد</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d رفع ملف</item>
-    <item quantity="other">%d رفع ملفات</item>
+    <item quantity="one">%1$d رفع ملف</item>
+    <item quantity="other">%1$d رفع ملفات</item>
   </plurals>
   <string name="title_activity_contributions">مرفوعاتي الأخيرة</string>
   <string name="contribution_state_queued">في قائمة الانتظار</string>
@@ -54,6 +54,7 @@
   <string name="gps_disabled">عطل نظام الملاحة العالمي GPS بجهازك. أترغب في التنشيط؟</string>
   <string name="enable_gps">تفعيل GPS</string>
   <string name="contributions_subtitle_zero">لا مرفوعات بعد</string>
+  <string name="multiple_uploads_title">{{جمع|واحد=%1$d رفع|%1$d رفع}}</string>
   <string name="categories_not_found">لا توجد تصنيفات تطابق %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">أضف التصانيف لتسهل اكتشاف صورك على ويكيميديا كومنز.\n\nابدأ الكتاب لتضيف التصانيف.\nانقر هذه الرسالة لتتجاوز هذه الخطوة.</string>
   <string name="categories_activity_title">تصنيفات</string>
@@ -122,4 +123,7 @@
   <string name="navigation_item_logout">تسجيل الخروج</string>
   <string name="navigation_item_notification">إشعارات</string>
   <string name="nearby_info_menu_commons_article">صفحة ملف كومنز</string>
+  <string name="notifications_welcome">مرحبا بكم في ويكيمديا كومنز، %1$s! نحن سعداء لأنك هنا.</string>
+  <string name="notifications_talk_page_message">%1$s رسالة على صفحة الحديث</string>
+  <string name="notifications_mention">%1$s ذكر لك على %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index a2b64fde6..204fd3767 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Toque pa velo</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">Xubiendo un ficheru</item>
-    <item quantity="other">Xubiendo %d ficheros</item>
+    <item quantity="other">Xubiendo %1$d ficheros</item>
   </plurals>
   <string name="title_activity_contributions">Les mios xubes recién</string>
   <string name="contribution_state_queued">En cola</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Inda nun hai xubes</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">1 carga</item>
-    <item quantity="other">%d cargues</item>
+    <item quantity="one">%1$d carga</item>
+    <item quantity="other">%1$d cargues</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Principiando 1 carga</item>
-    <item quantity="other">Principiando %d cargues</item>
+    <item quantity="one">Principiando %1$d carga</item>
+    <item quantity="other">Principiando %1$d cargues</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">1 carga</item>
-    <item quantity="other">%d cargues</item>
+    <item quantity="one">%1$d carga</item>
+    <item quantity="other">%1$d cargues</item>
   </plurals>
   <string name="categories_not_found">Nun s\'alcontró denguna categoría que case con %1$s</string>
   <string name="categories_skip_explanation">Amiesta categoríes pa facer les imaxes más fáciles d\'alcontrar en Wikimedia Commons.\nPrincipia a escribir p\'amestar categoríes.</string>
@@ -74,7 +74,7 @@
   <string name="title_activity_signup">Date d\'alta</string>
   <string name="menu_about">Tocante a</string>
   <string name="about_license">La app de Wikimedia Commons ye software de códigu abiertu, creáu y calteníu por becaos y voluntarios de la comunidá de Wikimedia. La Fundación Wikimedia nun participa na creación, desendolcu nin caltenimientu de la app.</string>
-  <string name="about_improve" fuzzy="true">El &lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;códigu fonte&lt;/a&gt; ya\'l &lt;a href=\"https://commons-app.github.io/\"&gt;sitiu web&lt;/a&gt; tán en GitHub. Crea una nueva &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;incidencia en GitHub&lt;/a&gt; pa informar de problemes y suxerencies.</string>
+  <string name="about_improve">Crea una nueva &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;incidencia en GitHub&lt;/a&gt; pa informar de problemes y suxerencies.</string>
   <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Política d\'intimidá&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Créditos&lt;/a&gt;</string>
   <string name="title_activity_about">Tocante a</string>
@@ -164,6 +164,9 @@
   <string name="login_failed_2fa_not_supported">Anguaño nun hai encontu pa autenticación de dos factores.</string>
   <string name="logout_verification">¿Confirmes que quies salir?</string>
   <string name="commons_logo">Logo de Commons</string>
+  <string name="commons_website">Sitiu web de Commons</string>
+  <string name="commons_facebook">Páxina de Facebook de Commons</string>
+  <string name="commons_github">Códigu fonte de Commons en GitHub</string>
   <string name="background_image">Imaxe de fondu</string>
   <string name="mediaimage_failed">Falló la imaxe multimedia</string>
   <string name="no_image_found">Nun s\'atopó nenguna imaxe</string>
@@ -207,4 +210,9 @@
   <string name="location_permission_rationale_nearby">Ríquese permisu p\'amosar una llista de llugares cercanos</string>
   <string name="get_directions">CÓMO LLEGAR</string>
   <string name="read_article">LLEER L\'ARTÍCULU</string>
+  <string name="notifications_welcome">¡Afáyate\'n Wikimedia Commons, %1$s! Préstanos que teas equí.</string>
+  <string name="notifications_talk_page_message">%1$s dexó un mensaxe na to páxina d\'alderique</string>
+  <string name="notifications_thank_you_edit">Gracies por facer una edición</string>
+  <string name="notifications_mention">%1$s te mentó en %2$s.</string>
+  <string name="toggle_view_button">Alternar vista</string>
 </resources>
diff --git a/app/src/main/res/values-b+sr+Latn/strings.xml b/app/src/main/res/values-b+sr+Latn/strings.xml
index af3aaa3e0..be209bfa5 100644
--- a/app/src/main/res/values-b+sr+Latn/strings.xml
+++ b/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Ne mogu da otpremim „%1$s“</string>
   <string name="upload_failed_notification_subtitle">Tapnite da biste videli</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d datoteka se otprema</item>
-    <item quantity="other">%d datoteke se otpremaju</item>
+    <item quantity="one">%1$d datoteka se otprema</item>
+    <item quantity="other">%1$d datoteke se otpremaju</item>
   </plurals>
   <string name="title_activity_contributions">Moja skorašnja otpremanja</string>
   <string name="contribution_state_queued">Na čekanju</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">GPS je onemogućen na Vašem uređaju. Želite li ga omogućiti?</string>
   <string name="enable_gps">Omogući GPS</string>
   <string name="contributions_subtitle_zero">Još uvek nema otpremanja</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d otpremanje</item>
-    <item quantity="other">%d otpremanja</item>
+    <item quantity="one">%1$d otpremanje</item>
+    <item quantity="other">%1$d otpremanja</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">Započni %d otpremanje</item>
-    <item quantity="other">Započni %d otpremanja</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">Započni %1$d otpremanje</item>
+    <item quantity="other">Započni %1$d otpremanja</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d otpremanje</item>
-    <item quantity="other">%d otpremanja</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d otpremanje</item>
+    <item quantity="other">%1$d otpremanja</item>
   </plurals>
   <string name="categories_not_found">Nema kategorija koje odgovaraju %1$s</string>
   <string name="categories_skip_explanation">Dodajte kategorije na slike da biste olakšali korisnicima njihovo pronalaženje na Ostavi.\n\nDa biste dodali kategoriju, počnite sa pisanjem njenog imena.</string>
@@ -205,4 +205,5 @@
   <string name="nearby_location_has_not_changed">Lokacija nije promenjena.</string>
   <string name="nearby_location_not_available">Lokacija nije dostupna.</string>
   <string name="location_permission_rationale_nearby">Potrebna je dozvola za prikazivanje liste lokacija u blizini</string>
+  <string name="notifications_welcome">Dobrodošli na Wikimedia Commons, %1$s! Drago nam je da ste ovdje.</string>
 </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 4628ca951..abb15ac3d 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -32,8 +32,8 @@
   <string name="menu_upload_single">Качване</string>
   <string name="menu_save_categories">Съхраняване</string>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d качване</item>
-    <item quantity="other">%d качвания</item>
+    <item quantity="one">%1$d качване</item>
+    <item quantity="other">%1$d качвания</item>
   </plurals>
   <string name="categories_activity_title">Категории</string>
   <string name="title_activity_settings">Настройки</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 6af522d50..6333a81eb 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$s আপলোড ব্যর্থ</string>
   <string name="upload_failed_notification_subtitle">দেখার জন্য টোকা দিন</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%dটি ফাইল আপলোড হচ্ছে</item>
-    <item quantity="other">%dটি ফাইল আপলোড হচ্ছে</item>
+    <item quantity="one">%1$dটি ফাইল আপলোড হচ্ছে</item>
+    <item quantity="other">%1$dটি ফাইল আপলোড হচ্ছে</item>
   </plurals>
   <string name="title_activity_contributions">আমার সাম্প্রতিক আপলোড</string>
   <string name="contribution_state_queued">অপেক্ষারত</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">এখনো কোন আপলোড নেই</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%dটি আপলোড</item>
-    <item quantity="other">%dটি আপলোড</item>
+    <item quantity="one">%1$dটি আপলোড</item>
+    <item quantity="other">%1$dটি আপলোড</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%dটি আপলোড শুরু হয়েছে</item>
-    <item quantity="other">%dটি আপলোড শুরু হয়েছে</item>
+    <item quantity="one">%1$dটি আপলোড শুরু হয়েছে</item>
+    <item quantity="other">%1$dটি আপলোড শুরু হয়েছে</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%dটি আপলোড</item>
-    <item quantity="other">%dটি আপলোড</item>
+    <item quantity="one">%1$dটি আপলোড</item>
+    <item quantity="other">%1$dটি আপলোড</item>
   </plurals>
   <string name="categories_not_found">%1$s-এর সাথে মিলে এমন কোন বিষয়শ্রেণী পাওয়া যায়নি</string>
   <string name="categories_skip_explanation">উইকিমিডিয়া কমন্স থেকে আপনার মিডিয়া ফাইলটি সহজে খুঁজে পেতে বিষয়শ্রেণী যুক্ত করুন।\n\nবিষয়শ্রেণী যোগ করার জন্য টাইপিং শুরু করুন।</string>
@@ -209,8 +209,8 @@
   <string name="location_permission_rationale_nearby">কাছাকাছি স্থানসমূহের একটি তালিকা প্রদর্শন করতে অনুমতি প্রয়োজন</string>
   <string name="get_directions">নির্দেশনা পান</string>
   <string name="read_article">নিবন্ধ পড়ুন</string>
-  <string name="notifications_welcome">উইকিমিডিয়া কমন্সে স্বাগতম, %s! আপনাকে এখানে পেয়ে আমরা আনন্দিত।</string>
-  <string name="notifications_talk_page_message">%s আপনার আলাপ পাতায় একটি বার্তা দিয়েছেন</string>
+  <string name="notifications_welcome">উইকিমিডিয়া কমন্সে স্বাগতম, %1$s! আপনাকে এখানে পেয়ে আমরা আনন্দিত।</string>
+  <string name="notifications_talk_page_message">%1$s আপনার আলাপ পাতায় একটি বার্তা দিয়েছেন</string>
   <string name="notifications_thank_you_edit">একটি সম্পাদনা করার জন্য আপনাকে ধন্যবাদ</string>
-  <string name="notifications_mention" formatted="false">%s আপনাকে %s-এ উল্লেখ করেছেন।</string>
+  <string name="notifications_mention">%1$s আপনাকে %2$s-এ উল্লেখ করেছেন।</string>
 </resources>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 01a0bc962..7258215aa 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">C\'hwitet en deus enporzhiañ %1$s</string>
   <string name="upload_failed_notification_subtitle">Pouezit evit diskwel</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d restr o vezañ karget</item>
-    <item quantity="other">%d restr o vezañ karget</item>
+    <item quantity="one">%1$d restr o vezañ karget</item>
+    <item quantity="other">%1$d restr o vezañ karget</item>
   </plurals>
   <string name="title_activity_contributions">Ma enporzhiadennoù nevez</string>
   <string name="contribution_state_queued">Lakaet el lostenn</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Enporzhiadenn ebet c\'hoazh !</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">Pellgardenn ebet c\'hoazh</item>
-    <item quantity="one">%d bellgargadenn</item>
-    <item quantity="other">%d Pellgargadennoù</item>
+    <item quantity="one">%1$d bellgargadenn</item>
+    <item quantity="other">%1$d Pellgargadennoù</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d bellgargadenn loc\'het</item>
-    <item quantity="other">%d pellgargadennoù loc\'het</item>
+    <item quantity="one">%1$d bellgargadenn loc\'het</item>
+    <item quantity="other">%1$d pellgargadennoù loc\'het</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d bellgargadenn</item>
-    <item quantity="other">%d pellgargadennoù</item>
+    <item quantity="one">%1$d bellgargadenn</item>
+    <item quantity="other">%1$d pellgargadennoù</item>
   </plurals>
   <string name="categories_not_found">N\'eus bet kavet rummad ebet o klotañ gant %1$s</string>
   <string name="categories_skip_explanation">Ouzhpennit rummadoù evit ma vo aesoc\'h kavout ho skeudennoù war Wikimedia Commons.\n\nKrogit da skrivañ evit ouzhpennañ rummadoù.</string>
@@ -75,7 +75,7 @@
   <string name="menu_about">Diwar-benn</string>
   <string name="about_license" fuzzy="true">Meziant frank a wirioù embannet dindan &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;an Aotre-implijout Apache v2&lt;/a&gt;. Merkoù kenwerzhel eus Diazezadur Wikimedia eo Wikimedia Commons hag e logoioù. Gallout a reont bezañ implijet gant aotre an Diazezadur. N\'omp nag aprouet gant Diazezadur Wiikimedia na stag outañ.</string>
   <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Mammenn&lt;/a&gt; ha &lt;a href=\"https://commons-app.github.io/\"&gt;lec\'hienn&lt;/a&gt; war GitHub. Krouiñ ur &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;gemennadenn GitHub nevez&lt;/a&gt; evit kelaouiñ a-zivout un draen bennak pe bet kinnigoù.</string>
-  <string name="about_privacy_policy" fuzzy="true">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Reolennoù prevezded&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy_policy\"&gt;Reolennoù prevezded&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Trugarekadennoù&lt;/a&gt;</string>
   <string name="title_activity_about">Diwar-benn</string>
   <string name="menu_feedback">Kas ho soñj (dre bostel)</string>
@@ -120,7 +120,7 @@
   <string name="tutorial_3_text">ARABAT enporzhiañ :</string>
   <string name="tutorial_3_subtext">- Emskeudennoù pe skeudennoù eus ho mignoned\n- Skeudennoù pellgarget ganeoc\'h diwar an Internet\n- Tapadennoù-skramm arloadoù prevez</string>
   <string name="tutorial_4_text">Skouer un enporzhiadenn :</string>
-  <string name="tutorial_4_subtext" fuzzy="true">- Titl : Ti opera Sydney\n- Desskrivadur : Ti opera Sydney gwelet eus tu all ar bae\n- Rummadoù : Ti opera Sydney, Ti opera Sydney gwelet eus ar c\'hornôg, Gweloù a-bell eus ti opera Sydney</string>
+  <string name="tutorial_4_subtext">- Titl : Ti opera Sydney\n- Desskrivadur : Ti opera Sydney gwelet eus tu all ar bae\n- Rummadoù : Ti opera Sydney, Ti opera Sydney gwelet eus ar c\'hornôg, Gweloù a-bell eus ti opera Sydney</string>
   <string name="welcome_wikipedia_text">Kemerit perzh gant ho skeudennoù. Sikourit pennadoù Wikipedia da zont da vev !</string>
   <string name="welcome_wikipedia_subtext">Dont a ra skeudennoù Wikipedia eus Wikimedia Commons.</string>
   <string name="welcome_copyright_text">Ho skeudennoù a sikour an dud da zeskiñ traoù dre ar bed a-bezh.</string>
@@ -160,6 +160,9 @@
   <string name="login_failed_2fa_not_supported">Ne vez ket embreget an dilesadur gant daou faktor evit ar mare.</string>
   <string name="logout_verification">Sur oc\'h e fell deoc\'h digevreañ ?</string>
   <string name="commons_logo">Logo Commons</string>
+  <string name="commons_website">Lec\'hienn web Commons</string>
+  <string name="commons_facebook">Pajenn Facebook Commons</string>
+  <string name="commons_github">Kod mammenn Github Commons</string>
   <string name="no_image_found">N\'eus bet kavet skeudenn ebet</string>
   <string name="upload_image">Kargañ ur skeudenn</string>
   <string name="welcome_image_mount_zao">Menez Zao</string>
@@ -185,8 +188,13 @@
   <string name="navigation_item_notification">Kemennoù</string>
   <string name="nearby_needs_permissions">Ne c\'haller ket diskwel al lec\'hioù tost ma ne rannit ket ho lec\'hiadur</string>
   <string name="no_description_found">N\'eus bet kavet deskrivadur ebet</string>
-  <string name="nearby_info_menu_commons_article" fuzzy="true">Pennad Commons</string>
+  <string name="nearby_info_menu_commons_article">Pajennad restroù Commons</string>
   <string name="nearby_info_menu_wikidata_article">Elfenn Wikidata</string>
+  <string name="give_permission">Reiñ ar gwir</string>
+  <string name="use_external_storage">Implijout ar stokañ diavaez</string>
+  <string name="use_external_storage_summary">Enrollit ar skeudennoù tennet gant luc\'hskeudennerez ho penveg</string>
+  <string name="login_to_your_account">Kevreit ouzh ho kont</string>
+  <string name="nearby_location_has_not_changed">N\'eo ket cheñchet al lec\'hiadur.</string>
   <string name="get_directions">Kaout urzhioù</string>
   <string name="read_article">Lenn ar pennad</string>
 </resources>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index b107dda91..05bacb4de 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Postavljanje datoteke %1$s nije uspjelo</string>
   <string name="upload_failed_notification_subtitle">Dodirnite da biste vidjeli</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">postavlja se %d datoteka</item>
-    <item quantity="other">postavlja se %d datoteka</item>
+    <item quantity="one">postavlja se %1$d datoteka</item>
+    <item quantity="other">postavlja se %1$d datoteka</item>
   </plurals>
   <string name="title_activity_contributions">Moje nedavno postavljene datoteke</string>
   <string name="contribution_state_queued">Na čekanju</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">GPS je onemogućen na Vašem uređaju. Želite li ga omogućiti?</string>
   <string name="enable_gps">Omogući GPS</string>
   <string name="contributions_subtitle_zero">Zasad nema postavljenih datoteka</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">postavljena %d datoteka</item>
-    <item quantity="other">postavljenih datoteka: %d</item>
+    <item quantity="one">postavljena %1$d datoteka</item>
+    <item quantity="other">postavljenih datoteka: %1$d</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">Započinjem postavljanje %d datoteke</item>
-    <item quantity="other">Započinjem postavljanje %d datoteka/-e</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">Započinjem postavljanje %1$d datoteke</item>
+    <item quantity="other">Započinjem postavljanje %1$d datoteka/-e</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d postavljanje</item>
-    <item quantity="other">%d postavljanja</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d postavljanje</item>
+    <item quantity="other">%1$d postavljanja</item>
   </plurals>
   <string name="categories_not_found">Nema kategorija koje odgovoraju %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Dodajte kategorije da biste korisnicima olakšali pronalaženje slika na Wikimedia Commonsu.\n\nPočnite pisati da biste dodali kategoriju.\nDodirnite ovu poruku (ili pritisnite dugme \"nazad\") da biste preskočili ovaj korak.</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index ef7c15efa..e678dfc26 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -20,9 +20,9 @@
   <string name="upload_progress_notification_title_finishing">Acabant la càrrega al servidor de %1$s</string>
   <string name="upload_failed_notification_title">Error al carregar %1$s</string>
   <string name="upload_failed_notification_subtitle">Prem per veure-ho</string>
-  <plurals name="uploads_pending_notification_indicator">
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">s\'està carregant 1 fitxer</item>
-    <item quantity="other">s\'estan carregant %d fitxers</item>
+    <item quantity="other">s\'estan carregant %1$d fitxers</item>
   </plurals>
   <string name="title_activity_contributions">Les meves càrregues recents</string>
   <string name="contribution_state_queued">En cua</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Encara no hi ha cap càrrega</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d càrrega</item>
-    <item quantity="other">%d càrregues</item>
+    <item quantity="one">%1$d càrrega</item>
+    <item quantity="other">%1$d càrregues</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">S\'està iniciant %d càrrega</item>
-    <item quantity="other">S\'estan iniciant %d càrregues</item>
+    <item quantity="one">S\'està iniciant %1$d càrrega</item>
+    <item quantity="other">S\'estan iniciant %1$d càrregues</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
+  <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 càrrega</item>
-    <item quantity="other">%d càrregues</item>
+    <item quantity="other">%1$d càrregues</item>
   </plurals>
   <string name="categories_not_found">No s\'ha trobat cap categoria que coincideixi amb %1$s</string>
   <string name="categories_skip_explanation">Afegiu categories per fer que les vostres imatges siguin més fàcils de trobar a Wikimedia Commons.</string>
@@ -178,5 +178,5 @@
   <string name="get_directions">COM ANAR-HI</string>
   <string name="read_article">LLEGIU L’ARTICLE</string>
   <string name="notifications_thank_you_edit">Gràcies per fer una modificació</string>
-  <string name="notifications_mention" formatted="false">%s us ha mencionat a %s.</string>
+  <string name="notifications_mention" fuzzy="true">%1$s us ha mencionat a %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-cs/error.xml b/app/src/main/res/values-cs/error.xml
index 66ac4f378..050ae78d7 100644
--- a/app/src/main/res/values-cs/error.xml
+++ b/app/src/main/res/values-cs/error.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="crash_dialog_title">Commons spadly</string>
-  <string name="crash_dialog_text">Ups. Něco je špatně!</string>
+  <string name="crash_dialog_text">Něco se pokazilo!</string>
   <string name="crash_dialog_comment_prompt">Řekněte nám, co jste dělali a dejte nám to vědět e-mailem. Pomůže sjednat nápravu!</string>
   <string name="crash_dialog_ok_toast">Děkujeme vám!</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5ae7392c0..39c5af4cf 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Načítání souboru %1$s se nezdařilo</string>
   <string name="upload_failed_notification_subtitle">Klepnutím zobrazíte</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d soubor se nahrává</item>
-    <item quantity="other">%d souborů se nahrává</item>
+    <item quantity="one">%1$d soubor se nahrává</item>
+    <item quantity="other">%1$d souborů se nahrává</item>
   </plurals>
   <string name="title_activity_contributions">Moje nedávné obrázky</string>
   <string name="contribution_state_queued">Ve frontě</string>
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">Žádné soubory</item>
     <item quantity="one">1 soubor</item>
-    <item quantity="other">%d souborů</item>
+    <item quantity="other">%1$d souborů</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Spouští se nahrávání %d souboru</item>
-    <item quantity="other">Spouští se nahrávání %d souborů</item>
+    <item quantity="one">Spouští se nahrávání %1$d souboru</item>
+    <item quantity="other">Spouští se nahrávání %1$d souborů</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d nahrávání</item>
-    <item quantity="other">%d nahrávání</item>
+    <item quantity="one">%1$d nahrávání</item>
+    <item quantity="other">%1$d nahrávání</item>
   </plurals>
   <string name="categories_not_found">Žádné kategorie neodpovídají „%1$s“</string>
   <string name="categories_skip_explanation">Přidejte kategorie, aby bylo vaše obrázky možno na Wikimedia Commons najít.</string>
@@ -73,8 +73,8 @@
   <string name="title_activity_settings">Nastavení</string>
   <string name="title_activity_signup">Zaregistrovat se</string>
   <string name="menu_about">O aplikaci</string>
-  <string name="about_license" fuzzy="true">Open Source software dostupný za podmínek &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. %1$s a logo %1$s jsou ochranné známky Wikimedia Foundation a jsou použity se svolením Wikimedia Foundation. Nejsme podporováni Wikimedia Foundation ani nejsme její součástí.</string>
-  <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Zdrojový kód&lt;/a&gt;, &lt;a href=\"https://commons-app.github.io/\"&gt;webová stránka&lt;/a&gt; a &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;hlášení chyb a sdílení nápadů&lt;/a&gt; na GitHubu.</string>
+  <string name="about_license">Aplikace Wikimedia Commons je open source software vytvářený a spravovaný členy komunity Wikimedia. Nadace Wikimedia se neúčastní tvorby, vývoje či správy aplikace.</string>
+  <string name="about_improve">Otevřete nové &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;hlášení na GitHubu&lt;/a&gt; pro nahlášení chyb a návrhů.</string>
   <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Ochrana osobních údajů&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Autoři&lt;/a&gt;</string>
   <string name="title_activity_about">O aplikaci</string>
@@ -86,6 +86,7 @@
   <string name="menu_retry_upload">Opakovat</string>
   <string name="menu_cancel_upload">Zrušit</string>
   <string name="share_license_summary">Tento obrázek bude zveřejněn pod licencí %1$s</string>
+  <string name="media_upload_policy">Odesláním tohoto souboru potvrzuji, že je mým vlastním dílem, neobsahuje autorskoprávně chráněný materiál a nejedná se o selfie a ani jinak neporušuje &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;pravidla a doporučení Wikimedia Commons&lt;/a&gt;.</string>
   <string name="menu_download">Stáhnout</string>
   <string name="preference_license">Licence</string>
   <string name="use_previous">Použít předchozí název a popis</string>
@@ -120,7 +121,7 @@
   <string name="tutorial_3_text">Prosím NENAHRÁVEJTE:</string>
   <string name="tutorial_3_subtext">- Selfie nebo obrázky vašich přátel\n- Obrázky stažené z Internetu\n- Screenshoty z proprietárních aplikací</string>
   <string name="tutorial_4_text">Příklad nahraného souboru:</string>
-  <string name="tutorial_4_subtext" fuzzy="true">- Název: Opera v Sydney\n- Popis: Opera v Sydney, pohled přes záliv\n- Kategorie: Sydney Opera House, Sydney Opera House from the west, Sydney Opera House remote views</string>
+  <string name="tutorial_4_subtext">- Název: Opera v Sydney\n- Popis: Opera v Sydney, pohled přes záliv\n- Kategorie: Sydney Opera House from the west, Sydney Opera House remote views</string>
   <string name="welcome_wikipedia_text">Přispějte svými obrázky. Pomozte oživit články na Wikipedii.</string>
   <string name="welcome_wikipedia_subtext">Obrázky na Wikipedii pochází \nz Wikimedia Commons.</string>
   <string name="welcome_copyright_text">Vaše obrázky pomáhají vzdělávat lidi po celém světě.</string>
@@ -134,6 +135,7 @@
   <string name="detail_license_empty">Neznámá licence</string>
   <string name="menu_refresh">Obnovit</string>
   <string name="read_storage_permission_rationale">Požadováno oprávnění ke čtení externího úložiště. Aplikace bez toho nemůže pracovat.</string>
+  <string name="write_storage_permission_rationale">Požadováno oprávnění k zápisu do externího úložiště. Aplikace bez toho nemůže pracovat.</string>
   <string name="location_permission_rationale">Volitelně: Umožněte aplikaci, aby získávala aktuální polohu a nabízela na jejím základě kategorie</string>
   <string name="ok">OK</string>
   <string name="title_activity_nearby">Místa v okolí</string>
@@ -149,6 +151,7 @@
   <string name="media_detail_uploaded_date">Datum nahrání souboru</string>
   <string name="media_detail_license">Licence</string>
   <string name="media_detail_coordinates">Souřadnice</string>
+  <string name="media_detail_coordinates_empty">Žádné vložené souřadnice</string>
   <string name="become_a_tester_title">Staňte se beta testery</string>
   <string name="become_a_tester_description">Přihlásit se do našeho beta kanálu na Google Play a dostávat včasný přístup k novinkám a opravám chyb</string>
   <string name="use_wikidata">Použít Wikidata</string>
@@ -161,6 +164,9 @@
   <string name="login_failed_2fa_not_supported">Tato aplikace zatím nepodporuje tzv. dvoufázové ověření.</string>
   <string name="logout_verification">Opravdu se chcete odhlásit?</string>
   <string name="commons_logo">Logo Wikimedia Commons</string>
+  <string name="commons_website">Stránka Commons</string>
+  <string name="commons_facebook">Facebooková stránka Commons</string>
+  <string name="commons_github">Zdrojový kód Commons na GitHubu</string>
   <string name="background_image">Obrázek na pozadí</string>
   <string name="mediaimage_failed">Obrázek</string>
   <string name="no_image_found">Nebyl nalezen žádný obrázek</string>
@@ -185,16 +191,28 @@
   <string name="navigation_item_feedback">Zpětná vazba</string>
   <string name="navigation_item_logout">Odhlášení</string>
   <string name="navigation_item_info">Průvodce</string>
+  <string name="navigation_item_notification">Upozornění</string>
   <string name="nearby_needs_permissions">Místa poblíž nebude možné zobrazit, neuvedete-li svojí polohu.</string>
   <string name="no_description_found">nebyl nalezen žádný popisek</string>
   <string name="nearby_info_menu_commons_article">Stránka souboru na Commons</string>
   <string name="nearby_info_menu_wikidata_article">Položka Wikidat</string>
+  <string name="error_while_cache">Chyba při meziukládání obrázků</string>
+  <string name="title_info">Unikátní a popisný název pro daný soubor, který bude sloužit jako název souboru. Můžete použít běžný psaný jazyk s mezerami; nezahrnujte koncovku souboru.</string>
+  <string name="description_info">Popište prosím obrázek, jak jen to je možné: Kde byl pořízen? Co znázorňuje? Jaký je kontext obrázku? Popisujte prosím významné předměty nebo osoby na obrázku a nezapomeňte na informace, které není možné snadno odhadnout ze samotného obrázku, jako je například denní doba, pokud jde o krajinu. Pokud je na obrázku něco neobvyklého, popište, co to dělá neobvyklým.</string>
   <string name="give_permission">Dát povolení</string>
+  <string name="use_external_storage">Použít externí úložiště</string>
+  <string name="use_external_storage_summary">Uložit obrázky pořízené fotoaparátem, jenž je součástí této aplikace</string>
   <string name="send_log_file">Odeslat log</string>
   <string name="send_log_file_description">Odeslat log vývojářům e-mailem</string>
   <string name="login_to_your_account">Přihlásit se k účtu</string>
   <string name="nearby_location_has_not_changed">Vaše umístění se nezměnilo.</string>
   <string name="nearby_location_not_available">Umístění není dostupné.</string>
+  <string name="location_permission_rationale_nearby">Vyžadováno povolení k zobrazení seznamu blízkých míst</string>
   <string name="get_directions">NAVIGOVAT</string>
   <string name="read_article">PŘEČÍST ČLÁNEK</string>
+  <string name="notifications_welcome">Vítejte na Wikimedia Commons, %1$s! Jsme rádi, že jste zde.</string>
+  <string name="notifications_talk_page_message">%2$s vám napsal na vaši diskusní stránku</string>
+  <string name="notifications_thank_you_edit">Děkujeme za vaši editaci</string>
+  <string name="notifications_mention">%1$s vás zmínil na %2$s.</string>
+  <string name="toggle_view_button">Přepnout pohled</string>
 </resources>
diff --git a/app/src/main/res/values-csb/strings.xml b/app/src/main/res/values-csb/strings.xml
index 47f21d85d..f89303b2b 100644
--- a/app/src/main/res/values-csb/strings.xml
+++ b/app/src/main/res/values-csb/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Wladënk %1$s nie darzëł sã</string>
   <string name="upload_failed_notification_subtitle">Tkni, abë òbôczëc</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Wladënk %d lopka</item>
-    <item quantity="other">Wladënk %d lopków</item>
+    <item quantity="one">Wladënk %1$d lopka</item>
+    <item quantity="other">Wladënk %1$d lopków</item>
   </plurals>
   <string name="title_activity_contributions">Mòjé slédno wladowóné lopczi</string>
   <string name="contribution_state_queued">Żdające</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">GPS je w twòjim ùrządzeniém wëłączony. Chcesz gò włączëc?</string>
   <string name="enable_gps">Wëłączë GPS</string>
   <string name="contributions_subtitle_zero">Nie dô jesz wladënków</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Przesłano @string/contributions_subtitle_zero</item>
-    <item quantity="one">Przesłano %d lopk</item>
-    <item quantity="other">Przesłano %d lopczi</item>
+    <item quantity="one">Przesłano %1$d lopk</item>
+    <item quantity="other">Przesłano %1$d lopczi</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">Naczãto %d wladënk</item>
-    <item quantity="other">Naczãto %d wladënczi</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">Naczãto %1$d wladënk</item>
+    <item quantity="other">Naczãto %1$d wladënczi</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d wladënk</item>
-    <item quantity="other">%d wladënczi</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d wladënk</item>
+    <item quantity="other">%1$d wladënczi</item>
   </plurals>
   <string name="categories_not_found">Felënk pasowny kategòrëji do %1$s</string>
   <string name="categories_activity_title">Kategòrëje</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 5af28c3cf..27480ee3d 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Tapiwch i weld</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">1 ffeil yn uwchlwytho</item>
-    <item quantity="other">%d ffeil yn uwchlwytho</item>
+    <item quantity="other">%1$d ffeil yn uwchlwytho</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Fy uwchlwythiadau</string>
   <string name="contribution_state_queued">Yn y ciw</string>
@@ -52,15 +52,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Dim Uwchlwythiadau eto</item>
     <item quantity="one">1 uwchlwythiad</item>
-    <item quantity="other">%d uwchlwythiad</item>
+    <item quantity="other">%1$d uwchlwythiad</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">Cychwyn uwchlwytho 1 ffeil</item>
-    <item quantity="other">Cychwyn uwchlwytho %d ffeil</item>
+    <item quantity="other">Cychwyn uwchlwytho %1$d ffeil</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 uwchlwythiad</item>
-    <item quantity="other">%d uwchlwythiad</item>
+    <item quantity="other">%1$d uwchlwythiad</item>
   </plurals>
   <string name="categories_not_found">Dim categori\'n cyfateb i %1$s ar gael</string>
   <string name="categories_skip_explanation" fuzzy="true">Cychwynwch deipio i ychwanegu categoriau.\nCyffyrddwch y neges hon (neu ddewis Nôl) i fynd i\'r cam nesaf.</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index c0f2c0228..5437d0008 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Overførsel af %1$s mislykkedes</string>
   <string name="upload_failed_notification_subtitle">Klik for at se</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fil overføres</item>
-    <item quantity="other">%d filer overføres</item>
+    <item quantity="one">%1$d fil overføres</item>
+    <item quantity="other">%1$d filer overføres</item>
   </plurals>
   <string name="title_activity_contributions">Mine seneste overførsler</string>
   <string name="contribution_state_queued">I kø</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ingen overførelser endnu</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d overførsel</item>
-    <item quantity="other">%d overførelser</item>
+    <item quantity="one">%1$d overførsel</item>
+    <item quantity="other">%1$d overførsler</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Starter %d overførsel</item>
-    <item quantity="other">Starter %d overførsler</item>
+    <item quantity="one">Starter %1$d overførsel</item>
+    <item quantity="other">Starter %1$d overførsler</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d overførsel</item>
-    <item quantity="other">%d overførsler</item>
+    <item quantity="one">%1$d overførsel</item>
+    <item quantity="other">%1$d overførsler</item>
   </plurals>
   <string name="categories_not_found">Ingen kategorier matchende %1$s er fundet</string>
   <string name="categories_skip_explanation">Tilføj kategorier for at gøre billederne mere synlig på Wikimedia Commons. Tast for at tilføje kategorier.</string>
@@ -74,7 +74,7 @@
   <string name="title_activity_signup">Opret konto</string>
   <string name="menu_about">Om</string>
   <string name="about_license">Wikimedia Commons-programmet oprettet og udviklet af frivillige i Wikimediafællesskabet. Wikimedia Foundation er ikke involveret i oprettelse, udvikling eller vedligeholdelse af programmet.</string>
-  <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Kilde&lt;/a&gt; og &lt;a href=\"https://commons-app.github.io/\"&gt;hjemmeside&lt;/a&gt; på GitHub. Opret en ny &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-sag&lt;/a&gt; for fejlrapporter og forslag.</string>
+  <string name="about_improve">Opret en ny &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-sag&lt;/a&gt; for fejlrapporter og forslag.</string>
   <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Privatlivspolitik&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Bidragsydere&lt;/a&gt;</string>
   <string name="title_activity_about">Om</string>
@@ -164,6 +164,9 @@
   <string name="login_failed_2fa_not_supported">Tofaktorgodkendelse er ikke understøttet i øjeblikket.</string>
   <string name="logout_verification">Ønsker du at logge ud?</string>
   <string name="commons_logo">Commons-logo</string>
+  <string name="commons_website">Commons-hjemmeside</string>
+  <string name="commons_facebook">Commons Facebook-side</string>
+  <string name="commons_github">Commons Github-kildekode</string>
   <string name="background_image">Baggrundsbillede</string>
   <string name="mediaimage_failed">Mediebillede mislykkedes</string>
   <string name="no_image_found">Intet billede fundet</string>
@@ -207,4 +210,9 @@
   <string name="location_permission_rationale_nearby">Tilladelse kræves for at vise en liste over steder i nærheden</string>
   <string name="get_directions">FÅ RUTEHJÆLP</string>
   <string name="read_article">LÆS ARTIKEL</string>
+  <string name="notifications_welcome">Velkommen til Wikimedia Commons, %1$s! Vi er glad for, at du er her.</string>
+  <string name="notifications_talk_page_message">%1$s efterlod en besked på din diskussionsside</string>
+  <string name="notifications_thank_you_edit">Tak fordi du lavede en redigering</string>
+  <string name="notifications_mention">%1$s nævnte dig på %2$s.</string>
+  <string name="toggle_view_button">Skift visning</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2542f5d38..58e0b272a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Tippen zum Betrachten</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">Eine Datei wird hochgeladen</item>
-    <item quantity="other">%d Dateien werden hochgeladen</item>
+    <item quantity="other">%1$d Dateien werden hochgeladen</item>
   </plurals>
   <string name="title_activity_contributions">Meine kürzlich hochgeladenen Dateien</string>
   <string name="contribution_state_queued">In der Warteschlange</string>
@@ -57,15 +57,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">Eine hochgeladene Datei</item>
-    <item quantity="other">%d hochgeladene Dateien</item>
+    <item quantity="other">%1$d hochgeladene Dateien</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Starte einen Upload</item>
-    <item quantity="other">Starte %d Uploads</item>
+    <item quantity="other">Starte %1$d Uploads</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">Eine hochgeladene Datei</item>
-    <item quantity="other">%d hochgeladene Dateien</item>
+    <item quantity="other">%1$d hochgeladene Dateien</item>
   </plurals>
   <string name="categories_not_found">Die Kategorie „%1$s“ wurde nicht gefunden</string>
   <string name="categories_skip_explanation">Füge Kategorien hinzu, um deine Bilder auf Wikimedia Commons auffindbarer zu machen.\nBeginne mit der Eingabe, um Kategorien hinzuzufügen.</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">Berechtigung zur Anzeige einer Liste mit Orten in der Nähe erforderlich</string>
   <string name="get_directions">RICHTUNGEN ABRUFEN</string>
   <string name="read_article">ARTIKEL LESEN</string>
-  <string name="notifications_welcome">Willkommen auf Wikimedia Commons, %s! Wir sind froh, dass du hier bist.</string>
-  <string name="notifications_talk_page_message">%s hinterließ eine Nachricht auf deiner Diskussionsseite</string>
+  <string name="notifications_welcome">Willkommen auf Wikimedia Commons, %1$s! Wir sind froh, dass du hier bist.</string>
+  <string name="notifications_talk_page_message">%1$s hinterließ eine Nachricht auf deiner Diskussionsseite</string>
   <string name="notifications_thank_you_edit">Vielen Dank für deine Bearbeitung</string>
-  <string name="notifications_mention" formatted="false">%s erwähnte dich auf %s.</string>
+  <string name="notifications_mention">%1$s erwähnte dich auf %2$s.</string>
+  <string name="toggle_view_button">Ansicht wechseln</string>
 </resources>
diff --git a/app/src/main/res/values-diq/strings.xml b/app/src/main/res/values-diq/strings.xml
index d5f18eeac..8ab93b5ed 100644
--- a/app/src/main/res/values-diq/strings.xml
+++ b/app/src/main/res/values-diq/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">pıpawane xo bıvin</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">1 dosye selagnayış</item>
-    <item quantity="other">%d dosye Selagnayışi</item>
+    <item quantity="other">%1$d dosye Selagnayışi</item>
   </plurals>
   <string name="title_activity_contributions">Barkerdışê mınê peyêni</string>
   <string name="contribution_state_queued">Ratneya</string>
@@ -52,19 +52,19 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Theba bar nêbı</item>
     <item quantity="one">1 bar kerdış</item>
-    <item quantity="other">%d bar kerdışi</item>
+    <item quantity="other">%1$d bar kerdışi</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">Sergendış 1 bar kerdış</item>
-    <item quantity="other">Sergendış %d bar kerdışi </item>
+    <item quantity="other">Sergendış %1$d bar kerdışi </item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 bar kerdış</item>
-    <item quantity="other">%d bar kerdışi </item>
+    <item quantity="other">%1$d bar kerdışi </item>
   </plurals>
   <string name="categories_not_found">Kategoriyan de %1$s deye theba çıniyo</string>
   <string name="categories_skip_explanation" fuzzy="true">Kategori cı kerdışi rê nusnayış bıkeré. Ena gamer ravêrdışi rê mesaci bıpıloğnê yana peyd şırê.</string>
-  <string name="categories_activity_title">Kategoriy</string>
+  <string name="categories_activity_title">Kategoriyi</string>
   <string name="title_activity_settings">Sazi</string>
   <string name="title_activity_signup">Qeyd be</string>
   <string name="menu_about">Heq te cı</string>
@@ -100,7 +100,7 @@
   <string name="tutorial_4_text">Misal bar kerden:</string>
   <string name="welcome_final_text">Şıma fam kerdê?</string>
   <string name="welcome_final_button_text">E!</string>
-  <string name="detail_panel_cats_label">Kategoriy</string>
+  <string name="detail_panel_cats_label">Kategoriyi</string>
   <string name="detail_panel_cats_loading">Bar beno…</string>
   <string name="detail_panel_cats_none">Theba nêweçineya</string>
   <string name="detail_description_empty">Akerdenayış çıniyo</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 665077d5e..bdaafb27b 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Πατήστε για να δείτε</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">1 αρχείο επιφορτώνεται</item>
-    <item quantity="other">%d αρχεία επιφορτώνονται</item>
+    <item quantity="other">%1$d αρχεία επιφορτώνονται</item>
   </plurals>
   <string name="title_activity_contributions">Οι Πρόσφατες Φορτώσεις Μου</string>
   <string name="contribution_state_queued">Στην ουρά</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Δεν υπάρχουν ακόμα φορτωμένα αρχεία</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">Δεν υπάρχουν επιφορτώσεις ακόμη</item>
-    <item quantity="one">1 επιφόρτωση</item>
-    <item quantity="other">%d επιφορτώσεις</item>
+    <item quantity="one">%1$d επιφόρτωση</item>
+    <item quantity="other">%1$d επιφορτώσεις</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Έναρξη 1 επιφόρτωσης</item>
-    <item quantity="other">Έναρτξη %d επιφορτώσεων</item>
+    <item quantity="one">Έναρξη %1$d επιφόρτωσης</item>
+    <item quantity="other">Έναρξη %1$d επιφορτώσεων</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">1 επιφόρτωση</item>
-    <item quantity="other">%d επιφορτώσεις</item>
+    <item quantity="one">%1$d επιφόρτωση</item>
+    <item quantity="other">%1$d επιφορτώσεις</item>
   </plurals>
   <string name="categories_not_found">Δεν βρέθηκαν κατηγορίες που ταιριάζουν %1$s</string>
   <string name="categories_skip_explanation">Προσθέστε κατηγορίες για να κάνετε τις εικόνες σας πιο ανιχνεύσιμες στα Wikimedia Commons.\n\nΑρχίστε να γράφετε για να προσθέσετε κατηγορίες.\nΠατήστε αυτό το μήνυμα (ή πατήστε επιστροφή) για να παραλείψετε αυτό το βήμα.</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">Απαιτείται άδεια για την εμφάνιση λίστας κοντινών σημείων</string>
   <string name="get_directions">Λάβετε κατευθύνσεις</string>
   <string name="read_article">Ανάγνωση άρθρου</string>
-  <string name="notifications_welcome">Καλωσήρθατε στο Wikimedia Commons, %s! Είμαστε χαρούμενοι που είστε εδώ.</string>
-  <string name="notifications_talk_page_message">Ο %s άφησε ένα μήνυμα στην σελίδα συζήτησής σας</string>
+  <string name="notifications_welcome">Καλωσήρθατε στο Wikimedia Commons, %1$s! Είμαστε χαρούμενοι που είστε εδώ.</string>
+  <string name="notifications_talk_page_message">Ο %1$s άφησε ένα μήνυμα στην σελίδα συζήτησής σας</string>
   <string name="notifications_thank_you_edit">Ευχαριστούμε που κάνατε μια επεξεργασία</string>
-  <string name="notifications_mention" formatted="false">Ο %s σας ανέφερε στο %s.</string>
+  <string name="notifications_mention">Ο %1$s σας ανέφερε στο %2$s.</string>
+  <string name="toggle_view_button">Μεταβολή προβολής</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3c5eab2a5..978749d96 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Falló la carga de %1$s</string>
   <string name="upload_failed_notification_subtitle">Toca para ver</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Subiendo %d archivo</item>
-    <item quantity="other">Subiendo %d archivos</item>
+    <item quantity="one">Cargando %1$d archivo</item>
+    <item quantity="other">Cargando %1$d archivos</item>
   </plurals>
   <string name="title_activity_contributions">Mis subidas recientes</string>
   <string name="contribution_state_queued">En la cola</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">No hay subidas aún</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d subida</item>
-    <item quantity="other">%d subidas</item>
+    <item quantity="one">%1$d carga</item>
+    <item quantity="other">%1$d cargas</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Iniciando 1 subida</item>
-    <item quantity="other">Iniciando %d subidas</item>
+    <item quantity="one">Iniciando %1$d carga</item>
+    <item quantity="other">Iniciando %1$d cargas</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d subida</item>
-    <item quantity="other">%d subidas</item>
+    <item quantity="one">%1$d carga</item>
+    <item quantity="other">%1$d cargas</item>
   </plurals>
   <string name="categories_not_found">No se encontraron categorías que coincidieran con %1$s</string>
   <string name="categories_skip_explanation">Añade categorías para hacer que tus imágenes sean más fáciles de encontrar en Wikimedia Commons.\nComienza a escribir para añadir categorías.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Se necesita permiso para mostrar una lista de lugares cercanos</string>
   <string name="get_directions">CÓMO LLEGAR</string>
   <string name="read_article">LEER ARTÍCULO</string>
-  <string name="notifications_welcome">¡Te damos la bienvenida a Wikimedia Commons, %s! Qué bueno que estés aquí.</string>
-  <string name="notifications_talk_page_message">%s dejó un mensaje en tu página de discusión</string>
+  <string name="notifications_welcome">¡Te damos la bienvenida a Wikimedia Commons, %1$s! Qué bueno que estés aquí.</string>
+  <string name="notifications_talk_page_message">%1$s dejó un mensaje en tu página de discusión</string>
   <string name="notifications_thank_you_edit">Gracias por realizar una edición</string>
-  <string name="notifications_mention" formatted="false">%s te ha mencionado en %s.</string>
+  <string name="notifications_mention">%1$s te ha mencionado en %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index dc7947c87..a340d7d72 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -51,7 +51,7 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Oraindik igoerarik ez</item>
     <item quantity="one">igoera 1</item>
-    <item quantity="other">%d igoera</item>
+    <item quantity="other">%1$d igoera</item>
   </plurals>
   <string name="categories_not_found">Ez da kategoriak aukritu %1$s izenarekin</string>
   <string name="categories_skip_explanation" fuzzy="true">Gehitu kategoriak zure argazkiak Wikimedia Commonsen aurkitzen errazagoak izan daitezen.</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 6ed2c5981..68d522865 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$s بارگذاری نشد</string>
   <string name="upload_failed_notification_subtitle">برای دیدن انگشت بزنید</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d پرونده در حال بارگذاری</item>
-    <item quantity="other">%d پرونده در حال بارگذاری</item>
+    <item quantity="one">%1$d پرونده در حال بارگذاری</item>
+    <item quantity="other">%1$d پرونده در حال بارگذاری</item>
   </plurals>
   <string name="title_activity_contributions">بارگذاری‌های اخیر من</string>
   <string name="contribution_state_queued">در صف</string>
@@ -54,18 +54,14 @@
   <string name="gps_disabled">مکان‌یاب در دستگاه شما خاموش است. آیا دوست دارید فعال شود؟</string>
   <string name="enable_gps">فعال کردن مکان‌یاب</string>
   <string name="contributions_subtitle_zero">هنوز هیچ بارگذاری</string>
-  <plurals name="contributions_subtitle">
-    <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">بارگذاری شد</item>
-    <item quantity="other">%d بارگذاری شد</item>
-  </plurals>
+  <string name="contributions_subtitle">{{%1$d|zero=@string/contributions_subtitle_zero|one=بارگذاری شد|%1$d بارگذاری شد}}</string>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">شروع %d بارگذاری پرونده</item>
-    <item quantity="other">شروع بارگذاری %d پرونده</item>
+    <item quantity="one">شروع %1$d بارگذاری پرونده</item>
+    <item quantity="other">شروع بارگذاری %1$d پرونده</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d بارگذاری</item>
-    <item quantity="other">%d بارگذاری</item>
+    <item quantity="one">%1$d بارگذاری</item>
+    <item quantity="other">%1$d بارگذاری</item>
   </plurals>
   <string name="categories_not_found">رده‌ای منطبق با %1$s یافت نشد</string>
   <string name="categories_skip_explanation">برای دسترسی آسان‌تر در ویکی‌انبار به تصویرهایتان رده بیافزائید.\n\nشروع به افزودن رده.</string>
@@ -210,8 +206,9 @@
   <string name="location_permission_rationale_nearby">برای نمایش مکان‌ّای اطراف نیاز به اجازه است.</string>
   <string name="get_directions">دریافت جهت‌‌ها</string>
   <string name="read_article">خواندن مقاله</string>
-  <string name="notifications_welcome">%s، به ویکی‌انبار خوش آمدید! خوشحالیم که اینجا هستید.</string>
-  <string name="notifications_talk_page_message">%s در صفحهٔ بحث شما پیامی گذاشته‌است</string>
+  <string name="notifications_welcome">%1$s، به ویکی‌انبار خوش آمدید! خوشحالیم که اینجا هستید.</string>
+  <string name="notifications_talk_page_message">%1$s در صفحهٔ بحث شما پیامی گذاشته‌است</string>
   <string name="notifications_thank_you_edit">برای ویرایش ممنون</string>
-  <string name="notifications_mention" formatted="false">%s در %s به شما اشاره کرده‌است.</string>
+  <string name="notifications_mention">%1$s در %2$s به شما اشاره کرده‌است.</string>
+  <string name="toggle_view_button">دکمه نمایش</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b69e08fe1..01864d294 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Napauta katsoaksesi</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">1 tiedosto tallentuu</item>
-    <item quantity="other">%d tiedostoa tallentuu</item>
+    <item quantity="other">%1$d tiedostoa tallentuu</item>
   </plurals>
   <string name="title_activity_contributions">Viimeaikaiset tallennukseni</string>
   <string name="contribution_state_queued">Jonossa</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">GPS ei ole käytössä. Haluatko ottaa sen käyttöön?</string>
   <string name="enable_gps">Ota GPS käyttöön</string>
   <string name="contributions_subtitle_zero">Ei tallennuksia vielä</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d tallennus</item>
-    <item quantity="other">%d tallennusta</item>
+    <item quantity="one">%1$d tallennus</item>
+    <item quantity="other">%1$d tallennusta</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">aloitetaan %d tallennus</item>
-    <item quantity="other">aloitetaan %d tallennusta</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">aloitetaan %1$d tallennus</item>
+    <item quantity="other">aloitetaan %1$d tallennusta</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d tallennus</item>
-    <item quantity="other">%d tallennusta</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d tallennus</item>
+    <item quantity="other">%1$d tallennusta</item>
   </plurals>
   <string name="categories_not_found">Luokkaa %1$s ei löytynyt</string>
   <string name="categories_skip_explanation">Lisää luokkia tehdäksesi kuvistasi enemmän löydettäviä Wikimedia Commonssissa.\nAloita kirjoittaminen lisätäksesi luokkia.</string>
@@ -121,7 +121,7 @@
   <string name="tutorial_3_text">ÄLÄ tallenna seuraavia:</string>
   <string name="tutorial_3_subtext">- Selfiet tai kuvat ystävistäsi\n- Netistä ladatut kuvat\n- Kuvakaappaukset kaupallisista sovelluksista</string>
   <string name="tutorial_4_text">Tallennusesimerkki:</string>
-  <string name="tutorial_4_subtext">- Otsikko: Sydneyn operatalo\n- Kuvaus: Sydneyn oopperatalo katsottuna lahden toisella puolella\n- Luokat: Sydneyn oopperatalo, Sydneyn oopperatalo lännestä, Sydneyn oopperatalo etänäkymät</string>
+  <string name="tutorial_4_subtext">- Otsikko: Sydneyn oopperatalo\n- Kuvaus: Sydneyn oopperatalo katsottuna lahden toiselta puolelta\n- Luokat: Sydneyn oopperatalo, Sydneyn oopperatalo lännestä, Sydneyn oopperatalon etänäkymät</string>
   <string name="welcome_wikipedia_text">Herätä Wikipedia-artikkelit eloon kuvillasi! Tuo kuvasi Wikipediaan.</string>
   <string name="welcome_wikipedia_subtext">Wikipedian kuvat tulevat Wikimedia Commonsista.</string>
   <string name="welcome_copyright_text">Kuvasi auttavat useita ihmisiä ympäri maailmaa artikkeleiden ymmärtämisessä.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e7408e25e..75e42c9d5 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Le téléversement de %1$s a échoué</string>
   <string name="upload_failed_notification_subtitle">Appuyer pour afficher</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fichier en cours de téléversement</item>
-    <item quantity="other">%d fichiers en cours de téléversement</item>
+    <item quantity="one">%1$d fichier en cours de téléchargement</item>
+    <item quantity="other">%1$d fichiers en cours de téléchargement</item>
   </plurals>
   <string name="title_activity_contributions">Mes téléversements récents</string>
   <string name="contribution_state_queued">Mis en file d\'attente</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Encore aucun téléversement</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d téléversement</item>
-    <item quantity="other">%d téléversements</item>
+    <item quantity="one">%1$d téléchargement</item>
+    <item quantity="other">%1$d téléchargements</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d téléversement démarré</item>
-    <item quantity="other">%d téléversements démarrés</item>
+    <item quantity="one">%1$d téléchargement démarré</item>
+    <item quantity="other">%1$d téléchargements démarrés</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d téléversement</item>
-    <item quantity="other">%d téléversements</item>
+    <item quantity="one">%1$d téléchargement</item>
+    <item quantity="other">%1$d téléchargements</item>
   </plurals>
   <string name="categories_not_found">Aucune catégorie correspondant à %1$s trouvée</string>
   <string name="categories_skip_explanation">Ajoutez des catégories pour rendre vos images plus simples à trouver sur Wikimedia Commons. \nCommencer à ajouter des catégories.</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">Une permission est requise pour afficher une liste de lieux relatifs</string>
   <string name="get_directions">OBTENIR DES DIRECTIVES</string>
   <string name="read_article">LIRE L’ARTICLE</string>
-  <string name="notifications_welcome">Bienvenue sur Wikimedia Commons, %s! Nous sommes heureux que vous soyez venu.</string>
-  <string name="notifications_talk_page_message">%s a laissé un message sur votre page de discussion</string>
+  <string name="notifications_welcome">Bienvenue sur Wikimedia Commons, %1$s! Nous sommes heureux que vous soyez venu.</string>
+  <string name="notifications_talk_page_message">%1$s a laissé un message sur votre page de discussion</string>
   <string name="notifications_thank_you_edit">Merci de faire une modification</string>
-  <string name="notifications_mention" formatted="false">%s vous a mentionné sur %s .</string>
+  <string name="notifications_mention">%1$s vous a mentionné sur %2$s .</string>
+  <string name="toggle_view_button">Basculer l’affichage</string>
 </resources>
diff --git a/app/src/main/res/values-frr/strings.xml b/app/src/main/res/values-frr/strings.xml
index 317890630..4d8ed0d4a 100644
--- a/app/src/main/res/values-frr/strings.xml
+++ b/app/src/main/res/values-frr/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Huuchschüüren faan „%1$s“ skiaf gingen</string>
   <string name="upload_failed_notification_subtitle">Tipe, am det uuntulukin</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d datei woort huuchschüürd</item>
-    <item quantity="other">%d datein wurd huuchschüürd</item>
+    <item quantity="one">%1$d datei woort huuchschüürd</item>
+    <item quantity="other">%1$d datein wurd huuchschüürd</item>
   </plurals>
   <string name="title_activity_contributions">Min tuleetst huuchschüürd datein</string>
   <string name="contribution_state_queued">Skal noch teew</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">GPS as üüb dan aperoot ei uun. Wel dü det nü aktiwiare?</string>
   <string name="enable_gps">GPS aktiwiare</string>
   <string name="contributions_subtitle_zero">Bit nü nian uploads</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">Ian huuchschüürd datei</item>
-    <item quantity="other">%d huuchschüürd datein</item>
+    <item quantity="other">%1$d huuchschüürd datein</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">Began %d upload</item>
-    <item quantity="other">Began %d uploads</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">Began %1$d upload</item>
+    <item quantity="other">Began %1$d uploads</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d huuchschüürd datei</item>
-    <item quantity="other">%d huuchschüürd datein</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d huuchschüürd datei</item>
+    <item quantity="other">%1$d huuchschüürd datein</item>
   </plurals>
   <string name="categories_not_found">Det kategorii „%1$s“ küd ei fünjen wurd.</string>
   <string name="categories_skip_explanation" fuzzy="true">Dü könst nei kategoriin iinracht, amdat din bilen beeder fünjen wurd. Eder skriiw en kategorii-nööm of tipe üüb det nooracht (of gung üüb det \'turag\'-fial), an läät di straal ütj.</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 96d94dec9..90de742cc 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Erro ao cargar \"%1$s\"</string>
   <string name="upload_failed_notification_subtitle">Prema para mostralo</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Cargando %d ficheiro</item>
-    <item quantity="other">Cargando %d ficheiros</item>
+    <item quantity="one">Cargando %1$d ficheiro</item>
+    <item quantity="other">Cargando %1$d ficheiros</item>
   </plurals>
   <string name="title_activity_contributions">As miñas subas recentes</string>
   <string name="contribution_state_queued">Na cola</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Aínda non hai subas</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d carga</item>
-    <item quantity="other">%d cargas</item>
+    <item quantity="one">%1$d carga</item>
+    <item quantity="other">%1$d cargas</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Iniciando %d carga</item>
-    <item quantity="other">Iniciando %d cargas</item>
+    <item quantity="one">Iniciando %1$d carga</item>
+    <item quantity="other">Iniciando %1$d cargas</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d carga</item>
-    <item quantity="other">%d cargas</item>
+    <item quantity="one">%1$d carga</item>
+    <item quantity="other">%1$d cargas</item>
   </plurals>
   <string name="categories_not_found">Non se atopou ningunha categoría que coincidise con \"%1$s\"</string>
   <string name="categories_skip_explanation">Engada categorías para facer máis accesibles as súas imaxes na Wikimedia Commons.\nComece a escribir para engadir categorías.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Precísase permiso para amosar unha lista de lugares preto de aquí</string>
   <string name="get_directions">OBTER DIRECCIÓNS</string>
   <string name="read_article">LER ARTIGO</string>
-  <string name="notifications_welcome">Benvido a Wikimedia Commons, %s! Alegrámonos de que estea aquí.</string>
-  <string name="notifications_talk_page_message">%s deixoulle unha mensaxe na súa páxina de conversa</string>
+  <string name="notifications_welcome">Benvido a Wikimedia Commons, %1$s! Alegrámonos de que estea aquí.</string>
+  <string name="notifications_talk_page_message">%1$s deixoulle unha mensaxe na súa páxina de conversa</string>
   <string name="notifications_thank_you_edit">Grazas por realizar unha edición</string>
-  <string name="notifications_mention" formatted="false">%s mencionouno en %s.</string>
+  <string name="notifications_mention">%1$s mencionouno en %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 718121ceb..452bb6523 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_progress_notification_title_finishing">%1$s का अपलोड पूरा हुआ</string>
   <string name="upload_failed_notification_title">%1$s का अपलोड विफल हुआ</string>
   <string name="upload_failed_notification_subtitle">देखने हेतु टैप करें</string>
-  <plurals name="uploads_pending_notification_indicator">
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">%d फ़ाइल अपलोड हो रहा</item>
     <item quantity="other">%d फ़ाइलें अपलोड हो रहीं</item>
   </plurals>
@@ -55,16 +55,16 @@
   <string name="enable_gps">जीपीएस सक्षम करें</string>
   <string name="contributions_subtitle_zero">अभी तक कोई अपलोड नहीं</string>
   <plurals name="contributions_subtitle">
-    <item quantity="one">%d अपलोड</item>
-    <item quantity="other">%d अपलोड्स</item>
+    <item quantity="one">%1$d अपलोड</item>
+    <item quantity="other">%1$d अपलोड्स</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d अपलोड शुरू</item>
-    <item quantity="other">%d अपलोड शुरू</item>
+    <item quantity="one">%1$d अपलोड शुरू</item>
+    <item quantity="other">%1$d अपलोड शुरू</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d अपलोड</item>
-    <item quantity="other">%d अपलोड</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d अपलोड</item>
+    <item quantity="other">%1$d अपलोड</item>
   </plurals>
   <string name="categories_not_found">%1$s से कोई श्रेणी मेल नहीं खाती</string>
   <string name="categories_skip_explanation">विकिमीडिया कॉमन्स पर अपनी छवियों को अधिक खोजने योग्य बनाने के लिए श्रेणियां जोड़ें|\nश्रेणियां जोड़ने के लिए टाइप करना प्रारंभ करें|</string>
@@ -209,8 +209,8 @@
   <string name="location_permission_rationale_nearby">आसपास के स्थान दिखाने के लिए अनुमति चाहिए</string>
   <string name="get_directions">दिशा - निर्देश प्राप्त करें</string>
   <string name="read_article">लेख पढ़ें</string>
-  <string name="notifications_welcome">विकिमीडिया कॉमन्स पर आपका स्वागत है, %s! हमें हर्ष है कि आप यहाँ हैं।</string>
-  <string name="notifications_talk_page_message">%s ने आपके वार्ता पृष्ठ पर सन्देश छोड़ा है</string>
+  <string name="notifications_welcome" fuzzy="true">विकिमीडिया कॉमन्स पर आपका स्वागत है, %1$s! हमें हर्ष है कि आप यहाँ हैं।</string>
+  <string name="notifications_talk_page_message" fuzzy="true">%1$s ने आपके वार्ता पृष्ठ पर सन्देश छोड़ा है</string>
   <string name="notifications_thank_you_edit">सम्पादन करने के लिए धन्यवाद</string>
-  <string name="notifications_mention" formatted="false">%s ने %s में आपका उल्लेख किया है</string>
+  <string name="notifications_mention" fuzzy="true">%1$s ने %2$s में आपका उल्लेख किया है</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0910c3b42..134563a09 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$s feltöltése sikertelen</string>
   <string name="upload_failed_notification_subtitle">Érintsd meg a megtekintéshez</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fájl feltöltése folyamatban</item>
-    <item quantity="other">%d fájl feltöltése folyamatban</item>
+    <item quantity="one">%1$d fájl feltöltése folyamatban</item>
+    <item quantity="other">%1$d fájl feltöltése folyamatban</item>
   </plurals>
   <string name="title_activity_contributions">Legutóbbi feltöltéseim</string>
   <string name="contribution_state_queued">Várólistán</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Még nincsenek feltöltések</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d feltöltés</item>
-    <item quantity="other">%d feltöltés</item>
+    <item quantity="one">%1$d feltöltés</item>
+    <item quantity="other">%1$d feltöltés</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d feltöltés kezdése</item>
-    <item quantity="other">%d feltöltés kezdése</item>
+    <item quantity="one">%1$d feltöltés kezdése</item>
+    <item quantity="other">%1$d feltöltés kezdése</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d feltöltés</item>
-    <item quantity="other">%d feltöltés</item>
+    <item quantity="one">%1$d feltöltés</item>
+    <item quantity="other">%1$d feltöltés</item>
   </plurals>
   <string name="categories_not_found">Nincs a(z) „%1$s” keresési kifejezésnek megfelelő kategória</string>
   <string name="categories_skip_explanation">Adj kategóriákat a képekhez, hogy könnyebben meg lehessen találni őket a Commonson.\nKezdd el beírni a kategória nevét, hogy hozzáadd.\nBökj erre az üzenetre (vagy a vissza gombra) a lépés kihagyásához</string>
@@ -74,7 +74,7 @@
   <string name="title_activity_signup">Regisztráció</string>
   <string name="menu_about">Névjegy</string>
   <string name="about_license">A Wikimedia Commons applikáció egy nyílt forráskódú szoftver, amit a Wikimedia-közösség önkéntesei készítettek és tartanak karban. A Wikimédia Alapítvány nem vesz részt az applikáció megalkotásában, fejlesztésében és üzemeltetésében.</string>
-  <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Forráskód&lt;/a&gt; és &lt;a href=\"https://commons-app.github.io/\"&gt;weboldal&lt;/a&gt; a GitHubon. Nyiss egy új &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-problémát&lt;/a&gt; hibabejelentéssel vagy fejlesztési javaslattal.</string>
+  <string name="about_improve">Nyiss egy új &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-problémát&lt;/a&gt; hibabejelentéssel vagy fejlesztési javaslattal.</string>
   <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Adatvédelmi irányelvek&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Köszönetnyilvánítás&lt;/a&gt;</string>
   <string name="title_activity_about">Névjegy</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 6cb355fee..a739449c4 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_failed_notification_subtitle">Tekan untuk melihat</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">Mengunggah 1 berkas</item>
-    <item quantity="other">Mengunggah %d berkas</item>
+    <item quantity="other">Mengunggah %1$d berkas</item>
   </plurals>
   <string name="title_activity_contributions">Unggahan saya</string>
   <string name="contribution_state_queued">Antrean</string>
@@ -49,15 +49,15 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">Tidak ada unggahan</item>
     <item quantity="one">1 unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Memulai 1 unggahan</item>
-    <item quantity="other">Memulai %d unggahan</item>
+    <item quantity="other">Memulai %1$d unggahan</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">1 unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <string name="categories_not_found">Tidak ada kategori yang cocok dengan %1$s</string>
   <string name="categories_skip_explanation">Tambahkan kategori agar foto Anda lebih mudah ditemukan di Wikimedia Commons.
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 397d78312..3d766f26d 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Tekan untuk melihat</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">mengunggah 1 berkas</item>
-    <item quantity="other">mengunggah %d berkas</item>
+    <item quantity="other">mengunggah %1$d berkas</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Unggahan saya</string>
   <string name="contribution_state_queued">Antrean</string>
@@ -52,15 +52,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Tidak ada unggahan</item>
     <item quantity="one">1 unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">Memulai 1 unggahan</item>
-    <item quantity="other">Memulai %d unggahan</item>
+    <item quantity="other">Memulai %1$d unggahan</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <string name="categories_not_found">Tidak ada kategori yang cocok dengan %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Tambahkan kategori agar foto Anda lebih mudah ditemukan di Wikimedia Commons.\n\nMulai mengetik untuk menambahkan kategori.\nTekan pesan ini (atau tekan kembali) untuk melewatkan langkah ini.</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index f0b280f77..36c7ee2b4 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Innsending á %1$s mistókst</string>
   <string name="upload_failed_notification_subtitle">Bankaðu til að skoða</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d skrá að sendast inn</item>
-    <item quantity="other">%d skrár að sendast inn</item>
+    <item quantity="one">%1$d skrá að sendast inn</item>
+    <item quantity="other">%1$d skrár að sendast inn</item>
   </plurals>
   <string name="title_activity_contributions">Nýlega innsendar skrár</string>
   <string name="contribution_state_queued">Í biðröð</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">GPS er óvirkt í tækinu þínu. Viltu virkja það?</string>
   <string name="enable_gps">Virkja GPS</string>
   <string name="contributions_subtitle_zero">Engar innsendingar ennþá</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d innsending</item>
-    <item quantity="other">%d innsendingar</item>
+    <item quantity="one">%1$d innsending</item>
+    <item quantity="other">%1$d innsendingar</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">Byrja %d innsendingu</item>
-    <item quantity="other">Byrja %d innsendingar</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">Byrja %1$d innsendingu</item>
+    <item quantity="other">Byrja %1$d innsendingar</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d innsending</item>
-    <item quantity="other">%d innsendingar</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d innsending</item>
+    <item quantity="other">%1$d innsendingar</item>
   </plurals>
   <string name="categories_not_found">Engir flokkar sem samsvara %1$s fundust</string>
   <string name="categories_skip_explanation">Bættu við flokkum til að gera myndirnar þínar aðgengilegri á Wikimedia Commons\nByrjaðu að skrifa til að bæta við flokkum.</string>
@@ -210,8 +210,8 @@
   <string name="location_permission_rationale_nearby">Heimild þarf til að birta lista yfir staði í nágrenninu</string>
   <string name="get_directions">FÁ LEIÐSÖGN</string>
   <string name="read_article">LESA GREIN</string>
-  <string name="notifications_welcome">Velkomin á Wikimedia Commons, %s! Við erum ánægð með að þú skulir vera hérna.</string>
-  <string name="notifications_talk_page_message">%s skildi eftir skilaboð á spjallsíðunni þinni</string>
+  <string name="notifications_welcome" fuzzy="true">Velkomin á Wikimedia Commons, %1$s! Við erum ánægð með að þú skulir vera hérna.</string>
+  <string name="notifications_talk_page_message">%1$s skildi eftir skilaboð á spjallsíðunni þinni</string>
   <string name="notifications_thank_you_edit">Takk fyrir að hafa gert breytingar</string>
-  <string name="notifications_mention" formatted="false">%s minntist á þig á %s.</string>
+  <string name="notifications_mention" fuzzy="true">%1$s minntist á þig á %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 05e462fe4..df93909d4 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Caricamento di %1$s non riuscito</string>
   <string name="upload_failed_notification_subtitle">Premi per visualizzare</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d file in caricamento</item>
-    <item quantity="other">%d file in caricamento</item>
+    <item quantity="one">%1$d file in caricamento</item>
+    <item quantity="other">%1$d file in caricamento</item>
   </plurals>
   <string name="title_activity_contributions">I miei ultimi caricamenti</string>
   <string name="contribution_state_queued">In coda</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Non è stato ancora caricato niente</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">1 caricamento</item>
-    <item quantity="other">%d caricamenti</item>
+    <item quantity="one">%1$d caricamento</item>
+    <item quantity="other">%1$d caricamenti</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Iniziato %d caricamento</item>
-    <item quantity="other">Iniziati %d caricamenti</item>
+    <item quantity="one">Iniziato %1$d caricamento</item>
+    <item quantity="other">Iniziati %1$d caricamenti</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d caricamento</item>
-    <item quantity="other">%d caricamenti</item>
+    <item quantity="one">%1$d caricamento</item>
+    <item quantity="other">%1$d caricamenti</item>
   </plurals>
   <string name="categories_not_found">Non è stata trovata alcuna categoria che contiene %1$s</string>
   <string name="categories_skip_explanation">Aggiungi categorie per rendere le tue immagini più facilmente individuabili su Wikimedia Commons.\nInizia a digitare per aggiungere categorie.</string>
@@ -181,8 +181,8 @@
   <string name="nearby_location_not_available">Posizione non disponibile.</string>
   <string name="get_directions">OTTIENI DIREZIONI</string>
   <string name="read_article">LEGGI VOCE</string>
-  <string name="notifications_welcome">Benvenuto in Wikimedia Commons, %s! Siamo contenti che tu sia qui.</string>
-  <string name="notifications_talk_page_message">%s ti ha lasciato un messaggio nella tua pagina di discussione</string>
+  <string name="notifications_welcome">Benvenuto in Wikimedia Commons, %1$s! Siamo contenti che tu sia qui.</string>
+  <string name="notifications_talk_page_message">%1$s ti ha lasciato un messaggio nella tua pagina di discussione</string>
   <string name="notifications_thank_you_edit">Grazie per aver fatto una modifica</string>
-  <string name="notifications_mention" formatted="false">%s ti ha menzionato su %s.</string>
+  <string name="notifications_mention">%1$s ti ha menzionato su %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 9d897f6a9..cc5026d83 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">נא ללחוץ כדי להציג</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">קובץ אחד מועלה</item>
-    <item quantity="other">%d קבצים מועלים</item>
+    <item quantity="other">%1$d קבצים מועלים</item>
   </plurals>
   <string name="title_activity_contributions">ההעלאות האחרונות שלי</string>
   <string name="contribution_state_queued">בתור</string>
@@ -55,16 +55,17 @@
   <string name="enable_gps">הפעלת GPS</string>
   <string name="contributions_subtitle_zero">לא הועלה עדיין שום דבר</string>
   <plurals name="contributions_subtitle">
+    <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">העלאה אחת</item>
-    <item quantity="other">%d העלאות</item>
+    <item quantity="other">%1$d העלאות</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">התחלת העלאה</item>
-    <item quantity="other">התחלת %d העלאות</item>
+    <item quantity="other">התחלת 1$d% העלאות</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">העלאה אחת</item>
-    <item quantity="other">%d העלאות</item>
+    <item quantity="other">%1$d העלאות</item>
   </plurals>
   <string name="categories_not_found">לא נמצאו קטגוריות בשם %1$s</string>
   <string name="categories_skip_explanation">יש להוסיף קטגוריות כדי שיהיה קל יותר למצוא את התמונות שלך בוויקישיתוף.\nכדי להוסיף קטגוריה יש להתחיל לכתוב.</string>
@@ -164,7 +165,10 @@
   <string name="logout_verification">האם באמת לצאת מהחשבון?</string>
   <string name="commons_logo">סמל ויקישיתוף</string>
   <string name="commons_website">אתר ויקישיתוף</string>
+  <string name="commons_facebook">עמוד הפייסבוק של ויקישיתוף</string>
+  <string name="commons_github">קוד המקור של ויקישיתוף ב־GitHub</string>
   <string name="background_image">תמונת רקע</string>
+  <string name="mediaimage_failed">תמונת המדיה נכשלה</string>
   <string name="no_image_found">לא נמצאה תמונה</string>
   <string name="upload_image">העלאת תמונה</string>
   <string name="welcome_image_mount_zao">הר זאו</string>
@@ -186,6 +190,7 @@
   <string name="navigation_item_feedback">משוב</string>
   <string name="navigation_item_logout">יציאה</string>
   <string name="navigation_item_info">מדריך</string>
+  <string name="navigation_item_notification">הודעות</string>
   <string name="nearby_needs_permissions">אי־אפשר להציג מקומות בסביבה ללא הרשאות מיקום</string>
   <string name="no_description_found">לא נמצא תיאור</string>
   <string name="nearby_info_menu_commons_article">דף קובץ בוויקישיתוף</string>
@@ -204,4 +209,9 @@
   <string name="location_permission_rationale_nearby">נדרשת הרשאה כדי להציג רשימה של מקומות בסביבה</string>
   <string name="get_directions">קבלת כיוונים</string>
   <string name="read_article">קריאה הערך</string>
+  <string name="notifications_welcome">ברוך בואך לוויקישיתוף של ויקימדיה, %1$s! שמחים לראות אותך כאן אצלנו.</string>
+  <string name="notifications_talk_page_message">קיבלת הודעה מאת %1$s בעמוד השיחה שלך</string>
+  <string name="notifications_thank_you_edit">תודה לך על העריכה</string>
+  <string name="notifications_mention">אוזכרת על ידי %2$s ב{{GRAMMAR:תחילית|%1$s}}.</string>
+  <string name="toggle_view_button">החלפת מצב תצוגה</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4b7135d0b..0806e8f54 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
   <string name="upload_failed_notification_title">%1$s のアップロードに失敗しました</string>
   <string name="upload_failed_notification_subtitle">閲覧するにはタップしてください</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="other">%d 件のファイルをアップロード中</item>
+    <item quantity="other">%1$d 件のファイルをアップロード中</item>
   </plurals>
   <string name="title_activity_contributions">自分の最近のアップロードファイル</string>
   <string name="contribution_state_queued">順番待ち中</string>
@@ -46,7 +46,7 @@
   <string name="multiple_share_base_title">このセットに名前をつけてください</string>
   <string name="provider_modifications">変更</string>
   <string name="menu_upload_single">アップロード</string>
-  <string name="categories_search_text_hint">検索するカテゴリ</string>
+  <string name="categories_search_text_hint">カテゴリを検索</string>
   <string name="menu_save_categories">保存</string>
   <string name="refresh_button">更新</string>
   <string name="gps_disabled">お使いのデバイスではGPSが無効になっています。有効にしますか?</string>
@@ -54,13 +54,13 @@
   <string name="contributions_subtitle_zero">まだ何もアップロードされていません。</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="other">%d 件のアップロード</item>
+    <item quantity="other">%1$d 件のアップロード</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="other">%d 件のアップロードを開始中</item>
+    <item quantity="other">%1$d 件のアップロードを開始中</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="other">%d 件のアップロード</item>
+    <item quantity="other">%1$d 件のアップロード</item>
   </plurals>
   <string name="categories_not_found">%1$s に一致するカテゴリが見つかりません</string>
   <string name="categories_skip_explanation">あなたの画像をウィキメディア・コモンズで見つけやすくするためにカテゴリを追加してください。\n\nカテゴリ名の入力を開始してください。\nこの手順をスキップするにはこのメッセージをタップしてください(または戻るボタン)。</string>
diff --git a/app/src/main/res/values-ji/strings.xml b/app/src/main/res/values-ji/strings.xml
index a523d2754..c955a3e73 100644
--- a/app/src/main/res/values-ji/strings.xml
+++ b/app/src/main/res/values-ji/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">ארויפֿלאדן %1$s דורכגעפֿאלן</string>
   <string name="upload_failed_notification_subtitle">דרוקט צו באקוקן</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d טעקע לאדט אן</item>
-    <item quantity="other">%d טעקעס לאדן אן</item>
+    <item quantity="one">%1$d טעקע לאדט אן</item>
+    <item quantity="other">%1$d טעקעס לאדן אן</item>
   </plurals>
   <string name="title_activity_contributions">מײַנע לעצטיקע ארויפֿלאדן</string>
   <string name="contribution_state_queued">אין ריי</string>
@@ -48,11 +48,11 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero </item>
     <item quantity="one">איין ארויפֿלאד</item>
-    <item quantity="other">%d ארויפֿלאדן</item>
+    <item quantity="other">%1$d ארויפֿלאדן</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">אנהייבן %d ארויפֿלאד</item>
-    <item quantity="other"> אנהייבן %d ארויפֿלאדן</item>
+    <item quantity="one">אנהייבן %1$d ארויפֿלאד</item>
+    <item quantity="other"> אנהייבן %1$d ארויפֿלאדן</item>
   </plurals>
   <string name="categories_activity_title">קאַטעגאריעס</string>
   <string name="title_activity_settings">איינשטעלונגען</string>
diff --git a/app/src/main/res/values-jv/strings.xml b/app/src/main/res/values-jv/strings.xml
index 10afc01bf..95c315e2a 100644
--- a/app/src/main/res/values-jv/strings.xml
+++ b/app/src/main/res/values-jv/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_progress_notification_title_finishing">Rampung ngunggah %1$s</string>
   <string name="upload_failed_notification_title">Wurung ngunggah %1$s</string>
   <string name="upload_failed_notification_subtitle">Tunyuk saperlu ndeleng</string>
-  <plurals name="uploads_pending_notification_indicator">
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">%d barkas lagi diunggah</item>
   </plurals>
   <string name="title_activity_contributions">Unggahanku Sing Anyar</string>
@@ -53,18 +53,18 @@
   <string name="gps_disabled">GPS dipatèni ing pirantiné panjenengan. Panjenengan arep ngurubaké?</string>
   <string name="enable_gps">Urubaké GPS</string>
   <string name="contributions_subtitle_zero">Durung ana unggahan</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d unggahan</item>
-    <item quantity="other">%d unggahan</item>
+    <item quantity="one">%1$d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">Miwiti %d unggahan</item>
-    <item quantity="other">Miwiti %d unggahan</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">Miwiti %1$d unggahan</item>
+    <item quantity="other">Miwiti %1$d unggahan</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d unggahan</item>
-    <item quantity="other">%d unggahan</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d unggahan</item>
+    <item quantity="other">%1$d unggahan</item>
   </plurals>
   <string name="categories_not_found">Ora ana kategori sing cocog karo %1$s</string>
   <string name="categories_activity_title">Kategori</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 276550210..83e834d9a 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -20,9 +20,9 @@
   <string name="upload_progress_notification_title_finishing">ატვირთვის დასრულება %1$</string>
   <string name="upload_failed_notification_title">%1$ ატვირთვა ვერ მოხერხდა</string>
   <string name="upload_failed_notification_subtitle">დააჭირეთ სანახავად</string>
-  <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d ფაილი იტვირთება</item>
-    <item quantity="other">%d ფაილი იტვირთება</item>
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
+    <item quantity="one">%1$d ფაილი იტვირთება</item>
+    <item quantity="other">%1$d ფაილი იტვირთება</item>
   </plurals>
   <string name="title_activity_contributions">ჩემი ბოლო ატვირთვები</string>
   <string name="contribution_state_queued">რიგი</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">თქვენ მოწყობილობაზე GPS გამორთულია. ნამდვილად გსურთ ჩართვა?</string>
   <string name="enable_gps">GPS-ის ჩართვა</string>
   <string name="contributions_subtitle_zero">ატვირთვები არ არის</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d ატვირთვა</item>
-    <item quantity="other">%d ატვირთვა</item>
+    <item quantity="one">%1$d ატვირთვა</item>
+    <item quantity="other">%1$d ატვირთვა</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">იწყება %d ატვირთვა</item>
-    <item quantity="other">იწყება %d ატვირთვა</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">იწყება %1$d ატვირთვა</item>
+    <item quantity="other">იწყება %1$d ატვირთვა</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d ატვირთვა</item>
-    <item quantity="other">%d ატვირთვა</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d ატვირთვა</item>
+    <item quantity="other">%1$d ატვირთვა</item>
   </plurals>
   <string name="categories_activity_title">კატეგორია</string>
   <string name="title_activity_settings">კონფიგურაცია</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 87795b9c2..651981705 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Asali n  %1$s ur yeddi ara</string>
   <string name="upload_failed_notification_subtitle">Senned akken ad sekneḍ</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d n ufaylu yezga yettali</item>
-    <item quantity="other">%d n ifuyla zgan ttalin</item>
+    <item quantity="one">%1$d n ufaylu yezga yettali</item>
+    <item quantity="other">%1$d n ifuyla zgan ttalin</item>
   </plurals>
   <string name="title_activity_contributions">Ifuyla yulin melmi kan</string>
   <string name="contribution_state_queued">Ttraǧun</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Usla ayen yulin</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d n usali</item>
-    <item quantity="other">%d n usali</item>
+    <item quantity="one">%1$d n usali</item>
+    <item quantity="other">%1$d n usali</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Beddu n %d n usali</item>
-    <item quantity="other">Beddu n %d n usali</item>
+    <item quantity="one">Beddu n %1$d n usali</item>
+    <item quantity="other">Beddu n %1$d n usali</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d n usali</item>
-    <item quantity="other">%d n usali</item>
+    <item quantity="one">%1$d n usali</item>
+    <item quantity="other">%1$d n usali</item>
   </plurals>
   <string name="categories_not_found">Ulac taggayin imenṭaḍen akked %1$s i yettwafen</string>
   <string name="categories_skip_explanation">Rnu taggayin akken ad terreḍ tugniwin-ik sehlent i tifin di Wikimedia Commons.\n\nBdu timerna n taggayin.</string>
@@ -74,7 +74,7 @@
   <string name="title_activity_signup">Jerred</string>
   <string name="menu_about">Ɣef</string>
   <string name="about_license">Asnas Wikipedia Commons d asnas n uɣbalu yeldin i d-yennulfan udiɣ yettwarfed sɣur iwiziwen d wid i t-iḍemnen n tmezdagnut Wikimedia. Tasbeddit Wikimedia ur tetteka ara deg usnulfu-is, tanfelit-is, neɣ aseggem n usnas.</string>
-  <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Iɣbula&lt;/a&gt; akked &lt;a href=\"https://commons-app.github.io/\"&gt;usmel web&lt;/a&gt; di GitHub. Rnu &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;tummla GitHub&lt;/a&gt; tamaynut akken ad temmleḍ ibugen neɣ ad d-mudded isumar.</string>
+  <string name="about_improve">Rnu &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;tummla tamaynut GitHub&lt;/a&gt; akken ad temmleḍ ibugen neɣ ad d-mudded isumar.</string>
   <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Tasertit n tbaḍnit&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Ismaden&lt;/a&gt;</string>
   <string name="title_activity_about">Ɣef</string>
@@ -164,6 +164,9 @@
   <string name="login_failed_2fa_not_supported">Asesteb s snat n tarrayin ur yettusefrak ara akka tura.</string>
   <string name="logout_verification">Tabɣiḍ ad teffɣeḍ?</string>
   <string name="commons_logo">Alugu Commons</string>
+  <string name="commons_website">Asmel wen n Commons</string>
+  <string name="commons_facebook">Asmel Facebook n Commons</string>
+  <string name="commons_github">Tangalt aɣbalu Github n Commons</string>
   <string name="background_image">Tugna n ugilal</string>
   <string name="mediaimage_failed">Tugna n midya ur teddi ara</string>
   <string name="no_image_found">Ulac tugna</string>
@@ -188,6 +191,7 @@
   <string name="navigation_item_feedback">Tikti</string>
   <string name="navigation_item_logout">Tuffɣa</string>
   <string name="navigation_item_info">Atuṭuryel</string>
+  <string name="navigation_item_notification">Ilɣa</string>
   <string name="nearby_needs_permissions">Imḍiqen iqerben zemren ur ttwaskanen ara ma yella ur tebḍiḍ ara adig-ik arakal.</string>
   <string name="no_description_found">ulac aglam yettwafen</string>
   <string name="nearby_info_menu_commons_article">Asebter n ifuyla yettwasnen</string>
@@ -206,4 +210,8 @@
   <string name="location_permission_rationale_nearby">Ilaq usireg i uskan tabdart n wadigen iqerben</string>
   <string name="get_directions">AWI IWELLIHEN</string>
   <string name="read_article">ƔER AMAGRAD</string>
+  <string name="notifications_welcome">Anṣuf ar Wikimedia Commons, %1$s! Nefreḥ yes-k dagi.</string>
+  <string name="notifications_talk_page_message">%1$syeǧǧa-d izen deg usenter n uskasi</string>
+  <string name="notifications_thank_you_edit">Tanemmirt ɣef ubeddel</string>
+  <string name="notifications_mention">%1$s yemmel-ak-id deg %2$s .</string>
 </resources>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 48b531318..370026cd4 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$s ಅಪ್ಲೋಡ್ ಮಾಡುವಿಕೆ ವಿಫಲವಾಗಿದೆ</string>
   <string name="upload_failed_notification_subtitle">ನೋಡಲು ಮೆಲ್ಲಗೆ ತಟ್ಟಿ</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d ಕಡತ ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
-    <item quantity="other">%d ಕಡತಗಳು ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
+    <item quantity="one">%1$d ಕಡತ ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
+    <item quantity="other">%1$d ಕಡತಗಳು ಅಪ್ಲೋಡ್ ಅಗುತ್ತಿದೆ</item>
   </plurals>
   <string name="title_activity_contributions">ನನ್ನ ಇತ್ತಿಚಿನ ಅಪ್ಲೋಡ್ಗಳು</string>
   <string name="contribution_state_queued">ಸರತಿಸಾಲಿನಲ್ಲಿದೆ</string>
diff --git a/app/src/main/res/values-ko-kp/strings.xml b/app/src/main/res/values-ko-kp/strings.xml
new file mode 100644
index 000000000..a8dd2b83e
--- /dev/null
+++ b/app/src/main/res/values-ko-kp/strings.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">공용</string>
+  <string name="menu_settings">설정</string>
+  <string name="username">사용자 이름</string>
+  <string name="password">통행암호</string>
+  <string name="login">가입</string>
+  <string name="signup">가입하기</string>
+  <string name="logging_in_title">가입 중</string>
+  <string name="logging_in_message">기다려주세요…</string>
+  <string name="login_success">가입 성공!</string>
+  <string name="login_failed">가입 실패!</string>
+  <string name="upload_failed">서류를 찾을수 없습니다. 다른 서류를 사용해주십시오.</string>
+  <string name="authentication_failed">인증 실패!</string>
+  <string name="uploading_started">올리적재를 시작했습니다!</string>
+  <string name="upload_completed_notification_title">%1$s 서류를 올리적재하였습니다!</string>
+  <string name="upload_completed_notification_text">당신의 올리적재를 보려면 두드리세요</string>
+  <string name="upload_progress_notification_title_start">%1$s 서류 올리적재를 시작하는중</string>
+  <string name="upload_progress_notification_title_in_progress">%1$s 서류를 올리적재하는중</string>
+  <string name="upload_progress_notification_title_finishing">%1$s 서류 올리적재를 완료하는중</string>
+  <string name="upload_failed_notification_title">%1$s 서류 올리적재 실패</string>
+  <string name="upload_failed_notification_subtitle">보려면 두드리세요</string>
+  <plurals name="uploads_pending_notification_indicator">
+    <item quantity="one">%1$d개의 서류를 올리적재하는중</item>
+    <item quantity="other">%1$d개의 서류를 올리적재하는중</item>
+  </plurals>
+  <string name="title_activity_contributions">내 최근 올리적재</string>
+  <string name="contribution_state_queued">대기중</string>
+  <string name="contribution_state_failed">실패</string>
+  <string name="contribution_state_in_progress">%1$d%% 완료</string>
+  <string name="contribution_state_starting">올리적재중</string>
+  <string name="menu_from_gallery">화랑에서 선택</string>
+  <string name="menu_from_camera">사진 찍기</string>
+  <string name="menu_nearby">근처</string>
+  <string name="provider_contributions">내 올리적재</string>
+  <string name="menu_share">공유</string>
+  <string name="menu_open_in_browser">열람기로 보기</string>
+  <string name="share_title_hint">제목</string>
+  <string name="share_description_hint">설명</string>
+  <string name="login_failed_network">가입할수 없습니다 - 망 오유입니다</string>
+  <string name="login_failed_username">가입할수 없습니다 - 사용자이름을 확인하세요</string>
+  <string name="login_failed_password">가입할수 없습니다 - 통행암호를 확인하세요</string>
+  <string name="login_failed_throttled">실패한 시도가 너무 많습니다. 몇분후에 다시 시도하세요.</string>
+  <string name="login_failed_blocked">죄송합니다, 이 사용자는 공용에서 차단되였습니다</string>
+  <string name="login_failed_2fa_needed">두인자검증부호를 제공해야 합니다.</string>
+  <string name="login_failed_generic">가입 실패</string>
+  <string name="share_upload_button">올리적재</string>
+  <string name="multiple_share_base_title">이 모임에 이름짓기</string>
+  <string name="provider_modifications">바뀜</string>
+  <string name="menu_upload_single">올리적재</string>
+  <string name="categories_search_text_hint">분류 검색</string>
+  <string name="menu_save_categories">보관</string>
+  <string name="refresh_button">재생</string>
+  <string name="gps_disabled">장치에서 GPS가 금지되여있습니다. 허가하시겠습니까?</string>
+  <string name="enable_gps">GPS 허가</string>
+  <string name="contributions_subtitle_zero">아직 올리적재가 없습니다</string>
+  <plurals name="contributions_subtitle">
+    <item quantity="zero">\@string/contributions_subtitle_zero</item>
+    <item quantity="one">%1$d개 올리적재</item>
+  </plurals>
+  <plurals name="starting_multiple_uploads">
+    <item quantity="one">%1$d장의 올리적재를 시작합니다</item>
+    <item quantity="other">%1$d장의 올리적재를 시작합니다</item>
+  </plurals>
+  <plurals name="multiple_uploads_title">
+    <item quantity="one">%1$d개 올리적재</item>
+  </plurals>
+  <string name="categories_not_found">%1$s와(과) 일치하는 분류를 찾을수 없습니다</string>
+  <string name="categories_activity_title">분류</string>
+  <string name="title_activity_settings">설정</string>
+  <string name="title_activity_signup">등록하기</string>
+  <string name="menu_about">정보</string>
+  <string name="about_license">위키매체공용 프로그람은 공개원천 응용프로그람이며 위키매체공동체내의 자원봉사자에 의해 유지됩니다. 위키매체재단은 응용프로그람의 생성, 개발, 유지보수에 관여하지 않습니다.</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;개인정보정책&lt;/a&gt;</string>
+  <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;제작진&lt;/a&gt;</string>
+  <string name="title_activity_about">정보</string>
+  <string name="menu_feedback">(전자우편으로) 반결합 발신하기</string>
+  <string name="no_email_client">설치된 전자우편 의뢰기가 없습니다</string>
+  <string name="provider_categories">최근에 사용한 분류</string>
+  <string name="waiting_first_sync">첫 동기를 기다리는중…</string>
+  <string name="no_uploads_yet">아직 사진을 올리적재하지 않았습니다.</string>
+  <string name="menu_retry_upload">다시 시도</string>
+  <string name="menu_cancel_upload">취소</string>
+  <string name="share_license_summary">이 그림은 %1$s에 따라 사용이 허가됩니다</string>
+  <string name="media_upload_policy">이 그림에 대해서, 이것이 본인이 창작한 저작물이며, 저작권에 위배되는것이 포함되지 않았으며, &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;위키매체공용정책&lt;/a&gt;에 위배되지 않는다는것에 동의합니다.</string>
+  <string name="menu_download">내리적재</string>
+  <string name="preference_license">허가권</string>
+  <string name="use_previous">이전의 제목/설명을 사용하기</string>
+  <string name="allow_gps">자동으로 현재 위치 얻기</string>
+  <string name="allow_gps_summary">화상에 지리정보꼬리표가 달려 있지 않다면, 현재 위치를 검색하여 분류를 제안해주십시오</string>
+  <string name="preference_theme">야간방식</string>
+  <string name="preference_theme_summary">어두운 주제 쓰기</string>
+  <string name="license_name_cc_by_sa_four">저작자표시-동일조건변경허락 4.0</string>
+  <string name="license_name_cc_by_four">저작자표시 4.0</string>
+  <string name="license_name_cc_by_sa">저작자표시-동일조건변경허락 3.0</string>
+  <string name="license_name_cc_by">저작자표시 3.0</string>
+  <string name="license_name_cc0">CC0</string>
+  <string name="license_name_cc_by_sa_3_0">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0</string>
+  <string name="license_name_cc_by_sa_3_0_at">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (오스트리아)</string>
+  <string name="license_name_cc_by_sa_3_0_de">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (도이췰란드)</string>
+  <string name="license_name_cc_by_sa_3_0_ee">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (에스또니야)</string>
+  <string name="license_name_cc_by_sa_3_0_es">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (에스빠냐)</string>
+  <string name="license_name_cc_by_sa_3_0_hr">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (흐르바쯔까)</string>
+  <string name="license_name_cc_by_sa_3_0_lu">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (룩셈부르그)</string>
+  <string name="license_name_cc_by_sa_3_0_nl">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (네데를란드)</string>
+  <string name="license_name_cc_by_sa_3_0_no">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (노르웨이)</string>
+  <string name="license_name_cc_by_sa_3_0_pl">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (뽈스까)</string>
+  <string name="license_name_cc_by_sa_3_0_ro">크리에이티브코먼즈 저작자표시-동일조건변경허락 3.0 (로므니아)</string>
+  <string name="license_name_cc_by_3_0">크리에이티브코먼즈 저작자표시 3.0</string>
+  <string name="license_name_cc_by_sa_4_0">크리에이티브코먼즈 저작자표시-동일조건변경허락 4.0</string>
+  <string name="license_name_cc_by_4_0">크리에이티브코먼즈 저작자표시 4.0</string>
+  <string name="license_name_cc_zero">CC 령</string>
+  <string name="tutorial_1_text">위키매체공용은 위키백과에 쓰이는 대부분의 화상을 주관합니다.</string>
+  <string name="tutorial_1_subtext">당신의 화상은 전전세계 사람들을 교육하는데 도움이 됩니다!</string>
+  <string name="navigation_item_logout">탈퇴</string>
+  <string name="navigation_item_info">강좌</string>
+  <string name="navigation_item_notification">알림</string>
+  <string name="nearby_needs_permissions">위치 허가가 없으면 주변 장소를 표시할수 없습니다</string>
+  <string name="no_description_found">설명이 없습니다</string>
+  <string name="nearby_info_menu_commons_article">공용 서류 문서</string>
+  <string name="nearby_info_menu_wikidata_article">위키자료 항목</string>
+  <string name="error_while_cache">그림 캐쉬처리 오유</string>
+  <string name="title_info">이 서류를 설명할수 있는 제목으로, 서류 이름으로 사용됩니다. 띄여쓰기를 포함한 일반적인 단어를 사용할수 있습니다. 서류 확장자는 포함하지 마세요</string>
+  <string name="give_permission">권한 주기</string>
+  <string name="use_external_storage">외부기억기 사용하기</string>
+  <string name="send_log_file">일지서류 발신하기</string>
+  <string name="send_log_file_description">전자우편으로 개발자에게 일지서류 발신하기</string>
+  <string name="notifications_welcome">%1$s님, 위키매체공용에 오신것을 환영합니다! 반갑습니다.</string>
+  <string name="notifications_talk_page_message">%1$s님이 당신의 사용자 토론 문서에 글을 남겼습니다</string>
+  <string name="notifications_thank_you_edit">편집해 주셔서 감사합니다</string>
+  <string name="notifications_mention">%1$s님이 %2$s에서 당신을 언급했습니다.</string>
+</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 829b07aa9..a38bf2fc8 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$s 파일 올리기 실패</string>
   <string name="upload_failed_notification_subtitle">보려면 탭하세요</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d개의 파일을 올리는 중</item>
-    <item quantity="other">%d개의 파일을 올리는 중</item>
+    <item quantity="one">%1$d개의 파일을 올리는 중</item>
+    <item quantity="other">%1$d개의 파일을 올리는 중</item>
   </plurals>
   <string name="title_activity_contributions">내 최근 업로드</string>
   <string name="contribution_state_queued">대기 중</string>
@@ -56,15 +56,14 @@
   <string name="contributions_subtitle_zero">아직 올린 항목이 없습니다</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">1개 업로드</item>
-    <item quantity="other">%d개 업로드</item>
+    <item quantity="one">%1$d개 업로드</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d장의 업로드를 시작합니다</item>
-    <item quantity="other">%d장의 업로드를 시작합니다</item>
+    <item quantity="one">%1$d장의 업로드를 시작합니다</item>
+    <item quantity="other">%1$d장의 업로드를 시작합니다</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d개 업로드</item>
+    <item quantity="one">%1$d개 업로드</item>
   </plurals>
   <string name="categories_not_found">%1$s와(과) 일치하는 분류를 찾을 수 없습니다</string>
   <string name="categories_skip_explanation">위키미디어 공용에서 그림을 더 찾기 쉽게 만들기 위해 분류를 추가합니다.\n분류를 추가하려면 입력을 시작하세요.</string>
@@ -163,6 +162,7 @@
   <string name="login_failed_2fa_not_supported">2요소 인증은 현재 지원하지 않습니다.</string>
   <string name="logout_verification">정말 로그아웃하시겠습니까?</string>
   <string name="commons_logo">공용 로고</string>
+  <string name="commons_website">공용 웹사이트</string>
   <string name="background_image">배경 그림</string>
   <string name="mediaimage_failed">미디어 그림 실패</string>
   <string name="no_image_found">그림이 없습니다</string>
@@ -203,4 +203,8 @@
   <string name="nearby_location_has_not_changed">위치가 변경되지 않았습니다.</string>
   <string name="nearby_location_not_available">위치를 사용할 수 없습니다.</string>
   <string name="location_permission_rationale_nearby">주변 장소의 목록을 표시하기 위한 권한이 필요합니다.</string>
+  <string name="notifications_welcome">%1$s님, 위키미디어 공용에 오신 것을 환영합니다! 반갑습니다.</string>
+  <string name="notifications_talk_page_message">%1$s님이 당신의 사용자 토론 문서에 글을 남겼습니다</string>
+  <string name="notifications_thank_you_edit">편집해 주셔서 감사합니다</string>
+  <string name="notifications_mention">%1$s님이 %2$s에서 당신을 언급했습니다.</string>
 </resources>
diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml
index 5dcb02a77..517570895 100644
--- a/app/src/main/res/values-ky/strings.xml
+++ b/app/src/main/res/values-ky/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_failed_notification_subtitle">Көрүү үчүн басыңыз</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">1 файл жүктөлүүдө</item>
-    <item quantity="other">%d файл жүктөлүүдө</item>
+    <item quantity="other">%1$d файл жүктөлүүдө</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Менин жүктөөлөрүм</string>
   <string name="contribution_state_queued">Кезек</string>
@@ -49,15 +49,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Азырынча жүктөөлөр жок</item>
     <item quantity="one">1 жүктөө</item>
-    <item quantity="other">%d жүктөө</item>
+    <item quantity="other">%1$d жүктөө</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">1 жүктөө башталды</item>
-    <item quantity="other">%d жүктөө башталды</item>
+    <item quantity="other">%1$d жүктөө башталды</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 жүктөө</item>
-    <item quantity="other">%d жүктөө</item>
+    <item quantity="other">%1$d жүктөө</item>
   </plurals>
   <string name="categories_not_found">%1$s түрмөктөрү табылган жок</string>
   <string name="categories_skip_explanation" fuzzy="true">Уикиказынада Сиздин сүрөттөрдү жеңил табуу үчүн түрмөктөрдү кошуңуз.\n\nТүрмөктөрдү жазууну баштаңыз.\nБул кадамды аттап өтүү үчүн, бул билдирүүнү (же кийинкини) басыңыз.</string>
diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml
index 734841765..70e72e959 100644
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Dréckt fir nach eng Kéier ze probéieren</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">ee Fichier eroplueden</item>
-    <item quantity="other">%d Fichieren eroplueden</item>
+    <item quantity="other">%1$d Fichieren eroplueden</item>
   </plurals>
   <string name="title_activity_contributions">Meng rezent eropgeluede Fichieren</string>
   <string name="contribution_state_queued">An der Queue</string>
@@ -55,16 +55,16 @@
   <string name="contributions_subtitle_zero">Nach keng eropgeluede Fichieren</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">N@string/contributions_subtitle_zero</item>
-    <item quantity="one">1 Fichier eropgelueden</item>
-    <item quantity="other">%d Fichieren eropgelueden</item>
+    <item quantity="one">Ee Fichier eropgelueden</item>
+    <item quantity="other">%1$d Fichieren eropgelueden</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Ugefaang 1 Fichier eropzelueden</item>
-    <item quantity="other">Ugefaang %d Fichieren eropzelueden</item>
+    <item quantity="other">Ugefaang %1$d Fichieren eropzelueden</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">1 Fichier eropgelueden</item>
-    <item quantity="other">%d Fichieren eropgelueden</item>
+    <item quantity="one">Ee Fichier eropgelueden</item>
+    <item quantity="other">%1$d Fichieren eropgelueden</item>
   </plurals>
   <string name="categories_not_found">D\'Kategorie %1$s gouf net fonnt</string>
   <string name="categories_skip_explanation">Setzt Kategorien dobäi fir datt Är Biller méi einfach op Wikimedia Commons ze fanne sinn.\n\nFänkt u mat Tippe fir Kategorien dobäizesetzen.</string>
@@ -195,5 +195,7 @@
   <string name="nearby_location_has_not_changed">De Plaz huet net geännert.</string>
   <string name="nearby_location_not_available">Plaz ass net disponibel.</string>
   <string name="read_article">ARTIKEL LIESEN</string>
+  <string name="notifications_welcome">Wëllkomm op Wikimedia Commons, %1$s! Mir si frou datt Dir hei sidd.</string>
   <string name="notifications_thank_you_edit">Merci datt Dir eng Ännerung gemaach hutt</string>
+  <string name="notifications_mention">%1$s huet Iech op %2$s ernimmt.</string>
 </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index ed9bcec38..43b7fa862 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Įkelti %1$s nepavyko</string>
   <string name="upload_failed_notification_subtitle">Bakstelėkite norėdami Rodyti</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d keliamas failas</item>
-    <item quantity="other">%d keliamų failų</item>
+    <item quantity="one">%1$d keliamas failas</item>
+    <item quantity="other">%1$d keliami failai</item>
   </plurals>
   <string name="title_activity_contributions">Naujausi mano įkėlimai</string>
   <string name="contribution_state_queued">Eilėje</string>
@@ -53,18 +53,18 @@
   <string name="gps_disabled">GPS išjungta jūsų įrenginyje. Ar norite įjungti?</string>
   <string name="enable_gps">Išjungti GPS</string>
   <string name="contributions_subtitle_zero">Nėra įkėlimų kol kas</string>
-  <plurals name="contributions_subtitle" fuzzy="true">
-    <item quantity="zero">Dar nėra įkėlimų</item>
+  <plurals name="contributions_subtitle">
+    <item quantity="zero">\@string/contributions_subtitle_zero</item>
     <item quantity="one">1 įkėlimas</item>
-    <item quantity="other">%d įkėlimai</item>
+    <item quantity="other">%1$d įkėlimai</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Pradedamas %d įkėlimas</item>
-    <item quantity="other">Pradedami %d įkėlimai</item>
+    <item quantity="one">Pradedamas %1$d įkėlimas</item>
+    <item quantity="other">Pradedami %1$d įkėlimai</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d įkėlimas</item>
-    <item quantity="other">%d įkėlimai</item>
+    <item quantity="one">%1$d įkėlimas</item>
+    <item quantity="other">%1$d įkėlimai</item>
   </plurals>
   <string name="categories_not_found">Nerasta kategorijų, atitinkančiu %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Pridėkite kategorijas, kad jūsų paveikslėliai būtų lengviau randami Vikimedija Commons.\n -\n -Pradėkite rašyti, kad pridėtumėte kategorijas.</string>
@@ -136,4 +136,7 @@
   <string name="navigation_item_logout">Atsijungti</string>
   <string name="give_permission">Suteikti leidimą</string>
   <string name="login_to_your_account">Prisijunkite prie savo paskyros</string>
+  <string name="notifications_talk_page_message">%1$s paliko žinutę jūsų aptarimo puslapyje</string>
+  <string name="notifications_thank_you_edit">Dėkoja jums už atliktą pakeitimą</string>
+  <string name="notifications_mention">%1$s jus paminėjo %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 82e2e1065..1926747c5 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -98,4 +98,5 @@
   <string name="use_external_storage">Izmantot ārējo krātuvi</string>
   <string name="read_article">LASĪT RAKSTU</string>
   <string name="notifications_thank_you_edit">Paldies par labojumu</string>
+  <string name="toggle_view_button">Pārslēgt skatu</string>
 </resources>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index e35407a63..8a9811cd0 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Подигањето на „%1$s“ не успеа</string>
   <string name="upload_failed_notification_subtitle">Допрете за да погледате</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Се подига %d податотека</item>
-    <item quantity="other">Се подигаат %d податотеки</item>
+    <item quantity="one">Се подига %1$d податотека</item>
+    <item quantity="other">Се подигаат %1$d податотеки</item>
   </plurals>
   <string name="title_activity_contributions">Мои скорешни подигања</string>
   <string name="contribution_state_queued">Чека ред</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Сè уште нема подигања</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d подигање</item>
-    <item quantity="other">%d подигања</item>
+    <item quantity="one">%1$d подигање</item>
+    <item quantity="other">%1$d подигања</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Започнувам %d подигање</item>
-    <item quantity="other">Започнувам %d подигања</item>
+    <item quantity="one">Започнувам %1$d подигање</item>
+    <item quantity="other">Започнувам %1$d подигања</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d подигање</item>
-    <item quantity="other">%d подигања</item>
+    <item quantity="one">%1$d подигање</item>
+    <item quantity="other">%1$d подигања</item>
   </plurals>
   <string name="categories_not_found">Нема категории што одговараат на %1$s</string>
   <string name="categories_skip_explanation">Ставете им категории на сликите, за да можат корисниците полесно да ги најдат на Ризницата.\n\nЗа да ставите категорија, почнете со пишување на нејзиното име.</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">Се бара дозвола за приказ на список на околни места</string>
   <string name="get_directions">ДАЈ НАСОКИ</string>
   <string name="read_article">ПРОЧИТАЈ СТАТИЈА</string>
-  <string name="notifications_welcome">Добре дојдовте на Ризницата, %s! Драго ни е што сте тука.</string>
-  <string name="notifications_talk_page_message">%s ви остави порака на разговорната страница</string>
+  <string name="notifications_welcome">Добре дојдовте на Ризницата, %1$s! Драго ни е што сте тука.</string>
+  <string name="notifications_talk_page_message">%1$s ви остави порака на разговорната страница</string>
   <string name="notifications_thank_you_edit">Ви благодариме за уредувањето</string>
-  <string name="notifications_mention" formatted="false">%s ве спомна на %s.</string>
+  <string name="notifications_mention">%1$s ве спомна на %2$s.</string>
+  <string name="toggle_view_button">Смени поглед</string>
 </resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index a5248015a..fe59034e2 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_failed_notification_subtitle">കാണാനായി ടാപ് ചെയ്യുക</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">1 പ്രമാണം അപ്‌ലോഡ് ചെയ്യുന്നു</item>
-    <item quantity="other">%d പ്രമാണങ്ങൾ അപ്‌ലോഡ് ചെയ്യുന്നു</item>
+    <item quantity="other">%1$d പ്രമാണങ്ങൾ അപ്‌ലോഡ് ചെയ്യുന്നു</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">എന്റെ അപ്‌ലോഡുകൾ</string>
   <string name="contribution_state_queued">നിരയായി വെച്ചു</string>
@@ -49,15 +49,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">ഒരു അപ്‌ലോഡും ചെയ്തില്ല</item>
     <item quantity="one">ഒരു അപ്‌ലോഡ്</item>
-    <item quantity="other">%d അപ്‌ലോഡുകൾ</item>
+    <item quantity="other">%1$d അപ്‌ലോഡുകൾ</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">ഒരു അപ്‌ലോഡ് തുടങ്ങുന്നു</item>
-    <item quantity="other">%d അപ്‌ലോഡുകൾ തുടങ്ങുന്നു</item>
+    <item quantity="other">%1$d അപ്‌ലോഡുകൾ തുടങ്ങുന്നു</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">ഒരു അപ്‌ലോഡ്</item>
-    <item quantity="other">%d അപ്‌ലോഡുകൾ</item>
+    <item quantity="other">%1$d അപ്‌ലോഡുകൾ</item>
   </plurals>
   <string name="categories_not_found">%1$s എന്നതുമായി പൊരുത്തമുള്ള ഒരു വർഗ്ഗവും കണ്ടെത്താനായില്ല</string>
   <string name="categories_skip_explanation" fuzzy="true">താങ്കളുടെ ചിത്രങ്ങൾ വിക്കിമീഡിയ കോമൺസിൽ കൂടുതൽ എളുപ്പത്തിൽ കണ്ടെത്തപ്പെടാനായി വർഗ്ഗങ്ങൾ ചേർക്കുക.\n\nവർഗ്ഗങ്ങൾ ചേർക്കാനായി ടൈപ്പ് ചെയ്ത് തുടങ്ങുക.\nഈ ഘട്ടം ഒഴിവാക്കാൻ ടാപ് ചെയ്യുക (അല്ലെങ്കിൽ പിന്നോട്ട് പോവുക).</string>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 9a766f31a..f7f65ef00 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">बघण्यास अलगद टपली मारा</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">१ संचिका अपभारीत आहे</item>
-    <item quantity="other">%d संचिका अपभारीत आहे</item>
+    <item quantity="other">%1$d संचिका अपभारीत आहे</item>
   </plurals>
   <string name="title_activity_contributions">माझी अपभारणे</string>
   <string name="contribution_state_queued">प्रतिक्षावलीत ठेवले</string>
@@ -53,15 +53,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">अद्याप अपभारणे नाहीत</item>
     <item quantity="one">एक अपभारण</item>
-    <item quantity="other">%d अपभारणे</item>
+    <item quantity="other">%1$d अपभारणे</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">१ अपभारण सुरू करीत आहे upload</item>
-    <item quantity="other">%d अपभारणे सुरू करीत आहे</item>
+    <item quantity="other">%1$d अपभारणे सुरू करीत आहे</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">१ अपभारण</item>
-    <item quantity="other">%d अपभारणे</item>
+    <item quantity="other">%1$d अपभारणे</item>
   </plurals>
   <string name="categories_not_found">%1$s शी जुळणारे कोणतेच वर्ग सापडले नाहीत</string>
   <string name="categories_skip_explanation" fuzzy="true">विकिमिडिया कॉमन्सवर आपल्या संचिकांना शोधणे सोपी जाण्यासाठी त्यांना वर्ग जोडा.\n\nवर्ग जोडण्यास टंकन सुरू करा.\nही पायरी चुकविण्यास या संदेशावर अलगद टिचका (किंवा बॅक कळ टिचका)</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 5fb921843..7c19027e3 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -43,15 +43,15 @@
   <string name="menu_upload_single">Muat naik</string>
   <string name="categories_search_text_hint">Cari dalam kategori</string>
   <string name="menu_save_categories">Simpan</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Belum ada muatnaik</item>
-    <item quantity="one">%d muatnaik</item>
-    <item quantity="other">%d muatnaik</item>
+    <item quantity="one">%1$d muatnaik</item>
+    <item quantity="other">%1$d muatnaik</item>
   </plurals>
   <string name="starting_multiple_uploads" fuzzy="true">Memulakan %d kerja muat naik</string>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d muatnaik</item>
-    <item quantity="other">%d muatnaik</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d muatnaik</item>
+    <item quantity="other">%1$d muatnaik</item>
   </plurals>
   <string name="categories_not_found">Tiada kategori yang sepadan dengan %1$s dijumpai</string>
   <string name="categories_skip_explanation" fuzzy="true">Tambahkan kategori supaya gambar-gambar anda lebih senang ditemui di Wikimedia Commons.\n\nMula menaip untuk menambahkan kategori.\nKetik mesej ini (atau tekan butang undur) untuk melangkau langkah ini.</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 44e991e32..25eb9ee4e 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -20,9 +20,9 @@
   <string name="upload_progress_notification_title_finishing">Avslutter opplasting av %1$s</string>
   <string name="upload_failed_notification_title">Opplastingen av %1$s feilet</string>
   <string name="upload_failed_notification_subtitle">Trykk for å vise</string>
-  <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fil lastes opp</item>
-    <item quantity="other">%d filer lastes opp</item>
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
+    <item quantity="one">%1$d fil lastes opp</item>
+    <item quantity="other">%1$d filer lastes opp</item>
   </plurals>
   <string name="title_activity_contributions">Mine nylige opplastinger</string>
   <string name="contribution_state_queued">I ventekø</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">GPS er slått av på denne enheten. Ønsker du å slå den på?</string>
   <string name="enable_gps">Slå på GPS</string>
   <string name="contributions_subtitle_zero">Ingen opplastinger ennå</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d opplasting</item>
-    <item quantity="other">%d opplastinger</item>
+    <item quantity="one">%1$d opplasting</item>
+    <item quantity="other">%1$d opplastinger</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Starter %d opplasting</item>
-    <item quantity="other">Starter %d opplastinger</item>
+    <item quantity="one">Starter %1$d opplasting</item>
+    <item quantity="other">Starter %1$d opplastinger</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d opplasting</item>
-    <item quantity="other">%d opplastinger</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d opplasting</item>
+    <item quantity="other">%1$d opplastinger</item>
   </plurals>
   <string name="categories_not_found">Ingen kategorier som stemte overens med %1$s funnet</string>
   <string name="categories_skip_explanation">Legg til kategorier for å gjøre bildene dine lettere å finne på Wikimedia Commons.\n\nBegynn å skrive navnet på kategoriene.</string>
@@ -74,7 +74,7 @@
   <string name="title_activity_signup">Registrer deg</string>
   <string name="menu_about">Om</string>
   <string name="about_license">Wikimedia Commons-appen er åpen kildekode og er skapt og vedlikeholdt av stipendiater og frivillige fra Wikimedia-fellesskapet. Wikimedia Foundation er ikke involvert i utviklingen eller vedlikeholdet av appen.</string>
-  <string name="about_improve" fuzzy="true">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Kildekode&lt;/a&gt; og &lt;a href=\"https://commons-app.github.io/\"&gt;nettside&lt;/a&gt; på GitHub. Opprett en ny &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-sak&lt;/a&gt; for feilrapporter og forslag.</string>
+  <string name="about_improve">Opprett en ny &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub-sak&lt;/a&gt; for feilrapporter og forslag.</string>
   <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Personvernpolicy&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-comons/blob/master/CREDITS\"&gt;Bidragsytere&lt;/a&gt;</string>
   <string name="title_activity_about">Om</string>
@@ -164,6 +164,9 @@
   <string name="login_failed_2fa_not_supported">Tofaktorautentisering støttes ikke ennå.</string>
   <string name="logout_verification">Ønsker du virkelig å logge ut?</string>
   <string name="commons_logo">Commons-logo</string>
+  <string name="commons_website">Commons-nettsted</string>
+  <string name="commons_facebook">Commons\' Facebook-side</string>
+  <string name="commons_github">Commons\' kildekode på GitHub</string>
   <string name="background_image">Bakgrunnsbilde</string>
   <string name="mediaimage_failed">Mediebilde feilet</string>
   <string name="no_image_found">Intet bilde funnet</string>
@@ -207,4 +210,8 @@
   <string name="location_permission_rationale_nearby">Tillatelse kreves for å vise listen over steder i nærheten</string>
   <string name="get_directions">FÅ VEIBESKRIVELSE</string>
   <string name="read_article">LES ARTIKKEL</string>
+  <string name="notifications_welcome">Velkommen til Wikimedia Commons, %1$s! Vi er glade for at du er her.</string>
+  <string name="notifications_talk_page_message">%1$s la igjen en beskjed på diskusjonssiden din</string>
+  <string name="notifications_thank_you_edit">Takk for at du har gjort en redigering</string>
+  <string name="notifications_mention">%1$s nevnte deg på %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 23314b38f..69c35cada 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Het uploaden van %1$s is mislukt</string>
   <string name="upload_failed_notification_subtitle">Wijs aan om te bekijken</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
-    <item quantity="one">%d bestand aan het uploaden</item>
-    <item quantity="other">%d bestanden aan het uploaden</item>
+    <item quantity="one">%1$d bestand aan het uploaden</item>
+    <item quantity="other">%1$d bestanden aan het uploaden</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Mijn uploads</string>
   <string name="contribution_state_queued">In wachtrij</string>
@@ -54,15 +54,15 @@
   <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">Nog geen uploads</item>
     <item quantity="one">1 upload</item>
-    <item quantity="other">%d uploads</item>
+    <item quantity="other">%1$d uploads</item>
   </plurals>
   <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">Bezig met 1 upload</item>
-    <item quantity="other">Bezig met %d uploads</item>
+    <item quantity="other">Bezig met %1$d uploads</item>
   </plurals>
   <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 upload</item>
-    <item quantity="other">%d uploads</item>
+    <item quantity="other">%1$d uploads</item>
   </plurals>
   <string name="categories_not_found">Er zijn geen categorieën met \"%1$s\" gevonden</string>
   <string name="categories_skip_explanation" fuzzy="true">Voeg categorieën toe om uw afbeeldingen makkelijker te vinden te maken op Wikimedia Commons.\n\nBegin met het toevoegen van categorieën.\n\nKlik op dit bericht, of ga terug, om deze stap over te slaan.</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index c3783f760..548be1198 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -20,9 +20,9 @@
   <string name="upload_progress_notification_title_finishing">Fin del telecargament %1$s</string>
   <string name="upload_failed_notification_title">Telecargament fracassat a %1$s</string>
   <string name="upload_failed_notification_subtitle">Quichar per afichar</string>
-  <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fichièr en cors de cargament</item>
-    <item quantity="other">%d fichièrs en cors de cargament</item>
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
+    <item quantity="one">%1$d fichièr en cors de cargament</item>
+    <item quantity="other">%1$d fichièrs en cors de cargament</item>
   </plurals>
   <string name="title_activity_contributions">Mos darrièrs cargaments</string>
   <string name="contribution_state_queued">Mes en fila d\'espèra</string>
@@ -50,18 +50,18 @@
   <string name="categories_search_text_hint">Recercar de categorias</string>
   <string name="menu_save_categories">Enregistrar</string>
   <string name="refresh_button">Refrescar</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d cargament</item>
-    <item quantity="other">%d cargaments</item>
+    <item quantity="one">%1$d cargament</item>
+    <item quantity="other">%1$d cargaments</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d cargament aviat</item>
-    <item quantity="other">%d cargaments aviats</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">%1$d cargament aviat</item>
+    <item quantity="other">%1$d cargaments aviats</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d cargament</item>
-    <item quantity="other">%d cargaments</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d cargament</item>
+    <item quantity="other">%1$d cargaments</item>
   </plurals>
   <string name="categories_not_found">Cap de categoria que correspond a %1$s pas trobada</string>
   <string name="categories_activity_title">Categorias</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 4d74c2cd6..a0d00bc5a 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -21,7 +21,7 @@
   <string name="upload_failed_notification_subtitle">ਵੇਖਣ ਲਈ ਥਪੇੜੋ</string>
   <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">੧ ਫ਼ਾਈਲ ਚੜ੍ਹਾਈ ਜਾ ਰਹੀ ਹੈ</item>
-    <item quantity="other">%d ਫ਼ਾਈਲਾਂ ਚੜ੍ਹਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ</item>
+    <item quantity="other">%1$d ਫ਼ਾਈਲਾਂ ਚੜ੍ਹਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">ਮੇਰੇ ਅੱਪਲੋਡ</string>
   <string name="contribution_state_queued">ਕਤਾਰ ਵਿਚ</string>
@@ -54,16 +54,16 @@
   <string name="contributions_subtitle_zero">ਫ਼ਿਲਹਾਲ ਕੋਈ ਅੱਪਲੋਡ ਨਹੀਂ</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d upload</item>
-    <item quantity="other">%d ਅੱਪਲੋਡ</item>
+    <item quantity="one">%1$d upload</item>
+    <item quantity="other">%1$d ਅੱਪਲੋਡ</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d ਅੱਪਲੋਡ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ</item>
-    <item quantity="other">%d ਸ਼ੁਰੂ ਹੋ ਰਹੇ ਹਨ</item>
+    <item quantity="one">%1$d ਅੱਪਲੋਡ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ</item>
+    <item quantity="other">%1$d ਸ਼ੁਰੂ ਹੋ ਰਹੇ ਹਨ</item>
   </plurals>
   <plurals name="multiple_uploads_title">
     <item quantity="one">&amp;d ਅੱਪਲੋਡ</item>
-    <item quantity="other">%d ਅੱਪਲੋਡਾਂ</item>
+    <item quantity="other">%1$d ਅੱਪਲੋਡਾਂ</item>
   </plurals>
   <string name="categories_not_found">%1$s ਨਾਲ਼ ਮੇਲ ਖਾਂਦੀ ਕੋਈ ਸ਼੍ਰੇਣੀ ਨਹੀਂ ਲੱਭੀ</string>
   <string name="categories_skip_explanation" fuzzy="true">ਆਪਣੀਆਂ ਤਸਵੀਰਾਂ ਨੂੰ ਵਿਕੀਮੀਡੀਆ ਕਾਮਨਜ਼ ਵਿਚ ਜ਼ਿਆਦਾ ਲੱਭਣਯੋਗ ਬਣਾਉਣ ਲਈ ਸ਼੍ਰੇਣੀਆਂ ਜੋੜੋ।\n\nਸ਼੍ਰੇਣੀਆਂ ਜੋੜਨ ਲਈ ਟਾਈਪ ਕਰਨ ਅਰੰਭ ਕਰੋ।\nਇਸ ਕਾਰਜ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰਨ ਲਈ ਇਹ ਸੁਨੇਹਾ ਥਪੇੜੋ (ਜਾਂ ਵਾਪਸੀ ਬਟਨ ਦਬਾਓ)।</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index be7f6c752..20fc55610 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Wysyłanie %1$s nieudane</string>
   <string name="upload_failed_notification_subtitle">Dotknij, aby zobaczyć</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Przesyłanie %d pliku</item>
-    <item quantity="other">Przesyłanie %d plików</item>
+    <item quantity="one">Przesyłanie %1$d pliku</item>
+    <item quantity="other">Przesyłanie %1$d plików</item>
   </plurals>
   <string name="title_activity_contributions">Niedawno przesłane</string>
   <string name="contribution_state_queued">W kolejce</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Na razie brak przesłanych plików!</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">Przesłano @string/contributions_subtitle_zero</item>
-    <item quantity="one">Przesłano %d plik</item>
-    <item quantity="other">Przesłano %d pliki</item>
+    <item quantity="one">Przesłano %1$d plik</item>
+    <item quantity="other">Przesłano %1$d pliki</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Rozpoczęto %d przesyłanie</item>
-    <item quantity="other">Rozpoczęto %d przesyłania</item>
+    <item quantity="one">Rozpoczęto %1$d przesyłanie</item>
+    <item quantity="other">Rozpoczęto %1$d przesyłania</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d przesłanie</item>
-    <item quantity="other">%d przesłania</item>
+    <item quantity="one">%1$d przesłanie</item>
+    <item quantity="other">%1$d przesłania</item>
   </plurals>
   <string name="categories_not_found">Nie znaleziono kategorii pasujących do %1$s</string>
   <string name="categories_skip_explanation">Dodaj kategorie, aby ułatwić odnalezienie plików w Wikimedia Commons.\nZacznij pisać, aby dodać kategorie.</string>
@@ -183,5 +183,6 @@
   <string name="nearby_info_menu_wikidata_article">Element Wikidanych</string>
   <string name="title_info">Podaj krótką, opisową i unikalną nazwę, która będzie służyła jako nazwa pliku. Możesz używać prostego języka i spacji. Nie dodawaj rozszerzenia pliku.</string>
   <string name="login_to_your_account">Zaloguj się na swoje konto</string>
-  <string name="notifications_welcome">Witamy w Wikimedia Commons, %s! Cieszymy się, że tu jesteś.</string>
+  <string name="notifications_welcome">Witamy w Wikimedia Commons, %1$s! Cieszymy się, że tu jesteś.</string>
+  <string name="notifications_mention">%1$s wspomniał o Tobie w %2$s.</string>
 </resources>
diff --git a/app/src/main/res/values-pms/strings.xml b/app/src/main/res/values-pms/strings.xml
index e869921c1..42347b7ee 100644
--- a/app/src/main/res/values-pms/strings.xml
+++ b/app/src/main/res/values-pms/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Cariament falì a %1$s</string>
   <string name="upload_failed_notification_subtitle">Sgnaché për ësmon-e</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d archivi an camin ch\'as caria</item>
-    <item quantity="other">%d archivi an camin ch\'as cario</item>
+    <item quantity="one">%1$d archivi an camin ch\'as caria</item>
+    <item quantity="other">%1$d archivi an camin ch\'as cario</item>
   </plurals>
   <string name="title_activity_contributions">Ij mè cariament recent</string>
   <string name="contribution_state_queued">An coa</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ancor gnun cariament</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d cariament</item>
-    <item quantity="other">%d cariament</item>
+    <item quantity="one">%1$d cariament</item>
+    <item quantity="other">%1$d cariament</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d cariament ancaminà</item>
-    <item quantity="other">%d cariament ancaminà</item>
+    <item quantity="one">%1$d cariament ancaminà</item>
+    <item quantity="other">%1$d cariament ancaminà</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d cariament</item>
-    <item quantity="other">%d cariament</item>
+    <item quantity="one">%1$d cariament</item>
+    <item quantity="other">%1$d cariament</item>
   </plurals>
   <string name="categories_not_found">Gnun-e categorìe rëspondente a %1$s trovà</string>
   <string name="categories_skip_explanation">Ch\'a gionta dle categorìe, për ch\'a sia pi belfé trové soe plance su Wikimedia Commons.\nCh\'a ancamin-a a scrive për gionté dle categorìe.</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">A-i é da manca dël përmess pr\'ësmon-e na lista dij pòst davzin</string>
   <string name="get_directions">OTEN-E D\'ANSTRUSSION</string>
   <string name="read_article">LESE L\'ARTÌCOL</string>
-  <string name="notifications_welcome">Bin-ëvnù an Wikimedia Commons, %s! I soma content ëd vëdd-lo sì.</string>
-  <string name="notifications_talk_page_message">%s a l\'ha lassà un mëssagi su soa pàgina ëd ciaciarade</string>
+  <string name="notifications_welcome">Bin-ëvnù an Wikimedia Commons, %1$s! I soma content ëd vëdd-lo sì.</string>
+  <string name="notifications_talk_page_message">%1$s a l\'ha lassà un mëssagi su soa pàgina ëd ciaciarade</string>
   <string name="notifications_thank_you_edit">Mersì d\'avèj fàit na modìfica</string>
-  <string name="notifications_mention" formatted="false">%s a l\'ha massionalo su %s .</string>
+  <string name="notifications_mention">%1$s a l\'ha massionalo su %2$s .</string>
+  <string name="toggle_view_button">Cangé la visualisassion</string>
 </resources>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 800bb79ba..439943662 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -32,9 +32,9 @@
   <string name="categories_search_text_hint">وېشنيزې پلټل</string>
   <string name="menu_save_categories">خوندي کول</string>
   <string name="refresh_button">بياتازه کول</string>
-  <plurals name="multiple_uploads_title">
+  <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 پورته کول</item>
-    <item quantity="other">%d پورته کول</item>
+    <item quantity="other">%1$d پورته کول</item>
   </plurals>
   <string name="categories_activity_title">وېشنيزې</string>
   <string name="title_activity_settings">امستنې</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index be9036d40..5792df782 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -22,7 +22,7 @@
   <string name="upload_failed_notification_subtitle">Toque para ver</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">carregando arquivo</item>
-    <item quantity="other">carregando %d arquivos</item>
+    <item quantity="other">carregando %1$d arquivos</item>
   </plurals>
   <string name="title_activity_contributions">Meus envios recentes</string>
   <string name="contribution_state_queued">Na fila</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ainda não carregado</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d envio</item>
-    <item quantity="other">%d envios</item>
+    <item quantity="one">%1$d envio</item>
+    <item quantity="other">%1$d envios</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Iniciando 1 carregamento</item>
-    <item quantity="other">Iniciando %d carregamentos</item>
+    <item quantity="one">Iniciando %1$d carregamento</item>
+    <item quantity="other">Iniciando %1$d carregamentos</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">1 carregamento</item>
-    <item quantity="other">%d carregamentos</item>
+    <item quantity="one">%1$d carregamento</item>
+    <item quantity="other">%1$d carregamentos</item>
   </plurals>
   <string name="categories_not_found">Nenhuma categoria correspondente %1$s encontrada</string>
   <string name="categories_skip_explanation">Adicione categorias para fazer suas imagens mais vistas no Wikimedia Commons. \n\nComece a digitar para adicionar categorias.\nAperte nesta mensagem (ou aperte para voltar) para pular este passo</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">Permissão necessária para exibir uma lista de locais próximos</string>
   <string name="get_directions">OBTER DIREÇÕES</string>
   <string name="read_article">LER ARTIGO</string>
-  <string name="notifications_welcome">Bem-vindo ao Wikimedia Commons, %s! É um prazer tê-lo aqui.</string>
-  <string name="notifications_talk_page_message">%s deixou uma mensagem na sua página de discussão</string>
+  <string name="notifications_welcome">Bem-vindo ao Wikimedia Commons, %1$s! É um prazer tê-lo aqui.</string>
+  <string name="notifications_talk_page_message">%1$s deixou uma mensagem na sua página de discussão</string>
   <string name="notifications_thank_you_edit">Obrigado por ter realizado uma edição</string>
-  <string name="notifications_mention" formatted="false">%s fez menção a você em %s.</string>
+  <string name="notifications_mention">%1$s fez menção a você em %2$s.</string>
+  <string name="toggle_view_button">Visualização de alternância</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index be96d27f1..bfd0027fd 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">O carregamento de %1$s falhou</string>
   <string name="upload_failed_notification_subtitle">Toque para ver</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d a carregar um ficheiro</item>
-    <item quantity="other">a carregar %d ficheiros</item>
+    <item quantity="one">%1$d a carregar um ficheiro</item>
+    <item quantity="other">a carregar %1$d ficheiros</item>
   </plurals>
   <string name="title_activity_contributions">Meus carregamentos recentes</string>
   <string name="contribution_state_queued">Em espera</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Ainda não foram enviados ficheiros</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d carregamento</item>
-    <item quantity="other">%d carregamentos</item>
+    <item quantity="one">%1$d carregamento</item>
+    <item quantity="other">%1$d carregamentos</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">A iniciar %d carregamento</item>
-    <item quantity="other">A iniciar %d carregamentos</item>
+    <item quantity="one">A iniciar %1$d carregamento</item>
+    <item quantity="other">A iniciar %1$d carregamentos</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d carregamento</item>
-    <item quantity="other">%d carregamentos</item>
+    <item quantity="one">%1$d carregamento</item>
+    <item quantity="other">%1$d carregamentos</item>
   </plurals>
   <string name="categories_not_found">Nenhuma categoria correspondente %1$s encontrada</string>
   <string name="categories_skip_explanation">Adicione categorias para tornar as suas imagens mais fáceis de encontrar no Wikimedia Commons.\nComece a digitar para adicionar categorias.</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">É necessária a permissão para mostrar uma lista dos sítios aqui perto</string>
   <string name="get_directions">OBTER DIREÇÕES</string>
   <string name="read_article">LER ARTIGO</string>
-  <string name="notifications_welcome">Bem-vindo ao Wikimedia Commons, %s! É um prazer tê-lo aqui.</string>
-  <string name="notifications_talk_page_message">%s deixou uma mensagem na sua página de discussão</string>
+  <string name="notifications_welcome">Bem-vindo ao Wikimedia Commons, %1$s! É um prazer tê-lo aqui.</string>
+  <string name="notifications_talk_page_message">%1$s deixou uma mensagem na sua página de discussão</string>
   <string name="notifications_thank_you_edit">Obrigado por ter realizado uma edição</string>
-  <string name="notifications_mention" formatted="false">%s fez menção a si em %s.</string>
+  <string name="notifications_mention">%1$s fez menção a si em %2$s.</string>
+  <string name="toggle_view_button">Alternar modo de visionamento</string>
 </resources>
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index 1c92111cb..3f2035941 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -20,8 +20,8 @@
   <string name="upload_failed_notification_title">Title for notification about upload failing. %1$s represents file name</string>
   <string name="upload_failed_notification_subtitle">Text for notification about upload being completed.</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Status text about number of uploads left.\n* %d represents number of uploads left, including current one\n</item>
-    <item quantity="other">Status text about number of uploads left.\n* %d represents number of uploads left, including current one\n</item>
+    <item quantity="one">Status text about number of uploads left.\n* %1$d represents number of uploads left, including current one\n</item>
+    <item quantity="other">Status text about number of uploads left.\n* %1$d represents number of uploads left, including current one\n</item>
   </plurals>
   <string name="title_activity_contributions">Title for screen showing my contributions.</string>
   <string name="contribution_state_queued">Show status of upload as currently queued.\n{{Identical|Queue}}</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index cea885296..8021d2970 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -22,8 +22,8 @@
   <string name="upload_failed_notification_subtitle">Atingeți pentru a vizualiza</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">1 fișier se încarcă</item>
-    <item quantity="few">%d fișiere se încarcă</item>
-    <item quantity="other">%d de fișiere se încarcă</item>
+    <item quantity="few">%1$d fișiere se încarcă</item>
+    <item quantity="other">%1$d de fișiere se încarcă</item>
   </plurals>
   <string name="title_activity_contributions" fuzzy="true">Încărcările mele</string>
   <string name="contribution_state_queued">În așteptare</string>
@@ -52,19 +52,19 @@
   <string name="menu_save_categories">Salvare</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d încărcare</item>
-    <item quantity="few">%d încărcări</item>
-    <item quantity="other">%d de încărcări</item>
+    <item quantity="one">%1$d încărcare</item>
+    <item quantity="few">%1$d încărcări</item>
+    <item quantity="other">%1$d de încărcări</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Se pornește 1 încărcare</item>
-    <item quantity="few">Se pornesc %d încărcări</item>
-    <item quantity="other">Se pornesc %d de încărcări</item>
+    <item quantity="few">Se pornesc %1$d încărcări</item>
+    <item quantity="other">Se pornesc %1$d de încărcări</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
+  <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 încărcare</item>
-    <item quantity="few">%d încărcări</item>
-    <item quantity="other">%d de încărcări</item>
+    <item quantity="few">%1$d încărcări</item>
+    <item quantity="other">%1$d de încărcări</item>
   </plurals>
   <string name="categories_not_found">Nu s-a găsit nicio categorie corespunzătoare cu %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Adăugați categorii pentru a facilita găsirea imaginilor dumneavoastră la Wikimedia Commons.\n\nÎncepeți să tastați pentru a adăuga categorii.\nAtingeți acest mesaj (sau mergeți înapoi) pentru a omite acest pas.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c41602c77..eece93a93 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -21,9 +21,9 @@
   <string name="upload_failed_notification_title">Загрузка %1$s не удалась</string>
   <string name="upload_failed_notification_subtitle">Нажмите для просмотра</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d файл загружается</item>
-    <item quantity="few">%d файла загружается</item>
-    <item quantity="other">%d файлов загружается</item>
+    <item quantity="one">%1$d файл загружается</item>
+    <item quantity="few">%1$d файла загружается</item>
+    <item quantity="other">%1$d файлов загружается</item>
   </plurals>
   <string name="title_activity_contributions">Мои недавние загрузки</string>
   <string name="contribution_state_queued">В очереди</string>
@@ -57,19 +57,19 @@
   <string name="contributions_subtitle_zero">Загрузок пока нет</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d загрузка</item>
-    <item quantity="few">%d загрузки</item>
-    <item quantity="other">%d загрузок</item>
+    <item quantity="one">%1$d загрузка</item>
+    <item quantity="few">%1$d загрузки</item>
+    <item quantity="other">%1$d загрузок</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Начинается %d загрузка</item>
-    <item quantity="few">Начинается %d загрузки</item>
-    <item quantity="other">Начинается %d загрузок</item>
+    <item quantity="one">Начинается %1$d загрузка</item>
+    <item quantity="few">Начинается %1$d загрузки</item>
+    <item quantity="other">Начинается %1$d загрузок</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d загрузка</item>
-    <item quantity="few">%d загрузки</item>
-    <item quantity="other">%d загрузок</item>
+    <item quantity="one">%1$d загрузка</item>
+    <item quantity="few">%1$d загрузки</item>
+    <item quantity="other">%1$d загрузок</item>
   </plurals>
   <string name="categories_not_found">Категории, соответствующие %1$s, не найдены</string>
   <string name="categories_skip_explanation">Добавьте категории, чтобы ваши изображения можно было легко найти на Викискладе.\nНачните вводить название для добавления категорий.</string>
@@ -214,8 +214,9 @@
   <string name="location_permission_rationale_nearby">Необходимо разрешение для отображения списка мест поблизости</string>
   <string name="get_directions">Показать на карте во внешней программе</string>
   <string name="read_article">ЧИТАТЬ СТАТЬЮ</string>
-  <string name="notifications_welcome">Добро пожаловать в Wikimedia Commons, %s! Рады вас здесь видеть :-)</string>
-  <string name="notifications_talk_page_message">%s оставил сообщение на вашей странице обсуждения</string>
+  <string name="notifications_welcome">Добро пожаловать на Викисклад, %1$s! Рады вас здесь видеть.</string>
+  <string name="notifications_talk_page_message">%1$s оставил сообщение на вашей странице обсуждения</string>
   <string name="notifications_thank_you_edit">Спасибо за правку</string>
-  <string name="notifications_mention" formatted="false">%s упомянул вас на %s.</string>
+  <string name="notifications_mention">%1$s упомянул вас на %2$s.</string>
+  <string name="toggle_view_button">Переключить режим просмотра</string>
 </resources>
diff --git a/app/src/main/res/values-sd/strings.xml b/app/src/main/res/values-sd/strings.xml
index 93cc55e57..c42a38464 100644
--- a/app/src/main/res/values-sd/strings.xml
+++ b/app/src/main/res/values-sd/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$s جو چاڙھڻ ناڪام ويو</string>
   <string name="upload_failed_notification_subtitle">ڏسڻ لاءِ ٺونگيو</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d فائيل چاڙھيندي</item>
-    <item quantity="other">%d فائيلَ چاڙھيندي</item>
+    <item quantity="one">%1$d فائيل چاڙھيندي</item>
+    <item quantity="other">%1$d فائيلَ چاڙھيندي</item>
   </plurals>
   <string name="title_activity_contributions">منھنجا تازا چاڙھ</string>
   <string name="contribution_state_queued">قطار ۾</string>
@@ -52,18 +52,18 @@
   <string name="refresh_button">تازو ڪيو</string>
   <string name="enable_gps">جي پي ايس چالو ڪيو (اين ايبل جي پي ايس)</string>
   <string name="contributions_subtitle_zero">اڃان تائين ڪو به ڄاڙهه (اَپلوڊ) نه ٿيو آهي</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d چاڙھ</item>
-    <item quantity="other">%d چاڙھَ</item>
+    <item quantity="one">%1$d چاڙھ</item>
+    <item quantity="other">%1$d چاڙھَ</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">چاڙھ %d شروع ڪندي</item>
-    <item quantity="other">چاڙھَ %d شروع ڪندي</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">چاڙھ %1$d شروع ڪندي</item>
+    <item quantity="other">چاڙھَ %d$1 شروع ڪندي</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d چاڙھ</item>
-    <item quantity="other">%d چاڙھَ</item>
+    <item quantity="one">%1$d چاڙھ</item>
+    <item quantity="other">%1$d چاڙھَ</item>
   </plurals>
   <string name="categories_not_found">%1$s سان ملندڙ ڪوبہ زمرو نہ لڌو</string>
   <string name="categories_skip_explanation">پنھنجي عڪسن ۾ زمرا وجھو تہ جيئن وڪيميڊيا العام تي وڌيڪ ڳولا لائق ٿي سگھن.\n\nزمرا وجھڻ لاءِ لکڻ شروع ڪريو.</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 25761cc36..6af78dbe6 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_progress_notification_title_finishing"> %1$s උඩුගතකිරීම් අවසන් කරමින්</string>
   <string name="upload_failed_notification_title">උදුගතකරමින්  %1$s අසාර්ථකයි</string>
   <string name="upload_failed_notification_subtitle">පෙන්වන්න තට්ටු කරන්න.</string>
-  <plurals name="uploads_pending_notification_indicator">
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
     <item quantity="one">1 ගොනුවක් උඩුගත කෙරේ</item>
     <item quantity="other">ගොනු %d ක් උඩුගත කෙරේ</item>
   </plurals>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">ඔබගේ උපකරණයේ GPS ක්‍රියා විරහිත කර ඇත. ඔබ එය නැවත ක්‍රියා කිරීමට කැමතිද?</string>
   <string name="enable_gps">GPS ක්‍රියා කරවන්න</string>
   <string name="contributions_subtitle_zero">තවම උඩුගත කිරීම් කිසිවක් නැත</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">තවමත් කිසිදු උඩුගත කිරීමක් නැත</item>
     <item quantity="one">එක් උඩුගත කිරීමක් ඇත</item>
-    <item quantity="other">උඩුගත කිරීම් %d ක් ඇත</item>
+    <item quantity="other">උඩුගත කිරීම් %1$d ක් ඇත</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
+  <plurals name="starting_multiple_uploads" fuzzy="true">
     <item quantity="one">1 උඩුගත කිරීමක් ආරම්භ කරමින්</item>
-    <item quantity="other">උඩුගත කිරීම් %d ක් ආරම්භ කරමින්</item>
+    <item quantity="other">උඩුගත කිරීම් %1$d ක් ආරම්භ කරමින්</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
+  <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">1 උඩුගත කිරීමක්</item>
-    <item quantity="other">උඩුගත කිරීම් %d ක්</item>
+    <item quantity="other">උඩුගත කිරීම් %1$d ක්</item>
   </plurals>
   <string name="categories_not_found">ප්‍රවර්ග සැසඳේන්නේ නැත %1$s හමුවිsය</string>
   <string name="categories_activity_title">ප්‍රවර්ග</string>
@@ -109,7 +109,13 @@
   <string name="license_name_cc_zero">CC Zero</string>
   <string name="tutorial_1_text">විකිමාධ්‍ය කොමන්ස් විසින් විකිපීඩියාහි බාවිතා වන ඡායාරූප වලින් වැඩි කොටසක් සදහා සත්කාරකත්වය දරයි.</string>
   <string name="tutorial_1_subtext">ඔබේ ඡායාරූප ලොව පුරා ජනතාව දැනුවත් කිරීමට උදව් වේ!</string>
+  <string name="tutorial_2_text">කරුණාකර ඔබ විසින් නිපදවූ හෝ ඔබ විසින් ගනු ලැබූ චායාරූප පමණක් උඩුගත කරන්න:</string>
+  <string name="tutorial_3_text">කරුණාකර උඩුගත කිරීමෙන් වැලකී සිටින්න:</string>
   <string name="tutorial_4_text">උදාහරණ උඩුගත කිරීම:</string>
+  <string name="welcome_wikipedia_text">ඔබගේ චායාරූප වලින් දායකත්වය ලබාදෙන්න. විකිපීඩියා ලිපි වලට ජීවය දෙන්න උදව් වෙන්න!</string>
+  <string name="welcome_wikipedia_subtext">විකිපීඩියාවෙහි ඇති පින්තූර විකිමීඩියා කොමන්ස් වෙතින් පැමිණි ඒවායි.</string>
+  <string name="welcome_copyright_text">ඔබගේ චායාරූප ලොව පුරා මිනිසුන්ව දැනුවත් කිරීමට උඩව් දෙයි.</string>
+  <string name="welcome_final_text">ඔබ හිතන්නෙ ඔබට එය තේරුම් ගත්තා කියලද?</string>
   <string name="welcome_final_button_text">ඔව්!</string>
   <string name="detail_panel_cats_label">ප්‍රවර්ග</string>
   <string name="detail_panel_cats_loading">පූරණය වෙමින්</string>
@@ -119,10 +125,28 @@
   <string name="menu_refresh">නැවත ප්‍රාණවත් කරන්න</string>
   <string name="ok">හරි</string>
   <string name="title_activity_nearby">අවට ස්ථාන</string>
+  <string name="no_nearby">ළඟපාත තැන් කිසිවක් සොයා ගැනීමට නොහැකි විය</string>
   <string name="warning">අනතුරු හැඟවීමයි</string>
+  <string name="file_exists">මෙම ගොනුව දැනටමත් කොමන්ස් හි ඇත. ඔබට ඉදිරියට ‍යෑම ගැන විශ්වාසද?</string>
   <string name="yes">ඔව්</string>
   <string name="no">නැත</string>
   <string name="media_detail_title">මාතෘකාව</string>
+  <string name="media_detail_media_title">මෙම මාධ්‍ය අන්ගයේ මාතෘකාව</string>
+  <string name="media_detail_description">විස්තරය</string>
+  <string name="media_detail_uploaded_date">උඩුගත කර දිනය</string>
+  <string name="media_detail_license">බලපත්‍රය</string>
+  <string name="media_detail_coordinates">ඛණ්ඩාංක</string>
+  <string name="media_detail_coordinates_empty">කිසිවක් සපයා නොමැත</string>
+  <string name="use_wikidata">විකිදත්ත භාවිතා කරන්න</string>
+  <string name="_2fa_code">දිවිත්ව තහවුරු කිරීමේ කේතය</string>
+  <string name="number_of_uploads">මගේ අලුත්ම උඩුගත කිරීම් පෙන්වීමේ සීමාව</string>
+  <string name="maximum_limit">උපරිම සීමාව</string>
+  <string name="maximum_limit_alert">500 කට වඩා පෙන්විය නොහැක</string>
+  <string name="set_limit">අලුත්ම උඩුගත කිරීම් පෙන්වීමට සීමාවක් දමන්න</string>
+  <string name="login_failed_2fa_not_supported">ද්විත්ව තහවුරු කිරීමේ ක්‍රියා මාර්ගය තවම ක්‍රියා කරන්නෙ නැත.</string>
+  <string name="logout_verification">ඔබට ඇත්තටම නික්මීමට අවශ්‍යද?</string>
+  <string name="commons_logo">කොමන්ස් ලාන්චනය</string>
+  <string name="commons_website">කොමන්ස් වෙබ් අඩවිය</string>
   <string name="commons_facebook">කොමන්ස් ෆේස්බුක් පිටුව</string>
   <string name="no_image_found">කිසිම චායාරූපයක් සොයාගැනීමට නොහැකි විය</string>
   <string name="upload_image">පිතූරය උඩුගත කරන්න</string>
@@ -140,6 +164,7 @@
   <string name="navigation_item_settings">සැකසුම්</string>
   <string name="navigation_item_feedback">ප්‍රතිචාරය</string>
   <string name="navigation_item_logout">නික්මීම</string>
+  <string name="navigation_item_info">පාඩම</string>
   <string name="navigation_item_notification">නිවේදන</string>
   <string name="no_description_found">කිසිම තොරතුරක් සොයාගැනීමට නොමැත</string>
   <string name="nearby_info_menu_wikidata_article">විකිදත්ත අයිතමය</string>
@@ -148,6 +173,6 @@
   <string name="nearby_location_has_not_changed">ස්ථානය වෙනස් වී නොමැත</string>
   <string name="nearby_location_not_available">ස්ථානය දී නොමැත</string>
   <string name="read_article">මෙමේ ලිපිය කියවන්න</string>
-  <string name="notifications_welcome">විකිමීඩියා කොමන්ස් වෙත ඔබව සාදරයෙන් පිළිගනිමු! ඔබ මෙහි පැමිණීම ගැන අපි හද පත්ලෙන්ම සතුටු වෙමු.</string>
-  <string name="notifications_talk_page_message">ඔබගේ කතා පිටුවේ %s විසින් පණිවුඩයක් තබා ඇත</string>
+  <string name="notifications_welcome" fuzzy="true">විකිමීඩියා කොමන්ස් වෙත ඔබව සාදරයෙන් පිළිගනිමු! ඔබ මෙහි පැමිණීම ගැන අපි හද පත්ලෙන්ම සතුටු වෙමු.</string>
+  <string name="notifications_talk_page_message" fuzzy="true">ඔබගේ කතා පිටුවේ %1$s විසින් පණිවුඩයක් තබා ඇත</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d42d3cadd..003e169c4 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Nahrávanie %1$s zlyhalo</string>
   <string name="upload_failed_notification_subtitle">Kliknutím zobrazíte</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">nahráva sa %d súbor</item>
-    <item quantity="other">nahrávajú sa %d súbory</item>
+    <item quantity="one">nahráva sa %1$d súbor</item>
+    <item quantity="other">nahrávajú sa %1$d súbory</item>
   </plurals>
   <string name="title_activity_contributions">Moje nedávno nahrané</string>
   <string name="contribution_state_queued">Nahrávanie je v poradí</string>
@@ -151,5 +151,6 @@
   <string name="navigation_item_feedback">Spätná väzba</string>
   <string name="navigation_item_logout">Odhlásiť sa</string>
   <string name="navigation_item_info">Návod</string>
+  <string name="navigation_item_notification">Upozornenia</string>
   <string name="no_description_found">nenašiel sa žiaden popis</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 325256cbd..cb3ba3419 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Отпремање „%1$s“ неуспешно</string>
   <string name="upload_failed_notification_subtitle">Додирните да бисте видели</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d датотека се отпрема</item>
-    <item quantity="other">%d датотеке се отпремају</item>
+    <item quantity="one">%1$d датотека се отпрема</item>
+    <item quantity="other">%1$d датотеке се отпремају</item>
   </plurals>
   <string name="title_activity_contributions">Моја скорашња отпремања</string>
   <string name="contribution_state_queued">На чекању</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">GPS је онемогућен на Вашем уређају. Желите ли га омогућити?</string>
   <string name="enable_gps">Омогући GPS</string>
   <string name="contributions_subtitle_zero">Још увек нема отпремања</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d отпремање</item>
-    <item quantity="other">%d отпремања</item>
+    <item quantity="one">%1$d отпремање</item>
+    <item quantity="other">%1$d отпремања</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">Започни %d отпремање</item>
-    <item quantity="other">Започни %d отпремања</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">Започни %1$d отпремање</item>
+    <item quantity="other">Започни %1$d отпремања</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d отпремање</item>
-    <item quantity="other">%d отпремања</item>
+    <item quantity="one">%1$d отпремање</item>
+    <item quantity="other">%1$d отпремања</item>
   </plurals>
   <string name="categories_not_found">Нема категорија које одговарају %1$s</string>
   <string name="categories_skip_explanation">Додајте категорије на слике да бисте олакшали корисницима њихово проналажење на Остави.\n\nДа бисте додали категорију, почните са писањем њеног имена.</string>
diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml
index 77003e209..042cae3fc 100644
--- a/app/src/main/res/values-su/strings.xml
+++ b/app/src/main/res/values-su/strings.xml
@@ -20,9 +20,9 @@
   <string name="upload_progress_notification_title_finishing">Méréskeun unjalan %1$s</string>
   <string name="upload_failed_notification_title">Ngunjal %1$s gagal</string>
   <string name="upload_failed_notification_subtitle">Toél pikeun nempo</string>
-  <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">ngunjal %d berkas</item>
-    <item quantity="other">ngunjal %d berkas</item>
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
+    <item quantity="one">ngunjal %1$d berkas</item>
+    <item quantity="other">ngunjal %1$d berkas</item>
   </plurals>
   <string name="title_activity_contributions">Unjalan panungtung kuring</string>
   <string name="contribution_state_queued">Antrian</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Can aya nu diunjal</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d unjalan</item>
-    <item quantity="other">%d unjalan</item>
+    <item quantity="one">%1$d unjalan</item>
+    <item quantity="other">%1$d unjalan</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">Ngamimitian saunjalan</item>
-    <item quantity="other">Ngamimitian %d unjalan</item>
+    <item quantity="other">Ngamimitian %1$d unjalan</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
+  <plurals name="multiple_uploads_title" fuzzy="true">
     <item quantity="one">saunjalan</item>
-    <item quantity="other">%d unjalan</item>
+    <item quantity="other">%1$d unjalan</item>
   </plurals>
   <string name="categories_not_found">Teu mendak kategori anu cocog jeung %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Tambahkeun kategori hambéh gambar anjeun beuki gampang katarana di Wikimédia Commons.\n\nMimitian ku ngetik kategori.\nToél ieu talatah (atawa toél deui) pikeun ngaliwatkeun ieu bagęan.</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c73542aa8..a0450280b 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Uppladdning av %1$s misslyckades</string>
   <string name="upload_failed_notification_subtitle">Tryck för att visa</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d fil laddas upp</item>
-    <item quantity="other">%d filer laddas upp</item>
+    <item quantity="one">%1$d fil laddas upp</item>
+    <item quantity="other">%1$d filer laddas upp</item>
   </plurals>
   <string name="title_activity_contributions">Mina senaste uppladdningar</string>
   <string name="contribution_state_queued">Köade</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">Inga uppladdningar ännu</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d uppladdning</item>
-    <item quantity="other">%d uppladdningar</item>
+    <item quantity="one">%1$d uppladdning</item>
+    <item quantity="other">%1$d uppladdningar</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Startar %d uppladdning</item>
-    <item quantity="other">Startar %d uppladdningar</item>
+    <item quantity="one">Startar %1$d uppladdning</item>
+    <item quantity="other">Startar %1$d uppladdningar</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d uppladdning</item>
-    <item quantity="other">%d uppladdningar</item>
+    <item quantity="one">%1$d uppladdning</item>
+    <item quantity="other">%1$d uppladdningar</item>
   </plurals>
   <string name="categories_not_found">Inga kategorier som stämmer överens med %1$s hittades</string>
   <string name="categories_skip_explanation">Lägg till kategorier för att göra dina bilder enklare att hitta på Wikimedia Commons.\n\nBörja skriva för att lägga till kategorier.</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">Behörighet krävs för att visa en lista över platser i närheten</string>
   <string name="get_directions">FÅ VÄGBESKRIVNINGAR</string>
   <string name="read_article">LÄS ARTIKEL</string>
-  <string name="notifications_welcome">Välkommen till Wikimedia Commons, %s! Vi är glada att du är här.</string>
-  <string name="notifications_talk_page_message">%s lämnade ett meddelande på din diskussionssida</string>
+  <string name="notifications_welcome">Välkommen till Wikimedia Commons, %1$s! Vi är glada att du är här.</string>
+  <string name="notifications_talk_page_message">%1$s lämnade ett meddelande på din diskussionssida</string>
   <string name="notifications_thank_you_edit">Tack för att du gjorde en redigering</string>
-  <string name="notifications_mention" formatted="false">%s nämnde dig på %s.</string>
+  <string name="notifications_mention">%1$s nämnde dig på %2$s.</string>
+  <string name="toggle_view_button">Växla vy</string>
 </resources>
diff --git a/app/src/main/res/values-tcy/strings.xml b/app/src/main/res/values-tcy/strings.xml
index 4ece0c348..deda69193 100644
--- a/app/src/main/res/values-tcy/strings.xml
+++ b/app/src/main/res/values-tcy/strings.xml
@@ -20,9 +20,9 @@
   <string name="upload_progress_notification_title_finishing">%1$s ಅಪ್ಲೋಡ್ ಕೈದ್ ಆವೊಂದುಂಡು.</string>
   <string name="upload_failed_notification_title">%1$s ಅಪ್ಲೋಡ್ ಸರಿ ಆತಿಜಿ</string>
   <string name="upload_failed_notification_subtitle">ತುಯಾರ ಮೆಲ್ಲ ಒತ್ತುಲೆ</string>
-  <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d ಕಡತ ಅಪ್ಲೊಡ್ ಆವೊಂದುಂಡು</item>
-    <item quantity="other">%d ಕಡತೊಲು ಅಪ್ಲೋಡ್ ಆವೊಂದುಂಡು</item>
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
+    <item quantity="one">%1$d ಕಡತ ಅಪ್ಲೊಡ್ ಆವೊಂದುಂಡು</item>
+    <item quantity="other">%1$d ಕಡತೊಲು ಅಪ್ಲೋಡ್ ಆವೊಂದುಂಡು</item>
   </plurals>
   <string name="title_activity_contributions">ಎನ್ನ ದಿಂಜಯೀನಾ ವಿಚಾರೊಳು</string>
   <string name="contribution_state_queued">ದಿಂಜೊಂತುಂಡು</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index a82d02554..2b3c68a2d 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_progress_notification_title_finishing">กำลังเสร็จสิ้นการอัปโหลด %1$s</string>
   <string name="upload_failed_notification_title">การอัปโหลด %1$s ล้มเหลว</string>
   <string name="upload_failed_notification_subtitle">แตะเพื่อดู</string>
-  <string name="uploads_pending_notification_indicator">กำลังอัปโหลดไฟล์ %d ไฟล์</string>
+  <string name="uploads_pending_notification_indicator">กำลังอัปโหลดไฟล์ %1$d ไฟล์</string>
   <string name="title_activity_contributions">การอัปโหลดล่าสุดของฉัน</string>
   <string name="contribution_state_queued">อยู่ในคิว</string>
   <string name="contribution_state_failed">ล้มเหลว</string>
@@ -51,11 +51,11 @@
   <string name="gps_disabled">GPS ถูกปิดใช้งานในอุปกรณ์ของคุณอยู่ คุณต้องการเปิดใช้งานหรือไม่?</string>
   <string name="enable_gps">เปิดใช้งาน GPS</string>
   <string name="contributions_subtitle_zero">ยังไม่มีการอัปโหลด</string>
-  <string name="contributions_subtitle">การอัปโหลด %d รายการ</string>
-  <string name="starting_multiple_uploads">กำลังเริ่มการอัปโหลด %d รายการ</string>
+  <string name="contributions_subtitle">การอัปโหลด %1$d รายการ</string>
+  <string name="starting_multiple_uploads" fuzzy="true">กำลังเริ่มการอัปโหลด %1$d รายการ</string>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">การอัปโหลด %d รายการ</item>
-    <item quantity="other">การอัปโหลด %d รายการ</item>
+    <item quantity="one">การอัปโหลด %1$d รายการ</item>
+    <item quantity="other">การอัปโหลด %1$d รายการ</item>
   </plurals>
   <string name="categories_not_found">ไม่พบหมวดหมู่ที่ตรงกับ %$1s</string>
   <string name="categories_skip_explanation" fuzzy="true">เพิ่มหมวดหมู่เพื่อทำให้รูปภาพของคุณค้นพบได้ง่ายขึ้นบน Wikimedia Commons\n\nเริ่มพิมพ์เพื่อเพิ่มหมวดหมู่\nแตะข้อความนี้ (หรือกดปุ่มย้อนกลับ) เพื่อข้ามขั้นตอนนี้</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e541f2f23..f5df91381 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">%1$s dosyasının yüklemesi başarısız oldu</string>
   <string name="upload_failed_notification_subtitle">Görüntülemek için dokunun</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d dosya karşıya yükleniyor</item>
-    <item quantity="other">%d dosya karşıya yükleniyor</item>
+    <item quantity="one">%1$d dosya karşıya yükleniyor</item>
+    <item quantity="other">%1$d dosya karşıya yükleniyor</item>
   </plurals>
   <string name="title_activity_contributions">Yakın Zamandaki Yüklemelerim</string>
   <string name="contribution_state_queued">Sırada</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">GPS, cihazınızda devre dışı bırakılmıştır. Etkinleştirmek ister misiniz?</string>
   <string name="enable_gps">GPS\'i etkinleştir</string>
   <string name="contributions_subtitle_zero">Henüz yüklenmedi</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d yükleme</item>
-    <item quantity="other">%d yükleme</item>
+    <item quantity="one">%1$d yükleme</item>
+    <item quantity="other">%1$d yükleme</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">%d yüklenmeye başlanıyor</item>
-    <item quantity="other">%d yüklenmeye başlanıyor</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">%1$d yüklenmeye başlanıyor</item>
+    <item quantity="other">%1$d yüklenmeye başlanıyor</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d yükleme</item>
-    <item quantity="other">%d yükleme</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d yükleme</item>
+    <item quantity="other">%1$d yükleme</item>
   </plurals>
   <string name="categories_not_found">%1$s ile eşleşen bir kategori bulunamadı</string>
   <string name="categories_skip_explanation">Resimlerinizi Wikimedia Commons\'ta daha bulunabilir duruma getirmek için kategoriler ekleyin.\nKategori eklemek için yazmaya başlayın.</string>
diff --git a/app/src/main/res/values-ug/error.xml b/app/src/main/res/values-ug/error.xml
index 405717ab9..8b2c00876 100644
--- a/app/src/main/res/values-ug/error.xml
+++ b/app/src/main/res/values-ug/error.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="crash_dialog_title">بايلىقتىن ئورتاق بەھرىمەن بولۇش ، ھالاك بولدى</string>
   <string name="crash_dialog_ok_toast">رەھمەت سىزگە!</string>
 </resources>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index b5e76081a..b0f0333db 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -5,30 +5,53 @@
   <string name="username">ئىشلەتكۇچى ئىسمى</string>
   <string name="password">پارول</string>
   <string name="login">تىزىمغا كىرىڭ</string>
+  <string name="signup">خەتلىتىش</string>
   <string name="logging_in_title">تىزىمغا كىرىۋاتىدۇ</string>
   <string name="logging_in_message">سەل كۈتۈڭ…</string>
   <string name="login_success">تىزىمغا كىرىش مۇۋەپپەقىيەتلىك!</string>
   <string name="login_failed">تىزىمغا كىرەلمىدى!</string>
+  <string name="upload_failed">ھۆججەت تېپىلمىدى . سىناپ بېقىڭ ، باشقا ھۆججەتلەر .</string>
+  <string name="authentication_failed">سالاھىيەتنى ئىسپاتىنى تەكشۈرۈش مەغلۇپ بولدى !</string>
   <string name="uploading_started">يۈكلەش باشلاندى!</string>
   <string name="upload_completed_notification_title">%1$s يۈكلەندى!</string>
+  <string name="upload_completed_notification_text">چېكىپ كۆرۈپ بېقىڭ ، سىزنىڭ يۇقىرىغا يوللاش</string>
   <string name="upload_progress_notification_title_start">باشلىنىۋاتىدۇ %1$s يۈكلەندى</string>
   <string name="upload_progress_notification_title_in_progress">%1$s يۈكلىنىۋاتىدۇ!</string>
   <string name="upload_progress_notification_title_finishing"> %1$s يۈكلەش تاماملىنىۋاتىدۇ</string>
   <string name="upload_failed_notification_title">يۈكلىنىۋاتىدۇ %1$s مەغلۇپ بولدى</string>
-  <string name="title_activity_contributions">يۈكلىگەنلىرىم</string>
+  <string name="upload_failed_notification_subtitle">چېكىپ كۆرۈش</string>
+  <string name="title_activity_contributions" fuzzy="true">يۈكلىگەنلىرىم</string>
+  <string name="contribution_state_queued">ئادەم كىردى</string>
+  <string name="contribution_state_failed">مەغلۇپ بولدى</string>
   <string name="contribution_state_in_progress">%1$d%% تاماملاندى</string>
   <string name="contribution_state_starting">يۈكلەۋاتىدۇ</string>
+  <string name="menu_from_gallery">تىن رەسىم ئامبىرى</string>
   <string name="menu_from_camera">سۈرەتكە تارتىڭ</string>
+  <string name="menu_nearby">يېقىندىكى</string>
   <string name="provider_contributions">يۈكلىگەنلىرىم</string>
   <string name="menu_share">ئورتاقلىشىش</string>
   <string name="menu_open_in_browser">توركۆرگۈدە ئېچىڭ</string>
+  <string name="share_title_hint">ماۋزۇ</string>
   <string name="share_description_hint">چۈشەندۈرۈش</string>
+  <string name="login_failed_network">تىزىملىتىش - تور كاشىلىسى</string>
+  <string name="login_failed_username">تىزىملاشقا ئامالسىز - سىزنىڭ ئابونت نامىڭىزنى تەكشۈرۈپ بېقىڭ</string>
+  <string name="login_failed_password">تىزىملاشقا ئامالسىز مەخپىي نومۇرىڭىزنى تەكشۈرۈپ بېقىڭ</string>
+  <string name="login_failed_throttled">مەغلۇپ بولغان قېتىم سانى بەك كۆپ .  نەچچە مىنۇتتىن كېيىن قايتا سىناڭ .</string>
+  <string name="login_failed_blocked">كەچۈرۈڭ، بۇ ئابونت ئاللىقاچان ئورتاق بەھرىمەن بولىدىغان بايلىق مەنبەسى دائىرىلىك</string>
+  <string name="login_failed_2fa_needed">سىز چوقۇم سىزنىڭ قوش ئامىل تەكشۈرۈش كودىنى تاپشۇرىسىز .</string>
+  <string name="login_failed_generic">تىزىملاش مەغلۇپ بولدى</string>
   <string name="share_upload_button">يۈكلەڭ</string>
+  <string name="multiple_share_base_title">نام بېرىش بۇ گۇرۇپپا سۈرەت</string>
+  <string name="provider_modifications">ئۇقتۇرۇشلار</string>
   <string name="menu_upload_single">يۈكلە</string>
   <string name="categories_search_text_hint">كاتېگورىيىنى ئىزدەڭ</string>
   <string name="menu_save_categories">ساقلاڭ</string>
+  <string name="refresh_button">يېڭىلاش</string>
+  <string name="gps_disabled">GPS سىزنىڭ ئۈسكۈنەم ئىشلىتىشتىن توختىدى . سىز قوزغىتامسىز يوق ؟</string>
+  <string name="enable_gps">ئىشلىشكە باشلاشGPS</string>
   <string name="title_activity_settings">تەڭشەكلەر</string>
   <string name="menu_about">ھەققىدە</string>
+  <string name="menu_cancel_upload">ۋاز كەچ</string>
   <string name="menu_download">چۈشۈرۈڭ</string>
   <string name="preference_license">ئىجازەتنامە</string>
   <string name="license_name_cc_by_sa" fuzzy="true">CC Attribution-ShareAlike 3.0</string>
@@ -46,8 +69,39 @@
   <string name="license_name_cc_by_3_0">CC BY 3.0</string>
   <string name="license_name_cc_zero">CC0</string>
   <string name="welcome_final_button_text">ھەئە!</string>
-  <string name="detail_panel_cats_label">كاتېگورىيە</string>
-  <string name="detail_panel_cats_loading">يۈكلەۋاتىدۇ…</string>
+  <string name="detail_panel_cats_label">تۈرلەر</string>
+  <string name="detail_panel_cats_loading" fuzzy="true">يۈكلەۋاتىدۇ…</string>
   <string name="detail_panel_cats_none">تاللانمىغان</string>
   <string name="detail_description_empty">چۈشەندۈرۈلۈشى يوق</string>
+  <string name="ok">جەزملەش</string>
+  <string name="warning">ئاگاھلاندۇرۇش</string>
+  <string name="yes">ھەئە</string>
+  <string name="no">ياق</string>
+  <string name="media_detail_title">ماۋزۇ</string>
+  <string name="media_detail_media_title">ۋاستە ماۋزۇسى</string>
+  <string name="media_detail_description">چۈشەندۈرۈش</string>
+  <string name="media_detail_description_explanation">بۇ يەردە تولدۇرۇپ ، ئاخبارات ۋاستىلىرى توغرىسىدا ئىزاھات بەردى . بۇ بەلكىم خېلى ئۇزۇن ، ھەم كۆپ يۈككە مۇھتاج بولىدۇ . بىز ئۇ قارىماققا بەك ئۈمىد قىلىمەن .</string>
+  <string name="media_detail_uploaded_date">ئۈستىگە يەتكۈزۈش چىسلاسى</string>
+  <string name="media_detail_license">ئىجازەتنامە</string>
+  <string name="media_detail_coordinates">كوئوردىناتلار</string>
+  <string name="media_detail_coordinates_empty">تەمىنلىمەيدۇ</string>
+  <string name="become_a_tester_title">سىناق نۇسخىدىكى سىناق قىلغۇچى بولۇپ قالدى</string>
+  <string name="become_a_tester_description">بىز كىرگەن Google Play، ئۈستىدىكى ئۆلچەش قانىلى ، ھەمدە تېخىمۇ بالدۇر يېڭى ئىقتىدارى ۋە خاتا ئەسلىگە كەلتۈرۈش</string>
+  <string name="use_wikidata">ئىشلەتكۈچى ۋىكى سانلىق مەلۇماتى</string>
+  <string name="use_wikidata_summary">( ئەسكەرتىش : بۇ ئىقتىدارى بەلكىم زور مىقداردا مەنئى قىلىنغان كۆچمە سانلىق مەلۇمات ئېقىم مىقدارى ھەققى )</string>
+  <string name="_2fa_code">2FAكودى</string>
+  <string name="number_of_uploads">مېنىڭ يېقىندىن بۇيان يۇقىرىغا يوللاش چەكلەش</string>
+  <string name="maximum_limit">ئەڭ چوڭ چەكلەش</string>
+  <string name="set_limit">يېقىندا چىقىرىش چەكلىمىسى تەڭشەش</string>
+  <string name="login_failed_2fa_not_supported">نۆۋەتتىكى قوش ئامىل دەلىللەشنى قوللىمايدۇ</string>
+  <string name="logout_verification">سىز راستتىنلا چېكىنىپ چىقامسىز ؟</string>
+  <string name="commons_logo">بايلىقتىن ئورتاق بەھرىمەن بولۇش بەلگىسى</string>
+  <string name="commons_website">ئورتاق بەھرىمان بولىدىغان توربەت بايلىقى</string>
+  <string name="background_image">كۆرۈنۈش رەسىمى</string>
+  <string name="mediaimage_failed">ۋاستە رەسىمى مەغلۇپ بولدى</string>
+  <string name="no_image_found">رەسىمنى تاپالمىدى</string>
+  <string name="upload_image">رەسىم يەتكۈزۈش</string>
+  <string name="welcome_image_rainbow_bridge">ھەسەت ھۈسەن كۆۋرۈك</string>
+  <string name="notifications_thank_you_edit">تەھرىرلەپ چىقارغىنىڭىزغا رەھمەت</string>
+  <string name="toggle_view_button">مۇۋاپىق كۆرۈنۈش ئالماشتۇرۇش</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 830ee5456..809bfc84b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -21,10 +21,10 @@
   <string name="upload_failed_notification_title">Не вдалося завантажити %1$s</string>
   <string name="upload_failed_notification_subtitle">Торкніться, щоб переглянути</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">Завантажується %d файл</item>
-    <item quantity="few">Завантажуються %d файли</item>
-    <item quantity="many">Завантажується %d файлів</item>
-    <item quantity="other">Завантажується %d файлів</item>
+    <item quantity="one">Завантажується %1$d файл</item>
+    <item quantity="few">Завантажуються %1$d файли</item>
+    <item quantity="many">Завантажується %1$d файлів</item>
+    <item quantity="other">Завантажується %1$d файлів</item>
   </plurals>
   <string name="title_activity_contributions">Мої останні завантаження</string>
   <string name="contribution_state_queued">У черзі</string>
@@ -58,22 +58,22 @@
   <string name="contributions_subtitle_zero">Ще нема завантажень</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d завантаження</item>
-    <item quantity="few">%d завантаження</item>
-    <item quantity="many">%d завантажень</item>
-    <item quantity="other">%d завантажень</item>
+    <item quantity="one">%1$d завантаження</item>
+    <item quantity="few">%1$d завантаження</item>
+    <item quantity="many">%1$d завантажень</item>
+    <item quantity="other">%1$d завантажень</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Починається %d завантаження</item>
-    <item quantity="few">Починаються %d завантаження</item>
-    <item quantity="many">Починаються %d завантажень</item>
-    <item quantity="other">Починаються %d завантажень</item>
+    <item quantity="one">Починається %1$d завантаження</item>
+    <item quantity="few">Починаються %1$d завантаження</item>
+    <item quantity="many">Починаються %1$d завантажень</item>
+    <item quantity="other">Починаються %1$d завантажень</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d завантаження</item>
-    <item quantity="few">%d завантаження</item>
-    <item quantity="many">%d завантажень</item>
-    <item quantity="other">%d завантажень</item>
+    <item quantity="one">%1$d завантаження</item>
+    <item quantity="few">%1$d завантаження</item>
+    <item quantity="many">%1$d завантажень</item>
+    <item quantity="other">%1$d завантажень</item>
   </plurals>
   <string name="categories_not_found">Категорій, відповідних %1$s, не знайдено</string>
   <string name="categories_skip_explanation">Додайте категорії, щоб Ваші зображення було легше знайти у Вікісховищі. \n\nПочніть вводити текст, щоб додати категорії.</string>
@@ -123,7 +123,7 @@
   <string name="license_name_cc_by_4_0">CC BY 4.0</string>
   <string name="license_name_cc_zero">CC Zero</string>
   <string name="tutorial_1_text">На Вікісховищі зберігається більшість зображень, що використовуються у Вікіпедії.</string>
-  <string name="tutorial_1_subtext">Ваші зображення допомагають навчати людей по всьому світі!</string>
+  <string name="tutorial_1_subtext">Ваші зображення допомагають освіті людей по всьому світу!</string>
   <string name="tutorial_2_text">Будь ласка, завантажуйте зображення, повністю виконані або створені Вами:</string>
   <string name="tutorial_2_subtext">u2022 Природні об\'єкти (квіти, тварини, гори) \nu2022 Корисні об\'єкти (велосипеди, залізничні вокзали) \nu2022 Відомі люди (Ваш мер, олімпійські атлети, яких Ви зустрічали)</string>
   <string name="tutorial_3_text">Будь ласка, НЕ завантажуйте:</string>
@@ -142,8 +142,8 @@
   <string name="detail_description_empty">Немає опису</string>
   <string name="detail_license_empty">Невідома ліцензія</string>
   <string name="menu_refresh">Оновити</string>
-  <string name="read_storage_permission_rationale">Обов\'язковий дозвіл: читання зовнішньої пам\'яті. Програмка не може працювати без цього.</string>
-  <string name="write_storage_permission_rationale">Необхідний дозвіл: записування на зовнішнє сховище. Додаток не може працювати без цього.</string>
+  <string name="read_storage_permission_rationale">Обов\'язковий дозвіл: читання зовнішньої пам\'яті. Програма не може працювати без цього.</string>
+  <string name="write_storage_permission_rationale">Обов\'язковий дозвіл: записування на зовнішнє сховище. Програма не може працювати без цього.</string>
   <string name="location_permission_rationale">Додатковий дозвіл: отримувати поточне розташування для підказок категорій</string>
   <string name="ok">Гаразд</string>
   <string name="title_activity_nearby">Місця поблизу</string>
@@ -161,9 +161,9 @@
   <string name="media_detail_coordinates">Координати</string>
   <string name="media_detail_coordinates_empty">Не передбачено</string>
   <string name="become_a_tester_title">Станьте бета-тестером</string>
-  <string name="become_a_tester_description">Увійдіть на наш бета-канал на Google Play і отримайте ранній доступ до нових функцій та виправлень багів</string>
+  <string name="become_a_tester_description">Підпишіться на наш бета-канал на Google Play і отримайте ранній доступ до нових функцій та виправлень багів</string>
   <string name="use_wikidata">Використати Вікідані</string>
-  <string name="use_wikidata_summary">(Попередження: вимкнення цього може спричинити використання значного обсягу мобільних даних)</string>
+  <string name="use_wikidata_summary">(Попередження: вимкнення може спричинити використання значного обсягу мобільних даних)</string>
   <string name="_2fa_code">Код 2FA</string>
   <string name="number_of_uploads">Ліміт моїх останніх завантажень</string>
   <string name="maximum_limit">Максимальний ліміт</string>
@@ -199,6 +199,7 @@
   <string name="navigation_item_feedback">Зворотний зв\'язок</string>
   <string name="navigation_item_logout">Вийти</string>
   <string name="navigation_item_info">Посібник</string>
+  <string name="navigation_item_notification">Сповіщення</string>
   <string name="nearby_needs_permissions">Місця поблизу неможливо показати без дозволу на визначення місця розташування.</string>
   <string name="no_description_found">опис не знайдено</string>
   <string name="nearby_info_menu_commons_article">Сторінка файлу у Вікісховищі</string>
@@ -208,7 +209,7 @@
   <string name="description_info">Будь ласка, докладно опишіть файл: де його було зроблено? що на ньому зображено? який контекст? Будь ласка, опишіть об\'єкти чи осіб. Додайте інформацію, яку не можна легко здогадатися, наприклад, пору доби для фотографії пейзажу. Якщо зображено щось незвичайне, постарайтеся пояснити, що робить його незвичайним.</string>
   <string name="give_permission">Надати дозвіл</string>
   <string name="use_external_storage">Використовувати зовнішнє сховище</string>
-  <string name="use_external_storage_summary">Зберігати зображення, виконані вбудованою в додатку камерою Вашого пристрою</string>
+  <string name="use_external_storage_summary">Зберігати зображення, виконані вбудованою камерою Вашого пристрою</string>
   <string name="send_log_file">Надіслати лог-файл</string>
   <string name="send_log_file_description">Надіслати лог-файл розробникам електронною поштою</string>
   <string name="login_to_your_account">Увійдіть у свій обліковий запис</string>
@@ -217,4 +218,9 @@
   <string name="location_permission_rationale_nearby">Потрібний дозвіл для показу списку місць поблизу</string>
   <string name="get_directions">Показати на мапі у зовнішній програмі</string>
   <string name="read_article">ЧИТАТИ СТАТТЮ</string>
+  <string name="notifications_welcome">Вітаємо у Wikimedia Commons, %1$s! Раді вас бачити.</string>
+  <string name="notifications_talk_page_message">%1$s залишив повідомлення на вашій сторінці обговорення</string>
+  <string name="notifications_thank_you_edit">Дякуємо за правку</string>
+  <string name="notifications_mention">%1$s згадав вас на %2$s.</string>
+  <string name="toggle_view_button">Перемкнути режим перегляду</string>
 </resources>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 01ad30d7d..a78c0d7e4 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">اپلوڈ %1$s ہونے میں ناکام</string>
   <string name="upload_failed_notification_subtitle">دیکھنے کے لیے ٹیپ کریں</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d فائل اپلوڈ ہورہی ہے</item>
-    <item quantity="other">%d فائلیں اپلوڈ ہورہی ہے</item>
+    <item quantity="one">%1$d فائل اپلوڈ ہورہی ہے</item>
+    <item quantity="other">%1$d فائلیں اپلوڈ ہورہی ہے</item>
   </plurals>
   <string name="title_activity_contributions">میں حالیہ اپلوڈ</string>
   <string name="contribution_state_queued">قطار</string>
@@ -54,18 +54,18 @@
   <string name="gps_disabled">جی پی ایس آپ کے آلے میں غیر فعال ہے۔ آپ اس کو فعال کرنا چاہینگے؟</string>
   <string name="enable_gps">جی پی ایس فعال کریں</string>
   <string name="contributions_subtitle_zero">ابھی تک کوئی اپلوڈ نہیں</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d اپلوڈ</item>
-    <item quantity="other">%d اپلوڈ</item>
+    <item quantity="one">%1$d اپلوڈ</item>
+    <item quantity="other">%1$d اپلوڈ</item>
   </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">شروع %d اپلوڈ</item>
-    <item quantity="other">شروع %d اپلوڈ</item>
+  <plurals name="starting_multiple_uploads" fuzzy="true">
+    <item quantity="one">شروع %1$d اپلوڈ</item>
+    <item quantity="other">شروع %d$1 اپلوڈ</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d اپلوڈ</item>
-    <item quantity="other">%d اپلوڈ</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d اپلوڈ</item>
+    <item quantity="other">%1$d اپلوڈ</item>
   </plurals>
   <string name="categories_not_found">%1$s سے کوئی زمرہ جات میل نہیں کھاتے</string>
   <string name="categories_skip_explanation">ویکیمیڈیا کامنز پر اپنی تصاویر کو قابل دریافت بنانے کے لیے زمرے شامل کریں۔\n\nزمرے شامل کرنے کے لیے لکھنا شروع کریں۔\n\nاس مرحلے کو نظر انداز کرنے کے لیے اس پیغام یا (یا پیچھے) پر ٹیپ کریں۔</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 2e884eb83..7bfdf837f 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_progress_notification_title_finishing">Đang hoàn thành việc tải lên tập tin %1$s</string>
   <string name="upload_failed_notification_title">Tải lên tập tin %1$s thất bại</string>
   <string name="upload_failed_notification_subtitle">Chạm để xem</string>
-  <string name="uploads_pending_notification_indicator">%d tập tin đang được tải lên</string>
+  <string name="uploads_pending_notification_indicator" fuzzy="true">%d tập tin đang được tải lên</string>
   <string name="title_activity_contributions">Tập tin Tôi đã Tải lên Gần đây</string>
   <string name="contribution_state_queued">Đang chờ</string>
   <string name="contribution_state_failed">Thất bại</string>
@@ -51,12 +51,12 @@
   <string name="gps_disabled">Chức năng GPS đang tắt trên thiết bị của bạn. Bạn có muốn bật nó lên?</string>
   <string name="enable_gps">Bật GPS</string>
   <string name="contributions_subtitle_zero">Chưa có tập tin tải lên</string>
-  <plurals name="contributions_subtitle">
+  <plurals name="contributions_subtitle" fuzzy="true">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="other">%d tập tin tải lên</item>
+    <item quantity="other">%1$d tập tin tải lên</item>
   </plurals>
-  <string name="starting_multiple_uploads">Đang bắt đầu tải lên %d tập tin</string>
-  <string name="multiple_uploads_title">%d tập tin tải lên</string>
+  <string name="starting_multiple_uploads">Đang bắt đầu tải lên %1$d tập tin</string>
+  <string name="multiple_uploads_title" fuzzy="true">%1$d tập tin tải lên</string>
   <string name="categories_not_found">Không tìm thấy thể loại khớp với %1$s</string>
   <string name="categories_skip_explanation" fuzzy="true">Xếp các hình ảnh vào thể loại để cho chúng dễ tìm kiếm hơn trên Wikimedia Commons.\n\nHãy bắt đầu nhập tên thể loại để tìm kiếm.\nChạm vào thông điệp này (hoặc bấm Quay lại) để bỏ qua bước này.</string>
   <string name="categories_activity_title">Thể loại</string>
diff --git a/app/src/main/res/values-xmf/strings.xml b/app/src/main/res/values-xmf/strings.xml
index e54a7395a..cec936e7c 100644
--- a/app/src/main/res/values-xmf/strings.xml
+++ b/app/src/main/res/values-xmf/strings.xml
@@ -20,9 +20,9 @@
   <string name="upload_progress_notification_title_finishing">ეხარგუაშ თება %1$</string>
   <string name="upload_failed_notification_title">%1$ ეხარგუაქ ვემიხუჯინუ</string>
   <string name="upload_failed_notification_subtitle">ოძირაფალო ქეგუწკანტეთ</string>
-  <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d ფაილი იხარგუ</item>
-    <item quantity="other">%d ფაილი იხარგუ</item>
+  <plurals name="uploads_pending_notification_indicator" fuzzy="true">
+    <item quantity="one">%1$d ფაილი იხარგუ</item>
+    <item quantity="other">%1$d ფაილი იხარგუ</item>
   </plurals>
   <string name="title_activity_contributions">ჩქიმი ბოლო ეხარგუეფი</string>
   <string name="contribution_state_queued">რადი</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">ეხარგუეფი ვა რე</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d ეხარგუა</item>
-    <item quantity="other">%d ეხარგუა</item>
+    <item quantity="one">%1$d ეხარგუა</item>
+    <item quantity="other">%1$d ეხარგუა</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">იჭყაფუ %d ეხარგუა</item>
-    <item quantity="other">იჭყაფუ %d ეხარგუა</item>
+    <item quantity="one">იჭყაფუ %1$d ეხარგუა</item>
+    <item quantity="other">იჭყაფუ %1$d ეხარგუა</item>
   </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d ეხარგუა</item>
-    <item quantity="other">%d ეხარგუა</item>
+  <plurals name="multiple_uploads_title" fuzzy="true">
+    <item quantity="one">%1$d ეხარგუა</item>
+    <item quantity="other">%1$d ეხარგუა</item>
   </plurals>
   <string name="categories_activity_title">კატეგორია</string>
   <string name="title_activity_settings">პარამეტრეფი</string>
diff --git a/app/src/main/res/values-yi/strings.xml b/app/src/main/res/values-yi/strings.xml
index 0c0c3287b..27ea76605 100644
--- a/app/src/main/res/values-yi/strings.xml
+++ b/app/src/main/res/values-yi/strings.xml
@@ -20,7 +20,7 @@
   <string name="upload_failed_notification_subtitle">דרוקט צו באקוקן</string>
   <plurals name="uploads_pending_notification_indicator">
     <item quantity="one">1 טעקע לאדט אן</item>
-    <item quantity="other">%d טעקעס לאדן אן</item>
+    <item quantity="other">%1$d טעקעס לאדן אן</item>
   </plurals>
   <string name="title_activity_contributions">מײַנע ארויפלאדן</string>
   <string name="contribution_state_queued">אין ריי</string>
@@ -43,7 +43,7 @@
   <plurals name="contributions_subtitle">
     <item quantity="zero">נאך נישט קיין ארויפֿלאדן </item>
     <item quantity="one">1 ארויפֿלאד</item>
-    <item quantity="other">%d ארויפֿלאדן</item>
+    <item quantity="other">%1$d ארויפֿלאדן</item>
   </plurals>
   <string name="categories_activity_title">קאַטעגאריעס</string>
   <string name="preference_tracking">באניץ באריכטן</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2d5756fe8..379cc42ae 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -19,8 +19,8 @@
   <string name="upload_failed_notification_title">上传%1$s失败</string>
   <string name="upload_failed_notification_subtitle">轻触以查看</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d个文件上传中</item>
-    <item quantity="other">%d个文件上传中</item>
+    <item quantity="one">%1$d个文件上传中</item>
+    <item quantity="other">%1$d个文件上传中</item>
   </plurals>
   <string name="title_activity_contributions">我上传的内容</string>
   <string name="contribution_state_queued">队列</string>
@@ -47,17 +47,17 @@
   <string name="categories_search_text_hint">搜索分类</string>
   <string name="menu_save_categories">保存</string>
   <plurals name="contributions_subtitle">
-    <item quantity="one">%d次上传</item>
-    <item quantity="other">%d次上传</item>
+    <item quantity="one">%1$d次上传</item>
+    <item quantity="other">%1$d次上传</item>
     <item quantity="zero">没有上传</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">开始%d次上传</item>
-    <item quantity="other">开始%d次上传</item>
+    <item quantity="one">开始%1$d次上传</item>
+    <item quantity="other">开始%1$d次上传</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d次上传</item>
-    <item quantity="other">%d次上传</item>
+    <item quantity="one">%1$d次上传</item>
+    <item quantity="other">%1$d次上传</item>
   </plurals>
   <string name="categories_not_found">没有找到匹配%1$s的分类</string>
   <string name="categories_skip_explanation">为您的图片添加分类，让它们在维基共享上更容易被找到。
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 846fc02dd..fa6265e52 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">上傳%1$s失敗</string>
   <string name="upload_failed_notification_subtitle">輕觸檢視</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">正在上載 %d 個檔案</item>
-    <item quantity="other">正在上載 %d 個檔案</item>
+    <item quantity="one">正在上載 %1$d 個檔案</item>
+    <item quantity="other">正在上載 %1$d 個檔案</item>
   </plurals>
   <string name="title_activity_contributions">我的最近上傳</string>
   <string name="contribution_state_queued">已佇列</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">尚未上傳</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d 次上傳</item>
-    <item quantity="other">%d 次上傳</item>
+    <item quantity="one">%1$d 次上傳</item>
+    <item quantity="other">%1$d 次上傳</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">開始 %d 次上傳</item>
-    <item quantity="other">開始 %d 次上傳</item>
+    <item quantity="one">開始 %1$d 次上傳</item>
+    <item quantity="other">開始 %1$d 次上傳</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d 次上傳</item>
-    <item quantity="other">%d 次上傳</item>
+    <item quantity="one">%1$d 次上傳</item>
+    <item quantity="other">%1$d 次上傳</item>
   </plurals>
   <string name="categories_not_found">沒有發現與 %1$s 相符的分類</string>
   <string name="categories_skip_explanation">為您的圖片添加分類，使別人在維基共享資源更容易找到。\n\n開始輸入以添加分類。</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">需權限來顯示附近地點清單</string>
   <string name="get_directions">取得導向</string>
   <string name="read_article">讀取條目</string>
-  <string name="notifications_welcome">%s，歡迎來到維基共享資源！我們很高興您來到這裡。</string>
-  <string name="notifications_talk_page_message">%s 留了訊息在您的對話頁</string>
+  <string name="notifications_welcome">%1$s，歡迎來到維基共享資源！我們很高興您來到這裡。</string>
+  <string name="notifications_talk_page_message">%1$s 留了訊息在您的對話頁</string>
   <string name="notifications_thank_you_edit">感謝您所做的編輯</string>
-  <string name="notifications_mention" formatted="false">%s 在 %s 提到了您。</string>
+  <string name="notifications_mention">%1$s 在 %2$s 提到了您。</string>
+  <string name="toggle_view_button">切換檢視</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 11f1963b0..201f93f42 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">上传%1$s失败</string>
   <string name="upload_failed_notification_subtitle">点击查看</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d个文件正在上传</item>
-    <item quantity="other">%d个文件正在上传</item>
+    <item quantity="one">%1$d个文件正在上传</item>
+    <item quantity="other">%1$d个文件正在上传</item>
   </plurals>
   <string name="title_activity_contributions">我的最近上传</string>
   <string name="contribution_state_queued">已入队列</string>
@@ -56,16 +56,16 @@
   <string name="contributions_subtitle_zero">尚无上传</string>
   <plurals name="contributions_subtitle">
     <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d次上传</item>
-    <item quantity="other">%d次上传</item>
+    <item quantity="one">%1$d次上传</item>
+    <item quantity="other">%1$d次上传</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">开始%d次上传</item>
-    <item quantity="other">开始%d次上传</item>
+    <item quantity="one">开始%1$d次上传</item>
+    <item quantity="other">开始%1$d次上传</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d次上传</item>
-    <item quantity="other">%d次上传</item>
+    <item quantity="one">%1$d次上传</item>
+    <item quantity="other">%1$d次上传</item>
   </plurals>
   <string name="categories_not_found">没有找到匹配%1$s的分类</string>
   <string name="categories_skip_explanation">添加分类使您的图像更容易在维基共享资源被找到。开始输入以添加分类。</string>
@@ -210,8 +210,9 @@
   <string name="location_permission_rationale_nearby">需要权限以显示附近地点列表</string>
   <string name="get_directions">获得指示</string>
   <string name="read_article">阅读条目</string>
-  <string name="notifications_welcome">欢迎来到维基共享资源，%s！我们很高兴您来这里。</string>
-  <string name="notifications_talk_page_message">%s在您的讨论页上留下了一条消息</string>
+  <string name="notifications_welcome">欢迎来到维基共享资源，%1$s！我们很高兴您来这里。</string>
+  <string name="notifications_talk_page_message">%1$s在您的讨论页上留下了一条消息</string>
   <string name="notifications_thank_you_edit">感谢您做出编辑</string>
-  <string name="notifications_mention" formatted="false">%s在%s提到了您。</string>
+  <string name="notifications_mention">%1$s在%2$s提到了您。</string>
+  <string name="toggle_view_button">切换视图</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d95d2042a..ceba924e1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,8 +21,8 @@
   <string name="upload_failed_notification_title">Uploading %1$s failed</string>
   <string name="upload_failed_notification_subtitle">Tap to view</string>
   <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d file uploading</item>
-    <item quantity="other">%d files uploading</item>
+    <item quantity="one">%1$d file uploading</item>
+    <item quantity="other">%1$d files uploading</item>
   </plurals>
   <string name="title_activity_contributions">My Recent Uploads</string>
   <string name="contribution_state_queued">Queued</string>
@@ -57,16 +57,16 @@
   <plurals name="contributions_subtitle">
     <!--zero is not used in english. Category mentioned here for easy reference in future-->
     <item quantity="zero">@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d upload</item>
-    <item quantity="other">%d uploads</item>
+    <item quantity="one">%1$d upload</item>
+    <item quantity="other">%1$d uploads</item>
   </plurals>
   <plurals name="starting_multiple_uploads">
-    <item quantity="one">Starting %d upload</item>
-    <item quantity="other">Starting %d uploads</item>
+    <item quantity="one">Starting %1$d upload</item>
+    <item quantity="other">Starting %1$d uploads</item>
   </plurals>
   <plurals name="multiple_uploads_title">
-    <item quantity="one">%d upload</item>
-    <item quantity="other">%d uploads</item>
+    <item quantity="one">%1$d upload</item>
+    <item quantity="other">%1$d uploads</item>
   </plurals>
   <string name="categories_not_found">No categories matching %1$s found</string>
   <string name="categories_skip_explanation">Add categories to make your images more discoverable on Wikimedia Commons.\nStart typing to add categories.</string>
@@ -215,11 +215,12 @@
   <string name="nearby_location_has_not_changed">Location has not changed.</string>
   <string name="nearby_location_not_available">Location not available.</string>
   <string name="location_permission_rationale_nearby">Permission required to display a list of nearby places</string>
-    <string name="get_directions">GET DIRECTIONS</string>
+  <string name="get_directions">GET DIRECTIONS</string>
   <string name="read_article">READ ARTICLE</string>
 
-  <string name="notifications_welcome" formatted="false">Welcome to Wikimedia Commons, %s! We\'re glad you\'re here.</string>
-  <string name="notifications_talk_page_message" formatted="false">%s left a message on your talk page</string>
+  <string name="notifications_welcome" formatted="false">Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here.</string>
+  <string name="notifications_talk_page_message">%1$s left a message on your talk page</string>
   <string name="notifications_thank_you_edit">Thank you for making an edit</string>
-  <string name="notifications_mention" formatted="false">%s mentioned you on %s.</string>
+  <string name="notifications_mention">%1$s mentioned you on %2$s.</string>
+  <string name="toggle_view_button">Toggle view</string>
 </resources>
diff --git a/app/src/test/java/fr/free/nrw/commons/TestCommonsApplication.java b/app/src/test/java/fr/free/nrw/commons/TestCommonsApplication.java
index aad8a22b8..6b9f583b4 100644
--- a/app/src/test/java/fr/free/nrw/commons/TestCommonsApplication.java
+++ b/app/src/test/java/fr/free/nrw/commons/TestCommonsApplication.java
@@ -84,12 +84,12 @@ public class TestCommonsApplication extends CommonsApplication {
                         }
 
                         @Override
-                        public SessionManager providesSessionManager(Context context, MediaWikiApi mediaWikiApi) {
+                        public SessionManager providesSessionManager(Context context, MediaWikiApi mediaWikiApi, SharedPreferences sharedPreferences) {
                             return sessionManager;
                         }
 
                         @Override
-                        public MediaWikiApi provideMediaWikiApi(Context context) {
+                        public MediaWikiApi provideMediaWikiApi(Context context, SharedPreferences sharedPreferences) {
                             return mediaWikiApi;
                         }
 
diff --git a/app/src/test/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java b/app/src/test/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java
index e6b53d460..e2c8b82f6 100644
--- a/app/src/test/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java
+++ b/app/src/test/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.java
@@ -1,12 +1,13 @@
 package fr.free.nrw.commons.mwapi;
 
+import android.content.SharedPreferences;
 import android.os.Build;
+import android.preference.PreferenceManager;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
@@ -36,11 +37,13 @@ public class ApacheHttpClientMediaWikiApiTest {
 
     private ApacheHttpClientMediaWikiApi testObject;
     private MockWebServer server;
+    private SharedPreferences sharedPreferences;
 
     @Before
     public void setUp() throws Exception {
         server = new MockWebServer();
-        testObject = new ApacheHttpClientMediaWikiApi(RuntimeEnvironment.application, "http://" + server.getHostName() + ":" + server.getPort() + "/");
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(RuntimeEnvironment.application);
+        testObject = new ApacheHttpClientMediaWikiApi(RuntimeEnvironment.application, "http://" + server.getHostName() + ":" + server.getPort() + "/", sharedPreferences);
         testObject.setWikiMediaToolforgeUrl("http://" + server.getHostName() + ":" + server.getPort() + "/");
     }
 
@@ -126,11 +129,11 @@ public class ApacheHttpClientMediaWikiApiTest {
 
         RecordedRequest loginRequest = assertBasicRequestParameters(server, "POST");
         body = parseBody(loginRequest.getBody().readUtf8());
-        assertEquals("1", body.get("rememberMe"));
+        assertEquals("true", body.get("rememberMe"));
         assertEquals("foo", body.get("username"));
         assertEquals("bar", body.get("password"));
         assertEquals("baz", body.get("logintoken"));
-        assertEquals("1", body.get("logincontinue"));
+        assertEquals("true", body.get("logincontinue"));
         assertEquals("2fa", body.get("OATHToken"));
         assertEquals("xml", body.get("format"));