Commit a03b4e5d 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 11b68c39
......@@ -6,6 +6,8 @@ Type=Application
Terminal=false
Name=KFind
Name[ca]=KFind
Name[ca@valencia]=KFind
Name[de]=KFind
Name[en_GB]=KFind
Name[es]=KFind
Name[it]=KFind
......@@ -23,6 +25,8 @@ Name[x-test]=xxKFindxx
Name[zh_CN]=KFind
GenericName=Find Files/Folders
GenericName[ca]=Cerca fitxers i carpetes
GenericName[ca@valencia]=Cerca fitxers i carpetes
GenericName[de]=Dateien/Ordner suchen
GenericName[en_GB]=Find Files/Folders
GenericName[es]=Buscar archivos/carpetas
GenericName[it]=Trova file/cartelle
......
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