Browse Source

Add Galician support

- Update locales
Unknwon 7 years ago
parent
commit
598e062241

+ 1 - 1
README.md

@@ -50,7 +50,7 @@ The goal of this project is to make the easiest, fastest, and most painless way
 - Mail service
 - Administration panel
 - Supports MySQL, PostgreSQL, SQLite3 and [TiDB](https://github.com/pingcap/tidb) (experimental)
-- Multi-language support ([21 languages](https://crowdin.com/project/gogs))
+- Multi-language support ([22 languages](https://crowdin.com/project/gogs))
 
 ## System Requirements
 

+ 1 - 1
README_ZH.md

@@ -31,7 +31,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - 支持邮件服务
 - 支持后台管理面板
 - 支持 MySQL、PostgreSQL、SQLite3 和 [TiDB](https://github.com/pingcap/tidb)(实验性支持) 数据库
-- 支持多语言本地化([21 种语言]([more](https://crowdin.com/project/gogs)))
+- 支持多语言本地化([22 种语言]([more](https://crowdin.com/project/gogs)))
 
 ## 系统要求
 

+ 3 - 2
conf/app.ini

@@ -402,8 +402,8 @@ DEFAULT_INTERVAL = 8
 MAX_RESPONSE_ITEMS = 50
 
 [i18n]
-LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR
-NAMES = English,简体中文,繁體中文(香港),繁體中文(台湾),Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen,Türkçe,čeština,Српски,Svenska,한국어
+LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR,gl-ES
+NAMES = English,简体中文,繁體中文(香港),繁體中文(台湾),Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen,Türkçe,čeština,Српски,Svenska,한국어,Galego
 
 ; Used for datetimepicker
 [i18n.datelang]
@@ -428,6 +428,7 @@ cs-CZ = cs-CZ
 sr-SP = sr
 sv-SE = sv
 ko-KR = ko
+gl-ES = gl
 
 ; Extension mapping to highlight class
 ; e.g. .toml=ini

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

@@ -137,6 +137,7 @@ issues.in_your_repos=Във Вашите хранилища
 [explore]
 repos=Хранилища
 users=Потребители
+organizations=Organizations
 search=Търсене
 
 [auth]
@@ -426,6 +427,7 @@ file_history=История
 file_view_raw=Виж директен файл
 file_permalink=Постоянна връзка
 file_too_large=Този файл е твърде голям за да се визуализира
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Нов файл
 editor.upload_file=Качи файл
@@ -455,6 +457,7 @@ editor.cancel=Отказ
 editor.filename_cannot_be_empty=Името не може да бъде празно.
 editor.branch_already_exists=Клон '%s' вече съществува в това хранилище.
 editor.directory_is_a_file=Частта '%s' в пътя е файл, не директория в това хранилище.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=Име '%s' вече съществува като директория в това хранилище.
 editor.file_editing_no_longer_exists=Файл '%s' който редактирате вече не съществува в това хранилище.
 editor.file_changed_while_editing=Съдържанието на файла е било променено докато правихте редакциите. <a target="_blank" href="%s">Щракнете тук</a> за да прегледате какво е променено или <strong>натиснете Запис на ревизия</strong> отново за да презапишете чуждите промени.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Не може да се извърши обедин
 pulls.cannot_auto_merge_helper=Моля, използвайте инструменти на командния ред за да разрешите конфликтите.
 pulls.merge_pull_request=Обедини заявка за сливане
 pulls.open_unmerged_pull_exists=`Невъзможно повторно отваряне, защото вече съществува заявка за сливане (#%d) от същото хранилище със същата информация за обединяване, която чака да бъде извършена`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Нов етап
 milestones.open_tab=%d отворени
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Изтрий удостоверяването
 auths.delete_auth_desc=Това удостоверяване ще бъде изтрито. Желаете ли да продължите?
 auths.still_in_used=Това удостоверяване все още се използва от някои потребители. Моля изтрийте ги или ги конвертирайте до друг тип на влизане първо.
 auths.deletion_success=Удостоверяването е изтрито успешно!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Сървърни настройки
 config.app_name=Име на приложението

+ 8 - 2
conf/locale/locale_cs-CZ.ini

@@ -13,7 +13,7 @@ version=Verze
 page=Strana
 template=Šablona
 language=Jazyk
-create_new=Vytořit...
+create_new=Vytvořit...
 user_profile_and_more=Uživatelský profil a další
 signed_in_as=Přihlášen jako
 
@@ -137,6 +137,7 @@ issues.in_your_repos=Ve vašich repositářích
 [explore]
 repos=Repositáře
 users=Uživatelé
+organizations=Organizations
 search=Vyhledat
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Historie
 file_view_raw=Zobrazit v surovém stavu
 file_permalink=Trvalý odkaz
 file_too_large=Tento soubor je příliš velký pro zobrazení
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Nový soubor
 editor.upload_file=Nahrát soubor
@@ -455,6 +457,7 @@ editor.cancel=Zrušit
 editor.filename_cannot_be_empty=Název souboru nemůže být prázdný.
 editor.branch_already_exists=Repositář větev '%s' již obsahuje.
 editor.directory_is_a_file=Položka '%s' v nadřazené cestě je v tomto repozitáři soubor, ne adresář.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=Jméno souboru '%s' koliduje v tomto repozitáři se jménem adresáře.
 editor.file_editing_no_longer_exists=Soubor '%s', který upravujete, již neexistuje v tomto repozitáři.
 editor.file_changed_while_editing=Obsah souboru se změnil od začátku úprav. <a target="_blank" href="%s"> Klepnutím sem</a> zobrazíte, co se změnilo, nebo <strong>stiskněte potvrdit znovu</strong> pro přepsání změn.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Tento požadavek na natažení nemůže být automa
 pulls.cannot_auto_merge_helper=Prosíme proveďte sloučení ručně, aby byly vyřešeny konflitky.
 pulls.merge_pull_request=Sloučit požadavek na stažení
 pulls.open_unmerged_pull_exists=`Nemůžete znovuotevřít požadavek na stažení, neboť požadavek na stažení ze stejného repositáře se stejnými informacemi pro sloučení již existuje (#%d).`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Nový milník
 milestones.open_tab=%d otevřených
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Smazání způsobu ověřování
 auths.delete_auth_desc=Tento způsob ověřování bude smazán, chcete pokračovat?
 auths.still_in_used=Tento způsob ověřování je stále používán některými uživateli. Prosím, nejdříve změňte u těchto uživatelů typ ověřování na jiný.
 auths.deletion_success=Způsob ověřování byl úspěšně smazán!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Nastavení serveru
 config.app_name=Název aplikace
@@ -1113,7 +1119,7 @@ config.cookie_life_time=Doba života souboru cookie
 config.picture_config=Nastavení ikony uživatele
 config.picture_service=Služba ikon uživatelů
 config.disable_gravatar=Zakázat službu Gravatar
-config.enable_federated_avatar=Enable Federated Avatars
+config.enable_federated_avatar=Povolit jednotné avatary
 
 config.git_config=Konfigurace Gitu
 config.git_disable_diff_highlight=Zakázat zvýraznění syntaxe v rozdílovém zobrazení

+ 6 - 1
conf/locale/locale_de-DE.ini

@@ -137,6 +137,7 @@ issues.in_your_repos=In Ihren Repositories
 [explore]
 repos=Repositories
 users=Benutzer
+organizations=Organizations
 search=Suche
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Verlauf
 file_view_raw=Ansicht im Originalformat
 file_permalink=Permalink
 file_too_large=Diese Datei ist zu groß zum Anzeigen
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Neue Datei
 editor.upload_file=Datei hochladen
@@ -455,7 +457,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 der nicht über den Web Editor bearbeitet werden kann.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 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.
@@ -580,6 +582,8 @@ pulls.cannot_auto_merge_desc=Dieser Pull-Request kann nicht automatisch zusammen
 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=`Sie können diesen Pull-Request nicht wieder öffnen, da bereits ein offener Pull-Request (#%d) aus dem selben Repository mit den gleichen Merge-Informationen existiert und auf das Zusammenführen wartet.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Neuer Meilenstein
 milestones.open_tab=%d offen
@@ -1029,6 +1033,7 @@ auths.delete_auth_title=Authentifizierung löschen
 auths.delete_auth_desc=Diese Authentifizierung wird gelöscht. Möchten Sie fortfahren?
 auths.still_in_used=Diese Authentifizierung wird noch von einigen Benutzern verwendet. Bitte löschen Sie diese Benutzer oder ändern Sie deren Anmeldetyp.
 auths.deletion_success=Authentifizierung wurde erfolgreich gelöscht!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Serverkonfiguration
 config.app_name=Name der Anwendung

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

@@ -137,6 +137,7 @@ issues.in_your_repos=En tus repositorios
 [explore]
 repos=Repositorios
 users=Usuarios
+organizations=Organizations
 search=Buscar
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Histórico
 file_view_raw=Ver Raw
 file_permalink=Permalink
 file_too_large=Este archivo es demasiado grande para ser mostrado
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Nuevo archivo
 editor.upload_file=Subir archivo
@@ -455,6 +457,7 @@ editor.cancel=Cancelar
 editor.filename_cannot_be_empty=El nombre del archivo no puede estar vacío.
 editor.branch_already_exists=La rama '%s' ya existe en este repositorio.
 editor.directory_is_a_file=La entrada '%s' en el directorio padre es un archivo no un directorio en este repositorio.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=El nombre del fichero '%s' es un directorio existente en este repositorio.
 editor.file_editing_no_longer_exists=El archivo '%s' que estás editando ya no existe en este repositorio.
 editor.file_changed_while_editing=El contenido del archivo ha sido modificado desde que empezó a editarlo. <a target="_blank" href="%s">Clic aquí</a> para ver qué ha sido modificado o <strong>presiona confirmar de nuevo</strong> para sobrescribir estos cambios.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Este Pull Request no puede ser fusionado automátic
 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`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Nuevo Milestone
 milestones.open_tab=%d abiertas
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Borrado de autenticación
 auths.delete_auth_desc=Esta autenticación será eliminada. ¿Deseas continuar?
 auths.still_in_used=Este método de autentificación aún es utilizado por algunos usuarios, por favor elimine o convierta estos usuarios a otro tipo de autentificación.
 auths.deletion_success=¡La autenticación ha sido eliminada con éxito!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Configuración del servidor
 config.app_name=Nombre de la Aplicación

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

@@ -137,6 +137,7 @@ issues.in_your_repos=Repoissasi
 [explore]
 repos=Repot
 users=Users
+organizations=Organizations
 search=Search
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Historia
 file_view_raw=Näytä raaka
 file_permalink=Pysyvä linkki
 file_too_large=This file is too large to be shown
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=New file
 editor.upload_file=Upload file
@@ -455,6 +457,7 @@ editor.cancel=Cancel
 editor.filename_cannot_be_empty=Filename cannot be empty.
 editor.branch_already_exists=Branch '%s' already exists in this repository.
 editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
 editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
 editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Tätä pull-pyyntöä ei voi yhdistää automaattis
 pulls.cannot_auto_merge_helper=Ole hyvä ja yhdistä manuaalisesti konfliktien ratkaisemiseksi.
 pulls.merge_pull_request=Yhdistä Pull-pyyntö
 pulls.open_unmerged_pull_exists=`Et voi suorittaa uudelleenavaus toimintoa koska on jo olemassa pull-pyyntö (#%d) samasta reposta samoilla yhdistämistiedoilla ja odottaa yhdistämistä.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Uusi merkkipaalu
 milestones.open_tab=%d avoinna
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Todennuksen poistaminen
 auths.delete_auth_desc=Tämä todennus poistetaan, haluatko jatkaa?
 auths.still_in_used=Tämä todennus on yhä joidenkin käyttäjien käytössä, ole hyvä ja poista tai muunna nämä käyttäjät toiselle kirjaututumistyypille ensin.
 auths.deletion_success=Todennus on poistettu onnistuneesti!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Palvelin asetukset
 config.app_name=Sovellus nimi

+ 6 - 1
conf/locale/locale_fr-FR.ini

@@ -137,6 +137,7 @@ issues.in_your_repos=Dans vos dépôts
 [explore]
 repos=Dépôts
 users=Utilisateurs
+organizations=Organizations
 search=Rechercher
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Historique
 file_view_raw=Voir le Raw
 file_permalink=Lien permanent
 file_too_large=Ce fichier est trop gros pour être afficher
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Nouveau fichier
 editor.upload_file=Téléverser un fichier
@@ -455,7 +457,7 @@ editor.cancel=Annuler
 editor.filename_cannot_be_empty=Nom de fichier ne peut pas être vide.
 editor.branch_already_exists=La branche '%s' existe déjà dans ce dépôt.
 editor.directory_is_a_file=L'entrée '%s' dans le chemin d’accès parent est un fichier pas un répertoire dans ce dépôt.
-editor.file_is_a_symlink=Le fichier '%s' est un lien symbolique qui ne peut pas être modifié par l'éditeur web
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=Le nom de fichier '%s' existe déjà dans ce dépot.
 editor.file_editing_no_longer_exists=Le fichier '%s' que vous modifiez n'existe plus dans le dépôt.
 editor.file_changed_while_editing=Le contenu du fichier à changé depuis que vous avez commencé à l'éditer. <a target="_blank" href="%s">Cliquez ici</a> pour voir ce qui à été modifié ou <strong>appuyez sur commit encore une fois</strong> pour remplacer ces changements.
@@ -580,6 +582,8 @@ pulls.cannot_auto_merge_desc=Cette pull request ne peut être fusionnée automat
 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.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Nouveau Jalon
 milestones.open_tab=%d Ouvert
@@ -1029,6 +1033,7 @@ auths.delete_auth_title=Suppression de l'authentification
 auths.delete_auth_desc=Cette authentification va être supprimée. voulez-vous continuer ?
 auths.still_in_used=Cette authentification est encore utilisée par d'autres utilisateurs, supprimez-les ou convertir ces utilisateurs vers un autre type de session, avant.
 auths.deletion_success=L'authentification a été supprimée avec succès !
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Configuration du Serveur
 config.app_name=Nom de l'application

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

@@ -137,6 +137,7 @@ issues.in_your_repos=Nei tuoi repository
 [explore]
 repos=Repository
 users=Utenti
+organizations=Organizations
 search=Cerca
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Cronologia
 file_view_raw=Vedi originale
 file_permalink=Permalink
 file_too_large=Questo file è troppo grande per essere mostrato
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Nuovo file
 editor.upload_file=Carica File
@@ -455,6 +457,7 @@ editor.cancel=Cancel
 editor.filename_cannot_be_empty=Filename cannot be empty.
 editor.branch_already_exists=Branch '%s' already exists in this repository.
 editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
 editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
 editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Questa pull request non può essere mergiata automa
 pulls.cannot_auto_merge_helper=Effettua il merge manualmente per risolvere i conflitti.
 pulls.merge_pull_request=Unisci Pull Request
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Nuova Milestone
 milestones.open_tab=%d Aperti
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Authentication Deletion
 auths.delete_auth_desc=This authentication is going to be deleted, do you want to continue?
 auths.still_in_used=This authentication is still used by some users, please delete or convert these users to another login type first.
 auths.deletion_success=Authentication has been deleted successfully!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Configurazione Server
 config.app_name=Nome Applicazione

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

@@ -137,6 +137,7 @@ issues.in_your_repos=あなたのリポジトリ
 [explore]
 repos=リポジトリ
 users=ユーザ
+organizations=Organizations
 search=検索
 
 [auth]
@@ -426,6 +427,7 @@ file_history=履歴
 file_view_raw=Rawデータを見る
 file_permalink=パーマリンク
 file_too_large=このファイルは大きすぎるため、表示できません。
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=New file
 editor.upload_file=Upload file
@@ -455,6 +457,7 @@ editor.cancel=キャンセル
 editor.filename_cannot_be_empty=Filename cannot be empty.
 editor.branch_already_exists=Branch '%s' already exists in this repository.
 editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
 editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
 editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=This pull request can't be merged automatically bec
 pulls.cannot_auto_merge_helper=競合を解決するためには、手動でマージする必要があります。
 pulls.merge_pull_request=プルリクエストをマージします。
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=新しいマイルストーン
 milestones.open_tab=%d オープン
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=認証削除
 auths.delete_auth_desc=認証を削除します、継続しますか?
 auths.still_in_used=This authentication is still used by some users, please delete or convert these users to another login type first.
 auths.deletion_success=認証が正常に削除されました。
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=サーバーの構成
 config.app_name=アプリケーション名

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

@@ -137,6 +137,7 @@ issues.in_your_repos=당신의 저장소에
 [explore]
 repos=저장소
 users=유저
+organizations=Organizations
 search=검색
 
 [auth]
@@ -426,6 +427,7 @@ file_history=히스토리
 file_view_raw=원본 보기
 file_permalink=고유링크
 file_too_large=이 파일은 표시하기엔 너무 큽니다.
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=파일 생성
 editor.upload_file=파일 업로드
@@ -455,6 +457,7 @@ editor.cancel=취소
 editor.filename_cannot_be_empty=파일명이 빈칸입니다.
 editor.branch_already_exists=이 저장소에 브랜치 '%s'가 이미 존재합니다.
 editor.directory_is_a_file=항목 '%s'의 상위 경로는 이 저장소의 디렉토리가 아닌 파일입니다.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=파일명 '%s'는 이 저장소에 이미 존재하는 디렉토리명입니다.
 editor.file_editing_no_longer_exists=편집중인 파일 '%s'는 저장소에 더 이상 존재하지 않습니다.
 editor.file_changed_while_editing=편집을 시작한 이후 파일 내용이 변경되었습니다. 변경된 내용을 보려면 <a target="_blank" href="%s">여기를 누르십시오</a>. 변경 사항을 덮어 쓰려면 <strong>다시 커밋</strong>을 누르십시오.
@@ -580,6 +583,8 @@ pulls.cannot_auto_merge_desc=컨플릭이 존재해서 이 풀리퀘스트는 
 pulls.cannot_auto_merge_helper=컨플릭을 해결하려면 수동으로 머지해 주십시오.
 pulls.merge_pull_request=풀리퀘스트 머지
 pulls.open_unmerged_pull_exists=`같은 리파지토리에서 같은 머지 정보로 만들어진 풀리퀘스트 (#%d) 가 이미 오픈 상태이고 머지를 기다리고 있기 때문에 다시 열기 작업을 할 수 없습니다.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=새로운 마일스톤
 milestones.open_tab=%d개 열림
@@ -1029,6 +1034,7 @@ auths.delete_auth_title=인증 삭제
 auths.delete_auth_desc=이 인증이 삭제됩니다. 정말로 진행하시겠습니까?
 auths.still_in_used=이 인증은 아직 몇몇 사용자들이 사용하고 있습니다, 먼저 사용자들의 로그인 유형을 삭제하거나 변경해주십시오.
 auths.deletion_success=인증이 성공적으로 삭제 되었습니다!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=서버 설정
 config.app_name=애플리케이션 이름

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

@@ -137,6 +137,7 @@ issues.in_your_repos=Jūsu repozitorijos
 [explore]
 repos=Repozitoriji
 users=Lietotāji
+organizations=Organizations
 search=Meklēt
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Vēsture
 file_view_raw=Rādīt neapstrādātu
 file_permalink=Patstāvīgā saite
 file_too_large=Šis fails ir par lielu, lai to parādītu
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Jauns fails
 editor.upload_file=Augšupielādēt failu
@@ -455,6 +457,7 @@ editor.cancel=Atcelt
 editor.filename_cannot_be_empty=Nav ievadīts faila nosaukums.
 editor.branch_already_exists=Atzars '%s' šajā repozitorijā jau eksistē.
 editor.directory_is_a_file=Ieraksts '%s' vecāka ceļā ir fails nevis direktorija šajā repozitorijā.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=Faila nosaukums '%s' sakrīt ar direktorijas nosaukumu šajā repozitorijā.
 editor.file_editing_no_longer_exists=Fails '%s', ko labojat, vairs neeksistē repozitorijā.
 editor.file_changed_while_editing=Faila saturs ir mainījies kopš brīža, kad sākāt to labot. <a target="_blank" href="%s">Nospiediet šeit</a>, lai redzētu kas ir mainījies vai <strong>nospiediet atkārtoti pabeigt revīziju</strong>, lai pārrakstītu izmaiņas.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Šis izmaiņu pieprasījums nevar tikt automātiski
 pulls.cannot_auto_merge_helper=Lūdzu sapludiniet manuāli, lai atrisinātu konfliktus.
 pulls.merge_pull_request=Izmaiņu pieprasījuma sapludināšana
 pulls.open_unmerged_pull_exists=`Jūs nevarat veikt atkārtotas atvēršanas darbību, jo jau eksistē izmaiņu pieprasījums (#%d) no šī repozitorija ar tādu pašu sapludināšanas informāciju un gaida sapludināšanu.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Jauns atskaites punkts
 milestones.open_tab=%d atvērti
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Autentifikācijas dzēšana
 auths.delete_auth_desc=Šī autentifikācija tiks dzēsta, vai vēlaties turpināt?
 auths.still_in_used=Daži lietotāji joprojām izmanto šo autentifikācijas veidu. Nepieciešams veikt šo lietotāju konvertāciju vai dzēšanu.
 auths.deletion_success=Autentifikācija tika veiksmīgi izdzēsta!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Servera konfigurācija
 config.app_name=Lietotnes nosaukums

+ 16 - 10
conf/locale/locale_nl-NL.ini

@@ -126,7 +126,7 @@ uname_holder=Gebruikersnaam of e-mail
 password_holder=Wachtwoord
 switch_dashboard_context=Wissel voorpaginacontext
 my_repos=Mijn repositories
-show_more_repos=Show more repositories...
+show_more_repos=Toon meer repositories...
 collaborative_repos=Gedeelde repositories
 my_orgs=Mijn organisaties
 my_mirrors=Mijn mirrors
@@ -137,6 +137,7 @@ issues.in_your_repos=In uw repositories
 [explore]
 repos=Repositories
 users=Gebruikers
+organizations=Organizations
 search=Zoeken
 
 [auth]
@@ -189,9 +190,9 @@ TeamName=Team naam
 AuthName=Autorisatienaam
 AdminEmail=E-mail beheerder
 
-NewBranchName=New branch name
-CommitSummary=Commit summary
-CommitMessage=Commit message
+NewBranchName=Nieuwe branch naam
+CommitSummary=Commit samenvatting
+CommitMessage=Commit bericht
 CommitChoice=Commit choice
 TreeName=Bestandspad
 Content=Inhoud
@@ -357,7 +358,7 @@ fork_from=Afsplitsing van
 fork_visiblity_helper=U kunt de zichtbaarheid van een geforkte repository niet aanpassen.
 repo_desc=Omschrijving
 repo_lang=Taal
-repo_gitignore_helper=Select .gitignore templates
+repo_gitignore_helper=Selecteer .gitignore sjablonen
 license=Licentie
 license_helper=Selecteer een licentie bestand
 readme=Leesmij-bestand
@@ -365,7 +366,7 @@ readme_helper=Selecteer een sjabloon voor het Leesmij-bestand
 auto_init=Initialiseer deze repositorie met de geselecteerde bestanden en sjabloon
 create_repo=Nieuwe repository
 default_branch=Standaard branch
-mirror_prune=Prune
+mirror_prune=Opschonen
 mirror_prune_desc=Remove any remote-tracking references that no longer exist on the remote
 mirror_interval=Mirror interval(uur)
 mirror_address=Kopie-adres
@@ -425,7 +426,8 @@ file_raw=Ruwe
 file_history=Geschiedenis
 file_view_raw=Weergave ruwe
 file_permalink=Permalink
-file_too_large=This file is too large to be shown
+file_too_large=Dit bestand is te groot om te worden getoond
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Nieuw bestand
 editor.upload_file=Bestand uploaden
@@ -437,11 +439,11 @@ editor.must_be_on_a_branch=Je moet in een branch zijn om aanpassingen te maken o
 editor.fork_before_edit=Je moet deze repository eerst vorken om dit bestand aan te kunnen passen
 editor.delete_this_file=Verwijder dit bestand
 editor.must_have_write_access=You must have write access to make or propose changes to this file
-editor.file_delete_success=File '%s' has been deleted successfully!
+editor.file_delete_success=Bestand '%s' is succesvol verwijderd!
 editor.name_your_file=Name your file...
 editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
-editor.or=or
-editor.cancel_lower=cancel
+editor.or=of
+editor.cancel_lower=annuleren
 editor.commit_changes=Commit Changes
 editor.add_tmpl=Add '%s/<filename>'
 editor.add=Add '%s'
@@ -455,6 +457,7 @@ editor.cancel=Cancel
 editor.filename_cannot_be_empty=Filename cannot be empty.
 editor.branch_already_exists=Branch '%s' already exists in this repository.
 editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
 editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
 editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Dit pull-request kan niet worden gemerged omdat er
 pulls.cannot_auto_merge_helper=Gelieve beide versies manueel samen te voegen om de conflicten op te lossen.
 pulls.merge_pull_request=Samenvoegen van pull verzoek
 pulls.open_unmerged_pull_exists=U kan de bewerking 'heropenen' niet uitvoeren omdat er al een pull-aanvraag (#%d) is van dezelfde repository met dezelfde informatie. Voeg deze eerst samen. 
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Nieuwe mijlpaal
 milestones.open_tab=%d geopend
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Authenticatie verwijderd
 auths.delete_auth_desc=Deze authenticatie zal verwijderd worden, wil je verdergaan?
 auths.still_in_used=This authentication is still used by some users, please delete or convert these users to another login type first.
 auths.deletion_success=Authentication has been deleted successfully!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Serverconfiguratie
 config.app_name=Applicatienaam

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

@@ -137,6 +137,7 @@ issues.in_your_repos=W Twoich repozytoriach
 [explore]
 repos=Repozytoria
 users=Użytkownicy
+organizations=Organizations
 search=Wyszukiwanie
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Historia
 file_view_raw=Zobacz czysty
 file_permalink=Bezpośredni odnośnik
 file_too_large=Ten plik jest zbyt duży, aby go wyświetlić
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Nowy plik
 editor.upload_file=Załaduj plik
@@ -455,7 +457,8 @@ editor.cancel=Anuluj
 editor.filename_cannot_be_empty=Nazwa pliku nie może być pusta.
 editor.branch_already_exists=Gałąź '%s' już istnieje w tym repozytorium.
 editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
-editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
+editor.filename_is_a_directory=Nazwa '%s' jest istniejącym katalogiem w tym repozytorium.
 editor.file_editing_no_longer_exists=Plik '%s' który edytujesz nie istnieje już w tym repozytorium.
 editor.file_changed_while_editing=Zawartość pliku została zmieniona od rozpoczęcia edycji. <a target="_blank" href="%s">Kliknij tutaj</a> aby zobaczyć, co zostało zmienione lub <strong>naciśnij commit ponownie</strong> aby nadpisać te zmiany.
 editor.file_already_exists=Nazwa pliku '%s' już istnieje w tym repozytorium.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Pull request nie może być automatycznie scalony z
 pulls.cannot_auto_merge_helper=Proszę scalić ręcznie, aby rozwiązać konflikty.
 pulls.merge_pull_request=Scal Pull Request
 pulls.open_unmerged_pull_exists=`Nie można otworzyć ponownie ponieważ już istnieje gotowy do scalenia pull request (#%d) z tego samego repozytorium z tymi samymi informacjami.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Nowy kamień milowy
 milestones.open_tab=Otwarte %d
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Usunięcie uwierzytelnienia
 auths.delete_auth_desc=To uwierzytelnienie zostanie usunięte, czy chcesz kontynuować?
 auths.still_in_used=Ten rodzaj autentykacji jest wciąż wykorzystywany przez niektórych użytkowników. Usuń lub przekonwertuj użytkowników, aby wykorzystywali inny typ logowania.
 auths.deletion_success=Uwierzytelnienie zostało usunięte pomyślnie!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Konfiguracja serwera
 config.app_name=Nazwa aplikacji

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

@@ -137,6 +137,7 @@ issues.in_your_repos=Em seus repositórios
 [explore]
 repos=Repositórios
 users=Usuários
+organizations=Organizations
 search=Pesquisar
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Histórico
 file_view_raw=Ver raw
 file_permalink=Link permanente
 file_too_large=Este arquivo é muito grande para ser exibido
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Novo arquivo
 editor.upload_file=Enviar arquivo
@@ -455,6 +457,7 @@ editor.cancel=Cancelar
 editor.filename_cannot_be_empty=Nome do arquivo não pode ser vazio.
 editor.branch_already_exists=Branch '%s' já existe neste repositório.
 editor.directory_is_a_file=Entrada '%s' no caminho pai é um arquivo e não uma pasta neste repositório.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=O arquivo '%s' é uma pasta existente neste repositório.
 editor.file_editing_no_longer_exists=O arquivo '%s' que você está editando não existe mais neste repositório.
 editor.file_changed_while_editing=O conteúdo do arquivo mudou desde que você começou a editar. <a target="_blank" href="%s">Clique aqui</a> para ver o que mudou ou <strong>pressione efetivar novamente</strong> para sobrescrever esses mudanças.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=O merge deste Pull Request não pode ser aplicado a
 pulls.cannot_auto_merge_helper=Por favor, aplique o merge manualmente para resolver os conflitos.
 pulls.merge_pull_request=Solicitação de merge de Pull Request
 pulls.open_unmerged_pull_exists=`Você não pode executar a operação de reabrir porque já existe um Pull request aberto (#%d) do mesmo repositório com as mesmas informações de merge e está esperando pelo merge.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Novo milestone
 milestones.open_tab=%d abertos
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Exclusão da autenticação
 auths.delete_auth_desc=Esta autenticação esta prestes a ser excluída, deseja continuar?
 auths.still_in_used=Esta autenticação ainda é usada por alguns usuários. Por favor remova ou converta esses usuários para outro tipo de login primeiro.
 auths.deletion_success=Autenticação excluída com sucesso!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Configuração do servidor
 config.app_name=Nome do aplicativo

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

@@ -137,6 +137,7 @@ issues.in_your_repos=В ваших репозиториях
 [explore]
 repos=Репозитории
 users=Пользователи
+organizations=Organizations
 search=Поиск
 
 [auth]
@@ -426,6 +427,7 @@ file_history=История
 file_view_raw=Посмотреть исходник
 file_permalink=Постоянная ссылка
 file_too_large=Этот файл слишком большой, поэтому он не может быть отображен
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Новый файл
 editor.upload_file=Загрузить файл
@@ -455,6 +457,7 @@ editor.cancel=Отмена
 editor.filename_cannot_be_empty=Имя файла не может быть пустым.
 editor.branch_already_exists=Ветка «%s» уже существует в этом репозитории.
 editor.directory_is_a_file=Запись «%s» в пути на верх является файлом, а не каталогом этого репозитория.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=Файл «%s» является каталогом в этом репозитории.
 editor.file_editing_no_longer_exists=Редактируемый вами файл «%s» больше не существует в репозитории.
 editor.file_changed_while_editing=Содержимое файла изменилось со времени начала редактирования. <a target="_blank" href="%s"> нажмите здесь,</a> чтобы увидеть, что было изменено, или <strong>нажмите кнопку commit снова</strong>, чтобы перезаписать эти изменения.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Этот запрос на слияние не мо
 pulls.cannot_auto_merge_helper=Пожалуйста, совершите слияние вручную для урегулирования конфликтов.
 pulls.merge_pull_request=Слить пулл-реквест
 pulls.open_unmerged_pull_exists=`Вы не можете снова открыть, поскольку уже существует запрос на слияние (#%d) из того же репозитория с той же информацией о слиянии и ожидающий слияния. `
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Новая контрольная точка
 milestones.open_tab=%d открыты
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Удаление канала аутентификаци
 auths.delete_auth_desc=Этот канал аутентификации будет удален. Вы уверены что хотите продолжить?
 auths.still_in_used=Эта проверка подлинности до сих пор используется некоторыми пользователями, удалите или преобразуйте этих пользователей в другой тип входа в систему.
 auths.deletion_success=Канал аутентификации успешно удален!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Конфигурация сервера
 config.app_name=Имя приложения

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

@@ -137,6 +137,7 @@ issues.in_your_repos=У вашим спремиштима
 [explore]
 repos=Спремишта
 users=Корисници
+organizations=Organizations
 search=Претрага
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Историја
 file_view_raw=Прегледај саму датотеку
 file_permalink=Пермалинк
 file_too_large=Ова датотека је превише веика да би се приказала
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Нова датотека
 editor.upload_file=Отпреми датотеку
@@ -455,6 +457,7 @@ editor.cancel=Откажи
 editor.filename_cannot_be_empty=Име датотеке неможе бити празно.
 editor.branch_already_exists=Грана '%s' већ постоји за ово спремиште.
 editor.directory_is_a_file='%s' је већ постојећа датотека а не директоријум у спремишту.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory='%s' је постојећи директоријум у спремишту.
 editor.file_editing_no_longer_exists=Датотека '%s' више не постоји у спремишту.
 editor.file_changed_while_editing=Садржај датотеке је промењен од почетка уређивања. <a target="_blank" href="%s">Кликните овде</a> да видите шта је промењено или <strong>опет поднесите комит</strong> да пребришете промене.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Овај захтев за спајање не мо
 pulls.cannot_auto_merge_helper=Молимо вас, обавите спајање ручно да би сте разрешили сукобе.
 pulls.merge_pull_request=Обави спајање
 pulls.open_unmerged_pull_exists=`Неможете поново отворити јер већ постоји захтев за спајање (#%d) из истог спремишта са истим информацијама о спајању и чека спајање.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Нова фаза
 milestones.open_tab=%d отворено
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Брисање канала аутентикације
 auths.delete_auth_desc=Овај канал аутентикације ће бити избрисан. Да ли желите да наставите?
 auths.still_in_used=Овај канал аутентикације још увек се користи од стране неких корисника, уклоните или пребаци ове кориснике у друг врсту аутентикације.
 auths.deletion_success=Канал аутентикације успешно избрисан!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Конфигурација сервера
 config.app_name=Име апликације

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

@@ -137,6 +137,7 @@ issues.in_your_repos=I dina utvecklingskataloger
 [explore]
 repos=Utvecklingskataloger
 users=Användare
+organizations=Organizations
 search=Sök
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Historik
 file_view_raw=Visa i råformat
 file_permalink=Permalänk
 file_too_large=Denna fil är för stor för att visas
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=Ny fil
 editor.upload_file=Ladda upp fil
@@ -455,6 +457,7 @@ editor.cancel=Avbryt
 editor.filename_cannot_be_empty=Filnamnet får inte vara tomt.
 editor.branch_already_exists=Grenen '%s' finns redan i förrådet.
 editor.directory_is_a_file=Komponenten '%s' i föräldrasökvägen är en fil, inte en katalog i detta förråd.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=Filnmanet '%s' är en existerande katalog i detta förråd.
 editor.file_editing_no_longer_exists=Filen '%s' som du redigerar finns inte lägre i förrådet.
 editor.file_changed_while_editing=Filinnhållet har ändrats sedan du började redigera. <a target="_blank" href="%s">Klicka här</a> för att se vad som ändrats eller <strong>tryck checka in igen</strong> för att skriva över dessa ändringar.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Denna pull-förfrågan kan inte sammanfogas automat
 pulls.cannot_auto_merge_helper=Vänligen sammanfoga manuellt för att lösa konflikter.
 pulls.merge_pull_request=Sammanfoga Pull-förfrågan
 pulls.open_unmerged_pull_exists=`Du kan inte utföra återöppningsoperationen eftersom det finns redan en öppen pull-förfrågan (#%d) från samma repo med samma sammanfogningsinformation som väntar på sammanfogning.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Ny milstolpe
 milestones.open_tab=%d Öppna
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Authentication Deletion
 auths.delete_auth_desc=This authentication is going to be deleted, do you want to continue?
 auths.still_in_used=This authentication is still used by some users, please delete or convert these users to another login type first.
 auths.deletion_success=Authentication has been deleted successfully!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Server Configuration
 config.app_name=Application Name

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

@@ -137,6 +137,7 @@ issues.in_your_repos=Depolarınızda
 [explore]
 repos=Depolar
 users=Kullanıcılar
+organizations=Organizations
 search=Ara
 
 [auth]
@@ -426,6 +427,7 @@ file_history=Geçmiş
 file_view_raw=Ham Görünüm
 file_permalink=Kalıcı Bağlantı
 file_too_large=Bu dosya sergilenmek için çok büyük
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=New file
 editor.upload_file=Upload file
@@ -455,6 +457,7 @@ editor.cancel=İptal
 editor.filename_cannot_be_empty=Filename cannot be empty.
 editor.branch_already_exists=Branch '%s' already exists in this repository.
 editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
 editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
 editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=Çakışmalardan dolayı bu değişiklik isteği ot
 pulls.cannot_auto_merge_helper=Çakışmaları çözmek için lütfen elle birleştirin.
 pulls.merge_pull_request=Değişiklik İsteğini Birleştir
 pulls.open_unmerged_pull_exists=`Yeniden açma işlemini gerçekleştiremezsiniz. Çünkü zaten aynı depodan, aynı birleştirme bilgisiyle açık olan bir değişiklik isteği var (#%d) ve birleştirme bekliyor.`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Yeni Kilometre Taşı
 milestones.open_tab=%d Açık
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=Yetkilendirme Silme
 auths.delete_auth_desc=Bu yetkilendirme silinecek. Devam etmek istiyor musunuz?
 auths.still_in_used=Bu yetkilendirme hala bazı kullanıcılar tarafından kullanılıyor. Lütfen öncelikle bunları silin ya da başka oturum açma türlerine çevirin.
 auths.deletion_success=Yetkilendirme başarıyla silindi!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=Sunucu Yapılandırması
 config.app_name=Uygulama Adı

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

@@ -137,6 +137,7 @@ issues.in_your_repos=属于该用户仓库的
 [explore]
 repos=仓库
 users=用户
+organizations=组织
 search=搜索
 
 [auth]
@@ -426,6 +427,7 @@ file_history=文件历史
 file_view_raw=查看原始文件
 file_permalink=永久链接
 file_too_large=文件过大导致无法显示
+video_not_supported_in_browser=您的浏览器不支持使用 HTML5 播放视频。
 
 editor.new_file=新的文件
 editor.upload_file=上传文件
@@ -455,7 +457,7 @@ editor.cancel=取消
 editor.filename_cannot_be_empty=文件名不能为空。
 editor.branch_already_exists=此仓库已存在名为 '%s' 的分支。
 editor.directory_is_a_file=路径 '%s' 的父路径中包含此仓库已存在的文件名。
-editor.file_is_a_symlink = '%s'数据是网页编辑器不能改变的符号链接
+editor.file_is_a_symlink=文件 '%s' 为一个符号链接,无法通过 Web 编辑器编辑内容
 editor.filename_is_a_directory=文件名 '%s' 是此仓库中已存在的目录名。
 editor.file_editing_no_longer_exists=您编辑的文件 '%s' 已经不存在于此仓库中。
 editor.file_changed_while_editing=文件内容在您进行编辑时已经发生变动。<a target="_blank" href="%s">单击此处</a> 查看变动的具体内容,或者 <strong>再次提交</strong> 覆盖已发生的变动。
@@ -580,6 +582,8 @@ pulls.cannot_auto_merge_desc=该合并请求存在冲突,无法进行自动合
 pulls.cannot_auto_merge_helper=请手动拉取代码变更以解决冲突。
 pulls.merge_pull_request=合并请求
 pulls.open_unmerged_pull_exists=`由于已经存在来自相同仓库和合并信息的未合并请求(#%d),您无法执行重新开启操作。`
+pulls.delete_branch=删除分支
+pulls.delete_branch_has_new_commits=该分支在完成合并后又推送了新的提交,无法进行删除操作。
 
 milestones.new=新的里程碑
 milestones.open_tab=%d 开启中
@@ -1029,6 +1033,7 @@ auths.delete_auth_title=删除认证操作
 auths.delete_auth_desc=该认证将被删除。是否继续?
 auths.still_in_used=此认证仍旧与一些用户有关联,请先删除或者将这些用户转换为其它登录类型。
 auths.deletion_success=授权源删除成功!
+auths.login_source_exist=登录源 '%s' 已存在。
 
 config.server_config=服务器配置
 config.app_name=应用名称

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

@@ -137,6 +137,7 @@ issues.in_your_repos=屬於該用戶倉庫的
 [explore]
 repos=探索倉庫
 users=用戶
+organizations=Organizations
 search=搜索
 
 [auth]
@@ -426,6 +427,7 @@ file_history=文件歷史
 file_view_raw=查看原始文件
 file_permalink=永久連結
 file_too_large=This file is too large to be shown
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=New file
 editor.upload_file=Upload file
@@ -455,6 +457,7 @@ editor.cancel=Cancel
 editor.filename_cannot_be_empty=Filename cannot be empty.
 editor.branch_already_exists=Branch '%s' already exists in this repository.
 editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
 editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
 editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=由於存在衝突,不能自動合併這推送請
 pulls.cannot_auto_merge_helper=請手動合併來解決衝突。
 pulls.merge_pull_request=合併請求
 pulls.open_unmerged_pull_exists=`由於已經存在來自相同倉庫和合併信息的未合併請求(#%d),您無法執行重新開啟操作。`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=新的里程碑
 milestones.open_tab=%d 開啟中
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=刪除認證操作
 auths.delete_auth_desc=該認證將被刪除。是否繼續?
 auths.still_in_used=This authentication is still used by some users, please delete or convert these users to another login type first.
 auths.deletion_success=認證源刪除成功!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=服務器配置
 config.app_name=應用名稱

+ 6 - 0
conf/locale/locale_zh-TW.ini

@@ -137,6 +137,7 @@ issues.in_your_repos=屬於該用戶倉庫的
 [explore]
 repos=探索倉庫
 users=用戶
+organizations=Organizations
 search=搜索
 
 [auth]
@@ -426,6 +427,7 @@ file_history=文件歷史
 file_view_raw=查看原始文件
 file_permalink=永久連結
 file_too_large=檔案太大,無法顯示
+video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
 editor.new_file=開新檔案
 editor.upload_file=上傳檔案
@@ -455,6 +457,7 @@ editor.cancel=取消
 editor.filename_cannot_be_empty=檔案名不能為空。
 editor.branch_already_exists='%s' 已存在於此存儲庫。
 editor.directory_is_a_file='%s' 在此倉庫中的路徑是檔案而不是目錄。
+editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
 editor.filename_is_a_directory=檔案名 '%s' 是此資料庫中的現有目錄。
 editor.file_editing_no_longer_exists=檔 '%s' 您正在編輯不再存在於資料庫。
 editor.file_changed_while_editing=從您開始編輯已更改檔的內容。<a target="_blank"href="%s"> 按一下此處</a> 以查看什麼發生了更改或 <strong>按提交再</strong> 覆蓋這些更改。
@@ -579,6 +582,8 @@ pulls.cannot_auto_merge_desc=由於存在衝突,不能自動合併這推送請
 pulls.cannot_auto_merge_helper=請手動合併來解決衝突。
 pulls.merge_pull_request=合併請求
 pulls.open_unmerged_pull_exists=`由於已經存在來自相同倉庫和合併信息的未合併請求(#%d),您無法執行重新開啟操作。`
+pulls.delete_branch=Delete Branch
+pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=新的里程碑
 milestones.open_tab=%d 開啟中
@@ -1028,6 +1033,7 @@ auths.delete_auth_title=刪除認證操作
 auths.delete_auth_desc=該認證將被刪除。是否繼續?
 auths.still_in_used=一些使用者仍然使用此驗證方式,請先刪除或轉換這些使用者到其它登入類型。
 auths.deletion_success=認證源刪除成功!
+auths.login_source_exist=Login source '%s' already exists.
 
 config.server_config=服務器配置
 config.app_name=應用名稱

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


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