Browse Source

Prepare release

Unknwon 7 years ago
parent
commit
b3757e424f

+ 1 - 1
.gopmfile

@@ -20,7 +20,7 @@ github.com/go-xorm/xorm = commit:19f6dfc
 github.com/gogits/chardet = commit:2404f77
 github.com/gogits/cron = commit:2fc07a4
 github.com/gogits/git-module = commit:1b9552b
-github.com/gogits/go-gogs-client = commit:98046bb
+github.com/gogits/go-gogs-client = commit:264a3d5
 github.com/gogits/go-libravatar = commit:cd1abbd
 github.com/issue9/identicon = commit:d36b545
 github.com/jaytaylor/html2text = commit:d16d412

+ 6 - 1
conf/locale/locale_bg-BG.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Уеб-куки
 settings.githooks=Git куки
@@ -684,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Символен
 settings.tracker_url_format_desc=Можете да използвате текстови маркери <code>{user} {repo} {index}</code> за потребителско име, име на хранилище и индекс на задача съответно.
 settings.pulls_desc=Включва заявки за сливане за да може да се приемат външни доработки
 settings.danger_zone=Опасна зона
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Новият притежател вече има хранилище със същото име. Изберете друго име.
 settings.convert=Промени към редовно хранилище
 settings.convert_desc=Можете да промените това огледало към редовно хранилище. Конверсията не може да се отмени.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Този потребител няма да
 settings.remove_collaborator_success=Сътрудникът е премахнат.
 settings.search_user_placeholder=Име на потребител...
 settings.org_not_allowed_to_be_collaborator=Невъзможно добавяне на организация като сътрудник.
-settings.user_is_org_member=Потребителят вече участва в организацията и не може да бъде добавен като сътрудник.
 settings.add_webhook=Добави уеб-кука
 settings.hooks_desc=Уеб-куките много приличат на обикновен HTTP POST тригер. Когато нещо се случи в Gogs, ние ще изпратим уведомление до сървъра, който посочите. Научете повече в <a target="_blank" href="%s">Ръководство за уеб-куки</a>.
 settings.webhook_deletion=Изтрий уеб-кука
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Gogs ще изпрати <code>POST</code> заявк
 settings.payload_url=URL адрес на изпращане
 settings.content_type=Тип на съдържанието
 settings.secret=Тайна
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Потребителско име
 settings.slack_icon_url=URL адрес на икона
 settings.slack_color=Цвят

+ 6 - 1
conf/locale/locale_cs-CZ.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webové háčky
 settings.githooks=Háčky Gitu
@@ -684,6 +688,7 @@ 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 index úkolu.
 settings.pulls_desc=Povolit požadavky na stažení, aby veřejné příspěvky mohly být akceptovány
 settings.danger_zone=Nebezpečná zóna
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Nový vlastník již repositář se stejným názvem má. Vyberte, prosíme, jiné jméno.
 settings.convert=Převést na běžný repositář
 settings.convert_desc=Můžete převést toto zrcadlo na běžný repositář. Tato změna nemůže být vrácena.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Tento uživatel po tom, co bude smazán, ji
 settings.remove_collaborator_success=Spolupracovník byl smazán.
 settings.search_user_placeholder=Hledat uživatele...
 settings.org_not_allowed_to_be_collaborator=Není dovoleno přidat organizaci jako spolupracovníka.
-settings.user_is_org_member=Uživatel je již členem organizace, tudíž nemůže být přidán jako spolupracovník.
 settings.add_webhook=Přidat webový háček
 settings.hooks_desc=Webové háčky jsou podobné základním spouštím HTTP POST událostí. Kdykoliv se něco stane v Gogs, bude postaráno o oznámení specifikovanému cílovému serveru. Více se o daném dozvíte v <a target="_blank" href="%s">příručce webových háčků</a>.
 settings.webhook_deletion=Smazat webový háček
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Gogs zašle požadavek typu <code>POST</code> na zadan
 settings.payload_url=URL obsahu
 settings.content_type=Typ obsahu
 settings.secret=Tajný klíč
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Uživatelské jméno
 settings.slack_icon_url=URL ikony uživatele
 settings.slack_color=Barva

+ 42 - 37
conf/locale/locale_de-DE.ini

@@ -48,7 +48,7 @@ cancel=Abbrechen
 install=Installation
 title=Installationsschritte für den ersten Start
 docker_helper=Wenn Gogs innerhalb von Docker läuft, lesen Sie sich bitte den <a target="_blank" href="%s">Leitfaden</a> genau durch, bevor Sie irgendwas auf dieser Seite ändern!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs benötigt MySQL, PostgreSQL, SQLite3, MSSQL oder TiDB.
 db_title=Datenbankeinstellungen
 db_type=Datenbanktyp
 host=Host
@@ -58,8 +58,8 @@ db_name=Datenbankname
 db_helper=Bitte verwenden Sie in MySQL die InnoDB-Engine mit dem Zeichensatz utf8_general_ci.
 ssl_mode=SSL-Modus
 path=Pfad
-sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=Der Dateipfad zur SQLite3-Datenbank. <br>Bitte verwenden Sie einen absoluten Pfad, wenn Gogs als Service gestartet wird.
+err_empty_db_path=SQLite3 Datenbankpfad darf nicht leer sein.
 no_admin_and_disable_registration=Sie können die Registrierung nicht deaktivieren, ohne ein Administratorkonto zu erstellen.
 err_empty_admin_password=Das Administrator-Passwort darf nicht leer sein.
 
@@ -74,8 +74,8 @@ domain=Domain
 domain_helper=Dies hat Auswirkung auf die SSH Klon-URLs.
 ssh_port=SSH Port
 ssh_port_helper=Der Port Ihres SSH-Servers. Leer lassen um SSH zu deaktivieren.
-use_builtin_ssh_server=Use Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server=Eingebauten SSH-Server verwenden
+use_builtin_ssh_server_popup=Starte eingebauten SSH-Server für git-Aufgaben, um es vom System-SSH-Dämon zu trennen.
 http_port=HTTP Port
 http_port_helper=Auf dieser Port Nummer wird Gogs erreichbar sein.
 app_url=Anwendungs-URL
@@ -117,7 +117,7 @@ sqlite3_not_available=Ihre Gogs-Version unterstützt SQLite3 nicht. Bitte laden
 invalid_db_setting=Datenbankeinstellungen sind nicht korrekt: %v
 invalid_repo_path=Repository Verzeichnis ist ungültig: %v
 run_user_not_match=Der ausführende Benutzer ist nicht der aktuelle Benutzer: %s -> %s
-invalid_smtp_from=SMPT ist nicht gültig im Feld: %v
+invalid_smtp_from=SMTP Absender Feld ist nicht gültig: %v
 save_config_failed=Fehler beim Speichern der Konfiguration: %v
 invalid_admin_setting=Admin-Konto Einstellungen sind ungültig: %v
 install_success=Herzlich Willkommen! Wir sind froh, dass Sie sich für Gogs entschieden haben. Wir wünschen viel Vergnügen damit.
@@ -462,7 +462,7 @@ editor.cancel=Abbrechen
 editor.filename_cannot_be_empty=Der Dateiname darf nicht leer sein.
 editor.branch_already_exists=Branch '%s' existiert bereits in diesem Repository.
 editor.directory_is_a_file='%s' im übergeordneten Verzeichnis ist eine Datei und kein Verzeichnis.
-editor.file_is_a_symlink=Die Datei '%s' ist ein Symlink die nicht im Webeditor verändert werden kann.
+editor.file_is_a_symlink=Die Datei '%s' ist ein Symlink, der im Webeditor nicht bearbeitet werden kann.
 editor.filename_is_a_directory=Die Datei '%s' existiert bereits als Verzeichnis in diesem Repository.
 editor.file_editing_no_longer_exists=Die Datei '%s', welche Sie bearbeiten, existiert in diesem Repository nicht mehr.
 editor.file_changed_while_editing=Seit dem Start der Bearbeitung hat sich die Datei geändert. <a target="_blank" href="%s">Hier klicken</a> um die Änderungen zu sehen, oder nochmals <strong>Commit drücken</strong> um die Änderungen zu überschreiben.
@@ -473,7 +473,7 @@ editor.add_subdir=Unterverzeichnis erstellen...
 editor.unable_to_upload_files=Fehler beim Hochladen der Dateien zu '%s'. Fehler: %v
 editor.upload_files_to_dir=Dateien hochladen nach '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=Commit Verlauf
 commits.commits=Commits
 commits.search=Commits durchsuchen
 commits.find=Finden
@@ -641,22 +641,26 @@ settings.collaboration.write=Schreibrechte
 settings.collaboration.read=Leserechte
 settings.collaboration.undefined=Nicht definiert
 settings.branches=Branches
-settings.default_branch=Default Branch
-settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
-settings.update=Update
-settings.update_default_branch_success=Default branch of this repository has been updated successfully!
+settings.default_branch=Standard-Branch
+settings.default_branch_desc=Der Standard-Branch gilt als Basis für Commits, Pull-Requests und Online-Bearbeitung.
+settings.update=Aktualisieren
+settings.update_default_branch_success=Standard-Branch dieses Repositories wurde erfolgreich aktualisiert!
 settings.protected_branches=Protected Branches
-settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
-settings.choose_a_branch=Choose a branch...
-settings.branch_protection=Branch Protection
-settings.branch_protection_desc=Please choose protect options for branch <b>%s</b>.
-settings.protect_this_branch=Protect this branch
-settings.protect_this_branch_desc=Disable force pushes and prevent from deletion.
-settings.protect_require_pull_request=Require pull request instead direct pushing
-settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
-settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
-settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
+settings.protected_branches_desc=Schützt Branches vor forcierten Pushes und versehentlichem Löschen. Comitter können freigeschaltet werden.
+settings.choose_a_branch=Wählen Sie einen Branch...
+settings.branch_protection=Branch-Schutz
+settings.branch_protection_desc=Bitte wählen Sie Schutzoptionen für den Branch <b>%s</b>.
+settings.protect_this_branch=Diesen Branch schützen
+settings.protect_this_branch_desc=Verhindere forcierte Pushes sowie Löschungen.
+settings.protect_require_pull_request=Verlange Pull-Request an Stelle von direkten Pushes
+settings.protect_require_pull_request_desc=Aktivieren Sie diese Option, um direktes Pushen in diesen Branch zu verhindern. Commits müssen in einen anderen, ungeschützten Branch gepusht werden und dann per Pull-Request in diesen Branch überführt werden.
+settings.protect_whitelist_committers=Fügt die Benutzer zu Whitelist hinzu, die in diesen Branch pushen dürfen
+settings.protect_whitelist_committers_desc=Benutzer oder Teams zur Whitelist hinzufügen.
+settings.protect_whitelist_users=Benutzer, die in diesen Branch pushen können
+settings.protect_whitelist_search_users=Benutzer suchen
+settings.protect_whitelist_teams=Teams, deren Mitglieder in diesen Branch pushen können
+settings.protect_whitelist_search_teams=Teams suchen
+settings.update_protect_branch_success=Schutzoptionen für diesen Branch wurden erfolgreich aktualisiert!
 settings.hooks=Webhooks
 settings.githooks=Git-Hooks
 settings.basic_settings=Grundeinstellungen
@@ -675,7 +679,7 @@ settings.external_wiki_url_desc=Besucher werden auf diese URL umgeleitet, wenn s
 settings.issues_desc=Issue-Tracker einschalten
 settings.use_internal_issue_tracker=Eingebauten Issue-Tracker verwenden
 settings.use_external_issue_tracker=Externes Issue-System verwenden
-settings.external_tracker_url=Externe Issue-Tracker URL
+settings.external_tracker_url=URL eines externen Issue Trackers
 settings.external_tracker_url_desc=Besucher werden auf diese URL umgeleitet, wenn sie auf den Tab klicken.
 settings.tracker_url_format=URL-Format des externen Issue-Systems
 settings.tracker_issue_style=Namenskonvention des externen Issue-Trackers:
@@ -684,6 +688,7 @@ 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.danger_zone=Gefahrenzone
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 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.
 settings.convert=In ein normales Repository umwandeln
 settings.convert_desc=Dieser Mirror kann in ein normales Repository umgewandelt werden. Dies kann nicht rückgängig gemacht werden.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Nach dem Löschen wird dieser Benutzer keine
 settings.remove_collaborator_success=Mitarbeiter wurde entfernt.
 settings.search_user_placeholder=Benutzer suchen...
 settings.org_not_allowed_to_be_collaborator=Eine Organisation kann nicht als Mitarbeiter hinzugefügt werden.
-settings.user_is_org_member=Benutzer ist ein Organisationsmitglied und kann nicht als Mitarbeiter hinzugefügt werden.
 settings.add_webhook=Webhook hinzufügen
 settings.hooks_desc=Webhooks erlauben es Ihnen, externe Dienste zu informieren, wenn etwas Bestimmtes in Ihrem Repository passiert. Gogs sendet dann einen POST-Request an alle angegebenen URLs. Erfahren Sie mehr in unserem <a target="_blank" href="%s">Webhooks Guide</a>.
 settings.webhook_deletion=Webhook entfernen
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Gogs sendet einen <code>POST</code>-Request an die unt
 settings.payload_url=Payload URL
 settings.content_type=Inhaltstyp
 settings.secret=Secret
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Benutzername
 settings.slack_icon_url=Icon URL
 settings.slack_color=Farbe
@@ -763,12 +768,12 @@ settings.delete_webhook=Webhook löschen
 settings.recent_deliveries=Letzte Zustellungen
 settings.hook_type=Hook Typ
 settings.add_slack_hook_desc=Fügen Sie <a href="%s">Slack</a>-Integration zu Ihrem Repository hinzu.
-settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
+settings.add_discord_hook_desc=Fügen Sie <a href="%s">Discord</a>-Integration zu Ihrem Repository hinzu.
 settings.slack_token=Token
 settings.slack_domain=Domain
 settings.slack_channel=Kanal
 settings.deploy_keys=Deploy-Schlüssel
-settings.deploy_keys_helper=<b>Common Gotcha!</b> If you're looking for adding personal public keys, please add them in your <a href="%s%s">account settings</a>.
+settings.deploy_keys_helper=<b>Häufiger Fehler!</b> Wenn Sie öffentliche Schlüssel hinzufügen wollen, gehen Sie zu Ihren <a href="%s%s"> Kontoeinstellungen</a>.
 settings.add_deploy_key=Deploy-Schlüssel hinzufügen
 settings.deploy_key_desc=Deploy-Schlüssel haben nur lesenden Zugriff. Sie sind nicht identisch mit dem SSH-Schlüssel des persönlichen Kontos.
 settings.no_deploy_keys=Sie haben noch keine Deploy-Schlüssel hinzugefügt.
@@ -847,7 +852,7 @@ team_permission_desc=Welche Berechtigungsstufe soll das Team haben?
 
 form.name_reserved=Organisationsname '%s' ist bereits vergeben.
 form.name_pattern_not_allowed=Organisationsnamen der Form '%s' sind nicht erlaubt.
-form.team_name_reserved=Team name '%s' is reserved.
+form.team_name_reserved=Der Teamname '%s' ist reserviert.
 
 settings=Einstellungen
 settings.options=Optionen
@@ -938,8 +943,8 @@ dashboard.git_gc_repos=Garbage Collection auf Repositories ausführen
 dashboard.git_gc_repos_success=Garbage Collection wurde auf allen Repositories erfolgreich ausgeführt.
 dashboard.resync_all_sshkeys=Datei '.ssh/authorized_keys' neu anlegen (Achtung: Schlüssel, die nicht zu Gogs gehören gehen verloren)
 dashboard.resync_all_sshkeys_success=Alle öffentlichen Keys wurden erfolgreich neu geschrieben.
-dashboard.resync_all_hooks=Resync pre-receive, update and post-receive hooks of all repositories
-dashboard.resync_all_hooks_success=All repositories' pre-receive, update and post-receive hooks have been resynced successfully.
+dashboard.resync_all_hooks=Synchronisiere pre-receive, update und post-receive Hooks für alle Repositorien
+dashboard.resync_all_hooks_success=Pre-receive, update und post-receive Hooks aller Repositorien wurden erfolgreich synchronisiert.
 dashboard.reinit_missing_repos=Alle Repository-Datensätze mit verloren gegangenen Git-Dateien neu initialisieren
 dashboard.reinit_missing_repos_success=Alle Repository-Datensätze, die Git-Dateien verloren haben wurden erfolgreich neu initialisiert.
 
@@ -1089,15 +1094,15 @@ config.ssh_keygen_path=Keygen ('ssh-keygen') Pfad
 config.ssh_minimum_key_size_check=Prüfung der Mindestschlüssellänge
 config.ssh_minimum_key_sizes=Minimale Schlüssellängen
 
-config.repo_config=Repository Configuration
+config.repo_config=Repository-Konfiguration
 config.repo_root_path=Repository-Verzeichnis
 config.script_type=Skript-Typ
-config.repo_force_private=Force Private
-config.max_creation_limit=Max Creation Limit
-config.preferred_licenses=Preferred Licenses
-config.disable_http_git=Disable HTTP Git
-config.enable_local_path_migration=Enable Local Path Migration
-config.commits_fetch_concurrency=Commits Fetch Concurrency
+config.repo_force_private=Erzwinge privat
+config.max_creation_limit=Maximal erstellbare Anzahl
+config.preferred_licenses=Bevorzugte Lizenzen
+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.db_config=Datenbankkonfiguration
 config.db_type=Typ

+ 6 - 1
conf/locale/locale_es-ES.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Requiere una solicitud pull, en lugar de u
 settings.protect_require_pull_request_desc=Active esta opción para deshabilitar un push directo a esta rama. Los commits tienen que ser empujados a otra rama no protegida y fusionados a esta rama a través de la solicitud pull.
 settings.protect_whitelist_committers=Lista blanca de quienes pueden empujar a esta rama
 settings.protect_whitelist_committers_desc=Añadir personas o equipos a la lista blanca de empuje directo a esta rama.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
@@ -684,6 +688,7 @@ 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.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.
 settings.convert=Convertir en un repositorio normal
 settings.convert_desc=Puedes convertir este repositorio en un repositorio normal. Este cambio no se puede deshacer.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Este usuario no podrá colaborar en este rep
 settings.remove_collaborator_success=El colaborador ha sido eliminado.
 settings.search_user_placeholder=Buscar usuario...
 settings.org_not_allowed_to_be_collaborator=Las organizaciones no tiene permitido ser añadidas como colaboradores.
-settings.user_is_org_member=El usuario es miembro de la organización, no puede ser añadido como colaborador.
 settings.add_webhook=Añadir Webhook
 settings.hooks_desc=Los Webhooks permiten a servicios externos recibir notificaciones cuando sucedan ciertos eventos en Gogs. Cuando sucedan los eventos especificados, enviaremos una petición POST a cada una de las URLs indicadas. Para obtener más información, consulta nuestra <a target="_blank" href="%s">Guía de Webhooks</a>.
 settings.webhook_deletion=Eliminar Webhook
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Enviaremos una petición <code>POST</code> a la siguie
 settings.payload_url=URL de Payload
 settings.content_type=Tipo de contenido
 settings.secret=Secreto
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Nombre de usuario
 settings.slack_icon_url=URL de icono
 settings.slack_color=Color

+ 6 - 1
conf/locale/locale_fi-FI.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Vaadi pull-pyyntö suoran push-operaation
 settings.protect_require_pull_request_desc=Estä suorat push-operaatiot tähän haaraan. Commitit täytyy pushata ei-suojattuun haaraan ja yhdistää tähän haaraan pull-pyynnön kautta.
 settings.protect_whitelist_committers=Lista sallituista, jotka voivat pushata tähän haaraan
 settings.protect_whitelist_committers_desc=Lisää ihmisiä tai tiimejä sallittujen listaan, jotka voivat pushata suoraan tähän haaraan.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webkoukut
 settings.githooks=Git koukut
@@ -684,6 +688,7 @@ 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.danger_zone=Vaaravyöhyke
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Uudella omistajalla on jo samanniminen repo. Ole hyvä ja valitse toinen nimi.
 settings.convert=Muunna tavalliseksi repoksi
 settings.convert_desc=Voit muuntaa tämän peilin tavalliseksi repoksi. Tätä ei voi peruuttaa.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Tällä käyttäjällä ei tule enää olema
 settings.remove_collaborator_success=Yhteistyökumppani on poistettu.
 settings.search_user_placeholder=Etsi käyttäjä...
 settings.org_not_allowed_to_be_collaborator=Yhteistyökumppaniksi ei voi lisätä organisaatiota.
-settings.user_is_org_member=Käyttäjä on organisaation jäsen, jota ei voi lisätä yhteistyökumppaniksi.
 settings.add_webhook=Lisää webkoukku
 settings.hooks_desc=Webkoukut muistuttavat paljon perus HTTP POST tapahtuma laukaisimia. Aina kun jotain tapahtuu Gogsissa, käsittelemme ilmoituksen määrittäämääsi kohteeseen. Lisätietoja <a target="_blank" href="%s">webkoukku oppaassa</a>.
 settings.webhook_deletion=Poista webkoukku
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Gogs lähettää <code>POST</code> requestin määritt
 settings.payload_url=Payload URL
 settings.content_type=Sisältötyyppi
 settings.secret=Salaus
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Käyttäjätunnus
 settings.slack_icon_url=Kuvakkeen URL
 settings.slack_color=Väri

+ 8 - 3
conf/locale/locale_fr-FR.ini

@@ -473,7 +473,7 @@ editor.add_subdir=Ajouter un sous-répertoire...
 editor.unable_to_upload_files=Échec lors de l'envoie du fichier '%s' avec l’erreur : %v
 editor.upload_files_to_dir=Transférer les fichiers vers '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=Historique des commits
 commits.commits=Commits
 commits.search=Rechercher des commits
 commits.find=Trouver
@@ -656,7 +656,11 @@ settings.protect_require_pull_request=Exiger une requête de fusion plutôt qu'u
 settings.protect_require_pull_request_desc=Activez cette option pour empêcher la publication immédiate vers cette branche. Les commits devront être publiés vers une autre branche (non protégée) et fusionnée dans cette branche avec une requête de fusion.
 settings.protect_whitelist_committers=Liste blanche de personnes pouvant publier sur cette branche
 settings.protect_whitelist_committers_desc=Ajouter des personnes ou des équipes à la liste blanche de publication directe vers cette branche.
-settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
+settings.protect_whitelist_users=Utilisateurs qui peuvent pousser sur cette branche
+settings.protect_whitelist_search_users=Rechercher des utilisateurs
+settings.protect_whitelist_teams=Les équipes pour lesquelles les membres peuvent pousser sur cette branche
+settings.protect_whitelist_search_teams=Rechercher des équipes
+settings.update_protect_branch_success=Les options de protection de cette branches ont été mises à jour avec succès.
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Paramètres de base
@@ -684,6 +688,7 @@ 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.danger_zone=Zone de danger
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Le nouveau propriétaire a déjà un dépôt nommé ainsi.
 settings.convert=Convertir en dépôt ordinaire
 settings.convert_desc=Vous pouvez convertir ce miroir en dépôt ordinaire. Cela ne peut pas être inversée.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Cet utilisateur n'aura plus accès pour coll
 settings.remove_collaborator_success=Collaborateur supprimé.
 settings.search_user_placeholder=Rechercher un utilisateur...
 settings.org_not_allowed_to_be_collaborator=Une organisation n'est pas autorisée à être ajoutée en tant que collaborateur.
-settings.user_is_org_member=Cet utilisateur ne peut pas être ajouté en tant que collaborateur car il fait partie d'une organisation.
 settings.add_webhook=Ajouter un Webhook
 settings.hooks_desc=Les Webhooks sont des déclencheurs de POST HTTP . Lorsque qu'un événement se produit dans Gogs, une notification sera envoyée vers l'hôte cible préalablement spécifié. Apprenez-en davantage dans le <a target="_blank" href="%s">Guide des Webhooks</a>.
 settings.webhook_deletion=Supprimer le Webhook
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Une requête <code>POST</code> sera transmise vers l'U
 settings.payload_url=URL des Données Utiles
 settings.content_type=Type de contenu
 settings.secret=Confidentiel
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Nom d'utilisateur
 settings.slack_icon_url=URL de l'icône
 settings.slack_color=Couleur

+ 6 - 1
conf/locale/locale_gl-ES.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
@@ -684,6 +688,7 @@ 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.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.
 settings.convert=Converter nun repositorio normal
 settings.convert_desc=Podes converter este repositorio nun repositorio normal. Este cambio non se pode desfacer.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Este usuario non poderá colaborar neste rep
 settings.remove_collaborator_success=O colaborador foi eliminado.
 settings.search_user_placeholder=Buscar usuario...
 settings.org_not_allowed_to_be_collaborator=As organizacións non teñen permitido ser engadidas como colaboradores.
-settings.user_is_org_member=O usuario é membro da organización, non pode ser engadido como colaborador.
 settings.add_webhook=Engadir Webhook
 settings.hooks_desc=Os Webhooks permiten a servizos externos recibir notificacións cando sucedan certos eventos en Gogs. Cando sucedan os eventos especificados, enviaremos unha petición POST a cada unha das URLs indicadas. Para obter máis información, consulta a nosa <a target="_blank" href="%s">Guía de Webhooks</a>.
 settings.webhook_deletion=Eliminar Webhook
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Enviaremos unha petición <code>POST</code> á seguint
 settings.payload_url=URL de Payload
 settings.content_type=Tipo de contido
 settings.secret=Secreto
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Nome da persoa usuaria
 settings.slack_icon_url=URL da icona
 settings.slack_color=Cor

+ 6 - 1
conf/locale/locale_it-IT.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
@@ -684,6 +688,7 @@ 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.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.
 settings.convert=Converti in Repository Regolare
 settings.convert_desc=Puoi convertire questo mirror in un repository regolare. Questa operazione non può essere annullata.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Questo utente non potrà più collaborare a
 settings.remove_collaborator_success=Il collaboratore è stato rimosso.
 settings.search_user_placeholder=Cerca utente...
 settings.org_not_allowed_to_be_collaborator=Un'organizzazione non può essere aggiunta come collaboratore.
-settings.user_is_org_member=L'utente è un membro dell'organizzazione che non può essere aggiunto come collaboratore.
 settings.add_webhook=Aggiungi Webhook
 settings.hooks_desc=I Webhooks sono molto simili a un basilare evento trigger HTTP POST. Ogni volta che qualcosa si verifica in Gogs, tratteremo la notifica all'host di destinazione specificato. Ulteriori informazioni in questa <a target="_blank" href="%s">Guida ai Webhooks</a>.
 settings.webhook_deletion=Elimina Webhook
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Gogs manderà una richiesta <code>POST</code> all'URL
 settings.payload_url=Payload URL
 settings.content_type=Content Type
 settings.secret=Secret
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Nome utente
 settings.slack_icon_url=URL icona
 settings.slack_color=Colore

+ 6 - 1
conf/locale/locale_ja-JP.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git のフック
@@ -684,6 +688,7 @@ 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.danger_zone=危険地帯
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=新しいオーナーは、既に同じ名前のリポジトリを持っています。
 settings.convert=Convert To Regular Repository
 settings.convert_desc=You can convert this mirror to a regular repository. This cannot be reversed.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=This user will no longer have collaboration
 settings.remove_collaborator_success=共同編集者が削除されました。
 settings.search_user_placeholder=Search users
 settings.org_not_allowed_to_be_collaborator=組織を共同編集者として追加することはできません。
-settings.user_is_org_member=ユーザーは組織の一員なので、共同編集者として追加することはできません。
 settings.add_webhook=Webhook を追加
 settings.hooks_desc=Webhooksは、Gogsで特定のイベントの発生時に指定された外部サービスに通知を許可します。イベントが発生すると、それぞれ指定されたUrlに、POSTリクエストが送られます。詳細はこちらのの <a target="_blank"href="%s"> Webhooks ガイド</a>をご覧ください。
 settings.webhook_deletion=Webhook を削除
@@ -741,6 +745,7 @@ settings.add_webhook_desc=私たちは、指定されたURLに購読されたイ
 settings.payload_url=ペイロードの URL
 settings.content_type=コンテンツ タイプ
 settings.secret=秘密
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=ユーザ名
 settings.slack_icon_url=アイコン URL
 settings.slack_color=カラー

+ 6 - 1
conf/locale/locale_ko-KR.ini

@@ -657,6 +657,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
@@ -685,6 +689,7 @@ settings.tracker_issue_style.alphanumeric=문자 숫자
 settings.tracker_url_format_desc=<code>{user} {repo} {index}</code> 사용자 명, 저장소 명, 이슈 인덱스를 사용하여 표시자를 사용할 수 있습니다.
 settings.pulls_desc=끌어오기 요청을 공개적으로 기여받을 수 있도록 활성화합니다.
 settings.danger_zone=위험 설정
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=새로운 소유자가 같은 이름의 저장소를 이미 가지고 있습니다. 다른 이름을 선택해주세요.
 settings.convert=일반 리파지토리로 변환
 settings.convert_desc=이 미러를 일반 리파지토리로 변환할 수 없습니다. 반대로는 할 수 없습니다.
@@ -719,7 +724,6 @@ settings.collaborator_deletion_desc=이 사용자는 더 이상 이 저장소의
 settings.remove_collaborator_success=공동작업자가 삭제 되었습니다.
 settings.search_user_placeholder=사용자 검색...
 settings.org_not_allowed_to_be_collaborator=조직을 공동 작업자로 추가할 수 없습니다.
-settings.user_is_org_member=사용자가 조직 구성원이므로 공동 작업자로 추가할 수 없습니다.
 settings.add_webhook=Webhook 추가
 settings.hooks_desc=웹후크는 기본적인 HTTP POST 이벤트 트리거입니다. Gogs에서 무슨 일이 발생할 때마다, 지정한 대상 호스트에 알림을 보냅니다. <a target="_blank" href="%s">웹후크 안내서</a>에서 자세히 알아보십시오.
 settings.webhook_deletion=Webhook 삭제
@@ -742,6 +746,7 @@ settings.add_webhook_desc=Gogs는 발생한 이벤트와 관련하여 지정한
 settings.payload_url=페이로드 URL
 settings.content_type=컨텐츠 타입
 settings.secret=비밀
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=사용자 이름
 settings.slack_icon_url=아이콘 URL
 settings.slack_color=색

+ 6 - 1
conf/locale/locale_lv-LV.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Tīmekļa āķi
 settings.githooks=Git āķi
@@ -684,6 +688,7 @@ 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.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.
 settings.convert=Konvertēt uz parastu repozitoriju
 settings.convert_desc=Šo spoguli ir iespējams konvertēt par parastu repozitoriju. Šī ir neatgriezeniska darbība.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Šim lietotājam pēc dzēšanas vairs nebū
 settings.remove_collaborator_success=Līdzstrādnieks tika noņemts.
 settings.search_user_placeholder=Meklēt lietotāju...
 settings.org_not_allowed_to_be_collaborator=Organizāciju nav atļauts pievienot kā līdzstrādnieku.
-settings.user_is_org_member=Lietotājs ir organizācijas biedrs, kas nevar tikt pievienots kā līdzstrādnieks.
 settings.add_webhook=Pievienot tīmekļa āķi
 settings.hooks_desc=Tīmekļa āķi ļauj paziņot ārējiem servisiem par noteiktiem notikomiem, kas notiek Git servisā. Kad iestāsies kāds notikums, katram ārējā servisa URL tiks nosūtīts POST pieprasījums. Lai uzzinātu sīkāk skatieties <a target="_blank" href="%s">Tīmekļa āķu rokasgrāmatā</a>.
 settings.webhook_deletion=Dzēst tīmekļa āķi
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Uz norādīto URL tiks nosūtīts <code>POST</code> pi
 settings.payload_url=Vērtuma URL
 settings.content_type=Satura tips
 settings.secret=Noslēpums
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Lietotājvārds
 settings.slack_icon_url=Ikonas URL
 settings.slack_color=Krāsa

+ 6 - 1
conf/locale/locale_nl-NL.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git-hooks
@@ -684,6 +688,7 @@ 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.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
 settings.convert=Converteren naar gewone repository
 settings.convert_desc=U kunt deze mirror converteren naar een gewone repository. Dit kan niet ongedaan worden gemaakt.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Deze gebruiker zal niet langer toegang hebbe
 settings.remove_collaborator_success=medewerker is verwijderd.
 settings.search_user_placeholder=Zoek gebruiker...
 settings.org_not_allowed_to_be_collaborator=De organisatie kan niet toegevoegd worden als medewerker.
-settings.user_is_org_member=Gebruiker is lid van de organisatie die als een medewerker kan niet worden toegevoegd.
 settings.add_webhook=Webhook toevoegen
 settings.hooks_desc=Webhooks dat de externe diensten om kennisgevingen te ontvangen wanneer bepaalde gebeurtenissen op Gogs plaatsvinden. Wanneer de opgegeven gebeurtenissen plaatsvinden, sturen we een POST-aanvraag naar elk van de URL's die u opgeeft. Meer informatie vindt u in onze <a target="_blank" href="%s"> Webhooks gids</a>.
 settings.webhook_deletion=Webhook verwijderen
@@ -741,6 +745,7 @@ settings.add_webhook_desc=We sturen een <code>POST</code>-aanvraag naar de onder
 settings.payload_url=Nettolading URL
 settings.content_type=Content type
 settings.secret=Geheim
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Gebruikersnaam
 settings.slack_icon_url=Icoon URL
 settings.slack_color=Kleur

+ 6 - 1
conf/locale/locale_pl-PL.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooki
 settings.githooks=Hooki Git
@@ -684,6 +688,7 @@ 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.danger_zone=Strefa niebezpieczeństwa
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Nowy właściciel już posiada repozytorium o tej samej nazwie.
 settings.convert=Konwersja na repozytorium regularne
 settings.convert_desc=Możesz przekonwertować ten mirror na repozytorium regularne. Ta czynność nie może być odwrócona.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Ten użytkownik nie będzie miał dostępu w
 settings.remove_collaborator_success=Współpracownik został usunięty.
 settings.search_user_placeholder=Szukaj użytkownika...
 settings.org_not_allowed_to_be_collaborator=Organizacji nie można dodać jako współpracownika.
-settings.user_is_org_member=Użytkownik jest członkiem organizacji, który nie może być dodany jako współpracownik.
 settings.add_webhook=Dodaj webhooka
 settings.hooks_desc=Webooki działają tak jak proste wywołania HTTP POST. Jeśli cokolwiek zdarzy się w Gogs, wyślemy powiadomienie do wybranego hosta. Więcej informacji można znaleźć w <a target="_blank" href="%s">przewodniku webhooków</a>.
 settings.webhook_deletion=Usuń webhooka
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Wyślemy żądanie <code>POST</code> pod poniższy adr
 settings.payload_url=URL do wywołania
 settings.content_type=Typ zawartości
 settings.secret=Sekret
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Użytkownik
 settings.slack_icon_url=Adres URL ikony
 settings.slack_color=Kolor

+ 6 - 1
conf/locale/locale_pt-BR.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Hooks do Git
@@ -684,6 +688,7 @@ 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.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 dono já tem um repositório com o mesmo nome. Por favor, escolha outro nome.
 settings.convert=Converter para repositório tradicional
 settings.convert_desc=Você pode converter este espelho em um repositório tradicional. Esta ação não pode ser revertida.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Este usuário não terá mais acesso de cola
 settings.remove_collaborator_success=O colaborador foi removido.
 settings.search_user_placeholder=Pesquisar usuário...
 settings.org_not_allowed_to_be_collaborator=Organização não tem permissão para ser adicionada como um colaborador.
-settings.user_is_org_member=O usuário é um membro da organização que não pode ser adicionado como um colaborador.
 settings.add_webhook=Adicionar Webhook
 settings.hooks_desc=Hooks da web ou Webhooks permitem serviços externos serem notificados quando certos eventos acontecem no Gogs. Quando acontecem os eventos especificados, enviaremos uma solicitação POST para cada uma das URLs que você fornecer. Saiba mais no nosso <a target="_blank" href="%s"> Guia de Webhooks</a>.
 settings.webhook_deletion=Deletar Webhook
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Enviaremos uma solicitação <code>POST</code> para o
 settings.payload_url=URL de Payload
 settings.content_type=Tipo de conteúdo
 settings.secret=Secreto
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Nome de usuário
 settings.slack_icon_url=URL do ícone
 settings.slack_color=Cor

+ 6 - 1
conf/locale/locale_ru-RU.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Автоматическое обновление
 settings.githooks=Git хуки
@@ -684,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Буквенноцифровой
 settings.tracker_url_format_desc=Вы можете использовать шаблон <code>{user} {repo} {index}</code> для имени пользователя, репозитория и номера задачи.
 settings.pulls_desc=Включить публичные запросы на слияние
 settings.danger_zone=Опасная зона
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=У нового владельца уже есть хранилище с таким названием.
 settings.convert=Преобразовать в обычный репозиторий
 settings.convert_desc=Это зеркало можно преобразовать в обычный репозиторий. Это не может быть отменено.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Этот пользователь больш
 settings.remove_collaborator_success=Соавтор был удален.
 settings.search_user_placeholder=Поиск пользователя...
 settings.org_not_allowed_to_be_collaborator=Организации не могут быть добавлены как соавторы.
-settings.user_is_org_member=Пользователь является членом организации,  члены которой не могут быть добавлены в качестве соавтора.
 settings.add_webhook=Добавить Webhook
 settings.hooks_desc=Webhooks позволяют внешним службам получать уведомления при возникновении определенных событий на Gogs. При возникновении указанных событий мы отправим запрос POST на каждый заданный вами URL. Узнать больше можно в нашем <a target="_blank" href="%s">Руководстве по Webhooks</a>.
 settings.webhook_deletion=Удалить веб-хук
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Мы отправим запрос <code>POST</code> 
 settings.payload_url=URL обработчика
 settings.content_type=Тип содержимого
 settings.secret=Secret
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Имя пользователя
 settings.slack_icon_url=URL иконки
 settings.slack_color=Цвет

+ 6 - 1
conf/locale/locale_sr-SP.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git хуки
@@ -684,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Алфанумерично
 settings.tracker_url_format_desc=Можете да користите шаблон <code>{user} {repo} {index}</code> за корисничко име, спремишта и задатака.
 settings.pulls_desc=Омогући систем захтева за спајање да би сте преузели јавних доприноса
 settings.danger_zone=Опасна зона
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Нови власник већ има спремиште по истим називом. Молимо вас изаберите друго име.
 settings.convert=Претворити у обично спремиште
 settings.convert_desc=Можете претворити огледало у обично спремиште, али та операција не може се укинути.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Овај корисник неће имат
 settings.remove_collaborator_success=Сарадник је уклоњен.
 settings.search_user_placeholder=Претрага корисника...
 settings.org_not_allowed_to_be_collaborator=Неможе се додати организација као сарадник.
-settings.user_is_org_member=Корисник је члан организације и потом неможе бити додат као сарадник.
 settings.add_webhook=Додај Webhook
 settings.hooks_desc=Webhooks омогућавају спољашњим услугама да приме обавештења када се нешто одређено догоди на Gogs. Сазнајте више у овом <a target="_blank" href="%s">водичу за Webhooks</a>.
 settings.webhook_deletion=Уклони Webhook
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Послаћемо захтев <code>POST</code> на
 settings.payload_url=URL адреса за слање
 settings.content_type=Тип садржаја
 settings.secret=Тајна
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Корисничко име
 settings.slack_icon_url=URL адреса иконице
 settings.slack_color=Боја

+ 6 - 1
conf/locale/locale_sv-SE.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webbhookar
 settings.githooks=Githookar
@@ -684,6 +688,7 @@ 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.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.
 settings.convert=Konvertera Till Vanligt Repo
 settings.convert_desc=Du kan konvertera denna spegling till ett vanligt förråd. Detta kan inte ångras.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Denna användare kommer förlora sin åtkoms
 settings.remove_collaborator_success=Deltagare har tagits bort.
 settings.search_user_placeholder=Sök användare...
 settings.org_not_allowed_to_be_collaborator=Organisationen kan inte läggas till som en deltagare.
-settings.user_is_org_member=Änvändaren är en organisationsmedlem som inte kan bli tillagd som deltagare.
 settings.add_webhook=Lägg Till Webbhook
 settings.hooks_desc=Webbhookar påminner mycket om vanliga HTTP POST-händelseutlösare. När något inträffar i Gogs, kommer vi att meddela måldatorn som du anger. Läs mera i <a target="_blank" href="%s">Webbhook Guide</a>.
 settings.webhook_deletion=Ta Bort Webbhook
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Gogs kommer skicka <code>POST</code>-anrop till webbad
 settings.payload_url=Adress till innehåll
 settings.content_type=Typ av innehåll
 settings.secret=Hemlighet
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Användarnamn
 settings.slack_icon_url=URL för ikon
 settings.slack_color=Färg

+ 6 - 1
conf/locale/locale_tr-TR.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Web İstekleri
 settings.githooks=Git İstekleri
@@ -684,6 +688,7 @@ 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.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.
 settings.convert=Düzenli Depoya Dönüştür
 settings.convert_desc=Bu yansıyı düzenli bir depoya dönüştürebilirsiniz. Bu işlem geri alınamaz.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Kullanıcı, silme işleminden sonra bu depo
 settings.remove_collaborator_success=Katkıcı silindi.
 settings.search_user_placeholder=Kullanıcı ara...
 settings.org_not_allowed_to_be_collaborator=Organizasyon, bir katkıcı olarak eklenemez.
-settings.user_is_org_member=Kullanıcı organizasyon üyesi olduğu için katkıcı olarak eklenemez.
 settings.add_webhook=Web İsteği Ekle
 settings.hooks_desc=Web istekleri, HTTP POST olay tetikleyicileri gibidirler. Gogs'ta ne zaman bir şey olsa, hedef belirttiğiniz sunuculara bildirim yapabilecek duruma geliriz. Daha fazla bilgiyi <a target="_blank" href="%s">Web İstekleri Kılavuzu</a>'nda bulabilirsiniz.
 settings.webhook_deletion=Web İsteğini Sil
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Gogs, meydana gelen olay ile birlikte belirttiğiniz b
 settings.payload_url=Yük Bağlantısı
 settings.content_type=İçerik Türü
 settings.secret=Gizli
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Kullanıcı Adı
 settings.slack_icon_url=Simge Bağlantısı
 settings.slack_color=Renk

+ 19 - 14
conf/locale/locale_uk-UA.ini

@@ -39,7 +39,7 @@ your_profile=Ваш профіль
 your_settings=Ваші налаштування
 
 activities=Дії
-pull_requests=пропозиція змін
+pull_requests=Запити на злиття
 issues=Обговорення
 
 cancel=Скасувати
@@ -69,7 +69,7 @@ app_name_helper=Вкажіть назву вашої організації, в
 repo_path=Кореневий шлях репозиторія
 repo_path_helper=До цього каталогу буде збережено всі зовнішні сховища Git.
 run_user=Запустити як
-run_user_helper=Користувач повинен мати доступ до папки репозиторіїв і запустити Gogs.
+run_user_helper=Користувач мусить мати доступ до кореню репозиторіїв та право на запуск Gogs.
 domain=Домен
 domain_helper=Це впливає на клонування через SSH.
 ssh_port=SSH порт
@@ -192,9 +192,9 @@ AuthName=Назва авторизації
 AdminEmail=Електронна пошта адміністратора
 
 NewBranchName=Ім'я нової гілки
-CommitSummary=Резюме комміту
-CommitMessage=Зафіксувати повідомлення
-CommitChoice=Зробити вибір
+CommitSummary=Резюме коміту
+CommitMessage=Повідомлення коміту
+CommitChoice=Зафіксувати вибір
 TreeName=Шлях до файлу
 Content=Вміст
 
@@ -305,7 +305,7 @@ add_email_success=Вашу нову адресу електронної пошт
 manage_ssh_keys=Керувати ключами SSH
 add_key=Додати ключ
 ssh_desc=Це список ключів SSH, пов'язані з вашим обліковим записом. Видаліть будь-які ключі, які не є вашими.
-ssh_helper=<strong>Потрібна допомога?</strong> Дивіться наш гід до <a href="%s"> генерації ключів SSH</a> або виправлення <a href="%s"> типових неполадок SSH</a>.
+ssh_helper=<strong>Потрібна допомога?</strong> Дивіться гід на GitHub з <a href="%s"> генерації ключів SSH</a> або виправлення <a href="%s">типових неполадок SSH</a>.
 add_new_key=Додати SSH ключа
 ssh_key_been_used=Було використано публічний ключ.
 ssh_key_name_used=Відкритий ключ з таким іменем уже існує.
@@ -422,7 +422,7 @@ filter_branch_and_tag=Фільтрувати гілку або тег
 branches=Гілки
 tags=Теги
 issues=Проблеми
-pulls=Пропозиція Змін
+pulls=Запити на злиття
 labels=Мітка
 milestones=Проміжні етапи
 commits=Коміти
@@ -449,12 +449,12 @@ editor.name_your_file=Дайте назву файлу...
 editor.filename_help=Щоб додати каталог, просто наберіть його ім'я, та натисніть /. Щоб видалити каталог, перейдіь на початок поля й натисніть клавішу backspace.
 editor.or=Або
 editor.cancel_lower=Скасувати
-editor.commit_changes=Порівняти зміни
+editor.commit_changes=Зафіксувати зміни
 editor.add_tmpl=Додати '%s/<filename>'
 editor.add=Додати '%s'
 editor.update=Оновити '%s'
 editor.delete=Видалити '%s'
-editor.commit_message_desc=Додати необов'язкове розширене описання...
+editor.commit_message_desc=Додати необов'язковий розширений опис...
 editor.commit_directly_to_this_branch=Зробіть комміт прямо в гілку <strong class="branch-name">%s</strong>.
 editor.create_new_branch=Створіть <strong>нову гілку</strong> для цього коміту та відкривайте запит на втягування.
 editor.new_branch_name_desc=Ім'я нової гілки...
@@ -473,7 +473,7 @@ editor.add_subdir=Додати підкаталогу...
 editor.unable_to_upload_files=Не вдалося завантажити файли до '%s' через помилку: %v
 editor.upload_files_to_dir=Завантажувати файли до '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=Історія комітів
 commits.commits=Коміти
 commits.search=Знайти коміт
 commits.find=Пошук
@@ -515,7 +515,7 @@ issues.filter_assginee_no_select=Етап не обрано
 issues.filter_type=Тип
 issues.filter_type.all_issues=Всі проблемы
 issues.filter_type.assigned_to_you=Призначене вам
-issues.filter_type.created_by_you=Створено тобою
+issues.filter_type.created_by_you=Створено вами
 issues.filter_type.mentioning_you=Вас згадано
 issues.filter_sort=Сортування
 issues.filter_sort.latest=Найновіші
@@ -656,7 +656,11 @@ settings.protect_require_pull_request=Вимагати запрос на зли
 settings.protect_require_pull_request_desc=Увімкніть цю опцію для заборони прямого push у цю гілку. Коміт має бути запушений у іншу, незахищену гілку та влитий у цю через запрос на злиття.
 settings.protect_whitelist_committers=Білий список тих, хто може робити push у цю гілку
 settings.protect_whitelist_committers_desc=Додати людей або команди у білий список для виконання push до цієї гілки.
-settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
+settings.protect_whitelist_users=Користувачі що можуть виконувати push до цієї гілки
+settings.protect_whitelist_search_users=Пошук користувачів
+settings.protect_whitelist_teams=Команди, члени яких можуть виконувати push до цієї гілки
+settings.protect_whitelist_search_teams=Пошук команд
+settings.update_protect_branch_success=Опції захисту цієї гілки було успішно оновлено!
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
 settings.basic_settings=Основні налаштування
@@ -684,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Буквено-цифровий
 settings.tracker_url_format_desc=Ви можете використовувати заповнювач <code>{user} {repo} {index}</code> для ім'я користувача, назви репозиторію на номеру проблеми.
 settings.pulls_desc=Увімкнути публічні запроси на злиття
 settings.danger_zone=Небезпечна зона
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=Новий власник вже має репозиторій з такою назвою.
 settings.convert=Перетворити на звичайний репозиторій
 settings.convert_desc=Ви можете сконвертувати це дзеркало у звичайний репозиторій. Це не може бути повернуто.
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=Цей користувач більше н
 settings.remove_collaborator_success=Співавтора було видалено.
 settings.search_user_placeholder=Пошук користувача...
 settings.org_not_allowed_to_be_collaborator=Організації не можуть бути додані як співавтори.
-settings.user_is_org_member=Користувач входить в організацію, член якої не може бути доданий як співавтор.
 settings.add_webhook=Додати Webhook
 settings.hooks_desc=Web-хуки схожі на HTTP POST тригери подій. Яка б подія не виникла в Gogs, ми можемо обробити повідомлення про неї на сторонньому хості який ви задаєте. Взнайте більше у <a target="_blank" href="%s">Webhooks Guide</a>.
 settings.webhook_deletion=Видалити Webhook
@@ -741,6 +745,7 @@ settings.add_webhook_desc=Gogs відправляє <code>POST</code> запит
 settings.payload_url=URL розробника
 settings.content_type=Тип змісту
 settings.secret=Таємний код
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=Ім'я користувача
 settings.slack_icon_url=URL іконки
 settings.slack_color=Колір
@@ -783,7 +788,7 @@ settings.deploy_key_deletion_success=Ключі для розгортуванн
 
 diff.browse_source=Переглянути джерело
 diff.parent=батько
-diff.commit=комміт
+diff.commit=коміт
 diff.data_not_available=Жодних diff даних не доступно.
 diff.show_diff_stats=Показати статистику Diff
 diff.show_split_view=Розділений вигляд

+ 6 - 1
conf/locale/locale_zh-CN.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=要求通过合并请求提交代码
 settings.protect_require_pull_request_desc=启用该选项后代码将不能直接被推送到此分支,所有的代码提交都必须通过另一个非保护分支发起合并请求进行合并。
 settings.protect_whitelist_committers=限制可以推送代码的成员
 settings.protect_whitelist_committers_desc=添加用户或团队到可直接推送代码的白名单。
+settings.protect_whitelist_users=允许推送到此分支的用户
+settings.protect_whitelist_search_users=搜索用户
+settings.protect_whitelist_teams=允许其成员推送到此分支的团队
+settings.protect_whitelist_search_teams=搜索团队
 settings.update_protect_branch_success=此分支的保护选项更新成功!
 settings.hooks=管理 Web 钩子
 settings.githooks=管理 Git 钩子
@@ -684,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=英文字母数字组合形式
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分别作为用户名、仓库名和工单索引的占位符。
 settings.pulls_desc=启用合并请求以接受社区贡献
 settings.danger_zone=危险操作区
+settings.cannot_fork_to_same_owner=您不能派生仓库到其当前的所有者。
 settings.new_owner_has_same_repo=新的仓库拥有者已经存在同名仓库!
 settings.convert=转换为普通仓库
 settings.convert_desc=您可以将该镜像仓库转换为普通仓库,且此操作不可逆。
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=此用户被删除后将不再拥有相关
 settings.remove_collaborator_success=被操作的协作者已经被收回权限!
 settings.search_user_placeholder=搜索用户...
 settings.org_not_allowed_to_be_collaborator=组织不允许被添加为仓库协作者!
-settings.user_is_org_member=被操作的用户是组织成员,因此无法添加为协作者!
 settings.add_webhook=添加 Web 钩子
 settings.hooks_desc=Web 钩子允许您设定在 Gogs 上发生指定事件时对指定 URL 发送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文档</a> 获取更多信息。
 settings.webhook_deletion=删除 Web 钩子
@@ -741,6 +745,7 @@ settings.add_webhook_desc=我们会通过 <code>POST</code> 请求将订阅事
 settings.payload_url=推送地址
 settings.content_type=数据格式
 settings.secret=密钥文本
+settings.secret_desc=密钥文本将被用于计算推送内容的 SHA256 HMAC 哈希值,并设置为 <code>X-Gogs-Signature</code> 请求头的值。
 settings.slack_username=服务名称
 settings.slack_icon_url=图标 URL
 settings.slack_color=颜色代码

+ 6 - 1
conf/locale/locale_zh-HK.ini

@@ -656,6 +656,10 @@ settings.protect_require_pull_request=Require pull request instead direct pushin
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=管理 Web 鉤子
 settings.githooks=管理 Git 鉤子
@@ -684,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=Alphanumeric
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分別作為用戶名、倉庫名和問題索引的占位符。
 settings.pulls_desc=啟用合併請求以接受社區貢獻
 settings.danger_zone=危險操作區
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=新的倉庫擁有者已經存在同名倉庫!
 settings.convert=轉換為正規倉庫
 settings.convert_desc=您可以將此鏡像轉成正規倉庫。此動做不可逆。
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=This user will no longer have collaboration
 settings.remove_collaborator_success=被操作的協作者已經被收回權限!
 settings.search_user_placeholder=搜索用戶...
 settings.org_not_allowed_to_be_collaborator=Organization is not allowed to be added as a collaborator.
-settings.user_is_org_member=被操作的用戶是組織成員,因此無法添加為協作者!
 settings.add_webhook=添加 Web 鉤子
 settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文檔</a> 獲取更多信息。
 settings.webhook_deletion=刪除 Web 鉤子
@@ -741,6 +745,7 @@ settings.add_webhook_desc=我們會通過 <code>POST</code> 請求將訂閱事
 settings.payload_url=推送地址
 settings.content_type=數據格式
 settings.secret=密鑰文本
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=服務名稱
 settings.slack_icon_url=圖標 URL
 settings.slack_color=顏色代碼

+ 8 - 3
conf/locale/locale_zh-TW.ini

@@ -473,7 +473,7 @@ editor.add_subdir=新增子目錄...
 editor.unable_to_upload_files=上傳檔案失敗到 '%s', 錯誤訊息: %v
 editor.upload_files_to_dir=上傳檔案到 '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=提交歷史
 commits.commits=次代碼提交
 commits.search=搜索提交歷史
 commits.find=查找
@@ -656,7 +656,11 @@ settings.protect_require_pull_request=請使用 pull request 來更新(合併)
 settings.protect_require_pull_request_desc=啟用這個選項之後,程式碼將無法直接 Push 到這個分支,所有 Commit 必須先 Push 到另一個非保護的分支,再透過 Pull Request 來要求合併。
 settings.protect_whitelist_committers=限制誰可以 Push 到這個分支
 settings.protect_whitelist_committers_desc=新增用戶或團隊到可以直接push到這個分支的白名單。
-settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
+settings.protect_whitelist_users=Users who can push to this branch
+settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_search_teams=Search teams
+settings.update_protect_branch_success=此分支設置保護已更新成功!
 settings.hooks=管理 Web 鉤子
 settings.githooks=管理 Git 鉤子
 settings.basic_settings=基本設置
@@ -684,6 +688,7 @@ settings.tracker_issue_style.alphanumeric=字母及數字
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分別作為用戶名、倉庫名和問題索引的占位符。
 settings.pulls_desc=啟用合併請求以接受社區貢獻
 settings.danger_zone=危險操作區
+settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
 settings.new_owner_has_same_repo=新的倉庫擁有者已經存在同名倉庫!
 settings.convert=轉換為正規倉庫
 settings.convert_desc=您可以將此鏡像轉成正規倉庫。此動做不可逆。
@@ -718,7 +723,6 @@ settings.collaborator_deletion_desc=刪除後此使用者將不再有協同者
 settings.remove_collaborator_success=被操作的協作者已經被收回權限!
 settings.search_user_placeholder=搜索用戶...
 settings.org_not_allowed_to_be_collaborator=組織不允許被加為協同者。
-settings.user_is_org_member=被操作的用戶是組織成員,因此無法添加為協作者!
 settings.add_webhook=添加 Web 鉤子
 settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 <a target="_blank" href="%s">Webhooks 文檔</a> 獲取更多信息。
 settings.webhook_deletion=刪除 Web 鉤子
@@ -741,6 +745,7 @@ settings.add_webhook_desc=我們會通過 <code>POST</code> 請求將訂閱事
 settings.payload_url=推送地址
 settings.content_type=數據格式
 settings.secret=密鑰文本
+settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
 settings.slack_username=服務名稱
 settings.slack_icon_url=圖標 URL
 settings.slack_color=顏色代碼

+ 1 - 1
gogs.go

@@ -16,7 +16,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.9.170.0226 / 0.10 RC"
+const APP_VER = "0.10.0.0227"
 
 func init() {
 	setting.AppVer = APP_VER

File diff suppressed because it is too large
+ 6 - 6
modules/bindata/bindata.go


+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.9.170.0226 / 0.10 RC
+0.10.0.0227

Some files were not shown because too many files changed in this diff