From 69bc07498d4711c884ecf88d9abba3a1ea08a3e4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Jun 2017 04:32:58 +0200
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              | 2 ++
 applets/clock/metadata.desktop                   | 2 ++
 applets/notifications/metadata.desktop           | 2 ++
 containments/homescreen/package/metadata.desktop | 1 +
 containments/panel/metadata.desktop              | 1 +
 containments/taskpanel/package/metadata.desktop  | 1 +
 dialer/package/metadata.desktop                  | 2 ++
 dialer/src/plasma_dialer.notifyrc                | 5 +++++
 kwinmultitasking/metadata.desktop                | 2 ++
 look-and-feel/metadata.desktop                   | 3 +++
 phonebook/metadata.desktop                       | 1 +
 shell/metadata.desktop                           | 1 +
 wallpaper/metadata.desktop                       | 1 +
 13 files changed, 24 insertions(+)

diff --git a/applets/activities/metadata.desktop b/applets/activities/metadata.desktop
index 6dba9b71..a0f0ae49 100644
--- a/applets/activities/metadata.desktop
+++ b/applets/activities/metadata.desktop
@@ -13,6 +13,7 @@ Name[nn]=Telefonaktivitetar
 Name[pl]=Aktywności telefonu
 Name[pt]=Actividades do Telefone
 Name[sv]=Telefonaktiviteter
+Name[tr]=Telefon Etkinlikleri
 Name[uk]=Простори дій телефону
 Name[x-test]=xxPhone Activitiesxx
 Name[zh_CN]=手机活动
@@ -30,6 +31,7 @@ Comment[nn]=Aktivitetsbytar for telefon
 Comment[pl]=Przełącznik aktywności dla tego telefonu
 Comment[pt]=Selector de actividades do telefone
 Comment[sv]=Aktivitetsbyte för telefonen
+Comment[tr]=Telefon için etkinlik değiştirici
 Comment[uk]=Перемикач дій для телефону
 Comment[x-test]=xxActivity switcher for the phonexx
 Comment[zh_CN]=手机的活动切换器
diff --git a/applets/clock/metadata.desktop b/applets/clock/metadata.desktop
index 644e5ada..81a1c647 100644
--- a/applets/clock/metadata.desktop
+++ b/applets/clock/metadata.desktop
@@ -14,6 +14,7 @@ Name[nn]=Klokke
 Name[pl]=Zegar
 Name[pt]=Relógio
 Name[sv]=Klocka
+Name[tr]=Saat
 Name[uk]=Годинник
 Name[x-test]=xxClockxx
 Name[zh_CN]=时钟
@@ -32,6 +33,7 @@ Comment[nn]=Klokka vist i digitalformat
 Comment[pl]=Wyświetla czas w formacie cyfrowym
 Comment[pt]=A hora apresentada num formato digital
 Comment[sv]=Tid visad med digitalformat
+Comment[tr]=Saati, sayısal biçimde göster
 Comment[uk]=Час, показаний у цифровому форматі
 Comment[x-test]=xxTime displayed in a digital formatxx
 Comment[zh_CN]=已数字格式显示时间
diff --git a/applets/notifications/metadata.desktop b/applets/notifications/metadata.desktop
index 75225151..ee5a12d7 100644
--- a/applets/notifications/metadata.desktop
+++ b/applets/notifications/metadata.desktop
@@ -13,6 +13,7 @@ Name[nn]=Varslingar
 Name[pl]=Powiadomienia
 Name[pt]=Notificações
 Name[sv]=Underrättelser
+Name[tr]=Bildirimler
 Name[uk]=Сповіщення
 Name[x-test]=xxNotificationsxx
 Name[zh_CN]=通知
@@ -30,6 +31,7 @@ Comment[nn]=Vis varslingar og jobbar
 Comment[pl]=Wyświetla powiadomienia i zadania
 Comment[pt]=Mostrar as notificações e tarefas
 Comment[sv]=Visa underrättelser och jobb
+Comment[tr]=Bildirimleri ve işleri görüntüle
 Comment[uk]=Показ сповіщень і завдань
 Comment[x-test]=xxDisplay notifications and jobsxx
 Comment[zh_CN]=显示通知和任务
diff --git a/containments/homescreen/package/metadata.desktop b/containments/homescreen/package/metadata.desktop
index 048b1c1a..fcb79157 100644
--- a/containments/homescreen/package/metadata.desktop
+++ b/containments/homescreen/package/metadata.desktop
@@ -13,6 +13,7 @@ Name[nn]=Heimebilete for telefon
 Name[pl]=Ekran domowy telefonu
 Name[pt]=Ecrã Inicial
 Name[sv]=Telefonens hemskärm
+Name[tr]=Telefon Ana Ekranı
 Name[uk]=Домашня сторінка телефону
 Name[x-test]=xxPhone Homescreenxx
 Name[zh_CN]=手机主屏幕
diff --git a/containments/panel/metadata.desktop b/containments/panel/metadata.desktop
index c43112ac..29d9c1ea 100644
--- a/containments/panel/metadata.desktop
+++ b/containments/panel/metadata.desktop
@@ -13,6 +13,7 @@ Name[nn]=Telefonpanel
 Name[pl]=Panel telefonu
 Name[pt]=Painel do Telefone
 Name[sv]=Telefonpanel
+Name[tr]=Telefon Panosu
 Name[uk]=Панель телефону
 Name[x-test]=xxPhone Panelxx
 Name[zh_CN]=手机面板
diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop
index 1300918a..dcbbf03e 100644
--- a/containments/taskpanel/package/metadata.desktop
+++ b/containments/taskpanel/package/metadata.desktop
@@ -12,6 +12,7 @@ Name[nn]=Oppgåvepanel for telefon
 Name[pl]=Panel zadań telefonu
 Name[pt]=Painel de Tarefas do Telefone
 Name[sv]=Telefonaktivitetspanel
+Name[tr]=Telefon İş panosu
 Name[uk]=Панель завдань телефону
 Name[x-test]=xxPhone Task panelxx
 Name[zh_CN]=手机任务面板
diff --git a/dialer/package/metadata.desktop b/dialer/package/metadata.desktop
index 7a2cef7a..a349a794 100644
--- a/dialer/package/metadata.desktop
+++ b/dialer/package/metadata.desktop
@@ -10,6 +10,7 @@ Comment[nn]=Telefonringjar for Plasma
 Comment[pl]=Pole wybierania telefonu
 Comment[pt]=Teclado do Plasma
 Comment[sv]=Plasma telefonuppringning
+Comment[tr]=Plasma telefon çevirici
 Comment[uk]=Засіб набирання номеру Плазми
 Comment[x-test]=xxPlasma phone dialerxx
 Comment[zh_CN]=Plasma 手机拨号器
@@ -29,6 +30,7 @@ Name[nn]=Telefon
 Name[pl]=Telefon
 Name[pt]=Telefone
 Name[sv]=Telefon
+Name[tr]=Telefon
 Name[uk]=Телефон
 Name[x-test]=xxPhonexx
 Name[zh_CN]=手机
diff --git a/dialer/src/plasma_dialer.notifyrc b/dialer/src/plasma_dialer.notifyrc
index b062e768..726e13d6 100644
--- a/dialer/src/plasma_dialer.notifyrc
+++ b/dialer/src/plasma_dialer.notifyrc
@@ -13,6 +13,7 @@ Comment[nn]=Telefon
 Comment[pl]=Telefon
 Comment[pt]=Telefone
 Comment[sv]=Telefon
+Comment[tr]=Telefon
 Comment[uk]=Телефон
 Comment[x-test]=xxPhonexx
 Comment[zh_CN]=手机
@@ -32,6 +33,7 @@ Name[nn]=Tapt oppringing
 Name[pl]=Połączenie nieodebrane
 Name[pt]=Chamada Não Atendida
 Name[sv]=Missat samtal
+Name[tr]=Cevapsız Çağrı
 Name[uk]=Пропущений дзвінок
 Name[x-test]=xxMissed Callxx
 Name[zh_CN]=错过的呼叫
@@ -48,6 +50,7 @@ Comment[nn]=Du mista ei oppringing
 Comment[pl]=Nie odebrano połączenia
 Comment[pt]=Uma chamada não foi atendida
 Comment[sv]=Ett samtal har missats
+Comment[tr]=Cevaplanmamış bir çağrı var
 Comment[uk]=Було пропущено дзвінок
 Comment[x-test]=xxA call has been missedxx
 Comment[zh_CN]=错过了一个呼叫
@@ -68,6 +71,7 @@ Name[nn]=Ringjer
 Name[pl]=Dzwonienie
 Name[pt]=A tocar
 Name[sv]=Ringer
+Name[tr]=Çalıyor
 Name[uk]=Дзвінок
 Name[x-test]=xxRingingxx
 Name[zh_CN]=响铃中
@@ -85,6 +89,7 @@ Comment[nn]=Telefonen ringjer
 Comment[pl]=Telefon dzwoni
 Comment[pt]=O telefone está a tocar
 Comment[sv]=Telefonen ringer
+Comment[tr]=Telefon çalıyor
 Comment[uk]=Телефон дзвонить
 Comment[x-test]=xxThe phone is ringingxx
 Comment[zh_CN]=手机正在响铃
diff --git a/kwinmultitasking/metadata.desktop b/kwinmultitasking/metadata.desktop
index 41e24d7e..f5f45432 100644
--- a/kwinmultitasking/metadata.desktop
+++ b/kwinmultitasking/metadata.desktop
@@ -10,6 +10,7 @@ Name[nn]=Telefon-multitasking
 Name[pl]=Wiele zadań na telefonie
 Name[pt]=Multi-Tarefas do Telefone
 Name[sv]=Flera uppgifter på telefonen
+Name[tr]=Telefon çoklu görev
 Name[uk]=Багатозадачний телефон
 Name[x-test]=xxPhone multitaskxx
 Name[zh_CN]=手机多任务
@@ -25,6 +26,7 @@ Comment[nn]=Multitaskingsgrensesnitt for telefoneiningar
 Comment[pl]=Interfejs użytkownika dla telefonów do wykonywania wielu zadań
 Comment[pt]=Interface multi-tarefa para dispositivos telefónicos
 Comment[sv]=Användargränssnitt med flera uppgifter för telefoner
+Comment[tr]=Telefon aygıtları için çoklu görev kullanıcı arayüzü
 Comment[uk]=Багатозадачний інтерфейс користувача для телефонних пристроїв
 Comment[x-test]=xxMultitasking user interface for Phone devicesxx
 Comment[zh_CN]=为手机设备设计的多任务用户界面
diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop
index 866b1c38..ddc9d46f 100644
--- a/look-and-feel/metadata.desktop
+++ b/look-and-feel/metadata.desktop
@@ -11,6 +11,7 @@ Name[nn]=Plasma-telefon
 Name[pl]=Telefon Plazmy
 Name[pt]=Plasma para Telefones
 Name[sv]=Plasma telefon
+Name[tr]=Plasma Telefonu
 Name[uk]=Телефон Плазми
 Name[x-test]=xxPlasma Phonexx
 Name[zh_CN]=Plasma Phone
@@ -26,6 +27,7 @@ Comment[nn]=Plasma-arbeidsområde for smarttelefonar
 Comment[pl]=Przestrzeń robocza Plazmy dla smartfonów
 Comment[pt]=Área de trabalho Plasma para telemóveis
 Comment[sv]=Plasma arbetsyta för smarta telefoner
+Comment[tr]=Akıllı telefonlar için Plasma çalışma alanı
 Comment[uk]=Робочий простір Плазми для смартфонів
 Comment[x-test]=xxPlasma workspace for smartphonesxx
 Comment[zh_CN]=为手机定制的 Plasma 工作空间
@@ -41,6 +43,7 @@ Keywords[nn]=telefon, arbeidsflate, utsjånad
 Keywords[pl]=Telefon, Przestrzeń robocza, Wrażenia wzrokowe i dotykowe
 Keywords[pt]=Telefone, Telemóvel, Área de Trabalho, Aparência e Comportamento
 Keywords[sv]=Telefon, arbetsyta, utseende och känsla
+Keywords[tr]=Telefon, Çalışma alanı, Görünüm
 Keywords[uk]=Телефон, Робочий простір, Вигляд і поведінка
 Keywords[x-test]=xxPhone, Workspace, Look and Feelxx
 Keywords[zh_CN]=Phone, Workspace, Look and Feel, 手机, 工作空间, 观感
diff --git a/phonebook/metadata.desktop b/phonebook/metadata.desktop
index 782dcd79..090e9a01 100644
--- a/phonebook/metadata.desktop
+++ b/phonebook/metadata.desktop
@@ -14,6 +14,7 @@ Name[nn]=Telefonkatalog
 Name[pl]=Książka telefoniczna
 Name[pt]=Lista Telefónica
 Name[sv]=Telefonkatalog
+Name[tr]=Telefon Rehberi
 Name[uk]=Телефонна книга
 Name[x-test]=xxPhonebookxx
 Name[zh_CN]=电话簿
diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index aad37754..98780423 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -12,6 +12,7 @@ Name[nn]=Telefon
 Name[pl]=Telefon
 Name[pt]=Telefone
 Name[sv]=Telefon
+Name[tr]=Telefon
 Name[uk]=Телефон
 Name[x-test]=xxPhonexx
 Name[zh_CN]=手机
diff --git a/wallpaper/metadata.desktop b/wallpaper/metadata.desktop
index 239bc929..1ca59ac1 100644
--- a/wallpaper/metadata.desktop
+++ b/wallpaper/metadata.desktop
@@ -10,6 +10,7 @@ Name[nn]=Telefonlåsarar for Plasma
 Name[pl]=Blokady telefonu plazmy
 Name[pt]=Bloqueios de Telefone do Plasma
 Name[sv]=Plasma telefonskåp
+Name[tr]=Plasma Telefon Kilidi
 Name[uk]=Блокувальники телефону Плазми
 Name[x-test]=xxPlasma Phone Lockersxx
 Name[zh_CN]=Plasma Phone 锁屏