Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translate various settings information #12919

Merged
merged 1 commit into from
Oct 11, 2018

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Translate settings information

Before

Settings info untranslated (e.g in api explorer)

After

Settings info translated. Some wording tweaks.

Technical Details

Comments

@civibot
Copy link

civibot bot commented Oct 10, 2018

(Standard links)

@civibot civibot bot added the master label Oct 10, 2018
'is_domain' => 1,
'is_contact' => 0,
'description' => 'Maximum Size of file (documents, images, etc.) which can attached to emails or activities.<br />Note: php.ini should support this file size.',
'description' => ts('Maximum Size of file (documents, images, etc.) which can attached to emails or activities.<br />Note: php.ini should support this file size.'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be attached

'is_domain' => 1,
'is_contact' => 0,
'description' => 'Maximum number of files (documents, images, etc.) which can attached to emails or activities.',
'description' => ts('Maximum number of files (documents, images, etc.) which can attached to emails or activities.'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be attached

@mattwire
Copy link
Contributor

Merge on pass

@seamuslee001
Copy link
Contributor

Jenkins re test this please

@eileenmcnaughton eileenmcnaughton merged commit 76cb98c into civicrm:master Oct 11, 2018
@eileenmcnaughton eileenmcnaughton deleted the setting branch October 11, 2018 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants