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"
2024-12-20 18:56:34 +01:00 · 2020-07-21 09:04:33 +02:00 · 2020-07-21 09:04:33 +02:00 · 2da5b68fde
commit 2da5b68fde
parent 871a88811d
21 changed files with 26 additions and 0 deletions
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@ -71,6 +71,7 @@ GenericName[es]=Navegador web
 GenericName[fi]=Verkkoselain
 GenericName[fr]=Navigateur Web
 GenericName[gl]=Navegador web
 GenericName[ia]=Navigator Web
 GenericName[id]=Penelusur Web
 GenericName[it]=Browser web
 GenericName[ko]=웹 브라우저
@ -105,6 +106,7 @@ Name[es]=Abrir nueva pestaña
 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]=새 탭 열기
--- a/src/lib/adblock/metadata.desktop
+++ b/src/lib/adblock/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=AdBlock
 Name[fi]=Mainosesto
 Name[fr]=AdBlock
 Name[gl]=Bloqueador de publicidade
 Name[ia]=Adblock (bloco de reclamos)
 Name[id]=AdBlock
 Name[it]=Adblock
 Name[ko]=AdBlock
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@ -12,6 +12,7 @@ Name[es]=Brisa
 Name[fi]=Breeze
 Name[fr]=Breeze
 Name[gl]=Breeze
 Name[ia]=Brisa
 Name[id]=Breeze
 Name[it]=Brezza
 Name[ko]=Breeze
@ -39,6 +40,7 @@ Comment[es]=Equipo de Brisa
 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 팀
--- a/src/plugins/GreaseMonkey/metadata.desktop
+++ b/src/plugins/GreaseMonkey/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=GreaseMonkey
 Name[fi]=GreaseMonkey
 Name[fr]=GreaseMonkey
 Name[gl]=GreaseMonkey
 Name[ia]=GreaseMonkey
 Name[id]=GreaseMonkey
 Name[it]=GreaseMonkey
 Name[ko]=그리스몽키
--- a/src/plugins/MouseGestures/metadata.desktop
+++ b/src/plugins/MouseGestures/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Gestos de ratón
 Name[fi]=Hiirieleet
 Name[fr]=Mouvements de souris
 Name[gl]=Xestos do rato
 Name[ia]=Gestures de mus
 Name[id]=Gestur Mouse
 Name[it]=Gesti del mouse
 Name[ko]=마우스 제스처
--- a/src/plugins/PIM/metadata.desktop
+++ b/src/plugins/PIM/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=PIM
 Name[fi]=Henkilökohtainen ajanhallinta
 Name[fr]=PIM
 Name[gl]=PIM
 Name[ia]=PIM
 Name[id]=PIM
 Name[it]=PIM
 Name[ko]=PIM
--- a/src/plugins/StatusBarIcons/metadata.desktop
+++ b/src/plugins/StatusBarIcons/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Iconos de la barra de tareas
 Name[fi]=Tilarivin kuvakkeet
 Name[fr]=Icônes de la barre d'état
 Name[gl]=Iconas da barra de estado
 Name[ia]=Icones de barra de stato
 Name[id]=StatusBar Icons
 Name[it]=Icone della barra di stato
 Name[ko]=상태 표시줄 아이콘
--- a/src/plugins/TabManager/metadata.desktop
+++ b/src/plugins/TabManager/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Gestor de pestañas
 Name[fi]=Välilehtien hallinta
 Name[fr]=Gestionnaire d'onglets
 Name[gl]=Xestor de separadores
 Name[ia]=Gerente de scheda
 Name[id]=Tab Manager
 Name[it]=Gestore delle schede
 Name[ko]=탭 관리자
--- a/src/plugins/TestPlugin/metadata.desktop
+++ b/src/plugins/TestPlugin/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Complemento de ejemplo
 Name[fi]=Esimerkkiliitännäinen
 Name[fr]=Exemple de module externe
 Name[gl]=Complemento de exemplo
 Name[ia]=Plugin de exemplo
 Name[id]=Example Plugin
 Name[it]=Estensione di esempio
 Name[ko]=예제 플러그인
--- a/src/plugins/VerticalTabs/metadata.desktop
+++ b/src/plugins/VerticalTabs/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Pestañas verticales
 Name[fi]=Pystyvälilehdet
 Name[fr]=Onglets verticaux
 Name[gl]=Separadores verticais
 Name[ia]=Schedas vertical
 Name[id]=Vertical Tabs
 Name[it]=Schede verticali
 Name[ko]=수직 탭
--- a/src/scripts/runaction/actions/dictionary.desktop
+++ b/src/scripts/runaction/actions/dictionary.desktop
@ -10,6 +10,7 @@ Name[es]=Diccionario
 Name[fi]=Sanasto
 Name[fr]=Dictionnaire
 Name[gl]=Dicionario
 Name[ia]=Dictionario
 Name[id]=Kamus
 Name[it]=Dizionario
 Name[ko]=사전
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@ -10,6 +10,7 @@ Name[es]=Google
 Name[fi]=Google
 Name[fr]=Google
 Name[gl]=Google
 Name[ia]=Google
 Name[id]=Google
 Name[it]=Google
 Name[ko]=Google
@ -35,6 +36,7 @@ Comment[es]=Buscar con...
 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]=다음으로 검색...
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@ -35,6 +35,7 @@ Comment[es]=Buscar con...
 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]=다음으로 검색...
--- a/src/scripts/runaction/actions/translate.desktop
+++ b/src/scripts/runaction/actions/translate.desktop
@ -10,6 +10,7 @@ Name[es]=Traducir página
 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]=웹 페이지 번역하기
--- a/src/scripts/runaction/actions/w3.desktop
+++ b/src/scripts/runaction/actions/w3.desktop
@ -10,6 +10,7 @@ Name[es]=Validar página
 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]=페이지 검사
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@ -10,6 +10,7 @@ Name[es]=Yandex
 Name[fi]=Yandex
 Name[fr]=Yandex
 Name[gl]=Yandex
 Name[ia]=Yandex
 Name[id]=Yandex
 Name[it]=Yandex
 Name[ko]=Yandex
@ -35,6 +36,7 @@ Comment[es]=Buscar con...
 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]=다음으로 검색...
--- a/src/scripts/runaction/metadata.desktop
+++ b/src/scripts/runaction/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Ejecutar acción
 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]=동작 실행
@ -35,6 +36,7 @@ Comment[es]=Ejecutar varias acciones en sitios
 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]=사이트에 다양한 동작 실행
--- a/themes/chrome/metadata.desktop
+++ b/themes/chrome/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Chrome
 Name[fi]=Chrome
 Name[fr]=Chrome
 Name[gl]=Chrome
 Name[ia]=Chrome
 Name[id]=Chrome
 Name[it]=Chrome
 Name[ko]=Chrome
--- a/themes/linux/metadata.desktop
+++ b/themes/linux/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Linux
 Name[fi]=Linux
 Name[fr]=Linux
 Name[gl]=Linux
 Name[ia]=Linux
 Name[id]=Linux
 Name[it]=Linux
 Name[ko]=리눅스
--- a/themes/mac/metadata.desktop
+++ b/themes/mac/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Mac
 Name[fi]=Mac
 Name[fr]=Mac
 Name[gl]=Mac
 Name[ia]=Mac
 Name[id]=Mac
 Name[it]=Mac
 Name[ko]=Mac
--- a/themes/windows/metadata.desktop
+++ b/themes/windows/metadata.desktop
@ -10,6 +10,7 @@ Name[es]=Windows
 Name[fi]=Windows
 Name[fr]=Windows
 Name[gl]=Xanelas
 Name[ia]=Fenestras
 Name[id]=Windows
 Name[it]=Windows
 Name[ko]=Windows