summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2015-05-22 07:02:44 +0000
committerKrzysztof KosiЕ„ski <tweenk.pl@gmail.com>2015-05-22 07:02:44 +0000
commit35d94a8e1c01cd60e4fcf4c15f46fee38c765fca (patch)
treed8366acd729a6a9d4bdc1001f050a43f30d8b7ad /packaging
parentUndo changes to CMakeLists.txt in 2geom directory after syncs (diff)
parentminor tweaks to libUEMF and related code (diff)
downloadinkscape-35d94a8e1c01cd60e4fcf4c15f46fee38c765fca.tar.gz
inkscape-35d94a8e1c01cd60e4fcf4c15f46fee38c765fca.zip
Merge from trunk
(bzr r14059.2.15)
Diffstat (limited to 'packaging')
-rw-r--r--packaging/macosx/Resources/etc/gtk-2.0/gtkrc3
-rw-r--r--packaging/win32/languages/Ukrainian.nsh8
2 files changed, 7 insertions, 4 deletions
diff --git a/packaging/macosx/Resources/etc/gtk-2.0/gtkrc b/packaging/macosx/Resources/etc/gtk-2.0/gtkrc
index 76c9f3397..46f5d2910 100644
--- a/packaging/macosx/Resources/etc/gtk-2.0/gtkrc
+++ b/packaging/macosx/Resources/etc/gtk-2.0/gtkrc
@@ -13,6 +13,9 @@ gtk-menu-images = 1
gtk-toolbar-style = 0
#gtk-toolbar-icon-size = 2
+# use OS X default PDF viewer for print preview
+gtk-print-preview-command="open -a /Applications/Preview.app %f"
+
# fix Adwaita theme for Inkscape's GimpSpinScale widgets
style "spinbutton" {}
widget_class "*GimpSpinScale*" style "spinbutton"
diff --git a/packaging/win32/languages/Ukrainian.nsh b/packaging/win32/languages/Ukrainian.nsh
index 1db81f196..ee5dfbf1f 100644
--- a/packaging/win32/languages/Ukrainian.nsh
+++ b/packaging/win32/languages/Ukrainian.nsh
@@ -44,7 +44,7 @@ ${LangFileString} lng_az "Азербайджанською"
${LangFileString} lng_be "Білоруською"
${LangFileString} lng_bg "Болгарською"
${LangFileString} lng_bn "Бенгальською"
-${LangFileString} lng_bn_BD "Bengali Bangladesh"
+${LangFileString} lng_bn_BD "Бенгальською (Бангладеш)"
${LangFileString} lng_br "Бретонською"
${LangFileString} lng_ca "Каталанською"
${LangFileString} lng_ca@valencia "Валенсійською каталанською"
@@ -71,15 +71,15 @@ ${LangFileString} lng_gl "Галісійською"
${LangFileString} lng_he "Івритом"
${LangFileString} lng_hr "Хорватською"
${LangFileString} lng_hu "Угорською"
-${LangFileString} lng_hy "Armenian"
+${LangFileString} lng_hy "Вірменською"
${LangFileString} lng_id "Індонезійською"
-${LangFileString} lng_is "Icelandic"
+${LangFileString} lng_is "Ісландською"
${LangFileString} lng_it "Італійською"
${LangFileString} lng_ja "Японською"
${LangFileString} lng_km "Кхмерською"
${LangFileString} lng_ko "Корейською"
${LangFileString} lng_lt "Литовською"
-${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_lv "Латвійською"
${LangFileString} lng_mk "Македонською"
${LangFileString} lng_mn "Монгольською"
${LangFileString} lng_ne "Непальською"