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"
7 years ago · 451512192c
parent ac0fa4e2e4
commit 451512192c
6 changed files with 9 additions and 0 deletions
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@ -2,6 +2,7 @@
 Name=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
+Name[cs]=Latte
 Name[de]=Latte
 Name[el]=Latte
 Name[es]=Latte
@ -28,6 +29,7 @@ Comment[zh_TW]=給大眾使用的 Dock
 GenericName=Dock
 GenericName[ca]=Acobla
 GenericName[ca@valencia]=Acobla
+GenericName[cs]=Dok
 GenericName[de]=Dock
 GenericName[el]=Πίνακας
 GenericName[es]=Dock
--- a/applets/separator/metadata.desktop.cmake
+++ b/applets/separator/metadata.desktop.cmake
@ -2,6 +2,7 @@
 Name=Separator
 Name[ca]=Separador
 Name[ca@valencia]=Separador
+Name[cs]=Oddělovač
 Name[de]=Abstandshalter
 Name[el]=Διαχωριστικό
 Name[es]=Separador
@ -34,6 +35,7 @@ Icon=filename-divider
 Keywords=separator
 Keywords[ca]=separador
 Keywords[ca@valencia]=separador
+Keywords[cs]=oddělovač
 Keywords[de]=Abstandshalter
 Keywords[el]=διαχωριστικό
 Keywords[es]=separador
--- a/applets/separator/package/metadata.desktop
+++ b/applets/separator/package/metadata.desktop
@ -2,6 +2,7 @@
 Name=Separator
 Name[ca]=Separador
 Name[ca@valencia]=Separador
+Name[cs]=Oddělovač
 Name[de]=Abstandshalter
 Name[el]=Διαχωριστικό
 Name[es]=Separador
@ -34,6 +35,7 @@ Icon=filename-divider
 Keywords=separator
 Keywords[ca]=separador
 Keywords[ca@valencia]=separador
+Keywords[cs]=oddělovač
 Keywords[de]=Abstandshalter
 Keywords[el]=διαχωριστικό
 Keywords[es]=separador
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -3,6 +3,7 @@ Encoding=UTF-8
 Name=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
+Name[cs]=Latte
 Name[de]=Latte
 Name[el]=Latte
 Name[es]=Latte
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -3,6 +3,7 @@ Encoding=UTF-8
 Name=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
+Name[cs]=Latte
 Name[de]=Latte
 Name[el]=Latte
 Name[es]=Latte
--- a/shell/package/contents/controls/latte-separator.desktop
+++ b/shell/package/contents/controls/latte-separator.desktop
@ -27,6 +27,7 @@ Comment[zh_TW]=Latte 鬼分隔器（鬼檔案）
 GenericName=Dock
 GenericName[ca]=Acobla
 GenericName[ca@valencia]=Acobla
+GenericName[cs]=Dok
 GenericName[de]=Dock
 GenericName[el]=Πίνακας
 GenericName[es]=Dock