Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 12: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 2021-08-19 01:13:28 +00:00
parent 217270bcdf
commit 1e1a3f8be2
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

@ -56,7 +56,7 @@ Comment[nl]=Voorbeeld Qml-plug-in
Comment[nn]=Eksempel på QML-tillegg Comment[nn]=Eksempel på QML-tillegg
Comment[pl]=Przykładowa wtyczka QML Comment[pl]=Przykładowa wtyczka QML
Comment[pt]='Plugin' de Exemplo em QML Comment[pt]='Plugin' de Exemplo em QML
Comment[pt_BR]=Plug-in QML de exemplo Comment[pt_BR]=Plugin QML de exemplo
Comment[ru]=Пример подключаемого модуля QML Comment[ru]=Пример подключаемого модуля QML
Comment[sk]=Ukážkový QML plugin Comment[sk]=Ukážkový QML plugin
Comment[sl]=Primer vtičnika za Qml Comment[sl]=Primer vtičnika za Qml