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-03-01 05:56:28 +01:00
parent 9fc663d9f0
commit 21e671bee1
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

@ -45,6 +45,7 @@ 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[fi]=Breeze Dark KDE VDG:ltä
Comment[gl]=Breeze escuro de KDE VDG
Comment[id]=Breeze Dark oleh KDE VDG
Comment[it]=Brezza scuro del KDE VDG

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

@ -42,6 +42,7 @@ 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[fi]=Breeze Light KDE VDG:ltä
Comment[gl]=Breeze claro de KDE VDG
Comment[id]=Breeze Light oleh KDE VDG
Comment[it]=Brezza chiaro del KDE VDG

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

@ -45,6 +45,7 @@ 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[fi]=Breeze KDE VDG:ltä
Comment[gl]=Breeze de KDE VDG
Comment[id]=Breeze oleh KDE VDG
Comment[it]=Brezza del KDE VDG