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:
l10n daemon script 2015-08-31 04:47:52 +00:00
parent ab8944dcce
commit 7be388fa0f
17 changed files with 17 additions and 17 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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