diff options
| author | l10n daemon script <[email protected]> | 2015-05-04 10:09:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-04 10:09:13 +0000 |
| commit | f1c5cd302ad382613edc0a1cb2c88bcb2a670b95 (patch) | |
| tree | ce9a944a91afa36aee45fbd19695eef720e7fb42 /src/org.kde.dolphin.desktop | |
| parent | ece6650ecd3af0eb450e28a9aadcb0f4dd26cb24 (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 cb5afd224..b9c916fae 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -9,6 +9,7 @@ Name[fr]=Dolphin Name[gl]=Dolphin Name[id]=Dolphin Name[it]=Dolphin +Name[ja]=Dolphin Name[ko]=Dolphin Name[nb]=Dolphin Name[nl]=Dolphin @@ -42,6 +43,7 @@ GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros GenericName[id]=Manajer Berkas GenericName[it]=Gestore dei file +GenericName[ja]=ファイルマネージャ GenericName[ko]=파일 관리자 GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder |