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"
9 years ago · e44b17080a
parent 93b824de9e
commit e44b17080a
16 changed files with 21 additions and 0 deletions
--- a/generators/chm/libokularGenerator_chmlib.json
+++ b/generators/chm/libokularGenerator_chmlib.json
@ -83,6 +83,7 @@
        "Name[sv]": "CHM-gränssnitt", 
        "Name[uk]": "Модуль CHM", 
        "Name[x-test]": "xxCHM Backendxx", 
        "Name[zh_CN]": "CHM 后端", 
        "Name[zh_TW]": "CHM 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/comicbook/libokularGenerator_comicbook.json
+++ b/generators/comicbook/libokularGenerator_comicbook.json
@ -79,6 +79,7 @@
        "Name[sv]": "Comic Book-gränssnitt", 
        "Name[uk]": "Модуль коміксів", 
        "Name[x-test]": "xxComicBook Backendxx", 
        "Name[zh_CN]": "漫画书后端", 
        "Name[zh_TW]": "ComicBook 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/djvu/libokularGenerator_djvu.json
+++ b/generators/djvu/libokularGenerator_djvu.json
@ -45,6 +45,7 @@
        "Description[sv]": "DjVu-gränssnitt baserat på DjVuLibre", 
        "Description[uk]": "Засіб обробки DjVu, заснований на DjVuLibre", 
        "Description[x-test]": "xxDjVu backend based on DjVuLibrexx", 
        "Description[zh_CN]": "基于 DjVuLibre 的 DjVu 后端", 
        "Description[zh_TW]": "基於 DjVuLibre 的 DjVu 後端介面", 
        "Id": "okular_djvu", 
        "License": "GPL", 
@ -74,6 +75,7 @@
        "Name[sv]": "DjVu-gränssnitt", 
        "Name[uk]": "Модуль DjVu", 
        "Name[x-test]": "xxDjVu Backendxx", 
        "Name[zh_CN]": "DjVu 后端", 
        "Name[zh_TW]": "DjVu 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/dvi/libokularGenerator_dvi.json
+++ b/generators/dvi/libokularGenerator_dvi.json
@ -72,6 +72,7 @@
        "Name[sv]": "DVI-gränssnitt", 
        "Name[uk]": "Модуль DVI", 
        "Name[x-test]": "xxDVI Backendxx", 
        "Name[zh_CN]": "DVI 后端", 
        "Name[zh_TW]": "DVI 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/epub/libokularGenerator_epub.json
+++ b/generators/epub/libokularGenerator_epub.json
@ -43,6 +43,7 @@
        "Description[sv]": "Ett Epub-gränssnitt", 
        "Description[uk]": "Сервер EPub", 
        "Description[x-test]": "xxAn EPub backendxx", 
        "Description[zh_CN]": "EPub 后端", 
        "Description[zh_TW]": "EPub 後端介面", 
        "Id": "okular_epub", 
        "License": "GPL", 
@ -72,6 +73,7 @@
        "Name[sv]": "Epub-gränssnitt", 
        "Name[uk]": "Модуль EPub", 
        "Name[x-test]": "xxEPub Backendxx", 
        "Name[zh_CN]": "EPub 后端", 
        "Name[zh_TW]": "EPub 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/fax/libokularGenerator_fax.json
+++ b/generators/fax/libokularGenerator_fax.json
@ -45,6 +45,7 @@
        "Description[sv]": "Ett G3/G4 telefax-dokumentgränssnitt", 
        "Description[uk]": "Сервер документів факсів G3/G4", 
        "Description[x-test]": "xxA G3/G4 fax document backendxx", 
        "Description[zh_CN]": "G3/G4 传真文档后端", 
        "Description[zh_TW]": "G3/G4 fax 文件後端介面", 
        "Id": "okular_fax", 
        "License": "GPL", 
@ -74,6 +75,7 @@
        "Name[sv]": "Telefax-gränssnitt", 
        "Name[uk]": "Модуль факсів", 
        "Name[x-test]": "xxFax Backendxx", 
        "Name[zh_CN]": "传真后端", 
        "Name[zh_TW]": "Fax 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/fictionbook/libokularGenerator_fb.json
+++ b/generators/fictionbook/libokularGenerator_fb.json
@ -75,6 +75,7 @@
        "Name[sv]": "Fiction Book-gränssnitt", 
        "Name[uk]": "Модуль белетристики", 
        "Name[x-test]": "xxFiction Book Backendxx", 
        "Name[zh_CN]": "Fiction Book 后端", 
        "Name[zh_TW]": "Fiction Book 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/kimgio/libokularGenerator_kimgio.json
+++ b/generators/kimgio/libokularGenerator_kimgio.json
@ -65,6 +65,7 @@
        "Description[sv]": "Ett enkelt bildgränssnitt", 
        "Description[uk]": "Проста програма для зображень", 
        "Description[x-test]": "xxA simple image backendxx", 
        "Description[zh_CN]": "简单的图像后端", 
        "Description[zh_TW]": "簡易的圖片後端介面", 
        "Id": "okular_kimgio", 
        "License": "GPL", 
@ -116,6 +117,7 @@
        "Name[sv]": "Bildgränssnitt", 
        "Name[uk]": "Модуль зображень", 
        "Name[x-test]": "xxImage Backendxx", 
        "Name[zh_CN]": "图像后端", 
        "Name[zh_TW]": "圖片後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/mobipocket/libokularGenerator_mobi.json
+++ b/generators/mobipocket/libokularGenerator_mobi.json
@ -74,6 +74,7 @@
        "Name[sv]": "Mobipocket-gränssnitt", 
        "Name[uk]": "Модуль Mobipocket", 
        "Name[x-test]": "xxMobipocket Backendxx", 
        "Name[zh_CN]": "Mobipocket 后端", 
        "Name[zh_TW]": "Mobipocket 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/ooo/libokularGenerator_ooo.json
+++ b/generators/ooo/libokularGenerator_ooo.json
@ -76,6 +76,7 @@
        "Name[sv]": "OpenDocument-textgränssnitt", 
        "Name[uk]": "Модуль текстових документів OpenDocument", 
        "Name[x-test]": "xxOpenDocument Text Backendxx", 
        "Name[zh_CN]": "开放文档(ODF)文本后端", 
        "Name[zh_TW]": "OpenDocument 文字檔後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/plucker/libokularGenerator_plucker.json
+++ b/generators/plucker/libokularGenerator_plucker.json
@ -76,6 +76,7 @@
        "Name[sv]": "Plucker-dokumentgränssnitt", 
        "Name[uk]": "Модуль документів Plucker", 
        "Name[x-test]": "xxPlucker Document Backendxx", 
        "Name[zh_CN]": "Plucker 文档后端", 
        "Name[zh_TW]": "Pluker 文件後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/poppler/libokularGenerator_poppler.json
+++ b/generators/poppler/libokularGenerator_poppler.json
@ -76,6 +76,7 @@
        "Name[sv]": "PDF-gränssnitt", 
        "Name[uk]": "Модуль PDF", 
        "Name[x-test]": "xxPDF Backendxx", 
        "Name[zh_CN]": "PDF 后端", 
        "Name[zh_TW]": "PDF 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/spectre/libokularGenerator_ghostview.json
+++ b/generators/spectre/libokularGenerator_ghostview.json
@ -74,6 +74,7 @@
        "Name[sv]": "PS-gränssnitt", 
        "Name[uk]": "Модуль PS", 
        "Name[x-test]": "xxPS Backendxx", 
        "Name[zh_CN]": "PS 后端", 
        "Name[zh_TW]": "PS 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/tiff/libokularGenerator_tiff.json
+++ b/generators/tiff/libokularGenerator_tiff.json
@ -74,6 +74,7 @@
        "Name[sv]": "TIFF-gränssnitt", 
        "Name[uk]": "Модуль TIFF", 
        "Name[x-test]": "xxTIFF Backendxx", 
        "Name[zh_CN]": "TIFF 后端", 
        "Name[zh_TW]": "TIFF 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/txt/libokularGenerator_txt.json
+++ b/generators/txt/libokularGenerator_txt.json
@ -72,6 +72,7 @@
        "Name[sv]": "Textgränssnitt", 
        "Name[uk]": "Модуль тексту", 
        "Name[x-test]": "xxTxt Backendxx", 
        "Name[zh_CN]": "纯文本后端", 
        "Name[zh_TW]": "Txt 後端介面", 
        "ServiceTypes": [
            "okular/Generator"
--- a/generators/xps/libokularGenerator_xps.json
+++ b/generators/xps/libokularGenerator_xps.json
@ -64,6 +64,7 @@
        "Description[sv]": "Ett XPS-gränssnitt", 
        "Description[uk]": "Програма для XPS", 
        "Description[x-test]": "xxAn XPS backendxx", 
        "Description[zh_CN]": "XPS 后端", 
        "Description[zh_TW]": "XPS 後端介面", 
        "Id": "okular_xps", 
        "License": "GPL", 
@ -94,6 +95,7 @@
        "Name[sv]": "XPS-gränssnitt", 
        "Name[uk]": "Модуль XPS", 
        "Name[x-test]": "xxXPS Backendxx", 
        "Name[zh_CN]": "XPS 后端", 
        "Name[zh_TW]": "XPS 後端介面", 
        "ServiceTypes": [
            "okular/Generator"