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-17 05:32:17 +01:00
parent bb643e99c3
commit 937f2ccc15
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/desktoptheme/breeze-dark/metadata.desktop
View File

@ -41,6 +41,14 @@ Name[x-test]=xxBreeze Darkxx
Name[zh_CN]=暗色微风 Name[zh_CN]=暗色微风
Name[zh_TW]=Breeze Dark Name[zh_TW]=Breeze Dark
Comment=Breeze Dark by the KDE VDG Comment=Breeze Dark by the KDE VDG
Comment[ca]=Brisa fosca pel VDG del KDE
Comment[gl]=Breeze escuro de KDE VDG
Comment[nl]=Breeze Dark door de KDE VDG
Comment[pt]=Brisa Escuro da VDG do KDE
Comment[sv]=Breeze mörk av KDE:s visuella designgrupp
Comment[uk]=Темна Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze Dark by the KDE VDGxx
Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze Dark
X-KDE-PluginInfo-Author=KDE Visual Design Group X-KDE-PluginInfo-Author=KDE Visual Design Group

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

@ -38,6 +38,14 @@ Name[x-test]=xxBreeze Lightxx
Name[zh_CN]=亮色微风 Name[zh_CN]=亮色微风
Name[zh_TW]=Breeze Light Name[zh_TW]=Breeze Light
Comment=Breeze Light by the KDE VDG Comment=Breeze Light by the KDE VDG
Comment[ca]=Brisa clara pel VDG del KDE
Comment[gl]=Breeze claro de KDE VDG
Comment[nl]=Breeze Light door de KDE VDG
Comment[pt]=Brisa Claro da VDG do KDE
Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
Comment[uk]=Світла Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze Light by the KDE VDGxx
Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze Light
X-KDE-PluginInfo-Author=KDE Visual Design Group X-KDE-PluginInfo-Author=KDE Visual Design Group

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

@ -41,6 +41,14 @@ Name[x-test]=xxBreezexx
Name[zh_CN]=微风 Name[zh_CN]=微风
Name[zh_TW]=Breeze Name[zh_TW]=Breeze
Comment=Breeze by the KDE VDG Comment=Breeze by the KDE VDG
Comment[ca]=Brisa pel VDG del KDE
Comment[gl]=Breeze de KDE VDG
Comment[nl]=Breeze door de KDE VDG
Comment[pt]=Brisa da VDG do KDE
Comment[sv]=Breeze av KDE:s visuella designgrupp
Comment[uk]=Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze by the KDE VDGxx
Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze
X-KDE-PluginInfo-Author=KDE Visual Design Group X-KDE-PluginInfo-Author=KDE Visual Design Group