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-07-06 05:15:02 +02:00
parent 214838313d
commit 875dbab70c
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

@ -60,6 +60,7 @@ Comment[pl]=Ciemna bryza autorstwa KDE VDG
Comment[pt]=Brisa Escuro da VDG do KDE
Comment[pt_BR]=Breeze Dark pelo KDE VDG
Comment[ru]=Тёмный вариант Breeze от KDE VDG
Comment[sk]=Vánok Tmavý od KDE VDG
Comment[sv]=Breeze mörk av KDE:s visuella designgrupp
Comment[uk]=Темна Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze Dark by the KDE VDGxx

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

@ -57,6 +57,7 @@ Comment[pl]=Lekka Bryza autorstwa KDE VDG
Comment[pt]=Brisa Claro da VDG do KDE
Comment[pt_BR]=Breeze Light pelo KDE VDG
Comment[ru]=Светлый вариант Breeze от KDE VDG
Comment[sk]=Vánok Svetlý od KDE VDG
Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
Comment[uk]=Світла Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze Light by the KDE VDGxx

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

@ -60,6 +60,7 @@ Comment[pl]=Bryza autorstwa KDE VDG
Comment[pt]=Brisa da VDG do KDE
Comment[pt_BR]=Breeze pelo KDE VDG
Comment[ru]=Breeze от KDE VDG
Comment[sk]=Vánok od KDE VDG
Comment[sv]=Breeze av KDE:s visuella designgrupp
Comment[uk]=Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze by the KDE VDGxx