From dda3c4103a606fb875058d2d6d44ad13dcaefe99 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 15 Feb 2021 07:14:54 +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/systemtray/container/package/metadata.desktop | 2 +- applets/systemtray/package/metadata.desktop | 2 +- dataengines/devicenotifications/devicenotifications.notifyrc | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/applets/systemtray/container/package/metadata.desktop b/applets/systemtray/container/package/metadata.desktop index bfc5ca4b3..bdf324b34 100644 --- a/applets/systemtray/container/package/metadata.desktop +++ b/applets/systemtray/container/package/metadata.desktop @@ -38,7 +38,7 @@ Name[hr]=Sistemski blok Name[hsb]=Systemowa wotkładka Name[hu]=Paneltálca Name[ia]=Tabuliero de systema -Name[id]=Baki Sistem +Name[id]=System Tray Name[is]=Kerfisbakki Name[it]=Vassoio di sistema Name[ja]=システムトレイ diff --git a/applets/systemtray/package/metadata.desktop b/applets/systemtray/package/metadata.desktop index 3f126262c..9bb9db6a9 100644 --- a/applets/systemtray/package/metadata.desktop +++ b/applets/systemtray/package/metadata.desktop @@ -38,7 +38,7 @@ Name[hr]=Sistemski blok Name[hsb]=Systemowa wotkładka Name[hu]=Paneltálca Name[ia]=Tabuliero de systema -Name[id]=Baki Sistem +Name[id]=System Tray Name[is]=Kerfisbakki Name[it]=Vassoio di sistema Name[ja]=システムトレイ diff --git a/dataengines/devicenotifications/devicenotifications.notifyrc b/dataengines/devicenotifications/devicenotifications.notifyrc index 508432ee7..40af1cf9a 100644 --- a/dataengines/devicenotifications/devicenotifications.notifyrc +++ b/dataengines/devicenotifications/devicenotifications.notifyrc @@ -80,10 +80,12 @@ IconName=device-notifier Name=Device Status Name[az]=Qurğuların statusu Name[ca]=Estat del dispositiu +Name[en_GB]=Device Status Name[es]=Estado del dispositivo Name[it]=Stato dei dispositivi Name[nl]=Apparaatstatus Name[nn]=Einingsstatus +Name[pl]=Stan urządzenia Name[pt]=Estado do Dispositivo Name[pt_BR]=Status do dispositivo Name[ru]=Состояние устройства