From 1db9259bf9d539503348d39709d53e7aeebd2c82 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Jul 2023 02:28:09 +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" --- .../kdecorations/aurorae/src/config/kcm_auroraeconfig.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json index 6684f5fe97..dd2be92ea7 100644 --- a/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json +++ b/src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json @@ -16,6 +16,7 @@ "Description[it]": "Motore dei temi delle decorazioni delle finestre", "Description[ka]": "ფანჯრის დეკორაციის თემის ძრავა", "Description[nl]": "Engine voor thema van vensterdecoraties", + "Description[nn]": "Vindaugsdekorasjon-temamotor", "Description[pl]": "Silnik wyglądu okien", "Description[sl]": "Stroj za teme okrasitev oken", "Description[tr]": "Pencere Dekorasyon Teması İşletkesi", @@ -39,6 +40,7 @@ "Name[it]": "Aurorae", "Name[ka]": "ავრორა", "Name[nl]": "Aurorae", + "Name[nn]": "Aurorae", "Name[pl]": "Aurorae", "Name[sl]": "Aurorae", "Name[tr]": "Aurorae",