From 1413d99ea6911a88b0fa63b33f14df239e787e5f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 6 Feb 2023 03:36:18 +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"
---
 wallpapers/Next/metadata.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wallpapers/Next/metadata.json b/wallpapers/Next/metadata.json
index 0e831245..7102be96 100644
--- a/wallpapers/Next/metadata.json
+++ b/wallpapers/Next/metadata.json
@@ -10,8 +10,10 @@
                 "Name[es]": "Andy Betts",
                 "Name[eu]": "Andy Betts",
                 "Name[fr]": "Andy Betts",
+                "Name[ka]": "ენდი ბეთსი",
                 "Name[nl]": "Andy Betts",
                 "Name[pl]": "Andy Betts",
+                "Name[sl]": "Andy Betts",
                 "Name[tr]": "Andy Betts",
                 "Name[uk]": "Andy Betts",
                 "Name[x-test]": "xxAndy Bettsxx"
@@ -26,8 +28,10 @@
         "Name[es]": "Montaña",
         "Name[eu]": "Mendia",
         "Name[fr]": "Montagne",
+        "Name[ka]": "მთა",
         "Name[nl]": "Berg",
         "Name[pl]": "Góra",
+        "Name[sl]": "Gora",
         "Name[tr]": "Dağ",
         "Name[uk]": "Гора",
         "Name[x-test]": "xxMountainxx"