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-25 05:47:43 +01:00
parent 32e16e8c98
commit 47b099e148
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,8 @@ Name[zh_CN]=暗色微风
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[de]=Breeze-Dunkel von der KDE VDG
Comment[es]=Brisa oscuro por KDE VDG
Comment[gl]=Breeze escuro de KDE VDG
Comment[id]=Breeze Dark oleh KDE VDG

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

@ -5,7 +5,7 @@ Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara
Name[cs]=Breeze Světlé
Name[da]=Breeze Light
Name[de]=Breeze Light
Name[de]=Breeze-Hell
Name[en_GB]=Breeze Light
Name[es]=Brisa claro
Name[et]=Breeze Light
@ -39,6 +39,8 @@ Name[zh_CN]=亮色微风
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[de]=Breeze-Hell von der KDE VDG
Comment[es]=Brisa claro por KDE VDG
Comment[gl]=Breeze claro de KDE VDG
Comment[id]=Breeze Light oleh KDE VDG

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

@ -42,6 +42,8 @@ Name[zh_CN]=微风
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[de]=Breeze von der KDE VDG
Comment[es]=Brisa por KDE VDG
Comment[gl]=Breeze de KDE VDG
Comment[id]=Breeze oleh KDE VDG