diff --git a/app/src/main/res/values-de/strings_preferences.xml b/app/src/main/res/values-de/strings_preferences.xml
index 0e474148178abb41a3182900e02b1db2bec1dba0..dfafc5d70474e0f361bf4aa8e84e649fa8b70dc2 100644
--- a/app/src/main/res/values-de/strings_preferences.xml
+++ b/app/src/main/res/values-de/strings_preferences.xml
@@ -110,6 +110,9 @@
   <string name="preference_larger_emoji_title">Große Reaktionen</string>
   <string name="preference_larger_emoji_summary">Zeigt Nachrichten, die nur Emoji enthalten, größer an</string>
 
+  <string name="preference_highlight_own_messages_title">Eigene Nachrichten hervorheben</string>
+  <string name="preference_highlight_own_messages_summary">Hebt eigene Nachrichten besser sichtbar hervor</string>
+
 
   <string name="preference_autocomplete_title">Autovervollständigung</string>
 
diff --git a/app/src/main/res/values-fr-rCA/strings_preferences.xml b/app/src/main/res/values-fr-rCA/strings_preferences.xml
index 913f3c06a8a8ba889587f5a4e6629963059d4b02..f6160856e53fed36036800e15144a0ca6f312846 100644
--- a/app/src/main/res/values-fr-rCA/strings_preferences.xml
+++ b/app/src/main/res/values-fr-rCA/strings_preferences.xml
@@ -110,7 +110,6 @@
   <string name="preference_larger_emoji_title">Réactions Plus Grosses</string>
   <string name="preference_larger_emoji_summary">Grossir les emoji si le message ne contient que des emojis</string>
 
-
   <string name="preference_autocomplete_title">Auto-Complétion</string>
 
   <string name="preference_autocomplete_sender_doubleclick_title">Auto-Complétion de l\'expéditeur</string>
diff --git a/app/src/main/res/values-lt/strings_preferences.xml b/app/src/main/res/values-lt/strings_preferences.xml
index e18c189ce8dc179299f5857fdd20d62ea8364022..16176aa7c779117995e205f6684840ba89619b18 100644
--- a/app/src/main/res/values-lt/strings_preferences.xml
+++ b/app/src/main/res/values-lt/strings_preferences.xml
@@ -110,7 +110,6 @@
   <string name="preference_larger_emoji_title">Didesni Emoji</string>
   <string name="preference_larger_emoji_summary">Padidinti emoji žinutes</string>
 
-
   <string name="preference_autocomplete_title">Auto-užbaigimas</string>
 
   <string name="preference_autocomplete_sender_doubleclick_title">Siuntėjo auto-įvedimas</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index fc5220aa6e85954b43110cc18498480032cc81f4..a8ce4b2760b8317c93982274d5c0c7e5dc8e4fda 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -90,7 +90,7 @@
   <string name="label_rename">Renomear</string>
   <string name="label_save">Guardar</string>
   <string name="label_select">Selecionar</string>
-  <string name="label_set_default">Definir Como Predefinido</string>
+  <string name="label_set_default">Definir Como Padrão</string>
   <string name="label_settings">Configurações</string>
   <string name="label_settings_client">Configurações do Cliente</string>
   <string name="label_settings_core">Configurações do Núcleo</string>
@@ -100,7 +100,7 @@
   <string name="label_topic">Tópico do Canal</string>
   <string name="label_translators">Tradutores</string>
   <string name="label_unhide">Tornar Visível</string>
-  <string name="label_use_default">Usar Predefinido</string>
+  <string name="label_use_default">Utilizar Padrão</string>
   <string name="label_website">Site</string>
   <string name="label_whitelist">Ignorar</string>
   <string name="label_whitelist_ignore_date">A data de caducidade é ignorada para este certificado</string>
diff --git a/app/src/main/res/values-pt/strings_preferences.xml b/app/src/main/res/values-pt/strings_preferences.xml
index c82d8a199f4cb75eecfcfca17a08af97c12e9c57..a27b828ee7ac7965be9c50777317b2c43cfd296a 100644
--- a/app/src/main/res/values-pt/strings_preferences.xml
+++ b/app/src/main/res/values-pt/strings_preferences.xml
@@ -110,6 +110,9 @@
   <string name="preference_larger_emoji_title">Reações Maiores</string>
   <string name="preference_larger_emoji_summary">Aumenta o tamanho das mensagens contendo apenas emojis</string>
 
+  <string name="preference_highlight_own_messages_title">Marcar próprias mensagens</string>
+  <string name="preference_highlight_own_messages_summary">Mostra as suas mensagens de forma mais proeminente</string>
+
 
   <string name="preference_autocomplete_title">Autocompletar</string>
 
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 6cffa095e9c57bdf495a040e90fd1babb35bf72d..9015ae6987a957371f44e607fe32315d29b1f040 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -20,16 +20,16 @@
 <resources>
   <string name="app_name">Quasseldroid</string>
   <string name="app_description">Android baziran klijent za decentralizovani Quassel IRC klijent.</string>
-  <string name="app_description_long">Quassel je distribuiran, decentralizovan IRC klijent, napisan pomoću C++ i Qt-a. Quasseldroid je čisto kotlin klijent za Quassel Core, omogućujući vam da se povežete na vaše Quassel Core koristeći vaš Android™ telefon. </string>
+  <string name="app_description_long">Quassel je distribuirani, decentralizovani IRC klijent, napisan koristeći C++ i Qt. Quasseldroid je klijent za Quassel jezgro napisan u Kotlinu, koji vam omogućava povezivanje na Quassel jezgro koristeći svoj Android™ telefon.</string>
 
   <string name="connection_service_title">Usluga Povezivanja</string>
-  <string name="connection_service_description">Održava vezu sa vašim Core-om što omogućava obavještenja i slanje poruka.</string>
+  <string name="connection_service_description">Održava vezu sa vašim jezgrom što omogućava dobijanje obaveštenja i slanje poruka.</string>
 
   <string name="label_about">O aplikaciji</string>
   <string name="label_accept">Prihvati</string>
   <string name="label_avatar">Avatar</string>
   <string name="label_back">Nazad</string>
-  <string name="label_buffer_name">Ime Buffera</string>
+  <string name="label_buffer_name">Ime bafera</string>
   <string name="label_cancel">Otkaži</string>
   <string name="label_update_user_password">Ažuriraj korisnika/lozinku</string>
   <string name="label_certificates">Sertifikati</string>
@@ -40,23 +40,23 @@
   <string name="label_connect">Poveži se</string>
   <string name="label_contributors">Saradnici</string>
   <string name="label_copy">Kopiraj</string>
-  <string name="label_crashes">Padovi Aplikacije</string>
+  <string name="label_crashes">Padovi aplikacije</string>
   <string name="label_create_shortcut">Kreiraj prečicu</string>
   <string name="label_delete">Obriši</string>
   <string name="label_delete_all">Obriši sve</string>
   <string name="label_disconnect">Prekini vezu</string>
-  <string name="label_edit_nick">Promijeni nadimak</string>
-  <string name="label_edit_topic">Promijeni temu</string>
+  <string name="label_edit_nick">Izmeni nadimak</string>
+  <string name="label_edit_topic">Izmeni temu</string>
   <string name="label_edit_topic_long">Otvori dijalog za mijenjanje teme kanala</string>
-  <string name="label_filter_messages">Filtriraj Poruke</string>
+  <string name="label_filter_messages">Filtriraj poruke</string>
   <string name="label_github">GitHub</string>
   <string name="label_hide_perm">Sakrij trajno</string>
   <string name="label_hide_temp">Sakrij privremeno</string>
   <string name="label_ignore">Ignoriši</string>
-  <string name="label_ignore_long">Dodaj/ukloni korisnika u/iz listu/liste ignorisanih</string>
-  <string name="label_info_channel">Detalji Kanala</string>
-  <string name="label_info_core">Podaci o Core-u</string>
-  <string name="label_info_user">Detalji o Korisniku</string>
+  <string name="label_ignore_long">Dodaj/ukloni korisnika iz liste ignorisanih</string>
+  <string name="label_info_channel">Podaci o kanalu</string>
+  <string name="label_info_core">Podaci o jezgru</string>
+  <string name="label_info_user">Podaci o korisniku</string>
   <string name="label_input_history">Istorija Unošenja</string>
   <string name="label_join">Pridruži se</string>
   <string name="label_join_long">Pridruži se kanalu</string>
@@ -64,7 +64,7 @@
   <string name="label_license">Licenca</string>
   <string name="label_mark_read">Označi pročitanim</string>
   <string name="label_mention">Spomeni</string>
-  <string name="label_mention_long">Kopiraj korisničko ime u liniju za unos</string>
+  <string name="label_mention_long">Kopiraj korisničko ime u polje za unos</string>
   <string name="label_new_account">Novi nalog</string>
   <string name="label_new_chatlist">Nova lista razgovora</string>
   <string name="label_new_highlight_rule">Novo Pravilo Isticanja</string>
@@ -75,8 +75,8 @@
   <string name="label_new_server">Novi server</string>
   <string name="label_nicklist">Lista nadimaka</string>
   <string name="label_no">Ne</string>
-  <string name="label_no_away_message">Poruka u odsustvu nije dostupna</string>
-  <string name="label_no_sound">Nijedan</string>
+  <string name="label_no_away_message">Poruka iz odsustva nije dostupna</string>
+  <string name="label_no_sound">Nijedno</string>
   <string name="label_reply">Odgovori</string>
   <string name="label_reset">Resetuj</string>
   <string name="label_open">Otvori</string>
@@ -91,12 +91,12 @@
   <string name="label_save">Sačuvaj</string>
   <string name="label_select">Odaberi</string>
   <string name="label_set_default">Podesi podrazumevane parametre</string>
-  <string name="label_settings">Podešavanja</string>
-  <string name="label_settings_client">Podešavanja klijenta</string>
-  <string name="label_settings_core">Podešavanja Core-a</string>
+  <string name="label_settings">Podešavanje</string>
+  <string name="label_settings_client">Podešavanje klijenta</string>
+  <string name="label_settings_core">Podešavanje jezgra</string>
   <string name="label_share">Podijeli</string>
-  <string name="label_share_crashreport">Podijeli Izvještaj o Padu Programa</string>
-  <string name="label_show_hidden">Pokaži Sakriveno</string>
+  <string name="label_share_crashreport">Podeli izveštaj o padu aplikacije</string>
+  <string name="label_show_hidden">Prikaži sakrivene</string>
   <string name="label_topic">Tema kanala</string>
   <string name="label_translators">Prevodioci</string>
   <string name="label_unhide">Učini vidljivim</string>
@@ -107,7 +107,7 @@
   <string name="label_whitelist_certificates">Sertifikati</string>
   <string name="label_whitelist_hostnames">Hostovi</string>
   <string name="label_who">Who</string>
-  <string name="label_who_long">Obnovi korisničke informacije svih korisnika</string>
+  <string name="label_who_long">Ažuriraj korisničke informacije svakog korisnika</string>
   <string name="label_whois">Whois</string>
   <string name="label_whois_long">Ažuriraj korisničke informacije</string>
   <string name="label_yes">Da</string>
@@ -115,30 +115,30 @@
   <string name="label_feature_synchronizedmarkerline">Potrebno za sinhronizovanje poslednje pozicije u kanalima</string>
   <string name="label_feature_saslauthentication">Potrebno za SASL</string>
   <string name="label_feature_saslexternal">Potrebno za SASL sa sertifikatima</string>
-  <string name="label_feature_hideinactivenetworks">Potrebno za sakrivanje neaktivnih mreža sa čet lista</string>
-  <string name="label_feature_passwordchange">Potrebno za mijenjanje lozinke iz klijenta</string>
-  <string name="label_feature_capnegotiation">Potrebno za IRCv3 mogućnosti</string>
-  <string name="label_feature_verifyserverssl">Potrebno za verifikaciju SSL sertifikata IRC mreža na koje ste spojeni</string>
-  <string name="label_feature_customratelimits">Potrebno za posebne rate limite IRC mreža</string>
-  <string name="label_feature_awayformattimestamp">Potrebno za posebno formatirane vremenske oznake u porukama iz odsutnosti</string>
-  <string name="label_feature_bufferactivitysync">Potrebno za traženje aktivnosti četova u čet listi</string>
+  <string name="label_feature_hideinactivenetworks">Potrebno za sakrivanje neaktivnih mreža u listama razgovora</string>
+  <string name="label_feature_passwordchange">Potrebno za menjanje lozinke iz klijenta</string>
+  <string name="label_feature_capnegotiation">Potrebno za IRCv3 funkcije</string>
+  <string name="label_feature_verifyserverssl">Potrebno za verifikaciju SSL sertifikata IRC mreža na koje ste povezani</string>
+  <string name="label_feature_customratelimits">Potrebno za prilagođena ograničenja brzina IRC mreža</string>
+  <string name="label_feature_awayformattimestamp">Potrebno za prilagođavanje formatiranja vremenskih oznaka u porukama iz odsustva.</string>
+  <string name="label_feature_bufferactivitysync">Potrebno za uvid u aktivnost razgovora u listi razgovora</string>
   <string name="label_feature_coresidehighlights">Potrebno za isticanje</string>
   <string name="label_feature_senderprefixes">Potrebno za vidljivost prefiksa modova (+, @) korisnika u porukama</string>
-  <string name="label_feature_remotedisconnect">Potrebno za daljinsko prekidanje veze vaših klijenata</string>
+  <string name="label_feature_remotedisconnect">Potrebno za daljinsko prekidanje veze sopstvenih klijenata</string>
   <string name="label_feature_richmessages">Potrebno za vidljivost pravih imena ili IRCv3 ili Gravatar avatara u porukama</string>
-  <string name="label_feature_backlogfiltertype">Potrebno za primanje prošlih obavještenja posle povezivanja</string>
+  <string name="label_feature_backlogfiltertype">Potrebno za primanje prošlih obaveštenja posle povezivanja</string>
 
   <string name="notification_channel_connection_title">Veza</string>
   <string name="notification_channel_highlight_title">Isticanje</string>
 
-  <string name="label_missing_features">Nedostajuće Funkcije</string>
-  <string name="info_missing_features">Vašem Core-u nedostaju funkcije koje su potrebne da Quasseldroid fukncioniše pravilno</string>
+  <string name="label_missing_features">Funkcije koje nedostaju</string>
+  <string name="info_missing_features">Vašem jezgru nedostaju funkcije potrebne za pravilno funkcionisanje Quasseldroid-a.</string>
 
-  <string name="buffer_delete_confirmation">Da li želite trajno obrisati ovaj buffer?</string>
+  <string name="buffer_delete_confirmation">Želite li trajno obrisati ovaj bafer?</string>
 
-  <string name="delete_confirmation">Da li ste sigurni da želite ovo trajno obrisati? Ovo se ne može opozvati.</string>
-  <string name="cancel_confirmation">Imate nesačuvanih promjena. Da li ih želite odbaciti?</string>
+  <string name="delete_confirmation">Da li ste sigurni da želite ovo trajno obrisati? Ovaj postupak se kasnije ne može poništiti.</string>
+  <string name="cancel_confirmation">Imate nesačuvane promene. Da li ih želite odbaciti?</string>
 
-  <string name="info_copied_version">Verzija kopirana u clipboard</string>
+  <string name="info_copied_version">Verzija kopirana u klipbord</string>
 
   </resources>
diff --git a/app/src/main/res/values-sr/strings_defaults.xml b/app/src/main/res/values-sr/strings_defaults.xml
index cef504df9a71a27dfe3a8be2acbb93069992638f..42ccef056d7e90c4611d822c035276edeb773da4 100644
--- a/app/src/main/res/values-sr/strings_defaults.xml
+++ b/app/src/main/res/values-sr/strings_defaults.xml
@@ -20,7 +20,7 @@
 <resources>
   <string name="default_bufferviewconfig_name">Svi razgovori</string>
 
-  <string name="default_identity_identity_name">Podrazumjevani identitet</string>
+  <string name="default_identity_identity_name">Podrazumevani identitet</string>
   <string name="default_identity_realname">Quassel IRC korisnik</string>
   <string name="default_identity_awayreason">Otišli pecati.</string>
   <string name="default_identity_autoawayreason">Ne ovde. Ne, stvarno. ne ovde!</string>
diff --git a/app/src/main/res/values-sr/strings_info.xml b/app/src/main/res/values-sr/strings_info.xml
index 1ea4983dbfb3d6b9ce7f4a6467715eeb11c87886..76ea70b1f77e26f43e872b16514d5eb8b62d9065 100644
--- a/app/src/main/res/values-sr/strings_info.xml
+++ b/app/src/main/res/values-sr/strings_info.xml
@@ -38,6 +38,6 @@
 
   <string name="property_group_ircchannel_channel">Kanal</string>
   <string name="property_ircchannel_topic">Tema</string>
-  <string name="property_ircchannel_topic_action_edit">Promijeni temu</string>
+  <string name="property_ircchannel_topic_action_edit">Izmeni temu</string>
   <string name="property_ircchannel_topic_default">Tema nije postavljena</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings_messages.xml b/app/src/main/res/values-sr/strings_messages.xml
index 7e6611855e9e3a4f6fe2090fbe67c2e787426b2b..431b3d2040bef330b5051db457f2235449e1da1b 100644
--- a/app/src/main/res/values-sr/strings_messages.xml
+++ b/app/src/main/res/values-sr/strings_messages.xml
@@ -35,8 +35,8 @@
   <string name="message_format_join">%1$s%2$s se pridružio/la %3$s</string>
   <string name="message_format_part_1">%1$s%2$s je napustio/la kanal</string>
   <string name="message_format_part_2">%1$s%2$s je napustio/la kanal (%3$s)</string>
-  <string name="message_format_quit_1">%1$s%2$s je izašao/la</string>
-  <string name="message_format_quit_2">%1$s%2$s je izašao/la (%3$s)</string>
+  <string name="message_format_quit_1">%1$s%2$s je prekinuo/la vezu</string>
+  <string name="message_format_quit_2">%1$s%2$s je prekinuo/la vezu (%3$s)</string>
   <string name="message_format_kick_1">%1$s je izbačen od %2$s%3$s</string>
   <string name="message_format_kick_2">%1$s je izbačen od %2$s%3$s (%4$s)</string>
   <string name="message_format_kill_1">%1$s je ubijen/na od %2$s%3$s</string>
@@ -49,6 +49,6 @@
   <plurals name="message_netsplit_quit">
     <item quantity="one">Netsplit između %1$s i %2$s: %3$d je napustio/la</item>
     <item quantity="few">Netsplit između %1$s i %2$s: %3$d su napustili</item>
-    <item quantity="other">Netsplit između %1$s i %2$s: %3$d korisnika je izašlo</item>
+    <item quantity="other">Netsplit između %1$s i %2$s: %3$d korisnika je prekinulo vezu</item>
   </plurals>
 </resources>
diff --git a/app/src/main/res/values-sr/strings_preferences.xml b/app/src/main/res/values-sr/strings_preferences.xml
index afea9e0f190a3ee89ea34d2e63099d8a99ccdf82..67ddce6e207c2a7528da0fd4a9264d19f4d4cdd0 100644
--- a/app/src/main/res/values-sr/strings_preferences.xml
+++ b/app/src/main/res/values-sr/strings_preferences.xml
@@ -31,17 +31,17 @@
   <string name="preference_theme_entry_gruvbox_light">Gruvbox (Svijetlo)</string>
   <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Tamno)</string>
   <string name="preference_theme_entry_dracula">Drakula</string>
-  <string name="preference_input_enter_title">Pritisni taster na tastaturi</string>
+  <string name="preference_input_enter_title">Funkcija \"Enter\" dugmeta na tastaturi</string>
   <string name="preference_input_enter_entry_emoji">Emoji</string>
   <string name="preference_input_enter_entry_send">Pošalji</string>
-  <string name="preference_show_lag_title">Prikaži Lag</string>
-  <string name="preference_show_lag_summary">Prikazuje lag između klijenta i Core-a u action traci</string>
+  <string name="preference_show_lag_title">Prikazuj kašnjenje</string>
+  <string name="preference_show_lag_summary">Prikazuje kašnjenje između klijenta i jezgra u komandnoj traci</string>
 
-  <string name="preference_keep_screen_on_title">Održi Screen Aktivnim</string>
-  <string name="preference_keep_screen_on_summary">Sprečava uređaj od odlaženja u sleep mod dok je aplikacija u prvom planu</string>
+  <string name="preference_keep_screen_on_title">Održavaj uključen ekran</string>
+  <string name="preference_keep_screen_on_summary">Sprečava ulaženje uređaja u režim slabije potrošnje dok je aplikacija u prvom planu</string>
 
   <string name="preference_language_title">Jezik</string>
-  <string name="preference_language_entry_auto">Sistemski Zadano</string>
+  <string name="preference_language_entry_auto">Sistemski zadato</string>
   <string name="preference_notifications_title">Obavještenja</string>
 
   <string name="preference_notification_query_title">Direktne poruke</string>
@@ -50,7 +50,7 @@
 
   <string name="preference_notification_other_title">Druge poruke</string>
 
-  <string name="preference_notification_sound_title">Zvuk obavještenja</string>
+  <string name="preference_notification_sound_title">Zvuk obaveštenja</string>
 
   <string name="preference_notification_vibration_title">Vibracija</string>
 
@@ -77,13 +77,13 @@
 
   <string name="preference_colorize_nicknames_title">Oboji nadimke</string>
   <string name="preference_colorize_nicknames_entry_all">Svi nadimci</string>
-  <string name="preference_colorize_nicknames_entry_all_but_mine">Svi sem vlastitog nadimka</string>
+  <string name="preference_colorize_nicknames_entry_all_but_mine">Svi sem sopstvenog nadimka</string>
   <string name="preference_colorize_nicknames_entry_none">Nijedan nadimak</string>
   <string name="preference_show_prefix_title">Prikazuj mod pošiljaoca</string>
   <string name="preference_show_prefix_entry_all">Svi modovi</string>
   <string name="preference_show_prefix_entry_highest">Najviši mod</string>
   <string name="preference_show_prefix_entry_none">Nijedan mod</string>
-  <string name="preference_hostmask_actions_title">Prikazuj Hostmask u akcijama</string>
+  <string name="preference_hostmask_actions_title">Prikazuj Hostmask u komandama</string>
   <string name="preference_hostmask_actions_summary">Prikaži čitav nick!ident@host u join/part/quit porukama</string>
 
   <string name="preference_nicks_on_new_line_title">Razdvoji nadimke</string>
@@ -107,20 +107,23 @@
   <string name="preference_time_at_end_title">Desno poravnata vremenska oznaka</string>
   <string name="preference_time_at_end_summary">Poravnava vremenske oznake na kraju svake poruke</string>
 
-  <string name="preference_larger_emoji_title">Veće Poruke Koje Sadrže Samo Emoji</string>
+  <string name="preference_larger_emoji_title">Veće reakcije</string>
   <string name="preference_larger_emoji_summary">Povećaj veličinu poruka koje sadrže samo emoji</string>
 
+  <string name="preference_highlight_own_messages_title">Istakni sopstvene poruke</string>
+  <string name="preference_highlight_own_messages_summary">Prikazuje vaše poruke upadljivije</string>
 
-  <string name="preference_autocomplete_title">Autokompletiranje</string>
 
-  <string name="preference_autocomplete_sender_doubleclick_title">Autokompletiranje Pošiljaoca</string>
-  <string name="preference_autocomplete_sender_doubleclick_summary">Dvoklik na poruku za autokompletiranje njenog pošaljioca</string>
+  <string name="preference_autocomplete_title">Automatsko dovršavanje</string>
 
-  <string name="preference_autocomplete_button_title">Dugme za Autokompletiranje</string>
-  <string name="preference_autocomplete_button_summary">Prikazuje dugme sa lijeve strane linije za unos koje pokreće tab kompletiranje</string>
+  <string name="preference_autocomplete_sender_doubleclick_title">Automatsko dovršavanje pošiljaoca</string>
+  <string name="preference_autocomplete_sender_doubleclick_summary">Dupli dodir na poruku za automatsko dovršavanje njenog pošaljioca</string>
 
-  <string name="preference_autocomplete_doubletap_title">Dvotap za Autokompletiranje</string>
-  <string name="preference_autocomplete_doubletap_summary">Predlaže nadimke i kanale posle dvoklika na liniju za unos</string>
+  <string name="preference_autocomplete_button_title">Dugme za automatsko dovršavanje</string>
+  <string name="preference_autocomplete_button_summary">Prikazuje dugme sa leve strane polja unos koje pokreće automatsko dovršavanje</string>
+
+  <string name="preference_autocomplete_doubletap_title">Dupli dodir za automatsko dovršavanje</string>
+  <string name="preference_autocomplete_doubletap_summary">Predloži nadimke i kanale posle duplog dodira na polje za unos</string>
 
   <string name="preference_autocomplete_auto_title">Prikazuj automatski</string>
   <string name="preference_autocomplete_auto_summary">Predloži nadimke i kanale posle unosa prva 3 znaka</string>
@@ -128,25 +131,25 @@
   <string name="preference_autocomplete_prefix_title">Prikaži posle prefiksa</string>
   <string name="preference_autocomplete_prefix_summary">Predloži nadimke i kanale posle unosa @ ili #</string>
 
-  <string name="preference_autocomplete_nicks_title">Autokompletiraj Nadimke</string>
+  <string name="preference_autocomplete_nicks_title">Automatski dovrši nadimke</string>
 
-  <string name="preference_autocomplete_buffers_title">Autokompletiraj Četove</string>
+  <string name="preference_autocomplete_buffers_title">Automatski dovrši razgovore</string>
 
-  <string name="preference_autocomplete_aliases_title">Autokompletiraj Komande</string>
+  <string name="preference_autocomplete_aliases_title">Automatski dovrši komande</string>
 
 
-  <string name="preference_backlog_title">Zaostatak</string>
+  <string name="preference_backlog_title">Zaostale poruke</string>
 
-  <string name="preference_page_size_title">Veličina Stranice</string>
-  <string name="preference_page_size_summary">Broj poruka učitan i održan u memoriji u jednom momentu</string>
+  <string name="preference_page_size_title">Veličina stranice</string>
+  <string name="preference_page_size_summary">Broj poruka učitanih i zadržanih u memoriji</string>
 
   <string name="preference_initial_amount_title">Početna količina</string>
-  <string name="preference_initial_amount_summary">Broj poruka koje će biti učitane pri prvom otvaranju buffer-a</string>
+  <string name="preference_initial_amount_summary">Broj poruka koje će biti učitane pri prvom otvaranju bafera</string>
 
 
   <string name="preference_connection_title">Veza</string>
 
   <string name="preference_show_notification_title">Prikazuj obavještenja</string>
-  <string name="preference_show_notification_summary">Održava Quasseldroid uvijek spojenim koristeći trajno obavještenje</string>
+  <string name="preference_show_notification_summary">Održava Quasseldroid povezanim koristeći trajno obaveštenje</string>
 
   </resources>
diff --git a/app/src/main/res/values-sr/strings_settings.xml b/app/src/main/res/values-sr/strings_settings.xml
index 2e3f5a08074af51e419c82ebfe324e9ee6b2721d..d495647d76f9c2626824881a48f0010885e87cd8 100644
--- a/app/src/main/res/values-sr/strings_settings.xml
+++ b/app/src/main/res/values-sr/strings_settings.xml
@@ -31,7 +31,7 @@
   <string name="settings_network_connection">Veza</string>
   <string name="settings_network_perform">Izvrši</string>
   <string name="settings_network_rejoin_channels">Ponovo se pridruži kanalima</string>
-  <string name="settings_network_autoreconnect_enabled">Automatsko Prespajanje</string>
+  <string name="settings_network_autoreconnect_enabled">Automatsko ponovno povezivanje</string>
   <string name="settings_network_autoreconnect_interval">Interval</string>
   <string name="settings_network_autoreconnect_interval_unit">sekundi</string>
   <string name="settings_network_autoreconnect_attempts">Maksimalan broj pokušaja</string>
@@ -39,7 +39,7 @@
   <string name="settings_network_customratelimits_enabled">Limiti Posebne Rate</string>
   <string name="settings_network_customratelimits_burstsize">Broj Uzastopnih Poruka</string>
   <string name="settings_network_customratelimits_unlimited">Neograničeno</string>
-  <string name="settings_network_customratelimits_delay">Odgoda</string>
+  <string name="settings_network_customratelimits_delay">Odlaganje</string>
   <string name="settings_network_customratelimits_interval_unit">sekundi</string>
 
   <string name="settings_networkserver_title">Server Mreže</string>
@@ -49,41 +49,41 @@
   <string name="settings_networkserver_ssl_enabled">Koristi SSL</string>
   <string name="settings_networkserver_ssl_verify">Verifikuj SSL</string>
   <string name="settings_networkserver_password">Lozinka</string>
-  <string name="settings_networkserver_proxy_enabled">Koristi Proxy</string>
-  <string name="settings_networkserver_proxy_type">Tip Proxy-a</string>
+  <string name="settings_networkserver_proxy_enabled">Koristi proxy</string>
+  <string name="settings_networkserver_proxy_type">Tip</string>
   <string name="settings_networkserver_proxy_type_http">HTTP</string>
   <string name="settings_networkserver_proxy_type_socks5">SOCKS 5</string>
   <string name="settings_networkserver_proxy_host">Host</string>
   <string name="settings_networkserver_proxy_port">Port</string>
-  <string name="settings_networkserver_proxy_user">Korisničko Ime</string>
+  <string name="settings_networkserver_proxy_user">Korisničko ime</string>
   <string name="settings_networkserver_proxy_pass">Lozinka</string>
 
   <string name="settings_identities_title">Identiteti</string>
   <string name="settings_identity_title">Identitet</string>
   <string name="settings_identity_names">Imena</string>
   <string name="settings_identity_identity_name">Ime identiteta</string>
-  <string name="settings_identity_real_name">Pravo Ime</string>
+  <string name="settings_identity_real_name">Pravo ime</string>
   <string name="settings_identity_ident">Ident</string>
   <string name="settings_identity_nick">Nadimak</string>
   <string name="settings_identity_nicks">Nadimci</string>
   <string name="settings_identity_messages">Poruke</string>
-  <string name="settings_identity_kick_reason">Razlog Kick-a</string>
+  <string name="settings_identity_kick_reason">Razlog izbacivanja</string>
   <string name="settings_identity_part_reason">Razlog Part-a</string>
-  <string name="settings_identity_quit_reason">Razlog Quit-a</string>
-  <string name="settings_identity_away">Poruke Iz Odsustva</string>
-  <string name="settings_identity_away_reason">Razlog Odsustva</string>
+  <string name="settings_identity_quit_reason">Razlog prekida veze</string>
+  <string name="settings_identity_away">Poruke iz odsustva</string>
+  <string name="settings_identity_away_reason">Razlog odsustva</string>
   <string name="settings_identity_detach_away">Odsutan Na Razdvajanju</string>
   <string name="settings_identity_detach_away_reason">Razlog Odsutnosti Na Razdvajanju</string>
 
   <string name="settings_chatlists_title">Liste razgovora</string>
   <string name="settings_chatlist_title">Lista razgovora</string>
-  <string name="settings_chatlist_ui">Korisnički Interfejs</string>
+  <string name="settings_chatlist_ui">Korisnički interfejs</string>
   <string name="settings_chatlist_buffer_view_name">Ime</string>
-  <string name="settings_chatlist_show_search">Prikaži Pretragu</string>
-  <string name="settings_chatlist_sort_alphabetically">Poredaj Alfabetski</string>
-  <string name="settings_chatlist_add_new_buffers_automatically">Dodaj nove četove automatski</string>
+  <string name="settings_chatlist_show_search">Prikaži pretragu</string>
+  <string name="settings_chatlist_sort_alphabetically">Sortiraj abecedno</string>
+  <string name="settings_chatlist_add_new_buffers_automatically">Dodaj nove razgovore automatski</string>
   <string name="settings_chatlist_network">Mreža</string>
-  <string name="settings_chatlist_show_status_buffer">Prikazuj Statusni Buffer</string>
+  <string name="settings_chatlist_show_status_buffer">Prikazuj statusni bafer</string>
   <string name="settings_chatlist_types">Tipovi razgovora</string>
   <string name="settings_chatlist_show_channels">Prikaži kanale</string>
   <string name="settings_chatlist_show_queries">Prikaži upite</string>
@@ -95,10 +95,10 @@
   <string name="settings_chatlist_hide_inactive_buffers">Sakrij neaktivne razgovore</string>
   <string name="settings_chatlist_hide_inactive_networks">Sakrij neaktivne mreže</string>
 
-  <string name="settings_ignorelist_title">Lista ignorisanja</string>
+  <string name="settings_ignorelist_title">Lista ignorisanih</string>
 
   <string name="settings_ignoreitem_title">Pravilo za ignorisanje</string>
-  <string name="settings_ignoreitem_enabled">Aktivirano</string>
+  <string name="settings_ignoreitem_enabled">Uključeno</string>
   <string name="settings_ignoreitem_ignorerule">Pravilo za ignorisanje</string>
   <string name="settings_ignoreitem_isregex">Regularni izraz</string>
   <string name="settings_ignoreitem_type">Tip</string>
@@ -119,31 +119,31 @@
   <string name="settings_highlightlist_highlight_nick_all_nicks">Sve Nadimke od Identiteta</string>
   <string name="settings_highlightlist_highlight_nick_current_nick">Trenutni nadimak</string>
   <string name="settings_highlightlist_highlight_nick_none">Nijedno</string>
-  <string name="settings_highlightlist_nicks_case_sensitive">Osjetljivo na Kapitalizaciju</string>
+  <string name="settings_highlightlist_nicks_case_sensitive">Zavisno od razlikovanja velikih i malih slova</string>
   <string name="settings_highlightlist_rules">Pravila Isticanja</string>
   <string name="settings_highlightlist_ignore_rules">Pravila za Ignorisanje Isticanja</string>
 
   <string name="settings_highlightrule_title">Pravilo Isticanja</string>
-  <string name="settings_highlightrule_enabled">Aktivirano</string>
+  <string name="settings_highlightrule_enabled">Uključeno</string>
   <string name="settings_highlightrule_name">Ime</string>
   <string name="settings_highlightrule_regular_expression">Regularni izraz</string>
-  <string name="settings_highlightrule_case_sensitive">Osjetljivo na Kapitalizaciju</string>
+  <string name="settings_highlightrule_case_sensitive">Zavisno od razlikovanja velikih i malih slova</string>
   <string name="settings_highlightrule_sender">Pošiljalac</string>
   <string name="settings_highlightrule_channel">Kanal</string>
 
-  <string name="settings_aliaslist_title">Aliasi</string>
+  <string name="settings_aliaslist_title">Alijasi</string>
 
-  <string name="settings_aliasitem_title">Alias</string>
+  <string name="settings_aliasitem_title">Alijas</string>
   <string name="settings_aliasitem_name">Ime </string>
   <string name="settings_aliasitem_expansion">Ekspanzija</string>
 
   <string name="settings_networkconfig_title">IRC Podešavanja</string>
-  <string name="settings_networkconfig_ping_timeout">Detekcija Ping Timeout-a</string>
-  <string name="settings_networkconfig_ping_interval">Ping Interval</string>
+  <string name="settings_networkconfig_ping_timeout">Detekcija ping tajm-auta</string>
+  <string name="settings_networkconfig_ping_interval">Ping interval</string>
   <string name="settings_networkconfig_ping_interval_unit">sekundi</string>
   <string name="settings_networkconfig_max_ping_count">Prekini vezu posle</string>
   <string name="settings_networkconfig_max_ping_count_unit">propuštenih pingova</string>
-  <string name="settings_networkconfig_auto_who">Automatsko Pretraživanje Korisničkih Informacija</string>
+  <string name="settings_networkconfig_auto_who">Automatsko traženje korisničkih informacija</string>
   <string name="settings_networkconfig_auto_who_interval">Interval osvježavanja</string>
   <string name="settings_networkconfig_auto_who_interval_unit">sekundi</string>
   <string name="settings_networkconfig_auto_who_nick_limit">Ignoriši kanale sa više od</string>
diff --git a/app/src/main/res/values-sr/strings_setup.xml b/app/src/main/res/values-sr/strings_setup.xml
index d6a81e9f9683f0ec51c299f4c17c5ca56d1ebe7b..b75f96d16903eb39257297965aea515f544521b0 100644
--- a/app/src/main/res/values-sr/strings_setup.xml
+++ b/app/src/main/res/values-sr/strings_setup.xml
@@ -30,12 +30,12 @@
   <string name="label_connection_host">Host</string>
   <string name="label_connection_port">Port</string>
 
-  <string name="hint_invalid_host">Hostname nije validno</string>
+  <string name="hint_invalid_host">Neispravan hostname</string>
   <string name="hint_invalid_port">Port nije validan</string>
 
   <!-- Account User -->
   <string name="slide_account_user_title">Vaš nalog</string>
-  <string name="slide_account_user_description">Sada, molimo unesite korisničko ime i lozinku za vaš nalog na Core-u. Ako ste upravo napravili taj Core, mi ćemo podesiti ovaj nalog za vas.</string>
+  <string name="slide_account_user_description">Sada, molimo unesite korisničko ime i lozinku za vaš nalog na jezgru. Ako ste upravo postavili to jezgro, mi ćemo podesiti ovaj nalog za vas.</string>
 
   <string name="label_account_user">Korisničko ime</string>
   <string name="label_account_pass">Lozinka</string>
@@ -72,7 +72,7 @@
   <string name="slide_user_network_title">Podesi mrežu</string>
   <string name="slide_user_network_description">Odaberi mrežu za povezivanje.</string>
 
-  <string name="label_network_custom">Prilagođena Mreža…</string>
+  <string name="label_network_custom">Prilagođena mreža…</string>
 
   <!-- User Channels -->
   <string name="slide_user_channels_title">Podesi kanale</string>