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 2015-11-29 08:59:07 +00:00
parent c7c2980f14
commit 29f9449fda
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/desktoptheme/breeze-dark/metadata.desktop
View File

@ -20,7 +20,7 @@ Name[lt]=Breeze tamsi
Name[nb]=Mørk bris
Name[nds]=Breeze düüster
Name[nl]=Breeze Dark
Name[nn]=Bris (mørk)
Name[nn]=Breeze mørk
Name[pl]=Ciemna bryza
Name[pt]=Brisa Escura
Name[pt_BR]=Breeze Dark

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

@ -20,7 +20,7 @@ Name[lt]=Breeze
Name[nb]=Bris
Name[nds]=Breeze
Name[nl]=Breeze
Name[nn]=Bris
Name[nn]=Breeze
Name[pl]=Bryza
Name[pt]=Brisa
Name[pt_BR]=Breeze