Merge pull request #358 from fanningert/dev

Correct some type issues in the english locale file

conf/locale/locale_de-DE.ini

@@ -0,0 +1,288 @@
+app_desc = Ein schmerzloses selbst gehostetes Git-Service in Go geschrieben
+
+home = Home
+dashboard = Dashboard
+explore = Erkunden
+help = Hilfe
+sign_in = Anmelden
+social_sign_in = Social Sign In: 2nd Step <small>associate account</small>
+sign_out = Abmelden
+sign_up = Sign up
+register = Register
+website = Website
+version = Version
+page = Seite
+template = Template
+language = Sprache
+
+username = Benutzername
+email = E-mail
+password = Passwort
+re_type = neu tippen
+captcha = Captcha
+
+repository = Repository
+organization = Organisation
+mirror = Mirror
+new_repo = Neues Repository
+new_migrate = Neue Migration
+new_org = Neue Organisation
+manage_org = Organisationen verwalten
+admin_panel = Admin Panel
+account_settings = Kontoeinstellungen
+settings = Einstellungen
+
+news_feed = News Feed
+pull_requests = Pull Requests
+issues = Issues
+
+cancel = Abbrechen
+
+[home]
+uname_holder = Benutzername oder E-mail
+password_holder = Passwort
+switch_dashboard_context = Switch Dashboard Context
+my_repos = Meine Repositories
+collaborative_repos = Collaborative Repositories
+my_orgs = Meine Organisationen
+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.
+remember_me = Erinnere mich
+forgot_password= Passwort vergessen
+forget_password = Passwort 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
+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.
+
+[form]
+UserName = Benutzername
+RepoName = Repository name
+Email = E-Mail-Adresse
+Password = Passwort
+Retype = Passwort erneut eingeben
+SSHTitle = SSH key name
+HttpsUrl = HTTPS URL
+PayloadUrl = Payload URL
+
+require_error = ` cannot be empty.`
+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
+
+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
+social = Social Accounts
+orgs = Organizations
+delete = Delete Accoount
+
+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.
+full_name = Full Name
+website = Website
+location = Location
+update_profile = Update Profile
+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.
+
+manage_ssh_keys = Manage SSH Keys
+add_key = Add Key
+ssh_desc = This is a list of SSH keys associated with your account. Remove any keys that you do not recognize.
+ssh_helper = <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
+key_content = Content
+add_key_success = New SSH Key has been added!
+delete_key = Delete
+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.
+
+manage_orgs = Manage Organizations
+
+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
+
+[repo]
+owner = Owner
+repo_name = Repository Name
+repo_name_helper = Great repository names are short, memorable and <strong>unique</strong>.
+visibility = Visibility
+visiblity_helper = This repository is <span class="label label-red label-radius">Private</span>
+repo_desc = Description
+repo_lang = Language
+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
+default_branch = Default Branch
+mirror_interval = Mirror Interval(hour)
+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
+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
+
+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
+unstar = Unstar
+star = Star
+fork = Fork
+
+settings = Settings
+settings.options = Options
+settings.collaboration = Collaboration
+settings.hooks = Webhooks
+settings.deploy_keys = Deploy Keys
+settings.basic_settings = Basic Settings
+settings.danger_zone = Danger Zone
+settings.site = Official Site
+settings.update_settings = Update Settings
+settings.transfer = Transfer Ownership
+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.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.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.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.secret = Secret
+settings.event_desc = Which events would you like to trigger this webhook?
+settings.event_push_only = Just the <code>push</code> event.
+settings.active = Active
+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.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
+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
+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
+
+[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>
+
+[tool]
+ago = vor
+from_now = ab sofort
+now = Jetzt
+1s = 1 Sekunde %s
+1m = 1 Minute %s
+1h = 1 Stunde %s
+1d = 1 Tag %s
+1w = 1 Woche %s
+1mon = 1 Monat %s
+1y = 1 Jahr %s
+seconds = %d Sekunden %s
+minutes = %d Minuten %s
+hours = %d Stunden %s
+days = %d Tage %s
+weeks = %d Wochen %s
+months = %d Monate %s
+years = %d Jahre %s
+
+
+
+
+
+
+
+
+
+
+
+

conf/locale/locale_en-US.ini

@@ -54,8 +54,8 @@ 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.
 remember_me = Remember Me
-forgot_password= Fotgot Password
+forgot_password= Forgot Password
-forget_password = Fotget password?
+forget_password = Forgot password?
 sign_up_now = Need an account? Sign up now.
 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
@@ -102,7 +102,7 @@ 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.
+enterred_invalid_password = Please make sure you entered password is correct.
 user_not_exist = Given user does not exist.
 
 invalid_ssh_key = Sorry, we're not able to verify your SSH key: %s
@@ -117,7 +117,7 @@ password = Password
 ssh_keys = SSH Keys
 social = Social Accounts
 orgs = Organizations
-delete = Delete Accoount
+delete = Delete Account
 
 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.
@@ -149,7 +149,7 @@ 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_success = Social account has been unbound.
 
 manage_orgs = Manage Organizations