diff options
| author | l10n daemon script <[email protected]> | 2015-05-05 14:00:14 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-05 14:00:14 +0000 |
| commit | c1a2c0f1a76dd1df7109d11a9f511b8c33d85054 (patch) | |
| tree | 276378cbbfa4b733c3003bdede1059bd76a92721 /src/org.kde.dolphin.desktop | |
| parent | f1c5cd302ad382613edc0a1cb2c88bcb2a670b95 (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 b9c916fae..fc417b7d7 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -11,6 +11,7 @@ Name[id]=Dolphin Name[it]=Dolphin Name[ja]=Dolphin Name[ko]=Dolphin +Name[lt]=Dolphin Name[nb]=Dolphin Name[nl]=Dolphin Name[nn]=Dolphin @@ -45,6 +46,7 @@ GenericName[id]=Manajer Berkas GenericName[it]=Gestore dei file GenericName[ja]=ファイルマネージャ GenericName[ko]=파일 관리자 +GenericName[lt]=Failų tvarkyklė GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder GenericName[nn]=Filhandsamar |