From 57ea28a2160c7a01eb01b96f371d5a343b5e68f6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 14 Nov 2017 05:58:20 +0100 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" --- plugins/platforms/virtual/virtual.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/platforms/virtual/virtual.json b/plugins/platforms/virtual/virtual.json index 594ce15c9b..5da2e01078 100644 --- a/plugins/platforms/virtual/virtual.json +++ b/plugins/platforms/virtual/virtual.json @@ -37,6 +37,7 @@ "Name": "virtual", "Name[ca@valencia]": "Virtual", "Name[ca]": "Virtual", + "Name[cs]": "virtuální", "Name[da]": "virtuel", "Name[de]": "Virtuell", "Name[el]": "εικονικό",