Merge pull request #359 from fanningert/dev

Correct some type issues in the English translation and update the German translation

conf/locale/locale_de-DE.ini

@@ -1,4 +1,4 @@
-app_desc = Ein schmerzloses selbst gehostetes Git-Service in Go geschrieben
+app_desc = Ein schmerzloses selbst gehostetes Git-Service welches in Go geschrieben wurde
 
 home = Home
 dashboard = Dashboard
@@ -17,7 +17,7 @@ language = Sprache
 
 username = Benutzername
 email = E-mail
-password = Passwort
+password = Kennwort
 re_type = neu tippen
 captcha = Captcha
 
@@ -40,7 +40,7 @@ cancel = Abbrechen
 
 [home]
 uname_holder = Benutzername oder E-mail
-password_holder = Passwort
+password_holder = Kennwort
 switch_dashboard_context = Switch Dashboard Context
 my_repos = Meine Repositories
 collaborative_repos = Collaborative Repositories
@@ -49,135 +49,135 @@ my_mirrors = My Mirrors
 
 [auth]
 create_new_account = Neues Konto erstellen
-register_hepler_msg = Bereits ein Konto? Jetzt anmelden!
-social_register_hepler_msg = Already have an account? Bind now!
-disable_register_prompt = Sorry, registration has been disabled. Please contact the site administrator.
-disable_register_mail = Sorry, Register Mail Confirmation has been disabled.
+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= Passwort vergessen
-forget_password = Passwort vergessen?
+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 = Sign in to your e-mail
-active_your_account = Activate Your Account
+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 = Click here to resend your activation e-mail
-email_not_associate = This e-mail address does not associate to any account.
-send_reset_mail = Click here to (re)send your passowrd reset e-mail
-reset_password = Reset Your Password
-invalid_code = Sorry, your confirmation code has exipired or not valid.
-reset_password_helper = Click here to reset your password
-password_too_short = Password length cannot be less then 6.
+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.
 
 [form]
 UserName = Benutzername
-RepoName = Repository name
+RepoName = Repository Name
 Email = E-Mail-Adresse
-Password = Passwort
-Retype = Passwort erneut eingeben
-SSHTitle = SSH key name
+Password = Kennwort
+Retype = Kennwort erneut eingeben
+SSHTitle = SSH Schlüsselname
 HttpsUrl = HTTPS URL
 PayloadUrl = Payload URL
 
-require_error = ` cannot be empty.`
+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.`
-min_size_error = ` must contain at least %s characters.`
-max_size_error = ` must contain at most %s characters.`
-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.
-
-username_been_taken = Username has been already taken.
-repo_name_been_taken = Repository name has been already taken.
-org_name_been_taken = Organization name has been already taken.
-email_been_used = E-mail address has been already used.
-ssh_key_been_used = Public key name has been used.
-illegal_username = Your username contains illegal characters.
-illegal_repo_name = Repository name contains illegal characters.
-illegal_org_name = Organization name contains illegal characters.
-username_password_incorrect = Username or password is not correct.
-enterred_invalid_repo_name = Please make sure you entered repository name is correct.
-enterred_invalid_owner_name = Please make sure you entered owner name is correct.
-enterred_invalid_password = Please make sure you entered passord is correct.
-user_not_exist = Given user does not exist.
-
-invalid_ssh_key = Sorry, we're not able to verify your SSH key: %s
-auth_failed = Authentication failed: %v
+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.
+
+username_been_taken = Benutzername ist bereits vergeben.
+repo_name_been_taken = Repository Name ist bereits vergeben.
+org_name_been_taken = Organisationsname 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.
+illegal_org_name = Organisationsname 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.
+user_not_exist = Angegebener Benutzer existiert nicht.
+
+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.
 
 [settings]
-profile = Profile
-password = Passwort
-ssh_keys = SSH Keys
+profile = Profil
+password = Kennwort
+ssh_keys = SSH-Schlüssel
 social = Social Accounts
-orgs = Organizations
+orgs = Organisationen
 delete = Delete Accoount
 
-public_profile = Public Profile
+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.
-full_name = Full Name
+full_name = Vollständiger Name
 website = Website
-location = Location
-update_profile = Update Profile
+location = Standort
+update_profile = Profil aktualisieren
 update_profile_success = Your profile has been successfully updated.
 
-change_password = Change Password
-old_password = Current Password
-new_password = New Password
-password_incorrect = Current password is not correct.
-change_password_success = Password is changed successfully. You can now sign in via new password.
+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.
 
-manage_ssh_keys = Manage SSH Keys
-add_key = Add Key
+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_new_key = Add SSH Key
-key_name = Key Name
+add_new_key = SSH-Schlüssel hinzufügen
+key_name = Schlüsselname
 key_content = Content
 add_key_success = New SSH Key has been added!
-delete_key = Delete
+delete_key = löschen
 add_on = Added on
 last_used = Last used on
 no_activity = No recent activity
 
 manage_social = Manage Associated Social Accounts
 social_desc = This is a list of associated social accounts. Remove any binding that you do not recognize.
-unbind = Unbind
-unbind_success = Social account has been unbinded.
+unbind = Verknüpfung entfernen
+unbind_success = Die Verknüpfung zum Social Konto wurde entfernt.
 
-manage_orgs = Manage Organizations
+manage_orgs = Organisationen verwalten
 
-delete_account = Delete Your Account
-delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undo!
-confirm_delete_account = Confirm Deletion
+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
 
 [repo]
-owner = Owner
+owner = Eigentümer
 repo_name = Repository Name
 repo_name_helper = Great repository names are short, memorable and <strong>unique</strong>.
-visibility = Visibility
+visibility = Sichtbarkeit
 visiblity_helper = This repository is <span class="label label-red label-radius">Private</span>
-repo_desc = Description
-repo_lang = Language
+repo_desc = Beschreibung
+repo_lang = Sprache
 repo_lang_helper = Select a .gitignore file
-license = License
-license_helper = Select a license file
-init_readme = Initialize this repository with a README.md
-create_repo = Create Repository
+license = Lizenz
+	license_helper = Wählen Sie eine Lizenzdatei aus
+init_readme = Initialisieren dieses Repository mit einem README.md
+create_repo = Repository erstellen
 default_branch = Default Branch
-mirror_interval = Mirror Interval(hour)
+mirror_interval = Mirror Intervall(Stunden)
 goget_meta = Go-Get Meta
 goget_meta_helper = This repository will be <span class="label label-blue label-radius">Go-Getable</span>
 
-need_auth = Need Authorization
+need_auth = Berechtigung erforderlich
 migrate_type = Migration Type
-migrate_type_helper = This repository will be a <span class="label label-blue label-radius">Mirror</span>
+migrate_type_helper = Dieses Repository wird ein <span class="label label-blue label-radius">Mirror</span>
 migrate_repo = Migrate Repository
 
 clone_helper = Need help cloning? Visit <a target="_blank" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository">Help</a>!
@@ -187,68 +187,68 @@ unstar = Unstar
 star = Star
 fork = Fork
 
-settings = Settings
-settings.options = Options
-settings.collaboration = Collaboration
+settings = Einstellungen
+settings.options = Optionen
+settings.collaboration = Zusammenarbeit
 settings.hooks = Webhooks
-settings.deploy_keys = Deploy Keys
-settings.basic_settings = Basic Settings
+settings.deploy_keys = Schlüssel bereitstellen
+settings.basic_settings = Grundeinstellungen
 settings.danger_zone = Danger Zone
-settings.site = Official Site
-settings.update_settings = Update Settings
-settings.transfer = Transfer Ownership
+settings.site = Offizielle Website
+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 = Delete This Repository
-settings.delete_desc = Once you delete a repository, there is no going back. Please be certain.
-settings.update_settings_success = Repository options has been successfully updated.
-settings.transfer_owner = New Owner
+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_owner = Neuer Besitzer
 settings.make_transfer = Make Transfer
-settings.confirm_delete = Confirm Deletion
-settings.add_collaborator = Add New Collaborator
-settings.add_collaborator_success = New collaborator has been added.
-settings.remove_collaborator_success = Collaborator has been removed.
-settings.add_webhook = Add Webhook
+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.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 has been removed.
+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.content_type = Content Type
+settings.content_type = Inhaltstyp
 settings.secret = Secret
-settings.event_desc = Which events would you like to trigger this webhook?
+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.active = Active
+settings.active = Aktiv
 settings.active_helper = We will deliver event details when this hook is triggered.
-settings.add_hook_success = New webhook has been added.
-settings.update_webhook = Update Webhook
-settings.update_hook_success = Webhook has been updated.
-settings.delete_webhook = Delete Webhook
+settings.add_hook_success = Neuer Webhook wurde hinzugefügt.
+settings.update_webhook = Webhook aktualisieren
+settings.update_hook_success = Webhook wurde aktualisiert.
+settings.delete_webhook = Webhook löschen
 settings.recent_deliveries = Recent Deliveries
 
 [org]
-org_name_holder = Organization Name
-org_name_helper = Great organization names are short and memorable.
-org_email_helper = Organization's Email receives all notifications and confirmations.
-create_org = Create Organization
-repo_updated = Updated
-people = People
-invite_someone = Invite Someone
+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.
+create_org = Organisation erstellen
+repo_updated = Aktualisiert
+people = Personen
+invite_someone = Jemanden einladen
 teams = Teams
-lower_members = members
-lower_repositories = repositories
-create_new_team = Create New Team
-org_desc = Description
-
-settings = Settings
-settings.options = Options
-settings.full_name = Full Name
+lower_members = Mitglieder
+lower_repositories = Repositories
+create_new_team = Neues Team erstellen
+org_desc = Beschreibung
+
+settings = Einstellungen
+settings.options = Optionen
+settings.full_name = Vollständiger Name
 settings.website = Website
-settings.location = Location
-settings.update_settings = Update Settings
-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.confirm_delete_account = Confirm Deletion
+settings.location = Standort
+settings.update_settings = Aktualisierungseinstellungen
+settings.update_setting_success = Einstellung der Organisation wurde erfolgreich 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
 
 [action]
 create_repo = created repository <a href="/%s">%s</a>
@@ -285,4 +285,3 @@ years = %d Jahre %s
 
 
 
-

conf/locale/locale_en-US.ini

@@ -64,9 +64,9 @@ resent_limit_prompt = Sorry, you are sending an activation e-mail too frequently
 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 = Click here to resend your activation e-mail
 email_not_associate = This e-mail address does not associate to any account.
-send_reset_mail = Click here to (re)send your passowrd reset e-mail
+send_reset_mail = Click here to (re)send your password reset e-mail
 reset_password = Reset Your Password
-invalid_code = Sorry, your confirmation code has exipired or not valid.
+invalid_code = Sorry, your confirmation code has expired or not valid.
 reset_password_helper = Click here to reset your password
 password_too_short = Password length cannot be less then 6.