diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9c88c5c6deaed3f912ac028f76d2a03ffcbc6b60..cd8b5ce71eec405ff70ad76bd9eecb84353cd31e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -63,7 +63,7 @@ android {
 
     signingConfig = signingConfigs.findByName("default")
 
-    //resConfigs("en", "de", "fr-rCA", "lt", "pt")
+    resConfigs("en", "de", "fr-rCA", "lt", "pt", "sr")
 
     vectorDrawables.useSupportLibrary = true
 
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index e633e9b7f05c4e3c4b443d3f925da1e021e9d51c..a589a6fdfc10d846790a1890239a3d6ac40011d8 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -20,12 +20,13 @@
 <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 jezgro, omogućujući vam da se povežete na vaše Quassel jezgro koristeći vaš Android™ telefon. </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="connection_service_title">Usluga Povezivanja</string>
-  <string name="connection_service_description">Održava vezu sa vašim jezgrom što omogućava obavještenja i slanje poruka.</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="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_buffer_name">Ime Buffera</string>
@@ -89,11 +90,12 @@
   <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_core">Podešavanja Jezgra</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_translators">Prevodioci</string>
   <string name="label_unhide">Učini Vidljivim</string>
   <string name="label_website">Web Stranica</string>
   <string name="label_whitelist">Ignoriši</string>
@@ -106,9 +108,28 @@
   <string name="label_whois_long">Obnovi 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_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 od 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_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_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="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="buffer_delete_confirmation">Da li želite trajno obrisati ovaj buffer?</string>
 
   <string name="delete_confirmation">Da li ste sigurni da želite ovo trajno obrisati? Ovo se ne može opozvati.</string>
diff --git a/app/src/main/res/values-sr/strings_format.xml b/app/src/main/res/values-sr/strings_format.xml
index 393cae785096134c4db7660c04ac2898abdd8eb3..b01e4b8affb65b6d75940bceba1cfdec50c5c2d1 100644
--- a/app/src/main/res/values-sr/strings_format.xml
+++ b/app/src/main/res/values-sr/strings_format.xml
@@ -17,4 +17,13 @@
   with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  <string name="label_bold">Bold</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>
+</resources>
diff --git a/app/src/main/res/values-sr/strings_info.xml b/app/src/main/res/values-sr/strings_info.xml
index 393cae785096134c4db7660c04ac2898abdd8eb3..640c366bae296ef4781d207752fddfd1a61bc5f7 100644
--- a/app/src/main/res/values-sr/strings_info.xml
+++ b/app/src/main/res/values-sr/strings_info.xml
@@ -17,4 +17,17 @@
   with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  <string name="label_user_away">Odsutni</string>
+  <string name="label_user_away_reason">Razlog</string>
+  <string name="label_user_identity">Identitet</string>
+  <string name="label_user_account">Nalog</string>
+  <string name="label_user_ident">Ident</string>
+  <string name="label_user_host">Host</string>
+  <string name="label_user_server">Server</string>
+
+  <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>
+</resources>
diff --git a/app/src/main/res/values-sr/strings_messages.xml b/app/src/main/res/values-sr/strings_messages.xml
index 393cae785096134c4db7660c04ac2898abdd8eb3..7f4e68543c2f5800f8414218e3978f560f50ffaa 100644
--- a/app/src/main/res/values-sr/strings_messages.xml
+++ b/app/src/main/res/values-sr/strings_messages.xml
@@ -17,4 +17,38 @@
   with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<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_nick">Nadimak</string>
+  <string name="message_type_mode">Mod</string>
+  <string name="message_type_topic">Tema</string>
+  <string name="message_format_copy">[%1$s] %2$s</string>
+  <string name="message_format_copy_complex">[%1$s] &lt;%2$s&gt; %3$s</string>
+
+  <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_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_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_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>
+  <string name="message_format_kill_2">%1$s je ubijen/na od %2$s%3$s (%4$s)</string>
+  <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>
+  </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>
+  </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 393cae785096134c4db7660c04ac2898abdd8eb3..ce05cdb030a1d8ec84a96a3f1c097dfef00bcb73 100644
--- a/app/src/main/res/values-sr/strings_preferences.xml
+++ b/app/src/main/res/values-sr/strings_preferences.xml
@@ -17,4 +17,136 @@
   with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  <string name="preference_appearance_title">Izgled</string>
+
+  <string name="preference_theme_title">Tema</string>
+  <string name="preference_theme_entry_material_light">Material (Svijetlo)</string>
+  <string name="preference_theme_entry_material_dark">Material (Tamno)</string>
+  <string name="preference_theme_entry_quassel_light">Quassel (Svijetlo)</string>
+  <string name="preference_theme_entry_quassel_dark">Quassel (Tamno)</string>
+  <string name="preference_theme_entry_amoled">AMOLED</string>
+  <string name="preference_theme_entry_solarized_light">Solarized (Svijetlo)</string>
+  <string name="preference_theme_entry_solarized_dark">Solarized (Tamno)</string>
+  <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">Unesi ključ 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_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_language_title">Jezik</string>
+  <string name="preference_language_entry_auto">Sistemski Zadano</string>
+  <string name="preference_notifications_title">Obavještenja</string>
+
+  <string name="preference_notification_query_title">Direktne Poruka</string>
+
+  <string name="preference_notification_channel_title">Poruke Kanala</string>
+
+  <string name="preference_notification_other_title">Druge Poruke</string>
+
+  <string name="preference_notification_sound_title">Zvuk Obavještenja</string>
+
+  <string name="preference_notification_vibration_title">Vibracija</string>
+
+  <string name="preference_notification_light_title">LED</string>
+
+  <string name="preference_notification_configure_title">Podesi Obavještenja</string>
+
+  <string name="preference_notifications_level_all">Sve Poruke</string>
+  <string name="preference_notifications_level_highlight">Spominjanja</string>
+  <string name="preference_notifications_level_none">Nikad</string>
+  <string name="preference_messages_title">Poruke</string>
+
+  <string name="preference_monospace_title">Koristi Monospace Font</string>
+
+  <string name="preference_textsize_title">Veličina Teksta</string>
+
+  <string name="preference_show_seconds_title">Prikazuj Sekunde</string>
+
+  <string name="preference_use_24h_clock_title">Koristi 24-časovni Sat</string>
+
+  <string name="preference_colorize_mirc_title">Koristi mIRC Boje</string>
+  <string name="preference_colorize_mirc_summaryon">Prikazuj mIRC boje u porukama</string>
+  <string name="preference_colorize_mirc_summaryoff">Skini mIRC boje sa poruka</string>
+
+  <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_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_summary">Prikaži čitav nick!ident@host u join/part/quit porukama</string>
+
+  <string name="preference_nicks_on_new_line_title">Razdvoj Nadimke</string>
+  <string name="preference_nicks_on_new_line_summary">Prikazuje nadimke na odvojenoj liniji</string>
+
+  <string name="preference_show_realnames_title">Prikazuj Realname</string>
+
+  <string name="preference_show_avatars_title">Prikazuj Avatare</string>
+
+  <string name="preference_square_avatars_title">Kvadratni Avatari</string>
+
+  <string name="preference_show_irccloud_avatars_title">Prikazuj IRCCloud Avatare</string>
+  <string name="preference_show_irccloud_avatars_summary">Prikazuje korisnicima bez avatara njihov IRCCloud avatar, ako je dostupan</string>
+
+  <string name="preference_show_gravatar_avatars_title">Prikazuj Gravatar Avatar</string>
+  <string name="preference_show_gravatar_avatars_summary">Prikazuje korisnicima bez avatara njihov Gravatar, ako je dostupan</string>
+
+  <string name="preference_show_matrix_avatars_title">Prikazuj Matrix Avatare</string>
+  <string name="preference_show_matrix_avatars_summary">Prikazuje korisnicima bez avatara njihov Matrix avatar, ako je dostupan</string>
+
+  <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_summary">Povećaj veličinu poruka koje sadže samo emoji</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_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_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_auto_title">Prikazuj Automatski</string>
+  <string name="preference_autocomplete_auto_summary">Predloži nadimke i kanale posle unosa prva 3 znaka</string>
+
+  <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_buffers_title">Autokompletiraj Četove</string>
+
+  <string name="preference_autocomplete_aliases_title">Autokompletiraj Komande</string>
+
+
+  <string name="preference_backlog_title">Zaostatak</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_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_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>
+
+</resources>
diff --git a/app/src/main/res/values-sr/strings_settings.xml b/app/src/main/res/values-sr/strings_settings.xml
index 393cae785096134c4db7660c04ac2898abdd8eb3..ea0ea9d125cf431ea536b4c1e4219cf89adeacdc 100644
--- a/app/src/main/res/values-sr/strings_settings.xml
+++ b/app/src/main/res/values-sr/strings_settings.xml
@@ -17,4 +17,138 @@
   with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<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_identity">Identitet</string>
+  <string name="settings_network_sasl_enabled">SASL</string>
+  <string name="settings_network_sasl_account">Nalog</string>
+  <string name="settings_network_sasl_password">Lozinka</string>
+  <string name="settings_network_autoidentify_enabled">Automatski Identifikuj</string>
+  <string name="settings_network_autoidentify_service">Servis</string>
+  <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_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_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_interval_unit">sekundi</string>
+
+  <string name="settings_networkserver_title">Server Mreže</string>
+  <string name="settings_networkserver_connection">Veza</string>
+  <string name="settings_networkserver_host">Host</string>
+  <string name="settings_networkserver_port">Port</string>
+  <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_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_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_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_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_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_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_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_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_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_ignorelist_title">Lista Ignorisanja</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_type">Tip</string>
+  <string name="settings_ignoreitem_type_sender">Pošiljaoc</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_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_none">Nijedno</string>
+  <string name="settings_highlightlist_nicks_case_sensitive">Osjetljivo na Kapitalizaciju</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_name">Ime</string>
+  <string name="settings_highlightrule_regular_expression">Regex</string>
+  <string name="settings_highlightrule_case_sensitive">Osjetljivo na Kapitalizaciju</string>
+  <string name="settings_highlightrule_sender">Pošiljaoc</string>
+  <string name="settings_highlightrule_channel">Kanal</string>
+
+  <string name="settings_aliaslist_title">Aliasi</string>
+
+  <string name="settings_aliasitem_title">Alias</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_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_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>
+  <string name="settings_networkconfig_auto_who_delay">Minimum čekanja između zahtjeva</string>
+  <string name="settings_networkconfig_auto_who_delay_unit">sekundi</string>
+  <string name="settings_networkconfig_standard_ctcp">CTCP ponašanje koje poštuje standard</string>
+</resources>
diff --git a/app/src/main/res/values-sr/strings_setup.xml b/app/src/main/res/values-sr/strings_setup.xml
index 5715f18b44957c220abce268c4e9170b45d174be..6b10a538e84add6aa8ab06bf9da608bd393ae3b9 100644
--- a/app/src/main/res/values-sr/strings_setup.xml
+++ b/app/src/main/res/values-sr/strings_setup.xml
@@ -25,7 +25,7 @@
 
   <!-- Account Connection -->
   <string name="slide_account_connection_title">Veza</string>
-  <string name="slide_account_connection_description">Prvo, molimo odaberite server na kom je vaše jezgro hostovano.</string>
+  <string name="slide_account_connection_description">Prvo, molimo odaberite server na kom je vaš Core hostovan.</string>
 
   <string name="label_connection_host">Host</string>
   <string name="label_connection_port">Port</string>
@@ -35,7 +35,7 @@
 
   <!-- 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 jezgru. Ako ste upravo napravili to jezgro, 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 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_pass">Lozinka</string>
diff --git a/app/src/main/res/values-sr/strings_status.xml b/app/src/main/res/values-sr/strings_status.xml
index 393cae785096134c4db7660c04ac2898abdd8eb3..c0151ac7a2fa6c2401e10c36e5966f7188502520 100644
--- a/app/src/main/res/values-sr/strings_status.xml
+++ b/app/src/main/res/values-sr/strings_status.xml
@@ -17,4 +17,11 @@
   with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  <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_connected">Povezano</string>
+  <string name="label_status_closed">Veza Izgubljena</string>
+</resources>
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index b8f0edd6c46deafe4bc4a03d91d5ae495c175e8e..30aaf0b1919cf21fb80d362b99f7e18aeda9347d 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -100,7 +100,7 @@
     <item>@string/preference_language_entry_lt</item>
     <item>@string/preference_language_entry_pt</item>
     <!--<item>@string/preference_language_entry_pt_br</item>-->
-    <!--<item>@string/preference_language_entry_sr</item>-->
+    <item>@string/preference_language_entry_sr</item>
   </string-array>
   <string-array name="preference_language_entryvalues" translatable="false">
     <item />
@@ -112,7 +112,7 @@
     <item>lt</item>
     <item>pt</item>
     <!--<item>pt-BR</item>-->
-    <!--<item>sr</item>-->
+    <item>sr</item>
   </string-array>
 
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 7ee112f6b897bab75ca7a93d60fc91923e82906c..c75c1af9621323e712eea54411affd2981b4b279 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -47,7 +47,7 @@
       android:summary="@string/preference_keep_screen_on_summary"
       android:title="@string/preference_keep_screen_on_title" />
 
-    <DropDownPreference
+    <ListPreference
       android:defaultValue=""
       android:entries="@array/preference_language_entries"
       android:entryValues="@array/preference_language_entryvalues"