Merge branch 'master' of github.com:humhub/humhub

This commit is contained in:
Lucas Bartholemy 2017-02-09 22:36:49 +01:00
commit 2bb10d6ef5
20 changed files with 31 additions and 48 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,30 +1,13 @@
<?php
/**
* Message translations.
*
* This file is automatically generated by 'yii message/extract' command.
* It contains the localizable messages extracted from source code.
* You may modify this file by translating the extracted messages.
*
* Each array element represents the translation (value) of a message (key).
* If the value is empty, the message is considered as not translated.
* Messages that no longer need translation will have their translations
* enclosed between a pair of '@@' marks.
*
* Message string can be used with plural forms format. Check i18n section
* of the guide for details.
*
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
'Specify space' => '',
'<strong>Search </strong> results' => '<strong>Suchergebnisse</strong>',
'Advanced search settings' => 'Erweiterte Sucheinstellungen',
'All' => 'Global',
'Content' => 'Inhalte',
'Search for user, spaces and content' => 'Nach Benutzern, Spaces und Inhalten suchen',
'Search only in certain spaces:' => 'Nur in diesen Spaces suchen:',
'Spaces' => 'Spaces',
'Users' => 'Benutzer',
'Your search returned no matches.' => 'Deine Suche ergab keine Treffer.',
];
return array (
'<strong>Search </strong> results' => '<strong>Suchergebnisse</strong>',
'Advanced search settings' => 'Erweiterte Sucheinstellungen',
'All' => 'Global',
'Content' => 'Inhalte',
'Search for user, spaces and content' => 'Nach Benutzern, Spaces und Inhalten suchen',
'Search only in certain spaces:' => 'Nur in diesen Spaces suchen:',
'Spaces' => 'Spaces',
'Specify space' => 'Space wählen',
'Users' => 'Benutzer',
'Your search returned no matches.' => 'Deine Suche ergab keine Treffer.',
);