diff --git a/lang/sr.yml b/lang/sr.yml
index 1f555c41b2f9a6a33ae8752892a17ecddef6eda2..7176f5cd7c8595549e34e766b62c6ea9e7d2055b 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -34,7 +34,7 @@ activerecord_error_not_a_number: nije broj
 activerecord_error_not_a_date: nije datum
 activerecord_error_greater_than_start_date: mora biti veći od početnog datuma
 activerecord_error_not_same_project: ne pripada istom projektu
-activerecord_error_circular_dependency: Ova relacija bi kreirala kružnu zavisnost
+activerecord_error_circular_dependency: Ova relacija bi napravila kružnu zavisnost
 
 general_fmt_age: %d g
 general_fmt_age_plural: %d god.
@@ -51,24 +51,24 @@ general_csv_separator: ','
 general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
-general_day_names: Ponedeljak, Utorak, Sreda, četvrtak, Petak, Subota, Nedelja
+general_day_names: Ponedeljak, Utorak, Sreda, ÄŒetvrtak, Petak, Subota, Nedelja
 general_first_day_of_week: '1'
 
-notice_account_updated: Nalog je uspešno izmenjen.
+notice_account_updated: Nalog je uspešno promenjen.
 notice_account_invalid_creditentials: Pogrešan korisnik ili lozinka
-notice_account_password_updated: Lozinka je uspešno izmenjena.
+notice_account_password_updated: Lozinka je uspešno promenjena.
 notice_account_wrong_password: Pogrešna lozinka
-notice_account_register_done: Nalog je uspešno kreiran. Da bi ste aktivirali vaš nalog kliknite na link koji vam je poslat. 
+notice_account_register_done: Nalog je uspešno napravljen. Da bi ste aktivirali vaš nalog kliknite na link koji vam je poslat. 
 notice_account_unknown_email: Nepoznati korisnik.
 notice_can_t_change_password: Ovaj nalog koristi eksterni izvor prijavljivanja. Ne mogu da promenim Å¡ifru.
 notice_account_lost_email_sent: Email sa uputstvima o izboru nove šifre je poslat na vašu adresu.
 notice_account_activated: Vaš nalog je aktiviran. Možete se ulogovati.
 notice_successful_create: Uspešna kreacija.
-notice_successful_update: Uspešna izmena.
+notice_successful_update: Uspešna promena.
 notice_successful_delete: Uspešno brisanje.
 notice_successful_connection: Uspešna konekcija.
 notice_file_not_found: Stranica kojoj pokušavate da pristupite ne postoji ili je uklonjena.
-notice_locking_conflict: Podaci su izmenjeni od strane drugog korisnika.
+notice_locking_conflict: Podaci su promenjeni od strane drugog korisnika.
 notice_not_authorized: Niste ovlašćeni da pristupite ovoj stranici.
 notice_email_sent: Email je poslat %s
 notice_email_error: Došlo je do greške pri slanju maila (%s)
@@ -77,13 +77,13 @@ notice_failed_to_save_issues: "Neuspešno snimanje %d kartica na %d izabrano: %s
 notice_no_issue_selected: "Nijedna kartica nije izabrana! Molim, izaberite kartice koje želite za editujete."
 
 error_scm_not_found: "Unos i/ili revizija ne postoji u spremištu."
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_command_failed: "Došlo je do greške pri pristupanju spremištu: %s"
 
 mail_subject_lost_password: Vaša %s lozinka
-mail_body_lost_password: 'Da biste izmenili vašu lozinku, kliknite na sledeći link:'
-mail_subject_register: Aktivacija %s naloga
+mail_body_lost_password: 'Da biste promenili vašu lozinku, kliknite na sledeći link:'
+mail_subject_register: Aktivacija naloga %s 
 mail_body_register: 'Da biste aktivirali vaš nalog, kliknite na sledeći link:'
-mail_body_account_information_external: Mozete koristiti vas "%s" nalog da bi ste se prikljucili.
+mail_body_account_information_external: Mozete koristiti vas nalog "%s" da bi ste se prikljucili.
 mail_body_account_information: Informacije o vasem nalogu
 
 gui_validation_error: 1 greška
@@ -96,12 +96,12 @@ field_is_required: Zahtevano
 field_firstname: Ime
 field_lastname: Prezime
 field_mail: Email
-field_filename: File
+field_filename: Fajl
 field_filesize: Veličina
-field_downloads: Downloads
+field_downloads: Preuzimanja
 field_author: Autor
-field_created_on: Kreirano
-field_updated_on: Izmenjeno
+field_created_on: Postavljeno
+field_updated_on: Promenjeno
 field_field_format: Format
 field_is_for_all: Za sve projekte
 field_possible_values: Moguće vrednosti
@@ -115,25 +115,25 @@ field_project: Projekat
 field_issue: Kartica
 field_status: Status
 field_notes: Beleške
-field_is_closed: Greška zatvorena
+field_is_closed: Kartica zatvorena
 field_is_default: Podrazumevana vrednost
-field_tracker: Tracker
-field_subject: Subjekat
+field_tracker: Vrsta
+field_subject: Tema
 field_due_date: Do datuma
 field_assigned_to: Dodeljeno
 field_priority: Prioritet
-field_fixed_version: Target version
+field_fixed_version: Verzija
 field_user: Korisnik
 field_role: Uloga
 field_homepage: Homepage
 field_is_public: Javni
-field_parent: Podprojekat od
-field_is_in_chlog: Kartice se prikazuju u changelog-u
-field_is_in_roadmap: Kartice se prikazuju u roadmap-u
-field_login: Login
+field_parent: Potprojekat od
+field_is_in_chlog: Kartice se prikazuju u dnevniku promena
+field_is_in_roadmap: Kartice se prikazuju u Redosledu
+field_login: Korisnik
 field_mail_notification: Obaveštavanje putem mail-a
 field_admin: Administrator
-field_last_login_on: Poslednja konekcija
+field_last_login_on: Poslednje prijavljivanje
 field_language: Jezik
 field_effective_date: Datum
 field_password: Lozinka
@@ -150,14 +150,14 @@ field_attr_firstname: Atribut imena
 field_attr_lastname: Atribut prezimena
 field_attr_mail: Atribut email-a
 field_onthefly: Kreacija naloga "On-the-fly"
-field_start_date: Start
+field_start_date: Početak
 field_done_ratio: %% Završeno
 field_auth_source: Vrsta prijavljivanja
 field_hide_mail: Sakrij moju email adresu
 field_comments: Komentar
 field_url: URL
 field_start_page: Početna strana
-field_subproject: Podprojekat
+field_subproject: Potprojekat
 field_hours: Sati
 field_activity: Aktivnost
 field_spent_on: Datum
@@ -175,7 +175,7 @@ setting_app_title: Naziv aplikacije
 setting_app_subtitle: Podnaslov aplikacije
 setting_welcome_text: Tekst dobrodošlice
 setting_default_language: Podrazumevani jezik
-setting_login_required: Prijavljivanje obaveyno
+setting_login_required: Prijavljivanje je obavezno
 setting_self_registration: Samoregistracija je dozvoljena
 setting_attachment_max_size: Maksimalna velicina Attachment-a
 setting_issues_export_limit: Max broj kartica u exportu
@@ -188,27 +188,28 @@ setting_autofetch_changesets: Autofetch commits
 setting_sys_api_enabled: Ukljuci WS za menadžment spremišta
 setting_commit_ref_keywords: Referentne ključne reči
 setting_commit_fix_keywords: Fiksne ključne reči
-setting_autologin: Autologin
+setting_autologin: Automatsko prijavljivanje
 setting_date_format: Format datuma
 setting_cross_project_issue_relations: Dozvoli relacije kartica između različitih projekata
 setting_issue_list_default_columns: Podrazumevana kolona se prikazuje na listi kartica
 setting_repositories_encodings: Kodna stranica spremišta
 setting_emails_footer: Zaglavlje emaila
 
+label_example: Primer
 label_user: Korisnik
 label_user_plural: Korisnici
 label_user_new: Novi korisnik
 label_project: Projekat
 label_project_new: Novi projekat
 label_project_plural: Projekti
-label_project_all: Svi Projekti
+label_project_all: Svi projekti
 label_project_latest: Poslednji projekat
 label_issue: Kartica
 label_issue_new: Nova kartica
 label_issue_plural: Kartice
 label_issue_view_all: Pregled svih kartica
-label_document: Dokumenat
-label_document_new: Novi dokumenat
+label_document: Dokument
+label_document_new: Novi dokument
 label_document_plural: Dokumenti
 label_role: Uloga
 label_role_plural: Uloge
@@ -217,39 +218,39 @@ label_role_and_permissions: Uloge i prava
 label_member: ÄŒlan
 label_member_new: Novi član
 label_member_plural: ÄŒlanovi
-label_tracker: Tracker
-label_tracker_plural: Trackers
-label_tracker_new: Novi tracker
+label_tracker: Vrsta
+label_tracker_plural: Vrste
+label_tracker_new: Nova vrsta
 label_workflow: Tok rada
 label_issue_status: Status kartice
 label_issue_status_plural: Statusi kartica
 label_issue_status_new: Novi status
-label_issue_category: Kategorij kartice
+label_issue_category: Kategorija kartice
 label_issue_category_plural: Kategorije kartica
 label_issue_category_new: Nova kategorija
 label_custom_field: Korisnički definisano polje
 label_custom_field_plural: Korisnički definisana polja
 label_custom_field_new: Novo korisnički definisano polje
-label_enumerations: Enumeracije
+label_enumerations: Konstante
 label_enumeration_new: Nova vrednost
 label_information: Informacija
 label_information_plural: Informacije
-label_please_login: Molim ulogujte se
+label_please_login: Molim prijavite se
 label_register: Registracija
 label_password_lost: Izgubljena lozinka
-label_home: Home
-label_my_page: Moja Stranica
+label_home: Naslovna stranica
+label_my_page: Moja stranica
 label_my_account: Moj nalog
 label_my_projects: Moji projekti
 label_administration: Administracija
-label_login: Login
-label_logout: Logout
+label_login: Korisnik
+label_logout: Odjavi me
 label_help: Pomoć
 label_reported_issues: Prijavljene kartice
-label_assigned_to_me_issues: Kartice meni dodeljene
-label_last_login: Poslednja konekcija
-label_last_updates: Poslednje izmene
-label_last_updates_plural: %d poslednje izmenjene
+label_assigned_to_me_issues: Moje kartice
+label_last_login: Poslednje prijavljivanje
+label_last_updates: Poslednje promene
+label_last_updates_plural: %d poslednje promenjene
 label_registered_on: Registrovano
 label_activity: Aktivnost
 label_new: Novo
@@ -259,8 +260,8 @@ label_authentication: Prijavljivanje
 label_auth_source: Način prijavljivanja
 label_auth_source_new: Novi način prijavljivanja
 label_auth_source_plural: Načini prijavljivanja
-label_subproject_plural: Podprojekti
-label_min_max_length: Min - Max velicina
+label_subproject_plural: Potprojekti
+label_min_max_length: Min - Max veličina
 label_list: Liste
 label_date: Datum
 label_integer: Integer
@@ -272,7 +273,7 @@ label_attribute_plural: Atributi
 label_download: %d Download
 label_download_plural: %d Downloads
 label_no_data: Nema podataka za prikaz
-label_change_status: Izmena statusa
+label_change_status: Promena statusa
 label_history: Istorija
 label_attachment: Fajl
 label_attachment_new: Novi fajl
@@ -281,13 +282,13 @@ label_attachment_plural: Fajlovi
 label_report: Izveštaj
 label_report_plural: Izveštaji
 label_news: Novosti
-label_news_new: Dodaj novosti
+label_news_new: Dodaj novost
 label_news_plural: Novosti
 label_news_latest: Poslednje novosti
 label_news_view_all: Pregled svih novosti
-label_change_log: Change log
+label_change_log: Dnevnik promena
 label_settings: Podešavanja
-label_overview: Overview
+label_overview: Pregled
 label_version: Verzija
 label_version_new: Nova verzija
 label_version_plural: Verzije
@@ -296,9 +297,9 @@ label_export_to: Izvoz u
 label_read: ÄŒitaj...
 label_public_projects: Javni projekti
 label_open_issues: Otvoren
-label_open_issues_plural: Otvoreni
-label_closed_issues: Zatvoreni
-label_closed_issues_plural: Zatvoreni
+label_open_issues_plural: Otvoreno
+label_closed_issues: Zatvoren
+label_closed_issues_plural: Zatvoreno
 label_total: Ukupno
 label_permissions: Dozvole
 label_current_status: Trenutni status
@@ -317,8 +318,8 @@ label_calendar: Kalendar
 label_months_from: Meseci od
 label_gantt: Gantt
 label_internal: Interno
-label_last_changes: Poslednjih %d izmena
-label_change_view_all: Prikaz svih izmena
+label_last_changes: Poslednjih %d promena
+label_change_view_all: Prikaz svih promena
 label_personalize_page: Personalizuj ovu stranicu
 label_comment: Komentar
 label_comment_plural: Komentari
@@ -332,26 +333,26 @@ label_filter_add: Dodaj filter
 label_filter_plural: Filter
 label_equals: je
 label_not_equals: nije
-label_in_less_than: je manji od
-label_in_more_than: je veci od
-label_in: u
+label_in_less_than: za manje od
+label_in_more_than: za više od
+label_in: za tačno
 label_today: danas
 label_this_week: ove nedelje
-label_less_than_ago: manje nego dana
-label_more_than_ago: više nego dana
-label_ago: pre dana
+label_less_than_ago: pre manje od
+label_more_than_ago: pre više od
+label_ago: pre tačno
 label_contains: Sadrži
 label_not_contains: ne sadrži
 label_day_plural: dana
 label_repository: Spremište
 label_browse: Pregled
-label_modification: %d izmena
-label_modification_plural: %d izmena
+label_modification: %d promena
+label_modification_plural: %d promena
 label_revision: Revizija
 label_revision_plural: Revizije
 label_added: dodato
 label_modified: modifikovano
-label_deleted: izmenjeno
+label_deleted: promenjeno
 label_latest_revision: Poslednja revizija
 label_latest_revision_plural: Poslednje revizije
 label_view_revisions: Pregled revizija
@@ -361,7 +362,7 @@ label_sort_highest: Premesti na vrh
 label_sort_higher: premesti na gore
 label_sort_lower: Premesti na dole
 label_sort_lowest: Premesti na dno
-label_roadmap: Roadmap
+label_roadmap: Redosled
 label_roadmap_due_in: Završava se za %s
 label_roadmap_overdue: %s kasni
 label_roadmap_no_issues: Nema kartica za ovu verziju
@@ -369,8 +370,8 @@ label_search: Traži
 label_result_plural: Rezultati
 label_all_words: Sve reči
 label_wiki: Wiki
-label_wiki_edit: Wiki izmena
-label_wiki_edit_plural: Wiki izmene
+label_wiki_edit: Wiki promena
+label_wiki_edit_plural: Wiki promene
 label_wiki_page: Wiki stranica
 label_wiki_page_plural: Wiki stranice
 label_index_by_title: Indeks po naslovima
@@ -378,13 +379,13 @@ label_index_by_date: Indeks po datumu
 label_current_version: Trenutna verzija
 label_preview: Brzi pregled
 label_feed_plural: Feeds
-label_changes_details: Detalji svih izmena
+label_changes_details: Detalji svih promena
 label_issue_tracking: Praćenje kartica
-label_spent_time: Potrošeno vremena
+label_spent_time: Utrošeno vremena
 label_f_hour: %.2f časa
 label_f_hour_plural: %.2f časova
 label_time_tracking: Praćenje vremena
-label_change_plural: Izmene
+label_change_plural: Promene
 label_statistics: Statistika
 label_commits_per_month: Commit-a po mesecu
 label_commits_per_author: Commit-a po autoru
@@ -395,7 +396,7 @@ label_options: Opcije
 label_copy_workflow_from: Kopiraj tok rada od
 label_permissions_report: Izveštaj o dozvolama
 label_watched_issues: Praćene kartice
-label_related_issues: Kartice u vezi
+label_related_issues: Povezane kartice
 label_applied_status: Primenjen status
 label_loading: Učitavam...
 label_relation_new: Nova relacija
@@ -429,18 +430,18 @@ label_week: Nedelja
 label_date_from: Od
 label_date_to: Do
 label_language_based: Bazirano na jeziku
-label_sort_by: Sortiraj po %s
+label_sort_by: Uredi po %s
 label_send_test_email: Pošalji probni email
-label_feeds_access_key_created_on: RSS ključ za pristup je kreiran pre %s 
-label_module_plural: Modulovi
+label_feeds_access_key_created_on: RSS ključ za pristup je napravljen pre %s 
+label_module_plural: Moduli
 label_added_time_by: Dodato pre %s %s 
-label_updated_time: Izmenjeno pre %s 
+label_updated_time: Promenjeno pre %s 
 label_jump_to_a_project: Prebaci se na projekat...
 label_file_plural: Fajlovi
-label_changeset_plural: Skupovi izmena
+label_changeset_plural: Skupovi promena
 label_default_columns: Podrazumevane kolone
-label_no_change_option: (Bez izmena)
-label_bulk_edit_selected_issues: Zajednička izmena izabranih kartica
+label_no_change_option: (Bez promena)
+label_bulk_edit_selected_issues: Zajednička promena izabranih kartica
 label_theme: Tema
 label_default: Podrazumevana
 label_search_titles_only: Pretraga samo naslova
@@ -448,39 +449,39 @@ label_user_mail_option_all: "Za bilo koji događaj na svim mojim projektima"
 label_user_mail_option_selected: "Za bilo koji događaj za samo izabrane projekte..."
 label_user_mail_option_none: "Samo za stvari koje pratim ili u kojima učestvujem"
 
-button_login: Login
+button_login: Prijavi
 button_submit: Pošalji
-button_save: Snimi
+button_save: Sačuvaj
 button_check_all: Označi sve
 button_uncheck_all: Isključi sve
-button_delete: Briši
-button_create: Kreiraj
-button_test: Testiraj
-button_edit: Izmene
-button_add: Dodavanje
-button_change: Izmena
-button_apply: Primena
-button_clear: Brisanje
-button_lock: Zaključavanje
-button_unlock: Odključavanje
-button_download: Download
-button_list: Lista
+button_delete: Obriši
+button_create: Napravi
+button_test: Proveri
+button_edit: Menjanje
+button_add: Dodaj
+button_change: Promeni
+button_apply: Primeni
+button_clear: Poništi
+button_lock: Zaključaj
+button_unlock: Otključaj
+button_download: Preuzmi
+button_list: Spisak
 button_view: Pregled
-button_move: Premeštanje
+button_move: Premesti
 button_back: Nazad
-button_cancel: Odustajanje
+button_cancel: Odustani
 button_activate: Aktiviraj
-button_sort: Sortiranje
-button_log_time: Log time
+button_sort: Uredi
+button_log_time: Zapiši vreme
 button_rollback: Izvrši rollback na ovu verziju
-button_watch: Praćenje
-button_unwatch: Prekid praćenja
-button_reply: Odgovor
-button_archive: Arhiviranje
-button_unarchive: Dearhiviranje
-button_reset: Reset
-button_rename: Promena imena
-button_change_password: Izmena lozinke
+button_watch: Prati
+button_unwatch: Prekini praćenje
+button_reply: Odgovori
+button_archive: Arhiviraj
+button_unarchive: Dearhiviraj
+button_reset: Poništi
+button_rename: Promeni ime
+button_change_password: Promeni lozinku
 
 status_active: aktivan
 status_registered: registrovan
@@ -492,7 +493,7 @@ text_min_max_length_info: 0 znači bez restrikcija
 text_project_destroy_confirmation: Da li ste sigurni da želite da izbrišete ovaj projekat i sve njegove podatke?
 text_workflow_edit: Select a role and a tracker to edit the workflow
 text_are_you_sure: Da li ste sigurni ?
-text_journal_changed: izmenjen iz %s u %s
+text_journal_changed: promenjen iz %s u %s
 text_journal_set_to: postavi na %s
 text_journal_deleted: izbrisano
 text_tip_task_begin_day: Zadaci koji počinju ovog dana
@@ -506,12 +507,12 @@ text_unallowed_characters: Nedozvoljeni karakteri
 text_comma_separated: Višestruke vrednosti su dozvoljene (razdvojene zarezom).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
 text_issue_added: Kartica %s je prijavljena (by %s).
-text_issue_updated: Kartica %s je izmenjena (by %s).
+text_issue_updated: Kartica %s je promenjena (by %s).
 text_wiki_destroy_confirmation: Da li ste sigurni da želite da izbrišete ovaj wiki i svu njegovu sadržinu ?
 text_issue_category_destroy_question: Neke kartice (%d) su dodeljene ovoj kategoriji. Šta želite da uradite ?
 text_issue_category_destroy_assignments: Ukloni dodeljivanje kategorija
 text_issue_category_reassign_to: Ponovo dodeli kartice ovoj kategoriji
-text_user_mail_option: "Za neizabrane projekte, primaćete obaveštenja samo o stvarima koje pratite ili u kojima učestvujete (npr. kartice koje ste vi kreirali ili koje su vama dodeljene)."
+text_user_mail_option: "Za neizabrane projekte, primaćete obaveštenja samo o stvarima koje pratite ili u kojima učestvujete (npr. kartice koje ste vi napravili ili koje su vama dodeljene)."
 
 default_role_manager: Menadžer
 default_role_developper: Developer
@@ -528,7 +529,7 @@ default_issue_status_rejected: Odbačeno
 default_doc_category_user: Korisnička dokumentacija
 default_doc_category_tech: Tehnička dokumentacija
 default_priority_low: Nizak
-default_priority_normal: Normalan
+default_priority_normal: Redovan
 default_priority_high: Visok
 default_priority_urgent: Hitan
 default_priority_immediate: Odmah
@@ -539,16 +540,16 @@ enumeration_issue_priorities: Prioriteti kartica
 enumeration_doc_categories: Kategorija dokumenata
 enumeration_activities: Aktivnosti (praćenje vremena))
 label_float: Float
-button_copy: Copy
+button_copy: Iskopiraj
 setting_protocol: Protocol
-label_user_mail_no_self_notified: "Ne želim da budem obaveštavan o izmenama koje sam pravim"
+label_user_mail_no_self_notified: "Ne želim da budem obaveštavan o promenama koje sam pravim"
 setting_time_format: Format vremena
 label_registration_activation_by_email: aktivacija naloga putem email-a
 mail_subject_account_activation_request: %s zahtev za aktivacijom naloga
 mail_body_account_activation_request: 'Novi korisnik (%s) se registrovao. Njegov nalog čeka vaše odobrenje:'
 label_registration_automatic_activation: automatska aktivacija naloga
 label_registration_manual_activation: ručna aktivacija naloga
-notice_account_pending: "Vaš nalog je kreiran i čeka odobrenje administratora."
+notice_account_pending: "Vaš nalog je napravljen i čeka odobrenje administratora."
 field_time_zone: Vremenska zona
 text_caracters_minimum: Mora biti minimum %d karaktera dugačka.
 setting_bcc_recipients: '"Blind carbon copy" primaoci (bcc)'
@@ -562,23 +563,23 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
+button_update: Promeni
+label_change_properties: Promeni svojstva
+label_general: Opšte
+label_repository_plural: Spremišta
+label_associated_revisions: Dodeljene revizije
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
+label_more: Još
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
 label_scm: SCM
 text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
+label_issue_added: Kartica dodata
+label_issue_updated: Kartica promenjena
+label_document_added: Dokument dodat
+label_message_posted: Poruka dodata
+label_file_added: Fajl dodat
+label_news_added: Novost dodata
 project_module_boards: Boards
 project_module_issue_tracking: Issue tracking
 project_module_wiki: Wiki
@@ -594,53 +595,53 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
+label_this_month: ovog meseca
+label_last_n_days: poslednjih %d dana
+label_all_time: sva vremena
+label_this_year: ove godine
+label_date_range: Raspon datuma
+label_last_week: prošle nedelje
+label_yesterday: juče
+label_last_month: prošlog meseca
+label_add_another_file: Dodaj još jedan fajl
+label_optional_description: Opcioni opis
 text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
 error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
+label_chronological_order: U hronološkom redosledu
 field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
+label_reverse_chronological_order: U obrnutom hronološkom redosledu
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
+label_overall_activity: Ukupna aktivnost
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
-label_and_its_subprojects: %s and its subprojects
+label_planning: Planiranje
+text_subprojects_destroy_warning: 'I potprojekti projekta: %s će takođe biti obrisani.'
+label_and_its_subprojects: %s i potprojekti
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
-label_duplicated_by: duplicated by
+label_duplicated_by: ponovljen kao
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
-label_incoming_emails: Incoming emails
-label_generate_key: Generate a key
+label_incoming_emails: Dolazeće e-poruke
+label_generate_key: Generiši ključ
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
-label_issue_watchers: Watchers
+label_issue_watchers: Posmatrači
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
 setting_sequential_project_identifiers: Generate sequential project identifiers
 notice_unable_delete_version: Unable to delete version
-label_renamed: renamed
-label_copied: copied
+label_renamed: preimenovano
+label_copied: iskopirano
 setting_plain_text_mail: plain text only (no HTML)
 permission_view_files: View files
 permission_edit_issues: Edit issues
@@ -689,7 +690,6 @@ permission_rename_wiki_pages: Rename wiki pages
 permission_edit_time_entries: Edit time logs
 permission_edit_own_issue_notes: Edit own notes
 setting_gravatar_enabled: Use Gravatar user icons
-label_example: Example
-text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
 permission_edit_own_messages: Edit own messages
 permission_delete_won_messages: Delete own messages
+text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
diff --git a/lang/vn.yml b/lang/vn.yml
index bde3113831ee734e127052e28d65fecc2fa4c130..356dc1ecf671a54cd6ea8ee77bf1f20b89acdd4f 100644
--- a/lang/vn.yml
+++ b/lang/vn.yml
@@ -694,3 +694,4 @@ permission_delete_messages: Xóa bài viết
 permission_delete_own_messages: Xóa bài viết cá nhân
 label_example: Ví dụ
 text_repository_usernames_mapping: "Chọn hoặc cập nhật ánh xạ người dùng hệ thống với người dùng trong kho lưu trữ.\nNhững trường hợp trùng hợp về tên và email sẽ được tự động ánh xạ."
+permission_delete_won_messages: Delete own messages
diff --git a/lang/zh.yml b/lang/zh.yml
index d9cd6224c6a788e2607e240afd696cbd30778993..36c74867663a9550235722a1e2726fcd23ad710c 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -694,3 +694,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+permission_delete_won_messages: Delete own messages