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"
This commit is contained in:
l10n daemon script 2016-11-09 09:19:08 +00:00
parent 3f484b44a9
commit 66cba6e293
16 changed files with 32 additions and 0 deletions

View file

@ -18,6 +18,7 @@
"Description": "A Microsoft Windows help file renderer",
"Description[ca@valencia]": "Un renderitzador de fitxers d'ajuda del Windows de Microsoft",
"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[it]": "Un visualizzatore per file di aiuto di Microsoft Windows",
"Description[nl]": "Een viewer voor Microsoft Windows-helpbestanden",
@ -36,6 +37,7 @@
"Name": "CHM Backend",
"Name[ca@valencia]": "Dorsal CHM",
"Name[ca]": "Dorsal CHM",
"Name[de]": "Anzeigemodul für CHM",
"Name[es]": "Motor para CHM",
"Name[it]": "Backend CHM",
"Name[nl]": "CHM-backend",

View file

@ -13,6 +13,7 @@
"Description": "A renderer for various comic book formats",
"Description[ca@valencia]": "Un renderitzador per a diversos formats de ComicBook",
"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[it]": "Un visualizzatore per vari formati di strisce a fumetti",
"Description[nl]": "Een viewer voor diverse ComicBook-formaten",
@ -34,6 +35,7 @@
"Name": "ComicBook Backend",
"Name[ca@valencia]": "Dorsal de ComicBook",
"Name[ca]": "Dorsal de ComicBook",
"Name[de]": "Anzeigemodul für Comic-Book",
"Name[es]": "Motor para ComicBook",
"Name[it]": "Backend ComicBook",
"Name[nl]": "ComicBook-backend",

View file

@ -13,6 +13,7 @@
"Description": "DjVu backend based on DjVuLibre",
"Description[ca@valencia]": "Dorsal pel DjVu basat en el DjVuLibre",
"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[it]": "Backend DjVu basato su DjVuLibre",
"Description[nl]": "DjVu-backend gebaseerd op DjVuLibre",
@ -31,6 +32,7 @@
"Name": "DjVu Backend",
"Name[ca@valencia]": "Dorsal DjVu",
"Name[ca]": "Dorsal DjVu",
"Name[de]": "Anzeigemodul für DjVu",
"Name[es]": "Motor para DjVu",
"Name[it]": "Backend DjVu",
"Name[nl]": "DjVu-backend",

View file

@ -13,6 +13,7 @@
"Description": "A DVI file renderer",
"Description[ca@valencia]": "Un renderitzador de fitxers DVI",
"Description[ca]": "Un renderitzador de fitxers DVI",
"Description[de]": "Ein Renderer für DVI-Dateien",
"Description[es]": "Un visor de archivos DVI",
"Description[it]": "Un visualizzatore di file DVI",
"Description[nl]": "Een DVI-bestandsweergever",
@ -31,6 +32,7 @@
"Name": "DVI Backend",
"Name[ca@valencia]": "Dorsal de DVI",
"Name[ca]": "Dorsal de DVI",
"Name[de]": "Anzeigemodul für DVI",
"Name[es]": "Motor para DVI",
"Name[it]": "Backend DVI",
"Name[nl]": "DVI-backend",

View file

@ -13,6 +13,7 @@
"Description": "An EPub backend",
"Description[ca@valencia]": "Un dorsal per l'EPub",
"Description[ca]": "Un dorsal per l'EPub",
"Description[de]": "Ein Anzeigemodul für EPUB",
"Description[es]": "Un motor para EPub",
"Description[it]": "Backend EPub",
"Description[nl]": "Een EPub-backend",
@ -31,6 +32,7 @@
"Name": "EPub Backend",
"Name[ca@valencia]": "Dorsal EPub",
"Name[ca]": "Dorsal EPub",
"Name[de]": "Anzeigemodul für EPUB",
"Name[es]": "Motor para EPub",
"Name[it]": "Backend EPub",
"Name[nl]": "EPub-backend",

View file

@ -13,6 +13,7 @@
"Description": "A G3/G4 fax document backend",
"Description[ca@valencia]": "Un dorsal per documents de fax G3/G4",
"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[it]": "Un backend per documenti fax G3/G4",
"Description[nl]": "Een backend voor een G3/G4 faxdocument",
@ -32,6 +33,7 @@
"Name": "Fax Backend",
"Name[ca@valencia]": "Dorsal de fax",
"Name[ca]": "Dorsal de fax",
"Name[de]": "Anzeigemodul für Faxe",
"Name[es]": "Motor para fax",
"Name[it]": "Backend fax",
"Name[nl]": "Faxbackend",

View file

@ -13,6 +13,7 @@
"Description": "A renderer for FictionBook eBooks",
"Description[ca@valencia]": "Un renderitzador per a llibres electrònics FictionBook",
"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[it]": "Un visualizzatore per ebook FictionBook",
"Description[nl]": "Een viewer voor FictionBooks eBooks",
@ -31,6 +32,7 @@
"Name": "Fiction Book Backend",
"Name[ca@valencia]": "Dorsal per al Fiction Book",
"Name[ca]": "Dorsal per al Fiction Book",
"Name[de]": "Anzeigemodul für FictionBook",
"Name[es]": "Motor para Fiction Book",
"Name[it]": "Backend Fiction Book",
"Name[nl]": "FictionBook-backend",

View file

@ -24,6 +24,7 @@
"Description": "A simple image backend",
"Description[ca@valencia]": "Un dorsal d'imatges senzill",
"Description[ca]": "Un dorsal d'imatges senzill",
"Description[de]": "Ein einfaches Anzeigemodul für Bilder",
"Description[es]": "Un sencillo motor para imágenes",
"Description[it]": "Un semplice backend per le immagini",
"Description[nl]": "Een eenvoudige afbeeldingsbackend",
@ -63,6 +64,7 @@
"Name": "Image Backend",
"Name[ca@valencia]": "Dorsal d'imatges",
"Name[ca]": "Dorsal d'imatges",
"Name[de]": "Anzeigemodul für Bilder",
"Name[es]": "Motor para imágenes",
"Name[it]": "Backend immagini",
"Name[nl]": "Afbeeldings-backend",

View file

@ -13,6 +13,7 @@
"Description": "A mobipocket backend",
"Description[ca@valencia]": "Un dorsal pel Mobipocket",
"Description[ca]": "Un dorsal pel Mobipocket",
"Description[de]": "Ein Anzeigemodul für Mobipocket-Dateien",
"Description[es]": "Un motor para mobipocket",
"Description[it]": "Un backend per mobipocket",
"Description[nl]": "Een mobipocket-backend",
@ -31,6 +32,7 @@
"Name": "Mobipocket Backend",
"Name[ca@valencia]": "Dorsal del Mobipocket",
"Name[ca]": "Dorsal del Mobipocket",
"Name[de]": "Anzeigemodul für Mobipocket-Dateien",
"Name[es]": "Motor para Mobipocket",
"Name[it]": "Backend Mobipocket",
"Name[nl]": "Mobipocket-backend",

View file

@ -13,6 +13,7 @@
"Description": "A renderer for OpenDocument Text documents",
"Description[ca@valencia]": "Un renderitzador per als documents de text OpenDocument",
"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[it]": "Un visualizzatore per documenti OpenDocument Text",
"Description[nl]": "Een viewer voor OpenDocument-tekstdocumenten",
@ -31,6 +32,7 @@
"Name": "OpenDocument Text Backend",
"Name[ca@valencia]": "Dorsal per a textos OpenDocument",
"Name[ca]": "Dorsal per a textos OpenDocument",
"Name[de]": "Anzeigemodul für OpenDocument-Textformat",
"Name[es]": "Motor para texto de OpenDocument",
"Name[it]": "Backend OpenDocument Text",
"Name[nl]": "OpenDocument-tekst-backend",

View file

@ -13,6 +13,7 @@
"Description": "A renderer for Plucker eBooks",
"Description[ca@valencia]": "Un renderitzador per a llibres electrònics Plucker",
"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[it]": "Un visualizzatore per eBook Plucker",
"Description[nl]": "Een viewer voor Plucker eBooks",
@ -31,6 +32,7 @@
"Name": "Plucker Document Backend",
"Name[ca@valencia]": "Dorsal per a documents Plucker",
"Name[ca]": "Dorsal per a documents Plucker",
"Name[de]": "Anzeigemodul für Plucker-Dokumente",
"Name[es]": "Motor para documento de Plucker",
"Name[it]": "Backend per documenti Plucker",
"Name[nl]": "Plucker Document-backend",

View file

@ -13,6 +13,7 @@
"Description": "A PDF file renderer",
"Description[ca@valencia]": "Un renderitzador de fitxers PDF",
"Description[ca]": "Un renderitzador de fitxers PDF",
"Description[de]": "Ein Renderer für PDF-Dateien",
"Description[es]": "Un visor de archivos PDF",
"Description[it]": "Un visualizzatore di file PDF",
"Description[nl]": "Een PDF-bestandsviewer",
@ -33,6 +34,7 @@
"Name": "PDF Backend",
"Name[ca@valencia]": "Dorsal per a PDF",
"Name[ca]": "Dorsal per a PDF",
"Name[de]": "PDF-Anzeigemodul",
"Name[es]": "Motor para PDF",
"Name[it]": "Backend PDF",
"Name[nl]": "PDF-backend",

View file

@ -13,6 +13,7 @@
"Description": "A PostScript file renderer based on the Spectre library",
"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[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[it]": "Un visualizzatore di file PostScript basato sulla libreria Spectre",
"Description[nl]": "Een renderer van PostScript bestanden gebaseerd op de bibliotheek Spectre",
@ -32,6 +33,7 @@
"Name": "PS Backend",
"Name[ca@valencia]": "Dorsal PS",
"Name[ca]": "Dorsal PS",
"Name[de]": "PS-Anzeigemodul",
"Name[es]": "Motor para PS",
"Name[it]": "Backend PS",
"Name[nl]": "PS-backend",

View file

@ -13,6 +13,7 @@
"Description": "A TIFF backend",
"Description[ca@valencia]": "Un dorsal pel TIFF",
"Description[ca]": "Un dorsal pel TIFF",
"Description[de]": "Ein Anzeigemodul für TIFF",
"Description[es]": "Un motor para TIFF",
"Description[it]": "Un backend per TIFF",
"Description[nl]": "Een TIFF-backend",
@ -31,6 +32,7 @@
"Name": "TIFF Backend",
"Name[ca@valencia]": "Dorsal TIFF",
"Name[ca]": "Dorsal TIFF",
"Name[de]": "Anzeigemodul für TIFF",
"Name[es]": "Motor para TIFF",
"Name[it]": "Backend TIFF",
"Name[nl]": "TIFF-backend",

View file

@ -13,6 +13,7 @@
"Description": "Txt backend",
"Description[ca@valencia]": "Dorsal Txt",
"Description[ca]": "Dorsal Txt",
"Description[de]": "Anzeigemodul für Textformat",
"Description[es]": "Motor Txt",
"Description[it]": "Backend di testo semplice",
"Description[nl]": "Txt-backend",
@ -30,6 +31,7 @@
"Name": "Txt Backend",
"Name[ca@valencia]": "Dorsal Txt",
"Name[ca]": "Dorsal Txt",
"Name[de]": "Anzeigemodul für Textformat",
"Name[es]": "Motor para Txt",
"Name[it]": "Backend di testo semplice",
"Name[nl]": "Txt-backend",

View file

@ -23,6 +23,7 @@
"Description": "An XPS backend",
"Description[ca@valencia]": "Un dorsal per a l'XPS",
"Description[ca]": "Un dorsal per a l'XPS",
"Description[de]": "Ein Anzeigemodul für XPS",
"Description[es]": "Un motor para XPS",
"Description[it]": "Un backend per XPS",
"Description[nl]": "Een XPS-backend",
@ -42,6 +43,7 @@
"Name": "XPS Backend",
"Name[ca@valencia]": "Dorsal XPS",
"Name[ca]": "Dorsal XPS",
"Name[de]": "Anzeigemodul für XPS",
"Name[es]": "Motor para XPS",
"Name[it]": "Backend XPS",
"Name[nl]": "XPS-backend",