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"
2024-08-24 18:35:37 +00:00 · 2016-12-20 13:06:28 +01:00 · 2016-12-20 13:06:28 +01:00 · fb77e0d1fd
parent 006cb782a2
commit fb77e0d1fd
19 changed files with 0 additions and 19 deletions
--- a/core/okularGenerator.desktop
+++ b/core/okularGenerator.desktop
@ -3,7 +3,6 @@ Type=ServiceType
 X-KDE-ServiceType=okular/Generator
 Comment=File format backend for Okular
 Comment[ar]=المنتهى الخلفي لـنسق الملف لأوكلار
-Comment[ast]=Motor de formatos de ficheros pa Okular
 Comment[bg]=Ядро на Okular за файлови формати
 Comment[bs]=Pozadina formata datoteke za Okular
 Comment[ca]=Dorsal de format de fitxer per a l'Okular
--- a/generators/chm/kio-msits/ms-its.protocol
+++ b/generators/chm/kio-msits/ms-its.protocol
@ -8,7 +8,6 @@ listing=Name,Type,Size
 defaultMimetype=text/html
 Description=A kioslave for displaying WinHelp files
 Description[ar]=خاصية كِييُوسليْف لعرض ملفات WinHelp
-Description[ast]=Un «kioslave» p'amosar ficheros WinHelp
 Description[bg]=kioslave за показване на помощни файлове за Windows
 Description[bs]=U/I alat za prikaz WinHelp datoteke
 Description[ca]=Un kioslave per visualitzar els fitxers WinHelp
--- a/generators/chm/okularApplication_chm.desktop
+++ b/generators/chm/okularApplication_chm.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/djvu/okularApplication_djvu.desktop
+++ b/generators/djvu/okularApplication_djvu.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/dvi/okularApplication_dvi.desktop
+++ b/generators/dvi/okularApplication_dvi.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/epub/okularApplication_epub.desktop
+++ b/generators/epub/okularApplication_epub.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/fax/okularApplication_fax.desktop
+++ b/generators/fax/okularApplication_fax.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/fictionbook/okularApplication_fb.desktop
+++ b/generators/fictionbook/okularApplication_fb.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/kimgio/okularApplication_kimgio.desktop
+++ b/generators/kimgio/okularApplication_kimgio.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/mobipocket/okularApplication_mobi.desktop
+++ b/generators/mobipocket/okularApplication_mobi.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/ooo/okularApplication_ooo.desktop
+++ b/generators/ooo/okularApplication_ooo.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/plucker/okularApplication_plucker.desktop
+++ b/generators/plucker/okularApplication_plucker.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/poppler/okularApplication_pdf.desktop
+++ b/generators/poppler/okularApplication_pdf.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/spectre/okularApplication_ghostview.desktop
+++ b/generators/spectre/okularApplication_ghostview.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/tiff/okularApplication_tiff.desktop
+++ b/generators/tiff/okularApplication_tiff.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/txt/okularApplication_txt.desktop
+++ b/generators/txt/okularApplication_txt.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/generators/xps/okularApplication_xps.desktop
+++ b/generators/xps/okularApplication_xps.desktop
@ -63,7 +63,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents
--- a/shell/org.kde.okular.desktop
+++ b/shell/org.kde.okular.desktop
@ -62,7 +62,6 @@ Name[zh_CN]=Okular
 Name[zh_TW]=文件檢視_Okular
 GenericName=Document Viewer
 GenericName[ar]=عارض المستندات
-GenericName[ast]=Visor de documentos
 GenericName[bg]=Преглед на документи
 GenericName[bs]=Prikazivač dokumenata
 GenericName[ca]=Visualitzador de documents