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/release/21.08
l10n daemon script 5 years ago
parent 017a93c751
commit b022f98495
11 changed files with 11 additions and 11 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/libokularGenerator_chmlib.json
  2. 2
      generators/dvi/libokularGenerator_dvi.json
  3. 2
      generators/epub/libokularGenerator_epub.json
  4. 2
      generators/fax/libokularGenerator_fax.json
  5. 2
      generators/mobipocket/libokularGenerator_mobi.json
  6. 2
      generators/plucker/libokularGenerator_plucker.json
  7. 2
      generators/poppler/libokularGenerator_poppler.json
  8. 2
      generators/spectre/libokularGenerator_ghostview.json
  9. 2
      generators/tiff/libokularGenerator_tiff.json
  10. 2
      generators/txt/libokularGenerator_txt.json
  11. 2
      generators/xps/libokularGenerator_xps.json

2
generators/chm/libokularGenerator_chmlib.json
Unescape View File

@ -127,7 +127,7 @@
"Description": "A Microsoft Windows help file renderer",
"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",
"Description[ca]": "Un renderitzador de fitxers d'ajuda de Microsoft Windows",
"Description[cs]": "Nástroj pro zobrazování nápovědy Microsoft Windows",
"Description[da]": "En gengiver til Microsoft Windows-hjælpfiler",
"Description[de]": "Darstellungsprogramm für Hilfedateien aus Microsoft Windows",

2
generators/dvi/libokularGenerator_dvi.json
Unescape View File

@ -85,7 +85,7 @@
"Description": "A DVI file renderer",
"Description[az]": "DVİ faylı tərtibatçısı",
"Description[ca@valencia]": "Un renderitzador per als fitxers DVI",
"Description[ca]": "Un renderitzador per als fitxers DVI",
"Description[ca]": "Un renderitzador de fitxers DVI",
"Description[cs]": "Vykreslovač DVI souborů",
"Description[da]": "En gengiver til DVI-filer",
"Description[de]": "Ein Renderer für DVI-Dateien",

2
generators/epub/libokularGenerator_epub.json
Unescape View File

@ -83,7 +83,7 @@
"Copyright[zh_TW]": "© 2008 Ely Levy",
"Description": "An EPub backend",
"Description[az]": "EPub modulu",
"Description[ca@valencia]": "Un dorsal per a l'EPub",
"Description[ca@valencia]": "Un dorsal d'EPub",
"Description[ca]": "Un dorsal d'EPub",
"Description[cs]": "Podpůrná vrstva EPub",
"Description[da]": "En EPub-backend",

2
generators/fax/libokularGenerator_fax.json
Unescape View File

@ -85,7 +85,7 @@
"Copyright[zh_TW]": "© 2008 Tobias Koenig",
"Description": "A G3/G4 fax document backend",
"Description[az]": "A G3/G4 fax sənədi modulu",
"Description[ca@valencia]": "Un dorsal per a documents de fax G3/G4",
"Description[ca@valencia]": "Un dorsal de documents de fax G3/G4",
"Description[ca]": "Un dorsal de documents de fax G3/G4",
"Description[cs]": "Implementace dokumentu faxu A G3/G4",
"Description[da]": "En G3/G4 faxdokument-backend",

2
generators/mobipocket/libokularGenerator_mobi.json
Unescape View File

@ -85,7 +85,7 @@
"Copyright[zh_TW]": "© 2008-2009 Jakub Stachowski",
"Description": "A mobipocket backend",
"Description[az]": "Mobipocket modulu",
"Description[ca@valencia]": "Un dorsal per al Mobipocket",
"Description[ca@valencia]": "Un dorsal de Mobipocket",
"Description[ca]": "Un dorsal de Mobipocket",
"Description[cs]": " Implementace Mobipocket",
"Description[da]": "En mobipocket-backend",

2
generators/plucker/libokularGenerator_plucker.json
Unescape View File

@ -127,7 +127,7 @@
],
"Name": "Plucker Document Backend",
"Name[az]": "Plucker sənədi modulu",
"Name[ca@valencia]": "Dorsal per a documents Plucker",
"Name[ca@valencia]": "Dorsal de documents Plucker",
"Name[ca]": "Dorsal de documents Plucker",
"Name[cs]": "Podpůrná vrstva Plucker Dokumentu",
"Name[da]": "Plucker-dokument-backend",

2
generators/poppler/libokularGenerator_poppler.json
Unescape View File

@ -86,7 +86,7 @@
"Description": "A PDF file renderer",
"Description[az]": "PDF faylı tərtibatçısı",
"Description[ca@valencia]": "Un renderitzador per als fitxers PDF",
"Description[ca]": "Un renderitzador per als fitxers PDF",
"Description[ca]": "Un renderitzador de fitxers PDF",
"Description[cs]": "Vykreslovač PDF souborů",
"Description[da]": "En gengiver til PDF-filer",
"Description[de]": "Ein Renderer für PDF-Dateien",

2
generators/spectre/libokularGenerator_ghostview.json
Unescape View File

@ -85,7 +85,7 @@
"Copyright[zh_TW]": "© 2007-2008 Albert Astals Cid",
"Description": "A PostScript file renderer based on the Spectre library",
"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@valencia]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre",
"Description[ca]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre",
"Description[cs]": "Vykreslovač souborů PostScript založený na knihovně Spectre.",
"Description[da]": "En gengiver til PostScript-filer baseret på Spectre-biblioteket",

2
generators/tiff/libokularGenerator_tiff.json
Unescape View File

@ -86,7 +86,7 @@
"Description": "A TIFF backend",
"Description[az]": "TİFF modulu",
"Description[ca@valencia]": "Un dorsal per al TIFF",
"Description[ca]": "Un dorsal per al TIFF",
"Description[ca]": "Un dorsal de TIFF",
"Description[cs]": "Podpůrná vrstva pro TIFF",
"Description[da]": "En TIFF-backend",
"Description[de]": "Ein Anzeigemodul für TIFF",

2
generators/txt/libokularGenerator_txt.json
Unescape View File

@ -85,7 +85,7 @@
"Description": "Txt backend",
"Description[az]": "Txt modulu",
"Description[ca@valencia]": "Dorsal txt",
"Description[ca]": "Dorsal txt",
"Description[ca]": "Dorsal de txt",
"Description[cs]": "Podpůrná vrstva txt",
"Description[da]": "Txt-backend",
"Description[de]": "Anzeigemodul für Textformat",

2
generators/xps/libokularGenerator_xps.json
Unescape View File

@ -168,7 +168,7 @@
"Copyright[zh_TW]": "© 2006-2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano",
"Description": "An XPS backend",
"Description[az]": "XPS modulu",
"Description[ca@valencia]": "Un dorsal per a l'XPS",
"Description[ca@valencia]": "Un dorsal de XPS",
"Description[ca]": "Un dorsal de XPS",
"Description[cs]": "Podpůrná vrstva XPS",
"Description[da]": "En XPS-backend",

Write Preview
Loading…
Cancel
Save