Commit aff81b39 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 c25396c5
......@@ -9,6 +9,7 @@ Name[ast]=KFind
Name[ca]=KFind
Name[ca@valencia]=KFind
Name[cs]=KFind
Name[da]=KFind
Name[de]=KFind
Name[el]=KFind
Name[en_GB]=KFind
......@@ -47,6 +48,7 @@ GenericName[ast]=Alcontar ficheros/carpetes
GenericName[ca]=Cerca fitxers i carpetes
GenericName[ca@valencia]=Busca fitxers i carpetes
GenericName[cs]=Najít soubory/složky
GenericName[da]=Find filer/mapper
GenericName[de]=Dateien/Ordner suchen
GenericName[el]=Αναζήτηση αρχείων/φακέλων
GenericName[en_GB]=Find Files/Folders
......
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