From a4693fe2d50e38a0e0c9a5042aaf0646e76ee0ce Mon Sep 17 00:00:00 2001
From: Kajetan Kazimierczak <kajetan-kazimierczak@users.noreply.github.com>
Date: Tue, 18 May 2021 10:41:09 +0200
Subject: [PATCH] Conflict in lang files (#13)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Conflict in lang files

* test: 💍 Uppdaterade test så de tar med nya översättnigen
---
 src/index.test.ts        | 14 +++++++-------
 src/translations/it.json | 13 ++++++++++++-
 src/translations/pl.json |  3 +--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/index.test.ts b/src/index.test.ts
index ba98dcf96..305051a28 100644
--- a/src/index.test.ts
+++ b/src/index.test.ts
@@ -289,7 +289,7 @@ describe('parse', () => {
     expect(parse('MLAKA')).toEqual({
       code: 'MLAKA',
       category: 'Modersmål',
-      name: 'Akan, Asante, Fante',
+      name: 'Akan',
     })
     expect(parse('MLSQI')).toEqual({
       code: 'MLSQI',
@@ -329,7 +329,7 @@ describe('parse', () => {
     expect(parse('MLBAL')).toEqual({
       code: 'MLBAL',
       category: 'Modersmål',
-      name: 'Baluchi, Baloci, Baluci, Makrani',
+      name: 'Baluchiska',
     })
     expect(parse('MLBAM')).toEqual({
       code: 'MLBAM',
@@ -349,7 +349,7 @@ describe('parse', () => {
     expect(parse('MLBEM')).toEqual({
       code: 'MLBEM',
       category: 'Modersmål',
-      name: 'Bemba, Chibemba, Chiwemba, Ichibemba, Wemba',
+      name: 'Bemba',
     })
     expect(parse('MLBEN')).toEqual({
       code: 'MLBEN',
@@ -529,7 +529,7 @@ describe('parse', () => {
     expect(parse('MLKAM')).toEqual({
       code: 'MLKAM',
       category: 'Modersmål',
-      name: 'Kamba, Kekamba, Kikamba',
+      name: 'Kamba',
     })
     expect(parse('MLKHM')).toEqual({
       code: 'MLKHM',
@@ -894,7 +894,7 @@ describe('parse', () => {
     expect(parse('MLSOT')).toEqual({
       code: 'MLSOT',
       category: 'Modersmål',
-      name: 'Sesotho, Sisutho, Souto, Suthu, Suto',
+      name: 'Sydsotho',
     })
     expect(parse('MLSNA')).toEqual({
       code: 'MLSNA',
@@ -999,7 +999,7 @@ describe('parse', () => {
     expect(parse('MLTSN')).toEqual({
       code: 'MLTSN',
       category: 'Modersmål',
-      name: 'Tswana, Setswana',
+      name: 'Tswana',
     })
     expect(parse('MLTUR')).toEqual({
       code: 'MLTUR',
@@ -1049,7 +1049,7 @@ describe('parse', () => {
     expect(parse('MLYOR')).toEqual({
       code: 'MLYOR',
       category: 'Modersmål',
-      name: 'Yoruba, Yariba, Yooba',
+      name: 'Yoruba',
     })
     expect(parse('MLZUL')).toEqual({
       code: 'MLZUL',
diff --git a/src/translations/it.json b/src/translations/it.json
index 62f47b7f0..cda57a57e 100644
--- a/src/translations/it.json
+++ b/src/translations/it.json
@@ -9,7 +9,18 @@
     },
     "languages": {
         "ITA": "Italiano",
-        "FRA": "Francese"
+        "FRA": "Francese",
+        "TUR": "Turco",
+        "SPA": "Spagnolo",
+        "RUS": "Russo",
+        "POR": "Portogese",
+        "NOR": "Norvegese",
+        "KOR": "Coreano",
+        "ZHO": "Cinese",
+        "JPN": "Giapponese",
+        "ENG": "Inglese",
+        "DAN": "Danese",
+        "FIN": "Finlandese"
     },
     "specialLanguages": {
         "SVA": "Svedese come secondo lingua",
diff --git a/src/translations/pl.json b/src/translations/pl.json
index 11a35a7ee..37a2ac030 100644
--- a/src/translations/pl.json
+++ b/src/translations/pl.json
@@ -219,7 +219,6 @@
     "misc": {
         "Lunch": "Lunch",
         "MTID": "Czas z mentorem",
-        "Prandium": "Lunch",
-        "Rast": "Przerwa"
+        "Prandium": "Lunch"
     }
 }