From 3577e59bc0f98e225f32c92c6a9b52c665a15d7b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 7 Oct 2016 09:31:42 +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" --- applets/activities/metadata.desktop | 10 ++++++++ applets/clock/metadata.desktop | 10 ++++++++ applets/notifications/metadata.desktop | 10 ++++++++ .../homescreen/package/metadata.desktop | 5 ++++ containments/panel/metadata.desktop | 5 ++++ .../taskpanel/package/metadata.desktop | 5 ++++ dialer/package/metadata.desktop | 10 ++++++++ dialer/src/plasma_dialer.notifyrc | 25 +++++++++++++++++++ kwinmultitasking/metadata.desktop | 6 +++++ look-and-feel/metadata.desktop | 15 +++++++++++ phonebook/metadata.desktop | 5 ++++ shell/metadata.desktop | 5 ++++ wallpaper/metadata.desktop | 5 ++++ 13 files changed, 116 insertions(+) diff --git a/applets/activities/metadata.desktop b/applets/activities/metadata.desktop index 765f8b67..66348b3a 100644 --- a/applets/activities/metadata.desktop +++ b/applets/activities/metadata.desktop @@ -1,8 +1,18 @@ [Desktop Entry] Encoding=UTF-8 Name=Phone Activities +Name[nl]=Telefoonactiviteiten +Name[pt]=Actividades do Telefone +Name[sv]=Telefonaktiviteter +Name[uk]=Простори дій телефону +Name[x-test]=xxPhone Activitiesxx Comment=Activity switcher for the phone +Comment[nl]=Omschakelaar van telefoonactiviteiten +Comment[pt]=Selector de actividades do telefone +Comment[sv]=Aktivitetsbyte för telefonen +Comment[uk]=Перемикач дій для телефону +Comment[x-test]=xxActivity switcher for the phonexx Icon=preferences-activities Type=Service X-KDE-ParentApp= diff --git a/applets/clock/metadata.desktop b/applets/clock/metadata.desktop index 6e04d3ab..2d76dd97 100644 --- a/applets/clock/metadata.desktop +++ b/applets/clock/metadata.desktop @@ -1,8 +1,18 @@ [Desktop Entry] Encoding=UTF-8 Name=Clock +Name[nl]=Klok +Name[pt]=Relógio +Name[sv]=Klocka +Name[uk]=Годинник +Name[x-test]=xxClockxx Comment=Time displayed in a digital format +Comment[nl]=De tijd getoond in een digitaal formaat +Comment[pt]=A hora apresentada num formato digital +Comment[sv]=Tid visad med digitalformat +Comment[uk]=Час, показаний у цифровому форматі +Comment[x-test]=xxTime displayed in a digital formatxx Icon=preferences-system-time Type=Service diff --git a/applets/notifications/metadata.desktop b/applets/notifications/metadata.desktop index c2cbf50f..d509e329 100644 --- a/applets/notifications/metadata.desktop +++ b/applets/notifications/metadata.desktop @@ -1,7 +1,17 @@ [Desktop Entry] Encoding=UTF-8 Name=Notifications +Name[nl]=Meldingen +Name[pt]=Notificações +Name[sv]=Underrättelser +Name[uk]=Сповіщення +Name[x-test]=xxNotificationsxx Comment=Display notifications and jobs +Comment[nl]=Meldingen en taken tonen +Comment[pt]=Mostrar as notificações e tarefas +Comment[sv]=Visa underrättelser och jobb +Comment[uk]=Показ сповіщень і завдань +Comment[x-test]=xxDisplay notifications and jobsxx Type=Service Icon=preferences-desktop-notification diff --git a/containments/homescreen/package/metadata.desktop b/containments/homescreen/package/metadata.desktop index ee2d146e..fdc900c9 100644 --- a/containments/homescreen/package/metadata.desktop +++ b/containments/homescreen/package/metadata.desktop @@ -2,6 +2,11 @@ Encoding=UTF-8 Keywords= Name=Phone Homescreen +Name[nl]=Standaardscherm van de telefoon +Name[pt]=Ecrã Inicial +Name[sv]=Telefonens hemskärm +Name[uk]=Домашня сторінка телефону +Name[x-test]=xxPhone Homescreenxx Type=Service X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment diff --git a/containments/panel/metadata.desktop b/containments/panel/metadata.desktop index 873c5907..9af6f1e0 100644 --- a/containments/panel/metadata.desktop +++ b/containments/panel/metadata.desktop @@ -2,6 +2,11 @@ Encoding=UTF-8 Keywords= Name=Phone Panel +Name[nl]=Telefoonpaneel +Name[pt]=Painel do Telefone +Name[sv]=Telefonpanel +Name[uk]=Панель телефону +Name[x-test]=xxPhone Panelxx Type=Service X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop index 9fd5f970..00b31e4f 100644 --- a/containments/taskpanel/package/metadata.desktop +++ b/containments/taskpanel/package/metadata.desktop @@ -2,6 +2,11 @@ Encoding=UTF-8 Keywords= Name=Phone Task panel +Name[nl]=Telefoontakenpaneel +Name[pt]=Painel de Tarefas do Telefone +Name[sv]=Telefonaktivitetspanel +Name[uk]=Панель завдань телефону +Name[x-test]=xxPhone Task panelxx Type=Service X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment diff --git a/dialer/package/metadata.desktop b/dialer/package/metadata.desktop index e263428d..8e0d874f 100644 --- a/dialer/package/metadata.desktop +++ b/dialer/package/metadata.desktop @@ -1,8 +1,18 @@ [Desktop Entry] Comment=Plasma phone dialer +Comment[nl]=Telefoonkiezer van Plasma +Comment[pt]=Teclado do Plasma +Comment[sv]=Plasma telefonuppringning +Comment[uk]=Засіб набирання номеру Плазми +Comment[x-test]=xxPlasma phone dialerxx Encoding=UTF-8 Keywords= Name=Phone +Name[nl]=Telefoon +Name[pt]=Telefone +Name[sv]=Telefon +Name[uk]=Телефон +Name[x-test]=xxPhonexx Type=Application Icon=call-start X-KDE-ParentApp= diff --git a/dialer/src/plasma_dialer.notifyrc b/dialer/src/plasma_dialer.notifyrc index 26113912..347eee6b 100644 --- a/dialer/src/plasma_dialer.notifyrc +++ b/dialer/src/plasma_dialer.notifyrc @@ -1,15 +1,40 @@ [Global] IconName=call-start Comment=Phone +Comment[nl]=Telefoon +Comment[pt]=Telefone +Comment[sv]=Telefon +Comment[uk]=Телефон +Comment[x-test]=xxPhonexx [Event/callMissed] Name=Missed Call +Name[nl]=Gemiste oproepen +Name[pt]=Chamada Não Atendida +Name[sv]=Missat samtal +Name[uk]=Пропущений дзвінок +Name[x-test]=xxMissed Callxx Comment=A call has been missed +Comment[nl]=Er is een gemiste oproep +Comment[pt]=Uma chamada não foi atendida +Comment[sv]=Ett samtal har missats +Comment[uk]=Було пропущено дзвінок +Comment[x-test]=xxA call has been missedxx Action=Popup [Event/ringing] Name=Ringing +Name[nl]=Bel gaat over +Name[pt]=A tocar +Name[sv]=Ringer +Name[uk]=Дзвінок +Name[x-test]=xxRingingxx Comment=The phone is ringing +Comment[nl]=De telefoon gaat over +Comment[pt]=O telefone está a tocar +Comment[sv]=Telefonen ringer +Comment[uk]=Телефон дзвонить +Comment[x-test]=xxThe phone is ringingxx Action=Sound Sound=KDE-Im-Phone-Ring.ogg diff --git a/kwinmultitasking/metadata.desktop b/kwinmultitasking/metadata.desktop index 1c1f6860..fd48c48c 100644 --- a/kwinmultitasking/metadata.desktop +++ b/kwinmultitasking/metadata.desktop @@ -1,6 +1,12 @@ [Desktop Entry] Name=Phone multitask +Name[nl]=Multitasking van de telefoon +Name[pt]=Multi-Tarefas do Telefone +Name[sv]=Flera uppgifter på telefonen +Name[uk]=Багатозадачний телефон +Name[x-test]=xxPhone multitaskxx Comment=Multitasking user interface for Phone devices +Comment[uk]=Багатозадачний інтерфейс користувача для телефонних пристроїв Icon=preferences-system-windows-script-test diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop index 348a5490..7c26b6eb 100644 --- a/look-and-feel/metadata.desktop +++ b/look-and-feel/metadata.desktop @@ -1,7 +1,22 @@ [Desktop Entry] Name=Plasma Phone +Name[nl]=Plasma telefoon +Name[pt]=Plasma para Telefones +Name[sv]=Plasma telefon +Name[uk]=Телефон Плазми +Name[x-test]=xxPlasma Phonexx Comment=Plasma workspace for smartphones +Comment[nl]=Plasma workspace voor smartphones +Comment[pt]=Área de trabalho Plasma para telemóveis +Comment[sv]=Plasma arbetsyta för smarta telefoner +Comment[uk]=Робочий простір Плазми для смартфонів +Comment[x-test]=xxPlasma workspace for smartphonesxx Keywords=Phone, Workspace, Look and Feel +Keywords[nl]=Telefoon, werkruimte, uiterlijk +Keywords[pt]=Telefone, Telemóvel, Área de Trabalho, Aparência e Comportamento +Keywords[sv]=Telefon, arbetsyta, utseende och känsla +Keywords[uk]=Телефон, Робочий простір, Вигляд і поведінка +Keywords[x-test]=xxPhone, Workspace, Look and Feelxx Type=Service X-KDE-ServiceTypes=Plasma/LookAndFeel diff --git a/phonebook/metadata.desktop b/phonebook/metadata.desktop index cd389de6..288fb0d3 100644 --- a/phonebook/metadata.desktop +++ b/phonebook/metadata.desktop @@ -3,6 +3,11 @@ Comment= Encoding=UTF-8 Keywords= Name=Phonebook +Name[nl]=Telefoonboek +Name[pt]=Lista Telefónica +Name[sv]=Telefonkatalog +Name[uk]=Телефонна книга +Name[x-test]=xxPhonebookxx Type=Application Icon=system-users Exec=kpackagelauncherqml -a org.kde.phone.phonebook diff --git a/shell/metadata.desktop b/shell/metadata.desktop index e4027d15..e667de08 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -1,5 +1,10 @@ [Desktop Entry] Name=Phone +Name[nl]=Telefoon +Name[pt]=Telefone +Name[sv]=Telefon +Name[uk]=Телефон +Name[x-test]=xxPhonexx Type=Service X-KDE-ServiceTypes=Plasma/Shell diff --git a/wallpaper/metadata.desktop b/wallpaper/metadata.desktop index efde647e..cb2941fd 100644 --- a/wallpaper/metadata.desktop +++ b/wallpaper/metadata.desktop @@ -1,5 +1,10 @@ [Desktop Entry] Name=Plasma Phone Lockers +Name[nl]=Plasma telefoonvergrendeling +Name[pt]=Bloqueios de Telefone do Plasma +Name[sv]=Plasma telefonskåp +Name[uk]=Блокувальники телефону Плазми +Name[x-test]=xxPlasma Phone Lockersxx X-KDE-PluginInfo-Name=org.kde.plasma.phone.lockers X-KDE-PluginInfo-Author=Jens Reuterberg