From 824feedbe20fd0a2a39f21c62f41ab22db9c3284 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 Jan 2025 02:19:33 +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" --- containment/package/metadata.json | 2 ++ .../contextmenu/plasma-containmentactions-lattecontextmenu.json | 2 ++ indicators/default/metadata.json | 2 ++ indicators/org.kde.latte.plasma/metadata.json | 2 ++ indicators/org.kde.latte.plasmatabstyle/metadata.json | 2 ++ plasmoid/package/metadata.json | 2 ++ shell/package/metadata.json | 2 ++ 7 files changed, 14 insertions(+) diff --git a/containment/package/metadata.json b/containment/package/metadata.json index 06f8bccc1..72614ca86 100644 --- a/containment/package/metadata.json +++ b/containment/package/metadata.json @@ -4,6 +4,7 @@ { "Email": "mvourlakos@gmail.com, audoban@openmailbox.org", "Name": "Michail Vourlakos, Smith Ar", + "Name[ar]": "مايكل فورلاكوس، سميث آر", "Name[az]": "Michail Vourlakos, Smith Ar", "Name[ca@valencia]": "Michail Vourlakos, Smith Ar", "Name[ca]": "Michail Vourlakos, Smith Ar", @@ -35,6 +36,7 @@ "Category": "", "Dependencies": [], "Description": "Containment provided for the Latte Dock", + "Description[ar]": "حاوية موفرة لرصيف لاتيه", "Description[az]": "Latte Dok paneli üçün nəzərdə tutulmuş saxlama", "Description[ca@valencia]": "Contenidor proporcionat per Latte Dock", "Description[ca]": "Contenidor proporcionat pel Latte Dock", diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json index 174a893e2..40f0f67c4 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json @@ -4,6 +4,7 @@ { "Email": "mvourlakos@gmail.com", "Name": "Michail Vourlakos", + "Name[ar]": "مايكل فورلاكوس", "Name[az]": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos", @@ -34,6 +35,7 @@ ], "Dependencies": [], "Description": "The latte menu that normally shows on right-click", + "Description[ar]": "قائمة لاتيه التي تظهر في المعتاد عن النقر باليمين", "Description[az]": "Latte menyusu sağ düyməyə vurduqda normal göstərilir", "Description[ca@valencia]": "El menú Latte que es mostra normalment amb un clic del botó dret", "Description[ca]": "El menú Latte que es mostra normalment amb un clic del botó dret", diff --git a/indicators/default/metadata.json b/indicators/default/metadata.json index d9f682be5..8ad82df18 100644 --- a/indicators/default/metadata.json +++ b/indicators/default/metadata.json @@ -4,6 +4,7 @@ { "Email": "mvourlakos@gmail.com", "Name": "Michail Vourlakos", + "Name[ar]": "مايكل فورلاكوس", "Name[az]": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos", @@ -34,6 +35,7 @@ ], "Category": "Latte Indicator", "Description": "Latte default indicator", + "Description[ar]": "مؤشر لاتيه المبدئي", "Description[az]": "Latte standart göstəricisi", "Description[ca@valencia]": "Indicador predeterminat de Latte", "Description[ca]": "Indicador predeterminat del Latte", diff --git a/indicators/org.kde.latte.plasma/metadata.json b/indicators/org.kde.latte.plasma/metadata.json index 31ed1b74a..4f91779dc 100644 --- a/indicators/org.kde.latte.plasma/metadata.json +++ b/indicators/org.kde.latte.plasma/metadata.json @@ -4,6 +4,7 @@ { "Email": "mvourlakos@gmail.com", "Name": "Michail Vourlakos", + "Name[ar]": "مايكل فورلاكوس", "Name[az]": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos", @@ -34,6 +35,7 @@ ], "Category": "Latte Indicator", "Description": "Latte Plasma style indicator", + "Description[ar]": "مؤشر نمط بلازما لاتيه", "Description[az]": "Latte Plasma üslubu göstəricisi", "Description[ca@valencia]": "Indicador a l'estil Plasma de Latte", "Description[ca]": "Indicador a l'estil Plasma del Latte", diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.json b/indicators/org.kde.latte.plasmatabstyle/metadata.json index e89f772f6..b3a050cdc 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.json +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.json @@ -4,6 +4,7 @@ { "Email": "mvourlakos@gmail.com", "Name": "Michail Vourlakos", + "Name[ar]": "مايكل فورلاكوس", "Name[az]": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos", @@ -34,6 +35,7 @@ ], "Category": "Latte Indicator", "Description": "Plasma Tab style indicator for Latte", + "Description[ar]": "مؤشر نمط ألسنة بلازما للاتيه", "Description[az]": "Latte üçün Plasma Vərəq Üslubu göstəricisi", "Description[ca@valencia]": "Indicador a l'estil pestanya de Plasma per a Latte", "Description[ca]": "Indicador a l'estil pestanya del Plasma per al Latte", diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index 08b84a694..e87e1211a 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -4,6 +4,7 @@ { "Email": "mvourlakos@gmail.com, audoban@openmailbox.org", "Name": "Michail Vourlakos, Smith Ar", + "Name[ar]": "مايكل فورلاكوس، سميث آر", "Name[az]": "Michail Vourlakos, Smith Ar", "Name[ca@valencia]": "Michail Vourlakos, Smith Ar", "Name[ca]": "Michail Vourlakos, Smith Ar", @@ -34,6 +35,7 @@ ], "Category": "Windows and Tasks", "Description": "Tasks plasmoid from Latte Dock", + "Description[ar]": "بلازمويد المهام من رصيف لاتيه", "Description[az]": "Latte Dokdan Tapşırıqlar plasmoidi", "Description[ca@valencia]": "Plasmoide de tasques de Latte Dock", "Description[ca]": "Plasmoide de tasques del Latte Dock", diff --git a/shell/package/metadata.json b/shell/package/metadata.json index ecd5874a9..a1866c7e4 100644 --- a/shell/package/metadata.json +++ b/shell/package/metadata.json @@ -4,6 +4,7 @@ { "Email": "mvourlakos@gmail.com, audoban@openmailbox.org", "Name": "Michail Vourlakos, Smith Ar", + "Name[ar]": "مايكل فورلاكوس، سميث آر", "Name[az]": "Michail Vourlakos, Smith Ar", "Name[ca@valencia]": "Michail Vourlakos, Smith Ar", "Name[ca]": "Michail Vourlakos, Smith Ar", @@ -33,6 +34,7 @@ } ], "Description": "Shell provided for the Latte Dock", + "Description[ar]": "صدفة موفرة لرصيف لاتيه", "Description[az]": "Latte Dok paneli üçün nəzərdə tutulan üzlük", "Description[ca@valencia]": "Intèrpret d'ordres proporcionat per Latte Dock", "Description[ca]": "Intèrpret d'ordres proporcionat pel Latte Dock",