diff options
| author | l10n daemon script <[email protected]> | 2021-12-03 01:47:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-03 01:47:17 +0000 |
| commit | 9ec88ec1aea35abedf3319d331c7a05188b7dba5 (patch) | |
| tree | 908eceaeb05757d2395e0e60a25f30560744b5d8 /src | |
| parent | 1939609e703b89d7e2c06514e373857ff2bc925b (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')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 2aef24cf6..171b0c2a8 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -116,6 +116,11 @@ Terminal=false MimeType=inode/directory; InitialPreference=10 Keywords=files;file management;file browsing;samba;network shares; +Keywords[ca]=fitxers;gestió de fitxers;explorar fitxers;samba;comparticions de xarxa; +Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares; +Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser; +Keywords[uk]=files;file management;file browsing;samba;network shares;файли;керування файлами;навігація;самба;спільні ресурси;мережа; +Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx; X-DBUS-ServiceName=org.kde.dolphin X-KDE-Shortcuts=Meta+E StartupWMClass=dolphin |