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"
5 years ago · ce365f35ad
parent 5fce1a5266
commit ce365f35ad
7 changed files with 8 additions and 8 deletions
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@ -1,7 +1,7 @@
 [Global]
 Name=Latte Dock
 Name[ar]=رصيف لاتيه
-Name[ca]=Latte Dock
+Name[ca]=Acoblador Latte
 Name[ca@valencia]=Latte Dock
 Name[cs]=Dok Latte
 Name[da]=Latte-dok
@ -30,7 +30,7 @@ Name[zh_CN]=Latte 停靠栏
 Name[zh_TW]=Latte Dock
 Comment=Latte Dock
 Comment[ar]=رصيف لاتيه
-Comment[ca]=Acoblador del Latte
+Comment[ca]=Acoblador Latte
 Comment[ca@valencia]=Acoblador del Latte
 Comment[cs]=Dok Latte
 Comment[da]=Latte-dok
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@ -30,7 +30,7 @@ Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
-Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
+Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Beholder til Latte-dokken
 Comment[de]=Containment für Latte-Dock
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@ -30,7 +30,7 @@ Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
-Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
+Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Beholder til Latte-dokken
 Comment[de]=Containment für Latte-Dock
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@ -25,7 +25,7 @@ Name[x-test]=xxLatte Tasksxx
 Name[zh_CN]=Latte 任务管理器
 Name[zh_TW]=Latte 工作
 Comment=Tasks plasmoid from Latte Dock
-Comment[ca]=Plasmoide de tasques del Latte Dock
+Comment[ca]=Plasmoide de tasques de l'acoblador Latte
 Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
 Comment[cs]=Plasmoid úloh z doku Latte
 Comment[en_GB]=Tasks plasmoid from Latte Dock
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@ -25,7 +25,7 @@ Name[x-test]=xxLatte Tasksxx
 Name[zh_CN]=Latte 任务管理器
 Name[zh_TW]=Latte 工作
 Comment=Tasks plasmoid from Latte Dock
-Comment[ca]=Plasmoide de tasques del Latte Dock
+Comment[ca]=Plasmoide de tasques de l'acoblador Latte
 Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
 Comment[cs]=Plasmoid úloh z doku Latte
 Comment[en_GB]=Tasks plasmoid from Latte Dock
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@ -29,7 +29,7 @@ Name[x-test]=xxLatte Shellxx
 Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
-Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
+Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Skal til Latte-dokken
 Comment[de]=Shell für Latte-Dock
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@ -29,7 +29,7 @@ Name[x-test]=xxLatte Shellxx
 Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
-Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
+Comment[ca]=Intèrpret d'ordres proporcionat per l'acoblador Latte
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Skal til Latte-dokken
 Comment[de]=Shell für Latte-Dock