Merge pull-request #2896

26 files changed, 26 insertions, 0 deletions

diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index e27a4501..d0fe2026 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Japanski jen',
     'NZD - New Zealand Dollar' => 'NZD - Novozelandski dolar',
     'RSD - Serbian dinar' => 'RSD - Srpski dinar',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Američki dolar',
     'Destination column' => 'Odredišna kolona',
     'Move the task to another column when assigned to a user' => 'Premjesti zadatak u neku drugu kolonu kada se dodijeli izvršiocu',
diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php
index 5091de00..98fbcab0 100644
--- a/app/Locale/cs_CZ/translations.php
+++ b/app/Locale/cs_CZ/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Japanischer Yen',
     'NZD - New Zealand Dollar' => 'NZD - Neuseeland-Dollar',
     'RSD - Serbian dinar' => 'RSD - Serbische Dinar',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - US Dollar',
     'Destination column' => 'Cílový sloupec',
     'Move the task to another column when assigned to a user' => 'Přesunout úkol do jiného sloupce, když je úkol přiřazen uživateli.',
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index 2ca864e5..4f6ccb04 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -566,6 +566,7 @@ return array(
     // 'JPY - Japanese Yen' => '',
     // 'NZD - New Zealand Dollar' => '',
     // 'RSD - Serbian dinar' => '',
+    // 'CNY - Chinese Yuan' => '',
     // 'USD - US Dollar' => '',
     // 'Destination column' => '',
     // 'Move the task to another column when assigned to a user' => '',
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 950a3b77..24eaffd6 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Japanische Yen',
     'NZD - New Zealand Dollar' => 'NZD - Neuseeland-Dollar',
     'RSD - Serbian dinar' => 'RSD - Serbische Dinar',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - US-Dollar',
     'Destination column' => 'Zielspalte',
     'Move the task to another column when assigned to a user' => 'Aufgabe in eine andere Spalte verschieben, wenn ein User zugeordnet wurde.',
diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php
index 7b7d855e..0f151637 100644
--- a/app/Locale/el_GR/translations.php
+++ b/app/Locale/el_GR/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Japanese Yen',
     'NZD - New Zealand Dollar' => 'NZD - New Zealand Dollar',
     'RSD - Serbian dinar' => 'RSD - Serbian dinar',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - US Dollar',
     'Destination column' => 'Στήλη προορισμού',
     'Move the task to another column when assigned to a user' => 'Μετακινήστε την εργασία σε άλλη στήλη όταν ανατεθεί σε ένα χρήστη',
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index 984d42db..c6b583ed 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Yen japonés',
     'NZD - New Zealand Dollar' => 'NZD - Dóloar neocelandés',
     'RSD - Serbian dinar' => 'RSD - Dinar serbio',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Dólar estadounidense',
     'Destination column' => 'Columna destino',
     'Move the task to another column when assigned to a user' => 'Mover la tarea a otra columna al asignarse a un usuario',
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index 41e51fa1..c81a9cfd 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -566,6 +566,7 @@ return array(
     // 'JPY - Japanese Yen' => '',
     // 'NZD - New Zealand Dollar' => '',
     // 'RSD - Serbian dinar' => '',
+    // 'CNY - Chinese Yuan' => '',
     // 'USD - US Dollar' => '',
     // 'Destination column' => '',
     // 'Move the task to another column when assigned to a user' => '',
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index daac98ed..50a2d2ce 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Yen',
     'NZD - New Zealand Dollar' => 'NZD - Dollar néo-zélandais',
     'RSD - Serbian dinar' => 'RSD - Dinar serbe',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Dollar américain',
     'Destination column' => 'Colonne de destination',
     'Move the task to another column when assigned to a user' => 'Déplacer la tâche dans une autre colonne lorsque celle-ci est assignée à quelqu\'un',
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index 784c27ba..5df1cb03 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Japán Yen',
     'NZD - New Zealand Dollar' => 'NZD - Új-Zélandi dollár',
     'RSD - Serbian dinar' => 'RSD - Szerb dínár',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Amerikai dollár',
     'Destination column' => 'Cél oszlop',
     'Move the task to another column when assigned to a user' => 'Feladat másik oszlopba helyezése felhasználóhoz rendélés után',
diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php
index 9398d51d..22f39d0e 100644
--- a/app/Locale/id_ID/translations.php
+++ b/app/Locale/id_ID/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Yen Jepang',
     'NZD - New Zealand Dollar' => 'NZD - Dollar Selandia baru',
     'RSD - Serbian dinar' => 'RSD - Dinar Serbia',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Dollar Amerika',
     'Destination column' => 'Kolom tujuan',
     'Move the task to another column when assigned to a user' => 'Pindahkan tugas ke kolom lain ketika ditugaskan ke pengguna',
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index 65defe86..5af3dc05 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Yen Giapponesi',
     'NZD - New Zealand Dollar' => 'NZD - Dollari della Nuova Zelanda',
     'RSD - Serbian dinar' => 'RSD - Dinar Serbi',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Dollari Americani',
     'Destination column' => 'Colonna destinazione',
     'Move the task to another column when assigned to a user' => 'Sposta il task in un\'altra colonna quando viene assegnato ad un utente',
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index d0487fb7..f4b996f6 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - 日本円',
     'NZD - New Zealand Dollar' => 'NZD - NZ ドル',
     'RSD - Serbian dinar' => 'RSD - セルビアデナール',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - 米ドル',
     'Destination column' => '移動先のカラム',
     'Move the task to another column when assigned to a user' => 'ユーザの割り当てをしたらタスクを他のカラムに移動',
diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php
index a613b467..eba10b9a 100644
--- a/app/Locale/ko_KR/translations.php
+++ b/app/Locale/ko_KR/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - 일본 엔',
     'NZD - New Zealand Dollar' => 'NZD - 뉴질랜드 달러',
     'RSD - Serbian dinar' => 'RSD - 세르비아 디나르',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - 미국 달러',
     'Destination column' => '이동 후 컬럼',
     'Move the task to another column when assigned to a user' => '사용자의 할당을 하면 할일을 다른 컬럼에 이동',
diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index be335dec..d527798c 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Yen Jepang',
     'NZD - New Zealand Dollar' => 'NZD - Dollar Selandia baru',
     'RSD - Serbian dinar' => 'RSD - Dinar Serbia',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Dollar Amerika',
     'Destination column' => 'Kolom tujuan',
     'Move the task to another column when assigned to a user' => 'Pindahkan tugas ke kolom lain ketika ditugaskan ke pengguna',
diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php
index 6b49545c..77febbed 100644
--- a/app/Locale/nb_NO/translations.php
+++ b/app/Locale/nb_NO/translations.php
@@ -566,6 +566,7 @@ return array(
     // 'JPY - Japanese Yen' => '',
     // 'NZD - New Zealand Dollar' => '',
     // 'RSD - Serbian dinar' => '',
+    // 'CNY - Chinese Yuan' => '',
     // 'USD - US Dollar' => '',
     'Destination column' => 'Ny kolonne',
     'Move the task to another column when assigned to a user' => 'Flytt oppgaven til en annen kolonne når den er tildelt en bruker',
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 44434a4e..bf218d21 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -566,6 +566,7 @@ return array(
     // 'JPY - Japanese Yen' => '',
     // 'NZD - New Zealand Dollar' => '',
     // 'RSD - Serbian dinar' => '',
+    // 'CNY - Chinese Yuan' => '',
     // 'USD - US Dollar' => '',
     'Destination column' => 'Doel kolom',
     // 'Move the task to another column when assigned to a user' => '',
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 51c0fef8..9c16a880 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Jen japoński',
     'NZD - New Zealand Dollar' => 'NZD - Dolar nowozelandzki',
     'RSD - Serbian dinar' => 'RSD - Dinar serbski',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Dolar amerykański',
     'Destination column' => 'Kolumna docelowa',
     'Move the task to another column when assigned to a user' => 'Przenieś zadanie do innej kolumny gdy zostanie przypisane do osoby',
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index c0fa2387..cd09255e 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Iene japonês',
     'NZD - New Zealand Dollar' => 'NZD - Dólar Neozelandês',
     'RSD - Serbian dinar' => 'RSD - Dinar sérvio',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Dólar norte-americano',
     'Destination column' => 'Coluna de destino',
     'Move the task to another column when assigned to a user' => 'Mover a tarefa para uma outra coluna quando esta está atribuída a um usuário',
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index 3a229570..9cd78737 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Iene japonês',
     'NZD - New Zealand Dollar' => 'NZD - Dólar Neozelandês',
     'RSD - Serbian dinar' => 'RSD - Dinar sérvio',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Dólar norte-americano',
     'Destination column' => 'Coluna de destino',
     'Move the task to another column when assigned to a user' => 'Mover a tarefa para uma outra coluna quando esta está atribuída a um utilizador',
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 4d821f6a..6cacf5bb 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Японскай йена',
     'NZD - New Zealand Dollar' => 'NZD - Новозеландский доллар',
     'RSD - Serbian dinar' => 'RSD - Сербский динар',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - доллар США',
     'Destination column' => 'Колонка назначения',
     'Move the task to another column when assigned to a user' => 'Переместить задачу в другую колонку, когда она назначена пользователю',
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 470e3390..a0c5f1bc 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -566,6 +566,7 @@ return array(
     // 'JPY - Japanese Yen' => '',
     // 'NZD - New Zealand Dollar' => '',
     // 'RSD - Serbian dinar' => '',
+    // 'CNY - Chinese Yuan' => '',
     // 'USD - US Dollar' => '',
     // 'Destination column' => '',
     // 'Move the task to another column when assigned to a user' => '',
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 2ec4fa82..536b0ed4 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - Japanska Yen',
     'NZD - New Zealand Dollar' => 'NZD - Nya Zeeländska Dollar',
     'RSD - Serbian dinar' => 'RSD - Serbiska Dinarer',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - Amerikanska Dollar',
     'Destination column' => 'Målkolumn',
     'Move the task to another column when assigned to a user' => 'Flytta uppgiften till en annan kolumn när den tilldelats en användare',
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index 5e0912fc..3f4f4092 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -566,6 +566,7 @@ return array(
     'JPY - Japanese Yen' => 'JPY - เยน',
     'NZD - New Zealand Dollar' => 'NZD - ดอลลาร์นิวซีแลนด์',
     'RSD - Serbian dinar' => 'RSD - ดีนาร์เซอร์เบีย',
+    // 'CNY - Chinese Yuan' => '',
     'USD - US Dollar' => 'USD - ดอลลาร์สหรัฐ',
     'Destination column' => 'คอลัมน์เป้าหมาย',
     'Move the task to another column when assigned to a user' => 'ย้ายงานไปคอลัมน์อื่นเมื่อกำหนดบุคคลรับผิดชอบ',
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 1a648bbf..ce1ceed6 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -566,6 +566,7 @@ return array(
     // 'JPY - Japanese Yen' => '',
     // 'NZD - New Zealand Dollar' => '',
     // 'RSD - Serbian dinar' => '',
+    // 'CNY - Chinese Yuan' => '',
     // 'USD - US Dollar' => '',
     'Destination column' => 'Hedef Sütun',
     'Move the task to another column when assigned to a user' => 'Bir kullanıcıya atandığında görevi başka bir sütuna taşı',
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index c87adbec..bbe7df5b 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -567,6 +567,7 @@ return array(
     'NZD - New Zealand Dollar' => '新西兰元',
     'RSD - Serbian dinar' => '第纳尔',
     'USD - US Dollar' => '美元',
+    'CNY - Chinese Yuan' => '人民币',
     'Destination column' => '目标栏目',
     'Move the task to another column when assigned to a user' => '指定负责人时移动到其它栏目',
     'Move the task to another column when assignee is cleared' => '移除负责人时移动到其它栏目',
diff --git a/app/Model/CurrencyModel.php b/app/Model/CurrencyModel.php
index bfd9697c..6144ec90 100644
--- a/app/Model/CurrencyModel.php
+++ b/app/Model/CurrencyModel.php
@@ -42,6 +42,7 @@ class CurrencyModel extends Base
             'NOK' => t('NOK - Norwegian Krone'),
             'BAM' => t('BAM - Konvertible Mark'),
             'RUB' => t('RUB - Russian Ruble'),
+            'CNY' => t('CNY - Chinese Yuan'),
         );
     }