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-10-30 09:15:51 +00:00
parent c246588999
commit 910e6a4ef7
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/desktoptheme/breeze/metadata.desktop
View File

@ -38,7 +38,7 @@ Name[tr]=Esintili
Name[uk]=Breeze Name[uk]=Breeze
Name[x-test]=xxBreezexx Name[x-test]=xxBreezexx
Name[zh_CN]=微风 Name[zh_CN]=微风
Name[zh_TW]=Breeze Dark Name[zh_TW]=Breeze
X-KDE-PluginInfo-Author=KDE Visual Design Group X-KDE-PluginInfo-Author=KDE Visual Design Group