Commit 39ef052c 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 d682a669
......@@ -20,6 +20,7 @@ Name[ca]=Vigilant de SMB
Name[ca@valencia]=Vigilant de SMB
Name[es]=Observador SMB
Name[eu]=SMB behatzailea
Name[fi]=SMB-valvoja
Name[fr]=Surveillance « Samba »
Name[nl]=SMB-bewaker
Name[pt]=Vigilante do SMB
......@@ -34,6 +35,7 @@ Comment[ca]=Controla els canvis als directoris en el protocol «smb:/»
Comment[ca@valencia]=Controla els canvis als directoris en el protocol «smb:/»
Comment[es]=Monitoriza cambios en directorios del protocolo smb:/
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:/ »
Comment[nl]=Bewaakt mappen via het protocol smb:// op wijzigingen
Comment[pt]=Vigia as alterações nas pastas com protocolo 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