diff options
| author | l10n daemon script <[email protected]> | 2015-06-16 13:31:20 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-16 13:31:20 +0000 |
| commit | a8a4981b2c58090c01cc96da933022909d6adf6b (patch) | |
| tree | 05b8a39ae915503b8fe9b63b00d399a415d642d4 /src/org.kde.dolphin.desktop | |
| parent | 1c1efb983c60ea57422317186047f744e23df114 (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 ea802b431..e483d0539 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -8,6 +8,7 @@ Name[es]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin +Name[ia]=Dolphin Name[id]=Dolphin Name[it]=Dolphin Name[ja]=Dolphin @@ -45,6 +46,7 @@ GenericName[es]=Gestor de archivos GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros +GenericName[ia]=Gerente de file GenericName[id]=Manajer Berkas GenericName[it]=Gestore dei file GenericName[ja]=ファイルマネージャ |