diff options
| author | l10n daemon script <[email protected]> | 2018-03-03 05:23:49 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-03-03 05:23:49 +0100 |
| commit | e46421bfeee7a2d4f8f61c24feee2758325e86a4 (patch) | |
| tree | 3005a0e4df2ad3ae3010b2a400e0bbe31b25e23a /src/org.kde.dolphin.desktop | |
| parent | b95cc59091f9b538f87b616b92e91d6aace0e1be (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 f187cef58..447e21ac7 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]=Manajer Berkas +GenericName[id]=Pengelola Fail GenericName[it]=Gestore dei file GenericName[ja]=ファイルマネージャ GenericName[ko]=파일 관리자 |