Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
This commit is contained in:
l10n daemon script 2020-01-13 09:36:25 +01:00
parent 3953f3e0bf
commit 50c2cebdd6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/applications/org.kde.falkon.desktop
View File

@ -103,7 +103,7 @@ Name[en_GB]=Open new tab
Name[es]=Abrir nueva pestaña Name[es]=Abrir nueva pestaña
Name[fi]=Avaa uusi välilehti Name[fi]=Avaa uusi välilehti
Name[fr]=Ouvrir un nouvel onglet Name[fr]=Ouvrir un nouvel onglet
Name[gl]=Abrir unha lapela nova Name[gl]=Abrir un novo separador
Name[id]=Buka tab baru Name[id]=Buka tab baru
Name[it]=Apri una nuova scheda Name[it]=Apri una nuova scheda
Name[ko]=새 탭 열기 Name[ko]=새 탭 열기

4
src/plugins/TabManager/metadata.desktop
View File

@ -9,7 +9,7 @@ Name[en_GB]=Tab Manager
Name[es]=Gestor de pestañas Name[es]=Gestor de pestañas
Name[fi]=Välilehtien hallinta Name[fi]=Välilehtien hallinta
Name[fr]=Gestionnaire d'onglets Name[fr]=Gestionnaire d'onglets
Name[gl]=Xestor de lapelas Name[gl]=Xestor de separadores
Name[id]=Tab Manager Name[id]=Tab Manager
Name[it]=Gestore delle schede Name[it]=Gestore delle schede
Name[ko]=탭 관리자 Name[ko]=탭 관리자
@ -34,7 +34,7 @@ Comment[en_GB]=Adds ability to managing tabs and windows
Comment[es]=Añade la posibilidad de gestionar pestañas y ventanas Comment[es]=Añade la posibilidad de gestionar pestañas y ventanas
Comment[fi]=Lisää kyvyn hallita välilehtiä ja ikkunoita Comment[fi]=Lisää kyvyn hallita välilehtiä ja ikkunoita
Comment[fr]=Ajout d'une capacité de gestion des onglets et des fenêtres Comment[fr]=Ajout d'une capacité de gestion des onglets et des fenêtres
Comment[gl]=Engade a posibilidade de xestionar lapelas e xanelas Comment[gl]=Permite xestionar separadores e xanelas
Comment[id]=Menambah kemampuan untuk mengelola tab dan window Comment[id]=Menambah kemampuan untuk mengelola tab dan window
Comment[it]=Aggiunge la capacità di gestione delle schede e delle finestre Comment[it]=Aggiunge la capacità di gestione delle schede e delle finestre
Comment[ko]=탭과 창 관리 기능 Comment[ko]=탭과 창 관리 기능

4
src/plugins/VerticalTabs/metadata.desktop
View File

@ -9,7 +9,7 @@ Name[en_GB]=Vertical Tabs
Name[es]=Pestañas verticales Name[es]=Pestañas verticales
Name[fi]=Pystyvälilehdet Name[fi]=Pystyvälilehdet
Name[fr]=Onglets verticaux Name[fr]=Onglets verticaux
Name[gl]=Lapelas verticais Name[gl]=Separadores verticais
Name[id]=Vertical Tabs Name[id]=Vertical Tabs
Name[it]=Schede verticali Name[it]=Schede verticali
Name[ko]=수직 탭 Name[ko]=수직 탭
@ -34,7 +34,7 @@ Comment[en_GB]=Adds ability to show tabs in sidebar
Comment[es]=Añade la posibilidad de mostrar pestañas en la barra lateral Comment[es]=Añade la posibilidad de mostrar pestañas en la barra lateral
Comment[fi]=Lisää kyvyn näyttää välilehdet sivupalkissa Comment[fi]=Lisää kyvyn näyttää välilehdet sivupalkissa
Comment[fr]=Prise en charge de l'affichage des onglets dans le panneau latéral Comment[fr]=Prise en charge de l'affichage des onglets dans le panneau latéral
Comment[gl]=Engade a posibilidade de mostrar lapelas na barra lateral Comment[gl]=Permite mostrar separadores na barra lateral
Comment[id]=Menambah kemampuan untuk menampilkan tab dalam bilah sisi Comment[id]=Menambah kemampuan untuk menampilkan tab dalam bilah sisi
Comment[it]=Aggiunge la capacità di mostrare le schede nella barra laterale Comment[it]=Aggiunge la capacità di mostrare le schede nella barra laterale
Comment[ko]=사이드바에 탭 표시 Comment[ko]=사이드바에 탭 표시