diff --git a/app/Controllers/Auth/RecoverController.php b/app/Controllers/Auth/RecoverController.php index 3f1ddff8..273dd429 100644 --- a/app/Controllers/Auth/RecoverController.php +++ b/app/Controllers/Auth/RecoverController.php @@ -63,10 +63,10 @@ class RecoverController extends MainController // Отправка e-mail $newpass_link = Config::get('meta.url') . $recover_uri . '/remind/' . $code; - $mail_message = Translate::get('your link to change your password') . ": \n" . $newpass_link . "\n\n"; - SendEmail::send($email, Config::get('meta.name') . ' — ' . Translate::get('changing your password'), $mail_message); + $mail_message = Translate::get('linkchange password') . ": \n" . $newpass_link . "\n\n"; + SendEmail::send($email, Config::get('meta.name') . ' — ' . Translate::get('changing password'), $mail_message); - addMsg(Translate::get('new password has been sent to e-mail'), 'success'); + addMsg(Translate::get('new password email'), 'success'); redirect(getUrlByName('login')); } diff --git a/app/Controllers/Auth/RegisterController.php b/app/Controllers/Auth/RegisterController.php index f9a14b2c..5e870776 100644 --- a/app/Controllers/Auth/RegisterController.php +++ b/app/Controllers/Auth/RegisterController.php @@ -149,7 +149,7 @@ class RegisterController extends MainController $mail_message = Translate::get('activate e-mail') . ": \n" . $link . "\n\n"; SendEmail::send($email, Config::get('meta.name') . ' — ' . Translate::get('checking e-mail'), $mail_message); - addMsg(Translate::get('check your e-mail to activate your account'), 'success'); + addMsg(Translate::get('check your email'), 'success'); redirect(getUrlByName('login')); } diff --git a/app/Language/de.php b/app/Language/de.php index e32293ce..922b659b 100644 --- a/app/Language/de.php +++ b/app/Language/de.php @@ -1,7 +1,243 @@ 'Heim', - 'city' => 'Stadt', + 'to the website' => 'Zur Webseite', + 'feed' => 'Futter', + 'hi' => 'Hallo', + 'news' => 'Nachrichten', + 'top' => 'TOP', + 'admin' => 'Administratorin', + 'tools' => 'Werkzeug', + 'template' => 'Schablone', + 'settings' => 'Einstellungen', + 'security' => 'Sicherheit', + 'avatar' => 'Profilfoto', + 'understands' => 'Versteht', + 'necessarily' => 'Erforderlich zum Ausfüllen ', + 'create' => 'Fressen', + 'writers' => 'Schriftsteller', + 'welcome' => 'Herzlich willkommen', + 'create account' => 'Benutzerkonto erstellen', + 'not registered' => 'Posten, antworten, kommentieren...
Sie haben sich noch nicht registriert', + 'saw' => 'Gesehen', + 'the post' => 'Die Post', + 'bodies' => 'Körper', + 'thanks' => 'Danke', + 'whisper' => 'Flüstern', + 'report' => 'Prüfbericht', + 'reports' => 'Berichte', + + /* Die Übersetzung wird teilweise weiter vervollständigt */ + 'build' => 'Build', + 'complained about' => 'complained about ', + 'freely' => 'Free', + 'useful resources' => 'Useful Resources', + 'comment deleted' => 'Comment has been deleted', + 'post deleted' => 'Post deleted', + 'answer deleted' => 'Answer deleted', + 'deleted' => 'Deleted', + 'remote' => 'Remote', + 'email activated' => 'Email activated', + 'not activated' => 'Not activated', + 'like' => 'Like', + 'i like comments' => 'I like comments', + 'i like posts' => 'I like posts', + 'by topic' => 'By topic', + 'all comments' => 'All comments', + 'all answers' => 'All answers', + 'recommended' => 'Recommended', + 'notification' => 'Notification', + 'notifications' => 'Notifications', + 'preferences' => 'Preferences', + 'action' => 'Action', + 'domain' => 'Domain', + 'domains' => 'Domains', + 'posted' => 'Posted', + 'posted-help' => 'The posted material is visible to the participants', + 'all domains' => 'All domains', + 'blog' => 'Blog', + 'blogs' => 'Blogs', + 'topics' => 'Topics', + 'topic' => 'Topic', + 'topics-no' => 'There are no topics yet', + 'blogs-no' => 'There are no blogs yet', + 'parent' => 'Parent', + 'edit topic' => 'Edit topic', + 'authorization' => 'Authorization', + 'sign in' => 'Sign in', + 'sign out' => 'Sign out', + 'sign up' => 'Sign up', + 'advertising' => 'Advertising', + 'private messages' => 'Private messages', + 'it was read' => 'It was read', + 'all messages' => 'All messages', + 'send a message' => 'Send a message', + 'dialogues' => 'Dialogues', + 'dialogue' => 'Dialogue', + 'write a message' => 'Write a message', + 'send' => 'Send', + 'to share' => 'To share', + 'information' => 'Information', + 'review' => 'Review', + 'contacts' => 'Contacts', + 'city' => 'City', + 'remember me' => 'Remember me', + 'banned' => 'Banned', + 'ban it' => 'ban it', + 'unban' => 'Unban', + 'dumb mode' => 'Dumb mode', + 'reset' => 'Reset', + 'to create' => 'To create', + 'invited guests' => 'Invited guests', + 'nickname' => 'Nickname', + 'name' => 'Name', + 'password' => 'Password', + 'new password' => 'New Password', + 'repeat' => 'Rv', + 'show' => 'Show', + 'new' => 'New', + 'new ones' => 'New ones', + 'approved' => 'Approved', + 'old' => 'Old', + 'code' => 'Code', + 'code error' => 'Code error', + 'invite' => 'Invite', + 'invites' => 'Invites', + 'view' => 'Viewing', + 'views' => 'Views', + 'profile' => 'Profile', + 'title' => 'Title', + 'heading' => 'Heading', + 'to extract' => 'To extract', + 'discussion' => 'Discussion', + 'description' => 'Description', + 'meta description' => 'Meta description', + 'short description' => 'Short description', + 'favorites' => 'Favorites', + 'long' => 'Long', + 'created by' => 'Created by', + 'help' => 'Help', + 'statistics' => 'Statistics', + 'privacy' => 'Privacy', + 'about' => 'About', + 'about me' => 'About me', + 'riddle' => 'Riddle', + 'info' => 'Info', + 'more' => 'More', + 'other' => 'Other', + 'social networks' => 'Social Networks', + 'official' => 'Official', + 'community' => 'Community', + 'works on' => 'Works on', + 'trust level' => 'Trust Level', + 'search' => 'Search', + 'to find' => 'To find', + 'up' => 'Up', + 'user' => 'User', + 'users' => 'Users', + 'no users' => 'No users', + 'page' => 'Page', + 'read' => 'Read', + 'reads' => 'Reads', + 'reading' => 'I read', + 'is reading' => 'Is reading', + 'subscribed' => 'Subscribed', + 'unsubscribed' => 'Unsubscribed', + 'unsubscribe' => 'Unsubscribe', + 'subscribe' => 'Subscribe', + 'read more' => 'Read more', + 'to approve' => 'To approve', + 'remove' => 'Remove', + 'recover' => 'Recover', + 'download' => 'Download', + 'successful download' => 'Successful download', + 'error in loading' => 'Error in loading', + 'password recovery' => 'Password recovery', + 'draft' => 'Draft', + 'drafts' => 'Drafts', + 'there no drafts' => 'There no drafts', + 'update the data' => 'Update the data', + 'cancel' => 'Cancel', + 'reply' => 'Reply', + 'edit' => 'Edit', + 'save' => 'Save', + 'source' => 'Source', + 'website' => 'Website', + 'sites' => 'Sites', + 'related' => 'Related', + 'related posts' => 'Related posts', + 'related topics' => 'Related topics', + 'see more' => 'See more', + 'parents' => 'Parents', + 'children' => 'Children', + 'bound (children)' => 'Bound (children)', + 'bound (parents)' => 'Bound (parents)', + 'structure' => 'Structure', + 'root' => 'Root', + 'root-help' => 'The top (main) theme of the tree.', + 'upper' => 'Upper', + 'subtopics' => 'Subtopics', + 'badge' => 'Badge', + 'badges' => 'Badges', + 'reward the user' => 'Reward the user', + 'reward added' => 'Reward added', + 'add badge' => 'add badge', + 'edit badge' => 'Edit badge', + 'reward weight' => 'Reward weight', + 'edit user' => 'Edit user', + 'for example' => 'For example', + 'ed' => 'ed', + 'add' => 'Add', + 'there are' => 'There are', + 'yes' => 'Yes', + 'no' => 'No', + 'all' => 'All', + 'you' => 'You', + 'from' => 'From', + 'by' => 'by', + 'in' => 'in', + 'on' => 'on', + 'for' => 'for', + 'my' => 'My', + 'by default' => 'By default', + 'just me' => 'Just me', + 'publications' => 'Publications', + 'selected post' => 'Selected post', + 'edit post' => 'Edit post', + 'participant posts' => 'Participant posts', + 'color' => 'Color', + 'text' => 'Text', + 'author' => 'Author', + 'characters' => 'Characters', + 'post added' => 'Post added', + 'last answer' => 'Last answer', + 'no answers' => 'Unfortunately, there are no answers. Write if you know the answer.', + 'comments-desc' => 'All comments (on answers) are in order of priority in the community', + 'answers-desc' => 'All responses (to posts) are in order of priority in the community', + 'no-auth-comm' => 'You must be logged in to post a comment', + 'write-something' => 'Supports Markdown', + 'write-response' => 'Write an answer to the question', + 'write' => 'Write', + 'in-the-profile' => 'In profile', + 'add-favorites' => 'Add favorites', + 'remove-favorites' => 'Remove favorites', + 'no-cover' => 'No cover. Download', + 'add post' => 'Add post', + 'change' => 'Change', + 'change saved' => 'Change saved', + 'add topic' => 'Add Topic', + 'add blog' => 'Add Blog', + 'add tag' => 'Add tag', + 'edit tag' => 'Edit tag', + 'registrations' => 'Registrations', + 'no dialogs' => 'No dialogs', + 'words' => 'Stop words', + 'word' => 'Stop word', + 'stop words no' => 'Stop word no', + 'add a stop word' => 'Add a stop word', + 'bookmark added' => 'Bookmark added', + 'bookmark deleted' => 'Bookmark deleted', 'language' => 'Lokalisierung', 'ru-language' => 'Russisch (RU)', @@ -11,6 +247,297 @@ $data = [ 'zh-language' => 'Chinesisch (ZH)', 'md-language' => 'Moldauisch (MD)', + 'repeat the password' => 'Repeat password', + 'the post is closed' => 'Post closed', + 'there are no posts' => 'Unfortunately there are no posts', + 'forgot your password' => 'Forgot your password', + 'there are no comments' => 'Sorry, no comments', + 'rules' => 'Site rules', + 'privacy policy' => 'Privacy Policy', + 'restriction' => 'Restrictions', + 'no-invate-txt' => 'Not a user yet? Registration is by invitation only to combat spam and increase accountability. If you know the current user of the site, ask him for an invitation.', + + /* Date and time + Events */ + 'months' => ['', 'January', 'February', 'Martha', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], + 'today' => 'Today', + 'yesterday' => 'Yesterday', + + 'num-message' => ['Message', 'Messages', 'Messages'], + 'num-comment' => ['Comment', 'Comments', 'Comments'], + 'num-answer' => ['Answer', 'Answers', 'Answers'], + 'num-post' => ['Post', 'Post', 'Posts'], + 'num-view' => ['View', 'View', 'Views'], + 'num-website' => ['Website', 'Sites', 'Sites'], + 'num-blog' => ['Blog', 'Blogs', 'Blogs'], + 'num-up' => ['Vote', 'Votes', 'Votes'], + + 'comment' => 'Comment', + 'comments' => 'Comments', + 'answer' => 'Answer', + 'answers' => 'Answers', + 'message' => 'Message', + 'messages' => 'Messages', + 'post' => 'Post', + 'posts' => 'Posts', + + 'answered' => 'Answered', + 'translation' => 'Translation', + 'is this a translation?' => 'Is this a translation?', + 'to close?' => 'To close?', + 'format Q&A?' => 'Format Q&A?', + 'raise?' => 'Raise?', + 'is this a draft?' => 'Is this a draft?', + 'default' => 'Ddefault', + 'qa' => 'Q&A', + 'moderation log' => 'Moderation log', + 'no moderation logs' => 'No logs found in the moderation log', + 'meta-moderation' => 'Actions of members and moderators to remove and restore content in the community.', + 'deleted-post' => 'Deleted post', + 'restored-post' => 'Restored post', + 'deleted-comment' => 'Deleted comment', + 'restored-comment' => 'Restored comment', + 'deleted-answer' => 'Deleted the answer', + 'restored-answer' => 'Rebuilt the answer', + + /* Настройки */ + 'setting profile page' => 'Setting profile page', + 'change avatar' => 'Change avatar', + 'cover art' => 'Cover art', + 'type' => 'Type', + 'logo' => 'Logo', + 'last' => 'Last', + 'cover removed' => 'Cover removed', + 'change avatar page' => 'Change avatar page', + 'change password' => 'Change password', + 'change password page' => 'Change password page', + 'recommended size' => 'Recommended size', + + /* Notifications */ + 'no notifications yet' => 'No notifications yet', + 'i read' => 'I read', + 'wrote' => 'Wrote', + 'wrote a post' => 'Wrote a post', + 'wrote to you' => 'Wrote to you', + 'replied to post' => 'Replied to post', + 'successfully, log in' => 'Successfully, log in', + 'appealed to you' => 'Appealed to you', + 'in post' => 'In post', + 'in answer' => 'In answer', + 'in the comment' => 'In the comment', + 'to your answer' => 'To your answer', + + /* MSG */ + 'text-string-length' => 'Length %1$s should be from %2$s -> %3$s characters ', + 'text-charset-slug' => '%1$s should contain only Latin letters, numbers', + 'text-check-url' => '%1$s address is not correct', + 'titles' => 'Titles', + 'descriptions' => 'Descriptions', + 'url-already-exists' => 'This topic URL already exists', + 'url-gaps' => 'Blog are not allowed in the URL', + 'select topic' => 'Choose a topic', + 'you-question-no' => 'You have already answered this question', + 'you need to log in' => 'Login required', + 'no-auth-login' => 'For an answer you can log in', + 'you dont have access' => 'You don have access', + 'access restricted' => 'Access limited', + 'member does not exist' => 'Member does not exist', + + 'changes saved' => 'Changes saved', + 'invite created' => 'Invite created', + 'invalid' => 'Invalid', + 'avatar changed' => 'Avatar changed ', + 'cover changed' => 'Cover changed', + 'password changed' => 'Password changed successfully', + 'old-password-err' => 'Old password is incorrect', + 'pass-match-err' => 'Password mismatch', + 'login-use-condition' => 'By continuing, you agree to Terms of use site', + 'user-already' => 'The user is already on the site', + 'invate-to-replay' => 'You have already sent an invitation to this user', + 'limit-content-day' => 'For %1$s you have reached the limit %2$s for today', + 'limit-add-content-no' => 'You have reached the limit for adding set on the site', + 'registration by invite' => 'Registration by invite', + 'details are here' => 'Details here', + 'breaking the rules' => 'Breaking the rules', + + 'soft' => 'Software', + 'there is a program' => 'There is a program?', + 'hosted on github' => 'Is the program on GitHub?', + 'url address github' => 'Repository URL on GitHub', + + 'sections' => 'Sections', + 'section' => 'Section', + 'pages' => 'Pages', + 'edit page' => 'Edit page', + 'add page' => 'Add page', + 'go to' => 'Go to', + 'frameworks' => 'Frameworks', + 'interesting sites' => 'Interesting sites', + 'facts' => 'Facts', + 'psychology' => 'Psychology', + + /* Meta - desc */ + 'title-profile' => '%1$s %2$s | Profile on %3$s', + 'desc-profile' => '%1$s - member profile page. %2$s Posts, comments, awards on %3$s', + 'page-number' => ' Page %1$s. ', + 'main.top.title' => 'Popular posts. ', + 'main.top.desc' => 'List of popular posts in the community feed (by the number of replies). Topics of interest. Conversations, questions and answers, comments. ', + 'main.all.title' => 'All posts. ', + 'main.all.desc' => 'List of all posts in the community feed (by number of replies). Conversations, questions and answers, comments. ', + 'edit answer' => 'Change the answer', + 'no results' => 'No results', + 'no search results' => 'The search has not given any results.
Too short / long search term.', + 'empty request' => 'Empty search term', + 'enter' => 'Enter', + 'enter your password' => 'Enter password', + 'enter content' => 'Enter content', + + 'description is formed' => 'Description is formed', + 'under development' => 'Under development', + 'activity' => 'Activity', + 'the question is closed' => 'The question is closed', + 'this is a draft' => 'This is a draft', + 'there are no favorites' => 'No bookmarks', + 'users-ban' => 'Users', + 'posts-ban' => 'Posts', + + /* web */ + 'news & media' => 'News & Media', + 'social network' => 'Social network', + 'internet' => 'Internet', + 'software' => 'Software', + 'reference info' => 'Reference Information', + 'related sites' => 'Related Sites', + 'web-cat' => 'Are there in the site directory?', + 'web-cat-help' => 'In the site catalog, will be a Category (will become visible)', + + /* soft */ + 'soft-cat' => 'Are there programs in the catalog?', + 'soft-cat-help' => 'In the program directory, will be Category (will become visible)', + + /* Setting */ + 'info-setting' => 'Fill in your name, this will help attendees refer to you by name.

Tell us something about yourself. You have a great opportunity to open up to please others and seem like an interesting person.', + 'info-avatar' => 'Upload an avatar and cover for your profile.

When each user has a unique avatar, it becomes much easier to follow the discussions! ', + 'info-security' => 'Make sure all your passwords are 8 characters or more, ideally a lot more.

Passwords must contain Large letters, small, numbers, specials. symbols.', + 'info-search' => 'To refine your search, try to find a more precise query.', + 'info-login' => 'Authorization gives you the ability to publish posts, reply, comment.

You can vote for other publications, fill out and edit the profile.', + 'info-recover' => 'After clicking the "Reset" button, check your email...', + 'info-favorite' => 'Posts, comments and questions in your bookmarks', + 'info-preferences' => 'Posts you are subscribed to. You will be notified of all new replies', + 'e-mail notification' => 'Notify by Email', + 'info-notifications' => 'You can mark all ads as read by clicking on the link: "I have read".', + 'info-notification' => 'You can unsubscribe from all notifications by Email in this section', + + 'message to PM' => 'When the message came to PM', + 'contacted via @' => 'When they reached out to me through @', + 'you mentioned (@)' => 'You were mentioned (@), look', + 'linkchange password' => 'Your link to change your password', + 'changing password' => 'Change Password', + 'activate e-mail' => 'Activation link Email', + 'checking e-mail' => 'Examination Email', + 'there are no domains' => 'No domains', + 'change the site' => 'Change site', + 'add a website' => 'Add site', + 'description is formed' => 'Description is formed', + 'domain-desc' => 'Grouping posts in a community by domain', + 'domains-title' => 'Websites in the system', + 'domains-desc' => 'Statistics on domains, links that are used to compile publications on the site. Most visited, popular sites', + 'code-incorrect' => 'The code is incorrect or has already been used. Go through the recovery procedure again.', + 'yes-email-pass' => 'Now you can use your email and password.', + 'code-used' => 'The code is incorrect or has already been used.', + 'audits' => 'Audits', + 'content-audit' => 'Your message has been sent for review.', + 'no invitations' => 'No invitations yet', + 'limit-tl-invitation' => 'Your trust level does not yet allow using invites', + 'can send this link' => 'You can send this link ', + 'link has been used' => 'Link has been used', + 'the link was used to' => 'The link was used to', + 'medal for registration' => 'Registration Medal', + 'registered' => 'Registered ', + 'invitations left' => 'Invitations left', + 'no-topic-to-add' => 'You do not have topics to add a post. Subscribe to topics', + + 'site under reconstruction' => 'The site is under reconstruction', + 'limiting-mode-1' => 'You cannot publish materials, your account is being verified', + 'the dialog does not exist' => 'The specified dialog does not exist', + 'the topic does not exist' => 'The specified topic does not exist', + 'the site is already there' => 'Such a site is already in the system', + 'joined in the early days' => 'Joined in the early days of the community launch', + 'the owner restricted the publication' => 'Topic owner has restricted posting', + 'the profile is being checked' => 'Your profile is pending', + 'nickname-replay' => 'This nickname is already on the site', + 'e-mail-replay' => 'This email is already on the site', + 'multiple-accounts' => 'Don. t register multiple accounts ', + 'password-spaces' => 'Password cannot contain spaces', + 'nickname-repeats-characters' => 'There are too many repeating characters in the nickname', + 'the code is incorrect' => 'The code is incorrect or has already been used', + 'format-cover-post' => 'Width greater than 500px. Orientation horizontal', + 'e-mail or password is not correct' => 'Email or password is not correct', + 'your account is not activated' => 'Your account is not activated', + 'your account is under review' => 'Your account is pending', + 'invalid email address' => 'Invalid email', + 'there is no such e-mail on the site' => 'This email is not on the site', + 'english' => 'English', + 'who will be able to post' => 'Who can post', + 'design choice' => 'Choice of design', + 'test-email' => 'Testing the messaging system', + 'work email' => 'Work email (for activation account)', + 'new password email' => 'New password has been sent to email', + 'check your email' => 'Check your email to activate your account', + 'tl-limitation' => 'Your Trust Level (TL) does not allow this action', + 'who will be able to post posts' => 'Who can post', + 'long name from' => 'Long name from', + 'does this violate site rules' => 'This violates the rules of the site', + 'flag not included' => 'Flag left out, don use it often', + 'invited you' => 'You were invited by a member from this site. Enter invite', + 'you can invite your friends' => 'You can invite friends', + 'you were looking for' => 'You were looking for', + 'personal-messages-site' => 'Private messages with site members', + 'responses-members' => 'Responses from community members', + 'the page does not exist' => 'The page does not exist', + 'to main' => 'To main', + 'the page has been removed' => 'The page has been removed', + 'the command is executed' => 'Command executed', + 'you can add more' => 'You can add more', + + 'recommended posts' => 'recommended posts', + 'recommended.posts.desc' => 'Recommended posts in «%1$s» hand - selected. ', + + 'structure-desc' => 'Topics represented by different trees, structure of topics and their relationship ', + 'topic-subscription' => 'Subscribe to topics and read them in the feed', + 'stop-blog' => 'This blog URL is reserved', + + 'users.all' => 'List of participants', + 'users.all.info' => 'List of participants in the order of their activity on the site', + 'users.all.desc' => 'Participants in the order of their activity on the site. Ability to view profile data', + + 'blogs.all' => 'All blogs ', + 'blogs.all.info' => 'Blogs created by contributors', + 'blogs.all.desc' => 'Blogs in the order of their registration on the site, the ability to view the created blogs, subscribe to them, view statistics', + + 'blogs.new' => 'New blogs', + 'blogs.new.info' => 'Recently added blogs on the site', + 'blogs.new.desc' => 'Blogs on the site added recently. Personal blogs of participants, the ability to subscribe to interesting blogs', + + 'blogs.my' => 'My blogs', + 'blogs.my.info' => 'Blogs I follow or have created', + 'blogs.my.desc' => 'Blogs I Read or Have Created', + + 'topics.all' => 'All topics', + 'topics.all.info' => 'All topics on the site in order of their popularit', + 'topics.all.desc' => 'A page of topics arranged in order of popularity. By the number of posts located, the ability to subscribe to blogs ', + + 'topics.new' => 'New Topics', + 'topics.new.info' => 'New themes, themes added recently', + 'topics.new.desc' => 'New themes added to the site recently. Topic statistics and the ability to subscribe to topics', + + 'topics.my' => 'I read ', + 'topics.my.info' => 'Topics I follow, I read', + 'topics.my.desc' => 'Topics that I read or have created', + + 'main.feed.info' => 'Posts in chronological order...', + 'main.all.info' => 'All posts in the community feed...', + 'main.top.info' => 'Recent active posts...', + ]; return $data; diff --git a/app/Language/en.php b/app/Language/en.php index 5763cabf..21fe3516 100644 --- a/app/Language/en.php +++ b/app/Language/en.php @@ -14,7 +14,6 @@ $data = [ 'avatar' => 'Profile photo', 'understands' => 'Understands', 'necessarily' => 'Required to fill ', - 'create Post' => 'Сreate Post', 'create' => 'Сreate', 'writers' => 'Writers', 'welcome' => 'Welcome', @@ -425,13 +424,13 @@ $data = [ 'info-notifications' => 'You can mark all ads as read by clicking on the link: "I have read".', 'info-notification' => 'You can unsubscribe from all notifications by Email in this section', - 'when the message came to PM' => 'When the message came to PM', - 'when you contacted me via @' => 'When they reached out to me through @', - 'you were mentioned (@), see' => 'You were mentioned (@), look', - 'your link to change your password' => 'Your link to change your password', - 'changing your password' => 'Change Password', - 'activate e-mail' => 'Activation link Email', - 'checking e-mail' => 'Examination Email', + 'message to PM' => 'When the message came to PM', + 'contacted via @' => 'When they reached out to me through @', + 'you mentioned (@)' => 'You were mentioned (@), look', + 'linkchange password' => 'Your link to change your password', + 'changing password' => 'Change Password', + 'activate e-mail' => 'Activation link Email', + 'checking e-mail' => 'Examination Email', 'there are no domains' => 'No domains', 'change the site' => 'Change site', 'add a website' => 'Add site', @@ -478,26 +477,24 @@ $data = [ 'who will be able to post' => 'Who can post', 'design choice' => 'Choice of design', 'test-email' => 'Testing the messaging system', - 'posts will not be visible in the feed' => 'If not, then the posts will not be visible in the feed (on the main page)', - 'work e-mail (to activate your account)' => 'Work email (for activation account)', - 'new password has been sent to e-mail' => 'New password has been sent to email', - 'check your e-mail to activate your account' => 'Check your email to activate your account', - 'tl-limitation' => 'Your Trust Level (TL) does not allow this action', - 'who will be able to post posts' => 'Who can post', - 'long name from' => 'Long name from', - 'posts will not be visible in the feed' => 'If not, then the posts will not be visible in the feed (on the main page)', - 'does this violate site rules' => 'This violates the rules of the site', - 'flag not included' => 'Flag left out, don use it often', - 'someone invited you from the site' => 'You were invited by a member from this site. Enter invite', - 'you can invite your friends' => 'You can invite friends', - 'you were looking for' => 'You were looking for', - 'personal-messages-site' => 'Private messages with site members', - 'responses-members' => 'Responses from community members', - 'the page does not exist' => 'The page does not exist', - 'to main' => 'To main', - 'the page has been removed' => 'The page has been removed', - 'the command is executed' => 'Command executed', - 'you can add more' => 'You can add more', + 'work email' => 'Work email (for activation account)', + 'new password email' => 'New password has been sent to email', + 'check your email' => 'Check your email to activate your account', + 'tl-limitation' => 'Your Trust Level (TL) does not allow this action', + 'who will be able to post posts' => 'Who can post', + 'long name from' => 'Long name from', + 'does this violate site rules' => 'This violates the rules of the site', + 'flag not included' => 'Flag left out, don use it often', + 'invited you' => 'You were invited by a member from this site. Enter invite', + 'you can invite your friends' => 'You can invite friends', + 'you were looking for' => 'You were looking for', + 'personal-messages-site' => 'Private messages with site members', + 'responses-members' => 'Responses from community members', + 'the page does not exist' => 'The page does not exist', + 'to main' => 'To main', + 'the page has been removed' => 'The page has been removed', + 'the command is executed' => 'Command executed', + 'you can add more' => 'You can add more', 'recommended posts' => 'recommended posts', 'recommended.posts.desc' => 'Recommended posts in «%1$s» hand - selected. ', diff --git a/app/Language/fr.php b/app/Language/fr.php index 8a128c89..2686d910 100644 --- a/app/Language/fr.php +++ b/app/Language/fr.php @@ -1,7 +1,243 @@ 'Domicile', - 'city' => 'Ville', + 'to the website' => 'Vers le site', + 'feed' => 'Nourrir', + 'hi' => 'Salut ', + 'news' => 'Des nouvelles', + 'top' => 'TOP', + 'admin' => 'Panneau', + 'tools' => 'Outils', + 'template' => 'Modèle', + 'settings' => 'Réglages', + 'security' => 'Sécurité', + 'avatar' => 'Photo de profil', + 'understands' => 'Comprend', + 'necessarily' => 'Obligatoire à remplir ', + 'create' => 'Créer', + 'writers' => 'Écrivains', + 'welcome' => 'Bienvenu', + 'create account' => 'Créer un compte', + 'not registered' => 'Publier, répondre, commenter...
Vous nêtes pas encore inscrit', + 'saw' => 'Scie', + 'the post' => 'La poste', + 'bodies' => 'Corps', + 'thanks' => 'Merci', + 'whisper' => 'Chuchotement', + 'report' => 'Reportage', + 'reports' => 'Rapports', + + /* La traduction est en outre complétée en partie */ + 'build' => 'Build', + 'complained about' => 'complained about ', + 'freely' => 'Free', + 'useful resources' => 'Useful Resources', + 'comment deleted' => 'Comment has been deleted', + 'post deleted' => 'Post deleted', + 'answer deleted' => 'Answer deleted', + 'deleted' => 'Deleted', + 'remote' => 'Remote', + 'email activated' => 'Email activated', + 'not activated' => 'Not activated', + 'like' => 'Like', + 'i like comments' => 'I like comments', + 'i like posts' => 'I like posts', + 'by topic' => 'By topic', + 'all comments' => 'All comments', + 'all answers' => 'All answers', + 'recommended' => 'Recommended', + 'notification' => 'Notification', + 'notifications' => 'Notifications', + 'preferences' => 'Preferences', + 'action' => 'Action', + 'domain' => 'Domain', + 'domains' => 'Domains', + 'posted' => 'Posted', + 'posted-help' => 'The posted material is visible to the participants', + 'all domains' => 'All domains', + 'blog' => 'Blog', + 'blogs' => 'Blogs', + 'topics' => 'Topics', + 'topic' => 'Topic', + 'topics-no' => 'There are no topics yet', + 'blogs-no' => 'There are no blogs yet', + 'parent' => 'Parent', + 'edit topic' => 'Edit topic', + 'authorization' => 'Authorization', + 'sign in' => 'Sign in', + 'sign out' => 'Sign out', + 'sign up' => 'Sign up', + 'advertising' => 'Advertising', + 'private messages' => 'Private messages', + 'it was read' => 'It was read', + 'all messages' => 'All messages', + 'send a message' => 'Send a message', + 'dialogues' => 'Dialogues', + 'dialogue' => 'Dialogue', + 'write a message' => 'Write a message', + 'send' => 'Send', + 'to share' => 'To share', + 'information' => 'Information', + 'review' => 'Review', + 'contacts' => 'Contacts', + 'city' => 'City', + 'remember me' => 'Remember me', + 'banned' => 'Banned', + 'ban it' => 'ban it', + 'unban' => 'Unban', + 'dumb mode' => 'Dumb mode', + 'reset' => 'Reset', + 'to create' => 'To create', + 'invited guests' => 'Invited guests', + 'nickname' => 'Nickname', + 'name' => 'Name', + 'password' => 'Password', + 'new password' => 'New Password', + 'repeat' => 'Rv', + 'show' => 'Show', + 'new' => 'New', + 'new ones' => 'New ones', + 'approved' => 'Approved', + 'old' => 'Old', + 'code' => 'Code', + 'code error' => 'Code error', + 'invite' => 'Invite', + 'invites' => 'Invites', + 'view' => 'Viewing', + 'views' => 'Views', + 'profile' => 'Profile', + 'title' => 'Title', + 'heading' => 'Heading', + 'to extract' => 'To extract', + 'discussion' => 'Discussion', + 'description' => 'Description', + 'meta description' => 'Meta description', + 'short description' => 'Short description', + 'favorites' => 'Favorites', + 'long' => 'Long', + 'created by' => 'Created by', + 'help' => 'Help', + 'statistics' => 'Statistics', + 'privacy' => 'Privacy', + 'about' => 'About', + 'about me' => 'About me', + 'riddle' => 'Riddle', + 'info' => 'Info', + 'more' => 'More', + 'other' => 'Other', + 'social networks' => 'Social Networks', + 'official' => 'Official', + 'community' => 'Community', + 'works on' => 'Works on', + 'trust level' => 'Trust Level', + 'search' => 'Search', + 'to find' => 'To find', + 'up' => 'Up', + 'user' => 'User', + 'users' => 'Users', + 'no users' => 'No users', + 'page' => 'Page', + 'read' => 'Read', + 'reads' => 'Reads', + 'reading' => 'I read', + 'is reading' => 'Is reading', + 'subscribed' => 'Subscribed', + 'unsubscribed' => 'Unsubscribed', + 'unsubscribe' => 'Unsubscribe', + 'subscribe' => 'Subscribe', + 'read more' => 'Read more', + 'to approve' => 'To approve', + 'remove' => 'Remove', + 'recover' => 'Recover', + 'download' => 'Download', + 'successful download' => 'Successful download', + 'error in loading' => 'Error in loading', + 'password recovery' => 'Password recovery', + 'draft' => 'Draft', + 'drafts' => 'Drafts', + 'there no drafts' => 'There no drafts', + 'update the data' => 'Update the data', + 'cancel' => 'Cancel', + 'reply' => 'Reply', + 'edit' => 'Edit', + 'save' => 'Save', + 'source' => 'Source', + 'website' => 'Website', + 'sites' => 'Sites', + 'related' => 'Related', + 'related posts' => 'Related posts', + 'related topics' => 'Related topics', + 'see more' => 'See more', + 'parents' => 'Parents', + 'children' => 'Children', + 'bound (children)' => 'Bound (children)', + 'bound (parents)' => 'Bound (parents)', + 'structure' => 'Structure', + 'root' => 'Root', + 'root-help' => 'The top (main) theme of the tree.', + 'upper' => 'Upper', + 'subtopics' => 'Subtopics', + 'badge' => 'Badge', + 'badges' => 'Badges', + 'reward the user' => 'Reward the user', + 'reward added' => 'Reward added', + 'add badge' => 'add badge', + 'edit badge' => 'Edit badge', + 'reward weight' => 'Reward weight', + 'edit user' => 'Edit user', + 'for example' => 'For example', + 'ed' => 'ed', + 'add' => 'Add', + 'there are' => 'There are', + 'yes' => 'Yes', + 'no' => 'No', + 'all' => 'All', + 'you' => 'You', + 'from' => 'From', + 'by' => 'by', + 'in' => 'in', + 'on' => 'on', + 'for' => 'for', + 'my' => 'My', + 'by default' => 'By default', + 'just me' => 'Just me', + 'publications' => 'Publications', + 'selected post' => 'Selected post', + 'edit post' => 'Edit post', + 'participant posts' => 'Participant posts', + 'color' => 'Color', + 'text' => 'Text', + 'author' => 'Author', + 'characters' => 'Characters', + 'post added' => 'Post added', + 'last answer' => 'Last answer', + 'no answers' => 'Unfortunately, there are no answers. Write if you know the answer.', + 'comments-desc' => 'All comments (on answers) are in order of priority in the community', + 'answers-desc' => 'All responses (to posts) are in order of priority in the community', + 'no-auth-comm' => 'You must be logged in to post a comment', + 'write-something' => 'Supports Markdown', + 'write-response' => 'Write an answer to the question', + 'write' => 'Write', + 'in-the-profile' => 'In profile', + 'add-favorites' => 'Add favorites', + 'remove-favorites' => 'Remove favorites', + 'no-cover' => 'No cover. Download', + 'add post' => 'Add post', + 'change' => 'Change', + 'change saved' => 'Change saved', + 'add topic' => 'Add Topic', + 'add blog' => 'Add Blog', + 'add tag' => 'Add tag', + 'edit tag' => 'Edit tag', + 'registrations' => 'Registrations', + 'no dialogs' => 'No dialogs', + 'words' => 'Stop words', + 'word' => 'Stop word', + 'stop words no' => 'Stop word no', + 'add a stop word' => 'Add a stop word', + 'bookmark added' => 'Bookmark added', + 'bookmark deleted' => 'Bookmark deleted', 'language' => 'Localisation', 'ru-language' => 'Russe (RU)', @@ -10,6 +246,298 @@ $data = [ 'fr-language' => 'Français (FR)', 'zh-language' => 'Chinois (ZH)', 'md-language' => 'Moldave (MD)', + + 'repeat the password' => 'Repeat password', + 'the post is closed' => 'Post closed', + 'there are no posts' => 'Unfortunately there are no posts', + 'forgot your password' => 'Forgot your password', + 'there are no comments' => 'Sorry, no comments', + 'rules' => 'Site rules', + 'privacy policy' => 'Privacy Policy', + 'restriction' => 'Restrictions', + 'no-invate-txt' => 'Not a user yet? Registration is by invitation only to combat spam and increase accountability. If you know the current user of the site, ask him for an invitation.', + + /* Date and time + Events */ + 'months' => ['', 'January', 'February', 'Martha', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], + 'today' => 'Today', + 'yesterday' => 'Yesterday', + + 'num-message' => ['Message', 'Messages', 'Messages'], + 'num-comment' => ['Comment', 'Comments', 'Comments'], + 'num-answer' => ['Answer', 'Answers', 'Answers'], + 'num-post' => ['Post', 'Post', 'Posts'], + 'num-view' => ['View', 'View', 'Views'], + 'num-website' => ['Website', 'Sites', 'Sites'], + 'num-blog' => ['Blog', 'Blogs', 'Blogs'], + 'num-up' => ['Vote', 'Votes', 'Votes'], + + 'comment' => 'Comment', + 'comments' => 'Comments', + 'answer' => 'Answer', + 'answers' => 'Answers', + 'message' => 'Message', + 'messages' => 'Messages', + 'post' => 'Post', + 'posts' => 'Posts', + + 'answered' => 'Answered', + 'translation' => 'Translation', + 'is this a translation?' => 'Is this a translation?', + 'to close?' => 'To close?', + 'format Q&A?' => 'Format Q&A?', + 'raise?' => 'Raise?', + 'is this a draft?' => 'Is this a draft?', + 'default' => 'Ddefault', + 'qa' => 'Q&A', + 'moderation log' => 'Moderation log', + 'no moderation logs' => 'No logs found in the moderation log', + 'meta-moderation' => 'Actions of members and moderators to remove and restore content in the community.', + 'deleted-post' => 'Deleted post', + 'restored-post' => 'Restored post', + 'deleted-comment' => 'Deleted comment', + 'restored-comment' => 'Restored comment', + 'deleted-answer' => 'Deleted the answer', + 'restored-answer' => 'Rebuilt the answer', + + /* Настройки */ + 'setting profile page' => 'Setting profile page', + 'change avatar' => 'Change avatar', + 'cover art' => 'Cover art', + 'type' => 'Type', + 'logo' => 'Logo', + 'last' => 'Last', + 'cover removed' => 'Cover removed', + 'change avatar page' => 'Change avatar page', + 'change password' => 'Change password', + 'change password page' => 'Change password page', + 'recommended size' => 'Recommended size', + + /* Notifications */ + 'no notifications yet' => 'No notifications yet', + 'i read' => 'I read', + 'wrote' => 'Wrote', + 'wrote a post' => 'Wrote a post', + 'wrote to you' => 'Wrote to you', + 'replied to post' => 'Replied to post', + 'successfully, log in' => 'Successfully, log in', + 'appealed to you' => 'Appealed to you', + 'in post' => 'In post', + 'in answer' => 'In answer', + 'in the comment' => 'In the comment', + 'to your answer' => 'To your answer', + + /* MSG */ + 'text-string-length' => 'Length %1$s should be from %2$s -> %3$s characters ', + 'text-charset-slug' => '%1$s should contain only Latin letters, numbers', + 'text-check-url' => '%1$s address is not correct', + 'titles' => 'Titles', + 'descriptions' => 'Descriptions', + 'url-already-exists' => 'This topic URL already exists', + 'url-gaps' => 'Blog are not allowed in the URL', + 'select topic' => 'Choose a topic', + 'you-question-no' => 'You have already answered this question', + 'you need to log in' => 'Login required', + 'no-auth-login' => 'For an answer you can log in', + 'you dont have access' => 'You don have access', + 'access restricted' => 'Access limited', + 'member does not exist' => 'Member does not exist', + + 'changes saved' => 'Changes saved', + 'invite created' => 'Invite created', + 'invalid' => 'Invalid', + 'avatar changed' => 'Avatar changed ', + 'cover changed' => 'Cover changed', + 'password changed' => 'Password changed successfully', + 'old-password-err' => 'Old password is incorrect', + 'pass-match-err' => 'Password mismatch', + 'login-use-condition' => 'By continuing, you agree to Terms of use site', + 'user-already' => 'The user is already on the site', + 'invate-to-replay' => 'You have already sent an invitation to this user', + 'limit-content-day' => 'For %1$s you have reached the limit %2$s for today', + 'limit-add-content-no' => 'You have reached the limit for adding set on the site', + 'registration by invite' => 'Registration by invite', + 'details are here' => 'Details here', + 'breaking the rules' => 'Breaking the rules', + + 'soft' => 'Software', + 'there is a program' => 'There is a program?', + 'hosted on github' => 'Is the program on GitHub?', + 'url address github' => 'Repository URL on GitHub', + + 'sections' => 'Sections', + 'section' => 'Section', + 'pages' => 'Pages', + 'edit page' => 'Edit page', + 'add page' => 'Add page', + 'go to' => 'Go to', + 'frameworks' => 'Frameworks', + 'interesting sites' => 'Interesting sites', + 'facts' => 'Facts', + 'psychology' => 'Psychology', + + /* Meta - desc */ + 'title-profile' => '%1$s %2$s | Profile on %3$s', + 'desc-profile' => '%1$s - member profile page. %2$s Posts, comments, awards on %3$s', + 'page-number' => ' Page %1$s. ', + 'main.top.title' => 'Popular posts. ', + 'main.top.desc' => 'List of popular posts in the community feed (by the number of replies). Topics of interest. Conversations, questions and answers, comments. ', + 'main.all.title' => 'All posts. ', + 'main.all.desc' => 'List of all posts in the community feed (by number of replies). Conversations, questions and answers, comments. ', + 'edit answer' => 'Change the answer', + 'no results' => 'No results', + 'no search results' => 'The search has not given any results.
Too short / long search term.', + 'empty request' => 'Empty search term', + 'enter' => 'Enter', + 'enter your password' => 'Enter password', + 'enter content' => 'Enter content', + + 'description is formed' => 'Description is formed', + 'under development' => 'Under development', + 'activity' => 'Activity', + 'the question is closed' => 'The question is closed', + 'this is a draft' => 'This is a draft', + 'there are no favorites' => 'No bookmarks', + 'users-ban' => 'Users', + 'posts-ban' => 'Posts', + + /* web */ + 'news & media' => 'News & Media', + 'social network' => 'Social network', + 'internet' => 'Internet', + 'software' => 'Software', + 'reference info' => 'Reference Information', + 'related sites' => 'Related Sites', + 'web-cat' => 'Are there in the site directory?', + 'web-cat-help' => 'In the site catalog, will be a Category (will become visible)', + + /* soft */ + 'soft-cat' => 'Are there programs in the catalog?', + 'soft-cat-help' => 'In the program directory, will be Category (will become visible)', + + /* Setting */ + 'info-setting' => 'Fill in your name, this will help attendees refer to you by name.

Tell us something about yourself. You have a great opportunity to open up to please others and seem like an interesting person.', + 'info-avatar' => 'Upload an avatar and cover for your profile.

When each user has a unique avatar, it becomes much easier to follow the discussions! ', + 'info-security' => 'Make sure all your passwords are 8 characters or more, ideally a lot more.

Passwords must contain Large letters, small, numbers, specials. symbols.', + 'info-search' => 'To refine your search, try to find a more precise query.', + 'info-login' => 'Authorization gives you the ability to publish posts, reply, comment.

You can vote for other publications, fill out and edit the profile.', + 'info-recover' => 'After clicking the "Reset" button, check your email...', + 'info-favorite' => 'Posts, comments and questions in your bookmarks', + 'info-preferences' => 'Posts you are subscribed to. You will be notified of all new replies', + 'e-mail notification' => 'Notify by Email', + 'info-notifications' => 'You can mark all ads as read by clicking on the link: "I have read".', + 'info-notification' => 'You can unsubscribe from all notifications by Email in this section', + + 'message to PM' => 'When the message came to PM', + 'contacted via @' => 'When they reached out to me through @', + 'you mentioned (@)' => 'You were mentioned (@), look', + 'linkchange password' => 'Your link to change your password', + 'changing password' => 'Change Password', + 'activate e-mail' => 'Activation link Email', + 'checking e-mail' => 'Examination Email', + 'there are no domains' => 'No domains', + 'change the site' => 'Change site', + 'add a website' => 'Add site', + 'description is formed' => 'Description is formed', + 'domain-desc' => 'Grouping posts in a community by domain', + 'domains-title' => 'Websites in the system', + 'domains-desc' => 'Statistics on domains, links that are used to compile publications on the site. Most visited, popular sites', + 'code-incorrect' => 'The code is incorrect or has already been used. Go through the recovery procedure again.', + 'yes-email-pass' => 'Now you can use your email and password.', + 'code-used' => 'The code is incorrect or has already been used.', + 'audits' => 'Audits', + 'content-audit' => 'Your message has been sent for review.', + 'no invitations' => 'No invitations yet', + 'limit-tl-invitation' => 'Your trust level does not yet allow using invites', + 'can send this link' => 'You can send this link ', + 'link has been used' => 'Link has been used', + 'the link was used to' => 'The link was used to', + 'medal for registration' => 'Registration Medal', + 'registered' => 'Registered ', + 'invitations left' => 'Invitations left', + 'no-topic-to-add' => 'You do not have topics to add a post. Subscribe to topics', + + 'site under reconstruction' => 'The site is under reconstruction', + 'limiting-mode-1' => 'You cannot publish materials, your account is being verified', + 'the dialog does not exist' => 'The specified dialog does not exist', + 'the topic does not exist' => 'The specified topic does not exist', + 'the site is already there' => 'Such a site is already in the system', + 'joined in the early days' => 'Joined in the early days of the community launch', + 'the owner restricted the publication' => 'Topic owner has restricted posting', + 'the profile is being checked' => 'Your profile is pending', + 'nickname-replay' => 'This nickname is already on the site', + 'e-mail-replay' => 'This email is already on the site', + 'multiple-accounts' => 'Don. t register multiple accounts ', + 'password-spaces' => 'Password cannot contain spaces', + 'nickname-repeats-characters' => 'There are too many repeating characters in the nickname', + 'the code is incorrect' => 'The code is incorrect or has already been used', + 'format-cover-post' => 'Width greater than 500px. Orientation horizontal', + 'e-mail or password is not correct' => 'Email or password is not correct', + 'your account is not activated' => 'Your account is not activated', + 'your account is under review' => 'Your account is pending', + 'invalid email address' => 'Invalid email', + 'there is no such e-mail on the site' => 'This email is not on the site', + 'english' => 'English', + 'who will be able to post' => 'Who can post', + 'design choice' => 'Choice of design', + 'test-email' => 'Testing the messaging system', + 'work email' => 'Work email (for activation account)', + 'new password email' => 'New password has been sent to email', + 'check your email' => 'Check your email to activate your account', + 'tl-limitation' => 'Your Trust Level (TL) does not allow this action', + 'who will be able to post posts' => 'Who can post', + 'long name from' => 'Long name from', + 'does this violate site rules' => 'This violates the rules of the site', + 'flag not included' => 'Flag left out, don use it often', + 'invited you' => 'You were invited by a member from this site. Enter invite', + 'you can invite your friends' => 'You can invite friends', + 'you were looking for' => 'You were looking for', + 'personal-messages-site' => 'Private messages with site members', + 'responses-members' => 'Responses from community members', + 'the page does not exist' => 'The page does not exist', + 'to main' => 'To main', + 'the page has been removed' => 'The page has been removed', + 'the command is executed' => 'Command executed', + 'you can add more' => 'You can add more', + + 'recommended posts' => 'recommended posts', + 'recommended.posts.desc' => 'Recommended posts in «%1$s» hand - selected. ', + + 'structure-desc' => 'Topics represented by different trees, structure of topics and their relationship ', + 'topic-subscription' => 'Subscribe to topics and read them in the feed', + 'stop-blog' => 'This blog URL is reserved', + + 'users.all' => 'List of participants', + 'users.all.info' => 'List of participants in the order of their activity on the site', + 'users.all.desc' => 'Participants in the order of their activity on the site. Ability to view profile data', + + 'blogs.all' => 'All blogs ', + 'blogs.all.info' => 'Blogs created by contributors', + 'blogs.all.desc' => 'Blogs in the order of their registration on the site, the ability to view the created blogs, subscribe to them, view statistics', + + 'blogs.new' => 'New blogs', + 'blogs.new.info' => 'Recently added blogs on the site', + 'blogs.new.desc' => 'Blogs on the site added recently. Personal blogs of participants, the ability to subscribe to interesting blogs', + + 'blogs.my' => 'My blogs', + 'blogs.my.info' => 'Blogs I follow or have created', + 'blogs.my.desc' => 'Blogs I Read or Have Created', + + 'topics.all' => 'All topics', + 'topics.all.info' => 'All topics on the site in order of their popularit', + 'topics.all.desc' => 'A page of topics arranged in order of popularity. By the number of posts located, the ability to subscribe to blogs ', + + 'topics.new' => 'New Topics', + 'topics.new.info' => 'New themes, themes added recently', + 'topics.new.desc' => 'New themes added to the site recently. Topic statistics and the ability to subscribe to topics', + + 'topics.my' => 'I read ', + 'topics.my.info' => 'Topics I follow, I read', + 'topics.my.desc' => 'Topics that I read or have created', + + 'main.feed.info' => 'Posts in chronological order...', + 'main.all.info' => 'All posts in the community feed...', + 'main.top.info' => 'Recent active posts...', + ]; return $data; diff --git a/app/Language/md.php b/app/Language/md.php index bfb04553..47d85289 100644 --- a/app/Language/md.php +++ b/app/Language/md.php @@ -6,7 +6,6 @@ $data = [ 'news' => 'Știri', 'tools' => 'Instrumente', 'template' => 'Șablon', - 'create post' => 'Scrie o postare', 'create' => 'Scrie un mesaj', 'saw' => 'A văzut', 'the post' => 'Post', @@ -413,17 +412,17 @@ $data = [ 'info-favorite' => 'Postări, comentarii și întrebări pe care le urmăriți', 'info-preferences' => 'Postări la care sunteți abonat. Veți fi informat cu privire la toate răspunsurile noi', - 'e-mail notification' => 'Notificați prin e-mail', + 'e-mail notification' => 'Notificați prin e-mail', 'info-notifications' => 'Vă puteți dezabona de la toate notificările prin e-mail în această secțiune', - 'when the message came to PM' => 'Când mesajul a venit la PM', - 'when you contacted me via @' => 'Când m-ați contactat prin @', - 'you were mentioned (@), see' => 'Menționat (@), vezi', - 'your link to change your password' => 'Link-ul dvs. pentru a vă schimba parola', - 'changing your password' => 'schimbați parola', - 'activate e-mail' => 'Link pentru activarea e-mailului', - 'checking e-mail' => 'verifica e-mail', - 'site under reconstruction' => 'Site în reconstrucție', + 'message to PM' => 'Când mesajul a venit la PM', + 'contacted via @' => 'Când m-ați contactat prin @', + 'you mentioned (@)' => 'Menționat (@), vezi', + 'linkchange password' => 'Link-ul dvs. pentru a vă schimba parola', + 'changing password' => 'schimbați parola', + 'activate e-mail' => 'Link pentru activarea e-mailului', + 'checking e-mail' => 'verifica e-mail', + 'site under reconstruction' => 'Site în reconstrucție', 'there are no domains' => 'Fără domenii', 'change the site' => 'Schimbați site-ul', @@ -454,6 +453,7 @@ $data = [ 'the dialog does not exist' => 'Caseta de dialog specificată nu există', 'the topic does not exist' => 'Subiectul specificat nu există', 'test-email' => 'Testarea sistemului de mesagerie', + 'work email' => 'Work email (for activation account)', 'the page does not exist' => 'Pagina nu există', 'to main' => 'La principal ', 'the page has been removed' => 'Este posibil să fi fost șters', @@ -479,20 +479,20 @@ $data = [ 'the command is executed' => 'Comanda este executată', 'you can add more' => 'Puteți adăuga mai multe', - 'new password has been sent to e-mail' => 'Noua parolă a fost trimisă prin e-mail', - 'check your e-mail to activate your account' => 'Verificați-vă e-mailul pentru a vă activa contul', - 'tl-limitation' => 'Nivelul dvs. de încredere (TL) nu permite această acțiune', - 'who will be able to post posts' => 'Cine va putea posta', - 'long name from' => 'Numele lung de la', - 'posts will not be visible in the feed' => 'Dacă nu, postările nu vor fi vizibile în flux (pe pagina principală)', + 'new password email' => 'Noua parolă a fost trimisă prin e-mail', + 'check your email' => 'Verificați-vă e-mailul pentru a vă activa contul', + 'tl-limitation' => 'Nivelul dvs. de încredere (TL) nu permite această acțiune', + 'who will be able to post posts' => 'Cine va putea posta', + 'long name from' => 'Numele lung de la', 'does this violate site rules' => 'Acest lucru încalcă regulile site-ului.', 'flag not included' => 'Semnalizați-l lăsat, nu îl folosiți des', + 'invited you' => 'You were invited by a member from this site. Enter invite', 'medal for registration' => 'Medalie pentru înregistrare', 'responses-members' => 'Răspunsurile comunității', 'design choice' => 'alegerea designului', - 'recommended posts' => 'postări recomandate ', - 'recommended.posts.desc' => 'Postări recomandate în «%1$s» selectat manual. ', + 'recommended posts' => 'postări recomandate ', + 'recommended.posts.desc' => 'Postări recomandate în «%1$s» selectat manual. ', 'structure-desc' => 'Subiecte reprezentate de diferiți arbori, structura subiectelor și relația lor', 'topic-subscription' => 'Abonați-vă la subiecte și citiți-le în feed', diff --git a/app/Language/ru.php b/app/Language/ru.php index 6d914770..4e37a3eb 100644 --- a/app/Language/ru.php +++ b/app/Language/ru.php @@ -14,7 +14,6 @@ $data = [ 'avatar' => 'Аватарка', 'understands' => 'Разбирается', 'necessarily' => 'Обязательно к заполнению', - 'create Post' => 'Написать пост', 'create' => 'Написать', 'writers' => 'Писатели', 'welcome' => 'Добро пожаловать', @@ -433,13 +432,13 @@ $data = [ 'info-notifications' => 'Вы можете пометить все объявления, как прочитанные, нажать на ссылку: «Я прочитал».', 'info-notification' => 'Вы можете отписаться от всех уведомлений на E-mail в этом разделе', - 'when the message came to PM' => 'Когда пришло сообщение на PM', - 'when you contacted me via @' => 'Когда обратились ко мне через @', - 'you were mentioned (@), see' => 'Вас упомянули (@), посмотреть', - 'your link to change your password' => 'Ваша ссылка для изменения пароля', - 'changing your password' => 'изменение пароля', - 'activate e-mail' => 'Ссылка для активации E-mail', - 'checking e-mail' => 'проверка e-mail', + 'message to PM' => 'Когда пришло сообщение на PM', + 'contacted via @' => 'Когда обратились ко мне через @', + 'you mentioned (@)' => 'Вас упомянули (@), посмотреть', + 'linkchange password' => 'Ваша ссылка для изменения пароля', + 'changing password' => 'изменение пароля', + 'activate e-mail' => 'Ссылка для активации E-mail', + 'checking e-mail' => 'проверка e-mail', 'there are no domains' => 'Доменов нет', 'change the site' => 'Изменить сайт', 'add a website' => 'Добавить сайт', @@ -486,26 +485,25 @@ $data = [ 'who will be able to post' => 'Кто может размещать посты', 'design choice' => 'Выбор дизайна', 'test-email' => 'Тестирование системы обмена сообщениями', - 'posts will not be visible in the feed' => 'Если нет, то посты не будут видны в ленте (на главной)', - 'work e-mail (to activate your account)' => 'Рабочий е-mail (для активации аккаунта)
Working email (for account activation)', - 'new password has been sent to e-mail' => 'Новый пароль отправлен на e-mail', - 'check your e-mail to activate your account' => 'Проверьте e-mail почту для активации аккаунта', - 'tl-limitation' => 'Ваш уровень доверия (TL) не позволяет совершить это действие', - 'who will be able to post posts' => 'Кто может размещать посты', - 'long name from' => 'Длинное название от', - 'posts will not be visible in the feed' => 'Если нет, то посты не будут видны в ленте (на главной)', - 'does this violate site rules' => 'Это нарушает правила сайта', - 'flag not included' => 'Флаг не учтен, не используйте его часто', - 'someone invited you from the site' => 'Вас пригласил участник с этого сайта. Введите инвайт', - 'you can invite your friends' => 'Вы можете пригласить друзей', - 'you were looking for' => 'Вы искали', - 'personal-messages-site' => 'Личные сообщения с участниками сайта', - 'responses-members' => 'Ответы участников сообщества', - 'the page does not exist' => 'Страница не существует', - 'to main' => 'На главную', - 'the page has been removed' => 'Возможно она была удалена', - 'the command is executed' => 'Команда выполнена', - 'you can add more' => 'Вы можете добавить ещё', + + 'work email' => 'Рабочий е-mail (для активации аккаунта)
Working email (for account activation)', + 'new password email' => 'Новый пароль отправлен на e-mail', + 'check your email' => 'Проверьте e-mail почту для активации аккаунта', + 'tl-limitation' => 'Ваш уровень доверия (TL) не позволяет совершить это действие', + 'who will be able to post posts' => 'Кто может размещать посты', + 'long name from' => 'Длинное название от', + 'does this violate site rules' => 'Это нарушает правила сайта', + 'flag not included' => 'Флаг не учтен, не используйте его часто', + 'invited you' => 'Вас пригласил участник с этого сайта. Введите инвайт', + 'you can invite your friends' => 'Вы можете пригласить друзей', + 'you were looking for' => 'Вы искали', + 'personal-messages-site' => 'Личные сообщения с участниками сайта', + 'responses-members' => 'Ответы участников сообщества', + 'the page does not exist' => 'Страница не существует', + 'to main' => 'На главную', + 'the page has been removed' => 'Возможно она была удалена', + 'the command is executed' => 'Команда выполнена', + 'you can add more' => 'Вы можете добавить ещё', 'recommended posts' => 'рекомендованные посты', 'recommended.posts.desc' => 'Рекомендованные посты в «%1$s» отобранные в ручную. ', @@ -542,9 +540,9 @@ $data = [ 'topics.my.info' => 'Темы, на которые я подписан, читаю', 'topics.my.desc' => 'Темы, которые я читаю или создал', - 'main.feed.info' => 'Посты в хронологическом порядке...', - 'main.all.info' => 'Все посты в ленте сообщества...', - 'main.top.info' => 'Активные посты за последнее время...', + 'main.feed.info' => 'Посты в хронологическом порядке...', + 'main.all.info' => 'Все посты в ленте сообщества...', + 'main.top.info' => 'Активные посты за последнее время...', ]; diff --git a/app/Language/zh.php b/app/Language/zh.php index 57ecd477..6144cf4c 100644 --- a/app/Language/zh.php +++ b/app/Language/zh.php @@ -14,7 +14,6 @@ $data = [ 'avatar' => '头像照片', 'understands' => '了解', 'necessarily' => '需要填写', - 'create Post' => '创建帖子', 'create' => '创建', 'writers' => '作家', 'welcome' => '欢迎', @@ -426,13 +425,13 @@ $data = [ 'info-notifications' => '您可以通過單擊以下鏈接將所有廣告標記為已讀：“我已閱讀”。', 'info-notification' => '您可以在此部分取消訂閱通過電子郵件發送的所有通知', - 'when the message came to PM' => '當消息來到 PM', - 'when you contacted me via @' => '當他們通過@聯繫我時 ', - 'you were mentioned (@), see' => '你被提及（@），看', - 'your link to change your password' => '您更改密碼的鏈接', - 'changing your password' => '更改密碼', - 'activate e-mail' => '激活鏈接電子郵件', - 'checking e-mail' => '考試郵箱 ', + 'message to PM' => '當消息來到 PM', + 'contacted via @' => '當他們通過@聯繫我時 ', + 'you mentioned (@)' => '你被提及（@），看', + 'linkchange password' => '您更改密碼的鏈接', + 'changing password' => '更改密碼', + 'activate e-mail' => '激活鏈接電子郵件', + 'checking e-mail' => '考試郵箱 ', 'there are no domains' => '沒有域', 'change the site' => '更改站點', 'add a website' => '添加站點', @@ -479,26 +478,24 @@ $data = [ 'who will be able to post' => '誰可以發帖', 'design choice' => '設計選擇', 'test-email' => '測試消息系統 ', - 'posts will not be visible in the feed' => '如果沒有，那麼帖子將不會在提要中可見（在主頁上）', - 'work e-mail (to activate your account)' => '工作郵箱（用於激活帳戶）', - 'new password has been sent to e-mail' => '新密碼已發送至郵箱', - 'check your e-mail to activate your account' => '檢查您的電子郵件以激活您的帳戶', - 'tl-limitation' => '您的信任級別 (TL) 不允許此操作', - 'who will be able to post posts' => '誰可以發帖', - 'long name from' => '長名來自', - 'posts will not be visible in the feed' => '如果沒有，那麼帖子將不會在提要中可見（在主頁上）', - 'does this violate site rules' => '這違反了網站的規則', - 'flag not included' => 'Flag 被遺漏了，不要經常使用它', - 'someone invited you from the site' => '您是受此網站成員邀請的。 輸入邀請', - 'you can invite your friends' => '你可以邀請朋友', - 'you were looking for' => '你在找', - 'personal-messages-site' => '與網站成員的私信', - 'responses-members' => '社區成員的回應', - 'the page does not exist' => '該頁面不存在', - 'to main' => '主要', - 'the page has been removed' => '該頁面已被刪除', - 'the command is executed' => '命令執行', - 'you can add more' => '你可以添加更多', + 'work email' => '工作郵箱（用於激活帳戶）', + 'new password email' => '新密碼已發送至郵箱', + 'check your email' => '檢查您的電子郵件以激活您的帳戶', + 'tl-limitation' => '您的信任級別 (TL) 不允許此操作', + 'who will be able to post posts' => '誰可以發帖', + 'long name from' => '長名來自', + 'does this violate site rules' => '這違反了網站的規則', + 'flag not included' => 'Flag 被遺漏了，不要經常使用它', + 'invited you' => '您是受此網站成員邀請的。 輸入邀請', + 'you can invite your friends' => '你可以邀請朋友', + 'you were looking for' => '你在找', + 'personal-messages-site' => '與網站成員的私信', + 'responses-members' => '社區成員的回應', + 'the page does not exist' => '該頁面不存在', + 'to main' => '主要', + 'the page has been removed' => '該頁面已被刪除', + 'the command is executed' => '命令執行', + 'you can add more' => '你可以添加更多', 'recommended posts' => '推薦帖子', 'recommended.posts.desc' => '推薦的帖子 «%1$s» 手選.', diff --git a/app/Libraries/SendEmail.php b/app/Libraries/SendEmail.php index b287d9e4..02aa4a48 100644 --- a/app/Libraries/SendEmail.php +++ b/app/Libraries/SendEmail.php @@ -16,7 +16,7 @@ class SendEmail if ($setting['setting_email_appealed'] == 1) { $user = UserModel::getUser($user_id, 'id'); $link = Config::get('meta.url') . '/u/' . $user['user_login'] . '/notifications'; - $message = Translate::get('You were mentioned (@), see') . ": \n" . $link . "\n\n" . Config::get('meta.url'); + $message = Translate::get('you mentioned (@)') . ": \n" . $link . "\n\n" . Config::get('meta.url'); self::send($user['user_email'], Config::get('meta.name') . ' - ' . Translate::get('notification'), $message); } } diff --git a/public/assets/js/common.js b/public/assets/js/common.js index 3df39bc1..8ce3b3c7 100644 --- a/public/assets/js/common.js +++ b/public/assets/js/common.js @@ -236,6 +236,7 @@ document.getElementById('find').addEventListener('keydown', function () { function fetch_search() { let val = document.getElementById("find").value; let token = document.querySelector('input[name="token"]').value; + let url = document.querySelector('input[name="url"]').value; if (val.length < 3) { return; @@ -255,18 +256,17 @@ function fetch_search() { let obj = JSON.parse(text); var html = '
'; for (var key in obj) { - if (obj[key].topic_slug) { + if (obj[key].facet_slug) { html += ''; - html += ''; + html += ''; html += obj[key].facet_title + ''; } if (obj[key].post_id) { - html += '' + - obj[key].title + ''; + html += '' + obj[key].title + ''; } html += '
'; } - + let items = document.getElementById("search_items"); items.classList.add("block"); items.innerHTML = html; @@ -277,7 +277,7 @@ function fetch_search() { items.classList.remove("block"); }; }; - } + } } ); } diff --git a/resources/views/default/content/auth/register.php b/resources/views/default/content/auth/register.php index 2ee11f38..5d4580c0 100644 --- a/resources/views/default/content/auth/register.php +++ b/resources/views/default/content/auth/register.php @@ -19,7 +19,7 @@ 'title' => Translate::get('E-mail'), 'type' => 'email', 'name' => 'email', - 'help' => Translate::get('work e-mail (to activate your account)') + 'help' => Translate::get('work email') ], [ 'title' => Translate::get('password'), diff --git a/resources/views/default/content/user/invite.php b/resources/views/default/content/user/invite.php index 16f495b9..210f3e35 100644 --- a/resources/views/default/content/user/invite.php +++ b/resources/views/default/content/user/invite.php @@ -19,4 +19,4 @@ - Translate::get('someone invited you from the site'), 'uid' => $uid]); ?> \ No newline at end of file + Translate::get('invited you'), 'uid' => $uid]); ?> \ No newline at end of file diff --git a/resources/views/default/content/user/setting/notifications.php b/resources/views/default/content/user/setting/notifications.php index 9e4017e9..6bd3aa0b 100644 --- a/resources/views/default/content/user/setting/notifications.php +++ b/resources/views/default/content/user/setting/notifications.php @@ -24,12 +24,12 @@ 'uid' => $uid, 'data' => [ [ - 'title' => Translate::get('when the message came to PM'), + 'title' => Translate::get('message to PM'), 'name' => 'setting_email_pm', 'checked' => $data['setting']['setting_email_pm'] ?? 0, ], [ - 'title' => Translate::get('when you contacted me via @'), + 'title' => Translate::get('contacted via @'), 'name' => 'setting_email_appealed', 'checked' => $data['setting']['setting_email_appealed'] ?? 0, ], diff --git a/resources/views/default/header.php b/resources/views/default/header.php index 963b69d5..8da840b1 100644 --- a/resources/views/default/header.php +++ b/resources/views/default/header.php @@ -50,8 +50,9 @@ $facet = $data['facet'] ?? false; ?>
+
-
+
diff --git a/resources/views/qa/content/auth/register.php b/resources/views/qa/content/auth/register.php index 4d803238..60250b7f 100644 --- a/resources/views/qa/content/auth/register.php +++ b/resources/views/qa/content/auth/register.php @@ -19,7 +19,7 @@ 'title' => Translate::get('E-mail'), 'type' => 'email', 'name' => 'email', - 'help' => Translate::get('work e-mail (to activate your account)') + 'help' => Translate::get('work email') ], [ 'title' => Translate::get('password'), diff --git a/resources/views/qa/content/facets/edit-pages.php b/resources/views/qa/content/facets/edit-pages.php index 581e59d1..9030689e 100644 --- a/resources/views/qa/content/facets/edit-pages.php +++ b/resources/views/qa/content/facets/edit-pages.php @@ -1,15 +1,8 @@ - - -
+
-
+

    @@ -40,7 +33,7 @@
-
+
diff --git a/resources/views/qa/content/facets/edit.php b/resources/views/qa/content/facets/edit.php index 0d816975..71de3a33 100644 --- a/resources/views/qa/content/facets/edit.php +++ b/resources/views/qa/content/facets/edit.php @@ -1,13 +1,6 @@ - - -
+

@@ -40,7 +33,7 @@
-
+
diff --git a/resources/views/qa/content/messages/dialog.php b/resources/views/qa/content/messages/dialog.php index 8de18cff..f14d5b60 100644 --- a/resources/views/qa/content/messages/dialog.php +++ b/resources/views/qa/content/messages/dialog.php @@ -1,11 +1,4 @@ - - -
+

diff --git a/resources/views/qa/content/messages/messages.php b/resources/views/qa/content/messages/messages.php index 02f200ac..a64707fd 100644 --- a/resources/views/qa/content/messages/messages.php +++ b/resources/views/qa/content/messages/messages.php @@ -1,11 +1,4 @@ - - -
+

diff --git a/resources/views/qa/content/notification/index.php b/resources/views/qa/content/notification/index.php index e9e8d673..40bbb261 100644 --- a/resources/views/qa/content/notification/index.php +++ b/resources/views/qa/content/notification/index.php @@ -1,11 +1,4 @@ - - -
+

diff --git a/resources/views/qa/content/page/add.php b/resources/views/qa/content/page/add.php index 9310b030..a528263b 100644 --- a/resources/views/qa/content/page/add.php +++ b/resources/views/qa/content/page/add.php @@ -1,5 +1,5 @@
-
+
/ diff --git a/resources/views/qa/content/page/edit.php b/resources/views/qa/content/page/edit.php index 7c5a8480..154f9d89 100644 --- a/resources/views/qa/content/page/edit.php +++ b/resources/views/qa/content/page/edit.php @@ -1,6 +1,6 @@
-
+
/ diff --git a/resources/views/qa/content/post/add.php b/resources/views/qa/content/post/add.php index 06d3f2da..9e913338 100644 --- a/resources/views/qa/content/post/add.php +++ b/resources/views/qa/content/post/add.php @@ -1,5 +1,5 @@
-
+
/ diff --git a/resources/views/qa/content/user/draft.php b/resources/views/qa/content/user/draft.php index 29a6fe0c..e924f509 100644 --- a/resources/views/qa/content/user/draft.php +++ b/resources/views/qa/content/user/draft.php @@ -1,13 +1,4 @@ -
- -
- -
+

    diff --git a/resources/views/qa/content/user/favorite.php b/resources/views/qa/content/user/favorite.php index 1bc9ac83..c0144cde 100644 --- a/resources/views/qa/content/user/favorite.php +++ b/resources/views/qa/content/user/favorite.php @@ -1,13 +1,4 @@ -
    - -
    - -
    +

      diff --git a/resources/views/qa/content/user/invitation.php b/resources/views/qa/content/user/invitation.php index 05cdfebc..3151e551 100644 --- a/resources/views/qa/content/user/invitation.php +++ b/resources/views/qa/content/user/invitation.php @@ -1,11 +1,4 @@ - - -
      +

      diff --git a/resources/views/qa/content/user/invite.php b/resources/views/qa/content/user/invite.php index 16f495b9..210f3e35 100644 --- a/resources/views/qa/content/user/invite.php +++ b/resources/views/qa/content/user/invite.php @@ -19,4 +19,4 @@
    - Translate::get('someone invited you from the site'), 'uid' => $uid]); ?> \ No newline at end of file + Translate::get('invited you'), 'uid' => $uid]); ?> \ No newline at end of file diff --git a/resources/views/qa/content/user/setting/notifications.php b/resources/views/qa/content/user/setting/notifications.php index bb2ebc2b..0a679b05 100644 --- a/resources/views/qa/content/user/setting/notifications.php +++ b/resources/views/qa/content/user/setting/notifications.php @@ -13,12 +13,12 @@ 'uid' => $uid, 'data' => [ [ - 'title' => Translate::get('when the message came to PM'), + 'title' => Translate::get('message to PM'), 'name' => 'setting_email_pm', 'checked' => $data['setting']['setting_email_pm'] ?? 0, ], [ - 'title' => Translate::get('when you contacted me via @'), + 'title' => Translate::get('contacted via @'), 'name' => 'setting_email_appealed', 'checked' => $data['setting']['setting_email_appealed'] ?? 0, ], diff --git a/resources/views/qa/content/user/subscribed.php b/resources/views/qa/content/user/subscribed.php index 7dd69a70..5e6ddecb 100644 --- a/resources/views/qa/content/user/subscribed.php +++ b/resources/views/qa/content/user/subscribed.php @@ -1,13 +1,4 @@ -
    - -
    - -
    +