Commit 44084704 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 1a4bdd92
......@@ -13,6 +13,7 @@ Name[de]=KFind
Name[el]=KFind
Name[en_GB]=KFind
Name[es]=KFind
Name[fi]=KFind
Name[fr]=KFind
Name[he]=KFind
Name[hu]=KFind
......@@ -46,6 +47,7 @@ GenericName[de]=Dateien/Ordner suchen
GenericName[el]=Αναζήτηση αρχείων/φακέλων
GenericName[en_GB]=Find Files/Folders
GenericName[es]=Buscar archivos/carpetas
GenericName[fi]=Etsi tiedostoja ja kansioita
GenericName[fr]=Trouver des fichiers ou dossiers
GenericName[he]=חיפוש קבצים ותיקיות
GenericName[hu]=Fájl- és mappakereső
......
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