Commit 9fcda988 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 d1c5dffc
...@@ -10,4 +10,20 @@ X-KDE-Kded-load-on-demand=true ...@@ -10,4 +10,20 @@ X-KDE-Kded-load-on-demand=true
X-KDE-Kded-autoload=false X-KDE-Kded-autoload=false
Name=Search Folder Updater Name=Search Folder Updater
Name[ca]=Actualitzador de les carpetes de cerca
Name[it]=Strumento di aggiornamento delle cartelle di ricerca
Name[nl]=Bijwerker van zoekmap
Name[sk]=Aktualizátor priečinkov hľadania
Name[sl]=Posodobilnik iskalnih map
Name[sv]=Uppdatering av sökkatalog
Name[uk]=Засіб оновлення тек пошуку
Name[x-test]=xxSearch Folder Updaterxx
Comment=Allows automatic updates of Search Folders Comment=Allows automatic updates of Search Folders
Comment[ca]=Permet l'actualització automàtica de les carpetes de cerca
Comment[it]=Consente aggiornamenti automatici delle cartelle di ricerca
Comment[nl]=Staat automatisch bijwerken van zoekmappen toe
Comment[sk]=Umožní automatické aktualizácie priečinkov hľadania
Comment[sl]=Omogoča samodejno posodabljanje iskalnih map
Comment[sv]=Möjliggör automatiska uppdateringar av sökkataloger
Comment[uk]=Надає змогу автоматично оновлювати теки пошуку
Comment[x-test]=xxAllows automatic updates of Search Foldersxx
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