EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'spis-master'

Browse source 
# Conflicts:
#   lang/en/lang.php
This commit is contained in:
Jana Deutschländer 2017-04-26 16:42:17 +02:00
commit d3e6e376f1
7 changed files with 67 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lang/de/lang.php
View file

@ -20,7 +20,7 @@ $lang['head_magic_matcher'] = 'MagicMatcher';
$lang['head_quick_search'] = 'wikiübergreifende Schnellsuche';
$lang['head_menu_main'] = 'Hauptmenü';
$lang['head_menu_status'] = 'Seitenstatus';
$lang['head_breadcrumb'] = 'Standortanzeiger';
$lang['head_breadcrumb_youarehere'] = 'Standortanzeiger';
$lang['head_menu_trace'] = 'Zuletzt Angesehen';
$lang['head_meta_box'] = 'Metainformationen zur Seite';
$lang['head_menu_starred'] = 'gemerkte Seite';
@ -54,6 +54,9 @@ $lang['osm_zoom_link_title'] = 'externer Link - öffnet in neuem Fenster'
$lang['image_detail'] = 'Detailinformationen zum Bild';
$lang['mode_edit'] = 'Seite bearbeiten';
$lang['mode_detail'] = 'Details zum Bild';
/**
* colors
*/

6
lang/en/lang.php
View file

@ -20,7 +20,7 @@ $lang['head_magic_matcher'] = 'MagicMatcher';
$lang['head_quick_search'] = 'quick search';
$lang['head_menu_main'] = 'main menu';
$lang['head_menu_status'] = 'site status';
$lang['head_breadcrumb'] = 'location indicator';
$lang['head_breadcrumb_youarehere'] = 'location indicator';
$lang['head_menu_trace'] = 'Last Visited Pages';
$lang['head_meta_box'] = 'meta data for this page';
$lang['head_menu_starred'] = 'Starred Pages';
@ -53,6 +53,8 @@ $lang['osm_zoom_link_text'] = 'view larger map';
$lang['osm_zoom_link_title'] = 'external link opens new window';
$lang['image_detail'] = 'image details';
$lang['mode_edit'] = 'Editing Page';
$lang['mode_detail'] = 'Image Details';
/**
* colors
@ -92,4 +94,4 @@ $lang['__background_alt__'] = 'table head, table cell (hover), struct La
$lang['__text_alt__'] = 'table head (unlinked), table cell (hover), struct Label (hover) - font color (alternative)';
$lang['__border__'] = 'tables, form fields, blockquotes - border color';
$lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius';
$lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius';