From 35e160afe2e6cfcac83524d62059be8be3804089 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Aug 2022 01:47:02 +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" --- linux/applications/org.kde.falkon.desktop | 6 ++++++ src/lib/adblock/metadata.desktop | 2 ++ src/lib/data/breeze-fallback/index.theme | 2 ++ src/plugins/AutoScroll/metadata.desktop | 1 + src/scripts/hellopython/metadata.desktop | 1 + src/scripts/helloqml/metadata.desktop | 1 + src/scripts/middleclickloader/metadata.desktop | 1 + src/scripts/runaction/actions/dictionary.desktop | 1 + src/scripts/runaction/actions/googleimagesearch.desktop | 2 ++ src/scripts/runaction/actions/mpv.desktop | 1 + src/scripts/runaction/actions/tineyeimagesearch.desktop | 2 ++ src/scripts/runaction/actions/translate.desktop | 1 + src/scripts/runaction/actions/w3.desktop | 1 + src/scripts/runaction/actions/yandeximagesearch.desktop | 2 ++ src/scripts/runaction/metadata.desktop | 1 + themes/chrome/metadata.desktop | 1 + themes/linux/metadata.desktop | 1 + themes/mac/metadata.desktop | 1 + themes/windows/metadata.desktop | 1 + 19 files changed, 29 insertions(+) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index e905aaec1..2556dbab5 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -18,6 +18,7 @@ Name[fr]=Falkon Name[gl]=Falkon Name[ia]=Falkon: Name[id]=Falkon +Name[is]=Falkon Name[it]=Falkon Name[ka]=Falkon Name[ko]=Falkon @@ -59,6 +60,7 @@ Comment[fr]=Un navigateur Web rapide et sécurisé Comment[gl]=Un navegador rápido e seguro Comment[ia]=Un rapide e secure navigator web Comment[id]=Sebuah penelusur web yang cepat dan aman +Comment[is]=Hraðvirkur og öruggur vafri Comment[it]=Un browser web veloce e sicuro Comment[ka]=სწრაფი და დაცული ბრაუზერი Comment[ko]=빠르고 안전한 웹 브라우저 @@ -97,6 +99,7 @@ GenericName[fr]=Navigateur Web GenericName[gl]=Navegador web GenericName[ia]=Navigator Web GenericName[id]=Penelusur Web +GenericName[is]=Vafri GenericName[it]=Browser web GenericName[ka]=ვებ-ბრაუზერი GenericName[ko]=웹 브라우저 @@ -142,6 +145,7 @@ Name[fr]=Ouvrir un nouvel onglet Name[gl]=Abrir un novo separador Name[ia]=Aperi nove scheda Name[id]=Buka tab baru +Name[is]=Opna nýjan flipa Name[it]=Apri una nuova scheda Name[ka]=ახალი ჩანართის გახსნა Name[ko]=새 탭 열기 @@ -184,6 +188,7 @@ Name[fr]=Ouvrir une nouvelle fenêtre Name[gl]=Abrir unha xanela nova Name[ia]=Aperi nove fenestra Name[id]=Buka window baru +Name[is]=Opna nýjan glugga Name[it]=Apre una nuova finestra Name[ka]=ახალ ფანჯრის გახსნა Name[ko]=새 창 열기 @@ -226,6 +231,7 @@ Name[fr]=Démarrer la navigation privée Name[gl]=Iniciar a navegación privada Name[ia]=Initia navigation private Name[id]=Mulai penelusuran privasi +Name[is]=Byrja einkavafur Name[it]=Avvia navigazione anonima Name[ka]=ანონიმური ბრაუზერის გაშვება Name[ko]=비밀 브라우징 시작 diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 5fa8969be..7974e2f58 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=AdBlock Name[gl]=Bloqueador de publicidade Name[ia]=Adblock (bloco de reclamos) Name[id]=AdBlock +Name[is]=AdBlock Name[it]=Adblock Name[ka]=AdBlock Name[ko]=AdBlock @@ -54,6 +55,7 @@ Comment[fr]=Blocage des contenus Web indésirables Comment[gl]=Bloquea contenido web non desexado Comment[ia]=Bloca contento de web non volite Comment[id]=Memblokir konten web yang tak diinginkan +Comment[is]=Lokar á óumbeðið vefefni Comment[it]=Blocca i contenuti web non desiderati Comment[ka]=დაბლოკავს არასასურველი შემცველობას Comment[ko]=원하지 않는 웹 콘텐츠 차단 diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme index 8fbe053c5..9570545e2 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -18,6 +18,7 @@ Name[fr]=Breeze Name[gl]=Breeze Name[ia]=Brisa Name[id]=Breeze +Name[is]=Breeze Name[it]=Brezza Name[ka]=ნაივი Name[ko]=Breeze @@ -56,6 +57,7 @@ Comment[fr]=L'équipe de Breeze Comment[gl]=Equipo de Breeze Comment[ia]=Equipa de Breeze (Brisa) Comment[id]=Tim Breeze +Comment[is]=Breeze-teymið Comment[it]=La squadra di Brezza Comment[ka]=Breeze -ის გუნდი Comment[ko]=Breeze 팀 diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index b27e18201..fbd1c143e 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=AutoScroll Name[gl]=Desprazamento automático Name[ia]=Auto rolar Name[id]=AutoScroll +Name[is]=Sjálfvirkt skrun Name[it]=Scorrimento automatico Name[ka]=ავტოჩოჩია Name[ko]=자동 스크롤 diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index 2eea299e3..75720faa5 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=Hello Python Name[gl]=Ola, Python! Name[ia]=Salute Python Name[id]=Hello Python +Name[is]=Halló Python Name[it]=Hello Python Name[ka]=გამარჯობა, პითონო Name[ko]=안녕 파이썬 diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 4fa1781f8..b901a5bb4 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=Bonjour Qml Name[gl]=Ola Qml Name[ia]=Salute Qml Name[id]=Hello Qml +Name[is]=Halló Qml Name[it]=Hello Qml Name[ka]=Hello QML Name[ko]=안녕 QML diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 6af710d09..60c2d0f82 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=MiddleClickLoader Name[gl]=MiddleClickLoader Name[ia]=MiddleClickLoader Name[id]=MiddleClickLoader +Name[is]=MiddleClickLoader Name[it]=Caricatore al clic centrale Name[ka]=შუაღილაკისჩამტვირთავი Name[ko]=가운데 단추 클릭 로더 diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index 706e44e05..d621cb819 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -17,6 +17,7 @@ Name[fr]=Dictionnaire Name[gl]=Dicionario Name[ia]=Dictionario Name[id]=Kamus +Name[is]=Orðasafn Name[it]=Dizionario Name[ka]=ლექსიკონი Name[ko]=사전 diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 963dd15dc..69f465fed 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -17,6 +17,7 @@ Name[fr]=Google Name[gl]=Google Name[ia]=Google Name[id]=Google +Name[is]=Google Name[it]=Google Name[ka]=Google Name[ko]=Google @@ -53,6 +54,7 @@ Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[ia]=Cerca con... Comment[id]=Cari dengan... +Comment[is]=Leita með... Comment[it]=Cerca con... Comment[ka]=ძებნა... Comment[ko]=다음으로 검색... diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index 0b7bff799..e65dce09b 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -17,6 +17,7 @@ Name[fr]=Ouvrir avec mpv Name[gl]=Abrir con mpv Name[ia]=Aperi con mpv Name[id]=Buka dengan mpv +Name[is]=Opna með mpv Name[it]=Apri con mpv Name[ka]="mpv"-ით გახსნა Name[ko]=mpv로 열기 diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 26db885cb..18ed7ea09 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -17,6 +17,7 @@ Name[fr]=TinEye Name[gl]=TinEye Name[ia]=TinEye Name[id]=TinEye +Name[is]=TinEye Name[it]=TinEye Name[ka]=TinEye Name[ko]=TinEye @@ -53,6 +54,7 @@ Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[ia]=Cerca con... Comment[id]=Cari dengan... +Comment[is]=Leita með... Comment[it]=Cerca con... Comment[ka]=ძებნა... Comment[ko]=다음으로 검색... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 6c75b7be5..1c557d5a5 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -17,6 +17,7 @@ Name[fr]=Traduire la page Web Name[gl]=Traducir a páxina Name[ia]=Traduce pagina Name[id]=Terjemahkan halaman +Name[is]=Þýða síðu Name[it]=Traduci la pagina Name[ka]=გვერდის თარგმნა Name[ko]=웹 페이지 번역하기 diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 8660ba7ae..9027c226e 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -17,6 +17,7 @@ Name[fr]=Valider la page Name[gl]=Validar a páxina Name[ia]=Valida Pagina Name[id]=Absahkan halaman +Name[is]=Staðfesta síðu Name[it]=Convalida la pagina Name[ka]=გვერდის დამოწმება Name[ko]=페이지 검사 diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index bc09ecf36..257e227e0 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -17,6 +17,7 @@ Name[fr]=Yandex Name[gl]=Yandex Name[ia]=Yandex Name[id]=Yandex +Name[is]=Yandex Name[it]=Yandex Name[ka]=Yandex Name[ko]=Yandex @@ -53,6 +54,7 @@ Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[ia]=Cerca con... Comment[id]=Cari dengan... +Comment[is]=Leita með... Comment[it]=Cerca con... Comment[ka]=ძებნა... Comment[ko]=다음으로 검색... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index 1cda2d4dd..11ceff1f4 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=Lancer une action Name[gl]=Executar a acción Name[ia]=Executa action Name[id]=Run Action +Name[is]=Keyra aðgerð Name[it]=Esegui azione Name[ka]=ქმედების გაშვება Name[ko]=동작 실행 diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index 439e78500..de848fc16 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=Chrome Name[gl]=Chrome Name[ia]=Chrome Name[id]=Chrome +Name[is]=Chrome Name[it]=Chrome Name[ka]=ქრომი Name[ko]=Chrome diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index 4c25c59f9..b28c4c9a3 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=Linux Name[gl]=Linux Name[ia]=Linux Name[id]=Linux +Name[is]=Linux Name[it]=Linux Name[ka]=Linux Name[ko]=리눅스 diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 6b6f16e30..0cd6202da 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=Mac Name[gl]=Mac Name[ia]=Mac Name[id]=Mac +Name[is]=Mac Name[it]=Mac Name[ka]=Mac Name[ko]=Mac diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index 8eeeeb2aa..57d2673a7 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=Windows Name[gl]=Xanelas Name[ia]=Fenestras Name[id]=Windows +Name[is]=Windows Name[it]=Windows Name[ka]=ფანჯრები Name[ko]=Windows