Commit d6032398 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 1b693b06
......@@ -33,6 +33,7 @@ Name[it]=Osservatore SMB
Name[ko]=SMB 모니터
Name[nl]=SMB-bewaker
Name[nn]=SMB-overvaking
Name[pl]=Monitor SMB
Name[pt]=Vigilante do SMB
Name[pt_BR]=Monitor SMB
Name[sk]=Sledovanie SMB
......@@ -58,6 +59,7 @@ Comment[it]=Sorveglia i cambiamenti nelle cartelle del protocollo smb:/
Comment[ko]=smb:/ 프로토콜의 디렉터리 변경 사항 감시
Comment[nl]=Bewaakt mappen via het protocol smb:// op wijzigingen
Comment[nn]=Overvakar mapper på smb:/-protokollen for endringar
Comment[pl]=Monitoruje katalogi protokołu smb:/ w poszukiwaniu zmian
Comment[pt]=Vigia as alterações nas pastas com protocolo smb:/
Comment[pt_BR]=Monitora as alterações nas pastas do protocolo smb://
Comment[sk]=Sleduje zmeny adresárov protokolu 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