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-20 05:52:17 +01:00
parent e01e78e9d3
commit 397f191c41
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

@ -46,6 +46,7 @@ Comment[es]=Brisa oscuro por KDE VDG
Comment[gl]=Breeze escuro de KDE VDG Comment[gl]=Breeze escuro de KDE VDG
Comment[nl]=Breeze Dark door de KDE VDG Comment[nl]=Breeze Dark door de KDE VDG
Comment[pt]=Brisa Escuro da VDG do KDE Comment[pt]=Brisa Escuro da VDG do KDE
Comment[pt_BR]=Breeze Dark pelo KDE VDG
Comment[sv]=Breeze mörk av KDE:s visuella designgrupp Comment[sv]=Breeze mörk av KDE:s visuella designgrupp
Comment[uk]=Темна Breeze, автори — KDE VDG Comment[uk]=Темна Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze Dark by the KDE VDGxx Comment[x-test]=xxBreeze Dark by the KDE VDGxx

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

@ -43,6 +43,7 @@ Comment[es]=Brisa claro por KDE VDG
Comment[gl]=Breeze claro de KDE VDG Comment[gl]=Breeze claro de KDE VDG
Comment[nl]=Breeze Light door de KDE VDG Comment[nl]=Breeze Light door de KDE VDG
Comment[pt]=Brisa Claro da VDG do KDE Comment[pt]=Brisa Claro da VDG do KDE
Comment[pt_BR]=Breeze Light pelo KDE VDG
Comment[sv]=Breeze ljus av KDE:s visuella designgrupp Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
Comment[uk]=Світла Breeze, автори — KDE VDG Comment[uk]=Світла Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze Light by the KDE VDGxx Comment[x-test]=xxBreeze Light by the KDE VDGxx

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

@ -46,6 +46,7 @@ Comment[es]=Brisa por KDE VDG
Comment[gl]=Breeze de KDE VDG Comment[gl]=Breeze de KDE VDG
Comment[nl]=Breeze door de KDE VDG Comment[nl]=Breeze door de KDE VDG
Comment[pt]=Brisa da VDG do KDE Comment[pt]=Brisa da VDG do KDE
Comment[pt_BR]=Breeze pelo KDE VDG
Comment[sv]=Breeze av KDE:s visuella designgrupp Comment[sv]=Breeze av KDE:s visuella designgrupp
Comment[uk]=Breeze, автори — KDE VDG Comment[uk]=Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze by the KDE VDGxx Comment[x-test]=xxBreeze by the KDE VDGxx