From 006cb7f865ad0d95a766c0f8c937b8417d9adb88 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 18 Feb 2021 07:54:49 +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/activities/metadata.desktop | 4 ++-- containments/homescreen/package/metadata.desktop | 2 +- containments/panel/package/metadata.desktop | 2 +- containments/taskpanel/package/metadata.desktop | 2 +- kwinmultitasking/metadata.desktop | 4 ++-- look-and-feel/metadata.desktop | 6 +++--- shell/metadata.desktop | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/applets/activities/metadata.desktop b/applets/activities/metadata.desktop index 9c71ded4..93f4e21e 100644 --- a/applets/activities/metadata.desktop +++ b/applets/activities/metadata.desktop @@ -25,7 +25,7 @@ Name[nn]=Telefonaktivitetar Name[pa]=ਫ਼ੋਨ ਸਰਗਰਮੀਆਂ Name[pl]=Aktywności telefonu Name[pt]=Actividades do Telefone -Name[pt_BR]=Atividades do telefone +Name[pt_BR]=Atividades do celular Name[ro]=Activități pe telefon Name[ru]=Комнаты Name[sk]=Aktivity telefónu @@ -61,7 +61,7 @@ Comment[nn]=Aktivitetsbytar for telefon Comment[pa]=ਫ਼ੋਨ ਲਈ ਸਰਗਰਮੀ ਸਵਿੱਚਰ Comment[pl]=Przełącznik aktywności dla tego telefonu Comment[pt]=Selector de actividades do telefone -Comment[pt_BR]=Alternador de atividade para o telefone +Comment[pt_BR]=Alternador de atividade para o celular Comment[ro]=Comutator de activități pentru telefon Comment[ru]=Переключатель комнат для телефона Comment[sk]=Prepínač aktivít pre telefón diff --git a/containments/homescreen/package/metadata.desktop b/containments/homescreen/package/metadata.desktop index c856532e..ab1576e4 100644 --- a/containments/homescreen/package/metadata.desktop +++ b/containments/homescreen/package/metadata.desktop @@ -25,7 +25,7 @@ Name[nn]=Heimebilete for telefon Name[pa]=ਫ਼ੋਨ ਦੀ ਮੁੱਖ-ਸਕਰੀਨ Name[pl]=Ekran domowy telefonu Name[pt]=Ecrã Inicial -Name[pt_BR]=Tela inicial do telefone +Name[pt_BR]=Tela inicial do celular Name[ro]=Ecran de pornire al telefonului Name[ru]=Главный экран телефона Name[sk]=Domovská obrazovka telefónu diff --git a/containments/panel/package/metadata.desktop b/containments/panel/package/metadata.desktop index 1efd99e4..f6a89ff1 100644 --- a/containments/panel/package/metadata.desktop +++ b/containments/panel/package/metadata.desktop @@ -25,7 +25,7 @@ Name[nn]=Telefonpanel Name[pa]=ਫ਼ੋਨ ਦਾ ਪੈਨਲ Name[pl]=Panel telefonu Name[pt]=Painel do Telefone -Name[pt_BR]=Painel do telefone +Name[pt_BR]=Painel do celular Name[ro]=Panoul telefonului Name[ru]=Панель телефона Name[sk]=Panel telefónu diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop index 99c3dfcb..22432930 100644 --- a/containments/taskpanel/package/metadata.desktop +++ b/containments/taskpanel/package/metadata.desktop @@ -24,7 +24,7 @@ Name[nn]=Oppgåvepanel for telefon Name[pa]=ਫ਼ੋਨ ਟਾਸਕ ਪੈਨਲ Name[pl]=Panel zadań telefonu Name[pt]=Painel de Tarefas do Telefone -Name[pt_BR]=Painel de tarefas do telefone +Name[pt_BR]=Painel de tarefas do celular Name[ro]=Panou de sarcini al telefonului Name[ru]=Панель задач телефона Name[sk]=Panel úloh telefónu diff --git a/kwinmultitasking/metadata.desktop b/kwinmultitasking/metadata.desktop index 7bc3b57e..30f33291 100644 --- a/kwinmultitasking/metadata.desktop +++ b/kwinmultitasking/metadata.desktop @@ -22,7 +22,7 @@ Name[nn]=Telefon-multitasking Name[pa]=ਫ਼ੋਨ ਬਹੁ-ਟਾਸਕ Name[pl]=Wiele zadań na telefonie Name[pt]=Multi-Tarefas do Telefone -Name[pt_BR]=Multitarefas do telefone +Name[pt_BR]=Multitarefas do celular Name[ro]=Sarcini multiple pe telefon Name[ru]=Многозадачность для телефона Name[sk]=Multitask telefónu @@ -56,7 +56,7 @@ Comment[nn]=Multitaskingsgrensesnitt for telefoneiningar Comment[pa]=ਫ਼ੋਨ ਡਿਵਾਈਸਾਂ ਲਈ ਬਹੁ-ਟਾਸਕ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ Comment[pl]=Interfejs użytkownika dla telefonów do wykonywania wielu zadań Comment[pt]=Interface multi-tarefa para dispositivos telefónicos -Comment[pt_BR]=Interface de multitarefas para telefones +Comment[pt_BR]=Interface de multitarefas para celulares Comment[ro]=Interfață cu sarcini multiple pentru dispozitive telefonice Comment[ru]=Интерфейс пользователя с поддержкой многозадачности для телефонов Comment[sk]=Rozhranie multitaskingu pre telefóny diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop index a6808b41..4dbb0cfd 100644 --- a/look-and-feel/metadata.desktop +++ b/look-and-feel/metadata.desktop @@ -23,7 +23,7 @@ Name[nn]=Plasma-telefon Name[pa]=ਪਲਾਜ਼ਮਾ ਫ਼ੋਨ Name[pl]=Telefon Plazmy Name[pt]=Plasma para Telefones -Name[pt_BR]=Telefone do Plasma +Name[pt_BR]=Celular do Plasma Name[ro]=Plasma Phone Name[ru]=Plasma Phone Name[sk]=Plasma telefón @@ -58,7 +58,7 @@ Comment[nn]=Plasma-arbeidsområde for smarttelefonar Comment[pa]=ਸਮਾਰਟ-ਫ਼ੋਨ ਲਈ ਪਲਾਜ਼ਮਾ ਵਰਕਸਪੇਸ Comment[pl]=Przestrzeń robocza Plazmy dla smartfonów Comment[pt]=Área de trabalho Plasma para telemóveis -Comment[pt_BR]=Espaço de trabalho Plasma para telefones +Comment[pt_BR]=Espaço de trabalho Plasma para celulares Comment[ro]=Spațiu de lucru al Plasma pentru telefoane inteligente Comment[ru]=Среда рабочего стола Plasma для смартфонов Comment[sk]=Plasma pracovný priestor pre smartfóny @@ -93,7 +93,7 @@ Keywords[nn]=telefon, arbeidsflate, utsjånad Keywords[pa]=ਫ਼ੋਨ,ਵਰਕਸਪੇਸ, ਦਿੱਖ ਤੇ ਅਨੁਭਵ Keywords[pl]=Telefon, Przestrzeń robocza, Wrażenia wzrokowe i dotykowe Keywords[pt]=Telefone, Telemóvel, Área de Trabalho, Aparência e Comportamento -Keywords[pt_BR]=Telefone, espaço de trabalho, aparência +Keywords[pt_BR]=Celular, telefone, espaço de trabalho, aparência Keywords[ro]=Telefon, Spațiu de lucru, Aspect și comportament Keywords[ru]=Phone, Workspace, Look and Feel, Телефон, рабочий стол, рабочая среда, внешний вид Keywords[sk]=Telefón, Pracovný priestor, Vzhľad diff --git a/shell/metadata.desktop b/shell/metadata.desktop index aeaefec8..b2cb661e 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -25,7 +25,7 @@ Name[nn]=Telefon Name[pa]=ਫ਼ੋਨ Name[pl]=Telefon Name[pt]=Telefone -Name[pt_BR]=Telefone +Name[pt_BR]=Celular Name[ro]=Telefon Name[ru]=Телефон Name[sk]=Telefón @@ -61,7 +61,7 @@ Comment[nn]=Plasma-skal for telefonar Comment[pa]=ਫ਼ੋਨਾਂ ਲਈ ਪਲਾਜ਼ਮਾ ਸ਼ੈਲ Comment[pl]=Powłoka Plazmy dla telefonów Comment[pt]=Área de trabalho Plasma para telemóveis -Comment[pt_BR]=Plasma Shell para telefones +Comment[pt_BR]=Plasma Shell para celulares Comment[ro]=Învelișul Plasma pentru telefoane Comment[ru]=Оболочка Plasma для смартфонов Comment[sk]=Plasma shell pre telefóny