diff options
| author | l10n daemon script <[email protected]> | 2018-04-03 07:12:29 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-03 07:12:29 +0200 |
| commit | f4e2593aa79cdc0483121507012b2045bf2e9703 (patch) | |
| tree | 0edd69eac7762c248bfa1e64195d35b5ad0273b7 /src/org.kde.dolphin.desktop | |
| parent | 4bd6e9fb1397373b6c113fc25f9b4e17764a1504 (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, 1 insertions, 1 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 447e21ac7..9895e2098 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -65,7 +65,7 @@ GenericName[gl]=Xestor de ficheiros GenericName[he]=מנהל קבצים GenericName[hu]=Fájlkezelő GenericName[ia]=Gerente de file -GenericName[id]=Pengelola Fail +GenericName[id]=Pengelola File GenericName[it]=Gestore dei file GenericName[ja]=ファイルマネージャ GenericName[ko]=파일 관리자 |