Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 04:36:34 +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-05-29 05:34:41 +02:00
parent 0f1c46d0e7
commit fa7aa25a5d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/KDEFrameworksIntegration/metadata.desktop
View File

@ -3,6 +3,7 @@ Name=KDE Frameworks Integration
Name[ca]=Integració amb els Frameworks del KDE
Name[ca@valencia]=Integració amb els Frameworks del KDE
Name[cs]=Integrace KDE Frameworks
Name[da]=KDE Frameworks integration
Name[en_GB]=KDE Frameworks Integration
Name[es]=Integración con la infraestructura de KDE
Name[gl]=Integración coas infraestruturas de KDE