From 3852558044b59e0a58bc7fc6e24fe085d9412100 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 27 Jul 2024 01:22:48 +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"
---
 resources/linux/org.kde.ghostwriter.desktop | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/linux/org.kde.ghostwriter.desktop b/resources/linux/org.kde.ghostwriter.desktop
index 36f5e6f97..14aa9b625 100644
--- a/resources/linux/org.kde.ghostwriter.desktop
+++ b/resources/linux/org.kde.ghostwriter.desktop
@@ -12,6 +12,7 @@ Name[eu]=ghostwriter
 Name[fi]=ghostwriter
 Name[fr]=Ghostwriter
 Name[gl]=ghostwriter
+Name[he]=ghostwriter
 Name[ia]=ghostwriter
 Name[id]=ghostwriter
 Name[it]=ghostwriter
@@ -42,6 +43,7 @@ GenericName[eu]=«Markdown» Editorea
 GenericName[fi]=Markdown-muokkain
 GenericName[fr]=Éditeur de langage « Markdown »
 GenericName[gl]=Editor de Markdown
+GenericName[he]=עורך Markdown
 GenericName[id]=Penyunting Markdown
 GenericName[it]=Editor Markdown
 GenericName[ka]=Markdown-ის რედაქტორი
@@ -69,6 +71,7 @@ Comment[eu]=«Markdown»erako distrakziorik gabeko testu editorea
 Comment[fi]=Häiriöttömän tilan Markdown-tekstimuokkain
 Comment[fr]=Éditeur de texte sans distraction pour le langage « Markdown »
 Comment[gl]=Editor de texto Markdown sen distraccións.
+Comment[he]=עורך טקסט Markdown נטול הסחות
 Comment[id]=Penyunting teks tanpa gangguan untuk Markdown
 Comment[it]=Editor di testo senza distrazioni per Markdown
 Comment[ka]=ფოკუსირებული მარკდაუნის რედაქტორი
@@ -101,6 +104,7 @@ Keywords[eu]=Markdown;editorea;dokumentua;pantaila-betea;pantaila-osoa;distrakzi
 Keywords[fi]=Markdown;muokkain;editori;tiedosto;dokumentti;asiakirja;koko näyttö;häiriö;häiriötön;keskittyminen;kirjoittaminen;kirjoitus;
 Keywords[fr]=Markdown;éditeur;document;plein écran;distraction;concentration;concentré;écriture;
 Keywords[gl]=Markdown;editor;documento;pantalla completa;distracción;concentración;centrarse;escribir;
+Keywords[he]=Markdown;עורך;מסמך;מסך מלא;הסחה;הסחות;מיקוד;ריכוז;ממוקד;ממוקדת;מרוכז;מרוכזת;כתיבה;ספרות;שירה;
 Keywords[id]=Markdown;editor;penyunting;layar penuh;gangguan;konsentrasi;terfokus;penulis;menulis;
 Keywords[it]=Markdown;editor;documento;schermo intero;distrazione;concentrazione;focalizzato;scrittura;
 Keywords[ka]=Markdown;editor;document;fullscreen;distraction;concentration;focused;writing;