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-23 05:34:04 +01:00
parent 9e56be5194
commit d9a926a620
2 changed files with 2 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

@ -2,7 +2,7 @@
Name=Hello Qml Name=Hello Qml
Name[ca]=Hola Qml Name[ca]=Hola Qml
Name[ca@valencia]=Hola Qml Name[ca@valencia]=Hola Qml
Name[de]=Hallo Qml Name[de]=Hallo QML“
Name[en_GB]=Hello QML Name[en_GB]=Hello QML
Name[es]=Hola Qml Name[es]=Hola Qml
Name[fr]=Bonjour Qml Name[fr]=Bonjour Qml

1
src/scripts/middleclickloader/metadata.desktop
View File

@ -3,6 +3,7 @@ Name=MiddleClickLoader
Name[ca]=MiddleClickLoader Name[ca]=MiddleClickLoader
Name[ca@valencia]=MiddleClickLoader Name[ca@valencia]=MiddleClickLoader
Name[cs]=Načtení prostředním tlačítkem myši Name[cs]=Načtení prostředním tlačítkem myši
Name[de]=Mittelklick-Lader
Name[en_GB]=MiddleClickLoader Name[en_GB]=MiddleClickLoader
Name[es]=Cargador de clic central Name[es]=Cargador de clic central
Name[fi]=Keskipainikelatain Name[fi]=Keskipainikelatain