From d50085f665d5fd7b93c09371fc5e9de81243758c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 21 Oct 2025 01:36:13 +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/konsolepart.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/konsolepart.json b/src/konsolepart.json index 8df835f7c..6d364278c 100644 --- a/src/konsolepart.json +++ b/src/konsolepart.json @@ -33,6 +33,7 @@ "Description[pl]": "Dostęp do wiersza poleceń", "Description[pt]": "Acesso à linha de comandos", "Description[pt_BR]": "Acesso à linha de comandos", + "Description[ro]": "Acces în linie de comandă", "Description[ru]": "Доступ к командной строке", "Description[sa]": "आदेशपङ्क्तिप्रवेशः", "Description[sk]": "Prístup na príkazový riadok", @@ -76,6 +77,7 @@ "Name[pl]": "Emulator terminala", "Name[pt]": "Emulador de Terminal", "Name[pt_BR]": "Emulador de terminal", + "Name[ro]": "Emulator de terminal", "Name[ru]": "Эмулятор терминала", "Name[sa]": "टर्मिनल एमुलेटर", "Name[sk]": "Emulátor terminálu",