From f5a4498776bc69c458162f245edecf29ddfd2357 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Apr 2022 02:50:52 +0000 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" --- menu/desktop/kf5-toys.directory | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu/desktop/kf5-toys.directory b/menu/desktop/kf5-toys.directory index f42a38bd0..f53b58941 100644 --- a/menu/desktop/kf5-toys.directory +++ b/menu/desktop/kf5-toys.directory @@ -14,7 +14,7 @@ Name[bn_IN]=খেলনা Name[br]=C'hoarielloù Name[bs]=Igračke Name[ca]=Joguines -Name[ca@valencia]=Joguines +Name[ca@valencia]=Joguets Name[cs]=Hračky Name[csb]=Zabôwczi Name[cy]=Tegannau