diff options
| author | l10n daemon script <[email protected]> | 2015-07-26 19:57:51 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-07-26 19:57:51 +0000 |
| commit | d1871eb1b84fa9697b69d98eac02ca0a58874a65 (patch) | |
| tree | bd0f9db85ba7324a106c925c1666b76b5cbbb355 /src/dolphinpart.desktop | |
| parent | 8d2a8a0f920cfe1c7f2d24053ded0743d3047fb5 (diff) | |
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"
Diffstat (limited to 'src/dolphinpart.desktop')
| -rw-r--r-- | src/dolphinpart.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
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]=Детаљи |