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-05 10:00:05 +00:00
parent 4c1a44bc40
commit 3a16c16a17
16 changed files with 265 additions and 21 deletions

View file

@ -3,21 +3,37 @@
"Authors": [
{
"Email": "niedakh@gmail.com",
"Name": "Piotr Szymański"
"Name": "Piotr Szymański",
"Name[x-test]": "xxPiotr Szymańskixx"
},
{
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid"
"Name": "Albert Astals Cid",
"Name[x-test]": "xxAlbert Astals Cidxx"
}
],
"Copyright": "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid",
"Copyright[uk]": "© Piotr Szymański, 20052007\n© Albert Astals Cid, 2008",
"Copyright[x-test]": "xx© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cidxx",
"Description": "A Microsoft Windows help file renderer",
"Description[ca]": "Un renderitzador de fitxers d'ajuda del Windows de Microsoft",
"Description[es]": "Un visor de archivos de ayuda de Microsoft Windows",
"Description[nl]": "Een viewer voor Microsoft Windows-helpbestanden",
"Description[pt]": "Um visualizador de ficheiros de ajuda do Microsoft Windows",
"Description[uk]": "Відображення файлів довідки Microsoft Windows",
"Description[x-test]": "xxA Microsoft Windows help file rendererxx",
"Id": "okular_chm",
"License": "GPL",
"MimeTypes": [
"application/x-chm"
],
"Name": "CHM Backend",
"Name[ca]": "Dorsal CHM",
"Name[es]": "Motor para CHM",
"Name[nl]": "CHM-backend",
"Name[pt]": "Infra-Estrutura de CHM",
"Name[uk]": "Модуль CHM",
"Name[x-test]": "xxCHM Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,11 +3,20 @@
"Authors": [
{
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
"Name": "Tobias Koenig",
"Name[x-test]": "xxTobias Koenigxx"
}
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Copyright[uk]": "© Tobias Koenig, 20072008",
"Copyright[x-test]": "xx© 2007-2008 Tobias Koenigxx",
"Description": "A renderer for various comic book formats",
"Description[ca]": "Un renderitzador per a diversos formats de ComicBook",
"Description[es]": "Un visor para diversos formatos de libros de cómics",
"Description[nl]": "Een viewer voor diverse ComicBook-formaten",
"Description[pt]": "Um visualizador de diversos formatos de banda desenhada",
"Description[uk]": "Програма для відображення коміксів у різних форматах",
"Description[x-test]": "xxA renderer for various comic book formatsxx",
"Id": "okular_comicbook",
"License": "GPL",
"MimeTypes": [
@ -17,6 +26,12 @@
"inode/directory"
],
"Name": "ComicBook Backend",
"Name[ca]": "Dorsal de ComicBook",
"Name[es]": "Motor para ComicBook",
"Name[nl]": "ComicBook-backend",
"Name[pt]": "Infra-Estrutura de ComicBook (BD)",
"Name[uk]": "Модуль коміксів",
"Name[x-test]": "xxComicBook Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,17 +3,32 @@
"Authors": [
{
"Email": "pino@kde.org",
"Name": "Pino Toscano"
"Name": "Pino Toscano",
"Name[x-test]": "xxPino Toscanoxx"
}
],
"Copyright": "© 2006-2008 Pino Toscano",
"Copyright[uk]": "© Pino Toscano, 20062008",
"Copyright[x-test]": "xx© 2006-2008 Pino Toscanoxx",
"Description": "DjVu backend based on DjVuLibre",
"Description[ca]": "Dorsal pel DjVu basat en el DjVuLibre",
"Description[es]": "Motor DjVu basado en DjVuLibre",
"Description[nl]": "DjVu-backend gebaseerd op DjVuLibre",
"Description[pt]": "Infra-estrutura do DjVu com base no DjVuLibre",
"Description[uk]": "Засіб обробки DjVu, заснований на DjVuLibre",
"Description[x-test]": "xxDjVu backend based on DjVuLibrexx",
"Id": "okular_djvu",
"License": "GPL",
"MimeTypes": [
"image/vnd.djvu"
],
"Name": "DjVu Backend",
"Name[ca]": "Dorsal DjVu",
"Name[es]": "Motor para DjVu",
"Name[nl]": "DjVu-backend",
"Name[pt]": "Infra-Estrutura do DjVu",
"Name[uk]": "Модуль DjVu",
"Name[x-test]": "xxDjVu Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,17 +3,32 @@
"Authors": [
{
"Email": "luigi.toscano@tiscali.it",
"Name": "Luigi Toscano"
"Name": "Luigi Toscano",
"Name[x-test]": "xxLuigi Toscanoxx"
}
],
"Copyright": "© 2006 Luigi Toscano",
"Copyright[uk]": "© Luigi Toscano, 2006",
"Copyright[x-test]": "xx© 2006 Luigi Toscanoxx",
"Description": "A DVI file renderer",
"Description[ca]": "Un renderitzador de fitxers DVI",
"Description[es]": "Un visor de archivos DVI",
"Description[nl]": "Een DVI-bestandsweergever",
"Description[pt]": "Um visualizador de ficheiros DVI",
"Description[uk]": "Інструмент для показу файлів DVI",
"Description[x-test]": "xxA DVI file rendererxx",
"Id": "okular_dvi",
"License": "GPL",
"MimeTypes": [
"application/x-dvi"
],
"Name": "DVI Backend",
"Name[ca]": "Dorsal de DVI",
"Name[es]": "Motor para DVI",
"Name[nl]": "DVI-backend",
"Name[pt]": "Infra-Estrutura de DVI",
"Name[uk]": "Модуль DVI",
"Name[x-test]": "xxDVI Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,17 +3,32 @@
"Authors": [
{
"Email": "elylevy@cs.huji.ac.il",
"Name": "Ely Levy"
"Name": "Ely Levy",
"Name[x-test]": "xxEly Levyxx"
}
],
"Copyright": "© 2008 Ely Levy",
"Copyright[uk]": "© Ely Levy, 2008",
"Copyright[x-test]": "xx© 2008 Ely Levyxx",
"Description": "An EPub backend",
"Description[ca]": "Un dorsal per l'EPub",
"Description[es]": "Un motor para EPub",
"Description[nl]": "Een EPub-backend",
"Description[pt]": "Uma infra-estrutura de EPub",
"Description[uk]": "Сервер EPub",
"Description[x-test]": "xxAn EPub backendxx",
"Id": "okular_epub",
"License": "GPL",
"MimeTypes": [
"application/epub+zip"
],
"Name": "EPub Backend",
"Name[ca]": "Dorsal EPub",
"Name[es]": "Motor para EPub",
"Name[nl]": "EPub-backend",
"Name[pt]": "Infra-Estrutura de EPub",
"Name[uk]": "Модуль EPub",
"Name[x-test]": "xxEPub Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,11 +3,20 @@
"Authors": [
{
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
"Name": "Tobias Koenig",
"Name[x-test]": "xxTobias Koenigxx"
}
],
"Copyright": "© 2008 Tobias Koenig",
"Copyright[uk]": "© Tobias Koenig, 2008",
"Copyright[x-test]": "xx© 2008 Tobias Koenigxx",
"Description": "A G3/G4 fax document backend",
"Description[ca]": "Un dorsal per documents de fax G3/G4",
"Description[es]": "Un motor para documentos de fax G3/G4",
"Description[nl]": "Een backend voor een G3/G4 faxdocument",
"Description[pt]": "Uma infra-estrutura de documentos de fax G3/G4",
"Description[uk]": "Сервер документів факсів G3/G4",
"Description[x-test]": "xxA G3/G4 fax document backendxx",
"Id": "okular_fax",
"License": "GPL",
"MimeTypes": [
@ -15,6 +24,11 @@
"image/g3fax"
],
"Name": "Fax Backend",
"Name[ca]": "Dorsal de fax",
"Name[es]": "Motor para fax",
"Name[nl]": "Faxbackend",
"Name[uk]": "Модуль факсів",
"Name[x-test]": "xxFax Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,17 +3,32 @@
"Authors": [
{
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
"Name": "Tobias Koenig",
"Name[x-test]": "xxTobias Koenigxx"
}
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Copyright[uk]": "© Tobias Koenig, 20072008",
"Copyright[x-test]": "xx© 2007-2008 Tobias Koenigxx",
"Description": "A renderer for FictionBook eBooks",
"Description[ca]": "Un renderitzador per a llibres electrònics FictionBook",
"Description[es]": "Un visor para libros electrónicos FictionBook",
"Description[nl]": "Een viewer voor FictionBooks eBooks",
"Description[pt]": "Um visualizador de eBooks em FictionBook",
"Description[uk]": "Програма для відображення електронної белетристики",
"Description[x-test]": "xxA renderer for FictionBook eBooksxx",
"Id": "okular_fax",
"License": "GPL",
"MimeTypes": [
"application/x-fictionbook+xml"
],
"Name": "Fiction Book Backend",
"Name[ca]": "Dorsal per al Fiction Book",
"Name[es]": "Motor para Fiction Book",
"Name[nl]": "FictionBook-backend",
"Name[pt]": "Infra-Estrutura de Livros de Ficção",
"Name[uk]": "Модуль белетристики",
"Name[x-test]": "xxFiction Book Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,19 +3,30 @@
"Authors": [
{
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid"
"Name": "Albert Astals Cid",
"Name[x-test]": "xxAlbert Astals Cidxx"
},
{
"Email": "pino@kde.org",
"Name": "Pino Toscano"
"Name": "Pino Toscano",
"Name[x-test]": "xxPino Toscanoxx"
},
{
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
"Name": "Tobias Koenig",
"Name[x-test]": "xxTobias Koenigxx"
}
],
"Copyright": "© 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, 20062007\n© Tobias Koenig, 20062007",
"Copyright[x-test]": "xx© 2005, 2009 Albert Astals Cid\n© 2006-2007 Pino Toscano\n© 2006-2007 Tobias Koenigxx",
"Description": "A simple image backend",
"Description[ca]": "Un dorsal d'imatges senzill",
"Description[es]": "Un sencillo motor para imágenes",
"Description[nl]": "Een eenvoudige afbeeldingsbackend",
"Description[pt]": "Uma infra-estrutura de imagens simples",
"Description[uk]": "Проста програма для зображень",
"Description[x-test]": "xxA simple image backendxx",
"Id": "okular_kimgio",
"License": "GPL",
"MimeTypes": [
@ -43,6 +54,12 @@
"image/x-xpixmap"
],
"Name": "Image Backend",
"Name[ca]": "Dorsal d'imatges",
"Name[es]": "Motor para imágenes",
"Name[nl]": "Afbeeldings-backend",
"Name[pt]": "Infra-Estrutura de Imagens",
"Name[uk]": "Модуль зображень",
"Name[x-test]": "xxImage Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,17 +3,32 @@
"Authors": [
{
"Email": "qbast@go2.pl",
"Name": "Jakub Stachowski"
"Name": "Jakub Stachowski",
"Name[x-test]": "xxJakub Stachowskixx"
}
],
"Copyright": "© 2008-2009 Jakub Stachowski",
"Copyright[uk]": "© Jakub Stachowski, 20082009",
"Copyright[x-test]": "xx© 2008-2009 Jakub Stachowskixx",
"Description": "A mobipocket backend",
"Description[ca]": "Un dorsal pel Mobipocket",
"Description[es]": "Un motor para mobipocket",
"Description[nl]": "Een mobipocket-backend",
"Description[pt]": "Uma infra-estrutura de Mobipocket",
"Description[uk]": "Сервер mobipocket",
"Description[x-test]": "xxA mobipocket backendxx",
"Id": "okular_mobi",
"License": "GPL",
"MimeTypes": [
"application/x-mobipocket-ebook"
],
"Name": "Mobipocket Backend",
"Name[ca]": "Dorsal del Mobipocket",
"Name[es]": "Motor para Mobipocket",
"Name[nl]": "Mobipocket-backend",
"Name[pt]": "Infra-Estrutura de Mobipocket",
"Name[uk]": "Модуль Mobipocket",
"Name[x-test]": "xxMobipocket Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,17 +3,32 @@
"Authors": [
{
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
"Name": "Tobias Koenig",
"Name[x-test]": "xxTobias Koenigxx"
}
],
"Copyright": "© 2006-2008 Tobias Koenig",
"Copyright[uk]": "© Tobias Koenig, 20062008",
"Copyright[x-test]": "xx© 2006-2008 Tobias Koenigxx",
"Description": "A renderer for OpenDocument Text documents",
"Description[ca]": "Un renderitzador per als documents de text OpenDocument",
"Description[es]": "Un visor para documentos de texto OpenDocument",
"Description[nl]": "Een viewer voor OpenDocument-tekstdocumenten",
"Description[pt]": "Um visualizador de documentos de texto em OpenDocument",
"Description[uk]": "Модуль для показу текстових документів OpenDocument",
"Description[x-test]": "xxA renderer for OpenDocument Text documentsxx",
"Id": "okular_ooo",
"License": "GPL",
"MimeTypes": [
"application/vnd.oasis.opendocument.text"
],
"Name": "OpenDocument Text Backend",
"Name[ca]": "Dorsal per a textos OpenDocument",
"Name[es]": "Motor para texto de OpenDocument",
"Name[nl]": "OpenDocument-tekst-backend",
"Name[pt]": "Infra-Estrutura de Texto em OpenDocument",
"Name[uk]": "Модуль текстових документів OpenDocument",
"Name[x-test]": "xxOpenDocument Text Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,17 +3,32 @@
"Authors": [
{
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
"Name": "Tobias Koenig",
"Name[x-test]": "xxTobias Koenigxx"
}
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Copyright[uk]": "© Tobias Koenig, 20072008",
"Copyright[x-test]": "xx© 2007-2008 Tobias Koenigxx",
"Description": "A renderer for Plucker eBooks",
"Description[ca]": "Un renderitzador per a llibres electrònics Plucker",
"Description[es]": "Un visor de libros electrónicos Plucker",
"Description[nl]": "Een viewer voor Plucker eBooks",
"Description[pt]": "Um visualizador de eBooks do Plucker",
"Description[uk]": "Програма для відображення ел. книг Plucker",
"Description[x-test]": "xxA renderer for Plucker eBooksxx",
"Id": "okular_plucker",
"License": "GPL",
"MimeTypes": [
"application/prs.plucker"
],
"Name": "Plucker Document Backend",
"Name[ca]": "Dorsal per a documents Plucker",
"Name[es]": "Motor para documento de Plucker",
"Name[nl]": "Plucker Document-backend",
"Name[pt]": "Infra-Estrutura de Documentos do Plucker",
"Name[uk]": "Модуль документів Plucker",
"Name[x-test]": "xxPlucker Document Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,11 +3,20 @@
"Authors": [
{
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid"
"Name": "Albert Astals Cid",
"Name[x-test]": "xxAlbert Astals Cidxx"
}
],
"Copyright": "© 2005-2008 Albert Astals Cid",
"Copyright[uk]": "© Albert Astals Cid, 20052008",
"Copyright[x-test]": "xx© 2005-2008 Albert Astals Cidxx",
"Description": "A PDF file renderer",
"Description[ca]": "Un renderitzador de fitxers PDF",
"Description[es]": "Un visor de archivos PDF",
"Description[nl]": "Een PDF-bestandsviewer",
"Description[pt]": "Um visualizador de ficheiros PDF",
"Description[uk]": "Програма для показу файлів PDF",
"Description[x-test]": "xxA PDF file rendererxx",
"Id": "okular_poppler",
"License": "GPL",
"MimeTypes": [
@ -16,6 +25,12 @@
"application/x-wwf"
],
"Name": "PDF Backend",
"Name[ca]": "Dorsal per a PDF",
"Name[es]": "Motor para PDF",
"Name[nl]": "PDF-backend",
"Name[pt]": "Infra-Estrutura de PDF",
"Name[uk]": "Модуль PDF",
"Name[x-test]": "xxPDF Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,11 +3,20 @@
"Authors": [
{
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid"
"Name": "Albert Astals Cid",
"Name[x-test]": "xxAlbert Astals Cidxx"
}
],
"Copyright": "© 2007-2008 Albert Astals Cid",
"Copyright[uk]": "© Albert Astals Cid, 20072008",
"Copyright[x-test]": "xx© 2007-2008 Albert Astals Cidxx",
"Description": "A PostScript file renderer based on the Spectre library",
"Description[ca]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre",
"Description[es]": "Un visor de archivos PostScript basado en la biblioteca Spectre",
"Description[nl]": "Een renderer van PostScript bestanden gebaseerd op de bibliotheek Spectre",
"Description[pt]": "Um visualzador de ficheiros PostScript com base na biblioteca Spectre",
"Description[uk]": "Обробник файлів PostScript на основі бібліотеки Spectre",
"Description[x-test]": "xxA PostScript file renderer based on the Spectre libraryxx",
"Id": "okular_ghostview",
"License": "GPL",
"MimeTypes": [
@ -15,6 +24,12 @@
"image/x-eps"
],
"Name": "PS Backend",
"Name[ca]": "Dorsal PS",
"Name[es]": "Motor para PS",
"Name[nl]": "PS-backend",
"Name[pt]": "Infra-Estrutura de PS",
"Name[uk]": "Модуль PS",
"Name[x-test]": "xxPS Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,17 +3,32 @@
"Authors": [
{
"Email": "pino@kde.org",
"Name": "Pino Toscano"
"Name": "Pino Toscano",
"Name[x-test]": "xxPino Toscanoxx"
}
],
"Copyright": "© 2006-2008 Pino Toscano",
"Copyright[uk]": "© Pino Toscano, 20062008",
"Copyright[x-test]": "xx© 2006-2008 Pino Toscanoxx",
"Description": "A TIFF backend",
"Description[ca]": "Un dorsal pel TIFF",
"Description[es]": "Un motor para TIFF",
"Description[nl]": "Een TIFF-backend",
"Description[pt]": "Uma infra-estrutura de TIFF",
"Description[uk]": "Програма для TIFF",
"Description[x-test]": "xxA TIFF backendxx",
"Id": "okular_tiff",
"License": "GPL",
"MimeTypes": [
"image/tiff"
],
"Name": "TIFF Backend",
"Name[ca]": "Dorsal TIFF",
"Name[es]": "Motor para TIFF",
"Name[nl]": "TIFF-backend",
"Name[pt]": "Infra-Estrutura de TIFF",
"Name[uk]": "Модуль TIFF",
"Name[x-test]": "xxTIFF Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,17 +3,32 @@
"Authors": [
{
"Email": "a3at.mail@gmail.com",
"Name": "Azat Khuzhin"
"Name": "Azat Khuzhin",
"Name[x-test]": "xxAzat Khuzhinxx"
}
],
"Copyright": "© 2013 Azat Khuzhin",
"Copyright[uk]": "© Azat Khuzhin, 2013",
"Copyright[x-test]": "xx© 2013 Azat Khuzhinxx",
"Description": "Txt backend",
"Description[ca]": "Dorsal Txt",
"Description[es]": "Motor Txt",
"Description[nl]": "Txt-backend",
"Description[pt]": "Infra-estrutura de TXT",
"Description[uk]": "Модуль тексту",
"Description[x-test]": "xxTxt backendxx",
"Id": "okular_txt",
"License": "GPL",
"MimeTypes": [
"text/plain"
],
"Name": "Txt Backend",
"Name[ca]": "Dorsal Txt",
"Name[es]": "Motor para Txt",
"Name[nl]": "Txt-backend",
"Name[pt]": "Infra-Estrutura de TXT",
"Name[uk]": "Модуль тексту",
"Name[x-test]": "xxTxt Backendxx",
"ServiceTypes": [
"okular/Generator"
],

View file

@ -3,19 +3,30 @@
"Authors": [
{
"Email": "bradh@frogmouth.net",
"Name": "Brad Hards"
"Name": "Brad Hards",
"Name[x-test]": "xxBrad Hardsxx"
},
{
"Email": "jiri.klement@gmail.com",
"Name": "Jiri Klement"
"Name": "Jiri Klement",
"Name[x-test]": "xxJiri Klementxx"
},
{
"Email": "pino@kde.org",
"Name": "Pino Toscano"
"Name": "Pino Toscano",
"Name[x-test]": "xxPino Toscanoxx"
}
],
"Copyright": "© 2006-2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano",
"Copyright[uk]": "© Brad Hards, 20062007\n© Jiri Klement, 2007\n© Pino Toscano, 2008",
"Copyright[x-test]": "xx© 2006-2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscanoxx",
"Description": "An XPS backend",
"Description[ca]": "Un dorsal per a l'XPS",
"Description[es]": "Un motor para XPS",
"Description[nl]": "Een XPS-backend",
"Description[pt]": "Uma infra-estrutura de XPS",
"Description[uk]": "Програма для XPS",
"Description[x-test]": "xxAn XPS backendxx",
"Id": "okular_xps",
"License": "GPL",
"MimeTypes": [
@ -23,6 +34,12 @@
"application/vnd.ms-xpsdocument"
],
"Name": "XPS Backend",
"Name[ca]": "Dorsal XPS",
"Name[es]": "Motor para XPS",
"Name[nl]": "XPS-backend",
"Name[pt]": "Infra-Estrutura de XPS",
"Name[uk]": "Модуль XPS",
"Name[x-test]": "xxXPS Backendxx",
"ServiceTypes": [
"okular/Generator"
],