Commit c93a28a6 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 879e6d7e
......@@ -12,6 +12,7 @@ Name[cs]=KFind
Name[de]=KFind
Name[en_GB]=KFind
Name[es]=KFind
Name[ia]=KFind
Name[it]=KFind
Name[nl]=KFind
Name[pl]=KFind
......@@ -34,6 +35,7 @@ GenericName[cs]=Najít soubory/složky
GenericName[de]=Dateien/Ordner suchen
GenericName[en_GB]=Find Files/Folders
GenericName[es]=Buscar archivos/carpetas
GenericName[ia]=Trova files/dossieres
GenericName[it]=Trova file/cartelle
GenericName[nl]=Bestanden/mappen zoeken
GenericName[pl]=Wyszukiwanie plików/katalogów
......
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