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

@@ -13,6 +13,7 @@
             }
         ], 
         "Copyright": "© 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", 
         "Description": "A Microsoft Windows help file renderer", 
@@ -22,6 +23,7 @@
         "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", 
+        "Description[nn]": "Ein framvisar for Microsoft Windows-hjelpefiler", 
         "Description[pl]": "System zajmujący się wyświetlaniem plików pomocy Microsoft Windows", 
         "Description[pt]": "Um visualizador de ficheiros de ajuda do Microsoft Windows", 
         "Description[sk]": "Vykresľovanie súborov pomocníka Microsoft Windows", 
@@ -41,6 +43,7 @@
         "Name[es]": "Motor para CHM", 
         "Name[it]": "Backend CHM", 
         "Name[nl]": "CHM-backend", 
+        "Name[nn]": "CHM-motor", 
         "Name[pl]": "Silnik CHM", 
         "Name[pt]": "Infra-Estrutura de CHM", 
         "Name[sl]": "Zaledje za CHM", 

generators/comicbook/libokularGenerator_comicbook.json

@@ -4,10 +4,12 @@
             {
                 "Email": "tokoe@kde.org", 
                 "Name": "Tobias Koenig", 
+                "Name[nn]": "Tobias König", 
                 "Name[x-test]": "xxTobias Koenigxx"
             }
         ], 
         "Copyright": "© 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", 
         "Description": "A renderer for various comic book formats", 
@@ -17,6 +19,7 @@
         "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", 
+        "Description[nn]": "Ein gjengjevar for ulike teikneserieformat", 
         "Description[pl]": "Wyświetlanie różnych formatów comic book.", 
         "Description[pt]": "Um visualizador de diversos formatos de banda desenhada", 
         "Description[sk]": "Vykresľovanie rôznych formátov kníh komiksov", 
@@ -39,6 +42,7 @@
         "Name[es]": "Motor para ComicBook", 
         "Name[it]": "Backend ComicBook", 
         "Name[nl]": "ComicBook-backend", 
+        "Name[nn]": "ComicBook-motor", 
         "Name[pl]": "Moduł ComicBook", 
         "Name[pt]": "Infra-Estrutura de ComicBook (BD)", 
         "Name[sk]": "Backend pre knihy komiksov", 

generators/djvu/libokularGenerator_djvu.json

@@ -8,6 +8,7 @@
             }
         ], 
         "Copyright": "© 2006-2008 Pino Toscano", 
+        "Copyright[nn]": "© 2006–2008 Pino Toscano", 
         "Copyright[uk]": "© Pino Toscano, 2006–2008", 
         "Copyright[x-test]": "xx© 2006-2008 Pino Toscanoxx", 
         "Description": "DjVu backend based on DjVuLibre", 
@@ -17,6 +18,7 @@
         "Description[es]": "Motor DjVu basado en DjVuLibre", 
         "Description[it]": "Backend DjVu basato su DjVuLibre", 
         "Description[nl]": "DjVu-backend gebaseerd op DjVuLibre", 
+        "Description[nn]": "DjVu-motor basert på DjVuLibre", 
         "Description[pl]": "Silnik DjVu oparty na DjVuLibre", 
         "Description[pt]": "Infra-estrutura do DjVu com base no DjVuLibre", 
         "Description[sk]": "DjVu backend postavený na DjVuLibre", 
@@ -36,6 +38,7 @@
         "Name[es]": "Motor para DjVu", 
         "Name[it]": "Backend DjVu", 
         "Name[nl]": "DjVu-backend", 
+        "Name[nn]": "DjVu-motor", 
         "Name[pl]": "Silnik DjVu", 
         "Name[pt]": "Infra-Estrutura do DjVu", 
         "Name[sl]": "Zaledje za DjVu", 

generators/dvi/libokularGenerator_dvi.json

@@ -17,6 +17,7 @@
         "Description[es]": "Un visor de archivos DVI", 
         "Description[it]": "Un visualizzatore di file DVI", 
         "Description[nl]": "Een DVI-bestandsweergever", 
+        "Description[nn]": "Ein gjengjevar for DVI-filer", 
         "Description[pl]": "Wyświetlanie pliku DVI", 
         "Description[pt]": "Um visualizador de ficheiros DVI", 
         "Description[sk]": "Vykresľovanie DVI súborov", 
@@ -36,6 +37,7 @@
         "Name[es]": "Motor para DVI", 
         "Name[it]": "Backend DVI", 
         "Name[nl]": "DVI-backend", 
+        "Name[nn]": "DVI-motor", 
         "Name[pl]": "Obsługa DVI", 
         "Name[pt]": "Infra-Estrutura de DVI", 
         "Name[sl]": "Zaledje za DVI", 

generators/epub/libokularGenerator_epub.json

@@ -17,6 +17,7 @@
         "Description[es]": "Un motor para EPub", 
         "Description[it]": "Backend EPub", 
         "Description[nl]": "Een EPub-backend", 
+        "Description[nn]": "Ein EPUB-motor", 
         "Description[pl]": "Moduł EPub", 
         "Description[pt]": "Uma infra-estrutura de EPub", 
         "Description[sk]": "EPub backend", 
@@ -36,6 +37,7 @@
         "Name[es]": "Motor para EPub", 
         "Name[it]": "Backend EPub", 
         "Name[nl]": "EPub-backend", 
+        "Name[nn]": "EPUB-motor", 
         "Name[pl]": "Moduł EPub", 
         "Name[pt]": "Infra-Estrutura de EPub", 
         "Name[sl]": "Zaledje za EPub", 

generators/fax/libokularGenerator_fax.json

@@ -4,10 +4,12 @@
             {
                 "Email": "tokoe@kde.org", 
                 "Name": "Tobias Koenig", 
+                "Name[nn]": "Tobias König", 
                 "Name[x-test]": "xxTobias Koenigxx"
             }
         ], 
         "Copyright": "© 2008 Tobias Koenig", 
+        "Copyright[nn]": "© 2008 Tobias König", 
         "Copyright[uk]": "© Tobias Koenig, 2008", 
         "Copyright[x-test]": "xx© 2008 Tobias Koenigxx", 
         "Description": "A G3/G4 fax document backend", 
@@ -17,6 +19,7 @@
         "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", 
+        "Description[nn]": "Ein motor for G3/G4-faksdokument", 
         "Description[pl]": "Obsługa dokumentów faksowych G3/G4", 
         "Description[pt]": "Uma infra-estrutura de documentos de fax G3/G4", 
         "Description[sk]": "Backend dokumentu faxu G3/G4", 
@@ -37,6 +40,7 @@
         "Name[es]": "Motor para fax", 
         "Name[it]": "Backend fax", 
         "Name[nl]": "Faxbackend", 
+        "Name[nn]": "Faksmotor", 
         "Name[pl]": "Obsługa faksu", 
         "Name[sl]": "Zaledje za faks", 
         "Name[sv]": "Telefax-gränssnitt", 

generators/fictionbook/libokularGenerator_fb.json

@@ -4,10 +4,12 @@
             {
                 "Email": "tokoe@kde.org", 
                 "Name": "Tobias Koenig", 
+                "Name[nn]": "Tobias König", 
                 "Name[x-test]": "xxTobias Koenigxx"
             }
         ], 
         "Copyright": "© 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", 
         "Description": "A renderer for FictionBook eBooks", 
@@ -17,6 +19,7 @@
         "Description[es]": "Un visor para libros electrónicos FictionBook", 
         "Description[it]": "Un visualizzatore per ebook FictionBook", 
         "Description[nl]": "Een viewer voor FictionBooks eBooks", 
+        "Description[nn]": "Ein lesar for e-bøker av typen FictionBook", 
         "Description[pl]": "Wyświetlanie eksiążek FictionBook", 
         "Description[pt]": "Um visualizador de eBooks em FictionBook", 
         "Description[sk]": "Vykresľovanie e-kníh FictionBook", 
@@ -36,6 +39,7 @@
         "Name[es]": "Motor para Fiction Book", 
         "Name[it]": "Backend Fiction Book", 
         "Name[nl]": "FictionBook-backend", 
+        "Name[nn]": "FictionBook-motor", 
         "Name[pl]": "Obsługa Fiction Book", 
         "Name[pt]": "Infra-Estrutura de Livros de Ficção", 
         "Name[sl]": "Zaledje za FictionBook", 

generators/kimgio/libokularGenerator_kimgio.json

@@ -14,10 +14,12 @@
             {
                 "Email": "tokoe@kde.org", 
                 "Name": "Tobias Koenig", 
+                "Name[nn]": "Tobias König", 
                 "Name[x-test]": "xxTobias Koenigxx"
             }
         ], 
         "Copyright": "© 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", 
         "Copyright[x-test]": "xx© 2005, 2009 Albert Astals Cid\n© 2006-2007 Pino Toscano\n© 2006-2007 Tobias Koenigxx", 
@@ -28,6 +30,7 @@
         "Description[es]": "Un sencillo motor para imágenes", 
         "Description[it]": "Un semplice backend per le immagini", 
         "Description[nl]": "Een eenvoudige afbeeldingsbackend", 
+        "Description[nn]": "Ein enkel biletmotor", 
         "Description[pl]": "Silnik prostych obrazków", 
         "Description[pt]": "Uma infra-estrutura de imagens simples", 
         "Description[sk]": "Backend jednoduchých obrázkov", 
@@ -68,6 +71,7 @@
         "Name[es]": "Motor para imágenes", 
         "Name[it]": "Backend immagini", 
         "Name[nl]": "Afbeeldings-backend", 
+        "Name[nn]": "Biletmotor", 
         "Name[pl]": "Silnik obrazów", 
         "Name[pt]": "Infra-Estrutura de Imagens", 
         "Name[sk]": "Backend obrázkov", 

generators/mobipocket/libokularGenerator_mobi.json

@@ -8,6 +8,7 @@
             }
         ], 
         "Copyright": "© 2008-2009 Jakub Stachowski", 
+        "Copyright[nn]": "© 2008–2009 Jakub Stachowski", 
         "Copyright[uk]": "© Jakub Stachowski, 2008–2009", 
         "Copyright[x-test]": "xx© 2008-2009 Jakub Stachowskixx", 
         "Description": "A mobipocket backend", 
@@ -17,6 +18,7 @@
         "Description[es]": "Un motor para mobipocket", 
         "Description[it]": "Un backend per mobipocket", 
         "Description[nl]": "Een mobipocket-backend", 
+        "Description[nn]": "Ein Mobipocket-motor", 
         "Description[pl]": "Obsługa mobipocket", 
         "Description[pt]": "Uma infra-estrutura de Mobipocket", 
         "Description[sk]": "Mobipocket backend", 
@@ -36,6 +38,7 @@
         "Name[es]": "Motor para Mobipocket", 
         "Name[it]": "Backend Mobipocket", 
         "Name[nl]": "Mobipocket-backend", 
+        "Name[nn]": "Mobipocket-motor", 
         "Name[pl]": "Obsługa Mobipocket", 
         "Name[pt]": "Infra-Estrutura de Mobipocket", 
         "Name[sl]": "Zaledje za Mobipocket", 

generators/ooo/libokularGenerator_ooo.json

@@ -4,10 +4,12 @@
             {
                 "Email": "tokoe@kde.org", 
                 "Name": "Tobias Koenig", 
+                "Name[nn]": "Tobias König", 
                 "Name[x-test]": "xxTobias Koenigxx"
             }
         ], 
         "Copyright": "© 2006-2008 Tobias Koenig", 
+        "Copyright[nn]": "© 2006–2008 Tobias Koenig", 
         "Copyright[uk]": "© Tobias Koenig, 2006–2008", 
         "Copyright[x-test]": "xx© 2006-2008 Tobias Koenigxx", 
         "Description": "A renderer for OpenDocument Text documents", 
@@ -17,6 +19,7 @@
         "Description[es]": "Un visor para documentos de texto OpenDocument", 
         "Description[it]": "Un visualizzatore per documenti OpenDocument Text", 
         "Description[nl]": "Een viewer voor OpenDocument-tekstdocumenten", 
+        "Description[nn]": "Ein lesar for OpenDocument-tekstdokument", 
         "Description[pl]": "Program wyświetlający dokumentów tekstowych OpenDocument", 
         "Description[pt]": "Um visualizador de documentos de texto em OpenDocument", 
         "Description[sk]": "Vykresľovač pre textové dokumenty OpenDocument", 
@@ -36,6 +39,7 @@
         "Name[es]": "Motor para texto de OpenDocument", 
         "Name[it]": "Backend OpenDocument Text", 
         "Name[nl]": "OpenDocument-tekst-backend", 
+        "Name[nn]": "OpenDocument-tekstmotor", 
         "Name[pl]": "Silnik dokumentów OpenDocument", 
         "Name[pt]": "Infra-Estrutura de Texto em OpenDocument", 
         "Name[sk]": "Backend OpenDocument Text", 

generators/plucker/libokularGenerator_plucker.json

@@ -4,10 +4,12 @@
             {
                 "Email": "tokoe@kde.org", 
                 "Name": "Tobias Koenig", 
+                "Name[nn]": "Tobias König", 
                 "Name[x-test]": "xxTobias Koenigxx"
             }
         ], 
         "Copyright": "© 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", 
         "Description": "A renderer for Plucker eBooks", 
@@ -17,6 +19,7 @@
         "Description[es]": "Un visor de libros electrónicos Plucker", 
         "Description[it]": "Un visualizzatore per eBook Plucker", 
         "Description[nl]": "Een viewer voor Plucker eBooks", 
+        "Description[nn]": "Ein gjengjevar for Plucker-e-bøker", 
         "Description[pl]": "Wyświetlanie eksiążek w formacie Plucker", 
         "Description[pt]": "Um visualizador de eBooks do Plucker", 
         "Description[sk]": "Vykresľovanie e-kníh Plucker", 
@@ -36,6 +39,7 @@
         "Name[es]": "Motor para documento de Plucker", 
         "Name[it]": "Backend per documenti Plucker", 
         "Name[nl]": "Plucker Document-backend", 
+        "Name[nn]": "Plucker-dokumentmotor", 
         "Name[pl]": "Obsługa dokumentów Plucker", 
         "Name[pt]": "Infra-Estrutura de Documentos do Plucker", 
         "Name[sk]": "Backend dokumentov Plucker", 

generators/poppler/libokularGenerator_poppler.json

@@ -8,6 +8,7 @@
             }
         ], 
         "Copyright": "© 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", 
         "Description": "A PDF file renderer", 
@@ -17,6 +18,7 @@
         "Description[es]": "Un visor de archivos PDF", 
         "Description[it]": "Un visualizzatore di file PDF", 
         "Description[nl]": "Een PDF-bestandsviewer", 
+        "Description[nn]": "Ein gjengjevar for PDF-filer", 
         "Description[pl]": "Wyświetlanie pliku PDF", 
         "Description[pt]": "Um visualizador de ficheiros PDF", 
         "Description[sk]": "Vykresľovanie PDF súborov", 
@@ -38,6 +40,7 @@
         "Name[es]": "Motor para PDF", 
         "Name[it]": "Backend PDF", 
         "Name[nl]": "PDF-backend", 
+        "Name[nn]": "PDF-motor", 
         "Name[pl]": "Silnik PDF", 
         "Name[pt]": "Infra-Estrutura de PDF", 
         "Name[sl]": "Zaledje za PDF", 

generators/spectre/libokularGenerator_ghostview.json

@@ -8,6 +8,7 @@
             }
         ], 
         "Copyright": "© 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", 
         "Description": "A PostScript file renderer based on the Spectre library", 
@@ -17,6 +18,7 @@
         "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", 
+        "Description[nn]": "Ein gjengjevar for PostScript-filer, basert på Spectre-biblioteket", 
         "Description[pl]": "Wyświetlanie plików PostScript oparte o bibliotekę Spectre", 
         "Description[pt]": "Um visualzador de ficheiros PostScript com base na biblioteca Spectre", 
         "Description[sk]": "Renderovač PostScript súborov založený na knižnici Spectre", 
@@ -37,6 +39,7 @@
         "Name[es]": "Motor para PS", 
         "Name[it]": "Backend PS", 
         "Name[nl]": "PS-backend", 
+        "Name[nn]": "PS-motor", 
         "Name[pl]": "Silnik PS", 
         "Name[pt]": "Infra-Estrutura de PS", 
         "Name[sl]": "Zaledje za PS", 

generators/tiff/libokularGenerator_tiff.json

@@ -8,6 +8,7 @@
             }
         ], 
         "Copyright": "© 2006-2008 Pino Toscano", 
+        "Copyright[nn]": "© 2006–2008 Pino Toscano", 
         "Copyright[uk]": "© Pino Toscano, 2006–2008", 
         "Copyright[x-test]": "xx© 2006-2008 Pino Toscanoxx", 
         "Description": "A TIFF backend", 
@@ -17,6 +18,7 @@
         "Description[es]": "Un motor para TIFF", 
         "Description[it]": "Un backend per TIFF", 
         "Description[nl]": "Een TIFF-backend", 
+        "Description[nn]": "Ein TIFF-motor", 
         "Description[pl]": "Jeden z silników TIFF", 
         "Description[pt]": "Uma infra-estrutura de TIFF", 
         "Description[sk]": "TIFF backend", 
@@ -36,6 +38,7 @@
         "Name[es]": "Motor para TIFF", 
         "Name[it]": "Backend TIFF", 
         "Name[nl]": "TIFF-backend", 
+        "Name[nn]": "TIFF-motor", 
         "Name[pl]": "Silnik TIFF", 
         "Name[pt]": "Infra-Estrutura de TIFF", 
         "Name[sl]": "Zaledje za TIFF", 

generators/txt/libokularGenerator_txt.json

@@ -17,6 +17,7 @@
         "Description[es]": "Motor Txt", 
         "Description[it]": "Backend di testo semplice", 
         "Description[nl]": "Txt-backend", 
+        "Description[nn]": "Txt-motor", 
         "Description[pl]": "Silnik tekstowy", 
         "Description[pt]": "Infra-estrutura de TXT", 
         "Description[sl]": "Zaledje za txt", 
@@ -35,6 +36,7 @@
         "Name[es]": "Motor para Txt", 
         "Name[it]": "Backend di testo semplice", 
         "Name[nl]": "Txt-backend", 
+        "Name[nn]": "Txt-motor", 
         "Name[pl]": "Silnik tekstowy", 
         "Name[pt]": "Infra-Estrutura de TXT", 
         "Name[sk]": "Txt backend", 

generators/xps/libokularGenerator_xps.json

@@ -18,6 +18,7 @@
             }
         ], 
         "Copyright": "© 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", 
         "Description": "An XPS backend", 
@@ -27,6 +28,7 @@
         "Description[es]": "Un motor para XPS", 
         "Description[it]": "Un backend per XPS", 
         "Description[nl]": "Een XPS-backend", 
+        "Description[nn]": "Ein XPS-motor", 
         "Description[pl]": "Jeden z silników XPS", 
         "Description[pt]": "Uma infra-estrutura de XPS", 
         "Description[sk]": "XPS backend", 
@@ -47,6 +49,7 @@
         "Name[es]": "Motor para XPS", 
         "Name[it]": "Backend XPS", 
         "Name[nl]": "XPS-backend", 
+        "Name[nn]": "XPS-motor", 
         "Name[pl]": "Silnik XPS", 
         "Name[pt]": "Infra-Estrutura de XPS", 
         "Name[sl]": "Zaledje za XPS",