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 2020-11-01 06:27:47 +01:00
parent e6fb3c7a87
commit 7134b09e00
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/applets/bugreport/metadata.desktop
View File

@ -84,7 +84,7 @@ Keywords[sv]=plasma;bugzilla;fel;utveckling;support;
Keywords[tg]=plasma;bugzilla;хато;барномарезӣ;дастгирӣ;
Keywords[tr]=plazma;bugzilla;hata;geliştirme;destek;plasma;
Keywords[uk]=plasma;bugzilla;bug;development;support;плазма;багзілла;вада;баг;розробка;підтримка;супровід;помилка;
Keywords[vi]=plasma;bugzilla;lỗi;phát triển;hỗ trợ;
Keywords[vi]=plasma;bugzilla;bug;development;support;lỗi;phát triển;hỗ trợ;
Keywords[x-test]=xxplasmaxx;xxbugzillaxx;xxbugxx;xxdevelopmentxx;xxsupportxx;
Keywords[zh_CN]=plasma;bugzilla;bug;development;support;错误;开发;支持;
Keywords[zh_TW]=plasma;bugzilla;bug;development;support;