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-08-16 05:09:03 +02:00
parent dbe0c8ac73
commit e454afa352
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ Name[it]=Brezza chiaro
Name[ko]=Breeze Light Name[ko]=Breeze Light
Name[nl]=Breeze Light Name[nl]=Breeze Light
Name[nn]=Breeze lys Name[nn]=Breeze lys
Name[pl]=Lekka Bryza Name[pl]=Jasna Bryza
Name[pt]=Brisa Clara Name[pt]=Brisa Clara
Name[pt_BR]=Breeze Light Name[pt_BR]=Breeze Light
Name[ru]=Breeze, светлый вариант Name[ru]=Breeze, светлый вариант
@ -54,7 +54,7 @@ Comment[it]=Brezza chiaro del KDE VDG
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light
Comment[nl]=Breeze Light door de KDE VDG Comment[nl]=Breeze Light door de KDE VDG
Comment[nn]=Breeze lys frå KDE VDG Comment[nn]=Breeze lys frå KDE VDG
Comment[pl]=Lekka Bryza autorstwa KDE VDG Comment[pl]=Jasna Bryza autorstwa 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[pt_BR]=Breeze Light pelo KDE VDG
Comment[ru]=Светлый вариант Breeze от KDE VDG Comment[ru]=Светлый вариант Breeze от KDE VDG