From 2b61f2a9e8ec8bb7151fe1e0d565fd8bac8cac0c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 May 2024 01:16:57 +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/purpose/purposeplugin.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/purpose/purposeplugin.json b/src/purpose/purposeplugin.json index b507e7981..0024a0c90 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -17,6 +17,7 @@ "Name[lv]": "Tobias Fella", "Name[nl]": "Tobias Fella", "Name[pl]": "Tobias Fella", + "Name[ru]": "Tobias Fella", "Name[sl]": "Tobias Fella", "Name[ta]": "டோபியாஸ் ஃபெல்லா", "Name[tr]": "Tobias Fella", @@ -40,6 +41,7 @@ "Description[lv]": "Kopīgot ar „NeoChat“", "Description[nl]": "Delen via NeoChat", "Description[pl]": "Udostępnij przez NeoChat", + "Description[ru]": "Опубликовать в NeoChat", "Description[sl]": "Deli prek NeoChat", "Description[ta]": "நியோச்சாட் மூலம் பகிர்", "Description[tr]": "NeoChat ile Paylaş", @@ -64,6 +66,7 @@ "Name[lv]": "NeoChat", "Name[nl]": "NeoChat", "Name[pl]": "NeoChat", + "Name[ru]": "NeoChat", "Name[sl]": "NeoChat", "Name[ta]": "நியோச்சாட்", "Name[tr]": "NeoChat",