Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10: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 2018-05-19 08:02:14 +02:00
parent 277003fa1d
commit 1d03b5d44b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
themes/windows/metadata.desktop
View File

@ -17,7 +17,7 @@ Name[pt]=Windows
Name[sv]=Windows Name[sv]=Windows
Name[uk]=Windows Name[uk]=Windows
Name[x-test]=xxWindowsxx Name[x-test]=xxWindowsxx
Name[zh_CN]=窗口 Name[zh_CN]=Windows
Comment=Windows like theme based on Material design Comment=Windows like theme based on Material design
Comment[ca]=Tema semblant al Windows basat en el «Material design» Comment[ca]=Tema semblant al Windows basat en el «Material design»
Comment[ca@valencia]=Tema semblant al Windows basat en el «Material design» Comment[ca@valencia]=Tema semblant al Windows basat en el «Material design»