diff options
| author | l10n daemon script <[email protected]> | 2022-04-01 02:03:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-01 02:03:03 +0000 |
| commit | 356ccd21b4d386511ffed5f10fd612b5c82c876c (patch) | |
| tree | 86273d684f6b42d9907309fda17a8eb6f0ccf6ff /src/org.kde.dolphin.desktop | |
| parent | 3ccc0420a694deeb0d236c7b39ce569bd074f3e8 (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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index c64895d2e..ba1d1fc22 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -139,7 +139,6 @@ Keywords[pt]=ficheiros;gestão de ficheiros;navegação de ficheiros;samba;parti Keywords[pt_BR]=arquivo;gerenciamento de arquivos;navegação de arquivos;samba;compartilhamentos de rede;explorador;localizador; Keywords[ro]=fișiere;gestiune fișiere;răsfoire fișiere;samba;partajări de rețea;unități de rețea;Explorer;Finder; Keywords[ru]=files;file management;file browsing;samba;network shares;Explorer;Finder;файлы,управление файлами,просмотр файлов,сетевые папки -Keywords[sk]=súbory;správa súborov;prehliadanie súborov;samba;sieťové akcie;Prieskumník;Vyhľadávač; 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[tr]=dosyalar;dosya yönetimi;dosya göz at;samba;ağ paylaşımları;Explorer;Finder; |