diff options
| author | l10n daemon script <[email protected]> | 2021-12-11 01:42:51 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-11 01:42:51 +0000 |
| commit | ce8d4e5bcd125f45dfebf11ec53234b733de61ff (patch) | |
| tree | 14511ab6fe4ba2a698599dc84b0aa733d0363a9d | |
| parent | 4451c9f2df5b72e63033d3b91bd218ba9ea5cd3a (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"
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 8f12f1b7a..8a53246d6 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -128,6 +128,7 @@ Keywords[pt_BR]=arquivo;gerenciamento de arquivos;navegação de arquivos;samba; Keywords[sl]=datoteke;upravljanje z datotekami;brskanje po datotekah;samba;mrežni diski;Raziskovalec;Iskalec; Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser;Utforskare;Finder; Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;Finder;файли;керування файлами;навігація;самба;спільні ресурси;мережа;експлорер;провідник;файндер; +Keywords[vi]=files;file management;file browsing;samba;network shares;Explorer;Finder;tệp;quản lí tệp;duyệt tệp;chia sẻ mạng; Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx;xxExplorerxx;xxFinderxx; X-DBUS-ServiceName=org.kde.dolphin X-KDE-Shortcuts=Meta+E |