SVN_SILENT made messages (.desktop file) - always resolve ours

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/numberformattest
l10n daemon script 4 years ago
parent df66d0cf13
commit 326d314677
  1. 2
      generators/chm/okularApplication_chm.desktop
  2. 2
      generators/chm/okularChm.desktop
  3. 2
      generators/comicbook/okularApplication_comicbook.desktop
  4. 2
      generators/comicbook/okularComicbook.desktop
  5. 2
      generators/djvu/okularApplication_djvu.desktop
  6. 2
      generators/djvu/okularDjvu.desktop
  7. 2
      generators/dvi/okularApplication_dvi.desktop
  8. 2
      generators/dvi/okularDvi.desktop
  9. 2
      generators/epub/okularApplication_epub.desktop
  10. 2
      generators/epub/okularEPub.desktop
  11. 2
      generators/fax/okularApplication_fax.desktop
  12. 2
      generators/fax/okularFax.desktop
  13. 2
      generators/fictionbook/okularApplication_fb.desktop
  14. 2
      generators/fictionbook/okularFb.desktop
  15. 2
      generators/kimgio/okularApplication_kimgio.desktop
  16. 2
      generators/kimgio/okularKimgio.desktop
  17. 2
      generators/markdown/okularApplication_md.desktop
  18. 2
      generators/markdown/okularMd.desktop
  19. 2
      generators/mobipocket/okularApplication_mobi.desktop
  20. 2
      generators/mobipocket/okularMobi.desktop
  21. 2
      generators/plucker/okularApplication_plucker.desktop
  22. 2
      generators/plucker/okularPlucker.desktop
  23. 2
      generators/poppler/okularApplication_pdf.desktop
  24. 2
      generators/poppler/okularPoppler.desktop
  25. 2
      generators/spectre/okularApplication_ghostview.desktop
  26. 2
      generators/spectre/okularGhostview.desktop
  27. 2
      generators/tiff/okularApplication_tiff.desktop
  28. 2
      generators/tiff/okularTiff.desktop
  29. 2
      generators/txt/okularApplication_txt.desktop
  30. 2
      generators/txt/okularTxt.desktop
  31. 2
      generators/xps/okularApplication_xps.desktop
  32. 2
      generators/xps/okularXps.desktop
  33. 2
      mobile/app/package/metadata.desktop
  34. 2
      okular_part.desktop
  35. 2
      shell/org.kde.okular.desktop

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -61,7 +61,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=okularpart

@ -59,7 +59,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document viewer
GenericName[ar]=عارض المستندات

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
X-KDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
X-KDE-Library=okularpart

@ -60,7 +60,7 @@ Name[ug]=Okular
Name[uk]=Okular
Name[vi]=Okular
Name[x-test]=xxOkularxx
Name[zh_CN]=Okular
Name[zh_CN]=Okular 文档查看器
Name[zh_TW]=文件檢視_Okular
GenericName=Document Viewer
GenericName[ar]=عارض المستندات

Loading…
Cancel
Save