diff options
| author | l10n daemon script <[email protected]> | 2022-01-28 01:45:57 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-01-28 01:45:57 +0000 |
| commit | 166e71533e83cf9f47e146c8625130b5d167a91f (patch) | |
| tree | ee78dedbc54cfb4afcedd8826ae0c3197111c99c /src/org.kde.dolphin.desktop | |
| parent | 65846125d7f4dd90acd69abf73161607ba76cc8b (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, 1 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 70edf7c32..a967857c7 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -125,6 +125,7 @@ Keywords[es]=archivos;gestión de archivos;administración de archivos;exploraci Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ; samba ; partages sur réseau ; explorateur ; chercheur ; Keywords[hu]=fájlok;fájlkezelés;fájlböngészés;samba;hálózati megosztások;Explorer;Finder; Keywords[ia]=files; gestion de file; navigation de file;samba; partes de rete;Explorator;Trovator; +Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Finder; Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder; Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유; Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem; |