Export/import app data (#1339)

Closes #788

Closes #1338

Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1339
Co-authored-by: M M Arif <mmarif@swatian.com>
Co-committed-by: M M Arif <mmarif@swatian.com>

README.md

@@ -99,6 +99,7 @@ Thanks to all the open source libraries, contributors, and donors.
 - [lucide-icons/lucide](https://github.com/lucide-icons/lucide)
 - [primer/octicons](https://github.com/primer/octicons)
 - [google/material-design-icons](https://github.com/google/material-design-icons)
+- [tabler/tabler-icons](https://github.com/tabler/tabler-icons)
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)
 

app/src/main/AndroidManifest.xml

@@ -177,6 +177,9 @@
             android:name=".activities.CreateNoteActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation"
             android:windowSoftInputMode="adjustResize"/>
+        <activity
+            android:name=".activities.SettingsBackupRestoreActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|keyboard|keyboardHidden|navigation" />
 
         <meta-data
             android:name="com.samsung.android.keepalive.density"

app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java

@@ -107,14 +107,14 @@ public class AddNewAccountActivity extends BaseActivity {
 				return;
 			}
 
-			if (instanceUrlET.equals("")) {
+			if (instanceUrlET.isEmpty()) {
 
 				SnackBar.error(
 						ctx, findViewById(android.R.id.content), getString(R.string.emptyFieldURL));
 				return;
 			}
 
-			if (loginToken.equals("")) {
+			if (loginToken.isEmpty()) {
 
 				SnackBar.error(
 						ctx,

app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java

@@ -217,7 +217,7 @@ public class CreateIssueActivity extends BaseActivity
 
 	private void checkForAttachments() {
 
-		if (contentUri.size() > 0) {
+		if (!contentUri.isEmpty()) {
 
 			BottomSheetAttachmentsBinding bottomSheetAttachmentsBinding =
 					BottomSheetAttachmentsBinding.inflate(getLayoutInflater());
@@ -409,7 +409,7 @@ public class CreateIssueActivity extends BaseActivity
 		String newIssueDueDateForm =
 				Objects.requireNonNull(viewBinding.newIssueDueDate.getText()).toString();
 
-		if (newIssueTitleForm.equals("")) {
+		if (newIssueTitleForm.isEmpty()) {
 
 			SnackBar.error(
 					ctx, findViewById(android.R.id.content), getString(R.string.issueTitleEmpty));
@@ -479,7 +479,7 @@ public class CreateIssueActivity extends BaseActivity
 
 							assert response2.body() != null;
 
-							if (contentUri.size() > 0) {
+							if (!contentUri.isEmpty()) {
 								processAttachments(response2.body().getNumber());
 								contentUri.clear();
 							} else {
@@ -536,7 +536,7 @@ public class CreateIssueActivity extends BaseActivity
 								milestonesList.put(ms.getTitle(), ms);
 								assert milestonesList_ != null;
 
-								if (milestonesList_.size() > 0) {
+								if (!milestonesList_.isEmpty()) {
 
 									for (Milestone milestone : milestonesList_) {
 

app/src/main/java/org/mian/gitnex/activities/LoginActivity.java

@@ -1,19 +1,30 @@
 package org.mian.gitnex.activities;
 
+import static org.mian.gitnex.helpers.BackupUtil.checkpointIfWALEnabled;
+import static org.mian.gitnex.helpers.BackupUtil.copyFile;
+import static org.mian.gitnex.helpers.BackupUtil.getTempDir;
+import static org.mian.gitnex.helpers.BackupUtil.unzip;
+
+import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RadioGroup;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import io.mikael.urlbuilder.UrlBuilder;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import okhttp3.Credentials;
 import org.gitnex.tea4j.v2.models.AccessToken;
@@ -42,48 +53,36 @@ import retrofit2.Callback;
  */
 public class LoginActivity extends BaseActivity {
 
-	private Button loginButton;
-	private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode;
-	private AutoCompleteTextView protocolSpinner;
-	private RadioGroup loginMethod;
+	private ActivityLoginBinding activityLoginBinding;
 	private String device_id = "token";
 	private String selectedProtocol;
 	private URI instanceUrl;
 	private Version giteaVersion;
 	private int maxResponseItems = 50;
 	private int defaultPagingNumber = 25;
+	private final String DATABASE_NAME = "gitnex";
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
-		ActivityLoginBinding activityLoginBinding =
-				ActivityLoginBinding.inflate(getLayoutInflater());
+		activityLoginBinding = ActivityLoginBinding.inflate(getLayoutInflater());
 		setContentView(activityLoginBinding.getRoot());
 
 		NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
 
-		loginButton = activityLoginBinding.loginButton;
-		instanceUrlET = activityLoginBinding.instanceUrl;
-		loginUidET = activityLoginBinding.loginUid;
-		loginPassword = activityLoginBinding.loginPasswd;
-		otpCode = activityLoginBinding.otpCode;
-		protocolSpinner = activityLoginBinding.httpsSpinner;
-		loginMethod = activityLoginBinding.loginMethod;
-		loginTokenCode = activityLoginBinding.loginTokenCode;
-
 		activityLoginBinding.appVersion.setText(AppUtil.getAppVersion(appCtx));
 
 		ArrayAdapter<Protocol> adapterProtocols =
 				new ArrayAdapter<>(
 						LoginActivity.this, R.layout.list_spinner_items, Protocol.values());
 
-		instanceUrlET.setText(getIntent().getStringExtra("instanceUrl"));
+		activityLoginBinding.instanceUrl.setText(getIntent().getStringExtra("instanceUrl"));
 
-		protocolSpinner.setAdapter(adapterProtocols);
-		protocolSpinner.setSelection(0);
-		protocolSpinner.setOnItemClickListener(
+		activityLoginBinding.httpsSpinner.setAdapter(adapterProtocols);
+		activityLoginBinding.httpsSpinner.setSelection(0);
+		activityLoginBinding.httpsSpinner.setOnItemClickListener(
 				(parent, view, position, id) -> {
 					selectedProtocol = String.valueOf(parent.getItemAtPosition(position));
 
@@ -95,7 +94,7 @@ public class LoginActivity extends BaseActivity {
 					}
 				});
 
-		if (R.id.loginToken == loginMethod.getCheckedRadioButtonId()) {
+		if (R.id.loginToken == activityLoginBinding.loginMethod.getCheckedRadioButtonId()) {
 			AppUtil.setMultiVisibility(
 					View.GONE,
 					findViewById(R.id.login_uidLayout),
@@ -111,7 +110,7 @@ public class LoginActivity extends BaseActivity {
 			findViewById(R.id.loginTokenCodeLayout).setVisibility(View.GONE);
 		}
 
-		loginMethod.setOnCheckedChangeListener(
+		activityLoginBinding.loginMethod.setOnCheckedChangeListener(
 				(group, checkedId) -> {
 					if (checkedId == R.id.loginToken) {
 						AppUtil.setMultiVisibility(
@@ -138,7 +137,7 @@ public class LoginActivity extends BaseActivity {
 										enableProcessButton();
 									} else {
 										disableProcessButton();
-										loginButton.setText(
+										activityLoginBinding.loginButton.setText(
 												getResources().getString(R.string.btnLogin));
 										SnackBar.error(
 												ctx,
@@ -149,11 +148,29 @@ public class LoginActivity extends BaseActivity {
 
 		loadDefaults();
 
-		loginButton.setOnClickListener(
+		activityLoginBinding.loginButton.setOnClickListener(
 				view -> {
 					disableProcessButton();
 					login();
 				});
+
+		activityLoginBinding.restoreFromBackup.setOnClickListener(
+				restoreDb -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.restore)
+									.setMessage(
+											getResources()
+													.getString(R.string.restoreFromBackupPopupText))
+									.setNeutralButton(
+											R.string.cancelButton,
+											(dialog, which) -> dialog.dismiss())
+									.setPositiveButton(
+											R.string.restore,
+											(dialog, which) -> requestRestoreFile());
+
+					materialAlertDialogBuilder.create().show();
+				});
 	}
 
 	private void login() {
@@ -170,21 +187,33 @@ public class LoginActivity extends BaseActivity {
 				return;
 			}
 
-			String loginUid = loginUidET.getText().toString().replaceAll("[\\uFEFF]", "").trim();
-			String loginPass = loginPassword.getText().toString().trim();
+			String loginUid =
+					Objects.requireNonNull(activityLoginBinding.loginUid.getText())
+							.toString()
+							.replaceAll("[\\uFEFF]", "")
+							.trim();
+			String loginPass =
+					Objects.requireNonNull(activityLoginBinding.loginPasswd.getText())
+							.toString()
+							.trim();
 			String loginToken =
-					loginTokenCode.getText().toString().replaceAll("[\\uFEFF|#]", "").trim();
+					Objects.requireNonNull(activityLoginBinding.loginTokenCode.getText())
+							.toString()
+							.replaceAll("[\\uFEFF|#]", "")
+							.trim();
 
 			LoginType loginType =
-					(loginMethod.getCheckedRadioButtonId() == R.id.loginUsernamePassword)
+					(activityLoginBinding.loginMethod.getCheckedRadioButtonId()
+									== R.id.loginUsernamePassword)
 							? LoginType.BASIC
 							: LoginType.TOKEN;
 
 			URI rawInstanceUrl =
 					UrlBuilder.fromString(
 									UrlHelper.fixScheme(
-											instanceUrlET
-													.getText()
+											Objects.requireNonNull(
+															activityLoginBinding.instanceUrl
+																	.getText())
 													.toString()
 													.replaceAll("[\\uFEFF|#]", "")
 													.trim(),
@@ -199,9 +228,10 @@ public class LoginActivity extends BaseActivity {
 
 			// cache values to make them available the next time the user wants to log in
 			tinyDB.putString("loginType", loginType.name().toLowerCase());
-			tinyDB.putString("instanceUrlRaw", instanceUrlET.getText().toString());
+			tinyDB.putString(
+					"instanceUrlRaw", activityLoginBinding.instanceUrl.getText().toString());
 
-			if (instanceUrlET.getText().toString().equals("")) {
+			if (activityLoginBinding.instanceUrl.getText().toString().isEmpty()) {
 
 				SnackBar.error(
 						ctx, findViewById(android.R.id.content), getString(R.string.emptyFieldURL));
@@ -211,7 +241,8 @@ public class LoginActivity extends BaseActivity {
 
 			if (loginType == LoginType.BASIC) {
 
-				if (otpCode.length() != 0 && otpCode.length() != 6) {
+				if (activityLoginBinding.otpCode.length() != 0
+						&& activityLoginBinding.otpCode.length() != 6) {
 
 					SnackBar.error(
 							ctx,
@@ -221,7 +252,7 @@ public class LoginActivity extends BaseActivity {
 					return;
 				}
 
-				if (loginUid.equals("")) {
+				if (loginUid.isEmpty()) {
 					SnackBar.error(
 							ctx,
 							findViewById(android.R.id.content),
@@ -230,7 +261,7 @@ public class LoginActivity extends BaseActivity {
 					return;
 				}
 
-				if (loginPass.equals("")) {
+				if (loginPass.isEmpty()) {
 					SnackBar.error(
 							ctx,
 							findViewById(android.R.id.content),
@@ -240,15 +271,19 @@ public class LoginActivity extends BaseActivity {
 				}
 
 				int loginOTP =
-						(otpCode.length() > 0)
-								? Integer.parseInt(otpCode.getText().toString().trim())
+						(activityLoginBinding.otpCode.length() > 0)
+								? Integer.parseInt(
+										Objects.requireNonNull(
+														activityLoginBinding.otpCode.getText())
+												.toString()
+												.trim())
 								: 0;
 
 				versionCheck(loginUid, loginPass, loginOTP, loginToken, loginType);
 
 			} else {
 
-				if (loginToken.equals("")) {
+				if (loginToken.isEmpty()) {
 
 					SnackBar.error(
 							ctx,
@@ -311,7 +346,7 @@ public class LoginActivity extends BaseActivity {
 
 		Call<ServerVersion> callVersion;
 
-		if (!loginToken.equals("")) {
+		if (!loginToken.isEmpty()) {
 
 			callVersion =
 					RetrofitClient.getApiInterface(
@@ -700,7 +735,7 @@ public class LoginActivity extends BaseActivity {
 							AccessToken newToken = responseCreate.body();
 							assert newToken != null;
 
-							if (!newToken.getSha1().equals("")) {
+							if (!newToken.getSha1().isEmpty()) {
 
 								Call<User> call =
 										RetrofitClient.getApiInterface(
@@ -836,20 +871,20 @@ public class LoginActivity extends BaseActivity {
 
 		if (tinyDB.getString("loginType").equals(LoginType.BASIC.name().toLowerCase())) {
 
-			loginMethod.check(R.id.loginUsernamePassword);
+			activityLoginBinding.loginMethod.check(R.id.loginUsernamePassword);
 		} else {
 
-			loginMethod.check(R.id.loginToken);
+			activityLoginBinding.loginMethod.check(R.id.loginToken);
 		}
 
-		if (!tinyDB.getString("instanceUrlRaw").equals("")) {
+		if (!tinyDB.getString("instanceUrlRaw").isEmpty()) {
 
-			instanceUrlET.setText(tinyDB.getString("instanceUrlRaw"));
+			activityLoginBinding.instanceUrl.setText(tinyDB.getString("instanceUrlRaw"));
 		}
 
 		if (getAccount() != null && getAccount().getAccount() != null) {
 
-			loginUidET.setText(getAccount().getAccount().getUserName());
+			activityLoginBinding.loginUid.setText(getAccount().getAccount().getUserName());
 		}
 
 		if (!tinyDB.getString("uniqueAppId").isEmpty()) {
@@ -863,18 +898,109 @@ public class LoginActivity extends BaseActivity {
 
 	private void disableProcessButton() {
 
-		loginButton.setText(R.string.processingText);
-		loginButton.setEnabled(false);
+		activityLoginBinding.loginButton.setText(R.string.processingText);
+		activityLoginBinding.loginButton.setEnabled(false);
 	}
 
 	private void enableProcessButton() {
 
-		loginButton.setText(R.string.btnLogin);
-		loginButton.setEnabled(true);
+		activityLoginBinding.loginButton.setText(R.string.btnLogin);
+		activityLoginBinding.loginButton.setEnabled(true);
 	}
 
 	private enum LoginType {
 		BASIC,
 		TOKEN
 	}
+
+	private void requestRestoreFile() {
+
+		Intent intentRestore = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+		intentRestore.addCategory(Intent.CATEGORY_OPENABLE);
+		intentRestore.setType("*/*");
+		String[] mimeTypes = {"application/octet-stream", "application/x-zip"};
+		intentRestore.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
+
+		activityRestoreFileLauncher.launch(intentRestore);
+	}
+
+	ActivityResultLauncher<Intent> activityRestoreFileLauncher =
+			registerForActivityResult(
+					new ActivityResultContracts.StartActivityForResult(),
+					result -> {
+						if (result.getResultCode() == Activity.RESULT_OK) {
+
+							assert result.getData() != null;
+
+							Uri restoreFileUri = result.getData().getData();
+							assert restoreFileUri != null;
+
+							try {
+								InputStream inputStream =
+										getContentResolver().openInputStream(restoreFileUri);
+								restoreDatabaseThread(inputStream);
+							} catch (FileNotFoundException e) {
+								SnackBar.error(
+										ctx,
+										findViewById(android.R.id.content),
+										getString(R.string.restoreError));
+							}
+						}
+					});
+
+	private void restoreDatabaseThread(InputStream inputStream) {
+
+		Thread restoreDatabaseThread =
+				new Thread(
+						() -> {
+							boolean exceptionOccurred = false;
+
+							try {
+
+								String tempDir = getTempDir(ctx).getPath();
+
+								unzip(inputStream, tempDir);
+								checkpointIfWALEnabled(ctx, DATABASE_NAME);
+								restoreDatabaseFile(ctx, tempDir, DATABASE_NAME);
+
+								UserAccountsApi userAccountsApi =
+										BaseApi.getInstance(ctx, UserAccountsApi.class);
+								assert userAccountsApi != null;
+								UserAccount account = userAccountsApi.getAccountById(1);
+								AppUtil.switchToAccount(ctx, account);
+							} catch (final Exception e) {
+
+								exceptionOccurred = true;
+								SnackBar.error(
+										ctx,
+										findViewById(android.R.id.content),
+										getString(R.string.restoreError));
+							} finally {
+								if (!exceptionOccurred) {
+
+									runOnUiThread(this::restartApp);
+								}
+							}
+						});
+
+		restoreDatabaseThread.setDaemon(false);
+		restoreDatabaseThread.start();
+	}
+
+	public void restoreDatabaseFile(Context context, String tempDir, String nameOfFileToRestore)
+			throws IOException {
+
+		File currentDbFile = new File(context.getDatabasePath(DATABASE_NAME).getPath());
+		File newDbFile = new File(tempDir + "/" + nameOfFileToRestore);
+		if (newDbFile.exists()) {
+			copyFile(newDbFile, currentDbFile, false);
+		}
+	}
+
+	public void restartApp() {
+		Intent i = ctx.getPackageManager().getLaunchIntentForPackage(ctx.getPackageName());
+		assert i != null;
+		startActivity(Intent.makeRestartActivityTask(i.getComponent()));
+		Runtime.getRuntime().exit(0);
+	}
 }

app/src/main/java/org/mian/gitnex/activities/SettingsBackupRestoreActivity.java

@@ -0,0 +1,285 @@
+package org.mian.gitnex.activities;
+
+import static org.mian.gitnex.helpers.BackupUtil.backupDatabaseFile;
+import static org.mian.gitnex.helpers.BackupUtil.checkpointIfWALEnabled;
+import static org.mian.gitnex.helpers.BackupUtil.copyFile;
+import static org.mian.gitnex.helpers.BackupUtil.copyFileWithStreams;
+import static org.mian.gitnex.helpers.BackupUtil.getTempDir;
+import static org.mian.gitnex.helpers.BackupUtil.unzip;
+import static org.mian.gitnex.helpers.BackupUtil.zip;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import org.mian.gitnex.R;
+import org.mian.gitnex.database.api.BaseApi;
+import org.mian.gitnex.database.api.UserAccountsApi;
+import org.mian.gitnex.database.models.UserAccount;
+import org.mian.gitnex.databinding.ActivitySettingsBackupRestoreBinding;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.SnackBar;
+
+/**
+ * @author M M Arif
+ */
+public class SettingsBackupRestoreActivity extends BaseActivity {
+
+	private final String DATABASE_NAME = "gitnex";
+	private String BACKUP_DATABASE_NAME;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+
+		super.onCreate(savedInstanceState);
+
+		ActivitySettingsBackupRestoreBinding viewBinding =
+				ActivitySettingsBackupRestoreBinding.inflate(getLayoutInflater());
+		setContentView(viewBinding.getRoot());
+
+		viewBinding.topAppBar.setNavigationOnClickListener(v -> finish());
+		viewBinding.topAppBar.setTitle(
+				getResources()
+						.getString(
+								R.string.backupRestore,
+								getString(R.string.backup),
+								getString(R.string.restore)));
+
+		BACKUP_DATABASE_NAME = ctx.getString(R.string.appName) + "-" + LocalDate.now() + ".backup";
+
+		viewBinding.backupDataFrame.setOnClickListener(
+				v -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.backup)
+									.setMessage(
+											getResources().getString(R.string.backupFilePopupText))
+									.setNeutralButton(
+											R.string.cancelButton,
+											(dialog, which) -> dialog.dismiss())
+									.setPositiveButton(
+											R.string.backup,
+											(dialog, which) -> requestBackupFileDownload());
+
+					materialAlertDialogBuilder.create().show();
+				});
+
+		viewBinding.restoreDataFrame.setOnClickListener(
+				restoreDb -> {
+					MaterialAlertDialogBuilder materialAlertDialogBuilder =
+							new MaterialAlertDialogBuilder(ctx)
+									.setTitle(R.string.restore)
+									.setMessage(
+											getResources().getString(R.string.restoreFilePopupText))
+									.setNeutralButton(
+											R.string.cancelButton,
+											(dialog, which) -> dialog.dismiss())
+									.setPositiveButton(
+											R.string.restore,
+											(dialog, which) -> requestRestoreFile());
+
+					materialAlertDialogBuilder.create().show();
+				});
+	}
+
+	ActivityResultLauncher<Intent> activityBackupFileLauncher =
+			registerForActivityResult(
+					new ActivityResultContracts.StartActivityForResult(),
+					result -> {
+						if (result.getResultCode() == Activity.RESULT_OK) {
+
+							assert result.getData() != null;
+
+							Uri backupFileUri = result.getData().getData();
+							backupDatabaseThread(backupFileUri);
+						}
+					});
+
+	private void requestBackupFileDownload() {
+
+		Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+		intent.addCategory(Intent.CATEGORY_OPENABLE);
+		intent.putExtra(Intent.EXTRA_TITLE, BACKUP_DATABASE_NAME);
+		intent.setType("application/octet-stream");
+
+		activityBackupFileLauncher.launch(intent);
+	}
+
+	private void backupDatabaseThread(Uri backupFileUri) {
+
+		List<File> filesToZip = new ArrayList<>();
+
+		Thread backupDatabaseThread =
+				new Thread(
+						() -> {
+							File tempDir = getTempDir(ctx);
+
+							try {
+
+								checkpointIfWALEnabled(ctx, DATABASE_NAME);
+
+								File databaseBackupFile =
+										backupDatabaseFile(
+												getDatabasePath(DATABASE_NAME).getPath(),
+												tempDir.getPath() + "/" + DATABASE_NAME);
+
+								filesToZip.add(databaseBackupFile);
+								String tempZipFilename = "temp.backup";
+
+								boolean zipFileStatus =
+										zip(filesToZip, tempDir.getPath(), tempZipFilename);
+
+								if (zipFileStatus) {
+
+									File tempZipFile = new File(tempDir, tempZipFilename);
+									Uri zipFileUri = Uri.fromFile(tempZipFile);
+
+									InputStream inputStream =
+											getContentResolver().openInputStream(zipFileUri);
+									OutputStream outputStream =
+											getContentResolver().openOutputStream(backupFileUri);
+
+									boolean copySucceeded =
+											copyFileWithStreams(inputStream, outputStream);
+
+									SnackBar.success(
+											ctx,
+											findViewById(android.R.id.content),
+											getString(R.string.backupFileSuccess));
+
+									if (copySucceeded) {
+										tempZipFile.delete();
+									} else {
+										SnackBar.error(
+												ctx,
+												findViewById(android.R.id.content),
+												getString(R.string.backupFileError));
+									}
+								} else {
+									SnackBar.error(
+											ctx,
+											findViewById(android.R.id.content),
+											getString(R.string.backupFileError));
+								}
+
+							} catch (final Exception e) {
+								SnackBar.error(
+										ctx,
+										findViewById(android.R.id.content),
+										getString(R.string.backupFileError));
+							} finally {
+								for (File file : filesToZip) {
+									if (file != null && file.exists()) {
+										file.delete();
+									}
+								}
+							}
+						});
+
+		backupDatabaseThread.setDaemon(false);
+		backupDatabaseThread.start();
+	}
+
+	private void requestRestoreFile() {
+
+		Intent intentRestore = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+		intentRestore.addCategory(Intent.CATEGORY_OPENABLE);
+		intentRestore.setType("*/*");
+		String[] mimeTypes = {"application/octet-stream", "application/x-zip"};
+		intentRestore.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
+
+		activityRestoreFileLauncher.launch(intentRestore);
+	}
+
+	ActivityResultLauncher<Intent> activityRestoreFileLauncher =
+			registerForActivityResult(
+					new ActivityResultContracts.StartActivityForResult(),
+					result -> {
+						if (result.getResultCode() == Activity.RESULT_OK) {
+
+							assert result.getData() != null;
+
+							Uri restoreFileUri = result.getData().getData();
+							assert restoreFileUri != null;
+
+							try {
+								InputStream inputStream =
+										getContentResolver().openInputStream(restoreFileUri);
+								restoreDatabaseThread(inputStream);
+							} catch (FileNotFoundException e) {
+								SnackBar.error(
+										ctx,
+										findViewById(android.R.id.content),
+										getString(R.string.restoreError));
+							}
+						}
+					});
+
+	private void restoreDatabaseThread(InputStream inputStream) {
+
+		Thread restoreDatabaseThread =
+				new Thread(
+						() -> {
+							boolean exceptionOccurred = false;
+
+							try {
+
+								String tempDir = getTempDir(ctx).getPath();
+
+								unzip(inputStream, tempDir);
+								checkpointIfWALEnabled(ctx, DATABASE_NAME);
+								restoreDatabaseFile(ctx, tempDir, DATABASE_NAME);
+
+								UserAccountsApi userAccountsApi =
+										BaseApi.getInstance(ctx, UserAccountsApi.class);
+								assert userAccountsApi != null;
+								UserAccount account = userAccountsApi.getAccountById(1);
+								AppUtil.switchToAccount(ctx, account);
+							} catch (final Exception e) {
+
+								exceptionOccurred = true;
+								SnackBar.error(
+										ctx,
+										findViewById(android.R.id.content),
+										getString(R.string.restoreError));
+							} finally {
+								if (!exceptionOccurred) {
+
+									runOnUiThread(this::restartApp);
+								}
+							}
+						});
+
+		restoreDatabaseThread.setDaemon(false);
+		restoreDatabaseThread.start();
+	}
+
+	public void restoreDatabaseFile(Context context, String tempDir, String nameOfFileToRestore)
+			throws IOException {
+
+		File currentDbFile = new File(context.getDatabasePath(DATABASE_NAME).getPath());
+		File newDbFile = new File(tempDir + "/" + nameOfFileToRestore);
+		if (newDbFile.exists()) {
+			copyFile(newDbFile, currentDbFile, false);
+		}
+	}
+
+	public void restartApp() {
+		Intent i = ctx.getPackageManager().getLaunchIntentForPackage(ctx.getPackageName());
+		assert i != null;
+		startActivity(Intent.makeRestartActivityTask(i.getComponent()));
+		Runtime.getRuntime().exit(0);
+	}
+}

app/src/main/java/org/mian/gitnex/core/MainApplication.java

@@ -52,18 +52,10 @@ public class MainApplication extends Application {
 
 		Notifications.createChannels(appCtx);
 		DynamicColors.applyToActivitiesIfAvailable(this);
-	}
-
-	@Override
-	protected void attachBaseContext(Context context) {
-
-		super.attachBaseContext(context);
-
-		tinyDB = TinyDB.getInstance(context);
 
 		if (Boolean.parseBoolean(
 				AppDatabaseSettings.getSettingsValue(
-						context, AppDatabaseSettings.APP_CRASH_REPORTS_KEY))) {
+						getApplicationContext(), AppDatabaseSettings.APP_CRASH_REPORTS_KEY))) {
 
 			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder();
 
@@ -91,7 +83,7 @@ public class MainApplication extends Application {
 									getResources()
 											.getString(
 													R.string.crashReportEmailSubject,
-													AppUtil.getAppBuildNo(context)))
+													AppUtil.getAppBuildNo(getApplicationContext())))
 							.withReportAsFile(true)
 							.build());
 
@@ -102,6 +94,14 @@ public class MainApplication extends Application {
 		}
 	}
 
+	@Override
+	protected void attachBaseContext(Context context) {
+
+		super.attachBaseContext(context);
+
+		tinyDB = TinyDB.getInstance(context);
+	}
+
 	public boolean switchToAccount(UserAccount userAccount, boolean tmp) {
 		if (!tmp || tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
 			currentAccount = new AccountContext(userAccount);

app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java

@@ -279,7 +279,11 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 			if (issue.getIssueType().equalsIgnoreCase("issue")) {
 				binding.issuePrDivider.setVisibility(View.GONE);
 			}
-		} else if (!canPush) {
+		}
+		if (isRepoAdmin || canPush) {
+			binding.addRemoveAssignees.setVisibility(View.VISIBLE);
+			binding.editLabels.setVisibility(View.VISIBLE);
+		} else {
 			binding.addRemoveAssignees.setVisibility(View.GONE);
 			binding.editLabels.setVisibility(View.GONE);
 		}

app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java

@@ -16,6 +16,7 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.activities.BaseActivity;
 import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.SettingsAppearanceActivity;
+import org.mian.gitnex.activities.SettingsBackupRestoreActivity;
 import org.mian.gitnex.activities.SettingsCodeEditorActivity;
 import org.mian.gitnex.activities.SettingsGeneralActivity;
 import org.mian.gitnex.activities.SettingsNotificationsActivity;
@@ -44,16 +45,14 @@ public class SettingsFragment extends Fragment {
 				FragmentSettingsBinding.inflate(inflater, container, false);
 
 		ctx = getContext();
+		assert ctx != null;
 		materialAlertDialogBuilder =
 				new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
 		((MainActivity) requireActivity())
 				.setActionBarTitle(getResources().getString(R.string.navSettings));
 
-		if (((BaseActivity) requireActivity()).getAccount().requiresVersion("1.12.3")) {
-
-			fragmentSettingsBinding.notificationsFrame.setVisibility(View.VISIBLE);
-		}
+		fragmentSettingsBinding.notificationsFrame.setVisibility(View.VISIBLE);
 
 		fragmentSettingsBinding.generalFrame.setOnClickListener(
 				generalFrameCall -> startActivity(new Intent(ctx, SettingsGeneralActivity.class)));
@@ -70,6 +69,14 @@ public class SettingsFragment extends Fragment {
 		fragmentSettingsBinding.notificationsFrame.setOnClickListener(
 				v1 -> startActivity(new Intent(ctx, SettingsNotificationsActivity.class)));
 
+		fragmentSettingsBinding.backupData.setText(
+				getString(
+						R.string.backupRestore,
+						getString(R.string.backup),
+						getString(R.string.restore)));
+		fragmentSettingsBinding.backupFrame.setOnClickListener(
+				v1 -> startActivity(new Intent(ctx, SettingsBackupRestoreActivity.class)));
+
 		fragmentSettingsBinding.rateAppFrame.setOnClickListener(rateApp -> rateThisApp());
 
 		fragmentSettingsBinding.aboutAppFrame.setOnClickListener(aboutApp -> showAboutAppDialog());
@@ -102,36 +109,32 @@ public class SettingsFragment extends Fragment {
 				((BaseActivity) requireActivity()).getAccount().getServerVersion().toString());
 
 		aboutAppDialogBinding.donationLinkPatreon.setOnClickListener(
-				v12 -> {
-					AppUtil.openUrlInBrowser(
-							requireContext(),
-							getResources().getString(R.string.supportLinkPatreon));
-				});
+				v12 ->
+						AppUtil.openUrlInBrowser(
+								requireContext(),
+								getResources().getString(R.string.supportLinkPatreon)));
 
 		aboutAppDialogBinding.donationLinkBuyMeaCoffee.setOnClickListener(
-				v11 -> {
-					AppUtil.openUrlInBrowser(
-							requireContext(),
-							getResources().getString(R.string.supportLinkBuyMeaCoffee));
-				});
+				v11 ->
+						AppUtil.openUrlInBrowser(
+								requireContext(),
+								getResources().getString(R.string.supportLinkBuyMeaCoffee)));
 
 		aboutAppDialogBinding.translateLink.setOnClickListener(
-				v13 -> {
-					AppUtil.openUrlInBrowser(
-							requireContext(), getResources().getString(R.string.crowdInLink));
-				});
+				v13 ->
+						AppUtil.openUrlInBrowser(
+								requireContext(), getResources().getString(R.string.crowdInLink)));
 
 		aboutAppDialogBinding.appWebsite.setOnClickListener(
-				v14 -> {
-					AppUtil.openUrlInBrowser(
-							requireContext(), getResources().getString(R.string.appWebsiteLink));
-				});
+				v14 ->
+						AppUtil.openUrlInBrowser(
+								requireContext(),
+								getResources().getString(R.string.appWebsiteLink)));
 
 		aboutAppDialogBinding.feedback.setOnClickListener(
-				v14 -> {
-					AppUtil.openUrlInBrowser(
-							requireContext(), getResources().getString(R.string.feedbackLink));
-				});
+				v14 ->
+						AppUtil.openUrlInBrowser(
+								requireContext(), getResources().getString(R.string.feedbackLink)));
 
 		if (AppUtil.isPro(requireContext())) {
 			aboutAppDialogBinding.layoutFrame1.setVisibility(View.GONE);

app/src/main/java/org/mian/gitnex/helpers/AppDatabaseSettings.java

@@ -1,7 +1,6 @@
 package org.mian.gitnex.helpers;
 
 import android.content.Context;
-import android.util.Log;
 import org.mian.gitnex.database.api.AppSettingsApi;
 import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.models.AppSettings;
@@ -217,8 +216,6 @@ public class AppDatabaseSettings {
 
 		TinyDB tinyDB = TinyDB.getInstance(ctx);
 
-		Log.e("TestVal", "prefsMigration-ran");
-
 		if (tinyDB.checkForExistingPref("themeId")) {
 			AppDatabaseSettings.updateSettingsValue(
 					ctx,

app/src/main/java/org/mian/gitnex/helpers/AppUtil.java

@@ -290,7 +290,7 @@ public class AppUtil {
 	}
 
 	public static Boolean checkStringsWithAlphaNumeric(String str) { // [a-zA-Z0-9]
-		return str.matches("^[\\w]+$");
+		return str.matches("^\\w+$");
 	}
 
 	public static Boolean checkStrings(String str) { // [a-zA-Z0-9-_. ]
@@ -416,7 +416,7 @@ public class AppUtil {
 	public static String decodeBase64(String str) {
 
 		String base64Str = str;
-		if (!str.equals("")) {
+		if (!str.isEmpty()) {
 			byte[] data = Base64.decode(base64Str, Base64.DEFAULT);
 			base64Str = new String(data, StandardCharsets.UTF_8);
 		}
@@ -444,7 +444,7 @@ public class AppUtil {
 
 	public static long getLineCount(String s) {
 
-		if (s.length() < 1) {
+		if (s.isEmpty()) {
 			return 0;
 		}
 
@@ -476,9 +476,8 @@ public class AppUtil {
 				.switchToAccount(userAccount, false);
 	}
 
-	public static boolean switchToAccount(Context context, UserAccount userAccount, boolean tmp) {
-		return ((MainApplication) context.getApplicationContext())
-				.switchToAccount(userAccount, tmp);
+	public static void switchToAccount(Context context, UserAccount userAccount, boolean tmp) {
+		((MainApplication) context.getApplicationContext()).switchToAccount(userAccount, tmp);
 	}
 
 	public static void sharingIntent(Context ctx, String url) {
@@ -497,7 +496,7 @@ public class AppUtil {
 				pm.queryIntentActivities(
 						new Intent(intent)
 								.setData(
-										intent.getData()
+										Objects.requireNonNull(intent.getData())
 												.buildUpon()
 												.authority("example.com")
 												.scheme("https")

app/src/main/java/org/mian/gitnex/helpers/BackupUtil.java

@@ -0,0 +1,209 @@
+package org.mian.gitnex.helpers;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.FileChannel;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * @author M M Arif
+ */
+public class BackupUtil {
+
+	public static File getTempDir(Context context) {
+		String backupDirectoryPath = String.valueOf(context.getExternalFilesDir(null));
+		return new File(backupDirectoryPath);
+	}
+
+	public static boolean copyFile(File fromFile, File toFile, boolean bDeleteOriginalFile)
+			throws IOException {
+
+		boolean bSuccess = true;
+		FileInputStream inputStream = new FileInputStream(fromFile);
+		FileOutputStream outputStream = new FileOutputStream(toFile);
+
+		FileChannel fromChannel = null;
+		FileChannel toChannel = null;
+		try {
+			fromChannel = inputStream.getChannel();
+			toChannel = outputStream.getChannel();
+			fromChannel.transferTo(0, fromChannel.size(), toChannel);
+		} catch (Exception e) {
+			bSuccess = false;
+		} finally {
+			try {
+				if (fromChannel != null) {
+					fromChannel.close();
+				}
+			} finally {
+				if (toChannel != null) {
+					toChannel.close();
+				}
+			}
+
+			if (bDeleteOriginalFile) {
+				fromFile.delete();
+			}
+		}
+		return bSuccess;
+	}
+
+	public static File backupDatabaseFile(String pathOfFileToBackUp, String destinationFilePath)
+			throws IOException {
+
+		File currentDbFile = new File(pathOfFileToBackUp);
+		File newDb = new File(destinationFilePath);
+		if (currentDbFile.exists()) {
+			copyFile(currentDbFile, newDb, false);
+			return newDb;
+		}
+		return null;
+	}
+
+	public static boolean copyFileWithStreams(InputStream inputStream, OutputStream outputStream)
+			throws IOException {
+
+		boolean bSuccess = true;
+
+		try {
+			byte[] buffer = new byte[1024];
+			int length;
+
+			while ((length = inputStream.read(buffer)) > 0) {
+				outputStream.write(buffer, 0, length);
+			}
+		} catch (Exception e) {
+			bSuccess = false;
+		} finally {
+			try {
+				if (inputStream != null) {
+					inputStream.close();
+				}
+			} finally {
+				if (outputStream != null) {
+					outputStream.close();
+				}
+			}
+		}
+		return bSuccess;
+	}
+
+	@SuppressLint("Recycle")
+	public static void checkpointIfWALEnabled(Context ctx, String DATABASE_NAME) {
+
+		Cursor csr;
+		int wal_busy = -99;
+		int wal_log = -99;
+		int wal_checkpointed = -99;
+
+		SQLiteDatabase db =
+				SQLiteDatabase.openDatabase(
+						ctx.getDatabasePath(DATABASE_NAME).getPath(),
+						null,
+						SQLiteDatabase.OPEN_READWRITE);
+		csr = db.rawQuery("PRAGMA journal_mode", null);
+
+		if (csr.moveToFirst()) {
+
+			String mode = csr.getString(0);
+			if (mode.equalsIgnoreCase("wal")) {
+
+				csr = db.rawQuery("PRAGMA wal_checkpoint", null);
+
+				if (csr.moveToFirst()) {
+					wal_busy = csr.getInt(0);
+					wal_log = csr.getInt(1);
+					wal_checkpointed = csr.getInt(2);
+				}
+
+				csr = db.rawQuery("PRAGMA wal_checkpoint(TRUNCATE)", null);
+				csr.getCount();
+				csr = db.rawQuery("PRAGMA wal_checkpoint", null);
+
+				if (csr.moveToFirst()) {
+					wal_busy = csr.getInt(0);
+					wal_log = csr.getInt(1);
+					wal_checkpointed = csr.getInt(2);
+				}
+			}
+		}
+		csr.close();
+		db.close();
+	}
+
+	public static boolean zip(
+			List<File> filesBeingZipped, String zipDirectory, String zipFileName) {
+
+		boolean success = true;
+
+		try {
+
+			int BUFFER = 80000;
+			BufferedInputStream origin;
+			FileOutputStream dest = new FileOutputStream(zipDirectory + "/" + zipFileName);
+			ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(dest));
+			byte[] data = new byte[BUFFER];
+
+			for (File fileBeingZipped : filesBeingZipped) {
+
+				FileInputStream fi = new FileInputStream(fileBeingZipped);
+				origin = new BufferedInputStream(fi, BUFFER);
+
+				ZipEntry entry =
+						new ZipEntry(
+								fileBeingZipped
+										.getPath()
+										.substring(fileBeingZipped.getPath().lastIndexOf("/") + 1));
+				out.putNextEntry(entry);
+				int count;
+
+				while ((count = origin.read(data, 0, BUFFER)) != -1) {
+					out.write(data, 0, count);
+				}
+				origin.close();
+			}
+			out.close();
+		} catch (Exception e) {
+			success = false;
+		}
+
+		return success;
+	}
+
+	public static void unzip(InputStream uriInputStream, String unzipDirectory) throws Exception {
+
+		ZipInputStream zipInputStream = new ZipInputStream(uriInputStream);
+		ZipEntry ze;
+
+		while ((ze = zipInputStream.getNextEntry()) != null) {
+
+			FileOutputStream fileOutputStream =
+					new FileOutputStream(unzipDirectory + "/" + ze.getName());
+
+			BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(fileOutputStream);
+			byte[] buffer = new byte[1024];
+			int read = 0;
+			while ((read = zipInputStream.read(buffer)) != -1) {
+				bufferedOutputStream.write(buffer, 0, read);
+			}
+
+			zipInputStream.closeEntry();
+			bufferedOutputStream.close();
+			fileOutputStream.close();
+		}
+		zipInputStream.close();
+	}
+}

app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java

@@ -1,5 +1,8 @@
 package org.mian.gitnex.helpers.ssl;
 
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+
+import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -7,6 +10,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.util.Base64;
+import android.util.Log;
 import android.util.SparseArray;
 import androidx.core.app.NotificationCompat;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -31,6 +35,7 @@ import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
@@ -42,6 +47,7 @@ import org.mian.gitnex.activities.BaseActivity;
 /**
  * @author Georg Lukas, modified by opyale
  */
+@SuppressLint("CustomX509TrustManager")
 public class MemorizingTrustManager implements X509TrustManager {
 
 	public static final String KEYSTORE_NAME = "keystore";
@@ -295,7 +301,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 				}
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			Log.e("MemorizingTrustManager", Objects.requireNonNull(e.getMessage()));
 		}
 
 		return null;
@@ -308,14 +314,13 @@ public class MemorizingTrustManager implements X509TrustManager {
 		try {
 			keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
 		} catch (KeyStoreException e) {
-			e.printStackTrace();
 			return null;
 		}
 
 		try {
 			keyStore.load(null, null);
 		} catch (NoSuchAlgorithmException | CertificateException | IOException e) {
-			e.printStackTrace();
+			e.getMessage();
 		}
 
 		String keystore = keyStoreStorage.getString(KEYSTORE_KEY, null);
@@ -328,7 +333,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 				keyStore.load(inputStream, "MTM".toCharArray());
 				inputStream.close();
 			} catch (Exception e) {
-				e.printStackTrace();
+				Log.e("MemorizingTrustManager", Objects.requireNonNull(e.getMessage()));
 			}
 		}
 
@@ -340,7 +345,6 @@ public class MemorizingTrustManager implements X509TrustManager {
 		try {
 			appKeyStore.setCertificateEntry(alias, cert);
 		} catch (KeyStoreException e) {
-			e.printStackTrace();
 			return;
 		}
 
@@ -372,7 +376,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 									byteArrayOutputStream.toByteArray(), Base64.DEFAULT))
 					.apply();
 		} catch (Exception e) {
-			e.printStackTrace();
+			Log.e("MemorizingTrustManager", Objects.requireNonNull(e.getMessage()));
 		}
 	}
 
@@ -396,7 +400,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 				appTrustManager.checkClientTrusted(chain, authType);
 			}
 		} catch (CertificateException ae) {
-			// if the cert is stored in our appTrustManager, we ignore expiredness
+			// if the cert is stored in our appTrustManager, we ignore expired ones
 			if (isExpiredException(ae) || isCertKnown(chain[0])) {
 				return;
 			}
@@ -522,7 +526,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 				}
 			}
 		} catch (CertificateParsingException e) {
-			e.printStackTrace();
+			Log.e("MemorizingTrustManager", Objects.requireNonNull(e.getMessage()));
 			stringBuilder.append("<Parsing error: ");
 			stringBuilder.append(e.getLocalizedMessage());
 			stringBuilder.append(">\n");
@@ -538,7 +542,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 
 	private void startActivityNotification(Intent intent, int decisionId, String certName) {
 
-		final PendingIntent call = PendingIntent.getActivity(context, 0, intent, 0);
+		final PendingIntent call = PendingIntent.getActivity(context, 0, intent, FLAG_IMMUTABLE);
 		final String mtmNotification = context.getString(R.string.mtmNotification);
 
 		NotificationCompat.Builder builder =
@@ -591,7 +595,7 @@ public class MemorizingTrustManager implements X509TrustManager {
 				choice.wait();
 			}
 		} catch (InterruptedException e) {
-			e.printStackTrace();
+			Log.e("MemorizingTrustManager", Objects.requireNonNull(e.getMessage()));
 		}
 
 		return choice.state;
@@ -665,7 +669,6 @@ public class MemorizingTrustManager implements X509TrustManager {
 					return interactHostname(cert, hostname);
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
 				return false;
 			}
 		}

app/src/main/res/drawable/ic_export.xml

@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,6c0,1.657 3.582,3 8,3s8,-1.343 8,-3s-3.582,-3 -8,-3s-8,1.343 -8,3"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M4,6v6c0,1.657 3.582,3 8,3c1.118,0 2.183,-0.086 3.15,-0.241"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20,12v-6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M4,12v6c0,1.657 3.582,3 8,3c0.157,0 0.312,-0.002 0.466,-0.005"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16,19h6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19,16l3,3l-3,3"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+</vector>

app/src/main/res/layout/activity_login.xml

@@ -256,12 +256,23 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dimen8dp"
-                android:layout_marginBottom="@dimen/dimen16dp"
+                android:layout_marginBottom="@dimen/dimen8dp"
                 android:text="@string/btnLogin"
                 android:textColor="?attr/materialCardBackgroundColor"
                 android:letterSpacing="0.1"
                 android:textStyle="bold" />
 
+            <TextView
+                android:id="@+id/restore_from_backup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/restoreFromBackup"
+                android:textSize="@dimen/dimen14sp"
+                android:textColor="?attr/inputTextColor"
+                android:gravity="center"
+                android:layout_marginBottom="@dimen/dimen16dp"
+                android:layout_marginTop="@dimen/dimen8dp" />
+
         </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>

app/src/main/res/layout/activity_settings_backup_restore.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/primaryBackgroundColor"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/primaryBackgroundColor"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            style="?attr/collapsingToolbarLayoutLargeStyle"
+            android:layout_width="match_parent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+            android:background="?attr/primaryBackgroundColor"
+            app:contentScrim="?attr/primaryBackgroundColor"
+            android:layout_height="?attr/collapsingToolbarLayoutLargeSize">
+
+             <com.google.android.material.appbar.MaterialToolbar
+                 android:id="@+id/topAppBar"
+                 android:layout_width="match_parent"
+                 android:elevation="0dp"
+                 android:layout_height="?attr/actionBarSize"
+                 app:title="@string/backup"
+                 app:layout_collapseMode="pin"
+                 app:navigationIcon="@drawable/ic_close" />
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/dimen16dp">
+
+            <LinearLayout
+                android:id="@+id/backupDataFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:focusable="true"
+                android:layout_marginTop="@dimen/dimen8dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/backupHeaderSelector"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/backup"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen18sp" />
+
+                <TextView
+                    android:id="@+id/backupDataHint"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="@string/backupDataHintText"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen12sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/restoreDataFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dimen32dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/restoreHeaderSelector"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/restore"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen18sp" />
+
+                <TextView
+                    android:id="@+id/restoreDataHint"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="@string/restoreDataHintText"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen12sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_settings.xml

@@ -16,17 +16,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingTop="10dp">
+            android:paddingTop="@dimen/dimen10dp">
 
             <LinearLayout
                 android:id="@+id/generalFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
+                android:layout_marginBottom="@dimen/dimen6dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp">
+                android:padding="@dimen/dimen16dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -37,8 +37,8 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginStart="@dimen/dimen10dp"
+                    android:layout_marginEnd="@dimen/dimen10dp"
                     android:layout_weight="1"
                     android:orientation="vertical">
 
@@ -46,22 +46,22 @@
                         android:id="@+id/tvGeneral"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/settingsGeneralHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp"/>
+                        android:textSize="@dimen/dimen18sp" />
 
                     <TextView
                         android:id="@+id/generalHintText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/generalHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp"/>
+                        android:textSize="@dimen/dimen12sp" />
 
                 </LinearLayout>
 
@@ -77,11 +77,11 @@
                 android:id="@+id/appearanceFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
+                android:layout_marginBottom="@dimen/dimen6dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp">
+                android:padding="@dimen/dimen16dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -92,8 +92,8 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginStart="@dimen/dimen10dp"
+                    android:layout_marginEnd="@dimen/dimen10dp"
                     android:layout_weight="1"
                     android:orientation="vertical">
 
@@ -101,22 +101,22 @@
                         android:id="@+id/tvAppearance"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/settingsAppearanceHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp"/>
+                        android:textSize="@dimen/dimen18sp" />
 
                     <TextView
                         android:id="@+id/appearanceHintText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/appearanceHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp"/>
+                        android:textSize="@dimen/dimen12sp" />
 
                 </LinearLayout>
 
@@ -132,11 +132,11 @@
                 android:id="@+id/codeEditorFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
+                android:layout_marginBottom="@dimen/dimen6dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp">
+                android:padding="@dimen/dimen16dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -147,8 +147,8 @@
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginStart="@dimen/dimen10dp"
+                    android:layout_marginEnd="@dimen/dimen10dp"
                     android:layout_weight="1"
                     android:orientation="vertical">
 
@@ -156,22 +156,22 @@
                         android:id="@+id/codeEditor"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/codeEditor"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp"/>
+                        android:textSize="@dimen/dimen18sp" />
 
                     <TextView
                         android:id="@+id/codeEditorHintText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/codeEditorHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp"/>
+                        android:textSize="@dimen/dimen12sp" />
 
                 </LinearLayout>
 
@@ -179,7 +179,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_chevron_right"/>
+                    app:srcCompat="@drawable/ic_chevron_right" />
 
             </LinearLayout>
 
@@ -187,23 +187,23 @@
                 android:id="@+id/securityFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
+                android:layout_marginBottom="@dimen/dimen6dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp">
+                android:padding="@dimen/dimen16dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_security"/>
+                    app:srcCompat="@drawable/ic_security" />
 
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginStart="@dimen/dimen10dp"
+                    android:layout_marginEnd="@dimen/dimen10dp"
                     android:layout_weight="1"
                     android:orientation="vertical">
 
@@ -211,22 +211,22 @@
                         android:id="@+id/tvSecurity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/settingsSecurityHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp"/>
+                        android:textSize="@dimen/dimen18sp" />
 
                     <TextView
                         android:id="@+id/securityHintText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/securityHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp"/>
+                        android:textSize="@dimen/dimen12sp" />
 
                 </LinearLayout>
 
@@ -234,7 +234,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_chevron_right"/>
+                    app:srcCompat="@drawable/ic_chevron_right" />
 
             </LinearLayout>
 
@@ -242,23 +242,23 @@
                 android:id="@+id/notificationsFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
+                android:layout_marginBottom="@dimen/dimen6dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp">
+                android:padding="@dimen/dimen16dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_notifications"/>
+                    app:srcCompat="@drawable/ic_notifications" />
 
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginStart="@dimen/dimen10dp"
+                    android:layout_marginEnd="@dimen/dimen10dp"
                     android:layout_weight="1"
                     android:orientation="vertical">
 
@@ -266,22 +266,22 @@
                         android:id="@+id/notificationsHeader"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/pageTitleNotifications"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp"/>
+                        android:textSize="@dimen/dimen18sp" />
 
                     <TextView
                         android:id="@+id/notificationsHintText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/notificationsHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp"/>
+                        android:textSize="@dimen/dimen12sp" />
 
                 </LinearLayout>
 
@@ -289,7 +289,62 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_chevron_right"/>
+                    app:srcCompat="@drawable/ic_chevron_right" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/backupFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dimen6dp"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="@dimen/dimen16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_export" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dimen10dp"
+                    android:layout_marginEnd="@dimen/dimen10dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/backupData"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
+                        android:text="@string/backup"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="@dimen/dimen18sp" />
+
+                    <TextView
+                        android:id="@+id/backupDataHintText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
+                        android:text="@string/backupRestoreHintText"
+                        android:textColor="?attr/primaryTextColor"
+                        android:textSize="@dimen/dimen12sp" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/generalImgContentText"
+                    app:srcCompat="@drawable/ic_chevron_right" />
 
             </LinearLayout>
 
@@ -297,23 +352,23 @@
                 android:id="@+id/rateAppFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
+                android:layout_marginBottom="@dimen/dimen6dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:padding="15dp">
+                android:padding="@dimen/dimen16dp">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_like"/>
+                    app:srcCompat="@drawable/ic_like" />
 
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginStart="@dimen/dimen10dp"
+                    android:layout_marginEnd="@dimen/dimen10dp"
                     android:layout_weight="1"
                     android:orientation="vertical">
 
@@ -321,22 +376,22 @@
                         android:id="@+id/rateApp"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/navRate"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="18sp"/>
+                        android:textSize="@dimen/dimen18sp" />
 
                     <TextView
                         android:id="@+id/rateAppHintText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
+                        android:paddingStart="@dimen/dimen12dp"
+                        android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/rateAppHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="12sp"/>
+                        android:textSize="@dimen/dimen12sp" />
 
                 </LinearLayout>
 
@@ -356,7 +411,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_info"/>
+                    app:srcCompat="@drawable/ic_info" />
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -374,7 +429,7 @@
                         android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/navAbout"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="@dimen/dimen18sp"/>
+                        android:textSize="@dimen/dimen18sp" />
 
                     <TextView
                         android:id="@+id/aboutAppHintText"
@@ -385,7 +440,7 @@
                         android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/aboutAppHintText"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="@dimen/dimen12sp"/>
+                        android:textSize="@dimen/dimen12sp" />
 
                 </LinearLayout>
 
@@ -405,7 +460,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_logout"/>
+                    app:srcCompat="@drawable/ic_logout" />
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -423,7 +478,7 @@
                         android:paddingEnd="@dimen/dimen12dp"
                         android:text="@string/navLogout"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="@dimen/dimen18sp"/>
+                        android:textSize="@dimen/dimen18sp" />
 
                 </LinearLayout>
 

app/src/main/res/values-ar-rSA/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">قضاياي</string>
     <string name="navMostVisited">المستودعات الأكثر زيارة</string>
     <string name="navNotes">الملاحظات</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">مستودع جديد</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">طلب دمج جديد</string>
     <string name="pageTitleUsers">المُستخدمون</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Demo repo</string>
     <string name="repoDescription">مثال عن الوصف</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">وصف المستودَع</string>
     <string name="newRepoPrivateCopy">خاص</string>
     <string name="newRepoOwner">المالك</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">اسم المنظمة</string>
     <string name="newOrgDescTintCopy">وصف المنظمة</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">اسم المستخدم</string>
     <string name="passWord">كلمة المرور</string>
     <string name="btnLogin">لِج</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">اسم المستخدم مطلوب</string>
     <string name="emptyFieldPassword">كلمة المرور مطلوبة</string>
     <string name="protocolEmptyError">البروتوكول مطلوب</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">لا يمكن الوصول إلى الشبكة، رجاءً تحقق اتصالك بالإنترنت</string>
     <string name="repoNameErrorEmpty">اسم المستودع فارغ</string>
     <string name="repoNameErrorInvalid">اسم المستودع غير صالح. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">أُنشئ المستودع بنجاح</string>
     <string name="repoExistsError">يوجد مستودع بهذا الاسم للمالك المحدد فعلًا</string>
     <string name="repoOwnerError">اِختر مالك المستودع</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">اسم المنظمة فارغ</string>
     <string name="orgNameErrorInvalid">اسم المنظمة غير صالح. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">تجاوز وصف المنظمة عدد الحروف الأقصى 255 حرفاً</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">المُشتقّات</string>
     <string name="infoTabRepoCreatedAt">أُنشئ</string>
     <string name="infoTabRepoUpdatedAt">آخر تحديث</string>
-    <string name="infoShowMoreInformation">إظهار المزيد من المعلومات</string>
     <string name="infoMoreInformation">المزيد من المعلومات</string>
     <string name="timeAtText">على</string>
     <string name="issueMilestone">المرحلة %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">تمكين حذف المسودات</string>
     <string name="settingsEnableCommentsDeletionHintText">حذف مسودة التعليق عندما يُنشر</string>
     <string name="settingsGeneralHeader">الإعدادات العامّة</string>
-    <string name="generalHintText">الصفحة الرئيسة، معالج الرابط الافتراضي</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">معالج الرابط الافتراضي</string>
     <string name="generalDeepLinkDefaultScreenHintText">اختر الشاشة التي يجب عرضها إذا لم يستطع التطبيق التعامل مع الروابط الخارجية سيعيد توجيهك تلقائيًا إليها.</string>
-    <string name="generalDeepLinkSelectedText">غير متاح</string>
     <string name="linkSelectorDialogTitle">اِختر صفحة معالج الرابط الافتراضية</string>
     <string name="settingsBiometricHeader">دعم القُفْل الحيوي</string>
     <string name="settingsLabelsInListHeader">أوسمة مع دعم النصوص</string>
     <string name="settingsLabelsInListHint">سيؤدي تمكين هذا إلى إظهار الأوسمة التي تحوي نصاً في المشكلات وطلبات الدمج، بشكل افتراضي ستعرض نُقَطٌ ملونة</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">لا يوجد المزيد من البيانات المتاحة</string>
     <string name="createLabel">وسم جديد</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">أُزيل المستودع من الفريق بنجاح</string>
     <string name="repoAddToTeamMessage">إضافة المستودع %1$s لمنظمة %2$s فريق %3$s</string>
     <string name="repoRemoveTeamMessage">إزالة المستودع %1$s من الفريق %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">اسم الفريق</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">المتابِعون</string>
     <string name="profileTabFollowing">المتابَعون</string>
-    <string name="profileCreateNewEmailAddress">إضافة عنوان بريد إلكتروني</string>
-    <string name="profileEmailTitle">عنوان البريد الإلكتروني</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">أُضيف البريد الإلكتروني الجديد بنجاح</string>
     <string name="emailErrorEmpty">عنوان البريد الإلكتروني فارغ</string>
     <string name="emailErrorInvalid">عنوان البريد الإلكتروني غير صالح</string>
     <string name="emailErrorInUse">عنوان البريد الإلكتروني مستخدم مسبقاً</string>
     <string name="emailTypeText">أساسي</string>
-    <string name="profileTabEmails">العناوين البريدية</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">إضافة / حذف الأوسمة</string>
     <string name="labelsUpdated">حُدِّثت الأوسمة</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">فتح في المتصفح</string>
     <string name="deleteGenericTitle">حذف %s</string>
     <string name="reset">إعادة تعيين</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">استكشاف المستخدمين</string>
     <string name="exploreIssues">استكشاف القضايا</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">أُكتشف إصدار جديد من Gitea! يرجى تحديث GitNex!</string>
     <string name="versionUnknown">لم يُكتشف Gitea!</string>
     <string name="versionAlertDialogHeader">إصدار غير مدعوم من Gitea</string>
-    <string name="loginViaPassword">اسم المستخدم / كلمة المرور</string>
-    <string name="loginMethodText">اِختر طريقتك المفضلة لتسجيل الدخول للوصول لحسابك. الرمز أكثر أماناً!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">أرجع المثيل خطأ - غير مصرح به. تحقق من بيانات تسجيل دخولك وحاول مرة أخرى</string>
     <string name="loginTokenError">الرمز مطلوب</string>
     <string name="prDeletedFork">اشتقاق محذوف</string>
@@ -509,19 +528,20 @@
     <string name="resetMostReposCounter">أُعيد تعيين العداد بنجاح</string>
     <string name="resetCounterDialogMessage">أتريد إعادة تعيين عداد المستودع %s؟</string>
     <string name="resetCounterAllDialogMessage">سيعيد هذا تعيين جميع العدادات لمستودعات هذا الحساب.</string>
-    <string name="appearanceHintText">السمات، الخطوط، الشارات</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">المصادقة الحيوية، شهادات SSL، التخزين المؤقت</string>
     <string name="languagesHintText">اللغات</string>
     <string name="reportsHintText">تقارير الأعطال</string>
     <string name="rateAppHintText">إذا أحببت GitNex يمكنك الإعجاب به</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">مؤرشف</string>
     <string name="archivedRepositoryMessage">المستودع مؤرشف. يمكنك رؤية الملفات لكن لا يمكنك الدفع أو فتح قضية/طلب دمج.</string>
     <string name="accountDeletedMessage">حُذف الحساب بنجاح</string>
     <string name="removeAccountPopupTitle">حذف الحساب</string>
     <string name="removeAccountPopupMessage">أمتأكد أنك تريد إزالة هذا الحساب من التطبيق؟\n\nسيحذف هذا جميع البيانات المتعلقة بهذا الحساب من التطبيق فقط.</string>
     <string name="addNewAccount">حساب جديد</string>
-    <string name="addNewAccountText">إضافة حساب جديد</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">الحساب موجود في التطبيق فعلًا</string>
     <string name="accountAddedMessage">أُضيف الحساب بنجاح</string>
     <string name="switchAccountSuccess">حُوُّلَ للحساب: %1$s@%2$s</string>
@@ -529,14 +549,17 @@
     <string name="pageTitleNotifications">الإشعارات</string>
     <string name="noDataNotifications">إطَّلعت على جميعها 🚀</string>
     <string name="notificationsPollingHeaderText">تأخير تحديث الإشعارات</string>
-    <string name="pollingDelaySelectedText">%d دقائق</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">اِختر تأخير التحديث</string>
     <string name="pollingDelayDialogDescriptionText">اِختر تأخيراً بالدقائق ليحاول GitNex جلب إشعارات جديدة</string>
     <string name="markAsRead">الوسم كمقروء</string>
     <string name="markAsUnread">الوسم كغير مقروء</string>
     <string name="pinNotification">تثبيت</string>
     <string name="markedNotificationsAsRead">وُسِمت جميع الإشعارات كمقروءة بنجاح</string>
-    <string name="notificationsHintText">تأخير الطلبات، الإضاءة، الاهتزاز</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">تمكين الإشعارات</string>
     <string name="enableLightsHeaderText">تمكين الإضاءة</string>
     <string name="enableVibrationHeaderText">تمكين الاهتزاز</string>
@@ -553,6 +576,7 @@
         <item quantity="many">You have %s new notifications</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">مقروء</string>
     <string name="isUnread">غير مقروء</string>
     <string name="repoSettingsTitle">إعدادات المستودع</string>
@@ -599,9 +623,9 @@
     <string name="prClosed">أُغلق طلب الدمج</string>
     <string name="prReopened">أُعيد فتح طلب الدمج</string>
     <string name="prMergeInfo">معلومات طلب الدمج</string>
-    <string name="accountDoesNotExist">يبدو أن الحساب للرابط %1$s غير موجود في التطبيق. يمكنك إضافة حساب بالنقر على زر إضافة حساب جديد.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">انتقل إلى التطبيق</string>
-    <string name="noActionText">لا يستطيع GitNex التعامل مع الموارد المطلوبة، يمكنك فتح مشكلة في مستودع المشروع كتحسين مع توفير تفاصيل العمل. ما عليك سوى تشغيل الشاشة الافتراضية الآن من الأزرار أدناه، ويمكن تغييرها من الإعدادات.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">المصادقة الحيوية</string>
     <string name="biometricAuthSubTitle">فتح القُفْل باستخدام المصادقة الحيوية</string>
     <string name="biometricNotSupported">لا يوجد ميزات مصادقة حيوية متوفرة في هذا الجهاز</string>
@@ -646,6 +670,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -669,7 +695,7 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="zero">Notes deleted successfully</item>
         <item quantity="one">Note deleted successfully</item>
@@ -680,6 +706,7 @@
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -692,6 +719,7 @@
     <string name="timelineAssigneesAssigned">%1$s وُكِّل بواسطة %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s أضاف إلى مرحلة %2$s %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s أزال من مرحلة %2$s %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s أغلق قضية %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s أعاد فتح قضية %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s أعاد فتح طلب الدمج %2$s</string>
@@ -720,7 +748,39 @@
     <string name="timelineRefIssue">%1$s أشار إلى هذه القضية في #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s أشار إلى طلب الدمج هذا في #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s أشار إلى هذه القضية من <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">الحالات</string>
     <string name="statusNoUrl">هذه الحالة ليس لها عنوان URL مستهدف مرتبط.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">Τα ζητήματά μου</string>
     <string name="navMostVisited">Συχνά επισκεπτόμενα αποθετήρια</string>
     <string name="navNotes">Σημειώσεις</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Νέο αποθετήριο</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">Νέο Pull Request</string>
     <string name="pageTitleUsers">Χρήστες</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Demo Αποθετήριο</string>
     <string name="repoDescription">Demo περιγραφή</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Περιγραφή αποθετηρίου</string>
     <string name="newRepoPrivateCopy">Ιδιωτικό</string>
     <string name="newRepoOwner">Ιδιοκτήτης</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Όνομα Οργανισμού</string>
     <string name="newOrgDescTintCopy">Περιγραφή Οργανισμού</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Username</string>
     <string name="passWord">Κωδικόs πρόσβασης</string>
     <string name="btnLogin">ΕΙΣΟΔΟΣ</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Username is required</string>
     <string name="emptyFieldPassword">Password is required</string>
     <string name="protocolEmptyError">Protocol is required</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Cannot access network, please check your Internet connection</string>
     <string name="repoNameErrorEmpty">Repository name is empty</string>
     <string name="repoNameErrorInvalid">Repository name is not valid. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Repository created successfully</string>
     <string name="repoExistsError">Repository of this name already exists under selected Owner</string>
     <string name="repoOwnerError">Select owner for the repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Organization name is empty</string>
     <string name="orgNameErrorInvalid">Organization name is not valid, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Organization description exceeds the max 255 characters limit</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">Forks</string>
     <string name="infoTabRepoCreatedAt">Created</string>
     <string name="infoTabRepoUpdatedAt">Last Updated</string>
-    <string name="infoShowMoreInformation">Show More Information</string>
     <string name="infoMoreInformation">More Information</string>
     <string name="timeAtText">at</string>
     <string name="issueMilestone">Ορόσημο %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Enable Drafts Deletion</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">General</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">New Label</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Το αποθετήριο καταργήθηκε επιτυχώς από την ομάδα</string>
     <string name="repoAddToTeamMessage">Προσθήκη αποθετηρίου %1$s στον οργανισμό %2$s στην ομάδα %3$s</string>
     <string name="repoRemoveTeamMessage">Κατάργηση αποθετηρίου %1$s από την ομάδα %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Όνομα Ομάδας</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Ακόλουθοι</string>
     <string name="profileTabFollowing">Ακολουθείτε</string>
-    <string name="profileCreateNewEmailAddress">Προσθήκη διεύθυνσης email</string>
-    <string name="profileEmailTitle">Διεύθυνση Email</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">New email added successfully</string>
     <string name="emailErrorEmpty">Email address is empty</string>
     <string name="emailErrorInvalid">Email address is not valid</string>
     <string name="emailErrorInUse">Email address is already in use</string>
     <string name="emailTypeText">Primary</string>
-    <string name="profileTabEmails">Emails</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Add / Remove Labels</string>
     <string name="labelsUpdated">Labels updated</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
-    <string name="loginViaPassword">Username / Password</string>
-    <string name="loginMethodText">Choose your preferred login method to access your account. Token is more secure!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Instance has returned an error - Unauthorized. Check your credentials and try again</string>
     <string name="loginTokenError">Το Token είναι υποχρεωτικό</string>
     <string name="prDeletedFork">Διαγραφή Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">New Account</string>
-    <string name="addNewAccountText">Add New Account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Account added successfully</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minutes</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Επιλέξτε μια ελάχιστη καθυστέρηση κατά την οποία το GitNex προσπαθεί να μετρήσει νέες ειδοποιήσεις</string>
     <string name="markAsRead">Σήμανση ως αναγνωσμένο</string>
     <string name="markAsUnread">Σήμανση ως μη αναγνωσμένα</string>
     <string name="pinNotification">Καρφίτσωμα</string>
     <string name="markedNotificationsAsRead">Επιτυχής επισήμανση όλων των ειδοποιήσεων ως αναγνωσμένες</string>
-    <string name="notificationsHintText">Καθυστέρηση ψηφοφορίας, φωτισμός άκρων, δόνηση</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Ενεργοποίηση Ειδοποιήσεων</string>
     <string name="enableLightsHeaderText">Ενεργοποίηση Φωτισμού Άκρων</string>
     <string name="enableVibrationHeaderText">Ενεργοποίηση δόνησης</string>
@@ -548,6 +571,7 @@
         <item quantity="one">Έχετε μία %s νέα ειδοποίηση</item>
         <item quantity="other">Έχετε %s νέες ειδοποιήσεις</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Διαβασμένα</string>
     <string name="isUnread">Μη αναγνωσμένα</string>
     <string name="repoSettingsTitle">Ρυθμίσεις Αποθετηρίου</string>
@@ -594,9 +618,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -640,6 +664,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -663,13 +689,14 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="other">Notes deleted successfully</item>
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -682,6 +709,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -710,7 +738,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-eo-rEO/strings.xml

@@ -739,6 +739,7 @@
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
     <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>

app/src/main/res/values-es-rES/strings.xml

@@ -46,8 +46,11 @@
     <string name="newRepoDescTintCopy">Descripción del repositorio</string>
     <string name="newRepoPrivateCopy">Privado</string>
     <string name="newRepoOwner">Propietario</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Hacer el repositorio una plantilla</string>
     <string name="newOrgTintCopy">Nombre de la organización</string>
     <string name="newOrgDescTintCopy">Descripción de la organización</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Nombre de usuario</string>
     <string name="passWord">Contraseña</string>
     <string name="btnLogin">INICIAR SESIÓN</string>
@@ -73,6 +76,7 @@
     <string name="repoCreated">El repositorio se ha creado correctamente</string>
     <string name="repoExistsError">El nombre del repositorio ya existe en el propietario seleccionado</string>
     <string name="repoOwnerError">Seleccione el propietario del repositorio</string>
+    <string name="repoDefaultBranchError">La rama por defecto no puede estar vacía</string>
     <string name="orgNameErrorEmpty">El nombre de la organización está vacío</string>
     <string name="orgNameErrorInvalid">El nombre de la organización es inválido. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">La descripción de la organización supera el límite de 255 caracteres</string>
@@ -104,7 +108,6 @@
     <string name="infoTabRepoForksCount">Bifurcaciones</string>
     <string name="infoTabRepoCreatedAt">Creado</string>
     <string name="infoTabRepoUpdatedAt">Última actualización</string>
-    <string name="infoShowMoreInformation">Mostrar más información</string>
     <string name="infoMoreInformation">Más información</string>
     <string name="timeAtText">a las</string>
     <string name="issueMilestone">Hito %1$s</string>
@@ -427,6 +430,8 @@
     <string name="reset">Restablecer</string>
     <string name="beta">BETA</string>
     <string name="none">Ninguno</string>
+    <string name="main">main</string>
+    <string name="license">Licencia</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explorar usuarios</string>
     <string name="exploreIssues">Explorar incidencias</string>
@@ -440,8 +445,7 @@
     <string name="versionUnsupportedNew">¡Se ha detectado una nueva versión de Gitea! ¡Por favor, ACTUALICE GitNex!</string>
     <string name="versionUnknown">¡No se ha detectado instancia de Gitea!</string>
     <string name="versionAlertDialogHeader">Versión de Gitea no compatible</string>
-    <string name="loginViaPassword">Usuario / contraseña</string>
-    <string name="loginMethodText">Elige el método de inicio de sesión preferido. Por Token es la forma más segura.</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">La instancia ha respondido con un error - No autorizado. Verifique sus credenciales e inténtalo de nuevo</string>
     <string name="loginTokenError">Token necesario</string>
     <string name="prDeletedFork">Bifuración eliminada</string>
@@ -536,7 +540,7 @@
     <string name="removeAccountPopupTitle">Eliminar cuenta</string>
     <string name="removeAccountPopupMessage">¿Estás seguro que quieres eliminar esta cuenta de la aplicación?\n\nEsta acción va a eliminar todos los datos de la cuenta, pero sólo en esta aplicación.</string>
     <string name="addNewAccount">Nueva cuenta</string>
-    <string name="addNewAccountText">Añadir nueva cuenta</string>
+    <string name="addNewAccountText">Añadir Cuenta</string>
     <string name="accountAlreadyExistsError">La cuenta ya existe en la aplicación</string>
     <string name="accountAddedMessage">Cuenta añadida con éxito</string>
     <string name="switchAccountSuccess">Cambio de la cuenta: %1$s@%2$s</string>
@@ -544,14 +548,17 @@
     <string name="pageTitleNotifications">Notificaciones</string>
     <string name="noDataNotifications">Todo en orden 🚀</string>
     <string name="notificationsPollingHeaderText">Retraso de notificaciones</string>
-    <string name="pollingDelaySelectedText">%d minutos</string>
+    <string name="pollingDelay15Minutes">15 Minutos</string>
+    <string name="pollingDelay30Minutes">30 Minutos</string>
+    <string name="pollingDelay45Minutes">45 Minutos</string>
+    <string name="pollingDelay1Hour">1 Hora</string>
     <string name="pollingDelayDialogHeaderText">Seleccionar cantidad del retraso</string>
     <string name="pollingDelayDialogDescriptionText">Selecciona un retraso en minutos para que GitNex vuelva a consultar nuevas notificaciones</string>
     <string name="markAsRead">Marcar como leído</string>
     <string name="markAsUnread">Marcar como no leído</string>
     <string name="pinNotification">Fijar</string>
     <string name="markedNotificationsAsRead">Todas las notificaciones fueron marcadas como leídas con éxito</string>
-    <string name="notificationsHintText">Cantidad del retraso, luz, vibración</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Activar notificaciones</string>
     <string name="enableLightsHeaderText">Activar luz</string>
     <string name="enableVibrationHeaderText">Activar vibración</string>
@@ -564,6 +571,7 @@
         <item quantity="one">Tienes %s nueva notificación</item>
         <item quantity="other">Tienes %s nuevas notificaciones</item>
     </plurals>
+    <string name="openAppSettings">Para recibir notificaciones, debe habilitar las notificaciones para GitNex. Presione Abrir para acceder a los ajustes del teléfono y habilitar las notificaciones.</string>
     <string name="isRead">Leer</string>
     <string name="isUnread">No leídos</string>
     <string name="repoSettingsTitle">Configuración del repositorio</string>
@@ -612,7 +620,7 @@
     <string name="prMergeInfo">Información de Pull Request</string>
     <string name="accountDoesNotExist">La cuenta %1$s no existe en la aplicación. Puedes añadirla pulsando \"Añadir nueva cuenta\".</string>
     <string name="launchApp">Ir a la aplicación</string>
-    <string name="noActionText">GitNex no puede gestionar el recurso solicitado, puede abrir una incidencia en el repositorio del proyecto aportando detalles del error. Por el momento, lanza una pantalla por defecto desde los botones de abajo, se puede cambiar desde la configuración.</string>
+    <string name="noActionText">GitNex no puede gestionar el recurso solicitado. Puede abrir una incidencia en el repositorio del proyecto aportando detalles del error. Por el momento, lanza una pantalla por defecto desde los botones de abajo; se puede cambiar desde la configuración.</string>
     <string name="biometricAuthTitle">Autenticación biométrica</string>
     <string name="biometricAuthSubTitle">Desbloquear usando tus credenciales biométricas</string>
     <string name="biometricNotSupported">No se ha encontrado función biométrica en el dispositivo</string>
@@ -730,9 +738,39 @@
     <string name="timelineRefIssue">%1$s ha hecho referencia a esta incidencia en #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s ha hecho referencia a este Pull Request en #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s ha hecho referencia a esta incidencia desde <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s dejó un comentario: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Estados</string>
     <string name="statusNoUrl">Este estado no tiene una URL de destino asociada.</string>
     <string name="starredRepos">Repositorios favoritos</string>
     <string name="lang_statistics">Estadísticas del lenguaje</string>
     <string name="dashboard">Panel de Control</string>
+    <string name="createdRepository">repositorio creado</string>
+    <string name="renamedRepository">nombre de repositorio cambiado de %1$s a </string>
+    <string name="starredRepository">destacado</string>
+    <string name="transferredRepository">repositorio %1$s transferido a</string>
+    <string name="createdBranch">rama %1$s creada en</string>
+    <string name="pushedTo">enviado de %1$s en</string>
+    <string name="openedIssue">incidencias abierta</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">incidencia cerrada</string>
+    <string name="reopenedIssue">incidencia reabierta</string>
+    <string name="createdPR">solicitud de cambios creada</string>
+    <string name="closedPR">solicitud de cambios cerrada</string>
+    <string name="reopenedPR">solicitud de cambios reabierta</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-fa-rIR/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">My Issues</string>
     <string name="navMostVisited">Most Visited Repos</string>
     <string name="navNotes">Notes</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">ایجاد مخزن جدید</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">ایجاد درخواست ادغام جدید</string>
     <string name="pageTitleUsers">Users</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">مخزن پیش نمایشی</string>
     <string name="repoDescription">توضیحات پیش نمایشی</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">توضیح مخزن</string>
     <string name="newRepoPrivateCopy">خصوصی</string>
     <string name="newRepoOwner">مالک</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">نام سازمان</string>
     <string name="newOrgDescTintCopy">توضیحات سازمان</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">نام کاربری</string>
     <string name="passWord">گذرواژه</string>
     <string name="btnLogin">ورود به حساب کاربری</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">نام کاربری اجباری است</string>
     <string name="emptyFieldPassword">گذرواژه الزامی است</string>
     <string name="protocolEmptyError">پروتکل الزامی است</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">عدم دسترسی به شبکه، لطفا اتصال اینترنت خود را بررسی کنید</string>
     <string name="repoNameErrorEmpty">نام مخزن خالی است</string>
     <string name="repoNameErrorInvalid">نام مخزن اشتباه است. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">مخزن با موفقیت ساخته شد</string>
     <string name="repoExistsError">یک مخزن با این نام قبلا در لیست مخازن وجود دارد</string>
     <string name="repoOwnerError">Select owner for the repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">نام سازمان خالی است</string>
     <string name="orgNameErrorInvalid">نام سازمان صحیح نیست, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">توضیحات سازمان از سقف 255 کاراکتر بیشتر است</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">انشعاب‌ها</string>
     <string name="infoTabRepoCreatedAt">ایجاد شد</string>
     <string name="infoTabRepoUpdatedAt">آخرین به‌روزرسانی</string>
-    <string name="infoShowMoreInformation">نمایش اطلاعات بیشتر</string>
     <string name="infoMoreInformation">اطلاعات بیشتر</string>
     <string name="timeAtText">در</string>
     <string name="issueMilestone">نقطه عطف %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Enable Drafts Deletion</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">عمومی</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">اطلاعات بیشتری موجود نیست</string>
     <string name="createLabel">برچسب جدید</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">نام تیم</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">دنبال کنندگان</string>
     <string name="profileTabFollowing">درحال دنبال کردن</string>
-    <string name="profileCreateNewEmailAddress">افزودن رایانامه</string>
-    <string name="profileEmailTitle">نشانی رایانامه</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">رایانه جدید با موفقیت افزوده شد</string>
     <string name="emailErrorEmpty">نشانی رایانامه خالی است</string>
     <string name="emailErrorInvalid">نشانی رایانامه نامعتبر است</string>
     <string name="emailErrorInUse">نشانی رایانامه از قبل موجود است</string>
     <string name="emailTypeText">اصلی</string>
-    <string name="profileTabEmails">ایمیل‌ها</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">افزودن / حذف برچسب‌ها</string>
     <string name="labelsUpdated">برچسب‌ها به‌روزرسانی شدند</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">هیچ Gitea تشخیص داده نشد!</string>
     <string name="versionAlertDialogHeader">نگارش پشتیبانی نشده Gitea</string>
-    <string name="loginViaPassword">نام کاربری / گذرواژه</string>
-    <string name="loginMethodText">Choose your preferred login method to access your account. Token is more secure!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Instance has returned an error - Unauthorized. Check your credentials and try again</string>
     <string name="loginTokenError">توکن الزامی است</string>
     <string name="prDeletedFork">انشعاب پاک شده</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">پوسته‌ها، فونت‌ها، نشانگرها</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">زبان‌ها</string>
     <string name="reportsHintText">گزارش‌های خرابی</string>
     <string name="rateAppHintText">اگر GitNex را می‌پسندید می‌توانید به آن امتیاز دهید</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">بایگانی شده</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">حساب کاربری با موفقیت حذف شد</string>
     <string name="removeAccountPopupTitle">حذف حساب</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">حساب جدید</string>
-    <string name="addNewAccountText">افزودن حساب جدید</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">حساب کاربری با موفقیت افزوده شد</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">آگاهی‌ها</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d دقیقه</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">فعال‌سازی آگاهی‌ها</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">فعال‌سازی لرزش</string>
@@ -548,6 +571,7 @@
         <item quantity="one">You have %s new notification</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">خوانده شده</string>
     <string name="isUnread">خوانده نشده</string>
     <string name="repoSettingsTitle">تنظیمات مخزن</string>
@@ -594,9 +618,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">برو به برنامه</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -640,6 +664,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -663,13 +689,14 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="other">Notes deleted successfully</item>
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -682,6 +709,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -710,7 +738,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-fi-rFI/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">My Issues</string>
     <string name="navMostVisited">Most Visited Repos</string>
     <string name="navNotes">Notes</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Uusi Repo</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">New Pull Request</string>
     <string name="pageTitleUsers">Users</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Demo repo</string>
     <string name="repoDescription">Demo kuvaus</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Repon kuvaus</string>
     <string name="newRepoPrivateCopy">Yksityinen</string>
     <string name="newRepoOwner">Omistaja</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Organisaation nimi</string>
     <string name="newOrgDescTintCopy">Organisaation kuvaus</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Käyttäjätunnus</string>
     <string name="passWord">Salasana</string>
     <string name="btnLogin">LOGIN</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Username is required</string>
     <string name="emptyFieldPassword">Password is required</string>
     <string name="protocolEmptyError">Protocol is required</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Cannot access network, please check your Internet connection</string>
     <string name="repoNameErrorEmpty">Repository name is empty</string>
     <string name="repoNameErrorInvalid">Repository name is not valid. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Repository created successfully</string>
     <string name="repoExistsError">Repository of this name already exists under selected Owner</string>
     <string name="repoOwnerError">Select owner for the repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Organization name is empty</string>
     <string name="orgNameErrorInvalid">Organization name is not valid, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Organization description exceeds the max 255 characters limit</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">Forks</string>
     <string name="infoTabRepoCreatedAt">Created</string>
     <string name="infoTabRepoUpdatedAt">Last Updated</string>
-    <string name="infoShowMoreInformation">Show More Information</string>
     <string name="infoMoreInformation">More Information</string>
     <string name="timeAtText">at</string>
     <string name="issueMilestone">Milestone %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Enable Drafts Deletion</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">General</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">New Label</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Team Name</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Followers</string>
     <string name="profileTabFollowing">Following</string>
-    <string name="profileCreateNewEmailAddress">Add Email Address</string>
-    <string name="profileEmailTitle">Email Address</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">New email added successfully</string>
     <string name="emailErrorEmpty">Email address is empty</string>
     <string name="emailErrorInvalid">Email address is not valid</string>
     <string name="emailErrorInUse">Email address is already in use</string>
     <string name="emailTypeText">Primary</string>
-    <string name="profileTabEmails">Emails</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Add / Remove Labels</string>
     <string name="labelsUpdated">Labels updated</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
-    <string name="loginViaPassword">Username / Password</string>
-    <string name="loginMethodText">Choose your preferred login method to access your account. Token is more secure!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Instance has returned an error - Unauthorized. Check your credentials and try again</string>
     <string name="loginTokenError">Token is required</string>
     <string name="prDeletedFork">Deleted Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">New Account</string>
-    <string name="addNewAccountText">Add New Account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Account added successfully</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minutes</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Enable Notifications</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Enable Vibration</string>
@@ -548,6 +571,7 @@
         <item quantity="one">You have %s new notification</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -594,9 +618,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -640,6 +664,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -663,13 +689,14 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="other">Notes deleted successfully</item>
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -682,6 +709,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -710,7 +738,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-it-rIT/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">My Issues</string>
     <string name="navMostVisited">Most Visited Repos</string>
     <string name="navNotes">Notes</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Nuovo Repository</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">Nuova Pull Request</string>
     <string name="pageTitleUsers">Utenti</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Demo repo</string>
     <string name="repoDescription">Descrizione demo</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Descrizione Repository</string>
     <string name="newRepoPrivateCopy">Privato</string>
     <string name="newRepoOwner">Proprietario</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Nome Organizzazione</string>
     <string name="newOrgDescTintCopy">Descrizione Organizzazione</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Nome utente</string>
     <string name="passWord">Password</string>
     <string name="btnLogin">LOGIN</string>
@@ -61,6 +67,7 @@ URL è richiesto</string>
     <string name="emptyFieldUsername">Nome utente obbligatorio</string>
     <string name="emptyFieldPassword">Password obbligatoria</string>
     <string name="protocolEmptyError">Il protocollo è richiesto</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Errore di connessione. Controllare la connessione Internet</string>
     <string name="repoNameErrorEmpty">Il nome del repository è vuoto</string>
     <string name="repoNameErrorInvalid">Nome del repository non è valido. [a&#8211;z A&#8211;Z 0&#8211;char@@9 &#8211; _]</string>
@@ -70,6 +77,7 @@ URL è richiesto</string>
     <string name="repoCreated">Il repository è stato creato</string>
     <string name="repoExistsError">Il repository di questo nome esiste già sotto il proprietario selezionato</string>
     <string name="repoOwnerError">Seleziona il proprietario per il repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Nome organizzazione vuoto</string>
     <string name="orgNameErrorInvalid">Nome organizzazione nono valido, [a&#8211;z A&#8211;Z 0&#8211;char@@9 &#8211; _]</string>
     <string name="orgDescError">La descrizione dell\'organizzazione supera il limite massimo di 255 caratteri</string>
@@ -101,7 +109,6 @@ URL è richiesto</string>
     <string name="infoTabRepoForksCount">Forks</string>
     <string name="infoTabRepoCreatedAt">Creato</string>
     <string name="infoTabRepoUpdatedAt">Ultimo aggiornamento</string>
-    <string name="infoShowMoreInformation">Mostra Ulteriori Informazioni</string>
     <string name="infoMoreInformation">Ulteriori Informazioni</string>
     <string name="timeAtText">alle</string>
     <string name="issueMilestone">Milestone %1$s</string>
@@ -181,14 +188,20 @@ URL è richiesto</string>
     <string name="settingsEnableCommentsDeletionText">Abilita Eliminazione Bozze</string>
     <string name="settingsEnableCommentsDeletionHintText">Elimina la bozza del commento quando viene pubblicato</string>
     <string name="settingsGeneralHeader">Generale</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Sblocco biometrico</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">Nessun altro dato disponibile</string>
     <string name="createLabel">Nuovo label</string>
@@ -229,6 +242,7 @@ URL è richiesto</string>
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Nome team</string>
@@ -264,15 +278,17 @@ autorizzazione</string>
     <!-- profile section -->
     <string name="profileTabFollowers">Follower</string>
     <string name="profileTabFollowing">Seguendo</string>
-    <string name="profileCreateNewEmailAddress">Aggiungi indirizzo email</string>
-    <string name="profileEmailTitle">Indirizzo Email</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">New email added successfully</string>
     <string name="emailErrorEmpty">L\'indirizzo email è vuoto</string>
     <string name="emailErrorInvalid">Indirizzo email non valido</string>
     <string name="emailErrorInUse">Indirizzo email già in uso</string>
     <string name="emailTypeText">Primario</string>
-    <string name="profileTabEmails">Email</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Aggiungi/Rimuovi label</string>
     <string name="labelsUpdated">Label aggiornate</string>
@@ -414,6 +430,10 @@ autorizzazione</string>
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Esplora utenti</string>
     <string name="exploreIssues">Esplora problemi</string>
@@ -427,8 +447,7 @@ autorizzazione</string>
     <string name="versionUnsupportedNew">Nuova versione di Gitea rilevata! Si prega di AGGIORNARE GitNex!</string>
     <string name="versionUnknown">Nessun Gitea rilevato!</string>
     <string name="versionAlertDialogHeader">Versione non supportata di Gitea</string>
-    <string name="loginViaPassword">Nome utente / Password</string>
-    <string name="loginMethodText">Scegli il tuo metodo di accesso preferito per accedere al tuo account. Il token è più sicuro!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">L\'istanza ha restituito un errore - Non autorizzato. Controlla le tue credenziali e riprova</string>
     <string name="loginTokenError">Il token è richiesto</string>
     <string name="prDeletedFork">Fork Eliminato</string>
@@ -510,19 +529,20 @@ autorizzazione</string>
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Lingue</string>
     <string name="reportsHintText">Rapporti crash</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archiviato</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account eliminato con successo</string>
     <string name="removeAccountPopupTitle">Rimuovi l\'account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">Nuovo account</string>
-    <string name="addNewAccountText">Aggiungere un nuovo account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">L\'account esiste già</string>
     <string name="accountAddedMessage">Account aggiunto con successo</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -530,14 +550,17 @@ autorizzazione</string>
     <string name="pageTitleNotifications">Notifiche</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Intervallo di ricerca notifiche</string>
-    <string name="pollingDelaySelectedText">%d Minuti</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Seleziona l\'intervallo per la ricerca</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Abilita le notifiche</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Abilita la vibrazione</string>
@@ -550,6 +573,7 @@ autorizzazione</string>
         <item quantity="one">You have %s new notification</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Letto</string>
     <string name="isUnread">Non letto</string>
     <string name="repoSettingsTitle">Impostazioni del repository</string>
@@ -596,9 +620,9 @@ autorizzazione</string>
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Vai all\'App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Autenticazione biometrica</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -642,6 +666,8 @@ autorizzazione</string>
     <string name="notLoggedIn">%s \u25CF non è connesso</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -665,13 +691,14 @@ autorizzazione</string>
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="other">Notes deleted successfully</item>
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -684,6 +711,7 @@ autorizzazione</string>
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -712,7 +740,39 @@ autorizzazione</string>
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-ja-rJP/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">自分の課題</string>
     <string name="navMostVisited">訪問者の多いリポジトリ</string>
     <string name="navNotes">注記</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">新しいリポジトリ</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">新規プルリクエスト</string>
     <string name="pageTitleUsers">ユーザー</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">デモ・リポジトリ</string>
     <string name="repoDescription">デモの説明</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">リポジトリの説明</string>
     <string name="newRepoPrivateCopy">プライベート</string>
     <string name="newRepoOwner">所有者</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">組織名</string>
     <string name="newOrgDescTintCopy">組織の説明</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">ユーザ名</string>
     <string name="passWord">パスワード</string>
     <string name="btnLogin">ログイン</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">ユーザー名が必要です</string>
     <string name="emptyFieldPassword">パスワードが必要です</string>
     <string name="protocolEmptyError">プロトコルが必要です</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">ネットワークにアクセスできません。インターネット接続を確認してください</string>
     <string name="repoNameErrorEmpty">リポジトリ名が空です</string>
     <string name="repoNameErrorInvalid">リポジトリ名が無効です。[a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">リポジトリが正常に作成されました</string>
     <string name="repoExistsError">この名前のリポジトリは、選択した所有者の下にすでに存在します</string>
     <string name="repoOwnerError">リポジトリの所有者を選択します</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">組織名が空です</string>
     <string name="orgNameErrorInvalid">組織名が無効です。[a&#8211;z A&#8211;Z 0&#8211;9&#8211;_]</string>
     <string name="orgDescError">組織の説明が最大255文字の制限を超えています</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">フォーク</string>
     <string name="infoTabRepoCreatedAt">作成済み</string>
     <string name="infoTabRepoUpdatedAt">最終更新日</string>
-    <string name="infoShowMoreInformation">詳細情報を表示</string>
     <string name="infoMoreInformation">詳細情報</string>
     <string name="timeAtText">at</string>
     <string name="issueMilestone">マイルストーン %1Ss</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">下書き削除の有効化</string>
     <string name="settingsEnableCommentsDeletionHintText">コメントが投稿されたときにコメントドラフトを削除する</string>
     <string name="settingsGeneralHeader">一般</string>
-    <string name="generalHintText">ホーム画面、既定のリンクハンドラ</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">既定のリンクハンドラ</string>
     <string name="generalDeepLinkDefaultScreenHintText">アプリケーションが外部リンクを処理できない場合にロードする画面を選択します。自動的にリダイレクトされます。</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">デフォルトリンクハンドラの選択画面</string>
     <string name="settingsBiometricHeader">生体認証のサポート</string>
     <string name="settingsLabelsInListHeader">テキストサポート付きラベル</string>
     <string name="settingsLabelsInListHint">これを有効にすると、問題とPRリストにテキスト付きのラベルが表示されます。デフォルトはカラードットです。</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">これ以上のデータはありません</string>
     <string name="createLabel">新規ラベル</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">リポジトリがチームから正常に削除されました</string>
     <string name="repoAddToTeamMessage">リポジトリ%1$sを組織%2$sチーム%3$sに追加</string>
     <string name="repoRemoveTeamMessage">リポジトリ%1$sをチーム%2$sから削除</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">チーム名</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">フォロワー</string>
     <string name="profileTabFollowing">フォロー中</string>
-    <string name="profileCreateNewEmailAddress">電子メールアドレスの追加</string>
-    <string name="profileEmailTitle">電子メールアドレス</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">新しい電子メールが正常に追加されました</string>
     <string name="emailErrorEmpty">電子メールアドレスが空です</string>
     <string name="emailErrorInvalid">電子メールアドレスが無効です</string>
     <string name="emailErrorInUse">電子メールアドレスは既に使用されています</string>
     <string name="emailTypeText">プライマリ</string>
-    <string name="profileTabEmails">電子メール</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">ラベルを追加/削除</string>
     <string name="labelsUpdated">ラベルが更新されました</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">ブラウザで開く</string>
     <string name="deleteGenericTitle">%sを削除</string>
     <string name="reset">リセット</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">ユーザーの表示</string>
     <string name="exploreIssues">課題の表示</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">新しいGiteaバージョンが検出されました!GitNex最新情報をお知らせください!</string>
     <string name="versionUnknown">Giteaが検出されませんでした!</string>
     <string name="versionAlertDialogHeader">サポートされていないバージョンのGitea</string>
-    <string name="loginViaPassword">ユーザー名/パスワード</string>
-    <string name="loginMethodText">アカウントにアクセスするためのログイン方法を選択します。トークンはより安全です!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">インスタンスから認証エラーが返されました。資格情報を確認して、再試行してください</string>
     <string name="loginTokenError">トークンが必要です</string>
     <string name="prDeletedFork">削除されたフォーク</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">カウンタが正常にリセットされました</string>
     <string name="resetCounterDialogMessage">リポジトリ%sのカウンタをリセットしますか?</string>
     <string name="resetCounterAllDialogMessage">これにより、このアカウントリポジトリのすべてのカウンタがリセットされます。</string>
-    <string name="appearanceHintText">テーマ、フォント、バッジ</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">生体認証、SSL証明書、キャッシュ</string>
     <string name="languagesHintText">言語</string>
     <string name="reportsHintText">クラッシュレポート</string>
     <string name="rateAppHintText">あなたがGitNexが好きなら、それを称賛してもいいですよ。</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">アーカイブ済み</string>
     <string name="archivedRepositoryMessage">このリポジトリはアーカイブされます。ファイルを表示することはできますが、問題/プルリクエストをプッシュまたはオープンすることはできません。</string>
     <string name="accountDeletedMessage">アカウントは正常に削除されました</string>
     <string name="removeAccountPopupTitle">アカウントの削除</string>
     <string name="removeAccountPopupMessage">このアカウントをアプリから削除してよろしいですか?\n\nこれにより、このアカウントに関連するすべてのデータがアプリケーションからのみ削除されます。</string>
     <string name="addNewAccount">新規アカウント</string>
-    <string name="addNewAccountText">新規アカウントの追加</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">アカウントは既にアプリケーションに存在します</string>
     <string name="accountAddedMessage">アカウントが正常に追加されました</string>
     <string name="switchAccountSuccess">アカウントに切り替え: %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">通知</string>
     <string name="noDataNotifications">すべて確保🚀</string>
     <string name="notificationsPollingHeaderText">通知確認の間隔</string>
-    <string name="pollingDelaySelectedText">%d分</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">通知確認の間隔を選択</string>
     <string name="pollingDelayDialogDescriptionText">GitNexが新しい通知を確認する時間間隔を選択します。</string>
     <string name="markAsRead">既読にマーク</string>
     <string name="markAsUnread">未読にマーク</string>
     <string name="pinNotification">ピン止め</string>
     <string name="markedNotificationsAsRead">すべての通知を既読としてマークしました</string>
-    <string name="notificationsHintText">ポーリング遅延、光、振動</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">通知を有効にする</string>
     <string name="enableLightsHeaderText">ライトを有効化</string>
     <string name="enableVibrationHeaderText">バイブレーションを有効にする</string>
@@ -547,6 +570,7 @@
     <plurals name="youHaveNewNotifications">
         <item quantity="other">%s件の新しい通知があります</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">既読</string>
     <string name="isUnread">未読</string>
     <string name="repoSettingsTitle">リポジトリ設定</string>
@@ -593,9 +617,9 @@
     <string name="prClosed">プルリクエストがクローズされました</string>
     <string name="prReopened">プルリクエストが再オープンされました</string>
     <string name="prMergeInfo">プルリクエスト情報</string>
-    <string name="accountDoesNotExist">URI%1$sのアカウントがアプリに存在しないようです。[新規アカウントの追加]ボタンをタップすると追加できます。</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">アプリケーションに移動</string>
-    <string name="noActionText">GitNexは要求されたリソースを処理できません。作業の詳細を提供して、プロジェクトリポジトリで改善提案として課題の登録をおねがいします。下のボタンからデフォルト画面を起動するだけで、設定から変更できます。</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">生体認証</string>
     <string name="biometricAuthSubTitle">生体認証の資格情報を使用してロック解除する</string>
     <string name="biometricNotSupported">このデバイスで利用できる生体認証機能はありません</string>
@@ -639,6 +663,8 @@
     <string name="notLoggedIn">%s\u25CFはログインしていません</string>
     <string name="followSystem">システム設定に従う(ライト/ダーク)</string>
     <string name="followSystemBlack">システム設定に従う(ライト/ピッチブラック)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">次のフォーク:%s</string>
     <string name="adoptRepo">登録</string>
     <string name="repoAdopted">リポジトリ%sを登録しました</string>
@@ -662,12 +688,13 @@
     <string name="newNoteContentHint">ここからノートを取り始める</string>
     <string name="noteDateTime">%sを作成しました</string>
     <string name="noteTimeModified">%sを更新しました</string>
-    <string name="noteDeleteDialoMessage">本当にこのノートを削除しますか?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="other">ノートは正常に削除されました</item>
     </plurals>
     <string name="notesAllDeletionMessage">すべてのノートが削除されます。この操作は元に戻せません。</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">コミット</string>
     <string name="timelineAddedCommit">%1$s が %2$s %3$sを追加</string>
     <!-- the | is replaced by the label -->
@@ -680,6 +707,7 @@
     <string name="timelineAssigneesAssigned">%1$s は、%2$s から%3$sに割り当てられました。</string>
     <string name="timelineMilestoneAdded">%1$s は、これを マイルストーン %3$sの %2$s に追加しました。</string>
     <string name="timelineMilestoneRemoved">%1$s はこれをマイルストーン%3$s の %2$s から 削除しました</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s は、この課題 %2$s をクローズしました。</string>
     <string name="timelineStatusReopenedIssue">%1$s は、課題 %2$s を再オープンしました。</string>
     <string name="timelineStatusReopenedPr">%1$s は、プルリクエスト %2$s を再オープンしました。</string>
@@ -708,7 +736,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-ko-rKR/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">My Issues</string>
     <string name="navMostVisited">Most Visited Repos</string>
     <string name="navNotes">Notes</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">새 저장소</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">New Pull Request</string>
     <string name="pageTitleUsers">Users</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Demo repo</string>
     <string name="repoDescription">Demo description</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">저장소 설명</string>
     <string name="newRepoPrivateCopy">비공개</string>
     <string name="newRepoOwner">소유자</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">조직 이름</string>
     <string name="newOrgDescTintCopy">Organization Description</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Username</string>
     <string name="passWord">Password</string>
     <string name="btnLogin">LOGIN</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Username is required</string>
     <string name="emptyFieldPassword">Password is required</string>
     <string name="protocolEmptyError">Protocol is required</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Cannot access network, please check your Internet connection</string>
     <string name="repoNameErrorEmpty">Repository name is empty</string>
     <string name="repoNameErrorInvalid">Repository name is not valid. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Repository created successfully</string>
     <string name="repoExistsError">Repository of this name already exists under selected Owner</string>
     <string name="repoOwnerError">Select owner for the repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Organization name is empty</string>
     <string name="orgNameErrorInvalid">Organization name is not valid, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Organization description exceeds the max 255 characters limit</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">포크</string>
     <string name="infoTabRepoCreatedAt">생성됨</string>
     <string name="infoTabRepoUpdatedAt">마지막 업데이트</string>
-    <string name="infoShowMoreInformation">상세한 정보 보기</string>
     <string name="infoMoreInformation">더 많은 정보</string>
     <string name="timeAtText">at</string>
     <string name="issueMilestone">Milestone %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Enable Drafts Deletion</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">General</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">New Label</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Team Name</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Followers</string>
     <string name="profileTabFollowing">Following</string>
-    <string name="profileCreateNewEmailAddress">Add Email Address</string>
-    <string name="profileEmailTitle">Email Address</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">New email added successfully</string>
     <string name="emailErrorEmpty">Email address is empty</string>
     <string name="emailErrorInvalid">Email address is not valid</string>
     <string name="emailErrorInUse">Email address is already in use</string>
     <string name="emailTypeText">Primary</string>
-    <string name="profileTabEmails">Emails</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Add / Remove Labels</string>
     <string name="labelsUpdated">Labels updated</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
-    <string name="loginViaPassword">Username / Password</string>
-    <string name="loginMethodText">Choose your preferred login method to access your account. Token is more secure!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Instance has returned an error - Unauthorized. Check your credentials and try again</string>
     <string name="loginTokenError">Token is required</string>
     <string name="prDeletedFork">Deleted Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">New Account</string>
-    <string name="addNewAccountText">Add New Account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Account added successfully</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minutes</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Enable Notifications</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Enable Vibration</string>
@@ -547,6 +570,7 @@
     <plurals name="youHaveNewNotifications">
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -593,9 +617,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -639,6 +663,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -662,12 +688,13 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="other">Notes deleted successfully</item>
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -680,6 +707,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -708,7 +736,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-lv-rLV/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">My Issues</string>
     <string name="navMostVisited">Most Visited Repos</string>
     <string name="navNotes">Notes</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Jauns repozitorijs</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">New Pull Request</string>
     <string name="pageTitleUsers">Users</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Demo repo</string>
     <string name="repoDescription">Demo description</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Repository Description</string>
     <string name="newRepoPrivateCopy">Privāts</string>
     <string name="newRepoOwner">Īpašnieks</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Organizācijas nosaukums</string>
     <string name="newOrgDescTintCopy">Organization Description</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Username</string>
     <string name="passWord">Password</string>
     <string name="btnLogin">LOGIN</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Username is required</string>
     <string name="emptyFieldPassword">Password is required</string>
     <string name="protocolEmptyError">Protocol is required</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Cannot access network, please check your Internet connection</string>
     <string name="repoNameErrorEmpty">Repository name is empty</string>
     <string name="repoNameErrorInvalid">Repository name is not valid. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Repository created successfully</string>
     <string name="repoExistsError">Repository of this name already exists under selected Owner</string>
     <string name="repoOwnerError">Select owner for the repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Organization name is empty</string>
     <string name="orgNameErrorInvalid">Organization name is not valid, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Organization description exceeds the max 255 characters limit</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">Forks</string>
     <string name="infoTabRepoCreatedAt">Created</string>
     <string name="infoTabRepoUpdatedAt">Last Updated</string>
-    <string name="infoShowMoreInformation">Show More Information</string>
     <string name="infoMoreInformation">More Information</string>
     <string name="timeAtText">at</string>
     <string name="issueMilestone">Milestone %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Enable Drafts Deletion</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">General</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">New Label</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Team Name</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Followers</string>
     <string name="profileTabFollowing">Following</string>
-    <string name="profileCreateNewEmailAddress">Add Email Address</string>
-    <string name="profileEmailTitle">Email Address</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">New email added successfully</string>
     <string name="emailErrorEmpty">Email address is empty</string>
     <string name="emailErrorInvalid">Email address is not valid</string>
     <string name="emailErrorInUse">Email address is already in use</string>
     <string name="emailTypeText">Primary</string>
-    <string name="profileTabEmails">Emails</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Add / Remove Labels</string>
     <string name="labelsUpdated">Labels updated</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
-    <string name="loginViaPassword">Username / Password</string>
-    <string name="loginMethodText">Choose your preferred login method to access your account. Token is more secure!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Instance has returned an error - Unauthorized. Check your credentials and try again</string>
     <string name="loginTokenError">Token is required</string>
     <string name="prDeletedFork">Deleted Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">New Account</string>
-    <string name="addNewAccountText">Add New Account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Account added successfully</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minutes</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Enable Notifications</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Enable Vibration</string>
@@ -549,6 +572,7 @@
         <item quantity="one">You have %s new notification</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -595,9 +619,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -641,6 +665,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -664,7 +690,7 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="zero">Notes deleted successfully</item>
         <item quantity="one">Note deleted successfully</item>
@@ -672,6 +698,7 @@
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -684,6 +711,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -712,7 +740,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-nl-rNL/strings.xml

@@ -12,8 +12,10 @@
     <string name="navLogout">Uitloggen</string>
     <string name="navAdministration">Instance Administration</string>
     <string name="navMyIssues">My Issues</string>
-    <string name="navMostVisited">Most Visited Repos</string>
-    <string name="navNotes">Notes</string>
+    <string name="navMostVisited">Meest Bezochte Repos</string>
+    <string name="navNotes">Notities</string>
+    <string name="navAccount">Account Instellingen</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Nieuwe Repository</string>
@@ -30,9 +32,10 @@
     <string name="pageTitleAddEmail">E-mailadres Toevoegen</string>
     <string name="pageTitleNewFile">Nieuw Bestand</string>
     <string name="pageTitleExplore">Ontdek</string>
-    <string name="pageTitleAdministration">Administration</string>
+    <string name="pageTitleAdministration">Administratie</string>
     <string name="pageTitleNewPullRequest">Nieuw Pull Request</string>
-    <string name="pageTitleUsers">Users</string>
+    <string name="pageTitleUsers">Gebruikers</string>
+    <string name="pageTitleAddRepository">Voeg Repository Toe</string>
     <!-- page titles -->
     <string name="repoName">Voorbeeld repo</string>
     <string name="repoDescription">Voorbeeld beschrijving</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Repository Beschrijving</string>
     <string name="newRepoPrivateCopy">Privé</string>
     <string name="newRepoOwner">Eigenaar</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Naam Organisatie</string>
     <string name="newOrgDescTintCopy">Beschrijving Organisatie</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Gebruikersnaam</string>
     <string name="passWord">Wachtwoord</string>
     <string name="btnLogin">INLOGGEN</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Gebruikersnaam is vereist</string>
     <string name="emptyFieldPassword">Wachtwoord is vereist</string>
     <string name="protocolEmptyError">Protocol is vereist</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Verbindingsfout, controleer uw internetverbinding</string>
     <string name="repoNameErrorEmpty">Repository naam is leeg</string>
     <string name="repoNameErrorInvalid">Repository naam is niet geldig. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Repository met succes aangemaakt</string>
     <string name="repoExistsError">Er bestaat al een Repository met deze naam voor de geselecteerde Eigenaar</string>
     <string name="repoOwnerError">Selecteer eigenaar van de repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Organisatie naam is leeg</string>
     <string name="orgNameErrorInvalid">Organisatie naam is niet geldig. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Organisatie beschrijving overschrijdt het limiet van 255 karakters</string>
@@ -100,13 +108,12 @@
     <string name="infoTabRepoForksCount">Aantal Forks</string>
     <string name="infoTabRepoCreatedAt">Aangemaakt</string>
     <string name="infoTabRepoUpdatedAt">Laatst Bijgewerkt</string>
-    <string name="infoShowMoreInformation">Toon Meer Informatie</string>
     <string name="infoMoreInformation">Meer Informatie</string>
     <string name="timeAtText">om</string>
     <string name="issueMilestone">Mijlpaal %1$s</string>
     <string name="dueDate">Vervalt op %1$s</string>
     <string name="assignedTo">Toegewezen aan: %1$s</string>
-    <string name="assignedToMe">Assigned to Me</string>
+    <string name="assignedToMe">Toegewezen aan Mij</string>
     <string name="commentButtonText">Reactie</string>
     <string name="commentEmptyError">Voer uw reactie in</string>
     <string name="commentSuccess">Reactie geplaatst</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Activeer concept verwijdering</string>
     <string name="settingsEnableCommentsDeletionHintText">Verwijder reactie concept wanneer reactie is geplaatst</string>
     <string name="settingsGeneralHeader">Algemeen</string>
-    <string name="generalHintText">Beginscherm, standaard URL afhandelaar</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Standaard URL Afhandelaar</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N.v.t.</string>
     <string name="linkSelectorDialogTitle">Selecteer Standaard URL Afhandelaar Scherm</string>
     <string name="settingsBiometricHeader">Ondersteuning voor Biometrie</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Inspringing</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">Geen verdere gegevens beschikbaar</string>
     <string name="createLabel">Nieuw Label</string>
@@ -196,18 +209,18 @@
     <string name="labelColor">Label Kleur</string>
     <string name="labelEmptyError">Label naam is leeg</string>
     <string name="labelNameError">Label name is not valid</string>
-    <string name="labelCreated">Label created</string>
-    <string name="labelUpdated">Label updated</string>
+    <string name="labelCreated">Label aangemaakt</string>
+    <string name="labelUpdated">Label bijgewerkt</string>
     <string name="labelMenuContentDesc">Desc</string>
-    <string name="labelDeleteText">Label deleted</string>
+    <string name="labelDeleteText">Label verwijderd</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Authorization Error</string>
     <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
     <string name="labelDeleteMessage">Do you really want to delete this label?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Teams</string>
-    <string name="orgTabMembers">Members</string>
-    <string name="teamTitle">Team name</string>
+    <string name="orgTabMembers">Leden</string>
+    <string name="teamTitle">Teamnaam</string>
     <string name="teamDescription">Team desc</string>
     <string name="teamPermissions">Permissions</string>
     <string name="teamPermissionNone">• Members of this team do not have any permissions.</string>
@@ -215,19 +228,20 @@
     <string name="teamPermissionWrite">• Members of this team can view and push to team repositories.</string>
     <string name="teamPermissionAdmin">• Members of this team can push to and from team repositories and add collaborators.</string>
     <string name="teamPermissionOwner">• Members of this team have owner permissions.</string>
-    <string name="teamShowAll">show all</string>
+    <string name="teamShowAll">alles weergeven</string>
     <string name="orgMember">Org members</string>
     <string name="orgTeamMembers">Organization team members</string>
-    <string name="removeTeamMember">Remove %s</string>
-    <string name="addTeamMember">Add %s</string>
-    <string name="addTeamMemberMessage">Do you want to add this user to the team?</string>
-    <string name="removeTeamMemberMessage">Do you want to remove this user from the team?</string>
-    <string name="memberAddedMessage">Member added to the team successfully</string>
-    <string name="memberRemovedMessage">Member removed from the team successfully</string>
-    <string name="repoAddedMessage">Repository added to the team successfully</string>
-    <string name="repoRemovedMessage">Repository removed from the team successfully</string>
+    <string name="removeTeamMember">Verwijder %s</string>
+    <string name="addTeamMember">Voeg %s toe</string>
+    <string name="addTeamMemberMessage">Wilt u deze gebruiker toevoegen aan het team?</string>
+    <string name="removeTeamMemberMessage">Wilt u deze gebruiker verwijderen uit het team?</string>
+    <string name="memberAddedMessage">Gebruiker succesvol aan het team toegevoegd</string>
+    <string name="memberRemovedMessage">Gebruiker succesvol uit het team verwijderd</string>
+    <string name="repoAddedMessage">Repository succesvol aan het team toegevoegd</string>
+    <string name="repoRemovedMessage">Repository succesvol uit het team verwijderd</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Team Name</string>
@@ -240,7 +254,7 @@
     <string name="teamNameEmpty">Please enter team name</string>
     <string name="teamNameError">Team name should contain only alphanumeric, dash (-), underscore (_) and dot (.) characters</string>
     <string name="teamPermissionEmpty">Please select permission</string>
-    <string name="teamDescError">Team description have illegal characters</string>
+    <string name="teamDescError">Team beschrijving heeft ongeldige tekens</string>
     <string name="teamDescLimit">Team beschrijving heeft meer dan 100 karakters</string>
     <string name="teamCreated">Team met succes aangemaakt</string>
     <!-- create team -->
@@ -254,7 +268,7 @@
     <!-- add collaborator -->
     <string name="addCollaboratorSearchHint">Zoek gebruikers</string>
     <string name="addCollaboratorViewUserDesc">Gebruikersnaam</string>
-    <string name="removeCollaboratorDialogTitle">Remove %s?</string>
+    <string name="removeCollaboratorDialogTitle">Verwijder %s?</string>
     <string name="removeCollaboratorMessage">Wilt u deze gebruiker verwijderen van deze repository?</string>
     <string name="removeCollaboratorToastText">Gebruiker verwijderd van repository.</string>
     <string name="addCollaboratorToastText">Gebruiker toegevoegd aan repository.</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Volgers</string>
     <string name="profileTabFollowing">Volgend</string>
-    <string name="profileCreateNewEmailAddress">E-mailadres Toevoegen</string>
-    <string name="profileEmailTitle">E-mailadres</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">E-mails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">Nieuw e-mailadres met succes toegevoegd</string>
     <string name="emailErrorEmpty">E-mailadres is leeg</string>
     <string name="emailErrorInvalid">E-mailadres is niet geldig</string>
     <string name="emailErrorInUse">E-mailadres is reeds in gebruik</string>
     <string name="emailTypeText">Primair</string>
-    <string name="profileTabEmails">E-mailadressen</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Toevoegen / Verwijderen Label</string>
     <string name="labelsUpdated">Label bijgewerkt</string>
@@ -286,7 +302,7 @@
     <!-- single issue section -->
     <string name="repoMetaData">Repository Meta</string>
     <!-- admin -->
-    <string name="adminCreateNewUser">New User</string>
+    <string name="adminCreateNewUser">Nieuwe Gebruiker</string>
     <string name="adminUsers">Systeemgebruikers</string>
     <string name="userRoleAdmin">Administrator</string>
     <string name="adminCron">Cron-taken</string>
@@ -299,13 +315,13 @@
     <!-- create user -->
     <string name="userFullNameText">Volledige Naam</string>
     <string name="userEmail">E-mailadres</string>
-    <string name="userUserName">Username</string>
-    <string name="userPassword">Password</string>
-    <string name="userInvalidFullName">Invalid Full Name</string>
-    <string name="userInvalidUserName">Invalid Username</string>
-    <string name="userInvalidEmail">Invalid Email</string>
+    <string name="userUserName">Gebruikersnaam</string>
+    <string name="userPassword">Wachtwoord</string>
+    <string name="userInvalidFullName">Ongeldige Volledige Naam</string>
+    <string name="userInvalidUserName">Ongeldige Gebruikersnaam</string>
+    <string name="userInvalidEmail">Ongeldige E-mail</string>
     <string name="userCreatedText">New user added successfully</string>
-    <string name="userExistsError">User already exists</string>
+    <string name="userExistsError">Gebruiker bestaat al</string>
     <!-- create user -->
     <!-- edit issue -->
     <string name="editIssueNavHeader">Edit Issue #%1$s</string>
@@ -314,37 +330,37 @@
     <!-- release -->
     <string name="createRelease">New Release</string>
     <string name="releaseTagNameText">Tag Name</string>
-    <string name="releaseTitleText">Title</string>
-    <string name="releaseContentText">Content</string>
-    <string name="releaseTypeText">Mark as Pre-Release</string>
-    <string name="releaseBranchText">Select Branch</string>
+    <string name="releaseTitleText">Titel</string>
+    <string name="releaseContentText">Inhoud</string>
+    <string name="releaseTypeText">Markeer als Pre-Release</string>
+    <string name="releaseBranchText">Selecteer Branch</string>
     <string name="releaseDraftText">Draft</string>
-    <string name="tagNameErrorEmpty">Tag name is empty</string>
-    <string name="titleErrorEmpty">Title is empty</string>
+    <string name="tagNameErrorEmpty">Tag naam is leeg</string>
+    <string name="titleErrorEmpty">Titel is leeg</string>
     <string name="releaseCreatedText">New release created</string>
     <string name="deleteReleaseConfirmation">Do you really want to delete this release?</string>
     <string name="releaseDeleted">Release deleted</string>
     <!-- release -->
-    <string name="loginOTPTypeError">OTP code should be numbers</string>
-    <string name="loginOTP">OTP Code (Optional)</string>
-    <string name="otpMessage">Enter otp code if 2FA is enabled</string>
+    <string name="loginOTPTypeError">OTP code moeten nummers zijn</string>
+    <string name="loginOTP">OTP Code (Optioneel)</string>
+    <string name="otpMessage">Vul otp code in als 2FA is ingeschakeld</string>
     <string name="openWebRepo">Open in Browser</string>
     <string name="repoStargazersInMenu">Stargazers</string>
     <string name="repoWatchersInMenu">Watchers</string>
-    <string name="noDataWebsite">No website found</string>
-    <string name="noDataDescription">No description found</string>
-    <string name="noDataLocation">No location found</string>
-    <string name="starMember">Star</string>
+    <string name="noDataWebsite">Geen website gevonden</string>
+    <string name="noDataDescription">Geen beschrijving gevonden</string>
+    <string name="noDataLocation">Geen locatie gevonden</string>
+    <string name="starMember">Ster</string>
     <string name="watcherMember">Watcher</string>
     <string name="zipArchiveDownloadReleasesTab">Source code (ZIP)</string>
     <string name="tarArchiveDownloadReleasesTab">Source code (TAR.GZ)</string>
     <!-- new file -->
-    <string name="newFileNameTintCopy">File Name</string>
-    <string name="newFileBranchTintCopy">New Branch Name</string>
-    <string name="newFileContentTintCopy">File Content</string>
-    <string name="newFileButtonCopy">Create New File</string>
-    <string name="newFileNameHintMessage">with folder: app/test.md</string>
-    <string name="newFileMessageTintCopy">Commit Message</string>
+    <string name="newFileNameTintCopy">Bestandsnaam</string>
+    <string name="newFileBranchTintCopy">Nieuwe Branch Naam</string>
+    <string name="newFileContentTintCopy">Inhoud Bestand</string>
+    <string name="newFileButtonCopy">Maak Nieuw Bestand</string>
+    <string name="newFileNameHintMessage">met folder: app/test.md</string>
+    <string name="newFileMessageTintCopy">Commitbericht</string>
     <string name="newFileInvalidBranchName">Invalid branch name, may only contain &#8211;, a&#8211;z, 0&#8211;9</string>
     <string name="newFileCommitMessageError">Commit message is too long</string>
     <string name="newFileSuccessMessage">New file created</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
-    <string name="loginViaPassword">Username / Password</string>
-    <string name="loginMethodText">Choose your preferred login method to access your account. Token is more secure!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Instance has returned an error - Unauthorized. Check your credentials and try again</string>
     <string name="loginTokenError">Token is required</string>
     <string name="prDeletedFork">Deleted Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">New Account</string>
-    <string name="addNewAccountText">Add New Account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Account added successfully</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minutes</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Enable Notifications</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Enable Vibration</string>
@@ -548,6 +571,7 @@
         <item quantity="one">You have %s new notification</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -594,9 +618,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -640,6 +664,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -663,13 +689,14 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="other">Notes deleted successfully</item>
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -682,6 +709,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -710,7 +738,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-pl-rPL/strings.xml

@@ -10,10 +10,12 @@
     <string name="navAbout">O programie</string>
     <string name="navRate">Oceń GitNex</string>
     <string name="navLogout">Wyloguj się</string>
-    <string name="navAdministration">Instance Administration</string>
+    <string name="navAdministration">Administacja instancji</string>
     <string name="navMyIssues">Moje zgłoszenia</string>
     <string name="navMostVisited">Most Visited Repos</string>
-    <string name="navNotes">Notes</string>
+    <string name="navNotes">Notatki</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Nowe repozytorium</string>
@@ -30,9 +32,10 @@
     <string name="pageTitleAddEmail">Dodaj adres e-mail</string>
     <string name="pageTitleNewFile">Nowy plik</string>
     <string name="pageTitleExplore">Przeglądaj</string>
-    <string name="pageTitleAdministration">Administration</string>
+    <string name="pageTitleAdministration">Administracja</string>
     <string name="pageTitleNewPullRequest">Nowy Pull Request</string>
     <string name="pageTitleUsers">Użytkownicy</string>
+    <string name="pageTitleAddRepository">Dodaj repozytorium</string>
     <!-- page titles -->
     <string name="repoName">Repozytorium demo</string>
     <string name="repoDescription">Opis demo</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Opis repozytorium</string>
     <string name="newRepoPrivateCopy">Prywatny</string>
     <string name="newRepoOwner">Właściciel</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Nazwa organizacji</string>
     <string name="newOrgDescTintCopy">Opis organizacji</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Nazwa użytkownika</string>
     <string name="passWord">Hasło</string>
     <string name="btnLogin">ZALOGUJ</string>
@@ -52,14 +58,15 @@
     <string name="navigationDrawerOpen">Otwórz szufladę nawigacji</string>
     <string name="navigationDrawerClose">Zamknij szufladę nawigacji</string>
     <string name="protocol">Protokół</string>
-    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter instance url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
+    <string name="urlInfoTooltip">1- Wybierz poprawny protokół (https lub http). \n2- Wprowadź adres URL instancji np: try.gitea.io. \n3- Jeśli aktywowano 2FA dla swojego konta, wprowadź kod w polu OTP Code. \n4 - Dla podstawowej autoryzacji HTTP użyj NAZWAUŻYTKOWNIKA@STRONA.PL w polu URL.</string>
     <string name="malformedUrl">Nie można połączyć się z hostem. Sprawdź czy adres URL i port są prawidłowe</string>
-    <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network</string>
-    <string name="malformedJson">Malformed JSON was received. Server response was not successful</string>
+    <string name="protocolError">Nie zaleca się używania protokołu HTTP, z wyjątkiem testowania w sieci lokalnej</string>
+    <string name="malformedJson">Otrzymano błędne JSON. Odpowiedź serwera nie powiodła się</string>
     <string name="emptyFieldURL">Adres URL instancji jest wymagany</string>
     <string name="emptyFieldUsername">Nazwa użytkownika jest wymagana</string>
     <string name="emptyFieldPassword">Hasło jest wymagane</string>
     <string name="protocolEmptyError">Protokuł jest wymagany</string>
+    <string name="instanceHelperText">Wprowadź adresURL bez http lub https. Przykład: codeberg.org</string>
     <string name="checkNetConnection">Nie można uzyskać dostępu do sieci, sprawdź swoje połączenie internetowe</string>
     <string name="repoNameErrorEmpty">Nazwa repozytorium jest pusta</string>
     <string name="repoNameErrorInvalid">Nazwa repozytorium jest nieprawidłowa. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Repozytorium utworzone pomyślnie</string>
     <string name="repoExistsError">Repozytorium o tej nazwie już istnieje pod wybranym właścicielem</string>
     <string name="repoOwnerError">Wybierz właściciela tego repozytorium</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Nazwa organizacji jest pusta</string>
     <string name="orgNameErrorInvalid">Nazwa organizacji jest nieprawidłowa, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Opis organizacji przekracza limit 255 znaków</string>
@@ -83,7 +91,7 @@
     <string name="repoContentAvatar">Repozytorium</string>
     <string name="privateAvatar">Pri</string>
     <string name="removeContent">Usuń</string>
-    <string name="genericApiError">Instance has returned an error. Code %d</string>
+    <string name="genericApiError">Instancja zwróciła błąd. Kod %d</string>
     <string name="tabTextInfo">Szczegóły</string>
     <string name="tabTextFiles">Pliki</string>
     <string name="tabTextMl">Kamienie milowe</string>
@@ -100,13 +108,12 @@
     <string name="infoTabRepoForksCount">Forki</string>
     <string name="infoTabRepoCreatedAt">Utworzono</string>
     <string name="infoTabRepoUpdatedAt">Ostatnia aktualizacja</string>
-    <string name="infoShowMoreInformation">Pokaż więcej informacji</string>
     <string name="infoMoreInformation">Więcej informacji</string>
     <string name="timeAtText">w</string>
     <string name="issueMilestone">Etap %1$s</string>
     <string name="dueDate">Termin %1$s</string>
     <string name="assignedTo">Przypisano do: %1$s</string>
-    <string name="assignedToMe">Assigned to Me</string>
+    <string name="assignedToMe">Przypisane do mnie</string>
     <string name="commentButtonText">Komentarz</string>
     <string name="commentEmptyError">Napisz swój komentarz</string>
     <string name="commentSuccess">Komentarz wysłany</string>
@@ -115,7 +122,7 @@
     <string name="commitAuthor">Autor commitu: %1$s</string>
     <string name="releaseDownloadText">Pobrania</string>
     <string name="releasePublishedBy">Opublikowane przez @%1$s</string>
-    <string name="noReleaseBodyContent">Release notes are not provided by the publisher.</string>
+    <string name="noReleaseBodyContent">Informacje o wydaniu nie zostały podane przez osobę publikującą.</string>
     <string name="newMilestoneTitle">Tytuł</string>
     <string name="newMilestoneDescription">Opis</string>
     <string name="newMilestoneDueDate">Termin</string>
@@ -123,7 +130,7 @@
     <string name="milestoneDescError">Opis etapu przekracza limit 255 znaków</string>
     <string name="milestoneCreated">Etap został utworzony pomyślnie</string>
     <string name="milestoneDateEmpty">Proszę wybrać termin</string>
-    <string name="milestoneNoDueDate">No due date</string>
+    <string name="milestoneNoDueDate">Nie ustalono terminu</string>
     <string name="milestoneNoDescription">Brak opisu</string>
     <string name="milestoneIssueStatusOpen">Otwarte %1$d</string>
     <string name="milestoneIssueStatusClosed">Zamknięte %1$d</string>
@@ -153,25 +160,25 @@
     <string name="settingsLanguageSelectedHeaderDefault">Angielski</string>
     <string name="settingsAppearanceHeader">Wygląd</string>
     <string name="settingsLanguageSelectorDialogTitle">Wybierz język</string>
-    <string name="settingsLightThemeTimeSelectorHeader">Light Theme Switch Time</string>
-    <string name="settingsDarkThemeTimeSelectorHeader">Dark Theme Switch Time</string>
+    <string name="settingsLightThemeTimeSelectorHeader">Czas przełączenia na jasny motyw</string>
+    <string name="settingsDarkThemeTimeSelectorHeader">Czas przełączenia na ciemny motyw</string>
     <string name="settingsTimeSelectorDialogTitle">Wybierz format czasu</string>
     <string name="settingsHelpTranslateText">Przetłumacz GitNex za pomocą Crowdin</string>
     <string name="codeBlockHeaderText">Kolor bloku kodu</string>
     <string name="settingsCodeBlockSelectorDialogTitle">Wybór koloru bloku kodu</string>
     <string name="settingsHomeScreenHeaderText">Ekran główny</string>
     <string name="settingsHomeScreenSelectedText">Moje repozytoria</string>
-    <string name="settingsHomeScreenSelectorDialogTitle">Select Home Screen</string>
+    <string name="settingsHomeScreenSelectorDialogTitle">Wybierz ekran główny</string>
     <string name="settingsCustomFontHeaderText">Czcionka</string>
     <string name="settingsCustomFontSelectorDialogTitle">Wybierz czcionkę</string>
     <string name="themeSelectorDialogTitle">Wybierz motyw aplikacji</string>
     <string name="themeSelectionHeaderText">Motyw</string>
     <string name="settingsCounterBadges">Odznaki liczników</string>
     <string name="settingsFileViewerSourceCodeHeaderText">Motyw kodu źródłowego</string>
-    <string name="cacheSizeDataDialogHeader">Data Cache Size</string>
-    <string name="cacheSizeDataSelectionHeaderText">Data Cache Size</string>
-    <string name="cacheSizeImagesDialogHeader">Images Cache Size</string>
-    <string name="cacheSizeImagesSelectionHeaderText">Images Cache Size</string>
+    <string name="cacheSizeDataDialogHeader">Rozmiar pamięci podręcznej danych</string>
+    <string name="cacheSizeDataSelectionHeaderText">Rozmiar pamięci podręcznej danych</string>
+    <string name="cacheSizeImagesDialogHeader">Rozmiar pamięci podręcznej obrazów</string>
+    <string name="cacheSizeImagesSelectionHeaderText">Rozmiar pamięci podręcznej obrazów</string>
     <string name="clearCacheSelectionHeaderText">Czyść Cache</string>
     <string name="clearCacheDialogHeader">Wyczyścić pamięć podręczną?</string>
     <string name="clearCacheDialogMessage">This will delete all the cache data including files and images.\n\nProceed with deletion?</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Włącz usuwanie szkiców</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">Ogólne</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Obsługa biometrii</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">Brak dostępnych danych</string>
     <string name="createLabel">Nowa etykieta</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Nazwa zespołu</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Obserwujący</string>
     <string name="profileTabFollowing">Obserwowane</string>
-    <string name="profileCreateNewEmailAddress">Dodaj adres e-mail</string>
-    <string name="profileEmailTitle">Adres e-mail</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">Nowy e-mail został dodany</string>
     <string name="emailErrorEmpty">Adres e-mail jest pusty</string>
     <string name="emailErrorInvalid">Adres e-mail jest nieprawidłowy</string>
     <string name="emailErrorInUse">Adres e-mail jest już używany</string>
     <string name="emailTypeText">Podstawowy</string>
-    <string name="profileTabEmails">E-maile</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Dodaj / Usuń etykiety</string>
     <string name="labelsUpdated">Etykiety zaktualizowane</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Przeglądaj zgłoszenia</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">Wykryto nową wersję Gitea! Proszę ZAKTUALIZOWAĆ GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Nieobsługiwana wersja Gitea</string>
-    <string name="loginViaPassword">Nazwa użytkownika / Hasło</string>
-    <string name="loginMethodText">Wybierz preferowaną metodę logowania, aby uzyskać dostęp do swojego konta. Token jest bezpieczniejszy!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Instancja zwróciła błąd - nieautoryzowana. Sprawdź swoje dane i spróbuj ponownie</string>
     <string name="loginTokenError">Token is required</string>
     <string name="prDeletedFork">Deleted Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Usuń Konto</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">Nowe Konto</string>
-    <string name="addNewAccountText">Dodaj Nowe Konto</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Pomyślnie dodano konto</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Powiadomienia</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minut(y)</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Włącz powiadomienia</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Włącz Wibracje</string>
@@ -550,6 +573,7 @@
         <item quantity="many">You have %s new notifications</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Odczytane</string>
     <string name="isUnread">Nieodczytane</string>
     <string name="repoSettingsTitle">Ustawienia Repozytorium</string>
@@ -596,9 +620,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -642,6 +666,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -665,7 +691,7 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="few">Notes deleted successfully</item>
@@ -674,6 +700,7 @@
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -686,6 +713,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -714,7 +742,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -10,10 +10,12 @@
     <string name="navAbout">Sobre</string>
     <string name="navRate">Avalie o GitNex</string>
     <string name="navLogout">Sair</string>
-    <string name="navAdministration">Instance Administration</string>
+    <string name="navAdministration">Administração da Instância</string>
     <string name="navMyIssues">Meus Issues</string>
-    <string name="navMostVisited">Most Visited Repos</string>
-    <string name="navNotes">Notes</string>
+    <string name="navMostVisited">Repositórios Mais Visitados</string>
+    <string name="navNotes">Anotações</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Novo repositório</string>
@@ -30,9 +32,10 @@
     <string name="pageTitleAddEmail">Adicionar endereço de E-mail</string>
     <string name="pageTitleNewFile">Novo arquivo</string>
     <string name="pageTitleExplore">Explorar</string>
-    <string name="pageTitleAdministration">Administration</string>
+    <string name="pageTitleAdministration">Administração</string>
     <string name="pageTitleNewPullRequest">Novo Pull Request</string>
     <string name="pageTitleUsers">Usuários</string>
+    <string name="pageTitleAddRepository">Adicionar Repositório</string>
     <!-- page titles -->
     <string name="repoName">Repo demo</string>
     <string name="repoDescription">Descrição demo</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Descrição do repositório</string>
     <string name="newRepoPrivateCopy">Privado</string>
     <string name="newRepoOwner">Proprietário</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Nome da organização</string>
     <string name="newOrgDescTintCopy">Descrição da organização</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Usuário</string>
     <string name="passWord">Senha</string>
     <string name="btnLogin">ENTRAR</string>
@@ -52,7 +58,7 @@
     <string name="navigationDrawerOpen">Abrir painel de navegação</string>
     <string name="navigationDrawerClose">Fechar painel de navegação</string>
     <string name="protocol">Protocolo</string>
-    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter instance url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
+    <string name="urlInfoTooltip">1- Selecione o protocolo correto (https ou http).\n2- Insira a URL da instância, p. ex.: try.gitea.io.\n3- Se você habilitou autenticação de dois fatores (2FA) na sua conta, insira o código no campo OTP.\n4- Para autenticação HTTP básica, use USERNAME@DOMAIN.COM no campo URL.</string>
     <string name="malformedUrl">Não foi possível conectar-se ao host. Por favor verifique sua URL ou porta para ver se há algum erro</string>
     <string name="protocolError">Não é recomendado usar o protocolo HTTP a menos que você esteja testando na rede local</string>
     <string name="malformedJson">JSON malformado foi recebido. A resposta do servidor não foi bem sucedida</string>
@@ -60,21 +66,24 @@
     <string name="emptyFieldUsername">Nome de usuário é necessário</string>
     <string name="emptyFieldPassword">A senha é necessária</string>
     <string name="protocolEmptyError">Necessário especificar o protocolo</string>
-    <string name="checkNetConnection">Não é possível acessar a rede, por favor, verifique sua conexão com a Internet</string>
+    <string name="instanceHelperText">Insira a URL, sem http ou https.
+Exemplo: codeberg.org</string>
+    <string name="checkNetConnection">Não é possível acessar a rede. Por favor, verifique sua conexão com a Internet</string>
     <string name="repoNameErrorEmpty">Nome do repositório está vazio</string>
-    <string name="repoNameErrorInvalid">O nome do repositório não é válido. [um&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
+    <string name="repoNameErrorInvalid">O nome do repositório não é válido. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="repoNameErrorReservedName">O nome do repositório está reservado</string>
     <string name="repoNameErrorReservedPatterns">Nome do repositório contém palavras-chave reservadas</string>
     <string name="repoDescError">Descrição do repositório excede o limite máximo de 255 caracteres</string>
     <string name="repoCreated">Repositório criado com êxito</string>
     <string name="repoExistsError">Um repositório com este nome já existe sob o proprietário selecionado</string>
     <string name="repoOwnerError">Selecione o proprietário do repositório</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">O nome da organização está vazio</string>
     <string name="orgNameErrorInvalid">O nome da organização não é válido, [&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Descrição da organização excede o limite máximo de 255 caracteres</string>
     <string name="orgCreated">Organização criada com sucesso</string>
     <string name="orgExistsError">Organização já existe</string>
-    <string name="diffStatistics">%1$s addition(s) and %2$s deletion(s)</string>
+    <string name="diffStatistics">%1$s inclusão(ões) e %2$s exclusão(ões)</string>
     <string name="processingText">Processando</string>
     <string name="search">Pesquisar</string>
     <string name="close">Fechar</string>
@@ -100,7 +109,6 @@
     <string name="infoTabRepoForksCount">Forks</string>
     <string name="infoTabRepoCreatedAt">Criado</string>
     <string name="infoTabRepoUpdatedAt">Última atualização</string>
-    <string name="infoShowMoreInformation">Mostrar Mais Informações</string>
     <string name="infoMoreInformation">Mais informações</string>
     <string name="timeAtText">em</string>
     <string name="issueMilestone">Meta %1$s</string>
@@ -108,9 +116,9 @@
     <string name="assignedTo">Atribuído a: %1$s</string>
     <string name="assignedToMe">Atribuídos a mim</string>
     <string name="commentButtonText">Comentar</string>
-    <string name="commentEmptyError">Por favor escreva o seu comentário</string>
+    <string name="commentEmptyError">Por favor, deixe seu comentário</string>
     <string name="commentSuccess">Comentário publicado</string>
-    <string name="featureDeprecated">Esta funcionalidade será removida no futuro</string>
+    <string name="featureDeprecated">Esta funcionalidade será removida futuramente</string>
     <string name="generalImgContentText">Imagem</string>
     <string name="commitAuthor">Autor do commit: %1$s</string>
     <string name="releaseDownloadText">Downloads</string>
@@ -127,7 +135,7 @@
     <string name="milestoneNoDescription">Sem descrição</string>
     <string name="milestoneIssueStatusOpen">%1$d Aberto</string>
     <string name="milestoneIssueStatusClosed">%1$d Fechado</string>
-    <string name="selectMilestone">Selecionar marco (milestone)</string>
+    <string name="selectMilestone">Selecionar marco</string>
     <string name="newIssueSelectAssigneesListTitle">Selecionar designados</string>
     <string name="newIssueSelectLabelsListTitle">Selecionar marcadores</string>
     <string name="newIssueTitle">Título</string>
@@ -147,16 +155,16 @@
     <string name="settingsSecurityHeader">Segurança</string>
     <string name="settingsCertsSelectorHeader">Excluir Certificados Confiáveis</string>
     <string name="settingsCertsPopupTitle">Excluir Certificados Confiáveis?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Tem certeza que deseja excluir quaisquer dos certificados ou hostnames manualmente confiados? \n\nVocê também será desconectado.</string>
     <string name="settingsSave">Configurações salvas</string>
     <string name="settingsLanguageSelectorHeader">Idioma</string>
     <string name="settingsLanguageSelectedHeaderDefault">Português (Brasil)</string>
     <string name="settingsAppearanceHeader">Aparência</string>
     <string name="settingsLanguageSelectorDialogTitle">Escolha o idioma</string>
-    <string name="settingsLightThemeTimeSelectorHeader">Light Theme Switch Time</string>
-    <string name="settingsDarkThemeTimeSelectorHeader">Dark Theme Switch Time</string>
-    <string name="settingsTimeSelectorDialogTitle">Escolha o formato da hora</string>
-    <string name="settingsHelpTranslateText">Translate GitNex via Crowdin</string>
+    <string name="settingsLightThemeTimeSelectorHeader">Horário de Mudança para o Tema Claro</string>
+    <string name="settingsDarkThemeTimeSelectorHeader">Horário de Mudança para o Tema Escuro</string>
+    <string name="settingsTimeSelectorDialogTitle">Escolha o Formato de Hora</string>
+    <string name="settingsHelpTranslateText">Traduza o Gitnex com Crowdin</string>
     <string name="codeBlockHeaderText">Cor do bloco de código</string>
     <string name="settingsCodeBlockSelectorDialogTitle">Seletor de cores do bloco de código</string>
     <string name="settingsHomeScreenHeaderText">Tela inicial</string>
@@ -180,14 +188,20 @@
     <string name="settingsEnableCommentsDeletionText">Ativar exclusão de rascunhos</string>
     <string name="settingsEnableCommentsDeletionHintText">Excluir rascunho de comentário quando um comentário é postado</string>
     <string name="settingsGeneralHeader">Geral</string>
-    <string name="generalHintText">Home screen, default link handler</string>
-    <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
+    <string name="generalHintText">Tela inicial, rascunhos e relatórios de falha</string>
+    <string name="generalDeepLinkDefaultScreen">Manipulador de Links Padrão</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Escolha a tela a ser carregada automaticamente caso o aplicativo não possa abrir links externos.</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Cor do Realce de Sintaxe</string>
+    <string name="ceIndentation">Indentação</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">Fonte Padrão</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">Não há mais dados disponíveis</string>
     <string name="createLabel">Novo marcador</string>
@@ -196,22 +210,22 @@
     <string name="labelColor">Cor do marcador</string>
     <string name="labelEmptyError">Nome do marcador está vazio</string>
     <string name="labelNameError">Nome do marcador é inválido</string>
-    <string name="labelCreated">Label created</string>
-    <string name="labelUpdated">Label updated</string>
+    <string name="labelCreated">Rótulo criado</string>
+    <string name="labelUpdated">Rótulo atualizado</string>
     <string name="labelMenuContentDesc">Descrição</string>
     <string name="labelDeleteText">Marcador excluído</string>
     <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Erro de autorização</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">Parece que o Token de Acesso foi revogado OU você não está autorizado a ver esses conteúdos.\n\nNo caso de Token revogado, faça o logout e login de novo</string>
     <string name="labelDeleteMessage">Você realmente deseja excluir este marcador?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Equipes</string>
     <string name="orgTabMembers">Membros</string>
     <string name="teamTitle">Nome da equipe</string>
     <string name="teamDescription">Descrição da equipe</string>
-    <string name="teamPermissions">Permissions</string>
+    <string name="teamPermissions">Permissões</string>
     <string name="teamPermissionNone">• Members of this team do not have any permissions.</string>
-    <string name="teamPermissionRead">• Members of this team can view team repositories.</string>
+    <string name="teamPermissionRead">Membros podem ver os repositórios da equipe.</string>
     <string name="teamPermissionWrite">• Members of this team can view and push to team repositories.</string>
     <string name="teamPermissionAdmin">• Members of this team can push to and from team repositories and add collaborators.</string>
     <string name="teamPermissionOwner">• Members of this team have owner permissions.</string>
@@ -228,6 +242,7 @@
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Nome da equipe</string>
@@ -262,15 +277,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Seguidores</string>
     <string name="profileTabFollowing">Seguindo</string>
-    <string name="profileCreateNewEmailAddress">Adicionar endereço de e-mail</string>
-    <string name="profileEmailTitle">Endereço de e-mail</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">Novo e-mail adicionado com êxito</string>
     <string name="emailErrorEmpty">O endereço de e-mail está vazio</string>
     <string name="emailErrorInvalid">Endereço de e-mail inválido</string>
     <string name="emailErrorInUse">O endereço de e-mail já está em uso</string>
     <string name="emailTypeText">Principal</string>
-    <string name="profileTabEmails">E-mails</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Adicionar/Remover marcadores</string>
     <string name="labelsUpdated">Marcadores atualizados</string>
@@ -327,7 +344,7 @@
     <!-- release -->
     <string name="loginOTPTypeError">O código OTP deve ter apenas números</string>
     <string name="loginOTP">Código OTP (Opcional)</string>
-    <string name="otpMessage">Insira o código de otp se a 2FA estiver ativada</string>
+    <string name="otpMessage">Insira o código OTP se a 2FA estiver ativada</string>
     <string name="openWebRepo">Abrir no Navegador</string>
     <string name="repoStargazersInMenu">Usuários que favoritaram</string>
     <string name="repoWatchersInMenu">Observadores</string>
@@ -412,6 +429,10 @@
     <string name="openInBrowser">Abrir no Navegador</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +446,7 @@
     <string name="versionUnsupportedNew">Nova versão do Gitea detectada! Por favor, ATUALIZE o GitNex!</string>
     <string name="versionUnknown">Gitea não detectado!</string>
     <string name="versionAlertDialogHeader">Versão do Gitea não suportada</string>
-    <string name="loginViaPassword">Usuário e senha</string>
-    <string name="loginMethodText">Escolha seu método de login preferido para acessar sua conta. O token é mais seguro!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">A instância retornou um erro - Não autorizado. Verifique suas credenciais e tente novamente</string>
     <string name="loginTokenError">Token é obrigatório</string>
     <string name="prDeletedFork">Fork excluído</string>
@@ -508,19 +528,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Idiomas</string>
     <string name="reportsHintText">Relatórios de erros</string>
     <string name="rateAppHintText">Se você gosta do GitNex você pode dar um joinha</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Arquivado</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Conta excluída com êxito</string>
     <string name="removeAccountPopupTitle">Excluir Conta</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">Nova Conta</string>
-    <string name="addNewAccountText">Adicionar Nova Conta</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Esta conta já existe no app</string>
     <string name="accountAddedMessage">Conta adicionada com êxito</string>
     <string name="switchAccountSuccess">Alterado para a conta : %1$s@%2$s</string>
@@ -528,14 +549,17 @@
     <string name="pageTitleNotifications">Notificações</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Atraso da Enquete das Notificações</string>
-    <string name="pollingDelaySelectedText">%d Minutos</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Selecionar atraso da votação</string>
     <string name="pollingDelayDialogDescriptionText">Escolha um atraso no qual o GitNex tenta fazer pesquisa de novas notificações</string>
     <string name="markAsRead">Marcar como lido</string>
     <string name="markAsUnread">Marcar como não lido</string>
     <string name="pinNotification">Fixar</string>
     <string name="markedNotificationsAsRead">Todas as notificações marcadas como lidas</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Enable Notifications</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Enable Vibration</string>
@@ -548,6 +572,7 @@
         <item quantity="one">You have %s new notification</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Lida</string>
     <string name="isUnread">Não Lida</string>
     <string name="repoSettingsTitle">Configurações do repositório</string>
@@ -594,9 +619,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Ir para o Aplicativo</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -640,6 +665,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -663,13 +690,14 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="other">Notes deleted successfully</item>
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -682,6 +710,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -710,7 +739,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-ru-rRU/strings.xml

@@ -10,10 +10,12 @@
     <string name="navAbout">О программе</string>
     <string name="navRate">Оценить GitNex</string>
     <string name="navLogout">Выход</string>
-    <string name="navAdministration">Instance Administration</string>
+    <string name="navAdministration">Администрирование экземпляра</string>
     <string name="navMyIssues">Мои вопросы</string>
-    <string name="navMostVisited">Most Visited Repos</string>
-    <string name="navNotes">Notes</string>
+    <string name="navMostVisited">Самые посещаемые репозитории</string>
+    <string name="navNotes">Примечания</string>
+    <string name="navAccount">Настройки учетной записи</string>
+    <string name="navWatchedRepositories">Просматриваемые репозитории</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Создать репозиторий</string>
@@ -30,9 +32,10 @@
     <string name="pageTitleAddEmail">Добавить адрес эл. почты</string>
     <string name="pageTitleNewFile">Новый файл</string>
     <string name="pageTitleExplore">Обзор</string>
-    <string name="pageTitleAdministration">Administration</string>
+    <string name="pageTitleAdministration">Администрация</string>
     <string name="pageTitleNewPullRequest">Новый запрос на слияние</string>
     <string name="pageTitleUsers">Пользователи</string>
+    <string name="pageTitleAddRepository">Добавить репозиторий</string>
     <!-- page titles -->
     <string name="repoName">Демо репозиторий</string>
     <string name="repoDescription">Демо описание</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Описание репозитория</string>
     <string name="newRepoPrivateCopy">Приватный</string>
     <string name="newRepoOwner">Владелец</string>
+    <string name="newRepoIssueLabels">Тикеты</string>
+    <string name="setAsTemplate">Сделать репозиторий шаблоном</string>
     <string name="newOrgTintCopy">Имя организации</string>
     <string name="newOrgDescTintCopy">Описание организации</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Имя пользователя</string>
     <string name="passWord">Пароль</string>
     <string name="btnLogin">Войти</string>
@@ -52,7 +58,7 @@
     <string name="navigationDrawerOpen">Открыть навигацию</string>
     <string name="navigationDrawerClose">Закрыть навигацию</string>
     <string name="protocol">Протокол</string>
-    <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter instance url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
+    <string name="urlInfoTooltip">1. Выберите протокол (https или http) \n2. Укажите URL Gitea, например: try.gitea.io \n3. Если для учетной записи включена 2FA, введите код OTP в соответствующее поле. \n4. Для базовой аутентификации HTTP укажите USERNAME@DOMAIN.COM в поле URL.</string>
     <string name="malformedUrl">Не удалось подключиться к хосту. Пожалуйста, проверьте URL-адрес или порт на наличие ошибок</string>
     <string name="protocolError">Не рекомендуется использовать протокол HTTP, если вы не тестируете в локальной сети</string>
     <string name="malformedJson">Получен искаженный JSON. Ответ сервера не был успешным</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Требуется имя пользователя</string>
     <string name="emptyFieldPassword">Требуется пароль</string>
     <string name="protocolEmptyError">Требуется протокол</string>
+    <string name="instanceHelperText">Введите URL без http или https. Пример: codeberg.org</string>
     <string name="checkNetConnection">Нет подключения к интернету, проверьте наличие связи.</string>
     <string name="repoNameErrorEmpty">Название репозитория пустое.</string>
     <string name="repoNameErrorInvalid">Недоступное название репозитория. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,12 +76,13 @@
     <string name="repoCreated">Репозиторий успешно создан!</string>
     <string name="repoExistsError">Репозиторий с таким именему уже существует у выбранного владельца</string>
     <string name="repoOwnerError">Выбрать владельца репозитория</string>
+    <string name="repoDefaultBranchError">Ветка по умолчанию не должна быть пустой</string>
     <string name="orgNameErrorEmpty">Название организации пустое.</string>
     <string name="orgNameErrorInvalid">Недоступное название организации. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Описание организации превышает 255 символов.</string>
     <string name="orgCreated">Организация успешно создана!</string>
     <string name="orgExistsError">Организация уже существует</string>
-    <string name="diffStatistics">%1$s addition(s) and %2$s deletion(s)</string>
+    <string name="diffStatistics">%1$s добавлен(о) и %2$s удален(о)</string>
     <string name="processingText">Обработка</string>
     <string name="search">Поиск</string>
     <string name="close">Закрыть</string>
@@ -83,7 +91,7 @@
     <string name="repoContentAvatar">Реп.</string>
     <string name="privateAvatar">Лич.</string>
     <string name="removeContent">Удалить</string>
-    <string name="genericApiError">Instance has returned an error. Code %d</string>
+    <string name="genericApiError">Экземпляр вернул ошибку. Код %d</string>
     <string name="tabTextInfo">Информация</string>
     <string name="tabTextFiles">Файлы</string>
     <string name="tabTextMl">Этапы</string>
@@ -91,7 +99,7 @@
     <string name="tabTextBranches">Ветки</string>
     <string name="tabTextCollaborators">Соавторы</string>
     <string name="tabPullRequests">Запросы на слияние</string>
-    <string name="pullRequest">Pull Request</string>
+    <string name="pullRequest">Запрос на извлечение</string>
     <string name="infoTabRepoSize">Размер</string>
     <string name="infoTabRepoDefaultBranch">Ветка по умолчанию</string>
     <string name="infoTabRepoSshUrl">SSH/URL</string>
@@ -100,13 +108,12 @@
     <string name="infoTabRepoForksCount">Кол-во форков</string>
     <string name="infoTabRepoCreatedAt">Создан</string>
     <string name="infoTabRepoUpdatedAt">Последнее обновление</string>
-    <string name="infoShowMoreInformation">Показать больше информации</string>
     <string name="infoMoreInformation">Больше информации</string>
     <string name="timeAtText">в</string>
     <string name="issueMilestone">Вехи %1$s</string>
     <string name="dueDate">Срок до %1$s</string>
     <string name="assignedTo">Назначено: %1$s</string>
-    <string name="assignedToMe">Assigned to Me</string>
+    <string name="assignedToMe">Назначено мне</string>
     <string name="commentButtonText">Комментарий</string>
     <string name="commentEmptyError">Введите свой комментарий.</string>
     <string name="commentSuccess">Комментарий отправлен!</string>
@@ -147,7 +154,7 @@
     <string name="settingsSecurityHeader">Безопасность</string>
     <string name="settingsCertsSelectorHeader">Удалить доверенные сертификаты</string>
     <string name="settingsCertsPopupTitle">Удалить доверенные сертификаты?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
+    <string name="settingsCertsPopupMessage">Вы уверены, что хотите удалить любой вручную доверенный сертификат или имя хоста? \n\nВы также выйдите из системы.</string>
     <string name="settingsSave">Сохранено</string>
     <string name="settingsLanguageSelectorHeader">Язык</string>
     <string name="settingsLanguageSelectedHeaderDefault">Английский</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Включить удаление черновиков</string>
     <string name="settingsEnableCommentsDeletionHintText">Удалить черновик комментария при публикации комментария</string>
     <string name="settingsGeneralHeader">Общее</string>
-    <string name="generalHintText">Домашний экран, обработчик ссылок по умолчанию</string>
+    <string name="generalHintText">Главный экран, черновики, отчеты о сбоях</string>
     <string name="generalDeepLinkDefaultScreen">Обработчик ссылок по умолчанию</string>
-    <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">Н/Д</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Выберите, какой экран следует загрузить, если приложение не может обрабатывать внешние ссылки. Он автоматически перенаправит вас.</string>
     <string name="linkSelectorDialogTitle">Выбрать экран обработчика ссылок по умолчанию</string>
     <string name="settingsBiometricHeader">Поддержка биометрии</string>
-    <string name="settingsLabelsInListHeader">Labels With Text Support</string>
-    <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="settingsLabelsInListHeader">Ярлыки с поддержкой текста</string>
+    <string name="settingsLabelsInListHint">Включение этого параметра будет показывать метки с текстом в списках задач и списках запросов на слияние, по умолчанию — это цветовые точки</string>
+    <string name="ceSyntaxHighlightColor">Цвет выделения синтаксиса</string>
+    <string name="ceIndentation">Отступы</string>
+    <string name="ceIndentationTabsWidth">Ширина вкладок</string>
+    <string name="system_font">Системный шрифт по умолчанию</string>
+    <string name="fragmentTabsAnimationHeader">Анимация вкладок</string>
+    <string name="fadeOut">Затухание</string>
+    <string name="zoomOut">Отдалить</string>
     <!-- settings -->
     <string name="noMoreData">Больше даных нет</string>
     <string name="createLabel">Создание метки</string>
@@ -196,38 +209,39 @@
     <string name="labelColor">Цвет метки</string>
     <string name="labelEmptyError">Имя метки не указано</string>
     <string name="labelNameError">Недопустимое имя метки</string>
-    <string name="labelCreated">Label created</string>
-    <string name="labelUpdated">Label updated</string>
+    <string name="labelCreated">Метка создана</string>
+    <string name="labelUpdated">Метка обновлена</string>
     <string name="labelMenuContentDesc">Описание</string>
     <string name="labelDeleteText">Метка удалена!</string>
     <string name="selectBranchError">Выберите ветку для релиза</string>
     <string name="alertDialogTokenRevokedTitle">Ошибка авторизации</string>
-    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
+    <string name="alertDialogTokenRevokedMessage">Похоже, токен доступа отозван, либо вам не разрешено просматривать это содержимое.\n\nВ случае отзыва токена, пожалуйста, выйдите из системы и войдите снова</string>
     <string name="labelDeleteMessage">Вы действительно хотите удалить эту метку?</string>
     <!-- org tabbed layout str -->
     <string name="orgTabTeams">Команды</string>
     <string name="orgTabMembers">Участники</string>
     <string name="teamTitle">Имя команды</string>
     <string name="teamDescription">Описание команды</string>
-    <string name="teamPermissions">Permissions</string>
-    <string name="teamPermissionNone">• Members of this team do not have any permissions.</string>
-    <string name="teamPermissionRead">• Members of this team can view team repositories.</string>
-    <string name="teamPermissionWrite">• Members of this team can view and push to team repositories.</string>
-    <string name="teamPermissionAdmin">• Members of this team can push to and from team repositories and add collaborators.</string>
-    <string name="teamPermissionOwner">• Members of this team have owner permissions.</string>
-    <string name="teamShowAll">show all</string>
+    <string name="teamPermissions">Разрешения</string>
+    <string name="teamPermissionNone">• Члены этой команды не имеют никаких разрешений.</string>
+    <string name="teamPermissionRead">• Члены этой команды могут просматривать репозитории команды.</string>
+    <string name="teamPermissionWrite">• Участники могут читать и изменять репозитории команды.</string>
+    <string name="teamPermissionAdmin">• Члены этой команды могут заливать свои коммиты в и из командного репозитория и добавлять соавторов.</string>
+    <string name="teamPermissionOwner">• Члены этой команды имеют права владельца.</string>
+    <string name="teamShowAll">показать все</string>
     <string name="orgMember">Участники организации</string>
     <string name="orgTeamMembers">Участники команд организации</string>
-    <string name="removeTeamMember">Remove %s</string>
-    <string name="addTeamMember">Add %s</string>
+    <string name="removeTeamMember">Удалить %s</string>
+    <string name="addTeamMember">Добавить %s</string>
     <string name="addTeamMemberMessage">Вы хотите добавить этого пользователя в команду?</string>
     <string name="removeTeamMemberMessage">Вы хотите удалить этого пользователя из команды?</string>
     <string name="memberAddedMessage">Участник успешно добавлен в команду</string>
     <string name="memberRemovedMessage">Участник успешно удалён из команды</string>
-    <string name="repoAddedMessage">Repository added to the team successfully</string>
-    <string name="repoRemovedMessage">Repository removed from the team successfully</string>
-    <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
-    <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="repoAddedMessage">Репозиторий успешно добавлен в команду</string>
+    <string name="repoRemovedMessage">Репозиторий успешно удален из команды</string>
+    <string name="repoAddToTeamMessage">Добавить репозиторий %1$s в организацию %2$s команды %3$s</string>
+    <string name="repoRemoveTeamMessage">Удалить репозиторий %1$s из команды %2$s</string>
+    <string name="addRemoveMember">Добавить / Удалить участника</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Имя команды</string>
@@ -254,7 +268,7 @@
     <!-- add collaborator -->
     <string name="addCollaboratorSearchHint">Поиск</string>
     <string name="addCollaboratorViewUserDesc">Имя пользователя</string>
-    <string name="removeCollaboratorDialogTitle">Remove %s?</string>
+    <string name="removeCollaboratorDialogTitle">Удалить %s?</string>
     <string name="removeCollaboratorMessage">Вы точно хотите снять права сотрудника с этого пользователя?</string>
     <string name="removeCollaboratorToastText">С пользователя были сняты права сотрудника.</string>
     <string name="addCollaboratorToastText">Пользователь получает права сотрудника!</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Подписчики</string>
     <string name="profileTabFollowing">Подписки</string>
-    <string name="profileCreateNewEmailAddress">Добавить адрес эл. почты</string>
-    <string name="profileEmailTitle">Адрес эл. почты</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Электронная почта</string>
+    <string name="accountEmailTitle">Адрес электронной почты</string>
     <string name="emailAddedText">Новая электронная почта успешно добавлена</string>
     <string name="emailErrorEmpty">Адрес электронной почты пустой</string>
     <string name="emailErrorInvalid">Некорректный адрес электронной почты</string>
     <string name="emailErrorInUse">Адрес электронной почты уже используется</string>
     <string name="emailTypeText">Основной</string>
-    <string name="profileTabEmails">Адреса эл. почты</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH ключи</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Добавить/удалить метку</string>
     <string name="labelsUpdated">Метки обновлены</string>
@@ -286,7 +302,7 @@
     <!-- single issue section -->
     <string name="repoMetaData">Метаинформация репозитория</string>
     <!-- admin -->
-    <string name="adminCreateNewUser">New User</string>
+    <string name="adminCreateNewUser">Новый пользователь</string>
     <string name="adminUsers">Пользователи системы</string>
     <string name="userRoleAdmin">Админ</string>
     <string name="adminCron">Задачи cron</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Обзор пользователей</string>
     <string name="exploreIssues">Обзор задач</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">Обнаружена новая версия Gitea! Пожалуйста, ОБНОВИТЕ GitNex!</string>
     <string name="versionUnknown">Gitea не обнаружен!</string>
     <string name="versionAlertDialogHeader">Неподдерживаемая версия Gitea</string>
-    <string name="loginViaPassword">Имя пользователя / Пароль</string>
-    <string name="loginMethodText">Выберите предпочтительный метод входа для доступа к вашей учетной записи. Токен более безопасный!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Экземпляр вернул ошибку - не авторизовано. Проверьте ваши учетные данные и повторите попытку</string>
     <string name="loginTokenError">Требуется токен</string>
     <string name="prDeletedFork">Удалённый Форк</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Темы, шрифты, значки</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Биометрическая аутентификация, SSL-сертификаты, кеш</string>
     <string name="languagesHintText">Языки</string>
     <string name="reportsHintText">Отчёты об ошибках</string>
     <string name="rateAppHintText">Если вам нравится GitNex, вы можете поставить ему палец вверх</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Архивировано</string>
     <string name="archivedRepositoryMessage">Этот репозиторий находится в архиве. Вы можете просматривать файлы, но не можете отправлять или открывать проблемы/запросы на слияние.</string>
     <string name="accountDeletedMessage">Учётная запись успешно удалена</string>
     <string name="removeAccountPopupTitle">Удалить учётную запись</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">Новая учётная запись</string>
-    <string name="addNewAccountText">Добавить новую учётную запись</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Учётная запись уже существует в приложении</string>
     <string name="accountAddedMessage">Учётная запись успешно добавлена</string>
     <string name="switchAccountSuccess">Переключено на аккаунт: %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Уведомления</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Задержка опроса уведомлений</string>
-    <string name="pollingDelaySelectedText">%d Минут</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 час</string>
     <string name="pollingDelayDialogHeaderText">Выбрать задержку опроса</string>
     <string name="pollingDelayDialogDescriptionText">Выберите минутную задержку, при которой GitNex пытается опрашивать новые уведомления</string>
-    <string name="markAsRead">Mark Read</string>
-    <string name="markAsUnread">Mark Unread</string>
-    <string name="pinNotification">Pin</string>
+    <string name="markAsRead">Пометить прочитанным</string>
+    <string name="markAsUnread">Снять отметку о прочтении</string>
+    <string name="pinNotification">Прикрепить</string>
     <string name="markedNotificationsAsRead">Все уведомления успешно помечены как прочитанные</string>
-    <string name="notificationsHintText">Задержка опроса, световой индикатор, вибрация</string>
+    <string name="notificationsHintText">Задержка опроса</string>
     <string name="enableNotificationsHeaderText">Включить уведомления</string>
     <string name="enableLightsHeaderText">Включите световой индикатор</string>
     <string name="enableVibrationHeaderText">Включить вибрацию</string>
@@ -548,8 +571,9 @@
         <item quantity="one">You have %s new notification</item>
         <item quantity="few">You have %s new notifications</item>
         <item quantity="many">You have %s new notifications</item>
-        <item quantity="other">You have %s new notifications</item>
+        <item quantity="other">У вас %s новые уведомления</item>
     </plurals>
+    <string name="openAppSettings">Чтобы получать уведомления вы должно включить уведомления для GitNex. Нажмите «Открыть» чтобы получить доступ к настройкам телефона, и включить уведомления.</string>
     <string name="isRead">Прочитано</string>
     <string name="isUnread">Непрочитано</string>
     <string name="repoSettingsTitle">Настройки репозитория</string>
@@ -568,12 +592,12 @@
     <string name="repoPropertiesEnableSquash">Включить объединение и слияние</string>
     <string name="repoPropertiesEnableForceMerge">Включить rebase с коммитом слияния (&#8212;&#8212;no-ff)</string>
     <string name="repoPropertiesSaveSuccess">Свойства репозитория успешно обновлены</string>
-    <string name="repoSettingsDeleteDescription">Things to know before deletion:\n\n- This operation CANNOT be undone.\n- This operation will permanently delete the repository including code, issues, comments, wiki data and collaborator settings.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsDeleteDescription">Что нужно знать перед удалением:\n\n- Эту операцию НЕЛЬЗЯ отменить.\n- Эта операция навсегда удалит репозиторий, включая код, задачи, комментарии, данные вики и настройки соавтора.\n\nВведите имя репозитория в качестве подтверждения</string>
     <string name="repoSettingsDeleteError">Имя репозитория не совпадает</string>
     <string name="repoDeletionSuccess">Репозиторий успешно удалён</string>
     <string name="repoSettingsTransferOwnership">Передать права собственности</string>
-    <string name="repoSettingsTransferOwnershipHint">Transfer this repository to a user or to an organization for which you have administrator rights</string>
-    <string name="repoSettingsTransferOwnershipDescription">Things to know before transfer:\n\n- You will lose access to the repository if you transfer it to an individual user.\n- You will keep access to the repository if you transfer it to an organization that you (co-)own.\n\nEnter the repository name as confirmation</string>
+    <string name="repoSettingsTransferOwnershipHint">Передать репозиторий другому пользователю или организации где у вас есть права администратора</string>
+    <string name="repoSettingsTransferOwnershipDescription">Что нужно знать перед передачей:\n\n- Вы потеряете доступ к репозиторию, если передадите его отдельному пользователю.\n- Вы сохраните доступ к репозиторию, если передадите его организации, которой вы (со)владеете.\n\nВведите имя репозитория в качестве подтверждения</string>
     <string name="repoTransferText">Выполнить передачу</string>
     <string name="repoTransferOwnerText">Новый владелец</string>
     <string name="repoTransferSuccess">Репозиторий успешно перенесён</string>
@@ -593,12 +617,12 @@
     <string name="titleError">Требуется заголовок</string>
     <string name="prCreateSuccess">Запрос на слияние успешно создан</string>
     <string name="prAlreadyExists">Запрос на слияние между этими ветками уже существует</string>
-    <string name="prClosed">Pull Request closed</string>
-    <string name="prReopened">Pull Request reopened</string>
-    <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="prClosed">Запрос на слияние закрыт</string>
+    <string name="prReopened">Запрос на слияние переоткрыт</string>
+    <string name="prMergeInfo">Информация о запросе на слияние</string>
+    <string name="accountDoesNotExist">Похоже, что учётная запись для URI %1$s не существует в приложении. Вы можете добавить её, нажав кнопку «Добавить новую учётную запись».</string>
     <string name="launchApp">Перейти к приложению</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex не может обработать запрошенный ресурс. Вы можете открыть задачу в репозитории проекта в качестве улучшения, предоставив подробную информацию о работе. Просто запустите экран по умолчанию, используя кнопки ниже, его можно изменить в настройках.</string>
     <string name="biometricAuthTitle">Биометрическая Aутентификация</string>
     <string name="biometricAuthSubTitle">Разблокируйте с помощью биометрических данных</string>
     <string name="biometricNotSupported">На этом устройстве нет биометрических функций</string>
@@ -627,45 +651,47 @@
     <string name="updateStrategyMerge">Слить</string>
     <string name="updateStrategyRebase">Rebase</string>
     <string name="selectUpdateStrategy">Выберите стратегию обновления</string>
-    <string name="userAvatar">Avatar</string>
-    <string name="tags">Tags</string>
-    <string name="releasesTags">Releases/Tags</string>
-    <string name="create_tag">Create Tag Only</string>
-    <string name="tagCreated">Tag created</string>
-    <string name="asRef">Use as reference</string>
-    <string name="deleteTagConfirmation">Do you really want to delete this tag?</string>
-    <string name="tagDeleted">Tag deleted</string>
-    <string name="tagDeleteError">A tag attached to a release cannot be deleted directly</string>
-    <string name="useCustomTabs">Use Custom Tabs</string>
-    <string name="browserOpenFailed">No application found to open this link. SSH URLs and URLs with another prefix the http:// or https:// are not supported by most browser</string>
-    <string name="logInAgain">Log in again</string>
-    <string name="notLoggedIn">%s \u25CF not logged in</string>
-    <string name="followSystem">Follow system (Light/Dark)</string>
-    <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
-    <string name="repoForkOf">Fork of: %s</string>
-    <string name="adoptRepo">Adopt</string>
-    <string name="repoAdopted">Adopted repository %s</string>
-    <string name="unadoptedRepos">Unadopted Repositories</string>
-    <string name="unadoptedReposMessage">- Adopt will add repository %1$s to organization/user %2$s.\n- Delete will remove it from the system.</string>
-    <string name="commits">Commits</string>
+    <string name="userAvatar">Аватар</string>
+    <string name="tags">Метки</string>
+    <string name="releasesTags">Выпуски/Метки</string>
+    <string name="create_tag">Создать только метку</string>
+    <string name="tagCreated">Метка создана</string>
+    <string name="asRef">Использовать в качестве ссылки</string>
+    <string name="deleteTagConfirmation">Вы действительно хотите удалить эту метку?</string>
+    <string name="tagDeleted">Метка удалена</string>
+    <string name="tagDeleteError">Метка прикрепленная к выпуску не может быть удалена напрямую</string>
+    <string name="useCustomTabs">Использовать пользовательские вкладки</string>
+    <string name="browserOpenFailed">Не найдено приложения для открытия этой ссылки. SSH URL и URL с другим префиксом the http:// или https:// не поддерживаются большинством браузеров</string>
+    <string name="logInAgain">Войти заново</string>
+    <string name="notLoggedIn">%s \u25CF не вошел в систему</string>
+    <string name="followSystem">Как в системе (Светлый/Темный)</string>
+    <string name="followSystemBlack">Как в системе (Светлый/Темный)</string>
+    <string name="dynamicColorsFollowSystem">Динамические цвета ­— Как в системе (Светлый/Темный)</string>
+    <string name="codebergDark">Codeberg (Темный)</string>
+    <string name="repoForkOf">Форк: %s</string>
+    <string name="adoptRepo">Заимствовать</string>
+    <string name="repoAdopted">Заимствованный репозиторий %s</string>
+    <string name="unadoptedRepos">Непринятые репозитории</string>
+    <string name="unadoptedReposMessage">- Заимствование добавит репозиторий %1$s к организации/пользователю %2$s.\n- Удаление удалит его из системы.</string>
+    <string name="commits">Коммиты</string>
     <!-- wiki -->
-    <string name="wiki">Wiki</string>
-    <string name="wikiAuthor"><![CDATA[<b>%1$s</b> updated %2$s]]></string>
-    <string name="deleteWikiPageMessage">Do you really want to delete %s?</string>
-    <string name="wikiPageDeleted">Wiki page deleted successfully</string>
-    <string name="wikiPageNameAndContentError">Page name and page content can\'t be empty</string>
-    <string name="createWikiPage">Create Wiki Page</string>
-    <string name="wikiUpdated">Wiki page updated successfully</string>
-    <string name="wikiCreated">Wiki page created successfully</string>
+    <string name="wiki">Вики</string>
+    <string name="wikiAuthor"><![CDATA[<b>%1$s</b> обновлен %2$s]]></string>
+    <string name="deleteWikiPageMessage">Вы действительно хотите удалить %s?</string>
+    <string name="wikiPageDeleted">Страница вики успешно удалена</string>
+    <string name="wikiPageNameAndContentError">Название и содержание страницы не могут быть пустыми</string>
+    <string name="createWikiPage">Создать страницу вики</string>
+    <string name="wikiUpdated">Страница вики успешно обновлена</string>
+    <string name="wikiCreated">Страница вики успешно создана</string>
     <!-- code editor -->
-    <string name="openInCodeEditor">Open in Code Editor</string>
+    <string name="openInCodeEditor">Открыть в текстовом редакторе</string>
     <!-- notes -->
-    <string name="newNote">New Note</string>
-    <string name="editNote">Edit Note</string>
-    <string name="newNoteContentHint">Start taking your notes here</string>
+    <string name="newNote">Новая заметка</string>
+    <string name="editNote">Редактировать Заметку</string>
+    <string name="newNoteContentHint">Начните делать заметки здесь</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="few">Notes deleted successfully</item>
@@ -674,6 +700,7 @@
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -686,6 +713,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -714,7 +742,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Панель управления</string>
+    <string name="createdRepository">созданный репозиторий</string>
+    <string name="renamedRepository">репозиторий переименован с %1$s на</string>
+    <string name="starredRepository">звезды</string>
+    <string name="transferredRepository">репозиторий перенесен %1$s в</string>
+    <string name="createdBranch">создал ветку %1$s в</string>
+    <string name="pushedTo">толкнул из %1$s на</string>
+    <string name="openedIssue">открытая проблема</string>
+    <string name="commentedOnIssue">прокомментировал проблему</string>
+    <string name="closedIssue">закрытая проблема</string>
+    <string name="reopenedIssue">переоткрытая проблема</string>
+    <string name="createdPR">создал запрос на включение</string>
+    <string name="closedPR">закрыл запрос на включение</string>
+    <string name="reopenedPR">переоткрыл запрос на включение</string>
+    <string name="mergedPR">объеденил запрос на принятие изменений</string>
+    <string name="approved">утвержден</string>
+    <string name="suggestedChanges">предложенные изменения для</string>
+    <string name="commentedOnPR">прокомментировал запрос на включение</string>
+    <string name="autoMergePR">автоматически объедененный запрос на включение</string>
+    <string name="deletedBranch">удалена ветка %1$s в</string>
+    <string name="pushedTag">отправил метку %1$s в</string>
+    <string name="deletedTag">удалил метку %1$s из</string>
+    <string name="releasedBranch">выпущен %1$s в</string>
+    <string name="syncedCommits">синхронизировал коммит с %1$s к</string>
+    <string name="syncedRefs">синхронизированна новая ссылка %1$s с</string>
+    <string name="syncedDeletedRefs">ссылка синхронизирована и удалена %1$s на</string>
+    <string name="attachment">Вложение</string>
+    <string name="attachments">Вложения</string>
+    <string name="attachmentsSaveError">Проблема была создана, но в настоящее время обработка вложений невозможна. Проверьте журналы сервера для более подробной информации.</string>
 </resources>

app/src/main/res/values-si-rLK/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">මගේ ගැටළු</string>
     <string name="navMostVisited">Most Visited Repos</string>
     <string name="navNotes">Notes</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">නව කෝ ඇතිය</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">නව අදින්න ඉල්ලීම</string>
     <string name="pageTitleUsers">පරිශිලකයින්</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Demo repo</string>
     <string name="repoDescription">Demo විස්තරය</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">කෝ සෑහෙනේ සවිස්තරය</string>
     <string name="newRepoPrivateCopy">පුද්ගලික</string>
     <string name="newRepoOwner">හිමිකරු</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">සංවිධානයේ නම</string>
     <string name="newOrgDescTintCopy">සංවිධානයේ සවිස්තරය</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">පරිශීලක නාමය</string>
     <string name="passWord">මුරපදය</string>
     <string name="btnLogin">ඇතුල් වන්න</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">පරිශීලක නාමය අවශ්යයි</string>
     <string name="emptyFieldPassword">මුරපදය අවශ්යයි</string>
     <string name="protocolEmptyError">කෙටුම්පත ඇවැසිය</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">ජාලයට ප්‍රවේශ විය නොහැක, කරුණාකර ඔබගේ අන්තර්ජාල සම්බන්ධතාවය පරීක්ෂා කරන්න</string>
     <string name="repoNameErrorEmpty">කෝ ඇතියේ නම හිස්ය</string>
     <string name="repoNameErrorInvalid">ගබඩා නාමය වලංගු නොවේ. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">ගබඩාව සාර්ථකව සාදන ලදී</string>
     <string name="repoExistsError">තෝරාගත් හිමිකරු යටතේ මෙම නාමයේ ගබඩාව දැනටමත් පවතී</string>
     <string name="repoOwnerError">ගබඩාව සඳහා හිමිකරු තෝරන්න</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">සංවිධානයේ නම හිස් ය</string>
     <string name="orgNameErrorInvalid">සංවිධානයේ නම වලංගු නැත, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">සංවිධානයේ විස්තරය උපරිම අක්ෂර 255 සීමාව ඉක්මවයි</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">ගෑරුප්පු</string>
     <string name="infoTabRepoCreatedAt">ලබාිණි</string>
     <string name="infoTabRepoUpdatedAt">අවසන් වරට යාවත්කාලීන කරන ලදී</string>
-    <string name="infoShowMoreInformation">තවත් තොරතුරු පෙන්වන්න</string>
     <string name="infoMoreInformation">වැඩි විස්තර</string>
     <string name="timeAtText">හිදී</string>
     <string name="issueMilestone">සන්ධිස්ථානය %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">කෙටුම්පත් මකාදැමීම සබල කරන්න</string>
     <string name="settingsEnableCommentsDeletionHintText">අදහස් පළ කළ විට අදහස් කෙටුම්පත මකන්න</string>
     <string name="settingsGeneralHeader">ජනරාල්</string>
-    <string name="generalHintText">මුල් තිරය, පෙරනිමි සබැඳි හසුරුව</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">පෙරනිමි සබැඳි හසුරුවන්නා</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">අ/නොවේ</string>
     <string name="linkSelectorDialogTitle">Default Link Handler Screen තෝරන්න</string>
     <string name="settingsBiometricHeader">ජෛවමිතික සහාය</string>
     <string name="settingsLabelsInListHeader">පෙළ සහය සහිත ලේබල්</string>
     <string name="settingsLabelsInListHint">මෙය සබල කිරීමෙන් ගැටළු සහ pr ලැයිස්තු තුළ පෙළ සහිත ලේබල පෙන්වනු ඇත, පෙරනිමිය වර්ණ තිත් වේ</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">තවත් දත්ත නොමැත</string>
     <string name="createLabel">නව ලේබලය</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">ගබඩාව කණ්ඩායමෙන් සාර්ථකව ඉවත් කරන ලදී</string>
     <string name="repoAddToTeamMessage">සංවිධානය %2$s කණ්ඩායම %3$sවෙත ගබඩාව %1$s එක් කරන්න</string>
     <string name="repoRemoveTeamMessage">%2$sකණ්ඩායමෙන් නිධිය %1$s ඉවත් කරන්න</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">කණ්ඩායමේ නම</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">අනුගාමිකයින්</string>
     <string name="profileTabFollowing">අනුගමනය</string>
-    <string name="profileCreateNewEmailAddress">වි-තැපෑල එකතු කරන්න</string>
-    <string name="profileEmailTitle">වි-තැපැල් ලිපිනය</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">නව විද්‍යුත් තැපෑල සාර්ථකව එක් කරන ලදී</string>
     <string name="emailErrorEmpty">විද්‍යුත් තැපැල් ලිපිනය හිස්ය</string>
     <string name="emailErrorInvalid">ඊමේල් ලිපිනය වලංගු නැත</string>
     <string name="emailErrorInUse">ඊමේල් ලිපිනය දැනටමත් භාවිතයේ ඇත</string>
     <string name="emailTypeText">ප්රාථමික</string>
-    <string name="profileTabEmails">වි-තැපැල්</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">ලේබල් එකතු කරන්න / ඉවත් කරන්න</string>
     <string name="labelsUpdated">ලේබල් යාවත්කාලීන කරන ලදී</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">බ්‍රව්සරයේ විවෘත කරන්න</string>
     <string name="deleteGenericTitle">%sමකන්න</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">පරිශීලකයන් ගවේෂණය කරන්න</string>
     <string name="exploreIssues">ගැටළු ගවේෂණය කරන්න</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">නව Gitea අනුවාදය අනාවරණය විය! කරුණාකර GitNex යාවත්කාලීන කරන්න!</string>
     <string name="versionUnknown">Gitea අනාවරණය කර ගත්තේ නැත!</string>
     <string name="versionAlertDialogHeader">Gitea හි සහාය නොදක්වන අනුවාදය</string>
-    <string name="loginViaPassword">පරිශීලක නාමය / මුරපදය</string>
-    <string name="loginMethodText">ඔබගේ ගිණුමට ප්‍රවේශ වීමට ඔබ කැමති පිවිසුම් ක්‍රමය තෝරන්න. ටෝකනය වඩාත් ආරක්ෂිතයි!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">උදාහරණය දෝෂයක් ලබා දී ඇත - අනවසරයි. ඔබගේ අක්තපත්‍ර පරීක්ෂා කර නැවත උත්සාහ කරන්න</string>
     <string name="loginTokenError">ටෝකනය අවශ්ය වේ</string>
     <string name="prDeletedFork">මකා දැමූ ෆෝක්</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">තේමා, අකුරු, ලාංඡන</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">ජෛවමිතික සත්‍යාපනය, SSL සහතික, හැඹිලිය</string>
     <string name="languagesHintText">භාෂා</string>
     <string name="reportsHintText">බිඳ වැටීම් වාර්තා</string>
     <string name="rateAppHintText">ඔබ GitNex වලට කැමති නම් ඔබට එය thumbs up ලබා දිය හැක</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">සංරක්ෂණය කර ඇත</string>
     <string name="archivedRepositoryMessage">මෙම රෙපෝව සංරක්ෂණය කර ඇත. ඔබට ගොනු බැලිය හැක, නමුත් ගැටළු/අදින්න-ඉල්ලීම් තල්ලු කිරීමට හෝ විවෘත කිරීමට නොහැක.</string>
     <string name="accountDeletedMessage">ගිණුම සාර්ථකව මකා ඇත</string>
     <string name="removeAccountPopupTitle">ගිණුම ඉවත් කරන්න</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">නව ගිණුම</string>
-    <string name="addNewAccountText">නව ගිණුමක් එක් කරන්න</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">ගිණුම දැනටමත් යෙදුම තුළ පවතී</string>
     <string name="accountAddedMessage">ගිණුම සාර්ථකව එකතු කරන ලදී</string>
     <string name="switchAccountSuccess">ගිණුමට මාරු විය: %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">දැනුම්දීම්</string>
     <string name="noDataNotifications">ඔක්කොම අල්ලලා 🚀</string>
     <string name="notificationsPollingHeaderText">දැනුම්දීම් ඡන්ද ප්‍රමාදය</string>
-    <string name="pollingDelaySelectedText">මිනිත්තු %d</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">ඡන්ද ප්‍රමාදය තෝරන්න</string>
     <string name="pollingDelayDialogDescriptionText">GitNex නව දැනුම්දීම් ඡන්ද විමසීමට උත්සාහ කරන සුළු ප්‍රමාදයක් තෝරන්න</string>
     <string name="markAsRead">මාර්ක් කියවන්න</string>
     <string name="markAsUnread">නොකියවූ ලකුණු කරන්න</string>
     <string name="pinNotification">පින් කරන්න</string>
     <string name="markedNotificationsAsRead">සියලුම දැනුම්දීම් කියවූ ලෙස සාර්ථකව ලකුණු කරන ලදී</string>
-    <string name="notificationsHintText">ඡන්ද ප්‍රමාදය, ආලෝකය, කම්පනය</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">දැනුම්දීම් සබල කරන්න</string>
     <string name="enableLightsHeaderText">ආලෝකය සක්රිය කරන්න</string>
     <string name="enableVibrationHeaderText">කම්පනය සක්රිය කරන්න</string>
@@ -548,6 +571,7 @@
         <item quantity="one">ඔබට නව දැනුම්දීම් %s ක් ඇත</item>
         <item quantity="other">ඔබට නව දැනුම්දීම් %s ක් ඇත</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">කියවන්න</string>
     <string name="isUnread">නොකියවූ</string>
     <string name="repoSettingsTitle">ගබඩා සැකසුම්</string>
@@ -594,9 +618,9 @@
     <string name="prClosed">ඇදීමේ ඉල්ලීම වසා ඇත</string>
     <string name="prReopened">ඇදීමේ ඉල්ලීම නැවත විවෘත කරන ලදී</string>
     <string name="prMergeInfo">ඉල්ලීම් තොරතුරු අදින්න</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">යෙදුම වෙත යන්න</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">ජෛවමිතික සත්‍යාපනය</string>
     <string name="biometricAuthSubTitle">ඔබගේ ජෛවමිතික අක්තපත්‍ර භාවිතයෙන් අගුලු හරින්න</string>
     <string name="biometricNotSupported">මෙම උපාංගයේ ජෛවමිතික විශේෂාංග නොමැත</string>
@@ -640,6 +664,8 @@
     <string name="notLoggedIn">\u25CF %s වී නැත</string>
     <string name="followSystem">පද්ධතිය අනුගමනය කරන්න (ආලෝකය/අඳුරු)</string>
     <string name="followSystemBlack">පද්ධතිය අනුගමනය කරන්න (ආලෝකය/තාර කළු)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">දෙබලක: %s</string>
     <string name="adoptRepo">හදාගන්න</string>
     <string name="repoAdopted">සම්මත කරන ලද නිධිය %s</string>
@@ -663,13 +689,14 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="other">Notes deleted successfully</item>
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -682,6 +709,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -710,7 +738,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-sk-rSK/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">My Issues</string>
     <string name="navMostVisited">Najnavštevovanejšie stránky</string>
     <string name="navNotes">Notes</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Nový repozitár</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">New Pull Request</string>
     <string name="pageTitleUsers">Užívatelia</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Demo repozitár</string>
     <string name="repoDescription">Demo popis</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Popis repozitára</string>
     <string name="newRepoPrivateCopy">Súkromné</string>
     <string name="newRepoOwner">Vlastník</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Názov organizácie</string>
     <string name="newOrgDescTintCopy">Popis organizácie</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Používateľské meno</string>
     <string name="passWord">Heslo</string>
     <string name="btnLogin">Prihlásiť sa</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Prihlasovacie meno je povinné</string>
     <string name="emptyFieldPassword">Heslo je povinné</string>
     <string name="protocolEmptyError">Protokol je povinný</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Cannot access network, please check your Internet connection</string>
     <string name="repoNameErrorEmpty">Repository name is empty</string>
     <string name="repoNameErrorInvalid">Repository name is not valid. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Repository created successfully</string>
     <string name="repoExistsError">Repository of this name already exists under selected Owner</string>
     <string name="repoOwnerError">Select owner for the repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Organization name is empty</string>
     <string name="orgNameErrorInvalid">Organization name is not valid, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Organization description exceeds the max 255 characters limit</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">Forky</string>
     <string name="infoTabRepoCreatedAt">Vytvorené</string>
     <string name="infoTabRepoUpdatedAt">Posledná aktualizácia</string>
-    <string name="infoShowMoreInformation">Zobraziť ďalšie informácie</string>
     <string name="infoMoreInformation">Viac informácií</string>
     <string name="timeAtText">o</string>
     <string name="issueMilestone">Milestone %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Enable Drafts Deletion</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">General</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometrické odomykanie</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">New Label</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Repozitár úspešne odstránené z tímu</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Názov tímu</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Followers</string>
     <string name="profileTabFollowing">Following</string>
-    <string name="profileCreateNewEmailAddress">Add Email Address</string>
-    <string name="profileEmailTitle">Email Address</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">New email added successfully</string>
     <string name="emailErrorEmpty">Email address is empty</string>
     <string name="emailErrorInvalid">Email address is not valid</string>
     <string name="emailErrorInUse">Email address is already in use</string>
     <string name="emailTypeText">Primary</string>
-    <string name="profileTabEmails">Emails</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Add / Remove Labels</string>
     <string name="labelsUpdated">Labels updated</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">New Gitea version detected! Please UPDATE GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Unsupported Version of Gitea</string>
-    <string name="loginViaPassword">Username / Password</string>
-    <string name="loginMethodText">Choose your preferred login method to access your account. Token is more secure!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Instance has returned an error - Unauthorized. Check your credentials and try again</string>
     <string name="loginTokenError">Token is required</string>
     <string name="prDeletedFork">Deleted Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">New Account</string>
-    <string name="addNewAccountText">Add New Account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Account added successfully</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minutes</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Enable Notifications</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Enable Vibration</string>
@@ -550,6 +573,7 @@
         <item quantity="many">You have %s new notifications</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -596,9 +620,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -642,6 +666,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -665,7 +691,7 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="few">Notes deleted successfully</item>
@@ -674,6 +700,7 @@
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -686,6 +713,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -714,7 +742,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-sr-rRS/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">My Issues</string>
     <string name="navMostVisited">Most Visited Repos</string>
     <string name="navNotes">Notes</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Нови репозиторијум</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">New Pull Request</string>
     <string name="pageTitleUsers">Users</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Демо репозиторијум</string>
     <string name="repoDescription">Демо опис</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Опис</string>
     <string name="newRepoPrivateCopy">Приватни</string>
     <string name="newRepoOwner">Власник</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Назив</string>
     <string name="newOrgDescTintCopy">Опис</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Корисничко име</string>
     <string name="passWord">Лозинка</string>
     <string name="btnLogin">Пријави ме</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Корисничко име је обавезно</string>
     <string name="emptyFieldPassword">Лозинка је обавезна</string>
     <string name="protocolEmptyError">Protocol is required</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Не могу да приступим мрежи, провери интернет конекцију</string>
     <string name="repoNameErrorEmpty">Назив репозиторијума је обавезан</string>
     <string name="repoNameErrorInvalid">Назив репозиторијума није валидан [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Репозиторијум је успешно креиран</string>
     <string name="repoExistsError">Репозиторијум већ постоји</string>
     <string name="repoOwnerError">Select owner for the repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Назив организације је обавезан</string>
     <string name="orgNameErrorInvalid">Назив организације није валидан [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Опис је дужи од максималних 255 карактера</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">Број форкова</string>
     <string name="infoTabRepoCreatedAt">Креиран</string>
     <string name="infoTabRepoUpdatedAt">Ажуриран</string>
-    <string name="infoShowMoreInformation">Прикажи више информација</string>
     <string name="infoMoreInformation">Више информација</string>
     <string name="timeAtText">у</string>
     <string name="issueMilestone">Фаза %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Enable Drafts Deletion</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">General</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">Нема више података</string>
     <string name="createLabel">Нова ознака</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Назив тима</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Прате ме</string>
     <string name="profileTabFollowing">Пратим</string>
-    <string name="profileCreateNewEmailAddress">Додај имејл-адресу</string>
-    <string name="profileEmailTitle">Имејл-адреса</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">New email added successfully</string>
     <string name="emailErrorEmpty">Email address is empty</string>
     <string name="emailErrorInvalid">Имејл-адреса није валидна</string>
     <string name="emailErrorInUse">Неко већ користи ову имејл-адресу</string>
     <string name="emailTypeText">Главна адреса</string>
-    <string name="profileTabEmails">Имејл</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Додај или уклони ознаку</string>
     <string name="labelsUpdated">Ознаке су ажуриране</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">Нова верзија програма Gitea је детектована! Ажурирај GitNex!</string>
     <string name="versionUnknown">No Gitea detected!</string>
     <string name="versionAlertDialogHeader">Верзија програма Gitea коју тренутно користиш није подржана</string>
-    <string name="loginViaPassword">Корисничко име и лозинка</string>
-    <string name="loginMethodText">Одабери начин за пријављивање. Имај у виду да је токен безбеднији него корисничко име и лозинка.</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Грешка. Провери креденцијале и покушај поново.</string>
     <string name="loginTokenError">Token is required</string>
     <string name="prDeletedFork">Deleted Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">New Account</string>
-    <string name="addNewAccountText">Add New Account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Account added successfully</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minutes</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Enable Notifications</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Enable Vibration</string>
@@ -549,6 +572,7 @@
         <item quantity="few">You have %s new notifications</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -595,9 +619,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -641,6 +665,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -664,7 +690,7 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="few">Notes deleted successfully</item>
@@ -672,6 +698,7 @@
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -684,6 +711,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -712,7 +740,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-tr-rTR/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">Konularım</string>
     <string name="navMostVisited">En çok ziyaret edilen depolar</string>
     <string name="navNotes">Notlar</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Yeni Depo</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">Yeni Değişiklik İsteği</string>
     <string name="pageTitleUsers">Kullanıcılar</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Demo deposu</string>
     <string name="repoDescription">Demo açıklaması</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Depo Açıklaması</string>
     <string name="newRepoPrivateCopy">Gizli</string>
     <string name="newRepoOwner">Sahibi</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Organizasyon Adı</string>
     <string name="newOrgDescTintCopy">Organizasyon Açıklaması</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Kullanıcı Adı</string>
     <string name="passWord">Parola</string>
     <string name="btnLogin">OTURUM AÇ</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Kullanıcı adı gerekli</string>
     <string name="emptyFieldPassword">Parola gerekli</string>
     <string name="protocolEmptyError">Protokol gerekli</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Ağa erişilemiyor, lütfen internet bağlantınızı kontrol edin</string>
     <string name="repoNameErrorEmpty">Depo adı boş</string>
     <string name="repoNameErrorInvalid">Depo adı geçerli değil. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Depo başarıyla oluşturuldu</string>
     <string name="repoExistsError">Bu adın deposu, seçilen Sahibi altında zaten var</string>
     <string name="repoOwnerError">Depo için sahip seçin</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Organizasyon adı boş</string>
     <string name="orgNameErrorInvalid">Organizasyon adı geçerli değil, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Organizasyon açıklaması maksimum 255 karakter sınırını aşıyor</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">Forklar</string>
     <string name="infoTabRepoCreatedAt">Oluşturuldu</string>
     <string name="infoTabRepoUpdatedAt">Son Güncellenme</string>
-    <string name="infoShowMoreInformation">Daha fazla bilgi göster</string>
     <string name="infoMoreInformation">Daha fazla bilgi</string>
     <string name="timeAtText">de</string>
     <string name="issueMilestone">Kilometre taşı %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Enable Drafts Deletion</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">General</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">Daha fazla veri yok</string>
     <string name="createLabel">Yeni Etiket</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Takım Adı</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Takipçiler</string>
     <string name="profileTabFollowing">Takip Edilenler</string>
-    <string name="profileCreateNewEmailAddress">E-posta Adresi Ekle</string>
-    <string name="profileEmailTitle">E-posta Adresi</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">New email added successfully</string>
     <string name="emailErrorEmpty">Email address is empty</string>
     <string name="emailErrorInvalid">E-posta adresi geçerli değil</string>
     <string name="emailErrorInUse">E-posta adresi zaten kullanılıyor</string>
     <string name="emailTypeText">Birincil</string>
-    <string name="profileTabEmails">E-postalar</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Etiket Ekle/Kaldır</string>
     <string name="labelsUpdated">Etiketler güncellendi</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Tarayıcıda aç</string>
     <string name="deleteGenericTitle">%s\'i sil</string>
     <string name="reset">Sıfırla</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Kullanıcıları keşfet</string>
     <string name="exploreIssues">Konuları keşfet</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">Yeni Gitea versiyonu tespit edildi! Lütfen GitNex\'i GÜNCELLEYİN!</string>
     <string name="versionUnknown">Gitea bulunamadı!</string>
     <string name="versionAlertDialogHeader">Desteklenmeyen Gitea Versiyonu</string>
-    <string name="loginViaPassword">Kullanıcı Adı / Şifre</string>
-    <string name="loginMethodText">Hesabınıza erişmek için tercih ettiğiniz giriş yöntemini seçin. Jeton daha güvenli!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Örnek bir hata döndürdü - Yetkisiz. Kimlik bilgilerinizi kontrol edin ve tekrar deneyin</string>
     <string name="loginTokenError">Token gerekli</string>
     <string name="prDeletedFork">Silinmiş Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">Bu depo arşivlendi. Dosyaları görüntüleyebilir ama konu/değişiklik isteği açamaz veya paylaşamazsınız.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">New Account</string>
-    <string name="addNewAccountText">Add New Account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Account added successfully</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minutes</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Enable Notifications</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Enable Vibration</string>
@@ -548,6 +571,7 @@
         <item quantity="one">You have %s new notification</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -594,9 +618,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex istenen kaynağı işleyemedi, işin ayrıntılarını sağlayarak iyileştirme olarak proje deposunda bir konu açabilirsiniz. Şimdilik aşağıdaki butonlardan bir varsayılan ekran başlatmanız yeterlidir, ayarlardan değiştirilebilir.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -640,6 +664,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -663,13 +689,14 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="other">Notes deleted successfully</item>
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -682,6 +709,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -710,7 +738,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-uk-rUA/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">My Issues</string>
     <string name="navMostVisited">Most Visited Repos</string>
     <string name="navNotes">Notes</string>
+    <string name="navAccount">Account Settings</string>
+    <string name="navWatchedRepositories">Watched Repositories</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">Новий репозиторій</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">Administration</string>
     <string name="pageTitleNewPullRequest">New Pull Request</string>
     <string name="pageTitleUsers">Users</string>
+    <string name="pageTitleAddRepository">Add Repository</string>
     <!-- page titles -->
     <string name="repoName">Демо-репозиторій</string>
     <string name="repoDescription">Демо опис</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">Опис репозиторія</string>
     <string name="newRepoPrivateCopy">Приватний</string>
     <string name="newRepoOwner">Власник</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">Make repository a template</string>
     <string name="newOrgTintCopy">Назва організації</string>
     <string name="newOrgDescTintCopy">Опис організації</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">Ім\'я користувача</string>
     <string name="passWord">Пароль</string>
     <string name="btnLogin">УВІЙТИ</string>
@@ -60,6 +66,7 @@
     <string name="emptyFieldUsername">Ім\'я користувача є обов\'язковим</string>
     <string name="emptyFieldPassword">Пароль є обов\'язковим</string>
     <string name="protocolEmptyError">Protocol is required</string>
+    <string name="instanceHelperText">Enter URL without http or https. Example: codeberg.org</string>
     <string name="checkNetConnection">Неможливо отримати доступ до мережі, будь ласка, перевірте підключення до Інтернету</string>
     <string name="repoNameErrorEmpty">Назва репозиторія порожня</string>
     <string name="repoNameErrorInvalid">Назва репозиторія некоректна. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -69,6 +76,7 @@
     <string name="repoCreated">Репозиторій створено успішно</string>
     <string name="repoExistsError">Репозиторій із такою назвою вже існує в обраного власника</string>
     <string name="repoOwnerError">Select owner for the repository</string>
+    <string name="repoDefaultBranchError">The default branch must not be empty</string>
     <string name="orgNameErrorEmpty">Назва організації порожня</string>
     <string name="orgNameErrorInvalid">Назва організації некоректна, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Довжина опису організації перевищує 255 символів</string>
@@ -100,7 +108,6 @@
     <string name="infoTabRepoForksCount">Форки</string>
     <string name="infoTabRepoCreatedAt">Створений</string>
     <string name="infoTabRepoUpdatedAt">Остання зміна</string>
-    <string name="infoShowMoreInformation">Докладніше</string>
     <string name="infoMoreInformation">Докладніше</string>
     <string name="timeAtText">о</string>
     <string name="issueMilestone">Етап %1$s</string>
@@ -180,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">Enable Drafts Deletion</string>
     <string name="settingsEnableCommentsDeletionHintText">Delete comment draft when comment is posted</string>
     <string name="settingsGeneralHeader">General</string>
-    <string name="generalHintText">Home screen, default link handler</string>
+    <string name="generalHintText">Home screen, drafts, crash reports</string>
     <string name="generalDeepLinkDefaultScreen">Default Link Handler</string>
     <string name="generalDeepLinkDefaultScreenHintText">Choose what screen should be loaded if the app cannot handle external links. It will redirect you automatically.</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <string name="settingsBiometricHeader">Biometric Support</string>
     <string name="settingsLabelsInListHeader">Labels With Text Support</string>
     <string name="settingsLabelsInListHint">Enabling this will show labels with text in issues and pr lists, default are color dots</string>
+    <string name="ceSyntaxHighlightColor">Syntax Highlighting Color</string>
+    <string name="ceIndentation">Indentation</string>
+    <string name="ceIndentationTabsWidth">Tabs Width</string>
+    <string name="system_font">System Default Font</string>
+    <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
+    <string name="fadeOut">Fade Out</string>
+    <string name="zoomOut">Zoom Out</string>
     <!-- settings -->
     <string name="noMoreData">Даних більше немає</string>
     <string name="createLabel">Створити мітку</string>
@@ -228,6 +241,7 @@
     <string name="repoRemovedMessage">Repository removed from the team successfully</string>
     <string name="repoAddToTeamMessage">Add repository %1$s to organization %2$s team %3$s</string>
     <string name="repoRemoveTeamMessage">Remove repository %1$s from team %2$s</string>
+    <string name="addRemoveMember">Add / Remove Member</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">Назва команди</string>
@@ -262,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">Читачі</string>
     <string name="profileTabFollowing">Читає</string>
-    <string name="profileCreateNewEmailAddress">Додати адресу Email</string>
-    <string name="profileEmailTitle">Адреса Email</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">Emails</string>
+    <string name="accountEmailTitle">Email Address</string>
     <string name="emailAddedText">New email added successfully</string>
     <string name="emailErrorEmpty">Email address is empty</string>
     <string name="emailErrorInvalid">Адреса Email некоректна</string>
     <string name="emailErrorInUse">Адреса Email вже використовується</string>
     <string name="emailTypeText">Основна</string>
-    <string name="profileTabEmails">Адреси Email</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH Keys</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">Додати / Видалити мітки</string>
     <string name="labelsUpdated">Мітки оновлено</string>
@@ -412,6 +428,10 @@
     <string name="openInBrowser">Open in Browser</string>
     <string name="deleteGenericTitle">Delete %s</string>
     <string name="reset">Reset</string>
+    <string name="beta">BETA</string>
+    <string name="none">None</string>
+    <string name="main">main</string>
+    <string name="license">License</string>
     <!-- generic copy -->
     <string name="exploreUsers">Explore users</string>
     <string name="exploreIssues">Explore issues</string>
@@ -425,8 +445,7 @@
     <string name="versionUnsupportedNew">Виявлено нову версію Gitea! Будь ласка, ОНОВІТЬ GitNex!</string>
     <string name="versionUnknown">Gitea не виявлено!</string>
     <string name="versionAlertDialogHeader">Непідтримувана версія Gitea</string>
-    <string name="loginViaPassword">Ім\'я користувача / Пароль</string>
-    <string name="loginMethodText">Оберіть бажаний метод входу для доступу до облікового запису. Токен є більш безпечним!</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">Екземпляр повернув помилку - не авторизовано. Перевірте облікові дані та спробуйте знову</string>
     <string name="loginTokenError">Token is required</string>
     <string name="prDeletedFork">Deleted Fork</string>
@@ -508,19 +527,20 @@
     <string name="resetMostReposCounter">Counter is reset successfully</string>
     <string name="resetCounterDialogMessage">Do you want to reset counter for repository %s?</string>
     <string name="resetCounterAllDialogMessage">This will reset all the counters for this account repositories.</string>
-    <string name="appearanceHintText">Themes, fonts, badges</string>
+    <string name="appearanceHintText">Themes, fonts, badges, translation</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Мови</string>
     <string name="reportsHintText">Звіти про падіння</string>
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
+    <string name="codeEditorHintText">Syntax color, indentation</string>
     <string name="archivedRepository">Архівовано</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>
     <string name="accountDeletedMessage">Account deleted successfully</string>
     <string name="removeAccountPopupTitle">Remove Account</string>
     <string name="removeAccountPopupMessage">Are you sure you want to remove this account from the app?\n\nThis will remove all the data related to this account on the app only.</string>
     <string name="addNewAccount">New Account</string>
-    <string name="addNewAccountText">Add New Account</string>
+    <string name="addNewAccountText">Add Account</string>
     <string name="accountAlreadyExistsError">Account already exists in the app</string>
     <string name="accountAddedMessage">Account added successfully</string>
     <string name="switchAccountSuccess">Switched to account : %1$s@%2$s</string>
@@ -528,14 +548,17 @@
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">All caught up 🚀</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
-    <string name="pollingDelaySelectedText">%d Minutes</string>
+    <string name="pollingDelay15Minutes">15 Minutes</string>
+    <string name="pollingDelay30Minutes">30 Minutes</string>
+    <string name="pollingDelay45Minutes">45 Minutes</string>
+    <string name="pollingDelay1Hour">1 Hour</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
     <string name="pollingDelayDialogDescriptionText">Choose a minutely delay in which GitNex tries to poll new notifications</string>
     <string name="markAsRead">Mark Read</string>
     <string name="markAsUnread">Mark Unread</string>
     <string name="pinNotification">Pin</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
-    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="notificationsHintText">Polling delay</string>
     <string name="enableNotificationsHeaderText">Enable Notifications</string>
     <string name="enableLightsHeaderText">Enable Light</string>
     <string name="enableVibrationHeaderText">Enable Vibration</string>
@@ -550,6 +573,7 @@
         <item quantity="many">You have %s new notifications</item>
         <item quantity="other">You have %s new notifications</item>
     </plurals>
+    <string name="openAppSettings">To receive notifications, you must enable notifications for GitNex. Tap Open to access your phone settings and enable notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -596,9 +620,9 @@
     <string name="prClosed">Pull Request closed</string>
     <string name="prReopened">Pull Request reopened</string>
     <string name="prMergeInfo">Pull Request Info</string>
-    <string name="accountDoesNotExist">It seems that account for URI %1$s does not exists in the app. You can add one by tapping on the Add New Account button.</string>
+    <string name="accountDoesNotExist">It seems that the account for URI %1$s does not exist in the app. You can add one by tapping on the Add New Account button.</string>
     <string name="launchApp">Go to App</string>
-    <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>
@@ -642,6 +666,8 @@
     <string name="notLoggedIn">%s \u25CF not logged in</string>
     <string name="followSystem">Follow system (Light/Dark)</string>
     <string name="followSystemBlack">Follow system (Light/Pitch Black)</string>
+    <string name="dynamicColorsFollowSystem">Dynamic colors - Follow system (Light/Dark)</string>
+    <string name="codebergDark">Codeberg (Dark)</string>
     <string name="repoForkOf">Fork of: %s</string>
     <string name="adoptRepo">Adopt</string>
     <string name="repoAdopted">Adopted repository %s</string>
@@ -665,7 +691,7 @@
     <string name="newNoteContentHint">Start taking your notes here</string>
     <string name="noteDateTime">Created %s</string>
     <string name="noteTimeModified">Updated %s</string>
-    <string name="noteDeleteDialoMessage">Do you really want to delete this note?</string>
+    <string name="noteDeleteDialogMessage">Do you really want to delete this note?</string>
     <plurals name="noteDeleteMessage">
         <item quantity="one">Note deleted successfully</item>
         <item quantity="few">Notes deleted successfully</item>
@@ -674,6 +700,7 @@
     </plurals>
     <string name="notesAllDeletionMessage">This will delete all of your notes. This action cannot be undone.</string>
     <!-- timeline -->
+    <string name="commitsText">commit</string>
     <string name="commitText">commit</string>
     <string name="timelineAddedCommit">%1$s added %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -686,6 +713,7 @@
     <string name="timelineAssigneesAssigned">%1$s was assigned by %2$s %3$s</string>
     <string name="timelineMilestoneAdded">%1$s added this to the %2$s milestone %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s removed this from the %2$s milestone %3$s</string>
+    <string name="timelineMilestoneDeleted">%1$s added this to a deleted milestone %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s closed this issue %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s reopened this issue %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s reopened this pull request %2$s</string>
@@ -714,7 +742,39 @@
     <string name="timelineRefIssue">%1$s referenced this issue in #%2$d %3$s</string>
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
+    <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>
+    <string name="lang_statistics">Language Statistics</string>
+    <string name="dashboard">Dashboard</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">renamed repository from %1$s to</string>
+    <string name="starredRepository">starred</string>
+    <string name="transferredRepository">transferred repository %1$s to</string>
+    <string name="createdBranch">created branch %1$s in</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">reopened issue</string>
+    <string name="createdPR">created pull request</string>
+    <string name="closedPR">closed pull request</string>
+    <string name="reopenedPR">reopened pull request</string>
+    <string name="mergedPR">merged pull request</string>
+    <string name="approved">approved</string>
+    <string name="suggestedChanges">suggested changes for</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">automatically merged pull request</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">pushed tag %1$s to</string>
+    <string name="deletedTag">deleted tag %1$s from</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -14,6 +14,8 @@
     <string name="navMyIssues">我的问题</string>
     <string name="navMostVisited">访问最多的代码库</string>
     <string name="navNotes">备注</string>
+    <string name="navAccount">账户设置</string>
+    <string name="navWatchedRepositories">关注的仓库</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleNewRepo">创建仓库</string>
@@ -33,6 +35,7 @@
     <string name="pageTitleAdministration">管理</string>
     <string name="pageTitleNewPullRequest">新拉取请求</string>
     <string name="pageTitleUsers">用户</string>
+    <string name="pageTitleAddRepository">添加仓库</string>
     <!-- page titles -->
     <string name="repoName">演示仓库</string>
     <string name="repoDescription">演示描述</string>
@@ -43,8 +46,11 @@
     <string name="newRepoDescTintCopy">仓库描述</string>
     <string name="newRepoPrivateCopy">私有</string>
     <string name="newRepoOwner">所有者</string>
+    <string name="newRepoIssueLabels">Issue Labels</string>
+    <string name="setAsTemplate">设置仓库为模板仓库</string>
     <string name="newOrgTintCopy">组织名称</string>
     <string name="newOrgDescTintCopy">组织描述</string>
+    <string name="organizationFullname">%1$s - %2$s</string>
     <string name="userName">用户名</string>
     <string name="passWord">密码</string>
     <string name="btnLogin">登录</string>
@@ -52,8 +58,7 @@
     <string name="navigationDrawerOpen">打开导航栏</string>
     <string name="navigationDrawerClose">关闭导航栏</string>
     <string name="protocol">协议</string>
-    <string name="urlInfoTooltip">1- 选择正确协议(https or http). \n2- 输入实例 url 如: try.gitea.io. \n3- 如果你为账户启用了 2FA
- ，请在 OTP 码字段输入代码。 \n4- 对 HTTP basic auth， 请在 URL 字段中使用 USERNAME@DOMAIN.COM。</string>
+    <string name="urlInfoTooltip">1- 选择正确的协议（https 或 http）。\n2- 输入实例网址，例如：try.gitea.io。\n3- 如果您已为您的账户启用了两步验证（2FA），请在OTP代码字段中输入验证码。\n4- 对于 HTTP basic auth，请在URL字段中使用 USERNAME@DOMAIN.COM。</string>
     <string name="malformedUrl">无法连接到主机。请检查您的 URL 或端口是否有任何错误</string>
     <string name="protocolError">除非您正在本地网络上测试，否则不建议使用 HTTP 协议</string>
     <string name="malformedJson">收到格式错误的 JSON 。服务器响应不成功</string>
@@ -61,6 +66,7 @@
     <string name="emptyFieldUsername">未填写 用户名</string>
     <string name="emptyFieldPassword">未填写 密码</string>
     <string name="protocolEmptyError">协议是必需的</string>
+    <string name="instanceHelperText">输入不含 http 或者 https 的 URL。 例如：codeberg.org</string>
     <string name="checkNetConnection">无法连接，请检查您的网络情况</string>
     <string name="repoNameErrorEmpty">仓库名称为空</string>
     <string name="repoNameErrorInvalid">仓库名称无效。[a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -70,6 +76,7 @@
     <string name="repoCreated">仓库创建成功</string>
     <string name="repoExistsError">当前所有者已拥有同名仓库</string>
     <string name="repoOwnerError">选择仓库所有者</string>
+    <string name="repoDefaultBranchError">默认分支必须是非空的</string>
     <string name="orgNameErrorEmpty">组织名称为空</string>
     <string name="orgNameErrorInvalid">组织名称无效, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">组织描述超过最大255个字符限制</string>
@@ -101,7 +108,6 @@
     <string name="infoTabRepoForksCount">派生仓库</string>
     <string name="infoTabRepoCreatedAt">已创建</string>
     <string name="infoTabRepoUpdatedAt">最后更新</string>
-    <string name="infoShowMoreInformation">显示更多信息</string>
     <string name="infoMoreInformation">更多信息</string>
     <string name="timeAtText">在</string>
     <string name="issueMilestone">里程碑 %1$s</string>
@@ -124,15 +130,15 @@
     <string name="milestoneDescError">里程碑描述超过最大255个字符限制</string>
     <string name="milestoneCreated">里程碑创建成功</string>
     <string name="milestoneDateEmpty">请选择截止日期</string>
-    <string name="milestoneNoDueDate">没有到期日</string>
+    <string name="milestoneNoDueDate">无截止日期</string>
     <string name="milestoneNoDescription">无描述</string>
-    <string name="milestoneIssueStatusOpen">%1$d开启</string>
+    <string name="milestoneIssueStatusOpen">%1$d 开启</string>
     <string name="milestoneIssueStatusClosed">%1$d 已关闭</string>
     <string name="selectMilestone">选择里程碑</string>
     <string name="newIssueSelectAssigneesListTitle">选择受理人</string>
     <string name="newIssueSelectLabelsListTitle">选择标签</string>
     <string name="newIssueTitle">标题</string>
-    <string name="newIssueAssigneesListTitle">受理人</string>
+    <string name="newIssueAssigneesListTitle">指派人</string>
     <string name="newIssueDescriptionTitle">说明</string>
     <string name="newIssueDueDateTitle">到期日</string>
     <string name="newIssueMilestoneTitle">里程碑</string>
@@ -147,7 +153,7 @@
     <string name="settingsLanguageSystem">系统</string>
     <string name="settingsSecurityHeader">安全</string>
     <string name="settingsCertsSelectorHeader">删除信任的证书</string>
-    <string name="settingsCertsPopupTitle">删除信任的证书吗？</string>
+    <string name="settingsCertsPopupTitle">是否删除信任的证书？</string>
     <string name="settingsCertsPopupMessage">您确定要删除任何手动信任的证书或主机名吗？ \n\n您也将被注销。</string>
     <string name="settingsSave">设置已保存</string>
     <string name="settingsLanguageSelectorHeader">语言</string>
@@ -181,14 +187,20 @@
     <string name="settingsEnableCommentsDeletionText">启用草稿删除</string>
     <string name="settingsEnableCommentsDeletionHintText">发表评论时删除评论草稿</string>
     <string name="settingsGeneralHeader">常规​​​​​</string>
-    <string name="generalHintText">主屏幕、默认的链接处理程序</string>
+    <string name="generalHintText">主界面，草稿，崩溃报告</string>
     <string name="generalDeepLinkDefaultScreen">默认链接处理程序</string>
     <string name="generalDeepLinkDefaultScreenHintText">如果应用无法处理外部链接，请选择应加载的屏幕。 它会自动把你重定向。</string>
-    <string name="generalDeepLinkSelectedText">N/A</string>
     <string name="linkSelectorDialogTitle">选择默认链接处理程序屏幕</string>
     <string name="settingsBiometricHeader">生物识别支持</string>
     <string name="settingsLabelsInListHeader">带文本的标签</string>
     <string name="settingsLabelsInListHint">启用此功能将在问题和 pr 列表中显示带有文本的标签，默认是色点</string>
+    <string name="ceSyntaxHighlightColor">语法高亮</string>
+    <string name="ceIndentation">缩进</string>
+    <string name="ceIndentationTabsWidth">制表符宽度</string>
+    <string name="system_font">系统默认字体</string>
+    <string name="fragmentTabsAnimationHeader">标签页动画</string>
+    <string name="fadeOut">淡出</string>
+    <string name="zoomOut">缩小</string>
     <!-- settings -->
     <string name="noMoreData">没有更多可用数据</string>
     <string name="createLabel">创建标签</string>
@@ -229,6 +241,7 @@
     <string name="repoRemovedMessage">成功从团队中移除仓库</string>
     <string name="repoAddToTeamMessage">添加仓库 %1$s 到组织 %2$s 的团队 %3$s</string>
     <string name="repoRemoveTeamMessage">从团队 %2$s 处删除了仓库 %1$s</string>
+    <string name="addRemoveMember">添加/删除成员</string>
     <!-- org tabbed layout str -->
     <!-- create team -->
     <string name="newTeamTitle">团队名称</string>
@@ -263,15 +276,17 @@
     <!-- profile section -->
     <string name="profileTabFollowers">关注者</string>
     <string name="profileTabFollowing">正在关注</string>
-    <string name="profileCreateNewEmailAddress">添加电子邮件地址</string>
-    <string name="profileEmailTitle">電子郵件地址</string>
+    <!-- profile section -->
+    <!-- account settings -->
+    <string name="accountEmails">电子邮件</string>
+    <string name="accountEmailTitle">电子邮件地址</string>
     <string name="emailAddedText">成功添加新电子邮件。</string>
     <string name="emailErrorEmpty">电子邮件地址为空</string>
     <string name="emailErrorInvalid">电子邮件地址无效</string>
     <string name="emailErrorInUse">电子邮件地址已被使用</string>
     <string name="emailTypeText">主要</string>
-    <string name="profileTabEmails">电子邮件</string>
-    <!-- profile section -->
+    <string name="sshKeys">SSH 密钥</string>
+    <!-- account settings -->
     <!-- single issue section -->
     <string name="singleIssueEditLabels">添加/删除标签</string>
     <string name="labelsUpdated">标签已更新</string>
@@ -413,6 +428,10 @@
     <string name="openInBrowser">在浏览器中打开</string>
     <string name="deleteGenericTitle">删除 %s</string>
     <string name="reset">重置</string>
+    <string name="beta">测试</string>
+    <string name="none">无</string>
+    <string name="main">main</string>
+    <string name="license">许可证</string>
     <!-- generic copy -->
     <string name="exploreUsers">探索用户</string>
     <string name="exploreIssues">探索问题</string>
@@ -426,8 +445,7 @@
     <string name="versionUnsupportedNew">检测到新的 Gitea 版本！请更新 GitNex！</string>
     <string name="versionUnknown">未检测到Gitea！</string>
     <string name="versionAlertDialogHeader">不支持的 Gitea 版本</string>
-    <string name="loginViaPassword">用户名 / 密码</string>
-    <string name="loginMethodText">建议您使用更安全的令牌方式进行登录。</string>
+    <string name="loginViaPassword">Basic Auth</string>
     <string name="unauthorizedApiError">令牌可能已失效，请检查后重试</string>
     <string name="loginTokenError">令牌是必需的。</string>
     <string name="prDeletedFork">已删除分叉</string>
@@ -509,19 +527,20 @@
     <string name="resetMostReposCounter">成功重置计数</string>
     <string name="resetCounterDialogMessage">你要重置存储库 %s 的计数吗？</string>
     <string name="resetCounterAllDialogMessage">这会重置此账户存储库的所有计数</string>
-    <string name="appearanceHintText">主题、字体、徽章</string>
+    <string name="appearanceHintText">主题，字体，图标，翻译</string>
     <string name="securityHintText">生物特征认证、SSL证书、缓存</string>
     <string name="languagesHintText">语言</string>
     <string name="reportsHintText">崩溃报告</string>
     <string name="rateAppHintText">如果你喜欢GitNex，你可以给它点赞</string>
     <string name="aboutAppHintText">应用程序版本、构建、用户实例版本</string>
+    <string name="codeEditorHintText">语法高亮，缩进</string>
     <string name="archivedRepository">已存档</string>
     <string name="archivedRepositoryMessage">此代码库已存档。您可以查看文件，但不能推送或打开issues/合并请求。</string>
     <string name="accountDeletedMessage">帐户删除成功</string>
     <string name="removeAccountPopupTitle">删除账户</string>
     <string name="removeAccountPopupMessage">您确定要从应用中删除此帐户吗？\n\n 这将仅移除应用程序上与此账户相关的所有数据。</string>
     <string name="addNewAccount">新帐户</string>
-    <string name="addNewAccountText">添加新账户</string>
+    <string name="addNewAccountText">添加账号</string>
     <string name="accountAlreadyExistsError">帐户已经存在于应用程序中</string>
     <string name="accountAddedMessage">帐户添加成功</string>
     <string name="switchAccountSuccess">已切换到账户： %1$s@%2$s</string>
@@ -529,14 +548,17 @@
     <string name="pageTitleNotifications">通知</string>
     <string name="noDataNotifications">一切就绪 🚀</string>
     <string name="notificationsPollingHeaderText">通知轮询延迟</string>
-    <string name="pollingDelaySelectedText">%d 分钟</string>
+    <string name="pollingDelay15Minutes">15 分钟</string>
+    <string name="pollingDelay30Minutes">30 分钟</string>
+    <string name="pollingDelay45Minutes">45 分钟</string>
+    <string name="pollingDelay1Hour">1 小时</string>
     <string name="pollingDelayDialogHeaderText">选择轮询延迟</string>
     <string name="pollingDelayDialogDescriptionText">以分钟为单位，选择GitNex尝试轮询新通知的延迟。</string>
     <string name="markAsRead">标记为已读</string>
     <string name="markAsUnread">标记为未读</string>
     <string name="pinNotification">固定</string>
     <string name="markedNotificationsAsRead">成功将所有通知标记为已读</string>
-    <string name="notificationsHintText">轮询延迟、light、振动</string>
+    <string name="notificationsHintText">轮询延迟</string>
     <string name="enableNotificationsHeaderText">启用通知</string>
     <string name="enableLightsHeaderText">启用 Light</string>
     <string name="enableVibrationHeaderText">启用振动</string>
@@ -548,6 +570,7 @@
     <plurals name="youHaveNewNotifications">
         <item quantity="other">你有 %s 则新通知。</item>
     </plurals>
+    <string name="openAppSettings">为了接收通知，您需要为 GitNex 启用通知选项。点击访问您手机的设置界面，并且在设置中启用通知权限</string>
     <string name="isRead">已读</string>
     <string name="isUnread">未读</string>
     <string name="repoSettingsTitle">存储库设置</string>
@@ -594,9 +617,9 @@
     <string name="prClosed">拉取请求已关闭</string>
     <string name="prReopened">拉取请求已重新打开</string>
     <string name="prMergeInfo">合并请求信息</string>
-    <string name="accountDoesNotExist">似乎应用程序中并不存在URI%1$s的账户。您可以通过点击“添加新账户”按钮来添加一个。</string>
+    <string name="accountDoesNotExist">似乎应用程序中并不存在 URI %1$s 的账户。您可以通过点击 “添加新账户” 按钮来添加一个。</string>
     <string name="launchApp">前往应用</string>
-    <string name="noActionText">GitNex 无法处理所请求的资源，您可以在项目代码库中发起一个问题，最好提供工作细节。只需从下面的按钮启动一个默认屏幕，您可通过设置更改默认屏。</string>
+    <string name="noActionText">GitNex cannot handle the requested resource. You can open an issue at the project repository as an improvement, providing details of the work. Just launch a default screen for now from the buttons below; it can be changed from settings.</string>
     <string name="biometricAuthTitle">生物特征认证</string>
     <string name="biometricAuthSubTitle">使用你的生物特征凭证解锁</string>
     <string name="biometricNotSupported">此设备无可用的生物特征功能</string>
@@ -640,6 +663,8 @@
     <string name="notLoggedIn">%s \u25CF 未登录</string>
     <string name="followSystem">跟随系统 (浅色 / 深色)</string>
     <string name="followSystemBlack">跟随系统 (浅色/漆黑)</string>
+    <string name="dynamicColorsFollowSystem">动态颜色 - 跟随系统(浅色/神色)</string>
+    <string name="codebergDark">Codeberg (暗色)</string>
     <string name="repoForkOf">此仓库衍生自：%s</string>
     <string name="adoptRepo">采用</string>
     <string name="repoAdopted">已采用仓库 %s</string>
@@ -663,12 +688,13 @@
     <string name="newNoteContentHint">从此处开始记备注</string>
     <string name="noteDateTime">创建于 %s</string>
     <string name="noteTimeModified">更新于 %s</string>
-    <string name="noteDeleteDialoMessage">您真要删除此备注吗？</string>
+    <string name="noteDeleteDialogMessage">您真要删除此备注吗？</string>
     <plurals name="noteDeleteMessage">
         <item quantity="other">已成功删除备注</item>
     </plurals>
     <string name="notesAllDeletionMessage">这会删除您的所有备注。此操作无法撤消。</string>
     <!-- timeline -->
+    <string name="commitsText">提交</string>
     <string name="commitText">提交</string>
     <string name="timelineAddedCommit">%1$s 添加了 %2$s %3$s</string>
     <!-- the | is replaced by the label -->
@@ -681,6 +707,7 @@
     <string name="timelineAssigneesAssigned">%2$s %3$s 给 %1$s 分配了任务</string>
     <string name="timelineMilestoneAdded">%1$s 将此添加至 %2$s 里程碑 %3$s</string>
     <string name="timelineMilestoneRemoved">%1$s 将此从 %2$s 里程碑 %3$s 删除了</string>
+    <string name="timelineMilestoneDeleted">%1$s 将此添加至已删除的里程碑 %2$s</string>
     <string name="timelineStatusClosedIssue">%1$s 关闭了这张工单 %2$s</string>
     <string name="timelineStatusReopenedIssue">%1$s 重新打开了这张工单 %2$s</string>
     <string name="timelineStatusReopenedPr">%1$s 重新打开了此拉取请求 %2$s</string>
@@ -709,7 +736,39 @@
     <string name="timelineRefIssue">%1$s 在 #%2$d %3$s 中提到了这张工单</string>
     <string name="timelineRefPr">%1$s 在 #%2$d %3$s 中提到了这个拉取请求</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s 引用了来自 <font color=\'%2$d\'>%3$s</font> %4$s 的工单]]></string>
+    <string name="timelineReviewLeftComment">%1$s 留下评论：%2$s %3$s</string>
+    <string name="timelinePinned">%1$s 置顶了 %2$s</string>
     <string name="commitStatuses">状态</string>
     <string name="statusNoUrl">此状态没有链接的目标 URL。</string>
     <string name="starredRepos">加星标的仓库</string>
+    <string name="lang_statistics">语言统计</string>
+    <string name="dashboard">仪表盘</string>
+    <string name="createdRepository">created repository</string>
+    <string name="renamedRepository">将仓库名从 %1$s 修改为</string>
+    <string name="starredRepository">已加星标</string>
+    <string name="transferredRepository">转移仓库 %1$s 到</string>
+    <string name="createdBranch">建立分支 %1$s 于</string>
+    <string name="pushedTo">pushed to %1$s at</string>
+    <string name="openedIssue">opened issue</string>
+    <string name="commentedOnIssue">commented on issue</string>
+    <string name="closedIssue">closed issue</string>
+    <string name="reopenedIssue">重新开启的工单</string>
+    <string name="createdPR">已创建的合并请求</string>
+    <string name="closedPR">已关闭的合并请求</string>
+    <string name="reopenedPR">重新开启的合并请求</string>
+    <string name="mergedPR">已合并的合并请求</string>
+    <string name="approved">已通过</string>
+    <string name="suggestedChanges">建议更改</string>
+    <string name="commentedOnPR">commented on pull request</string>
+    <string name="autoMergePR">自动合并的合并请求</string>
+    <string name="deletedBranch">deleted branch %1$s at</string>
+    <string name="pushedTag">推送标签 %1$s 到</string>
+    <string name="deletedTag">删除标签 %1$s 从</string>
+    <string name="releasedBranch">released %1$s at</string>
+    <string name="syncedCommits">synced commits to %1$s at</string>
+    <string name="syncedRefs">synced new reference %1$s to</string>
+    <string name="syncedDeletedRefs">synced and deleted reference %1$s at</string>
+    <string name="attachment">Attachment</string>
+    <string name="attachments">Attachments</string>
+    <string name="attachmentsSaveError">An issue was created but cannot process attachments at this time. Check the server logs for more details.</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -84,9 +84,9 @@
     <string name="orgExistsError">Organization already exists</string>
     <string name="diffStatistics">%1$s addition(s) and %2$s deletion(s)</string>
     <string name="processingText">Processing</string>
-    <string name="search">Search</string>
-    <string name="close">Close</string>
-    <string name="addNewContent">Add</string>
+    <string name="search">搜尋</string>
+    <string name="close">關閉</string>
+    <string name="addNewContent">新增</string>
     <string name="orgContentAvatar">Org</string>
     <string name="repoContentAvatar">Repo</string>
     <string name="privateAvatar">Pri</string>
@@ -737,6 +737,7 @@
     <string name="timelineRefPr">%1$s referenced this pull request in #%2$d %3$s</string>
     <string name="timelineStatusRefIssue"><![CDATA[%1$s referenced this issue from a <font color=\'%2$d\'>%3$s</font> %4$s]]></string>
     <string name="timelineReviewLeftComment">%1$s left a comment: %2$s %3$s</string>
+    <string name="timelinePinned">%1$s pinned this %2$s</string>
     <string name="commitStatuses">Statuses</string>
     <string name="statusNoUrl">This status has no linked target URL.</string>
     <string name="starredRepos">Starred Repos</string>

app/src/main/res/values/strings.xml

@@ -262,6 +262,16 @@
     <string name="fragmentTabsAnimationHeader">Tabs Animation</string>
     <string name="fadeOut">Fade Out</string>
     <string name="zoomOut">Zoom Out</string>
+    <string name="backupRestore" translatable="false">%1$s / %2$s</string>
+    <string name="backup">Backup</string>
+    <string name="restore">Restore</string>
+    <string name="backupFileSuccess">The backup was successfully created</string>
+    <string name="backupFileError">An error occurred while creating a data backup</string>
+    <string name="backupFilePopupText">This action will backup your accounts, settings, drafts, notes, and data related to repositories.\n\nClick the Backup button to download the backup file.</string>
+    <string name="restoreFilePopupText">You are about to restore from a GitNex-generated backup file. This will restore user accounts, settings, drafts, notes, and data related to repositories.\n\nPlease note this action will overwrite the current database data. Proceed with caution.\n\nClick Restore to start the process.</string>
+    <string name="restoreError">An error occurred while restoring from the backup file.</string>
+    <string name="restoreFromBackup">Restore from Backup</string>
+    <string name="restoreFromBackupPopupText">You are about to restore from a GitNex-generated backup file. This will restore user accounts, settings, drafts, notes, and data related to repositories.\n\nClick Restore to start the process.</string>
     <!-- settings -->
 
     <string name="noMoreData">No more data available</string>
@@ -647,6 +657,9 @@
     <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
     <string name="aboutAppHintText">App version, build, user instance version</string>
     <string name="codeEditorHintText">Syntax color, indentation</string>
+    <string name="backupRestoreHintText">Backup and restore accounts, settings and more</string>
+    <string name="backupDataHintText">Backup accounts, settings, notes and more</string>
+    <string name="restoreDataHintText">Restore accounts, settings, notes and more</string>
 
     <string name="archivedRepository">Archived</string>
     <string name="archivedRepositoryMessage">This repo is archived. You can view files, but cannot push or open issues/pull-requests.</string>