Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +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 2019-06-19 05:21:30 +02:00
parent dfb3d2357d
commit d6c4cfeb74
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/scripts/helloqml/metadata.desktop
View File

@ -3,7 +3,7 @@ Name=Hello Qml
Name[ca]=Hola Qml
Name[ca@valencia]=Hola Qml
Name[cs]=Ahoj QML
Name[de]=Hallo QML“
Name[de]=Hallo QML
Name[en_GB]=Hello QML
Name[es]=Hola Qml
Name[fi]=Hei QML