diff options
| author | l10n daemon script <[email protected]> | 2019-09-25 05:15:10 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-09-25 05:15:10 +0200 |
| commit | a2730fad4323c3af0b5198a31021eed9c9a336e7 (patch) | |
| tree | d713e3f00da2f918cc9dac3b837bec1829d6bc3e /src/org.kde.dolphin.desktop | |
| parent | c0ca8f2c79c9b0e9f6db47dd86a1434d4e3de5bb (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 e75eeab99..3e71051ef 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -72,7 +72,7 @@ GenericName[id]=Pengelola File GenericName[it]=Gestore dei file GenericName[ja]=ファイルマネージャ GenericName[ko]=파일 관리자 -GenericName[lt]=Failų tvarkyklė +GenericName[lt]=Failų tvarkytuvė GenericName[ml]=ഫയല് മാനേജര് GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder |