Commit 3bc0a781 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 3a3aad55
...@@ -51,7 +51,7 @@ GenericName[en_GB]=Find Files/Folders ...@@ -51,7 +51,7 @@ GenericName[en_GB]=Find Files/Folders
GenericName[es]=Buscar archivos/carpetas GenericName[es]=Buscar archivos/carpetas
GenericName[fi]=Etsi tiedostoja ja kansioita GenericName[fi]=Etsi tiedostoja ja kansioita
GenericName[fr]=Trouver des fichiers ou dossiers GenericName[fr]=Trouver des fichiers ou dossiers
GenericName[gl]=Buscar ficheiros/cartafoles GenericName[gl]=Atopar ficheiros/cartafoles
GenericName[he]=חיפוש קבצים ותיקיות GenericName[he]=חיפוש קבצים ותיקיות
GenericName[hu]=Fájl- és mappakereső GenericName[hu]=Fájl- és mappakereső
GenericName[ia]=Trova files/dossieres GenericName[ia]=Trova files/dossieres
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