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 2016-08-21 09:22:10 +00:00
parent 6521c72f75
commit 888dca5501
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/data/servicetypes/plasma-lookandfeel.desktop
View File

@ -22,7 +22,7 @@ Name[it]=Aspetto di Plasma
Name[ko]=Plasma 모습과 느낌
Name[nb]=Plasma utseende og oppførsel
Name[nds]=Utsehn un Bedenen vun Plasma
Name[nl]=Plasma Look-and-Feel
Name[nl]=Plasma uiterlijk en gedrag
Name[nn]=Utsjånad for Plasma
Name[pa]=ਪਲਾਜ਼ਮਾ ਦਿੱਖ ਤੇ ਪਰਭਾਵ
Name[pl]=Odczucia i wygląd Plazmy