Commit aa3271b5 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 9f644e70
......@@ -26,6 +26,7 @@ Comment[hne]=मानीटर केलिब्रेसन औजार
Comment[hr]=Alat za uštimavanje monitora
Comment[hu]=Monitorbeállító program
Comment[ia]=Instrumento de calibration de monitor
Comment[id]=Sebuah alat kalibrasi monitor
Comment[is]=Tól til að stilla skjáinn
Comment[it]=Calibrazione del monitor
Comment[ja]=モニタ測定ツール
......@@ -97,6 +98,7 @@ Name[hne]=गामा
Name[hr]=Gama
Name[hu]=Gamma-korrekció
Name[ia]=Gamma
Name[id]=Gamma
Name[is]=Litróf (gamma)
Name[it]=Gamma
Name[ja]=ガンマ
......@@ -168,6 +170,7 @@ X-KDE-Keywords[gl]=KGamma, kgamma, Gamma, gamma
X-KDE-Keywords[he]=KGamma, kgamma, Gamma, gamma, גאמה
X-KDE-Keywords[hu]=KGamma, kgamma, Gamma, gamma
X-KDE-Keywords[ia]=KGamma, kgamma, Gamma, gamma
X-KDE-Keywords[id]=KGamma, kgamma, Gamma, gamma
X-KDE-Keywords[is]=KGamma, kgamma, Gamma, gamma,litstilling
X-KDE-Keywords[it]=KGamma, kgamma, Gamma, gamma
X-KDE-Keywords[kk]=KGamma, kgamma, Gamma, gamma, гамма, Гамма
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment