From e0de6cb5adf5a81a95840f648d8a388b566202bd Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 10 Nov 2014 05:30:07 -0500 Subject: [PATCH] work on #616 and update locales --- conf/locale/locale_de-DE.ini | 110 ++++++++++--------- conf/locale/locale_en-US.ini | 12 +-- conf/locale/locale_fr-CA.ini | 18 ++-- conf/locale/locale_nl-NL.ini | 138 ++++++++++++------------ conf/locale/locale_zh-CN.ini | 18 ++-- conf/locale/locale_zh-HK.ini | 18 ++-- gogs.go | 2 +- modules/auth/auth.go | 53 ++++++--- modules/middleware/context.go | 20 ---- public/ng/css/gogs.css | 7 +- public/ng/less/gogs/repository.less | 7 +- routers/install.go | 4 +- templates/.VERSION | 2 +- templates/repo/header.tmpl | 2 +- templates/repo/settings/hook_gogs.tmpl | 2 +- templates/repo/settings/hook_slack.tmpl | 2 +- templates/repo/settings/hooks.tmpl | 2 +- templates/user/settings/sshkeys.tmpl | 2 +- 18 files changed, 230 insertions(+), 189 deletions(-) diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini index c7f9e8a2a..b66a0a0b7 100755 --- a/conf/locale/locale_de-DE.ini +++ b/conf/locale/locale_de-DE.ini @@ -26,6 +26,7 @@ organization=Organisation mirror=Spiegel new_repo=Neues Repository new_migrate=Neue Migration +new_fork=Neue Gabel-Repository new_org=Neue Organisation manage_org=Organisationen verwalten admin_panel=Admin-Panel @@ -74,7 +75,7 @@ confirm_password=Passwort bestätigen admin_email=E-Mail install_gogs=Gogs installieren test_git_failed=Fehler beim Test des 'git' Kommandos: %v -sqlite3_not_available=Deine Version unterstüzt nicht SQLite3, bitte downloade dir die offiziele binäre Version von http: //gogs.io/docs/installation/install_from_binary.html, NOT the gobuild version. +sqlite3_not_available=Releaseversion SQLite3 nicht unterstützt, laden Sie die offizielle binary-Version von %s nicht die Gobuild Version. invalid_db_setting=Datenbank-Einstellungen sind nicht korrekt: %v invalid_repo_path=Repository Root-Verzeichnis ist ungültig: %v run_user_not_match=Der ausführende Benutzer ist nicht der aktuelle Benutzer: %s -> %s @@ -159,7 +160,7 @@ user_not_exist=Angegebener Benutzer existiert nicht. last_org_owner=Der zu entfernende Benutzer ist der letzte Teambesitzer. Es muss einen anderen Besitzer geben. invalid_ssh_key=Leider sind wir nicht in der Lage, deinen SSH-Schlüssel zu überprüfen: %s -unable_verify_ssh_key=Gogs cannot verify your SSH key, but we assume that is valid, please make sure yourself. +unable_verify_ssh_key=Gogs kann deinen SSH-Schlüssel nicht verifizieren, nimmt aber an, dass er gültig ist. Bitte stelle dies selbst sicher. auth_failed=Authentifizierung fehlgeschlagen: %v still_own_repo=Dein Konto besitzt noch Repositorys. Diese müssen zuerst gelöscht oder übertragen werden. @@ -167,6 +168,8 @@ org_still_own_repo=Diese Organisation besitzt noch Repositorys. Diese müssen zu still_own_user=Diese Authentifizierung wird noch von einigen Benutzern genutzt. Entferne diese zuvor und lösche erneut. +target_branch_not_exist=Zielverzweigung existiert nicht + [user] change_avatar=Ändere dein Profilbild auf gravatar.com join_on=Registriert @@ -193,7 +196,7 @@ location=Standort update_profile=Profil aktualisieren update_profile_success=Profil aktualisiert change_username=Benutzername geändert -change_username_desc=Username has been changed, do you want to continue? This will affect all links relate to your account. +change_username_desc=Benutzername wurde geändert, möchtest du fortfahren? Dies beeinträchtigt sämtliche Links, die dein Konto betreffen. continue=Weiter cancel=Abbrechen @@ -206,7 +209,7 @@ change_password_success=Passwort geändert. Du kannst dich jetzt mit dem neuen P manage_ssh_keys=SSH-Schlüssel verwalten add_key=SSH-Schlüssel hinzufügen ssh_desc=Dies ist eine Liste aller SSH-Schlüssel, die mit deinem Konto verknüpft sind. Entferne alle Schlüssel, die du nicht kennst. -ssh_helper=Du brauchst Hilfe? Hier ist eine Anleitung zum generating SSH keys or troubleshoot common SSH Problems. +ssh_helper=Brauche Hilfe? Lesen Sie unsere Anleitung für die Erzeugung von SSH-Schlüsseln oder beheben Sie SSH-Probleme zu. add_new_key=SSH-Schlüssel hinzufügen key_name=Schlüsselname key_content=Inhalt @@ -233,6 +236,9 @@ repo_name=Repository-Name repo_name_helper=Gute Repository-Namen sind kurz, einprägsam und einzigartig. visibility=Sichtbarkeit visiblity_helper=Dieses Repository ist Privat +fork_repo=Gabel-Repository +fork_from=Gabel aus +fork_visiblity_helper=Abgezweigten Repository ändern nicht seine Sichtbarkeit. repo_desc=Beschreibung repo_lang=Sprache repo_lang_helper=Wähle eine .gitignore Datei @@ -253,7 +259,7 @@ migrate_repo=Repository migrieren copy_link=Kopieren click_to_copy=In Zwischenablage kopieren copied=Kopiert OK -clone_helper=Du brauchst Hilfe beim Klonen? Hier gibt es Help! +clone_helper=Brauchen Sie Hilfe Klonen? Besuchen Sie helfen! unwatch=Beobachtung beenden watch=Beobachtung unstar=Markierung aufheben @@ -271,15 +277,15 @@ tree=Struktur branch_and_tags=Branchen & Tags branches=Branchen tags=Markierungen -issues=Fragen -commits=verpflichtungen +issues=Issues +commits=Commits releases=Veröffentlichungen file_raw=Roh file_history=Verlauf file_view_raw=Ansicht Roh -commits.commits=verpflichtungen -commits.search=Suche verpflichtungen +commits.commits=Commits +commits.search=Durchsuche Commits commits.find=Finden commits.author=Author commits.message=Mitteilung @@ -291,20 +297,20 @@ settings=Einstellungen settings.options=Optionen settings.collaboration=Zusammenarbeit settings.hooks=Webhooks -settings.githooks=Git Hooks +settings.githooks=Git-Hooks settings.deploy_keys=Deploy-Keys settings.basic_settings=Grundeinstellungen settings.danger_zone=Gefahrenzone settings.site=Offizielle Webseite settings.update_settings=Aktualisierungseinstellungen -settings.change_reponame=Repository Name Changed -settings.change_reponame_desc=Repository name has been changed, do you want to continue? This will affect all links relate to this repository. +settings.change_reponame=Name des Repositories geändert +settings.change_reponame_desc=Repository-Name wurde geändert, möchtest du fortfahren? Dies beeinträchtigt sämtliche Links, die dieses Repository betreffen. settings.transfer=Besitz übertragen settings.transfer_desc=Übertrage dieses Repository einem anderen Benutzer oder einer Organisation. settings.new_owner_has_same_repo=Neuer Eigentümer hat bereits ein Repository mit dem gleichen Namen. settings.delete=Repository löschen settings.delete_desc=Wenn dieses Repository gelöscht ist, gibt es keinen Weg zurück. Sei dir sicher! -settings.transfer_notices=

- You will lose access if new owner is a individual user.

- You will remain access if new owner is an organization and you're one of the owners.

+settings.transfer_notices=

- Du wirst den Zugriff verlieren, falls der neue Besitzer ein einzelner Benutzer ist.

- Du wirst deinen Zugang behalten, falls der neue Besitzer eine Organisation ist, und du zu ihren Besitzern gehörst.

settings.update_settings_success=Repository-Optionen aktualisiert settings.transfer_owner=Neuer Besitzer settings.make_transfer=übertragen @@ -313,16 +319,16 @@ settings.confirm_delete=Löschen settings.add_collaborator=Mitarbeiter hinzufügen settings.add_collaborator_success=Mitarbeiter hinzugefügt settings.remove_collaborator_success=Mitarbeiter entfernt -settings.user_is_org_member=User is organization member who cannot be added as a collaborator. +settings.user_is_org_member=Benutzer ist ein Organisationsmitglied und kann nicht als Mitarbeiter hinzugefügt werden. settings.add_webhook=Webhook hinzufügen -settings.hooks_desc=Webhooks erlauben es externe Dienste zu informieren, wenn etwas bestimmtes in deinem Repository passiert. GoGS sendet dann eine POST-Request an alle angegebenen URLs. Erfahre mehr in unserem Webhooks Guide. -settings.githooks_desc=Git Hooks are powered by Git itself, you can edit files of supported hooks in the list below to apply custom operations. -settings.githook_edit_desc=If hook is not active, sample content will be presented. Leave content to be blank will disable this hook. -settings.githook_name=Hook Name -settings.githook_content=Hook Content -settings.update_githook=Update Hook +settings.hooks_desc=Webhooks erlauben es externe Dienste zu informieren, wenn etwas bestimmtes in deinem Repository passiert. GoGS sendet dann eine POST-Request an alle angegebenen URLs. Erfahre mehr in unserem Webhooks Guide. +settings.githooks_desc=Git-Hooks werden von Git selbst bereitgestellt. Du kannst die Dateien der unterstützten Hooks in der Liste unten bearbeiten, um eigene Operationen einzubinden. +settings.githook_edit_desc=Wenn ein Hook nicht aktiv ist, wird der Standardinhalt benutzt. Lasse den Inhalt leer, um den Hook zu deaktivieren. +settings.githook_name=Hook-Name +settings.githook_content=Hook-Inhalt +settings.update_githook=Aktualisiere Hook settings.remove_hook_success=Webhook entfernt -settings.add_webhook_desc=GoGS sendet einen POST-Request an die unten stehende URL mit Details aller abonierten Ereignisse. Du kannst auch angeben, welches Datenformat du erhalten willst (JSON, x-www-form-urlencoded, etc). Mehr Informationen findest du im Webhooks Guide. +settings.add_webhook_desc=GoGS sendet einen POST-Request an die unten stehende URL mit Details aller abonnierten Ereignisse. Du kannst auch angeben, welches Datenformat du erhalten willst (JSON, x-www-form-urlencoded, etc). Mehr Informationen findest du im Webhooks Guide. settings.payload_url=Payload-URL settings.content_type=Inhaltstyp settings.secret=Secret @@ -336,17 +342,17 @@ settings.update_hook_success=Webhook aktualisiert settings.delete_webhook=Webhook löschen settings.recent_deliveries=letzte Zustellungen settings.hook_type=Hook Typ -settings.add_slack_hook_desc=Add Slack integration to your repository. //slack.com">Slack integration to your repository. +settings.add_slack_hook_desc=Fügen Sie Slack-Integration in Ihr Repository. settings.slack_token=Token settings.slack_domain=Domain settings.slack_channel=Kanal diff.browse_source=Quellcode durchsuchen -diff.parent=parent +diff.parent=Ursprung diff.commit=Commit diff.data_not_available=Keine Diff-Daten verfügbar. diff.show_diff_stats=Diff-Statistik anzeigen -diff.stats_desc= %d changed files with %d additions and %d deletions +diff.stats_desc= %d geänderte Dateien mit %d neuen Zeilen und %d gelöschten Zeilen diff.bin=BIN diff.view_file=Datei anzeigen @@ -375,15 +381,15 @@ settings.full_name=Vollständiger Name settings.website=Webseite settings.location=Standort settings.update_settings=Aktualisierungseinstellungen -settings.change_orgname=Organization Name Changed -settings.change_orgname_desc=Organization name has been changed, do you want to continue? This will affect all links relate to this organization. +settings.change_orgname=Organisationsname geändert +settings.change_orgname_desc=Organisationsname wurde geändert, möchtest du fortfahren? Dies beeinträchtigt sämtliche Links, die diese Organisation betreffen. settings.update_setting_success=Organisationseinstellungen aktualisiert settings.delete=Organisation löschen settings.delete_account=Diese Organisation löschen settings.delete_prompt=Die Organisation wird dauerhaft gelöscht. Dies kann NICHT rückgängig gemacht werden! settings.confirm_delete_account=Löschen settings.delete_org_title=Organisation löschen -settings.delete_org_desc=This organization is going to be deleted permanently, do you want to continue? +settings.delete_org_desc=Diese Organisation wird dauerhaft gelöscht, möchtest du fortfahren? settings.hooks_desc=Füge Webhooks hinzu, die für alle Repositorys dieser Organisation ausgelöst werden. members.public=Öffentlich @@ -414,7 +420,7 @@ teams.update_settings=Einstellungen aktualisieren teams.delete_team=Dieses Team löschen teams.add_team_member=Teammitglied hinzufügen teams.delete_team_title=Team löschen -teams.delete_team_desc=This team is going to be deleted, do you want to continue? Members of this team may lose access to some repositories. +teams.delete_team_desc=Dieses Team wird gelöscht, möchtest du fortfahren? Mitglieder dieses Teams verlieren möglicherweise ihren Zugang zu einigen Repositories. teams.delete_team_success=Team gelöscht teams.read_permission_desc=Dieses Team erlaubt Lesezugriff: Mitglieder können Team-Repositorys einsehen und klonen. teams.write_permission_desc=Dieses Team erlaubt Schreibzugriff: Mitglieder können Team-Repositorys einsehen und hinein pushen. @@ -422,7 +428,7 @@ teams.admin_permission_desc=Diese Team erlaubt Adminzugriff: Mi teams.repositories=Team-Repositorys teams.add_team_repository=Team-Repository hinzufügen teams.remove_repo=Entfernen -teams.add_nonexistent_repo=The repository you're trying to add does not exist, please create it first. +teams.add_nonexistent_repo=Das Repository, das du hinzufügen willst, existiert nicht. Bitte erstelle es zuerst. [admin] dashboard=Dashboard @@ -431,7 +437,7 @@ organizations=Organisationen repositories=Repositorys authentication=Authentifizierung config=Konfiguration -notices=System Notices +notices=System-Mitteilungen monitor=Monitoring prev=zurück next=vor @@ -533,8 +539,8 @@ auths.activated=Diese Authentifizierung ist aktiviert auths.update_success=Authentifizierungseinstellungen aktualisiert auths.update=Authentifizierungseinstellungen aktualisieren auths.delete=Authentifizierung löschen -auths.delete_auth_title=Authorization Deletion -auths.delete_auth_desc=This authorization is going to be deleted, do you want to continue? +auths.delete_auth_title=Authentifizierungsquelle löschen +auths.delete_auth_desc=Diese Authentifizierungsquelle wird gelöscht, möchtest du fortfahren? config.server_config=Server-Konfiguration config.app_name=Anwendungsname @@ -549,7 +555,7 @@ config.repo_root_path=Repository-Verzeichnis config.static_file_root_path=Verzeichnis für statische Dateien config.log_file_root_path=Log-Verzeichnis config.script_type=Skript-Typ -config.reverse_auth_user=Reverse Authentication User +config.reverse_auth_user=Nutzer bei Reverse-Authentifizierung config.db_config=Datenbankkonfiguration config.db_type=Typ config.db_host=Host @@ -607,12 +613,12 @@ monitor.desc=Beschreibung monitor.start=Startzeit monitor.execute_time=Ausführungszeit -notices.system_notice_list=System Notices -notices.type=Type +notices.system_notice_list=System-Mitteilungen +notices.type=Typ notices.type_1=Repository notices.desc=Beschreibung notices.op=Op. -notices.delete_success=System notice has been successfully deleted. +notices.delete_success=System-Mitteilung erfolgreich gelöscht. [action] create_repo=hat Repository %s erstellt @@ -620,27 +626,27 @@ commit_repo=hat nach %s in %s gep create_issue=hat Issue %s#%s eröffnet comment_issue=hat Issue %s#%s kommentiert transfer_repo=hat Repository %s transferiert an %s -push_tag=pushed tag %s to %s -compare_2_commits=View comparison for these 2 commits +push_tag=hat nach %s in %s gepusht +compare_2_commits=Zeige Vergleich dieser 2 Commits [tool] ago=vor from_now=ab sofort now=Jetzt -1s=1 Sekunde %s -1m=1 Minute %s -1h=1 Stunde %s -1d=1 Tag %s -1w=1 Woche %s -1mon=1 Monat %s -1y=1 Jahr %s -seconds=%d Sekunden %s -minutes=%d Minuten %s -hours=%d Stunden %s -days=%d Tage %s -weeks=%d Wochen %s -months=%d Monate %s -years=%d Jahre %s +1s=%s 1 Sekunde +1m=%s 1 Minute +1h=%s 1 Stunde +1d=%s 1 Tag +1w=%s 1 Woche +1mon=%s 1 Monat +1y=%s 1 Jahr +seconds=%v %v Sekunden +minutes=%v %v Minuten +hours=%v %v Stunden +days=%v %v Tagen +weeks=%v %v Wochen +months=%v %v Monaten +years=%v %v Jahren raw_seconds=Sekunden raw_minutes=Minuten diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 6d4c13c5a..53bf0eb7d 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -75,7 +75,7 @@ confirm_password = Confirm Password admin_email = E-mail install_gogs = Install Gogs test_git_failed = Fail to test 'git' command: %v -sqlite3_not_available = Your release version does not support SQLite3, please download the official binary version from http://gogs.io/docs/installation/install_from_binary.html, NOT the gobuild version. +sqlite3_not_available = Your release version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version. invalid_db_setting = Database setting is not correct: %v invalid_repo_path = Repository root path is invalid: %v run_user_not_match = Run user isn't the current user: %s -> %s @@ -209,7 +209,7 @@ change_password_success = Password is changed successfully. You can now sign in manage_ssh_keys = Manage SSH Keys add_key = Add Key ssh_desc = This is a list of SSH keys associated with your account. Remove any keys that you do not recognize. -ssh_helper = Need help? Check out our guide to generating SSH keys or troubleshoot common SSH Problems. +ssh_helper = Need help? Check out our guide to generating SSH keys or troubleshoot common SSH Problems. add_new_key = Add SSH Key key_name = Key Name key_content = Content @@ -259,7 +259,7 @@ migrate_repo = Migrate Repository copy_link = Copy click_to_copy = Copy to clipboard copied = Copied OK -clone_helper = Need help cloning? Visit Help! +clone_helper = Need help cloning? Visit Help! unwatch = Unwatch watch = Watch unstar = Unstar @@ -321,14 +321,14 @@ settings.add_collaborator_success = New collaborator has been added. settings.remove_collaborator_success = Collaborator has been removed. settings.user_is_org_member = User is organization member who cannot be added as a collaborator. settings.add_webhook = Add Webhook -settings.hooks_desc = Webhooks allow external services to be notified when certain events happen on Gogs. When the specified events happen, we'll send a POST request to each of the URLs you provide. Learn more in our Webhooks Guide. +settings.hooks_desc = Webhooks allow external services to be notified when certain events happen on Gogs. When the specified events happen, we'll send a POST request to each of the URLs you provide. Learn more in our Webhooks Guide. settings.githooks_desc = Git Hooks are powered by Git itself, you can edit files of supported hooks in the list below to apply custom operations. settings.githook_edit_desc = If hook is not active, sample content will be presented. Leave content to be blank will disable this hook. settings.githook_name = Hook Name settings.githook_content = Hook Content settings.update_githook = Update Hook settings.remove_hook_success = Webhook has been removed. -settings.add_webhook_desc = We’ll send a POST request to the URL below with details of any subscribed events. You can also specify which data format you'd like to receive (JSON, x-www-form-urlencoded, etc). More information can be found in Webhooks Guide. +settings.add_webhook_desc = We’ll send a POST request to the URL below with details of any subscribed events. You can also specify which data format you'd like to receive (JSON, x-www-form-urlencoded, etc). More information can be found in Webhooks Guide. settings.payload_url = Payload URL settings.content_type = Content Type settings.secret = Secret @@ -342,7 +342,7 @@ settings.update_hook_success = Webhook has been updated. settings.delete_webhook = Delete Webhook settings.recent_deliveries = Recent Deliveries settings.hook_type = Hook Type -settings.add_slack_hook_desc = Add Slack integration to your repository. +settings.add_slack_hook_desc = Add Slack integration to your repository. settings.slack_token = Token settings.slack_domain = Domain settings.slack_channel = Channel diff --git a/conf/locale/locale_fr-CA.ini b/conf/locale/locale_fr-CA.ini index 04ce529b6..40057ef2d 100755 --- a/conf/locale/locale_fr-CA.ini +++ b/conf/locale/locale_fr-CA.ini @@ -26,6 +26,7 @@ organization=Organisation mirror=Miroir new_repo=Nouveau Référentiel new_migrate=Nouvelle Migration +new_fork=Nouveau référentiel de fourche new_org=Nouvelle Organisation manage_org=Gérer les Organisations admin_panel=Administration @@ -74,7 +75,7 @@ confirm_password=Confirmez le Mot de Passe admin_email=E-mail install_gogs=Installer Gogs test_git_failed=Tentative de commande "git" échouée : %v -sqlite3_not_available=Votre version publiée ne prend pas en charge SQLite3. Veuillez télécharger la version binaire officielle à cette adresse : //gogs.io/docs/installation/install_from_binary.html, NOT the gobuild version. +sqlite3_not_available=Votre version publiée ne prend pas en charge SQLite3. Veuillez télécharger la version binaire officielle à cette adresse %s. invalid_db_setting=Paramètres de base de données incorrects : %v invalid_repo_path=Chemin Racine du Référentiel invalide : %v run_user_not_match=L'utilisateur entré n'est pas l'utilisateur actuel : %s -> %s @@ -167,6 +168,8 @@ org_still_own_repo=Cette organisation comporte toujours des propriétés de Réf 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 + [user] change_avatar=Changez d'avatar via gravatar.com join_on=Adhéré le @@ -206,7 +209,7 @@ change_password_success=Mot de passe modifié avec succès. Vous pouvez à prés manage_ssh_keys=Gérer les clés SSH add_key=Ajouter une Clé ssh_desc=Ceci est une liste des clés SSH associées à votre compte. Supprimez celles que vous ne reconnaissez pas. -ssh_helper=Besoin d'aide ? Jetez un oeil à notre guide à generating SSH keys or troubleshoot common SSH Problems. +ssh_helper=Besoin d'aide? Consultez notre guide pour générer des clés SSH ou résoudre les problèmes courants de SSH. add_new_key=Ajouter une Clé SSH key_name=Nom de la Clé key_content=Contenu @@ -233,6 +236,9 @@ repo_name=Nom du Référentiel repo_name_helper=Idéalement, le nom d'un Référentiel devrait être court, mémorable et unique. visibility=Visibilité visiblity_helper=Ce Référentiel est Privé +fork_repo=Référentiel de la fourche +fork_from=Fourche de +fork_visiblity_helper=Référentiel Aristide ne peut pas changer sa visiblité repo_desc=Description repo_lang=Langue repo_lang_helper=Sélectionner un fichier .gitignore @@ -253,7 +259,7 @@ migrate_repo=Migrer le Référentiel copy_link=Copier click_to_copy=Copier dans le presse-papier copied=Copié -clone_helper=Besoin de conseils pour dupliquer ? Visitez Help! +clone_helper=Besoin d'aide pour le clonage ? Visitez l'aider ! unwatch=Ne plus suivre watch=Suivre unstar=Retirer le vote @@ -315,14 +321,14 @@ settings.add_collaborator_success=Nouveau collaborateur ajouté. settings.remove_collaborator_success=Collaborateur supprimé. settings.user_is_org_member=Cet utilisateur ne peut pas être ajouté en tant que collaborateur car il fait partie d'une organisation. settings.add_webhook=Ajouter un Webhook -settings.hooks_desc=Les Webhooks permettent aux services externes d'être notifiés par certains évènements se produisant dans Gogs. Quand cela arrive, nous envoyons une requête POST pour chaque URL fourni. Plus d'infos à Webhooks Guide. +settings.hooks_desc=Webhooks aux services externes être notifié lorsque certains événements se produisent sur Gogs. Lorsque les événements spécifiés se produisent, nous vous enverrons une demande POST à chacun des URL que vous fournissez. Apprenez-en davantage dans notre Webhooks Guide. settings.githooks_desc=Les Hooks Git sont alimentés par Git lui même. Les Hooks compatibles sont modifiables dans la liste ci-dessous pour effectuer des opérations personnalisées. settings.githook_edit_desc=Si un Hook est inactif, un exemple de contenu vous sera proposé. Un contenu laissé vide signifie un Hook inactif. settings.githook_name=Nom du Hook settings.githook_content=Contenu du Hook settings.update_githook=Mettre le Hook à jour settings.remove_hook_success=Webhook supprimé. -settings.add_webhook_desc=Nous enverrons une requête POST à l'URL suivant avec les détails des événements auxquels vous avez souscrits. Vous pouvez également spécifier le format dans lequel vous souhaitez recevoir les données (JSON, x-www-form-urlencoded, etc). Plus d'infos disponibles à Webhooks Guide. +settings.add_webhook_desc=Nous vous enverrons une demande POST à l'URL ci-dessous avec les détails de tous les événements souscrites. Vous pouvez également spécifier quel format de données vous souhaitez recevoir (JSON, x-www-formulaires-urlencoded, etc.). Plus d'informations se trouvent dans le Guide de le Webhooks. settings.payload_url=URL des Données Utiles settings.content_type=Type de contenu settings.secret=Confidentiel @@ -336,7 +342,7 @@ settings.update_hook_success=Webhook mis à jour. settings.delete_webhook=Supprimer le Webhook settings.recent_deliveries=Livraisons récentes settings.hook_type=Type de Hook -settings.add_slack_hook_desc=Ajouter Slack integration to your repository. +settings.add_slack_hook_desc=Ajouter Slack intégration dans votre référentiel. settings.slack_token=Jeton settings.slack_domain=Domaine settings.slack_channel=Canal diff --git a/conf/locale/locale_nl-NL.ini b/conf/locale/locale_nl-NL.ini index 5d1a0e49e..3dce2bcaf 100755 --- a/conf/locale/locale_nl-NL.ini +++ b/conf/locale/locale_nl-NL.ini @@ -1,6 +1,6 @@ app_desc=Een pijnloze self-hosted Git-dienst geschreven in Go -home=Home +home=Huis dashboard=Dashboard explore=Verkennen help=Help @@ -12,20 +12,21 @@ register=Registreer website=Website version=Versie page=Pagina -template=Template +template=Sjabloon language=Taal username=Gebruikersnaam email=E-mail password=Wachttwoord re_type=Verificatie -captcha=Captcha +captcha=CAPTCHA repository=Repositorie organization=Organisatie -mirror=Mirror +mirror=Spiegel new_repo=Nieuwe repositorie new_migrate=Nieuwe migratie +new_fork=Nieuwe vork Repository new_org=Nieuwe organisatie manage_org=Beheer organisaties admin_panel=Adminpaneel @@ -34,7 +35,7 @@ settings=Instellingen news_feed=Nieuwsfeed pull_requests=Pull-aanvragen -issues=Issues +issues=Kwesties cancel=Annuleer @@ -74,7 +75,7 @@ confirm_password=Verifieer wachtwoord admin_email=E-mailadres install_gogs=Installeer Gogs test_git_failed=Git test niet gelukt: 'git' commando %v -sqlite3_not_available=SQLite3 wordt niet ondersteund in uw versie. Gelieve de officiële versie downloaden vanaf http: //gogs.io/docs/installation/install_from_binary.html, NOT the gobuild version. +sqlite3_not_available=Uw versie biedt geen ondersteuning voor SQLite3, download de officiële binaire versie van %s, niet de gobuild versie. invalid_db_setting=Uw database instellingen zijn niet correct: %v invalid_repo_path=Repositorie basis pad is niet correct: %v run_user_not_match=De uitvoerende gebruiker is niet de huidig gebruiker: %s -> %s @@ -124,8 +125,8 @@ Email=e-mailadres Password=Wachtwoord Retype=Verifieer wachtwoord SSHTitle=SSH sleutel naam -HttpsUrl=HTTPS URL -PayloadUrl=Payload URL +HttpsUrl=HTTPS-URL +PayloadUrl=Nettolading URL TeamName=Team naam AuthName=Autorisatienaam AdminEmail=E-mail beheerder @@ -159,7 +160,7 @@ user_not_exist=Gegeven gebruiker bestaat niet. last_org_owner=De gebruiker die u probeert te verwijderen is het enige lid (eigenaar) van dit team. U moet eerst nieuwe lid (eigenaar) aanstellen. invalid_ssh_key=Sorry, we zijn niet in staat om uw SSH-sleutel te verifiëren: %s -unable_verify_ssh_key=Gogs cannot verify your SSH key, but we assume that is valid, please make sure yourself. +unable_verify_ssh_key=Gogs kan niet controleren of uw SSH-sleutel, maar wij gaan ervan uit dat is geldig, zorg ervoor dat uzelf. auth_failed=Verificatie mislukt: %v still_own_repo=Uw account heeft nog een eigendom op een repositorie. U moet deze eerst verwijderen of overdragen. @@ -167,6 +168,8 @@ org_still_own_repo=De organisatie heeft nog eigendomen op repositories. U moet d still_own_user=Deze authenticatie methode wordt nog gebruikt door sommige gebruikers. U moet hen eerst verplaatsen of verwijderen. +target_branch_not_exist=Doel branch bestaat niet + [user] change_avatar=Verander uw avatar op Gravatar.com join_on=Aangemeld op @@ -206,7 +209,7 @@ change_password_success=Wachtwoord is succesvol gewijzigd. U kunt nu met uw nieu manage_ssh_keys=Beheer SSH sleutels add_key=Sleutel toevoegen ssh_desc=Dit is een lijst van alle SSH sleutels die gekoppeld zijn aan uw account. Verwijder alle sleutels die u niet herkent. -ssh_helper=Hulp nodig? Bekijk onze help pagina's over generating SSH keys or troubleshoot common SSH Problems. +ssh_helper=De behoeftehulp van? Check out onze gids voor het genereren van SSH sleutels of algemene SSH problemen. add_new_key=SSH sleutel toevoegen key_name=Sleutel naam key_content=Inhoud @@ -233,6 +236,9 @@ repo_name=Repositorie naam repo_name_helper=Een goede repositorie naam is kort, memorabel en uniek. visibility=Zichtbaarheid visiblity_helper=Deze repositorie is prive +fork_repo=Vork Repository +fork_from=Afsplitsing van +fork_visiblity_helper=Gevorkte repository wijzigen zijn bereik potentiële kopers niet repo_desc=Omschrijving repo_lang=Taal repo_lang_helper=Selecteer een .gitignore bestand @@ -253,12 +259,12 @@ migrate_repo=Migreer repositorie copy_link=Kopieer click_to_copy=Kopieer link naar plakbord copied=Gekopieerd -clone_helper=Hulp nodig bij het klonen? Kijk dan Help! +clone_helper=De behoeftehulp van klonen? Bezoek helpen! unwatch=Negeren watch=Volgen unstar=Ontster star=Ster -fork=Fork +fork=Vork no_desc=Geen omschrijving quick_guide=Snelstart gids @@ -271,12 +277,12 @@ tree=Boom branch_and_tags=Aftakkingen & labels branches=Aftakkingen tags=Labels -issues=Issues +issues=Kwesties commits=Commits releases=Publicaties -file_raw=Raw -file_history=History -file_view_raw=View Raw +file_raw=Ruwe +file_history=Geschiedenis +file_view_raw=Weergave ruwe commits.commits=Commits commits.search=Zoeken @@ -291,7 +297,7 @@ settings=Instellingen settings.options=Opties settings.collaboration=Samenwerking settings.hooks=Webhooks -settings.githooks=Git Hooks +settings.githooks=Git haken settings.deploy_keys=Installeer sleutels settings.basic_settings=Basis instellingen settings.danger_zone=Gevaren zone @@ -313,17 +319,17 @@ settings.confirm_delete=Bevestig verwijdering settings.add_collaborator=Nieuwe medewerker toevoegen settings.add_collaborator_success=medewerker is toegevoegd. settings.remove_collaborator_success=medewerker is verwijderd. -settings.user_is_org_member=User is organization member who cannot be added as a collaborator. +settings.user_is_org_member=Gebruiker is lid van de organisatie die als een medewerker kan niet worden toegevoegd. settings.add_webhook=Webhook toevoegen -settings.hooks_desc=Webhooks maken het mogelijk om ​​externe diensten te waaarschuwen wanneer zich bepaalde gebeurtenissen voordoen op Gogs . Wanneer de opgegeven gebeurtenissen gebeuren , zullen we een POST-aanvraag aan alle URL's die u verstrekt sturen . Lees meer in onze Webhooks Guide. -settings.githooks_desc=Git Hooks are powered by Git itself, you can edit files of supported hooks in the list below to apply custom operations. -settings.githook_edit_desc=If hook is not active, sample content will be presented. Leave content to be blank will disable this hook. -settings.githook_name=Hook Name -settings.githook_content=Hook Content -settings.update_githook=Update Hook +settings.hooks_desc=Webhooks dat de externe diensten om kennisgevingen te ontvangen wanneer bepaalde gebeurtenissen op Gogs plaatsvinden. Wanneer de opgegeven gebeurtenissen plaatsvinden, sturen we een POST-aanvraag naar elk van de URL's die u opgeeft. Meer informatie vindt u in onze Webhooks gids. +settings.githooks_desc=Git haken worden aangedreven door Git zelf, u kunt bestanden van ondersteunde haken in de lijst hieronder om aangepaste acties van toepassing bewerken. +settings.githook_edit_desc=Als haak niet actief is, zal monster inhoud worden gepresenteerd. Verlof inhoud leeg zal deze haak uitschakelen. +settings.githook_name=Haak naam +settings.githook_content=Haak inhoud +settings.update_githook=Haak bijwerken settings.remove_hook_success=Webhook is verwijderd. -settings.add_webhook_desc=We sturen een POST verzoek aan de onderstaande URL met de details van het geplaatste evenementen. U kunt ook aangeven welke data u wilt ontvangen (JSON, x-www-form-urlencoded, etc). U kunt meer informatie vinden in onze Webhooks Guide. -settings.payload_url=Payload URL +settings.add_webhook_desc=We sturen een POST-aanvraag naar de onderstaande URL met details voor alle geplaatste gebeurtenissen. U kunt ook opgeven welke gegevensindeling u wenst te ontvangen (JSON, x-1-800-www-Dell-vorm-urlencoded, enz.). Meer informatie kan gevonden worden in Webhooks gids. +settings.payload_url=Nettolading URL settings.content_type=Content type settings.secret=Geheim settings.event_desc=Bij welke gebeurtenissen wilt u dat deze webhook getriggerd wordt? @@ -336,19 +342,19 @@ settings.update_hook_success=Webhook is bijgewerkt. settings.delete_webhook=Webhook verwijderen settings.recent_deliveries=Recente bezorgingen settings.hook_type=Type hook -settings.add_slack_hook_desc=Voeg een Slack integration to your repository. +settings.add_slack_hook_desc= toegestane vertraging integratie toevoegen aan uw repository. settings.slack_token=Slack token settings.slack_domain=Slack domein settings.slack_channel=Slack kanaal -diff.browse_source=Browse Source -diff.parent=parent +diff.browse_source=Bladeren bron +diff.parent=bovenliggende diff.commit=commit -diff.data_not_available=Diff Data Not Available. -diff.show_diff_stats=Show Diff Stats -diff.stats_desc= %d changed files with %d additions and %d deletions +diff.data_not_available=Diff gegevens niet beschikbaar. +diff.show_diff_stats=Toon Diff Stats +diff.stats_desc=%d gewijzigde bestanden met toevoegingen van %d en %d verwijderingen diff.bin=BIN -diff.view_file=View File +diff.view_file=Bestand weergeven [org] org_name_holder=Organisatienaam @@ -422,7 +428,7 @@ teams.admin_permission_desc=Dit team heeft Beheerders rechten : teams.repositories=Teamrepositories teams.add_team_repository=Nieuwe teamrepositorie aanmaken teams.remove_repo=Verwijder -teams.add_nonexistent_repo=The repository you're trying to add does not exist, please create it first. +teams.add_nonexistent_repo=De opslagplaats die u probeert toe te voegen niet bestaat, kunt u het eerst aanmaken. [admin] dashboard=Dashboard @@ -431,7 +437,7 @@ organizations=Orgranisaties repositories=Repositories authentication=Autenticaties config=Configuratie -notices=System Notices +notices=Systeem aankondigingen monitor=Bijhouden prev=Vorige next=Volgende @@ -450,24 +456,24 @@ dashboard.current_goroutine=Huidige Goroutines dashboard.current_memory_usage=Huidige geheugen gebruik dashboard.total_memory_allocated=Totaal toegewezen geheugen dashboard.memory_obtained=Geheugen gebruikt -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.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_released=Heap Memory Released -dashboard.heap_objects=Heap Objects -dashboard.bootstrap_stack_usage=Bootstrap Stack Usage -dashboard.stack_memory_obtained=Stack Memory Obtained -dashboard.mspan_structures_usage=MSpan Structures Usage -dashboard.mspan_structures_obtained=MSpan Structures Obtained -dashboard.mcache_structures_usage=MCache Structures Usage -dashboard.mcache_structures_obtained=MCache Structures Obtained -dashboard.profiling_bucket_hash_table_obtained=Profiling Bucket Hash Table Obtained -dashboard.gc_metadata_obtained=GC Metadada Obtained -dashboard.other_system_allocation_obtained=Other System Allocation Obtained +dashboard.pointer_lookup_times=Aanwijzer Lookup keer +dashboard.memory_allocate_times=Geheugen toewijzen keer +dashboard.memory_free_times=Geheugen gratis keer +dashboard.current_heap_usage=Huidige Heap gebruik +dashboard.heap_memory_obtained=Heap-geheugen verkregen +dashboard.heap_memory_idle=Heap Memory inactief +dashboard.heap_memory_in_use=Hoop geheugen In gebruik +dashboard.heap_memory_released=Heap-geheugen vrijgegeven +dashboard.heap_objects=Heap-objecten +dashboard.bootstrap_stack_usage=Bootstrap Stack gebruik +dashboard.stack_memory_obtained=Stapel geheugen verkregen +dashboard.mspan_structures_usage=MSpan structuren gebruik +dashboard.mspan_structures_obtained=MSpan structuren verkregen +dashboard.mcache_structures_usage=MCache structuren gebruik +dashboard.mcache_structures_obtained=MCache structuren verkregen +dashboard.profiling_bucket_hash_table_obtained=Profilering emmer hashtabel verkregen +dashboard.gc_metadata_obtained=GC Metadada verkregen +dashboard.other_system_allocation_obtained=Andere systeem toewijzing verkregen dashboard.next_gc_recycle=Volgende GC recycle dashboard.last_gc_time=Sinds vorige GC verwerkingstijd dashboard.total_gc_time=Totaal GC verwerkingstijd @@ -505,7 +511,7 @@ repos.name=Naam repos.private=Prive repos.watches=Volgers repos.stars=Sterren -repos.issues=Issues +repos.issues=Kwesties auths.auth_manage_panel=Autorisatiebeheerpaneel auths.new=Nieuwe autorisatiebron @@ -521,7 +527,7 @@ auths.port=Poort auths.base_dn=Base DN auths.attributes=Zoek attributen auths.filter=Zoek filter -auths.ms_ad_sa=Ms Ad SA +auths.ms_ad_sa=MS Ad SA auths.smtp_auth=SMTP authenticatietype auths.smtphost=SMTP host auths.smtpport=SMTP poort @@ -549,7 +555,7 @@ config.repo_root_path=Repositorie basis pad config.static_file_root_path=Statische bestanden basis pad config.log_file_root_path=Log bestand basis pad config.script_type=Script type -config.reverse_auth_user=Reverse Authentication User +config.reverse_auth_user=Omgekeerde verificatie gebruiker config.db_config=Databaseconfiguratie config.db_type=Type config.db_host=Host @@ -557,16 +563,16 @@ config.db_name=Naam config.db_user=Gebruiker config.db_ssl_mode=SSL modus config.db_ssl_mode_helper=(alleen voor "postgres") -config.db_path=Path +config.db_path=Pad config.db_path_helper=(alleen voor "sqlite3") config.service_config=Serviceconfiguratie -config.register_email_confirm=Register Email Confirmation +config.register_email_confirm=E-mailbevestiging registreren config.disable_register=Registratie uitgeschakeld config.require_sign_in_view=Inloggen vereist om te kunnen inzien config.mail_notify=E-mailnotificaties config.enable_cache_avatar=Avatar Cache inschakelen -config.active_code_lives=Active Code Lives -config.reset_password_code_lives=Reset Password Code Lives +config.active_code_lives=Actieve Code leven +config.reset_password_code_lives=Reset wachtwoord Code leven config.webhook_config=Webhook configuratie config.task_interval=Taakinterval config.deliver_timeout=Bezorging verlooptijd @@ -607,12 +613,12 @@ monitor.desc=Omschrijving monitor.start=Starttijd monitor.execute_time=Uitvoertijd -notices.system_notice_list=System Notices +notices.system_notice_list=Systeem aankondigingen notices.type=Type -notices.type_1=Repository -notices.desc=Description +notices.type_1=Opslagplaats +notices.desc=Beschrijving notices.op=Op. -notices.delete_success=System notice has been successfully deleted. +notices.delete_success=Systeem bericht is met succes verwijderd. [action] create_repo=repositorie aangemaakt in %s @@ -620,8 +626,8 @@ commit_repo=push update naar %s in %s create_issue=opende issue in %s#%s comment_issue=reactie op issue %s#%s transfer_repo=repositorie verplaatst naar %s naar %s -push_tag=pushed tag %s to %s -compare_2_commits=View comparison for these 2 commits +push_tag=geduwd label %s naar %s +compare_2_commits=Weergave vergelijking voor deze 2 commits [tool] ago=geleden diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 9da2063d9..d22be191a 100755 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -26,6 +26,7 @@ organization=组织 mirror=镜像 new_repo=创建新的仓库 new_migrate=迁移外部仓库 +new_fork=创建新的派生仓库 new_org=创建新的组织 manage_org=管理我的组织 admin_panel=管理面板 @@ -74,7 +75,7 @@ confirm_password=确认密码 admin_email=管理员邮箱 install_gogs=立即安装 test_git_failed=无法识别 'git' 命令：%v -sqlite3_not_available=您所使用的发行版不支持 SQLite3，请从 http://gogs.io/docs/installation/install_from_binary.html 下载官方二进制发行版，而不是 gobuild 版本。 //gogs.io/docs/installation/install_from_binary.html, NOT the gobuild version. +sqlite3_not_available=您所使用的发行版不支持 SQLite3，请从 %s 下载官方构建版，而不是 gobuild 版本。 invalid_db_setting=数据库设置不正确：%v invalid_repo_path=仓库根目录设置不正确：%v run_user_not_match=运行系统用户非当前用户：%s -> %s @@ -167,6 +168,8 @@ org_still_own_repo=该组织仍然是某些仓库的拥有者，您必须先转 still_own_user=该授权认证依旧被部分用户使用，请先删除该部分用户后再试！ +target_branch_not_exist=目标分支不存在。 + [user] change_avatar=到 gravatar.com 上修改您的头像 join_on=加入于 @@ -206,7 +209,7 @@ change_password_success=密码修改成功！您现在可以使用新的密码 manage_ssh_keys=管理 SSH 密钥 add_key=增加密钥 ssh_desc=以下是与您帐户所关联的 SSH 密钥，如果您发现有陌生的密钥，请立即删除它！ -ssh_helper=需要帮助？ 请查看有关 如何生成 SSH 密钥 或 常见 SSH 问题 寻找答案。 //help.github.com/articles/generating-ssh-keys">generating SSH keys or troubleshoot common SSH Problems. +ssh_helper=需要帮助？ 请查看有关 如何生成 SSH 密钥 或 常见 SSH 问题 寻找答案。 add_new_key=增加 SSH 密钥 key_name=密钥名称 key_content=密钥内容 @@ -233,6 +236,9 @@ repo_name=仓库名称 repo_name_helper=伟大的仓库名称一般都较短、令人深刻并且 独一无二 的。 visibility=可见性 visiblity_helper=本仓库将是 私有的 +fork_repo=派生仓库 +fork_from=派生自 +fork_visiblity_helper=派生仓库无法修改可见性 repo_desc=仓库描述 repo_lang=仓库语言 repo_lang_helper=请选择 .gitignore 文件 @@ -253,7 +259,7 @@ migrate_repo=迁移仓库 copy_link=复制链接 click_to_copy=复制到剪切板 copied=复制成功 -clone_helper=不知道如何操作？访问 此处 查看帮助！ //git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository">Help! +clone_helper=不知道如何操作？访问 此处 查看帮助！ unwatch=取消关注 watch=关注 unstar=取消点赞 @@ -315,14 +321,14 @@ settings.add_collaborator_success=成功添加新的协作者！ settings.remove_collaborator_success=被操作的协作者已经被收回权限！ settings.user_is_org_member=被操作的用户是组织成员，因此无法添加为协作者！ settings.add_webhook=添加 Web 钩子 -settings.hooks_desc=Web 钩子允许您设定在 Gogs 上发生指定事件时对指定 URL 发送 POST 通知。查看 Webhooks 文档 获取更多信息。 //gogs.io/docs/features/webhook.html">Webhooks Guide. +settings.hooks_desc=Web 钩子允许您设定在 Gogs 上发生指定事件时对指定 URL 发送 POST 通知。查看 Webhooks 文档 获取更多信息。 settings.githooks_desc=Git 钩子是由 Git 本身提供的功能，以下为 Gogs 所支持的钩子列表。 settings.githook_edit_desc=如果钩子未启动，则会显示样例文件中的内容。如果想要删除某个钩子，则提交空白文本即可。 settings.githook_name=钩子名称 settings.githook_content=钩子文本 settings.update_githook=更新钩子设置 settings.remove_hook_success=Web 钩子删除成功！ -settings.add_webhook_desc=我们会通过 POST 请求将订阅事件信息发送至向指定 URL 地址。您可以设置不同的数据接收方式（JSON 或 x-www-form-urlencoded）。 请查阅 Webhooks 文档 获取更多信息。 //gogs.io/docs/features/webhook.html">Webhooks Guide. +settings.add_webhook_desc=我们会通过 POST 请求将订阅事件信息发送至向指定 URL 地址。您可以设置不同的数据接收方式（JSON 或 x-www-form-urlencoded）。 请查阅 Webhooks 文档 获取更多信息。 settings.payload_url=推送地址 settings.content_type=数据格式 settings.secret=密钥文本 @@ -336,7 +342,7 @@ settings.update_hook_success=Web 钩子更新成功！ settings.delete_webhook=删除 Web 钩子 settings.recent_deliveries=最近推送记录 settings.hook_type=钩子类型 -settings.add_slack_hook_desc=为您的仓库增加 Slack 集成 //slack.com">Slack integration to your repository. +settings.add_slack_hook_desc=为您的仓库增加 Slack 集成。 settings.slack_token=令牌 settings.slack_domain=域名 settings.slack_channel=频道 diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini index a7ab14c8a..8cd2c50f0 100755 --- a/conf/locale/locale_zh-HK.ini +++ b/conf/locale/locale_zh-HK.ini @@ -26,6 +26,7 @@ organization=組織 mirror=鏡像 new_repo=創建新的倉庫 new_migrate=遷移外部倉庫 +new_fork=新的派生倉庫 new_org=創建新的組織 manage_org=管理我的組織 admin_panel=管理面版 @@ -74,7 +75,7 @@ confirm_password=確認密碼 admin_email=管理員郵箱 install_gogs=立即安裝 test_git_failed=無法識別 'git' 命令：%v -sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 http: //gogs.io/docs/installation/install_from_binary.html, NOT the gobuild version. +sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s 下載官方構建版，而不是 gobuild 版本。 invalid_db_setting=數據庫設置不正確：%v invalid_repo_path=倉庫根目錄設置不正確：%v run_user_not_match=執行系統用戶非當前用戶：%s -> %s @@ -167,6 +168,8 @@ org_still_own_repo=該組織仍然是某些倉庫的擁有者，您必須先轉 still_own_user=該授權認證依舊被部分用戶使用，請先刪除該部分用戶後再試！ +target_branch_not_exist=目標分支不存在 + [user] change_avatar=到 gravatar.com 上修改您的頭像 join_on=加入於 @@ -206,7 +209,7 @@ change_password_success=密碼修改成功！您現在可以使用新的密碼 manage_ssh_keys=管理 SSH 密鑰 add_key=增加密鑰 ssh_desc=以下是與您帳戶所關聯的 SSH 密鑰，如果您發現有陌生的密鑰，請立即刪除它！ -ssh_helper=需要幫助？ 請查看有關 generating SSH keys or troubleshoot common SSH Problems. +ssh_helper=需要幫助嗎? 請查看有關 如何生成 SSH 密鑰 的指南或 SSH 的常見問題 的疑難排解。 add_new_key=增加 SSH 密鑰 key_name=密鑰名稱 key_content=密鑰內容 @@ -233,6 +236,9 @@ repo_name=倉庫名稱 repo_name_helper=偉大的倉庫名稱一般都較短、令人深刻並且 獨一無二 的。 visibility=可見度 visiblity_helper=本倉庫將是 私有的 +fork_repo=派生倉庫 +fork_from=派生自 +fork_visiblity_helper=派生倉庫無法修改可見性。 repo_desc=倉庫描述 repo_lang=倉庫語言 repo_lang_helper=請選擇 .gitignore 文件 @@ -253,7 +259,7 @@ migrate_repo=遷移倉庫 copy_link=復製連結 click_to_copy=復製到剪切簿 copied=復製成功 -clone_helper=不知道如何操作？訪問 Help! +clone_helper=不知道如何操作？訪問 帮助説明 ！ unwatch=取消關註 watch=關註 unstar=取消讚好 @@ -315,14 +321,14 @@ settings.add_collaborator_success=成功添加新的協作者！ settings.remove_collaborator_success=被操作的協作者已經被收回權限！ settings.user_is_org_member=被操作的用戶是組織成員，因此無法添加為協作者！ settings.add_webhook=添加 Web 鉤子 -settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 Webhooks Guide. +settings.hooks_desc=Web 鉤子允許您設定在 Gogs 上發生指定事件時對指定 URL 發送 POST 通知。查看 Webhooks 文檔 獲取更多信息。 settings.githooks_desc=Git 鉤子是由 Git 本身提供的功能，以下為 Gogs 所支持的鉤子列表。 settings.githook_edit_desc=如果鉤子未啟動，則會顯示樣例文件中的內容。如果想要刪除某個鉤子，則提交空白文本即可。 settings.githook_name=鉤子名稱 settings.githook_content=鉤子文本 settings.update_githook=更新鉤子設置 settings.remove_hook_success=Web 鉤子刪除成功！ -settings.add_webhook_desc=我們會通過 POST 請求將訂閱事件信息發送至向指定 URL 地址。您可以設置不同的數據接收方式（JSON 或 x-www-form-urlencoded）。 請查閱 Webhooks Guide. +settings.add_webhook_desc=我們會通過 POST 請求將訂閱事件信息發送至向指定 URL 地址。您可以設置不同的數據接收方式（JSON 或 x-www-form-urlencoded）。 請查閱 Webhooks 指南. settings.payload_url=推送地址 settings.content_type=數據格式 settings.secret=密鑰文本 @@ -336,7 +342,7 @@ settings.update_hook_success=Web 鉤子更新成功！ settings.delete_webhook=刪除 Web 鉤子 settings.recent_deliveries=最近推送記錄 settings.hook_type=鉤子類型 -settings.add_slack_hook_desc=為您的倉庫增加 Slack integration to your repository. +settings.add_slack_hook_desc=為您的倉庫增加 Slack 集成。 settings.slack_token=令牌 settings.slack_domain=域名 settings.slack_channel=頻道 diff --git a/gogs.go b/gogs.go index a8e1ea1b6..bbf90fc56 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.7.1107 Beta" +const APP_VER = "0.5.7.1110 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 95e647f53..b9266d689 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -14,6 +14,7 @@ import ( "github.com/macaron-contrib/session" "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/setting" ) @@ -24,20 +25,6 @@ func SignedInId(header http.Header, sess session.Store) int64 { return 0 } - if setting.Service.EnableReverseProxyAuth { - webAuthUser := header.Get(setting.ReverseProxyAuthUser) - if len(webAuthUser) > 0 { - u, err := models.GetUserByName(webAuthUser) - if err != nil { - if err != models.ErrUserNotExist { - log.Error(4, "GetUserByName: %v", err) - } - return 0 - } - return u.Id - } - } - uid := sess.Get("uid") if uid == nil { return 0 @@ -56,8 +43,46 @@ func SignedInId(header http.Header, sess session.Store) int64 { // SignedInUser returns the user object of signed user. func SignedInUser(header http.Header, sess session.Store) *models.User { + if !models.HasEngine { + return nil + } + uid := SignedInId(header, sess) + if uid <= 0 { + if setting.Service.EnableReverseProxyAuth { + webAuthUser := header.Get(setting.ReverseProxyAuthUser) + if len(webAuthUser) > 0 { + u, err := models.GetUserByName(webAuthUser) + if err != nil { + if err != models.ErrUserNotExist { + log.Error(4, "GetUserByName: %v", err) + } + return nil + } + return u + } + } + + // Check with basic auth. + baHead := header.Get("Authorization") + if len(baHead) > 0 { + auths := strings.Fields(baHead) + if len(auths) == 2 && auths[0] == "Basic" { + uname, passwd, _ := base.BasicAuthDecode(auths[1]) + u, err := models.GetUserByName(uname) + if err != nil { + if err != models.ErrUserNotExist { + log.Error(4, "GetUserByName: %v", err) + } + return nil + } + + if u.ValidtePassword(passwd) { + return u + } + } + } return nil } diff --git a/modules/middleware/context.go b/modules/middleware/context.go index 7d767b9e7..58b4f7497 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -174,26 +174,6 @@ func Contexter() macaron.Handler { // Get user from session if logined. ctx.User = auth.SignedInUser(ctx.Req.Header, ctx.Session) - // Check with basic auth again. - if ctx.User == nil { - baHead := ctx.Req.Header.Get("Authorization") - auths := strings.Fields(baHead) - if len(auths) == 2 && auths[0] == "Basic" { - uname, passwd, _ := base.BasicAuthDecode(auths[1]) - u, err := models.GetUserByName(uname) - if err != nil { - if err != models.ErrUserNotExist { - ctx.Handle(500, "GetUserByName", err) - return - } - } else { - if u.ValidtePassword(passwd) { - ctx.User = u - } - } - } - } - if ctx.User != nil { ctx.IsSigned = true ctx.Data["IsSigned"] = ctx.IsSigned diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index df881a839..b59b915d4 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -1052,9 +1052,9 @@ The register and sign-in page style } #repo-header-download-drop { line-height: 24px; - width: 440px; + width: 460px; top: 50px; - left: -370px; + left: -390px; padding: 20px; box-sizing: border-box; z-index: 1; @@ -1066,6 +1066,9 @@ The register and sign-in page style #repo-header-download-drop input { font-size: 11px; } +#repo-clone { + width: inherit; +} #repo-content { padding: 18px 0; } diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less index dc8a4804d..0663a12b5 100644 --- a/public/ng/less/gogs/repository.less +++ b/public/ng/less/gogs/repository.less @@ -72,9 +72,9 @@ } #repo-header-download-drop { line-height: 24px; - width: 440px; + width: 460px; top: 50px; - left: -370px; + left: -390px; padding: 20px; box-sizing: border-box; z-index: 1; @@ -85,6 +85,9 @@ font-size: 11px; } } +#repo-clone { + width: inherit; +} #repo-content { padding: 18px 0; } diff --git a/routers/install.go b/routers/install.go index eff66e84b..408ca108f 100644 --- a/routers/install.go +++ b/routers/install.go @@ -165,9 +165,9 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) { // Set test engine. var x *xorm.Engine if err := models.NewTestEngine(x); err != nil { - // NOTE: should use core.QueryDriver (github.com/go-xorm/core) + // FIXME: should use core.QueryDriver (github.com/go-xorm/core) if strings.Contains(err.Error(), `Unknown database type: sqlite3`) { - ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available"), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available", "http://gogs.io/docs/installation/install_from_binary.html"), INSTALL, &form) } else { ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), INSTALL, &form) } diff --git a/templates/.VERSION b/templates/.VERSION index 172a31fa2..c11f99413 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.7.1107 Beta \ No newline at end of file +0.5.7.1110 Beta \ No newline at end of file diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 2344311d6..96f55eedd 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -22,7 +22,7 @@ -

{{$.i18n.Tr "repo.clone_helper" | Str2html}}

+

{{$.i18n.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository" | Str2html}}

ZIP diff --git a/templates/repo/settings/hook_gogs.tmpl b/templates/repo/settings/hook_gogs.tmpl index 31a04ce09..39e612b9f 100644 --- a/templates/repo/settings/hook_gogs.tmpl +++ b/templates/repo/settings/hook_gogs.tmpl @@ -2,7 +2,7 @@
{{.CsrfTokenHtml}} -
{{.i18n.Tr "repo.settings.add_webhook_desc" | Str2html}}
+
{{.i18n.Tr "repo.settings.add_webhook_desc" "http://gogs.io/docs/features/webhook.html" | Str2html}}
diff --git a/templates/repo/settings/hook_slack.tmpl b/templates/repo/settings/hook_slack.tmpl index 08d86180e..bc307ec85 100644 --- a/templates/repo/settings/hook_slack.tmpl +++ b/templates/repo/settings/hook_slack.tmpl @@ -2,7 +2,7 @@ {{.CsrfTokenHtml}} -
{{.i18n.Tr "repo.settings.add_slack_hook_desc" | Str2html}}
+
{{.i18n.Tr "repo.settings.add_slack_hook_desc" "http://slack.com" | Str2html}}
diff --git a/templates/repo/settings/hooks.tmpl b/templates/repo/settings/hooks.tmpl index 6efd8f0a6..6fcedab7d 100644 --- a/templates/repo/settings/hooks.tmpl +++ b/templates/repo/settings/hooks.tmpl @@ -15,7 +15,7 @@ {{.i18n.Tr "repo.settings.hooks"}}
    -
  • {{.i18n.Tr "repo.settings.hooks_desc" | Str2html}}
    • +
  • {{.i18n.Tr "repo.settings.hooks_desc" "http://gogs.io/docs/features/webhook.html" | Str2html}}
    • {{range .Webhooks}}
  • {{if .IsActive}} diff --git a/templates/user/settings/sshkeys.tmpl b/templates/user/settings/sshkeys.tmpl index 188f078a2..7b1dec5f7 100644 --- a/templates/user/settings/sshkeys.tmpl +++ b/templates/user/settings/sshkeys.tmpl @@ -33,7 +33,7 @@ {{end}}
-

{{.i18n.Tr "settings.ssh_helper" | Str2html}}

+

{{.i18n.Tr "settings.ssh_helper" "https://help.github.com/articles/generating-ssh-keys" "https://help.github.com/ssh-issues/" | Str2html}}


{{.CsrfTokenHtml}}