Commit 781b2054 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 eb568c58
......@@ -5,6 +5,7 @@ X-DocPath=kfind/index.html
Type=Application
Terminal=false
Name=KFind
Name[ast]=KFind
Name[ca]=KFind
Name[ca@valencia]=KFind
Name[cs]=KFind
......@@ -25,6 +26,7 @@ Name[uk]=KFind
Name[x-test]=xxKFindxx
Name[zh_CN]=KFind
GenericName=Find Files/Folders
GenericName[ast]=Alcontar ficheros/carpetes
GenericName[ca]=Cerca fitxers i carpetes
GenericName[ca@valencia]=Cerca fitxers i carpetes
GenericName[cs]=Najít soubory/složky
......
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