update to trunk

(bzr r11950.1.329)

40 files changed, 271 insertions, 135 deletions

diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi
index db3ddb613..3ce614a9f 100755
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -115,7 +115,6 @@ ShowUninstDetails hide
   !insertmacro MUI_LANGUAGE "${_LANG}"
   !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "languages\${_LANG}.nsh" "languages\English.nsh"
 !macroend
-!insertmacro INKLANGFILE BrazilianPortuguese
 !insertmacro INKLANGFILE Breton
 !insertmacro INKLANGFILE Catalan
 !insertmacro INKLANGFILE Czech
@@ -129,6 +128,7 @@ ShowUninstDetails hide
 !insertmacro INKLANGFILE Italian
 !insertmacro INKLANGFILE Japanese
 !insertmacro INKLANGFILE Polish
+!insertmacro INKLANGFILE PortugueseBR
 !insertmacro INKLANGFILE Romanian
 !insertmacro INKLANGFILE Russian
 !insertmacro INKLANGFILE Slovak
@@ -315,15 +315,24 @@ Section $(Core) SecCore ; Mandatory Inkscape core files section {{{
   File /nonfatal /a /r /x *.??*.???* /x examples /x tutorials ..\..\inkscape\share
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
   ; this files are added because it slips through the filter
-  SetOutPath $INSTDIR\share\clipart
+  SetOutPath $INSTDIR\share\branding
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /a ..\..\inkscape\share\clipart\inkscape.logo.svg
+  File /a ..\..\inkscape\share\branding\draw-freely.ru.svg
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
   SetOutPath $INSTDIR\share\icons
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
   File /a ..\..\inkscape\share\icons\inkscape.file.png
   File /a ..\..\inkscape\share\icons\inkscape.file.svg
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+  SetOutPath $INSTDIR\share\extensions
+  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+  File /a ..\..\inkscape\share\extensions\inkscape.extension.rng
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+  SetOutPath $INSTDIR\share\extensions\test
+  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+  File /a ..\..\inkscape\share\extensions\test\inkwebjs-move.test.svg
+  File /a ..\..\inkscape\share\extensions\test\test_template.py.txt
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
   SetOutPath $INSTDIR\modules
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
   File /nonfatal /a /r ..\..\inkscape\modules\*.*
@@ -532,6 +541,7 @@ SectionGroup "$(Languages)" SecLanguages ; Languages sections {{{
   !insertmacro Language Hebrew            he
   !insertmacro Language Croatian          hr
   !insertmacro Language Hungarian         hu
+  !insertmacro Language Armenian          hy
   !insertmacro Language Indonesian        id
   !insertmacro Language Italian           it
   !insertmacro Language Japanese          ja
@@ -651,7 +661,7 @@ Function .onInit ; initialise the installer {{{2
   !macroend
 
   ; No need for English to be detected as it's the default
-  !insertmacro LanguageAutoSelect BrPortuguese  1046
+  !insertmacro LanguageAutoSelect PortugueseBrazil  1046
   !insertmacro LanguageAutoSelect Breton        1150
   !insertmacro LanguageAutoSelect Catalan       1027
   !insertmacro LanguageAutoSelect Czech         1029
@@ -794,6 +804,7 @@ Function .onInit ; initialise the installer {{{2
   !insertmacro Parameter he             ${SecHebrew}
   !insertmacro Parameter hr             ${SecCroatian}
   !insertmacro Parameter hu             ${SecHungarian}
+  !insertmacro Parameter hy             ${SecArmenian}
   !insertmacro Parameter id             ${SecIndonesian}
   !insertmacro Parameter it             ${SecItalian}
   !insertmacro Parameter ja             ${SecJapanese}
diff --git a/packaging/win32/languages/Breton.nsh b/packaging/win32/languages/Breton.nsh
index 857ee4c56..5d7b5c295 100644
--- a/packaging/win32/languages/Breton.nsh
+++ b/packaging/win32/languages/Breton.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerbaidjaneg"
 ${LangFileString} lng_be "Bieloruseg"
 ${LangFileString} lng_bg "Bulgareg"
 ${LangFileString} lng_bn "Bengalieg"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Brezhoneg"
 ${LangFileString} lng_ca "Katalaneg"
 ${LangFileString} lng_ca@valencia "Katalaneg Valensia"
@@ -70,12 +71,14 @@ ${LangFileString} lng_ga "Iwerzhoneg"
 ${LangFileString} lng_gl "Galisianeg"
 ${LangFileString} lng_hr "Kroateg"
 ${LangFileString} lng_hu "Hungareg"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indoneseg"
 ${LangFileString} lng_it "Italianeg"
 ${LangFileString} lng_ja "Japoneg"
 ${LangFileString} lng_km "Khmereg"
 ${LangFileString} lng_ko "Koreaneg"
 ${LangFileString} lng_lt "Lituaneg"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Makédonieg"
 ${LangFileString} lng_mn "Mongoleg"
 ${LangFileString} lng_ne "Nepalieg"
diff --git a/packaging/win32/languages/Catalan.nsh b/packaging/win32/languages/Catalan.nsh
index 5efcf1af6..3f9f3212a 100644
--- a/packaging/win32/languages/Catalan.nsh
+++ b/packaging/win32/languages/Catalan.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerbaijani"
 ${LangFileString} lng_be "Biel·lorús"
 ${LangFileString} lng_bg "Búlgar"
 ${LangFileString} lng_bn "Bengalí"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
 ${LangFileString} lng_ca "Català"
 ${LangFileString} lng_ca@valencia "Català valencià"
@@ -71,11 +72,13 @@ ${LangFileString} lng_he "Hebreu"
 ${LangFileString} lng_id "Indonesi"
 ${LangFileString} lng_hr "Croat"
 ${LangFileString} lng_hu "Hongarès"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_it "Italià"
 ${LangFileString} lng_ja "Japonès"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Coreà"
 ${LangFileString} lng_lt "Lituà"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedoni"
 ${LangFileString} lng_mn "Mongol"
 ${LangFileString} lng_ne "Nepalí"
diff --git a/packaging/win32/languages/Czech.nsh b/packaging/win32/languages/Czech.nsh
index fab76c72d..5b4e05d4c 100644
--- a/packaging/win32/languages/Czech.nsh
+++ b/packaging/win32/languages/Czech.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerbajdžánština"
 ${LangFileString} lng_be "Bìloruština"
 ${LangFileString} lng_bg "Bulgarian"
 ${LangFileString} lng_bn "Bengali"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
 ${LangFileString} lng_ca "Katalánština"
 ${LangFileString} lng_ca@valencia "Valencian Catalan"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Galician"
 ${LangFileString} lng_he "Hebrew"
 ${LangFileString} lng_hr "Chorvatština"
 ${LangFileString} lng_hu "Maïarština"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesian"
 ${LangFileString} lng_it "Italština"
 ${LangFileString} lng_ja "Japonština"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Korejština"
 ${LangFileString} lng_lt "Litevština"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Makedonština"
 ${LangFileString} lng_mn "Mongolština"
 ${LangFileString} lng_ne "Nepálština"
diff --git a/packaging/win32/languages/Dutch.nsh b/packaging/win32/languages/Dutch.nsh
index b31656e9e..38225b6e3 100644
--- a/packaging/win32/languages/Dutch.nsh
+++ b/packaging/win32/languages/Dutch.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azeri"
 ${LangFileString} lng_be "Wit-Russisch"
 ${LangFileString} lng_bg "Bulgaars"
 ${LangFileString} lng_bn "Bengaals"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Bretoens"
 ${LangFileString} lng_ca "Catalaans"
 ${LangFileString} lng_ca@valencia "Catalaans/Valencia"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Galisisch"
 ${LangFileString} lng_he "Hebreeuws"
 ${LangFileString} lng_hr "Kroatisch"
 ${LangFileString} lng_hu "Hongaars"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesisch"
 ${LangFileString} lng_it "Italiaans"
 ${LangFileString} lng_ja "Japans"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Koreaans"
 ${LangFileString} lng_lt "Litouws"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedonisch"
 ${LangFileString} lng_mn "Mongools"
 ${LangFileString} lng_ne "Nepalees"
diff --git a/packaging/win32/languages/English.nsh b/packaging/win32/languages/English.nsh
index f85225804..c585f2e45 100644
--- a/packaging/win32/languages/English.nsh
+++ b/packaging/win32/languages/English.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerbaijani"
 ${LangFileString} lng_be "Byelorussian"
 ${LangFileString} lng_bg "Bulgarian"
 ${LangFileString} lng_bn "Bengali"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
 ${LangFileString} lng_ca "Catalan"
 ${LangFileString} lng_ca@valencia "Valencian Catalan"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Galician"
 ${LangFileString} lng_he "Hebrew"
 ${LangFileString} lng_hr "Croatian"
 ${LangFileString} lng_hu "Hungarian"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesian"
 ${LangFileString} lng_it "Italian"
 ${LangFileString} lng_ja "Japanese"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Korean"
 ${LangFileString} lng_lt "Lithuanian"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedonian"
 ${LangFileString} lng_mn "Mongolian"
 ${LangFileString} lng_ne "Nepali"
diff --git a/packaging/win32/languages/Finnish.nsh b/packaging/win32/languages/Finnish.nsh
index 2f6a376ef..e5c53d253 100644
--- a/packaging/win32/languages/Finnish.nsh
+++ b/packaging/win32/languages/Finnish.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "azerbaid?ani"
 ${LangFileString} lng_be "valkovenäjä"
 ${LangFileString} lng_bg "bulgaria"
 ${LangFileString} lng_bn "Bengali"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
 ${LangFileString} lng_ca "katalaani"
 ${LangFileString} lng_ca@valencia "Valencian Catalan"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "galicia"
 ${LangFileString} lng_he "Hebrew"
 ${LangFileString} lng_hr "kroatia"
 ${LangFileString} lng_hu "unkari"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesian"
 ${LangFileString} lng_it "italia"
 ${LangFileString} lng_ja "japani"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "korea"
 ${LangFileString} lng_lt "liettua"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "makedonia"
 ${LangFileString} lng_mn "mongolia"
 ${LangFileString} lng_ne "nepali"
diff --git a/packaging/win32/languages/French.nsh b/packaging/win32/languages/French.nsh
index bb33f2ce1..93b99b7c3 100644
--- a/packaging/win32/languages/French.nsh
+++ b/packaging/win32/languages/French.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azéri"
 ${LangFileString} lng_be "Biélorusse"
 ${LangFileString} lng_bg "Bulgare"
 ${LangFileString} lng_bn "Bengali"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
 ${LangFileString} lng_ca "Catalan"
 ${LangFileString} lng_ca@valencia "Catalan Valencien"
@@ -70,12 +71,14 @@ ${LangFileString} lng_ga "Irlandais"
 ${LangFileString} lng_gl "Galicien"
 ${LangFileString} lng_hr "Croatian"
 ${LangFileString} lng_hu "Hongrois"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonésien"
 ${LangFileString} lng_it "Italien"
 ${LangFileString} lng_ja "Japonais"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Coréen"
 ${LangFileString} lng_lt "Lituanien"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macédonien"
 ${LangFileString} lng_mn "Mongol"
 ${LangFileString} lng_ne "Népalais"
diff --git a/packaging/win32/languages/Galician.nsh b/packaging/win32/languages/Galician.nsh
index 2f5acb4c4..17f7a42e1 100644
--- a/packaging/win32/languages/Galician.nsh
+++ b/packaging/win32/languages/Galician.nsh
@@ -45,6 +45,7 @@ ${LangFileString} lng_be "Bielorruso"
 ${LangFileString} lng_bg "Búlgaro"
 ${LangFileString} lng_bn "Bengalí"
 ${LangFileString} lng_br "Breton"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_ca "Catalán"
 ${LangFileString} lng_ca@valencia "Catalán Valenciano"
 ${LangFileString} lng_cs "Checo"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Galego"
 ${LangFileString} lng_he "Hebreo"
 ${LangFileString} lng_hr "Croata"
 ${LangFileString} lng_hu "Húngaro"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesio"
 ${LangFileString} lng_it "Italiano"
 ${LangFileString} lng_ja "Xaponés"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Coreano"
 ${LangFileString} lng_lt "Lituano"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedonio"
 ${LangFileString} lng_mn "Mongol"
 ${LangFileString} lng_ne "Nepalí"
diff --git a/packaging/win32/languages/German.nsh b/packaging/win32/languages/German.nsh
index be99d8646..60ab1f2b4 100644
--- a/packaging/win32/languages/German.nsh
+++ b/packaging/win32/languages/German.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Aserbaidschanisch"
 ${LangFileString} lng_be "Weißrussisch"
 ${LangFileString} lng_bg "Bulgarisch"
 ${LangFileString} lng_bn "Bengalisch"
+${LangFileString} lng_bn_BD "Bangladesch Bengalisch"
 ${LangFileString} lng_br "Bretonisch"
 ${LangFileString} lng_ca "Katalanisch"
 ${LangFileString} lng_ca@valencia "Valencianisch Katalanisch"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Galizisch"
 ${LangFileString} lng_he "Hebräisch"
 ${LangFileString} lng_hr "Kroatisch"
 ${LangFileString} lng_hu "Ungarisch"
+${LangFileString} lng_hy "Armenisch"
 ${LangFileString} lng_id "Indonesian"
 ${LangFileString} lng_it "Italienisch"
 ${LangFileString} lng_ja "Japanisch"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Koreanisch"
 ${LangFileString} lng_lt "Litauisch"
+${LangFileString} lng_lv "Lettisch"
 ${LangFileString} lng_mn "Mongolisch"
 ${LangFileString} lng_mk "Mazedonisch"
 ${LangFileString} lng_ne "Nepalisch"
diff --git a/packaging/win32/languages/Greek.nsh b/packaging/win32/languages/Greek.nsh
index 74902dd83..a04094c63 100644
--- a/packaging/win32/languages/Greek.nsh
+++ b/packaging/win32/languages/Greek.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "ÁæÝñéêá"
 ${LangFileString} lng_be "Ëåõêïñþóéêá"
 ${LangFileString} lng_bg "ÂïõëãáñéêÜ"
 ${LangFileString} lng_bn "ÌðåíãêÜëé"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "ÂñåôïíéêÜ"
 ${LangFileString} lng_ca "ÊáôáëáíéêÜ"
 ${LangFileString} lng_ca@valencia "ÊáôáëáíéêÜ ÂáëÝíèéáò"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "ÃáëéêéáíéêÜ"
 ${LangFileString} lng_he "ÅâñáúêÜ"
 ${LangFileString} lng_hr "ÊñïáôéêÜ"
 ${LangFileString} lng_hu "ÏõããñéêÜ"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "ÉíäïíçóéáêÜ"
 ${LangFileString} lng_it "ÉôáëéêÜ"
 ${LangFileString} lng_ja "ÃéáðùíÝæéêá"
 ${LangFileString} lng_km "×ìåñ"
 ${LangFileString} lng_ko "ÊïñåáôéêÜ"
 ${LangFileString} lng_lt "ËéèïõáíéêÜ"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "ÌáêåäïíéêÜ"
 ${LangFileString} lng_mn "ÌïããïëéêÜ"
 ${LangFileString} lng_ne "ÍåðáëéêÜ"
diff --git a/packaging/win32/languages/Hebrew.nsh b/packaging/win32/languages/Hebrew.nsh
index b21263c75..817ef18c0 100644
--- a/packaging/win32/languages/Hebrew.nsh
+++ b/packaging/win32/languages/Hebrew.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "àæøéú"
 ${LangFileString} lng_be "áìøåñéú"
 ${LangFileString} lng_bg "áåìâøéú"
 ${LangFileString} lng_bn "áðâìéú"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "áøèåðéú"
 ${LangFileString} lng_ca "÷èìàðéú"
 ${LangFileString} lng_ca@valencia "÷èìàðéú åìðñéú"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "âìéñéú"
 ${LangFileString} lng_he "òáøéú"
 ${LangFileString} lng_hr "÷øåàèéú"
 ${LangFileString} lng_hu "äåðâøéú"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "àéðãåðæéú"
 ${LangFileString} lng_it "àéèì÷éú"
 ${LangFileString} lng_ja "éôðéú"
 ${LangFileString} lng_km "÷îøéú"
 ${LangFileString} lng_ko "÷åøéàðéú"
 ${LangFileString} lng_lt "ìéèàéú"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "î÷ãåðéú"
 ${LangFileString} lng_mn "îåðâåìéú"
 ${LangFileString} lng_ne "ðôàìéú"
diff --git a/packaging/win32/languages/Indonesian.nsh b/packaging/win32/languages/Indonesian.nsh
index 25d50852c..5fb9b5cd5 100644
--- a/packaging/win32/languages/Indonesian.nsh
+++ b/packaging/win32/languages/Indonesian.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerbaijan"
 ${LangFileString} lng_be "Belarus"
 ${LangFileString} lng_bg "Bulgaria"
 ${LangFileString} lng_bn "Benggala"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
 ${LangFileString} lng_ca "Katalan"
 ${LangFileString} lng_ca@valencia "Katalan Valencia"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Galician"
 ${LangFileString} lng_he "Ibrani"
 ${LangFileString} lng_hr "Kroasia"
 ${LangFileString} lng_hu "Hongaria"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Bahasa Indonesia"
 ${LangFileString} lng_it "Italia"
 ${LangFileString} lng_ja "Jepang"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Korea"
 ${LangFileString} lng_lt "Lithuania"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedonia"
 ${LangFileString} lng_mn "Mongolia"
 ${LangFileString} lng_ne "Nepal"
diff --git a/packaging/win32/languages/Italian.nsh b/packaging/win32/languages/Italian.nsh
index f346de25c..7a9b32a07 100644
--- a/packaging/win32/languages/Italian.nsh
+++ b/packaging/win32/languages/Italian.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerbaigiano"
 ${LangFileString} lng_be "Bielorusso"
 ${LangFileString} lng_bg "Bulgaro"
 ${LangFileString} lng_bn "Bengali"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Bretone"
 ${LangFileString} lng_ca "Catalano"
 ${LangFileString} lng_ca@valencia "Catalano Valenciano"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Gallese"
 ${LangFileString} lng_he "Ebreo"
 ${LangFileString} lng_hr "Croato"
 ${LangFileString} lng_hu "Ungherese"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesiano"
 ${LangFileString} lng_it "Italiano"
 ${LangFileString} lng_ja "Giopponese"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Koreano"
 ${LangFileString} lng_lt "Lituano"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedone"
 ${LangFileString} lng_mn "Mongolo"
 ${LangFileString} lng_ne "Nepali"
diff --git a/packaging/win32/languages/Japanese.nsh b/packaging/win32/languages/Japanese.nsh
index b5c710caa..eaa376296 100644
--- a/packaging/win32/languages/Japanese.nsh
+++ b/packaging/win32/languages/Japanese.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "ƒAƒ[ƒ‹ƒoƒCƒWƒƒƒ“Œê"
 ${LangFileString} lng_be "ƒxƒ‰ƒ‹�[ƒVŒê"
 ${LangFileString} lng_bg "ƒuƒ‹ƒKƒŠƒAŒê"
 ${LangFileString} lng_bn "ƒxƒ“ƒKƒ‹Œê"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "ƒuƒ‹ƒgƒ“Œê"
 ${LangFileString} lng_ca "ƒJƒ^ƒ�ƒjƒAŒê"
 ${LangFileString} lng_ca@valencia "ƒoƒŒƒ“ƒVƒAŒê"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "ƒKƒŠƒVƒAŒê"
 ${LangFileString} lng_he "ƒwƒuƒ‰ƒCŒê"
 ${LangFileString} lng_hr "ƒNƒ�ƒAƒ`ƒAŒê"
 ${LangFileString} lng_hu "ƒnƒ“ƒKƒŠ�[Œê"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "ƒCƒ“ƒhƒlƒVƒAŒê"
 ${LangFileString} lng_it "ƒCƒ^ƒŠƒAŒê"
 ${LangFileString} lng_ja "“ú–{Œê"
 ${LangFileString} lng_km "ƒNƒ��[ƒ‹Œê"
 ${LangFileString} lng_ko "ŠØ�‘Œê"
 ${LangFileString} lng_lt "ƒŠƒgƒAƒjƒAŒê"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "ƒ}ƒPƒhƒjƒAŒê"
 ${LangFileString} lng_mn "ƒ‚ƒ“ƒSƒ‹Œê"
 ${LangFileString} lng_ne "ƒlƒp�[ƒ‹Œê"
diff --git a/packaging/win32/languages/Polish.nsh b/packaging/win32/languages/Polish.nsh
index 65bebb407..73f64ec7f 100644
--- a/packaging/win32/languages/Polish.nsh
+++ b/packaging/win32/languages/Polish.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerski"
 ${LangFileString} lng_be "Bia³oruski"
 ${LangFileString} lng_bg "Bu³garski"
 ${LangFileString} lng_bn "Bengalski"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Bretoñski"
 ${LangFileString} lng_ca "Kataloñski"
 ${LangFileString} lng_ca@valencia "Walencki-Kataloñski"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Galicyjski"
 ${LangFileString} lng_he "Hebrajski"
 ${LangFileString} lng_hr "Chorwacki"
 ${LangFileString} lng_hu "Wêgierski"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonezyjski"
 ${LangFileString} lng_it "W³oski"
 ${LangFileString} lng_ja "Japoñski"
 ${LangFileString} lng_km "Kmerski"
 ${LangFileString} lng_ko "Koreañski"
 ${LangFileString} lng_lt "Litewski"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedoñski"
 ${LangFileString} lng_mn "Mongolski"
 ${LangFileString} lng_ne "Nepali"
diff --git a/packaging/win32/languages/BrazilianPortuguese.nsh b/packaging/win32/languages/PortugueseBR.nsh
index 651485d55..cf158ac5c 100644
--- a/packaging/win32/languages/BrazilianPortuguese.nsh
+++ b/packaging/win32/languages/PortugueseBR.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerbaijão"
 ${LangFileString} lng_be "Bielo-Rússo"
 ${LangFileString} lng_bg "Búlgaro"
 ${LangFileString} lng_bn "Bengali"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Bretão"
 ${LangFileString} lng_ca "Catalão"
 ${LangFileString} lng_ca@valencia "Catalão de Valencia"
@@ -56,7 +57,7 @@ ${LangFileString} lng_en "Inglês"
 ${LangFileString} lng_en_AU "Inglês Australiano"
 ${LangFileString} lng_en_CA "Inglês Canadense"
 ${LangFileString} lng_en_GB "Inglês Britânico"
-${LangFileString} lng_en_US @ piglatin "Pig Latin"
+${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
 ${LangFileString} lng_es "Espanhol"
 ${LangFileString} lng_es_MX "Espanhol Mexicano"
@@ -68,6 +69,7 @@ ${LangFileString} lng_fr "Francês"
 ${LangFileString} lng_ga "Irlandês"
 ${LangFileString} lng_gl "Galego"
 ${LangFileString} lng_he "Hebreu"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_hr "Croata"
 ${LangFileString} lng_hu "Húngaro"
 ${LangFileString} lng_id "Indonésio"
@@ -76,6 +78,7 @@ ${LangFileString} lng_ja "Japonês"
 ${LangFileString} lng_km "Khmer"
 ${LangFileString} lng_ko "Coreano"
 ${LangFileString} lng_lt "Lituano"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedónio"
 ${LangFileString} lng_mn "Mongol"
 ${LangFileString} lng_ne "Nepali"
@@ -93,7 +96,7 @@ ${LangFileString} lng_sk "Eslováquio"
 ${LangFileString} lng_sl "Esloveno"
 ${LangFileString} lng_sq "Albanês"
 ${LangFileString} lng_sr "Sérvio"
-${LangFileString} lng_sr @ latin "Sérvio no alfabeto latino"
+${LangFileString} lng_sr@latin "Sérvio no alfabeto latino"
 ${LangFileString} lng_sv "Sueco"
 ${LangFileString} lng_te_IN "Telugu"
 ${LangFileString} lng_th "Tailandês"
diff --git a/packaging/win32/languages/Romanian.nsh b/packaging/win32/languages/Romanian.nsh
index ea2ba3e3f..cad8d23c4 100644
--- a/packaging/win32/languages/Romanian.nsh
+++ b/packaging/win32/languages/Romanian.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerã"
 ${LangFileString} lng_be "Bielorusã"
 ${LangFileString} lng_bg "Bulgarã"
 ${LangFileString} lng_bn "Bengali"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Bretonã"
 ${LangFileString} lng_ca "Catalanã"
 ${LangFileString} lng_ca@valencia "Catalanã, Valencian"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Galicianã"
 ${LangFileString} lng_he "Ebraicã"
 ${LangFileString} lng_hr "Croatã"
 ${LangFileString} lng_hu "Maghiarã"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonezianã"
 ${LangFileString} lng_it "Italianã"
 ${LangFileString} lng_ja "Japonezã"
 ${LangFileString} lng_km "Khmerã"
 ${LangFileString} lng_ko "Koreanã"
 ${LangFileString} lng_lt "Lituanianã"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedoneanã"
 ${LangFileString} lng_mn "Mongolã"
 ${LangFileString} lng_ne "Nepalezã"
diff --git a/packaging/win32/languages/Russian.nsh b/packaging/win32/languages/Russian.nsh
index 59bb02c6b..1810726e5 100644
--- a/packaging/win32/languages/Russian.nsh
+++ b/packaging/win32/languages/Russian.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Àçåðáàéäæàíñêèé"
 ${LangFileString} lng_be "Áåëîðóññêèé"
 ${LangFileString} lng_bg "Áîëãàðñêèé"
 ${LangFileString} lng_bn "Áåíãàëüñêèé"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Áðåòîíñêèé"
 ${LangFileString} lng_ca "Êàòàëàíñêèé"
 ${LangFileString} lng_ca@valencia "Êàòàëîíñêèé (Âàëåíñèÿ)"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Ãàëèñèéñêèé"
 ${LangFileString} lng_he "Èâðèò"
 ${LangFileString} lng_hr "Õîðâàòñêèé"
 ${LangFileString} lng_hu "Âåíãåðñêèé"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Èíäîíåçèéñêèé"
 ${LangFileString} lng_it "Èòàëüÿíñêèé"
 ${LangFileString} lng_ja "ßïîíñêèé"
 ${LangFileString} lng_km "Êõìåðñêèé"
 ${LangFileString} lng_ko "Êîðåéñêèé"
 ${LangFileString} lng_lt "Ëèòîâñêèé"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Ìàêåäîíñêèé"
 ${LangFileString} lng_mn "Ìîíãîëüñêèé"
 ${LangFileString} lng_ne "Íåïàëüñêèé"
diff --git a/packaging/win32/languages/SimpChinese.nsh b/packaging/win32/languages/SimpChinese.nsh
index 85fce0208..4e72b5b43 100644
--- a/packaging/win32/languages/SimpChinese.nsh
+++ b/packaging/win32/languages/SimpChinese.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "??????È»??"
 ${LangFileString} lng_be "?׶???˹??"
 ${LangFileString} lng_bg "??????????"
 ${LangFileString} lng_bn "?ϼ?À­??"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "??????????"
 ${LangFileString} lng_ca "??̩¡??"
 ${LangFileString} lng_ca@valencia "?????????? ??Ì©????????"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "??????????"
 ${LangFileString} lng_he "Ï£??????"
 ${LangFileString} lng_hr "???Þ°???????"
 ${LangFileString} lng_hu "????????"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Ó¡????"
 ${LangFileString} lng_it "????????"
 ${LangFileString} lng_ja "????"
 ${LangFileString} lng_km "??????"
 ${LangFileString} lng_ko "????"
 ${LangFileString} lng_lt "Á¢??????"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "????????"
 ${LangFileString} lng_mn "?ɹ???"
 ${LangFileString} lng_ne "?á²´????"
diff --git a/packaging/win32/languages/Slovak.nsh b/packaging/win32/languages/Slovak.nsh
index 6d19c9ad2..402139d3f 100644
--- a/packaging/win32/languages/Slovak.nsh
+++ b/packaging/win32/languages/Slovak.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "azerbajdžanèina"
 ${LangFileString} lng_be "bieloruština"
 ${LangFileString} lng_bg "bulharèina"
 ${LangFileString} lng_bn "bengálèina"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "bretónèina"
 ${LangFileString} lng_ca "katalánèina"
 ${LangFileString} lng_ca@valencia "valencijèina"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "galícijèina"
 ${LangFileString} lng_he "hebrejèina"
 ${LangFileString} lng_hr "chorvátèina"
 ${LangFileString} lng_hu "maïarèina"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "indonézština"
 ${LangFileString} lng_it "talianèina"
 ${LangFileString} lng_ja "japonèina"
 ${LangFileString} lng_km "khmérèina"
 ${LangFileString} lng_ko "kórejèina"
 ${LangFileString} lng_lt "litovèina"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "macedónèina"
 ${LangFileString} lng_mn "mongolèina"
 ${LangFileString} lng_ne "nepálèina"
diff --git a/packaging/win32/languages/Slovenian.nsh b/packaging/win32/languages/Slovenian.nsh
index 523380e6a..fb2cdaac1 100644
--- a/packaging/win32/languages/Slovenian.nsh
+++ b/packaging/win32/languages/Slovenian.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "azerbajdžanski"
 ${LangFileString} lng_be "beloruski"
 ${LangFileString} lng_bg "bolgarski"
 ${LangFileString} lng_bn "bengalski"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "bretonski"
 ${LangFileString} lng_ca "katalonski"
 ${LangFileString} lng_ca@valencia "valencijski katalonski"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "galegaški"
 ${LangFileString} lng_he "hebrejski"
 ${LangFileString} lng_hr "hrvaški"
 ${LangFileString} lng_hu "madžarski"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "indonezijski"
 ${LangFileString} lng_it "italijanski"
 ${LangFileString} lng_ja "japonski"
 ${LangFileString} lng_km "kmerski"
 ${LangFileString} lng_ko "korejski"
 ${LangFileString} lng_lt "litovski"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "makedonski"
 ${LangFileString} lng_mn "mongolski"
 ${LangFileString} lng_ne "nepalski"
diff --git a/packaging/win32/languages/Spanish.nsh b/packaging/win32/languages/Spanish.nsh
index c879415d2..224fe8244 100644
--- a/packaging/win32/languages/Spanish.nsh
+++ b/packaging/win32/languages/Spanish.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Azerbayano"
 ${LangFileString} lng_be "Bielorruso"
 ${LangFileString} lng_bg "Búlgaro"
 ${LangFileString} lng_bn "Bengalí"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Bretón"
 ${LangFileString} lng_ca "Catalán"
 ${LangFileString} lng_ca@valencia "Valenciano"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Galego"
 ${LangFileString} lng_he "Hebreo"
 ${LangFileString} lng_hr "Croata"
 ${LangFileString} lng_hu "Húngaro"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesio"
 ${LangFileString} lng_it "Italiano"
 ${LangFileString} lng_ja "Japonés"
 ${LangFileString} lng_km "Jemer"
 ${LangFileString} lng_ko "Coreano"
 ${LangFileString} lng_lt "Lituano"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Macedonio"
 ${LangFileString} lng_mn "Mongol"
 ${LangFileString} lng_ne "Nepalí"
diff --git a/packaging/win32/languages/TradChinese.nsh b/packaging/win32/languages/TradChinese.nsh
index e8f1a260f..657daa892 100644
--- a/packaging/win32/languages/TradChinese.nsh
+++ b/packaging/win32/languages/TradChinese.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "¨È¶ë«ôµM»y"
 ${LangFileString} lng_be "¥Õ«Xù´µ»y"
 ${LangFileString} lng_bg "«O¥[§Q¨È»y"
 ${LangFileString} lng_bn "©s¥[©Ô»y"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "¤£¦C¶ð¥§»y"
 ${LangFileString} lng_ca "¥[®õ¶©»y"
 ${LangFileString} lng_ca@valencia "¥Ë­Û¦è¨È»y ¥[®õù¥§¨È»y"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "¥[¨½¦è¨È»y"
 ${LangFileString} lng_he "§Æ§B¨Ó»y"
 ${LangFileString} lng_hr "§Jù®J¦è¨È»y"
 ${LangFileString} lng_hu "¦I¤ú§Q»y"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "¦L¥§»y"
 ${LangFileString} lng_it "¸q¤j§Q¤å"
 ${LangFileString} lng_ja "¤é¤å"
 ${LangFileString} lng_km "°ª´Ö»y"
 ${LangFileString} lng_ko "Áú¤å"
 ${LangFileString} lng_lt "¥ß³³©{»y"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "°¨¨ä¹y»y"
 ${LangFileString} lng_mn "»X¥j»y"
 ${LangFileString} lng_ne "¥§ªyº¸»y"
diff --git a/packaging/win32/languages/Ukrainian.nsh b/packaging/win32/languages/Ukrainian.nsh
index 3991c51e7..d1b29fca7 100644
--- a/packaging/win32/languages/Ukrainian.nsh
+++ b/packaging/win32/languages/Ukrainian.nsh
@@ -44,6 +44,7 @@ ${LangFileString} lng_az "Àçåðáàéäæàíñüêîþ"
 ${LangFileString} lng_be "Á³ëîðóñüêîþ"
 ${LangFileString} lng_bg "Áîëãàðñüêîþ"
 ${LangFileString} lng_bn "Áåíãàëüñüêîþ"
+${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Áðåòîíñüêîþ"
 ${LangFileString} lng_ca "Êàòàëàíñüêîþ"
 ${LangFileString} lng_ca@valencia "Âàëåíñ³éñüêîþ êàòàëàíñüêîþ"
@@ -70,12 +71,14 @@ ${LangFileString} lng_gl "Ãàë³ñ³éñüêîþ"
 ${LangFileString} lng_he "²âðèòîì"
 ${LangFileString} lng_hr "Õîðâàòñüêîþ"
 ${LangFileString} lng_hu "Óãîðñüêîþ"
+${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "²íäîíåç³éñüêîþ"
 ${LangFileString} lng_it "²òàë³éñüêîþ"
 ${LangFileString} lng_ja "ßïîíñüêîþ"
 ${LangFileString} lng_km "Êõìåðñüêîþ"
 ${LangFileString} lng_ko "Êîðåéñüêîþ"
 ${LangFileString} lng_lt "Ëèòîâñüêîþ"
+${LangFileString} lng_lv "Latvian"
 ${LangFileString} lng_mk "Ìàêåäîíñüêîþ"
 ${LangFileString} lng_mn "Ìîíãîëüñüêîþ"
 ${LangFileString} lng_ne "Íåïàëüñüêîþ"
diff --git a/po/lv.po b/po/lv.po
index 28b0377df..8243b228f 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Inkscape\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-03-04 13:58+0100\n"
-"PO-Revision-Date: 2014-04-07 22:06+0200\n"
+"PO-Revision-Date: 2014-04-17 22:48+0200\n"
 "Last-Translator: J�nis Eisaks <jancs@dv.lv>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
@@ -3696,7 +3696,6 @@ msgstr "Alternatīvas process"
 
 #. Symbols: ./FlowSymbols.svg
 #: ../share/symbols/symbols.h:140
-#, fuzzy
 msgctxt "Symbol"
 msgid "Extract"
 msgstr "Atspiest"
@@ -4707,7 +4706,7 @@ msgstr "Velosipēdu novietne"
 #: ../share/symbols/symbols.h:316
 msgctxt "Symbol"
 msgid "Marina"
-msgstr ""
+msgstr "JÅ«ras pasaule"
 
 #. Symbols: ./MapSymbols.svg
 #: ../share/symbols/symbols.h:317
@@ -8442,12 +8441,11 @@ msgid "Image Rendering Mode:"
 msgstr "Attēla renderēšanas režīms:"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:201
-#, fuzzy
 msgid ""
 "When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will "
 "not work in all browsers.)"
 msgstr ""
-"Ja attēls ir palielin�ts, pielietot izlīdzin�šanu vai atst�t kvadr�tainu "
+"Ja attēls ir palielin�ts, pielietot izlīdzin�šanu vai atst�t graudainu "
 "(pikselētu). (Nedarbojas visos p�rlūkos.)"
 
 #: ../src/extension/internal/gdkpixbuf-input.cpp:202
@@ -9309,7 +9307,7 @@ msgstr "P�rvietot kr�su p�rejas turi"
 
 #: ../src/gradient-drag.cpp:1162 ../src/widgets/gradient-vector.cpp:847
 msgid "Delete gradient stop"
-msgstr "Dzēst kr�su p�rejas beigas"
+msgstr "Dzēst kr�su p�rejas pieturpunktu"
 
 #: ../src/gradient-drag.cpp:1425
 #, c-format
@@ -9318,7 +9316,7 @@ msgid ""
 "+Alt</b> to delete stop"
 msgstr ""
 "%s %d objektam: %s%s; velciet ar <b>Ctrl</b>, lai piesaistītu novirzei; "
-"uzklikšķiniet ar <b>Ctrl+Alt</b>, lai dzēstu p�rtraukumu"
+"uzklikšķiniet ar <b>Ctrl+Alt</b>, lai dzēstu pieturpunktu"
 
 #: ../src/gradient-drag.cpp:1429 ../src/gradient-drag.cpp:1436
 msgid " (stroke)"
@@ -9366,11 +9364,11 @@ msgstr "P�rvietot kr�su p�rejas turi(-us)"
 
 #: ../src/gradient-drag.cpp:2408
 msgid "Move gradient mid stop(s)"
-msgstr "P�rvietot kr�su p�rejas vidus punktu(s)"
+msgstr "P�rvietot kr�su p�rejas viduspunktu(s)"
 
 #: ../src/gradient-drag.cpp:2697
 msgid "Delete gradient stop(s)"
-msgstr "Dzēst kr�su p�rejas beigas"
+msgstr "Dzēst kr�su p�rejas pieturpunktu(s)"
 
 #: ../src/inkscape.cpp:341
 msgid "Autosave failed! Cannot create directory %1."
@@ -9686,8 +9684,7 @@ msgstr "<b>Mērogot</b> faktūras aizpildījumu; vien�d� mēr� - ar <b>Ctrl</
 
 #: ../src/knotholder.cpp:268
 msgid "<b>Rotate</b> the pattern fill; with <b>Ctrl</b> to snap angle"
-msgstr ""
-"<b>Griezt</b> faktūras aizpildījumu; ar <b>Ctrl</b> - pievilkt leņķim"
+msgstr "<b>Griezt</b> faktūras aizpildījumu; ar <b>Ctrl</b> - pievilkt leņķim"
 
 #: ../src/libgdl/gdl-dock-bar.c:105
 msgid "Master"
@@ -12379,9 +12376,9 @@ msgid ""
 "snap angle; drag <b>inside</b> the ellipse for arc, <b>outside</b> for "
 "segment"
 msgstr ""
-"Novietojiet loka vai segmenta <b>s�kumpunktu</b>; ar <b>Ctrl</b> - "
-"pievilkt leņķim; lai iegūtu loku, velciet elipses <b>iekšpusē</b>; lai "
-"iegūtu sektoru - <b>�rpusē</b>"
+"Novietojiet loka vai segmenta <b>s�kumpunktu</b>; ar <b>Ctrl</b> - pievilkt "
+"leņķim; lai iegūtu loku, velciet elipses <b>iekšpusē</b>; lai iegūtu sektoru "
+"- <b>�rpusē</b>"
 
 #: ../src/object-edit.cpp:961
 msgid ""
@@ -12389,9 +12386,9 @@ msgid ""
 "snap angle; drag <b>inside</b> the ellipse for arc, <b>outside</b> for "
 "segment"
 msgstr ""
-"Novietojiet loka vai segmenta <b>beigu punktu</b>; ar <b>Ctrl</b> - "
-"pievilkt leņķim; lai iegūtu loku, velciet elipses <b>iekšpusē</b>; lai "
-"iegūtu sektoru - <b>�rpusē</b>"
+"Novietojiet loka vai segmenta <b>beigu punktu</b>; ar <b>Ctrl</b> - pievilkt "
+"leņķim; lai iegūtu loku, velciet elipses <b>iekšpusē</b>; lai iegūtu sektoru "
+"- <b>�rpusē</b>"
 
 #: ../src/object-edit.cpp:1101
 msgid ""
@@ -12423,8 +12420,8 @@ msgid ""
 "Roll/unroll the spiral from <b>outside</b>; with <b>Ctrl</b> to snap angle; "
 "with <b>Shift</b> to scale/rotate; with <b>Alt</b> to lock radius"
 msgstr ""
-"Satīt/attīt spir�li no <b>�rpuses</b>; ar <b>Ctrl</b> - pievilkt leņķim; "
-"ar <b>Shift</b> - mērogot/griezt; ar <b>Alt</b> - fiksēt r�diusu"
+"Satīt/attīt spir�li no <b>�rpuses</b>; ar <b>Ctrl</b> - pievilkt leņķim; ar "
+"<b>Shift</b> - mērogot/griezt; ar <b>Alt</b> - fiksēt r�diusu"
 
 #: ../src/object-edit.cpp:1348
 msgid "Adjust the <b>offset distance</b>"
@@ -12793,7 +12790,7 @@ msgstr "Dzēst visu"
 
 #: ../src/selection-chemistry.cpp:750
 msgid "Select <b>some objects</b> to group."
-msgstr "Grupēšanai atlasiet <b>dažus objektus</b>."
+msgstr "Atlasiet <b>dažus objektus</b> grupēšanai."
 
 #: ../src/selection-chemistry.cpp:765 ../src/sp-item-group.cpp:331
 msgid "Group"
@@ -12813,7 +12810,7 @@ msgstr "Atgrupēt"
 
 #: ../src/selection-chemistry.cpp:942
 msgid "Select <b>object(s)</b> to raise."
-msgstr "Izvēlieties <b>objektu(s)</b>, kurus pacelt augst�k."
+msgstr "Atlasiet <b>objektu(s)</b>, kurus pacelt augst�k."
 
 #: ../src/selection-chemistry.cpp:948 ../src/selection-chemistry.cpp:1004
 #: ../src/selection-chemistry.cpp:1032 ../src/selection-chemistry.cpp:1093
@@ -12831,7 +12828,7 @@ msgstr "Pacelt"
 
 #: ../src/selection-chemistry.cpp:996
 msgid "Select <b>object(s)</b> to raise to top."
-msgstr "Izvēlieties <b>objektu(s)</b>, kurus pacelt paš� augš�."
+msgstr "Atlasiet <b>objektu(s)</b>, kurus pacelt paš� augš�."
 
 #: ../src/selection-chemistry.cpp:1019
 msgid "Raise to top"
@@ -12839,7 +12836,7 @@ msgstr "Pacelt paš� augš�"
 
 #: ../src/selection-chemistry.cpp:1026
 msgid "Select <b>object(s)</b> to lower."
-msgstr "Izvēlieties <b>objektu(s)</b>, kurus nolaist zem�k."
+msgstr "Atlasiet <b>objektu(s)</b>, kurus nolaist zem�k."
 
 #. TRANSLATORS: "Lower" means "to lower an object" in the undo history
 #: ../src/selection-chemistry.cpp:1077
@@ -12849,7 +12846,7 @@ msgstr "Nolaist zem�k"
 
 #: ../src/selection-chemistry.cpp:1085
 msgid "Select <b>object(s)</b> to lower to bottom."
-msgstr "Izvēlieties <b>objektu(s)</b>, kurus nolaist paš� apakš�."
+msgstr "Atlasiet <b>objektu(s)</b>, kurus nolaist paš� apakš�."
 
 #: ../src/selection-chemistry.cpp:1120
 msgid "Lower to bottom"
@@ -12996,7 +12993,7 @@ msgstr "Atlasītajam nav pielietots neviens ceļa efekts."
 
 #: ../src/selection-chemistry.cpp:2550 ../src/ui/dialog/clonetiler.cpp:2218
 msgid "Select an <b>object</b> to clone."
-msgstr "Izvēlieties klonējamo <b>objektu</b>."
+msgstr "Atlasiet klonējamo <b>objektu</b>."
 
 #: ../src/selection-chemistry.cpp:2586
 msgctxt "Action"
@@ -13048,7 +13045,7 @@ msgid ""
 "<b>Cannot find</b> the object to select (orphaned clone, offset, textpath, "
 "flowed text?)"
 msgstr ""
-"<b>Nevar atrast</b> atlas�ma objektu (pamests klons, nobīde, teksta ceļš, "
+"<b>Nevar atrast</b> atlas�mo objektu (pamests klons, nobīde, teksta ceļš, "
 "teksta aizpildījums?)"
 
 #: ../src/selection-chemistry.cpp:2760
@@ -13115,7 +13112,7 @@ msgstr "Objektus par faktūru"
 #: ../src/selection-chemistry.cpp:3331
 msgid "Select an <b>object with pattern fill</b> to extract objects from."
 msgstr ""
-"Izvēlieties <b>objektu ar faktūras aizpildījumu</b>, no kura ekstraģēt  "
+"Atlasiet <b>objektu ar faktūras aizpildījumu</b>, no kura ekstraģēt  "
 "objektus."
 
 #: ../src/selection-chemistry.cpp:3386
@@ -13343,16 +13340,16 @@ msgid ""
 "<b>Skew</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> to "
 "skew around the opposite side"
 msgstr ""
-"<b>Šķiebt</b> atlasīto; ar <b>Ctrl</b> - pievilkt leņķim; ar <b>Shift</b> "
-"- šķiebt gar pretējo malu"
+"<b>Šķiebt</b> atlasīto; ar <b>Ctrl</b> - pievilkt leņķim; ar <b>Shift</b> - "
+"šķiebt gar pretējo malu"
 
 #: ../src/seltrans-handles.cpp:12
 msgid ""
 "<b>Rotate</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> "
 "to rotate around the opposite corner"
 msgstr ""
-"<b>Griezt</b> atlasīto; ar <b>Ctrl</b> - pievilkt leņķim; ar <b>Shift</b> "
-"- griezt ap pretējo stūri"
+"<b>Griezt</b> atlasīto; ar <b>Ctrl</b> - pievilkt leņķim; ar <b>Shift</b> - "
+"griezt ap pretējo stūri"
 
 #: ../src/seltrans-handles.cpp:13
 msgid ""
@@ -14067,7 +14064,7 @@ msgstr "TVektorizēšana: %1.  %2 mezgli"
 #: ../src/ui/dialog/pixelartdialog.cpp:338
 #: ../src/ui/dialog/pixelartdialog.cpp:356
 msgid "Select an <b>image</b> to trace"
-msgstr "Atlasiet vektorizējamo <b>attēlu</b>"
+msgstr "Izvēlieties vektorizējamo <b>attēlu</b>"
 
 #: ../src/trace/trace.cpp:94
 msgid "Select only one <b>image</b> to trace"
@@ -14075,7 +14072,7 @@ msgstr "Vektorizēšanai izvēlieties tikai vienu <b>attēlu</b>"
 
 #: ../src/trace/trace.cpp:112
 msgid "Select one image and one or more shapes above it"
-msgstr "atlasiet vienu attēlu un vienu vai vair�kas figūras virs t�"
+msgstr "Atlasiet vienu attēlu un vienu vai vair�kas figūras virs t�"
 
 #: ../src/trace/trace.cpp:216
 msgid "Trace: No active desktop"
@@ -15134,8 +15131,7 @@ msgstr "<small>Objekts nesatur klonētus raksta elementus.</small>"
 
 #: ../src/ui/dialog/clonetiler.cpp:2097
 msgid "Select <b>one object</b> whose tiled clones to unclump."
-msgstr ""
-"Izvēlieties <b>vienu objektu</b>, kura klonu raksta elementus izretin�t."
+msgstr "Atlasiet <b>vienu objektu</b>, kura klonu raksta elementus izretin�t."
 
 #: ../src/ui/dialog/clonetiler.cpp:2119
 msgid "Unclump tiled clones"
@@ -15144,7 +15140,7 @@ msgstr "Izretin�t klonētos raksta elementus"
 #: ../src/ui/dialog/clonetiler.cpp:2148
 msgid "Select <b>one object</b> whose tiled clones to remove."
 msgstr ""
-"Izvēlieties <b>vienu objektu</b>, kura klonētos raksta elementus vēlaties "
+"Atlasiet <b>vienu objektu</b>, kura klonētos raksta elementus vēlaties "
 "aizv�kt."
 
 #: ../src/ui/dialog/clonetiler.cpp:2171
@@ -15416,8 +15412,8 @@ msgid ""
 "If set, objects only snap to a guide when it's within the range specified "
 "below"
 msgstr ""
-"Ja iestatīts, objekti tiek pievilkti palīglīnij�m tikai tad, ja tie "
-"atrodas nor�dītaj� att�lum� vai tuv�k"
+"Ja iestatīts, objekti tiek pievilkti palīglīnij�m tikai tad, ja tie atrodas "
+"nor�dītaj� att�lum� vai tuv�k"
 
 #. ---------------------------------------------------------------
 #: ../src/ui/dialog/document-properties.cpp:137
@@ -17023,7 +17019,7 @@ msgstr "_Meklēt"
 
 #: ../src/ui/dialog/find.cpp:114
 msgid "Select all objects matching the selection criteria"
-msgstr "Izvēlēties visus objektus, kas atbilst izvēles kritērijam"
+msgstr "Atlasīt visus objektus, kas atbilst izvēles kritērijam"
 
 #: ../src/ui/dialog/find.cpp:115
 msgid "_Replace All"
@@ -19752,7 +19748,7 @@ msgstr "Atlasīt visos sl�ņos"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1139
 msgid "Select only within current layer"
-msgstr "Iezīmēt tikai pašreizēj� sl�nī"
+msgstr "Atlasīt tikai pašreizēj� sl�nī"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1140
 msgid "Select in current layer and sublayers"
@@ -20105,8 +20101,8 @@ msgid ""
 "Rotating with Ctrl pressed snaps every that much degrees; also, pressing "
 "[ or ] rotates by this amount"
 msgstr ""
-"Griešana ar nospiestu Ctrl pievilkta nor�dītajiem gr�diem (solim);  "
-"[ vai ] nospiešana t�pat pagriež par nor�dīto lielumu"
+"Griešana ar nospiestu Ctrl pievilkta nor�dītajiem gr�diem (solim);  [ vai ] "
+"nospiešana t�pat pagriež par nor�dīto lielumu"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1265
 msgid "Relative snapping of guideline angles"
@@ -20972,7 +20968,7 @@ msgstr "Nospiediet pievienošanas pogu, lai p�rvērstu klonu"
 #: ../src/ui/dialog/livepatheffect-editor.cpp:338
 #: ../src/ui/dialog/livepatheffect-editor.cpp:346
 msgid "Select a path or shape"
-msgstr "Izvēlieties ceļu vai figūru"
+msgstr "Atlasiet ceļu vai figūru"
 
 #: ../src/ui/dialog/livepatheffect-editor.cpp:342
 msgid "Only one item can be selected"
@@ -21167,6 +21163,13 @@ msgid ""
 "Note that this behaviour is not defined in the SVG 1.1 specification and not "
 "all browsers follow this interpretation."
 msgstr ""
+"'image-rendering' īpašība var ietekmēt veidu, k�d� tiek palielin�ta "
+"bitkarte:\n"
+"\t'auto' nav priekšrokas;\n"
+"\t'optimizeQuality' izlīdzin�ta;\n"
+"\t'optimizeSpeed' graudaina.\n"
+"Ņemiet vēr�, ka š�ds meh�nisms nav definēts SVG 1.1 specifik�cij� un ne visi "
+"p�rlūki atbalsta š�du interpret�ciju."
 
 #. Hide
 #: ../src/ui/dialog/object-properties.cpp:293
@@ -21297,9 +21300,8 @@ msgid "Avoid single disconnected pixels"
 msgstr "Izvairīties no atsevišķiem nesavienotiem pikseļiem"
 
 #: ../src/ui/dialog/pixelartdialog.cpp:181
-#, fuzzy
 msgid "A constant vote value"
-msgstr "ierobežots leņķis"
+msgstr "Konstanta svara vērtība"
 
 #: ../src/ui/dialog/pixelartdialog.cpp:191
 msgid "Sparse pixels (window _radius):"
@@ -21321,7 +21323,7 @@ msgstr "Dod priekšroku savienojumiem, kas ir priekšpl�na kr�sas daļa"
 # 'heuristic' vote: voters base their decisions on their feelings towards those promoting a Yes or a No vote, rather than on the issue itself.
 #: ../src/ui/dialog/pixelartdialog.cpp:218
 msgid "The heuristic computed vote will be multiplied by this value"
-msgstr ""
+msgstr "Heiristiski aprēķin�tais svars tiks reizin�ts ar šo vērtību"
 
 #: ../src/ui/dialog/pixelartdialog.cpp:231
 msgid "Heuristics"
@@ -21648,7 +21650,7 @@ msgstr "Teksta priekšskatījums:"
 #: ../src/ui/tools/gradient-tool.cpp:465
 #: ../src/widgets/gradient-vector.cpp:814
 msgid "Add gradient stop"
-msgstr "Pievienot kr�su p�rejas beigas"
+msgstr "Pievienot kr�su p�rejas pieturpunktu"
 
 #. TRANSLATORS: An item in context menu on a colour in the swatches
 #: ../src/ui/dialog/swatches.cpp:258
@@ -22564,16 +22566,16 @@ msgid ""
 "<b>Shift+Ctrl</b>: snap rotation angle to %g° increments and rotate both "
 "handles"
 msgstr ""
-"<b>Shift+Ctrl</b>: pievilkt griešanas leņķi ik %g° pieaugumam un griezt "
-"abus turus"
+"<b>Shift+Ctrl</b>: pievilkt griešanas leņķi ik %g° pieaugumam un griezt abus "
+"turus"
 
 #: ../src/ui/tool/node.cpp:465
 #, c-format
 msgctxt "Path handle tip"
 msgid "<b>Ctrl</b>: snap rotation angle to %g° increments, click to retract"
 msgstr ""
-"<b>Ctrl</b>: pievilkt griešanas leņķi ik %g° pieaugumam, uzklikšķiniet - "
-"lai atsauktu"
+"<b>Ctrl</b>: pievilkt griešanas leņķi ik %g° pieaugumam, uzklikšķiniet - lai "
+"atsauktu"
 
 #: ../src/ui/tool/node.cpp:470
 msgctxt "Path hande tip"
@@ -22796,7 +22798,7 @@ msgstr ""
 
 #: ../src/ui/tools/connector-tool.cpp:1345
 msgid "Select <b>at least one non-connector object</b>."
-msgstr "Izvēlieties <b>vismaz vienu objektu, kas nav savienot�js</b>."
+msgstr "Atlasiet <b>vismaz vienu objektu, kas nav savienot�js</b>."
 
 #: ../src/ui/tools/connector-tool.cpp:1350
 #: ../src/widgets/connector-toolbar.cpp:311
@@ -22976,13 +22978,13 @@ msgid ""
 msgid_plural ""
 "One handle merging %d stops (drag with <b>Shift</b> to separate) selected"
 msgstr[0] ""
-"Atlasīts viens, %d p�rtraukumu apvienojošs turis (velciet ar <b>Shift</b> "
+"Atlasīts viens, %d pieturpunktu apvienojošs turis (velciet ar <b>Shift</b> "
 "lai atdalītu)"
 msgstr[1] ""
-"Atlasīts viens, %d p�rtraukumus apvienojošs turis (velciet ar <b>Shift</b> "
+"Atlasīts viens, %d pieturpunktus apvienojošs turis (velciet ar <b>Shift</b> "
 "lai atdalītu)"
 msgstr[2] ""
-"Atlasīts viens, %d p�rtraukumus apvienojošs turis (velciet ar <b>Shift</b> "
+"Atlasīts viens, %d pieturpunktus apvienojošs turis (velciet ar <b>Shift</b> "
 "lai atdalītu)"
 
 #. TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count)
@@ -23469,8 +23471,8 @@ msgstr "<b>Ctrl</b>: pievilkt leņķim; saglab�t starus radi�lus"
 msgid ""
 "<b>Polygon</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle"
 msgstr ""
-"<b>Daudzstūris</b>: r�diuss %s, leņķis %5g&#176;; ar <b>Ctrl</b> - "
-"pievilkt leņķim"
+"<b>Daudzstūris</b>: r�diuss %s, leņķis %5g&#176;; ar <b>Ctrl</b> - pievilkt "
+"leņķim"
 
 #: ../src/ui/tools/star-tool.cpp:418
 #, c-format
@@ -25184,19 +25186,19 @@ msgstr "Dzēst visus objektus dokument�"
 
 #: ../src/verbs.cpp:2450
 msgid "Select Al_l"
-msgstr "Izvēlēties _visu"
+msgstr "Atlasīt _visu"
 
 #: ../src/verbs.cpp:2451
 msgid "Select all objects or all nodes"
-msgstr "Iezīmēt visus objektus vai mezglus"
+msgstr "Atlasīt visus objektus vai mezglus"
 
 #: ../src/verbs.cpp:2452
 msgid "Select All in All La_yers"
-msgstr "Iezīmēt visu visos s_l�ņos"
+msgstr "Atlasīt visu visos s_l�ņos"
 
 #: ../src/verbs.cpp:2453
 msgid "Select all objects in all visible and unlocked layers"
-msgstr "Izvēlēties visus objektus visos redzamajos un atvērtajos sl�ņos"
+msgstr "Atlasīt visus objektus visos redzamajos un atvērtajos sl�ņos"
 
 #: ../src/verbs.cpp:2454
 msgid "Fill _and Stroke"
@@ -25255,7 +25257,7 @@ msgstr "In_vertēt izvēlēto"
 
 #: ../src/verbs.cpp:2465
 msgid "Invert selection (unselect what is selected and select everything else)"
-msgstr "Invertēt iezīmēto (atceļ iepriekšējo izvēli un izvēlas visu p�rējo)"
+msgstr "Invertēt atlasīto (atceļ iepriekšējo atlasi un atlasa visu p�rējo)"
 
 #: ../src/verbs.cpp:2466
 msgid "Invert in All Layers"
@@ -25263,23 +25265,23 @@ msgstr "Invertēt visus sl�ņus"
 
 #: ../src/verbs.cpp:2467
 msgid "Invert selection in all visible and unlocked layers"
-msgstr "Invertēt iezīmēto visos redzamajos un atvērtajos sl�ņos"
+msgstr "Invertēt atlasīto visos redzamajos un atvērtajos sl�ņos"
 
 #: ../src/verbs.cpp:2468
 msgid "Select Next"
-msgstr "Izvēlēties n�košo"
+msgstr "Atlasīt n�košo"
 
 #: ../src/verbs.cpp:2469
 msgid "Select next object or node"
-msgstr "Izvēlēties n�košo objektu vai mezglu"
+msgstr "Atlasīt n�košo objektu vai mezglu"
 
 #: ../src/verbs.cpp:2470
 msgid "Select Previous"
-msgstr "Izvēlēties iepriekšējo"
+msgstr "Atlasīt iepriekšējo"
 
 #: ../src/verbs.cpp:2471
 msgid "Select previous object or node"
-msgstr "Izvēlēties iepriekšējo objektu vai mezglu"
+msgstr "Atlasīt iepriekšējo objektu vai mezglu"
 
 #: ../src/verbs.cpp:2472
 msgid "D_eselect"
@@ -25287,7 +25289,7 @@ msgstr "Atc_elt atlasi"
 
 #: ../src/verbs.cpp:2473
 msgid "Deselect any selected objects or nodes"
-msgstr "Atcelt visu objektu vai mezglu izvēli"
+msgstr "Atcelt visu objektu vai mezglu atlasi"
 
 #: ../src/verbs.cpp:2475
 msgid "Delete all the guides in the document"
@@ -27697,7 +27699,7 @@ msgstr "Iestatīt kr�su p�rejas atk�rtojumu"
 #: ../src/widgets/gradient-toolbar.cpp:992
 #: ../src/widgets/gradient-vector.cpp:740
 msgid "Change gradient stop offset"
-msgstr "Mainīt kr�su p�rejas pieturvietas nobīdi"
+msgstr "Mainīt kr�su p�rejas pieturpunkta nobīdi"
 
 #: ../src/widgets/gradient-toolbar.cpp:1036
 msgid "linear"
@@ -27796,7 +27798,7 @@ msgstr "atbalsta punkti"
 
 #: ../src/widgets/gradient-toolbar.cpp:1145
 msgid "Select a stop for the current gradient"
-msgstr "Atlasiet pašreizēj�s kr�su p�rejas atbalsta punktu"
+msgstr "Atlasiet pašreizēj�s kr�su p�rejas pieturpunktu"
 
 #: ../src/widgets/gradient-toolbar.cpp:1146
 msgid "Stops:"
@@ -27811,18 +27813,18 @@ msgstr "Nobīde:"
 
 #: ../src/widgets/gradient-toolbar.cpp:1158
 msgid "Offset of selected stop"
-msgstr "Atlasīt� atbalsta punkta nobīde"
+msgstr "Atlasīt� pieturpunkta nobīde"
 
 #: ../src/widgets/gradient-toolbar.cpp:1176
 #: ../src/widgets/gradient-toolbar.cpp:1177
 msgid "Insert new stop"
-msgstr "Ievietot jaunu atbalsta punktu"
+msgstr "Ievietot jaunu pieturpunktu"
 
 #: ../src/widgets/gradient-toolbar.cpp:1190
 #: ../src/widgets/gradient-toolbar.cpp:1191
 #: ../src/widgets/gradient-vector.cpp:908
 msgid "Delete stop"
-msgstr "Dzēst atbalsta punktu"
+msgstr "Dzēst pieturpunktu"
 
 #: ../src/widgets/gradient-toolbar.cpp:1204
 msgid "Reverse"
@@ -27857,20 +27859,20 @@ msgstr "Nav atlasītu kr�su p�reju"
 #. TRANSLATORS: "Stop" means: a "phase" of a gradient
 #: ../src/widgets/gradient-vector.cpp:903
 msgid "Add stop"
-msgstr "Pievienot atbalsta punktu"
+msgstr "Pievienot pieturpunktu"
 
 #: ../src/widgets/gradient-vector.cpp:906
 msgid "Add another control stop to gradient"
-msgstr "Pievienot vēl vienu kr�su p�rejas atbalsta punktu"
+msgstr "Pievienot vēl vienu kr�su p�rejas pieturpunktu"
 
 #: ../src/widgets/gradient-vector.cpp:911
 msgid "Delete current control stop from gradient"
-msgstr "Dzēst pašreizējo kr�su p�rejas atbalsta punktu"
+msgstr "Dzēst pašreizējo kr�su p�rejas pieturpunktu"
 
 #. TRANSLATORS: "Stop" means: a "phase" of a gradient
 #: ../src/widgets/gradient-vector.cpp:979
 msgid "Stop Color"
-msgstr "Atbalsta punkta kr�sa"
+msgstr "Pieturpunkta kr�sa"
 
 #: ../src/widgets/gradient-vector.cpp:1007
 msgid "Gradient editor"
@@ -27878,7 +27880,7 @@ msgstr "Kr�su p�reju redaktors"
 
 #: ../src/widgets/gradient-vector.cpp:1307
 msgid "Change gradient stop color"
-msgstr "Mainīt kr�su p�rejas atbalsta punkta kr�su"
+msgstr "Mainīt kr�su p�rejas pieturpunkta kr�su"
 
 #: ../src/widgets/lpe-toolbar.cpp:298
 msgid "All inactive"
@@ -29682,8 +29684,7 @@ msgstr "Citi"
 #: ../src/widgets/toolbox.cpp:1780
 msgid "Snap other points (centers, guide origins, gradient handles, etc.)"
 msgstr ""
-"Pievilkt citus punktus (centrus, vadlīniju s�kumus, kr�su p�reju turus "
-"utt.)"
+"Pievilkt citus punktus (centrus, vadlīniju s�kumus, kr�su p�reju turus utt.)"
 
 #: ../src/widgets/toolbox.cpp:1788
 msgid "Object Centers"
@@ -29945,7 +29946,7 @@ msgstr ""
 
 #: ../share/extensions/dimension.py:109
 msgid "Please select an object."
-msgstr "Lūdzu izvēlieties k�du objektu."
+msgstr "Lūdzu, atlasiet k�du objektu."
 
 #: ../share/extensions/dimension.py:134
 msgid "Unable to process this object.  Try changing it into a path first."
@@ -30069,7 +30070,7 @@ msgstr ""
 
 #: ../share/extensions/funcplot.py:315
 msgid "Please select a rectangle"
-msgstr "Lūdzu, izvēlieties taisnstūri"
+msgstr "Lūdzu, atlasiet taisnstūri"
 
 #: ../share/extensions/gcodetools.py:3321
 #: ../share/extensions/gcodetools.py:4526
@@ -30081,7 +30082,7 @@ msgstr "Nav atlasīts neviens ceļš! Mēģina apstr�d�t visus pieejamos ceļu
 
 #: ../share/extensions/gcodetools.py:3324
 msgid "Noting is selected. Please select something."
-msgstr "Nekas nav izvēlēts. Lūdzu, izvēlieties kaut ko."
+msgstr "Nekas nav atlasīts. Lūdzu, atlasiet kaut ko."
 
 #: ../share/extensions/gcodetools.py:3864
 msgid ""
@@ -30238,7 +30239,7 @@ msgstr "Uzmanību: izlaiž ne-ceļu "
 
 #: ../share/extensions/gcodetools.py:5511
 msgid "Please select at least one path to engrave and run again."
-msgstr "Lūdzu, izvēlieties vismaz vienu gravējamu ceļu un palaidiet vēlreiz."
+msgstr "Lūdzu, atlasiet vismaz vienu gravējamu ceļu un palaidiet vēlreiz."
 
 #: ../share/extensions/gcodetools.py:5519
 msgid "Unknown unit selected. mm assumed"
@@ -30304,8 +30305,8 @@ msgid ""
 " Current active tab id is %s"
 msgstr ""
 "Izvēlieties vienu no darbību cilnēm - ceļu par G-code, laukums, gravēšana, "
-"DXF punkti, izvietojum, p�rbīde, virpa vai rīku bibliotēka .\n"
-" Šobrīd aktīv� cilne ir  %s"
+"DXF punkti, izvietojums, p�rbīde, virpa vai rīku bibliotēka .\n"
+" Šobrīd aktīv� cilne ir %s"
 
 #: ../share/extensions/gcodetools.py:6668
 msgid ""
@@ -30600,8 +30601,7 @@ msgstr ""
 
 #: ../share/extensions/jessyInk_view.py:75
 msgid "More than one object selected. Please select only one object.\n"
-msgstr ""
-"Ir izvēlēts vair�k nek� viens objekts. Lūdzu, izvēlieties tikai vienu.\n"
+msgstr "Ir atlasīts vair�k nek� viens objekts. Lūdzu, atlasiet tikai vienu.\n"
 
 #: ../share/extensions/jessyInk_view.py:79
 msgid ""
@@ -30864,19 +30864,19 @@ msgstr "Jums nepieciešams uzst�dīt UniConvertor programmatūru.\n"
 
 #: ../share/extensions/voronoi2svg.py:215
 msgid "Please select objects!"
-msgstr "Lūdzu, izvēlieties objektus!"
+msgstr "LÅ«dzu, atlasiet objektus!"
 
 #: ../share/extensions/web-set-att.py:58
 #: ../share/extensions/web-transmit-att.py:54
 msgid "You must select at least two elements."
-msgstr "Ir j�izvēlas vismaz divi elementi."
+msgstr "Ir j�atlasa vismaz divi elementi."
 
 #: ../share/extensions/webslicer_create_group.py:57
 msgid ""
 "You must create and select some \"Slicer rectangles\" before trying to group."
 msgstr ""
-"Jums ir j�izveido un j�atlasa daži \"Griezēja taisnstūri\" pirms "
-"pielietošanas grupai."
+"Jums ir j�izveido un j�atlasa daži \"Griezēja taisnstūri\" pirms mēģin�juma "
+"grupēt."
 
 #: ../share/extensions/webslicer_create_group.py:72
 msgid ""
@@ -31986,7 +31986,7 @@ msgid ""
 "   Isotropic scaling is disabled.\n"
 "   First derivative is always determined numerically."
 msgstr ""
-"Pirms paplašin�juma izsaukšanas izvēlieties taisnstūri,\n"
+"Pirms paplašin�juma izsaukšanas atlasiet taisnstūri,\n"
 "tas noteiks X un Y izmērus. Ja vēlaties aizpildīt laukumu, pievienojiet x-"
 "ass galapunktus.\n"
 "\n"
@@ -32200,8 +32200,8 @@ msgid ""
 "colored arrows."
 msgstr ""
 "Lietošana: 1. Atlasiet visas laukuma nobīdes (pelēk�s aprises) 2. Objekts/"
-"Atgrupēt (Shift+Ctrl+G) 3. Nospiediet 'Pielietot';  Aizdomas turētie sīkie "
-"objekti tiks atzīmēti ar kr�sain�m bultiņ�m."
+"Atgrupēt (Shift+Ctrl+G) 3. Nospiediet 'Pielietot';  Aizdomīgi sīkie objekti "
+"tiks atzīmēti ar kr�sain�m bultiņ�m."
 
 #: ../share/extensions/gcodetools_area.inx.h:19
 #: ../share/extensions/gcodetools_lathe.inx.h:12
@@ -32810,7 +32810,7 @@ msgid ""
 "of the pattern and get an empty border."
 msgstr ""
 "Izveidot nejaušu Voronoja šūnu faktūru. Faktūra būs pieejama Aizpildījuma un "
-"apmales dialoglodziņ�. Jums ir j�izvēlas k�ds objekts vai grupa.\n"
+"apmales dialoglodziņ�. Jums ir j�atlasa k�ds objekts vai grupa.\n"
 "\n"
 "Ja apmale ir 0, faktūra tiks p�rtraukta pie mal�m Izmantojiet pozitīvu "
 "apmales lielumu, vēlams, liel�ku par šūnas izmēru, lai pan�ktu gludu "
@@ -33455,9 +33455,8 @@ msgstr "Atspoguļot X asi"
 
 #: ../share/extensions/hpgl_output.inx.h:17
 #: ../share/extensions/plotter.inx.h:33
-#, fuzzy
 msgid "Check this to mirror the X axis. (Default: Unchecked)"
-msgstr "R�dīt p�rvietojumus starp ceļiem (Noklusētais: neatzīmēts)"
+msgstr "Atzīmējiet šo, lai atspoguļot X asi. (Noklusētais - neatzīmēts)"
 
 #: ../share/extensions/hpgl_output.inx.h:18
 #: ../share/extensions/plotter.inx.h:34
@@ -33466,9 +33465,8 @@ msgstr "Atspoguļot Y asi"
 
 #: ../share/extensions/hpgl_output.inx.h:19
 #: ../share/extensions/plotter.inx.h:35
-#, fuzzy
 msgid "Check this to mirror the Y axis. (Default: Unchecked)"
-msgstr "R�dīt p�rvietojumus starp ceļiem (Noklusētais: neatzīmēts)"
+msgstr "Atzīmējiet šo, lai atspoguļotu Y asi. (Noklusētais - neatzīmēts)"
 
 #: ../share/extensions/hpgl_output.inx.h:20
 #: ../share/extensions/plotter.inx.h:36
@@ -33556,6 +33554,9 @@ msgid ""
 "if used). If unchecked you have to make sure that all parts of your drawing "
 "are within the document border! (Default: Checked)"
 msgstr ""
+"Atzīmējiet šo, lai autom�tiski pieskaņotu zīmējumu nulles punktam (plus rīka "
+"nobīde, ja tiek izmantota). Ja nav atzīmēts, Jums ir j�p�rliecin�s, ka visas "
+"zīmējuma daļas atrodas dokumenta robež�s (noklusētais - atzīmēts)"
 
 #: ../share/extensions/hpgl_output.inx.h:33
 #: ../share/extensions/plotter.inx.h:51
@@ -34046,19 +34047,19 @@ msgstr "Saraksta režīms"
 
 #: ../share/extensions/jessyInk_keyBindings.inx.h:35
 msgid "Select the slide to the left:"
-msgstr "Izvēlēties slaidu pa kreisi:"
+msgstr "Atlasīt slaidu pa kreisi:"
 
 #: ../share/extensions/jessyInk_keyBindings.inx.h:36
 msgid "Select the slide to the right:"
-msgstr "Izvēlēties slaidu pa labi"
+msgstr "Atlasīt slaidu pa labi"
 
 #: ../share/extensions/jessyInk_keyBindings.inx.h:37
 msgid "Select the slide above:"
-msgstr "Izvēlieties slaidu virs:"
+msgstr "Atlasīt slaidu virs:"
 
 #: ../share/extensions/jessyInk_keyBindings.inx.h:38
 msgid "Select the slide below:"
-msgstr "Izvēlieties slaidu zem:"
+msgstr "Atlasīt slaidu zem:"
 
 #: ../share/extensions/jessyInk_keyBindings.inx.h:39
 msgid "Previous page:"
@@ -34677,7 +34678,7 @@ msgid ""
 "scales.\n"
 "First derivatives are always determined numerically."
 msgstr ""
-"Izvēlieties taisnstūri pirms paplašin�juma izsaukšanas, tas noteiks X un Y "
+"Atlasiet taisnstūri pirms paplašin�juma izsaukšanas, tas noteiks X un Y "
 "izmērus.\n"
 "Pirmie atvasin�jumi vienmēr tiek noteikti skaitliski."
 
@@ -36471,7 +36472,7 @@ msgid ""
 "it). To use this, you must to select some \"Slicer rectangles\" first."
 msgstr ""
 "Izk�rtojuma grupas mērķis ir tikai veicin�t lab�ka koda veidošanai (ja tas "
-"nepieciešams). Lai to izmantotu, Jums vispirms ir j�izvēlas daži \"Griezēja "
+"nepieciešams). Lai to izmantotu, Jums vispirms ir j�atlasa daži \"Griezēja "
 "taisnstūri\"."
 
 #: ../share/extensions/webslicer_create_group.inx.h:14
diff --git a/share/extensions/color_blackandwhite.inx b/share/extensions/color_blackandwhite.inx
index 8432ab2d3..0fa58a128 100644
--- a/share/extensions/color_blackandwhite.inx
+++ b/share/extensions/color_blackandwhite.inx
@@ -5,6 +5,7 @@
 	<dependency type="executable" location="extensions">coloreffect.py</dependency>
 	<dependency type="executable" location="extensions">color_blackandwhite.py</dependency>
 	<dependency type="executable" location="extensions">simplestyle.py</dependency>
+	<param name="threshold" type="int" min="1" max="255" _gui-text="Threshold Color (1-255):">127</param>
 	<effect>
 		<object-type>all</object-type>
 		<effects-menu>
diff --git a/share/extensions/color_blackandwhite.py b/share/extensions/color_blackandwhite.py
index 57e6e2ae8..fcee057c7 100755
--- a/share/extensions/color_blackandwhite.py
+++ b/share/extensions/color_blackandwhite.py
@@ -2,12 +2,19 @@
 import coloreffect,sys
 
 class C(coloreffect.ColorEffect):
+  def __init__(self):
+    coloreffect.ColorEffect.__init__(self)
+    self.OptionParser.add_option("-t", "--threshold",
+                                 action="store", type="int",
+                                 dest="threshold", default=127,
+                                 help="Threshold Color Level")
+
   def colmod(self,r,g,b):
     #ITU-R Recommendation BT.709
     #l = 0.2125 * r + 0.7154 * g + 0.0721 * b
     #NTSC and PAL
     l = 0.299 * r + 0.587 * g + 0.114 * b
-    if l > 127:
+    if l > self.options.threshold:
        ig = 255
     else:
        ig = 0
diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py
index d71b7d7e7..947cb5b30 100755
--- a/share/extensions/inkex.py
+++ b/share/extensions/inkex.py
@@ -285,8 +285,8 @@ class Effect:
             return 'px'
 
     #a dictionary of unit to user unit conversion factors
-    __uuconv = {'in':90.0, 'pt':1.25, 'px':1, 'mm':3.5433070866, 'cm':35.433070866, 'm':3543.3070866,
-              'km':3543307.0866, 'pc':15.0, 'yd':3240 , 'ft':1080}
+    __uuconv = {'in':90.0, 'pt':1.25, 'px':1.0, 'mm':3.5433070866, 'cm':35.433070866, 'm':3543.3070866,
+              'km':3543307.0866, 'pc':15.0, 'yd':3240.0 , 'ft':1080.0}
     def unittouu(self, string):
         '''Returns userunits given a string representation of units in another system'''
         unit = re.compile('(%s)$' % '|'.join(self.__uuconv.keys()))
diff --git a/src/desktop.cpp b/src/desktop.cpp
index 22c00d4f1..3ed6d9ef3 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -138,6 +138,8 @@ SPDesktop::SPDesktop() :
     _w2d(),
     _d2w(),
     _doc2dt( Geom::Scale(1, -1) ),
+    // This doesn't work I don't know why.
+    _image_render_observer(this, "/options/rendering/imageinoutlinemode"),
     grids_visible( false )
 {
     _d2w.setIdentity();
@@ -499,11 +501,15 @@ SPDesktop::remove_temporary_canvasitem (Inkscape::Display::TemporaryItem * tempi
     }
 }
 
+void SPDesktop::redrawDesktop() {
+    sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (main), _d2w); // redraw
+}
+
 void SPDesktop::_setDisplayMode(Inkscape::RenderMode mode) {
     SP_CANVAS_ARENA (drawing)->drawing.setRenderMode(mode);
     canvas->rendermode = mode;
     _display_mode = mode;
-    sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (main), _d2w); // redraw
+    redrawDesktop();
     _widget->setTitle( sp_desktop_document(this)->getName() );
 }
 void SPDesktop::_setDisplayColorMode(Inkscape::ColorMode mode) {
@@ -524,7 +530,7 @@ void SPDesktop::_setDisplayColorMode(Inkscape::ColorMode mode) {
     SP_CANVAS_ARENA (drawing)->drawing.setColorMode(mode);
     canvas->colorrendermode = mode;
     _display_color_mode = mode;
-    sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (main), _d2w); // redraw
+    redrawDesktop();
     _widget->setTitle( sp_desktop_document(this)->getName() );
 }
 
@@ -819,7 +825,7 @@ SPDesktop::set_display_area (double x0, double y0, double x1, double y1, double
         // zoom changed - set new zoom factors
         _d2w = Geom::Scale(newscale, -newscale);
         _w2d = Geom::Scale(1/newscale, 1/-newscale);
-        sp_canvas_item_affine_absolute(SP_CANVAS_ITEM(main), _d2w);
+        redrawDesktop();
         clear = TRUE;
         zoomChanged = true;
     }
@@ -1699,7 +1705,6 @@ _layer_hierarchy_changed(SPObject */*top*/, SPObject *bottom,
 /// Called when document is starting to be rebuilt.
 static void _reconstruction_start(SPDesktop * desktop)
 {
-    g_debug("Desktop, starting reconstruction\n");
     desktop->_reconstruction_old_layer_id = desktop->currentLayer()->getId() ? desktop->currentLayer()->getId() : "";
     desktop->layers->reset();
 
@@ -1710,8 +1715,6 @@ static void _reconstruction_start(SPDesktop * desktop)
     }
     */
     desktop->selection->clear();
-
-    g_debug("Desktop, starting reconstruction end\n");
 }
 
 /// Called when document rebuild is finished.
diff --git a/src/desktop.h b/src/desktop.h
index 2f47dc2dd..fec6249e9 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -35,12 +35,14 @@
 #include "display/rendermode.h"
 #include <glibmm/ustring.h>
 
+#include "preferences.h"
 #include "sp-gradient.h" // TODO refactor enums out to their own .h file
 
 class SPCSSAttr;
 struct SPCanvas;
 struct SPCanvasItem;
 struct SPCanvasGroup;
+struct DesktopPrefObserver;
 
 namespace Inkscape {
 namespace UI {
@@ -206,7 +208,7 @@ public:
     /// Emitted when the zoom factor changes (not emitted when scrolling).
     /// The parameter is the new zoom factor
     sigc::signal<void, double> signal_zoom_changed;
-    
+
     sigc::connection connectDestroy(const sigc::slot<void, SPDesktop*> &slot)
     {
         return _destroy_signal.connect(slot);
@@ -256,6 +258,8 @@ public:
     Inkscape::Display::TemporaryItem * add_temporary_canvasitem (SPCanvasItem *item, guint lifetime, bool move_to_bottom = true);
     void remove_temporary_canvasitem (Inkscape::Display::TemporaryItem * tempitem);
 
+    void redrawDesktop();
+
     void _setDisplayMode(Inkscape::RenderMode mode);
     void setDisplayModeNormal() {
         _setDisplayMode(Inkscape::RENDERMODE_NORMAL);
@@ -426,6 +430,26 @@ private:
     Geom::Affine _d2w;
     Geom::Affine _doc2dt;
 
+    /*
+     * Allow redrawing or refreshing if preferences change
+     */
+    class DesktopPrefObserver : public Inkscape::Preferences::Observer {
+      public:
+        DesktopPrefObserver(SPDesktop *desktop, Glib::ustring const &path)
+            : Inkscape::Preferences::Observer(path)
+            , _desktop(desktop) {
+            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+            prefs->addObserver(*this);
+        }
+      private:
+        void notify(Inkscape::Preferences::Entry const &val) {
+            _desktop->redrawDesktop();
+        }
+        SPDesktop *_desktop;
+    };
+
+    DesktopPrefObserver _image_render_observer;
+
     bool grids_visible; /* don't set this variable directly, use the method below */
     void set_grids_visible(bool visible);
 
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp
index 5844c8b08..00caef525 100644
--- a/src/display/drawing-image.cpp
+++ b/src/display/drawing-image.cpp
@@ -106,7 +106,10 @@ unsigned DrawingImage::_renderItem(DrawingContext &dc, Geom::IntRect const &/*ar
 {
     bool outline = _drawing.outline();
 
-    if (!outline) {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    bool imgoutline = prefs->getBool("/options/rendering/imageinoutlinemode", false);
+
+    if (!outline || imgoutline) {
         if (!_pixbuf) return RENDER_OK;
 
         Inkscape::DrawingContext::Save save(dc);
@@ -141,7 +144,7 @@ unsigned DrawingImage::_renderItem(DrawingContext &dc, Geom::IntRect const &/*ar
         dc.paint(_opacity);
 
     } else { // outline; draw a rect instead
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
         guint32 rgba = prefs->getInt("/options/wireframecolors/images", 0xff0000ff);
 
         {   Inkscape::DrawingContext::Save save(dc);
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 6d903867b..3dc4a7504 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -2153,6 +2153,8 @@ gboolean SPCanvasImpl::handleDraw(GtkWidget *widget, cairo_t *cr) {
             canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom());
         }
 
+        cairo_rectangle_list_destroy(rects);
+
 	return FALSE;
 }
 #else
diff --git a/src/extension/dbus/Makefile_insert b/src/extension/dbus/Makefile_insert
index 7d851715e..192651d87 100644
--- a/src/extension/dbus/Makefile_insert
+++ b/src/extension/dbus/Makefile_insert
@@ -78,7 +78,7 @@ libinkdbus_la_CFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(INKSCAPE_CFLAGS) \
 	-I$(builddir)/extension/dbus \
-	-Wall -Werror
+	-Wall
 
 libinkdbus_la_LIBADD = \
 	$(DBUS_LIBS) \
diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp
index c45367c08..9ce73c260 100644
--- a/src/extension/internal/pdf-input-cairo.cpp
+++ b/src/extension/internal/pdf-input-cairo.cpp
@@ -616,7 +616,7 @@ PdfInputCairo::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
                                                                    output, width, height);
     cairo_t* cr = cairo_create(surface);
 
-    poppler_page_render(page, cr);
+    poppler_page_render_for_printing(page, cr);
     cairo_show_page(cr);
 
     cairo_destroy(cr);
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index 96629f22d..734e8a582 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -293,7 +293,9 @@ static char const preferences_skeleton[] =
 #ifdef WIN32 // FIXME: Temporary Win32 special code to enable transient dialogs
 "    <group id=\"dialogsontopwin32\" value=\"0\"/>\n"
 #endif
-"    <group id=\"defaultwindowsize\" value=\"2\" />\n"
+#if !defined(GDK_WINDOWING_QUARTZ) // No maximise for Quartz, see lp:1302627
+ "    <group id=\"defaultwindowsize\" value=\"2\" />\n"
+#endif
 "    <group id=\"arenatilescachesize\" value=\"8192\"/>\n"
 "    <group id=\"preservetransform\" value=\"0\"/>\n"
 "    <group id=\"clonecompensation\" value=\"1\"/>\n"
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 6aec42c5b..40f3f174a 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -960,16 +960,17 @@ Geom::PathVector* item_outline(SPItem const *item, bool bbox_only)
     Geom::Affine const transform(item->transform);
     float const scale = transform.descrim();
 
-    float o_width, o_miter;
+    float o_width = i_style->stroke_width.computed;
+    if (o_width < Geom::EPSILON) {
+        // This may result in rounding errors for very small stroke widths (happens e.g. when user unit is large).
+        // See bug lp:1244861
+        o_width = Geom::EPSILON;
+    }
+    float o_miter = i_style->stroke_miterlimit.value * o_width;
+
     JoinType o_join;
     ButtType o_butt;
     {
-        o_width = i_style->stroke_width.computed;
-        if (o_width < 0.01) {
-            o_width = 0.01;
-        }
-        o_miter = i_style->stroke_miterlimit.value * o_width;
-
         switch (i_style->stroke_linejoin.computed) {
             case SP_STROKE_LINEJOIN_MITER:
                 o_join = join_pointy;
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index d826ece09..559398a84 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1463,6 +1463,11 @@ void InkscapePreferences::initPageBitmaps()
     _page_bitmaps.add_line( false, "", _importexport_import_res_override, "",
                             _("Use default bitmap resolution in favor of information from file"));
 
+    _page_bitmaps.add_group_header( _("Render"));
+    // rendering outlines for pixmap image tags
+    _rendering_image_outline.init( _("Images in Outline Mode"), "/options/rendering/imageinoutlinemode", false);
+    _page_bitmaps.add_line(false, _(""), _rendering_image_outline, "", _("When active will render images while in outline mode instead of a red box with an x. This is useful for manual tracing."));
+
     this->AddPage(_page_bitmaps, _("Bitmaps"), PREFS_PAGE_BITMAPS);
 }
 
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index da85b805d..1c2151605 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -292,6 +292,7 @@ protected:
     UI::Widget::PrefCheckButton _show_filters_info_box;
     UI::Widget::PrefCombo       _dockbar_style;
     UI::Widget::PrefCombo       _switcher_style;
+    UI::Widget::PrefCheckButton _rendering_image_outline;
     UI::Widget::PrefSpinButton  _rendering_cache_size;
     UI::Widget::PrefSpinButton  _filter_multi_threaded;
 
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 24e2db9e1..32a1e7f5d 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -382,7 +382,10 @@ static void sp_repr_css_merge_from_decl(SPCSSAttr *css, CRDeclaration const *con
     std::string characters;
     std::string temp;
     bool number_valid = !(ss >> number).fail();
-    if( !number_valid ) ss.clear();
+    if (!number_valid) {
+        ss.clear();
+        ss.seekg(0); // work-around for a bug in libc++ (see lp:1300271)
+    }
     while( !(ss >> temp).eof() ) {
         characters += temp;
         characters += " ";