Commit f7554b20 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 613a3cb6
......@@ -6,12 +6,14 @@ Type=Application
Terminal=false
Name=KFind
Name[ca]=KFind
Name[es]=KFind
Name[it]=KFind
Name[nl]=KFind
Name[uk]=KFind
Name[x-test]=xxKFindxx
GenericName=Find Files/Folders
GenericName[ca]=Cerca fitxers i carpetes
GenericName[es]=Buscar archivos/carpetas
GenericName[it]=Trova file/cartelle
GenericName[nl]=Bestanden/mappen zoeken
GenericName[uk]=Пошук файлів та тек
......
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