diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 35eb4f39..08a97c78 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Repository created successfully</string>
     <string name="repoCreatedError">Something went wrong, please try again</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="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>
@@ -165,7 +166,7 @@
     <string name="issueCreated">New issue created successfully</string>
     <string name="issueCreatedError">Something went wrong, please try again</string>
     <string name="issueCreatedNoMilestone">No milestone</string>
-    <string name="noAssigneesFound">No collaborators found</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">No labels found</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">الترجمة</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">New Label</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="labelDeleteErrorText">Something went wrong, please try again</string>
     <string name="noDataBranchesTab">No branches found</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="alertDialogTokenRevokedCopyNegativeButton">إلغاء</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Rebase and Merge</string>
     <string name="mergeOptionRebaseCommit">Rebase and Merge (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Squash and Merge</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Download This File</string>
     <string name="waitLoadingDownloadFile">Please wait for the file to load to memory</string>
     <string name="downloadFileSaved">File saved successfully</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Themes, fonts, badges, code block theme</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF mode, source code theme</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index fb81c31d..f3a521b0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Repozitář byl úspěšně vytvořen</string>
     <string name="repoCreatedError">Něco se pokazilo, zkuste to prosím znovu</string>
     <string name="repoExistsError">Repozitář tohoto jména již existuje pod vybraným vlastníkem</string>
+    <string name="repoOwnerError">Select owner for the repository</string>
     <string name="orgNameErrorEmpty">Název organizace je prázdný</string>
     <string name="orgNameErrorInvalid">Název organizace není platný, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Popis organizace překračuje maximální limit 255 znaků</string>
@@ -165,7 +166,7 @@
     <string name="issueCreated">Problém úspěšně vytvořen</string>
     <string name="issueCreatedError">Něco se pokazilo, zkuste to prosím znovu</string>
     <string name="issueCreatedNoMilestone">Žádný milník</string>
-    <string name="noAssigneesFound">Nebyli nalezeni žádní spolupracovníci</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">Nebyly nalezeny žádné popisky</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Překlad</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">New Label</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="labelDeleteErrorText">Something went wrong, please try again</string>
     <string name="noDataBranchesTab">No branches found</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="alertDialogTokenRevokedCopyNegativeButton">Cancel</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Rebase and Merge</string>
     <string name="mergeOptionRebaseCommit">Rebase and Merge (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Squash and Merge</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Download This File</string>
     <string name="waitLoadingDownloadFile">Please wait for the file to load to memory</string>
     <string name="downloadFileSaved">File saved successfully</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Themes, fonts, badges, code block theme</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF mode, source code theme</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 589a2abf..6fb9260d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Repository erfolgreich erstellt!</string>
     <string name="repoCreatedError">Etwas ist schief gelaufen. Bitte versuche es erneut</string>
     <string name="repoExistsError">Ein Repository mit diesem Namen existiert bereits unter dem ausgewählten Besitzer</string>
+    <string name="repoOwnerError">Wähle den Besitzer für das Repository aus</string>
     <string name="orgNameErrorEmpty">Name der Organisation ist leer</string>
     <string name="orgNameErrorInvalid">Organisationsname ist nicht gültig, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Organisationsbeschreibung überschreitet maximale Anzahl von 255 Zeichen</string>
@@ -165,7 +166,7 @@
     <string name="issueCreated">Neues Issues wurde erfolgreich erstellt!</string>
     <string name="issueCreatedError">Etwas ist schief gelaufen. Bitte versuche es erneut</string>
     <string name="issueCreatedNoMilestone">Kein Meilenstein</string>
-    <string name="noAssigneesFound">Keine Zuständigen gefunden!</string>
+    <string name="noAssigneesFound">Keine Zuständigen gefunden</string>
     <string name="noLabelsFound">Keine Labels gefunden!</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Sprachen</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Kommentarentwürfe</string>
     <string name="settingsEnableCommentsDeletionText">Entwürfe löschen aktivieren</string>
     <string name="settingsEnableCommentsDeletionHintText">Kommentar-Entwurf löschen, wenn Kommentar veröffentlicht wird</string>
+    <string name="settingsGeneralHeader">Allgemein</string>
+    <string name="generalHintText">Startseite, Standard Link Handhaber</string>
+    <string name="generalDeepLinkDefaultScreen">Standard Link Handhaber</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Wähle die Ansicht, welche geladen werden soll, wenn ein externer Link nicht handhabbar ist. Du wirst dann automatisch zu jener weitergeleitet.</string>
+    <string name="generalDeepLinkSelectedText">N/V</string>
+    <string name="linkSelectorDialogTitle">Wähle Standard Link Handhaber</string>
     <!-- settings -->
     <string name="noMoreData">Keine weiteren Daten verfügbar.</string>
     <string name="createLabel">Label erstellen</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Label gelöscht!</string>
     <string name="labelDeleteErrorText">Etwas ist schief gelaufen. Bitte versuche es erneut</string>
     <string name="noDataBranchesTab">Keine Branch gefunden!</string>
+    <string name="selectBranchError">Wähle einen Branch für das Release</string>
     <string name="alertDialogTokenRevokedTitle">Autorisierungsfehler</string>
     <string name="alertDialogTokenRevokedMessage">Es scheint, dass der Access Token widerrufen wurde ODER du diese Inhalte nicht sehen darfst.\n\nFalls der Token wiederrufen wurde, melde dich bitte ab und wieder an</string>
     <string name="alertDialogTokenRevokedCopyNegativeButton">Abbrechen</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Rebase und Mergen</string>
     <string name="mergeOptionRebaseCommit">Rebasen und Mergen (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Zusammenfassen und Mergen</string>
+    <string name="mergeStrategy">Merge-Strategie</string>
+    <string name="selectMergeStrategy">Wähle eine Merge-Strategie</string>
+    <string name="mergeNotAllowed">Nicht erlaubt zu mergen [Grund: Hat nicht genügend Genehmigungen]</string>
     <string name="downloadFile">Datei herunterladen</string>
     <string name="waitLoadingDownloadFile">Bitte warte, bis die Datei in den Speicher geladen wurde</string>
     <string name="downloadFileSaved">Datei erfolgreich gespeichert</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Entwürfe erfolgreich gelöscht</string>
     <string name="draftsSingleDeleteSuccess">Entwurf erfolgreich gelöscht</string>
     <string name="deleteAllDraftsDialogMessage">Dadurch werden alle Entwürfe für dieses Konto gelöscht. \n\nMit dem Löschen fortfahren?</string>
-    <string name="draftSaved">Entwurf gespeichert</string>
-    <string name="appearanceHintText">Designs, Schriftarten, Plaketten, Code Block-Template</string>
+    <string name="draftSaved">Entwurf wurde automatisch gespeichert.</string>
+    <string name="appearanceHintText">Themen, Schriften, Abzeichen</string>
     <string name="fileViewerHintText">PDF-Modus, Quellcode Theme</string>
-    <string name="securityHintText">SSL-Zertifikate, Cache, Abfrageverzögerung</string>
+    <string name="securityHintText">SSL-Zertifikate, Cache</string>
     <string name="languagesHintText">Sprachen</string>
     <string name="reportsHintText">Absturzberichte</string>
     <string name="rateAppHintText">Wenn dir GitNex gefällt, hinterlassen Feedback</string>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Benachrichtigungen</string>
     <string name="noDataNotifications">Keine Benachrichtigungen gefunden</string>
-    <string name="notificationBody">Sie haben eine neue Benachrichtigung erhalten. (%s)</string>
     <string name="notificationsPollingHeaderText">Benachrichtigungsverzögerung</string>
     <string name="pollingDelaySelectedText">%d Minuten</string>
     <string name="pollingDelayDialogHeaderText">Abfrageverzögerung auswählen</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Als ungelesen markieren</string>
     <string name="pinNotification">Nachricht Anpinnen</string>
     <string name="markedNotificationsAsRead">Alle Benachrichtigungen erfolgreich als gelesen markiert</string>
+    <string name="notificationsHintText">Intervall, Licht, Vibration</string>
+    <string name="enableNotificationsHeaderText">Benachrichtigungen aktivieren</string>
+    <string name="enableLightsHeaderText">Aktiviere LED</string>
+    <string name="enableVibrationHeaderText">Vibration aktivieren</string>
+    <string name="chooseColorSelectorHeader">Farbe auswählen</string>
+    <string name="newMessages">Neue Nachrichten</string>
+    <string name="youHaveGotNewNotifications">Du hast %d neue Nachrichten.</string>
     <string name="isRead">Gelesen</string>
     <string name="isUnread">Ungelesen</string>
     <string name="repoSettingsTitle">Repository Einstellungen</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Titel wird benötigt</string>
     <string name="prCreateSuccess">Pull-Request erfolgreich erstellt</string>
     <string name="prAlreadyExists">Zwischen diesen Branches existiert bereits ein Pull-Request</string>
+    <string name="accountDoesNotExist">Es sieht so aus als würde das Konto für den Link %1$s nicht existieren. Du kannst ihn hinzufügen, indem du auf \"Neues Konto hinzufügen\" klickst.</string>
+    <string name="launchApp">App aufrufen</string>
+    <string name="noActionText">GitNex kann den Link nicht handhaben, du kannst ein Issue im Projekt-Repository öffnen, so dass es ausgebessert werden kann. Bitte gebe alle nötigen Details an. Um die Standart-Ansicht zu öffnen, einfach den Button unten anklicken.</string>
+    <string name="codeBlockGreenOnBlack">Grün auf Schwarz</string>
+    <string name="codeBlockWhiteOnBlack">Weiß auf Schwarz</string>
+    <string name="codeBlockGreyOnBlack">Grau auf Schwarz</string>
+    <string name="codeBlockWhiteOnGrey">Weiß auf Grau</string>
+    <string name="codeBlockDarkOnWhite">Dunkel auf Weiß</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3e4595f1..6e03ec5b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">El repositorio se ha creado correctamente</string>
     <string name="repoCreatedError">Algo salió mal, por favor, inténtalo de nuevo</string>
     <string name="repoExistsError">El repositorio de este nombre ya existe bajo el propietario seleccionado</string>
+    <string name="repoOwnerError">Select owner for the repository</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 excede el límite de 255 caracteres maximamente</string>
@@ -165,7 +166,7 @@
     <string name="issueCreated">La incidencia se ha creado correctamente</string>
     <string name="issueCreatedError">Algo salió mal, por favor, inténtalo de nuevo</string>
     <string name="issueCreatedNoMilestone">No milestone</string>
-    <string name="noAssigneesFound">No se han encontrado colaboradores</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">No se han encontrado etiquetas</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Traducción</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">Nueva etiqueta</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="labelDeleteErrorText">Algo salió mal, por favor, inténtalo de nuevo</string>
     <string name="noDataBranchesTab">No se han encontrado ramas</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="alertDialogTokenRevokedCopyNegativeButton">Cancelar</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Hacer Rebase y Fusionar</string>
     <string name="mergeOptionRebaseCommit">Hacer Rebase y Fusionar (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Hacer Squash y Fusionar</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Descargar este archivo</string>
     <string name="waitLoadingDownloadFile">Por favor espere a que el dispositivo cargue</string>
     <string name="downloadFileSaved">File saved successfully</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Themes, fonts, badges, code block theme</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF mode, source code theme</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 0970fdc4..a884ecb7 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -86,6 +86,7 @@
     <string name="repoCreated">مخزن با موفقیت ساخته شد</string>
     <string name="repoCreatedError">مشکلی پیش آمده. لطفا دوباره تلاش کنید</string>
     <string name="repoExistsError">یک مخزن با این نام قبلا در لیست مخازن وجود دارد</string>
+    <string name="repoOwnerError">Select owner for the repository</string>
     <string name="orgNameErrorEmpty">نام سازمان خالی است</string>
     <string name="orgNameErrorInvalid">نام سازمان صحیح نیست, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">توضیحات سازمان از سقف 255 کاراکتر بیشتر است</string>
@@ -168,7 +169,7 @@
     <string name="issueCreated">مسئله جدید با موفقیت ساخته شد</string>
     <string name="issueCreatedError">مشکلی پیش آمده. لطفا دوباره تلاش کنید</string>
     <string name="issueCreatedNoMilestone">نقطه عطفی وجود ندارد</string>
-    <string name="noAssigneesFound">مشارکت کننده‌ای پیدا نشد</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">برچسبی پیدا نشد</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">ترجمه</string>
@@ -210,6 +211,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">اطلاعات بیشتری موجود نیست</string>
     <string name="createLabel">برچسب جدید</string>
@@ -228,6 +235,7 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="labelDeleteErrorText">Something went wrong, please try again</string>
     <string name="noDataBranchesTab">No branches found</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="alertDialogTokenRevokedCopyNegativeButton">Cancel</string>
@@ -466,6 +474,9 @@
     <string name="mergeOptionRebase">بازگردانی و ادغام</string>
     <string name="mergeOptionRebaseCommit">بازگردانی و ادغام (--no-ff)</string>
     <string name="mergeOptionSquash">له کردن و ادغام</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Download This File</string>
     <string name="waitLoadingDownloadFile">Please wait for the file to load to memory</string>
     <string name="downloadFileSaved">File saved successfully</string>
@@ -517,10 +528,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Themes, fonts, badges, code block theme</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF mode, source code theme</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -537,7 +548,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -546,6 +556,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -589,4 +606,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 754b625a..a5dc943c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Repository created successfully</string>
     <string name="repoCreatedError">Something went wrong, please try again</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="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>
@@ -165,7 +166,7 @@
     <string name="issueCreated">New issue created successfully</string>
     <string name="issueCreatedError">Something went wrong, please try again</string>
     <string name="issueCreatedNoMilestone">No milestone</string>
-    <string name="noAssigneesFound">No collaborators found</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">No labels found</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Translation</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">New Label</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="labelDeleteErrorText">Something went wrong, please try again</string>
     <string name="noDataBranchesTab">No branches found</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="alertDialogTokenRevokedCopyNegativeButton">Cancel</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Rebase and Merge</string>
     <string name="mergeOptionRebaseCommit">Rebase and Merge (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Squash and Merge</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Download This File</string>
     <string name="waitLoadingDownloadFile">Please wait for the file to load to memory</string>
     <string name="downloadFileSaved">File saved successfully</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Themes, fonts, badges, code block theme</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF mode, source code theme</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b132b790..dc4d8346 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,7 +12,7 @@
     <string name="navLogout">Déconnexion</string>
     <string name="navExplore">Explorer</string>
     <string name="navAdministration">Administration</string>
-    <string name="navSearchIssuesPulls">Search Issues</string>
+    <string name="navSearchIssuesPulls">Rechercher des tickets</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleAbout">À propos</string>
@@ -83,6 +83,7 @@
     <string name="repoCreated">Dépôt créé</string>
     <string name="repoCreatedError">Une erreur s’est produite, veuillez réessayer</string>
     <string name="repoExistsError">Le propriétaire possède déjà un dépôt du même nom</string>
+    <string name="repoOwnerError">Propriétaire du dépôt</string>
     <string name="orgNameErrorEmpty">Nom manquant</string>
     <string name="orgNameErrorInvalid">Nom de l’organisation invalide [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">La description dépasse la limite de 255 caractères</string>
@@ -165,7 +166,7 @@
     <string name="issueCreated">Nouveau ticket créé</string>
     <string name="issueCreatedError">Une erreur s’est produite, veuillez réessayer</string>
     <string name="issueCreatedNoMilestone">Aucun jalon</string>
-    <string name="noAssigneesFound">Aucun collaborateur</string>
+    <string name="noAssigneesFound">Aucun membre assigné</string>
     <string name="noLabelsFound">Aucune étiquette</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Traduction</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Brouillon de commentaires</string>
     <string name="settingsEnableCommentsDeletionText">Suppression des brouillons</string>
     <string name="settingsEnableCommentsDeletionHintText">Supprimer le brouillon d’un commentaire publié</string>
+    <string name="settingsGeneralHeader">Général</string>
+    <string name="generalHintText">Écran d’accueil, gestionnaire de liens par défaut</string>
+    <string name="generalDeepLinkDefaultScreen">Ouvrir avec par défaut</string>
+    <string name="generalDeepLinkDefaultScreenHintText">Choisissez l\'écran à afficher si l\'application n\'est pas compatible avec le lien externe.</string>
+    <string name="generalDeepLinkSelectedText">S/O</string>
+    <string name="linkSelectorDialogTitle">Choix du gestionnaire de liens par défaut</string>
     <!-- settings -->
     <string name="noMoreData">Aucune donnée</string>
     <string name="createLabel">Nouvelle étiquette</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Étiquette supprimée</string>
     <string name="labelDeleteErrorText">Une erreur s’est produite, veuillez réessayer</string>
     <string name="noDataBranchesTab">Aucune branche</string>
+    <string name="selectBranchError">Branche de diffusion</string>
     <string name="alertDialogTokenRevokedTitle">Erreur d’autorisation</string>
     <string name="alertDialogTokenRevokedMessage">Le jeton d’accès est peut-être révoqué ou vous n’êtes pas autorisé à voir ce contenu.\n\nEn cas de jeton révoqué, veuillez vous reconnecter</string>
     <string name="alertDialogTokenRevokedCopyNegativeButton">Annuler</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Rebaser et fusionner</string>
     <string name="mergeOptionRebaseCommit">Rebaser et fusionner (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Squasher et fusionner</string>
+    <string name="mergeStrategy">Stratégie de fusion</string>
+    <string name="selectMergeStrategy">Stratégie de fusion</string>
+    <string name="mergeNotAllowed">Fusion non permise [Raison : autorisations insuffisante]</string>
     <string name="downloadFile">Télécharger ce fichier</string>
     <string name="waitLoadingDownloadFile">Chargement du fichier dans la mémoire</string>
     <string name="downloadFileSaved">Fichier sauvegardé avec succès</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Brouillons supprimés</string>
     <string name="draftsSingleDeleteSuccess">Brouillon supprimé</string>
     <string name="deleteAllDraftsDialogMessage">Tous les brouillons du compte seront supprimés.\n\nContinuer ?</string>
-    <string name="draftSaved">Brouillon enregistré</string>
-    <string name="appearanceHintText">Thèmes, polices, badges, couleur du code</string>
+    <string name="draftSaved">Brouillon sauvegardé automatiquement</string>
+    <string name="appearanceHintText">Thèmes, polices, badges</string>
     <string name="fileViewerHintText">Mode PDF, thème du code source</string>
-    <string name="securityHintText">Certificats SSL, cache, scrutation des notifications</string>
+    <string name="securityHintText">Certificats SSL, cache</string>
     <string name="languagesHintText">Langues</string>
     <string name="reportsHintText">Rapports de plantage</string>
     <string name="rateAppHintText">Vous aimez GitNex ? Mettez-lui un pouce !</string>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">Aucune notification</string>
-    <string name="notificationBody">Vous avez reçu une nouvelle notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Délai de scrutation des notifications</string>
     <string name="pollingDelaySelectedText">%d minutes</string>
     <string name="pollingDelayDialogHeaderText">Délai de scrutation</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Marquer comme non lu</string>
     <string name="pinNotification">Épingler la notification</string>
     <string name="markedNotificationsAsRead">Les notifications ont été marquées comme lues</string>
+    <string name="notificationsHintText">Délai d\'interrogation, témoin lumineux, vibreur</string>
+    <string name="enableNotificationsHeaderText">Activer les notifications</string>
+    <string name="enableLightsHeaderText">Activer le témoin lumineux</string>
+    <string name="enableVibrationHeaderText">Activer le vibreur</string>
+    <string name="chooseColorSelectorHeader">Choisir une couleur</string>
+    <string name="newMessages">Nouveaux messages</string>
+    <string name="youHaveGotNewNotifications">Vous avez %d nouvelles notifications.</string>
     <string name="isRead">Lu</string>
     <string name="isUnread">Non lu</string>
     <string name="repoSettingsTitle">Paramètres du dépôt</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Titre requis</string>
     <string name="prCreateSuccess">Requête de tirage créé</string>
     <string name="prAlreadyExists">Une requête de tirage existe déjà entre ces branches</string>
+    <string name="accountDoesNotExist">Ce compte associé à l\'URI %1$s n\'existe pas dans l\'application. Vous pouvez l\'ajouter en appuyant sur Ajouter un nouveau compte.</string>
+    <string name="launchApp">Lancer l’app</string>
+    <string name="noActionText">GitNex ne prend pas en charge cette ressource, vous pouvez signaler et détailler le problème dans le dépôt du projet. Pour le moment, vous pouvez revenir à l\'écran par défaut en cliquant sur le bouton ci-dessus.</string>
+    <string name="codeBlockGreenOnBlack">Vert sur noir</string>
+    <string name="codeBlockWhiteOnBlack">Blanc sur noir</string>
+    <string name="codeBlockGreyOnBlack">Gris sur noir</string>
+    <string name="codeBlockWhiteOnGrey">Blanc sur gris</string>
+    <string name="codeBlockDarkOnWhite">Sombre sur blanc</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 682d88af..94887aca 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -84,6 +84,7 @@ URL è richiesto</string>
     <string name="repoCreated">Il repository è stato creato</string>
     <string name="repoCreatedError">Qualcosa è andato storto, riprova</string>
     <string name="repoExistsError">Il repository di questo nome esiste già sotto il proprietario selezionato</string>
+    <string name="repoOwnerError">Select owner for the repository</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>
@@ -166,7 +167,7 @@ URL è richiesto</string>
     <string name="issueCreated">Nuovo problema creato con successo</string>
     <string name="issueCreatedError">Qualcosa è andato storto, riprova</string>
     <string name="issueCreatedNoMilestone">Nessun traguardo</string>
-    <string name="noAssigneesFound">Nessun collaboratore trovato</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">Nessun label trovato</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Traduzione</string>
@@ -208,6 +209,12 @@ URL è richiesto</string>
     <string name="draftsHintText">Bozze dei commenti</string>
     <string name="settingsEnableCommentsDeletionText">Abilita Eliminazione Bozze</string>
     <string name="settingsEnableCommentsDeletionHintText">Elimina la bozza del commento quando viene pubblicato</string>
+    <string name="settingsGeneralHeader">General</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="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <!-- settings -->
     <string name="noMoreData">Nessun altro dato disponibile</string>
     <string name="createLabel">Nuovo label</string>
@@ -226,6 +233,7 @@ URL è richiesto</string>
     <string name="labelDeleteText">Label cancellato</string>
     <string name="labelDeleteErrorText">Qualcosa è andato storto, riprova</string>
     <string name="noDataBranchesTab">Nessun branch trovato</string>
+    <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Errore di autorizzazione</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="alertDialogTokenRevokedCopyNegativeButton">Annullare</string>
@@ -465,6 +473,9 @@ autorizzazione</string>
     <string name="mergeOptionRebase">Fai rebase e unisci</string>
     <string name="mergeOptionRebaseCommit">Fai rebase e unisci (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Fai squash e unisci</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Scarica Questo File</string>
     <string name="waitLoadingDownloadFile">Attendere che il file venga caricato in memoria</string>
     <string name="downloadFileSaved">File salvato con successo</string>
@@ -516,10 +527,10 @@ autorizzazione</string>
     <string name="draftsDeleteSuccess">Bozze eliminate con successo</string>
     <string name="draftsSingleDeleteSuccess">Bozza eliminata con successo</string>
     <string name="deleteAllDraftsDialogMessage">Questo eliminerà tutte le bozze per questo account. \n\nProcedi con la cancellazione?</string>
-    <string name="draftSaved">Bozza salvata</string>
-    <string name="appearanceHintText">Temi, caratteri, badge, tema del codice</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">Modalità PDF, tema codice sorgente</string>
-    <string name="securityHintText">Certificati SSL, cache, ricerca di notifiche</string>
+    <string name="securityHintText">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>
@@ -536,7 +547,6 @@ autorizzazione</string>
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifiche</string>
     <string name="noDataNotifications">Nessuna notifica trovata</string>
-    <string name="notificationBody">Hai ricevuto una nuova notifica. (%s)</string>
     <string name="notificationsPollingHeaderText">Intervallo di ricerca notifiche</string>
     <string name="pollingDelaySelectedText">%d Minuti</string>
     <string name="pollingDelayDialogHeaderText">Seleziona l\'intervallo per la ricerca</string>
@@ -545,6 +555,13 @@ autorizzazione</string>
     <string name="markAsUnread">Segna come non letto</string>
     <string name="pinNotification">Fissa Notifica</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Letto</string>
     <string name="isUnread">Non letto</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -588,4 +605,12 @@ autorizzazione</string>
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 2018a98b..388d3daa 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Repository created successfully</string>
     <string name="repoCreatedError">Something went wrong, please try again</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="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>
@@ -165,7 +166,7 @@
     <string name="issueCreated">New issue created successfully</string>
     <string name="issueCreatedError">Something went wrong, please try again</string>
     <string name="issueCreatedNoMilestone">No milestone</string>
-    <string name="noAssigneesFound">No collaborators found</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">No labels found</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Translation</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">No more data available</string>
     <string name="createLabel">New Label</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Label deleted</string>
     <string name="labelDeleteErrorText">Something went wrong, please try again</string>
     <string name="noDataBranchesTab">No branches found</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="alertDialogTokenRevokedCopyNegativeButton">Cancel</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Rebase a sloučit</string>
     <string name="mergeOptionRebaseCommit">Rebase a sloučit (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Saspiest un sapludināt</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Download This File</string>
     <string name="waitLoadingDownloadFile">Please wait for the file to load to memory</string>
     <string name="downloadFileSaved">File saved successfully</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Themes, fonts, badges, code block theme</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF mode, source code theme</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d7ee0eaa..1a239006 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Repozytorium utworzone pomyślnie</string>
     <string name="repoCreatedError">Coś poszło nie tak, spróbuj ponownie</string>
     <string name="repoExistsError">Repozytorium o tej nazwie już istnieje pod wybranym właścicielem</string>
+    <string name="repoOwnerError">Select owner for the repository</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>
@@ -165,7 +166,7 @@
     <string name="issueCreated">Nowy problem został pomyślnie utworzony</string>
     <string name="issueCreatedError">Coś poszło nie tak, spróbuj ponownie</string>
     <string name="issueCreatedNoMilestone">Brak kamienia milowego</string>
-    <string name="noAssigneesFound">Nie znaleziono współpracowników</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">Nie znaleziono etykiet</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Tłumaczenie</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">Brak dostępnych danych</string>
     <string name="createLabel">Nowa etykieta</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Etykieta usunięta</string>
     <string name="labelDeleteErrorText">Coś poszło nie tak, spróbuj ponownie</string>
     <string name="noDataBranchesTab">Nie znaleziono gałęzi</string>
+    <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Błąd autoryzacji</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="alertDialogTokenRevokedCopyNegativeButton">Anuluj</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Zmień bazę i scal</string>
     <string name="mergeOptionRebaseCommit">Zmień bazę i scal (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Zmiażdż i scal</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Pobierz ten plik</string>
     <string name="waitLoadingDownloadFile">Poczekaj aż plik załaduje się do pamięci</string>
     <string name="downloadFileSaved">File saved successfully</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Themes, fonts, badges, code block theme</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF mode, source code theme</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 04c11ba0..a02d45aa 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -12,7 +12,7 @@
     <string name="navLogout">Sair</string>
     <string name="navExplore">Explorar</string>
     <string name="navAdministration">Administração</string>
-    <string name="navSearchIssuesPulls">Search Issues</string>
+    <string name="navSearchIssuesPulls">Pesquisar incidentes</string>
     <!-- menu items -->
     <!-- page titles -->
     <string name="pageTitleAbout">Sobre</string>
@@ -38,7 +38,7 @@
     <string name="pageTitleExplore">Explorar</string>
     <string name="pageTitleAdministration">Administração de Gitea</string>
     <string name="pageTitleUserAccounts">Gerenciar contas</string>
-    <string name="pageTitleNewPullRequest">New Pull Request</string>
+    <string name="pageTitleNewPullRequest">Novo Pull Request</string>
     <!-- page titles -->
     <string name="repoName">Repo demo</string>
     <string name="repoFullname">Repo com ORG</string>
@@ -64,7 +64,7 @@
     <string name="navigation_drawer_open">Abrir painel de navegação</string>
     <string name="navigation_drawer_close">Fechar painel de navegação</string>
     <string name="logo">Conectar no Gitea</string>
-    <string name="protocol">Protocol</string>
+    <string name="protocol">Protocolo</string>
     <string name="urlInfoTooltip">1- Escolha o protocolo correto (https ou http). \n2- Insira a url do Gitea. Por exemplo: try.gitea.io. \n3 - Se você habilitou 2FA para sua conta, digite o código no campo de código OTP. \n4- Para autenticação básica HTTP use USUARIO@DOMINIO.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>
@@ -83,6 +83,7 @@
     <string name="repoCreated">Repositório criado com êxito</string>
     <string name="repoCreatedError">Algo deu errado, por favor, tente de novo</string>
     <string name="repoExistsError">Um repositório com este nome já existe sob o proprietário selecionado</string>
+    <string name="repoOwnerError">Select owner for the repository</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>
@@ -165,7 +166,7 @@
     <string name="issueCreated">Novo incidente criado com sucesso</string>
     <string name="issueCreatedError">Algo deu errado, por favor, tente de novo</string>
     <string name="issueCreatedNoMilestone">Sem meta</string>
-    <string name="noAssigneesFound">Nenhum colaborador encontrado</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">Nenhuma marcador encontrado</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Tradução</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Rascunho dos comentários</string>
     <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="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <!-- settings -->
     <string name="noMoreData">Não há mais dados disponíveis</string>
     <string name="createLabel">Novo marcador</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Marcador excluído</string>
     <string name="labelDeleteErrorText">Algo deu errado, por favor, tente de novo</string>
     <string name="noDataBranchesTab">Nenhuma branch encontrada</string>
+    <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Erro de autorização</string>
     <string name="alertDialogTokenRevokedMessage">Parece que o Token de Acesso foi revogado OU você não está autorizado para ver esses conteúdos.\n\nNo caso de token ser revogado, faça o logout e login de novo</string>
     <string name="alertDialogTokenRevokedCopyNegativeButton">Cancelar</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Aplicar Rebase e Merge</string>
     <string name="mergeOptionRebaseCommit">Aplicar Rebase e Merge (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Aplicar Squash e Merge</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Baixar este arquivo</string>
     <string name="waitLoadingDownloadFile">Aguarde que o arquivo seja carregado para a memória</string>
     <string name="downloadFileSaved">Arquivo salvo com êxito</string>
@@ -514,13 +525,13 @@
     <string name="draftsDeleteSuccess">Rascunhos excluídos com êxito</string>
     <string name="draftsSingleDeleteSuccess">Rascunho excluído com êxito</string>
     <string name="deleteAllDraftsDialogMessage">Isso vai excluir todos os rascunhos para essa conta. \n\nProsseguir com a exclusão?</string>
-    <string name="draftSaved">Rascunho salvo</string>
-    <string name="appearanceHintText">Temas, fontes, badges, tema do bloco de código</string>
+    <string name="draftSaved">O rascunho foi salvo automaticamente.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">Modo PDF, tema do código fonte</string>
-    <string name="securityHintText">Certificados SSL, cache e atraso de pesquisa</string>
+    <string name="securityHintText">SSL certificates, cache</string>
     <string name="languagesHintText">Idiomas</string>
     <string name="reportsHintText">Relatórios de erros</string>
-    <string name="rateAppHintText">If you like GitNex you can give it a thumbs up</string>
+    <string name="rateAppHintText">Se você gosta do GitNex você pode dar um joinha</string>
     <string name="aboutAppHintText">App version, build, user gitea version</string>
     <string name="archivedRepository">Arquivado</string>
     <string name="accountDeletedMessage">Conta excluída com êxito</string>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notificações</string>
     <string name="noDataNotifications">Sem notificações</string>
-    <string name="notificationBody">Você recebeu uma nova notificação. (%s)</string>
     <string name="notificationsPollingHeaderText">Atraso da Enquete das Notificações</string>
     <string name="pollingDelaySelectedText">%d Minutos</string>
     <string name="pollingDelayDialogHeaderText">Selecionar atraso da votação</string>
@@ -543,47 +553,62 @@
     <string name="markAsUnread">Marcar como não lida</string>
     <string name="pinNotification">Notificação do Pin</string>
     <string name="markedNotificationsAsRead">Todas as notificações marcadas como lidas</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Lida</string>
     <string name="isUnread">Não Lida</string>
-    <string name="repoSettingsTitle">Repository Settings</string>
-    <string name="repoSettingsEditProperties">Edit Properties</string>
-    <string name="repoSettingsDelete">Delete Repository</string>
-    <string name="repoSettingsDeleteHint">Be careful, this operation CANNOT be undone!</string>
-    <string name="repoPropertiesTemplate">Set as Template</string>
+    <string name="repoSettingsTitle">Configurações do repositório</string>
+    <string name="repoSettingsEditProperties">Editar propriedades</string>
+    <string name="repoSettingsDelete">Deletar repositório</string>
+    <string name="repoSettingsDeleteHint">Tenha cuidado, essa operação NÃO pode ser desfeita!</string>
+    <string name="repoPropertiesTemplate">Definir como Template</string>
     <string name="repoPropertiesEnableIssues">Enable Issues</string>
     <string name="repoPropertiesExternalIssuesUrl">External Issue Tracker Url</string>
     <string name="repoPropertiesEnableWiki">Enable Wiki</string>
     <string name="repoPropertiesExternalWikiUrl">External Wiki Url</string>
-    <string name="repoPropertiesEnablePr">Enable Pull Requests</string>
+    <string name="repoPropertiesEnablePr">Ativar Pull Requests</string>
     <string name="repoPropertiesEnableTimeTracker">Enable Time Tracker</string>
     <string name="repoPropertiesEnableMergeCommits">Enable Merge Commits</string>
     <string name="repoPropertiesEnableRebase">Enable Rebase</string>
-    <string name="repoPropertiesEnableSquash">Enable Squash and Merge</string>
+    <string name="repoPropertiesEnableSquash">Ativar Squash e Merge</string>
     <string name="repoPropertiesEnableForceMerge">Enable Rebase with Merge Commits (&#8212;&#8212;no-ff)</string>
-    <string name="repoPropertiesSaveSuccess">Repository properties updated successfully</string>
+    <string name="repoPropertiesSaveSuccess">Propriedades do repositório atualizadas com sucesso</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="repoSettingsDeleteError">Repository name does not match</string>
-    <string name="repoDeletionSuccess">Repository deleted successfully</string>
+    <string name="repoDeletionSuccess">Repositório deletado com sucesso</string>
     <string name="repoSettingsTransferOwnership">Transfer Ownership</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="repoTransferText">Perform Transfer</string>
+    <string name="repoSettingsTransferOwnershipHint">Transferir este repositório para um outro usuário ou para uma organização onde você tem permissões de administrador</string>
+    <string name="repoSettingsTransferOwnershipDescription">Coisas para saber antes da transferência:\n\n- Você irá perder acesso ao repositório se você transferir-o para um usuário individual.\n- Você irá manter o acesso ao repositório se você transferir para uma organização que você (co-)pertence.\n\nInsira o nome do repositório como confirmação</string>
+    <string name="repoTransferText">Realizar Transferência</string>
     <string name="repoTransferOwnerText">New Owner</string>
-    <string name="repoTransferSuccess">Repository transferred successfully</string>
+    <string name="repoTransferSuccess">Repositório transferido com sucesso</string>
     <string name="repoTransferOwnerError">New owner is required</string>
     <string name="repoTransferError">There is a problem with the owner name. Make sure that the new owner exists</string>
-    <string name="exploreFilterDialogTitle">Filter Repositories</string>
-    <string name="exploreFilterIncludeTopic">Search ONLY in Topic</string>
-    <string name="exploreFilterIncludeDesc">Search in Description</string>
-    <string name="exploreFilterIncludeArchive">Only Archived Repositories</string>
-    <string name="exploreFilterIncludePrivate">Only Private Repositories</string>
-    <string name="exploreFilterIncludeTemplateRepos">Search in Template Repositories</string>
-    <string name="mergeIntoBranch">Merge Into</string>
-    <string name="pullFromBranch">Pull From</string>
-    <string name="sameBranchesError">These branches are equal. There is no need to create a pull request</string>
-    <string name="mergeIntoError">Merge into branch is required</string>
-    <string name="pullFromError">Pull from branch is required</string>
-    <string name="titleError">Title is required</string>
-    <string name="prCreateSuccess">Pull Request created successfully</string>
-    <string name="prAlreadyExists">A pull request between these branches already exists</string>
+    <string name="exploreFilterDialogTitle">Filtrar Repositórios</string>
+    <string name="exploreFilterIncludeTopic">Pesquisar APENAS em Tópico</string>
+    <string name="exploreFilterIncludeDesc">Pesquisar em Descrição</string>
+    <string name="exploreFilterIncludeArchive">Apenas Repositórios Arquivados</string>
+    <string name="exploreFilterIncludePrivate">Apenas Repositórios Privados</string>
+    <string name="exploreFilterIncludeTemplateRepos">Pesquisar em Repositórios de Template</string>
+    <string name="mergeIntoBranch">Merge em</string>
+    <string name="pullFromBranch">Pull de</string>
+    <string name="sameBranchesError">Essas branches estão iguais. Não há necessidade de criar uma pull request</string>
+    <string name="mergeIntoError">Merge em branch é obrigatório</string>
+    <string name="pullFromError">Pull de uma branch é obrigatório</string>
+    <string name="titleError">Título é obrigatório</string>
+    <string name="prCreateSuccess">Pull Request criado com sucesso</string>
+    <string name="prAlreadyExists">Já existe um pull request entre estas branches</string>
+    <string name="accountDoesNotExist">Parece que a conta para a URI %1$s não existe no aplicativo. Você pode adicionar uma tocando no botão de Adicionar Uma Conta.</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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2e273c46..add3d7ee 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Репозиторий успешно создан!</string>
     <string name="repoCreatedError">Что-то пошло не так. Пожалуйста, попытайтесь еще раз.</string>
     <string name="repoExistsError">Репозиторий с таким именему уже существует у выбранного владельца</string>
+    <string name="repoOwnerError">Select owner for the repository</string>
     <string name="orgNameErrorEmpty">Название организации пустое.</string>
     <string name="orgNameErrorInvalid">Недоступное название организации. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Описание организации превышает 255 символов.</string>
@@ -165,7 +166,7 @@
     <string name="issueCreated">Задача успешно добавлена!</string>
     <string name="issueCreatedError">Что-то пошло не так. Пожалуйста, попытайтесь еще раз.</string>
     <string name="issueCreatedNoMilestone">Нет вехи</string>
-    <string name="noAssigneesFound">Сотрудников не обнаружено</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">Меток не обнаружено</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Перевод</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Черновик комментариев</string>
     <string name="settingsEnableCommentsDeletionText">Включить удаление черновиков</string>
     <string name="settingsEnableCommentsDeletionHintText">Удалить черновик комментария при публикации комментария</string>
+    <string name="settingsGeneralHeader">General</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="linkSelectorDialogTitle">Select Default Link Handler Screen</string>
     <!-- settings -->
     <string name="noMoreData">Больше даных нет</string>
     <string name="createLabel">Создание метки</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Метка удалена!</string>
     <string name="labelDeleteErrorText">Что-то пошло не так. Пожалуйста, попытайтесь еще раз.</string>
     <string name="noDataBranchesTab">Веток не обнаружено</string>
+    <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Ошибка авторизации</string>
     <string name="alertDialogTokenRevokedMessage">Похоже, токен доступа отозван, либо вам не разрешено просматривать это содержимое.\n\nВ случае отзыва токена, пожалуйста, выйдите из системы и войдите снова</string>
     <string name="alertDialogTokenRevokedCopyNegativeButton">Закрыть</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Выполнить rebase и принять PR</string>
     <string name="mergeOptionRebaseCommit">Выполнить rebase и принять PR (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Объединить и принять PR</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Скачать этот файл</string>
     <string name="waitLoadingDownloadFile">Пожалуйста дождитесь загрузки файла</string>
     <string name="downloadFileSaved">Файл успешно сохранён</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Черновики успешно удалены</string>
     <string name="draftsSingleDeleteSuccess">Черновик успешно удален</string>
     <string name="deleteAllDraftsDialogMessage">Это приведет к удалению всех черновиков для этой учетной записи. \n\nПродолжить удаление?</string>
-    <string name="draftSaved">Черновик сохранён</string>
-    <string name="appearanceHintText">Темы, шрифты, значки, тема блока кода</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF режим, исходный код темы</string>
-    <string name="securityHintText">SSL-сертификаты, кэш, задержка опроса</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Уведомления</string>
     <string name="noDataNotifications">Уведомления не найдены</string>
-    <string name="notificationBody">Вы получили новое уведомление. (%s)</string>
     <string name="notificationsPollingHeaderText">Задержка опроса уведомлений</string>
     <string name="pollingDelaySelectedText">%d Минут</string>
     <string name="pollingDelayDialogHeaderText">Выбрать задержку опроса</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Отметить как непрочитанное</string>
     <string name="pinNotification">Прикрепить уведомление</string>
     <string name="markedNotificationsAsRead">Все уведомления успешно помечены как прочитанные</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Прочитано</string>
     <string name="isUnread">Непрочитано</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index a2efc188..eaa7e4ee 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Репозиторијум је успешно креиран</string>
     <string name="repoCreatedError">Нешто је пошло наопако, покушај поново</string>
     <string name="repoExistsError">Репозиторијум већ постоји</string>
+    <string name="repoOwnerError">Select owner for the repository</string>
     <string name="orgNameErrorEmpty">Назив организације је обавезан</string>
     <string name="orgNameErrorInvalid">Назив организације није валидан [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Опис је дужи од максималних 255 карактера</string>
@@ -165,7 +166,7 @@
     <string name="issueCreated">Проблем је успешно креиран</string>
     <string name="issueCreatedError">Нешто је пошло наопако, покушај поново</string>
     <string name="issueCreatedNoMilestone">Без назива фазе</string>
-    <string name="noAssigneesFound">Ниједан сарадник није пронађен</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">Ниједна ознака није пронађена</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Превод</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">Нема више података</string>
     <string name="createLabel">Нова ознака</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Ознака је избрисана</string>
     <string name="labelDeleteErrorText">Нешто је пошло наопако, покушај поново</string>
     <string name="noDataBranchesTab">Ниједна грана није пронађена</string>
+    <string name="selectBranchError">Select a branch for release</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="alertDialogTokenRevokedCopyNegativeButton">Откажи</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Rebase and Merge</string>
     <string name="mergeOptionRebaseCommit">Rebase and Merge (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Squash and Merge</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Преузми овај фајл</string>
     <string name="waitLoadingDownloadFile">Сачекај да се фајл учита у меморију</string>
     <string name="downloadFileSaved">File saved successfully</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Themes, fonts, badges, code block theme</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF mode, source code theme</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 095aa684..3eb8b36b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Depo başarıyla oluşturuldu</string>
     <string name="repoCreatedError">Bir şeyler ters gitti lütfen tekrar deneyin</string>
     <string name="repoExistsError">Bu adın deposu, seçilen Sahibi altında zaten var</string>
+    <string name="repoOwnerError">Select owner for the repository</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>
@@ -165,7 +166,7 @@
     <string name="issueCreated">Yeni konu başarıyla oluşturuldu</string>
     <string name="issueCreatedError">Bir şeyler ters gitti, lütfen tekrar deneyin</string>
     <string name="issueCreatedNoMilestone">No milestone</string>
-    <string name="noAssigneesFound">İşbirlikçi bulunamadı</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">Etiket bulunamadı</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Çeviri</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">Daha fazla veri yok</string>
     <string name="createLabel">Yeni Etiket</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Etiket silindi</string>
     <string name="labelDeleteErrorText">Bir şeyler ters gitti, lütfen tekrar deneyin</string>
     <string name="noDataBranchesTab">Dal bulunamadı</string>
+    <string name="selectBranchError">Select a branch for release</string>
     <string name="alertDialogTokenRevokedTitle">Yetkilendirme Hatası</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="alertDialogTokenRevokedCopyNegativeButton">İptal</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Rebase and Merge</string>
     <string name="mergeOptionRebaseCommit">Rebase and Merge (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Squash and Merge</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Download This File</string>
     <string name="waitLoadingDownloadFile">Please wait for the file to load to memory</string>
     <string name="downloadFileSaved">File saved successfully</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Themes, fonts, badges, code block theme</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">PDF mode, source code theme</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 837d70b4..0a75e74b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">Репозиторій створено успішно</string>
     <string name="repoCreatedError">Щось пішло не так. Будь ласка, спробуйте знову</string>
     <string name="repoExistsError">Репозиторій із такою назвою вже існує в обраного власника</string>
+    <string name="repoOwnerError">Select owner for the repository</string>
     <string name="orgNameErrorEmpty">Назва організації порожня</string>
     <string name="orgNameErrorInvalid">Назва організації некоректна, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">Довжина опису організації перевищує 255 символів</string>
@@ -165,7 +166,7 @@
     <string name="issueCreated">Нову проблему створено успішно</string>
     <string name="issueCreatedError">Щось пішло не так. Будь ласка, спробуйте знову</string>
     <string name="issueCreatedNoMilestone">Етап відсутній</string>
-    <string name="noAssigneesFound">Співавторів не знайдено</string>
+    <string name="noAssigneesFound">No assignees found</string>
     <string name="noLabelsFound">Міток не знайдено</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Переклад</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">Comments draft</string>
     <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="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>
     <!-- settings -->
     <string name="noMoreData">Даних більше немає</string>
     <string name="createLabel">Створити мітку</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">Мітку видалено</string>
     <string name="labelDeleteErrorText">Щось пішло не так. Будь ласка, спробуйте знову</string>
     <string name="noDataBranchesTab">Гілок не знайдено</string>
+    <string name="selectBranchError">Select a branch for release</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="alertDialogTokenRevokedCopyNegativeButton">Скасувати</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">Зробити Rebase і злити</string>
     <string name="mergeOptionRebaseCommit">Rebase та Об\'єднати (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">Об\'єднати (Squash) і злити</string>
+    <string name="mergeStrategy">Merge Strategy</string>
+    <string name="selectMergeStrategy">Select merge strategy</string>
+    <string name="mergeNotAllowed">Not allowed to merge [Reason: Does not have enough approvals]</string>
     <string name="downloadFile">Завантажити цей файл</string>
     <string name="waitLoadingDownloadFile">Зачекайте, поки файл завантажиться</string>
     <string name="downloadFileSaved">Файл успішно збережений</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">Drafts deleted successfully</string>
     <string name="draftsSingleDeleteSuccess">Draft deleted successfully</string>
     <string name="deleteAllDraftsDialogMessage">This will delete all the drafts for this account. \n\nProceed with deletion?</string>
-    <string name="draftSaved">Draft saved</string>
-    <string name="appearanceHintText">Теми, шрифти, значки, тема блоку коду</string>
+    <string name="draftSaved">Draft was saved automatically.</string>
+    <string name="appearanceHintText">Themes, fonts, badges</string>
     <string name="fileViewerHintText">Режим PDF-версії, тема відображення коду</string>
-    <string name="securityHintText">SSL certificates, cache, polling delay</string>
+    <string name="securityHintText">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>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">Notifications</string>
     <string name="noDataNotifications">No notifications found</string>
-    <string name="notificationBody">You have received a new notification. (%s)</string>
     <string name="notificationsPollingHeaderText">Notifications Polling Delay</string>
     <string name="pollingDelaySelectedText">%d Minutes</string>
     <string name="pollingDelayDialogHeaderText">Select Polling Delay</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">Mark as Unread</string>
     <string name="pinNotification">Pin Notification</string>
     <string name="markedNotificationsAsRead">Successfully marked all notifications as read</string>
+    <string name="notificationsHintText">Polling delay, light, vibration</string>
+    <string name="enableNotificationsHeaderText">Enable Notifications</string>
+    <string name="enableLightsHeaderText">Enable Light</string>
+    <string name="enableVibrationHeaderText">Enable Vibration</string>
+    <string name="chooseColorSelectorHeader">Choose Color</string>
+    <string name="newMessages">New messages</string>
+    <string name="youHaveGotNewNotifications">You\'ve got %d new notifications.</string>
     <string name="isRead">Read</string>
     <string name="isUnread">Unread</string>
     <string name="repoSettingsTitle">Repository Settings</string>
@@ -586,4 +603,12 @@
     <string name="titleError">Title is required</string>
     <string name="prCreateSuccess">Pull Request created successfully</string>
     <string name="prAlreadyExists">A pull request between these branches already exists</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="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="codeBlockGreenOnBlack">Green on Black</string>
+    <string name="codeBlockWhiteOnBlack">White on Black</string>
+    <string name="codeBlockGreyOnBlack">Grey on Black</string>
+    <string name="codeBlockWhiteOnGrey">White on Grey</string>
+    <string name="codeBlockDarkOnWhite">Dark on White</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index dbc8db06..3892ef20 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -83,6 +83,7 @@
     <string name="repoCreated">仓库创建成功</string>
     <string name="repoCreatedError">出错了，请重试</string>
     <string name="repoExistsError">当前所有者已拥有同名仓库</string>
+    <string name="repoOwnerError">选择仓库所有者</string>
     <string name="orgNameErrorEmpty">组织名称为空</string>
     <string name="orgNameErrorInvalid">组织名称无效, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="orgDescError">组织描述超过最大255个字符限制</string>
@@ -165,7 +166,7 @@
     <string name="issueCreated">新问题创建成功</string>
     <string name="issueCreatedError">出了错，请重试</string>
     <string name="issueCreatedNoMilestone">没有里程碑</string>
-    <string name="noAssigneesFound">未找到合作者</string>
+    <string name="noAssigneesFound">未找到受让人</string>
     <string name="noLabelsFound">未找到标签</string>
     <!-- settings -->
     <string name="settingsLanguageHeaderText">翻译</string>
@@ -207,6 +208,12 @@
     <string name="draftsHintText">评论草稿</string>
     <string name="settingsEnableCommentsDeletionText">启用草稿删除</string>
     <string name="settingsEnableCommentsDeletionHintText">发表评论时删除评论草稿</string>
+    <string name="settingsGeneralHeader">常规​​​​​</string>
+    <string name="generalHintText">主屏幕、默认的链接处理程序</string>
+    <string name="generalDeepLinkDefaultScreen">默认链接处理程序</string>
+    <string name="generalDeepLinkDefaultScreenHintText">如果应用无法处理外部链接，请选择应加载的屏幕。 它会自动把你重定向。</string>
+    <string name="generalDeepLinkSelectedText">N/A</string>
+    <string name="linkSelectorDialogTitle">选择默认链接处理程序屏幕</string>
     <!-- settings -->
     <string name="noMoreData">没有更多可用数据</string>
     <string name="createLabel">创建标签</string>
@@ -225,6 +232,7 @@
     <string name="labelDeleteText">标签已删除</string>
     <string name="labelDeleteErrorText">出了错，请重试</string>
     <string name="noDataBranchesTab">未找到分支</string>
+    <string name="selectBranchError">选择用于发行的分支</string>
     <string name="alertDialogTokenRevokedTitle">授权错误</string>
     <string name="alertDialogTokenRevokedMessage">看来访问令牌已被吊销，或者您不被允许查看这些内容。\n\n如果令牌被吊销，请注销并重新登录</string>
     <string name="alertDialogTokenRevokedCopyNegativeButton">取消</string>
@@ -463,6 +471,9 @@
     <string name="mergeOptionRebase">重建并合并</string>
     <string name="mergeOptionRebaseCommit">重建合并 (&#45;&#45;no-ff)</string>
     <string name="mergeOptionSquash">压缩提交并合并</string>
+    <string name="mergeStrategy">合并策略</string>
+    <string name="selectMergeStrategy">选择合并策略</string>
+    <string name="mergeNotAllowed">不允许合并 [理由：没有足够多的认可]</string>
     <string name="downloadFile">下载此文件</string>
     <string name="waitLoadingDownloadFile">请等待文件加载到内存</string>
     <string name="downloadFileSaved">文件保存成功</string>
@@ -514,10 +525,10 @@
     <string name="draftsDeleteSuccess">已成功删除草稿</string>
     <string name="draftsSingleDeleteSuccess">草稿已成功删除</string>
     <string name="deleteAllDraftsDialogMessage">这将删除此帐户的所有草稿。 \n\n继续删除？</string>
-    <string name="draftSaved">草稿已保存</string>
-    <string name="appearanceHintText">主题、 字体、 徽章、 代码块主题</string>
+    <string name="draftSaved">草稿已自动保存。</string>
+    <string name="appearanceHintText">主题、字体、徽章</string>
     <string name="fileViewerHintText">PDF 模式，源代码主题</string>
-    <string name="securityHintText">SSL 证书、缓存、轮询延迟</string>
+    <string name="securityHintText">SSL 证书、缓存</string>
     <string name="languagesHintText">语言</string>
     <string name="reportsHintText">崩溃报告</string>
     <string name="rateAppHintText">如果你喜欢GitNex，你可以给它点赞</string>
@@ -534,7 +545,6 @@
     <!-- Notifications -->
     <string name="pageTitleNotifications">通知</string>
     <string name="noDataNotifications">没有找到通知</string>
-    <string name="notificationBody">您收到了一个新的通知。(%s)</string>
     <string name="notificationsPollingHeaderText">通知轮询延迟</string>
     <string name="pollingDelaySelectedText">%d 分钟</string>
     <string name="pollingDelayDialogHeaderText">选择轮询延迟</string>
@@ -543,6 +553,13 @@
     <string name="markAsUnread">标记为未读</string>
     <string name="pinNotification">固定通知</string>
     <string name="markedNotificationsAsRead">成功将所有通知标记为已读</string>
+    <string name="notificationsHintText">轮询延迟、light、振动</string>
+    <string name="enableNotificationsHeaderText">启用通知</string>
+    <string name="enableLightsHeaderText">启用 Light</string>
+    <string name="enableVibrationHeaderText">启用振动</string>
+    <string name="chooseColorSelectorHeader">选择颜色</string>
+    <string name="newMessages">新消息</string>
+    <string name="youHaveGotNewNotifications">您有%d条新通知</string>
     <string name="isRead">已读</string>
     <string name="isUnread">未读</string>
     <string name="repoSettingsTitle">存储库设置</string>
@@ -586,4 +603,12 @@
     <string name="titleError">标题不可为空</string>
     <string name="prCreateSuccess">拉取请求创建成功</string>
     <string name="prAlreadyExists">这些分支之间的拉取请求已存在</string>
+    <string name="accountDoesNotExist">似乎应用程序中并不存在URI%1$s的账户。您可以通过点击添加新帐户按钮来添加一个。</string>
+    <string name="launchApp">前往应用</string>
+    <string name="noActionText">GitNex无法处理所请求的资源，您可以在项目代码库中发起一个问题，提供工作细节。只需从下面的按钮启动一个默认屏幕，您可通过设置更改默认屏。</string>
+    <string name="codeBlockGreenOnBlack">黑底绿字</string>
+    <string name="codeBlockWhiteOnBlack">黑底白字</string>
+    <string name="codeBlockGreyOnBlack">黑底灰字</string>
+    <string name="codeBlockWhiteOnGrey">灰底白字</string>
+    <string name="codeBlockDarkOnWhite">白底黑字</string>
 </resources>