From 57e0c8169bc409e37958821a0bb00a1f667320c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 30 Sep 2019 09:19:39 +0200 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" --- runners/services/plasma-runner-services.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runners/services/plasma-runner-services.desktop b/runners/services/plasma-runner-services.desktop index 9cc1778df..cafdefdc4 100644 --- a/runners/services/plasma-runner-services.desktop +++ b/runners/services/plasma-runner-services.desktop @@ -28,7 +28,7 @@ Name[fi]=Sovellukset Name[fr]=Applications Name[fy]=Programma's Name[ga]=Feidhmchláir -Name[gl]=Aplicativos +Name[gl]=Aplicacións Name[gu]=કાર્યક્રમો Name[he]=תוכניות Name[hi]=अनुप्रयोग