Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions homeassistant/components/axis/strings.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
"config": {
"title": "Axis device",
"flow_title": "Axis device: {name} ({host})",
"step": {
"user": {
"title": "Set up Axis device",
"data": {
"host": "Host",
"username": "Username",
"password": "Password",
"port": "Port"
}
}
},
"error": {
"already_configured": "Device is already configured",
"already_in_progress": "Config flow for device is already in progress.",
"device_unavailable": "Device is not available",
"faulty_credentials": "Bad user credentials"
},
"abort": {
"already_configured": "Device is already configured",
"bad_config_file": "Bad data from config file",
"link_local_address": "Link local addresses are not supported",
"not_axis_device": "Discovered device not an Axis device"
"config": {
"title": "Axis device",
"flow_title": "Axis device: {name} ({host})",
"step": {
"user": {
"title": "Set up Axis device",
"data": {
"host": "Host",
"username": "Username",
"password": "Password",
"port": "Port"
}
}
},
"error": {
"already_configured": "Device is already configured",
"already_in_progress": "Config flow for device is already in progress.",
"device_unavailable": "Device is not available",
"faulty_credentials": "Bad user credentials"
},
"abort": {
"already_configured": "Device is already configured",
"bad_config_file": "Bad data from configuration file",
"link_local_address": "Link local addresses are not supported",
"not_axis_device": "Discovered device not an Axis device"
}
}
}
}
2 changes: 1 addition & 1 deletion homeassistant/components/bom/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
if station is not None:
if zone_id and wmo_id:
_LOGGER.warning(
"Using config %s, not %s and %s for BOM sensor",
"Using configuration %s, not %s and %s for BOM sensor",
CONF_STATION,
CONF_ZONE_ID,
CONF_WMO_ID,
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/config/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"domain": "config",
"name": "Config",
"name": "Configuration",
"documentation": "https://www.home-assistant.io/integrations/config",
"requirements": [],
"dependencies": ["http"],
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/ecobee/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ async def async_step_import(self, import_data):
if await self.hass.async_add_executor_job(ecobee.refresh_tokens):
# Credentials found and validated; create the entry.
_LOGGER.debug(
"Valid ecobee configuration found for import, creating config entry"
"Valid ecobee configuration found for import, creating configuration entry"
)
return self.async_create_entry(
title=DOMAIN,
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/eddystone_temperature/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def get_from_conf(config, config_key, length):
string = config.get(config_key)
if len(string) != length:
_LOGGER.error(
"Error in config parameter %s: Must be exactly %d "
"Error in configuration parameter %s: Must be exactly %d "
"bytes. Device will not be added",
config_key,
length / 2,
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/emoncms/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def update(self):
self.data = req.json()
else:
_LOGGER.error(
"Please verify if the specified config value "
"Please verify if the specified configuration value "
"'%s' is correct! (HTTP Status_code = %d)",
CONF_URL,
req.status_code,
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/harmony/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ async def sync(self):
def write_config_file(self):
"""Write Harmony configuration file."""
_LOGGER.debug(
"%s: Writing hub config to file: %s", self.name, self._config_path
"%s: Writing hub configuration to file: %s", self.name, self._config_path
)
if self._client.config is None:
_LOGGER.warning("%s: No configuration received from hub", self.name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ async def async_import_legacy_pairing(self, discovery_props, pairing_data):
_LOGGER.info(
(
"Legacy configuration %s for homekit"
"accessory migrated to config entries"
"accessory migrated to configuration entries"
),
hkid,
)
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/homekit_controller/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"already_paired": "This accessory is already paired to another device. Please reset the accessory and try again.",
"ignored_model": "HomeKit support for this model is blocked as a more feature complete native integration is available.",
"already_configured": "Accessory is already configured with this controller.",
"invalid_config_entry": "This device is showing as ready to pair but there is already a conflicting config entry for it in Home Assistant that must first be removed.",
"invalid_config_entry": "This device is showing as ready to pair but there is already a conflicting configuration entry for it in Home Assistant that must first be removed.",
"accessory_not_found_error": "Cannot add pairing as device can no longer be found.",
"already_in_progress": "Config flow for device is already in progress."
}
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/mqtt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ async def async_setup_entry(hass, entry):
conf = CONFIG_SCHEMA({DOMAIN: entry.data})[DOMAIN]
elif any(key in conf for key in entry.data):
_LOGGER.warning(
"Data in your config entry is going to override your "
"Data in your configuration entry is going to override your "
"configuration.yaml: %s",
entry.data,
)
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/octoprint/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
"If you do not want to have your printer on <br />"
" at all times, and you would like to monitor <br /> "
"temperatures, please add <br />"
"bed and/or number&#95of&#95tools to your config <br />"
"bed and/or number&#95of&#95tools to your configuration <br />"
"and restart.",
title=NOTIFICATION_TITLE,
notification_id=NOTIFICATION_ID,
Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/pandora/media_player.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ def turn_on(self):
elif mode == 2:
_LOGGER.warning(
"The pianobar client is not configured to log in. "
"Please create a config file for it as described at "
"https://home-assistant.io/components/media_player.pandora/"
"Please create a configuration file for it as described at "
"https://home-assistant.io/integrations/pandora/"
)
# pass through the email/password prompts to quit cleanly
self._pianobar.sendcontrol("m")
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/plex/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"all_configured": "All linked servers already configured",
"already_configured": "This Plex server is already configured",
"already_in_progress": "Plex is being configured",
"discovery_no_file": "No legacy config file found",
"discovery_no_file": "No legacy configuration file found",
"invalid_import": "Imported configuration is invalid",
"non-interactive": "Non-interactive import",
"token_request_timeout": "Timed out obtaining token",
Expand Down
6 changes: 3 additions & 3 deletions homeassistant/components/smartthings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ async def retrieve_device_status(device):
except ClientResponseError as ex:
if ex.status in (401, 403):
_LOGGER.exception(
"Unable to setup config entry '%s' - please reconfigure the integration",
"Unable to setup configuration entry '%s' - please reconfigure the integration",
entry.title,
)
remove_entry = True
Expand Down Expand Up @@ -183,7 +183,7 @@ async def async_get_entry_scenes(entry: ConfigEntry, api):
except ClientResponseError as ex:
if ex.status == 403:
_LOGGER.exception(
"Unable to load scenes for config entry '%s' because the access token does not have the required access",
"Unable to load scenes for configuration entry '%s' because the access token does not have the required access",
entry.title,
)
else:
Expand Down Expand Up @@ -230,7 +230,7 @@ async def async_remove_entry(hass: HomeAssistantType, entry: ConfigEntry) -> Non
app_count = sum(1 for entry in all_entries if entry.data[CONF_APP_ID] == app_id)
if app_count > 1:
_LOGGER.debug(
"App %s was not removed because it is in use by other config entries",
"App %s was not removed because it is in use by other configuration entries",
app_id,
)
return
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/sonos/media_player.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def __init__(self, hass):
async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
"""Set up the Sonos platform. Obsolete."""
_LOGGER.error(
"Loading Sonos by media_player platform config is no longer supported"
"Loading Sonos by media_player platform configuration is no longer supported"
)


Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/vizio/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"abort": {
"already_setup": "This entry has already been setup.",
"already_setup_with_diff_host_and_name": "This entry appears to have already been setup with a different host and name based on its serial number. Please remove any old entries from your configuration.yaml and from the Integrations menu before reattempting to add this device.",
"updated_entry": "This entry has already been setup but the name and/or options defined in the config do not match the previously imported config so the config entry has been updated accordingly."
"updated_entry": "This entry has already been setup but the name and/or options defined in the configuration do not match the previously imported configuration, so the configuration entry has been updated accordingly."
}
},
"options": {
Expand Down
10 changes: 5 additions & 5 deletions homeassistant/components/zwave/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ def set_config_parameter(service):
if value.type == const.TYPE_BOOL:
value.data = int(selection == "True")
_LOGGER.info(
"Setting config parameter %s on Node %s with bool selection %s",
"Setting configuration parameter %s on Node %s with bool selection %s",
param,
node_id,
str(selection),
Expand All @@ -687,7 +687,7 @@ def set_config_parameter(service):
if value.type == const.TYPE_LIST:
value.data = str(selection)
_LOGGER.info(
"Setting config parameter %s on Node %s with list selection %s",
"Setting configuration parameter %s on Node %s with list selection %s",
param,
node_id,
str(selection),
Expand All @@ -697,7 +697,7 @@ def set_config_parameter(service):
network.manager.pressButton(value.value_id)
network.manager.releaseButton(value.value_id)
_LOGGER.info(
"Setting config parameter %s on Node %s "
"Setting configuration parameter %s on Node %s "
"with button selection %s",
param,
node_id,
Expand All @@ -706,15 +706,15 @@ def set_config_parameter(service):
return
value.data = int(selection)
_LOGGER.info(
"Setting config parameter %s on Node %s with selection %s",
"Setting configuration parameter %s on Node %s with selection %s",
param,
node_id,
selection,
)
return
node.set_config_param(param, selection, size)
_LOGGER.info(
"Setting unknown config parameter %s on Node %s with selection %s",
"Setting unknown configuration parameter %s on Node %s with selection %s",
param,
node_id,
selection,
Expand Down
8 changes: 4 additions & 4 deletions homeassistant/config_entries.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ async def async_setup(
component = integration.get_component()
except ImportError as err:
_LOGGER.error(
"Error importing integration %s to set up %s config entry: %s",
"Error importing integration %s to set up %s configuration entry: %s",
integration.domain,
self.domain,
err,
Expand All @@ -197,7 +197,7 @@ async def async_setup(
integration.get_platform("config_flow")
except ImportError as err:
_LOGGER.error(
"Error importing platform config_flow from integration %s to set up %s config entry: %s",
"Error importing platform config_flow from integration %s to set up %s configuration entry: %s",
integration.domain,
self.domain,
err,
Expand Down Expand Up @@ -503,7 +503,7 @@ async def async_create_flow(
integration.get_platform("config_flow")
except ImportError as err:
_LOGGER.error(
"Error occurred loading config flow for integration %s: %s",
"Error occurred loading configuration flow for integration %s: %s",
handler_key,
err,
)
Expand Down Expand Up @@ -1024,7 +1024,7 @@ async def _handle_reload(self, _now: Any) -> None:
self.changed = set()

_LOGGER.info(
"Reloading config entries because disabled_by changed in entity registry: %s",
"Reloading configuration entries because disabled_by changed in entity registry: %s",
", ".join(self.changed),
)

Expand Down
2 changes: 1 addition & 1 deletion homeassistant/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ def _async_mount_config_dir(hass: "HomeAssistant") -> bool:
Async friendly but not a coroutine.
"""
if hass.config.config_dir is None:
_LOGGER.error("Can't load integrations - config dir is not set")
_LOGGER.error("Can't load integrations - configuration directory is not set")
return False
if hass.config.config_dir not in sys.path:
sys.path.insert(0, hass.config.config_dir)
Expand Down
4 changes: 2 additions & 2 deletions tests/auth/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ async def test_auth_manager_from_config_validates_config(mock_hass):
[
{"name": "Test Name", "type": "insecure_example", "users": []},
{
"name": "Invalid config because no users",
"name": "Invalid configuration because no users",
"type": "insecure_example",
"id": "invalid_config",
},
Expand Down Expand Up @@ -81,7 +81,7 @@ async def test_auth_manager_from_config_auth_modules(mock_hass):
[
{"name": "Module 1", "type": "insecure_example", "data": []},
{
"name": "Invalid config because no data",
"name": "Invalid configuration because no data",
"type": "insecure_example",
"id": "another",
},
Expand Down