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

@@ -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=

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

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

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

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

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

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=

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
 

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
 

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

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

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

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