diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index a589a6fdfc10d846790a1890239a3d6ac40011d8..00009ad2f16d9904893b67e6ca7efa05743ae88e 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -28,50 +28,50 @@
   <string name="label_about">O aplikaciji</string>
   <string name="label_accept">Prihvati</string>
   <string name="label_avatar">Avatar</string>
-  <string name="label_back">Vrati se nazad</string>
+  <string name="label_back">Nazad</string>
   <string name="label_buffer_name">Ime Buffera</string>
   <string name="label_cancel">Otkaži</string>
-  <string name="label_update_user_password">Ažuriraj Korisnika/Lozinku</string>
+  <string name="label_update_user_password">Ažuriraj korisnika/lozinku</string>
   <string name="label_certificates">Sertifikati</string>
   <string name="label_close">Zatvori</string>
   <string name="label_colors_custom">Prilagođeno</string>
   <string name="label_colors_mirc">mIRC</string>
   <string name="label_configure">Podesi</string>
   <string name="label_connect">Poveži se</string>
-  <string name="label_contributors">Učesnici</string>
+  <string name="label_contributors">Saradnici</string>
   <string name="label_copy">Kopiraj</string>
   <string name="label_crashes">Padovi Aplikacije</string>
   <string name="label_delete">Obriši</string>
-  <string name="label_delete_all">Obriši Sve</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_topic_long">Otvori dijalog za mijenjanje teme kanala</string>
   <string name="label_filter_messages">Filtriraj Poruke</string>
   <string name="label_github">GitHub</string>
-  <string name="label_hide_perm">Trajno Sakrij</string>
-  <string name="label_hide_temp">Privremeno Sakrij</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_user">Detalji 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>
+  <string name="label_join_long">Pridruži se kanalu</string>
   <string name="label_libraries">Biblioteke</string>
-  <string name="label_license">Licence</string>
-  <string name="label_mark_read">Označi Pročitanim</string>
+  <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_new_account">Novi Nalog</string>
-  <string name="label_new_chatlist">Nova Četlista</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>
   <string name="label_new_highlight_ignore_rule">Novo Pravilo Ignorisanja Isticanja</string>
-  <string name="label_new_identity">Novi Identitet</string>
-  <string name="label_new_network">Nova Mreža</string>
-  <string name="label_new_nick">Novi Nadimak</string>
-  <string name="label_new_server">Novi Server</string>
-  <string name="label_nicklist">Lista Nadimaka</string>
+  <string name="label_new_identity">Novi identitet</string>
+  <string name="label_new_network">Nova mreža</string>
+  <string name="label_new_nick">Novi nadimak</string>
+  <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>
@@ -82,22 +82,22 @@
   <string name="label_part_long">Napusti Kanal</string>
   <string name="label_placeholder_message">Napiši poruku…</string>
   <string name="label_placeholder_topic">Opiši temu kanala…</string>
-  <string name="label_privacy_policy">Pravila Privatnosti</string>
+  <string name="label_privacy_policy">Politika privatnosti</string>
   <string name="label_query">Upit</string>
-  <string name="label_query_long">Otvori privatni čet sa korisnikom</string>
+  <string name="label_query_long">Otvori privatni razgovor sa korisnikom</string>
   <string name="label_rename">Preimenuj</string>
   <string name="label_save">Sačuvaj</string>
   <string name="label_select">Odaberi</string>
   <string name="label_settings">Podešavanja</string>
-  <string name="label_settings_client">Podešavanja Klijenta</string>
+  <string name="label_settings_client">Podešavanja klijenta</string>
   <string name="label_settings_core">Podešavanja Core-a</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_topic">Tema Kanala</string>
+  <string name="label_topic">Tema kanala</string>
   <string name="label_translators">Prevodioci</string>
   <string name="label_unhide">Učini Vidljivim</string>
-  <string name="label_website">Web Stranica</string>
+  <string name="label_website">Veb stranica</string>
   <string name="label_whitelist">Ignoriši</string>
   <string name="label_whitelist_ignore_date">Datum isteka je ignorisan za ovaj sertifikat</string>
   <string name="label_whitelist_certificates">Sertifikati</string>
@@ -105,10 +105,10 @@
   <string name="label_who">Who</string>
   <string name="label_who_long">Obnovi korisničke informacije svih korisnika</string>
   <string name="label_whois">Whois</string>
-  <string name="label_whois_long">Obnovi korisničke informacije</string>
+  <string name="label_whois_long">Ažuriraj korisničke informacije</string>
   <string name="label_yes">Da</string>
 
-  <string name="label_feature_synchronizedmarkerline">Potrebno za sinhronizovanje zadnje pozicije u kanalima</string>
+  <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>
@@ -137,4 +137,4 @@
 
   <string name="info_copied_version">Verzija kopirana u clipboard</string>
 
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-sr/strings_contributors.xml b/app/src/main/res/values-sr/strings_contributors.xml
index 5fab1c4f5c62bebf69e5b3836125b4b136c14748..8532edf0d3562d3bd9cdea1e02fa0b7efdfbb33c 100644
--- a/app/src/main/res/values-sr/strings_contributors.xml
+++ b/app/src/main/res/values-sr/strings_contributors.xml
@@ -18,9 +18,9 @@
   -->
 
 <resources>
-  <string name="contributor_description_freqmod">Initial qdatastream deserialization attempts</string>
+  <string name="contributor_description_freqmod">Inicijalni pokušaji deserijalizacije qdatastream-a</string>
   <string name="contributor_description_sandsmark">Stari tip implementacije protokola, (de)serijalizacija, (de)moralizator projekta</string>
-  <string name="contributor_description_magnuf">Stari Tip Korisničkog Interfejsa</string>
-  <string name="contributor_description_kenji">Stari Tip Korisničkog Interfejsa</string>
-  <string name="contributor_description_justjanne">Prepiši, Korisnički Interfejs, Obrađivači Obavještenja, Pozadinski Mehanizam</string>
+  <string name="contributor_description_magnuf">Stari tip korisničkog interfejsa</string>
+  <string name="contributor_description_kenji">Stari tip korisničkog interfejsa</string>
+  <string name="contributor_description_justjanne">Prepiši, Korisnički interfejs, Obrađivači obavještenja, Pozadinski mehanizam</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 d46833686e4a96ff3cef1b05e0983581f17b5414..cef504df9a71a27dfe3a8be2acbb93069992638f 100644
--- a/app/src/main/res/values-sr/strings_defaults.xml
+++ b/app/src/main/res/values-sr/strings_defaults.xml
@@ -18,14 +18,14 @@
   -->
 
 <resources>
-  <string name="default_bufferviewconfig_name">Svi Četovi</string>
+  <string name="default_bufferviewconfig_name">Svi razgovori</string>
 
-  <string name="default_identity_identity_name">Podrazumjevani Identitet</string>
-  <string name="default_identity_realname">Quassel IRC Korisnik</string>
+  <string name="default_identity_identity_name">Podrazumjevani 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>
   <string name="default_identity_detachawayreason">Svi Quassel klijenti su nestali sa lica zemlje…</string>
   <string name="default_identity_kickreason">Vrtić je negdje drugo!</string>
-  <string name="default_identity_partreason">https://quassel-irc.org - Četuj lagodno. Bilo gdje.</string>
-  <string name="default_identity_quitreason">https://quassel-irc.org - Četuj lagodno. Bilo gdje.</string>
+  <string name="default_identity_partreason">https://quassel-irc.org - Ćaskaj lagodno. Bilo gdje.</string>
+  <string name="default_identity_quitreason">https://quassel-irc.org - Ćaskaj lagodno. Bilo gdje.</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings_error.xml b/app/src/main/res/values-sr/strings_error.xml
index b6d86a715d6423644c9ade5bfc607f9f2210d4db..8c80d94b498f1e28ba53554bceb7b8ad16f9ffcc 100644
--- a/app/src/main/res/values-sr/strings_error.xml
+++ b/app/src/main/res/values-sr/strings_error.xml
@@ -18,24 +18,24 @@
   -->
 
 <resources>
-  <string name="label_error_login">Greška Pri Prijavi</string>
-  <string name="label_error_setup">Greška Pri Postavci</string>
-  <string name="label_error_init">Greška u Vezi</string>
-  <string name="label_error_certificate">Greška u Sertifikatu</string>
+  <string name="label_error_login">Greška pri prijavi</string>
+  <string name="label_error_setup">Greška pri postavci</string>
+  <string name="label_error_init">Greška pri povezivanju</string>
+  <string name="label_error_certificate">Greška u sertifikatu</string>
   <string name="label_error_certificate_no_certificate">Sertifikat nije dostupan</string>
   <string name="label_error_certificate_no_hostname">Hostname nije dostupno</string>
   <string name="label_error_certificate_invalid"><![CDATA[
-    <p>Sertifikat sa fingerprint-om<br/>
-    <code>%1$s</code> je validan samo od %2$s do %3$s</p>
+    <p>Sertifikat sa otiskom<br/>
+    <code>%1$s</code> je važeći od %2$s do %3$s</p>
   ]]></string>
   <string name="label_error_certificate_untrusted"><![CDATA[
-    <p>Sertifikat sa fingerprint-om<br/>
+    <p>Sertifikat sa otiskom<br/>
     <code>%1$s</code><br/>
     nije pouzdan.</p>
   ]]></string>
   <string name="label_error_certificate_no_match"><![CDATA[
-    <p>Sertifikat sa fingerprint-om<br/>
+    <p>Sertifikat sa otiskom<br/>
     <code>%1$s</code><br/>
-    nije validan za %2$s.</p>
+    nije važeći za %2$s.</p>
   ]]></string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings_format.xml b/app/src/main/res/values-sr/strings_format.xml
index b01e4b8affb65b6d75940bceba1cfdec50c5c2d1..4f785ddbe94d6f4d81a2d89567b9fb1772062256 100644
--- a/app/src/main/res/values-sr/strings_format.xml
+++ b/app/src/main/res/values-sr/strings_format.xml
@@ -18,12 +18,12 @@
   -->
 
 <resources>
-  <string name="label_bold">Bold</string>
+  <string name="label_bold">Podebljano</string>
   <string name="label_italic">Italik</string>
   <string name="label_strikethrough">Precrtano</string>
   <string name="label_underline">Podvučeno</string>
   <string name="label_monospace">Monospace</string>
-  <string name="label_foreground">Boje Prednjeg Plana</string>
-  <string name="label_background">Boje Pozadine</string>
-  <string name="label_clear_formatting">Jasno Formatiranje</string>
+  <string name="label_foreground">Boja prednjeg plana</string>
+  <string name="label_background">Boja pozadine</string>
+  <string name="label_clear_formatting">Ukloni formatiranje</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings_info.xml b/app/src/main/res/values-sr/strings_info.xml
index 640c366bae296ef4781d207752fddfd1a61bc5f7..e34eb436e7dae5af2a74e6aed138550285919abe 100644
--- a/app/src/main/res/values-sr/strings_info.xml
+++ b/app/src/main/res/values-sr/strings_info.xml
@@ -28,6 +28,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_default">Tema Nije Postavljena</string>
+  <string name="property_ircchannel_topic_action_edit">Promijeni 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 7f4e68543c2f5800f8414218e3978f560f50ffaa..7e6611855e9e3a4f6fe2090fbe67c2e787426b2b 100644
--- a/app/src/main/res/values-sr/strings_messages.xml
+++ b/app/src/main/res/values-sr/strings_messages.xml
@@ -18,9 +18,9 @@
   -->
 
 <resources>
-  <string name="message_type_join">Join</string>
-  <string name="message_type_part">Part</string>
-  <string name="message_type_quit">Quit</string>
+  <string name="message_type_join">Pridruži se</string>
+  <string name="message_type_part">Napusti</string>
+  <string name="message_type_quit">Izađi</string>
   <string name="message_type_nick">Nadimak</string>
   <string name="message_type_mode">Mod</string>
   <string name="message_type_topic">Tema</string>
@@ -29,14 +29,14 @@
 
   <string name="message_format_action">— %1$s%2$s %3$s</string>
   <string name="message_format_notice">[%1$s%2$s] %3$s</string>
-  <string name="message_format_nick">%1$s%2$s je sada %3$s%4$s</string>
-  <string name="message_format_nick_self">Vi ste sada %1$s%2$s</string>
+  <string name="message_format_nick">%1$s%2$s je sada poznat/a kao %3$s%4$s</string>
+  <string name="message_format_nick_self">Vi ste sada poznati kao %1$s%2$s</string>
   <string name="message_format_mode">Mod %1$s od %2$s%3$s</string>
   <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</string>
-  <string name="message_format_part_2">%1$s%2$s je napustio/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 iz (%3$s)</string>
+  <string name="message_format_quit_2">%1$s%2$s je izašao/la (%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>
@@ -44,11 +44,11 @@
   <plurals name="message_netsplit_join">
     <item quantity="one">Netsplit između %1$s i %2$s se završio: %3$d se pridružio/la</item>
     <item quantity="few">Netsplit između %1$s i %2$s se završio: %3$d su se pridružili</item>
-    <item quantity="other">Netsplit između %1$s i %2$s se završio: %3$d su se pridružili</item>
+    <item quantity="other">Netsplit između %1$s i %2$s se završio: %3$d korisnika se pridružilo</item>
   </plurals>
   <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 su napustili</item>
+    <item quantity="other">Netsplit između %1$s i %2$s: %3$d korisnika je izašlo</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 ce05cdb030a1d8ec84a96a3f1c097dfef00bcb73..d595deb61cfbd872f590e6c5eac398f82ec30057 100644
--- a/app/src/main/res/values-sr/strings_preferences.xml
+++ b/app/src/main/res/values-sr/strings_preferences.xml
@@ -149,4 +149,4 @@
   <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>
 
-</resources>
+  </resources>
diff --git a/app/src/main/res/values-sr/strings_settings.xml b/app/src/main/res/values-sr/strings_settings.xml
index ea0ea9d125cf431ea536b4c1e4219cf89adeacdc..2e3f5a08074af51e419c82ebfe324e9ee6b2721d 100644
--- a/app/src/main/res/values-sr/strings_settings.xml
+++ b/app/src/main/res/values-sr/strings_settings.xml
@@ -20,7 +20,7 @@
 <resources>
   <string name="settings_networks_title">Mreže</string>
   <string name="settings_network_title">Mreža</string>
-  <string name="settings_network_network_name">Ime Mreže</string>
+  <string name="settings_network_network_name">Ime mreže</string>
   <string name="settings_network_identity">Identitet</string>
   <string name="settings_network_sasl_enabled">SASL</string>
   <string name="settings_network_sasl_account">Nalog</string>
@@ -30,12 +30,12 @@
   <string name="settings_network_autoidentify_password">Lozinka</string>
   <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_rejoin_channels">Ponovo se pridruži kanalima</string>
   <string name="settings_network_autoreconnect_enabled">Automatsko Prespajanje</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>
-  <string name="settings_network_autoreconnect_unlimited">Neograničen Broj Pokušaja</string>
+  <string name="settings_network_autoreconnect_attempts">Maksimalan broj pokušaja</string>
+  <string name="settings_network_autoreconnect_unlimited">Neograničen broj pokušaja</string>
   <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>
@@ -75,8 +75,8 @@
   <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">Četliste</string>
-  <string name="settings_chatlist_title">Četlista</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_buffer_view_name">Ime</string>
   <string name="settings_chatlist_show_search">Prikaži Pretragu</string>
@@ -84,40 +84,40 @@
   <string name="settings_chatlist_add_new_buffers_automatically">Dodaj nove četove 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_types">Tipovi Četa</string>
-  <string name="settings_chatlist_show_channels">Prikaži Kanale</string>
-  <string name="settings_chatlist_show_queries">Prikaži Upite</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>
   <string name="settings_chatlist_activity">Aktivnost</string>
-  <string name="settings_chatlist_minimum_activity_no_activity">Bez Aktivnosti</string>
-  <string name="settings_chatlist_minimum_activity_other_activity">Druge Aktivnosti</string>
-  <string name="settings_chatlist_minimum_activity_new_message">Nove Poruke</string>
+  <string name="settings_chatlist_minimum_activity_no_activity">Bez aktivnosti</string>
+  <string name="settings_chatlist_minimum_activity_other_activity">Druge aktivnosti</string>
+  <string name="settings_chatlist_minimum_activity_new_message">Nove poruke</string>
   <string name="settings_chatlist_minimum_activity_highlight">Isticanje</string>
-  <string name="settings_chatlist_hide_inactive_buffers">Sakrij Neaktivne Četove</string>
-  <string name="settings_chatlist_hide_inactive_networks">Sakrij Neaktivne Mreže</string>
+  <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 ignorisanja</string>
 
-  <string name="settings_ignoreitem_title">Pravilo za Ignorisanje</string>
+  <string name="settings_ignoreitem_title">Pravilo za ignorisanje</string>
   <string name="settings_ignoreitem_enabled">Aktivirano</string>
-  <string name="settings_ignoreitem_ignorerule">Pravilo za Ignorisanje</string>
-  <string name="settings_ignoreitem_isregex">Regex</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>
-  <string name="settings_ignoreitem_type_sender">Pošiljaoc</string>
+  <string name="settings_ignoreitem_type_sender">Pošiljalac</string>
   <string name="settings_ignoreitem_type_message">Poruka</string>
   <string name="settings_ignoreitem_type_ctcp">CTCP</string>
   <string name="settings_ignoreitem_strictness">Striktnost</string>
   <string name="settings_ignoreitem_strictness_soft">Dinamično</string>
   <string name="settings_ignoreitem_strictness_hard">Trajno</string>
-  <string name="settings_ignoreitem_scope">Obim</string>
-  <string name="settings_ignoreitem_scope_global">Globalni Obim</string>
-  <string name="settings_ignoreitem_scope_network">Obim u Mreži</string>
-  <string name="settings_ignoreitem_scope_channel">Obim u Kanalu</string>
-  <string name="settings_ignoreitem_scoperule">Pravilo Obima</string>
+  <string name="settings_ignoreitem_scope">Doseg</string>
+  <string name="settings_ignoreitem_scope_global">Globalni doseg</string>
+  <string name="settings_ignoreitem_scope_network">Doseg u mreži</string>
+  <string name="settings_ignoreitem_scope_channel">Doseg u kanalu</string>
+  <string name="settings_ignoreitem_scoperule">Pravilo dosega</string>
 
   <string name="settings_highlightlist_title">Isticanja</string>
   <string name="settings_highlightlist_highlight_nick">Ističi Nadimak</string>
   <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_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_rules">Pravila Isticanja</string>
@@ -126,9 +126,9 @@
   <string name="settings_highlightrule_title">Pravilo Isticanja</string>
   <string name="settings_highlightrule_enabled">Aktivirano</string>
   <string name="settings_highlightrule_name">Ime</string>
-  <string name="settings_highlightrule_regular_expression">Regex</string>
+  <string name="settings_highlightrule_regular_expression">Regularni izraz</string>
   <string name="settings_highlightrule_case_sensitive">Osjetljivo na Kapitalizaciju</string>
-  <string name="settings_highlightrule_sender">Pošiljaoc</string>
+  <string name="settings_highlightrule_sender">Pošiljalac</string>
   <string name="settings_highlightrule_channel">Kanal</string>
 
   <string name="settings_aliaslist_title">Aliasi</string>
@@ -144,7 +144,7 @@
   <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_interval">Interval Osvježavanja</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>
   <string name="settings_networkconfig_auto_who_nick_limit_unit">korisnika</string>
diff --git a/app/src/main/res/values-sr/strings_setup.xml b/app/src/main/res/values-sr/strings_setup.xml
index 6b10a538e84add6aa8ab06bf9da608bd393ae3b9..1afb936482d1a28dccbde2d63f35a797a5d74a48 100644
--- a/app/src/main/res/values-sr/strings_setup.xml
+++ b/app/src/main/res/values-sr/strings_setup.xml
@@ -19,7 +19,7 @@
 
 <resources>
   <!-- Account Selection -->
-  <string name="slide_account_select_title">Odaberi Nalog</string>
+  <string name="slide_account_select_title">Odaberi nalog</string>
   <string name="slide_account_select_description">Odaberi nalog iz liste ili dodaj novi</string>
   <string name="label_user_on_host">%1$s na %2$s:%3$d</string>
 
@@ -34,17 +34,17 @@
   <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_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="label_account_user">Korisničko Ime</string>
+  <string name="label_account_user">Korisničko ime</string>
   <string name="label_account_pass">Lozinka</string>
 
   <string name="hint_invalid_user">Korisničko ime ne može biti prazno</string>
 
   <!-- Account Name -->
-  <string name="slide_account_name_title">Prilagodi Nalog</string>
-  <string name="slide_account_name_description">Daj ovom nalogu ime</string>
+  <string name="slide_account_name_title">Prilagodi nalog</string>
+  <string name="slide_account_name_description">Imenujte ovaj nalog</string>
 
   <string name="label_account_name">Ime naloga</string>
 
@@ -55,28 +55,28 @@
   <string name="slide_core_authenticator_select_description">Molimo odaberite backend za potvrdu autentičnosti da bi Quassel Core mogao potvrditi autentičnost korisnika.</string>
 
   <!-- Core Backend Select -->
-  <string name="slide_core_backend_select_title">Odaberi Backend za Skladištenje</string>
+  <string name="slide_core_backend_select_title">Odaberi backend za skladištenje podataka</string>
   <string name="slide_core_backend_select_description">Molimo odaberite backend databaze od Quassel Core memorije da bi skladištili backlog i druge podatke.</string>
 
   <!-- Core Backend Config -->
-  <string name="slide_core_backend_setup_title">Podesi Backend za Skladištenje</string>
-  <string name="slide_core_backend_setup_description">Molimo podesite odabrani backend databaze.</string>
+  <string name="slide_core_backend_setup_title">Podesi backend za skladištenje podataka</string>
+  <string name="slide_core_backend_setup_description">Molimo podesite odabrani backend baze podataka.</string>
 
   <!-- User Identity -->
-  <string name="slide_user_identity_title">Postavka Identiteta</string>
+  <string name="slide_user_identity_title">Postavka identiteta</string>
   <string name="slide_user_identity_description">Molimo odaberite nadimak</string>
 
-  <string name="hint_invalid_nick">Nadimak nije validan</string>
+  <string name="hint_invalid_nick">Nadimak nije važeći</string>
 
   <!-- User Network -->
-  <string name="slide_user_network_title">Podesi Mrežu</string>
-  <string name="slide_user_network_description">Odaberi mrežu za spajanje.</string>
+  <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>
 
   <!-- User Channels -->
-  <string name="slide_user_channels_title">Podesi Kanale</string>
-  <string name="slide_user_channels_description">Odaberite kojim kanalima da se pridružite.</string>
+  <string name="slide_user_channels_title">Podesi kanale</string>
+  <string name="slide_user_channels_description">Odaberite kojim kanalima želite da se pridružite.</string>
 
   <string name="label_channels">Kanali</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings_status.xml b/app/src/main/res/values-sr/strings_status.xml
index c0151ac7a2fa6c2401e10c36e5966f7188502520..c53f23ce988118a9893f63ff91095fafc69e873e 100644
--- a/app/src/main/res/values-sr/strings_status.xml
+++ b/app/src/main/res/values-sr/strings_status.xml
@@ -21,7 +21,7 @@
   <string name="label_status_disconnected">Odvojeni</string>
   <string name="label_status_connecting">Povezivanje</string>
   <string name="label_status_handshake">Handshake</string>
-  <string name="label_status_init">Init</string>
+  <string name="label_status_init">Inicijalizacija</string>
   <string name="label_status_connected">Povezano</string>
-  <string name="label_status_closed">Veza Izgubljena</string>
+  <string name="label_status_closed">Veza izgubljena</string>
 </resources>