From 83158aac7abd0600c382306ba29c1e9a0704aff2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 29 Jan 2018 05:02:00 +0100 Subject: [PATCH] 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" --- plugins/kdeconnect.notifyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 444860514..63057cba0 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -459,7 +459,7 @@ Comment[et]=Aku täituvus on madal Comment[eu]=Zure bateria egoera baxuan dago Comment[fi]=Akkusi virta on vähissä Comment[fr]=Votre batterie est faible -Comment[gl]=A batería está esgotándose. +Comment[gl]=A batería está nas últimas. Comment[he]=הבטריה שלך הולכת להגמר Comment[hu]=Az akkumulátora feszültsége alacsony Comment[it]=La tua batteria è al livello basso