update locales

README.md

@@ -1,8 +1,6 @@
-Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs) [![Docker Repository on Quay](https://quay.io/repository/gogs/gogs/status "Docker Repository on Quay")](https://quay.io/repository/gogs/gogs) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/gogs/localized.svg)](https://crowdin.com/project/gogs)
+Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs) [![Docker Repository on Quay](https://quay.io/repository/gogs/gogs/status "Docker Repository on Quay")](https://quay.io/repository/gogs/gogs) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/gogs/localized.svg)](https://crowdin.com/project/gogs) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gogits/gogs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 =====================
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gogits/gogs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
 ##### Current version: 0.7.44 Beta
@@ -15,10 +13,10 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ### NOTICES
 
-- Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) has been reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site.
-- The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch.
-- :bangbang:<span style="color: red">You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) before you start filing an issue or making a Pull Request, and **MUST** discuss with us on [Gitter](https://gitter.im/gogits/gogs) for UI changes, otherwise it's high possibilities that we are not going to merge it.</span>:bangbang:
+- :bangbang: You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) for bug report and contributing code. :bangbang:
 - Please [start discussion](http://forum.gogs.io/category/2/general-discussion) or [ask a question](http://forum.gogs.io/category/4/getting-help) on [the forum](http://forum.gogs.io/). GitHub issue tracker only keeps **bugs** and **feature requests**, all other topics will be closed without reason.
+- Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) was reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site.
+- The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch.
 - If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks!
 - If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki).
 - If your team/company is using Gogs and would like to put your logo on [our website](http://gogs.io), contact us by any means.

README_ZH.md

@@ -11,7 +11,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 
 - 有关基本用法和变更日志，请通过 [使用手册](http://gogs.io/docs/intro/) 查看。
 - 您可以到 [Trello Board](https://trello.com/b/uxAoeLUl/gogs-go-git-service) 跟随开发团队的脚步。
-- 想要先睹为快？通过 [在线体验](https://try.gogs.io/gogs/gogs) 或查看 **安装部署 -> 二进制安装** 小节。
+- 想要先睹为快？直接去 [在线体验](https://try.gogs.io/gogs/gogs) 。
 - 使用过程中遇到问题？尝试从 [故障排查](http://gogs.io/docs/intro/troubleshooting.html) 页面获取帮助。
 - 希望帮助多国语言界面的翻译吗？请立即访问 [详情页面](http://gogs.io/docs/features/i18n.html)！
 

conf/locale/locale_bg-BG.ini

@@ -28,7 +28,7 @@ organization=Организация
 mirror=Огледало
 new_repo=Ново хранилище
 new_migrate=Нова миграция
-new_mirror=New Mirror
+new_mirror=Ново огледало
 new_fork=Ново разклонено хранилище
 new_org=Нова организация
 manage_org=Управление на организации
@@ -248,6 +248,7 @@ uid=UID
 
 public_profile=Публичен профил
 profile_desc=Вашият адрес на ел. поща е публичен и ще бъде използван за всички свързани с профила Ви уведомления и всички уеб базирани операции, направени чрез сайта.
+password_username_disabled=Нелокални потребители не могат да променят името си от тук.
 full_name=Пълно име
 website=Уебсайт
 location=Локация
@@ -272,6 +273,7 @@ new_password=Нова парола
 retype_new_password=Повторно новата парола
 password_incorrect=Въведената парола не е вярна.
 change_password_success=Вашата парола е променена успешно. Вече може да влизате, използвайки тази нова парола.
+password_change_disabled=Нелокални потребители не могат да променят паролата си от тук.
 
 emails=Адреси на ел. поща
 manage_emails=Управление на адреси на ел. поща
@@ -359,6 +361,7 @@ watchers=Наблюдаващи
 stargazers=Харесващи
 forks=Разклонения
 
+form.reach_limit_of_creation=Притежателят е достигнал настроения лимит от %d брой хранилища.
 form.name_reserved=Името на хранилището '%s' е запазено.
 form.name_pattern_not_allowed=Име на хранилището от вида '%s' не е позволено.
 
@@ -510,9 +513,9 @@ pulls.merged=Обединени
 pulls.has_merged=Тази заявка за сливане е обединена успешно!
 pulls.data_broken=Данните от тази заявка за сливане са невалидни поради изтрита информация за някое разклонение.
 pulls.is_checking=Проверката за конфликт все още е в ход. Моля обновете страницата след малко.
-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.can_auto_merge_desc=Може да се извърши обединяване на тази заявка за сливане.
+pulls.cannot_auto_merge_desc=Не може да се извърши обединяване, защото съществуват конфликти между ревизиите.
+pulls.cannot_auto_merge_helper=Моля, използвайте инструменти на командния ред за да разрешите конфликтите.
 pulls.merge_pull_request=Обедини заявка за сливане
 pulls.open_unmerged_pull_exists=`Невъзможно повторно отваряне, защото вече съществува заявка за сливане (#%d) от същото хранилище със същата информация за обединяване, която чака да бъде извършена`
 
@@ -567,6 +570,9 @@ settings.update_settings=Запази настройките
 settings.change_reponame_prompt=Тази промяна ще засегне връзките, които се отнасят до това хранилището.
 settings.advanced_settings=Разширени настройки
 settings.wiki_desc=Включва уики за да може потребителите да създават документи
+settings.use_external_wiki=Използвай външно уики
+settings.external_wiki_url=URL адрес на външно уики
+settings.external_wiki_url_desc=Посетителите ще бъдат пренасочени към този URL адрес от връзката за раздел уики.
 settings.issues_desc=Включва вградена система за проследяване на задачи
 settings.use_external_issue_tracker=Използвай външна система за проследяване на задачи
 settings.tracker_url_format=Формат на URL адрес на външна система за проследяване на задачи
@@ -855,6 +861,8 @@ users.auth_login_name=Потребителско име за вход
 users.password_helper=Оставете празна ако не се променя.
 users.update_profile_success=Профилът е запазен успешно.
 users.edit_account=Редактирай профил
+users.max_repo_creation=Макс. брой хранилища
+users.max_repo_creation_desc=(Задайте -1 за да се използва глобалния лимит)
 users.is_activated=Този профил е активиран
 users.is_admin=Този профил има административни права
 users.allow_git_hook=Този профил има разрешение да създава Git куки
@@ -1022,7 +1030,7 @@ comment_issue=`коментира задача <a href="%s/issues/%s">%s#%[2]s"<
 merge_pull_request=`обедини заявка за сливане <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=прехвърли хранилище <code>%s</code> към <a href="%s">%s</a>
 push_tag=предаде маркер <a href="%s/src/%s">%[2]s</a> към <a href="%[1]s">[3]s</a>
-compare_commits=View comparison for these %d commits
+compare_commits=Сравнение между тези %d ревизии
 
 [tool]
 ago=преди

conf/locale/locale_de-DE.ini

@@ -28,7 +28,7 @@ organization=Organisation
 mirror=Spiegel
 new_repo=Neues Repository
 new_migrate=Neue Migration
-new_mirror=New Mirror
+new_mirror=Neuer Spiegel
 new_fork=Neues abgespaltetes Repository
 new_org=Neue Organisation
 manage_org=Organisationen verwalten
@@ -248,6 +248,7 @@ uid=Uid
 
 public_profile=Öffentliches Profil
 profile_desc=Deine E-Mail-Adresse ist öffentlich einsehbar und wird für accountspezifische Benachrichtigungen verwendet, sowie für alle web-basierten Funktionen, die über die Seite gemacht werden.
+password_username_disabled=Nicht-lokalen Benutzern ist es nicht erlaubt, ihren Usernamen zu ändern.
 full_name=Vollständiger Name
 website=Webseite
 location=Standort
@@ -272,6 +273,7 @@ new_password=Neues Passwort
 retype_new_password=Neues Passwort erneut eingeben
 password_incorrect=Aktuelles Passwort ist nicht korrekt.
 change_password_success=Passwort geändert. Du kannst dich jetzt mit deinem neuen Passwort anmelden.
+password_change_disabled=Nicht-lokalen Benutzern ist es nicht erlaubt, ihr Passwort zu ändern.
 
 emails=E-Mail-Adressen
 manage_emails=E-Mail-Adressen verwalten
@@ -359,6 +361,7 @@ watchers=Beobachter
 stargazers=Sterngucker
 forks=Forks
 
+form.reach_limit_of_creation=Der Besitzer hat die maximale Anzahl vo %d erstellbaren Repositorys erreicht.
 form.name_reserved=Repository-Name '%s' ist bereits vergeben.
 form.name_pattern_not_allowed=Repository-Namesmuster '%s' ist nicht zulässig.
 
@@ -510,9 +513,9 @@ pulls.merged=Zusammengeführt
 pulls.has_merged=Dieser Pull-Request wurde erfolgreich zusammengeführt!
 pulls.data_broken=Die Daten dieser Pull-Anforderung sind defekt aufgrund des Löschens von Fork-Informationen.
 pulls.is_checking=Die Konfliktprüfung ist in Arbeit. Bitte aktualisiere die Seite in wenigen Momenten.
-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.can_auto_merge_desc=Diese Pull-Anforderung kann automatisch zusammengeführt werden.
+pulls.cannot_auto_merge_desc=Diese Pull-Anforderung 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.merge_pull_request=Pull-Request zusammenführen
 pulls.open_unmerged_pull_exists=`Du kannst die Pull-Anforderung nicht wiedereröffnen, da bereits eine offene Pull-Anforderung (#%d) aus dem selben Repository mit den gleichen Merge-Informationen existiert und auf das Merging wartet.`
 
@@ -567,6 +570,9 @@ settings.update_settings=Einstellungen speichern
 settings.change_reponame_prompt=Diese Änderung wirkt sich darauf aus, wie sich Links auf Repositories beziehen.
 settings.advanced_settings=Erweiterte Einstellungen
 settings.wiki_desc=Wiki aktivieren um Leuten das Schreiben von Dokumenten zu ermöglichen
+settings.use_external_wiki=Benutze externes Wiki
+settings.external_wiki_url=Externe Wiki URL
+settings.external_wiki_url_desc=Besucher werden auf die URL umgeleitet, wenn sie auf den Tab klicken.
 settings.issues_desc=Benutze eingebauten leichtgewichtigen Issue-Tracker
 settings.use_external_issue_tracker=Benutze externen Issue-Tracker
 settings.tracker_url_format=URL-Format für externen Issu-Tracker
@@ -855,6 +861,8 @@ users.auth_login_name=Authentifizierung-Loginnname
 users.password_helper=Leer lassen um es unverändert zu lassen.
 users.update_profile_success=Kontoprofil wurde erfolgreich aktualisiert.
 users.edit_account=Konto bearbeiten
+users.max_repo_creation=Limit zum Erstellen von Repositorys
+users.max_repo_creation_desc=(auf -1 setzen, um das globale Standardlimit zu verwenden)
 users.is_activated=Dieses Konto ist aktiviert
 users.is_admin=Dieses Konto hat Administratorrechte
 users.allow_git_hook=Dieses Konto ist berechtigt, Git-Hooks zu erstellen
@@ -1022,7 +1030,7 @@ comment_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> kommentiert`
 merge_pull_request=`Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> zuammengeführt`
 transfer_repo=hat Repository <code>%s</code> transferiert an <a href="%s">%s</a>
 push_tag=hat nach <a href="%s/src/%s">%[2]s</a> in <a href="%[1]s">%[3]s</a> gepusht
-compare_commits=View comparison for these %d commits
+compare_commits=Zeige Vergleich für diese %d Commits
 
 [tool]
 ago=vor

conf/locale/locale_es-ES.ini

@@ -28,7 +28,7 @@ organization=Organización
 mirror=Mirror
 new_repo=Nuevo repositorio
 new_migrate=Nueva Migración
-new_mirror=New Mirror
+new_mirror=Nueva réplica
 new_fork=Nuevo Fork del Repositorio
 new_org=Nueva organización
 manage_org=Administrar organizaciones
@@ -248,6 +248,7 @@ uid=UUID
 
 public_profile=Perfil Público
 profile_desc=Tu correo electrónico es público y será usado para todas las notificaciones relacionadas con cualquier cuenta y cualquier operación hecha a través de la web.
+password_username_disabled=Los usuarios que no son locales no tienen permitido cambiar su nombre de usuario.
 full_name=Nombre Completo
 website=Página Web
 location=Localización
@@ -272,6 +273,7 @@ new_password=Nueva contraseña
 retype_new_password=Confirmar nueva contraseña
 password_incorrect=Contraseña actual incorrecta.
 change_password_success=La contraseña se ha modificado correctamente. Ya puedes iniciar sesión con tu nueva contraseña.
+password_change_disabled=Los usuarios que no son locales no tienen permitido cambiar su contraseña.
 
 emails=Direcciones de correo electrónico
 manage_emails=Gestionar direcciones de correo electrónico
@@ -353,12 +355,13 @@ auto_init=Inicializar los archivos seleccionados y plantillas de este repositori
 create_repo=Crear Repositorio
 default_branch=Rama por defecto
 mirror_interval=Intervalo de mirror(en horas)
-mirror_address=Mirror Address
-mirror_address_desc=Please include necessary user credentials in the address.
+mirror_address=Dirección de la réplica
+mirror_address_desc=Por favor, incluya las credenciales de usuario necesarias en la dirección.
 watchers=Seguidores
 stargazers=Fans
 forks=Forks
 
+form.reach_limit_of_creation=El propietario ha alcanzado el límite máximo de %d repositorios creados.
 form.name_reserved=El nombre del repositorio '%s' está reservado.
 form.name_pattern_not_allowed=El patrón del nombre del repositorio '%s' no está permitido.
 
@@ -372,7 +375,7 @@ migrate.permission_denied=No te está permitido importar repositorios locales.
 migrate.invalid_local_path=Rutal local inválida, no existe o no es un directorio.
 migrate.failed=Migración fallida: %v
 
-mirror_from=mirror from
+mirror_from=espejo de
 forked_from=forked de
 fork_from_self=Eres el propietario del repositorio, ¡no puedes hacer fork!
 copy_link=Copiar
@@ -510,9 +513,9 @@ pulls.merged=Fuisionado
 pulls.has_merged=¡Este pull request se ha completado con éxito!
 pulls.data_broken=Los datos de este pull request ya no están disponibles porque se ha eliminado la información del fork.
 pulls.is_checking=Se está procediendo a la búsqueda de conflictos, por favor actualice la página en unos momentos.
-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.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.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`
 
@@ -567,10 +570,13 @@ settings.update_settings=Actualizar Configuración
 settings.change_reponame_prompt=Este cambio afectará a los enlaces al repositorio.
 settings.advanced_settings=Ajustes avanzados
 settings.wiki_desc=Habilitar la Wiki para que los colaboradores documenten
+settings.use_external_wiki=Usar Wiki externa
+settings.external_wiki_url=URL externa de la Wiki
+settings.external_wiki_url_desc=Los visitantes serán redireccionados a la URL cuando hagan click en la barra.
 settings.issues_desc=Habilitar tracker ligero de incidencias
 settings.use_external_issue_tracker=Usar tracker externo de incidencias
 settings.tracker_url_format=Formato URL del tracker de incidencias externo
-settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
+settings.tracker_url_format_desc=Puedes usar las plantillas <code>{user} {repo} {index}</code> para el nombre de usuario, nombre del repositorio e índice del issue.
 settings.pulls_desc=Habilitar Pull Requests para aceptar contribuciones públicas
 settings.danger_zone=Zona de Peligro
 settings.transfer=Transferir la Propiedad
@@ -602,9 +608,9 @@ settings.hooks_desc=Los Webhooks permiten a servicios externos recibir notificac
 settings.webhook_deletion=Eliminar Webhook
 settings.webhook_deletion_desc=Al borrar este webhook se eliminará su información y todo su historial. ¿Desea continuar?
 settings.webhook_deletion_success=¡Webhook eliminado con éxito!
-settings.webhook.test_delivery=Test Delivery
-settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
-settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may taks few seconds before it shows up in the delivery history.
+settings.webhook.test_delivery=Test de entrega
+settings.webhook.test_delivery_desc=Enviar un falso evento Push de entrega para probar tus ajustes de webhook
+settings.webhook.test_delivery_success=Probar que los webhook han sido añadidos a la cola de entrega. Esto puede tomar algunos segundos antes de aparecer en el historial de entregas.
 settings.webhook.request=Petición
 settings.webhook.response=Respuesta
 settings.webhook.headers=Encabezado
@@ -644,7 +650,7 @@ settings.slack_domain=Dominio
 settings.slack_channel=Canal
 settings.deploy_keys=Claves de Despliegue
 settings.add_deploy_key=Añadir Clave de Despliegue
-settings.deploy_key_desc=Deploy key only has read-only access. It is not same as personal account SSH keys.
+settings.deploy_key_desc=La clave de desarrollo tiene sólo acceso de lectura. No es igual que las claves SSH de las cuentas personales.
 settings.no_deploy_keys=No has añadido ninguna clave de despliegue.
 settings.title=Título
 settings.deploy_key_content=Contenido
@@ -855,6 +861,8 @@ users.auth_login_name=Nombre de Inicio de Sesión de Autenticación
 users.password_helper=Deje el campo vacío si no desea cambiar la contraseña.
 users.update_profile_success=El perfil de la cuenta se ha actualizado correctamente.
 users.edit_account=Editar Cuenta
+users.max_repo_creation=Límite máximo de repositorios
+users.max_repo_creation_desc=(Configura a -1 para usar el límite global por defecto)
 users.is_activated=Esta cuenta está activada
 users.is_admin=Esta cuenta tiene permisos de administrador
 users.allow_git_hook=Esta cuenta tiene permisos para crear hooks de Git
@@ -1022,7 +1030,7 @@ comment_issue=`comentó en la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`fusionado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=transfirió el repositorio <code>%s</code> a <a href="%s">%s</a>
 push_tag=hizo push del tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>
-compare_commits=View comparison for these %d commits
+compare_commits=Ver comparación de estos %d commits
 
 [tool]
 ago=hace

conf/locale/locale_fr-FR.ini

@@ -28,7 +28,7 @@ organization=Organisation
 mirror=Miroir
 new_repo=Nouveau Dépôt
 new_migrate=Nouvelle Migration
-new_mirror=New Mirror
+new_mirror=Nouveau miroir
 new_fork=Nouvel embranchement
 new_org=Nouvelle Organisation
 manage_org=Gérer les Organisations
@@ -248,6 +248,7 @@ uid=ID d'Utilisateur
 
 public_profile=Profil Public
 profile_desc=Votre adresse e-mail est publique et sera utilisée pour les notifications relatives au compte, ainsi que pour toute opération Web effectuée via le site.
+password_username_disabled=Les utilisateurs non-locaux n'ont pas le droit de modifier leur nom d'utilisateur.
 full_name=Nom Complet
 website=Site Web
 location=Localisation
@@ -272,6 +273,7 @@ new_password=Nouveau Mot de Passe
 retype_new_password=Retapez le nouveau mot de passe
 password_incorrect=Mot de passe actuel incorrect.
 change_password_success=Mot de passe modifié avec succès. Vous pouvez à présent vous connecter avec le nouveau mot de passe.
+password_change_disabled=Les utilisateurs non-locaux n'ont pas le droit de modifier leur mot de passe.
 
 emails=Adresses E-mail
 manage_emails=Gérer les adresses e-mail
@@ -353,12 +355,13 @@ auto_init=Initialiser ce dépôt avec le modèle et les fichiers sélectionnés
 create_repo=Créer un dépôt
 default_branch=Branche par défaut
 mirror_interval=Intervalle du miroir (heure)
-mirror_address=Mirror Address
-mirror_address_desc=Please include necessary user credentials in the address.
+mirror_address=Adresse du miroir
+mirror_address_desc=Veuillez inclure les informations d'identification nécessaires dans l'adresse.
 watchers=Observateurs
 stargazers=Stargazers
 forks=Embranchements
 
+form.reach_limit_of_creation=Le propriétaire a atteint le nombre maximal de %d dépôts créés.
 form.name_reserved=Le nom de dépôt '%s' est réservé.
 form.name_pattern_not_allowed=Motif '%s' interdit pour les noms de dépôt.
 
@@ -372,7 +375,7 @@ migrate.permission_denied=Vous n'êtes pas autorisé à importer des dépôts lo
 migrate.invalid_local_path=Chemin local non valide, non existant ou n'étant pas un dossier.
 migrate.failed=Echec de migration: %v
 
-mirror_from=mirror from
+mirror_from=miroir de
 forked_from=scindé depuis
 fork_from_self=Vous nous ne pouvez pas scinder un dépôt que vous possédez déja !
 copy_link=Copier
@@ -510,9 +513,9 @@ pulls.merged=Fusionné
 pulls.has_merged=Cette Pull Request a été fusionnée avec succès !
 pulls.data_broken=Les données de cette demande de rattachement ont été compromise en raison de la suppression d'informations sur l'embranchement.
 pulls.is_checking=La recherche de conflits est toujours en cours, veuillez rafraichir la page dans quelques instants.
-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.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.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.`
 
@@ -567,6 +570,9 @@ settings.update_settings=Valider
 settings.change_reponame_prompt=Ce changement affectera comment les liens sont reliés avec le dépôt.
 settings.advanced_settings=Paramètres Avancés
 settings.wiki_desc=Activer le wiki pour permettre l'écriture de documents
+settings.use_external_wiki=Utiliser un wiki externe
+settings.external_wiki_url=URL Wiki externe
+settings.external_wiki_url_desc=Les visiteurs seront redirigés vers cette URL lorsqu'ils cliqueront sur l'onglet.
 settings.issues_desc=Activer le bug-tracker léger intégré
 settings.use_external_issue_tracker=Utiliser un bug-tracker externe
 settings.tracker_url_format=Format d'URL du bug tracker
@@ -855,6 +861,8 @@ users.auth_login_name=Nom d'utilisateur d'authentification
 users.password_helper=Laissez-le vide pour ne pas changer.
 users.update_profile_success=Profil mis à jour avec succès.
 users.edit_account=Modifier le Compte
+users.max_repo_creation=Nombre maximum de dépôts créés
+users.max_repo_creation_desc=(Mettre à -1 pour utiliser la limite globale par défaut)
 users.is_activated=Ce compte est activé
 users.is_admin=Ce compte possède un niveau d'accès administrateur
 users.allow_git_hook=Ce compte dispose des autorisations pour créer des crochets de Git
@@ -1022,7 +1030,7 @@ comment_issue=`a commenté le problème <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`pull request fusionné le <a href="%s/pulls/%s">%s#%[2]s</a>`
 transfer_repo=a transféré le dépôt <code>%s</code> à <a href="%s">%s</a>
 push_tag=a soumis le tag <a href="%s/src/%s">%[2]s</a> à <a href="%[1]s">%[3]s</a>
-compare_commits=View comparison for these %d commits
+compare_commits=Comparer ces %d commits
 
 [tool]
 ago=auparavant

conf/locale/locale_it-IT.ini

@@ -248,6 +248,7 @@ uid=Uid
 
 public_profile=Profilo pubblico
 profile_desc=Il tuo indirizzo e-mail è pubblico e sarà usato per ogni notifica inerente al tuo account, e per qualsiasi operazione web effettuata attraverso il sito.
+password_username_disabled=Non-local type users are not allowed to change their username.
 full_name=Nome Completo
 website=Sito web
 location=Posizione
@@ -272,6 +273,7 @@ new_password=Nuova Password
 retype_new_password=Re-inserisci la password
 password_incorrect=La Password attuale non è corretta.
 change_password_success=La tua password è stata cambiata con successo. Ora puoi accedere usando la nuova password.
+password_change_disabled=Non-local type users are not allowed to change their password.
 
 emails=Indirizzi e-mail
 manage_emails=Gestisci indirizzi email
@@ -359,6 +361,7 @@ watchers=Watchers
 stargazers=Stargazers
 forks=Forks
 
+form.reach_limit_of_creation=The owner has reached maximum creation limit of %d repositories.
 form.name_reserved=Il nome repository %s è riservato.
 form.name_pattern_not_allowed=La struttura del nome del repository %s non è consentita.
 
@@ -567,6 +570,9 @@ settings.update_settings=Aggiorna Impostazioni
 settings.change_reponame_prompt=This change will affect how links relate to the repository.
 settings.advanced_settings=Advanced Settings
 settings.wiki_desc=Enable wiki to allow people write documents
+settings.use_external_wiki=Use external wiki
+settings.external_wiki_url=External Wiki URL
+settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.issues_desc=Enable builtin lightweight issue tracker
 settings.use_external_issue_tracker=Use external issue tracker
 settings.tracker_url_format=External Issue Tracker URL Format
@@ -855,6 +861,8 @@ users.auth_login_name=Authentication Login Name
 users.password_helper=Leave it empty to remain unchanged.
 users.update_profile_success=Profilo dell'account aggiornato con successo.
 users.edit_account=Modifica Account
+users.max_repo_creation=Maximum Repository Creation Limit
+users.max_repo_creation_desc=(Set -1 to use global default limit)
 users.is_activated=Questo account è attivato
 users.is_admin=Questo account ha permessi di amministratore
 users.allow_git_hook=Questo account ha il permesso di creare hooks di Git

conf/locale/locale_ja-JP.ini

@@ -248,6 +248,7 @@ uid=Uid
 
 public_profile=パブリック プロフィール
 profile_desc=あなたのメールアドレスは公開され、任意のアカウント関連の通知に使用されます。また、Webベースの操作はサイトを介して行います。
+password_username_disabled=Non-local type users are not allowed to change their username.
 full_name=フルネーム
 website=WEBサイト
 location=ロケーション
@@ -272,6 +273,7 @@ new_password=新しいパスワード
 retype_new_password=新しいパスワードを再入力します。
 password_incorrect=現在のパスワードが正しくありません。
 change_password_success=パスワードが正常に変更されました。今すぐ新しいパスワード経由でサインインすることができます。
+password_change_disabled=Non-local type users are not allowed to change their password.
 
 emails=E-mail アドレス
 manage_emails=E-mail アドレスを管理
@@ -359,6 +361,7 @@ watchers=ウォッチャー
 stargazers=Stargazers
 forks=フォーク
 
+form.reach_limit_of_creation=The owner has reached maximum creation limit of %d repositories.
 form.name_reserved=リポジトリ名 '%s' は予約されています。
 form.name_pattern_not_allowed=リポジトリ名のパターン '%s' は許可されていません。
 
@@ -567,6 +570,9 @@ settings.update_settings=設定の更新
 settings.change_reponame_prompt=この変更はリンクがリポジトリに関連付ける方法に影響します。
 settings.advanced_settings=拡張設定
 settings.wiki_desc=Enable wiki to allow people write documents
+settings.use_external_wiki=Use external wiki
+settings.external_wiki_url=External Wiki URL
+settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.issues_desc=Enable builtin lightweight issue tracker
 settings.use_external_issue_tracker=外部課題トラッキングシステムを使用
 settings.tracker_url_format=外部課題トラッキングツール URLのフォーマット
@@ -855,6 +861,8 @@ users.auth_login_name=認証ログイン名
 users.password_helper=それをそのまま空のままにします。
 users.update_profile_success=アカウントのプロファイルが更新されました。
 users.edit_account=アカウントの編集
+users.max_repo_creation=Maximum Repository Creation Limit
+users.max_repo_creation_desc=(Set -1 to use global default limit)
 users.is_activated=アカウントがアクティブされました
 users.is_admin=このアカウントには管理者の権限を持つ
 users.allow_git_hook=このアカウントには Git のフックを作成する権限を持つ

conf/locale/locale_lv-LV.ini

@@ -248,6 +248,7 @@ uid=Lietotāja ID
 
 public_profile=Publiskais profils
 profile_desc=Jūsu e-pasta adrese ir publiska un tiks izmantota, lai nosūtītju Jums paziņojumus, kas saistīti ar Jūsu kontu vai darbībām veiktām caur šo mājas lapu.
+password_username_disabled=Non-local type users are not allowed to change their username.
 full_name=Pilns vārds
 website=Mājas lapa
 location=Atrašanās vieta
@@ -272,6 +273,7 @@ new_password=Jauna parole
 retype_new_password=Ievadīt paroli atkāroti
 password_incorrect=Ievadīta nepareiza pašreizējā parole.
 change_password_success=Parole tika veiksmīgi nomainīta. Tagad jūs varat pieraksītites, izmantojot jauno paroli.
+password_change_disabled=Non-local type users are not allowed to change their password.
 
 emails=E-pasta adreses
 manage_emails=Pārvaldīt e-pasta adreses
@@ -359,6 +361,7 @@ watchers=Novērotāji
 stargazers=Zvaigžņdevēji
 forks=Atdalītie repozitoriji
 
+form.reach_limit_of_creation=The owner has reached maximum creation limit of %d repositories.
 form.name_reserved=Repozitorija nosaukums '%s' ir rezervēts.
 form.name_pattern_not_allowed=Repozitorija nosaukums '%s' nav atļauts.
 
@@ -567,6 +570,9 @@ settings.update_settings=Mainīt iestatījumus
 settings.change_reponame_prompt=Šī izmaiņa ietekmēs saites, kas ir saistītas ar šo repozitoriju.
 settings.advanced_settings=Advanced Settings
 settings.wiki_desc=Enable wiki to allow people write documents
+settings.use_external_wiki=Use external wiki
+settings.external_wiki_url=External Wiki URL
+settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.issues_desc=Enable builtin lightweight issue tracker
 settings.use_external_issue_tracker=Use external issue tracker
 settings.tracker_url_format=External Issue Tracker URL Format
@@ -855,6 +861,8 @@ users.auth_login_name=Autentifikācijas pieteikšanās vārds
 users.password_helper=Atstājiet tukšu, ja nevēlaties mainīt.
 users.update_profile_success=Konta profils tika veiksmīgi saglabāts.
 users.edit_account=Labot kontu
+users.max_repo_creation=Maximum Repository Creation Limit
+users.max_repo_creation_desc=(Set -1 to use global default limit)
 users.is_activated=Konts ir aktivizēts
 users.is_admin=Šim kontam ir administratora piekļuves tiesības
 users.allow_git_hook=Šim kontam ir tiesības pievienot/labot Git āķus

conf/locale/locale_nl-NL.ini

@@ -248,6 +248,7 @@ uid=uid
 
 public_profile=Openbaar profiel
 profile_desc=Uw e-mailadres is openbaar en zal gebruikt worden voor alle account gerelateerde berichtgevingen en bewerkingingen die via de website worden gedaan.
+password_username_disabled=Non-local type users are not allowed to change their username.
 full_name=Volledige naam
 website=Website
 location=Locatie
@@ -272,6 +273,7 @@ new_password=Nieuw wachtwoord
 retype_new_password=Retype New Password
 password_incorrect=Huidig wachtwoord is niet correct.
 change_password_success=Wachtwoord is succesvol gewijzigd. U kunt nu met uw nieuwe wachtwoord inloggen.
+password_change_disabled=Non-local type users are not allowed to change their password.
 
 emails=E-mailadressen
 manage_emails=E-mailadressen beheren
@@ -359,6 +361,7 @@ watchers=Watchers
 stargazers=Stargazers
 forks=Forks
 
+form.reach_limit_of_creation=The owner has reached maximum creation limit of %d repositories.
 form.name_reserved=Repositorienaam '%s' is gereserveerd.
 form.name_pattern_not_allowed=Repositorie naampatroon '%s' is niet toegestaan.
 
@@ -567,6 +570,9 @@ settings.update_settings=Instellingen bewerken
 settings.change_reponame_prompt=This change will affect how links relate to the repository.
 settings.advanced_settings=Advanced Settings
 settings.wiki_desc=Enable wiki to allow people write documents
+settings.use_external_wiki=Use external wiki
+settings.external_wiki_url=External Wiki URL
+settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.issues_desc=Enable builtin lightweight issue tracker
 settings.use_external_issue_tracker=Use external issue tracker
 settings.tracker_url_format=External Issue Tracker URL Format
@@ -855,6 +861,8 @@ users.auth_login_name=Authentication Login Name
 users.password_helper=Leave it empty to remain unchanged.
 users.update_profile_success=Profiel is succesvol bijgewerkt.
 users.edit_account=Bewerk account
+users.max_repo_creation=Maximum Repository Creation Limit
+users.max_repo_creation_desc=(Set -1 to use global default limit)
 users.is_activated=Dit account is geactiveerd
 users.is_admin=Dit account heeft beheerdersrechten
 users.allow_git_hook=Deze account beschikt over machtigingen voor het maken van Git haken

conf/locale/locale_pt-BR.ini

@@ -248,6 +248,7 @@ uid=Uid
 
 public_profile=Perfil Público
 profile_desc=Seu endereço de E-mail é publico e será usado para qualquer notificação relacionada à conta, e qualquer operação na web feita através do site.
+password_username_disabled=Non-local type users are not allowed to change their username.
 full_name=Nome Completo
 website=Site
 location=Localização
@@ -272,6 +273,7 @@ new_password=Nova Senha
 retype_new_password=Digite novamente a nova senha
 password_incorrect=A senha atual não está correta.
 change_password_success=A senha está alterada com sucesso. Você pode agora entrar com a senha nova.
+password_change_disabled=Non-local type users are not allowed to change their password.
 
 emails=Endereços de E-mail
 manage_emails=Gerenciar endereços de e-mail
@@ -359,6 +361,7 @@ watchers=Observadores
 stargazers=Usuários que estrelaram
 forks=Forks
 
+form.reach_limit_of_creation=The owner has reached maximum creation limit of %d repositories.
 form.name_reserved=O nome de repositório '%s' não pode ser usado.
 form.name_pattern_not_allowed=Não é permitido usar o padrão '%s' para o nome de repositório.
 
@@ -567,6 +570,9 @@ settings.update_settings=Configurações de Atualização
 settings.change_reponame_prompt=Este mudanças vai afetar os links para este repositório.
 settings.advanced_settings=Configurações avançadas
 settings.wiki_desc=Habilitar o wiki para permitir que as pessoas escrevam documentos
+settings.use_external_wiki=Use external wiki
+settings.external_wiki_url=External Wiki URL
+settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.issues_desc=Habilitar gerenciamento de "problemas" nativo
 settings.use_external_issue_tracker=Usar issue tracker externo
 settings.tracker_url_format=Formato de URL do issue tracker externo
@@ -855,6 +861,8 @@ users.auth_login_name=Nome de login da autenticação
 users.password_helper=Deixe em branco para não mudar.
 users.update_profile_success=O perfil da conta foi atualizado com sucesso.
 users.edit_account=Editar Conta
+users.max_repo_creation=Maximum Repository Creation Limit
+users.max_repo_creation_desc=(Set -1 to use global default limit)
 users.is_activated=Esta conta está ativada
 users.is_admin=Esta conta tem permissões de administrador
 users.allow_git_hook=Esta conta tem permissões para criar hooks do Git

conf/locale/locale_ru-RU.ini

@@ -248,6 +248,7 @@ uid=UID
 
 public_profile=Открытый профиль
 profile_desc=Адрес вашей электронной почты является публичным и будет использован для любых уведомлений, связанных с аккаунтом, а также для любых действий, совершенных через сайт.
+password_username_disabled=Non-local type users are not allowed to change their username.
 full_name=ФИО
 website=Веб-сайт
 location=Местоположение
@@ -272,6 +273,7 @@ new_password=Новый пароль
 retype_new_password=Подтверждение нового пароля
 password_incorrect=Текущий пароль не правильный.
 change_password_success=Пароль сменен успешно. Теперь вы можете войти с новым паролем.
+password_change_disabled=Non-local type users are not allowed to change their password.
 
 emails=Адреса электронной почты
 manage_emails=Управление адресами электронной почты
@@ -359,6 +361,7 @@ watchers=Наблюдатели
 stargazers=Звездочеты
 forks=Форки
 
+form.reach_limit_of_creation=The owner has reached maximum creation limit of %d repositories.
 form.name_reserved=Имя репозитория  '%s'  зарезервировано.
 form.name_pattern_not_allowed=Шаблон имени репозитория '%s' не допускается.
 
@@ -567,6 +570,9 @@ settings.update_settings=Обновить настройки
 settings.change_reponame_prompt=Это изменение повлияет на отношения ссылок к этому репозиторию.
 settings.advanced_settings=Расширенные настройки
 settings.wiki_desc=Включить Вики, чтобы позволить людям ипсать документы
+settings.use_external_wiki=Use external wiki
+settings.external_wiki_url=External Wiki URL
+settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.issues_desc=Включить встроенную, легковесную систему отслеживания ошибок
 settings.use_external_issue_tracker=Использовать внешнюю систему отслеживания ошибок
 settings.tracker_url_format=Внешний формат ссылки системы отслеживания ошибок.
@@ -855,6 +861,8 @@ users.auth_login_name=Логин для авторизации
 users.password_helper=Оставьте пустым, чтобы оставить без изменений.
 users.update_profile_success=Профиль учетной записи обновлен успешно.
 users.edit_account=Изменение учетной записи
+users.max_repo_creation=Maximum Repository Creation Limit
+users.max_repo_creation_desc=(Set -1 to use global default limit)
 users.is_activated=Эта учетная запись активирована
 users.is_admin=У этой учетной записи есть права администратора
 users.allow_git_hook=Пользователь имеет право создать Git перехватчик

conf/locale/locale_zh-CN.ini

@@ -248,6 +248,7 @@ uid=用户 ID
 
 public_profile=公开信息
 profile_desc=您的邮箱地址将会被公开，并被用于接收帐户的所有提醒和通知。
+password_username_disabled=非本地类型的用户被禁止修改用户名。
 full_name=自定义名称
 website=个人网站
 location=所在地区
@@ -272,6 +273,7 @@ new_password=新的密码
 retype_new_password=重新输入新的密码
 password_incorrect=当前密码不正确！
 change_password_success=密码修改成功！您现在可以使用新的密码登录。
+password_change_disabled=非本地类型的用户被禁止修改密码。
 
 emails=邮箱地址
 manage_emails=管理邮箱地址
@@ -359,6 +361,7 @@ watchers=关注者
 stargazers=称赞者
 forks=派生仓库
 
+form.reach_limit_of_creation=该用户已经达到允许创建 %d 个仓库的最大上限。
 form.name_reserved=仓库名称 '%s' 是被保留的。
 form.name_pattern_not_allowed=仓库名称不允许 '%s' 的格式。
 
@@ -567,6 +570,9 @@ settings.update_settings=更新仓库设置
 settings.change_reponame_prompt=该操作将会影响到所有与该仓库有关的链接
 settings.advanced_settings=高级设置
 settings.wiki_desc=启用 Wiki 以允许用户协作文档
+settings.use_external_wiki=使用外部 Wiki
+settings.external_wiki_url=外部 Wiki 链接
+settings.external_wiki_url_desc=当访问者单击分页标签时，将会被重定向到该链接。
 settings.issues_desc=启用内置的轻量级工单管理系统
 settings.use_external_issue_tracker=使用外部的工单管理系统
 settings.tracker_url_format=外部工单管理系统的 URL 格式
@@ -855,6 +861,8 @@ users.auth_login_name=认证登录名称
 users.password_helper=将值留空使其保持不变。
 users.update_profile_success=该用户信息更新成功！
 users.edit_account=编辑用户信息
+users.max_repo_creation=最大允许创建仓库数量
+users.max_repo_creation_desc=（设置为 -1 表示使用全局默认值）
 users.is_activated=该用户已被激活
 users.is_admin=该用户具有管理员权限
 users.allow_git_hook=该用户具有创建 Git 钩子的权限

conf/locale/locale_zh-HK.ini

@@ -248,6 +248,7 @@ uid=用戶 ID
 
 public_profile=公開信息
 profile_desc=您的郵箱地址將會被公開，並被用於接收帳戶的所有提醒和通知。
+password_username_disabled=Non-local type users are not allowed to change their username.
 full_name=自定義名稱
 website=個人網站
 location=所在地區
@@ -272,6 +273,7 @@ new_password=新的密碼
 retype_new_password=重新輸入新的密碼
 password_incorrect=當前密碼不正確！
 change_password_success=密碼修改成功！您現在可以使用新的密碼登錄。
+password_change_disabled=Non-local type users are not allowed to change their password.
 
 emails=電子郵件地址
 manage_emails=管理電子郵件地址
@@ -359,6 +361,7 @@ watchers=關注者
 stargazers=稱讚者
 forks=派生倉庫
 
+form.reach_limit_of_creation=The owner has reached maximum creation limit of %d repositories.
 form.name_reserved=倉庫名稱 '%s' 是被保留的。
 form.name_pattern_not_allowed=倉庫名稱不允許 '%s' 的格式。
 
@@ -567,6 +570,9 @@ settings.update_settings=更新倉庫設置
 settings.change_reponame_prompt=該操作將會影響到所有與該倉庫有關的鏈接
 settings.advanced_settings=高級設置
 settings.wiki_desc=啟用 Wiki 以允許用戶協作文檔
+settings.use_external_wiki=Use external wiki
+settings.external_wiki_url=External Wiki URL
+settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.issues_desc=啟用內置的輕量級問題管理系統
 settings.use_external_issue_tracker=使用外部的問題管理系統
 settings.tracker_url_format=外部問題管理系統的 URL 格式
@@ -855,6 +861,8 @@ users.auth_login_name=認證登錄名稱
 users.password_helper=留空使其保持不變。
 users.update_profile_success=該用戶信息更新成功！
 users.edit_account=編輯用戶信息
+users.max_repo_creation=Maximum Repository Creation Limit
+users.max_repo_creation_desc=(Set -1 to use global default limit)
 users.is_activated=該用戶已被激活
 users.is_admin=該用戶具有管理員權限
 users.allow_git_hook=該帳戶具有創建 Git 鉤子的權限