Skip to content

Commit 14033b2

Browse files
author
l10n daemon script
committed
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"
1 parent 1cbe070 commit 14033b2

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

resources/linux/org.kde.ghostwriter.desktop

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ Keywords=Markdown;editor;document;fullscreen;distraction;concentration;focused;w
112112
Keywords[ar]=مارك داون;محرر;مستند;شاشة كاملة;تشتيت الانتباه;التركيز;الكتابة;
113113
Keywords[ca]=Markdown;editor;document;pantalla completa;distracció;concentració;enfocat;escriptura;
114114
Keywords[ca@valencia]=Markdown;editor;document;pantalla completa;distracció;concentració;enfocat;escriptura;
115+
Keywords[cs]=Markdown;editor;dokument;celá obrazovka;rozptýlení;soustředění;soustředěný;psaní;
115116
Keywords[de]=Markdown;Editor;Dokument;Vollbild;Ablenkung;Konzentration;fokussiert;Schreiben;
116117
Keywords[en_GB]=Markdown;editor;document;fullscreen;distraction;concentration;focused;writing;
117118
Keywords[eo]=Markdown;redaktilo;dokumento;plenekrana;distriĝo;koncentriĝo;fokusita;

0 commit comments

Comments
 (0)