Commit 91e740c2 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 4e04c12d
......@@ -13,6 +13,7 @@
{
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid",
"Name[ia]": "Albert Astals Cid",
"Name[sr@ijekavian]": "Алберт Асталс Сид",
"Name[sr@ijekavianlatin]": "Albert Astals Sid",
"Name[sr@latin]": "Albert Astals Sid",
......@@ -41,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[ia]": "Un rendition de file de adjuta de Microsoft Windows",
"Description[it]": "Un visualizzatore per file di aiuto di Microsoft Windows",
"Description[ko]": "마이크로소프트 Windows 도움말 파일 표시기",
"Description[nl]": "Een viewer voor Microsoft Windows-helpbestanden",
......@@ -73,6 +75,7 @@
"Name[et]": "CHM-i taustaprogramm",
"Name[fi]": "CHM-taustaosa",
"Name[fr]": "Moteur CHM",
"Name[ia]": "Retro-Administration de CHM",
"Name[it]": "Backend CHM",
"Name[ko]": "CHM 백엔드",
"Name[nl]": "CHM-backend",
......
......@@ -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[ia]": "Un rendition pro varie formatos de libros comic",
"Description[it]": "Un visualizzatore per vari formati di strisce a fumetti",
"Description[ko]": "다양한 만화책 형식 렌더러",
"Description[nl]": "Een viewer voor diverse ComicBook-formaten",
......@@ -69,6 +70,7 @@
"Name[et]": "ComicBooki taustaprogramm",
"Name[fi]": "ComicBook-taustaosa",
"Name[fr]": "Moteur pour les livres de BD",
"Name[ia]": "Retro-Administration de libros de comic",
"Name[it]": "Backend ComicBook",
"Name[ko]": "만화책 백엔드",
"Name[nl]": "ComicBook-backend",
......
......@@ -32,6 +32,7 @@
"Description[et]": "DjVu taustaprogramm DjVuLibre alusel",
"Description[fi]": "DjVuLibreen perustuva DjVu-taustaosa",
"Description[fr]": "Moteur DjVu utilisant DjVuLibre",
"Description[ia]": "Retro-Administration de DjVu basate sur DjVuLibre.",
"Description[it]": "Backend DjVu basato su DjVuLibre",
"Description[ko]": "DjVuLibre 기반 DjVu 백엔드",
"Description[nl]": "DjVu-backend gebaseerd op DjVuLibre",
......@@ -66,6 +67,7 @@
"Name[et]": "DjVu taustaprogramm",
"Name[fi]": "DjVu-taustaosa",
"Name[fr]": "Moteur DjVu",
"Name[ia]": "Retro-Administration de DjVu",
"Name[it]": "Backend DjVu",
"Name[ko]": "DjVu 백엔드",
"Name[nl]": "DjVu-backend",
......
......@@ -13,6 +13,7 @@
],
"Copyright": "© 2006 Luigi Toscano",
"Copyright[et]": "© 2006: Luigi Toscano",
"Copyright[ia]": "© 2006 Pino Toscano",
"Copyright[ru]": "© Luigi Toscano, 2006",
"Copyright[sr@ijekavian]": "© 2006, Луиђи Тоскано",
"Copyright[sr@ijekavianlatin]": "© 2006, Luiđi Toskano",
......@@ -30,6 +31,7 @@
"Description[et]": "DVI-faili renderdaja",
"Description[fi]": "DVI-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour fichiers « DVI »",
"Description[ia]": "Un renditor de file de DVI",
"Description[it]": "Un visualizzatore di file DVI",
"Description[ko]": "DVI 파일 렌더러",
"Description[nl]": "Een DVI-bestandsweergever",
......@@ -62,6 +64,7 @@
"Name[et]": "DVI taustaprogramm",
"Name[fi]": "DVI-taustaosa",
"Name[fr]": "Moteur DVI",
"Name[ia]": "Retro-administration de DVI",
"Name[it]": "Backend DVI",
"Name[ko]": "DVI 백엔드",
"Name[nl]": "DVI-backend",
......
......@@ -30,6 +30,7 @@
"Description[et]": "EPubi taustaprogramm",
"Description[fi]": "EPub-taustaosa",
"Description[fr]": "Un moteur EPub",
"Description[ia]": "Un retro-administration de EPub",
"Description[it]": "Backend EPub",
"Description[ko]": "EPub 백엔드",
"Description[nl]": "Een EPub-backend",
......@@ -64,6 +65,7 @@
"Name[et]": "EPubi taustaprogramm",
"Name[fi]": "EPub-taustaosa",
"Name[fr]": "Moteur EPub",
"Name[ia]": "Retro-Administration de EPub",
"Name[it]": "Backend EPub",
"Name[ko]": "EPub 백엔드",
"Name[nl]": "EPub-backend",
......
......@@ -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[ia]": "UN retro-administration de documento 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",
......@@ -68,6 +69,7 @@
"Name[et]": "Faksi taustaprogramm",
"Name[fi]": "Faksitaustaosa",
"Name[fr]": "Moteur Fax",
"Name[ia]": "Retro-Administration de fax",
"Name[it]": "Backend fax",
"Name[ko]": "팩스 백엔드",
"Name[nl]": "Faxbackend",
......
......@@ -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[ia]": "Un rendition pro eBooks (Libros electronic) de FictionBook",
"Description[it]": "Un visualizzatore per ebook FictionBook",
"Description[ko]": "FictionBook 전자책 렌더러",
"Description[nl]": "Een viewer voor FictionBooks eBooks",
......@@ -66,6 +67,7 @@
"Name[et]": "Fiction Booki taustaprogramm",
"Name[fi]": "FictionBook-taustaosa",
"Name[fr]": "Moteur pour FictionBook",
"Name[ia]": "Retro adminisration de Fiction Book",
"Name[it]": "Backend Fiction Book",
"Name[ko]": "Fiction Book 백엔드",
"Name[nl]": "FictionBook-backend",
......
......@@ -4,6 +4,7 @@
{
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid",
"Name[ia]": "Albert Astals Cid",
"Name[sr@ijekavian]": "Алберт Асталс Сид",
"Name[sr@ijekavianlatin]": "Albert Astals Sid",
"Name[sr@latin]": "Albert Astals Sid",
......@@ -53,6 +54,7 @@
"Description[et]": "Lihtne pildi taustaprogramm",
"Description[fi]": "Yksinkertainen kuvataustaosa",
"Description[fr]": "Un moteur simple pour image",
"Description[ia]": "Un simplice retroadministration de image",
"Description[it]": "Un semplice backend per le immagini",
"Description[ko]": "간단한 그림 백엔드",
"Description[nl]": "Een eenvoudige afbeeldingsbackend",
......@@ -108,6 +110,7 @@
"Name[et]": "Pildi taustaprogramm",
"Name[fi]": "Kuvataustaosa",
"Name[fr]": "Moteur image",
"Name[ia]": "Retro-Administration de Image",
"Name[it]": "Backend immagini",
"Name[ko]": "그림 백엔드",
"Name[nl]": "Afbeeldings-backend",
......
......@@ -4,6 +4,7 @@
{
"Email": "qbast@go2.pl",
"Name": "Jakub Stachowski",
"Name[ia]": " Jakub Stachowski",
"Name[sr@ijekavian]": "Јакуб Стаховски",
"Name[sr@ijekavianlatin]": "Jakub Stahovski",
"Name[sr@latin]": "Jakub Stahovski",
......@@ -14,6 +15,7 @@
"Copyright": "© 2008-2009 Jakub Stachowski",
"Copyright[et]": "© 2008-2009: Jakub Stachowski",
"Copyright[fi]": "© 2008–2009 Jakub Stachowski",
"Copyright[ia]": "© 2008-2009 Jakub Stachowski",
"Copyright[nn]": "© 2008–2009 Jakub Stachowski",
"Copyright[ru]": "© Jakub Stachowski, 2008-2009",
"Copyright[sr@ijekavian]": "© 2008—2009, Јакуб Стаховски",
......@@ -32,6 +34,7 @@
"Description[et]": "Mobipocketi taustaprogramm",
"Description[fi]": "MobiPocket-taustaosa",
"Description[fr]": "Un moteur Mobipocket",
"Description[ia]": "Un retro-administration de Mobipocket",
"Description[it]": "Un backend per mobipocket",
"Description[ko]": "Mobipocket 백엔드",
"Description[nl]": "Een mobipocket-backend",
......@@ -64,6 +67,7 @@
"Name[et]": "Mobipocketi taustaprogramm",
"Name[fi]": "Mobipocket-taustaosa",
"Name[fr]": "Moteur Mobipocket",
"Name[ia]": "Retro-administration de Mobipocket",
"Name[it]": "Backend Mobipocket",
"Name[ko]": "Mobipocket 백엔드",
"Name[nl]": "Mobipocket-backend",
......
......@@ -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[ia]": "Un programma de rendition pro documentos de texto de OpenDocument",
"Description[it]": "Un visualizzatore per documenti OpenDocument Text",
"Description[ko]": "OpenDocument 텍스트 문서 렌더러",
"Description[nl]": "Een viewer voor OpenDocument-tekstdocumenten",
......@@ -66,6 +67,7 @@
"Name[et]": "OpenDocument teksti taustaprogramm",
"Name[fi]": "OpenDocument-tekstitaustaosa",
"Name[fr]": "Moteur pour texte OpenDocument",
"Name[ia]": "Retro-administration de Texto de OpenDocument",
"Name[it]": "Backend OpenDocument Text",
"Name[ko]": "OpenDocument 텍스트 백엔드",
"Name[nl]": "OpenDocument-tekst-backend",
......
......@@ -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[ia]": "Un rendition pro eBooks (Libros electronic) de Plucker",
"Description[it]": "Un visualizzatore per eBook Plucker",
"Description[ko]": "Plucker 전자책 렌더러",
"Description[nl]": "Een viewer voor Plucker eBooks",
......@@ -66,6 +67,7 @@
"Name[et]": "Pluckeri dokumendi taustaprogramm",
"Name[fi]": "Plucker-tiedostotaustaosa",
"Name[fr]": "Moteur de document Plucker",
"Name[ia]": "Un retro-administration de documento Plucker",
"Name[it]": "Backend per documenti Plucker",
"Name[ko]": "Plucker 문서 백엔드",
"Name[nl]": "Plucker Document-backend",
......
......@@ -4,6 +4,7 @@
{
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid",
"Name[ia]": "Albert Astals Cid",
"Name[sr@ijekavian]": "Алберт Асталс Сид",
"Name[sr@ijekavianlatin]": "Albert Astals Sid",
"Name[sr@latin]": "Albert Astals Sid",
......@@ -14,6 +15,7 @@
"Copyright": "© 2005-2008 Albert Astals Cid",
"Copyright[et]": "© 2005-2008: Albert Astals Cid",
"Copyright[fi]": "© 2005–2008 Albert Astals Cid",
"Copyright[ia]": "Albert Astals Cid",
"Copyright[nn]": "© 2005–2008 Albert Astals Cid",
"Copyright[ru]": "© Albert Astals Cid, 2005-2008",
"Copyright[sr@ijekavian]": "© 2005–2008, Алберт Асталс Сид",
......@@ -32,6 +34,7 @@
"Description[et]": "PDF-faili renderdaja",
"Description[fi]": "PDF-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour les fichiers « PDF »",
"Description[ia]": "Un renditor de file de PDF",
"Description[it]": "Un visualizzatore di file PDF",
"Description[ko]": "PDF 파일 렌더러",
"Description[nl]": "Een PDF-bestandsviewer",
......@@ -66,6 +69,7 @@
"Name[et]": "PDF-i taustaprogramm",
"Name[fi]": "PDF-taustaosa",
"Name[fr]": "Moteur PDF",
"Name[ia]": "Retro-administration de PDF",
"Name[it]": "Backend PDF",
"Name[ko]": "PDF 백엔드",
"Name[nl]": "PDF-backend",
......
......@@ -4,6 +4,7 @@
{
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid",
"Name[ia]": "Albert Astals Cid",
"Name[sr@ijekavian]": "Алберт Асталс Сид",
"Name[sr@ijekavianlatin]": "Albert Astals Sid",
"Name[sr@latin]": "Albert Astals Sid",
......@@ -14,6 +15,7 @@
"Copyright": "© 2007-2008 Albert Astals Cid",
"Copyright[et]": "© 2007-2008: Albert Astals Cid",
"Copyright[fi]": "© 2007–2008 Albert Astals Cid",
"Copyright[ia]": "Albert Astals Cid",
"Copyright[nn]": "© 2007–2008 Albert Astals Cid",
"Copyright[ru]": "© Albert Astals Cid, 2007-2008",
"Copyright[sr@ijekavian]": "© 2007–2008, Алберт Асталс Сид",
......@@ -65,6 +67,7 @@
"Name[et]": "PS-i taustaprogramm",
"Name[fi]": "PS-taustaosa",
"Name[fr]": "Moteur PS",
"Name[ia]": "Retro-Administration de PS",
"Name[it]": "Backend PS",
"Name[ko]": "PS 백엔드",
"Name[nl]": "PS-backend",
......
......@@ -32,6 +32,7 @@
"Description[et]": "TIFF-i taustaprogramm",
"Description[fi]": "TIFF-taustaosa",
"Description[fr]": "Un moteur TIFF",
"Description[ia]": "Un retro-administration de TIFF",
"Description[it]": "Un backend per TIFF",
"Description[ko]": "TIFF 백엔드",
"Description[nl]": "Een TIFF-backend",
......@@ -64,6 +65,7 @@
"Name[et]": "TIFF-i taustaprogramm",
"Name[fi]": "TIFF-taustaosa",
"Name[fr]": "Moteur TIFF",
"Name[ia]": "Retro-Administration de TIFF",
"Name[it]": "Backend TIFF",
"Name[ko]": "TIFF 백엔드",
"Name[nl]": "TIFF-backend",
......
......@@ -31,6 +31,7 @@
"Description[et]": "Txt taustaprogramm",
"Description[fi]": "Txt-taustaosa",
"Description[fr]": "Moteur Txt",
"Description[ia]": "Retro-administration per Txt ",
"Description[it]": "Backend di testo semplice",
"Description[ko]": "TXT 백엔드",
"Description[nl]": "Txt-backend",
......@@ -62,6 +63,7 @@
"Name[et]": "Txt taustaprogramm",
"Name[fi]": "Txt-taustaosa",
"Name[fr]": "Moteur Txt",
"Name[ia]": "Retro-administration per Txt ",
"Name[it]": "Backend di testo semplice",
"Name[ko]": "TXT 백엔드",
"Name[nl]": "Txt-backend",
......
......@@ -51,6 +51,7 @@
"Description[et]": "XPS-i taustaprogramm",
"Description[fi]": "XPS-taustaosa",
"Description[fr]": "Un moteur XPS",
"Description[ia]": "Un retro-administration de XPS",
"Description[it]": "Un backend per XPS",
"Description[ko]": "XPS 백엔드",
"Description[nl]": "Een XPS-backend",
......@@ -86,6 +87,7 @@
"Name[et]": "XPS-i taustaprogramm",
"Name[fi]": "XPS-taustaosa",
"Name[fr]": "Moteur XPS",
"Name[ia]": "Retro-Administration de XPS",
"Name[it]": "Backend XPS",
"Name[ko]": "XPS 백엔드",
"Name[nl]": "XPS-backend",
......
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