1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00

SVN_SILENT made messages (.desktop file) - always resolve ours

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-02-10 01:15:57 +00:00
parent 73fe08a6ef
commit eb3ea40edb
2 changed files with 2 additions and 2 deletions

View File

@ -75,7 +75,7 @@ Comment[ru]=Тема в стиле Mac для Falkon, основанная на
Comment[sk]=Mac téma pre Falkon postavená na Firefox Mac OS X téme
Comment[sl]=Mac kot tema za Falkon temelji na temi Mac OS X za Firefox
Comment[sv]=Mac-liknande tema för Falkon baserat på Firefox Mac OS X-tema
Comment[tr]=Firefox macOS teması tabanlı, Falkon için Mac'e benzer tema
Comment[tr]=Firefox macOS teması tabanlı, Falkon için Mace benzer tema
Comment[uk]=Mac-подібна тема для Falkon, заснована на темі Mac OS X для Firefox
Comment[x-test]=xxMac like theme for Falkon based on Firefox Mac OS X themexx
Comment[zh_CN]=仿 macOS Falkon Firefox Mac OS X

View File

@ -75,7 +75,7 @@ Comment[ru]=Тема в стиле Windows, основанная на систе
Comment[sk]=Téma ako Windows postavená na Material Dizajne
Comment[sl]=Windowsu podobna tema, ki temelji na temi Material design
Comment[sv]=Windows-liknande tema baserat på Material design
Comment[tr]=Material design tabanlı, Windows'a benzer tema
Comment[tr]=Material design tabanlı, Windowsa benzer tema
Comment[uk]=Windows-подібна тема, заснована на дизайні Material
Comment[x-test]=xxWindows like theme based on Material designxx
Comment[zh_CN]=仿 Windows Falkon Material