From 5d55ee4a0ce58663d5e974b0896aa8f47de7075c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Oct 2023 02:08:50 +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" --- examples/quick-effect/package/metadata.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/quick-effect/package/metadata.json b/examples/quick-effect/package/metadata.json index 1035d5afa6..f121a01eae 100644 --- a/examples/quick-effect/package/metadata.json +++ b/examples/quick-effect/package/metadata.json @@ -8,12 +8,14 @@ "Name[ca@valencia]": "Nom real", "Name[ca]": "Nom real", "Name[es]": "Nombre real", + "Name[eu]": "Benetako izena", "Name[fr]": "Nom réel", "Name[ia]": "Nomine real", "Name[ka]": "ნამდვილი სახელი", "Name[nl]": "Echte naam", "Name[pl]": "Rzeczywista nazwa", "Name[sl]": "Pravo ime", + "Name[ta]": "உண்மையான பெயர்", "Name[tr]": "Gerçek Adı", "Name[uk]": "Справжнє ім'я", "Name[x-test]": "xxReal Namexx", @@ -25,6 +27,7 @@ "Description[ca@valencia]": "Efecte ràpid", "Description[ca]": "Efecte ràpid", "Description[es]": "Efecto rápido", + "Description[eu]": "Efektu azkarra", "Description[fr]": "Effet rapide", "Description[ia]": "Effecto Rapide", "Description[ka]": "სწრაფი ეფექტი", @@ -42,6 +45,7 @@ "Name[ca@valencia]": "Efecte ràpid", "Name[ca]": "Efecte ràpid", "Name[es]": "Efecto rápido", + "Name[eu]": "Efektu azkarra", "Name[fr]": "Effet rapide", "Name[ia]": "Effecto Rapide", "Name[ka]": "სწრაფი ეფექტი",