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/org.kde.dolphin.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/org.kde.dolphin.desktop')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index d7e905507..0d25c1750 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -20,6 +20,7 @@ Name[nn]=Dolphin Name[pl]=Dolphin Name[pt]=Dolphin Name[pt_BR]=Dolphin +Name[ru]=Dolphin Name[se]=Dolphin Name[sk]=Dolphin Name[sl]=Dolphin @@ -59,6 +60,7 @@ GenericName[nn]=Filhandsamar GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros GenericName[pt_BR]=Gerenciador de arquivos +GenericName[ru]=Диспетчер файлов GenericName[se]=Fiilagieđahalli GenericName[sk]=Správca súborov GenericName[sl]=Upravljalnik datotek |