Merge remote-tracking branch 'origin/KDE/4.12'

This commit is contained in:
Albert Astals Cid 2013-12-09 18:47:29 +01:00
commit 9dbb62137d
7 changed files with 8 additions and 1 deletions

View file

@ -204,7 +204,7 @@ kde4_add_kcfg_files(okularpart_SRCS conf/settings.kcfgc )
qt4_add_dbus_interfaces(okularpart_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
kde4_add_plugin(okularpart ${okularpart_SRCS})
kde4_add_plugin(okularpart SHARED ${okularpart_SRCS})
target_link_libraries(okularpart okularcore ${KDE4_KPARTS_LIBS} ${KDE4_KPRINTUTILS_LIBS} ${MATH_LIB} ${QIMAGEBLITZ_LIBRARIES} ${KDE4_PHONON_LIBRARY} ${KDE4_SOLID_LIBRARY})

View file

@ -146,6 +146,7 @@ X-KDE-Keywords[hu]=mobipocket
X-KDE-Keywords[ia]=mobipocket
X-KDE-Keywords[kk]=mobipocket
X-KDE-Keywords[nl]=mobipocket
X-KDE-Keywords[pa]=
X-KDE-Keywords[pt]=mobipocket
X-KDE-Keywords[pt_BR]=mobipocket
X-KDE-Keywords[sk]=mobipocket

View file

@ -163,6 +163,7 @@ X-KDE-Keywords[lt]=PS, PostScript
X-KDE-Keywords[mr]=PS, ि
X-KDE-Keywords[nb]=PS, PostScript
X-KDE-Keywords[nl]=PS, PostScript
X-KDE-Keywords[pa]=PS, ਿ
X-KDE-Keywords[pl]=PS, PostScript
X-KDE-Keywords[pt]=PS, PostScript
X-KDE-Keywords[pt_BR]=PS, PostScript

View file

@ -152,6 +152,7 @@ X-KDE-Keywords[lt]=PS, PostScript
X-KDE-Keywords[mr]=PS, ि
X-KDE-Keywords[nb]=PS, PostScript
X-KDE-Keywords[nl]=PS, PostScript
X-KDE-Keywords[pa]=PS, ਿ
X-KDE-Keywords[pl]=PS, PostScript
X-KDE-Keywords[pt]=PS, PostScript
X-KDE-Keywords[pt_BR]=PS, PostScript

View file

@ -163,6 +163,7 @@ X-KDE-Keywords[lt]=txt
X-KDE-Keywords[mr]=txt
X-KDE-Keywords[nb]=txt
X-KDE-Keywords[nl]=txt
X-KDE-Keywords[pa]=txt
X-KDE-Keywords[pl]=txt
X-KDE-Keywords[pt]=txt
X-KDE-Keywords[pt_BR]=txt

View file

@ -23,6 +23,7 @@ Name[lt]=txt
Name[mr]=txt
Name[nb]=tekst
Name[nl]=tekst
Name[pa]=txt
Name[pl]=txt
Name[pt]=txt
Name[pt_BR]=txt
@ -63,6 +64,7 @@ Comment[lt]=Txt programinė sąsaja, skirta Okular
Comment[mr]= ि Txt
Comment[nb]=Txt-motor for Okular
Comment[nl]=Tekst-backend voor Okular
Comment[pa]= Txt
Comment[pl]=Obsługa Txt dla Okulara
Comment[pt]=Infra-estrutura de TXT para o Okular
Comment[pt_BR]=Infraestrutura Txt para o Okular

View file

@ -153,6 +153,7 @@ X-KDE-Keywords[lt]=txt
X-KDE-Keywords[mr]=txt
X-KDE-Keywords[nb]=txt
X-KDE-Keywords[nl]=txt
X-KDE-Keywords[pa]=txt
X-KDE-Keywords[pl]=txt
X-KDE-Keywords[pt]=txt
X-KDE-Keywords[pt_BR]=txt