Commit 9f7be9a1 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 c08c346e
...@@ -6,6 +6,7 @@ Name[ast]=Dropbox ...@@ -6,6 +6,7 @@ Name[ast]=Dropbox
Name[bs]=Dropbox Name[bs]=Dropbox
Name[ca]=Dropbox Name[ca]=Dropbox
Name[ca@valencia]=Dropbox Name[ca@valencia]=Dropbox
Name[da]=Dropbox Name[da]=Dropbox
Name[de]=Dropbox Name[de]=Dropbox
Name[el]=Dropbox Name[el]=Dropbox
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
"application/x-cd-image" "application/x-cd-image"
], ],
"Name": "Mount and unmount iso image", "Name": "Mount and unmount iso image",
"Name[ca]": "Muntatge i desmuntatge d'una imatge ISO",
"Name[cs]": "Připojit a odpojit obraz iso",
"Name[nl]": "Aan- en afkoppelen van iso-image",
"Name[uk]": "Монтування і демонтування образів ISO",
"Name[x-test]": "xxMount and unmount iso imagexx", "Name[x-test]": "xxMount and unmount iso imagexx",
"ServiceTypes": [ "ServiceTypes": [
"KFileItemAction/Plugin" "KFileItemAction/Plugin"
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