diff options
| author | l10n daemon script <[email protected]> | 2026-03-01 01:45:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-03-01 01:45:03 +0000 |
| commit | d342f3528f1161fe349fc74e80bf7fc8e2cacf55 (patch) | |
| tree | 5898044b5072b9de7be58e45b01c24537f4615d9 /src/org.kde.dolphin.desktop | |
| parent | f26b2c959405dd8f9c4c5ff505315d9c3c92762f (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, 2 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index d01ab2a7a..b74480aac 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -144,6 +144,7 @@ Comment[hu]=Kezelje fájljait Comment[ia]=Gere tu files Comment[is]=Hafðu umsjón með skránum þínum Comment[it]=Gestisci i tuoi file +Comment[ja]=ファイルを管理 Comment[ka]=მართეთ თქვენი ფაილები Comment[ko]=내 파일 관리 Comment[lt]=Tvarkyti failus @@ -192,6 +193,7 @@ Keywords[id]=file;berkas;pengelola file;peramban file;samba;pembagian jaringan;E Keywords[ie]=files;gestie;gerente;navigation;rete;samba;partite;Explorer;Finder; 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[ja]=files;file management;file browsing;samba;network shares;Explorer;Finder;ファイル;ファイル管理;ファイルブラウザ;ネットワーク共有,エクスプローラー Keywords[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder; Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유; Keywords[lt]=failai;failų valdymas;failu valdymas;failų tvarkymas;failu tvarkymas;failų naršymas;failu narsymas;samba;tinklo viešiniai;tinklo viesiniai;Finder;Explorer; |