Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26: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 2022-04-19 01:44:15 +00:00
parent be9f4a933f
commit 2becc00be8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/data/breeze-fallback/index.theme
View File

@ -39,7 +39,7 @@ Comment=Breeze Team
Comment[ar]=فريق نسيم
Comment[az]=Breeze Komandası
Comment[ca]=L'equip del «Breeze»
Comment[ca@valencia]=L'equip del «Breeze»
Comment[ca@valencia]=L'equip de «Breeze»
Comment[cs]=Team Breeze
Comment[da]=Breeze-tema
Comment[de]=Breeze-Team

2
themes/windows/metadata.desktop
View File

@ -36,7 +36,7 @@ Name[zh_TW]=Windows
Comment=Windows like theme based on Material design
Comment[az]=Material dizaynında Windows oxşarı mövzu
Comment[ca]=Tema semblant al Windows, basat en el «Material design»
Comment[ca@valencia]=Tema semblant a Windows, basat en el «Material design»
Comment[ca@valencia]=Tema semblant a Windows, basat en «Material design»
Comment[cs]=Motiv podobný Windows založený na designu Material
Comment[da]=Windows-lignende tema baseret på Material design
Comment[de]=Windows ähnliches Design auf der Basis des Designs Material