Commit 9afab77a 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 7bc338f3
......@@ -422,7 +422,9 @@ Name[cs]=Certifikáty OpenPGP
Name[de]=OpenPGP-Zertifikate
Name[en_GB]=OpenPGP Certificates
Name[es]=Certificados OpenPGP
Name[fi]=OpenPGP-varmenteet
Name[gl]=Certificados OpenPGP
Name[it]=Certificati OpenPGP
Name[nl]=OpenPGP-certificaten
Name[pl]=Certyfikaty OpenPGP
Name[pt]=Certificados do OpenPGP
......@@ -445,7 +447,9 @@ Name[cs]=Certifikáty X509
Name[de]=X509-Zertifikate
Name[en_GB]=X509 Certificates
Name[es]=Certificados X509
Name[fi]=X509-varmenteet
Name[gl]=Certificados X509
Name[it]=Certificati X509
Name[nl]=X509-certificaten
Name[pl]=Certyfikaty X509
Name[pt]=Certificados X509
......
......@@ -462,7 +462,9 @@ Name[cs]=Certifikáty OpenPGP
Name[de]=OpenPGP-Zertifikate
Name[en_GB]=OpenPGP Certificates
Name[es]=Certificados OpenPGP
Name[fi]=OpenPGP-varmenteet
Name[gl]=Certificados OpenPGP
Name[it]=Certificati OpenPGP
Name[nl]=OpenPGP-certificaten
Name[pl]=Certyfikaty OpenPGP
Name[pt]=Certificados do OpenPGP
......@@ -485,7 +487,9 @@ Name[cs]=Certifikáty X509
Name[de]=X509-Zertifikate
Name[en_GB]=X509 Certificates
Name[es]=Certificados X509
Name[fi]=X509-varmenteet
Name[gl]=Certificados X509
Name[it]=Certificati X509
Name[nl]=X509-certificaten
Name[pl]=Certyfikaty X509
Name[pt]=Certificados X509
......
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