kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
This commit is contained in:
l10n daemon script 2024-01-05 02:08:48 +00:00
parent 74cad37242
commit e13a47f01f
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/org.kde.dolphin.desktop
View File

@ -157,6 +157,7 @@ Keywords[lt]=failai;failų valdymas;failu valdymas;failų tvarkymas;failu tvarky
Keywords[nb]=filer;filbehandling;filutforskning;samba;nettverksressurser;Explorer;Finder;
Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem;
Keywords[nn]=filer;filhandsaming;filutforsking;samba;nettverksressursar;Explorer;Finder;
Keywords[pa]=ਫਾਇਲ;ਫਾਈਲ;ਫ਼ਾਇਲ;ਫ਼ਾਈਲਾਂ;ਫਾਇਲ ਪਰਬੰਧ;ਫਾਇਲ ਇੰਤਜ਼ਾਮ;ਫਾਇਲ ਬਰਾਊਜ਼ਰ;ਝਲਕ;ਸਾਂਬਾ;ਨੈ਼ਟਵਰਕ ਸਾਂਝ;ਐਕਸਪਲੋਰਰ;ਫਾਈਡਰ;
Keywords[pl]=pliki;zarządzenie plikami;przeglądanie plików;samba;udziały sieciowe;Przeglądarka;Finder;
Keywords[pt]=ficheiros;gestão de ficheiros;navegação de ficheiros;samba;partilhas de rede;Explorador;Pesquisa;
Keywords[pt_BR]=arquivo;gerenciamento de arquivos;navegação de arquivos;samba;compartilhamentos de rede;explorador;localizador;

1
src/settings/kcm/kcmdolphingeneral.json
View File

@ -32,6 +32,7 @@
"Name[nb]": "Generelt",
"Name[nl]": "Algemeen",
"Name[nn]": "Generelt",
"Name[pa]": "ਸਧਾਰਨ",
"Name[pl]": "Ogólne",
"Name[pt]": "Geral",
"Name[pt_BR]": "Geral",