From aae9eb9c65d96d431e55e0cf4d359297fc564032 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 May 2024 01:18:51 +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/showfps/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/showfps/metadata.json b/src/plugins/showfps/metadata.json index 70afa083fb..b1d0a2287b 100644 --- a/src/plugins/showfps/metadata.json +++ b/src/plugins/showfps/metadata.json @@ -87,7 +87,7 @@ "Name[sl]": "Pokaži št. sličic na sekundo", "Name[sv]": "Visa ramar/s", "Name[ta]": "FPS-ஐ காட்டு", - "Name[tr]": "FPS'yi Göster", + "Name[tr]": "FPS’yi Göster", "Name[uk]": "Показ частоти кадрів", "Name[vi]": "Hiện FPS", "Name[x-test]": "xxShow FPSxx",