diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e0458dec..9f12eea0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -69,7 +69,6 @@
     <string name="logo">In Gitea anmelden</string>
     <string name="urlInfoTooltip">1- Wähle das richtige Protokoll (https oder http) \ N2- Gebe die Gitea-URL ein, z.B. try.gitea.io \n3- Falls du 2FA aktiviert hast, gib den Code in das OTP-Code Feld ein. \n4- Für HTTP basic auth nutze BENUTZERNAME@DOMAIN.COM im URL Feld</string>
     <string name="loginFailed">Falscher Benutzername/Passwort </string>
-    <string name="protocolDelimiter">://</string>
     <string name="protocolError">Es wird nicht empfohlen, das HTTP-Protokoll zu verwenden, es sei denn, du testest in einem lokalen Netzwerk.</string>
     <string name="malformedJson">Fehlerhaftes JSON erhalten. Serveranfrage war nicht erfolgreich.</string>
     <string name="emptyFieldURL">Instanzen-URL ist erforderlich</string>
@@ -102,9 +101,6 @@
     <string name="orgContentAvatar">Org</string>
     <string name="repoContentAvatar">Repo</string>
     <string name="privateAvatar">Pri</string>
-    <string name="repoStars">12345</string>
-    <string name="repoWatchers">98324</string>
-    <string name="repoIssues">54321</string>
     <string name="removeContent">Entfernen</string>
 
     <string name="genericApiStatusError">Die Gitea Instanz hat einen Fehler zurückgegeben. Code\u0020</string>
@@ -134,13 +130,8 @@
     <string name="infoTabRepoForksCount">Anzahl an Forks</string>
     <string name="infoTabRepoCreatedAt">Erstellt</string>
     <string name="infoTabRepoUpdatedAt">Letzte Aktualisierung</string>
-    <string name="infoTabRepoDummyTime">2018&#8211;10&#8211;30 08:25:25</string>
-    <string name="infoTabRepoBlank">&#8230;</string>
-    <string name="infoTabRepoZero">0</string>
-    <string name="infoTabRepoDefaultBranchText">master</string>
 
     <string name="timeAtText">um</string>
-    <string name="hash">#</string>
     <string name="createdText">Erstellt\u0020</string>
     <string name="dueDateText">Fälligkeitsdatum </string>
     <string name="issueStatusTextOpen">Status: offen</string>
@@ -152,7 +143,6 @@
     <string name="issueTypeIssue">Typ: Issue</string>
     <string name="issueTypePullRequest">Typ: Pull Anfrage</string>
     <string name="issueCommenter">Kommentator:\u0020</string>
-    <string name="issueTitleWithId">#%1$d %2$s</string>
     <string name="issueMilestone">Meilenstein %1$s</string>
     <string name="dueDate">Fällig %1$s</string>
     <string name="createdTime">Erstellt %1$s</string>
@@ -163,7 +153,6 @@
     <string name="commentError">Etwas ist schief gelaufen. Bitte versuche es erneut</string>
 
     <string name="generalImgContentText">Benutzerbild</string>
-    <string name="generalPageTitle">GitNex</string>
 
     <string name="noDataMilestonesTab">Kein Meilenstein gefunden!</string>
 
@@ -187,7 +176,6 @@
     <string name="newMilestoneTitle">Titel</string>
     <string name="newMilestoneDescription">Beschreibung</string>
     <string name="newMilestoneDueDate">Fälligkeitsdatum</string>
-    <string name="setDueDate">%1$d-%2$d-%3$d</string>
     <string name="milestoneNameErrorEmpty">Titel des Meilensteins ist leer</string>
     <string name="milestoneNameErrorInvalid">Titel des Meilensteins ist nicht gültig. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="milestoneDescError">Die Beschreibung des Meilensteins überschreitet die maximale Anzahl von 255 Zeichen</string>
@@ -207,8 +195,6 @@
     <string name="newIssueDueDateTitle">Fälligkeitsdatum</string>
     <string name="newIssueMilestoneTitle">Meilenstein</string>
     <string name="newIssueLabelsTitle">Labels</string>
-    <string name="spinnerMilestoneText">%1$s [%2$s]</string>
-    <string name="dialogAssignessText">%1$s - @%2$s</string>
     <string name="issueTitleEmpty">Der Titel des Issues ist leer!</string>
     <string name="issueDescriptionEmpty">Die Beschreibung des Issues ist leer!</string>
     <string name="issueCreated">Neues Issues wurde erfolgreich erstellt!</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1e37b539..9445c7ad 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -70,7 +70,6 @@
     <string name="logo">Se connecter à Gitea</string>
     <string name="urlInfoTooltip">1- Choose the correct protocol(https or http) \n2- Enter Gitea url e.g: try.gitea.io \n3- For 2FA enter USERNAME:CODE in the Username field \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field</string>
     <string name="loginFailed">Wrong username/password</string>
-    <string name="protocolDelimiter">://</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="emptyFieldURL">Instance URL is required</string>
@@ -103,9 +102,6 @@
     <string name="orgContentAvatar">Org</string>
     <string name="repoContentAvatar">Repo</string>
     <string name="privateAvatar">Pri</string>
-    <string name="repoStars">0</string>
-    <string name="repoWatchers">0</string>
-    <string name="repoIssues">54321</string>
     <string name="removeContent">Remove</string>
 
     <string name="genericApiStatusError">L\'instance a renvoyé une erreur. Code\u0020</string>
@@ -135,13 +131,9 @@
     <string name="infoTabRepoForksCount">Forks Count</string>
     <string name="infoTabRepoCreatedAt">Created</string>
     <string name="infoTabRepoUpdatedAt">Last Updated</string>
-    <string name="infoTabRepoDummyTime">2018&#8211;10&#8211;30 08:25:25</string>
-    <string name="infoTabRepoBlank">&#8230;</string>
-    <string name="infoTabRepoZero">0</string>
     <string name="infoTabRepoDefaultBranchText">master</string>
 
     <string name="timeAtText">à</string>
-    <string name="hash">#</string>
     <string name="createdText">Created\u0020</string>
     <string name="dueDateText">Due Date</string>
     <string name="issueStatusTextOpen">Status : open</string>
@@ -153,7 +145,6 @@
     <string name="issueTypeIssue">Type : Issue</string>
     <string name="issueTypePullRequest">Type : Pull Request</string>
     <string name="issueCommenter">Commenter :\u0020</string>
-    <string name="issueTitleWithId">#%1$d %2$s</string>
     <string name="issueMilestone">Milestone %1$s</string>
     <string name="dueDate">Due %1$s</string>
     <string name="createdTime">Created %1$s</string>
@@ -164,7 +155,6 @@
     <string name="commentError">Something went wrong, please try again</string>
 
     <string name="generalImgContentText">IMG</string>
-    <string name="generalPageTitle">GitNex</string>
 
     <string name="noDataMilestonesTab">No Milestone found!</string>
 
@@ -188,7 +178,6 @@
     <string name="newMilestoneTitle">Title</string>
     <string name="newMilestoneDescription">Description</string>
     <string name="newMilestoneDueDate">Due Date</string>
-    <string name="setDueDate">%1$d-%2$d-%3$d</string>
     <string name="milestoneNameErrorEmpty">Milestone title is empty</string>
     <string name="milestoneNameErrorInvalid">Milestone title is not valid. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="milestoneDescError">Milestone description exceeds the max 255 characters limit</string>
@@ -208,8 +197,6 @@
     <string name="newIssueDueDateTitle">Due Date</string>
     <string name="newIssueMilestoneTitle">Milestone</string>
     <string name="newIssueLabelsTitle">Labels</string>
-    <string name="spinnerMilestoneText">%1$s [%2$s]</string>
-    <string name="dialogAssignessText">%1$s - @%2$s</string>
     <string name="issueTitleEmpty">Issue title is empty!</string>
     <string name="issueDescriptionEmpty">Issue description is empty!</string>
     <string name="issueCreated">New issue created successfully!</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 60b92557..680ea261 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -70,7 +70,6 @@
     <string name="logo">Войти в Gitea</string>
     <string name="urlInfoTooltip">1- Выберите протокол (https или http) \n2- Введите инстанцию Gitea, например: try.gitea.io \n3- For 2FA enter USERNAME:CODE in the Username field \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field</string>
     <string name="loginFailed">Неверные логин и/или пароль</string>
-    <string name="protocolDelimiter">://</string>
     <string name="protocolError">Не рекомендуется использовать протокол HTTP, если вы не тестируете инстанцию в локальной сети.</string>
     <string name="malformedJson">Неожиданный ответ от сервера. Попробуйте сменить протокол или обратитесь к администратору инстанции.</string>
     <string name="emptyFieldURL">Instance URL is required</string>
@@ -103,9 +102,6 @@
     <string name="orgContentAvatar">Орг.</string>
     <string name="repoContentAvatar">Реп.</string>
     <string name="privateAvatar">Лич.</string>
-    <string name="repoStars">12345</string>
-    <string name="repoWatchers">98324</string>
-    <string name="repoIssues">54321</string>
     <string name="removeContent">Удалить</string>
 
     <string name="genericApiStatusError">Инстанция вернула ошибку. Код\u0020</string>
@@ -135,13 +131,9 @@
     <string name="infoTabRepoForksCount">Кол-во форков</string>
     <string name="infoTabRepoCreatedAt">Создан</string>
     <string name="infoTabRepoUpdatedAt">Последнее обновление</string>
-    <string name="infoTabRepoDummyTime">2018&#8211;10&#8211;30 08:25:25</string>
-    <string name="infoTabRepoBlank">&#8230;</string>
-    <string name="infoTabRepoZero">0</string>
     <string name="infoTabRepoDefaultBranchText">master</string>
 
     <string name="timeAtText">в</string>
-    <string name="hash">#</string>
     <string name="createdText">Создано\u0020</string>
     <string name="dueDateText">Дата исполнения</string>
     <string name="issueStatusTextOpen">Статус: открыта</string>
@@ -153,7 +145,6 @@
     <string name="issueTypeIssue">Тип: задача</string>
     <string name="issueTypePullRequest">Тип: pull request</string>
     <string name="issueCommenter">Комментатор:\u0020</string>
-    <string name="issueTitleWithId">#%1$d %2$s</string>
     <string name="issueMilestone">Вехи %1$s</string>
     <string name="dueDate">Исполнение %1$s</string>
     <string name="createdTime">Создано %1$s</string>
@@ -164,7 +155,6 @@
     <string name="commentError">Что-то пошло не так. Пожалуйста, попытайтесь еще раз.</string>
 
     <string name="generalImgContentText">Аватар</string>
-    <string name="generalPageTitle">GitNex</string>
 
     <string name="noDataMilestonesTab">Вех не обнаружено</string>
 
@@ -188,7 +178,6 @@
     <string name="newMilestoneTitle">Заголовок</string>
     <string name="newMilestoneDescription">Описание</string>
     <string name="newMilestoneDueDate">Дата исполнения</string>
-    <string name="setDueDate">%1$d-%2$d-%3$d</string>
     <string name="milestoneNameErrorEmpty">Заголовок вехи пустой.</string>
     <string name="milestoneNameErrorInvalid">Недоступный заголовок вехи. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="milestoneDescError">Описание вехи превышает 255 символов.</string>
@@ -208,8 +197,6 @@
     <string name="newIssueDueDateTitle">Дата исполнения</string>
     <string name="newIssueMilestoneTitle">Вехи</string>
     <string name="newIssueLabelsTitle">Метки</string>
-    <string name="spinnerMilestoneText">%1$s [%2$s]</string>
-    <string name="dialogAssignessText">%1$s - @%2$s</string>
     <string name="issueTitleEmpty">Заголовок задачи пустой.</string>
     <string name="issueDescriptionEmpty">Описание задачи пустое.</string>
     <string name="issueCreated">Задача успешно добавлена!</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34e0fcdd..28013819 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -91,7 +91,7 @@
     <string name="logo">Login to Gitea</string>
     <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea 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="loginFailed">Wrong username/password</string>
-    <string name="protocolDelimiter">://</string>
+    <string name="protocolDelimiter" translatable="false">://</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="emptyFieldURL">Instance URL is required</string>
@@ -123,9 +123,9 @@
     <string name="orgContentAvatar">Org</string>
     <string name="repoContentAvatar">Repo</string>
     <string name="privateAvatar">Pri</string>
-    <string name="repoStars">12345</string>
-    <string name="repoWatchers">98324</string>
-    <string name="repoIssues">54321</string>
+    <string name="repoStars" translatable="false">12345</string>
+    <string name="repoWatchers" translatable="false">98324</string>
+    <string name="repoIssues" translatable="false">54321</string>
     <string name="removeContent">Remove</string>
 
     <string name="genericApiStatusError">Instance has returned an error. Code\u0020</string>
@@ -155,13 +155,13 @@
     <string name="infoTabRepoForksCount">Forks</string>
     <string name="infoTabRepoCreatedAt">Created</string>
     <string name="infoTabRepoUpdatedAt">Last Updated</string>
-    <string name="infoTabRepoDummyTime">2018&#8211;10&#8211;30 08:25:25</string>
-    <string name="infoTabRepoBlank">&#8230;</string>
-    <string name="infoTabRepoZero">0</string>
-    <string name="infoTabRepoDefaultBranchText">master</string>
+    <string name="infoTabRepoDummyTime" translatable="false">2018&#8211;10&#8211;30 08:25:25</string>
+    <string name="infoTabRepoBlank" translatable="false">&#8230;</string>
+    <string name="infoTabRepoZero" translatable="false">0</string>
+    <string name="infoTabRepoDefaultBranchText" translatable="false">master</string>
 
     <string name="timeAtText">at</string>
-    <string name="hash">#</string>
+    <string name="hash" translatable="false">#</string>
     <string name="createdText">Opened\u0020</string>
     <string name="dueDateText">Due Date</string>
     <string name="issueStatusTextOpen">Status: open</string>
@@ -173,7 +173,7 @@
     <string name="issueTypeIssue">Type: Issue</string>
     <string name="issueTypePullRequest">Type: Pull Request</string>
     <string name="issueCommenter">Commenter:\u0020</string>
-    <string name="issueTitleWithId">#%1$d %2$s</string>
+    <string name="issueTitleWithId" translatable="false">#%1$d %2$s</string>
     <string name="issueMilestone">Milestone %1$s</string>
     <string name="dueDate">Due %1$s</string>
     <string name="createdTime">Opened %1$s</string>
@@ -184,7 +184,7 @@
     <string name="commentError">Something went wrong, please try again</string>
 
     <string name="generalImgContentText">Avatar</string>
-    <string name="generalPageTitle">GitNex</string>
+    <string name="generalPageTitle" translatable="false">GitNex</string>
 
     <string name="noDataMilestonesTab">No milestones found</string>
 
@@ -210,7 +210,7 @@
     <string name="newMilestoneTitle">Title</string>
     <string name="newMilestoneDescription">Description</string>
     <string name="newMilestoneDueDate">Due Date</string>
-    <string name="setDueDate">%1$d-%2$d-%3$d</string>
+    <string name="setDueDate" translatable="false">%1$d-%2$d-%3$d</string>
     <string name="milestoneNameErrorEmpty">Milestone title is empty</string>
     <string name="milestoneNameErrorInvalid">Milestone title is not valid. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="milestoneDescError">Milestone description exceeds the max 255 characters limit</string>
@@ -230,8 +230,8 @@
     <string name="newIssueDueDateTitle">Due Date</string>
     <string name="newIssueMilestoneTitle">Milestone</string>
     <string name="newIssueLabelsTitle">Labels</string>
-    <string name="spinnerMilestoneText">%1$s [%2$s]</string>
-    <string name="dialogAssignessText">%1$s - @%2$s</string>
+    <string name="spinnerMilestoneText" translatable="false">%1$s [%2$s]</string>
+    <string name="dialogAssignessText" translatable="false">%1$s - @%2$s</string>
     <string name="issueTitleEmpty">Issue title is empty</string>
     <string name="issueDescriptionEmpty">Issue description is empty</string>
     <string name="issueCreated">New issue created successfully</string>
@@ -259,16 +259,16 @@
     <string name="settingshomeScreenSelectorDialogTitle">Select Home Screen</string>
     <!-- settings -->
 
-    <string name="noMoreData">No more data available.</string>
+    <string name="noMoreData">No more data available</string>
 
     <string name="createLabel">New Label</string>
     <string name="menuTitleText">Repo Menu</string>
     <string name="labelName">Label Name</string>
     <string name="labelColor">Label Color</string>
-    <string name="labelEmptyError">Label name is empty.</string>
-    <string name="labelNameError">Label name is not valid.</string>
+    <string name="labelEmptyError">Label name is empty</string>
+    <string name="labelNameError">Label name is not valid</string>
     <string name="labelCreated">Label created.</string>
-    <string name="labelGeneralError">Something went wrong, please try again.</string>
+    <string name="labelGeneralError">Something went wrong, please try again</string>
     <string name="labelUpdated">Label updated.</string>
 
     <string name="noDataLabelsTab">No labels found</string>
@@ -287,7 +287,7 @@
     <!-- credits - this part does not need translation -->
 
     <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. In case of revoked Token, please logout and login again.</string>
+    <string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents. In case of revoked Token, please logout and login again</string>
     <string name="alertDialogTokenRevokedCopyNegativeButton">Cancel</string>
     <string name="alertDialogTokenRevokedCopyPositiveButton">Logout</string>
     <string name="labelDeleteTitle">Delete\u0020</string>
@@ -315,18 +315,18 @@
     <string name="newTeamDesc">Description</string>
     <string name="newTeamPermission">Permission</string>
     <string name="newTeamAccessControls">Access Controls</string>
-    <string name="newTeamPermissionRead">Members can view and clone team repositories.</string>
-    <string name="newTeamPermissionWrite">Members can read and push to team repositories.</string>
-    <string name="newTeamPermissionAdmin">Members can pull and push to team repositories and add collaborators to them.</string>
+    <string name="newTeamPermissionRead">Members can view and clone team repositories</string>
+    <string name="newTeamPermissionWrite">Members can read and push to team repositories</string>
+    <string name="newTeamPermissionAdmin">Members can pull and push to team repositories and add collaborators to them</string>
     <string name="newTeamPermissionValues" translatable="false">%1$s%2$s,\u0020</string>
     <string name="newTeamPermissionValuesFinal" translatable="false">%1$s%2$s,\u0020</string>
-    <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="teamDescLimit">Team description have more than 100 characters.</string>
-    <string name="teamCreated">Team created successfully.</string>
-    <string name="teamCreatedError">Something went wrong, please try again.</string>
+    <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="teamDescLimit">Team description have more than 100 characters</string>
+    <string name="teamCreated">Team created successfully</string>
+    <string name="teamCreatedError">Something went wrong, please try again</string>
     <!-- create team -->
 
     <!-- edit comment -->
@@ -353,8 +353,8 @@
     <string name="profileEmailTitle">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="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>
     <string name="usernameWithAt" translatable="false">\u0040\u0020%1$s</string>
@@ -473,7 +473,7 @@
     <!-- files -->
     <string name="noDataFilesTab">No files found</string>
     <string name="filesDirNotSupportedYet">Directory browsing is not supported yet</string>
-    <string name="filesGenericError">Sorry this file cannot be viewed as API return an error</string>
+    <string name="filesGenericError">Sorry this file cannot be viewed as API returned an error</string>
     <string name="filesBreadcrumb">Root</string>
 
     <!-- generic copy -->