From 889946e186a8cbb293bdd0bcebac3b3396a08289 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 22 Jun 2024 01:19:19 +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/neochat.notifyrc | 2 ++ src/purpose/purposeplugin.json | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index 9bba121cd..89904ad5f 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -271,6 +271,7 @@ Name[lv]=Kopīgot Name[nl]=Gedeelde Name[pl]=Udostępnij Name[sl]=Deli +Name[sv]=Dela Name[ta]=பகிர் Name[tr]=Paylaş Name[uk]=Оприлюднення @@ -294,6 +295,7 @@ Comment[lv]=Satura kopīgošanas rezultāts Comment[nl]=Het resultaat van het delen van een stukje inhoud Comment[pl]=Wynik udostępniania kawałka treści Comment[sl]=Rezultat deljenega kosa vsebine +Comment[sv]=Resultatet av att dela innehåll Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவு Comment[tr]=Bir parça içerik paylaşımının sonucu Comment[uk]=Результат оприлюднення даних diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index bed645741..9b96c7e8c 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -24,6 +24,7 @@ "Name[pl]": "Tobias Fella", "Name[ru]": "Tobias Fella", "Name[sl]": "Tobias Fella", + "Name[sv]": "Tobias Fella", "Name[ta]": "டோபியாஸ் ஃபெல்லா", "Name[tr]": "Tobias Fella", "Name[uk]": "Tobias Fella", @@ -53,6 +54,7 @@ "Description[pl]": "Udostępnij przez NeoChat", "Description[ru]": "Опубликовать в NeoChat", "Description[sl]": "Deli prek NeoChat", + "Description[sv]": "Dela via NeoChat", "Description[ta]": "நியோச்சாட் மூலம் பகிர்", "Description[tr]": "NeoChat ile Paylaş", "Description[uk]": "Оприлюднити за допомогою NeoChat", @@ -83,6 +85,7 @@ "Name[pl]": "NeoChat", "Name[ru]": "NeoChat", "Name[sl]": "NeoChat", + "Name[sv]": "NeoChat", "Name[ta]": "நியோச்சாட்", "Name[tr]": "NeoChat", "Name[uk]": "NeoChat",