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-09-20 05:41:08 +02:00
parent fb883e2740
commit 329ea4b4ff
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

@ -42,7 +42,7 @@ Comment[sv]=Rapportera ett fel i Plasma
Comment[tg]=Гузориш дар бораи хатои Plasma
Comment[tr]=Plasma'da hata raporla
Comment[uk]=Повідомити про ваду у Плазмі
Comment[vi]=Báo cáo một lỗi trong Plasma
Comment[vi]=Báo một lỗi trong Plasma
Comment[x-test]=xxReport a bug in Plasmaxx
Comment[zh_CN]=报告 Plasma 的错误
Comment[zh_TW]=在 Plasma 中回報問題