fix #864 with migration and update locale

conf/locale/locale_bg-BG.ini

@@ -143,6 +143,11 @@ invalid_code=За съжаление, вашия код за потвържде
 reset_password_helper=Щракнете тук, за да нулирате паролата си
 password_too_short=Дължина на паролата не може да бъде по-малко от 6.
 
+[modal]
+yes=Yes
+no=No
+modify=Modify
+
 [form]
 UserName=Потребителско име
 RepoName=Име на хранилище
@@ -159,6 +164,7 @@ AdminEmail=Имейл на администратора
 require_error="не може да бъде празен."
 alpha_dash_error=` must be valid alpha or numeric or dash(-_) characters.`
 alpha_dash_dot_error=` must be valid alpha or numeric or dash(-_) or dot characters.`
+size_error=` must be size %s.`
 min_size_error="трябва да съдържа поне %s знака."
 max_size_error="трябва да съдържа най-много %s знака."
 email_error=„не е валиден имейл адрес.“
@@ -316,6 +322,8 @@ migrate_repo=Мигриране на хранилището
 migrate.clone_address=Клонирай адрес
 migrate.invalid_local_path=Невалиден път - не съществува или не е директория.
 
+forked_from=forked from
+fork_from_self=You cannot fork repository you already owned!
 copy_link=Копирай
 click_to_copy=Копиране в клипборда
 copied=Успешно копирано
@@ -338,11 +346,14 @@ branch_and_tags=Бранчове и тагове
 branches=Бранчове
 tags=Тагове
 issues=Issues
+labels=Labels
+milestones=Milestones
 commits=Комити
 releases=Релийзи
 file_raw=Суров
 file_history=История
 file_view_raw=Прегледай в суров вид
+file_permalink=Permalink
 
 commits.commits=Комити
 commits.search=Търсене на комити
@@ -353,6 +364,34 @@ commits.date=Дата
 commits.older=По-стари
 commits.newer=По-нови
 
+issues.new=New Issue
+issues.new_label=New Label
+issues.new_label_placeholder=Label name...
+issues.open_tab=%d Open
+issues.close_tab=%d Closed
+issues.filter_label=Label
+issues.filter_label_no_select=No selected label
+issues.filter_milestone=Milestone
+issues.filter_assignee=Assignee
+issues.filter_type=Type
+issues.filter_type.all_issues=All issues
+issues.filter_type.assigned_to_you=Assigned to you
+issues.filter_type.created_by_you=Created by you
+issues.filter_type.mentioning_you=Mentioning you
+issues.opened_by=opened %[1]s by <a href="/%[2]s">%[2]s</a>
+issues.previous=Previous Page
+issues.next=Next Page
+issues.label_title=Label name
+issues.label_color=Label color
+issues.label_count=%d labels
+issues.label_open_issues=%d open issues
+issues.label_edit=Edit
+issues.label_delete=Delete
+issues.label_modify=Label Modification
+issues.label_deletion=Label Deletion
+issues.label_deletion_desc=Delete label will remove its information in all related issues. Do you want to continue?
+issues.label_deletion_success=Label has been deleted successfully!
+
 settings=Настройки
 settings.options=Опции
 settings.collaboration=Сътрудничество
@@ -679,7 +718,7 @@ config.enable_cache_avatar=Enable Cache Avatar
 config.active_code_lives=Active Code Lives
 config.reset_password_code_lives=Reset Password Code Lives
 config.webhook_config=Webhook настройки
-config.queue_length = Queue Length
+config.task_interval=Task Interval
 config.deliver_timeout=Deliver Timeout
 config.skip_tls_verify=Пропусни TLS проверката
 config.mailer_config=Мейлър конфигурация

conf/locale/locale_de-DE.ini

@@ -143,6 +143,11 @@ invalid_code=Es tut uns leid, der Bestätigungscode ist abgelaufen oder ungülti
 reset_password_helper=Hier klicken, um das Passwort zurückzusetzen
 password_too_short=Das Passwort muss mindenstens 6 Zeichen lang sein
 
+[modal]
+yes=Ja
+no=Nein
+modify=Ändern
+
 [form]
 UserName=Benutzername
 RepoName=Repository-Name
@@ -159,6 +164,7 @@ AdminEmail=Admin E-mail
 require_error=` darf nicht leer sein.`
 alpha_dash_error=` kann ausschließlich alphanumerische Zeichen und "-_" enthalten.`
 alpha_dash_dot_error=` kann ausschließlich alphanumerische Zeichen und ".-_" enthalten.`
+size_error=` muss die Größe %s haben.`
 min_size_error=` muss mindestens %s Zeichen enthalten.`
 max_size_error=` darf höchstens %s Zeichen enthalten.`
 email_error=` ist keine gültige E-Mail-Adresse.`
@@ -316,6 +322,8 @@ migrate_repo=Repository migrieren
 migrate.clone_address=Adresse kopieren
 migrate.invalid_local_path=Lokaler Pfad ist ungültig, er existiert nicht oder ist kein Ordner.
 
+forked_from=Geforkt von
+fork_from_self=SIe können kein Repository forken, das ihnen gehört!
 copy_link=Kopieren
 click_to_copy=In Zwischenablage kopieren
 copied=Kopiert OK
@@ -338,6 +346,8 @@ branch_and_tags=Branches & Tags
 branches=Branches
 tags=Markierungen
 issues=Issues
+labels=Label
+milestones=Meilensteine
 commits=Commits
 releases=Veröffentlichungen
 file_raw=Roh
@@ -354,6 +364,34 @@ commits.date=Datum
 commits.older=Älter
 commits.newer=Neuer
 
+issues.new=Neues Problem
+issues.new_label=Neues Label
+issues.new_label_placeholder=Label-Name...
+issues.open_tab=%d offen
+issues.close_tab=%d geschlossen
+issues.filter_label=Label
+issues.filter_label_no_select=Kein Label gewählt
+issues.filter_milestone=Meilenstein
+issues.filter_assignee=Beauftragter
+issues.filter_type=Typ
+issues.filter_type.all_issues=Alle Probleme
+issues.filter_type.assigned_to_you=Dir zugewiesen
+issues.filter_type.created_by_you=Erstellt von dir
+issues.filter_type.mentioning_you=Erwähnen dich
+issues.opened_by=opened %[1]s by <a href="/%[2]s">%[2]s</a>
+issues.previous=Vorherige Seite
+issues.next=Nächste Seite
+issues.label_title=Label Name
+issues.label_color=Label Farbe
+issues.label_count=%d Labels
+issues.label_open_issues=%d offene Probleme
+issues.label_edit=Bearbeiten
+issues.label_delete=Löschen
+issues.label_modify=Label Änderung
+issues.label_deletion=Label Löschung
+issues.label_deletion_desc=Delete label will remove its information in all related issues. Do you want to continue?
+issues.label_deletion_success=Label has been deleted successfully!
+
 settings=Einstellungen
 settings.options=Optionen
 settings.collaboration=Zusammenarbeit
@@ -680,7 +718,7 @@ config.enable_cache_avatar=Avatar-Cache aktivieren
 config.active_code_lives=Aktivierungscode Lebensdauer
 config.reset_password_code_lives=Passwortcode Lebensdauer
 config.webhook_config=Webhook-Einstellungen
-config.queue_length=Queue Length
+config.task_interval=Task-Intervall
 config.deliver_timeout=Zeitlimit für Zustellung
 config.skip_tls_verify=TLS verifikation überspringen
 config.mailer_config=Mailer-Einstellungen

conf/locale/locale_es-ES.ini

@@ -143,6 +143,11 @@ invalid_code=Lo sentimos, su código de confirmación ha expirado o no es valido
 reset_password_helper=Haga Clic aquí para restablecer su contraseña
 password_too_short=La longitud de la contraseña no puede ser menor a 6.
 
+[modal]
+yes=Sí
+no=No
+modify=Editar
+
 [form]
 UserName=Nombre de usuario
 RepoName=Nombre del repositorio
@@ -159,6 +164,7 @@ AdminEmail=Correo electrónico del administrador
 require_error=` no puede estar vacío.`
 alpha_dash_error=` los caracteres deben ser Alfanumericos o dash(-_).`
 alpha_dash_dot_error=` debe ser un caracter alfanumérivo válido, un guión alto o bajo (-_) o un signo de puntuación.`
+size_error=` debe ser de tamaño %s.`
 min_size_error=` debe contener al menos %s caracteres.`
 max_size_error=` debe contener como máximo %s caracteres.`
 email_error=` no es una dirección de correo válida.`
@@ -316,6 +322,8 @@ migrate_repo=Migrar Repositorio
 migrate.clone_address=Clonar Dirección
 migrate.invalid_local_path=Rutal local inválida, no existe o no es un directorio.
 
+forked_from=forked de
+fork_from_self=eres el propietario del repositorio, no puedes hacer fork!
 copy_link=Copiar
 click_to_copy=Copiar al portapapeles
 copied=Copiado correctamente
@@ -338,6 +346,8 @@ branch_and_tags=Ramas y Etiquetas
 branches=Ramas
 tags=Etiquetas
 issues=Incidencias
+labels=Etiquetas
+milestones=Milestones
 commits=Commits
 releases=Releases
 file_raw=Raw
@@ -354,6 +364,34 @@ commits.date=Fecha
 commits.older=Anterior
 commits.newer=Posterior
 
+issues.new=Nueva Incidencia
+issues.new_label=Nueva Etiqueta
+issues.new_label_placeholder=Nombre etiqueta...
+issues.open_tab=%d abiertas
+issues.close_tab=%d cerradas
+issues.filter_label=Etiqueta
+issues.filter_label_no_select=Ninguna etiqueta seleccionada
+issues.filter_milestone=Milestone
+issues.filter_assignee=Asignada por
+issues.filter_type=Tipo
+issues.filter_type.all_issues=Todas las incidencias
+issues.filter_type.assigned_to_you=Asignada a ti
+issues.filter_type.created_by_you=Creada por ti
+issues.filter_type.mentioning_you=Citado en
+issues.opened_by=abierta %[1]s por <a href="/%[2]s">%[2]s</a>
+issues.previous=Página Anterior
+issues.next=Página Siguiente
+issues.label_title=Nombre etiqueta
+issues.label_color=Color etiqueta
+issues.label_count=%d etiquetas
+issues.label_open_issues=%d incidencias abiertas
+issues.label_edit=Editar
+issues.label_delete=Borrar
+issues.label_modify=Modificación de Etiqueta
+issues.label_deletion=Borrado de Etiqueta
+issues.label_deletion_desc=Al borrar la etiqueta su información será eliminada de todas las incidencias relacionadas. Desea continuar?
+issues.label_deletion_success=Etiqueta borrada con éxito!
+
 settings=Configuración
 settings.options=Opciones
 settings.collaboration=Colaboración
@@ -680,7 +718,7 @@ config.enable_cache_avatar=Activar la Caché de Avatar
 config.active_code_lives=Habilitar Vida del Código
 config.reset_password_code_lives=Restablecer Contraseña de Vida del Código
 config.webhook_config=Configuración de Webhooks
-config.queue_length=Tamaño de Cola
+config.task_interval=Intervalo de Tareas
 config.deliver_timeout=Timeout de Entrega
 config.skip_tls_verify=Omitir la Verificación TLS
 config.mailer_config=Configuración del Mailer

conf/locale/locale_fr-FR.ini

@@ -41,9 +41,9 @@ cancel=Annuler
 
 [search]
 search=Rechercher...
-repository=Dépôt
+repository=Référentiel
 user=Utilisateur
-issue=Ticket
+issue=Problème
 code=Code
 
 [install]
@@ -79,7 +79,7 @@ app_url_helper=Cela affecte les doublons d'URL HTTP/HTTPS et le contenu d'e-mail
 optional_title=Paramètres facultatifs
 email_title=Paramètres du Service de Messagerie
 smtp_host=Hôte SMTP
-smtp_from=De
+smtp_from=Provenant de
 smtp_from_helper=Adresse de l'expéditeur, RFC 5322. Soit une adresse courriel simple, soit au format "Nom" <email@example.com>.
 mailer_user=E-mail de l'Expéditeur
 mailer_password=Mot de Passe de l'Expéditeur
@@ -135,14 +135,19 @@ sign_in_email=Connexion avec l'E-mail
 active_your_account=Activer votre Compte
 resent_limit_prompt=Désolé, vos tentatives d'activation sont trop fréquentes. Veuillez réessayer dans 3 minutes.
 has_unconfirmed_mail=Bonjour %s, votre adresse courriel (<b>%s</b>) n'a pas été confirmée. Si vous n'avez reçu aucun courriel de confirmation ou souhaitez renouveler l'envoi, appuyez sur le bouton ci-dessous.
-resend_mail=Appuyez ici pour renvoyer un mail de confirmation
+resend_mail=Cliquez ici pour renvoyer un mail de confirmation
 email_not_associate=Cette adresse e-mail n'est associée à aucun compte.
-send_reset_mail=Appuyez ici pour (r)envoyer le mail de réinitialisation du mot de passe
+send_reset_mail=Cliquez ici pour (r)envoyer le mail de réinitialisation du mot de passe
 reset_password=Réinitialiser le Mot de Passe
 invalid_code=Désolé, code de confirmation invalide ou expiré.
-reset_password_helper=Appuyez ici pour réinitialiser votre mot de passe
+reset_password_helper=Cliquez ici pour réinitialiser votre mot de passe
 password_too_short=Le mot de passe doit contenir 6 caractères minimum.
 
+[modal]
+yes=Oui
+no=Non
+modify=Modifier
+
 [form]
 UserName=Nom d'Utilisateur
 RepoName=Nom du Référentiel
@@ -154,11 +159,12 @@ HttpsUrl=URL HTTPS
 PayloadUrl=URL des Données Utiles
 TeamName=Nom d'équipe
 AuthName=Nom d'autorisation
-AdminEmail=E-mail d'admin
+AdminEmail=E-mail de l'administrateur
 
 require_error=` Ne peut être vide `
 alpha_dash_error=` doivent être des caractères alpha, numeriques ou console (-_) valides `
 alpha_dash_dot_error=` doivent être des caractères alpha, numeriques, console (-_) valides ou des points `
+size_error=` doit être à la taille de %s.`
 min_size_error=` %s caractères minimum `
 max_size_error=` %s caractères maximum `
 email_error=` adresse e-mail invalide `
@@ -175,7 +181,7 @@ email_been_used=Adresse e-mail déjà utilisée.
 ssh_key_been_used=Le nom de la clé publique a déjà servi.
 illegal_team_name=Le nom de l'équipe contient des caractères interdits.
 username_password_incorrect=Nom d'utilisateur ou mot de passe incorrect.
-enterred_invalid_repo_name=Veuillez vérifier que le nom saisi du dépôt soit correct.
+enterred_invalid_repo_name=Veuillez vérifier que le nom saisi du Référentiel soit correct.
 enterred_invalid_owner_name=Veuillez vérifier que le nom du propriétaire saisi soit correct.
 enterred_invalid_password=Veuillez vérifier que le mot de passe saisi soit correct.
 user_not_exist=Cet utilisateur n'existe pas.
@@ -186,16 +192,16 @@ unable_verify_ssh_key=Gogs n'a pu vérifier la validité de votre clé SSH, mêm
 auth_failed=Échec d'authentification : %s
 
 still_own_repo=Votre compte comporte toujours des propriétés du dépôt. Vous devez d'abord les supprimer ou les transférer.
-still_has_org=Votre compte a toujours membres de l'organisation, vous avez à gauche ou supprimez tout d'abord.
+still_has_org=Votre compte contient toujours au moins une adhésion à une organisation, vous devez quitter ou supprimer votre adhésion.
 org_still_own_repo=Cette organisation comporte toujours des propriétés de Référentiel. Vous devez d'abord les supprimer ou les transférer.
 
 still_own_user=Cette authentification a déjà servi à d'autres utilisateurs. Veuillez les déplacer puis supprimez à nouveau.
 
-target_branch_not_exist=Branche cible n'existe pas
+target_branch_not_exist=La branche cible n'existe pas.
 
 [user]
 change_avatar=Changez d'avatar via gravatar.com
-change_custom_avatar=Changer de vignette dans les réglages
+change_custom_avatar=Changer votre avatar dans les paramètres
 join_on=Adhéré le
 repositories=Référentiels
 activity=Activités publiques
@@ -228,13 +234,13 @@ change_username_desc=Nom d'utilisateur modifié. Cela affecte tous les liens rel
 continue=Continuer
 cancel=Annuler
 
-enable_custom_avatar=Permettre vignette personnalisée
+enable_custom_avatar=Activer l'Avatar personnalisé
 enable_custom_avatar_helper=Cette option désactive l'affichage via Gravatar
-choose_new_avatar=Choisir nouvelle vignette
-update_avatar=Réglage de mise à jour de vignette
+choose_new_avatar=Sélectionner un nouvel avatar
+update_avatar=Mettre l'Avatar à Jour
 uploaded_avatar_not_a_image=Le fichier téléchargé n'est pas une image.
 no_custom_avatar_available=Aucun avatar personnalisé disponible, activation impossible.
-update_avatar_success=La mise à jour de votre vignette a réussi.
+update_avatar_success=Votre avatar a été mis à jour avec succès.
 
 change_password=Modifier le Mot de Passe
 old_password=Mot de Passe actuel
@@ -279,7 +285,7 @@ token_name=Nom du jeton
 generate_token=Générer le jeton
 generate_token_succees=Nouveau jeton d'accès a été généré avec succès ! Assurez-vous de copier votre nouveau jeton d'accès personnel maintenant. Vous ne serez pas en mesure de le revoir !
 delete_token=Supprimer
-delete_token_success=Jeton d'accès personnelle a été supprimée avec succès ! N'oubliez pas de mettre à jour vos applications aussi bien.
+delete_token_success=Ce Jeton d'accès personnel a été supprimé avec succès ! N'oubliez pas de mettre vos applications à jour également.
 
 delete_account=Supprimer le Compte
 delete_prompt=Votre compte sera supprimé définitivement et cette opération est <strong>IRRÉVERSIBLE</strong> !
@@ -316,8 +322,10 @@ migrate_repo=Migrer le Référentiel
 migrate.clone_address=Adresse du clone
 migrate.invalid_local_path=Chemin local non valide, non existant ou n'étant pas un dossier.
 
+forked_from=dérivé depuis
+fork_from_self=Vous nous ne pouvez  pas dériver un dépôt que vous possédez déja !
 copy_link=Copier
-click_to_copy=Copier dans le presse-papier
+click_to_copy=Copier dans le presse-papiers
 copied=Copié
 clone_helper=Besoin d'aide pour le clonage ? Visitez <a target="_blank" href="%s"> l'aider</a> !
 unwatch=Ne plus suivre
@@ -338,12 +346,14 @@ branch_and_tags=Branches & Tags
 branches=Branches
 tags=Tags
 issues=Problèmes
+labels=Etiquettes
+milestones=Étapes
 commits=Commissions
 releases=Publications
 file_raw=Raw
 file_history=Historique
 file_view_raw=Voir le Raw
-file_permalink=Permalink
+file_permalink=Lien permanent
 
 commits.commits=Commissions
 commits.search=Rechercher des commissions
@@ -354,6 +364,34 @@ commits.date=Date
 commits.older=Précédemment
 commits.newer=Récemment
 
+issues.new=Nouveau Problème
+issues.new_label=Nouvelle étiquette
+issues.new_label_placeholder=Nom de l'étiquette...
+issues.open_tab=%d Ouvert
+issues.close_tab=%d Fermé
+issues.filter_label=Étiquette
+issues.filter_label_no_select=Aucun étiquette sélectionnée
+issues.filter_milestone=Étape
+issues.filter_assignee=Assigné
+issues.filter_type=Type
+issues.filter_type.all_issues=Tous les problèmes
+issues.filter_type.assigned_to_you=Qui vous sont assignés
+issues.filter_type.created_by_you=Créé(es) par vous
+issues.filter_type.mentioning_you=Vous mentionnant
+issues.opened_by=ouvert %[1]s par <a href="/%[2]s">%[2]s</a>
+issues.previous=Page Précédente
+issues.next=Page Suivante
+issues.label_title=Nom du Label
+issues.label_color=Couleur du Label
+issues.label_count=%d labels
+issues.label_open_issues=%d problèmes ouverts
+issues.label_edit=Éditer
+issues.label_delete=Supprimer
+issues.label_modify=Modification du Label
+issues.label_deletion=Suppression du Label
+issues.label_deletion_desc=Cette opération supprimera également toutes les informations relatives aux problèmes. Voulez-vous continuer ?
+issues.label_deletion_success=Label supprimé avec succès !
+
 settings=Paramètres
 settings.options=Options
 settings.collaboration=Collaboration
@@ -544,11 +582,11 @@ dashboard.delete_inactivate_accounts_success=Inactivent tous les comptes ont ét
 dashboard.delete_repo_archives=Supprimer toutes les archives de référentiels
 dashboard.delete_repo_archives_success=Toutes les archives de référentiels ont été supprimés avec succès.
 dashboard.git_gc_repos=Collecter les déchets des référentiels
-dashboard.git_gc_repos_success=Tous les référentiels ont effectué la collecte avec succès.
+dashboard.git_gc_repos_success=Tous les dépôts ont effectué la collecte avec succès.
 dashboard.resync_all_sshkeys=Ré-écrire le fichier '.ssh/authorized_keys' (attention : les clés hors-Gogs vont être perdues)
 dashboard.resync_all_sshkeys_success=Toutes les clés publiques ont été ré-écrites avec succès.
 dashboard.resync_all_update_hooks=Ré-écrire tous les hooks de mises à jour des dépôts (requis quand le chemin de la configuration personnalisé est modifié)
-dashboard.resync_all_update_hooks_success=Tous les hooks de mises à jour des dépôts ont été ré-écris avec succès.
+dashboard.resync_all_update_hooks_success=Les mises à jour de hook des référentiels ont toutes été réécrites avec succès.
 
 dashboard.server_uptime=Durée de Marche Serveur
 dashboard.current_goroutine=Goroutines actuelles
@@ -585,7 +623,7 @@ users.new_account=Créer un nouveau compte
 users.name=Nom
 users.activated=Activés
 users.admin=Administrateur
-users.repos=Repos
+users.repos=Dépôts
 users.created=Créés
 users.edit=Éditer
 users.auth_source=Source d'Autorisation
@@ -680,7 +718,7 @@ config.enable_cache_avatar=Activer le Cache d'Avatar
 config.active_code_lives=Limites de Code Actif
 config.reset_password_code_lives=Réinitialiser le Mot De Passe des Limites de Code
 config.webhook_config=Configuration Webhook
-config.queue_length=Queue Length
+config.task_interval=Intervalles des Tâches
 config.deliver_timeout=Expiration d'Envoi
 config.skip_tls_verify=Ne pas vérifier TLS
 config.mailer_config=Configuration du Maileur
@@ -725,7 +763,7 @@ notices.system_notice_list=Notes Systèmes
 notices.type=Type
 notices.type_1=Référentiel
 notices.desc=Description
-notices.op=Auteur
+notices.op=Opération
 notices.delete_success=Note système supprimée avec succès.
 
 [action]

conf/locale/locale_ja-JP.ini

@@ -143,6 +143,11 @@ invalid_code=申し訳ありませんが、確認用コードが期限切れま
 reset_password_helper=パスワードをリセットするにはここをクリック
 password_too_short=６文字未満のパスワードは設定できません。
 
+[modal]
+yes=はい
+no=いいえ
+modify=変更
+
 [form]
 UserName=ユーザ名
 RepoName=リポジトリ名
@@ -159,6 +164,7 @@ AdminEmail=管理者の電子メール
 require_error=空にできません
 alpha_dash_error=アルファベット、数字、ハイフン"-"、アンダースコア"_"のいずれかの必要があります
 alpha_dash_dot_error=' アルファベット、数値、ダッシュ(-)、アンダースコア(_) 、ドット(.)のいずれかを入力する必要があります。 '
+size_error=`サイズは %s である必要があります`
 min_size_error=' 少なくとも %s 文字の必要があります '
 max_size_error=' %s 文字以下の必要があります '
 email_error=' は有効な電子メール アドレスではない '
@@ -316,6 +322,8 @@ migrate_repo=リポジトリを移行
 migrate.clone_address=クローンアドレス
 migrate.invalid_local_path=ローカルパスが無効です。存在しないかディレクトリではありません。
 
+forked_from=フォーク元
+fork_from_self=すでにあなたの所有しているリポジトリはフォークできません
 copy_link=コピー
 click_to_copy=クリップボードにコピー
 copied=コピー成功
@@ -338,12 +346,14 @@ branch_and_tags=ブランチ& タグ
 branches=ブランチ
 tags=タグ
 issues=課題
+labels=ラベル
+milestones=マイルストーン
 commits=コミット
 releases=リリース
 file_raw=生データ
 file_history=履歴
 file_view_raw=生データを見る
-file_permalink=Permalink
+file_permalink=パーマリンク
 
 commits.commits=コミット
 commits.search=コミットの検索
@@ -354,6 +364,34 @@ commits.date=日付
 commits.older=古い
 commits.newer=新しい
 
+issues.new=新しい問題
+issues.new_label=新しいラベル
+issues.new_label_placeholder=ラベル名...
+issues.open_tab=%d オープン
+issues.close_tab=%d クローズ
+issues.filter_label=ラベル
+issues.filter_label_no_select=選択したラベルがありません。
+issues.filter_milestone=マイルストーン
+issues.filter_assignee=アサインされた人
+issues.filter_type=タイプ
+issues.filter_type.all_issues=すべての問題
+issues.filter_type.assigned_to_you=あなたに割り当てられました。
+issues.filter_type.created_by_you=あなたが作成しました。
+issues.filter_type.mentioning_you=あなたに伝える
+issues.opened_by=<a href="/%[2]s"> %[2]s</a>によって開かれた %[1]s
+issues.previous=前ページ
+issues.next=次ページ
+issues.label_title=ラベル名
+issues.label_color=ラベルの色
+issues.label_count=%d ラベル
+issues.label_open_issues=%d 未解決の問題
+issues.label_edit=編集
+issues.label_delete=削除
+issues.label_modify=ラベルの変更
+issues.label_deletion=ラベルの削除
+issues.label_deletion_desc=ラベルを削除すると、関連するすべての問題の情報が削除されます。続行しますか。
+issues.label_deletion_success=ラベルは正常に削除されました。
+
 settings=設定
 settings.options=オプション
 settings.collaboration=コラボレーション
@@ -680,7 +718,7 @@ config.enable_cache_avatar=アバターのキャッシュを有効にします
 config.active_code_lives=コードリンクの有効期限をアクティブ
 config.reset_password_code_lives=パスワードリンクの有効期限をリセット
 config.webhook_config=Webhook設定
-config.queue_length=Queue Length
+config.task_interval=タスクの間隔
 config.deliver_timeout=送信タイムアウト
 config.skip_tls_verify=TLSの確認を省略
 config.mailer_config=メーラーの構成

conf/locale/locale_lv-LV.ini

@@ -79,6 +79,8 @@ app_url_helper=Tas ietekmē HTTP/HTTPS klonēšanas URL un e-pasta saturā izsū
 optional_title=Optional Settings
 email_title=E-pasta pakalpojuma iestatījumi
 smtp_host=SMTP resursdators
+smtp_from=From
+smtp_from_helper=Mail from address, RFC 5322. It can be just an email address, or the "Name" <email@example.com> format.
 mailer_user=Sūtītāja e-pasta adrese
 mailer_password=Sūtītāja parole
 register_confirm=Iespējot reģistrēšanās apstiprināšanu
@@ -141,6 +143,11 @@ invalid_code=Atvainojiet, Jūsu apstiprināšanas kodam ir beidzies derīguma te
 reset_password_helper=Nospiediet šeit, lai atjaunotu paroli
 password_too_short=Paroles garums nedrīkst būt mazāks par 6.
 
+[modal]
+yes=Yes
+no=No
+modify=Modify
+
 [form]
 UserName=Lietotājvārds
 RepoName=Repozitorija nosaukums
@@ -157,6 +164,7 @@ AdminEmail=Admin e-pasta adrese
 require_error=` nedrīkst būt tukšs.`
 alpha_dash_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus vai domuzīmes (-_).`
 alpha_dash_dot_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus, domuzīmes (-_) vai punktu.`
+size_error=` must be size %s.`
 min_size_error=` jabūt vismaz %s simbolu garumā.`
 max_size_error=` jabūt ne mazāk kā %s simbolu garumā.`
 email_error=` nav derīga e-pasta adrese.`
@@ -314,6 +322,8 @@ migrate_repo=Migrēt repozitoriju
 migrate.clone_address=Clone Address
 migrate.invalid_local_path=Invalid local path, it does not exist or not a directory.
 
+forked_from=forked from
+fork_from_self=You cannot fork repository you already owned!
 copy_link=Kopēt
 click_to_copy=Kopēt uz starpliktuvi
 copied=Kopēšana notikusi veiksmīgi
@@ -336,6 +346,8 @@ branch_and_tags=Atzari un tagi
 branches=Atzari
 tags=Tagi
 issues=Problēmas
+labels=Labels
+milestones=Milestones
 commits=Revīzijas
 releases=Laidieni
 file_raw=Neapstrādāts
@@ -352,6 +364,34 @@ commits.date=Datums
 commits.older=Vecāki
 commits.newer=Jaunāki
 
+issues.new=New Issue
+issues.new_label=New Label
+issues.new_label_placeholder=Label name...
+issues.open_tab=%d Open
+issues.close_tab=%d Closed
+issues.filter_label=Label
+issues.filter_label_no_select=No selected label
+issues.filter_milestone=Milestone
+issues.filter_assignee=Assignee
+issues.filter_type=Type
+issues.filter_type.all_issues=All issues
+issues.filter_type.assigned_to_you=Assigned to you
+issues.filter_type.created_by_you=Created by you
+issues.filter_type.mentioning_you=Mentioning you
+issues.opened_by=opened %[1]s by <a href="/%[2]s">%[2]s</a>
+issues.previous=Previous Page
+issues.next=Next Page
+issues.label_title=Label name
+issues.label_color=Label color
+issues.label_count=%d labels
+issues.label_open_issues=%d open issues
+issues.label_edit=Edit
+issues.label_delete=Delete
+issues.label_modify=Label Modification
+issues.label_deletion=Label Deletion
+issues.label_deletion_desc=Delete label will remove its information in all related issues. Do you want to continue?
+issues.label_deletion_success=Label has been deleted successfully!
+
 settings=Iestatījumi
 settings.options=Opcijas
 settings.collaboration=Sadarbība
@@ -678,7 +718,7 @@ config.enable_cache_avatar=Glabāt profila attēlus kešatmiņā
 config.active_code_lives=Aktīvā koda ilgums
 config.reset_password_code_lives=Paroles atiestatīšanas koda ilgums
 config.webhook_config=Tīkla āķu konfigurācija
-config.queue_length=Queue Length
+config.task_interval=Uzdevuma intervāls
 config.deliver_timeout=Piegādes noildze
 config.skip_tls_verify=Izlaist TLS pārbaudi
 config.mailer_config=Sūtītāja konfigurācija

conf/locale/locale_nl-NL.ini

@@ -143,6 +143,11 @@ invalid_code=Sorry, uw bevestigingscode is verlopen of niet meer geldig.
 reset_password_helper=Klik hier om uw wachtwoord opnieuw in te stellen.
 password_too_short=De lengte van uw wachtwoord moet minimaal zes karakters zijn.
 
+[modal]
+yes=Yes
+no=No
+modify=Modify
+
 [form]
 UserName=Gebruikersnaam
 RepoName=Repositorie naam
@@ -159,6 +164,7 @@ AdminEmail=E-mail beheerder
 require_error=kan niet leeg zijn.
 alpha_dash_error=moet een valide alfanumeriek of dash(-_) karakter zijn.
 alpha_dash_dot_error=moet een valide alfanumeriek, dash(-_) of (.) punt karakter zijn.
+size_error=` must be size %s.`
 min_size_error=moet minimaal %s karakters bevatten.
 max_size_error=mag maximaal %s karakters bevatten.
 email_error=is niet een valide e-mail adres.
@@ -316,6 +322,8 @@ migrate_repo=Migreer repositorie
 migrate.clone_address=Clone adres
 migrate.invalid_local_path=Ongeldig lokaal pad, het pad bestaat niet of het is geen map.
 
+forked_from=forked from
+fork_from_self=You cannot fork repository you already owned!
 copy_link=Kopieer
 click_to_copy=Kopieer link naar plakbord
 copied=Gekopieerd
@@ -338,6 +346,8 @@ branch_and_tags=Aftakkingen & labels
 branches=Aftakkingen
 tags=Labels
 issues=Kwesties
+labels=Labels
+milestones=Milestones
 commits=Commits
 releases=Publicaties
 file_raw=Ruwe
@@ -354,6 +364,34 @@ commits.date=Datum
 commits.older=Ouder
 commits.newer=Nieuwer
 
+issues.new=New Issue
+issues.new_label=New Label
+issues.new_label_placeholder=Label name...
+issues.open_tab=%d Open
+issues.close_tab=%d Closed
+issues.filter_label=Label
+issues.filter_label_no_select=No selected label
+issues.filter_milestone=Milestone
+issues.filter_assignee=Assignee
+issues.filter_type=Type
+issues.filter_type.all_issues=All issues
+issues.filter_type.assigned_to_you=Assigned to you
+issues.filter_type.created_by_you=Created by you
+issues.filter_type.mentioning_you=Mentioning you
+issues.opened_by=opened %[1]s by <a href="/%[2]s">%[2]s</a>
+issues.previous=Previous Page
+issues.next=Next Page
+issues.label_title=Label name
+issues.label_color=Label color
+issues.label_count=%d labels
+issues.label_open_issues=%d open issues
+issues.label_edit=Edit
+issues.label_delete=Delete
+issues.label_modify=Label Modification
+issues.label_deletion=Label Deletion
+issues.label_deletion_desc=Delete label will remove its information in all related issues. Do you want to continue?
+issues.label_deletion_success=Label has been deleted successfully!
+
 settings=Instellingen
 settings.options=Opties
 settings.collaboration=Samenwerking
@@ -680,7 +718,7 @@ config.enable_cache_avatar=Avatar Cache inschakelen
 config.active_code_lives=Actieve Code leven
 config.reset_password_code_lives=Reset wachtwoord Code leven
 config.webhook_config=Webhook configuratie
-config.queue_length=Queue Length
+config.task_interval=Taakinterval
 config.deliver_timeout=Bezorging verlooptijd
 config.skip_tls_verify=TLS certificaat controle overslaan
 config.mailer_config=Mailerconfiguatie

conf/locale/locale_pl-PL.ini

@@ -143,6 +143,11 @@ invalid_code=Niestety, twój kod potwierdzający wygasł lub jest nieprawidłowy
 reset_password_helper=Kliknij tutaj, aby zresetować hasło
 password_too_short=Długość hasła nie może być mniejsza niż 6 znaków.
 
+[modal]
+yes=Yes
+no=No
+modify=Modify
+
 [form]
 UserName=Nazwa Użytkownika
 RepoName=Nazwa repozytorium
@@ -159,6 +164,7 @@ AdminEmail=E-mail administratora
 require_error=` nie może być puste.`
 alpha_dash_error=` musi się składać z prawidłowych znaków alfanumerycznych, myślników oraz podkreśleń.`
 alpha_dash_dot_error=` musi się składać z prawidłowych znaków alfanumerycznych, myślników, podkreśleń oraz kropek.`
+size_error=` must be size %s.`
 min_size_error=` musi zawierać co najwyżej %s znaków.`
 max_size_error=` musi zawierać co najwyżej %s znaków.`
 email_error=` nie jest poprawnym adresem e-mail.`
@@ -316,6 +322,8 @@ migrate_repo=Przenieś repozytorium
 migrate.clone_address=Sklonuj adres
 migrate.invalid_local_path=Ścieżka jest niepoprawna. Nie istnieje lub nie jest katalogiem.
 
+forked_from=forked from
+fork_from_self=You cannot fork repository you already owned!
 copy_link=Kopiuj
 click_to_copy=Kopiuj do schowka
 copied=Skopiowano
@@ -338,6 +346,8 @@ branch_and_tags=Gałęzie i tagi
 branches=Gałęzie
 tags=Tagi
 issues=Problemy
+labels=Labels
+milestones=Milestones
 commits=Commity
 releases=Wydania
 file_raw=Czysty
@@ -354,6 +364,34 @@ commits.date=Data
 commits.older=Starsze
 commits.newer=Nowsze
 
+issues.new=New Issue
+issues.new_label=New Label
+issues.new_label_placeholder=Label name...
+issues.open_tab=%d Open
+issues.close_tab=%d Closed
+issues.filter_label=Label
+issues.filter_label_no_select=No selected label
+issues.filter_milestone=Milestone
+issues.filter_assignee=Assignee
+issues.filter_type=Type
+issues.filter_type.all_issues=All issues
+issues.filter_type.assigned_to_you=Assigned to you
+issues.filter_type.created_by_you=Created by you
+issues.filter_type.mentioning_you=Mentioning you
+issues.opened_by=opened %[1]s by <a href="/%[2]s">%[2]s</a>
+issues.previous=Previous Page
+issues.next=Next Page
+issues.label_title=Label name
+issues.label_color=Label color
+issues.label_count=%d labels
+issues.label_open_issues=%d open issues
+issues.label_edit=Edit
+issues.label_delete=Delete
+issues.label_modify=Label Modification
+issues.label_deletion=Label Deletion
+issues.label_deletion_desc=Delete label will remove its information in all related issues. Do you want to continue?
+issues.label_deletion_success=Label has been deleted successfully!
+
 settings=Ustawienia
 settings.options=Opcje
 settings.collaboration=Współpraca
@@ -680,7 +718,7 @@ config.enable_cache_avatar=Włącz cache awatarów
 config.active_code_lives=Ważność kodów aktywacyjnych
 config.reset_password_code_lives=Czas życia kodu resetowania hasła
 config.webhook_config=Konfiguracja skryptów internetowych
-config.queue_length=Queue Length
+config.task_interval=Interwał zadań
 config.deliver_timeout=Limit czasu zdarzenia
 config.skip_tls_verify=Pomiń weryfikację protokołu TLS
 config.mailer_config=Konfiguracja poczty

conf/locale/locale_pt-BR.ini

@@ -143,6 +143,11 @@ invalid_code=Desculpe, seu código de confirmação expirou ou não é válido.
 reset_password_helper=Clique aqui para redefinir sua senha
 password_too_short=O comprimento da senha não pode ser menor que 6.
 
+[modal]
+yes=Sim
+no=Não
+modify=Alterar
+
 [form]
 UserName=Nome de usuário
 RepoName=Nome do repositório
@@ -159,6 +164,7 @@ AdminEmail=E-mail do Administrador
 require_error=` não pode estar vazio.`
 alpha_dash_error=` devem ser caracteres alfanuméricos ou hífen (-) ou sublinhado (_).`
 alpha_dash_dot_error=` devem ser caracteres alfanuméricos ou hífen (-) ou sublinhado (_).`
+size_error=` deve ter %s.`
 min_size_error=` deve conter pelo menos %s caracteres.`
 max_size_error=` deve conter no máximo %s caracteres.`
 email_error=` não é um endereço de e-mail válido.`
@@ -271,7 +277,7 @@ social_desc=Esta é uma lista de contas sociais. Remova qualquer ligação que v
 unbind=Desvincular
 unbind_success=A conta social foi desvinculada.
 
-manage_access_token=Gerenciar Tokens de Acesso pessoais
+manage_access_token=Gerenciar Tokens de Acesso Pessoal
 generate_new_token=Gerar novo Token
 tokens_desc=Tokens gerados por você que podem ser usados para acessar a API Gogs.
 new_token_desc=Por enquanto, todo token terá acesso completo à sua conta.
@@ -316,6 +322,8 @@ migrate_repo=Migrar Repositório
 migrate.clone_address=Endereço de Clone
 migrate.invalid_local_path=Caminho local inválido, não existe ou não é um diretório.
 
+forked_from=bifurcação de
+fork_from_self=Você não pode criar fork de um repositório que já é seu!
 copy_link=Copiar
 click_to_copy=Copiar para a área de transferência
 copied=Copiado com sucesso
@@ -338,12 +346,14 @@ branch_and_tags=Ramos & Tags
 branches=Ramos
 tags=Tags
 issues=Problemas
+labels=Etiquetas
+milestones=Marcos
 commits=Commits
 releases=Lançamentos
 file_raw=Cru
 file_history=Histórico
 file_view_raw=Ver cru
-file_permalink=Permalink
+file_permalink=Link permanente
 
 commits.commits=Commits
 commits.search=Pesquisar commits
@@ -354,6 +364,34 @@ commits.date=Data
 commits.older=Mais Antigo
 commits.newer=Mais Novo
 
+issues.new=Novo problema
+issues.new_label=Nova etiqueta
+issues.new_label_placeholder=Nome de etiqueta...
+issues.open_tab=%d aberto
+issues.close_tab=%d fechado
+issues.filter_label=Etiqueta
+issues.filter_label_no_select=Nenhuma etiqueta selecionada
+issues.filter_milestone=Marco
+issues.filter_assignee=Atribuído
+issues.filter_type=Tipo
+issues.filter_type.all_issues=Todos os problemas
+issues.filter_type.assigned_to_you=Atribuídos a você
+issues.filter_type.created_by_you=Criados por você
+issues.filter_type.mentioning_you=Mencionando você
+issues.opened_by=%[1]s foi aberto por <a href="/%[2]s">%[2]s</a>
+issues.previous=Página anterior
+issues.next=Próxima página
+issues.label_title=Nome da etiqueta
+issues.label_color=Cor da etiqueta
+issues.label_count=%d etiquetas
+issues.label_open_issues=%d problemas abertos
+issues.label_edit=Editar
+issues.label_delete=Excluir
+issues.label_modify=Alteração de etiqueta
+issues.label_deletion=Exclusão de etiqueta
+issues.label_deletion_desc=Excluir uma etiqueta a retirará de todos os problemas que ela estiver marcando. Quer mesmo continuar?
+issues.label_deletion_success=A etiqueta foi excluída com sucesso!
+
 settings=Configurações
 settings.options=Opções
 settings.collaboration=Colaboração
@@ -680,7 +718,7 @@ config.enable_cache_avatar=Habilitar Cache de Avatar
 config.active_code_lives=Ativar Code Lives
 config.reset_password_code_lives=Redefinir Senha de Code Lives
 config.webhook_config=Configuração de Hook da Web
-config.queue_length=Queue Length
+config.task_interval=Intervalo da Tarefa
 config.deliver_timeout=Intervalo de Entrega
 config.skip_tls_verify=Pular Verificar TLS
 config.mailer_config=Configuração de Correio

conf/locale/locale_ru-RU.ini

@@ -64,7 +64,7 @@ err_empty_sqlite_path=Путь к базе данных SQLite3 не может
 
 general_title=Общие параметры Gogs
 app_name=Имя приложения
-app_name_helper=Put your organization name here huge and loud!
+app_name_helper=Укажите здесь название вашей потрясающей организации!
 repo_path=Путь корня репозитория
 repo_path_helper=Все удаленные репозитории Git будут сохранены в этой директории.
 run_user=Пользователь
@@ -80,19 +80,19 @@ optional_title=Расширенные настройки
 email_title=Настройки службы электронной почты
 smtp_host=Узел SMTP
 smtp_from=Из
-smtp_from_helper=Mail from address, RFC 5322. It can be just an email address, or the "Name" <email@example.com> format.
+smtp_from_helper=Почта от адреса, RFC 5322. Это может быть email адрес или формат "Имя" <email@example.com>.
 mailer_user=Электронная почта отправителя
 mailer_password=Пароль отправителя
 register_confirm=Включить подтверждение регистрации
 mail_notify=Разрешить почтовые уведомления
-server_service_title=Server and Other Services Settings
+server_service_title=Сервер и другие настройки служб
 offline_mode=Включение офлайн режима
-offline_mode_popup=Disable CDN even in production mode, all resource files will be served locally.
-disable_registration=Disable Self-registration
-disable_registration_popup=Disable user self-registration, only admin can create accounts.
-require_sign_in_view=Enable Require Sign In to View Pages
-require_sign_in_view_popup=Only signed in users can view pages, visitors will only be able to see sign in/up pages.
-admin_setting_desc=You do not have to create an admin account right now, user whoever ID=1 will gain admin access automatically.
+offline_mode_popup=Отключить CDN даже в производственном режиме, все файлы ресурсов будут раздаваться локально.
+disable_registration=Отключить самостоятельную регистрацию
+disable_registration_popup=Запретить пользователям самостоятельную регистрацию, только администратор может создавать аккаунты.
+require_sign_in_view=Разрешить требовать авторизацию для просмотра страниц
+require_sign_in_view_popup=Только авторизированные пользователи могут просматривать страницы, посетители смогут увидеть только  ссылку на авторизацию вверху страницы.
+admin_setting_desc=Вы не должны создать учетную запись администратора прямо сейчас, пользователь с ID = 1 получит доступ с правами администратора автоматически.
 admin_title=Настройки учётной записи администратора
 admin_name=Имя пользователя
 admin_password=Пароль
@@ -143,6 +143,11 @@ invalid_code=Извините, ваш код подтверждения исте
 reset_password_helper=Нажмите здесь, чтобы сбросить свой пароль
 password_too_short=Длина пароля не менее 6 символов.
 
+[modal]
+yes=Да
+no=Нет
+modify=Изменить
+
 [form]
 UserName=Пользователь
 RepoName=Имя репозитория
@@ -159,6 +164,7 @@ AdminEmail=Электронная почта администратора
 require_error=` не может быть пустым.`
 alpha_dash_error=«должен быть допустимым символьным, числовым или dash(-_) значением.»
 alpha_dash_dot_error=«должен быть допустимым символьным, числовым или dash(-_) символами, включая точку.»
+size_error=` должен быть размер %s.`
 min_size_error=«должен содержать по крайней мере %s символов.»
 max_size_error=` должен содержать максимум %s символов.`
 email_error=«не является адресом электронной почты.»
@@ -250,7 +256,7 @@ primary_email=Установить как основной
 delete_email=Удалить
 add_new_email=Добавить новый адрес электронной почты
 add_email=Добавить электронную почту
-add_email_confirmation_sent=A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete the confirmation process.
+add_email_confirmation_sent=Новое подтверждение по электронной почте было отправлено<b>%s</b>, пожалуйста, проверьте свой почтовый ящик в течение следующих  %d часов, чтобы завершить процесс подтверждения.
 add_email_success=Новый адрес электронной почты успешно добавлен.
 
 manage_ssh_keys=Управление SSH ключами
@@ -316,6 +322,8 @@ migrate_repo=Перенос репозитория
 migrate.clone_address=Скопировать адрес
 migrate.invalid_local_path=Недопустимый локальный путь. Возможно он не существует или является не папкой.
 
+forked_from=forked from
+fork_from_self=Вы не можете форкнуть репозитарий, так как Вы уже его владелец!
 copy_link=Скопировать
 click_to_copy=Скопировать в буфер обмена
 copied=Успешно скопировано
@@ -338,12 +346,14 @@ branch_and_tags=Ветки и метки
 branches=Ветки
 tags=Метки
 issues=Обсуждения
+labels=Метки
+milestones=Этапы
 commits=Коммиты
 releases=Релизы
 file_raw=Исходник
 file_history=История
 file_view_raw=Посмотреть исходник
-file_permalink=Permalink
+file_permalink=Постоянная ссылка
 
 commits.commits=Коммиты
 commits.search=Поиск коммитов
@@ -354,6 +364,34 @@ commits.date=Дата
 commits.older=Раньше
 commits.newer=Новее
 
+issues.new=Новая задача
+issues.new_label=Новая метка
+issues.new_label_placeholder=Имя метки...
+issues.open_tab=%d Открыть
+issues.close_tab=%d Закрыть
+issues.filter_label=Метка
+issues.filter_label_no_select=Нет выбранной метки
+issues.filter_milestone=Этап
+issues.filter_assignee=Назначено
+issues.filter_type=Тип
+issues.filter_type.all_issues=Все задачи
+issues.filter_type.assigned_to_you=Назначено Вам
+issues.filter_type.created_by_you=Созданные вами
+issues.filter_type.mentioning_you=Вы упомянуты
+issues.opened_by=opened %[1]s by <a href="/%[2]s">%[2]s</a>
+issues.previous=Предыдущая страница
+issues.next=Следующая страница
+issues.label_title=Имя метки
+issues.label_color=Цвет метки
+issues.label_count=%d меток
+issues.label_open_issues=%d открытых задач
+issues.label_edit=Редактировать
+issues.label_delete=Удалить
+issues.label_modify=Изменение метки
+issues.label_deletion=Удаление метки
+issues.label_deletion_desc=Удаление ярлыка затронет все связанные задачи. Продолжить?
+issues.label_deletion_success=Метка была удалена успешно!
+
 settings=Настройки
 settings.options=Опции
 settings.collaboration=Сотрудничество
@@ -460,8 +498,8 @@ team_name_helper=Вы будете использовать это имя для
 team_desc_helper=What is this team all about?
 team_permission_desc=Какой уровень разрешений должен быть у этой команды?
 
-form.name_reserved=Organization name '%s' is reserved.
-form.name_pattern_not_allowed=Organization name pattern '%s' is not allowed.
+form.name_reserved=Наименование организации  '%s' зарезервированно.
+form.name_pattern_not_allowed=Шаблон организации  '%s' не допускается.
 
 settings=Настройки
 settings.options=Опции
@@ -551,17 +589,17 @@ dashboard.resync_all_update_hooks=Rewrite all update hook of repositories (neede
 dashboard.resync_all_update_hooks_success=All repositories' update hook have been rewritten successfully.
 
 dashboard.server_uptime=Время непрерывной работы сервера
-dashboard.current_goroutine=Current Goroutines
+dashboard.current_goroutine=Текущий Goroutines
 dashboard.current_memory_usage=Текущее использование памяти
 dashboard.total_memory_allocated=Всего памяти выделено
 dashboard.memory_obtained=Memory Obtained
 dashboard.pointer_lookup_times=Pointer Lookup Times
 dashboard.memory_allocate_times=Memory Allocate Times
 dashboard.memory_free_times=Memory Free Times
-dashboard.current_heap_usage=Current Heap Usage
+dashboard.current_heap_usage=Текущее использование кучи
 dashboard.heap_memory_obtained=Heap Memory Obtained
 dashboard.heap_memory_idle=Heap Memory Idle
-dashboard.heap_memory_in_use=Heap Memory In Use
+dashboard.heap_memory_in_use=Кучи памяти в работе
 dashboard.heap_memory_released=Heap Memory Released
 dashboard.heap_objects=Heap Objects
 dashboard.bootstrap_stack_usage=Bootstrap Stack Usage
@@ -680,7 +718,7 @@ config.enable_cache_avatar=Кешировать аватар
 config.active_code_lives=Active Code Lives
 config.reset_password_code_lives=Reset Password Code Lives
 config.webhook_config=Настройка автоматического обновления репозиции
-config.queue_length=Queue Length
+config.task_interval=Интервал задания
 config.deliver_timeout=Задержка доставки
 config.skip_tls_verify=Пропустить TLS проверка
 config.mailer_config=Настройки почты

conf/locale/locale_zh-CN.ini

@@ -718,7 +718,7 @@ config.enable_cache_avatar=开启缓存头像
 config.active_code_lives=激活用户链接有效期
 config.reset_password_code_lives=重置密码链接有效期
 config.webhook_config=Web 钩子配置
-config.queue_length=Queue Length
+config.task_interval=任务周期
 config.deliver_timeout=推送超时
 config.skip_tls_verify=忽略 TLS 验证
 config.mailer_config=邮件配置

conf/locale/locale_zh-HK.ini

@@ -79,6 +79,8 @@ app_url_helper=該設置影響 HTTP/HTTPS 複製地址和一些郵箱中的連
 optional_title=Optional Settings
 email_title=電子郵件服務設定
 smtp_host=SMTP 主機
+smtp_from=From
+smtp_from_helper=Mail from address, RFC 5322. It can be just an email address, or the "Name" <email@example.com> format.
 mailer_user=發送郵箱
 mailer_password=發送郵箱密碼
 register_confirm=啟用註冊郵箱確認
@@ -141,6 +143,11 @@ invalid_code=對不起，您的確認代碼已過期或已失效。
 reset_password_helper=單擊此處重置密碼
 password_too_short=密碼長度不能少於 6 位！
 
+[modal]
+yes=Yes
+no=No
+modify=Modify
+
 [form]
 UserName=用戶名
 RepoName=倉庫名稱
@@ -157,6 +164,7 @@ AdminEmail=管理員郵箱
 require_error=不能為空。
 alpha_dash_error=必須為英文字母、阿拉伯數字或橫線（-_）。
 alpha_dash_dot_error=必須為英文字母、阿拉伯數字、橫線（-_）或點。
+size_error=` must be size %s.`
 min_size_error=長度最小為 %s 個字符。
 max_size_error=長度最大為 %s 個字符。
 email_error=不是一個有效的郵箱地址。
@@ -314,6 +322,8 @@ migrate_repo=遷移倉庫
 migrate.clone_address=複製地址
 migrate.invalid_local_path=無效的本地路徑，該路徑不存在或不是一個目錄！
 
+forked_from=forked from
+fork_from_self=You cannot fork repository you already owned!
 copy_link=複製連結
 click_to_copy=複製到剪切簿
 copied=複製成功
@@ -336,6 +346,8 @@ branch_and_tags=分支與標籤
 branches=分支列表
 tags=標籤列表
 issues=問題管理
+labels=Labels
+milestones=Milestones
 commits=提交歷史
 releases=版本發佈
 file_raw=原始文件
@@ -352,6 +364,34 @@ commits.date=提交日期
 commits.older=更舊的提交
 commits.newer=更新的提交
 
+issues.new=New Issue
+issues.new_label=New Label
+issues.new_label_placeholder=Label name...
+issues.open_tab=%d Open
+issues.close_tab=%d Closed
+issues.filter_label=Label
+issues.filter_label_no_select=No selected label
+issues.filter_milestone=Milestone
+issues.filter_assignee=Assignee
+issues.filter_type=Type
+issues.filter_type.all_issues=All issues
+issues.filter_type.assigned_to_you=Assigned to you
+issues.filter_type.created_by_you=Created by you
+issues.filter_type.mentioning_you=Mentioning you
+issues.opened_by=opened %[1]s by <a href="/%[2]s">%[2]s</a>
+issues.previous=Previous Page
+issues.next=Next Page
+issues.label_title=Label name
+issues.label_color=Label color
+issues.label_count=%d labels
+issues.label_open_issues=%d open issues
+issues.label_edit=Edit
+issues.label_delete=Delete
+issues.label_modify=Label Modification
+issues.label_deletion=Label Deletion
+issues.label_deletion_desc=Delete label will remove its information in all related issues. Do you want to continue?
+issues.label_deletion_success=Label has been deleted successfully!
+
 settings=倉庫設置
 settings.options=基本設置
 settings.collaboration=管理協作者
@@ -678,7 +718,7 @@ config.enable_cache_avatar=開啟緩存頭像
 config.active_code_lives=激活用戶連結有效期
 config.reset_password_code_lives=重置密碼連結有效期
 config.webhook_config=Web 鉤子配置
-config.queue_length=Queue Length
+config.task_interval=任務周期
 config.deliver_timeout=推送超時
 config.skip_tls_verify=忽略 TLS 驗證
 config.mailer_config=郵件配置

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.6.3.0725 Beta"
+const APP_VER = "0.6.3.0726 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

models/action.go

@@ -293,12 +293,12 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
 	repoLink := fmt.Sprintf("%s%s/%s", setting.AppUrl, repoUserName, repoName)
 	// if not the first commit, set the compareUrl
 	if !strings.HasPrefix(oldCommitId, "0000000") {
-		commit.CompareUrl = fmt.Sprintf("%s/compare/%s...%s", repoLink, oldCommitId, newCommitId)
+		commit.CompareUrl = fmt.Sprintf("%s/%s/compare/%s...%s", repoUserName, repoName, oldCommitId, newCommitId)
 	}
 
 	bs, err := json.Marshal(commit)
 	if err != nil {
-		return errors.New("action.CommitRepoAction(json): " + err.Error())
+		return errors.New("json: " + err.Error())
 	}
 
 	refName := git.RefEndName(refFullName)
@@ -306,17 +306,17 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
 	// Change repository bare status and update last updated time.
 	repo, err := GetRepositoryByName(repoUserId, repoName)
 	if err != nil {
-		return errors.New("action.CommitRepoAction(GetRepositoryByName): " + err.Error())
+		return errors.New("GetRepositoryByName: " + err.Error())
 	}
 	repo.IsBare = false
 	if err = UpdateRepository(repo, false); err != nil {
-		return errors.New("action.CommitRepoAction(UpdateRepository): " + err.Error())
+		return errors.New("UpdateRepository: " + err.Error())
 	}
 
 	err = updateIssuesCommit(userId, repoId, repoUserName, repoName, commit.Commits)
 
 	if err != nil {
-		log.Debug("action.CommitRepoAction(updateIssuesCommit): ", err)
+		log.Debug("updateIssuesCommit: ", err)
 	}
 
 	if err = NotifyWatchers(&Action{
@@ -331,18 +331,18 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
 		RefName:      refName,
 		IsPrivate:    repo.IsPrivate,
 	}); err != nil {
-		return errors.New("action.CommitRepoAction(NotifyWatchers): " + err.Error())
+		return errors.New("NotifyWatchers: " + err.Error())
 
 	}
 
 	// New push event hook.
 	if err := repo.GetOwner(); err != nil {
-		return errors.New("action.CommitRepoAction(GetOwner): " + err.Error())
+		return errors.New("GetOwner: " + err.Error())
 	}
 
 	ws, err := GetActiveWebhooksByRepoId(repoId)
 	if err != nil {
-		return errors.New("action.CommitRepoAction(GetActiveWebhooksByRepoId): " + err.Error())
+		return errors.New("GetActiveWebhooksByRepoId: " + err.Error())
 	}
 
 	// check if repo belongs to org and append additional webhooks
@@ -350,7 +350,7 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
 		// get hooks for org
 		orgws, err := GetActiveWebhooksByOrgId(repo.OwnerId)
 		if err != nil {
-			return errors.New("action.CommitRepoAction(GetActiveWebhooksByOrgId): " + err.Error())
+			return errors.New("GetActiveWebhooksByOrgId: " + err.Error())
 		}
 		ws = append(ws, orgws...)
 	}
@@ -408,7 +408,7 @@ func CommitRepoAction(userId, repoUserId int64, userName, actEmail string,
 		},
 		Before:     oldCommitId,
 		After:      newCommitId,
-		CompareUrl: commit.CompareUrl,
+		CompareUrl: setting.AppUrl + commit.CompareUrl,
 	}
 
 	for _, w := range ws {

models/migrations/migrations.go

@@ -5,6 +5,7 @@
 package migrations
 
 import (
+	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -51,11 +52,12 @@ type Version struct {
 // If you want to "retire" a migration, remove it from the top of the list and
 // update _MIN_VER_DB accordingly
 var migrations = []Migration{
-	NewMigration("generate collaboration from access", accessToCollaboration), // V0 -> V1:v0.5.13
-	NewMigration("make authorize 4 if team is owners", ownerTeamUpdate),       // V1 -> V2:v0.5.13
-	NewMigration("refactor access table to use id's", accessRefactor),         // V2 -> V3:v0.5.13
-	NewMigration("generate team-repo from team", teamToTeamRepo),              // V3 -> V4:v0.5.13
-	NewMigration("fix locale file load panic", fixLocaleFileLoadPanic),        // V4 -> V5:v0.6.0
+	NewMigration("generate collaboration from access", accessToCollaboration),    // V0 -> V1:v0.5.13
+	NewMigration("make authorize 4 if team is owners", ownerTeamUpdate),          // V1 -> V2:v0.5.13
+	NewMigration("refactor access table to use id's", accessRefactor),            // V2 -> V3:v0.5.13
+	NewMigration("generate team-repo from team", teamToTeamRepo),                 // V3 -> V4:v0.5.13
+	NewMigration("fix locale file load panic", fixLocaleFileLoadPanic),           // V4 -> V5:v0.6.0
+	NewMigration("trim action compare URL prefix", trimCommitActionAppUrlPrefix), // V5 -> V6:v0.6.3      // V4 -> V5:v0.6.0
 }
 
 // Migrate database to current version
@@ -389,3 +391,65 @@ func fixLocaleFileLoadPanic(_ *xorm.Engine) error {
 	setting.Langs = strings.Split(strings.Replace(strings.Join(setting.Langs, ","), "fr-CA", "fr-FR", 1), ",")
 	return nil
 }
+
+func trimCommitActionAppUrlPrefix(x *xorm.Engine) error {
+	type PushCommit struct {
+		Sha1        string
+		Message     string
+		AuthorEmail string
+		AuthorName  string
+	}
+
+	type PushCommits struct {
+		Len        int
+		Commits    []*PushCommit
+		CompareUrl string
+	}
+
+	type Action struct {
+		ID      int64  `xorm:"pk autoincr"`
+		Content string `xorm:"TEXT"`
+	}
+
+	results, err := x.Query("SELECT `id`,`content` FROM `action` WHERE `op_type`=?", 5)
+	if err != nil {
+		return fmt.Errorf("select commit actions: %v", err)
+	}
+
+	sess := x.NewSession()
+	defer sessionRelease(sess)
+	if err = sess.Begin(); err != nil {
+		return err
+	}
+
+	var pushCommits *PushCommits
+	for _, action := range results {
+		actID := com.StrTo(string(action["id"])).MustInt64()
+		if actID == 0 {
+			continue
+		}
+
+		pushCommits = new(PushCommits)
+		if err = json.Unmarshal(action["content"], pushCommits); err != nil {
+			return fmt.Errorf("unmarshal action content[%s]: %v", actID, err)
+		}
+
+		infos := strings.Split(pushCommits.CompareUrl, "/")
+		if len(infos) <= 4 {
+			continue
+		}
+		pushCommits.CompareUrl = strings.Join(infos[len(infos)-4:], "/")
+
+		p, err := json.Marshal(pushCommits)
+		if err != nil {
+			return fmt.Errorf("marshal action content[%s]: %v", actID, err)
+		}
+
+		if _, err = sess.Id(actID).Update(&Action{
+			Content: string(p),
+		}); err != nil {
+			return fmt.Errorf("update action[%s]: %v", actID, err)
+		}
+	}
+	return sess.Commit()
+}

modules/log/log.go

@@ -214,7 +214,11 @@ func (l *Logger) writerMsg(skip, level int, msg string) error {
 				fnName = strings.TrimLeft(filepath.Ext(fn.Name()), ".") + "()"
 			}
 
-			lm.msg = fmt.Sprintf("[%s:%d %s] %s", filepath.Base(file), line, fnName, msg)
+			fileName := file
+			if len(fileName) > 20 {
+				fileName = "..." + fileName[len(fileName)-20:]
+			}
+			lm.msg = fmt.Sprintf("[%s:%d %s] %s", fileName, line, fnName, msg)
 		} else {
 			lm.msg = msg
 		}

templates/.VERSION

@@ -1 +1 @@
-0.6.3.0725 Beta
+0.6.3.0726 Beta

templates/user/dashboard/feeds.tmpl

@@ -30,7 +30,7 @@
                 {{range $push.Commits}}
                 <li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> <span class="text-truncate grid-4-5">{{.Message}}</span></li>
                 {{end}}
-                {{if $push.CompareUrl}}<li><a href="{{$push.CompareUrl}}">{{$.i18n.Tr "action.compare_2_commits"}} »</a></li>{{end}}
+                {{if $push.CompareUrl}}<li><a href="{{$.AppSubUrl}}/{{$push.CompareUrl}}">{{$.i18n.Tr "action.compare_2_commits"}} »</a></li>{{end}}
             </ul>
         </div>
         {{else if eq .GetOpType 6}}