Merge branch 'dev' into widget_menu

resources/lang/en/admin/contents.php

@@ -35,5 +35,7 @@ return [
     'template'               => 'Template of this page',
     'overview'               => 'List of all content pages',
     'homepageSetup'          => 'Homepage successfully set up.',
-    'setHomepage'            => 'Set page as homepage'
+    'setHomepage'            => 'Set page as homepage',
+    'noParentPage'           => ' -- No parent page -- ',
+    'uploadTitleImage'       => 'Upload title image'
 ];

resources/lang/en/admin/fileManager.php

@@ -20,6 +20,7 @@ return [
     'noFileSpecified'       => 'You have not specified any file for upload',
     'uploadSuccessfull'     => 'Your file was successfully uploaded',
     'selectFile'            => 'Select file for upload',
+    'name'                  => 'Name',
     'keywords'              => 'Keywords (comma separated)',
     'description'           => 'File description',
     'noFiles'               => 'No files were found. Try to upload some.',

resources/lang/en/admin/history.php

@@ -1,20 +1,23 @@
 <?php
 return [
-    'pageName'              => 'History of :name',
-    'columnPageContent'     => 'Page content',
-    'columnUrl'             => 'URL',
-    'columnTitle'           => 'Title',
-    'columnMetaKeywords'    => 'Meta keywords',
-    'columnMetaDescription' => 'Description',
-    'columnStatus'          => 'Page visibility',
-    'columnTemplate'        => 'Template',
-    'columnIs_homepage'     => 'Homepage',
-    'changedFromTo'         => 'Changed from <del>:from</del> to <ins>:to</ins>',
-    'numOfChanges'          => 'One change|:count changes',
-    'diff'                  => 'Difference',
-    'diffPageName'          => 'Difference of :column',
-    'backToOverview'        => 'Back to history overview',
-    'backToEdit'            => 'Back to editation form',
-    'setupAsHomepage'       => 'Setup as homepage'
+    'pageName'                 => 'History of :name',
+    'columnPageContent'        => 'Page content',
+    'columnUrl'                => 'URL',
+    'columnTitle'              => 'Title',
+    'columnMetaKeywords'       => 'Meta keywords',
+    'columnMetaDescription'    => 'Description',
+    'columnStatus'             => 'Page visibility',
+    'columnTemplate'           => 'Template',
+    'columnIs_homepage'        => 'Homepage',
+    'columnParentPage'         => 'Parent page',
+    'columnTitlePhotoFilename' => 'Title photo',
+    'emptyValue'               => '<em>none</em>',
+    'changedFromTo'            => 'Changed from <del>:from</del> to <ins>:to</ins>',
+    'numOfChanges'             => 'One change|:count changes',
+    'diff'                     => 'Difference',
+    'diffPageName'             => 'Difference of :column',
+    'backToOverview'           => 'Back to history overview',
+    'backToEdit'               => 'Back to editation form',
+    'setupAsHomepage'          => 'Setup as homepage'
 
 ];

resources/lang/en/admin/widgets.php

@@ -21,5 +21,6 @@ return [
     'successfullyAssociated'   => 'Association successfull',
     'associationDoesNotExists' => 'This association does not exist',
     'successfullyDeassociated' => 'Successfully removed from widget area',
+    'widgetExists'             => 'Widget :id already exists.'
 
 ];

resources/lang/en/widgets/orbitSlider.php

@@ -0,0 +1,15 @@
+<?php
+return [
+    'widgetName'        => 'Orbit slider',
+    'widgetDescription' => 'Slider for images. Uses Foundation framework.',
+    'name'              => 'Slider name',
+    'description'       => 'Slider description',
+    'containerClass'    => 'Extra HTML class for slider',
+    'createNew'         => 'Create new',
+    'new'               => 'Create new orbit slider',
+    'edit'              => 'Edit slider :name',
+    'editExisting'      => 'Save',
+    'preview'           => 'Slider preview',
+    'upload'            => 'Add photos into slider',
+    'code'              => 'Some extra HTML/JS code for slider'
+];