From d1871eb1b84fa9697b69d98eac02ca0a58874a65 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Jul 2015 19:57:51 +0000 Subject: 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/dolphinpart.desktop | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/dolphinpart.desktop') diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 8c78d6e0b..64c01f13b 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -21,6 +21,7 @@ Name[nn]=Dolphin-vising Name[pl]=Widok Dolphina Name[pt]=Área do Dolphin Name[pt_BR]=Visualização do Dolphin +Name[ru]=Представление Dolphin Name[se]=Dolphinčájeheapmi Name[sk]=Dolphin pohľad Name[sl]=Dolphin - pogled @@ -69,6 +70,7 @@ Name[nn]=Ikon Name[pl]=Ikony Name[pt]=Ícones Name[pt_BR]=Ícones +Name[ru]=Значки Name[se]=Govažat Name[sk]=Ikony Name[sl]=Ikone @@ -106,6 +108,7 @@ Name[nl]=Compact Name[pl]=Kompaktowy Name[pt]=Compacta Name[pt_BR]=Compacto +Name[ru]=Столбцы Name[sk]=Kompaktný Name[sl]=Strnjeno Name[sr]=Сажето @@ -144,6 +147,7 @@ Name[nn]=Detaljar Name[pl]=Szczegóły Name[pt]=Detalhes Name[pt_BR]=Detalhes +Name[ru]=Таблица Name[sk]=Podrobnosti Name[sl]=Podrobnosti Name[sr]=Детаљи -- cgit v1.3