Commit 094af7af authored by Script Kiddy's avatar Script Kiddy
Browse files

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 0d8c0958
......@@ -513,6 +513,7 @@ Name[et]=OpenPGP sertifikaadid
Name[fi]=OpenPGP-varmenteet
Name[fr]=Certificats OpenPGP
Name[gl]=Certificados OpenPGP
Name[ia]=Certificatos de OpenPGP
Name[it]=Certificati OpenPGP
Name[ko]=OpenPGP 인증서
Name[nl]=OpenPGP-certificaten
......@@ -548,6 +549,7 @@ Name[et]=X509 sertifikaadid
Name[fi]=X509-varmenteet
Name[fr]=Certificats X509
Name[gl]=Certificados X509
Name[ia]=Certificatos X.509
Name[it]=Certificati X509
Name[ko]=X509 인증서
Name[nl]=X509-certificaten
......@@ -584,6 +586,7 @@ Name[et]=VS-NfD ühilduv
Name[fi]=VS-NfD-yhteensopiva
Name[fr]=Compatible VS-NfD
Name[gl]=Cumpre con VS-NfD
Name[ia]=Conforme a VS-NfD
Name[it]=Conforme allo standard VS-NfD
Name[ko]=VS-NfD 적합
Name[nl]=VS-NfD Compliant
......@@ -611,6 +614,7 @@ Name[et]=VS-NfD ühildumatu
Name[fi]=Ei VS-NfD-yhteensopiva
Name[fr]=Incompatible VS-NfD
Name[gl]=Non cumpre con VS-NfD
Name[ia]=Non conforme a VS-NfD
Name[it]=Non conforme allo standard VS-NfD
Name[ko]=VS-NfD 부적합
Name[nl]=Niet VS-NfD Compliant
......
......@@ -226,6 +226,7 @@ Name[et]=sha512sum
Name[fi]=sha512sum
Name[fr]=sha512sum
Name[gl]=sha512sum
Name[ia]=sha512sum
Name[it]=sha512sum
Name[ko]=sha512sum
Name[nl]=sha512sum
......@@ -633,6 +634,7 @@ Name[et]=OpenPGP sertifikaadid
Name[fi]=OpenPGP-varmenteet
Name[fr]=Certificats OpenPGP
Name[gl]=Certificados OpenPGP
Name[ia]=Certificatos de OpenPGP
Name[it]=Certificati OpenPGP
Name[ko]=OpenPGP 인증서
Name[nl]=OpenPGP-certificaten
......@@ -668,6 +670,7 @@ Name[et]=X509 sertifikaadid
Name[fi]=X509-varmenteet
Name[fr]=Certificats X509
Name[gl]=Certificados X509
Name[ia]=Certificatos X.509
Name[it]=Certificati X509
Name[ko]=X509 인증서
Name[nl]=X509-certificaten
......@@ -704,6 +707,7 @@ Name[et]=VS-NfD ühilduv
Name[fi]=VS-NfD-yhteensopiva
Name[fr]=Compatible VS-NfD
Name[gl]=Cumpre con VS-NfD
Name[ia]=Conforme a VS-NfD
Name[it]=Conforme allo standard VS-NfD
Name[ko]=VS-NfD 적합
Name[nl]=VS-NfD Compliant
......@@ -731,6 +735,7 @@ Name[et]=VS-NfD ühildumatu
Name[fi]=Ei VS-NfD-yhteensopiva
Name[fr]=Incompatible VS-NfD
Name[gl]=Non cumpre con VS-NfD
Name[ia]=Non conforme a VS-NfD
Name[it]=Non conforme allo standard VS-NfD
Name[ko]=VS-NfD 부적합
Name[nl]=Niet VS-NfD Compliant
......
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