Merge remote branch 'origin/master'

trunk/english/language/lang_english/lang_blocks.php

@@ -384,7 +384,7 @@
 	'cms_var_md_tags_count' => 'Display Tags Counts',
 	'cms_var_md_tags_count_explain' => 'Display the total number of tags next to each word',
 	'cms_var_md_tags_random' => 'Top Or Random?',
-	'cms_var_md_tags_random_explain' => 'Choose whether top used or random tags will be displaied',
+	'cms_var_md_tags_random_explain' => 'Choose whether top used or random tags will be displayed',
 	'cms_var_md_tags_search' => 'Tags Search',
 	'cms_var_md_tags_search_explain' => 'Display a search box for all tags',
 	'cms_var_md_tags_words' => 'Maximum Tags',

trunk/german/language/lang_german/lang_blocks.php

@@ -78,13 +78,14 @@
 	'Title_staff' => 'Team',
 	'Title_statistics' => 'Statistik',
 	'Title_style' => 'Style',
+	'Title_tags' => 'Tags',
 	'Title_top_downloads' => 'Top Downloads',
 	'Title_top_posters' => 'Top Poster',
 	'Title_user_block' => 'Benutzerblock',
 	'Title_users_visited' => 'Aktive Benutzer',
 	'Title_visit_counter' => 'Besucherzähler',
 	'Title_welcome' => 'Willkommen',
-	'Title_wordgraph' => 'Tags',
+	'Title_wordgraph' => 'Wordgraph',
 
 	'Advanced_GSearch' => 'Erweiterte Google Suche',
 	'Advanced_search' => 'Erweiterte Suche',
@@ -380,6 +381,14 @@
 	'cms_var_md_search_option_text_explain' => 'Suchfeld Beschreibung',
 	'cms_var_md_show_avatars' => 'Avatare anzeigen',
 	'cms_var_md_show_avatars_explain' => '',
+	'cms_var_md_tags_count' => 'Tags-Anzahl anzeigen',
+	'cms_var_md_tags_count_explain' => 'Zeige die gesamte Anzahl der Tags neben jedem Wort an.',
+	'cms_var_md_tags_random' => 'Häufigsten oder zufällig?',
+	'cms_var_md_tags_random_explain' => 'Wähle aus, ob die häufigsten oder zufällige Tags angezeigt werden sollen.',
+	'cms_var_md_tags_search' => 'Tags Suche',
+	'cms_var_md_tags_search_explain' => 'Zeigt eine Suche-Box für alle Tags an.',
+	'cms_var_md_tags_words' => 'Maximum Tags',
+	'cms_var_md_tags_words_explain' => 'Wähle die maximale Anzahl der Tags aus, die angezeigt werden sollen.',
 	'cms_var_md_tla_display' => 'Horizontal / Vertikal',
 	'cms_var_md_tla_display_explain' => 'Wähle aus, ob Sponsoren horizontal oder vertikal angezeigt werden sollen.',
 	'cms_var_md_tla_inventory_key' => 'Text Link Ads Inventory Key',
@@ -390,7 +399,7 @@
 	'cms_var_md_total_articles_explain' => 'Anzahl der anzuzeigenden neuen Artikel',
 	'cms_var_md_total_poster' => 'Anzahl der Top Poster',
 	'cms_var_md_total_poster_explain' => '',
-	'cms_var_md_wordgraph_count' => 'Aktiviere Wort Zählungen',
+	'cms_var_md_wordgraph_count' => 'Wort-Anzahl anzeigen',
 	'cms_var_md_wordgraph_count_explain' => 'Zeige die Gesamtanzahl der Wörter neben jedem Wort',
 	'cms_var_md_wordgraph_words' => 'Maximale Wörter',
 	'cms_var_md_wordgraph_words_explain' => 'Wähle die Anzahl der maximal anzuzeigenden Wörter',
@@ -409,6 +418,7 @@
 	'cms_option_Recent' => 'Neuesten',
 	'cms_option_Scroll' => 'Scrollend',
 	'cms_option_Static' => 'Feststehend',
+	'cms_option_Top' => 'Top',
 	'cms_option_Horizontal' => 'Horizontal',
 	'cms_option_Vertical' => 'Vertikal',
 	'cms_option_Show_In_Portal' => 'Im Portal anzeigen',

trunk/german/language/lang_german/lang_cms.php

@@ -244,14 +244,15 @@
 	'cms_block_staff' => 'Staff',
 	'cms_block_statistics' => 'Statistiken',
 	'cms_block_style' => 'Style',
+	'cms_block_tags' => 'Tags',
 	'cms_block_top_downloads' => 'Besten Downloads',
 	'cms_block_top_nav' => 'Top Nav',
 	'cms_block_top_posters' => 'Besten Beitragsverfasser',
 	'cms_block_user_block' => 'Benutzer Block',
 	'cms_block_users_visited' => 'Aktive Benutzer',
 	'cms_block_visit_counter' => 'Besucher Zähler',
 	'cms_block_welcome' => 'Willkommen',
-	'cms_block_wordgraph' => 'Tags',
+	'cms_block_wordgraph' => 'Wordgraph',
 	'cms_block_xs_news' => 'News',
 //	'cms_block_' => '',