From f2bca662da4bc3846ae858c0838472857278d05e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Dec 2022 01:54:54 +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/backends/x11/windowed/x11.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/x11/windowed/x11.json b/src/backends/x11/windowed/x11.json index b409e8be26..cc512c04a8 100644 --- a/src/backends/x11/windowed/x11.json +++ b/src/backends/x11/windowed/x11.json @@ -36,7 +36,7 @@ "Description[sr@latin]": "Renderovanje u ugnežđeni prozor na prozorskom sistemu X11.", "Description[sr]": "Рендеровање у угнежђени прозор на прозорском систему Икс11.", "Description[sv]": "Återge till ett nästlat fönster på X11-fönstersystem.", - "Description[tr]": "X11 pencere sisteminde iç içe geçmiş bir pencereye gerçekle.", + "Description[tr]": "X11 pencere sisteminde iç içe geçmiş bir pencereye sunun.", "Description[uk]": "Обробляти у вкладене вікно системи керування вікнами X11.", "Description[vi]": "Kết xuất vào một cửa sổ lồng trong hệ thống cửa sổ X11.", "Description[x-test]": "xxRender to a nested window on X11 windowing system.xx",