From f08d4c7cfeed50228583aca5c6f5459ad3a6dd3b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 10 Mar 2025 01:32:02 +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" --- initialstart/modules/systemnavigation/metadata.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/initialstart/modules/systemnavigation/metadata.json b/initialstart/modules/systemnavigation/metadata.json index 51d082d9..5198130a 100644 --- a/initialstart/modules/systemnavigation/metadata.json +++ b/initialstart/modules/systemnavigation/metadata.json @@ -48,26 +48,32 @@ "Description[ca@valencia]": "Mòdul de començament inicial de navegació del sistema per a Plasma Mobile", "Description[ca]": "Mòdul de començament inicial de navegació del sistema per al Plasma Mobile", "Description[es]": "Módulo de navegación del sistema del primer inicio para Plasma Mobile", + "Description[fr]": "Module de démarrage initial pour le système de navigation pour Plasma Mobile", "Description[he]": "מודול להפעלה ראשונית של ניווט במערכת לפלזמה לניידים", + "Description[it]": "Modulo di avvio iniziale della navigazione del sistema per Plasma Mobile", "Description[ka]": "Plasma Mobile-ის სისტემაში ნავიგაციის სწრაფი გაშვების მოდული", "Description[nl]": "Systeemnavigatie initiële startmodule voor Plasma Mobile", "Description[sl]": "Modul za začetni zagon sistemske navigacije za Plasma Mobile", "Description[tr]": "Plasma Cep için sistem dolaşımı başlangıcı modülü", "Description[uk]": "Модуль навігації початкового запуску для мобільної Плазми", "Description[x-test]": "xxSystem navigation initialstart module for Plasma Mobilexx", + "Description[zh_CN]": "Plasma Mobile 的系统导航初始化模块", "Id": "org.kde.plasma.mobileinitialstart.systemnavigation", "License": "GPL-2.0+", "Name": "System Navigation", "Name[ca@valencia]": "Navegueu pel sistema", "Name[ca]": "Navegació del sistema", "Name[es]": "Navegación del sistema", + "Name[fr]": "Système de navigation", "Name[he]": "ניווט במערכת", + "Name[it]": "Navigazione del sistema", "Name[ka]": "ნავიგაცია სისტემაში", "Name[nl]": "Systeemnavigatie", "Name[sl]": "Sistemska navigacija", "Name[tr]": "Sistem Dolaşımı", "Name[uk]": "Навігація системою", "Name[x-test]": "xxSystem Navigationxx", + "Name[zh_CN]": "系统导航", "Website": "https://kde.org" } }