alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki 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-01-06 05:54:59 +01:00
parent d1517cee22
commit 8232ed1b78
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/desktoptheme/breeze-dark/metadata.desktop.cmake
View File

@ -43,7 +43,7 @@ Name[x-test]=xxBreeze Darkxx
Name[zh_CN]=暗色微风
Name[zh_TW]=Breeze Dark
Comment=Breeze Dark by the KDE VDG
Comment[ca]=Brisa fosca, creat per la comunitat VDG del KDE
Comment[ca]=Brisa fosca, creat pel VDG del KDE
Comment[ca@valencia]=Brisa fosca pel VDG del KDE
Comment[cs]=Breeze Dark od KDE VDG
Comment[da]=Breeze Dark af KDE VDG

2
src/desktoptheme/breeze-light/metadata.desktop.cmake
View File

@ -41,7 +41,7 @@ Name[x-test]=xxBreeze Lightxx
Name[zh_CN]=亮色微风
Name[zh_TW]=Breeze Light
Comment=Breeze Light by the KDE VDG
Comment[ca]=Brisa clara, creat per la comunitat VDG del KDE
Comment[ca]=Brisa clara, creat pel VDG del KDE
Comment[ca@valencia]=Brisa clara pel VDG del KDE
Comment[cs]=Breeze Light od KDE VDG
Comment[da]=Breeze Light af KDE VDG

2
src/desktoptheme/breeze/metadata.desktop.cmake
View File

@ -43,7 +43,7 @@ Name[x-test]=xxBreezexx
Name[zh_CN]=微风
Name[zh_TW]=Breeze
Comment=Breeze by the KDE VDG
Comment[ca]=Brisa, creat per la comunitat VDG del KDE
Comment[ca]=Brisa, creat pel VDG del KDE
Comment[ca@valencia]=Brisa pel VDG del KDE
Comment[cs]=Breeze od KDE VDG
Comment[da]=Breeze af KDE VDG