From 9893fae27c2beaef2728425cc7e509051923bbf0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 1 Jun 2024 01:18:01 +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 b5f6d4523..cf421371e 100644 --- a/src/purpose/purposeplugin.json +++ b/src/purpose/purposeplugin.json @@ -3,6 +3,7 @@ "Authors": [ { "Name": "Tobias Fella", + "Name[ar]": "توبياس فلة", "Name[ca@valencia]": "Tobias Fella", "Name[ca]": "Tobias Fella", "Name[cs]": "Tobias Fella", @@ -31,6 +32,7 @@ ], "Category": "Utilities", "Description": "Share via NeoChat", + "Description[ar]": "شارك بواسطة نيوتشات", "Description[ca@valencia]": "Compartix a través de NeoChat", "Description[ca]": "Comparteix a través del NeoChat", "Description[de]": "Über NeoChat teilen", @@ -57,6 +59,7 @@ "Icon": "org.kde.neochat", "License": "GPL", "Name": "NeoChat", + "Name[ar]": "نيوتشات", "Name[ast]": "NeoChat", "Name[ca@valencia]": "NeoChat", "Name[ca]": "NeoChat",