diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /release/scripts/modules/bl_i18n_utils | |
parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'release/scripts/modules/bl_i18n_utils')
4 files changed, 6 insertions, 6 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index b395aab7772..dd679f230d2 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -248,7 +248,7 @@ def dump_rna_messages(msgs, reports, settings, verbose=False): # Now here is the *ugly* hack! # Unfortunately, all classes we want to access are not available from bpy.types (OperatorProperties subclasses # are not here, as they have the same name as matching Operator ones :( ). So we use __subclasses__() calls - # to walk through all rna hierachy. + # to walk through all rna hierarchy. # But unregistered classes remain listed by relevant __subclasses__() calls (be it a Py or BPY/RNA bug), # and obviously the matching RNA struct exists no more, so trying to access their data (even the identifier) # quickly leads to segfault! @@ -498,7 +498,7 @@ def dump_py_messages_from_files(msgs, reports, files, settings): def extract_strings_split(node): """ Returns a list args as returned by 'extract_strings()', but split into groups based on separate_nodes, this way - expressions like ("A" if test else "B") wont be merged but "A" + "B" will. + expressions like ("A" if test else "B") won't be merged but "A" + "B" will. """ estr_ls = [] nds_ls = [] diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index 68a5537567c..7d5b33c50ac 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -262,7 +262,7 @@ PYGETTEXT_KEYWORDS = (() + # Check printf mismatches between msgid and msgstr. CHECK_PRINTF_FORMAT = ( - r"(?!<%)(?:%%)*%" # Begining, with handling for crazy things like '%%%%%s' + r"(?!<%)(?:%%)*%" # Beginning, with handling for crazy things like '%%%%%s' r"[-+#0]?" # Flags (note: do not add the ' ' (space) flag here, generates too much false positives!) r"(?:\*|[0-9]+)?" # Width r"(?:\.(?:\*|[0-9]+))?" # Precision diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py index 880721176e0..4be7ccf3356 100644 --- a/release/scripts/modules/bl_i18n_utils/utils.py +++ b/release/scripts/modules/bl_i18n_utils/utils.py @@ -457,7 +457,7 @@ class I18nMessages: def check(self, fix=False): """ Check consistency between messages and their keys! - Check messages using format stuff are consistant between msgid and msgstr! + Check messages using format stuff are consistent between msgid and msgstr! If fix is True, tries to fix the issues. Return a list of found errors (empty if everything went OK!). """ diff --git a/release/scripts/modules/bl_i18n_utils/utils_rtl.py b/release/scripts/modules/bl_i18n_utils/utils_rtl.py index 261d1544ac6..c446182dfc0 100755 --- a/release/scripts/modules/bl_i18n_utils/utils_rtl.py +++ b/release/scripts/modules/bl_i18n_utils/utils_rtl.py @@ -28,7 +28,7 @@ # Windows or OsX. # This uses ctypes, as there is no py3 binding for fribidi currently. # This implies you only need the compiled C library to run it. -# Finally, note that it handles some formating/escape codes (like +# Finally, note that it handles some formatting/escape codes (like # \", %s, %x12, %.4f, etc.), protecting them from ugly (evil) fribidi, # which seems completely unaware of such things (as unicode is...). @@ -79,7 +79,7 @@ MENU_DETECT_REGEX = re.compile("%x\\d+\\|") ##### Kernel processing funcs. ##### def protect_format_seq(msg): """ - Find some specific escaping/formating sequences (like \", %s, etc., + Find some specific escaping/formatting sequences (like \", %s, etc., and protect them from any modification! """ # LRM = "\u200E" |