Skip to content

Commit 24be2f4

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 3382d80 commit 24be2f4

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

resources/linux/org.kde.ghostwriter.desktop

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GenericName=Markdown Editor
3838
GenericName[ar]=محرّر Markdown
3939
GenericName[ca]=Editor de Markdown
4040
GenericName[ca@valencia]=Editor de Markdown
41-
GenericName[cs]=Editor Markdown
41+
GenericName[cs]=Editor Markdownu
4242
GenericName[de]=Markdown-Editor
4343
GenericName[en_GB]=Markdown Editor
4444
GenericName[eo]=Markdown-Redaktilo
@@ -71,6 +71,7 @@ Comment=Distraction-free text editor for Markdown
7171
Comment[ar]=محرر نصوص خالٍ من عوامل التشتيت لمارك داون
7272
Comment[ca]=Editor de text lliure de distraccions per al Markdown
7373
Comment[ca@valencia]=Editor de text lliure de distraccions per a Markdown
74+
Comment[cs]=Editor textu pro Markdown bez rušivých prvků
7475
Comment[de]=Ablenkungsfreier Texteditor für Markdown
7576
Comment[en_GB]=Distraction-free text editor for Markdown
7677
Comment[eo]=Senpretenda tekstredaktilo por Markdown

0 commit comments

Comments
 (0)