From fe3a39a5a91e689b93ecdacdc23f07f52ab5c6c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 27 Jun 2024 01:19:29 +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" --- .../metadata.json | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/layout-templates/org.kde.plasma.mobile.defaultMobileLayout/metadata.json b/layout-templates/org.kde.plasma.mobile.defaultMobileLayout/metadata.json index 4f91fffc..2efb1c2a 100644 --- a/layout-templates/org.kde.plasma.mobile.defaultMobileLayout/metadata.json +++ b/layout-templates/org.kde.plasma.mobile.defaultMobileLayout/metadata.json @@ -4,7 +4,43 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[ar]": "ديفين لين", + "Name[az]": "Devin Lin", + "Name[ca@valencia]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[cs]": "Devin Lin", + "Name[de]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[eo]": "Devin Lin", + "Name[es]": "Devin Lin", + "Name[eu]": "Devin Lin", + "Name[fi]": "Devin Lin", + "Name[fr]": "Devin Lin", + "Name[gl]": "Devin Lin", + "Name[he]": "דווין לין", + "Name[hu]": "Devin Lin", + "Name[ia]": "Devin Lin", + "Name[is]": "Devin Lin", + "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", + "Name[ko]": "Devin Lin", + "Name[lv]": "Devin Lin", + "Name[nl]": "Devin Lin", + "Name[nn]": "Devin Lin", + "Name[pa]": "ਡੇਵਿਨ ਲਿਨ", + "Name[pl]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", + "Name[ru]": "Devin Lin", + "Name[sk]": "Devin Lin", + "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx", + "Name[zh_CN]": "Devin Lin", + "Name[zh_TW]": "Devin Lin" } ], "Category": "", @@ -20,4 +56,3 @@ ], "X-Plasma-Shell": "plasmashell" } -