locale: sync from Crowdin

conf/app.ini

@@ -453,8 +453,8 @@ NEWS_FEED_PAGING_NUM = 20
 COMMITS_PAGING_NUM = 30
 
 [i18n]
-LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR,gl-ES,uk-UA,en-GB,hu-HU
+LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR,gl-ES,uk-UA,en-GB,hu-HU,sk-SK
-NAMES = English,简体中文,繁體中文（香港）,繁體中文（臺灣）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어,galego,українська,English (United Kingdom),Magyar
+NAMES = English,简体中文,繁體中文（香港）,繁體中文（臺灣）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어,galego,українська,English (United Kingdom),Magyar,slovenský
 
 ; Used for datetimepicker
 [i18n.datelang]

conf/locale/locale_bg-BG.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Проверката за конфликт все още е в
 pulls.can_auto_merge_desc=Може да се извърши обединяване на тази заявка за сливане.
 pulls.cannot_auto_merge_desc=Не може да се извърши обединяване, защото съществуват конфликти между ревизиите.
 pulls.cannot_auto_merge_helper=Моля, използвайте инструменти на командния ред за да разрешите конфликтите.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Обедини заявка за сливане
 pulls.open_unmerged_pull_exists=`Невъзможно повторно отваряне, защото вече съществува заявка за сливане (#%d) от същото хранилище със същата информация за обединяване, която чака да бъде извършена`
 pulls.delete_branch=Изтрий клон
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Цифров
 settings.tracker_issue_style.alphanumeric=Символен
 settings.tracker_url_format_desc=Можете да използвате текстови маркери <code>{user} {repo} {index}</code> за потребителско име, име на хранилище и индекс на задача съответно.
 settings.pulls_desc=Включва заявки за сливане за да може да се приемат външни доработки
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Опасна зона
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Новият притежател вече има хранилище със същото име. Изберете друго име.
@@ -1096,6 +1100,7 @@ auths.domain=Домейн
 auths.host=Сървър
 auths.port=Порт
 auths.bind_dn=Име (DN) за свръзка
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Парола за свръзка
 auths.bind_password_helper=Внимание: Тази парола се запазва некриптирана. Моля използвайте потребител, който няма административен достъп.
 auths.user_base=Базов OU за търсене
@@ -1136,6 +1141,7 @@ auths.still_in_used=Това удостоверяване все още се и
 auths.deletion_success=Удостоверяването е изтрито успешно!
 auths.login_source_exist=Източник за валидация на потребители "%s" вече съществува.
 
+config.not_set=(not set)
 config.server_config=Сървърни настройки
 config.app_name=Име на приложението
 config.app_ver=Версия на приложението
@@ -1172,6 +1178,9 @@ config.disable_http_git=Забраняване на HTTP Git
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Настройки на базата данни
 config.db_type=Тип
 config.db_host=Сървър

conf/locale/locale_cs-CZ.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Kontrola rozporů stále pokračuje, prosím obnovte za někol
 pulls.can_auto_merge_desc=Tento požadavek na natažení může být automaticky sloučen.
 pulls.cannot_auto_merge_desc=Tento požadavek na natažení nemůže být automaticky sloučen, neboť se v něm nachází rozpory.
 pulls.cannot_auto_merge_helper=Prosím proveďte sloučení ručně, aby byly vyřešeny rozpory.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Sloučit požadavek na natažení
 pulls.open_unmerged_pull_exists=`Nemůžete znovuotevřít požadavek na natažení, neboť požadavek na natažení ze stejného repositáře se stejnými informacemi pro sloučení již existuje (#%d) a čeká na sloučení.`
 pulls.delete_branch=Smazat větev
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Číselný
 settings.tracker_issue_style.alphanumeric=Alfanumerický
 settings.tracker_url_format_desc=Můžete použít zástupné výrazy <code>{user} {repo} {index}</code> pro uživatelské jméno, název repositáře a číslo úkolu.
 settings.pulls_desc=Povolit požadavky na natažení, aby mohly být příspěvky veřejnosti akceptovány
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Nebezpečná zóna
 settings.cannot_fork_to_same_owner=Nemůžete rozštěpit repositář jejímu vlastníkovi.
 settings.new_owner_has_same_repo=Nový vlastník již repositář se stejným názvem má. Vyberte, prosím, jiné jméno.
@@ -1096,6 +1100,7 @@ auths.domain=Doména
 auths.host=Server
 auths.port=Port
 auths.bind_dn=Připojení DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Heslo připojení
 auths.bind_password_helper=Upozornění: Toto heslo je ukládáno nešifrované. Nepoužívejte pro správcovské účty.
 auths.user_base=Výchozí místo hledání uživatelů
@@ -1136,6 +1141,7 @@ auths.still_in_used=Tento způsob ověřování je stále používán některým
 auths.deletion_success=Způsob ověřování byl smazán!
 auths.login_source_exist=Zdroj přihlášení '%s' již existuje.
 
+config.not_set=(not set)
 config.server_config=Nastavení serveru
 config.app_name=Název aplikace
 config.app_ver=Verze aplikace
@@ -1172,6 +1178,9 @@ config.disable_http_git=Vypnout HTTP Git
 config.enable_local_path_migration=Povolit migraci z místní cesty
 config.commits_fetch_concurrency=Souběžnost vyzvednutí revizí
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Nastavení databáze
 config.db_type=Typ
 config.db_host=Server

conf/locale/locale_de-DE.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Die Konfliktprüfung läuft noch. Bitte aktualisieren Sie die
 pulls.can_auto_merge_desc=Dieser Pull-Request kann automatisch zusammengeführt werden.
 pulls.cannot_auto_merge_desc=Dieser Pull-Request kann nicht automatisch zusammengeführt werden, da es Konflikte gibt.
 pulls.cannot_auto_merge_helper=Bitte manuell zusammenführen, um die Konflikte zu lösen.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Pull-Request zusammenführen
 pulls.open_unmerged_pull_exists=`Sie können diesen Pull-Request nicht wieder öffnen, da bereits ein offener Pull-Request (#%d) aus dem selben Repository mit den gleichen Merge-Informationen existiert und auf das Zusammenführen wartet.`
 pulls.delete_branch=Zweig löschen
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numerisch
 settings.tracker_issue_style.alphanumeric=Alphanumerisch
 settings.tracker_url_format_desc=Sie können die Platzhalter <code>{user} {repo} {index}</code> für den Benutzernamen, den Namen des Repositories und die Issue-Nummer verwenden.
 settings.pulls_desc=Pull-Requests aktivieren, um öffentliche Mitwirkung zu ermöglichen
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Gefahrenzone
 settings.cannot_fork_to_same_owner=Besitzer kann das Repository nicht forken.
 settings.new_owner_has_same_repo=Der neue Eigentümer hat bereits ein Repository mit dem gleichen Namen. Bitte wählen Sie einen anderen Namen.
@@ -1096,6 +1100,7 @@ auths.domain=Domain
 auths.host=Host
 auths.port=Port
 auths.bind_dn=DN binden
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Passwort binden
 auths.bind_password_helper=Achtung: Das Passwort wird im Klartext gespeichert. Benutzen Sie kein Konto mit hoher Berechtigungsstufe.
 auths.user_base=Basis für Benutzersuche
@@ -1136,6 +1141,7 @@ auths.still_in_used=Diese Authentifizierung wird noch von einigen Benutzern verw
 auths.deletion_success=Authentifizierung wurde erfolgreich gelöscht!
 auths.login_source_exist=Login-Quelle '%s' ist bereits vorhanden.
 
+config.not_set=(not set)
 config.server_config=Serverkonfiguration
 config.app_name=Name der Anwendung
 config.app_ver=Anwendungsversion
@@ -1172,6 +1178,9 @@ config.disable_http_git=Deaktiviere HTTP-Git
 config.enable_local_path_migration=Erlaube Migration von lokalem Pfad
 config.commits_fetch_concurrency=Anzahl gleichzeitiger Commit-/Fetch-Prozesse
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Datenbankkonfiguration
 config.db_type=Typ
 config.db_host=Host

conf/locale/locale_en-GB.ini

@@ -632,6 +632,8 @@ pulls.is_checking=The conflict checking is still in progress, please refresh pag
 pulls.can_auto_merge_desc=This pull request can be merged automatically.
 pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
 pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Merge Pull Request
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
 pulls.delete_branch=Delete Branch
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numeric
 settings.tracker_issue_style.alphanumeric=Alphanumeric
 settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
 settings.pulls_desc=Enable pull requests to accept public contributions
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Danger Zone
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=The new owner already has a repository with same name. Please choose another name.
@@ -757,7 +761,7 @@ settings.wiki_deletion_success=Repository wiki data have been erased successfull
 settings.delete=Delete This Repository
 settings.delete_desc=Once you delete a repository, there is no going back. Please be certain.
 settings.delete_notices_1=- This operation <strong>CANNOT</strong> be undone.
-settings.delete_notices_2=- This operation will permanently delete everything in this repository, including Git data, issues, comments and collaborator access.
+settings.delete_notices_2=- This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators.
 settings.delete_notices_fork_1=- All forks will become independent after deletion.
 settings.deletion_success=Repository has been deleted successfully!
 settings.update_settings_success=Repository options has been updated successfully.
@@ -1096,6 +1100,7 @@ auths.domain=Domain
 auths.host=Host
 auths.port=Port
 auths.bind_dn=Bind DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Bind Password
 auths.bind_password_helper=Warning: This password is stored in plain text. Do not use a high privileged account.
 auths.user_base=User Search Base
@@ -1136,6 +1141,7 @@ auths.still_in_used=This authentication is still used by some users, please dele
 auths.deletion_success=Authentication has been deleted successfully!
 auths.login_source_exist=Login source '%s' already exists.
 
+config.not_set=(not set)
 config.server_config=Server Configuration
 config.app_name=Application Name
 config.app_ver=Application Version
@@ -1172,6 +1178,9 @@ config.disable_http_git=Disable HTTP Git
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Database Configuration
 config.db_type=Type
 config.db_host=Host

conf/locale/locale_es-ES.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Se está procediendo a la búsqueda de conflictos, por favor a
 pulls.can_auto_merge_desc=Este Pull Request puede ser fusionado automáticamente.
 pulls.cannot_auto_merge_desc=Este Pull Request no puede ser fusionado automáticamente porque hay conflictos.
 pulls.cannot_auto_merge_helper=Por favor, fusiona manualmente para resolver los conflictos.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Fusionar Pull Request
 pulls.open_unmerged_pull_exists=`Usted no puede realizar la operación de reapertura porque en estos momentos existe una solicitud de pull request (#%d) para el mismo repositorio con la misma información que se encuentra a la espera de aprobación`
 pulls.delete_branch=Eliminar la rama
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numérico
 settings.tracker_issue_style.alphanumeric=Alfanumérico
 settings.tracker_url_format_desc=Puedes usar las plantillas <code>{user} {repo} {index}</code> para el nombre de usuario, nombre del repositorio e índice de la incidencia.
 settings.pulls_desc=Habilitar Pull Requests para aceptar contribuciones públicas
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Zona de Peligro
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=El nuevo propietario tiene un repositorio con el mismo nombre.
@@ -1096,6 +1100,7 @@ auths.domain=Dominio
 auths.host=Host
 auths.port=Puerto
 auths.bind_dn=Bind DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Contraseña Bind
 auths.bind_password_helper=Advertencia: La contraseña se almacena como texto plano. No utilice una cuenta con privilegios elevados.
 auths.user_base=Base de búsqueda de usuarios
@@ -1136,6 +1141,7 @@ auths.still_in_used=Este método de autentificación aún es utilizado por algun
 auths.deletion_success=¡La autenticación ha sido eliminada con éxito!
 auths.login_source_exist=El origen de autenticación '%s' ya existe.
 
+config.not_set=(not set)
 config.server_config=Configuración del servidor
 config.app_name=Nombre de la Aplicación
 config.app_ver=Versión de la Aplicación
@@ -1172,6 +1178,9 @@ config.disable_http_git=Desactivar HTTP Git
 config.enable_local_path_migration=Activar la migración de la ruta de acceso Local
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Configuración de la Base de Datos
 config.db_type=Tipo
 config.db_host=Host

conf/locale/locale_fi-FI.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Konfliktin tarkistus on yhä meneillään, ole hyvä ja päivi
 pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti.
 pulls.cannot_auto_merge_desc=Tätä pull-pyyntöä ei voi yhdistää automaattisesti koska on konflikteja.
 pulls.cannot_auto_merge_helper=Ole hyvä ja yhdistä manuaalisesti konfliktien ratkaisemiseksi.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Yhdistä Pull-pyyntö
 pulls.open_unmerged_pull_exists=`Et voi suorittaa uudelleenavaus toimintoa koska on jo olemassa pull-pyyntö (#%d) samasta reposta samoilla yhdistämistiedoilla ja odottaa yhdistämistä.`
 pulls.delete_branch=Poista haara
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numeerinen
 settings.tracker_issue_style.alphanumeric=Aakkosnumeerinen
 settings.tracker_url_format_desc=Voit käyttää paikkamerkkiä <code>{user} {repo} {index}</code> käyttäjänimelle, reponimelle ja vikanumerolle.
 settings.pulls_desc=Ota käyttöön pull-pyynnöt salliaksesi julkiset koodilahjoitukset
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Vaaravyöhyke
 settings.cannot_fork_to_same_owner=Et voi forkata repoa alkuperäiselle omistajalleen.
 settings.new_owner_has_same_repo=Uudella omistajalla on jo samanniminen repo. Ole hyvä ja valitse toinen nimi.
@@ -1096,6 +1100,7 @@ auths.domain=Verkkotunnus
 auths.host=Isäntä
 auths.port=Portti
 auths.bind_dn=Liitä DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Liitä salasana
 auths.bind_password_helper=Varoitus: Tämä salasana tallennetaan tavallisena tekstinä. Älä käytä korkeasti etuoikeutetulla tilillä.
 auths.user_base=Käyttäjä hakuperuste
@@ -1136,6 +1141,7 @@ auths.still_in_used=Tämä todennus on yhä joidenkin käyttäjien käytössä,
 auths.deletion_success=Todennus on poistettu onnistuneesti!
 auths.login_source_exist=Kirjautumislähde '%s' on jo olemassa
 
+config.not_set=(not set)
 config.server_config=Palvelin asetukset
 config.app_name=Sovellus nimi
 config.app_ver=Sovellus versio
@@ -1172,6 +1178,9 @@ config.disable_http_git=Poista käytöstä HTTP Git
 config.enable_local_path_migration=Ota käyttöön paikallisen polun migraatio
 config.commits_fetch_concurrency=Committien noudon samanaikaisuus
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Tietokannan asetukset
 config.db_type=Tyyppi
 config.db_host=Isäntä

conf/locale/locale_fr-FR.ini

@@ -632,6 +632,8 @@ pulls.is_checking=La recherche de conflits est toujours en cours, veuillez rafra
 pulls.can_auto_merge_desc=Cette pull request peut être fusionnée automatiquement.
 pulls.cannot_auto_merge_desc=Cette pull request ne peut être fusionnée automatiquement à cause de conflits.
 pulls.cannot_auto_merge_helper=Fusionner manuellement afin de résoudre les conflits.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Fusionner la Pull Request
 pulls.open_unmerged_pull_exists=`Vous ne pouvez effectuer une réouverture car il y a déjà une pull-request ouverte (#%d) depuis le même dépôt avec les mêmes informations de fusion et est en attente de fusion.`
 pulls.delete_branch=Supprimer la branche
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numérique
 settings.tracker_issue_style.alphanumeric=Alphanumérique
 settings.tracker_url_format_desc=Vous pouvez utiliser l'espace réservé <code>{user} {repo} {index}</code> pour le nom d'utilisateur, le nom du dépôt et le numéro de bug.
 settings.pulls_desc=Activer les pull requests pour accepter les contributions publiques
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Zone de danger
 settings.cannot_fork_to_same_owner=Vous ne pouvez par créer un fork d'un dépot à son propriétaire actuel.
 settings.new_owner_has_same_repo=Le nouveau propriétaire a déjà un dépôt nommé ainsi.
@@ -1096,6 +1100,7 @@ auths.domain=Domaine
 auths.host=Hôte
 auths.port=Port
 auths.bind_dn=Bind DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Bind mot de passe
 auths.bind_password_helper=Avertissement : Ce mot de passe est stocké en clair. N'utilisez pas le mot de passe d'un compte doté de privilèges élevés.
 auths.user_base=Utilisateur Search Base
@@ -1136,6 +1141,7 @@ auths.still_in_used=Cette authentification est encore utilisée par d'autres uti
 auths.deletion_success=L'authentification a été supprimée avec succès !
 auths.login_source_exist=La source de connexion « %s » existe déjà.
 
+config.not_set=(not set)
 config.server_config=Configuration du Serveur
 config.app_name=Nom de l'application
 config.app_ver=Version de l'application
@@ -1172,6 +1178,9 @@ config.disable_http_git=Désactiver Git HTTP
 config.enable_local_path_migration=Activer la migration de chemin locale
 config.commits_fetch_concurrency=Concurrence des récupérations de commits
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Configuration de la Base de Données
 config.db_type=Type
 config.db_host=Hôte

conf/locale/locale_gl-ES.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Estase procedendo á busca de conflitos, por favor, actualice
 pulls.can_auto_merge_desc=Este Pull Request pode ser fusionado automaticamente.
 pulls.cannot_auto_merge_desc=Este Pull Request non pode ser fusionado automaticamente porque hai conflitos.
 pulls.cannot_auto_merge_helper=Por favor, fusiona manualmente para resolver os conflitos.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Fusionar Pull Request
 pulls.open_unmerged_pull_exists=`Vostede non pode realizar a operación de reapertura porque nestes momentos existe unha solicitude de pull request (#%d) para o mesmo repositorio coa mesma información que se encontra á espera de aprobación`
 pulls.delete_branch=Eliminar branch
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numérico
 settings.tracker_issue_style.alphanumeric=Alfanumérico
 settings.tracker_url_format_desc=Podes usar os modelos <code>{user} {repo} {index}</code> para o nome de usuario, nome do repositorio e índice da incidencia.
 settings.pulls_desc=Habilitar Pull Requests para aceptar contribucións públicas
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Zona de perigo
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=O novo propietario ten un repositorio co mesmo nome.
@@ -1096,6 +1100,7 @@ auths.domain=Dominio
 auths.host=Host
 auths.port=Porto
 auths.bind_dn=Bind DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Contrasinal Bind
 auths.bind_password_helper=Advertencia: o contrasinal almacénase como texto plano. Non empregue unha conta con privilexios elevados.
 auths.user_base=Base de busca de usuarios
@@ -1136,6 +1141,7 @@ auths.still_in_used=Este método de autentificación aínda é utilizado por alg
 auths.deletion_success=A autenticación foi eliminada con éxito!
 auths.login_source_exist=Login source '%s' xa existe.
 
+config.not_set=(not set)
 config.server_config=Configuración do servidor
 config.app_name=Nome da aplicación
 config.app_ver=Versión da aplicación
@@ -1172,6 +1178,9 @@ config.disable_http_git=Disable HTTP Git
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Configuración da base de datos
 config.db_type=Tipo
 config.db_host=Host

conf/locale/locale_hu-HU.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Az ütközés ellenőrzés még folyamatban van, frissítsd az
 pulls.can_auto_merge_desc=Ez a beolvasztási kérés automatikusán egyesíthető.
 pulls.cannot_auto_merge_desc=Ez a beolvasztási kérés ütközések miatt nem egyesíthető automatikusan.
 pulls.cannot_auto_merge_helper=Kérlek, egyesítsd kézileg a konfliktusok megoldásához.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Beolvasztási kérés egyesítése
 pulls.open_unmerged_pull_exists=`Nem tudja újranyitni, mert már van egy nyitott egyesítési kérés (#%d) ugyanebben a tárolóban, ugyanezekket az egyesítési információkkal, és végrehajtásra vár.`
 pulls.delete_branch=Ág törlése
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numerikus
 settings.tracker_issue_style.alphanumeric=Alfanumerikus
 settings.tracker_url_format_desc=Az alábbiak helyettesítik a felhasználónevet, repository nevet és hibajegy számot: <code>{user} {repo} {index}</code>.
 settings.pulls_desc=Beolvasztási kérések engedélyezése a nyilvános hozzájárulások végett
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Veszélyes terület
 settings.cannot_fork_to_same_owner=Nem másolható a tároló az eredeti tulajdonosához.
 settings.new_owner_has_same_repo=Az új tulaj már rendelkezik ilyen nevű repository-val. Kérlek, válassz másik nevet.
@@ -1096,6 +1100,7 @@ auths.domain=Tartomány
 auths.host=Állomás
 auths.port=Port
 auths.bind_dn=Bind DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Bind jelszó
 auths.bind_password_helper=Figyelmeztetés: Ez a jelszó egyszerű szöveges formátumban kerül metésre. Ne használjon egy magas szintű jogosultsággal rendelkező fiókot.
 auths.user_base=Felhasználókeresés alapja
@@ -1136,6 +1141,7 @@ auths.still_in_used=A hitelesítési mód még használatban van, mielőtt tör
 auths.deletion_success=Hitelesítési forrás sikeresen törölve!
 auths.login_source_exist=Bejelentkezési forrás "%s" már létezik.
 
+config.not_set=(not set)
 config.server_config=Kiszolgáló konfiguráció
 config.app_name=Alkalmazás neve
 config.app_ver=Alkalmazás verziója
@@ -1172,6 +1178,9 @@ config.disable_http_git=A HTTP protokoll letiltása GIT-hez
 config.enable_local_path_migration=Engedélyezi a migrációt helyi elérési út alapján
 config.commits_fetch_concurrency=Konkurens lekérés
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Adatbázis konfiguráció
 config.db_type=Típus
 config.db_host=Állomás

conf/locale/locale_it-IT.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Il controllo dei conflitti è ancora in corso, per favore aggi
 pulls.can_auto_merge_desc=La pull request può essere mergiata automaticamente.
 pulls.cannot_auto_merge_desc=Questa pull request non può essere mergiata automaticamente perchè ci sono dei conflitti.
 pulls.cannot_auto_merge_helper=Effettua il merge manualmente per risolvere i conflitti.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Unisci Pull Request
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
 pulls.delete_branch=Delete Branch
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numeric
 settings.tracker_issue_style.alphanumeric=Alphanumeric
 settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
 settings.pulls_desc=Abilita le pull requests per accettare contributi pubblici
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Zona Pericolosa
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Il nuovo proprietario ha già un repository con lo stesso nome. Per favore scegli un altro nome.
@@ -1096,6 +1100,7 @@ auths.domain=Dominio
 auths.host=Host
 auths.port=Porta
 auths.bind_dn=Binda DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Binda Password
 auths.bind_password_helper=Attenzione: Questa password è salvata in chiaro. Non usare su un acount con alti privilegi.
 auths.user_base=User Search Base
@@ -1136,6 +1141,7 @@ auths.still_in_used=Questo meccanismo di autenticazione è ancora attivo per alc
 auths.deletion_success=Il meccanismo di autenticazione è stato eliminato!
 auths.login_source_exist=La fonte di autenticazione '%s' esiste già.
 
+config.not_set=(not set)
 config.server_config=Configurazione Server
 config.app_name=Nome Applicazione
 config.app_ver=Versione Applicazione
@@ -1172,6 +1178,9 @@ config.disable_http_git=Disable HTTP Git
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Configurazione Database
 config.db_type=Tipo
 config.db_host=Host

conf/locale/locale_ja-JP.ini

@@ -632,6 +632,8 @@ pulls.is_checking=コンフリクトが発生していないかチェック中
 pulls.can_auto_merge_desc=このプルリクエストは自動的にマージできます。
 pulls.cannot_auto_merge_desc=コンフリクトが発生しているため、このプルリクエストを自動的にマージすることはできません。
 pulls.cannot_auto_merge_helper=競合を解決するためには、手動でマージする必要があります。
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=プルリクエストをマージします。
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
 pulls.delete_branch=ブランチの削除
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=数値
 settings.tracker_issue_style.alphanumeric=英数字
 settings.tracker_url_format_desc=ユーザー名、リポジトリ名、課題番号を埋め込むために <code>{user} {repo} {index}</code> が使用できます。
 settings.pulls_desc=誰でもコントリビュートできるよう、プルリクエストの受け付けを有効にします
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=危険地帯
 settings.cannot_fork_to_same_owner=元の持ち主に向けてフォークすることは出来ません。
 settings.new_owner_has_same_repo=新しいオーナーは、既に同じ名前のリポジトリを持っています。
@@ -1096,6 +1100,7 @@ auths.domain=ドメイン
 auths.host=ホスト
 auths.port=ポート
 auths.bind_dn=バインド DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=バインド パスワード
 auths.bind_password_helper=警告: このパスワードは暗号化されずに格納されます。特権を持つアカウントに使用しないでください。
 auths.user_base=ユーザ検索ベース
@@ -1136,6 +1141,7 @@ auths.still_in_used=この認証を使用しているユーザーがいます。
 auths.deletion_success=認証が正常に削除されました。
 auths.login_source_exist=ログイン ソース '%s' は既に存在します。
 
+config.not_set=(not set)
 config.server_config=サーバーの構成
 config.app_name=アプリケーション名
 config.app_ver=アプリケーションのバージョン
@@ -1172,6 +1178,9 @@ config.disable_http_git=HTTP Git の無効化
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=データベース設定
 config.db_type=タイプ
 config.db_host=ホスト

conf/locale/locale_ko-KR.ini

@@ -633,6 +633,8 @@ pulls.is_checking=아직 컨플릭트 여부 체크 중입니다, 잠시 후 이
 pulls.can_auto_merge_desc=이 풀리퀘스트는 자동적으로 머지될 수 있습니다.
 pulls.cannot_auto_merge_desc=컨플릭이 존재해서 이 풀리퀘스트는 자동을 머지될 수 없습니다.
 pulls.cannot_auto_merge_helper=컨플릭을 해결하려면 수동으로 머지해 주십시오.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=풀리퀘스트 머지
 pulls.open_unmerged_pull_exists=`같은 리파지토리에서 같은 머지 정보로 만들어진 풀리퀘스트 (#%d) 가 이미 오픈 상태이고 머지를 기다리고 있기 때문에 다시 열기 작업을 할 수 없습니다.`
 pulls.delete_branch=브랜치 삭제
@@ -738,6 +740,8 @@ settings.tracker_issue_style.numeric=숫자
 settings.tracker_issue_style.alphanumeric=문자 숫자
 settings.tracker_url_format_desc=<code>{user} {repo} {index}</code> 사용자 명, 저장소 명, 이슈 인덱스를 사용하여 표시자를 사용할 수 있습니다.
 settings.pulls_desc=끌어오기 요청을 공개적으로 기여받을 수 있도록 활성화합니다.
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=위험 설정
 settings.cannot_fork_to_same_owner=본인 소유의 저장소를 본인 명의로 포크할 수 없습니다.
 settings.new_owner_has_same_repo=새로운 소유자가 같은 이름의 저장소를 이미 가지고 있습니다. 다른 이름을 선택해주세요.
@@ -1097,6 +1101,7 @@ auths.domain=도메인
 auths.host=호스트
 auths.port=포트
 auths.bind_dn=DN 연결
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=비밀번호 연결
 auths.bind_password_helper=경고: 이 암호는 일반 텍스트로 저장됩니다. 높은 권한의 계정을 사용하지 마십시오.
 auths.user_base=사용자 검색 기준
@@ -1137,6 +1142,7 @@ auths.still_in_used=이 인증은 아직 몇몇 사용자들이 사용하고 있
 auths.deletion_success=인증이 성공적으로 삭제 되었습니다!
 auths.login_source_exist=로그인 소스 '%s'는 이미 존재합니다.
 
+config.not_set=(not set)
 config.server_config=서버 설정
 config.app_name=애플리케이션 이름
 config.app_ver=응용 프로그램 버전
@@ -1173,6 +1179,9 @@ config.disable_http_git=Disable HTTP Git
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=데이터베이스 설정
 config.db_type=유형
 config.db_host=호스트

conf/locale/locale_lv-LV.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Notiek konfliktu pārbaude, mirkli uzgaidiet un atjaunojiet la
 pulls.can_auto_merge_desc=Šo izmaiņu pieprasījumu var automātiski saplūdināt.
 pulls.cannot_auto_merge_desc=Šis izmaiņu pieprasījums nevar tikt automātiski saplūdināts konfliktu dēļ.
 pulls.cannot_auto_merge_helper=Lūdzu sapludiniet manuāli, lai atrisinātu konfliktus.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Izmaiņu pieprasījuma sapludināšana
 pulls.open_unmerged_pull_exists=`Jūs nevarat veikt atkārtotas atvēršanas darbību, jo jau eksistē izmaiņu pieprasījums (#%d) no šī repozitorija ar tādu pašu sapludināšanas informāciju un gaida sapludināšanu.`
 pulls.delete_branch=Dzēst atzaru
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Cipari
 settings.tracker_issue_style.alphanumeric=Burti un cipari
 settings.tracker_url_format_desc=Jūs varat izmantot <code>{user}{repo}{index}</code> lietotājvārdam, repozitorija nosaukumam un problēmas identifikātoram.
 settings.pulls_desc=Iespējot izmaiņu pieprasījumus lai saņemtu publiskus ieguldījumus
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Bīstamā zona
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Jaunajam īpašniekam jau ir repozitorijs ar šādu nosaukumu.
@@ -1096,6 +1100,7 @@ auths.domain=Domēns
 auths.host=Resursdators
 auths.port=Ports
 auths.bind_dn=Saistīšanas DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Saistīšanas parole
 auths.bind_password_helper=Brīdinājums: Šī parole tiks saglabāta nešifrētā veidā. Neizmantojiet kontu ar augstām privilēģijām.
 auths.user_base=Lietotāja pamatnosacījumi
@@ -1136,6 +1141,7 @@ auths.still_in_used=Daži lietotāji joprojām izmanto šo autentifikācijas vei
 auths.deletion_success=Autentifikācija tika veiksmīgi izdzēsta!
 auths.login_source_exist=Pieteikšanās avots '%s' jau eksistē.
 
+config.not_set=(not set)
 config.server_config=Servera konfigurācija
 config.app_name=Lietotnes nosaukums
 config.app_ver=Lietotnes versija
@@ -1172,6 +1178,9 @@ config.disable_http_git=Atspējot HTTP Git
 config.enable_local_path_migration=Atļaut migrāciju no lokāla ceļa
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Datu bāzes konfigurācija
 config.db_type=Veids
 config.db_host=Resursdators

conf/locale/locale_nl-NL.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Controle van conflicten is nog bezig, ververs deze pagina in e
 pulls.can_auto_merge_desc=Dit pull-request kan automatisch samengevoegd worden.
 pulls.cannot_auto_merge_desc=Dit pull-request kan niet worden gemerged omdat er conflicten zijn.
 pulls.cannot_auto_merge_helper=Gelieve beide versies manueel samen te voegen om de conflicten op te lossen.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Samenvoegen van pull verzoek
 pulls.open_unmerged_pull_exists=U kan de bewerking 'heropenen' niet uitvoeren omdat er al een pull-aanvraag (#%d) is van dezelfde repository met dezelfde informatie. Voeg deze eerst samen. 
 pulls.delete_branch=Aftakking verwijderen
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Nummeriek
 settings.tracker_issue_style.alphanumeric=Alfanummeriek
 settings.tracker_url_format_desc=U kan de aanduidingen <code>{user} {repo} {index}</code> gebruiken voor de gebruikersnaam, de naam van de repository en de lijst van open tickets.
 settings.pulls_desc=Schakel 'pull request' in om publieke bijdragen te mogelijk te maken
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Gevaren zone
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=De nieuwe eigenaar heeft al een repositorie met deze naam
@@ -1096,6 +1100,7 @@ auths.domain=Domein
 auths.host=Host
 auths.port=Poort
 auths.bind_dn=Binden DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Bind wachtwoord
 auths.bind_password_helper=Opgelet: Dit wachtwoord wordt opgeslagen als leesbare tekst. Gebruik geen account met verhoogde rechten.
 auths.user_base=User Search Base
@@ -1136,6 +1141,7 @@ auths.still_in_used=This authentication is still used by some users, please dele
 auths.deletion_success=Authenticatie is met succes verwijderd!
 auths.login_source_exist=Login source '%s' already exists.
 
+config.not_set=(not set)
 config.server_config=Serverconfiguratie
 config.app_name=Applicatienaam
 config.app_ver=Applicatieversie
@@ -1172,6 +1178,9 @@ config.disable_http_git=Disable HTTP Git
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Databaseconfiguratie
 config.db_type=Type
 config.db_host=Host

conf/locale/locale_pl-PL.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Sprawdzanie konfliktów jeszcze trwa, proszę odświeżyć str
 pulls.can_auto_merge_desc=Pull request może być automatycznie scalony.
 pulls.cannot_auto_merge_desc=Pull request nie może być automatycznie scalony z powodu konfliktów.
 pulls.cannot_auto_merge_helper=Proszę scalić ręcznie, aby rozwiązać konflikty.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Scal Pull Request
 pulls.open_unmerged_pull_exists=`Nie można otworzyć ponownie ponieważ już istnieje gotowy do scalenia pull request (#%d) z tego samego repozytorium z tymi samymi informacjami.`
 pulls.delete_branch=Usuń gałąź
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numeryczny
 settings.tracker_issue_style.alphanumeric=Alfanumeryczne
 settings.tracker_url_format_desc=Symbole zastępcze <code>{user} {repo} {index}</code> mogą być użyte dla nazwy użytkownika, nazwy repozytorium i numeru problemu.
 settings.pulls_desc=Włącz obsługę pull request, aby akceptować publiczny wkład
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Strefa niebezpieczeństwa
 settings.cannot_fork_to_same_owner=Nie można sforkować repozytorium do pierwotnego właściciela.
 settings.new_owner_has_same_repo=Nowy właściciel już posiada repozytorium o tej samej nazwie.
@@ -1096,6 +1100,7 @@ auths.domain=Domena
 auths.host=Host
 auths.port=Port
 auths.bind_dn=Bind DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Hasło Bind
 auths.bind_password_helper=Ostrzeżenie: To hasło jest przechowywane w postaci zwykłego tekstu. Nie należy używać wysoko uprzywilejowanego konta.
 auths.user_base=Baza wyszukiwania
@@ -1136,6 +1141,7 @@ auths.still_in_used=Ten rodzaj autentykacji jest wciąż wykorzystywany przez ni
 auths.deletion_success=Uwierzytelnienie zostało usunięte pomyślnie!
 auths.login_source_exist=Login '%s' już istnieje.
 
+config.not_set=(not set)
 config.server_config=Konfiguracja serwera
 config.app_name=Nazwa aplikacji
 config.app_ver=Wersja aplikacji
@@ -1172,6 +1178,9 @@ config.disable_http_git=Wyłącz HTTP Git
 config.enable_local_path_migration=Włącz lokalną ścieżkę migracji
 config.commits_fetch_concurrency=Pobieraj zmiany w trybie równoległym
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Konfiguracja bazy danych
 config.db_type=Typ
 config.db_host=Host

conf/locale/locale_pt-BR.ini

@@ -632,6 +632,8 @@ pulls.is_checking=A verificação do conflito ainda está em progresso, por favo
 pulls.can_auto_merge_desc=O merge deste Pull Pequest pode ser aplicado automaticamente.
 pulls.cannot_auto_merge_desc=O merge deste Pull Request não pode ser aplicado automaticamente pois há conflitos.
 pulls.cannot_auto_merge_helper=Por favor, aplique o merge manualmente para resolver os conflitos.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Solicitação de merge de Pull Request
 pulls.open_unmerged_pull_exists=`Você não pode executar a operação de reabrir porque já existe um Pull request aberto (#%d) do mesmo repositório com as mesmas informações de merge e está esperando pelo merge.`
 pulls.delete_branch=Excluir Branch
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numérico
 settings.tracker_issue_style.alphanumeric=Alfanumérico
 settings.tracker_url_format_desc=Você pode usar o espaço reservado <code>{user} {repo} {index}</code> para o nome do usuário, índice de nome e a questão do repositório.
 settings.pulls_desc=Habilitar Pull Requests para aceitar contribuições públicas
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Zona de perigo
 settings.cannot_fork_to_same_owner=Não se pode realizar fork de um repositório para seu dono original.
 settings.new_owner_has_same_repo=O novo dono já tem um repositório com o mesmo nome. Por favor, escolha outro nome.
@@ -1096,6 +1100,7 @@ auths.domain=Domínio
 auths.host=Host
 auths.port=Porta
 auths.bind_dn=Vincular DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Vincular senha
 auths.bind_password_helper=Atenção: Esta senha é armazenada em texto plano. Não use uma conta com muitos privilégios.
 auths.user_base=Base de pesquisa do usuário
@@ -1136,6 +1141,7 @@ auths.still_in_used=Esta autenticação ainda é usada por alguns usuários. Por
 auths.deletion_success=Autenticação excluída com sucesso!
 auths.login_source_exist=A fonte de login '%s" já existe.
 
+config.not_set=(not set)
 config.server_config=Configuração do servidor
 config.app_name=Nome do aplicativo
 config.app_ver=Versão do aplicativo
@@ -1172,6 +1178,9 @@ config.disable_http_git=Desabilitar Git por HTTP
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Configuração do banco de dados
 config.db_type=Tipo
 config.db_host=Host

conf/locale/locale_ru-RU.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Продолжается проверка конфликтов
 pulls.can_auto_merge_desc=Этот запрос на слияние может быть объединён автоматически.
 pulls.cannot_auto_merge_desc=Этот запрос на слияние не может быть объединён автоматически.
 pulls.cannot_auto_merge_helper=Пожалуйста, совершите слияние вручную для урегулирования конфликтов.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Слить пулл-реквест
 pulls.open_unmerged_pull_exists=`Вы не можете снова открыть, поскольку уже существует запрос на слияние (#%d) из того же репозитория с той же информацией о слиянии и ожидающий слияния. `
 pulls.delete_branch=Удалить ветку
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Цифровой
 settings.tracker_issue_style.alphanumeric=Буквенноцифровой
 settings.tracker_url_format_desc=Вы можете использовать шаблон <code>{user} {repo} {index}</code> для имени пользователя, репозитория и номера задачи.
 settings.pulls_desc=Включить публичные запросы на слияние
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Опасная зона
 settings.cannot_fork_to_same_owner=Вы не можете ответвить репозиторий его же владельцу.
 settings.new_owner_has_same_repo=У нового владельца уже есть хранилище с таким названием.
@@ -1096,6 +1100,7 @@ auths.domain=Домен
 auths.host=Хост
 auths.port=Порт
 auths.bind_dn=Привязать DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Привязать пароль
 auths.bind_password_helper=Внимание: Этот пароль сохранен в небезопасном виде. Не используйте высоко-привилегированную учетную запись.
 auths.user_base=База для поиска пользователя
@@ -1136,6 +1141,7 @@ auths.still_in_used=Эта проверка подлинности до сих
 auths.deletion_success=Канал аутентификации успешно удален!
 auths.login_source_exist=Источник входа '%s' уже существует.
 
+config.not_set=(not set)
 config.server_config=Конфигурация сервера
 config.app_name=Имя приложения
 config.app_ver=Версия приложения
@@ -1172,6 +1178,9 @@ config.disable_http_git=Выключить HTTP Git
 config.enable_local_path_migration=Включить миграцию с локального пути
 config.commits_fetch_concurrency=Параллельность получения коммитов
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Конфигурация базы данных
 config.db_type=Тип
 config.db_host=Хост

conf/locale/locale_sr-SP.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Провера још увек у току, молимо ва
 pulls.can_auto_merge_desc=Овај захтев за спајање може бити обављен аутоматски.
 pulls.cannot_auto_merge_desc=Овај захтев за спајање не може бити обављен аутоматски због сукоба.
 pulls.cannot_auto_merge_helper=Молимо вас, обавите спајање ручно да би сте разрешили сукобе.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Обави спајање
 pulls.open_unmerged_pull_exists=`Неможете поново отворити јер већ постоји захтев за спајање (#%d) из истог спремишта са истим информацијама о спајању и чека спајање.`
 pulls.delete_branch=Избришите грану
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Нумерично
 settings.tracker_issue_style.alphanumeric=Алфанумерично
 settings.tracker_url_format_desc=Можете да користите шаблон <code>{user} {repo} {index}</code> за корисничко име, спремишта и задатака.
 settings.pulls_desc=Омогући систем захтева за спајање да би сте преузели јавних доприноса
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Опасна зона
 settings.cannot_fork_to_same_owner=Не можете поделити спремиште власнику.
 settings.new_owner_has_same_repo=Нови власник већ има спремиште по истим називом. Молимо вас изаберите друго име.
@@ -1096,6 +1100,7 @@ auths.domain=Домен
 auths.host=Хост
 auths.port=Порт
 auths.bind_dn=Bind DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Bind лозинкa
 auths.bind_password_helper=Упозорење: Ова лозинка је сачувана у облику нешифрованом текцту. Не користите високо-привилеговану налог.
 auths.user_base=База претраживање корисника
@@ -1136,6 +1141,7 @@ auths.still_in_used=Овај канал аутентикације још уве
 auths.deletion_success=Канал аутентикације успешно избрисан!
 auths.login_source_exist=Улазни извор '%s' већ постоји.
 
+config.not_set=(not set)
 config.server_config=Конфигурација сервера
 config.app_name=Име апликације
 config.app_ver=Верзија апликације
@@ -1172,6 +1178,9 @@ config.disable_http_git=Онемогући HTTP Git
 config.enable_local_path_migration=Омогући миграцију локалнe путањe
 config.commits_fetch_concurrency=Предузеће Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Конфигурација базе података
 config.db_type=Тип
 config.db_host=Хост

conf/locale/locale_sv-SE.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Konfliktkontroll är fortfarande pågågående, vänligen uppd
 pulls.can_auto_merge_desc=Denna pull-förfrågan kan sammanfogas automatiskt.
 pulls.cannot_auto_merge_desc=Denna pull-förfrågan kan inte sammanfogas automatiskt eftersom det finns konflikter.
 pulls.cannot_auto_merge_helper=Vänligen sammanfoga manuellt för att lösa konflikter.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Sammanfoga Pull-förfrågan
 pulls.open_unmerged_pull_exists=`Du kan inte utföra återöppningsoperationen eftersom det finns redan en öppen pull-förfrågan (#%d) från samma repo med samma sammanfogningsinformation som väntar på sammanfogning.`
 pulls.delete_branch=Ta bort gren
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numerisk
 settings.tracker_issue_style.alphanumeric=Alfanumerisk
 settings.tracker_url_format_desc=Du kan använda platshållaren <code>{user} {repo} {index}</code> för användarnamn, reponamn, och ärendenummer.
 settings.pulls_desc=Aktivera pullförfrågningar för att ta emot publika bidrag
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Högrisksområde
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Den nya ägaren har redan ett repo med det namnet. Vänligen välj ett annat namn.
@@ -1096,6 +1100,7 @@ auths.domain=Domän
 auths.host=Värd
 auths.port=Port
 auths.bind_dn=Bind DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Bind lösenord
 auths.bind_password_helper=Warning: This password is stored in plain text. Do not use a high privileged account.
 auths.user_base=User Search Base
@@ -1136,6 +1141,7 @@ auths.still_in_used=This authentication is still used by some users, please dele
 auths.deletion_success=Authentication has been deleted successfully!
 auths.login_source_exist=Login source '%s' already exists.
 
+config.not_set=(not set)
 config.server_config=Server-konfiguration
 config.app_name=Applikationsnamn
 config.app_ver=Applikationsversion
@@ -1172,6 +1178,9 @@ config.disable_http_git=Disable HTTP Git
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Databaskonfiguration
 config.db_type=Typ
 config.db_host=Värd

conf/locale/locale_tr-TR.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Çakışma kontrolü sürüyor. Lütfen birkaç dakika içinde
 pulls.can_auto_merge_desc=Bu değişiklik isteği otomatik olarak birleştirilebilir.
 pulls.cannot_auto_merge_desc=Çakışmalardan dolayı bu değişiklik isteği otomatik olarak birleştirilemez.
 pulls.cannot_auto_merge_helper=Çakışmaları çözmek için lütfen elle birleştirin.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Değişiklik İsteğini Birleştir
 pulls.open_unmerged_pull_exists=`Yeniden açma işlemini gerçekleştiremezsiniz. Çünkü zaten aynı depodan, aynı birleştirme bilgisiyle açık olan bir değişiklik isteği var (#%d) ve birleştirme bekliyor.`
 pulls.delete_branch=Delete Branch
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Sayısal
 settings.tracker_issue_style.alphanumeric=Alfanumerik
 settings.tracker_url_format_desc=Kullanıcı adı, depo ismi ve hata indeksi için <code>{kullanıcı} {depo} {indeks}</code> tutucusunu kullanabilirsiniz.
 settings.pulls_desc=Herkese açık katkıları kabul etmek için değişiklik isteklerini etkinleştirin
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Tehlike Alanı
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Yeni sahibin aynı isimde başka bir deposu var. Lütfen farklı bir isim seçin.
@@ -1096,6 +1100,7 @@ auths.domain=Alan Adı
 auths.host=Sunucu
 auths.port=Port
 auths.bind_dn=Bağlama DN'i
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Bağlama Parolası
 auths.bind_password_helper=Uyarı: Bu parola, ham halde bir metin dosyası içerisinde saklanacaktır. Yüksek izinli bir hesap kullanmayın.
 auths.user_base=Kullanıcı Arama Tabanı
@@ -1136,6 +1141,7 @@ auths.still_in_used=Bu yetkilendirme hala bazı kullanıcılar tarafından kulla
 auths.deletion_success=Yetkilendirme başarıyla silindi!
 auths.login_source_exist=Login source '%s' already exists.
 
+config.not_set=(not set)
 config.server_config=Sunucu Yapılandırması
 config.app_name=Uygulama Adı
 config.app_ver=Uygulama Sürümü
@@ -1172,6 +1178,9 @@ config.disable_http_git=Disable HTTP Git
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Veritabanı Yapılandırması
 config.db_type=Türü
 config.db_host=Sunucu

conf/locale/locale_uk-UA.ini

@@ -632,6 +632,8 @@ pulls.is_checking=Перевірка конфліктів продовжуєть
 pulls.can_auto_merge_desc=Цей запрос може бути влитий автоматично.
 pulls.cannot_auto_merge_desc=Цей запрос не може бути влитий автоматично, тому що він має конфлікти.
 pulls.cannot_auto_merge_helper=Будь ласка влийте вручну щоб врегулювати конфлікти.
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=Влити запрос на злиття
 pulls.open_unmerged_pull_exists=`Ви не можете перевідкрити, бо вже існує запрос на злиття (#%d) з того самого репозиторію, з тією самою інформацією про злиття, та він очікує на влиття.`
 pulls.delete_branch=Видалити гілку
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Цифровий
 settings.tracker_issue_style.alphanumeric=Буквено-цифровий
 settings.tracker_url_format_desc=Ви можете використовувати заповнювач <code>{user} {repo} {index}</code> для ім'я користувача, назви репозиторію на номеру проблеми.
 settings.pulls_desc=Увімкнути публічні запроси на злиття
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=Небезпечна зона
 settings.cannot_fork_to_same_owner=Ви не можете клонувати репозиторій його ж власнику.
 settings.new_owner_has_same_repo=Новий власник вже має репозиторій з такою назвою.
@@ -1096,6 +1100,7 @@ auths.domain=Домен
 auths.host=Хост
 auths.port=Порт
 auths.bind_dn=Прив'язати DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=Прив'язати пароль
 auths.bind_password_helper=Увага: Цей пароль зберігається як звичайний текст. Не використовуйте профіль з високими повноваженнями.
 auths.user_base=База пошуку користувачів
@@ -1136,6 +1141,7 @@ auths.still_in_used=Цю автентифікацію ще використов
 auths.deletion_success=Автентивікацію було успішно видалено!
 auths.login_source_exist=Джерело входу '%s' вже існує.
 
+config.not_set=(not set)
 config.server_config=Конфігурація сервера
 config.app_name=Назва програми
 config.app_ver=Версія програми
@@ -1172,6 +1178,9 @@ config.disable_http_git=Вимкнути HTTP Git
 config.enable_local_path_migration=Увімкнути міграцію з локального шляху
 config.commits_fetch_concurrency=Запросити коміти конкурентно
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=Налаштування бази даних
 config.db_type=Тип
 config.db_host=Хост

conf/locale/locale_zh-CN.ini

@@ -632,6 +632,8 @@ pulls.is_checking=该合并请求正在进行冲突检查，请稍后再刷新
 pulls.can_auto_merge_desc=该合并请求可以进行自动合并操作。
 pulls.cannot_auto_merge_desc=该合并请求存在冲突，无法进行自动合并操作。
 pulls.cannot_auto_merge_helper=请手动拉取代码变更以解决冲突。
+pulls.create_merge_commit=创建一个新的合并提交
+pulls.rebase_before_merging=合并前先进行衍合
 pulls.merge_pull_request=合并请求
 pulls.open_unmerged_pull_exists=`由于已经存在来自相同仓库和合并信息的未合并请求（#%d），您无法执行重新开启操作。`
 pulls.delete_branch=删除分支
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=纯数字形式
 settings.tracker_issue_style.alphanumeric=英文字母数字组合形式
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分别作为用户名、仓库名和工单索引的占位符。
 settings.pulls_desc=启用合并请求以接受社区贡献
+settings.pulls.ignore_whitespace=忽略空白符号的更改
+settings.pulls.allow_rebase_merge=允许在合并提交时使用衍合
 settings.danger_zone=危险操作区
 settings.cannot_fork_to_same_owner=您不能派生仓库到其当前的所有者。
 settings.new_owner_has_same_repo=新的仓库拥有者已经存在同名仓库！
@@ -1096,6 +1100,7 @@ auths.domain=域名
 auths.host=主机地址
 auths.port=主机端口
 auths.bind_dn=绑定 DN
+auths.bind_dn_helper=可以使用 '%s' 作为用户名的占位符，例如：DOM\%s
 auths.bind_password=绑定密码
 auths.bind_password_helper=警告：该密码将会以明文的形式保存在数据库中。请不要使用拥有高权限的帐户！
 auths.user_base=用户搜索基准
@@ -1136,6 +1141,7 @@ auths.still_in_used=此认证仍旧与一些用户有关联，请先删除或者
 auths.deletion_success=授权源删除成功！
 auths.login_source_exist=登录源 '%s' 已存在。
 
+config.not_set=(未设置)
 config.server_config=服务器配置
 config.app_name=应用名称
 config.app_ver=应用版本
@@ -1172,6 +1178,9 @@ config.disable_http_git=禁用 HTTP Git 操作
 config.enable_local_path_migration=启用本地路径迁移
 config.commits_fetch_concurrency=代码提交拉取并发量
 
+config.http_config=HTTP 配置
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=数据库配置
 config.db_type=数据库类型
 config.db_host=主机地址

conf/locale/locale_zh-HK.ini

@@ -632,6 +632,8 @@ pulls.is_checking=該合併請求正在進行衝突檢查，請稍後再刷新
 pulls.can_auto_merge_desc=這個拉請求可以自動合併。
 pulls.cannot_auto_merge_desc=由於存在衝突，不能自動合併這推送請求。
 pulls.cannot_auto_merge_helper=請手動合併來解決衝突。
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=合併請求
 pulls.open_unmerged_pull_exists=`由於已經存在來自相同倉庫和合併信息的未合併請求（#%d），您無法執行重新開啟操作。`
 pulls.delete_branch=Delete Branch
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=Numeric
 settings.tracker_issue_style.alphanumeric=Alphanumeric
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分別作為用戶名、倉庫名和問題索引的占位符。
 settings.pulls_desc=啟用合併請求以接受社區貢獻
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=危險操作區
 settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=新的倉庫擁有者已經存在同名倉庫！
@@ -1096,6 +1100,7 @@ auths.domain=域名
 auths.host=主機地址
 auths.port=主機端口
 auths.bind_dn=綁定DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=綁定密碼
 auths.bind_password_helper=警告：該密碼將會以明文的形式保存在數據庫中。請不要使用擁有高權限的帳戶！
 auths.user_base=用戶搜索基準
@@ -1136,6 +1141,7 @@ auths.still_in_used=This authentication is still used by some users, please dele
 auths.deletion_success=認證源刪除成功！
 auths.login_source_exist=Login source '%s' already exists.
 
+config.not_set=(not set)
 config.server_config=服務器配置
 config.app_name=應用名稱
 config.app_ver=應用版本
@@ -1172,6 +1178,9 @@ config.disable_http_git=Disable HTTP Git
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=數據庫配置
 config.db_type=數據庫類型
 config.db_host=主機地址

conf/locale/locale_zh-TW.ini

@@ -632,6 +632,8 @@ pulls.is_checking=該合併請求正在進行衝突檢查，請稍後再刷新
 pulls.can_auto_merge_desc=這個拉請求可以自動合併。
 pulls.cannot_auto_merge_desc=由於存在衝突，不能自動合併這推送請求。
 pulls.cannot_auto_merge_helper=請手動合併來解決衝突。
+pulls.create_merge_commit=Create a merge commit
+pulls.rebase_before_merging=Rebase before merging
 pulls.merge_pull_request=合併請求
 pulls.open_unmerged_pull_exists=`由於已經存在來自相同倉庫和合併信息的未合併請求（#%d），您無法執行重新開啟操作。`
 pulls.delete_branch=刪除分支
@@ -737,6 +739,8 @@ settings.tracker_issue_style.numeric=數字
 settings.tracker_issue_style.alphanumeric=字母及數字
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分別作為用戶名、倉庫名和問題索引的占位符。
 settings.pulls_desc=啟用合併請求以接受社區貢獻
+settings.pulls.ignore_whitespace=Ignore changes in whitespace
+settings.pulls.allow_rebase_merge=Allow use rebase to merge commits
 settings.danger_zone=危險操作區
 settings.cannot_fork_to_same_owner=你不可以 fork 一個 repository 到它的擁有者。
 settings.new_owner_has_same_repo=新的倉庫擁有者已經存在同名倉庫！
@@ -1096,6 +1100,7 @@ auths.domain=域名
 auths.host=主機地址
 auths.port=主機端口
 auths.bind_dn=綁定DN
+auths.bind_dn_helper=You can use '%s' as placeholder for username, e.g. DOM\%s
 auths.bind_password=綁定密碼
 auths.bind_password_helper=警告：該密碼將會以明文的形式保存在數據庫中。請不要使用擁有高權限的帳戶！
 auths.user_base=用戶搜索基準
@@ -1136,6 +1141,7 @@ auths.still_in_used=一些使用者仍然使用此驗證方式，請先刪除或
 auths.deletion_success=認證源刪除成功！
 auths.login_source_exist=登錄源 '%s' 已存在。
 
+config.not_set=(not set)
 config.server_config=服務器配置
 config.app_name=應用名稱
 config.app_ver=應用版本
@@ -1172,6 +1178,9 @@ config.disable_http_git=停用 HTTP Git
 config.enable_local_path_migration=啟用本地路徑遷移
 config.commits_fetch_concurrency=同時Fetch Commit數量
 
+config.http_config=HTTP Configuration
+config.http_access_control_allow_origin=Access Control Allow Origin
+
 config.db_config=資料庫設定
 config.db_type=數據庫類型
 config.db_host=主機地址