wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests 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"
remotes/origin/work/aacid/shorcutslost_2008
l10n daemon script 6 years ago
parent 1f187211bc
commit 21647201c2
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      generators/chm/kio-msits/ms-its.protocol

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

@ -62,7 +62,7 @@ Description[sv]=En I/O-slav för att visa WinHelp-filer
Description[th]=ส่วนเสริม kioslave สำหรับแสดงแฟ้ม WinHelp Description[th]=ส่วนเสริม kioslave สำหรับแสดงแฟ้ม WinHelp
Description[tr]=WinHelp dosyalarını göstermek için bir kioslave Description[tr]=WinHelp dosyalarını göstermek için bir kioslave
Description[uk]=Підлеглий засіб введення-виведення для перегляду файлів WinHelp 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[x-test]=xxA kioslave for displaying WinHelp filesxx
Description[zh_CN]=用以显示 WinHelp 文件的 kioslave Description[zh_CN]=用以显示 WinHelp 文件的 kioslave
Description[zh_TW]=顯示 WinHelp 檔的 kioslave Description[zh_TW]=顯示 WinHelp 檔的 kioslave

Write Preview
Loading…
Cancel
Save