Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-09-04 11:44:05 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-04 11:45:17 +0300
commit31403049401b5eb7a555f4fcd7b8c10c829a7662 (patch)
treea6f95973008e6f9615622cc27b6bef89e181a107
parent3cb936295f5b2a06c839ffe2433d1256dbe1003d (diff)
Cleanup: overly polite/rude messages
-rw-r--r--release/scripts/startup/bl_operators/image.py2
-rw-r--r--release/scripts/startup/bl_ui/properties_texture.py2
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py2
-rw-r--r--source/blender/draw/intern/draw_common.c2
-rw-r--r--tests/gtests/alembic/abc_export_test.cc2
-rw-r--r--tests/gtests/alembic/abc_matrix_test.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py
index caf5937cc95..8fbc8182ad8 100644
--- a/release/scripts/startup/bl_operators/image.py
+++ b/release/scripts/startup/bl_operators/image.py
@@ -82,7 +82,7 @@ class EditExternally(Operator):
import traceback
traceback.print_exc()
self.report({'ERROR'},
- "Image editor could not be launched, please ensure that "
+ "Image editor could not be launched, ensure that "
"the path in User Preferences > File is valid, and Blender has rights to launch it")
return {'CANCELLED'}
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index e112ad2ec4c..f1407672e0d 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -907,7 +907,7 @@ class TEXTURE_PT_colors_ramp(TextureButtonsPanel, TextureColorsPoll, Panel):
layout.template_color_ramp(tex, "color_ramp", expand=True)
else:
layout.alignment = 'RIGHT'
- layout.label(text="Please enable the Color Ramp first")
+ layout.label(text="Enable the Color Ramp first")
class TEXTURE_PT_custom_props(TextureButtonsPanel, PropertyPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index a4d61f94fce..ee2bd2645fc 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1376,7 +1376,7 @@ class USERPREF_PT_addons(Panel):
row = box.row()
row.label(text="Multiple add-ons with the same name found!")
row.label(icon='ERROR')
- box.label(text="Please delete one of each pair:")
+ box.label(text="Delete one of each pair to resolve:")
for (addon_name, addon_file, addon_path) in addon_utils.error_duplicates:
box.separator()
sub_col = box.column(align=True)
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 691cd27051a..f675740b414 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -842,7 +842,7 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color
return theme_id;
}
-/* XXX This is utter shit, better find something more general */
+/* XXX This is very stupid, better find something more general. */
float *DRW_color_background_blend_get(int theme_id)
{
static float colors[11][4];
diff --git a/tests/gtests/alembic/abc_export_test.cc b/tests/gtests/alembic/abc_export_test.cc
index c950084ef64..18716e53e31 100644
--- a/tests/gtests/alembic/abc_export_test.cc
+++ b/tests/gtests/alembic/abc_export_test.cc
@@ -1,6 +1,6 @@
#include "testing/testing.h"
-// Keep first since utildefines defines AT which conflicts with fucking STL
+// Keep first since utildefines defines AT which conflicts with STL
#include "intern/abc_util.h"
#include "intern/abc_exporter.h"
diff --git a/tests/gtests/alembic/abc_matrix_test.cc b/tests/gtests/alembic/abc_matrix_test.cc
index 08bce1ed50f..49fb662c934 100644
--- a/tests/gtests/alembic/abc_matrix_test.cc
+++ b/tests/gtests/alembic/abc_matrix_test.cc
@@ -1,6 +1,6 @@
#include "testing/testing.h"
-// Keep first since utildefines defines AT which conflicts with fucking STL
+// Keep first since utildefines defines AT which conflicts with STL
#include "intern/abc_util.h"
extern "C" {