Commit 047c7ef7 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 b2ae5b60
...@@ -46,7 +46,7 @@ Name[zh_TW]=KFind ...@@ -46,7 +46,7 @@ Name[zh_TW]=KFind
GenericName=Find Files/Folders GenericName=Find Files/Folders
GenericName[ast]=Alcontar ficheros/carpetes GenericName[ast]=Alcontar ficheros/carpetes
GenericName[ca]=Cerca fitxers i carpetes GenericName[ca]=Cerca fitxers i carpetes
GenericName[ca@valencia]=Busca fitxers i carpetes GenericName[ca@valencia]=Cerca fitxers i carpetes
GenericName[cs]=Najít soubory/složky GenericName[cs]=Najít soubory/složky
GenericName[da]=Find filer/mapper GenericName[da]=Find filer/mapper
GenericName[de]=Dateien/Ordner suchen GenericName[de]=Dateien/Ordner suchen
Markdown is supported
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