Commit e7b4ea5e 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 5ba66bf2
Pipeline #260572 skipped
......@@ -14,6 +14,7 @@ Name[gl]=Script de Sieve
Name[hu]=Sieve szkript
Name[ia]=Script Sieve
Name[it]=Script di Sieve
Name[ka]=Script Sieve
Name[ko]=스크립트 Sieve
Name[nl]=Script Sieve
Name[pl]=Skrypt Sieve
......
......@@ -15,6 +15,7 @@ Name[gl]=Mover ao directorio
Name[hu]=Áthelyezés mappába
Name[ia]=Move a directorio
Name[it]=Sposta nella cartella
Name[ka]=საქაღალდეში გადატანა
Name[ko]=디렉터리로 이동
Name[nb]=Flytt til mappe
Name[nl]=Naar map verplaatsen
......
Supports Markdown
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