From 68dfdefbdaf1c1ee4ab70db6a42a126bb4b66a51 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 20 Oct 2022 02:06:33 +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" --- bin/plasma-mobile-dev.desktop.cmake | 1 - bin/plasma-mobile.desktop.cmake | 2 -- containments/panel/package/metadata.json | 1 - containments/taskpanel/package/metadata.json | 1 - look-and-feel/metadata.desktop | 3 --- plasma_phone_components.notifyrc | 1 - quicksettings/donotdisturb/metadata.json | 1 + quicksettings/record/package/contents/metadata.json | 1 + quicksettings/screenrotation/package/metadata.json | 1 + shell/metadata.json | 1 - 10 files changed, 3 insertions(+), 10 deletions(-) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index b2740816..828ea3ea 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -31,7 +31,6 @@ Name[uk]=Мобільна Плазма (версія у розробці) Name[x-test]=xxPlasma Mobile (Development)xx Name[zh_CN]=Plasma Mobile (开发) Comment=Plasma Mobile by KDE -Comment[ast]=Plasma Mobile, por KDE Comment[az]=KDE Plasma Mobil Comment[ca]=Plasma Mobile, creat per la comunitat KDE Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake index 5930f06d..76f5172d 100644 --- a/bin/plasma-mobile.desktop.cmake +++ b/bin/plasma-mobile.desktop.cmake @@ -6,7 +6,6 @@ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/plasma-dbus-run-session-if-needed ${CMAKE_I TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmamobile DesktopNames=KDE Name=Plasma Mobile -Name[ast]=Plasma Mobile Name[az]=Plasma Mobil Name[ca]=Plasma Mobile Name[ca@valencia]=Plasma Mobile @@ -46,7 +45,6 @@ Name[x-test]=xxPlasma Mobilexx Name[zh_CN]=Plasma Mobile Name[zh_TW]=Plasma 行動 Comment=Plasma Mobile by KDE -Comment[ast]=Plasma Mobile, por KDE Comment[az]=KDE Plasma Mobil Comment[ca]=Plasma Mobile, creat per la comunitat KDE Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE diff --git a/containments/panel/package/metadata.json b/containments/panel/package/metadata.json index 3e03ea6f..b41227b5 100644 --- a/containments/panel/package/metadata.json +++ b/containments/panel/package/metadata.json @@ -53,7 +53,6 @@ "Id": "org.kde.phone.panel", "License": "GPLv2+", "Name": "Phone Panel", - "Name[ast]": "Panel del teléfonu", "Name[az]": "Telefon paneli", "Name[ca@valencia]": "Quadro del telèfon", "Name[ca]": "Plafó del telèfon", diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index d0fe2bcd..22b0e5be 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -53,7 +53,6 @@ "Id": "org.kde.phone.taskpanel", "License": "GPLv2+", "Name": "Phone Task panel", - "Name[ast]": "Panel de xeres del teléfonu", "Name[az]": "Telefon tapşırıq paneli", "Name[ca@valencia]": "Quadro de tasques del telèfon", "Name[ca]": "Plafó de tasques del telèfon", diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop index 2f19589e..06d297cd 100644 --- a/look-and-feel/metadata.desktop +++ b/look-and-feel/metadata.desktop @@ -3,7 +3,6 @@ [Desktop Entry] Name=Plasma Mobile -Name[ast]=Plasma Mobile Name[az]=Plasma Mobil Name[ca]=Plasma Mobile Name[ca@valencia]=Plasma Mobile @@ -43,7 +42,6 @@ Name[x-test]=xxPlasma Mobilexx Name[zh_CN]=Plasma Mobile Name[zh_TW]=Plasma 行動 Comment=Plasma workspace for smartphones -Comment[ast]=La estaya de trabayu de Plasma pa teléfonos intelixentes Comment[az]=Smartfonlar üçün Plasma iş sahəsi Comment[ca]=Espai de treball del Plasma per a telèfons intel·ligents Comment[ca@valencia]=Espai de treball Plasma per a telèfons intel·ligents @@ -82,7 +80,6 @@ Comment[x-test]=xxPlasma workspace for smartphonesxx Comment[zh_CN]=专为手机定制的 Plasma 工作空间 Comment[zh_TW]=智慧型手機的 Plasma 工作空間 Keywords=Phone, Workspace, Look and Feel -Keywords[ast]=Teléfonu, estilu y aspeutu, y estaya de trabayu Keywords[az]=Telefon, İş sahəsi, Xarici görünüş Keywords[ca]=Telèfon, Espai de treball, Aspecte i comportament Keywords[ca@valencia]=Telèfon, Espai de treball, Aspecte i comportament diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc index 1049e129..749eccf8 100644 --- a/plasma_phone_components.notifyrc +++ b/plasma_phone_components.notifyrc @@ -4,7 +4,6 @@ [Global] IconName=preferences-system-windows-effect-screenshot Name=Plasma -Name[ast]=Plasma Name[az]=Plasma Name[ca]=Plasma Name[ca@valencia]=Plasma diff --git a/quicksettings/donotdisturb/metadata.json b/quicksettings/donotdisturb/metadata.json index 132f52c2..dbd4284e 100644 --- a/quicksettings/donotdisturb/metadata.json +++ b/quicksettings/donotdisturb/metadata.json @@ -64,6 +64,7 @@ "Name[nl]": "Niet storen", "Name[pl]": "Nie przeszkadzać", "Name[pt]": "Não Incomodar", + "Name[pt_BR]": "Não perturbe", "Name[ru]": "Не беспокоить", "Name[sl]": "Ne moti", "Name[sv]": "Stör ej", diff --git a/quicksettings/record/package/contents/metadata.json b/quicksettings/record/package/contents/metadata.json index 9bf45f0e..508cd41c 100644 --- a/quicksettings/record/package/contents/metadata.json +++ b/quicksettings/record/package/contents/metadata.json @@ -64,6 +64,7 @@ "Name[nl]": "Scherm opnemen", "Name[pl]": "Nagraj ekran", "Name[pt]": "Gravar o Ecrã", + "Name[pt_BR]": "Gravar tela", "Name[ru]": "Запись экрана", "Name[sl]": "Posnemi zaslon", "Name[sv]": "Spela in bildskärm", diff --git a/quicksettings/screenrotation/package/metadata.json b/quicksettings/screenrotation/package/metadata.json index f575221f..fd822519 100644 --- a/quicksettings/screenrotation/package/metadata.json +++ b/quicksettings/screenrotation/package/metadata.json @@ -44,6 +44,7 @@ "Description[nl]": "Snelle instelling van schermrotatie", "Description[pl]": "Szybkie ustawienie obracania ekranu", "Description[pt]": "Configuração rápida da rotação do ecrã", + "Description[pt_BR]": "Configurações rápidas de rotação da tela", "Description[ru]": "Быстрая настройка поворота экрана", "Description[sl]": "Hitre nastavitve sukanja zaslona", "Description[sv]": "Snabbinställning av skärmrotation", diff --git a/shell/metadata.json b/shell/metadata.json index 6b63af0d..898b8f99 100644 --- a/shell/metadata.json +++ b/shell/metadata.json @@ -58,7 +58,6 @@ "Id": "org.kde.plasma.phoneshell", "License": "GPLv2+", "Name": "Phone", - "Name[ast]": "Teléfonu", "Name[az]": "Telefon", "Name[ca@valencia]": "Telèfon", "Name[ca]": "Telèfon",