diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini index 0254207fc6..8d1b2de1b1 100755 --- a/conf/locale/locale_de-DE.ini +++ b/conf/locale/locale_de-DE.ini @@ -281,13 +281,13 @@ init_readme=Repository mit README.md initialisieren create_repo=Repository erstellen default_branch=Standard-Branch mirror_interval=Spiegel-Intervall (in Stunden) -goget_meta=Go-Get Meta -goget_meta_helper=Dieses Repository wird man mit <span class="label label-blue label-radius">go get</span> klonen können. need_auth=Authorisierung benötigt migrate_type=Migrationstyp migrate_type_helper=Dieses Repository wird ein <span class="label label-blue label-radius">Spiegel</span> migrate_repo=Repository migrieren +migrate.clone_address=Clone Address +migrate.invalid_local_path=Invalid local path, it does not exist or not a directory. copy_link=Kopieren click_to_copy=In Zwischenablage kopieren @@ -595,7 +595,10 @@ auths.domain=Domain auths.host=Host auths.port=Port auths.base_dn=Base DN -auths.attributes=Suchattribute +auths.attribute_username=Username attribute +auths.attribute_name=First name attribute +auths.attribute_surname=Surname attribute +auths.attribute_mail=E-mail attribute auths.filter=Suchfilter auths.ms_ad_sa=Ms Ad SA auths.smtp_auth=SMTP-Authentifizierungstyp @@ -693,12 +696,12 @@ notices.op=Op. notices.delete_success=System-Mitteilung erfolgreich gelöscht. [action] -create_repo=hat Repository <a href="%s/%s">%s</a> erstellt -commit_repo=hat nach <a href="%s/%s/src/%s">%s</a> in <a href="%s/%s">%s</a> gepusht -create_issue=`hat Issue <a href="%s/issues/%s">%[1]s#%[2]s</a> eröffnet` -comment_issue=`hat Issue <a href="%s/issues/%s">%[1]s#%[2]s</a> kommentiert` -transfer_repo=hat Repository <code>%s</code> transferiert an <a href="/%s%s">%s</a> -push_tag=hat nach <a href="%s/%s/src/%s">%s</a> in <a href="%s/%s">%s</a> gepusht +create_repo=hat Repository <a href="%s">%s</a> erstellt +commit_repo=hat nach <a href="%s/src/%s">%[2]s</a> in <a href="%[1]s">%[3]s</a> gepusht +create_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> eröffnet` +comment_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> kommentiert` +transfer_repo=hat Repository <code>%s</code> transferiert an <a href="%s">%s</a> +push_tag=hat nach <a href="%s/src/%s">%[2]s</a> in <a href="%[1]s">%[3]s</a> gepusht compare_2_commits=Zeige Vergleich dieser 2 Commits [tool] diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 7e32a21eec..c2fec7d9e8 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -696,12 +696,12 @@ notices.op = Op. notices.delete_success = System notice has been deleted successfully. [action] -create_repo = created repository <a href="%s/%s">%s</a> -commit_repo = pushed to <a href="%s/%s/src/%s">%s</a> at <a href="%s/%s">%s</a> -create_issue = `opened issue <a href="%s/issues/%s">%[1]s#%[2]s</a>` -comment_issue = `commented on issue <a href="%s/issues/%s">%[1]s#%[2]s</a>` -transfer_repo = transfered repository <code>%s</code> to <a href="/%s%s">%s</a> -push_tag = pushed tag <a href="%s/%s/src/%s">%s</a> to <a href="%s/%s">%s</a> +create_repo = created repository <a href="%s">%s</a> +commit_repo = pushed to <a href="%s/src/%s">%[2]s</a> at <a href="%[1]s">%[3]s</a> +create_issue = `opened issue <a href="%s/issues/%s">%s#%[2]s</a>` +comment_issue = `commented on issue <a href="%s/issues/%s">%s#%[2]s</a>` +transfer_repo = transfered repository <code>%s</code> to <a href="%s">%s</a> +push_tag = pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> compare_2_commits = View comparison for these 2 commits [tool] diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini index fc235f1530..124548a30e 100755 --- a/conf/locale/locale_es-ES.ini +++ b/conf/locale/locale_es-ES.ini @@ -281,13 +281,13 @@ init_readme=Crear este repositorio con un fichero README.md create_repo=Crear Repositorio default_branch=Rama por defecto mirror_interval=Intervalo de mirror(en horas) -goget_meta=Go-Get Meta -goget_meta_helper=Este repositorio será <span class="label label-blue label-radius">Go-Getable</span> need_auth=Requiere Autorización migrate_type=Tipo de Migración migrate_type_helper=Este repositorio será un <span class="label label-blue label-radius">Mirror</span> 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. copy_link=Copiar click_to_copy=Copiar al portapapeles @@ -595,7 +595,10 @@ auths.domain=Dominio auths.host=Host auths.port=Puerto auths.base_dn=Base DN -auths.attributes=Atributos de búsqueda +auths.attribute_username=Atributo username +auths.attribute_name=Atributo nombre +auths.attribute_surname=Atributo apellido +auths.attribute_mail=Atributo correo electrónico auths.filter=Filtro de Búsqueda auths.ms_ad_sa=Ms Ad SA auths.smtp_auth=Tipo de Autorización SMTP @@ -693,12 +696,12 @@ notices.op=Op. notices.delete_success=La notificación del sistema se ha eliminado correctamente. [action] -create_repo=Repositorio creado <a href="%s/%s">%s</a> -commit_repo=hizo push a <a href="%s/%s/src/%s">%s</a> en <a href="%s/%s">%s</a> -create_issue=`incidencia abierta <a href="%s/issues/%s">%[1]s#%[2]s</a>` -comment_issue=`comentó en la incidencia <a href="%s/issues/%s">%[1]s#%[2]s</a>` -transfer_repo=transfirió el repositorio <code>%s</code> a <a href="/%s%s">%s</a> -push_tag=hizo push del tag <a href="%s/%s/src/%s">%s</a> a <a href="%s/%s">%s</a> +create_repo=Repositorio creado <a href="%s">%s</a> +commit_repo=hizo push a <a href="%s/src/%s">%[2]s</a> en <a href="%[1]s">%[3]s</a> +create_issue=`incidencia abierta <a href="%s/issues/%s">%s#%[2]s</a>` +comment_issue=`comentó en la incidencia <a href="%s/issues/%s">%s#%[2]s</a>` +transfer_repo=transfirió el repositorio <code>%s</code> a <a href="%s">%s</a> +push_tag=hizo push del tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a> compare_2_commits=Ver la comparación de estos 2 commits [tool] diff --git a/conf/locale/locale_fr-CA.ini b/conf/locale/locale_fr-CA.ini index e744b9d97c..b388884d33 100755 --- a/conf/locale/locale_fr-CA.ini +++ b/conf/locale/locale_fr-CA.ini @@ -281,13 +281,13 @@ init_readme=Initialiser ce Référentiel avec un README.md create_repo=Créer un Référentiel default_branch=Branche par défaut mirror_interval=Intervalle du miroir (heure) -goget_meta=Méta Go-Get -goget_meta_helper=Ce Référentiel sera <span class="label label-blue label-radius">Go-Getable</span> need_auth=Nécessite une Autorisation migrate_type=Type de Migration migrate_type_helper=Ce Référentiel sera un <span class="label label-blue label-radius">Miroir</span> 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. copy_link=Copier click_to_copy=Copier dans le presse-papier @@ -595,7 +595,10 @@ auths.domain=Domaine auths.host=Hôte auths.port=Port auths.base_dn=Base DN (Nom Distingué) -auths.attributes=Rechercher les Attributs +auths.attribute_username=Attribut du nom d'utilisateur +auths.attribute_name=Attribut du prénom +auths.attribute_surname=Attribut du nom de famille +auths.attribute_mail=Attribut de l'e-mail auths.filter=Filtre de recherche auths.ms_ad_sa=Ms Ad SA auths.smtp_auth=Type d'Autorisation SMTP @@ -693,12 +696,12 @@ notices.op=Auteur notices.delete_success=Note système supprimée avec succès. [action] -create_repo=a crée le Référentiel <a href="%s/%s">%s</a> -commit_repo=a soumis à <a href="%s/%s/src/%s">%s</a> chez <a href="%s/%s">%s</a> -create_issue=`a ouvert un problème <a href="%s/issues/%s">%[1]s#%[2]s</a>` -comment_issue=`a commenté le problème <a href="%s/issues/%s">%[1]s#%[2]s</a>` -transfer_repo=a transféré le Référentiel <code>%s</code> à <a href="/%s%s">%s</a> -push_tag=a tagé <a href="%s/%s/src/%s">%s</a> à <a href="%s/%s">%s</a> +create_repo=a crée le Référentiel <a href="%s">%s</a> +commit_repo=a soumis à <a href="%s/src/%s">%[2]s</a> chez <a href="%[1]s">%[3]s</a> +create_issue=`a ouvert un problème <a href="%s/issues/%s">%s#%[2]s</a>` +comment_issue=`a commenté le problème <a href="%s/issues/%s">%s#%[2]s</a>` +transfer_repo=a transféré le Référentiel <code>%s</code> à <a href="%s">%s</a> +push_tag=a tagé <a href="%s/src/%s">%[2]s</a> à <a href="%[1]s">%[3]s</a> compare_2_commits=Comparer ces 2 commissions [tool] diff --git a/conf/locale/locale_ja-JP.ini b/conf/locale/locale_ja-JP.ini index 441da8feb8..ef43362149 100755 --- a/conf/locale/locale_ja-JP.ini +++ b/conf/locale/locale_ja-JP.ini @@ -281,13 +281,13 @@ init_readme=README.md 付きでリポジトリを初期化 create_repo=リポジトリを作成 default_branch=デフォルトのブランチ mirror_interval=ミラー 間隔(時) -goget_meta=Go-Get メタ -goget_meta_helper=このリポジトリは <span class="label label-blue label-radius"> Go-Getable </span> になります need_auth=認証が必要 migrate_type=マイグレーションの種類 migrate_type_helper=このリポジトリは <span class="label label-blue label-radius"> ミラー</span> になります migrate_repo=リポジトリを移行 +migrate.clone_address=Clone Address +migrate.invalid_local_path=Invalid local path, it does not exist or not a directory. copy_link=コピー click_to_copy=クリップボードにコピー @@ -595,7 +595,10 @@ auths.domain=ドメイン auths.host=ホスト auths.port=ポート auths.base_dn=ベースのドメイン名 -auths.attributes=属性検索 +auths.attribute_username=Username attribute +auths.attribute_name=First name attribute +auths.attribute_surname=Surname attribute +auths.attribute_mail=E-mail attribute auths.filter=検索フィルター auths.ms_ad_sa=Ms Ad SA auths.smtp_auth=SMTP 認証の種類 @@ -693,12 +696,12 @@ notices.op=Op。 notices.delete_success=システム通知が正常に削除されました。 [action] -create_repo=リポジトリ <a href="%s/%s"> %s</a>を作成しました -commit_repo=<a href="%s/%s">%s</a>を<a href="%s/%s/src/%s">%s</a>にプッシュしました -create_issue=`問題 <a href="%s/issues/%s">%[1]s#%[2]s</a> を開きました` -comment_issue=`問題 <a href="%s/issues/%s">%[1]s#%[2]s</a> のコメント` -transfer_repo=リポジトリ <code>%s</code> を <a href="/%s%s">%s</a> へ転送しました -push_tag=<a href="%s/%s">%s</a> に タグ <a href="%s/%s/src/%s">%s</a> をプッシュしました +create_repo=リポジトリ <a href="%s"> %s</a>を作成しました +commit_repo=<a href="%[1]s">%[3]s</a>を<a href="%[1]s/src/%[2]s">%[2]s</a>にプッシュしました +create_issue=`問題 <a href="%s/issues/%s">%s#%[2]s</a> を開きました` +comment_issue=`問題 <a href="%s/issues/%s">%s#%[2]s</a> のコメント` +transfer_repo=リポジトリ <code>%s</code> を <a href="%s">%s</a> へ転送しました +push_tag=<a href="%[1]s">%[3]s</a> に タグ <a href="%[1]s/src/%[2]s">%[2]s</a> をプッシュしました compare_2_commits=これら 2 のコミットの比較を閲覧する [tool] diff --git a/conf/locale/locale_lv-LV.ini b/conf/locale/locale_lv-LV.ini index 23276b4655..35cdd3a830 100755 --- a/conf/locale/locale_lv-LV.ini +++ b/conf/locale/locale_lv-LV.ini @@ -281,13 +281,13 @@ init_readme=Inicializēt šo repozitoriju ar README.md failu create_repo=Izveidot repozitoriju default_branch=Noklusējuma atzars mirror_interval=Spoguļošanas intervāls (stundās) -goget_meta=Go-Get metadati -goget_meta_helper=Šis repozitorijs saturēs <span class="label label-blue label-radius">Go-Get</span> metadatus need_auth=Nepieciešama autorizācija migrate_type=Migrācijas veids migrate_type_helper=Šis repozitorijs būs <span class="label label-blue label-radius">Spoguļots</span> 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. copy_link=Kopēt click_to_copy=Kopēt uz starpliktuvi @@ -595,7 +595,10 @@ auths.domain=Domēns auths.host=Resursdators auths.port=Ports auths.base_dn=Pamata DN -auths.attributes=Meklēšanas atribūti +auths.attribute_username=Username attribute +auths.attribute_name=First name attribute +auths.attribute_surname=Surname attribute +auths.attribute_mail=E-mail attribute auths.filter=Meklēšanas filtrs auths.ms_ad_sa=MS Ad SA auths.smtp_auth=SMTP autorizācijas veids @@ -693,12 +696,12 @@ notices.op=Op. notices.delete_success=Sistēmas paziņojums tika veiksmīgi izdzēsts. [action] -create_repo=izveidoja repozitoriju <a href="%s/%s">%s</a> -commit_repo=veica izmaiņu nosūtīšanu atzaram <a href="%s/%s/src/%s">%s</a> repozitorijā <a href="%s/%s">%s</a> -create_issue=`reģistrēja problēmu <a href="%s/issues/%s">%[1]s#%[2]s</a>` -comment_issue=`pievienoja komentāru problēmai <a href="%s/issues/%s">%[1]s#%[2]s</a>` -transfer_repo=mainīja repozitorija <code>%s</code> īpašnieku uz <a href="/%s%s">%s</a> -push_tag=pievienoja tagu <a href="%s/%s/src/%s">%s</a> repozitorijam <a href="%s/%s">%s</a> +create_repo=izveidoja repozitoriju <a href="%s">%s</a> +commit_repo=veica izmaiņu nosūtīšanu atzaram <a href="%s/src/%s">%[2]s</a> repozitorijā <a href="%[1]s">%[3]s</a> +create_issue=`reģistrēja problēmu <a href="%s/issues/%s">%s#%[2]s</a>` +comment_issue=`pievienoja komentāru problēmai <a href="%s/issues/%s">%s#%[2]s</a>` +transfer_repo=mainīja repozitorija <code>%s</code> īpašnieku uz <a href="%s">%s</a> +push_tag=pievienoja tagu <a href="%s/src/%s">%[2]s</a> repozitorijam <a href="%[1]s">%[3]s</a> compare_2_commits=Veikt salīdzināšanu starp šīm 2 revīzijām [tool] diff --git a/conf/locale/locale_nl-NL.ini b/conf/locale/locale_nl-NL.ini index 0a4ecb43a7..c1bc6c3439 100755 --- a/conf/locale/locale_nl-NL.ini +++ b/conf/locale/locale_nl-NL.ini @@ -281,13 +281,13 @@ init_readme=Initialiseer deze repositorie met een README.md create_repo=Nieuwe Repositorie default_branch=Standaard branch mirror_interval=Mirror interval(uur) -goget_meta=Go-Get Meta -goget_meta_helper=Deze repositorie is nu beschikbaar voor <span class="label label-blue label-radius">Go-Get</span> need_auth=Autorisatie vereist migrate_type=Migratie type migrate_type_helper=Deze repositorie zal een <span class="label label-blue label-radius">mirror</span> worden migrate_repo=Migreer repositorie +migrate.clone_address=Clone Address +migrate.invalid_local_path=Invalid local path, it does not exist or not a directory. copy_link=Kopieer click_to_copy=Kopieer link naar plakbord @@ -595,7 +595,10 @@ auths.domain=Domein auths.host=Host auths.port=Poort auths.base_dn=Base DN -auths.attributes=Zoek attributen +auths.attribute_username=Username attribute +auths.attribute_name=First name attribute +auths.attribute_surname=Surname attribute +auths.attribute_mail=E-mail attribute auths.filter=Zoek filter auths.ms_ad_sa=MS Ad SA auths.smtp_auth=SMTP authenticatietype @@ -693,12 +696,12 @@ notices.op=Op. notices.delete_success=Systeem bericht is met succes verwijderd. [action] -create_repo=repositorie aangemaakt in <a href="%s/%s">%s</a> -commit_repo=push update naar <a href="%s/%s/src/%s">%s</a> in <a href="%s/%s">%s</a -create_issue=`opende issue in <a href="%s/issues/%s">%[1]s#%[2]s</a>` -comment_issue=`reactie op issue <a href="%s/issues/%s">%[1]s#%[2]s</a>` -transfer_repo=repositorie verplaatst naar <code>%s</code> naar <a href="/%s%s">%s</a> -push_tag=geduwd label <a href="%s/%s/src/%s"> %s</a> naar <a href="%s/%s"> %s</a> +create_repo=repositorie aangemaakt in <a href="%s">%s</a> +commit_repo=push update naar <a href="%s/src/%s">%[2]s</a> in <a href="%[1]s">%[3]s</a> +create_issue=`opende issue in <a href="%s/issues/%s">%s#%[2]s</a>` +comment_issue=`reactie op issue <a href="%s/issues/%s">%s#%[2]s</a>` +transfer_repo=repositorie verplaatst naar <code>%s</code> naar <a href="%s">%s</a> +push_tag=geduwd label <a href="%s/src/%s"> %[2]s</a> naar <a href="%[1]s"> %[3]s</a> compare_2_commits=Weergave vergelijking voor deze 2 commits [tool] diff --git a/conf/locale/locale_ru-RU.ini b/conf/locale/locale_ru-RU.ini index 731ba469ce..c2a50b9da8 100755 --- a/conf/locale/locale_ru-RU.ini +++ b/conf/locale/locale_ru-RU.ini @@ -281,13 +281,13 @@ init_readme=Создать репозиторий с файлом README.md create_repo=Создание репозитория default_branch=Ветка по умолчанию mirror_interval=Интервал зеркалирования (час) -goget_meta=Meta-тег для go get -goget_meta_helper=Репозиторий будет доступен для <span class="label label-blue label-radius">go get</span> need_auth=Требуется авторизация migrate_type=Тип миграции migrate_type_helper=Этот репозиторий будет <span class="label label-blue label-radius">зеркалом</span> migrate_repo=Перенос репозитория +migrate.clone_address=Clone Address +migrate.invalid_local_path=Invalid local path, it does not exist or not a directory. copy_link=Копировать click_to_copy=Скопировать в буфер обмена @@ -595,7 +595,10 @@ auths.domain=Домен auths.host=Хост auths.port=Порт auths.base_dn=Base DN -auths.attributes=Search Attributes +auths.attribute_username=Username attribute +auths.attribute_name=First name attribute +auths.attribute_surname=Surname attribute +auths.attribute_mail=E-mail attribute auths.filter=Фильтр поиска auths.ms_ad_sa=Ms Ad SA auths.smtp_auth=Тип авторизации SMTP @@ -693,12 +696,12 @@ notices.op=Op. notices.delete_success=Системное уведомление успешно удалено. [action] -create_repo=создан репозиторий <a href="%s/%s"> %s</a> -commit_repo=pushed to <a href="%s/%s/src/%s">%s</a> at <a href="%s/%s">%s</a> -create_issue=`opened issue <a href="%s/issues/%s">%[1]s#%[2]s</a>` -comment_issue=`commented on issue <a href="%s/issues/%s">%[1]s#%[2]s</a>` -transfer_repo=transfered repository <code>%s</code> to <a href="/%s%s">%s</a> -push_tag=pushed tag <a href="%s/%s/src/%s">%s</a> to <a href="%s/%s">%s</a> +create_repo=создан репозиторий <a href="%s"> %s</a> +commit_repo=pushed to <a href="%s/src/%s">%[2]s</a> at <a href="%[1]s">%[3]s</a> +create_issue=`opened issue <a href="%s/issues/%s">%s#%[2]s</a>` +comment_issue=`commented on issue <a href="%s/issues/%s">%s#%[2]s</a>` +transfer_repo=transfered repository <code>%s</code> to <a href="%s">%s</a> +push_tag=pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a> compare_2_commits=Просмотреть сравнение двух коммитов [tool] diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 3537068228..0e418e254a 100755 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -281,13 +281,13 @@ init_readme=使用 README.md 文件初始化仓库 create_repo=创建仓库 default_branch=默认分支 mirror_interval=镜像同步周期(小时) -goget_meta=Go-Get 支持 -goget_meta_helper=本仓库将可以通过 <span class="label label-blue label-radius">Go Get</span> 获取 need_auth=需要授权验证 migrate_type=迁移类型 migrate_type_helper=本仓库将是 <span class="label label-blue label-radius">镜像</span> migrate_repo=迁移仓库 +migrate.clone_address=克隆地址 +migrate.invalid_local_path=无效的本地路径,不存在或不是一个目录! copy_link=复制链接 click_to_copy=复制到剪切板 @@ -595,7 +595,10 @@ auths.domain=域名 auths.host=主机地址 auths.port=主机端口 auths.base_dn=Base DN -auths.attributes=Search Attributes +auths.attribute_username=用户名属性 +auths.attribute_name=名字属性 +auths.attribute_surname=姓氏属性 +auths.attribute_mail=邮箱属性 auths.filter=Search Filter auths.ms_ad_sa=Ms Ad SA auths.smtp_auth=SMTP 授权类型 @@ -693,12 +696,12 @@ notices.op=操作 notices.delete_success=系统提示删除成功! [action] -create_repo=创建了仓库 <a href="%s/%s">%s</a> -commit_repo=推送了 <a href="%s/%s/src/%s">%s</a> 分支的代码到 <a href="%s/%s">%s</a> -create_issue=`创建了工单 <a href="%s/issues/%s">%[1]s#%[2]s</a>` -comment_issue=`评论了工单 <a href="%s/issues/%s">%[1]s#%[2]s</a>` -transfer_repo=将仓库 <code>%s</code> 转移至 <a href="/%s%s">%s</a> -push_tag=推送了标签 <a href="%s/%s/src/%s">%s</a> 到 <a href="%s/%s">%s</a> +create_repo=创建了仓库 <a href="%s">%s</a> +commit_repo=推送了 <a href="%s/src/%s">%[2]s</a> 分支的代码到 <a href="%[1]s">%[3]s</a> +create_issue=`创建了工单 <a href="%s/issues/%s">%s#%[2]s</a>` +comment_issue=`评论了工单 <a href="%s/issues/%s">%s#%[2]s</a>` +transfer_repo=将仓库 <code>%s</code> 转移至 <a href="%s">%s</a> +push_tag=推送了标签 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a> compare_2_commits=查看 2 次提交的内容对比 [tool] diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini index a9b51a5b0c..8447e60912 100755 --- a/conf/locale/locale_zh-HK.ini +++ b/conf/locale/locale_zh-HK.ini @@ -281,13 +281,13 @@ init_readme=使用 README.md 文件初始化倉庫 create_repo=創建倉庫 default_branch=默認分支 mirror_interval=鏡像同步周期(小時) -goget_meta=Go-Get 支持 -goget_meta_helper=本倉庫將可以通過 <span class="label label-blue label-radius">Go Get</span> 獲取 need_auth=需要授權驗證 migrate_type=遷移類型 migrate_type_helper=本倉庫將是 <span class="label label-blue label-radius">鏡像</span> migrate_repo=遷移倉庫 +migrate.clone_address=Clone Address +migrate.invalid_local_path=Invalid local path, it does not exist or not a directory. copy_link=複製連結 click_to_copy=複製到剪切簿 @@ -595,7 +595,10 @@ auths.domain=域名 auths.host=主機地址 auths.port=主機端口 auths.base_dn=Base DN -auths.attributes=搜尋屬性 +auths.attribute_username=Username attribute +auths.attribute_name=First name attribute +auths.attribute_surname=Surname attribute +auths.attribute_mail=E-mail attribute auths.filter=搜尋過濾 auths.ms_ad_sa=Ms Ad SA auths.smtp_auth=SMTP 授權類型 @@ -693,12 +696,12 @@ notices.op=操作 notices.delete_success=系統提示刪除成功! [action] -create_repo=創建了倉庫 <a href="%s/%s">%s</a> -commit_repo=推送了 <a href="%s/%s/src/%s">%s</a> 分支的代碼到 <a href="%s/%s">%s</a> -create_issue=`創建了問題 <a href="%s/issues/%s">%[1]s#%[2]s</a>` -comment_issue=`評論了問題 <a href="%s/issues/%s">%[1]s#%[2]s</a>` -transfer_repo=將倉庫 <code>%s</code> 轉移至 <a href="/%s%s">%s</a> -push_tag=推送了標籤 <a href="%s/%s/src/%s">%s</a> 到 <a href="%s/%s">%s</a> +create_repo=創建了倉庫 <a href="%s">%s</a> +commit_repo=推送了 <a href="%s/src/%s">%[2]s</a> 分支的代碼到 <a href="%[1]s">%[3]s</a> +create_issue=`創建了問題 <a href="%s/issues/%s">%s#%[2]s</a>` +comment_issue=`評論了問題 <a href="%s/issues/%s">%s#%[2]s</a>` +transfer_repo=將倉庫 <code>%s</code> 轉移至 <a href="%s">%s</a> +push_tag=推送了標籤 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a> compare_2_commits=查看 2 次提交的內容對比 [tool] diff --git a/models/action.go b/models/action.go index f872104eb2..f97ecfcde3 100644 --- a/models/action.go +++ b/models/action.go @@ -97,8 +97,15 @@ func (a Action) GetRepoName() string { return a.RepoName } +func (a Action) GetRepoPath() string { + return path.Join(a.RepoUserName, a.RepoName) +} + func (a Action) GetRepoLink() string { - return path.Join(setting.AppSubUrl, a.RepoUserName, a.RepoName) + if len(setting.AppSubUrl) > 0 { + return path.Join(setting.AppSubUrl, a.GetRepoPath()) + } + return "/" + a.GetRepoPath() } func (a Action) GetBranch() string { diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 8acf228963..88fb407536 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -7,19 +7,19 @@ <p class="text-bold"> <a href="{{AppSubUrl}}/{{.GetActUserName}}">{{.GetActUserName}}</a> {{if eq .GetOpType 1}} - {{$.i18n.Tr "action.create_repo" AppSubUrl .GetRepoLink .GetRepoLink | Str2html}} + {{$.i18n.Tr "action.create_repo" .GetRepoLink .GetRepoPath | Str2html}} {{else if eq .GetOpType 5}} - {{$.i18n.Tr "action.commit_repo" AppSubUrl .GetRepoLink .GetBranch .GetBranch AppSubUrl .GetRepoLink .GetRepoLink | Str2html}} + {{$.i18n.Tr "action.commit_repo" .GetRepoLink .GetBranch .GetRepoPath | Str2html}} {{else if eq .GetOpType 6}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.create_issue" .GetRepoLink $index | Str2html}} + {{$.i18n.Tr "action.create_issue" .GetRepoLink $index .GetRepoPath | Str2html}} {{else if eq .GetOpType 8}} - {{$.i18n.Tr "action.transfer_repo" .GetContent AppSubUrl .GetRepoLink .GetRepoLink | Str2html}} + {{$.i18n.Tr "action.transfer_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}} {{else if eq .GetOpType 9}} - {{$.i18n.Tr "action.push_tag" AppSubUrl .GetRepoLink .GetBranch .GetBranch AppSubUrl .GetRepoLink .GetRepoLink | Str2html}} + {{$.i18n.Tr "action.push_tag" .GetRepoLink .GetBranch .GetRepoPath | Str2html}} {{else if eq .GetOpType 10}} {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.comment_issue" .GetRepoLink $index | Str2html}} + {{$.i18n.Tr "action.comment_issue" .GetRepoLink $index .GetRepoPath | Str2html}} {{end}} </p> {{if eq .GetOpType 5}}