From 83964c2071893b65e6fd8dc96bad5388107c8ef3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Jan 2023 02:03:57 +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 6726dbc9e..4f8f268ec 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -146,6 +146,7 @@ Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di r 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 +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[pl]=pliki;zarządzenie plikami;przeglądanie plików;samba;udziały sieciowe;Przeglądarka;Finder; -- cgit v1.3