Merge branch 'master' into edge

website/doctype/about_us_settings/locale/_messages_doc.json

@@ -8,9 +8,9 @@
  "Settings for the About Us Page", 
  "Company History Heading", 
  "Company Introduction", 
- "More content for the bottom of the page.", 
  "About Us Settings", 
  "\"Company History\"", 
+ "More content for the bottom of the page.", 
  "\"Team Members\" or \"Management\"", 
  "Team Members Heading"
 ]

website/doctype/about_us_settings/locale/de-doc.json

@@ -0,0 +1,16 @@
+{
+ "\"Company History\"": "Firmengeschichte", 
+ "\"Team Members\" or \"Management\"": "Teammitglieder oder \"Management\"", 
+ "About Us Settings": "\u00dcber uns Settings", 
+ "Company History": "Unternehmensgeschichte", 
+ "Company History Heading": "Unternehmensgeschichte \u00dcberschrift", 
+ "Company Introduction": "Vorstellung der Gesellschaft", 
+ "Footer": "Fu\u00dfzeile", 
+ "Help": "Hilfe", 
+ "Introduce your company to the website visitor.": "Pr\u00e4sentieren Sie Ihr Unternehmen auf der Website Besucher.", 
+ "More content for the bottom of the page.": "Mehr Inhalte f\u00fcr die unten auf der Seite.", 
+ "Settings for the About Us Page": "Einstellungen f\u00fcr die \u00dcber uns Seite", 
+ "Team Members": "Teammitglieder", 
+ "Team Members Heading": "Teammitglieder \u00dcberschrift", 
+ "Website": "Webseite"
+}

website/doctype/about_us_team_member/locale/de-doc.json

@@ -0,0 +1,5 @@
+{
+ "About Us Team Member": "\u00dcber uns Team Member", 
+ "Employee": "Mitarbeiter", 
+ "Website": "Webseite"
+}

website/doctype/blog/locale/_messages_doc.json

@@ -5,8 +5,8 @@
  "Blog Intro", 
  "Page Name", 
  "Blog", 
+ "Email Sent", 
  "File List", 
  "Published", 
- "Email Sent", 
  "Description for listing page, in plain text, only a couple of lines."
 ]

website/doctype/blog/locale/de-doc.json

@@ -0,0 +1,10 @@
+{
+ "Blog": "Blog", 
+ "Content": "Inhalt", 
+ "Email Sent": "E-Mail gesendet", 
+ "File List": "Dateiliste", 
+ "Page Name": "Page Name", 
+ "Published": "Ver\u00f6ffentlicht", 
+ "Title": "Titel", 
+ "Website": "Webseite"
+}

website/doctype/blog_subscriber/locale/de-doc.json

@@ -0,0 +1,4 @@
+{
+ "Blog Subscriber": "Blog Subscriber", 
+ "Website": "Webseite"
+}

website/doctype/company_history/locale/_messages_doc.json

@@ -1,6 +1,6 @@
 [
  "Website", 
- "Highlight", 
  "Company History", 
+ "Highlight", 
  "Year"
 ]

website/doctype/company_history/locale/de-doc.json

@@ -0,0 +1,6 @@
+{
+ "Company History": "Unternehmensgeschichte", 
+ "Highlight": "Hervorheben", 
+ "Website": "Webseite", 
+ "Year": "Jahr"
+}

website/doctype/contact_us_settings/locale/_messages_doc.json

@@ -6,8 +6,8 @@
  "Query Options", 
  "Contact Us Settings", 
  "Address to be displayed on the Contact Page", 
- "Address", 
  "Default: \"Contact Us\"", 
+ "Address", 
  "Contact options, like \"Sales Query, Support Query\" etc each on a new line or separated by commas.", 
  "Heading", 
  "Introductory information for the Contact Us Page"

website/doctype/contact_us_settings/locale/de-doc.json

@@ -0,0 +1,13 @@
+{
+ "Address": "Adresse", 
+ "Address to be displayed on the Contact Page": "Adresse auf der Kontakt Seite angezeigt werden", 
+ "Contact Us Settings": "Kontakt Settings", 
+ "Contact options, like \"Sales Query, Support Query\" etc each on a new line or separated by commas.": "Kontakt Optionen, wie \"Sales Query, Support-Anfrage\" etc jeweils auf einer neuen Zeile oder durch Kommas getrennt.", 
+ "Heading": "\u00dcberschrift", 
+ "Help": "Hilfe", 
+ "Introduction": "Einf\u00fchrung", 
+ "Introductory information for the Contact Us Page": "Einf\u00fchrende Informationen f\u00fcr den Kontakt Seite", 
+ "Query Options": "Abfrageoptionen", 
+ "Settings for Contact Us Page": "Einstellungen f\u00fcr Kontakt Seite", 
+ "Website": "Webseite"
+}

website/doctype/cross_list_item_group/locale/de-doc.json

@@ -0,0 +1,6 @@
+{
+ "Cross List Item Group": "\u00dcberqueren List Item-Gruppe", 
+ "Cross Listing of Item in multiple groups": "\u00dcberqueren Auflistung der Artikel in mehreren Gruppen", 
+ "Item Group": "Artikel-Gruppe", 
+ "Website": "Webseite"
+}

website/doctype/product_group/locale/_messages_doc.json

@@ -1,6 +1,6 @@
 [
  "Website", 
- "Product Group", 
+ "Label", 
  "Item Group", 
- "Label"
+ "Product Group"
 ]

website/doctype/product_group/locale/de-doc.json

@@ -0,0 +1,6 @@
+{
+ "Item Group": "Artikel-Gruppe", 
+ "Label": "Etikett", 
+ "Product Group": "Product Group", 
+ "Website": "Webseite"
+}

website/doctype/product_settings/locale/de-doc.json

@@ -0,0 +1,13 @@
+{
+ "Default Product Category": "Standard Produktkategorie", 
+ "Default: \"Product Search\"": "Default: \"Product Search\"", 
+ "Help": "Hilfe", 
+ "List of Item Groups to be shown in \"All Products\" menu - in the sequence wanted and with number of indents (left spacing to show a tree effect).": "Liste der Artikel Groups in \"Alle Produkte\"-Men\u00fc angezeigt werden - und wollte in der Folge mit der Anzahl der Einz\u00fcge (links, um den Baum Abstand Wirkung zu zeigen).", 
+ "Product Categories": "Produktkategorien", 
+ "Product Settings": "Produkt-Settings", 
+ "Search Help": "Suchen Hilfe", 
+ "Settings for Product Catalog on the website": "Einstellungen f\u00fcr Produkt-Katalog auf der Website", 
+ "This Item Group represents \"products.html\"": "Dieser Artikel Gruppe stellt \"products.html\"", 
+ "Website": "Webseite", 
+ "Website Product Categories": "Website Produktkategorien"
+}

website/doctype/products_settings/locale/de-doc.json

@@ -0,0 +1,6 @@
+{
+ "Groups": "Gruppen", 
+ "Product Groups that are listed on the website. The first product group from this list will be listed by default on the \"Products Page\"": "Produktgruppen, die auf der Website aufgef\u00fchrt sind. Das erste Produkt aus dieser Gruppe Liste wird standardm\u00e4\u00dfig auf der \"Products Page\" aufgef\u00fchrt werden", 
+ "Products Settings": "Produkte Einstellungen", 
+ "Website": "Webseite"
+}

website/doctype/related_page/locale/de-doc.json

@@ -0,0 +1,5 @@
+{
+ "Page": "Seite", 
+ "Related Page": "Verwandte Seite", 
+ "Website": "Webseite"
+}

website/doctype/style_settings/locale/_messages_doc.json

@@ -3,6 +3,7 @@
  "12px", 
  "13px", 
  "Verdana", 
+ "Solid background color (default light gray)", 
  "Set your background color, font and image (tiled)", 
  "Custom CSS", 
  "Lato", 
@@ -25,7 +26,6 @@
  "If image is selected, color will be ignored (attach first)", 
  "Background Image", 
  "Tahoma", 
- "Solid background color (default light gray)", 
  "Font", 
  "Heading Font"
 ]

website/doctype/style_settings/locale/de-doc.json

@@ -0,0 +1,31 @@
+{
+ "12px": "12px", 
+ "13px": "13px", 
+ "14px": "14px", 
+ "15px": "15px", 
+ "16px": "16px", 
+ "Add CSS": "F\u00fcgen Sie CSS", 
+ "Arial": "Arial", 
+ "Auto generated": "Auto generiert", 
+ "Background Color": "Hintergrundfarbe", 
+ "Background Image": "Background Image", 
+ "CSS": "CSS", 
+ "Custom CSS": "Custom CSS", 
+ "File List": "Dateiliste", 
+ "Font": "Schriftart", 
+ "Font Size": "Schriftgr\u00f6\u00dfe", 
+ "Georgia": "Georgia", 
+ "Heading Font": "Unterwegs Font", 
+ "Helvetica Neue": "Helvetica Neue", 
+ "If image is selected, color will be ignored (attach first)": "Wenn das Bild ausgew\u00e4hlt ist, wird die Farbe ignoriert (legen zuerst) werden", 
+ "Lato": "Lato", 
+ "Lucida Grande": "Lucida Grande", 
+ "Open Sans": "Offene Sans", 
+ "Set your background color, font and image (tiled)": "Stellen Sie Ihre Hintergrundfarbe, Schrift und Bild (Kachel)", 
+ "Solid background color (default light gray)": "Einfarbigen Hintergrund (Standard lichtgrau)", 
+ "Style Settings": "Style Einstellungen", 
+ "Tahoma": "Tahoma", 
+ "Verdana": "Verdana", 
+ "Website": "Webseite", 
+ "add your own CSS (careful!)": "f\u00fcgen Sie Ihre eigenen CSS (Vorsicht!)"
+}

website/doctype/top_bar_item/locale/de-doc.json

@@ -0,0 +1,9 @@
+{
+ "Label": "Etikett", 
+ "Parent Label": "Eltern Etikett", 
+ "Target": "Ziel", 
+ "Top Bar Item": "Top Bar Artikel", 
+ "URL": "URL", 
+ "Website": "Webseite", 
+ "target = \"_blank\"": "target = \"_blank\""
+}

website/doctype/web_page/locale/de-doc.json

@@ -0,0 +1,27 @@
+{
+ "Add code as &lt;script&gt;": "F\u00fcgen Sie Code wie <script>", 
+ "Begin this page with a slideshow of images": "Beginnen Sie diese Seite mit einer Diashow von Bildern", 
+ "CSS": "CSS", 
+ "Center": "Zentrum", 
+ "Content": "Inhalt", 
+ "Content in markdown format that appears on the main side of your page": "Content in markdown Format, das auf der Hauptseite Ihrer Seite", 
+ "File List": "Dateiliste", 
+ "Insert Code": "Code einf\u00fcgen", 
+ "Insert Style": "Legen Stil", 
+ "Javascript": "Javascript", 
+ "Left": "Links", 
+ "Link to other pages in the side bar and next section": "Link zu anderen Seiten in der Seitenleiste und im n\u00e4chsten Abschnitt", 
+ "Main Section": "Main Section", 
+ "More": "Mehr", 
+ "Page Name": "Page Name", 
+ "Page content": "Seiteninhalt", 
+ "Page url name (auto-generated) (add \".html\")": "Seite url Namen (automatisch generierte) (zus. \"Html\")", 
+ "Published": "Ver\u00f6ffentlicht", 
+ "Right": "Rechts", 
+ "Slideshow": "Slideshow", 
+ "Text Align": "Text ausrichten", 
+ "Title": "Titel", 
+ "Title / headline of your page": "Titel / \u00dcberschrift Ihrer Seite", 
+ "Web Page": "Web Page", 
+ "Website": "Webseite"
+}

website/doctype/website_item_group/locale/de-doc.json

@@ -0,0 +1,6 @@
+{
+ "Cross Listing of Item in multiple groups": "\u00dcberqueren Auflistung der Artikel in mehreren Gruppen", 
+ "Item Group": "Artikel-Gruppe", 
+ "Website": "Webseite", 
+ "Website Item Group": "Website-Elementgruppe"
+}

website/doctype/website_product_category/locale/de-doc.json

@@ -0,0 +1,7 @@
+{
+ "Indent": "Einzug", 
+ "Item Group": "Artikel-Gruppe", 
+ "Product Category for website": "Produktkategorie f\u00fcr Website", 
+ "Website": "Webseite", 
+ "Website Product Category": "Website Produktkategorie"
+}

website/doctype/website_script/locale/_messages_doc.json

@@ -1,6 +1,6 @@
 [
  "Website", 
- "Javascript", 
  "Script to attach to all web pages.", 
+ "Javascript", 
  "Website Script"
 ]

website/doctype/website_script/locale/de-doc.json

@@ -0,0 +1,6 @@
+{
+ "Javascript": "Javascript", 
+ "Script to attach to all web pages.": "Script auf alle Webseiten zu befestigen.", 
+ "Website": "Webseite", 
+ "Website Script": "Website Script"
+}

website/doctype/website_settings/locale/_messages_doc.json

@@ -2,6 +2,7 @@
  "Copyright", 
  "Misc", 
  "Background shade of the top menu bar", 
+ "Black", 
  "Website Settings", 
  "Google Analytics ID", 
  "White", 
@@ -13,7 +14,6 @@
  "Top Bar Items", 
  "File List", 
  "Address", 
- "Google Plus One", 
  "Sub-domain provided by erpnext.com", 
  "Enter domain names associated to this website, each on a new line", 
  "Domain List", 
@@ -23,8 +23,8 @@
  "Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.", 
  "Footer Items", 
  "FavIcon", 
+ "Google Plus One", 
  "Twitter Share", 
- "Twitter Share via", 
  "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href=\"http://favicon-generator.org/\" target=\"_blank\">favicon-generator.org</a>]", 
  "Home Page", 
  "Facebook Share", 
@@ -36,6 +36,6 @@
  "Tweet will be shared via your user account (if specified)", 
  "If checked, the Home page will be the default Item Group for the website.", 
  "Brand HTML", 
- "Black", 
+ "Twitter Share via", 
  "Title Prefix"
 ]

website/doctype/website_settings/locale/de-doc.json

@@ -0,0 +1,31 @@
+{
+ "Address": "Adresse", 
+ "Address and other legal information you may want to put in the footer.": "Adresse und weitere rechtliche Informationen m\u00f6chten Sie vielleicht in der Fu\u00dfzeile setzen.", 
+ "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href=\"http://favicon-generator.org/\" target=\"_blank\">favicon-generator.org</a>]": "Ein Symbol-Datei mit. Ico. Sollte 16 x 16 px sein. Erzeugt mit ein Favicon-Generator. [<a Href=\"http://favicon-generator.org/\" target=\"_blank\"> favicon-generator.org </ a>]", 
+ "Background shade of the top menu bar": "Hintergrund Schatten der oberen Men\u00fcleiste", 
+ "Black": "Schwarz", 
+ "Brand HTML": "Marke HTML", 
+ "Copyright": "Copyright", 
+ "Domain List": "Domain-Liste", 
+ "Enter domain names associated to this website, each on a new line": "Geben Sie Domain-Namen verbunden mit dieser Website, die jeweils auf einer neuen Zeile", 
+ "FavIcon": "FavIcon", 
+ "File List": "Dateiliste", 
+ "Footer": "Fu\u00dfzeile", 
+ "Footer Items": "Footer Artikel", 
+ "Home Page": "Home Page", 
+ "Home Page is Products": "Home Page ist Products", 
+ "If checked, the Home page will be the default Item Group for the website.": "Wenn aktiviert, wird die Startseite der Standard Artikel-Gruppe f\u00fcr die Website.", 
+ "Landing Page": "Landing Page", 
+ "Misc": "Misc", 
+ "Sub-domain provided by erpnext.com": "Sub-Domain durch erpnext.com vorgesehen", 
+ "Subdomain": "Subdomain", 
+ "The \"Web Page\" that is the website home page": "Die \"Web Page\", die Homepage der Website ist", 
+ "The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.": "Der Name Ihrer Firma / Website, wie Sie auf Titelleiste des Browsers angezeigt werden soll. Alle Seiten werden diese als Pr\u00e4fix f\u00fcr den Titel haben.", 
+ "Title Prefix": "Title Prefix", 
+ "Top Bar": "Top Bar", 
+ "Top Bar Background": "Top Bar Hintergrund", 
+ "Top Bar Items": "Top Bar Artikel", 
+ "Website": "Webseite", 
+ "Website Settings": "Website-Einstellungen", 
+ "White": "Wei\u00df"
+}

website/doctype/website_slideshow/locale/de-doc.json

@@ -0,0 +1,10 @@
+{
+ "File List": "Dateiliste", 
+ "Header": "Kopfzeile", 
+ "Slideshow Items": "Slideshow Artikel", 
+ "Slideshow Name": "Slideshow Namen", 
+ "Slideshow like display for the website": "Slideshow wie Display f\u00fcr die Website", 
+ "This goes above the slideshow.": "Dies geht \u00fcber die Diashow.", 
+ "Website": "Webseite", 
+ "Website Slideshow": "Website Slideshow"
+}

website/doctype/website_slideshow_item/locale/de-doc.json

@@ -0,0 +1,8 @@
+{
+ "Description": "Beschreibung", 
+ "File List": "Dateiliste", 
+ "Heading": "\u00dcberschrift", 
+ "Image": "Bild", 
+ "Website": "Webseite", 
+ "Website Slideshow Item": "Website Slideshow Artikel"
+}

website/module_def/website/locale/_messages_doc.json

@@ -7,7 +7,7 @@
  "Slideshow like display for the website", 
  "Settings for the About Us Page", 
  "Website Home", 
- "Set your background color, font and image (tiled)", 
  "Unsubscribe", 
+ "Set your background color, font and image (tiled)", 
  "Script to attach to all web pages."
 ]

website/module_def/website/locale/de-doc.json

@@ -0,0 +1,12 @@
+{
+ "Cross Listing of Item in multiple groups": "\u00dcberqueren Auflistung der Artikel in mehreren Gruppen", 
+ "Product Category for website": "Produktkategorie f\u00fcr Website", 
+ "Script to attach to all web pages.": "Script auf alle Webseiten zu befestigen.", 
+ "Set your background color, font and image (tiled)": "Stellen Sie Ihre Hintergrundfarbe, Schrift und Bild (Kachel)", 
+ "Settings for Contact Us Page": "Einstellungen f\u00fcr Kontakt Seite", 
+ "Settings for Product Catalog on the website": "Einstellungen f\u00fcr Produkt-Katalog auf der Website", 
+ "Settings for the About Us Page": "Einstellungen f\u00fcr die \u00dcber uns Seite", 
+ "Slideshow like display for the website": "Slideshow wie Display f\u00fcr die Website", 
+ "Unsubscribe": "Abmelden", 
+ "Website Home": "Website Home"
+}

website/page/website_home/locale/de-js.json

@@ -0,0 +1,24 @@
+{
+ "About Us Settings": "\u00dcber uns Settings", 
+ "Advanced Scripting": "Advanced Scripting", 
+ "Blog": "Blog", 
+ "Blog entry.": "Blog-Eintrag.", 
+ "Contact Us Settings": "Kontakt Settings", 
+ "Content web page.": "Inhalt Web-Seite.", 
+ "Embed image slideshows in website pages.": "Einbetten Bild Diashows in Web-Seiten.", 
+ "Javascript to append to the head section of the page.": "Javascript, um den Kopfteil der Seite anh\u00e4ngen.", 
+ "Product Settings": "Produkt-Settings", 
+ "Settings for About Us Page.": "Einstellungen f\u00fcr \u00dcber uns Seite.", 
+ "Settings for Contact Us Page.": "Einstellungen f\u00fcr Kontakt-Seite.", 
+ "Settings for Product Catalog on the website.": "Einstellungen f\u00fcr Produkt-Katalog auf der Website.", 
+ "Setup of fonts and background.": "Setup von Schriftarten und Hintergrund.", 
+ "Setup of top navigation bar, footer and logo.": "Setup der oberen Navigationsleiste, Fu\u00dfzeile und Logo.", 
+ "Special Page Settings": "Spezielle Einstellungen Seite", 
+ "Style Settings": "Style Einstellungen", 
+ "Web Content": "Web Content", 
+ "Web Page": "Web Page", 
+ "Website Overall Settings": "Website Overall Einstellungen", 
+ "Website Script": "Website Script", 
+ "Website Settings": "Website-Einstellungen", 
+ "Website Slideshow": "Website Slideshow"
+}