Merge remote-tracking branch 'upstream/master'

Conflicts:
	conf/app.ini

conf/app.ini

@@ -1,6 +1,5 @@
 ; App name that shows on every page title
 APP_NAME = Gogs: Go Git Service
-APP_LOGO = img/favicon.png
 ; Change it if you run locally
 RUN_USER = git
 ; Either "dev", "prod" or "test", default is "dev"
@@ -22,14 +21,14 @@ OFFLINE_MODE = false
 DISABLE_ROUTER_LOG = false
 ; Generate steps:
 ; $ cd path/to/gogs/custom/https
-; $ go run $GOROOT/src/pkg/crypto/tls/generate_cert.go -ca=true -duration=8760h0m0s -host=myhost.example.com
+; $ ./gogs cert -ca=true -duration=8760h0m0s -host=myhost.example.com
 CERT_FILE = custom/https/cert.pem
 KEY_FILE = custom/https/key.pem
 ; Upper level of template and static file path
 ; default is the path where Gogs is executed
 STATIC_ROOT_PATH =
 ; Application level GZIP support
-ENABLE_GZIP = false
+#ENABLE_GZIP = false
 
 [database]
 ; Either "mysql", "postgres" or "sqlite3", it's your choice
@@ -253,6 +252,9 @@ DRIVER =
 ; Based on xorm, e.g.: root:root@localhost/gogs?charset=utf8
 CONN =
 
+[git]
+MAX_GITDIFF_LINES = 10000
+
 [i18n]
-LANGS = en-US,zh-CN,de-DE,nl-NL
-NAMES = English,简体中文,Deutsch,Nederlands
+LANGS = en-US,zh-CN,de-DE,fr-CA,nl-NL
+NAMES = English,简体中文,Deutsch,Français,Nederlands

conf/locale/locale_de-DE.ini

@@ -1,4 +1,4 @@
-app_desc = Ein schmerzloses selbst gehostetes Git-Service welches in Go geschrieben wurde
+app_desc = Ein einfacher, selbst gehosteter Git-Service, geschrieben in Go.
 
 home = Home
 dashboard = Dashboard
@@ -12,23 +12,23 @@ register = Registrieren
 website = Webseite
 version = Version
 page = Seite
-template = Template
+template = Vorlage
 language = Sprache
 
 username = Benutzername
-email = E-mail
-password = Kennwort
-re_type = neu tippen
+email = E-Mail
+password = Passwort
+re_type = wiederholen
 captcha = Captcha
 
-repository = Repositorie
+repository = Repository
 organization = Organisation
 mirror = Spiegel
 new_repo = Neues Repository
 new_migrate = Neue Migration
 new_org = Neue Organisation
 manage_org = Organisationen verwalten
-admin_panel = Admin Panel
+admin_panel = Admin-Panel
 account_settings = Kontoeinstellungen
 settings = Einstellungen
 
@@ -38,214 +38,276 @@ issues = Issues
 
 cancel = Abbrechen
 
+[install]
+install = Installation
+title = Installation für erstmaligen Start
+requite_db_desc = Gogs erfordert MySQL, PostgreSQL oder SQLite 3, aber SQLite3 ist in der offiziellen binären Version akiviert.
+db_type = Datenbanktyp
+host = Host
+user = Benutzer
+password = Passwort
+db_name = Datenbankname
+db_helper = Bitte verwenden InnoDB-Engine mit utf8_general_ci Zeichensatz für MySQL.
+ssl_mode = SSL-Modus
+path = Pfad
+sqlite_helper = Der Dateipfad des SQLite3 Datenbank.
+general_title = Allgemeine Einstellungen von Gogs
+repo_path = Repository Root-Verzeichnispfad
+repo_path_helper = Alle Git-Repositorys werden in diesem Verzeichnis gespeichert.
+run_user = Ausführender Benutzer
+run_user_helper = Der Benutzer muss die Zugriffsberechtigung für das Repository Root-Verzeichnis haben und der ausführende Benutzer von Gogs sein.
+domain = Domain
+domain_helper = Dies hat Auswirkung auf die SSH clone URLs.
+app_url = Anwendungs-URL
+app_url_helper = Dies hat Auswirkung auf die HTTP/HTTPS clone URLs und für die E-Mails.
+email_title = E-Mail-Service-Einstellungen(Optional)
+smtp_host = SMTP Host
+mailer_user = Sender E-mail
+mailer_password = Sender Passwort
+notify_title = Benachrichtigungseinstellungen(Optional)
+register_confirm = Registrierungsbestätigung aktvieren
+mail_notify = E-Mail-Benachrichtgung aktivieren
+admin_title = Konto-Einstellungen für den Administrator
+admin_name = Benutzername
+admin_password = Passwort
+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, 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
+save_config_failed = Versuche die Konfiguration zu speichern ist fehlgeschlagen: %v
+invalid_admin_setting = Admin-Konto Einstellungen sind ungültig: %v
+install_success = Herzlich Willkommen! Wir sind froh, dass du dich für Gogs entschieden hast. Hab viel Vergnügen damit.
+
 [home]
-uname_holder = Benutzername oder E-mail
-password_holder = Kennwort
+uname_holder = Benutzername oder E-Mail
+password_holder = Passwort
 switch_dashboard_context = Switch Dashboard Context
-my_repos = Meine Repositories
-collaborative_repos = Collaborative Repositories
+my_repos = Meine Repositorys
+collaborative_repos = Gemeinschaftliche Repositorys
 my_orgs = Meine Organisationen
 my_mirrors = Meine Spiegel
 
+[explore]
+repos = Repositories
+
 [auth]
 create_new_account = Neues Konto erstellen
-register_hepler_msg = Sie haben bereits ein Konto? Jetzt anmelden!
-social_register_hepler_msg = Sie haben bereits ein Konto? Verknüpfe es jetzt!
-disable_register_prompt = Es tut uns leid, die Registrierung wurde deaktiviert. Bitte wende Sie sich an den Administrator.
-disable_register_mail = Es tut uns leid, die Registrierung E-Mail Bestätigung wurde deaktiviert.
-remember_me = Erinnere mich
-forgot_password= Kennwort vergessen
-forget_password = Kennwort vergessen?
-sign_up_now = Benötigen Sie ein Konto? Registrieren Sie sich jetzt.
-confirmation_mail_sent_prompt = A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete your registration.
-sign_in_email = Melden Sie sich mit Ihrer E-Mailadresse an
-active_your_account = Aktivieren Sie Ihr Konto
-resent_limit_prompt = Sorry, you are sending an activation e-mail too frequently. Please wait 3 minutes.
-has_unconfirmed_mail = Hi %s, you have an unconfirmed email address(<b>%s</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.
-resend_mail = Klicken Sie hier, um Ihre Aktivierungs-E-Mail erneut senden
-email_not_associate = Diese E-Mail-Adresse ist mit keinen Konto verknüpft.
-send_reset_mail = Klicken Sie hier, um sich das E-Mail zum Kennwort zurücksetzen erneut zu senden
-reset_password = Ihr Kennwort zurücksetzen
-invalid_code = Es tut uns leid, Ihre Bestätigungscode abgelaufen ist oder nicht gültig.
-reset_password_helper = Klicken Sie hier, um Ihr Kennwort zurückzusetzen
-password_too_short = Passwortlänge kann nicht weniger als 6 sein.
+register_hepler_msg = Du hast schon ein Konto? Jetzt anmelden!
+social_register_hepler_msg = Du hast schon ein soziales Konto? Jetzt verknüpfen!
+disable_register_prompt = Es tut uns leid, die Registrierung wurde deaktiviert. Bitte wende dich an den Administrator.
+disable_register_mail = Es tut uns leid, die Bestätigung der Registrierungs-E-Mail wurde deaktiviert.
+remember_me = angemeldet bleiben
+forgot_password= Passwort vergessen
+forget_password = Passwort vergessen?
+sign_up_now = Du willst ein Konto? Jetzt registrieren!
+confirmation_mail_sent_prompt = Eine neu Bestätigungs-E-Mail wurde an <b>%s</b> gesendet. Kontrolliere dein Postfach innerhalb der nächsten %d Stunden um die Registrierung abzuschließen.
+sign_in_email = Melden dich mit deiner E-Mail-Adresse an
+active_your_account = Aktivieren dein Konto
+resent_limit_prompt = Es tut uns leid, du sendest zu häufig Aktivierungs-E-Mails. Bitte warte 3 Minuten.
+has_unconfirmed_mail = Hallo %s, du hast eine unbestätigte E-Mail-Adresse (<b>%s</b>). Falls du noch keine Bestätigungs-E-Mail erhalten hast oder eine neue senden musst, klicke auf den unteren Button.
+resend_mail = Hier klicken, um deine Aktivierungs-E-Mail erneut zu versenden
+email_not_associate = Diese E-Mail-Adresse ist mit keinem Konto verknüpft.
+send_reset_mail = Hier klicken, um die E-Mail zum Passwort-zurücksetzen erneut zu versenden
+reset_password = Passwort zurücksetzen
+invalid_code = Es tut uns leid, der Bestätigungscode ist abgelaufen oder ungültig.
+reset_password_helper = Hier klicken, um das Passwort zurückzusetzen
+password_too_short = Das Passwort muss mindenstens 6 Zeichen lang sein
 
 [form]
 UserName = Benutzername
-RepoName = Repository Name
+RepoName = Repository-Name
 Email = E-Mail-Adresse
-Password = Kennwort
-Retype = Kennwort erneut eingeben
-SSHTitle = SSH Schlüsselname
-HttpsUrl = HTTPS URL
-PayloadUrl = Payload URL
+Password = Passwort
+Retype = Passwort erneut eingeben
+SSHTitle = SSH-Schlüsselname
+HttpsUrl = HTTPS-URL
+PayloadUrl = Payload-URL
 TeamName = Teamname
 AuthName = Authentifizierungsname
+AdminEmail = Admin E-mail
 
 require_error = ` darf nicht leer sein.`
-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.`
+alpha_dash_error = ` kann ausschließlich alphanumerische Zeichen und "-_" enthalten.`
+alpha_dash_dot_error = ` kann ausschließlich alphanumerische Zeichen und ".-_" enthalten.`
 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.`
 url_error = ` ist keine gültige URL.`
 unknown_error = Unbekannter Fehler:
 captcha_incorrect = Captcha stimmt nicht überein.
-password_not_match = Die Kennwörter stimmen nicht überein.
+password_not_match = Die Passwörter stimmen nicht überein.
 
 username_been_taken = Benutzername ist bereits vergeben.
-repo_name_been_taken = Repository Name ist bereits vergeben.
+repo_name_been_taken = Repository-Name ist bereits vergeben.
 org_name_been_taken = Organisationsname ist bereits vergeben.
 team_name_been_taken = Teamname ist bereits vergeben.
-email_been_used = E-Mail-Adresse ist bereits vergeben.
-ssh_key_been_used = Public-Key Name wird bereits verwendet.
-illegal_username = Ihr Benutzername enthält ungültige Zeichen.
-illegal_repo_name = Repository Name enthält ungültige Zeichen.
+email_been_used = E-Mail-Adresse wird bereits verwendet.
+ssh_key_been_used = SSH-Schlüsselname wird bereits verwendet.
+illegal_username = Benutzername enthält ungültige Zeichen.
+illegal_repo_name = Repository-Name enthält ungültige Zeichen.
 illegal_org_name = Organisationsname enthält ungültige Zeichen.
 illegal_team_name = Teamname enthält ungültige Zeichen.
-username_password_incorrect = Benutzername oder Kennwort ist nicht korrekt.
-enterred_invalid_repo_name = Bitte stellen Sie sicher, dass der eingegeben Repository Name richtig ist.
-enterred_invalid_owner_name = Bitte stellen Sie sicher, dass der eingegeben Eigentümername richtig ist.
-enterred_invalid_password = Bitte stellen Sie sicher, dass das eingegebene Passwort richtig ist.
+username_password_incorrect = Benutzername oder Passwort ist nicht korrekt.
+enterred_invalid_repo_name = Bitte stelle sicher, dass der eingegeben Repository-Name richtig ist.
+enterred_invalid_owner_name = Bitte stelle sicher, dass der eingegeben Besitzername richtig ist.
+enterred_invalid_password = Bitte stelle sicher, dass das eingegebene Passwort richtig ist.
 user_not_exist = Angegebener Benutzer existiert nicht.
-last_org_owner = The user to remove is the last member in owner team. There must be another owner.
+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, Ihren SSH-Schlüssel zu überprüfen: %s
 auth_failed = Authentifizierung fehlgeschlagen: %v
 
-still_own_repo = Your account still have ownership of repository, you have to delete or transfer them first.
-org_still_own_repo = This organization still have ownership of repository, you have to delete or transfer them first.
+still_own_repo = Dein Konto besitzt noch Repositorys. Diese müssen zuerst gelöscht oder übertragen werden.
+org_still_own_repo = Diese Organisation besitzt noch Repositorys. Diese müssen zuerst gelöscht oder übertragen werden.
 
-still_own_user = This authentication still has used by some users, you should move them and then delete again.
+still_own_user = Diese Authentifizierung wird noch von einigen Benutzern genutzt. Entferne diese zuvor und lösche erneut.
 
 [settings]
 profile = Profil
-password = Kennwort
+password = Passwort
 ssh_keys = SSH-Schlüssel
-social = Social Konten
+social = Soziale Konten
 orgs = Organisationen
-delete = Delete Accoount
+delete = Konto löschen
+uid = Uid
 
 public_profile = Öffentliches Profil
-profile_desc = Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.
+profile_desc = Deine E-Mail-Adresse ist öffentlich und dient dazu, dir Benachrichtigungen bezüglich deines Kontos und deiner Repositorys zu schicken.
 full_name = Vollständiger Name
-website = Website
+website = Webseite
 location = Standort
 update_profile = Profil aktualisieren
-update_profile_success = Your profile has been successfully updated.
+update_profile_success = Profil aktualisiert
 
-change_password = Kennwort ändern
-old_password = Aktuelles Kennwort
-new_password = Neues Kennwort
-password_incorrect = Aktuelles Kennwort ist nicht korrekt.
-change_password_success = Kennwort erfolgreich geändert. Sie können nun mittels des neuen Kennwortes anmelden.
+change_password = Passwort ändern
+old_password = Aktuelles Passwort
+new_password = Neues Passwort
+password_incorrect = Aktuelles Passwort ist nicht korrekt.
+change_password_success = Passwort geändert. Du kannst dich jetzt mit dem neuen Passwort anmelden.
 
 manage_ssh_keys = SSH-Schlüssel verwalten
-add_key = Schlüssel hinzufügen
-ssh_desc = This is a list of SSH keys associated with your account. Remove any keys that you do not recognize.
-ssh_helper = <strong>Need help?</strong> Check out our guide to <a href="https://help.github.com/articles/generating-ssh-keys">generating SSH keys</a> or troubleshoot <a href="https://help.github.com/ssh-issues/">common SSH Problems</a>.
+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 = <strong>Du brauchst Hilfe?</strong> Hier ist eine Anleitung zum <a href="https://help.github.com/articles/generating-ssh-keys">Erzeugen von SSH-Schlüsseln</a> oder <a href="https://help.github.com/ssh-issues/">Problemlösen einfacher SSH-Probleme</a>.
 add_new_key = SSH-Schlüssel hinzufügen
 key_name = Schlüsselname
 key_content = Inhalt
-add_key_success = New SSH Key has been added!
-delete_key = löschen
+add_key_success = SSH-Schlüssel hinzugefügt
+delete_key = SSH-Schlüssel löschen
 add_on = Hinzugefügt am
 last_used = Zuletzt verwendet auf
 no_activity = Keine neuen Aktivitäten
 
-manage_social = Manage Associated Social Accounts
-social_desc = This is a list of associated social accounts. Remove any binding that you do not recognize.
+manage_social = Verknüpfte soziale Konten verwalten
+social_desc = Dies ist eine Liste verknüpfter sozialer Konten. Entferne alle Verknüpfungen, die du nicht kennst.
 unbind = Verknüpfung entfernen
-unbind_success = Die Verknüpfung zum Social Konto wurde entfernt.
+unbind_success = Die Verknüpfung zum sozialen Konto wurde entfernt.
 
-delete_account = Löschen Sie Ihr Konto
-delete_prompt = Die Operation wird Ihr Konto dauerhaft löschen und kann <strong>NICHT</strong> rückgängig gemacht werden!
-confirm_delete_account = Löschung bestätigen
+delete_account = Konto löschen
+delete_prompt = Diese Aktion wird dein Konto dauerhaft löschen und kann <strong>NICHT</strong> rückgängig gemacht werden!
+confirm_delete_account = Löschen
 
 [repo]
-owner = Eigentümer
-repo_name = Repositorie Name
-repo_name_helper = Tolle Repositorienamen sind kurz, einprägsam und <strong>einzigartig</strong>.
+owner = Besitzer
+repo_name = Repository-Name
+repo_name_helper = Gute Repository-Namen sind kurz, einprägsam und <strong>einzigartig</strong>.
 visibility = Sichtbarkeit
-visiblity_helper = Dieses Repositorie ist <span class="label label-red label-radius">Privat</span>
+visiblity_helper = Dieses Repository ist <span class="label label-red label-radius">Privat</span>
 repo_desc = Beschreibung
 repo_lang = Sprache
-repo_lang_helper = Wählen Sie eine .gitignore Datei
+repo_lang_helper = Wähle eine .gitignore Datei
 license = Lizenz
-license_helper = Wählen Sie eine Lizenzdatei aus
-init_readme = Initialisieren dieses Repository mit einem README.md
+license_helper = Wähle eine Lizenz aus
+init_readme = Repository mit README.md initialisieren
 create_repo = Repository erstellen
-default_branch = Default Branch
-mirror_interval = Mirror Intervall(Stunden)
+default_branch = Standard-Branch
+mirror_interval = Spiegel-Intervall (in Stunden)
 goget_meta = Go-Get Meta
-goget_meta_helper = This repository will be <span class="label label-blue label-radius">Go-Getable</span>
+goget_meta_helper = Dieses Repository wird man mit <span class="label label-blue label-radius">go get</span> klonen können.
 
-need_auth = Berechtigung erforderlich
+need_auth = Authorisierung benötigt
 migrate_type = Migrationstyp
-migrate_type_helper = Dieses Repository wird ein <span class="label label-blue label-radius">Mirror</span>
-migrate_repo = Repositorie migrieren
+migrate_type_helper = Dieses Repository wird ein <span class="label label-blue label-radius">Spiegel</span>
+migrate_repo = Repository migrieren
 
-clone_helper = Need help cloning? Visit <a target="_blank" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository">Help</a>!
+copy_link = Klonen
+clone_helper = Du brauchst Hilfe beim Klonen? Hier gibt es <a target="_blank" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository">Hilfe</a>!
 unwatch = Beobachtung beenden
 watch = Beobachtung
 unstar = Markierung aufheben
 star = Markierung
 fork = Abspaltung
 
+quick_guide = Kurzanleitung
+clone_this_repo = Dieses Repository klonen
+create_new_repo_command = Erstelle ein neues Repository mittels der Kommandozeile
+push_exist_repo = Übertrage ein existierendes Repository von der Kommandozeile
+
 settings = Einstellungen
 settings.options = Optionen
 settings.collaboration = Zusammenarbeit
 settings.hooks = Webhooks
-settings.deploy_keys = Schlüssel bereitstellen
+settings.deploy_keys = Deploy-Keys
 settings.basic_settings = Grundeinstellungen
-settings.danger_zone = Danger Zone
-settings.site = Offizielle Website
+settings.danger_zone = Gefahrenzone
+settings.site = Offizielle Webseite
 settings.update_settings = Aktualisierungseinstellungen
-settings.transfer = Eigentum übertragen
-settings.transfer_desc = Transfer this repo to another user or to an organization where you have admin rights.
-settings.delete = Dieses Repository löschen
-settings.delete_desc = Sobald Sie ein Repository löschen, gibt es keinen Weg zurück. Bitte seien Sie sicher.
-settings.update_settings_success = Repository Optionen wurde erfolgreich aktualisiert.
+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öschet ist, gibt es keinen Weg zurück. Sei dir sicher!
+settings.update_settings_success = Repository-Optionen aktualisiert
 settings.transfer_owner = Neuer Besitzer
-settings.make_transfer = Make Transfer
-settings.confirm_delete = Löschung bestätigen
-settings.add_collaborator = Neuer Mitarbeiter hinzufügen
-settings.add_collaborator_success = Neuer Mitarbeiter wurde hinzugefügt.
-settings.remove_collaborator_success = Mitarbeiter wurde entfernt.
+settings.make_transfer = übertragen
+settings.transfer_succeed = Repository-Eigentum wurde erfolgreich übertragen.
+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.add_webhook = Webhook hinzufügen
-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 <a target="_blank" href="http://gogs.io/docs/features/webhook.html">Webhooks Guide</a>.
-settings.remove_hook_success = Webhook wurde entfernt.
-settings.add_webhook_desc = We’ll send a <code>POST</code> request to the URL below with details of any subscribed events. You can also specify which data format you'd like to receive (JSON, <code>x-www-form-urlencoded</code>, <em>etc</em>). More information can be found in <a target="_blank" href="http://gogs.io/docs/features/webhook.html">Webhooks Guide</a>.
-settings.payload_url = Payload URL
+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 <a target="_blank" href="http://gogs.io/docs/features/webhook.html">Webhooks Guide</a>.
+settings.remove_hook_success = Webhook entfernt
+settings.add_webhook_desc = GoGS sendet einen <code>POST</code>-Request an die unten stehende URL mit Details aller abonierten Ereignisse. Du kannst auch angeben, welches Datenformat du erhalten willst (JSON, <code>x-www-form-urlencoded</code>, <em>etc</em>). Mehr Informationen findest du im <a target="_blank" href="http://gogs.io/docs/features/webhook.html">Webhooks Guide</a>.
+settings.payload_url = Payload-URL
 settings.content_type = Inhaltstyp
-settings.secret = Geheimnis
-settings.event_desc = Durch welche Ereignisse würden Sie gerne diesen Webhook auslösen?
-settings.event_push_only = Just the <code>push</code> event.
+settings.secret = Secret
+settings.event_desc = Welche Ereignisse sollen diesen Webhook auslösen?
+settings.event_push_only = Nur das <code>push</code>-Ereignis.
 settings.active = Aktiv
-settings.active_helper = We will deliver event details when this hook is triggered.
-settings.add_hook_success = Neuer Webhook wurde hinzugefügt.
+settings.active_helper = Ereignisdetails werden ausgeliefert, wenn dieser Webhook ausgelöst wird.
+settings.add_hook_success = Webhook hinzugefügt
 settings.update_webhook = Webhook aktualisieren
-settings.update_hook_success = Webhook wurde aktualisiert.
+settings.update_hook_success = Webhook aktualisiert
 settings.delete_webhook = Webhook löschen
-settings.recent_deliveries = Jüngste Zustellungen
+settings.recent_deliveries = letzte Zustellungen
+settings.hook_type = Hook Type
+settings.add_slack_hook_desc = Add <a href="http://slack.com">Slack</a> integration to your repository.
+settings.slack_token = Token
+settings.slack_domain = Domain
+settings.slack_channel = Channel
 
 [org]
 org_name_holder = Name der Organisation
-org_name_helper = Namen großer Organisationen sind kurz und einprägsam.
-org_email_helper = E-Mail der Organisation empfängt alle Benachrichtigungen und Bestätigungen.
+org_name_helper = Gute Namen von Organisationen sind kurz und einprägsam.
+org_email_helper = Das E-Mail-Konto der Organisation empfängt alle Benachrichtigungen.
 create_org = Organisation erstellen
 repo_updated = Aktualisiert
 people = Personen
-invite_someone = Jemanden einladen
+invite_someone = Benutzer einladen
 teams = Teams
 lower_members = Mitglieder
-lower_repositories = Repositories
+lower_repositories = Repositorys
 create_new_team = Neues Team erstellen
 org_desc = Beschreibung
 team_name = Teamname
 team_desc = Beschreibung
-team_name_helper = Sie werden diesen Namen verwenden, um dieses Team in Gesprächen zu erwähnen.
-team_desc_helper = Was hat das Team auf sich?
+team_name_helper = Verwende diesen Namen, um dich auf dieses Team zu beziehen.
+team_desc_helper = Was hat es mit diesem Team auf sich?
 team_permission_desc = Welche Berechtigungsstufe soll das Team haben?
 
 settings = Einstellungen
@@ -254,68 +316,69 @@ settings.full_name = Vollständiger Name
 settings.website = Webseite
 settings.location = Standort
 settings.update_settings = Aktualisierungseinstellungen
-settings.update_setting_success = Einstellung der Organisation wurde erfolgreich aktualisiert.
+settings.update_setting_success = Organisationseinstellungen aktualisiert
 settings.delete = Organisation löschen
 settings.delete_account = Diese Organisation löschen
-settings.delete_prompt = Die Operation wird diese Organisation dauerhaft löschen und kann <strong>NICHT</strong> rückgängig gemacht werden!
-settings.confirm_delete_account = Löschung bestätigen
+settings.delete_prompt = Die Organisation wird dauerhaft gelöscht. Dies kann <strong>NICHT</strong> rückgängig gemacht werden!
+settings.confirm_delete_account = Löschen
+settings.hooks_desc = Add webhooks that will be triggered for <strong>all repositories</strong> under this organization.
 
 members.public = Öffentlich
 members.public_helper = Privat machen
 members.private = Privat
 members.private_helper = Öffentlich machen
-members.owner = Eigentümer
+members.owner = Besitzer
 members.member = Mitglied
 members.conceal = Verbergen
 members.remove = Entfernen
 members.leave = Verlassen
-members.invite_desc = Start typing a username to invite a new member to %s:
+members.invite_desc = Benutzernamen eingeben, um ihn als neues Mitglied in %s einzuladen:
 members.invite_now = Jetzt einladen
 
 teams.join = Beitreten
 teams.leave = Verlassen
 teams.read_access = Lesezugriff
-teams.read_access_helper = This team will be able to view and clone its repositories.
+teams.read_access_helper = Dieses Team wird Repositorys einsehen und klonen können.
 teams.write_access = Schreibzugriff
-teams.write_access_helper = This team will be able to read its repositories, as well as push to them.
+teams.write_access_helper = Dieses Team wird die Repositorys einsehen und in sie hinein pushen können.
 teams.admin_access = Adminzugriff
-teams.admin_access_helper = This team will be able to push/pull to its repositories, as well as add other collaborators to them.
+teams.admin_access_helper = Dieses Team wird pull- und push-Rechte für die Repositorys haben und Mitarbeiter einladen können.
 teams.no_desc = Dieses Team hat keine Beschreibung
 teams.settings = Einstellungen
-teams.owners_permission_desc = Owners have full access to <strong>all repositories</strong> and have <strong>admin rights</strong> to the organization.
+teams.owners_permission_desc = Besitzer haben vollen Zugriff auf <strong>alle Repositorys</strong> und <strong>Admin Rechte</strong> für diese Organisation.
 teams.members = Teammitglieder
 teams.update_settings = Einstellungen aktualisieren
 teams.delete_team = Dieses Team löschen
 teams.add_team_member = Teammitglied hinzufügen
-teams.delete_team_success = Das Team wurde erfolgreich gelöscht.
-teams.read_permission_desc = This team grants <strong>Read</strong> access: members can view and clone the team's repositories.
-teams.write_permission_desc = This team grants <strong>Write</strong> access: members can read from and push to the team's repositories.
-teams.admin_permission_desc = This team grants <strong>Admin</strong> access: members can read from, push to, and add collaborators to the team's repositories.
-teams.repositories = Team Repositories
-teams.add_team_repository = Teamrepositorie hinzufügen
+teams.delete_team_success = Team gelöscht
+teams.read_permission_desc = Dieses Team erlaubt <strong>Lesezugriff</strong>: Mitglieder können Team-Repositorys einsehen und klonen.
+teams.write_permission_desc = Dieses Team erlaubt <strong>Schreibzugriff</strong>: Mitglieder können Team-Repositorys einsehen und hinein pushen.
+teams.admin_permission_desc = Diese Team erlaubt <strong>Adminzugriff</strong>: Mitglieder dieses Teams können pullen, pushen und dem Team Mitarbeiter hinzufügen.
+teams.repositories = Team-Repositorys
+teams.add_team_repository = Team-Repository hinzufügen
 teams.remove_repo = Entfernen
 
 [admin]
 dashboard = Dashboard
 users = Benutzer
 organizations = Organisationen
-repositories = Repositories
+repositories = Repositorys
 authentication = Authentifizierung
 config = Konfiguration
 monitor = Monitoring
-prev = Prev.
-next = Next
+prev = zurück
+next = vor
 
 dashboard.statistic = Statistik
 dashboard.operations = Operationen
-dashboard.system_status = System Monitor Status
-dashboard.statistic_info = Gogs database has <b>%d</b> users, <b>%d</b> organizations, <b>%d</b> public keys, <b>%d</b> repositories, <b>%d</b> watches, <b>%d</b> stars, <b>%d</b> actions, <b>%d</b> accesses, <b>%d</b> issues, <b>%d</b> comments, <b>%d</b> social accounts, <b>%d</b> follows, <b>%d</b> mirrors, <b>%d</b> releases, <b>%d</b> login sources, <b>%d</b> webhooks, <b>%d</b> milestones, <b>%d</b> labels, <b>%d</b> hook tasks, <b>%d</b> teams, <b>%d</b> update tasks, <b>%d</b> attachments.
+dashboard.system_status = System-Monitor-Status
+dashboard.statistic_info = GoGS Datenbank hat <b>%d</b> Benutzer, <b>%d</b> Organizationen, <b>%d</b> öffentliche Schlüssel, <b>%d</b> Repositorys, <b>%d</b> watches, <b>%d</b> stars, <b>%d</b> actions, <b>%d</b> Zugriffe, <b>%d</b> issues, <b>%d</b> Kommentare, <b>%d</b> soziale Konten, <b>%d</b> follows, <b>%d</b> Spiegel, <b>%d</b> Releases, <b>%d</b> Login-Quellen, <b>%d</b> Webhooks, <b>%d</b> Milestones, <b>%d</b> Labels, <b>%d</b> Hook-Tasks, <b>%d</b> Teams, <b>%d</b> Aktualisierungs-Tasks, <b>%d</b> Anhänge.
 dashboard.operation_name = Operation Name
 dashboard.operation_switch = Switch
-dashboard.operation_run = Run
-dashboard.clean_unbind_oauth = Clean unbound OAuthes
-dashboard.delete_inactivate_accounts = Alle inaktiven Konten löschen
-dashboard.server_uptime = Server Uptime
+dashboard.operation_run = Ausführen
+dashboard.clean_unbind_oauth = ungebundene OAuths bereinigen
+dashboard.delete_inactivate_accounts = inaktive Konten löschen
+dashboard.server_uptime = Server-Uptime
 dashboard.current_goroutine = Aktuelle Goroutines
 dashboard.current_memory_usage = Aktuelle Speichernutzung
 dashboard.total_memory_allocated = Zugeteilter Gesamtspeicher
@@ -323,67 +386,66 @@ dashboard.memory_obtained = Erhaltener Speicher
 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.current_heap_usage = Aktuelle Heap-Auslastung
+dashboard.heap_memory_obtained = erhaltener Heap-Memory
+dashboard.heap_memory_idle = unbenutzter Heap-Memory
+dashboard.heap_memory_in_use = benutzter Heap-Memory
+dashboard.heap_memory_released = freigegebener Heap-Memory
+dashboard.heap_objects = Heap-Objekte
+dashboard.bootstrap_stack_usage = Bootstrap-Stack-Auslastung
+dashboard.stack_memory_obtained = erhaltener Stack-Memory
+dashboard.mspan_structures_usage = MSpan-Structures-Auslastung
+dashboard.mspan_structures_obtained = erhaltene MSpan-Structures
+dashboard.mcache_structures_usage = MCache-Structures-Auslastung
+dashboard.mcache_structures_obtained = erhaltene MCache-Structures
 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.next_gc_recycle = Next GC Recycle
-dashboard.last_gc_time = Since Last GC Time
-dashboard.total_gc_time = Total GC Pause
-dashboard.total_gc_pause = Total GC Pause
-dashboard.last_gc_pause = Last GC Pause
-dashboard.gc_times = GC Takt
+dashboard.gc_metadata_obtained = erhaltene GC-Metadata
+dashboard.other_system_allocation_obtained = andere erhaltene System-Allokatoren
+dashboard.next_gc_recycle = nächster GC-Zyklus
+dashboard.last_gc_time = seit letztem GC-Zyklus
+dashboard.total_gc_time = gesammte GC-Zeit
+dashboard.total_gc_pause = gesammte GC-Pause
+dashboard.last_gc_pause = letzte GC-Pause
+dashboard.gc_times = GC-Takt
 
-users.user_manage_panel = User Manage Panel
+users.user_manage_panel = Benutzer
 users.new_account = Neues Konto erstellen
 users.name = Name
-users.email = E-mail
 users.activated = Aktiviert
 users.admin = Admin
-users.repos = Repos
+users.repos = Repositorys
 users.created = Erzeugt
 users.edit = Bearbeiten
-users.auth_source = Auth Source
+users.auth_source = Auth-Quelle
 users.local = Lokal
-users.auth_login_name = Auth Login Name
-users.update_profile_success = Kontoprofil wurde erfolgreich aktualisiert.
+users.auth_login_name = Auth-Login-Name
+users.update_profile_success = Kontoprofil aktualisiert
 users.edit_account = Konto bearbeiten
 users.is_activated = Dieses Konto ist aktiviert
 users.is_admin = Dieses Konto hat Administratorrechte
-users.update_profile = Kontopprofil aktualisieren
+users.update_profile = Kontoprofil aktualisieren
 users.delete_account = Dieses Konto löschen
-users.still_own_repo = Dieses Konto ist noch Eigentümer von Repositories, Sie müssen zuerst diese löschen oder übertragen.
+users.still_own_repo = Dieses Konto besitzt noch Repositorys. Diese müssen zuerst gelöscht oder übertragen werden.
 
-orgs.org_manage_panel = Organization Manage Panel
+orgs.org_manage_panel = Organisationenverwaltung
 orgs.name = Name
 orgs.teams = Teams
 orgs.members = Mitglieder
 
-repos.repo_manage_panel = Repository Manage Panel
-repos.owner = Eigentümer
+repos.repo_manage_panel = Repositorys
+repos.owner = Besitzer
 repos.name = Name
 repos.private = Privat
 repos.watches = Watches
 repos.stars = Stars
-repos.issues = Themen
+repos.issues = Issues
 
-auths.auth_manage_panel = Authorization Manage Panel
-auths.new = Neu Authentifizierungsquelle hinzufügen
+auths.auth_manage_panel = Authentifizierung
+auths.new = Neue Authentifizierungsquelle hinzufügen
 auths.name = Name
 auths.type = Typ
-auths.enabled = Aktiviert
-auths.updated = Aktualisiert
+auths.enabled = aktiviert
+auths.updated = aktualisiert
 auths.auth_type = Authentifizierungstyp
 auths.auth_name = Authentifizierungsname
 auths.domain = Domain
@@ -393,30 +455,30 @@ auths.base_dn = Base DN
 auths.attributes = Suchattribute
 auths.filter = Suchfilter
 auths.ms_ad_sa = Ms Ad SA
-auths.smtp_auth = SMTP Authentifizierungstyp
-auths.smtphost = SMTP Host
-auths.smtpport = SMTP Port
+auths.smtp_auth = SMTP-Authentifizierungstyp
+auths.smtphost = SMTP-Host
+auths.smtpport = SMTP-Port
 auths.enable_tls = TLS-Verschlüsselung aktivieren
 auths.enable_auto_register = Automatische Registrierung aktivieren
 auths.tips = Tipps
 auths.edit = Authentifizierungseinstellungen bearbeiten
 auths.activated = Diese Authentifizierung ist aktiviert
-auths.update_success = Authentifizierungseinstellungen wurde erfolgreich aktualisiert.
+auths.update_success = Authentifizierungseinstellungen aktualisiert
 auths.update = Authentifizierungseinstellungen aktualisieren
-auths.delete = Diese Authentifizierung löschen
+auths.delete = Authentifizierung löschen
 
 config.server_config = Server-Konfiguration
 config.app_name = Anwendungsname
 config.app_ver = Anwendungsversion
-config.app_url = Anwendungs URL
+config.app_url = Anwendungs-URL
 config.domain = Domain
-config.offline_mode = Offline Mode
-config.disable_router_log = Router Log deaktivieren
-config.run_user = Run User
-config.run_mode = Run Mode
-config.repo_root_path = Repositorie Wurzelverzeichnis
-config.static_file_root_path = Wurzelverzeichnis für statische Dateien
-config.log_file_root_path = Wurzelverzeichnis für Log Dateien
+config.offline_mode = Offline-Modus
+config.disable_router_log = Router-Log deaktivieren
+config.run_user = Laufzeit-Benutzer
+config.run_mode = Laufzeit-Modus
+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.db_config = Datenbankkonfiguration
@@ -424,54 +486,54 @@ config.db_type = Typ
 config.db_host = Host
 config.db_name = Name
 config.db_user = Benutzer
-config.db_ssl_mode = SSL Modus
+config.db_ssl_mode = SSL-Modus
 config.db_ssl_mode_helper = (nur für "postgres")
 config.db_path = Verzeichnis
 config.db_path_helper = (nur für "sqlite3")
-config.service_config = Service Einstellungen
-config.register_email_confirm = E-Mail Bestätigung bei Registrierung
+config.service_config = Service-Einstellungen
+config.register_email_confirm = E-Mail-Bestätigung bei Registrierung
 config.disable_register = Registrierung deaktivieren
 config.require_sign_in_view = Require Sign In View
-config.mail_notify = E-Mail Benachrichtigung
-config.enable_cache_avatar = Avatar Cache avtivieren
+config.mail_notify = E-Mail-Benachrichtigung
+config.enable_cache_avatar = Avatar-Cache aktivieren
 config.active_code_lives = Active Code Lives
 config.reset_password_code_lives = Reset Password Code Lives
-config.webhook_config = Webhook Einstellungen
-config.task_interval = Task Intervall
+config.webhook_config = Webhook-Einstellungen
+config.task_interval = Task-Intervall
 config.deliver_timeout = Zeitlimit für Zustellung
-config.mailer_config = Mailer Einstellungen
+config.mailer_config = Mailer-Einstellungen
 config.mailer_enabled = Aktiviert
 config.mailer_name = Name
 config.mailer_host = Host
 config.mailer_user = Benutzer
-config.oauth_config = OAuth Einstellungen
+config.oauth_config = OAuth-Einstellungen
 config.oauth_enabled = Aktiviert
-config.cache_config = Cache Einstellungen
-config.cache_adapter = Cache Adapter
-config.cache_interval = Cache Intervall
-config.cache_conn = Cache Anbindung
-config.session_config = Session Einstellungen
-config.session_provider = Session Provider
-config.provider_config = Provider Einstellungen
-config.cookie_name = Cookie Name
+config.cache_config = Cache-Einstellungen
+config.cache_adapter = Cache-Adapter
+config.cache_interval = Cache-Intervall
+config.cache_conn = Cache-Anbindung
+config.session_config = Session-Einstellungen
+config.session_provider = Session-Provider
+config.provider_config = Provider-Einstellungen
+config.cookie_name = Cookie-Name
 config.enable_set_cookie = Enable Set Cookie
-config.gc_interval_time = GC Interval Time
-config.session_life_time = Session Lebensdauer
+config.gc_interval_time = GC-Intervallzeit
+config.session_life_time = Session-Lebensdauer
 config.https_only = nur HTTPS
-config.cookie_life_time = Cookie Lebensdauer
-config.session_hash_function = Session ID Hash Function
-config.session_hash_key = Session ID Hash Key
-config.picture_config = Bildereinstellungen
-config.picture_service = Bilderservice
+config.cookie_life_time = Cookie-Lebensdauer
+config.session_hash_function = Session-ID-Hashfunktion
+config.session_hash_key = Session-ID-Hashschlüssel
+config.picture_config = Bildeinstellungen
+config.picture_service = Bildservice
 config.disable_gravatar = Gravatar deaktivieren
-config.log_config = Log Einstellungen
-config.log_mode = Log Modus
+config.log_config = Log-Einstellungen
+config.log_mode = Log-Modus
 
-monitor.cron = Cron Tasks
+monitor.cron = Cron-Tasks
 monitor.name = Name
 monitor.schedule = Zeitplan
-monitor.next = Next Time
-monitor.previous = Previous Time
+monitor.next = nächste Ausführung
+monitor.previous = letzte Ausführung
 monitor.execute_times = Execute Times
 monitor.process = Laufende Prozesse
 monitor.desc = Beschreibung
@@ -479,10 +541,11 @@ monitor.start = Startzeit
 monitor.execute_time = Ausführungszeit
 
 [action]
-create_repo = Repositorie erstellen <a href="/%s">%s</a>
-commit_repo = pushed to <a href="/%s/src/%s">%s</a> at <a href="/%s">%s</a>
-create_issue = opened issue <a href="/%s/issues/%s">%s#%s</a>
-comment_issue = commented on issue <a href="/%s/issues/%s">%s#%s</a>
+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/%s/issues/%s">%s#%s</a> eröffnet
+comment_issue = hat Issue <a href="%s/%s/issues/%s">%s#%s</a> kommentiert
+transfer_repo = hat Repository <code>%s</code> transferiert an <a href="/%s%s">%s</a>
 
 [tool]
 ago = vor
@@ -504,16 +567,3 @@ months = %d Monate %s
 years = %d Jahre %s
 raw_seconds = Sekunden
 raw_minutes = Minuten
-
-
-
-
-
-
-
-
-
-
-
-
-

conf/locale/locale_en-US.ini

@@ -38,6 +38,50 @@ issues = Issues
 
 cancel = Cancel
 
+[install]
+install = Installation
+title = Install Steps For First-time Run
+requite_db_desc = Gogs requires MySQL, PostgreSQL or SQLite3, but SQLite3 is usually available in the official binary version.
+db_type = Database Type
+host = Host
+user = User
+password = Password
+db_name = Database Name
+db_helper = Please use INNODB engine with utf8_general_ci charset for MySQL.
+ssl_mode = SSL Mode
+path = Path
+sqlite_helper = The file path of SQLite3 database.
+general_title = General Settings of Gogs
+repo_path = Repository Root Path
+repo_path_helper = All Git remote repositories will be saved to this directory.
+run_user = Run User
+run_user_helper = The user must have access to Repository Root Path and run Gogs.
+domain = Domain
+domain_helper = This affects SSH clone URLs.
+app_url = Application URL
+app_url_helper = This affects HTTP/HTTPS clone URL and somewhere in e-mail.
+email_title = Email Service Settings(Optional)
+smtp_host = SMTP Host
+mailer_user = Sender E-mail
+mailer_password = Sender Password 
+notify_title = Notification Settings(Optional)
+register_confirm = Enable Register Confirmation
+mail_notify = Enable Mail Notification
+admin_title = Admin Account Settings
+admin_name = Username
+admin_password = Password
+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.
+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
+save_config_failed = Fail to save configuration: %v
+invalid_admin_setting = Admin account setting is invalid: %v
+install_success = Welcome! We're glad that you choose Gogs, have fun and take care.
+
 [home]
 uname_holder = Username or E-mail
 password_holder = Password
@@ -47,6 +91,9 @@ collaborative_repos = Collaborative Repositories
 my_orgs = My Organizations
 my_mirrors = My Mirrors
 
+[explore]
+repos = Repositories
+
 [auth]
 create_new_account = Create New Account
 register_hepler_msg = Already have an account? Sign in now!
@@ -81,6 +128,7 @@ HttpsUrl = HTTPS URL
 PayloadUrl = Payload URL
 TeamName = Team name
 AuthName = Authorization name
+AdminEmail = Admin E-mail
 
 require_error = ` cannot be empty.`
 alpha_dash_error = ` must be valid alpha or numeric or dash(-_) characters.`
@@ -91,7 +139,7 @@ email_error = ` is not a valid e-mail address.`
 url_error = ` is not a valid URL.`
 unknown_error = Unknown error:
 captcha_incorrect = Captcha didn't match.
-password_not_match = Password and re-type password are not same.
+password_not_match = Password and confirm password are not same.
 
 username_been_taken = Username has been already taken.
 repo_name_been_taken = Repository name has been already taken.
@@ -118,6 +166,15 @@ org_still_own_repo = This organization still have ownership of repository, you h
 
 still_own_user = This authentication still has used by some users, you should move them and then delete again.
 
+[user]
+change_avatar = Change your avatar at gravatar.com
+join_on = Joined on
+repositories = Repositories
+activity = Public Activity
+followers = Followers
+starred = Starred
+following = Following
+
 [settings]
 profile = Profile
 password = Password
@@ -125,6 +182,7 @@ ssh_keys = SSH Keys
 social = Social Accounts
 orgs = Organizations
 delete = Delete Account
+uid = Uid
 
 public_profile = Public Profile
 profile_desc = Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.
@@ -133,6 +191,10 @@ website = Website
 location = Location
 update_profile = Update Profile
 update_profile_success = Your profile has been successfully updated.
+change_username = Username Changed
+change_username_desc = Username has been changed, do you want to continue? This will affect all links relate to your account.
+continue = Continue
+cancel = Cancel
 
 change_password = Change Password
 old_password = Current Password
@@ -159,8 +221,10 @@ unbind = Unbind
 unbind_success = Social account has been unbound.
 
 delete_account = Delete Your Account
-delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undo!
+delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undone!
 confirm_delete_account = Confirm Deletion
+delete_account_title = Account Deletion
+delete_account_desc = This account is going to be deleted permanently, do you want to continue?
 
 [repo]
 owner = Owner
@@ -185,6 +249,9 @@ migrate_type = Migration Type
 migrate_type_helper = This repository will be a <span class="label label-blue label-radius">Mirror</span>
 migrate_repo = Migrate Repository
 
+copy_link = Copy
+click_to_copy = Copy to clipboard
+copied = Copied OK
 clone_helper = Need help cloning? Visit <a target="_blank" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository">Help</a>!
 unwatch = Unwatch
 watch = Watch
@@ -192,6 +259,30 @@ unstar = Unstar
 star = Star
 fork = Fork
 
+no_desc = No Description
+quick_guide = Quick Guide
+clone_this_repo = Clone this repository
+create_new_repo_command = Create a new repository on the command line
+push_exist_repo = Push an existing repository from the command line
+
+branch = Branch
+tree = Tree
+branch_and_tags = Branches & Tags
+branches = Branches
+tags = Tags
+issues = Issues
+commits = Commits
+releases = Releases
+
+commits.commits = Commits
+commits.search = Search commits
+commits.find = Find
+commits.author = Author
+commits.message = Message
+commits.date = Date
+commits.older = Older
+commits.newer = Newer
+
 settings = Settings
 settings.options = Options
 settings.collaboration = Collaboration
@@ -201,13 +292,18 @@ settings.basic_settings = Basic Settings
 settings.danger_zone = Danger Zone
 settings.site = Official Site
 settings.update_settings = Update Settings
+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.transfer = Transfer Ownership
 settings.transfer_desc = Transfer this repo to another user or to an organization where you have admin rights.
+settings.new_owner_has_same_repo = New owner already has a repository with same name.
 settings.delete = Delete This Repository
 settings.delete_desc = Once you delete a repository, there is no going back. Please be certain.
+settings.transfer_notices = <p>- You will lose access if new owner is a individual user.</p><p>- You will remain access if new owner is an organization and you're one of the owners.</p>
 settings.update_settings_success = Repository options has been successfully updated.
 settings.transfer_owner = New Owner
 settings.make_transfer = Make Transfer
+settings.transfer_succeed = Repository ownership has been successfully transferred.
 settings.confirm_delete = Confirm Deletion
 settings.add_collaborator = Add New Collaborator
 settings.add_collaborator_success = New collaborator has been added.
@@ -228,6 +324,11 @@ settings.update_webhook = Update Webhook
 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 <a href="http://slack.com">Slack</a> integration to your repository.
+settings.slack_token = Token
+settings.slack_domain = Domain
+settings.slack_channel = Channel
 
 [org]
 org_name_holder = Organization Name
@@ -254,11 +355,16 @@ settings.full_name = Full Name
 settings.website = Website
 settings.location = Location
 settings.update_settings = Update Settings
+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.update_setting_success = Organization setting has been successfully updated.
 settings.delete = Delete Organization
 settings.delete_account = Delete This Organization
-settings.delete_prompt = The operation will delete this organization permanently, and <strong>CANNOT</strong> be undo!
+settings.delete_prompt = The operation will delete this organization permanently, and <strong>CANNOT</strong> be undone!
 settings.confirm_delete_account = Confirm Deletion
+settings.delete_org_title = Organization Deletion
+settings.delete_org_desc = This organization is going to be deleted permanently, do you want to continue?
+settings.hooks_desc = Add webhooks that will be triggered for <strong>all repositories</strong> under this organization.
 
 members.public = Public
 members.public_helper = make private
@@ -287,6 +393,8 @@ teams.members = Team Members
 teams.update_settings = Update Settings
 teams.delete_team = Delete This Team
 teams.add_team_member = Add Team Member
+teams.delete_team_title = Team Deletion
+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_success = Given team has been successfully deleted.
 teams.read_permission_desc = This team grants <strong>Read</strong> access: members can view and clone the team's repositories.
 teams.write_permission_desc = This team grants <strong>Write</strong> access: members can read from and push to the team's repositories.
@@ -403,6 +511,8 @@ auths.activated = This authentication has activated
 auths.update_success = Authorization setting has been successfully updated.
 auths.update = Update Authorization Setting
 auths.delete = Delete This Authorization
+auths.delete_auth_title = Authorization Deletion
+auths.delete_auth_desc = This authorization is going to be deleted, do you want to continue?
 
 config.server_config = Server Configuration
 config.app_name = Application Name
@@ -478,10 +588,11 @@ monitor.start = Start Time
 monitor.execute_time = Execution Time
 
 [action]
-create_repo = created repository <a href="/%s">%s</a>
-commit_repo = pushed to <a href="/%s/src/%s">%s</a> at <a href="/%s">%s</a>
-create_issue = opened issue <a href="/%s/issues/%s">%s#%s</a>
-comment_issue = commented on issue <a href="/%s/issues/%s">%s#%s</a>
+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/%s/issues/%s">%s#%s</a>
+comment_issue = commented on issue <a href="%s/%s/issues/%s">%s#%s</a>
+transfer_repo = transfered repository <code>%s</code> to <a href="/%s%s">%s</a>
 
 [tool]
 ago = ago

conf/locale/locale_fr-CA.ini

@@ -0,0 +1,516 @@
+app_desc = Un service Git écrit en Go auto-hébergé
+
+home = Accueil
+dashboard = Tableau de bord
+explore = Explorer
+help = Aide
+sign_in = Connexion
+social_sign_in = Authentification via Internet: 2ème étape <small>associé le compte</small>
+sign_out = Déconnexion
+sign_up = Créer un compte
+register = S'inscrire
+website = Site web
+version = Version
+page = Page
+template = Gabarit
+language = Langage
+
+username = Usager
+email = Courriel
+password = Mot de passe
+re_type = Saisir à nouveau
+captcha = Captcha
+
+repository = Dépôt
+organization = Organisation
+mirror = Mirroir
+new_repo = Nouveau dépôt
+new_migrate = Nouvelle migration
+new_org = Nouvel organisation
+manage_org = Gestion des organisations
+admin_panel = Gestion
+account_settings = Profil usager
+settings = Configuration
+
+news_feed = Fil de nouvelles
+pull_requests = Demandes de fusion (pull requests)
+issues = Suivi de problèmes
+
+cancel = Annuler
+
+[home]
+uname_holder = Nom d'usager ou courriel
+password_holder = Mot de passe
+switch_dashboard_context = Changer de tableau de bord
+my_repos = Mes dépôts
+collaborative_repos = Dépôts partagés
+my_orgs = Mes organisations
+my_mirrors = Mes mirroirs
+
+[auth]
+create_new_account = Créer un nouveau compte
+register_hepler_msg = Déjà inscrits? Connectez-vous maintenant!
+social_register_hepler_msg = Déjà inscrits? Branchez-vous!
+disable_register_prompt = Désolé, l'auto-inscription n'est pas activée. Contactez l'admnistrateur du site.
+disable_register_mail = Désolé, la confirmation d'inscription par courriel est désactivée. Contactez l'administrateur du site.
+remember_me = Se souvenir de moi
+forgot_password= Mot de passe oublié
+forget_password = Mot de passe oublié?
+sign_up_now = Besoin d'un compte? Inscrivez-vous maintenant.
+confirmation_mail_sent_prompt = Un courriel de confirmation à été envoyé à <b>%s</b>, consultez vos courriels d'ici %d heures pour terminer l'inscription.
+sign_in_email = Connexion avec votre courriel
+active_your_account = Activez votre compte
+resent_limit_prompt = Désolé vous demandez trop souvent un courriel de confirmation. S.v.p. patientez 3 minutes.
+has_unconfirmed_mail = Bonjour %s, votre adresse courriel n'est pas vérifiée(<b>%s</b>). Si vous n'avez pas reçu de courriel de confirmation ou si vous avez besoin d'en envoyer un maintenant, appuyez sur le bouton ci-dessous.
+resend_mail = Appuyez ici pour envoyer de nouveau un courriel de confirmation.
+email_not_associate = Ce courriel ne correspond à aucun compte.
+send_reset_mail = Appuyez ici pour (ré)envoyer un courriel pour réinitialiser le mot de passe.
+reset_password = Réinitialiser votre mot de passe
+invalid_code = Désolé, ce code de confirmation est périmé ou non-valide.
+reset_password_helper = Appuyez ici pour réinitialiser votre mot de passe
+password_too_short = La longueur du mot de passe doit être d'au moins 6 caractères.
+
+[form]
+UserName = Nom d'usager
+RepoName = Nom du dépôt
+Email = Adresse de courriel
+Password = Mot de passe
+Retype = Mot de passe (confirmation)
+SSHTitle = Nom de la clé SSH
+HttpsUrl = URL HTTPS
+PayloadUrl = URL cible
+TeamName = Nom de l'équipe
+AuthName = Nom d'usager
+
+require_error = ` ne peut être vide.`
+alpha_dash_error = ` doit être composé de caractères alpha-numériques et/ou d'un tiret(-_).`
+alpha_dash_dot_error = ` doit être composé de caractères alpha-numérique, un point(.) et/ou tiret(-_).`
+min_size_error = ` doit être composé d'au moins %s caractères.`
+max_size_error = ` doit être conposé d'au plus %s caractères.`
+email_error = ` n'est pas une adresse de courriel bien formée.`
+url_error = ` n'est pas un URL valide.`
+unknown_error = Erreur inconnue:
+captcha_incorrect = Le captcha ne concorde pas.
+password_not_match = Les deux mots de passe diffèrent.
+
+username_been_taken = `Nom d'usager dèjà utilisé.`
+repo_name_been_taken = Nom de dépôt déjà utilisé.
+org_name_been_taken = Nom d'organisation déjà utilisé.
+team_name_been_taken = Nom d'équipe déjà utilisé.
+email_been_used = Adresse de courriel déjà utilisée.
+ssh_key_been_used = Nom de clé publique déjà utilisé.
+illegal_username = Votre nom d'usager contient des caractères interdits.
+illegal_repo_name = Le nom du dépôt contient des caractères interdits.
+illegal_org_name = Le nom de l'organisation contient des caractères interdits.
+illegal_team_name = Le nom de l'équipe contient des caractères interdits.
+username_password_incorrect = Nom d'usager ou mot de passe erroné.
+enterred_invalid_repo_name = Nom de dépôt inexistant.
+enterred_invalid_owner_name = Responsable de dépôt inexistant.
+enterred_invalid_password = Mot de passe erroné.
+user_not_exist = Nom d'usager inexistant.
+last_org_owner = Ceci est le dernier responsable du dépôt. Il doit y avoir obligatoirement au moins un usager responsable.
+
+invalid_ssh_key = Désolé, impossible de vérifier votre clé SSH: %
+auth_failed = Erreur d'authentification : %v
+
+still_own_repo = Votre compte est responsable d'au moins un dépôt. Vous devez soit détruire ces dépôts, soit transférer la responsabilité à un autre usager.
+org_still_own_repo = Cette organisation est responsable d'au moins un dépôt. Vous devez soit détruire ces dépôts, soit transférer la responsabilité à un autre usager ou organisation.
+
+still_own_user = Cette authentification est utilisée par un usager.
+
+[settings]
+profile = Profil
+password = Mot de passe
+ssh_keys = Clés SSH
+social = Comptes Internet
+orgs = Organisations
+delete = Supprimer votre compte
+
+public_profile = Profil public
+profile_desc = Votre adresse de courriel est publique et sera utilisée pour les avis produits par le site.
+full_name = Nom complet
+website = Site web
+location = Endroit
+update_profile = Mettre à jour le profil
+update_profile_success = Mise à jour du profil réussie.
+
+change_password = Changer le mot de passe
+old_password = Mot de passe actuel
+new_password = Nouveau mot de passe
+password_incorrect = Mot de passe actuel erroné.
+change_password_success = Modification du mot de passe effectuée. Vous pouvez dorénavant vous connecter avec le nouveau mot de passe.
+
+manage_ssh_keys = Gestion des clés SSH
+add_key = Ajouter une clé
+ssh_desc = Voici la liste de clés SSH associées à votre profil. Retirez les clés que vous ne reconnaissez pas.
+ssh_helper = <strong>Beson d'aide?</strong> Consultez le guide au <a href="https://help.github.com/articles/generating-ssh-keys">generating SSH keys</a> ou vérifiez <a href="https://help.github.com/ssh-issues/">les problèmes SSH fréquents</a>.
+add_new_key = Ajouter une clé SSH
+key_name = Nom de la clé
+key_content = Contenu
+add_key_success = Clé SSH ajoutée!
+delete_key = Détruire
+add_on = Ajoutée le
+last_used = Dernière utilisation le
+no_activity = Pas d'activité récente
+
+manage_social = Gestion des comptes Internets associés
+social_desc = Ceci est une liste de comptes Internet associés. Retirez les comptes que vous ne reconnaissez pas.
+unbind = Désassocier
+unbind_success = Compte Internet déassocié.
+
+delete_account = Detruire votre compte
+delete_prompt = Cette opération détruira votre compte et <strong>ne pourra être annulée</strong>!
+confirm_delete_account = Confirmez la suppression
+
+[repo]
+owner = Responsable
+repo_name = Nom du dépôt
+repo_name_helper = Les bons noms de dépôts sont courts, mémorables et <strong>uniques</strong>.
+visibility = Visibilité
+visiblity_helper = Ce dépôt est <span class="label label-red label-radius">privé</span>
+repo_desc = Description
+repo_lang = Langue
+repo_lang_helper = Choisir un fichier .gitignore
+license = License
+license_helper = Choisir un fichier de licence
+init_readme = Initialiser le dépôt avec un fichier README.md
+create_repo = Créer le dépôt
+default_branch = Branche par défaut
+mirror_interval = Intervale de synchronisation (heures)
+goget_meta = Métadonnées Go-Get
+goget_meta_helper = Ce dépôt sera <span class="label label-blue label-radius">Go-Getable</span>
+
+need_auth = Authorisation requise
+migrate_type = Type de migration
+migrate_type_helper = Ce dépôt sera un <span class="label label-blue label-radius">mirroir</span>
+migrate_repo = Migrer le dépôt
+
+copy_link = Copier
+clone_helper = Besoin d'aide pour cloner? Obtenez de l' <a target="_blank" href="http://git-scm.com/book/fr/Les-bases-de-Git-Démarrer-un-dépôt-Git">aide</a>!
+unwatch = Ne plus suivre
+watch = Suivre
+unstar = Retirer étoile
+star = Étoile
+fork = Fork
+
+quick_guide = Guide rapide
+clone_this_repo = Cloner ce dépôt
+create_new_repo_command = Créer un nouveau dépôt à la ligne de commande
+push_exist_repo = Pousser un dépôt existant depuis la ligne de commande
+
+settings = Réglages
+settings.options = Réglages de base
+settings.collaboration = Collaboration
+settings.hooks = Webhooks
+settings.deploy_keys = Clé de déploiement
+settings.basic_settings = réglages de base
+settings.danger_zone = Danger!
+settings.site = Site officiel
+settings.update_settings = Réglage des mises à jour
+settings.transfer = Transférer la responsabilité
+settings.transfer_desc = Transférer ce dépôt à un autre usager ou organisation si vous en avez la responsabilité.
+settings.delete = Détruire ce dépôt
+settings.delete_desc = La destruction est irrémédiable, impossible d'annuler. Soyez sûr de votre décision.
+settings.update_settings_success = Réglages modifiés
+settings.transfer_owner = Nouveau responsable
+settings.make_transfer = Faire le transfert
+settings.confirm_delete = Confirmer la destruction
+settings.add_collaborator = Ajouter un nouveau collaborateur
+settings.add_collaborator_success = Nouveau collaborateur ajouté.
+settings.remove_collaborator_success = Collaborateur supprimé.
+settings.add_webhook = Ajouter un Webhook
+settings.hooks_desc = Les Webhooks permettent à des services externes d'être avertis de certains changements sur Gogs. Lorque qu'un changement se produit, Gogs envoie une requête POST à chacun des URLs spécifiés. Plus d'info disponible sur notre <a target="_blank" href="http://gogs.io/docs/features/webhook.html">guide Webhooks'</a>.
+settings.remove_hook_success = Webhook supprimé.
+settings.add_webhook_desc = Gogs envoiera un POST à l'URL ci-dessous avec le détail de l'événement souscrit. Vous pouvez aussi spécifier dans quel format vous désirez recevoir les données (JSON,<code>x-www-form-urlencoded</code>, <em>etc</em>). Plus d'info disponible sur notre <a target="_blank" href="http://gogs.io/docs/features/webhook.html">guide Webhooks'</a>.
+settings.payload_url = URL cible
+settings.content_type = Content Type
+settings.secret = Secret
+settings.event_desc = Quels changements déclencheront le webhook?
+settings.event_push_only = Uniquement les <code>push</code>.
+settings.active = Activé
+settings.active_helper = Gogs fournira le détail de l'événement lorsque ce webhook sera déclenché.
+settings.add_hook_success = Nouveau webhook ajouté.
+settings.update_webhook = Mettre à jour le webhook
+settings.update_hook_success = Webhook mis à jour.
+settings.delete_webhook = Détruire le webhook
+settings.recent_deliveries = Livraisons récentes
+settings.hook_type = Type de déclencheur
+settings.add_slack_hook_desc = Ajouter la compatibilité <a href="http://slack.com">Slack</a> à ce dépôt.
+settings.slack_token = Jeton (token)
+settings.slack_domain = Domaine
+settings.slack_channel = Canal
+
+[org]
+org_name_holder = Nom de l'organisation
+org_name_helper = Les bons noms d'organisations sont courts, mémorables et uniques
+org_email_helper = Le courriel de l'organisation recevra toutes les notifications et les confirmations.
+create_org = Créer une organisation
+repo_updated = Changement effectué
+people = Personne
+invite_someone = Inviter quelqu'un
+teams = Équipes
+lower_members = Membres
+lower_repositories = Dépôts
+create_new_team = Créer une nouvelle équipe
+org_desc = Description
+team_name = Nom de l'équipe
+team_desc = Description
+team_name_helper = Le nom qui sera utilisé pour mentionner cette équipe dans les conversations.
+team_desc_helper = Quel est la raison d'être de cette équipe?
+team_permission_desc = Quel niveau de permission attribuer à cette équipe?
+
+settings = Réglages
+settings.options = Paramètres
+settings.full_name = Nom complet
+settings.website = Site web
+settings.location = Endroit
+settings.update_settings = Mettre à jour les paramètres
+settings.update_setting_success = Paramètres mis à jour.
+settings.delete = Détruire l'organisation
+settings.delete_account = Détruire cette organisation
+settings.delete_prompt = La destruction de l'organisation est irrémédiable, impossible d'annuler. Soyez sûr de votre décision.
+settings.confirm_delete_account = Confirmer la destruction
+
+members.public = Publique
+members.public_helper = Rendre privé
+members.private = Privé
+members.private_helper = Rendre publique
+members.owner = Responsable
+members.member = Membre
+members.conceal = Caché
+members.remove = Retirer
+members.leave = Quitter
+members.invite_desc = Commencez à saisir un nom d'usager pour l'inviter à %s:
+members.invite_now = Inviter
+
+teams.join = Rejoindre
+teams.leave = Quitter
+teams.read_access = Droits de lecture
+teams.read_access_helper = Cette équipe pourra voir et cloner ses dépôts.
+teams.write_access = Droits d'écriture
+teams.write_access_helper = Cette équipe pourra voir et cloner ses dépôts ainsi que pousser vers ceux-ci.
+teams.admin_access = Droits de gestion
+teams.admin_access_helper = En plus des droits d'écriture, cette équipe pourra gérer les collaborateurs.
+teams.no_desc = Cette équipe ne posséde pas de description
+teams.settings = Réglages
+teams.owners_permission_desc = Les responsables ont accès à <strong>tous</strong> les dépôts et en possédent les droits de gestion.
+teams.members = Membre de l'équipe
+teams.update_settings = Mettre à jour
+teams.delete_team = Détruire cette équipe
+teams.add_team_member = Ajouter un membre à l'équipe
+teams.delete_team_success = Équipe détruite
+teams.read_permission_desc = La participation à cette équipe confère les droits de lecture. Ses membres peuvent voir et cloner ses dépôts.
+teams.write_permission_desc = La participation à cette équipe confère les droits d'écriture en plus des droits de lecture. Ses membres peuvent pousser vers les dépôts de l'équipe.
+teams.admin_permission_desc = La participation à cette équire confère les droits de gestion. Ses membres peuvent voir, cloner, pousser et gérer les collaborateurs des dépôts.
+teams.repositories = Dépôts de l'équipe
+teams.add_team_repository = Ajouer un dépôt à l'équipe
+teams.remove_repo = Enlever
+
+[admin]
+dashboard = Tableau de bord
+users = Usagers
+organizations = Organisations
+repositories = Dépôts
+authentication = Sources d'authentifications
+config = Configuration
+monitor = Monitoring
+prev = Préc.
+next = Suiv.
+
+dashboard.statistic = Statistiques
+dashboard.operations = Opérations
+dashboard.system_status = État du monitoring système
+dashboard.statistic_info = La BD Gogs compte <b>%d</b> usagers, <b>%d</b> organisations, <b>%d</b> clé SSH, <b>%d</b> dépôts, <b>%d</b> suivis, <b>%d</b> étoiles, <b>%d</b> actions, <b>%d</b> accès, <b>%d</b> tickets, <b>%d</b> commentaires, <b>%d</b> comptes Internet, <b>%d</b> suivis, <b>%d</b> mirroirs, <b>%d</b> publications, <b>%d</b> sources d'authentification, <b>%d</b> webhooks, <b>%d</b> jalons, <b>%d</b> tags, <b>%d</b> tâches hook, <b>%d</b> équipes, <b>%d</b> tâches de mise à jours, <b>%d</b> fichiers joints.
+dashboard.operation_name = Nom de l'opération
+dashboard.operation_switch = Commande
+dashboard.operation_run = Lancer
+dashboard.clean_unbind_oauth = Nettoyer les OAuths orphelins
+dashboard.delete_inactivate_accounts = Détruire les comptes inactifs
+dashboard.server_uptime = Démarré depuis
+dashboard.current_goroutine = Nombre de Goroutines
+dashboard.current_memory_usage = Usage mémoire actuel
+dashboard.total_memory_allocated = Mémoire allouée totale
+dashboard.memory_obtained = Memoire obtenue
+dashboard.pointer_lookup_times = Accès pointeur
+dashboard.memory_allocate_times = Allocation mémoire
+dashboard.memory_free_times = Désallocation mémoire
+dashboard.current_heap_usage = Taille du heap actuelle
+dashboard.heap_memory_obtained = Mémoire heap obtenue
+dashboard.heap_memory_idle = Mémoire heap inactive
+dashboard.heap_memory_in_use = Mémoire heap utilisée
+dashboard.heap_memory_released = Mémoire heap relachée
+dashboard.heap_objects = Objets dans le heap
+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.next_gc_recycle = Next GC Recycle
+dashboard.last_gc_time = Since Last GC Time
+dashboard.total_gc_time = Total GC Pause
+dashboard.total_gc_pause = Total GC Pause
+dashboard.last_gc_pause = Last GC Pause
+dashboard.gc_times = GC Times
+
+users.user_manage_panel = Gestion des usager
+users.new_account = Creér un nouveau compte
+users.name = Nom
+users.activated = Activé
+users.admin = Gestionnaire
+users.repos = Dépôts
+users.created = Créé
+users.edit = Editer
+users.auth_source = Source d'authentification
+users.local = Locale
+users.auth_login_name = Identifiant d'authentification
+users.update_profile_success = Compte crée.
+users.edit_account = Éditer compte
+users.is_activated = Ce compte est activé
+users.is_admin = Ce compte a les droits de gestionnaire
+users.update_profile = Mettre à jour le compte
+users.delete_account = Détruire ce compte
+users.still_own_repo = Ce compte est responsables d'un dépôt. I faut détruire le dépôt ou transférer la responsabilité avant de détruire ce compte.
+
+orgs.org_manage_panel = Gestion des organisations
+orgs.name = Nom
+orgs.teams = Équipes
+orgs.members = Membres
+
+repos.repo_manage_panel = Gestion des dépôts
+repos.owner = Responsable
+repos.name = Nom
+repos.private = Privé
+repos.watches = Suivis
+repos.stars = Étoiles
+repos.issues = Ticket
+
+auths.auth_manage_panel = Gestion des sources d'authentification
+auths.new = Ajouter une nouvelle source d'authentification
+auths.name = Nom
+auths.type = Type
+auths.enabled = Activé
+auths.updated = Mis à jour
+auths.auth_type = Type d'authentification
+auths.auth_name = Nom de l'authentification
+auths.domain = Domaine
+auths.host = Serveur
+auths.port = Port
+auths.base_dn = DN de base
+auths.attributes = Attributs de recherche
+auths.filter = Filtre de recherche
+auths.ms_ad_sa = Microsoft Active Directory
+auths.smtp_auth = Authentification SMTP
+auths.smtphost = Serveur SMTP
+auths.smtpport = Port SMTP
+auths.enable_tls = Chiffrement TLS
+auths.enable_auto_register = Activer auto-abonnement
+auths.tips = Trucs
+auths.edit = Éditer réglages d'authentification
+auths.activated =  Source d'authentification activée
+auths.update_success = Réglages mis à jour.
+auths.update = Mettre à jour réglages
+auths.delete = Détruire cette source
+
+config.server_config = Configuration du serveur
+config.app_name = Nom de l'applicaiton
+config.app_ver = Version de l'application
+config.app_url = URL de l'application
+config.domain = Domaine
+config.offline_mode = Mode hors-ligne
+config.disable_router_log = Journal du routeur désactivé
+config.run_user = Éxécuté en tant que
+config.run_mode = Mode de fonctionnement
+config.repo_root_path = Dossier contenant les dépôts
+config.static_file_root_path = Dossier contenant les fichiers statiques
+config.log_file_root_path = Dossier contenant les journaux
+config.script_type = Type de script
+config.reverse_auth_user = Usager d'authentification inversée
+config.db_config = Configuration de la BD
+config.db_type = Type
+config.db_host = Serveur
+config.db_name = Nom
+config.db_user = Usager
+config.db_ssl_mode = Mode SSL
+config.db_ssl_mode_helper = (pour "postgres" seulement)
+config.db_path = Path
+config.db_path_helper = (pour "sqlite3" seulement)
+config.service_config = Configuration du service
+config.register_email_confirm = Confirmation d'abonnement par courriel
+config.disable_register = Auto-inscription désactivée
+config.require_sign_in_view = Connexion requise pour visualiser
+config.mail_notify = Notifications par courriel
+config.enable_cache_avatar = Cache avatar activée
+config.active_code_lives = Jeton d'activation
+config.reset_password_code_lives = Jeton de modification mot-de-passe
+config.webhook_config = Configuration Webhook
+config.task_interval = Intervalle
+config.deliver_timeout = Expiration des appels
+config.mailer_config = Configuration expédition de courriels
+config.mailer_enabled = Activé
+config.mailer_name = Nom
+config.mailer_host = Serveur
+config.mailer_user = Usager
+config.oauth_config = Configuration OAuth
+config.oauth_enabled = Activé
+config.cache_config = Configuration du cache
+config.cache_adapter = Mécanisme de cache
+config.cache_interval = Intervalle
+config.cache_conn = Chaîne de connexion
+config.session_config = Configuration des session
+config.session_provider = Mécanisme
+config.provider_config = Configuration du mécanisme
+config.cookie_name = Nom du fichier témoin
+config.enable_set_cookie = Fichier témoin actvité
+config.gc_interval_time = Intervalle GC
+config.session_life_time = Durée de la session
+config.https_only = HTTPS exigé
+config.cookie_life_time = Expiration du fichier témoin
+config.session_hash_function = Fonction de hashage ID de session
+config.session_hash_key = Clé de hashage ID de session
+config.picture_config = Configuration des avatars
+config.picture_service = Service image
+config.disable_gravatar = Désactivé Gravatar
+config.log_config = Configuration du journal
+config.log_mode = Mode de journal
+
+monitor.cron = Cron Tasks
+monitor.name = Name
+monitor.schedule = Schedule
+monitor.next = Next Time
+monitor.previous = Previous Time
+monitor.execute_times = Execute Times
+monitor.process = Running Processes
+monitor.desc = Description
+monitor.start = Start Time
+monitor.execute_time = Execution Time
+
+[action]
+create_repo = a créé le dépôt <a href="/%s">%s</a>
+commit_repo = a poussé sur <a href="/%s/src/%s">%s</a> à <a href="/%s">%s</a>
+create_issue = a ouvert le ticket <a href="/%s/issues/%s">%s#%s</a>
+comment_issue = a commenté sur le ticket <a href="/%s/issues/%s">%s#%s</a>
+
+[tool]
+ago = auparavant
+from_now = depuis
+now = maintenant
+1s = 1 seconde %s
+1m = 1 minute %s
+1h = 1 heure %s
+1d = 1 jour %s
+1w = 1 semaine %s
+1mon = 1 mos %s
+1y = 1 an %s
+seconds = %d secondes %s
+minutes = %d minutes %s
+hours = %d heures %s
+days = %d jours %s
+weeks = %d semaines %s
+months = %d mois %s
+years = %d années %s
+raw_seconds = secondes
+raw_minutes = minutes

conf/locale/locale_zh-CN.ini

@@ -38,6 +38,50 @@ issues = 工单管理
 
 cancel = 取消
 
+[install]
+install = 安装页面
+title = 首次运行安装程序
+requite_db_desc = Gogs 允许后端数据库为 MySQL、PostgreSQL 或 SQLite3，但是 SQLite3 一般只有官方二进制发行版才支持。
+db_type = 数据库类型
+host = 数据库主机
+user = 数据库用户
+password = 数据库用户密码
+db_name = 数据库名称
+db_helper = 如果您使用 MySQL，请使用 INNODB 引擎以及 utf8_general_ci 字符集。
+ssl_mode = SSL 模式
+path = 数据库文件路径
+sqlite_helper = SQLite3 数据库的文件路径。
+general_title = 应用基本设置
+repo_path = 仓库根目录
+repo_path_helper = 所有 Git 远程仓库都将被存放于该目录。
+run_user = 运行系统用户
+run_user_helper = 该用户必须具有对仓库根目录和运行 Gogs 的操作权限。
+domain = 域名
+domain_helper = 该设置影响 SSH 克隆地址。
+app_url = 应用 URL
+app_url_helper = 该设置影响 HTTP/HTTPS 克隆地址和一些邮箱中的链接。
+email_title = 邮件服务设置（可选）
+smtp_host = SMTP 主机
+mailer_user = 发送邮箱
+mailer_password = 发送邮箱密码
+notify_title = 通知提醒设置（可选）
+register_confirm = 启用注册邮箱确认
+mail_notify = 启用邮件通知提醒
+admin_title = 管理员帐号设置
+admin_name = 管理员用户名
+admin_password = 管理员密码
+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 版本。
+invalid_db_setting = 数据库设置不正确：%v
+invalid_repo_path = 仓库根目录设置不正确：%v
+run_user_not_match = 运行系统用户非当前用户：%s -> %s
+save_config_failed = 应用配置保存失败：%v
+invalid_admin_setting = 管理员帐户设置不正确：%v
+install_success = 您好！我们很高兴您选择使用 Gogs，祝您使用愉快，代码从此无 BUG！
+
 [home]
 uname_holder = 用户名或邮箱
 password_holder = 密码
@@ -47,6 +91,9 @@ collaborative_repos = 参与协作的仓库
 my_orgs = 我的组织
 my_mirrors = 我的镜像
 
+[explore]
+repos = 探索仓库
+
 [auth]
 create_new_account = 创建帐户
 register_hepler_msg = 已经注册？立即登录！
@@ -81,6 +128,7 @@ HttpsUrl = HTTPS URL 地址
 PayloadUrl = 推送地址
 TeamName = 团队名称
 AuthName = 认证名称
+AdminEmail = 管理员邮箱
 
 require_error = 不能为空。
 alpha_dash_error = 必须为英文字母、阿拉伯数字或横线（-_）。
@@ -118,6 +166,15 @@ org_still_own_repo = 该组织仍然是某些仓库的拥有者，您必须先
 
 still_own_user = 该授权认证依旧被部分用户使用，请先删除该部分用户后再试！
 
+[user]
+change_avatar = 到 gravatar.com 上修改您的头像
+join_on = 加入于
+repositories = 仓库列表
+activity = 公开活动
+followers = 关注者
+starred = 已点赞
+following = 关注中
+
 [settings]
 profile = 个人信息
 password = 修改密码
@@ -125,6 +182,7 @@ ssh_keys = 管理 SSH 密钥
 social = 社交帐号绑定
 orgs = 管理组织
 delete = 删除帐户
+uid = 用户 ID
 
 public_profile = 公开信息
 profile_desc = 您的邮箱地址将会被公开，并被用于接收帐户的所有提醒和通知。
@@ -133,6 +191,10 @@ website = 个人网站
 location = 所在地区
 update_profile = 更新信息
 update_profile_success = 您的个人信息更新成功！
+change_username = 用户名将被修改
+change_username_desc = 用户名被修改，您确定要继续操作吗？这将会影响到所有与您帐户有关的链接。
+continue = 继续操作
+cancel = 取消操作
 
 change_password = 修改密码
 old_password = 当前密码
@@ -161,6 +223,8 @@ unbind_success = 社交帐号解除绑定成功！
 delete_account = 删除当前帐户
 delete_prompt = 删除操作会永久清除您的帐户信息，并且 <strong>不可恢复</strong>！
 confirm_delete_account = 确认删除帐户
+delete_account_title = 帐户删除操作
+delete_account_desc = 该帐户将被永久性删除，您确定要继续操作吗？
 
 [repo]
 owner = 拥有者
@@ -185,6 +249,9 @@ migrate_type = 迁移类型
 migrate_type_helper = 本仓库将是 <span class="label label-blue label-radius">镜像</span>
 migrate_repo = 迁移仓库
 
+copy_link = 复制链接
+click_to_copy = 复制到剪切板
+copied = 复制成功
 clone_helper = 不知道如何操作？访问 <a target="_blank" href="http://git-scm.com/book/zh/Git-基础-取得项目的-Git-仓库">此处</a> 查看帮助！
 unwatch = 取消关注
 watch = 关注
@@ -192,6 +259,30 @@ unstar = 取消点赞
 star = 点赞
 fork = 派生
 
+no_desc = 暂无描述
+quick_guide = 快速帮助
+clone_this_repo = 克隆当前仓库
+create_new_repo_command = 从命令行创建一个新的仓库
+push_exist_repo = 从命令行推送已经创建的仓库
+
+branch = 分支
+tree = 目录树
+branch_and_tags = 分支与标签
+branches = 分支列表
+tags = 标签列表
+issues = 工单管理
+commits = 提交历史
+releases = 版本发布
+
+commits.commits = 次代码提交
+commits.search = 搜索提交历史
+commits.find = 查找
+commits.author = 作者
+commits.message = 备注
+commits.date = 提交日期
+commits.older = 更旧的提交
+commits.newer = 更新的提交
+
 settings = 仓库设置
 settings.options = 基本设置
 settings.collaboration = 管理协作者
@@ -201,13 +292,18 @@ settings.basic_settings = 基本设置
 settings.danger_zone = 危险操作区
 settings.site = 官方网站
 settings.update_settings = 更新仓库设置
+settings.change_reponame = 仓库名称将被修改
+settings.change_reponame_desc = 仓库名称被修改，您确定要继续操作吗？这将会影响到所有与该仓库有关的链接。
 settings.transfer = 转移仓库所有权
 settings.transfer_desc = 您可以将仓库转移至您拥有管理员权限的帐户或组织。
+settings.new_owner_has_same_repo = 新的仓库拥有者已经存在同名仓库！
 settings.delete = 删除本仓库
 settings.delete_desc = 删除仓库操作不可逆转，请三思而后行。
+settings.transfer_notices = <p>- 如果您转移给个人用户，您将对仓库失去所有权限。</p><p>- 如果您转移给您作为拥有者的组织，则可继续保持操作权限。</p>
 settings.update_settings_success = 仓库设置更新成功！
 settings.transfer_owner = 新拥有者
 settings.make_transfer = 确认转移仓库
+settings.transfer_succeed = 仓库所有权转移成功！
 settings.confirm_delete = 确认删除仓库
 settings.add_collaborator = 增加新的协作者
 settings.add_collaborator_success = 成功添加新的协作者！
@@ -228,6 +324,11 @@ settings.update_webhook = 更新 Web 钩子
 settings.update_hook_success = Web 钩子更新成功！
 settings.delete_webhook = 删除 Web 钩子
 settings.recent_deliveries = 最近推送记录
+settings.hook_type = 钩子类型
+settings.add_slack_hook_desc = 为您的仓库增加 <a href="http://slack.com">Slack</a> 集成
+settings.slack_token = 令牌
+settings.slack_domain = 域名
+settings.slack_channel = 频道
 
 [org]
 org_name_holder = 组织名称
@@ -254,11 +355,16 @@ settings.full_name = 组织全名
 settings.website = 官方网站
 settings.location = 所在地区
 settings.update_settings = 更新组织设置
+settings.change_orgname = 组织名称将被修改
+settings.change_orgname_desc = 组织名称被修改，您确定要继续操作吗？这将会影响到所有与该组织有关的链接。
 settings.update_setting_success = 组织设置更新成功！
 settings.delete = 删除组织
 settings.delete_account = 删除当前组织
 settings.delete_prompt = 删除操作会永久清除该组织的信息，并且 <strong>不可恢复</strong>！
 settings.confirm_delete_account = 确认删除组织
+settings.delete_org_title = 组织删除操作
+settings.delete_org_desc = 该组织将被永久性删除，您确定要继续操作吗？
+settings.hooks_desc = 在此处添加的 Web 钩子将会应用到该组织下的 <strong>所有仓库</strong>。
 
 members.public = 公开成员
 members.public_helper = 设为私有
@@ -287,6 +393,8 @@ teams.members = 团队成员
 teams.update_settings = 更新团队设置
 teams.delete_team = 删除当前团队
 teams.add_team_member = 添加团队成员
+teams.delete_team_title = 团队删除操作
+teams.delete_team_desc =  删除操作会永久清除有关该团队的信息，您确定要继续操作吗？团队成员可能会失去对某些仓库的操作权限。
 teams.delete_team_success = 指定团队删除成功！
 teams.read_permission_desc = 该团队拥有对所属仓库的 <strong>读取</strong> 权限，团队成员可以进行查看和克隆等只读操作。
 teams.write_permission_desc = 该团队拥有对所属仓库的 <strong>读取</strong> 和 <strong>写入</strong> 的权限。
@@ -362,6 +470,7 @@ users.is_activated = 该用户已被激活
 users.is_admin = 该用户具有管理员权限
 users.update_profile = 更新用户信息
 users.delete_account = 删除该用户
+users.still_own_repo = 该帐户仍然是某些仓库的拥有者，您必须先转移或删除它们才能执行删除帐户操作！
 
 orgs.org_manage_panel = 组织管理面板
 orgs.name = 组织名称
@@ -402,6 +511,8 @@ auths.activated = 该授权认证已经启用
 auths.update_success = 授权认证设置更新成功！
 auths.update = 更新授权认证信息
 auths.delete = 删除该授权认证
+auths.delete_auth_title = 授权认证删除操作
+auths.delete_auth_desc = 该授权认证将被删除，您确定要继续吗？
 
 config.server_config = 服务器配置
 config.app_name = 应用名称
@@ -477,10 +588,11 @@ monitor.start = 开始时间
 monitor.execute_time = 已执行时间
 
 [action]
-create_repo = 创建了仓库 <a href="/%s">%s</a>
-commit_repo = 推送了 <a href="/%s/src/%s">%s</a> 分支的代码到 <a href="/%s">%s</a>
-create_issue = 创建了工单 <a href="/%s/issues/%s">%s#%s</a>
-comment_issue = 评论了工单 <a href="/%s/issues/%s">%s#%s</a>
+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/%s/issues/%s">%s#%s</a>
+comment_issue = 评论了工单 <a href="%s/%s/issues/%s">%s#%s</a>
+transfer_repo = 将仓库 <code>%s</code> 转移至 <a href="/%s%s">%s</a>
 
 [tool]
 ago = 之前