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/schwarzer/update_platform_name
l10n daemon script 5 years ago
parent 7876ccac65
commit 5447aa1021
  1. 2
      generators/chm/libokularGenerator_chmlib.json
  2. 2
      generators/comicbook/libokularGenerator_comicbook.json
  3. 2
      generators/djvu/libokularGenerator_djvu.json
  4. 2
      generators/dvi/libokularGenerator_dvi.json
  5. 2
      generators/epub/libokularGenerator_epub.json
  6. 2
      generators/fax/libokularGenerator_fax.json
  7. 2
      generators/fictionbook/libokularGenerator_fb.json
  8. 2
      generators/kimgio/libokularGenerator_kimgio.json
  9. 1
      generators/markdown/libokularGenerator_md.json
  10. 2
      generators/mobipocket/libokularGenerator_mobi.json
  11. 2
      generators/plucker/libokularGenerator_plucker.json
  12. 2
      generators/poppler/libokularGenerator_poppler.json
  13. 2
      generators/spectre/libokularGenerator_ghostview.json
  14. 2
      generators/tiff/libokularGenerator_tiff.json
  15. 2
      generators/txt/libokularGenerator_txt.json
  16. 2
      generators/xps/libokularGenerator_xps.json

@ -125,6 +125,7 @@
"Copyright[zh_CN]": "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid",
"Copyright[zh_TW]": "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid",
"Description": "A Microsoft Windows help file renderer",
"Description[ar]": "عارض مستندات مساعدة ويندوز",
"Description[az]": "Microsoft Windows köməkçi fayl tərtibatçısı",
"Description[ca@valencia]": "Un renderitzador per als fitxers d'ajuda de Microsoft Windows",
"Description[ca]": "Un renderitzador per als fitxers d'ajuda de Microsoft Windows",
@ -167,6 +168,7 @@
"application/x-chm"
],
"Name": "CHM Backend",
"Name[ar]": "خلفية CHM",
"Name[az]": "CHM modulu",
"Name[ca@valencia]": "Dorsal CHM",
"Name[ca]": "Dorsal CHM",

@ -84,6 +84,7 @@
"Copyright[zh_CN]": "© 2007-2008 Tobias Koenig",
"Copyright[zh_TW]": "© 2007-2008 Tobias Koenig",
"Description": "A renderer for various comic book formats",
"Description[ar]": "عارض العديد من تنسيقات كتب الهزل",
"Description[az]": "Dəyişkən komiks formatları tərtibatçısı",
"Description[ca@valencia]": "Un renderitzador per a diversos formats de ComicBook",
"Description[ca]": "Un renderitzador per a diversos formats de ComicBook",
@ -130,6 +131,7 @@
"inode/directory"
],
"Name": "ComicBook Backend",
"Name[ar]": "خلفية ComicBook",
"Name[az]": "ComicBook modulu",
"Name[ca@valencia]": "Dorsal ComicBook",
"Name[ca]": "Dorsal ComicBook",

@ -84,6 +84,7 @@
"Copyright[zh_CN]": "© 2006-2008 Pino Toscano",
"Copyright[zh_TW]": "© 2006-2008 Pino Toscano",
"Description": "DjVu backend based on DjVuLibre",
"Description[ar]": "خلفية DjVu بالمعتمدة على DjVuLibre",
"Description[az]": "DjVuLibre'yə əsaslanan DjVu modulu",
"Description[ca@valencia]": "Dorsal DjVu basat en el DjVuLibre",
"Description[ca]": "Dorsal DjVu basat en el DjVuLibre",
@ -126,6 +127,7 @@
"image/vnd.djvu"
],
"Name": "DjVu Backend",
"Name[ar]": "خلفية DjVu",
"Name[az]": "DjVu modulu",
"Name[ca@valencia]": "Dorsal DjVu",
"Name[ca]": "Dorsal DjVu",

@ -83,6 +83,7 @@
"Copyright[zh_CN]": "© 2006 Luigi Toscano",
"Copyright[zh_TW]": "© 2006 Luigi Toscano",
"Description": "A DVI file renderer",
"Description[ar]": "عارض ملف DVI",
"Description[az]": "DVİ faylı tərtibatçısı",
"Description[ca@valencia]": "Un renderitzador per als fitxers DVI",
"Description[ca]": "Un renderitzador per als fitxers DVI",
@ -125,6 +126,7 @@
"application/x-dvi"
],
"Name": "DVI Backend",
"Name[ar]": "خلفية DVI",
"Name[az]": "DVİ modulu",
"Name[ca@valencia]": "Dorsal DVI",
"Name[ca]": "Dorsal DVI",

@ -82,6 +82,7 @@
"Copyright[zh_CN]": "© 2008 Ely Levy",
"Copyright[zh_TW]": "© 2008 Ely Levy",
"Description": "An EPub backend",
"Description[ar]": "خلفية EPub",
"Description[az]": "EPub modulu",
"Description[ca@valencia]": "Un dorsal per a l'EPub",
"Description[ca]": "Un dorsal per a l'EPub",
@ -125,6 +126,7 @@
"application/epub+zip"
],
"Name": "EPub Backend",
"Name[ar]": "خلفية EPub",
"Name[az]": "EPub modulu",
"Name[ca@valencia]": "Dorsal EPub",
"Name[ca]": "Dorsal EPub",

@ -84,6 +84,7 @@
"Copyright[zh_CN]": "© 2008 Tobias Koenig",
"Copyright[zh_TW]": "© 2008 Tobias Koenig",
"Description": "A G3/G4 fax document backend",
"Description[ar]": "خلفية مستندات فاكس G3/G4",
"Description[az]": "A G3/G4 fax sənədi modulu",
"Description[ca@valencia]": "Un dorsal per a documents de fax G3/G4",
"Description[ca]": "Un dorsal per a documents de fax G3/G4",
@ -127,6 +128,7 @@
"image/g3fax"
],
"Name": "Fax Backend",
"Name[ar]": "خلفية الفاكس",
"Name[az]": "Fax Backend",
"Name[ca@valencia]": "Dorsal de fax",
"Name[ca]": "Dorsal de fax",

@ -84,6 +84,7 @@
"Copyright[zh_CN]": "© 2007-2008 Tobias Koenig",
"Copyright[zh_TW]": "© 2007-2008 Tobias Koenig",
"Description": "A renderer for FictionBook eBooks",
"Description[ar]": "عارض الكتب الإلكترونية FictionBook",
"Description[az]": "FictionBook eBooks üçün tərtibatçı",
"Description[ca@valencia]": "Un renderitzador per a llibres electrònics FictionBook",
"Description[ca]": "Un renderitzador per a llibres electrònics FictionBook",
@ -126,6 +127,7 @@
"application/x-fictionbook+xml"
],
"Name": "Fiction Book Backend",
"Name[ar]": "خلفية الكتب الخيالية",
"Name[az]": "Fiction Book modulu",
"Name[ca@valencia]": "Dorsal Fiction Book",
"Name[ca]": "Dorsal Fiction Book",

@ -168,6 +168,7 @@
"Copyright[zh_CN]": "© 2005, 2009 Albert Astals Cid\n© 2006-2007 Pino Toscano\n© 2006-2007 Tobias Koenig",
"Copyright[zh_TW]": "© 2005, 2009 Albert Astals Cid\n© 2006-2007 Pino Toscano\n© 2006-2007 Tobias Koenig",
"Description": "A simple image backend",
"Description[ar]": "خلفية صور بسيطة",
"Description[az]": "Sadə şəkil modulu",
"Description[ca@valencia]": "Un dorsal d'imatges senzill",
"Description[ca]": "Un dorsal d'imatges senzill",
@ -236,6 +237,7 @@
"image/webp"
],
"Name": "Image Backend",
"Name[ar]": "خلفية الصور",
"Name[az]": "Image Backend",
"Name[ca@valencia]": "Dorsal d'imatges",
"Name[ca]": "Dorsal d'imatges",

@ -89,6 +89,7 @@
"text/x-markdown"
],
"Name": "Markdown Backend",
"Name[ar]": "خلفية مارك داون",
"Name[az]": "Markdown modulu",
"Name[ca@valencia]": "Dorsal Markdown",
"Name[ca]": "Dorsal Markdown",

@ -83,6 +83,7 @@
"Copyright[zh_CN]": "© 2008-2009 Jakub Stachowski",
"Copyright[zh_TW]": "© 2008-2009 Jakub Stachowski",
"Description": "A mobipocket backend",
"Description[ar]": "خلفية Mobipocket",
"Description[az]": "Mobipocket modulu",
"Description[ca@valencia]": "Un dorsal per al Mobipocket",
"Description[ca]": "Un dorsal per al Mobipocket",
@ -125,6 +126,7 @@
"application/x-mobipocket-ebook"
],
"Name": "Mobipocket Backend",
"Name[ar]": "خلفية Mobipocket",
"Name[az]": "Mobipocket modulu",
"Name[ca@valencia]": "Dorsal Mobipocket",
"Name[ca]": "Dorsal Mobipocket",

@ -84,6 +84,7 @@
"Copyright[zh_CN]": "© 2007-2008 Tobias Koenig",
"Copyright[zh_TW]": "© 2007-2008 Tobias Koenig",
"Description": "A renderer for Plucker eBooks",
"Description[ar]": "عارض كتب الإلكترونية Plucker",
"Description[az]": "Plucker eBooks üçün təsvirləmə",
"Description[ca@valencia]": "Un renderitzador per a llibres electrònics Plucker",
"Description[ca]": "Un renderitzador per a llibres electrònics Plucker",
@ -126,6 +127,7 @@
"application/prs.plucker"
],
"Name": "Plucker Document Backend",
"Name[ar]": "خلفية مستندات Plucker",
"Name[az]": "Plucker sənədi modulu",
"Name[ca@valencia]": "Dorsal per a documents Plucker",
"Name[ca]": "Dorsal per a documents Plucker",

@ -84,6 +84,7 @@
"Copyright[zh_CN]": "© 2005-2008 Albert Astals Cid",
"Copyright[zh_TW]": "© 2005-2008 Albert Astals Cid",
"Description": "A PDF file renderer",
"Description[ar]": "عارض ملفات بي دي اف",
"Description[az]": "PDF faylı tərtibatçısı",
"Description[ca@valencia]": "Un renderitzador per als fitxers PDF",
"Description[ca]": "Un renderitzador per als fitxers PDF",
@ -129,6 +130,7 @@
"application/x-wwf"
],
"Name": "PDF Backend",
"Name[ar]": "خلفية بي دي اف",
"Name[az]": "PDF modulu",
"Name[ca@valencia]": "Dorsal PDF",
"Name[ca]": "Dorsal PDF",

@ -84,6 +84,7 @@
"Copyright[zh_CN]": "© 2007-2008 Albert Astals Cid",
"Copyright[zh_TW]": "© 2007-2008 Albert Astals Cid",
"Description": "A PostScript file renderer based on the Spectre library",
"Description[ar]": "عراض ملفات بوست سكربت بالإعماد على مكتبة Spectre",
"Description[az]": "Spectre library'ə əsasında PostScript fayl tərtibatçısı",
"Description[ca@valencia]": "Un renderitzador per a fitxers PostScript basat en la biblioteca Spectre",
"Description[ca]": "Un renderitzador per a fitxers PostScript basat en la biblioteca Spectre",
@ -127,6 +128,7 @@
"image/x-eps"
],
"Name": "PS Backend",
"Name[ar]": "خلفية PS",
"Name[az]": "PS modulu",
"Name[ca@valencia]": "Dorsal PS",
"Name[ca]": "Dorsal PS",

@ -84,6 +84,7 @@
"Copyright[zh_CN]": "© 2006-2008 Pino Toscano",
"Copyright[zh_TW]": "© 2006-2008 Pino Toscano",
"Description": "A TIFF backend",
"Description[ar]": "خلفية TIFF",
"Description[az]": "TİFF modulu",
"Description[ca@valencia]": "Un dorsal per al TIFF",
"Description[ca]": "Un dorsal per al TIFF",
@ -127,6 +128,7 @@
"image/tiff"
],
"Name": "TIFF Backend",
"Name[ar]": "خلفية TIFF",
"Name[az]": "TİFF modulu",
"Name[ca@valencia]": "Dorsal TIFF",
"Name[ca]": "Dorsal TIFF",

@ -83,6 +83,7 @@
"Copyright[zh_CN]": "© 2013 Azat Khuzhin",
"Copyright[zh_TW]": "© 2013 Azat Khuzhin",
"Description": "Txt backend",
"Description[ar]": "خلفية النص",
"Description[az]": "Txt modulu",
"Description[ca@valencia]": "Dorsal txt",
"Description[ca]": "Dorsal txt",
@ -126,6 +127,7 @@
"text/plain"
],
"Name": "Txt Backend",
"Name[ar]": "خلفية النص",
"Name[az]": "Txt modulu",
"Name[ca@valencia]": "Dorsal txt",
"Name[ca]": "Dorsal txt",

@ -167,6 +167,7 @@
"Copyright[zh_CN]": "© 2006-2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano",
"Copyright[zh_TW]": "© 2006-2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano",
"Description": "An XPS backend",
"Description[ar]": "خلفية XPS",
"Description[az]": "XPS modulu",
"Description[ca@valencia]": "Un dorsal per a l'XPS",
"Description[ca]": "Un dorsal per a l'XPS",
@ -211,6 +212,7 @@
"application/vnd.ms-xpsdocument"
],
"Name": "XPS Backend",
"Name[ar]": "خلفية XPS",
"Name[az]": "XPS modulu",
"Name[ca@valencia]": "Dorsal XPS",
"Name[ca]": "Dorsal XPS",

Loading…
Cancel
Save