Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

README.md

@@ -19,7 +19,7 @@ You're going to love Zammad!
 - Docker multi container image: [![](https://images.microbadger.com/badges/image/zammad/zammad-docker-compose:zammad.svg)](https://microbadger.com/images/zammad/zammad-docker-compose:zammad) [![](https://img.shields.io/badge/version-stable-blue.svg)](https://hub.docker.com/r/zammad/zammad-docker-compose)
 - Docker single container image: [![](https://images.microbadger.com/badges/image/zammad/zammad.svg)](https://microbadger.com/images/zammad/zammad) [![](https://images.microbadger.com/badges/version/zammad/zammad.svg)](https://hub.docker.com/r/zammad/zammad/)
 - Vagrant: [![](https://img.shields.io/badge/version-develop-blue.svg)](https://github.com/zammad/zammad-vagrant)
-- License: [![](https://img.shields.io/badge/License-AGPL 3.0-lightgrey.svg)](https://github.com/zammad/zammad/blob/develop/LICENSE)
+- License: [![](https://img.shields.io/badge/License-AGPL%203.0-lightgrey.svg)](https://github.com/zammad/zammad/blob/develop/LICENSE)
 
 ## Installing & Getting Started
 

app/views/mailer/password_reset/en.html.erb

@@ -10,6 +10,6 @@ Reset your #{config.product_name} password
 <br>
 <div>This link takes you to a page where you can change your password.</div>
 <br>
-<div>If you don't want to reset your password, please ignore this message. Your password will not be reseted.</div>
+<div>If you don't want to reset your password, please ignore this message. Your password will not be reset.</div>
 <br>
 <div>Your #{config.product_name} Team</div>

public/assets/form/form.js

@@ -91,7 +91,7 @@ $(function() {
       },
     ],
     translations: {
-      de: {
+      'de': {
         'Name': 'Name',
         'Your Name': 'Ihr Name',
         'Email': 'E-Mail',
@@ -100,7 +100,7 @@ $(function() {
         'Attachments': 'Anhänge',
         'Your Message...': 'Ihre Nachricht...',
       },
-      es: {
+      'es': {
         'Name': 'Nombre',
         'Your Name': 'tu Nombre',
         'Email': 'correo electrónico',
@@ -109,7 +109,7 @@ $(function() {
         'Attachments': 'archivos adjuntos',
         'Your Message...': 'tu Mensaje...',
       },
-      fr: {
+      'fr': {
         'Name': 'Prénom',
         'Your Name': 'Votre nom',
         'Email': 'Email',
@@ -118,6 +118,24 @@ $(function() {
         'Attachments': 'Pièces jointes',
         'Your Message...': 'Votre message...',
       },
+      'zh-cn': {
+        'Name': '联系人',
+        'Your Name': '您的尊姓大名',
+        'Email': '电子邮件',
+        'Your Email': '您的邮件地址',
+        'Message': '留言',
+        'Attachments': '附件',
+        'Your Message...': '您的留言...',
+      },
+      'zh-tw': {
+        'Name': '聯絡人',
+        'Your Name': '您的尊姓大名',
+        'Email': 'E-Mail',
+        'Your Email': '請留下您的電子郵件地址',
+        'Message': '留言',
+        'Attachments': '附檔',
+        'Your Message...': '請寫下您的留言...'
+      },
     }
   };