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"
KDE · Oct 6, 2024 · 5a1e8c4 · 5a1e8c4
1 parent b9bb128
commit 5a1e8c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/org.kde.labplot.desktop b/src/org.kde.labplot.desktop
@@ -6,6 +6,7 @@ Name=LabPlot
 Name[ca]=LabPlot
 Name[ca@valencia]=LabPlot
 Name[cs]=LabPlot
+Name[de]=LabPlot
 Name[en_GB]=LabPlot
 Name[es]=LabPlot
 Name[fr]=LabPlot

diff --git a/src/org.kde.labplot2.desktop b/src/org.kde.labplot2.desktop
@@ -6,6 +6,7 @@ Name=LabPlot
 Name[ca]=LabPlot
 Name[ca@valencia]=LabPlot
 Name[cs]=LabPlot
+Name[de]=LabPlot
 Name[en_GB]=LabPlot
 Name[es]=LabPlot
 Name[fr]=LabPlot