From 5b5f17ae2bb77fb363fdf0ebd89f077f93fa78ea Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 24 Jun 2017 04:21:44 +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/clock/metadata.desktop         | 1 +
 applets/notifications/metadata.desktop | 2 ++
 dialer/package/metadata.desktop        | 1 +
 dialer/src/plasma_dialer.notifyrc      | 1 +
 shell/metadata.desktop                 | 1 +
 5 files changed, 6 insertions(+)

diff --git a/applets/clock/metadata.desktop b/applets/clock/metadata.desktop
index 81a1c647..e95104ae 100644
--- a/applets/clock/metadata.desktop
+++ b/applets/clock/metadata.desktop
@@ -28,6 +28,7 @@ Comment[cs]=Čas zobrazený v digitální podobě
 Comment[de]=Zeigt die Uhrzeit in digitaler Form an.
 Comment[en_GB]=Time displayed in a digital format
 Comment[es]=La hora mostrada en formato digital
+Comment[fr]=Heure affichée dans un format numérique
 Comment[nl]=De tijd getoond in een digitaal formaat
 Comment[nn]=Klokka vist i digitalformat
 Comment[pl]=Wyświetla czas w formacie cyfrowym
diff --git a/applets/notifications/metadata.desktop b/applets/notifications/metadata.desktop
index ee5a12d7..c258bdc8 100644
--- a/applets/notifications/metadata.desktop
+++ b/applets/notifications/metadata.desktop
@@ -8,6 +8,7 @@ Name[cs]=Oznamování
 Name[de]=Benachrichtigungen
 Name[en_GB]=Notifications
 Name[es]=Notificaciones
+Name[fr]=Notifications
 Name[nl]=Meldingen
 Name[nn]=Varslingar
 Name[pl]=Powiadomienia
@@ -26,6 +27,7 @@ Comment[cs]=Oznámení a úlohy
 Comment[de]=Benachrichtigungen und Aktionen anzeigen
 Comment[en_GB]=Display notifications and jobs
 Comment[es]=Mostrar notificaciones y tareas
+Comment[fr]=Affiche les notifications et les tâches
 Comment[nl]=Meldingen en taken tonen
 Comment[nn]=Vis varslingar og jobbar
 Comment[pl]=Wyświetla powiadomienia i zadania
diff --git a/dialer/package/metadata.desktop b/dialer/package/metadata.desktop
index a349a794..2e3804f0 100644
--- a/dialer/package/metadata.desktop
+++ b/dialer/package/metadata.desktop
@@ -25,6 +25,7 @@ Name[cs]=Telefon
 Name[de]=Telefon
 Name[en_GB]=Phone
 Name[es]=Teléfono
+Name[fr]=Téléphone
 Name[nl]=Telefoon
 Name[nn]=Telefon
 Name[pl]=Telefon
diff --git a/dialer/src/plasma_dialer.notifyrc b/dialer/src/plasma_dialer.notifyrc
index 726e13d6..9c7ddb15 100644
--- a/dialer/src/plasma_dialer.notifyrc
+++ b/dialer/src/plasma_dialer.notifyrc
@@ -28,6 +28,7 @@ Name[cs]=Zmeškaný hovor
 Name[de]=Verpasster Anruf
 Name[en_GB]=Missed Call
 Name[es]=Llamada perdida
+Name[fr]=Appel manqué
 Name[nl]=Gemiste oproepen
 Name[nn]=Tapt oppringing
 Name[pl]=Połączenie nieodebrane
diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index 98780423..6a10d5fa 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -7,6 +7,7 @@ Name[cs]=Telefon
 Name[de]=Telefon
 Name[en_GB]=Phone
 Name[es]=Teléfono
+Name[fr]=Téléphone
 Name[nl]=Telefoon
 Name[nn]=Telefon
 Name[pl]=Telefon