From 9e82887160b31177f4a01dfbab8c3775b50b9c08 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 7 Dec 2022 01:53:13 +0000 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" --- src/effects/tileseditor/metadata.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/effects/tileseditor/metadata.json b/src/effects/tileseditor/metadata.json index 048e6c549f..8896592a00 100644 --- a/src/effects/tileseditor/metadata.json +++ b/src/effects/tileseditor/metadata.json @@ -11,6 +11,7 @@ "Description[nl]": "Bewerker voor de gebieden waar tegels worden geplaatst", "Description[pl]": "Edytor dla obszarów kafelkowanych", "Description[pt]": "Editor das áreas com padrões", + "Description[sl]": "Urejevalnik za področja s sličicami", "Description[tr]": "Döşeme alanları için düzenleyici", "Description[uk]": "Редактор для мозаїчних областей", "Description[x-test]": "xxEditor for the tiling areasxx", @@ -27,6 +28,7 @@ "Name[nl]": "Bewerker voor tegels plaatsen", "Name[pl]": "Edytor kafelków", "Name[pt]": "Editor de Padrões", + "Name[sl]": "Urejevalnik sličic", "Name[tr]": "Döşeme Düzenleyici", "Name[uk]": "Редактор мозаїк", "Name[x-test]": "xxTiling Editorxx"