From 9f7be9a1db5a875dc3bb11701f027032da96b7a9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 2 Jun 2020 05:23:03 +0200 Subject: [PATCH] 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" --- dropbox/fileviewdropboxplugin.desktop | 1 + mountiso/mountisoaction.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dropbox/fileviewdropboxplugin.desktop b/dropbox/fileviewdropboxplugin.desktop index f833ce9..e10320c 100644 --- a/dropbox/fileviewdropboxplugin.desktop +++ b/dropbox/fileviewdropboxplugin.desktop @@ -6,6 +6,7 @@ Name[ast]=Dropbox Name[bs]=Dropbox Name[ca]=Dropbox Name[ca@valencia]=Dropbox +Name[cs]=Dropbox Name[da]=Dropbox Name[de]=Dropbox Name[el]=Dropbox diff --git a/mountiso/mountisoaction.json b/mountiso/mountisoaction.json index 7e91465..5708ee6 100644 --- a/mountiso/mountisoaction.json +++ b/mountiso/mountisoaction.json @@ -5,6 +5,10 @@ "application/x-cd-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", "ServiceTypes": [ "KFileItemAction/Plugin" -- GitLab