From b72f800ac4b299af5546f70deb4b7664f5890d89 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 19 Nov 2022 01:51:46 +0000 Subject: [PATCH] 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 + src/settings/kcm/kcmdolphingeneral.json | 2 ++ src/settings/kcm/kcmdolphinnavigation.json | 1 + src/settings/kcm/kcmdolphinviewmodes.json | 1 + 4 files changed, 5 insertions(+) diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 83c289d19..e7ddc6987 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -141,6 +141,7 @@ Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Find Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;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 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; diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 00890b763..cd62ec23f 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -21,6 +21,7 @@ "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ka]": "ფაილების მმართველის ზოგადი მორგება", "Description[ko]": "일반 파일 관리자 설정", + "Description[lt]": "Konfigūruoti bendras failų tvarkytuvės nuostatas", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", "Description[nn]": "Set opp generelle innstillingar for filhandsamaren", "Description[pl]": "Ustawienia ogólne zarządzania plikami", @@ -59,6 +60,7 @@ "Name[it]": "Generale", "Name[ka]": "მთავარი", "Name[ko]": "일반", + "Name[lt]": "Bendrosios", "Name[nl]": "Algemeen", "Name[nn]": "Generelt", "Name[pl]": "Ogólne", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 803735a2a..cb6942729 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -21,6 +21,7 @@ "Description[it]": "Configura la navigazione col gestore dei file", "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება", "Description[ko]": "파일 관리자 탐색 설정", + "Description[lt]": "Konfigūruoti failų tvarkytuvės naršymą", "Description[nl]": "Bestandsbeheerdernavigatie configureren", "Description[nn]": "Set opp navigasjonen i filhandsamaren", "Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 7f330f398..35e4466cd 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -21,6 +21,7 @@ "Description[it]": "Configura le viste del gestore dei file", "Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება", "Description[ko]": "파일 관리자 보기 모드 설정", + "Description[lt]": "Konfigūruoti failų tvarkytuvės rodinio veiksenas", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", "Description[nn]": "Set opp visingsmodusane i filhandsamaren", "Description[pl]": "Ustawienia trybów widoku zarządzania plikami", -- 2.47.3