diff --git a/bin/locale/el_GR.qm b/bin/locale/el_GR.qm
index 330824944..9853a2f3b 100644
Binary files a/bin/locale/el_GR.qm and b/bin/locale/el_GR.qm differ
diff --git a/bin/locale/es_ES.qm b/bin/locale/es_ES.qm
index 3dfe7bfff..7274a86d8 100644
Binary files a/bin/locale/es_ES.qm and b/bin/locale/es_ES.qm differ
diff --git a/bin/locale/fr_FR.qm b/bin/locale/fr_FR.qm
index 905448969..3bae9e10c 100644
Binary files a/bin/locale/fr_FR.qm and b/bin/locale/fr_FR.qm differ
diff --git a/bin/locale/it_IT.qm b/bin/locale/it_IT.qm
index 392b44a66..ad989912f 100644
Binary files a/bin/locale/it_IT.qm and b/bin/locale/it_IT.qm differ
diff --git a/bin/locale/nl_NL.qm b/bin/locale/nl_NL.qm
index 4cafb472e..252325c6b 100644
Binary files a/bin/locale/nl_NL.qm and b/bin/locale/nl_NL.qm differ
diff --git a/bin/locale/pl_PL.qm b/bin/locale/pl_PL.qm
index 34296bc69..c920656d6 100644
Binary files a/bin/locale/pl_PL.qm and b/bin/locale/pl_PL.qm differ
diff --git a/bin/locale/ru_RU.qm b/bin/locale/ru_RU.qm
index 3a384bef7..21efe3927 100644
Binary files a/bin/locale/ru_RU.qm and b/bin/locale/ru_RU.qm differ
diff --git a/bin/locale/sk_SK.qm b/bin/locale/sk_SK.qm
index ae25094f2..f2a85315a 100644
Binary files a/bin/locale/sk_SK.qm and b/bin/locale/sk_SK.qm differ
diff --git a/translations/sr_BA.ts b/translations/sr_BA.ts
index dc40b41af..60f0777bd 100644
--- a/translations/sr_BA.ts
+++ b/translations/sr_BA.ts
@@ -2141,32 +2141,20 @@
Print element background
-<<<<<<< HEAD
when you are printing page (on printer), it determine whether to also print background (color, image) of html elements
-
-=======
Штампај позадину елемента
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
Include links in focus chain
-<<<<<<< HEAD
focus also links on page (basically <a> elements) when pressing Tab key
-
-=======
Укључи везе у ланац фокуса
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
Enable XSS Auditing
-<<<<<<< HEAD
try to detect possible XSS attacks when executing javascript
-
-=======
Укључи ИксСС провјеравање
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
diff --git a/translations/sr_RS.ts b/translations/sr_RS.ts
index f4bd59b43..b53d675c6 100644
--- a/translations/sr_RS.ts
+++ b/translations/sr_RS.ts
@@ -2141,32 +2141,20 @@
Print element background
-<<<<<<< HEAD
when you are printing page (on printer), it determine whether to also print background (color, image) of html elements
-
-=======
Штампај позадину елемента
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
Include links in focus chain
-<<<<<<< HEAD
focus also links on page (basically <a> elements) when pressing Tab key
-
-=======
Укључи везе у ланац фокуса
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
Enable XSS Auditing
-<<<<<<< HEAD
try to detect possible XSS attacks when executing javascript
-
-=======
Укључи ИксСС проверавање
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3