From 4fd02993ea055da0335f06c7bd0d6de04e8ed086 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Jan 2018 05:11:15 +0100 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" --- applets/quicksettings/package/metadata.desktop | 2 +- plasma-mobile.desktop.cmake | 2 ++ touchscreentest/org.kde.touchtest.desktop | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/applets/quicksettings/package/metadata.desktop b/applets/quicksettings/package/metadata.desktop index 8de106d0..5664a538 100644 --- a/applets/quicksettings/package/metadata.desktop +++ b/applets/quicksettings/package/metadata.desktop @@ -20,7 +20,7 @@ Name[x-test]=xxQuick Settingsxx Name[zh_TW]=快速設定 Comment=A panel to quickly access most important settings -Comment[ast]=Un panel p'acceder rápidamente a les opciones más importantes +Comment[ast]=Un panel p'acceder aína a les opciones más importantes Comment[ca]=Un plafó per accedir ràpidament a les opcions més importants Comment[ca@valencia]=Un plafó per accedir ràpidament a les opcions més importants Comment[en_GB]=A panel to quickly access most important settings diff --git a/plasma-mobile.desktop.cmake b/plasma-mobile.desktop.cmake index 1a8109e2..13988959 100644 --- a/plasma-mobile.desktop.cmake +++ b/plasma-mobile.desktop.cmake @@ -4,6 +4,7 @@ Exec=dbus-launch --exit-with-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasmacom TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor DesktopNames=KDE Name=Plasma Mobile +Name[ast]=Plasma Mobile Name[ca]=Plasma Mòbil Name[ca@valencia]=Plasma Mòbil Name[en_GB]=Plasma Mobile @@ -16,6 +17,7 @@ Name[sv]=Plasma mobil Name[uk]=Мобільна Плазма Name[x-test]=xxPlasma Mobilexx Comment=Plasma Mobile by KDE +Comment[ast]=Plasma Mobile por KDE Comment[ca]=Plasma Mòbil, creat per la comunitat KDE Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE Comment[en_GB]=Plasma Mobile by KDE diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop index af48f080..2a71dcda 100755 --- a/touchscreentest/org.kde.touchtest.desktop +++ b/touchscreentest/org.kde.touchtest.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Touch Test +Name[ast]=Prueba táutil Name[ca]=Prova el tàctil Name[ca@valencia]=Prova el tàctil Name[cs]=Test doteku @@ -19,6 +20,7 @@ Categories=Qt;KDE;System;Development; Exec=touchtest GenericName=Terminal +GenericName[ast]=Terminal GenericName[ca]=Terminal GenericName[ca@valencia]=Terminal GenericName[cs]=Terminál