From 69c8a0e3dbc7a879227a336832b3d9529eea6e49 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 Aug 2016 09:31:09 +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" --- desktop/konsolerun.desktop | 1 + desktop/org.kde.konsole.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/desktop/konsolerun.desktop b/desktop/konsolerun.desktop index 14b03612..bd1f6546 100644 --- a/desktop/konsolerun.desktop +++ b/desktop/konsolerun.desktop @@ -79,6 +79,7 @@ Comment[nn]=Køyr inni konsoll Comment[pl]=Uruchom wewnątrz konsoli Comment[pt]=Executar no Konsole Comment[pt_BR]=Executar no Konsole +Comment[ru]=Выполнить команду в Konsole Comment[sk]=Spustiť v Konsole Comment[sl]=Zaženi znotraj Konsole Comment[sr]=Изврши у Конзоли diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop index 73581254..583fa3b4 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -294,6 +294,7 @@ Name[nn]=Opna ny fane Name[pl]=Otwórz nową kartę Name[pt]=Abrir uma Nova Página Name[pt_BR]=Abre uma nova aba +Name[ru]=Открыть новую вкладку Name[sk]=Otvoriť novú kartu Name[sl]=Odpri nov zavihek Name[sr]=Отвори нови језичак