diff --git a/src/components/Settings/Language/Language.component.js b/src/components/Settings/Language/Language.component.js
index 192da4ec6..e4f27bd2c 100644
--- a/src/components/Settings/Language/Language.component.js
+++ b/src/components/Settings/Language/Language.component.js
@@ -53,6 +53,15 @@ const Language = ({
         .length > 1;
 
     const langCode = showLangCode ? `(${lang})` : '';
+    let nativeName = `${ISO6391.getNativeName(locale)} ${langCode}`;
+    //handle custom native name 
+    if (lang === 'sr-ME') {
+      nativeName = 'Crnogorski jezik';
+    } else if (lang === 'sr-SP') {
+      nativeName = `Српски језик ${langCode}`;
+    } else if (lang === 'sr-RS') {
+      nativeName = `Srpski jezik ${langCode}`;
+    }
 
     return (
       <ListItem
@@ -62,11 +71,7 @@ const Language = ({
         key={index}
       >
         <ListItemText
-          primary={
-            lang !== 'sr-ME'
-              ? `${ISO6391.getNativeName(locale)} ${langCode}`
-              : `Crnogorski jezik`
-          }
+          primary={nativeName}
           secondary={<FormattedMessage {...messages[locale]} />}
         />
         {selectedLang === lang && <CheckIcon />}
diff --git a/src/components/Settings/Settings.container.js b/src/components/Settings/Settings.container.js
index 6d6edea3c..3ec4f27ef 100644
--- a/src/components/Settings/Settings.container.js
+++ b/src/components/Settings/Settings.container.js
@@ -25,6 +25,9 @@ export class SettingsContainer extends Component {
             const sLanguages = getVoicesLangs(voices);
             if (sLanguages !== undefined && sLanguages.length) {
               supportedLangs = sLanguages;
+              if(supportedLangs.includes('sr-RS')){
+                supportedLangs.push('sr-SP');
+              }
             }
           }
           setLangs(supportedLangs);
diff --git a/src/providers/SpeechProvider/SpeechProvider.container.js b/src/providers/SpeechProvider/SpeechProvider.container.js
index ed66164bf..addb3e6ed 100644
--- a/src/providers/SpeechProvider/SpeechProvider.container.js
+++ b/src/providers/SpeechProvider/SpeechProvider.container.js
@@ -23,15 +23,19 @@ export class SpeechProvider extends Component {
       setLangs,
       changeLang,
       voiceURI,
-      changeVoice
+      changeVoice,
+      getVoices
     } = this.props;
     if (tts.isSupported()) {
-      const voices = await this.props.getVoices();
+      const voices = await getVoices();
       let supportedLangs = [DEFAULT_LANG];
       if (voices.length) {
         const sLanguages = getVoicesLangs(voices);
         if (sLanguages !== undefined && sLanguages.length) {
           supportedLangs = sLanguages;
+          if (supportedLangs.includes('sr-RS')) {
+            supportedLangs.push('sr-SP');
+          }
         }
       }
       const lang = supportedLangs.includes(propsLang)
diff --git a/src/providers/SpeechProvider/SpeechProvider.reducer.js b/src/providers/SpeechProvider/SpeechProvider.reducer.js
index 10308a690..2949b396b 100644
--- a/src/providers/SpeechProvider/SpeechProvider.reducer.js
+++ b/src/providers/SpeechProvider/SpeechProvider.reducer.js
@@ -42,10 +42,14 @@ function speechProviderReducer(state = initialState, action) {
         options
       };
     case RECEIVE_VOICES:
+      const langs = [...new Set(action.voices.map(voice => voice.lang))];
+      if (langs.includes('sr-RS')) {
+        langs.push('sr-SP');
+      }
       return {
         ...state,
         voices: action.voices,
-        langs: [...new Set(action.voices.map(voice => voice.lang))].sort()
+        langs: langs.sort()
       };
     case CHANGE_VOICE:
       return {
@@ -57,14 +61,28 @@ function speechProviderReducer(state = initialState, action) {
         }
       };
     case CHANGE_LANG:
-      return {
-        ...state,
-        options: {
-          ...state.options,
-          lang: action.lang,
-          voiceURI: getVoiceURI(action.lang, state.voices)
-        }
-      };
+      // hack just for alfanum voice
+      if (action.lang === 'sr-SP' || action.lang === 'sr-RS') {
+        const language = 'sr-RS';
+        return {
+          ...state,
+          options: {
+            ...state.options,
+            lang: language,
+            voiceURI: getVoiceURI(language, state.voices)
+          },
+          langs: ['sr-SP', 'sr-RS']
+        };
+      } else {
+        return {
+          ...state,
+          options: {
+            ...state.options,
+            lang: action.lang,
+            voiceURI: getVoiceURI(action.lang, state.voices)
+          }
+        };
+      }
     case CHANGE_PITCH:
       return { ...state, options: { ...state.options, pitch: action.pitch } };
     case CHANGE_RATE:
diff --git a/src/translations/sr-RS.json b/src/translations/sr-RS.json
index ca421182c..da517d8de 100644
--- a/src/translations/sr-RS.json
+++ b/src/translations/sr-RS.json
@@ -38,6 +38,23 @@
   "cboard.components.App.save": "Sačuvaj",
   "cboard.components.App.newContentAvailable": "Dostupan je novi sadržaj; molimo osvežite stranicu.",
   "cboard.components.App.contentIsCached": "Sadržaj je sačuvan u privremenoj memoriji za vanmrežnu upotrebu.",
+  "cboard.components.Analytics.analytics": "Analitika",
+  "cboard.components.Analytics.mostUsedBoards": "Najviše korišćene table",
+  "cboard.components.Analytics.topUsedButtons": "Najviše korišćene dirke",
+  "cboard.components.Analytics.symbolSources": "Izvori simbola",
+  "cboard.components.Analytics.tenDaysUsage": "Desetodnevno korišćenje",
+  "cboard.components.Analytics.twentyDaysUsage": "Dvadeset dana upotrebe",
+  "cboard.components.Analytics.thirtyDaysUsage": "Trideset dana upotrebe",
+  "cboard.components.Analytics.sixtyDaysUsage": "Šezdeset dana upotrebe",
+  "cboard.components.Analytics.close": "Zatvori",
+  "cboard.components.Analytics.loadingError": "Došlo je do greške prilikom učitavanja podataka. Ponovite pokušaj.",
+  "cboard.components.Analytics.totalWords": "Ukupno reči",
+  "cboard.components.Analytics.totalPhrases": "Ukupno fraza",
+  "cboard.components.Analytics.boardsUsed": "Korišćene table",
+  "cboard.components.Analytics.tilesEdited": "Pločice su uređene",
+  "cboard.components.Analytics.editingEvents": "Uređivanje događaja",
+  "cboard.components.Analytics.speechEvents": "Govorni događaji",
+  "cboard.components.Analytics.navigationEvents": "Navigacijski događaji",
   "cboard.components.Board.tilesCreated": "Pločice su izrađene",
   "cboard.components.Board.tilesDeleted": "Pločice su izbrisane",
   "cboard.components.Board.rootBoardNotDeleted": "Nije moguće izbrisati zadatu tablu",
@@ -67,7 +84,7 @@
   "cboard.components.Board.boardCopyCancel": "Otkaži",
   "cboard.components.Board.boardCopyAccept": "Prihvati",
   "cboard.components.Board.boardCopiedSuccessfully": "Tabla je uspešno dodata vašem komunikatoru",
-  "cboard.components.Board.emptyVoiceAlert": "WARNING: we did not detect an available Text to Speech voice! Cboard cannot work properly.",
+  "cboard.components.Board.emptyVoiceAlert": "UPOZORENJE: Nismo pronašli odgovarajući glas za opciju pretvaranja teksta u govor. Cboard ne može da radi pravilno.",
   "cboard.components.LockToggle.lock": "Zaključaj",
   "cboard.components.LockToggle.unlock": "Otključaj",
   "cboard.components.BackButton.back": "Vrati se",
@@ -76,7 +93,7 @@
   "cboard.components.ColorSelect.clearSelection": "Obriši odabrano",
   "cboard.components.FullScreenButton.fullscreen": "Ceo ekran",
   "cboard.components.FullScreenButton.exitFullscreen": "Izađi iz celog ekrana",
-  "cboard.components.SymbolSearch.searchSymbolLibrary": "Za pretragu biblioteke simbola.",
+  "cboard.components.SymbolSearch.searchSymbolLibrary": "Pretraga biblioteke simbola.",
   "cboard.components.InputImage.uploadImage": "Učitaj sliku",
   "cboard.components.Board.TileEditor.voiceRecorder": "Snimač glasa",
   "cboard.components.Board.TileEditor.createTile": "Kreiraj pločicu",
@@ -153,7 +170,7 @@
   "cboard.components.CommunicatorDialog.boardInfoAuthor": "Autor table",
   "cboard.components.CommunicatorDialog.boardInfoTiles": "Broj pločica",
   "cboard.components.CommunicatorDialog.boardInfoId": "ID table",
-  "cboard.components.CommunicatorDialog.boardInfoDate": "Last edited",
+  "cboard.components.CommunicatorDialog.boardInfoDate": "Poslednja izmena",
   "cboard.components.CommunicatorDialog.boardPublished": "Tabla je uspešno objavljena! Sada svi mogu videti vašu tablu.",
   "cboard.components.CommunicatorDialog.boardUnpublished": "Tabla više nije objavljena! Sada niko ne može da vidi vašu tablu.",
   "cboard.components.CommunicatorDialog.boardDeleted": "Tabla je trajno izbrisana.",
@@ -166,11 +183,11 @@
   "cboard.components.CommunicatorDialog.deleteBoard": "Izbriši tablu",
   "cboard.components.CommunicatorDialog.deleteBoardDescription": "Ova akcija će izbrisati tablu i nećete je moći vratiti. Želite li da nastavite?",
   "cboard.components.CommunicatorDialog.accept": "Prihvati",
-  "cboard.components.CommunicatorDialog.imageBoardDescription": "You can either upload or look for symbols from libraries.",
-  "cboard.components.CommunicatorDialog.imageSearch": "Search for symbols",
-  "cboard.components.CommunicatorDialog.editBoardTitle": "Edit board name and description",
-  "cboard.components.CommunicatorDialog.editBoardTitleDescription": "You can edit board name and description from here. Please consider to write a meaningful description for your board.",
-  "board.components.CommunicatorDialog.noTitle": "No title",
+  "cboard.components.CommunicatorDialog.imageBoardDescription": "Možete ili otpremiti ili potražiti simbole iz galerije.",
+  "cboard.components.CommunicatorDialog.imageSearch": "Potražite simbole",
+  "cboard.components.CommunicatorDialog.editBoardTitle": "Uređivanje naziva i opisa table",
+  "cboard.components.CommunicatorDialog.editBoardTitleDescription": "Ovde možete urediti naziv i opis table. Pokušajte da napišete smisleni opis za svoju tablu.",
+  "board.components.CommunicatorDialog.noTitle": "Bеz naslova",
   "cboard.components.Settings.navigation": "Navigacija",
   "cboard.components.Settings.scanning": "Skeniranje",
   "cboard.components.Settings.display": "Prikaz",
@@ -190,7 +207,7 @@
   "cboard.components.Settings.appearance": "Izgled",
   "cboard.components.Settings.username": "Korisničko ime",
   "cboard.components.Settings.logout": "Odjava",
-  "cboard.components.Settings.loginSignup": "Login/prijava",
+  "cboard.components.Settings.loginSignup": "Prijava / registracija",
   "cboard.components.Settings.export": "Izvezi",
   "cboard.components.Settings.import": "Uvеzi",
   "cboard.components.Settings.People.people": "Ljudi",
@@ -211,13 +228,13 @@
   "cboard.components.Settings.Display.uiSizeSecondary": "Veličina elemenata",
   "cboard.components.Settings.Display.fontSize": "Veličina fonta",
   "cboard.components.Settings.Display.fontSizeSecondary": "Veličina fonta aplikacije",
-  "cboard.components.Settings.Display.LabelPositionAbove": "Above",
-  "cboard.components.Settings.Display.LabelPositionBelow": "Below",
-  "cboard.components.Settings.Display.LabelPositionHidden": "Hidden",
-  "cboard.components.Settings.Display.labelPosition": "Label Position",
-  "cboard.components.Settings.Display.darkTheme": "Enable dark theme",
-  "cboard.components.Settings.Display.darkThemeSecondary": "The theme specifies the color of the components, darkness of the surfaces, level of shadow, appropriate opacity of ink elements, etc.",
-  "cboard.components.Settings.Display.labelPositionSecondary": "Whether labels on tiles should be visible, or positioned above or below",
+  "cboard.components.Settings.Display.LabelPositionAbove": "Iznad",
+  "cboard.components.Settings.Display.LabelPositionBelow": "Ispod",
+  "cboard.components.Settings.Display.LabelPositionHidden": "Skriveno",
+  "cboard.components.Settings.Display.labelPosition": "Pozicija natpisa simbola",
+  "cboard.components.Settings.Display.darkTheme": "Omogući tamnu temu",
+  "cboard.components.Settings.Display.darkThemeSecondary": "Tema određuje boju komponenti, zatamnjenost površina, nivo osenčenosti,  odgovarajuću neprozirnost elemenata sa mastilom itd.",
+  "cboard.components.Settings.Display.labelPositionSecondary": "Natpis simbola može biti sakriven, postavljen iznad ili ispod simbola",
   "cboard.components.Settings.Scanning.scanning": "Skeniranje",
   "cboard.components.Settings.Scanning.enable": "Omogući",
   "cboard.components.Settings.Scanning.enableSecondary": "Odmah započni skeniranje table",
@@ -238,17 +255,17 @@
   "cboard.components.Settings.Navigation.quickUnlockSecondary": "Otključava postavke jednim klikom",
   "cboard.components.Settings.Navigation.outputRemove": "Uklanjanje simbola sa izlazne trake",
   "cboard.components.Settings.Navigation.outputRemoveSecondary": "Prikazuje tipku \"x\" na svakom simbolu koji treba da se ukloni",
-  "cboard.components.Settings.Display.outputHide": "Hide the output bar",
-  "cboard.components.Settings.Display.outputHideSecondary": "Hides the white bar on the top where you build a sentence.",
-  "cboard.components.Settings.Navigation.vocalizeFolders": "Enable folder vocalization",
-  "cboard.components.Settings.Navigation.vocalizeFoldersSecondary": "Reads folders name out loud when clicked",
+  "cboard.components.Settings.Display.outputHide": "Sakrijte izlaznu traku",
+  "cboard.components.Settings.Display.outputHideSecondary": "Sakriva belu traku na vrhu gde se sastavlja rečenica.",
+  "cboard.components.Settings.Navigation.vocalizeFolders": "Omogući vokalizaciju fascikli",
+  "cboard.components.Settings.Navigation.vocalizeFoldersSecondary": "Čita ime fascikle glasno kad se klikne",
   "cboard.components.Settings.Export.export": "Izvoz",
-  "cboard.components.Settings.Export.exportSingleSecondary": "This option will export a single board you have from a list of boards. You can choose {cboardLink}, {link} or PDF formats.",
-  "cboard.components.Settings.Export.exportAll": "Export All Boards",
-  "cboard.components.Settings.Export.exportAllSecondary": "This option will export ALL the boards you have if you choose {cboardLink} format or {link} format. It will export JUST the current board if you choose PDF format.",
+  "cboard.components.Settings.Export.exportSingleSecondary": "Ova opcija će izvesti jednu tablu koju imate na popisu tabli. Možete odabrati {cboardLink}, {link} ili PDF format.",
+  "cboard.components.Settings.Export.exportAll": "Izvezi sve table",
+  "cboard.components.Settings.Export.exportAllSecondary": "Ova opcija će da izveze SVE table koje imate ako odaberete format {cboardLink} ili {link} format. Ako odaberete PDF format, biće izvezena SAMO trenutna tabla.",
   "cboard.components.Settings.Export.boardDownloaded": "Vaše table su preuzete",
   "cboard.components.Settings.Export.boardDownloadedCva": "Vaše table su preuzete. Pronađite svoju datoteku u folderu za preuzimanje",
-  "cboard.components.Settings.Export.boards": "Boards",
+  "cboard.components.Settings.Export.boards": "Table",
   "cboard.components.Settings.Import.import": "Uvеzi",
   "cboard.components.Settings.Import.importSecondary": "Ova opcija će uvesti SAMO nove otkrivene table. NEĆE uvesti zadate table uključene na Cboard. Podržani formati su {cboardLink} ili {link} formata.",
   "cboard.components.Settings.Import.success": "Uspeh!! Tabla {boards} je uspešno učitana.",
@@ -266,7 +283,7 @@
   "cboard.components.Settings.Speech.rate": "Oceni",
   "cboard.components.Settings.Speech.rateDescription": "Neka glas govori brže ili sporije",
   "cboard.components.Settings.Speech.higher": "viši",
-  "cboard.components.Settings.Speech.lower": "Spusti",
+  "cboard.components.Settings.Speech.lower": "niži",
   "cboard.components.Settings.Speech.faster": "brži",
   "cboard.components.Settings.Speech.slower": "sporiji",
   "cboard.components.Settings.Speech.sampleSentence": "Zdravo! Ovo je moj glas",
@@ -309,9 +326,9 @@
   "cboard.components.Settings.Language.vietnamese": "vijetnamski",
   "cboard.components.Settings.Language.chinese": "kineski",
   "cboard.components.UserIcon.login": "Prijava ili registracija",
-  "cboard.components.VoiceRecorder.play": "Play recording",
-  "cboard.components.VoiceRecorder.clear": "Clear recording",
-  "cboard.components.VoiceRecorder.record": "Record",
+  "cboard.components.VoiceRecorder.play": "Pusti snimak",
+  "cboard.components.VoiceRecorder.clear": "Obriši snimak",
+  "cboard.components.VoiceRecorder.record": "Snimi",
   "cboard.board.home": "Početna stranica",
   "cboard.vocalization.myNameIsAmberley": "moje ime je Amberli",
   "cboard.vocalization.niceToMeetYou": "drago mi je što smo se upoznali",
@@ -346,7 +363,7 @@
   "cboard.symbol.colours": "boje",
   "cboard.symbol.iCantSpeak": "Ne mogu da govorim",
   "cboard.symbol.imThirsty": "Ja sam žedan",
-  "cboard.symbol.imHungry": "gladan sam",
+  "cboard.symbol.imHungry": "Ja sam gladan",
   "cboard.symbol.iWant": "Želim",
   "cboard.symbol.iDislike": "Ne volim",
   "cboard.symbol.quickChat": "brzo ćaskanje",
@@ -494,7 +511,7 @@
   "symbol.money.bank": "banka",
   "symbol.money.bankCard": "bankovna kartica",
   "symbol.foodMealsAndSnacks.banquetBuffet": "banketni bife",
-  "symbol.foodBreadsAndBaking.bap": "bap",
+  "symbol.foodBreadsAndBaking.bap": "zemička",
   "symbol.buildingGardenAndFarm.barbeque": "roštilj",
   "symbol.foodKitchenActions.toBarbeque": "praviti roštilj",
   "symbol.sportAccessories.baseballBase": "bejzbol baza",
@@ -599,7 +616,7 @@
   "symbol.buildingGardenAndFarm.bonfire": "lomača",
   "symbol.celebrationEvent.bonfireNight": "noć vatre",
   "symbol.buildingFurniture.bookcase": "policа za knjige",
-  "symbol.buildingContents.bookEnd": "završetak knjige",
+  "symbol.buildingContents.bookEnd": "graničnik za knjige",
   "symbol.buildingContents.bookEnds": "završeci knjige",
   "symbol.buildingFurniture.bookShelf": "polica za knjige",
   "symbol.clothesGeneral.bootees": "čizmice",
@@ -711,7 +728,7 @@
   "symbol.electricalMedia.camera": "kamera",
   "symbol.holidayAndTravel.toCamp": "kampovati",
   "symbol.celebrationItem.candle": "sveća",
-  "symbol.foodNuts.candyCane": "šećerni štap",
+  "symbol.foodNuts.candyCane": "šećerni štapić",
   "symbol.foodSweetsAndDesserts.candyFloss": "šećerna vuna",
   "symbol.foodSweetsAndDesserts.candyHearts": "medeno srce",
   "symbol.transportWater.canoe": "kanu",
@@ -893,7 +910,7 @@
   "symbol.clothesGeneral.coat": "kaput",
   "symbol.foodFeedingAndEating.coatedSpoon": "prilagođena kašika",
   "symbol.animalBirds.cockatiel": "Nimfa papagaj",
-  "symbol.animalBirds.cockerel": "petlić",
+  "symbol.animalBirds.cockerel": "petao",
   "symbol.foodNuts.coconut": "kokos",
   "symbol.drinkType.coffee": "kafa",
   "symbol.foodKitchenItems.coffeeMaker": "aparat za kafu",
@@ -1285,6 +1302,7 @@
   "symbol.foodFeedingAndEating.doidyCup": "nakrivljena uska šoljica",
   "symbol.leisureToys.doll": "lutka",
   "symbol.animalFishAndMarineMammals.dolphin": "delfin",
+  "symbol.animalFishAndMarineMammals.fishTropical": "tropical fish",
   "symbol.animalMammal.donkey": "magarac",
   "symbol.buildingStructure.door": "vrata",
   "symbol.buildingFurniture.doubleBed": "dupli krevet",
@@ -1298,7 +1316,7 @@
   "symbol.buildingFurniture.drainingBoard": "drenažni karton",
   "symbol.workAndSchoolSubjects.drama": "drama",
   "symbol.workAndSchoolTimetable.dramaClass": "čas glume",
-  "symbol.buildingFurniture.drawer": "crtač",
+  "symbol.buildingFurniture.drawer": "fioka",
   "symbol.workAndSchoolStationery.drawingPin": "igla za crtanje",
   "symbol.artMaking.toDraw": "crtati",
   "symbol.peopleActions.toDream": "sanjati",
@@ -1418,7 +1436,7 @@
   "symbol.peopleProfession.farmer": "seljak",
   "symbol.peopleActions.toFasten": "ubrzati",
   "symbol.descriptiveQuantity.fast": "brzo",
-  "symbol.peopleDescriptive.fat": "mast",
+  "symbol.peopleDescriptive.fat": "debeo",
   "symbol.celebrationItem.fatherChristmas": "deda Mraz",
   "symbol.celebrationItem.fatherChristmasSack": "Deda Mrazov džak",
   "symbol.foodDiet.fats": "masti",
@@ -1478,7 +1496,7 @@
   "symbol.animalActivityFeeding.fishFood": "hrana za ribe",
   "symbol.animalFeatures.scalesFish": "riblja vaga",
   "symbol.animalHabitat.fishTank": "akvarijum",
-  "symbol.healthcareBodyParts.fist": "Pesnica",
+  "symbol.healthcareBodyParts.fist": "pesnica",
   "symbol.number.five": "pet",
   "symbol.number.fiveDots": "pet tačaka",
   "symbol.countryFlags.flagAboriginalPeoples": "zastava aboridžinskih naroda",
@@ -1489,7 +1507,7 @@
   "symbol.countryFlags.flagAlandIslands-Finland": "zastava Olandskih ostrva - Finska",
   "symbol.countryFlags.flagAlaska": "zastava Aljaske",
   "symbol.countryFlags.flagAlbania": "zastava Albanije",
-  "symbol.countryFlags.flagAlderney": "Označi alderney",
+  "symbol.countryFlags.flagAlderney": "zastava Alderni",
   "symbol.countryFlags.flagAlgeria": "zastava Alžira",
   "symbol.countryFlags.flagAmericanSamoa": "zastava Američke Samoe",
   "symbol.countryFlags.flagAndorra": "zastava Andore",
@@ -1500,7 +1518,7 @@
   "symbol.countryFlags.flagArgentina": "zastava Argentine",
   "symbol.countryFlags.flagArmenia": "zastava Jermenije",
   "symbol.countryFlags.flagAruba": "zastava Arube",
-  "symbol.countryFlags.flagAsean": "Zastavica ASEAN",
+  "symbol.countryFlags.flagAsean": "zastava ASEAN",
   "symbol.countryFlags.flagAustria": "zastava Austrije",
   "symbol.countryFlags.flagAzerbaijan": "zastava Azerbejdžana",
   "symbol.countryFlags.flagBahrain": "zastava Bahreina",
@@ -1514,7 +1532,7 @@
   "symbol.countryFlags.flagBhutan": "zastava Butana",
   "symbol.countryFlags.flagBlank": "prazna zastava",
   "symbol.countryFlags.flagBolivia": "zastava Bolivije",
-  "symbol.countryFlags.flagBonaireDutchAntillies": "Obeleži zastavicom \"Holandski Antilies\"",
+  "symbol.countryFlags.flagBonaireDutchAntillies": "zastava Holandski Antili",
   "symbol.countryFlags.flagBosniaHerzegovina": "zastava Bosne i Hercegovine",
   "symbol.countryFlags.flagBotswana": "zastava Bocvane",
   "symbol.countryFlags.flagBrazil": "zastava Brazila",
@@ -1525,19 +1543,19 @@
   "symbol.countryFlags.flagCambodia": "zastava Kambodže",
   "symbol.countryFlags.flagCameroon": "zastava Kameruna",
   "symbol.countryFlags.flagCanada": "zastava Kanade",
-  "symbol.countryFlags.flagCanaryIslands": "Obeleži Kanarskim ostrvima",
-  "symbol.countryFlags.flagCapeVerde": "Obeleži Zelenortska verna",
-  "symbol.countryFlags.flagCaricom": "Označi caricom",
-  "symbol.countryFlags.flagCaymanIslands": "obeležavanje Kajmanska ostrva",
+  "symbol.countryFlags.flagCanaryIslands": "zastava Kanarskih ostrva",
+  "symbol.countryFlags.flagCapeVerde": "zastava Kejp Verde",
+  "symbol.countryFlags.flagCaricom": "zastava Karikom",
+  "symbol.countryFlags.flagCaymanIslands": "zastava Kajmanskih ostrva",
   "symbol.countryFlags.flagCentralAfricanRepublic": "zastava Centralnoafričke Republike",
   "symbol.countryFlags.flagChad": "zastava Čada",
   "symbol.countryFlags.flagChile": "zastava Čilea",
   "symbol.countryFlags.flagChina": "zastava Kine",
   "symbol.countryFlags.flagColombia": "zastava Kolumbije",
-  "symbol.countryFlags.flagComoros": "osa zastava",
-  "symbol.countryFlags.flagCongoBrazzaville": "Označi Konga \"Brazavilom\"",
-  "symbol.countryFlags.flagCongoKinshasa": "zastava kinshaša",
-  "symbol.countryFlags.flagCookIslands": "Označi ostrvo kuvarica",
+  "symbol.countryFlags.flagComoros": "zastava Komora",
+  "symbol.countryFlags.flagCongoBrazzaville": "zastava Kongo Brazavila",
+  "symbol.countryFlags.flagCongoKinshasa": "zastava Kinšhase",
+  "symbol.countryFlags.flagCookIslands": "zastava ostrva Kuk",
   "symbol.countryFlags.flagCostaRica": "zastava Kostarike",
   "symbol.countryFlags.flagCroatia": "zastava Hrvatske",
   "symbol.countryFlags.flagCuba": "zastava Kube",
@@ -1559,7 +1577,7 @@
   "symbol.countryFlags.flagFiji": "zastava Fidži",
   "symbol.countryFlags.flagFinland": "zastava Finske",
   "symbol.countryFlags.flagFrance": "zastava Francuske",
-  "symbol.countryFlags.flagFujairah-Uae": "Označi fairah-UAE",
+  "symbol.countryFlags.flagFujairah-Uae": "zastava Fujairah-UAE",
   "symbol.countryFlags.flagGabon": "zastava Gabona",
   "symbol.countryFlags.flagGeorgia": "zastava Gruzije",
   "symbol.countryFlags.flagGermany": "zastava Nemačke",
@@ -1969,7 +1987,7 @@
   "symbol.clothesAccessories.hankerchief": "maramica",
   "symbol.peopleFeelings.happyLady": "srećna žena",
   "symbol.peopleFeelings.happyMan": "srećni muškarac",
-  "symbol.descriptiveState.hard": "teško",
+  "symbol.descriptiveState.hard": "tvrdo",
   "symbol.clothesGeneral.hardHat": "kaciga",
   "symbol.animalMammal.hare": "zec",
   "symbol.celebrationItem.harvest": "žetva",
@@ -2089,7 +2107,7 @@
   "symbol.descriptiveQuantity.isThisEnough": "je li ovo dovoljno",
   "symbol.healthcareMedicalConditions.itch": "svrab",
   "symbol.peopleProfession.itAssistant": "IT asistent",
-  "symbol.workAndSchoolTimetable.itClass": "IT čas",
+  "symbol.workAndSchoolTimetable.itClass": "čas informatike",
   "symbol.buildingSchool.itRoom": "IT soba",
   "symbol.plantsAndTrees.ivy": "bršljan",
   "symbol.alphabet.i-LowerCase": "i",
@@ -2200,12 +2218,12 @@
   "symbol.foodKitchenItems.lid": "poklopac",
   "symbol.peopleActions.toLieOnBack": "ležati na leđima",
   "symbol.buildingStructure.lift": "lift",
-  "symbol.descriptiveQuantity.light": "svetao",
+  "symbol.descriptiveQuantity.light": "lako",
   "symbol.electricalGeneral.lightbulb": "sijalica",
   "symbol.artColour.lightBlue": "svetlo plava",
   "symbol.artColour.lightGreen": "svetlo zelena",
   "symbol.artColour.lightGrey": "svetlo siva",
-  "symbol.artColour.lightMauve": "svetlo ljubičasta",
+  "symbol.artColour.lightMauve": "ljubičasta",
   "symbol.plantsAndTrees.lily": "ljiljan",
   "symbol.foodFruit.lime": "limeta",
   "symbol.animalMammal.lion": "lav",
@@ -2216,7 +2234,7 @@
   "symbol.healthcareGroomingItems.liquidSoap": "tečni sapun",
   "symbol.descriptiveQuantity.little": "mali",
   "symbol.communicationAid.littleMacSwitch": "prekidač Little mac",
-  "symbol.animalBirds.chickenLive": "pileća džigerica",
+  "symbol.animalBirds.chickenLive": "živo pile",
   "symbol.animalReptilesAndAmphibians.lizard": "gušter",
   "symbol.buildingFurniture.locker": "ormarić",
   "symbol.plantsAndTrees.log": "cepanica",
@@ -2370,7 +2388,7 @@
   "symbol.workAndSchoolTimetable.musicClass": "čas muzičkog",
   "symbol.buildingSchool.musicRoom": "muzička soba",
   "symbol.animalCrustaceanAndMolluscs.mussel": "dagnja",
-  "symbol.computerIcon.myComputerIcon": "Ikona \"moj računar\"",
+  "symbol.computerIcon.myComputerIcon": "Ikona moj kompjuter",
   "symbol.alphabet.m-LowerCase": "m",
   "symbol.alphabet.m-UpperCase": "M",
   "symbol.toolsWorkshop.nail": "ekser",
@@ -2451,16 +2469,16 @@
   "symbol.science.opaque": "neprozirno",
   "symbol.descriptiveState.open": "otvoreno",
   "symbol.peopleActions.toOpen": "otvoriti",
-  "symbol.descriptivePosition.open": "Otvorite",
+  "symbol.descriptivePosition.open": "otvoreno",
   "symbol.computerIcon.openComputerFolder": "otvoren folder na računaru",
   "symbol.computerIcon.toOpenComputerFolder": "otvoriti folder na računaru",
   "symbol.peopleActions.toOpenDoor": "otvoriti vrata",
   "symbol.buildingShop.openShop": "otvorena prodavnica",
   "symbol.foodKitchenActions.toOpenTin": "otvoriti limenku",
   "symbol.buildingPublic.operatingTheatre": "otvoreno pozorište",
-  "symbol.healthcareMedicalConditions.operation": "Operacija",
+  "symbol.healthcareMedicalConditions.operation": "operacija",
   "symbol.descriptivePosition.opposite": "suprotan",
-  "symbol.foodFruit.orange": "narandžasta",
+  "symbol.foodFruit.orange": "pomorandža",
   "symbol.artColour.orange": "narandžasta",
   "symbol.drinkType.orangeFizzyDrink": "oranžada",
   "symbol.drinkType.orangeJuice": "sok od pomorandže",
@@ -2543,7 +2561,7 @@
   "symbol.foodKitchenActions.toPeel": "oljuštiti",
   "symbol.foodKitchenActions.toPeelOrange": "oljuštiti pomorandžu",
   "symbol.animalBirds.pelican": "pelikan",
-  "symbol.workAndSchoolStationery.pen": "olovka",
+  "symbol.workAndSchoolStationery.pen": "hemijska olovka",
   "symbol.workAndSchoolStationery.pencil": "olovka",
   "symbol.artMaking.pencilAndPaper": "olovka i papir",
   "symbol.workAndSchoolStationery.pencilBox": "pernica",
@@ -2712,7 +2730,7 @@
   "symbol.buildingHouseholdTasks.toPutOutRubbish": "baciti smeće",
   "symbol.clothesGeneral.pyjamas": "pidžama",
   "symbol.descriptiveShape.pyramidSquareBase": "kvadratna osnova piramide",
-  "symbol.descriptiveShape.pyramidTriangularBase": "trouglasta osnova piramide",
+  "symbol.descriptiveShape.pyramidTriangularBase": "piramida",
   "symbol.alphabet.p-LowerCase": "p",
   "symbol.alphabet.p-UpperCase": "P",
   "symbol.descriptiveShape.quadrilateral": "četvorostran",
@@ -2781,7 +2799,7 @@
   "symbol.sport.toRideHorse": "jahati konja",
   "symbol.clothesSport.ridingHat": "jahaći šešir",
   "symbol.military.rifle": "puška",
-  "symbol.descriptiveDirection.right": "pravo",
+  "symbol.descriptiveDirection.right": "desno",
   "symbol.electricalComputer.rightClick": "desni klik",
   "symbol.healthcareBodyParts.rightHand": "desna ruka",
   "symbol.clothesJewellery.ring": "prsten",
@@ -2839,7 +2857,7 @@
   "symbol.toolsWorkshop.sandpaper": "šmirgl papir",
   "symbol.foodMealsAndSnacks.sandwich": "sendvič",
   "symbol.leisureToys.sandPit": "kutija sa peskom",
-  "symbol.healthcareGroomingItems.sanitaryTowel": "peškir",
+  "symbol.healthcareGroomingItems.sanitaryTowel": "uložak",
   "symbol.scienceAstronomy.satellite": "satelit",
   "symbol.foodFruit.satsuma": "mandarina",
   "symbol.scienceAstronomy.saturn": "Saturn",
@@ -2929,9 +2947,9 @@
   "symbol.healthcareBodyParts.shin": "cevanica",
   "symbol.descriptiveState.shiny": "sjajan",
   "symbol.clothesGeneral.shirt": "košulja",
-  "symbol.science.shootingStar": "streljanu",
+  "symbol.science.shootingStar": "zvezda padalica",
   "symbol.sport.toShoot": "pucati",
-  "symbol.buildingShop.shop": "dućan",
+  "symbol.buildingShop.shop": "prodavnica",
   "symbol.peopleDescriptive.short": "kratak",
   "symbol.clothesGeneral.shorts": "šorc",
   "symbol.descriptiveQuantity.short": "kratak",
@@ -2954,7 +2972,7 @@
   "symbol.communicationConversation.toSign": "potpisati",
   "symbol.science.silence": "tišina",
   "symbol.foodFestival.simnelCake": "simnel torta",
-  "symbol.peopleProfession.singer": "Pevaи",
+  "symbol.peopleProfession.singer": "Pevač",
   "symbol.buildingFurniture.singleBed": "jednokrevetna soba",
   "symbol.transportRoad.busSingleDecker": "autobus na sprat",
   "symbol.peopleActions.toSing": "pevati",
@@ -2980,7 +2998,7 @@
   "symbol.sport.toSkip": "preskočiti",
   "symbol.clothesGeneral.skirt": "suknja",
   "symbol.sportAccessories.skis": "Skije",
-  "symbol.sport.toSki": "skijati",
+  "symbol.sport.toSki": "skijanje",
   "symbol.healthcareBodyParts.skull": "lobanja",
   "symbol.animalMammal.skunk": "tvor",
   "symbol.transportRoad.sledge": "sanke",
@@ -2999,7 +3017,7 @@
   "symbol.clothesGeneral.slippers": "papuče",
   "symbol.peopleDescriptive.slippery": "klizav",
   "symbol.electricalMedia.cameraSlr": "fotoaparat slr",
-  "symbol.animalCrustaceanAndMolluscs.slug": "žeton",
+  "symbol.animalCrustaceanAndMolluscs.slug": "puž golać",
   "symbol.descriptiveQuantity.clothesSmall": "odeća male veličine",
   "symbol.drinkContainersAndMeasures.smallDrink": "malo piće",
   "symbol.foodBreadsAndBaking.smallSausageRoll": "male rol viršle",
@@ -3063,7 +3081,7 @@
   "symbol.peopleActions.toSqueeze": "stisnuti",
   "symbol.animalMammal.squirrel": "veverica",
   "symbol.peopleActions.toSquirt": "našpricati",
-  "symbol.animalHabitat.stable": "stabilan",
+  "symbol.animalHabitat.stable": "štala",
   "symbol.animalMammal.stag": "jelen",
   "symbol.buildingStructure.stairs": "stepenice",
   "symbol.peopleActions.toStamp": "pečatiti",
@@ -3143,7 +3161,7 @@
   "symbol.workAndSchoolTimetable.swimmingClass": "čas plivanja",
   "symbol.clothesSport.swimmingCostume": "kupaći kostim",
   "symbol.clothesSport.swimmingTrunks": "kupaće gaće",
-  "symbol.sport.toSwim": "plivati",
+  "symbol.sport.toSwim": "plivanje",
   "symbol.leisurePlayground.swing": "ljuljaška",
   "symbol.leisurePlayground.toSwing": "ljuljati se",
   "symbol.foodSweetsAndDesserts.swissRoll": "švajcarske rolnice",
@@ -3210,7 +3228,7 @@
   "symbol.holidayAndTravel.themePark": "tematski park",
   "symbol.healthcareMedicalItems.thermometer": "termometar",
   "symbol.science.thermometer": "termometar",
-  "symbol.descriptiveQuantity.thick": "gust",
+  "symbol.descriptiveQuantity.thick": "širok",
   "symbol.healthcareBodyParts.thigh": "bedro",
   "symbol.peopleDescriptive.thin": "tanak",
   "symbol.peopleActions.toThink": "misliti",
@@ -3257,7 +3275,7 @@
   "symbol.foodMealsAndSnacks.tinCan": "limenka",
   "symbol.foodKitchenItems.tinFoil": "aluminijska folija",
   "symbol.workAndSchoolStationery.tippex": "korektor",
-  "symbol.healthcareGroomingItems.tissues": "tkiva",
+  "symbol.healthcareGroomingItems.tissues": "papirne maramice",
   "symbol.animalReptilesAndAmphibians.toad": "žaba krastača",
   "symbol.foodKitchenItems.toast": "tost",
   "symbol.foodMealsAndSnacks.toastedSandwich": "tost sendvič",
@@ -3457,7 +3475,7 @@
   "symbol.descriptiveQuantity.toWeigh": "meriti težinu",
   "symbol.peopleActions.toWeighFood": "meriti hranu",
   "symbol.healthcareGroomingActivities.toWeighPerson": "izmeriti osobu",
-  "symbol.clothesGeneral.wellingtonBoots": "Velington čizme",
+  "symbol.clothesGeneral.wellingtonBoots": "gumene čizme",
   "symbol.descriptiveDirection.west": "zapad",
   "symbol.descriptiveState.wet": "mokar",
   "symbol.question.what": "šta",