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/Applications/15.12
l10n daemon script 11 years ago
parent ab8944dcce
commit 7be388fa0f
17 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      generators/chm/okularApplication_chm.desktop
  2. 2
      generators/comicbook/okularApplication_comicbook.desktop
  3. 2
      generators/djvu/okularApplication_djvu.desktop
  4. 2
      generators/dvi/okularApplication_dvi.desktop
  5. 2
      generators/epub/okularApplication_epub.desktop
  6. 2
      generators/fax/okularApplication_fax.desktop
  7. 2
      generators/fictionbook/okularApplication_fb.desktop
  8. 2
      generators/kimgio/okularApplication_kimgio.desktop
  9. 2
      generators/mobipocket/okularApplication_mobi.desktop
  10. 2
      generators/ooo/okularApplication_ooo.desktop
  11. 2
      generators/plucker/okularApplication_plucker.desktop
  12. 2
      generators/poppler/okularApplication_pdf.desktop
  13. 2
      generators/spectre/okularApplication_ghostview.desktop
  14. 2
      generators/tiff/okularApplication_tiff.desktop
  15. 2
      generators/txt/okularApplication_txt.desktop
  16. 2
      generators/xps/okularApplication_xps.desktop
  17. 2
      shell/okular.desktop

2
generators/chm/okularApplication_chm.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/comicbook/okularApplication_comicbook.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/djvu/okularApplication_djvu.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/dvi/okularApplication_dvi.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/epub/okularApplication_epub.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/fax/okularApplication_fax.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/fictionbook/okularApplication_fb.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/kimgio/okularApplication_kimgio.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/mobipocket/okularApplication_mobi.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
TryExec=okular
Exec=okular %U %i -caption %c
Icon=okular

2
generators/ooo/okularApplication_ooo.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/plucker/okularApplication_plucker.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/poppler/okularApplication_pdf.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/spectre/okularApplication_ghostview.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/tiff/okularApplication_tiff.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/txt/okularApplication_txt.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
generators/xps/okularApplication_xps.desktop
Unescape View File

@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

2
shell/okular.desktop
Unescape View File

@ -61,7 +61,6 @@ Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
Comment=Universal document viewer
GenericName[ar]=عارض المستندات
GenericName[ast]=Visor de documentos
GenericName[bg]=Преглед на документи
@ -124,6 +123,7 @@ GenericName[uk]=Переглядач документів
GenericName[x-test]=xxDocument Viewerxx
GenericName[zh_CN]=文档查看器
GenericName[zh_TW]=文件檢視器
Comment=Universal document viewer
Exec=okular %U %i -caption %c
Icon=okular
Type=Application

Write Preview
Loading…
Cancel
Save