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 2020-08-07 05:48:05 +02:00
parent cc6fc7a4fa
commit 501678d0d8
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/lib/data/breeze-fallback/index.theme
View File

@ -32,8 +32,8 @@ Name[zh_CN]=微风
Name[zh_TW]=Breeze Name[zh_TW]=Breeze
Comment=Breeze Team Comment=Breeze Team
Comment[ar]=فريق نسيم Comment[ar]=فريق نسيم
Comment[ca]=L'equip «Breeze» Comment[ca]=L'equip del «Breeze»
Comment[ca@valencia]=L'equip «Breeze» Comment[ca@valencia]=L'equip del «Breeze»
Comment[cs]=Team Breeze Comment[cs]=Team Breeze
Comment[da]=Breeze-tema Comment[da]=Breeze-tema
Comment[de]=Breeze-Team Comment[de]=Breeze-Team