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-11-13 05:39:52 +01:00
parent 052a81f755
commit e0b70205f7
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.cmake
View File

@ -54,6 +54,7 @@ Comment[eu]=Breeze iluna, KDE VDGk egina
Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fi]=Breeze Dark KDE VDG:ltä
Comment[fr]=Breeze sombre, par KDE VDG Comment[fr]=Breeze sombre, par KDE VDG
Comment[gl]=Breeze escuro de KDE VDG Comment[gl]=Breeze escuro de KDE VDG
Comment[hu]=Breeze Dark a KDE VDG-től
Comment[id]=Breeze Gelap oleh KDE VDG Comment[id]=Breeze Gelap oleh KDE VDG
Comment[it]=Brezza scuro del KDE VDG Comment[it]=Brezza scuro del KDE VDG
Comment[ko]=KDE VDG에서 만든 어두운 Breeze Comment[ko]=KDE VDG에서 만든 어두운 Breeze

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

@ -52,6 +52,7 @@ Comment[eu]=Breeze argia, KDE VDGk egina
Comment[fi]=Breeze Light KDE VDG:ltä Comment[fi]=Breeze Light KDE VDG:ltä
Comment[fr]=Breeze clair, par KDE VDG Comment[fr]=Breeze clair, par KDE VDG
Comment[gl]=Breeze claro de KDE VDG Comment[gl]=Breeze claro de KDE VDG
Comment[hu]=Breeze Light a KDE VDG-től
Comment[id]=Breeze Terang oleh KDE VDG Comment[id]=Breeze Terang oleh KDE VDG
Comment[it]=Brezza chiaro del KDE VDG Comment[it]=Brezza chiaro del KDE VDG
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light

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

@ -54,6 +54,7 @@ Comment[eu]=Breeze, KDE VDGk egina
Comment[fi]=Breeze KDE VDG:ltä Comment[fi]=Breeze KDE VDG:ltä
Comment[fr]=Breeze, par KDE VDG Comment[fr]=Breeze, par KDE VDG
Comment[gl]=Breeze de KDE VDG Comment[gl]=Breeze de KDE VDG
Comment[hu]=Breeze a KDE VDG-től
Comment[id]=Breeze oleh KDE VDG Comment[id]=Breeze oleh KDE VDG
Comment[it]=Brezza del KDE VDG Comment[it]=Brezza del KDE VDG
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze