From 4719013aa558b47993af119ccb4262b5e6b9d7af Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 21 Oct 2023 02:07:21 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/quick-effect/package/metadata.json b/examples/quick-effect/package/metadata.json index fceeadaf71..398fca7428 100644 --- a/examples/quick-effect/package/metadata.json +++ b/examples/quick-effect/package/metadata.json @@ -9,6 +9,7 @@ "Name[ca]": "Nom real", "Name[es]": "Nombre real", "Name[ia]": "Nomine real", + "Name[ka]": "ნამდვილი სახელი", "Name[nl]": "Echte naam", "Name[sl]": "Pravo ime", "Name[tr]": "Gerçek Adı", @@ -23,6 +24,7 @@ "Description[ca]": "Efecte ràpid", "Description[es]": "Efecto rápido", "Description[ia]": "Effecto Rapide", + "Description[ka]": "სწრაფი ეფექტი", "Description[nl]": "Snel-effect", "Description[sl]": "Hitri učinek", "Description[tr]": "Tez Efekt", @@ -37,6 +39,7 @@ "Name[ca]": "Efecte ràpid", "Name[es]": "Efecto rápido", "Name[ia]": "Effecto Rapide", + "Name[ka]": "სწრაფი ეფექტი", "Name[nl]": "Snel-effect", "Name[sl]": "Hitri učinek", "Name[tr]": "Tez Efekt",