From 36c60741fb768dc3e7df84c5dd64980655f5a303 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 30 Jul 2017 04:54:11 +0200 Subject: [PATCH] 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" --- generators/chm/libokularGenerator_chmlib.json | 2 ++ generators/comicbook/libokularGenerator_comicbook.json | 2 ++ generators/djvu/libokularGenerator_djvu.json | 2 ++ generators/dvi/libokularGenerator_dvi.json | 2 ++ generators/epub/libokularGenerator_epub.json | 2 ++ generators/fax/libokularGenerator_fax.json | 2 ++ generators/fictionbook/libokularGenerator_fb.json | 2 ++ generators/kimgio/libokularGenerator_kimgio.json | 2 ++ generators/mobipocket/libokularGenerator_mobi.json | 2 ++ generators/ooo/libokularGenerator_ooo.json | 2 ++ generators/plucker/libokularGenerator_plucker.json | 2 ++ generators/poppler/libokularGenerator_poppler.json | 2 ++ generators/spectre/libokularGenerator_ghostview.json | 2 ++ generators/tiff/libokularGenerator_tiff.json | 2 ++ generators/txt/libokularGenerator_txt.json | 2 ++ generators/xps/libokularGenerator_xps.json | 2 ++ 16 files changed, 32 insertions(+) diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index 08906d6cd..c4a322664 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -42,6 +42,7 @@ "Description[et]": "Microsoft Windowsi abifailide renderdaja", "Description[fi]": "Microsoft Windows -ohjetiedostohahmonnin", "Description[fr]": "Un système de rendu pour les fichiers d'aide Windows", + "Description[gl]": "Un visor de ficheiros de axuda de Microsoft Windows", "Description[ia]": "Un rendition de file de adjuta de Microsoft Windows", "Description[it]": "Un visualizzatore per file di aiuto di Microsoft Windows", "Description[ko]": "마이크로소프트 Windows 도움말 파일 표시기", @@ -77,6 +78,7 @@ "Name[et]": "CHM-i taustaprogramm", "Name[fi]": "CHM-taustaosa", "Name[fr]": "Moteur CHM", + "Name[gl]": "Infraestrutura para CHM", "Name[ia]": "Retro-Administration de CHM", "Name[it]": "Backend CHM", "Name[ko]": "CHM 백엔드", diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json index 5d77fa72f..c4b5f74a2 100644 --- a/generators/comicbook/libokularGenerator_comicbook.json +++ b/generators/comicbook/libokularGenerator_comicbook.json @@ -34,6 +34,7 @@ "Description[et]": "Mitmesuguste koomiksivormingute renderdaja", "Description[fi]": "Eri sarjakuvakirjamuotojen hahmonnin", "Description[fr]": "Un système de rendu pour divers formats de livres de BD", + "Description[gl]": "Un visor de varios formatos de banda deseñada", "Description[ia]": "Un rendition pro varie formatos de libros comic", "Description[it]": "Un visualizzatore per vari formati di strisce a fumetti", "Description[ko]": "다양한 만화책 형식 렌더러", @@ -72,6 +73,7 @@ "Name[et]": "ComicBooki taustaprogramm", "Name[fi]": "ComicBook-taustaosa", "Name[fr]": "Moteur pour les livres de BD", + "Name[gl]": "Infraestrutura para ComicBook", "Name[ia]": "Retro-Administration de libros de comic", "Name[it]": "Backend ComicBook", "Name[ko]": "만화책 백엔드", diff --git a/generators/djvu/libokularGenerator_djvu.json b/generators/djvu/libokularGenerator_djvu.json index 1d0ea3319..a8f8d03cc 100644 --- a/generators/djvu/libokularGenerator_djvu.json +++ b/generators/djvu/libokularGenerator_djvu.json @@ -32,6 +32,7 @@ "Description[et]": "DjVu taustaprogramm DjVuLibre alusel", "Description[fi]": "DjVuLibreen perustuva DjVu-taustaosa", "Description[fr]": "Moteur DjVu utilisant DjVuLibre", + "Description[gl]": "Infraestrutura de DjVu baseada en DjVuLibre.", "Description[ia]": "Retro-Administration de DjVu basate sur DjVuLibre.", "Description[it]": "Backend DjVu basato su DjVuLibre", "Description[ko]": "DjVuLibre 기반 DjVu 백엔드", @@ -68,6 +69,7 @@ "Name[et]": "DjVu taustaprogramm", "Name[fi]": "DjVu-taustaosa", "Name[fr]": "Moteur DjVu", + "Name[gl]": "Infraestrutura para DjVu", "Name[ia]": "Retro-Administration de DjVu", "Name[it]": "Backend DjVu", "Name[ko]": "DjVu 백엔드", diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index 1fc225aa1..37e6bff03 100644 --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -31,6 +31,7 @@ "Description[et]": "DVI-faili renderdaja", "Description[fi]": "DVI-tiedostohahmonnin", "Description[fr]": "Système de rendu pour fichiers « DVI »", + "Description[gl]": "Un visor de ficheiros DVI", "Description[ia]": "Un renditor de file de DVI", "Description[it]": "Un visualizzatore di file DVI", "Description[ko]": "DVI 파일 렌더러", @@ -66,6 +67,7 @@ "Name[et]": "DVI taustaprogramm", "Name[fi]": "DVI-taustaosa", "Name[fr]": "Moteur DVI", + "Name[gl]": "Infraestrutura de DVI", "Name[ia]": "Retro-administration de DVI", "Name[it]": "Backend DVI", "Name[ko]": "DVI 백엔드", diff --git a/generators/epub/libokularGenerator_epub.json b/generators/epub/libokularGenerator_epub.json index db80ba1d2..2e3ed61dc 100644 --- a/generators/epub/libokularGenerator_epub.json +++ b/generators/epub/libokularGenerator_epub.json @@ -30,6 +30,7 @@ "Description[et]": "EPubi taustaprogramm", "Description[fi]": "EPub-taustaosa", "Description[fr]": "Un moteur EPub", + "Description[gl]": "Unha infraestrutura para EPub", "Description[ia]": "Un retro-administration de EPub", "Description[it]": "Backend EPub", "Description[ko]": "EPub 백엔드", @@ -66,6 +67,7 @@ "Name[et]": "EPubi taustaprogramm", "Name[fi]": "EPub-taustaosa", "Name[fr]": "Moteur EPub", + "Name[gl]": "Infraestrutura de EPub", "Name[ia]": "Retro-Administration de EPub", "Name[it]": "Backend EPub", "Name[ko]": "EPub 백엔드", diff --git a/generators/fax/libokularGenerator_fax.json b/generators/fax/libokularGenerator_fax.json index 6f8143250..95af059a4 100644 --- a/generators/fax/libokularGenerator_fax.json +++ b/generators/fax/libokularGenerator_fax.json @@ -33,6 +33,7 @@ "Description[et]": "G3/G4 faksidokumendi taustaprogramm", "Description[fi]": "G3/G4-faksitiedostotaustaosa", "Description[fr]": "Un moteur de document fax G3/G4", + "Description[gl]": "Unha infraestrutura de documentos de fax G3/G4", "Description[ia]": "UN retro-administration de documento fax G3/G4", "Description[it]": "Un backend per documenti fax G3/G4", "Description[ko]": "G3/G4 팩스 문서 백엔드", @@ -70,6 +71,7 @@ "Name[et]": "Faksi taustaprogramm", "Name[fi]": "Faksitaustaosa", "Name[fr]": "Moteur Fax", + "Name[gl]": "Infraestrutura de fax", "Name[ia]": "Retro-Administration de fax", "Name[it]": "Backend fax", "Name[ko]": "팩스 백엔드", diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json index dfb708fd4..aad318709 100644 --- a/generators/fictionbook/libokularGenerator_fb.json +++ b/generators/fictionbook/libokularGenerator_fb.json @@ -34,6 +34,7 @@ "Description[et]": "FictionBooki e-raamatute renderdaja", "Description[fi]": "FictionBook-e-kirjojen hahmonnin", "Description[fr]": "Système de rendu pour les livres électroniques FictionBook", + "Description[gl]": "Un visor de libros electrónicos FictionBook.", "Description[ia]": "Un rendition pro eBooks (Libros electronic) de FictionBook", "Description[it]": "Un visualizzatore per ebook FictionBook", "Description[ko]": "FictionBook 전자책 렌더러", @@ -69,6 +70,7 @@ "Name[et]": "Fiction Booki taustaprogramm", "Name[fi]": "FictionBook-taustaosa", "Name[fr]": "Moteur pour FictionBook", + "Name[gl]": "Infraestrutura para libros FictionBook", "Name[ia]": "Retro adminisration de Fiction Book", "Name[it]": "Backend Fiction Book", "Name[ko]": "Fiction Book 백엔드", diff --git a/generators/kimgio/libokularGenerator_kimgio.json b/generators/kimgio/libokularGenerator_kimgio.json index 35fb04ed8..78cb6d505 100644 --- a/generators/kimgio/libokularGenerator_kimgio.json +++ b/generators/kimgio/libokularGenerator_kimgio.json @@ -54,6 +54,7 @@ "Description[et]": "Lihtne pildi taustaprogramm", "Description[fi]": "Yksinkertainen kuvataustaosa", "Description[fr]": "Un moteur simple pour image", + "Description[gl]": "Unha infraestrutura simple para imaxes", "Description[ia]": "Un simplice retroadministration de image", "Description[it]": "Un semplice backend per le immagini", "Description[ko]": "간단한 그림 백엔드", @@ -111,6 +112,7 @@ "Name[et]": "Pildi taustaprogramm", "Name[fi]": "Kuvataustaosa", "Name[fr]": "Moteur image", + "Name[gl]": "Infraestrutura de imaxe", "Name[ia]": "Retro-Administration de Image", "Name[it]": "Backend immagini", "Name[ko]": "그림 백엔드", diff --git a/generators/mobipocket/libokularGenerator_mobi.json b/generators/mobipocket/libokularGenerator_mobi.json index 2b2c79aae..9ffa9dd90 100644 --- a/generators/mobipocket/libokularGenerator_mobi.json +++ b/generators/mobipocket/libokularGenerator_mobi.json @@ -34,6 +34,7 @@ "Description[et]": "Mobipocketi taustaprogramm", "Description[fi]": "MobiPocket-taustaosa", "Description[fr]": "Un moteur Mobipocket", + "Description[gl]": "Unha infraestrutura para mobipocket", "Description[ia]": "Un retro-administration de Mobipocket", "Description[it]": "Un backend per mobipocket", "Description[ko]": "Mobipocket 백엔드", @@ -69,6 +70,7 @@ "Name[et]": "Mobipocketi taustaprogramm", "Name[fi]": "Mobipocket-taustaosa", "Name[fr]": "Moteur Mobipocket", + "Name[gl]": "Infraestrutura para Mobipocket", "Name[ia]": "Retro-administration de Mobipocket", "Name[it]": "Backend Mobipocket", "Name[ko]": "Mobipocket 백엔드", diff --git a/generators/ooo/libokularGenerator_ooo.json b/generators/ooo/libokularGenerator_ooo.json index 0a2a1ef65..6a4382397 100644 --- a/generators/ooo/libokularGenerator_ooo.json +++ b/generators/ooo/libokularGenerator_ooo.json @@ -34,6 +34,7 @@ "Description[et]": "OpenDocument tekstidokumentide renderdaja", "Description[fi]": "OpenDocument-tekstitiedostojen hahmonnin", "Description[fr]": "Un système de rendu pour documents textes OpenDocument", + "Description[gl]": "Un renderizador de documentos de texto de OpenDocument", "Description[ia]": "Un programma de rendition pro documentos de texto de OpenDocument", "Description[it]": "Un visualizzatore per documenti OpenDocument Text", "Description[ko]": "OpenDocument 텍스트 문서 렌더러", @@ -69,6 +70,7 @@ "Name[et]": "OpenDocument teksti taustaprogramm", "Name[fi]": "OpenDocument-tekstitaustaosa", "Name[fr]": "Moteur pour texte OpenDocument", + "Name[gl]": "Infraestrutura para documentos de OpenDocument", "Name[ia]": "Retro-administration de Texto de OpenDocument", "Name[it]": "Backend OpenDocument Text", "Name[ko]": "OpenDocument 텍스트 백엔드", diff --git a/generators/plucker/libokularGenerator_plucker.json b/generators/plucker/libokularGenerator_plucker.json index 5aacdd95f..a7b4dd0a9 100644 --- a/generators/plucker/libokularGenerator_plucker.json +++ b/generators/plucker/libokularGenerator_plucker.json @@ -34,6 +34,7 @@ "Description[et]": "Pluckeri e-raamatute renderdaja", "Description[fi]": "Plucker-e-kirjojen hahmonnin", "Description[fr]": "Système de rendu pour les livres électroniques Plucker", + "Description[gl]": "Un visor de libros electrónicos Plucker", "Description[ia]": "Un rendition pro eBooks (Libros electronic) de Plucker", "Description[it]": "Un visualizzatore per eBook Plucker", "Description[ko]": "Plucker 전자책 렌더러", @@ -69,6 +70,7 @@ "Name[et]": "Pluckeri dokumendi taustaprogramm", "Name[fi]": "Plucker-tiedostotaustaosa", "Name[fr]": "Moteur de document Plucker", + "Name[gl]": "Infraestrutura para documentos Plucker", "Name[ia]": "Un retro-administration de documento Plucker", "Name[it]": "Backend per documenti Plucker", "Name[ko]": "Plucker 문서 백엔드", diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index bcf56f21f..9444b60af 100644 --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -34,6 +34,7 @@ "Description[et]": "PDF-faili renderdaja", "Description[fi]": "PDF-tiedostohahmonnin", "Description[fr]": "Système de rendu pour les fichiers « PDF »", + "Description[gl]": "Un visor de ficheiros PDF", "Description[ia]": "Un renditor de file de PDF", "Description[it]": "Un visualizzatore di file PDF", "Description[ko]": "PDF 파일 렌더러", @@ -71,6 +72,7 @@ "Name[et]": "PDF-i taustaprogramm", "Name[fi]": "PDF-taustaosa", "Name[fr]": "Moteur PDF", + "Name[gl]": "Infraestrutura de PDF", "Name[ia]": "Retro-administration de PDF", "Name[it]": "Backend PDF", "Name[ko]": "PDF 백엔드", diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index 03971c890..605306fcf 100644 --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -34,6 +34,7 @@ "Description[et]": "PostScript-faili renderdaja Spectre teegi alusel", "Description[fi]": "Spectre-kirjastoon pohjautuva PostScript-tiedostohahmonnin", "Description[fr]": "Système de rendu pour les fichiers « PostScript » utilisant la librairie Spectre", + "Description[gl]": "Un renderizador de ficheiros PostScript baseado na biblioteca Spectre.", "Description[it]": "Un visualizzatore di file PostScript basato sulla libreria Spectre", "Description[ko]": "Spectre 라이브러리를 사용하는 포스트스크립트 파일 렌더러", "Description[nl]": "Een renderer van PostScript bestanden gebaseerd op de bibliotheek Spectre", @@ -69,6 +70,7 @@ "Name[et]": "PS-i taustaprogramm", "Name[fi]": "PS-taustaosa", "Name[fr]": "Moteur PS", + "Name[gl]": "Infraestrutura para PS", "Name[ia]": "Retro-Administration de PS", "Name[it]": "Backend PS", "Name[ko]": "PS 백엔드", diff --git a/generators/tiff/libokularGenerator_tiff.json b/generators/tiff/libokularGenerator_tiff.json index 9d6863d74..19e698da7 100644 --- a/generators/tiff/libokularGenerator_tiff.json +++ b/generators/tiff/libokularGenerator_tiff.json @@ -32,6 +32,7 @@ "Description[et]": "TIFF-i taustaprogramm", "Description[fi]": "TIFF-taustaosa", "Description[fr]": "Un moteur TIFF", + "Description[gl]": "Unha infraestrutura para TIFF", "Description[ia]": "Un retro-administration de TIFF", "Description[it]": "Un backend per TIFF", "Description[ko]": "TIFF 백엔드", @@ -67,6 +68,7 @@ "Name[et]": "TIFF-i taustaprogramm", "Name[fi]": "TIFF-taustaosa", "Name[fr]": "Moteur TIFF", + "Name[gl]": "Infraestrutura para TIFF", "Name[ia]": "Retro-Administration de TIFF", "Name[it]": "Backend TIFF", "Name[ko]": "TIFF 백엔드", diff --git a/generators/txt/libokularGenerator_txt.json b/generators/txt/libokularGenerator_txt.json index 4a414ec38..089f937a5 100644 --- a/generators/txt/libokularGenerator_txt.json +++ b/generators/txt/libokularGenerator_txt.json @@ -31,6 +31,7 @@ "Description[et]": "Txt taustaprogramm", "Description[fi]": "Txt-taustaosa", "Description[fr]": "Moteur Txt", + "Description[gl]": "Infraestrutura para txt.", "Description[ia]": "Retro-administration per Txt ", "Description[it]": "Backend di testo semplice", "Description[ko]": "TXT 백엔드", @@ -65,6 +66,7 @@ "Name[et]": "Txt taustaprogramm", "Name[fi]": "Txt-taustaosa", "Name[fr]": "Moteur Txt", + "Name[gl]": "Infraestrutura para txt", "Name[ia]": "Retro-administration per Txt ", "Name[it]": "Backend di testo semplice", "Name[ko]": "TXT 백엔드", diff --git a/generators/xps/libokularGenerator_xps.json b/generators/xps/libokularGenerator_xps.json index 2e48a3e9c..4f411f39e 100644 --- a/generators/xps/libokularGenerator_xps.json +++ b/generators/xps/libokularGenerator_xps.json @@ -51,6 +51,7 @@ "Description[et]": "XPS-i taustaprogramm", "Description[fi]": "XPS-taustaosa", "Description[fr]": "Un moteur XPS", + "Description[gl]": "Unha infraestrutura para XPS", "Description[ia]": "Un retro-administration de XPS", "Description[it]": "Un backend per XPS", "Description[ko]": "XPS 백엔드", @@ -88,6 +89,7 @@ "Name[et]": "XPS-i taustaprogramm", "Name[fi]": "XPS-taustaosa", "Name[fr]": "Moteur XPS", + "Name[gl]": "Infraestrutura para XPS", "Name[ia]": "Retro-Administration de XPS", "Name[it]": "Backend XPS", "Name[ko]": "XPS 백엔드",