From 6376928072d51f3c4bf7192ea6ecfaab15546b0e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 Dec 2017 07:02:02 +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/appmenu/package/metadata.desktop | 1 + .../kded/colorcorrectlocationupdater.desktop | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index ef7e0722d..67b57b1b2 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -45,6 +45,7 @@ Comment[es]=Barra de menú global en la parte superior de la pantalla Comment[hu]=Globális menüsáv a képernyő tetején Comment[nl]=Globale menubalk bovenaan het scherm Comment[pt]=Menu global no topo do ecrã +Comment[pt_BR]=Barra de menu global no topo da tela Comment[sv]=Global menyrad överst på skärmen Comment[uk]=Загальна панель меню у верхній частині екрана Comment[x-test]=xxGlobal menubar on top of the screenxx diff --git a/libcolorcorrect/kded/colorcorrectlocationupdater.desktop b/libcolorcorrect/kded/colorcorrectlocationupdater.desktop index 56b53825c..938b33574 100644 --- a/libcolorcorrect/kded/colorcorrectlocationupdater.desktop +++ b/libcolorcorrect/kded/colorcorrectlocationupdater.desktop @@ -1,6 +1,13 @@ [Desktop Entry] Type=Service Name=ColorCorrect Geolocation Updater +Name[ca]=Actualitzador del la geolocalització del ColorCorrect +Name[nl]=Bijwerker van kleurgecorrigeerde geo-locatie +Name[pt]=Actualização da Geo-Localização da Correcção de Cores +Name[pt_BR]=Atualizador de geolocalização do ColorCorrect +Name[sv]=Färgriktig uppdatering av geografisk plats +Name[uk]=Засіб оновлення географічного розташування для ColorCorrect +Name[x-test]=xxColorCorrect Geolocation Updaterxx ServiceTypes=KDEDModule X-KDE-ServiceTypes=KDEDModule X-KDE-Library=colorcorrectlocationupdater @@ -8,3 +15,10 @@ X-KDE-FactoryName=colorcorrectlocationupdater X-KDE-DBus-ModuleName=colorcorrectlocationupdater X-KDE-Kded-autoload=true Comment=Sends updated location data to the compositor +Comment[ca]=Envia les dades actualitzades de la ubicació al compositor +Comment[nl]=Verstuurt bijgewerkte locatiegegevens naar de compositeur +Comment[pt]=Envia os dados de localização actualizados para o compositor +Comment[pt_BR]=Envia dados de localização atualizados para o computador. +Comment[sv]=Skickar uppdaterad platsinformation till sammansättare +Comment[uk]=Надсилає оновлені дані щодо розташування на комп'ютер +Comment[x-test]=xxSends updated location data to the compositorxx