diff --git a/umbrello/layouts/class-horizontal.desktop b/umbrello/layouts/class-horizontal.desktop
index 116292029..36a2dda21 100644
--- a/umbrello/layouts/class-horizontal.desktop
+++ b/umbrello/layouts/class-horizontal.desktop
@@ -1,97 +1,98 @@
 [Desktop Entry]
 Type=Service
 Name=Horizontal Layout
 Name[bs]=Horizontalni raspored
 Name[ca]=Disposició horitzontal
 Name[ca@valencia]=Disposició horitzontal
 Name[cs]=Vodorovné rozložení
 Name[da]=Vandret layout
 Name[de]=Horizontales Layout
 Name[el]=Οριζόντια διάταξη
 Name[en_GB]=Horizontal Layout
 Name[es]=Disposición horizontal
 Name[et]=Rõhtne paigutus
 Name[fi]=Vaakasuuntainen asettelu
 Name[fr]=Disposition horizontale
 Name[gl]=Disposición horizontal
 Name[hu]=Vízszintes elrendezés
 Name[it]=Disposizione orizzontale
 Name[kk]=Жатық орналасуы
 Name[ko]=수평 레이아웃
 Name[lt]=Horizontalus išdėstymas
 Name[mr]=आडवी रचना
 Name[nb]=Vannrett utforming
 Name[nl]=Horizontale indeling
 Name[nn]=Vassrett utforming
 Name[pa]=ਹਰੀਜੱਟਲ ਲੇਆਉਟ
 Name[pl]=Układ poziomy
 Name[pt]=Disposição Horizontal
 Name[pt_BR]=Layout horizontal
 Name[ru]=Горизонтальный шаблон
 Name[sk]=Vodorovné rozloženie
 Name[sl]=Vodoravna postavitev
 Name[sr]=Водоравни распоред
 Name[sr@ijekavian]=Водоравни распоред
 Name[sr@ijekavianlatin]=Vodoravni raspored
 Name[sr@latin]=Vodoravni raspored
 Name[sv]=Horisontell layout
 Name[tr]=Yatay Düzen
 Name[uk]=Горизонтальне компонування
 Name[x-test]=xxHorizontal Layoutxx
 Name[zh_CN]=水平布局
 Name[zh_TW]=水平佈局
 Comment=Layout which renders horizontal
 Comment[ca]=Disposició que renderitza horitzontalment
+Comment[de]=Layout, das horizontal gerendert wird
 Comment[en_GB]=Layout which renders horizontal
 Comment[es]=Diseño que se organiza de forma horizontal
 Comment[fr]=Disposition permettant un rendu horizontal
 Comment[gl]=Disposición que renderiza de maneira horizontal.
 Comment[nl]=Indeling die zich horizontaal laat weergeven
 Comment[pl]=Układ, który wyświetla się w poziomie
 Comment[pt]=Uma disposição que representa os itens na horizontal
 Comment[pt_BR]=Layout que representa os itens na horizontal
 Comment[sv]=Layout som återges horisontellt
 Comment[uk]=Компонування з горизонтальним розташуванням елементів
 Comment[x-test]=xxLayout which renders horizontalxx
 
 [X-UMBRELLO-Dot-Nodes]
 type::class=shape=box
 type::default=shape=box
 
 # for image output
 [X-UMBRELLO-Dot-Edges]
 # for visual representation
 visual::type::anchor=arrowhead=none,style=dashed
 visual::type::aggregation=arrowtail=odiamond,dir=back
 visual::type::composition=arrowhead=diamonds
 visual::type::containment=arrowtail=odottee,dir=back
 visual::type::dependency=arrowtail=vee,style=dashed,dir=back
 visual::type::uniassociation=arrowtail=vee,dir=back
 visual::type::association=arrowhead=none
 visual::type::generalization=arrowtail=onormal,dir=back
 visual::type::realisation=arrowtail=normal,dir=back
 visual::type::default=arrowhead=none
 # for position ranking
 ranking::type::anchor=weight=0.001
 ranking::type::aggregation=weight=0.001
 ranking::type::association=weight=0.001
 ranking::type::composition=weight=0.001
 ranking::type::containment=weight=0.001
 ranking::type::dependency=weight=0.001
 ranking::type::generalization=weight=1.0
 ranking::type::realisation=weight=0.8
 ranking::type::uniassociation=weight=0.001
 ranking::type::default=weight=0.001
 # id handling
 id::type::aggregation=swap
 id::type::composition=swap
 id::type::containment=swap
 
 [X-UMBRELLO-Dot-Attributes]
 graph=splines=polyline,rankdir=LR,outputorder=nodesfirst,ranksep=1.0,nodesep=0.8
 node=
 edge=
 
 [X-UMBRELLO-Dot-Settings]
 origin=50,50
 
diff --git a/umbrello/layouts/component-horizontal.desktop b/umbrello/layouts/component-horizontal.desktop
index 4e6fb5cb3..abf30999a 100644
--- a/umbrello/layouts/component-horizontal.desktop
+++ b/umbrello/layouts/component-horizontal.desktop
@@ -1,89 +1,90 @@
 [Desktop Entry]
 Type=Service
 Name=Horizontal Layout
 Name[bs]=Horizontalni raspored
 Name[ca]=Disposició horitzontal
 Name[ca@valencia]=Disposició horitzontal
 Name[cs]=Vodorovné rozložení
 Name[da]=Vandret layout
 Name[de]=Horizontales Layout
 Name[el]=Οριζόντια διάταξη
 Name[en_GB]=Horizontal Layout
 Name[es]=Disposición horizontal
 Name[et]=Rõhtne paigutus
 Name[fi]=Vaakasuuntainen asettelu
 Name[fr]=Disposition horizontale
 Name[gl]=Disposición horizontal
 Name[hu]=Vízszintes elrendezés
 Name[it]=Disposizione orizzontale
 Name[kk]=Жатық орналасуы
 Name[ko]=수평 레이아웃
 Name[lt]=Horizontalus išdėstymas
 Name[mr]=आडवी रचना
 Name[nb]=Vannrett utforming
 Name[nl]=Horizontale indeling
 Name[nn]=Vassrett utforming
 Name[pa]=ਹਰੀਜੱਟਲ ਲੇਆਉਟ
 Name[pl]=Układ poziomy
 Name[pt]=Disposição Horizontal
 Name[pt_BR]=Layout horizontal
 Name[ru]=Горизонтальный шаблон
 Name[sk]=Vodorovné rozloženie
 Name[sl]=Vodoravna postavitev
 Name[sr]=Водоравни распоред
 Name[sr@ijekavian]=Водоравни распоред
 Name[sr@ijekavianlatin]=Vodoravni raspored
 Name[sr@latin]=Vodoravni raspored
 Name[sv]=Horisontell layout
 Name[tr]=Yatay Düzen
 Name[uk]=Горизонтальне компонування
 Name[x-test]=xxHorizontal Layoutxx
 Name[zh_CN]=水平布局
 Name[zh_TW]=水平佈局
 Comment=Layout which renders horizontal
 Comment[ca]=Disposició que renderitza horitzontalment
+Comment[de]=Layout, das horizontal gerendert wird
 Comment[en_GB]=Layout which renders horizontal
 Comment[es]=Diseño que se organiza de forma horizontal
 Comment[fr]=Disposition permettant un rendu horizontal
 Comment[gl]=Disposición que renderiza de maneira horizontal.
 Comment[nl]=Indeling die zich horizontaal laat weergeven
 Comment[pl]=Układ, który wyświetla się w poziomie
 Comment[pt]=Uma disposição que representa os itens na horizontal
 Comment[pt_BR]=Layout que representa os itens na horizontal
 Comment[sv]=Layout som återges horisontellt
 Comment[uk]=Компонування з горизонтальним розташуванням елементів
 Comment[x-test]=xxLayout which renders horizontalxx
 
 [X-UMBRELLO-Dot-Nodes]
 type::artifact=shape=box
 type::component=shape=component
 type::interface=shape=doublecircle
 type::note=shape=box
 type::default=shape=box
 
 # for dot output
 [X-UMBRELLO-Dot-Edges]
 # for visual representation
 visual::type::component::port=arrowhead=none,style=dotted
 visual::type::anchor=arrowhead=none,style=dashed
 visual::type::association=arrowhead=none
 visual::type::dependency=arrowtail=vee,style=dashed,dir=back
 visual::type::realization=arrowtail=normal,dir=back
 visual::type::uniassociation=arrowtail=vee,dir=back
 visual::type::default=arrowhead=none
 # for position ranking
 ranking::type::component::port=minlen=0.0001,constraint=false
 #ranking::type::anchor=weight=0.8
 ranking::type::association=weight=0.8
 ranking::type::dependency=weight=0.8
 ranking::type::realization=weight=0.8
 ranking::type::uniassociation=weight=0.8
 ranking::type::default=weight=0.001
 
 [X-UMBRELLO-Dot-Attributes]
 graph=splines=polyline,rankdir=LR,outputorder=nodesfirst,ranksep=0.5,nodesep=0.5
 node=
 edge=
 
 [X-UMBRELLO-Dot-Settings]
 origin=50,50
diff --git a/umbrello/layouts/entityrelationship-horizontal.desktop b/umbrello/layouts/entityrelationship-horizontal.desktop
index d5b3115d9..4c8e77704 100644
--- a/umbrello/layouts/entityrelationship-horizontal.desktop
+++ b/umbrello/layouts/entityrelationship-horizontal.desktop
@@ -1,83 +1,84 @@
 [Desktop Entry]
 Type=Service
 Name=Horizontal Layout
 Name[bs]=Horizontalni raspored
 Name[ca]=Disposició horitzontal
 Name[ca@valencia]=Disposició horitzontal
 Name[cs]=Vodorovné rozložení
 Name[da]=Vandret layout
 Name[de]=Horizontales Layout
 Name[el]=Οριζόντια διάταξη
 Name[en_GB]=Horizontal Layout
 Name[es]=Disposición horizontal
 Name[et]=Rõhtne paigutus
 Name[fi]=Vaakasuuntainen asettelu
 Name[fr]=Disposition horizontale
 Name[gl]=Disposición horizontal
 Name[hu]=Vízszintes elrendezés
 Name[it]=Disposizione orizzontale
 Name[kk]=Жатық орналасуы
 Name[ko]=수평 레이아웃
 Name[lt]=Horizontalus išdėstymas
 Name[mr]=आडवी रचना
 Name[nb]=Vannrett utforming
 Name[nl]=Horizontale indeling
 Name[nn]=Vassrett utforming
 Name[pa]=ਹਰੀਜੱਟਲ ਲੇਆਉਟ
 Name[pl]=Układ poziomy
 Name[pt]=Disposição Horizontal
 Name[pt_BR]=Layout horizontal
 Name[ru]=Горизонтальный шаблон
 Name[sk]=Vodorovné rozloženie
 Name[sl]=Vodoravna postavitev
 Name[sr]=Водоравни распоред
 Name[sr@ijekavian]=Водоравни распоред
 Name[sr@ijekavianlatin]=Vodoravni raspored
 Name[sr@latin]=Vodoravni raspored
 Name[sv]=Horisontell layout
 Name[tr]=Yatay Düzen
 Name[uk]=Горизонтальне компонування
 Name[x-test]=xxHorizontal Layoutxx
 Name[zh_CN]=水平布局
 Name[zh_TW]=水平佈局
 Comment=Layout which renders horizontal
 Comment[ca]=Disposició que renderitza horitzontalment
+Comment[de]=Layout, das horizontal gerendert wird
 Comment[en_GB]=Layout which renders horizontal
 Comment[es]=Diseño que se organiza de forma horizontal
 Comment[fr]=Disposition permettant un rendu horizontal
 Comment[gl]=Disposición que renderiza de maneira horizontal.
 Comment[nl]=Indeling die zich horizontaal laat weergeven
 Comment[pl]=Układ, który wyświetla się w poziomie
 Comment[pt]=Uma disposição que representa os itens na horizontal
 Comment[pt_BR]=Layout que representa os itens na horizontal
 Comment[sv]=Layout som återges horisontellt
 Comment[uk]=Компонування з горизонтальним розташуванням елементів
 Comment[x-test]=xxLayout which renders horizontalxx
 
 [X-UMBRELLO-Dot-Nodes]
 type::note=shape=note
 type::entity=shape=box
 type::category=shape=circle
 type::default=shape=box
 
 # for image output
 [X-UMBRELLO-Dot-Edges]
 # for visual representation
 # for visual representation
 visual::type::anchor=arrowhead=none,style=dashed
 visual::type::category2parent=arrowhead=none,style=dashed
 visual::type::relationship=arrowtail=crow,dir=back
 visual::type::default=arrowhead=none
 # for position ranking
 ranking::type::anchor=weight=0.001
 ranking::type::relationship=weight=1.0
 ranking::type::default=weight=0.001
 
 [X-UMBRELLO-Dot-Attributes]
 graph=splines=polyline,rankdir=LR,outputorder=nodesfirst,ranksep=1.0,nodesep=0.8
 node=
 edge=
 
 [X-UMBRELLO-Dot-Settings]
 origin=50,50
 
diff --git a/umbrello/layouts/object-horizontal.desktop b/umbrello/layouts/object-horizontal.desktop
index d6b80a7c9..f4e7e43f2 100644
--- a/umbrello/layouts/object-horizontal.desktop
+++ b/umbrello/layouts/object-horizontal.desktop
@@ -1,79 +1,80 @@
 [Desktop Entry]
 Type=Service
 Name=Horizontal Layout
 Name[bs]=Horizontalni raspored
 Name[ca]=Disposició horitzontal
 Name[ca@valencia]=Disposició horitzontal
 Name[cs]=Vodorovné rozložení
 Name[da]=Vandret layout
 Name[de]=Horizontales Layout
 Name[el]=Οριζόντια διάταξη
 Name[en_GB]=Horizontal Layout
 Name[es]=Disposición horizontal
 Name[et]=Rõhtne paigutus
 Name[fi]=Vaakasuuntainen asettelu
 Name[fr]=Disposition horizontale
 Name[gl]=Disposición horizontal
 Name[hu]=Vízszintes elrendezés
 Name[it]=Disposizione orizzontale
 Name[kk]=Жатық орналасуы
 Name[ko]=수평 레이아웃
 Name[lt]=Horizontalus išdėstymas
 Name[mr]=आडवी रचना
 Name[nb]=Vannrett utforming
 Name[nl]=Horizontale indeling
 Name[nn]=Vassrett utforming
 Name[pa]=ਹਰੀਜੱਟਲ ਲੇਆਉਟ
 Name[pl]=Układ poziomy
 Name[pt]=Disposição Horizontal
 Name[pt_BR]=Layout horizontal
 Name[ru]=Горизонтальный шаблон
 Name[sk]=Vodorovné rozloženie
 Name[sl]=Vodoravna postavitev
 Name[sr]=Водоравни распоред
 Name[sr@ijekavian]=Водоравни распоред
 Name[sr@ijekavianlatin]=Vodoravni raspored
 Name[sr@latin]=Vodoravni raspored
 Name[sv]=Horisontell layout
 Name[tr]=Yatay Düzen
 Name[uk]=Горизонтальне компонування
 Name[x-test]=xxHorizontal Layoutxx
 Name[zh_CN]=水平布局
 Name[zh_TW]=水平佈局
 Comment=Layout which renders horizontal
 Comment[ca]=Disposició que renderitza horitzontalment
+Comment[de]=Layout, das horizontal gerendert wird
 Comment[en_GB]=Layout which renders horizontal
 Comment[es]=Diseño que se organiza de forma horizontal
 Comment[fr]=Disposition permettant un rendu horizontal
 Comment[gl]=Disposición que renderiza de maneira horizontal.
 Comment[nl]=Indeling die zich horizontaal laat weergeven
 Comment[pl]=Układ, który wyświetla się w poziomie
 Comment[pt]=Uma disposição que representa os itens na horizontal
 Comment[pt_BR]=Layout que representa os itens na horizontal
 Comment[sv]=Layout som återges horisontellt
 Comment[uk]=Компонування з горизонтальним розташуванням елементів
 Comment[x-test]=xxLayout which renders horizontalxx
 
 [X-UMBRELLO-Dot-Nodes]
 type::instance=shape=box
 type::default=shape=box
 
 # for image output
 [X-UMBRELLO-Dot-Edges]
 # for visual representation
 visual::type::anchor=arrowhead=none,style=dashed
 visual::type::association=arrowhead=none
 visual::type::default=arrowhead=none
 # for position ranking
 ranking::type::anchor=weight=0.001
 ranking::type::association=weight=0.001
 ranking::type::default=weight=0.001
 
 [X-UMBRELLO-Dot-Attributes]
 graph=splines=polyline,rankdir=LR,outputorder=nodesfirst,ranksep=1.0,nodesep=0.8
 node=
 edge=
 
 [X-UMBRELLO-Dot-Settings]
 origin=50,50