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-02-19 06:32:54 +01:00
parent 6081898626
commit e01e78e9d3
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
View File

@ -42,6 +42,7 @@ Name[zh_CN]=暗色微风
Name[zh_TW]=Breeze Dark
Comment=Breeze Dark by the KDE VDG
Comment[ca]=Brisa fosca pel VDG del KDE
Comment[es]=Brisa oscuro por KDE VDG
Comment[gl]=Breeze escuro de KDE VDG
Comment[nl]=Breeze Dark door de KDE VDG
Comment[pt]=Brisa Escuro da VDG do KDE

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

@ -39,6 +39,7 @@ Name[zh_CN]=亮色微风
Name[zh_TW]=Breeze Light
Comment=Breeze Light by the KDE VDG
Comment[ca]=Brisa clara pel VDG del KDE
Comment[es]=Brisa claro por KDE VDG
Comment[gl]=Breeze claro de KDE VDG
Comment[nl]=Breeze Light door de KDE VDG
Comment[pt]=Brisa Claro da VDG do KDE

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

@ -42,6 +42,7 @@ Name[zh_CN]=微风
Name[zh_TW]=Breeze
Comment=Breeze by the KDE VDG
Comment[ca]=Brisa pel VDG del KDE
Comment[es]=Brisa por KDE VDG
Comment[gl]=Breeze de KDE VDG
Comment[nl]=Breeze door de KDE VDG
Comment[pt]=Brisa da VDG do KDE