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 2017-10-27 04:46:40 +02:00
parent c52a6c5748
commit 6f75aa63d2
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/air/metadata.desktop
View File

@ -73,7 +73,7 @@ Comment[nn]=Eit friskt pust
Comment[pa]=ਤਾਜ਼ਾ ਹਵਾ ਵਿੱਚ ਸਾਹ ਲਵੋ Comment[pa]=ਤਾਜ਼ਾ ਹਵਾ ਵਿੱਚ ਸਾਹ ਲਵੋ
Comment[pl]=Powiew świeżego powietrza Comment[pl]=Powiew świeżego powietrza
Comment[pt]=Uma brisa de ar fresco Comment[pt]=Uma brisa de ar fresco
Comment[pt_BR]=Uma brisa de ar fresco Comment[pt_BR]=Um pouco de ar fresco
Comment[ru]=Волшебные пузырьки Comment[ru]=Волшебные пузырьки
Comment[sk]=Závan čerstvého vzduchu Comment[sk]=Závan čerstvého vzduchu
Comment[sl]=Svež vetrič Comment[sl]=Svež vetrič