Commit 5527fe1d authored by Script Kiddy's avatar Script Kiddy

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"
parent 43cde01c
......@@ -13,6 +13,7 @@
}
],
"Copyright": "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid",
"Copyright[fi]": "© 2005–2007 Piotr Szymański\n© 2008 Albert Astals Cid",
"Copyright[nn]": "© 2005–2007 Piotr Szymański\n© 2008 Albert Astals Cid",
"Copyright[uk]": "© Piotr Szymański, 2005–2007\n© Albert Astals Cid, 2008",
"Copyright[x-test]": "xx© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cidxx",
......@@ -21,6 +22,7 @@
"Description[ca]": "Un renderitzador de fitxers d'ajuda del Windows de Microsoft",
"Description[de]": "Darstellungsprogramm für Hilfedateien aus Microsoft Windows",
"Description[es]": "Un visor de archivos de ayuda de Microsoft Windows",
"Description[fi]": "Microsoft Windows -ohjetiedostohahmonnin",
"Description[fr]": "Un système de rendu pour les fichiers d'aide Windows",
"Description[it]": "Un visualizzatore per file di aiuto di Microsoft Windows",
"Description[nl]": "Een viewer voor Microsoft Windows-helpbestanden",
......@@ -43,6 +45,7 @@
"Name[ca]": "Dorsal CHM",
"Name[de]": "Anzeigemodul für CHM",
"Name[es]": "Motor para CHM",
"Name[fi]": "CHM-taustaosa",
"Name[fr]": "Moteur CHM",
"Name[it]": "Backend CHM",
"Name[nl]": "CHM-backend",
......
......@@ -9,6 +9,7 @@
}
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Copyright[fi]": "© 2007–2008 Tobias Koenig",
"Copyright[nn]": "© 2007–2008 Tobias König",
"Copyright[uk]": "© Tobias Koenig, 2007–2008",
"Copyright[x-test]": "xx© 2007-2008 Tobias Koenigxx",
......@@ -17,6 +18,7 @@
"Description[ca]": "Un renderitzador per a diversos formats de ComicBook",
"Description[de]": "Ein Renderer für verschiedene Comic-Book-Formate",
"Description[es]": "Un visor para diversos formatos de libros de cómics",
"Description[fi]": "Eri sarjakuvakirjamuotojen hahmonnin",
"Description[fr]": "Un système de rendu pour divers formats de livres de BD",
"Description[it]": "Un visualizzatore per vari formati di strisce a fumetti",
"Description[nl]": "Een viewer voor diverse ComicBook-formaten",
......@@ -42,6 +44,7 @@
"Name[ca]": "Dorsal de ComicBook",
"Name[de]": "Anzeigemodul für Comic-Book",
"Name[es]": "Motor para ComicBook",
"Name[fi]": "ComicBook-taustaosa",
"Name[fr]": "Moteur pour les livres de BD",
"Name[it]": "Backend ComicBook",
"Name[nl]": "ComicBook-backend",
......
......@@ -8,6 +8,7 @@
}
],
"Copyright": "© 2006-2008 Pino Toscano",
"Copyright[fi]": "© 2006–2008 Pino Toscano",
"Copyright[nn]": "© 2006–2008 Pino Toscano",
"Copyright[uk]": "© Pino Toscano, 2006–2008",
"Copyright[x-test]": "xx© 2006-2008 Pino Toscanoxx",
......@@ -16,6 +17,7 @@
"Description[ca]": "Dorsal pel DjVu basat en el DjVuLibre",
"Description[de]": "Anzeigemodul für DjVu auf der Basis von DjVuLibre",
"Description[es]": "Motor DjVu basado en DjVuLibre",
"Description[fi]": "DjVuLibreen perustuva DjVu-taustaosa",
"Description[fr]": "Moteur DjVu utilisant DjVuLibre",
"Description[it]": "Backend DjVu basato su DjVuLibre",
"Description[nl]": "DjVu-backend gebaseerd op DjVuLibre",
......@@ -38,6 +40,7 @@
"Name[ca]": "Dorsal DjVu",
"Name[de]": "Anzeigemodul für DjVu",
"Name[es]": "Motor para DjVu",
"Name[fi]": "DjVu-taustaosa",
"Name[fr]": "Moteur DjVu",
"Name[it]": "Backend DjVu",
"Name[nl]": "DjVu-backend",
......
......@@ -15,6 +15,7 @@
"Description[ca]": "Un renderitzador de fitxers DVI",
"Description[de]": "Ein Renderer für DVI-Dateien",
"Description[es]": "Un visor de archivos DVI",
"Description[fi]": "DVI-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour fichiers « DVI »",
"Description[it]": "Un visualizzatore di file DVI",
"Description[nl]": "Een DVI-bestandsweergever",
......@@ -37,6 +38,7 @@
"Name[ca]": "Dorsal de DVI",
"Name[de]": "Anzeigemodul für DVI",
"Name[es]": "Motor para DVI",
"Name[fi]": "DVI-taustaosa",
"Name[fr]": "Moteur DVI",
"Name[it]": "Backend DVI",
"Name[nl]": "DVI-backend",
......
......@@ -15,6 +15,7 @@
"Description[ca]": "Un dorsal per l'EPub",
"Description[de]": "Ein Anzeigemodul für EPUB",
"Description[es]": "Un motor para EPub",
"Description[fi]": "EPub-taustaosa",
"Description[fr]": "Un moteur EPub",
"Description[it]": "Backend EPub",
"Description[nl]": "Een EPub-backend",
......@@ -37,6 +38,7 @@
"Name[ca]": "Dorsal EPub",
"Name[de]": "Anzeigemodul für EPUB",
"Name[es]": "Motor para EPub",
"Name[fi]": "EPub-taustaosa",
"Name[fr]": "Moteur EPub",
"Name[it]": "Backend EPub",
"Name[nl]": "EPub-backend",
......
......@@ -17,6 +17,7 @@
"Description[ca]": "Un dorsal per documents de fax G3/G4",
"Description[de]": "Ein Anzeigemodul für G3/G4-Faxe",
"Description[es]": "Un motor para documentos de fax G3/G4",
"Description[fi]": "G3/G4-faksitiedostotaustaosa",
"Description[fr]": "Un moteur de document fax G3/G4",
"Description[it]": "Un backend per documenti fax G3/G4",
"Description[nl]": "Een backend voor een G3/G4 faxdocument",
......@@ -40,6 +41,7 @@
"Name[ca]": "Dorsal de fax",
"Name[de]": "Anzeigemodul für Faxe",
"Name[es]": "Motor para fax",
"Name[fi]": "Faksitaustaosa",
"Name[fr]": "Moteur Fax",
"Name[it]": "Backend fax",
"Name[nl]": "Faxbackend",
......
......@@ -9,6 +9,7 @@
}
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Copyright[fi]": "© 2007–2008 Tobias Koenig",
"Copyright[nn]": "© 2007–2008 Tobias König",
"Copyright[uk]": "© Tobias Koenig, 2007–2008",
"Copyright[x-test]": "xx© 2007-2008 Tobias Koenigxx",
......@@ -17,6 +18,7 @@
"Description[ca]": "Un renderitzador per a llibres electrònics FictionBook",
"Description[de]": "Ein Renderer für FictionBook-eBooks",
"Description[es]": "Un visor para libros electrónicos FictionBook",
"Description[fi]": "FictionBook-e-kirjojen hahmonnin",
"Description[fr]": "Système de rendu pour les livres électroniques FictionBook",
"Description[it]": "Un visualizzatore per ebook FictionBook",
"Description[nl]": "Een viewer voor FictionBooks eBooks",
......@@ -39,6 +41,7 @@
"Name[ca]": "Dorsal per al Fiction Book",
"Name[de]": "Anzeigemodul für FictionBook",
"Name[es]": "Motor para Fiction Book",
"Name[fi]": "FictionBook-taustaosa",
"Name[fr]": "Moteur pour FictionBook",
"Name[it]": "Backend Fiction Book",
"Name[nl]": "FictionBook-backend",
......
......@@ -19,6 +19,7 @@
}
],
"Copyright": "© 2005, 2009 Albert Astals Cid\n© 2006-2007 Pino Toscano\n© 2006-2007 Tobias Koenig",
"Copyright[fi]": "© 2005, 2009 Albert Astals Cid\n© 2006–2007 Pino Toscano\n© 2006–2007 Tobias Koenig",
"Copyright[nn]": "© 2005, 2009 Albert Astals Cid\n© 2006–2007 Pino Toscano\n© 2006–2007 Tobias Koenig",
"Copyright[sv]": "© 2005,2009 Albert Astals Cid\n© 2006-2007 Pino Toscano\n© 2006-2007 Tobias Koenig",
"Copyright[uk]": "© Albert Astals Cid, 2005, 2009 \n© Pino Toscano, 2006–2007\n© Tobias Koenig, 2006–2007",
......@@ -28,6 +29,7 @@
"Description[ca]": "Un dorsal d'imatges senzill",
"Description[de]": "Ein einfaches Anzeigemodul für Bilder",
"Description[es]": "Un sencillo motor para imágenes",
"Description[fi]": "Yksinkertainen kuvataustaosa",
"Description[fr]": "Un moteur simple pour image",
"Description[it]": "Un semplice backend per le immagini",
"Description[nl]": "Een eenvoudige afbeeldingsbackend",
......@@ -71,6 +73,7 @@
"Name[ca]": "Dorsal d'imatges",
"Name[de]": "Anzeigemodul für Bilder",
"Name[es]": "Motor para imágenes",
"Name[fi]": "Kuvataustaosa",
"Name[fr]": "Moteur image",
"Name[it]": "Backend immagini",
"Name[nl]": "Afbeeldings-backend",
......
......@@ -8,6 +8,7 @@
}
],
"Copyright": "© 2008-2009 Jakub Stachowski",
"Copyright[fi]": "© 2008–2009 Jakub Stachowski",
"Copyright[nn]": "© 2008–2009 Jakub Stachowski",
"Copyright[uk]": "© Jakub Stachowski, 2008–2009",
"Copyright[x-test]": "xx© 2008-2009 Jakub Stachowskixx",
......@@ -16,6 +17,7 @@
"Description[ca]": "Un dorsal pel Mobipocket",
"Description[de]": "Ein Anzeigemodul für Mobipocket-Dateien",
"Description[es]": "Un motor para mobipocket",
"Description[fi]": "MobiPocket-taustaosa",
"Description[fr]": "Un moteur Mobipocket",
"Description[it]": "Un backend per mobipocket",
"Description[nl]": "Een mobipocket-backend",
......@@ -38,6 +40,7 @@
"Name[ca]": "Dorsal del Mobipocket",
"Name[de]": "Anzeigemodul für Mobipocket-Dateien",
"Name[es]": "Motor para Mobipocket",
"Name[fi]": "Mobipocket-taustaosa",
"Name[fr]": "Moteur Mobipocket",
"Name[it]": "Backend Mobipocket",
"Name[nl]": "Mobipocket-backend",
......
......@@ -9,6 +9,7 @@
}
],
"Copyright": "© 2006-2008 Tobias Koenig",
"Copyright[fi]": "© 2006–2008 Tobias Koenig",
"Copyright[nn]": "© 2006–2008 Tobias Koenig",
"Copyright[uk]": "© Tobias Koenig, 2006–2008",
"Copyright[x-test]": "xx© 2006-2008 Tobias Koenigxx",
......@@ -17,6 +18,7 @@
"Description[ca]": "Un renderitzador per als documents de text OpenDocument",
"Description[de]": "Ein Renderer für OpenDocument-Textdokumente",
"Description[es]": "Un visor para documentos de texto OpenDocument",
"Description[fi]": "OpenDocument-tekstitiedostojen hahmonnin",
"Description[fr]": "Un système de rendu pour documents textes OpenDocument",
"Description[it]": "Un visualizzatore per documenti OpenDocument Text",
"Description[nl]": "Een viewer voor OpenDocument-tekstdocumenten",
......@@ -39,6 +41,7 @@
"Name[ca]": "Dorsal per a textos OpenDocument",
"Name[de]": "Anzeigemodul für OpenDocument-Textformat",
"Name[es]": "Motor para texto de OpenDocument",
"Name[fi]": "OpenDocument-tekstitaustaosa",
"Name[fr]": "Moteur pour texte OpenDocument",
"Name[it]": "Backend OpenDocument Text",
"Name[nl]": "OpenDocument-tekst-backend",
......
......@@ -9,6 +9,7 @@
}
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Copyright[fi]": "© 2007–2008 Tobias Koenig",
"Copyright[nn]": "© 2007–2008 Tobias König",
"Copyright[uk]": "© Tobias Koenig, 2007–2008",
"Copyright[x-test]": "xx© 2007-2008 Tobias Koenigxx",
......@@ -17,6 +18,7 @@
"Description[ca]": "Un renderitzador per a llibres electrònics Plucker",
"Description[de]": "Ein Renderer für Plucker eBooks",
"Description[es]": "Un visor de libros electrónicos Plucker",
"Description[fi]": "Plucker-e-kirjojen hahmonnin",
"Description[fr]": "Système de rendu pour les livres électroniques Plucker",
"Description[it]": "Un visualizzatore per eBook Plucker",
"Description[nl]": "Een viewer voor Plucker eBooks",
......@@ -39,6 +41,7 @@
"Name[ca]": "Dorsal per a documents Plucker",
"Name[de]": "Anzeigemodul für Plucker-Dokumente",
"Name[es]": "Motor para documento de Plucker",
"Name[fi]": "Plucker-tiedostotaustaosa",
"Name[fr]": "Moteur de document Plucker",
"Name[it]": "Backend per documenti Plucker",
"Name[nl]": "Plucker Document-backend",
......
......@@ -8,6 +8,7 @@
}
],
"Copyright": "© 2005-2008 Albert Astals Cid",
"Copyright[fi]": "© 2005–2008 Albert Astals Cid",
"Copyright[nn]": "© 2005–2008 Albert Astals Cid",
"Copyright[uk]": "© Albert Astals Cid, 2005–2008",
"Copyright[x-test]": "xx© 2005-2008 Albert Astals Cidxx",
......@@ -16,6 +17,7 @@
"Description[ca]": "Un renderitzador de fitxers PDF",
"Description[de]": "Ein Renderer für PDF-Dateien",
"Description[es]": "Un visor de archivos PDF",
"Description[fi]": "PDF-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour les fichiers « PDF »",
"Description[it]": "Un visualizzatore di file PDF",
"Description[nl]": "Een PDF-bestandsviewer",
......@@ -40,6 +42,7 @@
"Name[ca]": "Dorsal per a PDF",
"Name[de]": "PDF-Anzeigemodul",
"Name[es]": "Motor para PDF",
"Name[fi]": "PDF-taustaosa",
"Name[fr]": "Moteur PDF",
"Name[it]": "Backend PDF",
"Name[nl]": "PDF-backend",
......
......@@ -8,6 +8,7 @@
}
],
"Copyright": "© 2007-2008 Albert Astals Cid",
"Copyright[fi]": "© 2007–2008 Albert Astals Cid",
"Copyright[nn]": "© 2007–2008 Albert Astals Cid",
"Copyright[uk]": "© Albert Astals Cid, 2007–2008",
"Copyright[x-test]": "xx© 2007-2008 Albert Astals Cidxx",
......@@ -16,6 +17,7 @@
"Description[ca]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre",
"Description[de]": "Ein Renderer für PostScript-Dateien entwickelt aus der Spectre-Bibliothek",
"Description[es]": "Un visor de archivos PostScript basado en la biblioteca Spectre",
"Description[fi]": "Spectre-kirjastoon pohjautuva PostScript-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour les fichiers « PostScript » utilisant la librairie Spectre",
"Description[it]": "Un visualizzatore di file PostScript basato sulla libreria Spectre",
"Description[nl]": "Een renderer van PostScript bestanden gebaseerd op de bibliotheek Spectre",
......@@ -39,6 +41,7 @@
"Name[ca]": "Dorsal PS",
"Name[de]": "PS-Anzeigemodul",
"Name[es]": "Motor para PS",
"Name[fi]": "PS-taustaosa",
"Name[fr]": "Moteur PS",
"Name[it]": "Backend PS",
"Name[nl]": "PS-backend",
......
......@@ -8,6 +8,7 @@
}
],
"Copyright": "© 2006-2008 Pino Toscano",
"Copyright[fi]": "© 2006–2008 Pino Toscano",
"Copyright[nn]": "© 2006–2008 Pino Toscano",
"Copyright[uk]": "© Pino Toscano, 2006–2008",
"Copyright[x-test]": "xx© 2006-2008 Pino Toscanoxx",
......@@ -16,6 +17,7 @@
"Description[ca]": "Un dorsal pel TIFF",
"Description[de]": "Ein Anzeigemodul für TIFF",
"Description[es]": "Un motor para TIFF",
"Description[fi]": "TIFF-taustaosa",
"Description[fr]": "Un moteur TIFF",
"Description[it]": "Un backend per TIFF",
"Description[nl]": "Een TIFF-backend",
......@@ -38,6 +40,7 @@
"Name[ca]": "Dorsal TIFF",
"Name[de]": "Anzeigemodul für TIFF",
"Name[es]": "Motor para TIFF",
"Name[fi]": "TIFF-taustaosa",
"Name[fr]": "Moteur TIFF",
"Name[it]": "Backend TIFF",
"Name[nl]": "TIFF-backend",
......
......@@ -15,6 +15,7 @@
"Description[ca]": "Dorsal Txt",
"Description[de]": "Anzeigemodul für Textformat",
"Description[es]": "Motor Txt",
"Description[fi]": "Txt-taustaosa",
"Description[fr]": "Moteur Txt",
"Description[it]": "Backend di testo semplice",
"Description[nl]": "Txt-backend",
......@@ -36,6 +37,7 @@
"Name[ca]": "Dorsal Txt",
"Name[de]": "Anzeigemodul für Textformat",
"Name[es]": "Motor para Txt",
"Name[fi]": "Txt-taustaosa",
"Name[fr]": "Moteur Txt",
"Name[it]": "Backend di testo semplice",
"Name[nl]": "Txt-backend",
......
......@@ -18,6 +18,7 @@
}
],
"Copyright": "© 2006-2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano",
"Copyright[fi]": "© 2006–2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano",
"Copyright[nn]": "© 2006–2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano",
"Copyright[uk]": "© Brad Hards, 2006–2007\n© Jiri Klement, 2007\n© Pino Toscano, 2008",
"Copyright[x-test]": "xx© 2006-2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscanoxx",
......@@ -26,6 +27,7 @@
"Description[ca]": "Un dorsal per a l'XPS",
"Description[de]": "Ein Anzeigemodul für XPS",
"Description[es]": "Un motor para XPS",
"Description[fi]": "XPS-taustaosa",
"Description[fr]": "Un moteur XPS",
"Description[it]": "Un backend per XPS",
"Description[nl]": "Een XPS-backend",
......@@ -49,6 +51,7 @@
"Name[ca]": "Dorsal XPS",
"Name[de]": "Anzeigemodul für XPS",
"Name[es]": "Motor para XPS",
"Name[fi]": "XPS-taustaosa",
"Name[fr]": "Moteur XPS",
"Name[it]": "Backend XPS",
"Name[nl]": "XPS-backend",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment