Merge branch 'develop' of git.znuny.com:zammad/zammad into develop
This commit is contained in:
commit
1a1e1a2d7b
3 changed files with 23 additions and 5 deletions
|
@ -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 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/)
|
- 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)
|
- 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
|
## Installing & Getting Started
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,6 @@ Reset your #{config.product_name} password
|
||||||
<br>
|
<br>
|
||||||
<div>This link takes you to a page where you can change your password.</div>
|
<div>This link takes you to a page where you can change your password.</div>
|
||||||
<br>
|
<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>
|
<br>
|
||||||
<div>Your #{config.product_name} Team</div>
|
<div>Your #{config.product_name} Team</div>
|
||||||
|
|
|
@ -91,7 +91,7 @@ $(function() {
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
translations: {
|
translations: {
|
||||||
de: {
|
'de': {
|
||||||
'Name': 'Name',
|
'Name': 'Name',
|
||||||
'Your Name': 'Ihr Name',
|
'Your Name': 'Ihr Name',
|
||||||
'Email': 'E-Mail',
|
'Email': 'E-Mail',
|
||||||
|
@ -100,7 +100,7 @@ $(function() {
|
||||||
'Attachments': 'Anhänge',
|
'Attachments': 'Anhänge',
|
||||||
'Your Message...': 'Ihre Nachricht...',
|
'Your Message...': 'Ihre Nachricht...',
|
||||||
},
|
},
|
||||||
es: {
|
'es': {
|
||||||
'Name': 'Nombre',
|
'Name': 'Nombre',
|
||||||
'Your Name': 'tu Nombre',
|
'Your Name': 'tu Nombre',
|
||||||
'Email': 'correo electrónico',
|
'Email': 'correo electrónico',
|
||||||
|
@ -109,7 +109,7 @@ $(function() {
|
||||||
'Attachments': 'archivos adjuntos',
|
'Attachments': 'archivos adjuntos',
|
||||||
'Your Message...': 'tu Mensaje...',
|
'Your Message...': 'tu Mensaje...',
|
||||||
},
|
},
|
||||||
fr: {
|
'fr': {
|
||||||
'Name': 'Prénom',
|
'Name': 'Prénom',
|
||||||
'Your Name': 'Votre nom',
|
'Your Name': 'Votre nom',
|
||||||
'Email': 'Email',
|
'Email': 'Email',
|
||||||
|
@ -118,6 +118,24 @@ $(function() {
|
||||||
'Attachments': 'Pièces jointes',
|
'Attachments': 'Pièces jointes',
|
||||||
'Your Message...': 'Votre message...',
|
'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...': '請寫下您的留言...'
|
||||||
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue