From 26d9c50a4b05411d6645ce06bea0cdfd1151d1b9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 10 Apr 2018 05:34:06 +0200 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" --- .../plasma-wallpaper-with-qml-extension.kdevtemplate | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate b/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate index 6c05d70e0..ff183eb95 100644 --- a/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate +++ b/templates/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate @@ -1,6 +1,7 @@ [General] Name=Simple Plasma Wallpaper with QML extension Name[ca]=Fons de pantalla senzill del Plasma amb extensió QML +Name[ca@valencia]=Fons de pantalla senzill del Plasma amb extensió QML Name[en_GB]=Simple Plasma Wallpaper with QML extension Name[id]=Wallpaper Plasma sederhana dengan ektensi QML Name[it]=Semplice sfondo di Plasma con estensione QML @@ -12,6 +13,7 @@ Name[x-test]=xxSimple Plasma Wallpaper with QML extensionxx Name[zh_TW]=含有 QML 副檔名的簡易 Plasma 桌布 Comment=A Plasma wallpaper which uses custom API provided by an own QML extension plugin Comment[ca]=Un fons de pantalla del Plasma que usa una API personalitzada proporcionada per un connector propi d'una extensió QML +Comment[ca@valencia]=Un fons de pantalla del Plasma que usa una API personalitzada proporcionada per un connector propi d'una extensió QML Comment[en_GB]=A Plasma wallpaper which uses custom API provided by an own QML extension plugin Comment[id]=Sebuah wallpaper Plasma yang menggunakan suaian API yang disediakan oleh plugin ekstensi QML sendiri Comment[it]=Uno sfondo di Plasma che utilizza API personalizzate fornite da una propria estensione QML