From 7c9fb68b14cf2bd05693291f6db4abe3aaba304d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 3 Feb 2024 01:15:33 +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" --- src/plugins/frozenapp/package/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/frozenapp/package/metadata.json b/src/plugins/frozenapp/package/metadata.json index edc173cff4..f0c7e6ef80 100644 --- a/src/plugins/frozenapp/package/metadata.json +++ b/src/plugins/frozenapp/package/metadata.json @@ -115,7 +115,7 @@ "Name[ja]": "応答しないアプリケーションの彩度を下げる", "Name[ka]": "უსიცოცხლო აპლიკაციების გაუფერულება", "Name[ko]": "응답 없는 앱을 무채색으로 전환", - "Name[lt]": "Nusodrinti neatsakančias programas", + "Name[lt]": "Nusodrinti nereaguojančias programas", "Name[lv]": "Nereaģējošās programmas padarīt melnbaltas", "Name[nl]": "Verzadiging van niet responsieve toepassingen verminderen", "Name[nn]": "Fjern fargemetting på ikkje-responsive program",