Commit 868eb354 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 385ed848
......@@ -10,6 +10,7 @@
"Name[ca]": "Enllaçat de fitxers a les activitats",
"Name[cs]": "Připojit soubory k aktivitám",
"Name[da]": "Link filer til aktiviteter",
"Name[el]": "Σύνδεση αρχείων με δραστηριότητες",
"Name[en_GB]": "Link Files to Activities",
"Name[es]": "Enlazar archivos a actividades",
"Name[et]": "Failide linkimine tegevustega",
......
......@@ -19,6 +19,7 @@ Name=SMB Watcher
Name[ca]=Vigilant de SMB
Name[ca@valencia]=Vigilant de SMB
Name[cs]=Sledovač SMB
Name[el]=Επόπτης SMB
Name[es]=Observador SMB
Name[eu]=SMB behatzailea
Name[fi]=SMB-valvoja
......@@ -37,6 +38,7 @@ Comment=Monitors directories on the smb:/ protocol for changes
Comment[ca]=Controla els canvis als directoris en el protocol «smb:/»
Comment[ca@valencia]=Controla els canvis als directoris en el protocol «smb:/»
Comment[cs]=Monitoruje změny v adresáři protokolu smb:/
Comment[el]=Ελέγχει τους καταλόγους στο 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
......
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