Fixed Serbian translation files from previous commit.

14 years ago · 275c717783
parent 36d02bb680
commit 275c717783
10 changed files with 0 additions and 24 deletions
--- a/bin/locale/el_GR.qm
+++ b/bin/locale/el_GR.qm
--- a/bin/locale/es_ES.qm
+++ b/bin/locale/es_ES.qm
--- a/bin/locale/fr_FR.qm
+++ b/bin/locale/fr_FR.qm
--- a/bin/locale/it_IT.qm
+++ b/bin/locale/it_IT.qm
--- a/bin/locale/nl_NL.qm
+++ b/bin/locale/nl_NL.qm
--- a/bin/locale/pl_PL.qm
+++ b/bin/locale/pl_PL.qm
--- a/bin/locale/ru_RU.qm
+++ b/bin/locale/ru_RU.qm
--- a/bin/locale/sk_SK.qm
+++ b/bin/locale/sk_SK.qm
--- a/translations/sr_BA.ts
+++ b/translations/sr_BA.ts
@ -2141,32 +2141,20 @@
    <message>
        <location filename="../src/preferences/preferences.ui" line="818"/>
        <source>Print element background</source>
-<<<<<<< HEAD
        <extracomment>when you are printing page (on printer), it determine whether to also print background (color, image) of html elements</extracomment>
-        <translation type="unfinished"></translation>
-=======
        <translation>Штампај позадину елемента</translation>
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
    </message>
    <message>
        <location filename="../src/preferences/preferences.ui" line="825"/>
        <source>Include links in focus chain</source>
-<<<<<<< HEAD
        <extracomment>focus also links on page (basically &lt;a&gt; elements) when pressing Tab key</extracomment>
-        <translation type="unfinished"></translation>
-=======
        <translation>Укључи везе у ланац фокуса</translation>
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
    </message>
    <message>
        <location filename="../src/preferences/preferences.ui" line="832"/>
        <source>Enable XSS Auditing</source>
-<<<<<<< HEAD
        <extracomment>try to detect possible XSS attacks when executing javascript</extracomment>
-        <translation type="unfinished"></translation>
-=======
        <translation>Укључи ИксСС провјеравање</translation>
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
    </message>
    <message>
        <location filename="../src/preferences/preferences.ui" line="856"/>
--- a/translations/sr_RS.ts
+++ b/translations/sr_RS.ts
@ -2141,32 +2141,20 @@
    <message>
        <location filename="../src/preferences/preferences.ui" line="818"/>
        <source>Print element background</source>
-<<<<<<< HEAD
        <extracomment>when you are printing page (on printer), it determine whether to also print background (color, image) of html elements</extracomment>
-        <translation type="unfinished"></translation>
-=======
        <translation>Штампај позадину елемента</translation>
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
    </message>
    <message>
        <location filename="../src/preferences/preferences.ui" line="825"/>
        <source>Include links in focus chain</source>
-<<<<<<< HEAD
        <extracomment>focus also links on page (basically &lt;a&gt; elements) when pressing Tab key</extracomment>
-        <translation type="unfinished"></translation>
-=======
        <translation>Укључи везе у ланац фокуса</translation>
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
    </message>
    <message>
        <location filename="../src/preferences/preferences.ui" line="832"/>
        <source>Enable XSS Auditing</source>
-<<<<<<< HEAD
        <extracomment>try to detect possible XSS attacks when executing javascript</extracomment>
-        <translation type="unfinished"></translation>
-=======
        <translation>Укључи ИксСС проверавање</translation>
->>>>>>> 464d4f13f50e2a5decf7bf412971c0cf0851c1f3
    </message>
    <message>
        <location filename="../src/preferences/preferences.ui" line="856"/>