Commit 4fc31e26 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 eeff4402
Pipeline #104048 skipped
......@@ -8,6 +8,7 @@ Name[en_GB]=Strike
Name[es]=Strike
Name[fi]=Strike
Name[fr]=Strike
Name[it]=Strike
Name[ko]=Strike
Name[nl]=Strike
Name[pl]=Strike
......@@ -24,6 +25,7 @@ Comment[en_GB]=Simple convergent IDE
Comment[es]=Sencillo IDE convergente
Comment[fi]=Yksinkertainen mukautuva kehityskäyttöliittymä
Comment[fr]=Un environnement de développement simple et convergent
Comment[it]=IDE semplice e convergente
Comment[ko]=간단한 올인원 IDE
Comment[nl]=Eenvoudige convergente IDE
Comment[pl]=Prosty dostosowujący się IDE
......@@ -46,6 +48,7 @@ GenericName[en_GB]=Simple IDE
GenericName[es]=IDE sencillo
GenericName[fi]=Yksinkertainen kehityskäyttöliittymä
GenericName[fr]=Un environnement de développement simple
GenericName[it]=Semplice IDE
GenericName[ko]=간단한 IDE
GenericName[nl]=Eenvoudige IDE
GenericName[pl]=Prosty IDE
......
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