Commit b6614c4d 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 6bc9feab
......@@ -40,6 +40,7 @@
"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[ko]": "마이크로소프트 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",
......@@ -69,6 +70,7 @@
"Name[fi]": "CHM-taustaosa",
"Name[fr]": "Moteur CHM",
"Name[it]": "Backend CHM",
"Name[ko]": "CHM 백엔드",
"Name[nl]": "CHM-backend",
"Name[nn]": "CHM-motor",
"Name[pl]": "Silnik CHM",
......
......@@ -32,6 +32,7 @@
"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[ko]": "다양한 만화책 형식 렌더러",
"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.",
......@@ -64,6 +65,7 @@
"Name[fi]": "ComicBook-taustaosa",
"Name[fr]": "Moteur pour les livres de BD",
"Name[it]": "Backend ComicBook",
"Name[ko]": "만화책 백엔드",
"Name[nl]": "ComicBook-backend",
"Name[nn]": "ComicBook-motor",
"Name[pl]": "Moduł ComicBook",
......
......@@ -31,6 +31,7 @@
"Description[fi]": "DjVuLibreen perustuva DjVu-taustaosa",
"Description[fr]": "Moteur DjVu utilisant DjVuLibre",
"Description[it]": "Backend DjVu basato su DjVuLibre",
"Description[ko]": "DjVuLibre 기반 DjVu 백엔드",
"Description[nl]": "DjVu-backend gebaseerd op DjVuLibre",
"Description[nn]": "DjVu-motor basert på DjVuLibre",
"Description[pl]": "Silnik DjVu oparty na DjVuLibre",
......@@ -60,6 +61,7 @@
"Name[fi]": "DjVu-taustaosa",
"Name[fr]": "Moteur DjVu",
"Name[it]": "Backend DjVu",
"Name[ko]": "DjVu 백엔드",
"Name[nl]": "DjVu-backend",
"Name[nn]": "DjVu-motor",
"Name[pl]": "Silnik DjVu",
......
......@@ -29,6 +29,7 @@
"Description[fi]": "DVI-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour fichiers « DVI »",
"Description[it]": "Un visualizzatore di file DVI",
"Description[ko]": "DVI 파일 렌더러",
"Description[nl]": "Een DVI-bestandsweergever",
"Description[nn]": "Ein gjengjevar for DVI-filer",
"Description[pl]": "Wyświetlanie pliku DVI",
......@@ -58,6 +59,7 @@
"Name[fi]": "DVI-taustaosa",
"Name[fr]": "Moteur DVI",
"Name[it]": "Backend DVI",
"Name[ko]": "DVI 백엔드",
"Name[nl]": "DVI-backend",
"Name[nn]": "DVI-motor",
"Name[pl]": "Obsługa DVI",
......
......@@ -29,6 +29,7 @@
"Description[fi]": "EPub-taustaosa",
"Description[fr]": "Un moteur EPub",
"Description[it]": "Backend EPub",
"Description[ko]": "EPub 백엔드",
"Description[nl]": "Een EPub-backend",
"Description[nn]": "Ein EPUB-motor",
"Description[pl]": "Moduł EPub",
......@@ -58,6 +59,7 @@
"Name[fi]": "EPub-taustaosa",
"Name[fr]": "Moteur EPub",
"Name[it]": "Backend EPub",
"Name[ko]": "EPub 백엔드",
"Name[nl]": "EPub-backend",
"Name[nn]": "EPUB-motor",
"Name[pl]": "Moduł EPub",
......
......@@ -31,6 +31,7 @@
"Description[fi]": "G3/G4-faksitiedostotaustaosa",
"Description[fr]": "Un moteur de document fax G3/G4",
"Description[it]": "Un backend per documenti fax G3/G4",
"Description[ko]": "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",
......@@ -61,6 +62,7 @@
"Name[fi]": "Faksitaustaosa",
"Name[fr]": "Moteur Fax",
"Name[it]": "Backend fax",
"Name[ko]": "팩스 백엔드",
"Name[nl]": "Faxbackend",
"Name[nn]": "Faksmotor",
"Name[pl]": "Obsługa faksu",
......
......@@ -32,6 +32,7 @@
"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[ko]": "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",
......@@ -61,6 +62,7 @@
"Name[fi]": "FictionBook-taustaosa",
"Name[fr]": "Moteur pour FictionBook",
"Name[it]": "Backend Fiction Book",
"Name[ko]": "Fiction Book 백엔드",
"Name[nl]": "FictionBook-backend",
"Name[nn]": "FictionBook-motor",
"Name[pl]": "Obsługa Fiction Book",
......
......@@ -51,6 +51,7 @@
"Description[fi]": "Yksinkertainen kuvataustaosa",
"Description[fr]": "Un moteur simple pour image",
"Description[it]": "Un semplice backend per le immagini",
"Description[ko]": "간단한 그림 백엔드",
"Description[nl]": "Een eenvoudige afbeeldingsbackend",
"Description[nn]": "Ein enkel biletmotor",
"Description[pl]": "Silnik prostych obrazków",
......@@ -101,6 +102,7 @@
"Name[fi]": "Kuvataustaosa",
"Name[fr]": "Moteur image",
"Name[it]": "Backend immagini",
"Name[ko]": "그림 백엔드",
"Name[nl]": "Afbeeldings-backend",
"Name[nn]": "Biletmotor",
"Name[pl]": "Silnik obrazów",
......
......@@ -31,6 +31,7 @@
"Description[fi]": "MobiPocket-taustaosa",
"Description[fr]": "Un moteur Mobipocket",
"Description[it]": "Un backend per mobipocket",
"Description[ko]": "Mobipocket 백엔드",
"Description[nl]": "Een mobipocket-backend",
"Description[nn]": "Ein Mobipocket-motor",
"Description[pl]": "Obsługa mobipocket",
......@@ -60,6 +61,7 @@
"Name[fi]": "Mobipocket-taustaosa",
"Name[fr]": "Moteur Mobipocket",
"Name[it]": "Backend Mobipocket",
"Name[ko]": "Mobipocket 백엔드",
"Name[nl]": "Mobipocket-backend",
"Name[nn]": "Mobipocket-motor",
"Name[pl]": "Obsługa Mobipocket",
......
......@@ -32,6 +32,7 @@
"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[ko]": "OpenDocument 텍스트 문서 렌더러",
"Description[nl]": "Een viewer voor OpenDocument-tekstdocumenten",
"Description[nn]": "Ein lesar for OpenDocument-tekstdokument",
"Description[pl]": "Program wyświetlający dokumentów tekstowych OpenDocument",
......@@ -61,6 +62,7 @@
"Name[fi]": "OpenDocument-tekstitaustaosa",
"Name[fr]": "Moteur pour texte OpenDocument",
"Name[it]": "Backend OpenDocument Text",
"Name[ko]": "OpenDocument 텍스트 백엔드",
"Name[nl]": "OpenDocument-tekst-backend",
"Name[nn]": "OpenDocument-tekstmotor",
"Name[pl]": "Silnik dokumentów OpenDocument",
......
......@@ -32,6 +32,7 @@
"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[ko]": "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",
......@@ -61,6 +62,7 @@
"Name[fi]": "Plucker-tiedostotaustaosa",
"Name[fr]": "Moteur de document Plucker",
"Name[it]": "Backend per documenti Plucker",
"Name[ko]": "Plucker 문서 백엔드",
"Name[nl]": "Plucker Document-backend",
"Name[nn]": "Plucker-dokumentmotor",
"Name[pl]": "Obsługa dokumentów Plucker",
......
......@@ -31,6 +31,7 @@
"Description[fi]": "PDF-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour les fichiers « PDF »",
"Description[it]": "Un visualizzatore di file PDF",
"Description[ko]": "PDF 파일 렌더러",
"Description[nl]": "Een PDF-bestandsviewer",
"Description[nn]": "Ein gjengjevar for PDF-filer",
"Description[pl]": "Wyświetlanie pliku PDF",
......@@ -62,6 +63,7 @@
"Name[fi]": "PDF-taustaosa",
"Name[fr]": "Moteur PDF",
"Name[it]": "Backend PDF",
"Name[ko]": "PDF 백엔드",
"Name[nl]": "PDF-backend",
"Name[nn]": "PDF-motor",
"Name[pl]": "Silnik PDF",
......
......@@ -30,6 +30,7 @@
"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[ko]": "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",
......@@ -60,6 +61,7 @@
"Name[fi]": "PS-taustaosa",
"Name[fr]": "Moteur PS",
"Name[it]": "Backend PS",
"Name[ko]": "PS 백엔드",
"Name[nl]": "PS-backend",
"Name[nn]": "PS-motor",
"Name[pl]": "Silnik PS",
......
......@@ -31,6 +31,7 @@
"Description[fi]": "TIFF-taustaosa",
"Description[fr]": "Un moteur TIFF",
"Description[it]": "Un backend per TIFF",
"Description[ko]": "TIFF 백엔드",
"Description[nl]": "Een TIFF-backend",
"Description[nn]": "Ein TIFF-motor",
"Description[pl]": "Jeden z silników TIFF",
......@@ -60,6 +61,7 @@
"Name[fi]": "TIFF-taustaosa",
"Name[fr]": "Moteur TIFF",
"Name[it]": "Backend TIFF",
"Name[ko]": "TIFF 백엔드",
"Name[nl]": "TIFF-backend",
"Name[nn]": "TIFF-motor",
"Name[pl]": "Silnik TIFF",
......
......@@ -29,6 +29,7 @@
"Description[fi]": "Txt-taustaosa",
"Description[fr]": "Moteur Txt",
"Description[it]": "Backend di testo semplice",
"Description[ko]": "TXT 백엔드",
"Description[nl]": "Txt-backend",
"Description[nn]": "Txt-motor",
"Description[pl]": "Silnik tekstowy",
......@@ -57,6 +58,7 @@
"Name[fi]": "Txt-taustaosa",
"Name[fr]": "Moteur Txt",
"Name[it]": "Backend di testo semplice",
"Name[ko]": "TXT 백엔드",
"Name[nl]": "Txt-backend",
"Name[nn]": "Txt-motor",
"Name[pl]": "Silnik tekstowy",
......
......@@ -50,6 +50,7 @@
"Description[fi]": "XPS-taustaosa",
"Description[fr]": "Un moteur XPS",
"Description[it]": "Un backend per XPS",
"Description[ko]": "XPS 백엔드",
"Description[nl]": "Een XPS-backend",
"Description[nn]": "Ein XPS-motor",
"Description[pl]": "Jeden z silników XPS",
......@@ -80,6 +81,7 @@
"Name[fi]": "XPS-taustaosa",
"Name[fr]": "Moteur XPS",
"Name[it]": "Backend XPS",
"Name[ko]": "XPS 백엔드",
"Name[nl]": "XPS-backend",
"Name[nn]": "XPS-motor",
"Name[pl]": "Silnik XPS",
......
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