Commit 972d4d88 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 4a1c479b
......@@ -16,6 +16,7 @@ Name[cs]=Nástroj pro aktualizaci složek pro vyhledávání
Name[en_GB]=Search Folder Updater
Name[es]=Actualizador de carpetas de búsqueda
Name[et]=Otsingukataloogide uuendaja
Name[fi]=Hakukansion päivitin
Name[fr]=Mise à jour du dossier Recherche
Name[it]=Strumento di aggiornamento delle cartelle di ricerca
......@@ -41,6 +42,7 @@ Comment[cs]=Umožňuje automatickou aktualizaci prohledávaných složek
Comment[de]=Ermöglicht die automatische Aktualisierung von Suchordnern
Comment[en_GB]=Allows automatic updates of Search Folders
Comment[es]=Permite actualizaciones automáticas de carpetas de búsqueda
Comment[et]=Võimaldab otsingukataloogide automaatset uuendamist
Comment[fi]=Mahdollistaa hakukansioiden automaattisen päivittämisen
Comment[fr]=Permet une mise à jour automatique des dossiers de recherche
Comment[it]=Consente aggiornamenti automatici delle cartelle di ricerca
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