From e13a47f01ff96e3de87d59dc6d5da61009bba563 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 5 Jan 2024 02:08:48 +0000 Subject: 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" --- src/org.kde.dolphin.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src/org.kde.dolphin.desktop') diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 00e8e7b9b..d8baa93a5 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -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; -- cgit v1.3