office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-02 14:14:10 +00:00
Code Issues Packages 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-25 09:54:54 +02:00
parent 3f89246317
commit 601e96037c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generators/chm/kio-msits/ms-its.protocol
View file

@ -62,7 +62,7 @@ Description[sv]=En I/O-slav för att visa WinHelp-filer
Description[th]=ส่วนเสริม kioslave สำหรับแสดงแฟ้ม WinHelp
Description[tr]=WinHelp dosyalarını göstermek için bir kioslave
Description[uk]=Підлеглий засіб введення-виведення для перегляду файлів WinHelp
Description[vi]=Dịch vụ trợ giúp đọc tập tin CHM của Windows
Description[vi]=Dịch vụ trợ giúp đọc tệp CHM của Windows
Description[x-test]=xxA kioslave for displaying WinHelp filesxx
Description[zh_CN]=用以显示 WinHelp 文件的 kioslave
Description[zh_TW]=顯示 WinHelp 檔的 kioslave