Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-21 03:06: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 2024-05-04 03:21:19 +00:00
parent 0f78488e96
commit 1977a52501
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scripts/helloqml/metadata.desktop
View File

@ -15,7 +15,7 @@ Name[es]=Hola Qml
Name[et]=Tere QML Name[et]=Tere QML
Name[eu]=Kaixo QML Name[eu]=Kaixo QML
Name[fi]=Hei QML Name[fi]=Hei QML
Name[fr]=Bonjour Qml Name[fr]=Bonjour QML
Name[gl]=Ola Qml Name[gl]=Ola Qml
Name[hu]=Helló QML Name[hu]=Helló QML
Name[ia]=Salute Qml Name[ia]=Salute Qml
@ -55,7 +55,7 @@ Comment[es]=Complemento de ejemplo de Qml
Comment[et]=QML-i plugina näidis Comment[et]=QML-i plugina näidis
Comment[eu]=QML plugin lagina Comment[eu]=QML plugin lagina
Comment[fi]=Esimerkki-QML-liitännäinen Comment[fi]=Esimerkki-QML-liitännäinen
Comment[fr]=Exemple de module externe Qml Comment[fr]=Exemple de module externe QML
Comment[gl]=Complemento de exemplo de Qml. Comment[gl]=Complemento de exemplo de Qml.
Comment[hu]=Példa QML bővítmény Comment[hu]=Példa QML bővítmény
Comment[ia]=Plugin de Qml de exemplo Comment[ia]=Plugin de Qml de exemplo