update to trunk

(bzr r13682.1.27)

4 files changed, 126 insertions, 5 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/inkscape.nsi b/packaging/win32/inkscape.nsi
index fe2d9bb9d..d1bcb7216 100755
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -118,6 +118,7 @@ ShowUninstDetails hide
 !insertmacro INKLANGFILE Breton
 !insertmacro INKLANGFILE Catalan
 !insertmacro INKLANGFILE Czech
+!insertmacro INKLANGFILE Danish
 !insertmacro INKLANGFILE Dutch
 !insertmacro INKLANGFILE Finnish
 !insertmacro INKLANGFILE French
@@ -125,7 +126,7 @@ ShowUninstDetails hide
 !insertmacro INKLANGFILE German
 !insertmacro INKLANGFILE Greek
 !insertmacro INKLANGFILE Indonesian
-!insertmacro INKLANGFILE Icelandics
+!insertmacro INKLANGFILE Icelandic
 !insertmacro INKLANGFILE Italian
 !insertmacro INKLANGFILE Japanese
 !insertmacro INKLANGFILE Polish
@@ -667,6 +668,7 @@ Function .onInit ; initialise the installer {{{2
   !insertmacro LanguageAutoSelect Breton        1150
   !insertmacro LanguageAutoSelect Catalan       1027
   !insertmacro LanguageAutoSelect Czech         1029
+  !insertmacro LanguageAutoSelect Danish        1030
   !insertmacro LanguageAutoSelect Dutch         1043
   !insertmacro LanguageAutoSelect Finnish       1035
   !insertmacro LanguageAutoSelect French        1036
diff --git a/packaging/win32/languages/Danish.nsh b/packaging/win32/languages/Danish.nsh
new file mode 100644
index 000000000..e3f4bb246
--- /dev/null
+++ b/packaging/win32/languages/Danish.nsh
@@ -0,0 +1,116 @@
+;Language: Danish (1030, CP1252)
+;By scootergrisen
+${LangFileString} CaptionDescription "Open source skalérbar vektor redigeringsprogram"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) er udgivet under GNU General Public License (GPL). Licensen leveres her kun til orientering. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape er blevet installeret af brugeren $0.$\r$\nHvis du fortsætter lykkedes det måske ikke fuldt ud!$\r$\nLog venligst på som $0 og prøv igen."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 er allerede installeret. $\nVil du fjerne den tidligere version inden $(^Name) installeres?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nTryk på OK for at fortsætte eller tryk på ANNULLER for at afbryde."
+${LangFileString} NO_ADMIN "Du har ikke administratortilladelser.$\r$\nInstallationen af Inkscape for alle brugere lykkedes måske ikke fuldt ud.$\r$\nFravælg indstillingen 'Installér for alle brugere'."
+${LangFileString} NOT_SUPPORTED "Inkscape er kendt for ikke at køre under Windows 95/98/ME!$\r$\nSe venligst det officielle websted for detaljeret information."
+${LangFileString} Full "Fuld"
+${LangFileString} Optimal "Optimal"
+${LangFileString} Minimal "Minimal"
+${LangFileString} Core "Inkscape SVG-redigering (påkrævet)"
+${LangFileString} CoreDesc "Grundlæggende Inkscape-filer og dll'er"
+${LangFileString} GTKFiles "GTK+ Runtime Environment (påkrævet)"
+${LangFileString} GTKFilesDesc "Multi-platform GUI toolkit, anvendes af Inkscape"
+${LangFileString} Shortcuts "Genveje"
+${LangFileString} ShortcutsDesc "Genveje til at starte Inkscape"
+${LangFileString} Alluser "Installér for alle brugere"
+${LangFileString} AlluserDesc "Installér programmet for alle der bruger denne computer (alle brugere)"
+${LangFileString} Desktop "Skrivebord"
+${LangFileString} DesktopDesc "Opret en genvej til Inkscape på skrivebordet"
+${LangFileString} Startmenu "Menuen Start"
+${LangFileString} StartmenuDesc "Opret en post til Inkscape i menuen Start"
+${LangFileString} Quicklaunch "Hurtig start"
+${LangFileString} QuicklaunchDesc "Opret en genvej til Inkscape på værktøjslinjen Hurtig start"
+${LangFileString} SVGWriter "Åbn SVG-filer med Inkscape"
+${LangFileString} SVGWriterDesc "Vælg Inkscape som standardredigeringsprogram for SVG-filer"
+${LangFileString} ContextMenu "Genvejsmenu"
+${LangFileString} ContextMenuDesc "Tilføj Inkscape i genvejsmenuen for SVG-filer"
+${LangFileString} DeletePrefs "Slet personlige indstillinger"
+${LangFileString} DeletePrefsDesc "Slet personlige indstillinger efterladt fra tidligere installationer"
+${LangFileString} Addfiles "Yderligere filer"
+${LangFileString} AddfilesDesc "Yderligere filer"
+${LangFileString} Examples "Eksempler"
+${LangFileString} ExamplesDesc "Eksempler på brug af Inkscape"
+${LangFileString} Tutorials "Vejledninger"
+${LangFileString} TutorialsDesc "Vejledninger i brug af Inkscape"
+${LangFileString} Languages "Oversættelser"
+${LangFileString} LanguagesDesc "Installér diverse oversættelser til Inkscape"
+${LangFileString} lng_am "Amharisk"
+${LangFileString} lng_ar "Arabisk"
+${LangFileString} lng_az "Aserbajdsjansk"
+${LangFileString} lng_be "Hviderussisk"
+${LangFileString} lng_bg "Bulgarsk"
+${LangFileString} lng_bn "Bengalsk"
+${LangFileString} lng_bn_BD "Bengalsk (Bangladesh)"
+${LangFileString} lng_br "Bretonsk"
+${LangFileString} lng_ca "Katalansk"
+${LangFileString} lng_ca@valencia "Valenciansk (Katalansk)"
+${LangFileString} lng_cs "Tjekkisk"
+${LangFileString} lng_da "Dansk"
+${LangFileString} lng_de "Tysk"
+${LangFileString} lng_dz "Dzongkha"
+${LangFileString} lng_el "Græsk"
+${LangFileString} lng_en "Engelsk"
+${LangFileString} lng_en_AU "Australsk-engelsk"
+${LangFileString} lng_en_CA "Canadisk-engelsk"
+${LangFileString} lng_en_GB "Britisk-engelsk"
+${LangFileString} lng_en_US@piglatin "Pig Latin"
+${LangFileString} lng_eo "Esperanto"
+${LangFileString} lng_es "Spansk"
+${LangFileString} lng_es_MX "Spansk mexicansk"
+${LangFileString} lng_et "Estisk"
+${LangFileString} lng_eu "Baskisk"
+${LangFileString} lng_fa "Farsi"
+${LangFileString} lng_fi "Finsk"
+${LangFileString} lng_fr "Fransk"
+${LangFileString} lng_ga "Irsk"
+${LangFileString} lng_gl "Galicisk"
+${LangFileString} lng_he "Hebraisk"
+${LangFileString} lng_hr "Kroatisk"
+${LangFileString} lng_hu "Ungarsk"
+${LangFileString} lng_hy "Armensk"
+${LangFileString} lng_id "Indonesisk"
+${LangFileString} lng_it "Italiensk"
+${LangFileString} lng_ja "Japansk"
+${LangFileString} lng_km "Khmer"
+${LangFileString} lng_ko "Koreansk"
+${LangFileString} lng_lt "Litauisk"
+${LangFileString} lng_lv "Lettisk"
+${LangFileString} lng_mk "Makedonsk"
+${LangFileString} lng_mn "Mongolsk"
+${LangFileString} lng_ne "Nepalesisk"
+${LangFileString} lng_nb "Norsk (bogmål)"
+${LangFileString} lng_nl "Nederlandsk"
+${LangFileString} lng_nn "Norsk (nynorsk)"
+${LangFileString} lng_pa "Punjabisk"
+${LangFileString} lng_pl "Polsk"
+${LangFileString} lng_pt "Portugisisk"
+${LangFileString} lng_pt_BR "Brasiliansk-portugisisk"
+${LangFileString} lng_ro "Rumænsk"
+${LangFileString} lng_ru "Russisk"
+${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sk "Slovakisk"
+${LangFileString} lng_sl "Slovensk"
+${LangFileString} lng_sq "Albansk"
+${LangFileString} lng_sr "Serbisk"
+${LangFileString} lng_sr@latin "Serbisk i latin skrift"
+${LangFileString} lng_sv "Svensk"
+${LangFileString} lng_te "Telugu"
+${LangFileString} lng_th "Thai"
+${LangFileString} lng_tr "Tyrkisk"
+${LangFileString} lng_uk "Ukrainsk"
+${LangFileString} lng_vi "Vietnamesisk"
+${LangFileString} lng_zh_CN "Forenklet kinesisk"
+${LangFileString} lng_zh_TW "Traditionel kinesisk"
+${LangFileString} UInstOpt "Afinstallationsindstillinger"
+${LangFileString} UInstOpt1 "Foretag venligst dine valg af yderligere indstillinger"
+${LangFileString} PurgePrefs "Behold personlige indstillinger"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log ikke fundet!$\r$\nAfinstallér venligst ved at rydde mappen $INSTDIR manuelt!"
+${LangFileString} FileChanged "Filen $filename er blevet ændret efter installationen.$\r$\nVil du stadig slette filen?"
+${LangFileString} Yes "Ja"
+${LangFileString} AlwaysYes "svar altid Ja"
+${LangFileString} No "Nej"
+${LangFileString} AlwaysNo "svar altid Nej"
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 "Íåïàëüñüêîþ"