Commit 3fdf2083 authored by Script Kiddy's avatar Script Kiddy

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 c7f90160
......@@ -23,6 +23,7 @@ Name[de]=SMB-Überwachung
Name[el]=Επόπτης SMB
Name[en_GB]=SMB Watcher
Name[es]=Observador SMB
Name[et]=SMB jälgija
Name[eu]=SMB behatzailea
Name[fi]=SMB-valvoja
Name[fr]=Surveillance « Samba »
......@@ -46,6 +47,7 @@ Comment[de]=Überwacht Ordner für das Protokoll „smb:/“ auf Änderungen
Comment[el]=Ελέγχει τους καταλόγους στο smb:/ πρωτόκολλο για αλλαγές
Comment[en_GB]=Monitors directories on the smb:/ protocol for changes
Comment[es]=Monitoriza cambios en directorios del protocolo smb:/
Comment[et]=smb:/ protokolli kaudu ühendatud kataloogide muutuste jälgimine
Comment[eu]=«smb:/» protokoloko direktorioak zelatatzen ditu aldaketa bila
Comment[fi]=Tarkkailee smb:/-yhteyskäytännön kansioiden muutoksia
Comment[fr]=Surveille les modifications pour les dossiers gérés par le protocole « smb:/ »
......
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