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 2018-11-12 07:53:19 +01:00
parent 9dba909a7b
commit 71dbd57eab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ Comment[es]=Añade iconos adicionales y control de zum a la barra de estado
Comment[fi]=Lisää tilariville kuvakkeita ja lähennyssovelman
Comment[fr]=Ajout d'icônes supplémentaires et d'un composant graphique de zoom à la barre d'état
Comment[gl]=Engade iconas adicionais e un trebello de ampliación á barra de estado
Comment[id]=Menambah tambahan ikon dan perbesaran widget untuk bilah status
Comment[id]=Menambah tambahan ikon dan zum widget untuk bilah status
Comment[it]=Aggiunge alla barra di stato alcune icone aggiuntive ed uno strumento di ingrandimento
Comment[nl]=Voegt extra pictogrammen en zoomwidget toe aan de statusbalk
Comment[nn]=Leggjer til fleire ikon og sideforstørring via statuslinja