diff options
| author | l10n daemon script <[email protected]> | 2015-04-26 09:44:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-26 09:44:42 +0000 |
| commit | 06776451a72c395fca4b40196a6617366167ad66 (patch) | |
| tree | 5aa85d73868c4ca5733b5dc02aef7738e7d39291 /src/org.kde.dolphin.desktop | |
| parent | 0daae5336714c2124171ca89415eb8bf6098519d (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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 2193f9533..cb5afd224 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -9,11 +9,14 @@ Name[fr]=Dolphin Name[gl]=Dolphin Name[id]=Dolphin Name[it]=Dolphin +Name[ko]=Dolphin +Name[nb]=Dolphin Name[nl]=Dolphin Name[nn]=Dolphin Name[pl]=Dolphin Name[pt]=Dolphin Name[pt_BR]=Dolphin +Name[se]=Dolphin Name[sk]=Dolphin Name[sl]=Dolphin Name[sr]=Делфин @@ -39,11 +42,14 @@ GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros GenericName[id]=Manajer Berkas GenericName[it]=Gestore dei file +GenericName[ko]=파일 관리자 +GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder GenericName[nn]=Filhandsamar GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros GenericName[pt_BR]=Gerenciador de arquivos +GenericName[se]=Fiilagieđahalli GenericName[sk]=Správca súborov GenericName[sl]=Upravljalnik datotek GenericName[sr]=Менаџер фајлова |