Commit a9b93f57 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 c93a28a6
......@@ -15,6 +15,7 @@ Name[es]=KFind
Name[ia]=KFind
Name[it]=KFind
Name[nl]=KFind
Name[nn]=KFind
Name[pl]=KFind
Name[pt]=KFind
Name[sk]=KFind
......@@ -38,6 +39,7 @@ GenericName[es]=Buscar archivos/carpetas
GenericName[ia]=Trova files/dossieres
GenericName[it]=Trova file/cartelle
GenericName[nl]=Bestanden/mappen zoeken
GenericName[nn]=Finn filer/mapper
GenericName[pl]=Wyszukiwanie plików/katalogów
GenericName[pt]=Procurar nos Ficheiros/Pastas
GenericName[sk]=Nájsť súbory/priečinky
......
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