mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-25 02:45:38 +00:00
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"
This commit is contained in:
parent
ab8944dcce
commit
7be388fa0f
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
TryExec=okular
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -62,7 +62,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -125,6 +124,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
|
@ -61,7 +61,6 @@ Name[x-test]=xxOkularxx
|
|||
Name[zh_CN]=Okular
|
||||
Name[zh_TW]=文件檢視_Okular
|
||||
GenericName=Document Viewer
|
||||
Comment=Universal document viewer
|
||||
GenericName[ar]=عارض المستندات
|
||||
GenericName[ast]=Visor de documentos
|
||||
GenericName[bg]=Преглед на документи
|
||||
|
@ -124,6 +123,7 @@ GenericName[uk]=Переглядач документів
|
|||
GenericName[x-test]=xxDocument Viewerxx
|
||||
GenericName[zh_CN]=文档查看器
|
||||
GenericName[zh_TW]=文件檢視器
|
||||
Comment=Universal document viewer
|
||||
Exec=okular %U %i -caption %c
|
||||
Icon=okular
|
||||
Type=Application
|
||||
|
|
Loading…
Reference in a new issue