From 6fe0f762941302904cc872ac7ffa86b7967ffc69 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 4 Sep 2020 06:00:13 +0200 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 | 4 ++++ src/lib/adblock/metadata.desktop | 1 + src/lib/data/breeze-fallback/index.theme | 1 + src/plugins/AutoScroll/metadata.desktop | 1 + src/scripts/hellopython/metadata.desktop | 2 ++ src/scripts/helloqml/metadata.desktop | 2 ++ src/scripts/runaction/actions/googleimagesearch.desktop | 1 + 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 | 2 ++ themes/chrome/metadata.desktop | 1 + themes/mac/metadata.desktop | 1 + 15 files changed, 23 insertions(+) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index d68db8e88..8a0d23e38 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -48,6 +48,7 @@ Comment[eu]=Web arakatzaile azkar eta seguru bat Comment[fi]=Nopea ja turvallinen verkkoselain 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[it]=Un browser web veloce e sicuro Comment[ko]=빠르고 안전한 웹 브라우저 @@ -116,6 +117,7 @@ Name[eu]=Ireki fitxa berria Name[fi]=Avaa uusi välilehti Name[fr]=Ouvrir un nouvel onglet Name[gl]=Abrir un novo separador +Name[ia]=Aperi nove scheda Name[id]=Buka tab baru Name[it]=Apri una nuova scheda Name[ko]=새 탭 열기 @@ -150,6 +152,7 @@ Name[eu]=Ireki leiho berria Name[fi]=Avaa uusi ikkuna Name[fr]=Ouvrir une nouvelle fenêtre Name[gl]=Abrir unha xanela nova +Name[ia]=Aperi nove fenestra Name[id]=Buka window baru Name[it]=Apre una nuova finestra Name[ko]=새 창 열기 @@ -184,6 +187,7 @@ Name[eu]=Abiatu arakatze pribatua Name[fi]=Aloita yksityisselaus 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[it]=Avvia navigazione anonima Name[ko]=비밀 브라우징 시작 diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 8c0d222da..84463df69 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -42,6 +42,7 @@ Comment[eu]=Oztopatu nahi ez den web edukia Comment[fi]=Estää epätoivotun verkkosisällön 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[it]=Blocca i contenuti web non desiderati Comment[ko]=원하지 않는 웹 콘텐츠 차단 diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme index 1279f5997..bc1b5bfe0 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -44,6 +44,7 @@ Comment[eu]=Breeze taldea Comment[fi]=Breeze-työryhmä Comment[fr]=L'équipe de Breeze Comment[gl]=Equipo de Breeze +Comment[ia]=Equipa de Breeze (Brisa) Comment[id]=Tim Breeze Comment[it]=La squadra di Brezza Comment[ko]=Breeze 팀 diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index cd297e38b..6ded18331 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -12,6 +12,7 @@ Name[eu]=Kiribiltze automatikoa Name[fi]=Automaattivieritys Name[fr]=AutoScroll Name[gl]=Desprazamento automático +Name[ia]=Auto rolar Name[id]=AutoScroll Name[it]=Scorrimento automatico Name[ko]=자동 스크롤 diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index 84270fd74..96f0f127e 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -12,6 +12,7 @@ Name[eu]=Kaixo Python Name[fi]=Hei Python Name[fr]=Hello Python Name[gl]=Ola, Python! +Name[ia]=Salute Python Name[id]=Hello Python Name[it]=Hello Python Name[ko]=안녕 파이썬 @@ -41,6 +42,7 @@ Comment[eu]=Python-en hedapen adibidea Comment[fi]=Esimerkinomainen Python-laajennus Comment[fr]=Exemple d'extension Python Comment[gl]=Extensión de Python de exemplo +Comment[ia]=Extension de Python de exemplo Comment[id]=Contoh ekstensi Python Comment[it]=Estensione di esempio in Python Comment[ko]=예제 파이썬 확장 기능 diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index eadf9ef76..a937c8bbd 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -12,6 +12,7 @@ Name[eu]=Kaixo QML Name[fi]=Hei QML Name[fr]=Bonjour Qml Name[gl]=Ola Qml +Name[ia]=Salute Qml Name[id]=Hello Qml Name[it]=Hello Qml Name[ko]=안녕 QML @@ -41,6 +42,7 @@ Comment[eu]=QML plugin lagina Comment[fi]=Esimerkki-QML-liitännäinen Comment[fr]=Exemple de module externe Qml Comment[gl]=Complemento de exemplo de Qml +Comment[ia]=Plugin de Qml de exemplo Comment[id]=Contoh Plugin Qml Comment[it]=Estensione di esempio in Qml Comment[ko]=예제 QML 플러그인 diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index b3f4d402a..023030a8e 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -42,6 +42,7 @@ Comment[eu]=Bilatu honekin... Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… +Comment[ia]=Cerca con... Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[ko]=다음으로 검색... diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index 2e60902f5..ee4a73289 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -12,6 +12,7 @@ Name[eu]=Ireki «mpv» erabiliz Name[fi]=Avaa mpv:hen Name[fr]=Ouvrir avec mpv Name[gl]=Abrir con mpv +Name[ia]=Aperi con mpv Name[id]=Buka dengan mpv Name[it]=Apri con mpv Name[ko]=mpv로 열기 diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 1f9fa6f3a..be5238c4b 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -12,6 +12,7 @@ Name[eu]=TinEye Name[fi]=TinEye Name[fr]=TinEye Name[gl]=TinEye +Name[ia]=TinEye Name[id]=TinEye Name[it]=TinEye Name[ko]=TinEye @@ -41,6 +42,7 @@ Comment[eu]=Bilatu honekin... Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… +Comment[ia]=Cerca con... Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[ko]=다음으로 검색... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index be192216c..58393b7bb 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -12,6 +12,7 @@ Name[eu]=Itzuli orria Name[fi]=Käännä sivu Name[fr]=Traduire la page Web Name[gl]=Traducir a páxina +Name[ia]=Traduce pagina Name[id]=Terjemahkan halaman Name[it]=Traduci la pagina Name[ko]=웹 페이지 번역하기 diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 2614fd14f..c8026adf0 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -12,6 +12,7 @@ Name[eu]=Balidatu orria Name[fi]=Tarkista sivu Name[fr]=Valider la page Name[gl]=Validar a páxina +Name[ia]=Valida Pagina Name[id]=Absahkan halaman Name[it]=Convalida la pagina Name[ko]=페이지 검사 diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 4e7346850..9220861fb 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -12,6 +12,7 @@ Name[eu]=Yandex Name[fi]=Yandex Name[fr]=Yandex Name[gl]=Yandex +Name[ia]=Yandex Name[id]=Yandex Name[it]=Yandex Name[ko]=Yandex @@ -41,6 +42,7 @@ Comment[eu]=Bilatu honekin... Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… +Comment[ia]=Cerca con... Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[ko]=다음으로 검색... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index d97237d04..1bd5d7fae 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -12,6 +12,7 @@ Name[eu]=Exekutatu ekintza Name[fi]=Suorita toiminto Name[fr]=Lancer une action Name[gl]=Executar a acción +Name[ia]=Executa action Name[id]=Run Action Name[it]=Esegui azione Name[ko]=동작 실행 @@ -41,6 +42,7 @@ Comment[eu]=Exekutatu ekintza anizkoitzak web-lekuetan Comment[fi]=Suorita eri toimintoja sivustoilla Comment[fr]=Lancement d'actions diverses sur des sites Web Comment[gl]=Executar varias accións en sitios +Comment[ia]=Executa varie actiones sur sitos Comment[id]=Jalankan beberapa aksi pada situs Comment[it]=Esegue numerose azioni nei siti Comment[ko]=사이트에 다양한 동작 실행 diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index 949d9bed7..86c6f3daa 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -12,6 +12,7 @@ Name[eu]=Chrome Name[fi]=Chrome Name[fr]=Chrome Name[gl]=Chrome +Name[ia]=Chrome Name[id]=Chrome Name[it]=Chrome Name[ko]=Chrome diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index c26ed65a5..2b2b5a0d8 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -12,6 +12,7 @@ Name[eu]=Mac Name[fi]=Mac Name[fr]=Mac Name[gl]=Mac +Name[ia]=Mac Name[id]=Mac Name[it]=Mac Name[ko]=Mac