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 · Dec 10, 2020 · 0f2b8c4 · 0f2b8c4
1 parent fd7f1a3
commit 0f2b8c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/kcm/backends/ufw/helper/org.kde.ufw.actions b/kcm/backends/ufw/helper/org.kde.ufw.actions
@@ -153,7 +153,7 @@ Name[uk]=Зміна параметрів брандмауера
 Name[x-test]=xxModify Firewallxx
 Description=Modify firewall settings
 Description[ca]=Modifica la configuració del tallafoc
-Description[ca@valencia]=Modifica els ajustaments del tallafoc
+Description[ca@valencia]=Modifica la configuració del tallafoc
 Description[cs]=Upravit nastavení firewallu
 Description[da]=Rediger firewallindstillinger
 Description[en_GB]=Modify firewall settings

diff --git a/kcm/package/metadata.desktop b/kcm/package/metadata.desktop
@@ -25,7 +25,7 @@ Name[uk]=Брандмауер
 Name[x-test]=xxFirewallxx
 Comment=Adjust your firewall settings
 Comment[ca]=Ajusta la configuració del tallafoc
-Comment[ca@valencia]=Ajusta els ajustaments del tallafoc
+Comment[ca@valencia]=Ajusta la configuració del tallafoc
 Comment[da]=Juster dine firewallindstillinger
 Comment[en_GB]=Adjust your firewall settings
 Comment[es]=Ajustar las preferencias del cortafuegos