Commit 191e1030 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 ce4057c8
......@@ -2,28 +2,28 @@
"KPlugin": {
"Authors": [
{
"Email": "niedakh@gmail.com",
"Email": "niedakh@gmail.com",
"Name": "Piotr Szymański"
},
},
{
"Email": "aacid@kde.org",
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid"
}
],
"Copyright": "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid",
"Description": "A Microsoft Windows help file renderer",
"License": "GPL",
],
"Copyright": "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid",
"Description": "A Microsoft Windows help file renderer",
"Id": "okular_chm",
"License": "GPL",
"MimeTypes": [
"application/x-chm"
],
"Name": "CHM Backend",
"Id": "okular_chm",
],
"Name": "CHM Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.1.4"
},
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,27 +2,27 @@
"KPlugin": {
"Authors": [
{
"Email": "tokoe@kde.org",
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
}
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Description": "A renderer for various comic book formats",
"Id": "okular_comicbook",
"License": "GPL",
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Description": "A renderer for various comic book formats",
"Id": "okular_comicbook",
"License": "GPL",
"MimeTypes": [
"application/x-cbz",
"application/x-cbr",
"application/x-cbt",
"application/x-cbz",
"application/x-cbr",
"application/x-cbt",
"inode/directory"
],
"Name": "ComicBook Backend",
],
"Name": "ComicBook Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.4"
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,24 +2,24 @@
"KPlugin": {
"Authors": [
{
"Email": "pino@kde.org",
"Email": "pino@kde.org",
"Name": "Pino Toscano"
}
],
"Copyright": "© 2006-2008 Pino Toscano",
"Description": "DjVu backend based on DjVuLibre",
"Id": "okular_djvu",
"License": "GPL",
],
"Copyright": "© 2006-2008 Pino Toscano",
"Description": "DjVu backend based on DjVuLibre",
"Id": "okular_djvu",
"License": "GPL",
"MimeTypes": [
"image/vnd.djvu"
],
"Name": "DjVu Backend",
],
"Name": "DjVu Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.2.3"
},
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,24 +2,24 @@
"KPlugin": {
"Authors": [
{
"Email": "luigi.toscano@tiscali.it",
"Email": "luigi.toscano@tiscali.it",
"Name": "Luigi Toscano"
}
],
"Copyright": "© 2006 Luigi Toscano",
"Description": "A DVI file renderer",
"Id": "okular_dvi",
"License": "GPL",
],
"Copyright": "© 2006 Luigi Toscano",
"Description": "A DVI file renderer",
"Id": "okular_dvi",
"License": "GPL",
"MimeTypes": [
"application/x-dvi"
],
"Name": "DVI Backend",
],
"Name": "DVI Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.3.7"
},
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 2,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,24 +2,24 @@
"KPlugin": {
"Authors": [
{
"Email": "elylevy@cs.huji.ac.il",
"Email": "elylevy@cs.huji.ac.il",
"Name": "Ely Levy"
}
],
"Copyright": "© 2008 Ely Levy",
"Description": "An EPub backend",
"Id": "okular_epub",
"License": "GPL",
],
"Copyright": "© 2008 Ely Levy",
"Description": "An EPub backend",
"Id": "okular_epub",
"License": "GPL",
"MimeTypes": [
"application/epub+zip"
],
"Name": "EPub Backend",
],
"Name": "EPub Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.2.3"
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,25 +2,25 @@
"KPlugin": {
"Authors": [
{
"Email": "tokoe@kde.org",
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
}
],
"Copyright": "© 2008 Tobias Koenig",
"Description": "A G3/G4 fax document backend",
"Id": "okular_fax",
"License": "GPL",
],
"Copyright": "© 2008 Tobias Koenig",
"Description": "A G3/G4 fax document backend",
"Id": "okular_fax",
"License": "GPL",
"MimeTypes": [
"image/fax-g3",
"image/fax-g3",
"image/g3fax"
],
"Name": "Fax Backend",
],
"Name": "Fax Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.1.1"
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,24 +2,24 @@
"KPlugin": {
"Authors": [
{
"Email": "tokoe@kde.org",
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
}
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Description": "A renderer for FictionBook eBooks",
"Id": "okular_fax",
"License": "GPL",
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Description": "A renderer for FictionBook eBooks",
"Id": "okular_fax",
"License": "GPL",
"MimeTypes": [
"application/x-fictionbook+xml"
],
"Name": "Fiction Book Backend",
],
"Name": "Fiction Book Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.1.5"
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,51 +2,53 @@
"KPlugin": {
"Authors": [
{
"Email": "aacid@kde.org",
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid"
}, {
"Email": "pino@kde.org",
},
{
"Email": "pino@kde.org",
"Name": "Pino Toscano"
}, {
"Email": "tokoe@kde.org",
},
{
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
}
],
"Copyright": "© 2005, 2009 Albert Astals Cid\n© 2006-2007 Pino Toscano\n© 2006-2007 Tobias Koenig",
"Description": "A simple image backend",
"Id": "okular_kimgio",
"License": "GPL",
],
"Copyright": "© 2005, 2009 Albert Astals Cid\n© 2006-2007 Pino Toscano\n© 2006-2007 Tobias Koenig",
"Description": "A simple image backend",
"Id": "okular_kimgio",
"License": "GPL",
"MimeTypes": [
"image/bmp",
"image/x-dds",
"image/x-eps",
"image/x-exr",
"image/gif",
"image/x-hdr",
"image/x-ico",
"image/jp2",
"image/jpeg",
"video/x-mng",
"image/x-portable-bitmap",
"image/x-pcx",
"image/x-portable-graymap",
"image/png",
"image/x-portable-pixmap",
"image/x-psd",
"image/x-rgb",
"image/x-tga",
"image/tiff",
"image/x-xbitmap",
"image/x-xcf",
"image/bmp",
"image/x-dds",
"image/x-eps",
"image/x-exr",
"image/gif",
"image/x-hdr",
"image/x-ico",
"image/jp2",
"image/jpeg",
"video/x-mng",
"image/x-portable-bitmap",
"image/x-pcx",
"image/x-portable-graymap",
"image/png",
"image/x-portable-pixmap",
"image/x-psd",
"image/x-rgb",
"image/x-tga",
"image/tiff",
"image/x-xbitmap",
"image/x-xcf",
"image/x-xpixmap"
],
"Name": "Image Backend",
],
"Name": "Image Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.1.2"
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,24 +2,24 @@
"KPlugin": {
"Authors": [
{
"Email": "qbast@go2.pl",
"Email": "qbast@go2.pl",
"Name": "Jakub Stachowski"
}
],
"Copyright": "© 2008-2009 Jakub Stachowski",
"Description": "A mobipocket backend",
"Id": "okular_mobi",
"License": "GPL",
],
"Copyright": "© 2008-2009 Jakub Stachowski",
"Description": "A mobipocket backend",
"Id": "okular_mobi",
"License": "GPL",
"MimeTypes": [
"application/x-mobipocket-ebook"
],
"Name": "Mobipocket Backend",
],
"Name": "Mobipocket Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.1.1"
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -155,8 +155,9 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
TryExec=okular
Exec=okular %U
Exec=okular %U
Icon=okular
Type=Application
InitialPreference=1
......
......@@ -2,24 +2,24 @@
"KPlugin": {
"Authors": [
{
"Email": "tokoe@kde.org",
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
}
],
"Copyright": "© 2006-2008 Tobias Koenig",
"Description": "A renderer for OpenDocument Text documents",
"Id": "okular_ooo",
"License": "GPL",
],
"Copyright": "© 2006-2008 Tobias Koenig",
"Description": "A renderer for OpenDocument Text documents",
"Id": "okular_ooo",
"License": "GPL",
"MimeTypes": [
"application/vnd.oasis.opendocument.text"
],
"Name": "OpenDocument Text Backend",
],
"Name": "OpenDocument Text Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.2.4"
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": true
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,24 +2,24 @@
"KPlugin": {
"Authors": [
{
"Email": "tokoe@kde.org",
"Email": "tokoe@kde.org",
"Name": "Tobias Koenig"
}
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Description": "A renderer for Plucker eBooks",
"Id": "okular_plucker",
"License": "GPL",
],
"Copyright": "© 2007-2008 Tobias Koenig",
"Description": "A renderer for Plucker eBooks",
"Id": "okular_plucker",
"License": "GPL",
"MimeTypes": [
"application/prs.plucker"
],
"Name": "Plucker Document Backend",
],
"Name": "Plucker Document Backend",
"ServiceTypes": [
"okular/Generator"
],
],
"Version": "0.1.1"
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
},
"X-KDE-Priority": 1,
"X-KDE-okularAPIVersion": 1,
"X-KDE-okularHasInternalSettings": false
}
}
\ No newline at end of file
......@@ -155,6 +155,7 @@ Comment[sr@latin]=Univerzalni prikazivač dokumenata
Comment[sv]=Generell dokumentvisare
Comment[uk]=Універсальний переглядач документів
Comment[x-test]=xxUniversal document viewerxx
Comment[zh_TW]=通用文件檢視器
Exec=okular %U
Icon=okular
Type=Application
......
......@@ -2,26 +2,26 @@
"KPlugin": {
"Authors": [
{
"Email": "aacid@kde.org",
"Email": "aacid@kde.org",
"Name": "Albert Astals Cid"
}
],
"Copyright": "© 2005-2008 Albert Astals Cid",
"Description": "A PDF file renderer",
"Id": "okular_poppler",
"License": "GPL",
],
"Copyright": "© 2005-2008 Albert Astals Cid",
"Description": "A PDF file renderer",
"Id": "okular_poppler",
"License": "GPL",
"MimeTypes": [
"application/x-pdf",
"application/pdf",
"application/x-pdf",
"application/pdf",
"application/x-wwf"
],
"Name": "PDF Backend",