Commit 613a3cb6 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 4be34956
...@@ -5,7 +5,17 @@ X-DocPath=kfind/index.html ...@@ -5,7 +5,17 @@ X-DocPath=kfind/index.html
Type=Application Type=Application
Terminal=false Terminal=false
Name=KFind Name=KFind
GenericName=Find Files/Folders GenericName=Find Files/Folders
GenericName[ca]=Cerca fitxers i carpetes
GenericName[it]=Trova file/cartelle
GenericName[nl]=Bestanden/mappen zoeken
GenericName[uk]=Пошук файлів та тек
GenericName[x-test]=xxFind Files/Foldersxx
X-KDE-StartupNotify=true X-KDE-StartupNotify=true
OnlyShowIn=KDE; OnlyShowIn=KDE;
Categories=Qt;KDE;Utility; Categories=Qt;KDE;Utility;
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