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-10 05:35:43 +01:00
parent 17703508b7
commit e77bf0f5d6
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

@ -50,6 +50,7 @@ Comment[gl]=Breeze escuro de KDE VDG
Comment[id]=Breeze Dark oleh KDE VDG
Comment[it]=Brezza scuro del KDE VDG
Comment[nl]=Breeze Dark door de KDE VDG
Comment[nn]=Breeze mørk frå KDE VDG
Comment[pl]=Ciemna bryza autorstwa KDE VDG
Comment[pt]=Brisa Escuro da VDG do KDE
Comment[pt_BR]=Breeze Dark pelo KDE VDG

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

@ -47,6 +47,7 @@ Comment[gl]=Breeze claro de KDE VDG
Comment[id]=Breeze Light oleh KDE VDG
Comment[it]=Brezza chiaro del KDE VDG
Comment[nl]=Breeze Light door de KDE VDG
Comment[nn]=Breeze lys frå KDE VDG
Comment[pl]=Lekka Bryza autorstwa KDE VDG
Comment[pt]=Brisa Claro da VDG do KDE
Comment[pt_BR]=Breeze Light pelo KDE VDG

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

@ -50,6 +50,7 @@ Comment[gl]=Breeze de KDE VDG
Comment[id]=Breeze oleh KDE VDG
Comment[it]=Brezza del KDE VDG
Comment[nl]=Breeze door de KDE VDG
Comment[nn]=Breeze frå KDE VDG
Comment[pl]=Bryza autorstwa KDE VDG
Comment[pt]=Brisa da VDG do KDE
Comment[pt_BR]=Breeze pelo KDE VDG