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 2019-08-05 04:45:06 +02:00
parent 2ac6999881
commit bbad328bc2
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ Name[zh_TW]=Breeze Dark
Comment=Breeze Dark by the KDE VDG
Comment[ca]=Brisa fosca 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
Comment[de]=Breeze-Dunkel von der KDE VDG
Comment[en_GB]=Breeze Dark by the KDE VDG

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

@ -40,6 +40,7 @@ Name[zh_TW]=Breeze Light
Comment=Breeze Light by the KDE VDG
Comment[ca]=Brisa clara 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
Comment[de]=Breeze-Hell von der KDE VDG
Comment[en_GB]=Breeze Light by the KDE VDG

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

@ -43,6 +43,7 @@ Name[zh_TW]=Breeze
Comment=Breeze by the KDE VDG
Comment[ca]=Brisa pel VDG del KDE
Comment[ca@valencia]=Brisa pel VDG del KDE
Comment[cs]=Breeze od KDE VDG
Comment[da]=Breeze af KDE VDG
Comment[de]=Breeze von der KDE VDG
Comment[en_GB]=Breeze by the KDE VDG