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 2023-01-14 03:14:20 +00:00
parent b8f93bc5e9
commit 8263038b46
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/AutoScroll/metadata.desktop
View File

@ -14,7 +14,7 @@ Name[es]=Desplazamiento automático
Name[et]=Automaatne kerimine Name[et]=Automaatne kerimine
Name[eu]=Kiribiltze automatikoa Name[eu]=Kiribiltze automatikoa
Name[fi]=Automaattivieritys Name[fi]=Automaattivieritys
Name[fr]=AutoScroll Name[fr]=Défilement automatique
Name[gl]=Desprazamento automático Name[gl]=Desprazamento automático
Name[ia]=Auto rolar Name[ia]=Auto rolar
Name[id]=AutoScroll Name[id]=AutoScroll

2
themes/chrome/metadata.desktop
View File

@ -51,7 +51,7 @@ Comment[es]=Tema estilo Chrome para Falkon basado en el tema Firefox Chromifox
Comment[et]=Falkoni Chrome'i meenutav teema, mille aluseks on Firefoxi Chromifoxi teema Comment[et]=Falkoni Chrome'i meenutav teema, mille aluseks on Firefoxi Chromifoxi teema
Comment[eu]=Chrome-n antzeko gaia Falkonentzat, Firefox-en «Chromifox» gaian oinarritua Comment[eu]=Chrome-n antzeko gaia Falkonentzat, Firefox-en «Chromifox» gaian oinarritua
Comment[fi]=Firefoxin Chromifox-teemaan pohjautuva Chromen kaltainen Falkon-teema Comment[fi]=Firefoxin Chromifox-teemaan pohjautuva Chromen kaltainen Falkon-teema
Comment[fr]=Thème Chrome pour Falkon inspiré du thème Chromifox de Firefox Comment[fr]=Thème « Chrome » pour Falkon inspiré du thème « Chromifox » de Firefox
Comment[gl]=Tema parecido a Chrome para Falkon baseado no tema Chromifox de Firefox Comment[gl]=Tema parecido a Chrome para Falkon baseado no tema Chromifox de Firefox
Comment[ia]=Thema simile a Chrome per Falkon basate sur thema Chromifox Comment[ia]=Thema simile a Chrome per Falkon basate sur thema Chromifox
Comment[id]=Tema seperti Chrome untuk Falkon berdasarkan pada tema Firefox Chromifox Comment[id]=Tema seperti Chrome untuk Falkon berdasarkan pada tema Firefox Chromifox

2
themes/windows/metadata.desktop
View File

@ -51,7 +51,7 @@ Comment[es]=Tema estilo Windows basado en el diseño Material
Comment[et]=Windowsi meenutav teema, mille aluseks on Materiali disain Comment[et]=Windowsi meenutav teema, mille aluseks on Materiali disain
Comment[eu]=Windows-en antzeko gaia «Material design»en oinarritua Comment[eu]=Windows-en antzeko gaia «Material design»en oinarritua
Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema
Comment[fr]=Thème Windows inspiré par Material Comment[fr]=Thème « Windows » inspiré par Material
Comment[gl]=Tema parecido a Windows baseado no deseño material Comment[gl]=Tema parecido a Windows baseado no deseño material
Comment[ia]=Thema simile a Windows basate su dessigno Material Comment[ia]=Thema simile a Windows basate su dessigno Material
Comment[id]=Tema seperti Windows berdasarkan pada desain Material Comment[id]=Tema seperti Windows berdasarkan pada desain Material