summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2013-10-09 19:09:49 +0000
committerJazzyNico <nicoduf@yahoo.fr>2013-10-09 19:09:49 +0000
commit30422af227381c9aa900690586d25adec4fa262f (patch)
tree7340251d612de5cc98ec63995e33b516a38b1130 /src
parentWin32. Fix for Bug #627943 (Unexpected RegistryTool message on Windows 7). (diff)
downloadinkscape-30422af227381c9aa900690586d25adec4fa262f.tar.gz
inkscape-30422af227381c9aa900690586d25adec4fa262f.zip
Documentation/Translation. Fix for Bug #1236382 (Typos in comments and message, localization context needed) by Yuri Chornoivan.
Fixed bugs: - https://launchpad.net/bugs/1236382 (bzr r12673)
Diffstat (limited to 'src')
-rw-r--r--src/2geom/convex-cover.h2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/connector-context.cpp2
-rw-r--r--src/display/drawing-item.cpp2
-rw-r--r--src/extension/extension.h4
-rw-r--r--src/extension/internal/emf-inout.cpp6
-rw-r--r--src/extension/internal/text_reassemble.c2
-rw-r--r--src/extension/internal/wmf-inout.cpp6
-rw-r--r--src/libcroco/cr-parser.c2
-rw-r--r--src/libcroco/cr-rgb.c2
-rw-r--r--src/libcroco/cr-sel-eng.c2
-rw-r--r--src/libcroco/cr-statement.c2
-rw-r--r--src/libcroco/cr-style.c4
-rw-r--r--src/libcroco/cr-term.c2
-rw-r--r--src/marker.cpp2
-rw-r--r--src/object-snapper.cpp2
-rw-r--r--src/selection-chemistry.cpp3
-rw-r--r--src/sp-object.h2
-rw-r--r--src/tools-switch.cpp2
-rw-r--r--src/ui/dialog/filedialogimpl-win32.h4
-rw-r--r--src/widgets/sp-widget.cpp2
21 files changed, 29 insertions, 28 deletions
diff --git a/src/2geom/convex-cover.h b/src/2geom/convex-cover.h
index a0443e9dc..a5f95a5fb 100644
--- a/src/2geom/convex-cover.h
+++ b/src/2geom/convex-cover.h
@@ -163,7 +163,7 @@ unsigned find_bottom_right(ConvexHull const &a);
/*** Arbitrary transform operator.
* Take a convex hull and apply an arbitrary convexity preserving transform.
- * we should be concerned about singular tranforms here.
+ * we should be concerned about singular transforms here.
*/
template <class T> ConvexHull operator*(ConvexHull const &p, T const &m) {
ConvexHull pr;
diff --git a/src/Makefile.am b/src/Makefile.am
index a45a33932..411e3cf86 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -266,7 +266,7 @@ TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests
XFAIL_TESTS = $(check_PROGRAMS)
-# including the the testsuites here ensures that they get distributed
+# including the testsuites here ensures that they get distributed
cxxtests_SOURCES = cxxtests.cpp $(CXXTEST_TESTSUITES) $(ink_common_sources) $(win32_sources)
cxxtests_LDADD = $(all_libs)
diff --git a/src/connector-context.cpp b/src/connector-context.cpp
index 3d6a4f28e..99239533d 100644
--- a/src/connector-context.cpp
+++ b/src/connector-context.cpp
@@ -50,7 +50,7 @@
* changed so that it no longer defines special attributes to record
* the points. Instead it uses single node paths to define points
* who are then seperate objects that can be fixed on the canvas,
- * grouped into objects and take full advantage of all tranform, snap
+ * grouped into objects and take full advantage of all transform, snap
* and align functionality of all other objects.
*
* I think that the style change between polyline and orthogonal
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index 69adcb441..a8257e6e5 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -459,7 +459,7 @@ struct MaskLuminanceToAlpha {
/**
* Rasterize items.
* This method submits the drawing opeartions required to draw this item
- * to the supplied DrawingContext, restricting drawing the the specified area.
+ * to the supplied DrawingContext, restricting drawing the specified area.
*
* This method does some common tasks and calls the item-specific rendering
* function, _renderItem(), to render e.g. paths or bitmaps.
diff --git a/src/extension/extension.h b/src/extension/extension.h
index 079276936..1fb8bdfec 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -144,12 +144,12 @@ private:
extension */
public:
- /** \brief A function to get the the number of parameters that
+ /** \brief A function to get the number of parameters that
the extension has.
\return The number of parameters. */
unsigned int param_count ( ) { return parameters == NULL ? 0 :
g_slist_length(parameters); };
- /** \brief A function to get the the number of parameters that
+ /** \brief A function to get the number of parameters that
are visible to the user that the extension has.
\return The number of visible parameters.
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 4bca9dfd9..90ab763e0 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -321,7 +321,7 @@ Emf::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena
}
-/* given the transformation matrix from worldTranform return the scale in the matrix part. Assumes that the
+/* given the transformation matrix from worldTransform return the scale in the matrix part. Assumes that the
matrix is not used to skew, invert, or make another distorting transformation. */
double Emf::current_scale(PEMF_CALLBACK_DATA d){
double scale =
@@ -332,7 +332,7 @@ double Emf::current_scale(PEMF_CALLBACK_DATA d){
return(scale);
}
-/* given the transformation matrix from worldTranform and the current x,y position in inkscape coordinates,
+/* given the transformation matrix from worldTransform and the current x,y position in inkscape coordinates,
generate an SVG transform that gives the same amount of rotation, no scaling, and maps x,y back onto x,y. This is used for
rotating objects when the location of at least one point in that object is known. Returns:
"matrix(a,b,c,d,e,f)" (WITH the double quotes)
@@ -359,7 +359,7 @@ std::string Emf::current_matrix(PEMF_CALLBACK_DATA d, double x, double y, int us
return(cxform.str());
}
-/* given the transformation matrix from worldTranform return the rotation angle in radians.
+/* given the transformation matrix from worldTransform return the rotation angle in radians.
counter clocwise from the x axis. */
double Emf::current_rotation(PEMF_CALLBACK_DATA d){
return -std::atan2(d->dc[d->level].worldTransform.eM12, d->dc[d->level].worldTransform.eM11);
diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c
index 9ed6c9c3a..cd84910fc 100644
--- a/src/extension/internal/text_reassemble.c
+++ b/src/extension/internal/text_reassemble.c
@@ -1015,7 +1015,7 @@ int cxinfo_make_insertable(CX_INFO *cxi){
\brief Insert a complex into the CX_INFO structure. (Insert may be either TR_TEXT or TR_LINE.)
\returns 0 on success, !0 on error.
\param cxi pointer to the CX_INFO structure (complexes).
- \param src index of the the complex to insert.
+ \param src index of the complex to insert.
\param src_rt_tidx index of the bounding rectangle
\param type TR_TEXT (index is for tpi->chunks[]) or TR_LINE (index is for cxi->kids[])
*/
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 78fcdb66d..aab98dc87 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -320,12 +320,12 @@ Wmf::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena
}
-/* WMF has no worldTranform, so this always returns 1.0. Retain it to keep WMF and WMF in sync as much as possible.*/
+/* WMF has no worldTransform, so this always returns 1.0. Retain it to keep WMF and WMF in sync as much as possible.*/
double Wmf::current_scale(PWMF_CALLBACK_DATA d){
return 1.0;
}
-/* WMF has no worldTranform, so this always returns an Identity rotation matrix, but the offsets may have values.*/
+/* WMF has no worldTransform, so this always returns an Identity rotation matrix, but the offsets may have values.*/
std::string Wmf::current_matrix(PWMF_CALLBACK_DATA d, double x, double y, int useoffset){
std::stringstream cxform;
double scale = current_scale(d);
@@ -340,7 +340,7 @@ std::string Wmf::current_matrix(PWMF_CALLBACK_DATA d, double x, double y, int us
return(cxform.str());
}
-/* WMF has no worldTranform, so this always returns 0. Retain it to keep WMF and WMF in sync as much as possible.*/
+/* WMF has no worldTransform, so this always returns 0. Retain it to keep WMF and WMF in sync as much as possible.*/
double Wmf::current_rotation(PWMF_CALLBACK_DATA d){
return 0.0;
}
diff --git a/src/libcroco/cr-parser.c b/src/libcroco/cr-parser.c
index 917c5cb60..410f8f80f 100644
--- a/src/libcroco/cr-parser.c
+++ b/src/libcroco/cr-parser.c
@@ -3235,7 +3235,7 @@ cr_parser_parse_statement_core (CRParser * a_this)
*ruleset ::= selector [ ',' S* selector ]*
*'{' S* declaration? [ ';' S* declaration? ]* '}' S*;
*
- *This methods calls the the SAC handler on the relevant SAC handler
+ *This methods calls the SAC handler on the relevant SAC handler
*callbacks whenever it encounters some specific constructions.
*See the documentation of #CRDocHandler (the SAC handler) to know
*when which SAC handler is called.
diff --git a/src/libcroco/cr-rgb.c b/src/libcroco/cr-rgb.c
index 893c2080b..e0c28701a 100644
--- a/src/libcroco/cr-rgb.c
+++ b/src/libcroco/cr-rgb.c
@@ -365,7 +365,7 @@ cr_rgb_is_set_to_inherit (CRRgb *a_this)
}
/**
- *Tests if the the rgb is set to the
+ *Tests if the rgb is set to the
*value "transparent" or not.
*@param a_this the current instance of
*#CRRgb
diff --git a/src/libcroco/cr-sel-eng.c b/src/libcroco/cr-sel-eng.c
index f010efea0..266191e82 100644
--- a/src/libcroco/cr-sel-eng.c
+++ b/src/libcroco/cr-sel-eng.c
@@ -839,7 +839,7 @@ cr_sel_eng_get_matched_rulesets_real (CRSelEng * a_this,
sel_list = NULL;
/*
- *get the the damn selector list in
+ *get the damn selector list in
*which we have to look
*/
switch (cur_stmt->type) {
diff --git a/src/libcroco/cr-statement.c b/src/libcroco/cr-statement.c
index 2b2c1836c..147cc8347 100644
--- a/src/libcroco/cr-statement.c
+++ b/src/libcroco/cr-statement.c
@@ -1907,7 +1907,7 @@ cr_statement_ruleset_set_sel_list (CRStatement * a_this,
*Gets a pointer to the list of declaration contained
*in the ruleset statement.
*@param a_this the current instance of #CRStatement.
- *@a_decl_list out parameter. A pointer to the the returned
+ *@a_decl_list out parameter. A pointer to the returned
*list of declaration. Must not be NULL.
*@return CR_OK upon successfull completion, an error code if something
*bad happened.
diff --git a/src/libcroco/cr-style.c b/src/libcroco/cr-style.c
index e0abba83a..a9c5a5cec 100644
--- a/src/libcroco/cr-style.c
+++ b/src/libcroco/cr-style.c
@@ -36,7 +36,7 @@
*Each supported css property has an ID which is
*an entry into a property "population" jump table.
*each entry of the property population jump table
- *contains code to tranform the literal form of
+ *contains code to transform the literal form of
*a property value into a strongly typed value.
*/
enum CRPropertyID {
@@ -148,7 +148,7 @@ static CRPropertyDesc gv_prop_table[] = {
/**
*A the key/value pair of this hash table
*are:
- *key => name of the the css propertie found in gv_prop_table
+ *key => name of the css property found in gv_prop_table
*value => matching property id found in gv_prop_table.
*So this hash table is here just to retrieval of a property id
*from a property name.
diff --git a/src/libcroco/cr-term.c b/src/libcroco/cr-term.c
index 635577334..ccdff2522 100644
--- a/src/libcroco/cr-term.c
+++ b/src/libcroco/cr-term.c
@@ -766,7 +766,7 @@ cr_term_unref (CRTerm * a_this)
}
/**
- *The destructor of the the #CRTerm class.
+ *The destructor of the #CRTerm class.
*@param a_this the "this pointer" of the current instance
*of #CRTerm.
*/
diff --git a/src/marker.cpp b/src/marker.cpp
index 45188b4a4..50e7c970f 100644
--- a/src/marker.cpp
+++ b/src/marker.cpp
@@ -319,7 +319,7 @@ void SPMarker::update(SPCtx *ctx, guint flags) {
// Copy parent context
rctx.flags = ctx->flags;
- // Initialize tranformations
+ // Initialize transformations
rctx.i2doc = Geom::identity();
rctx.i2vp = Geom::identity();
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 3f3f0c1bf..de50f0dd8 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -538,7 +538,7 @@ void Inkscape::ObjectSnapper::_snapPaths(IntermSnapResults &isr,
* - Linking the individual nodes of the SPPath we have here, to the nodes of the NodePath::SubPath class as being
* used in sp_nodepath_selected_nodes_move. This class has a member variable called "selected". For this the nodes
* should be in the exact same order for both classes, so we can index them
- * - Replacing the SPPath being used here by the the NodePath::SubPath class; but how?
+ * - Replacing the SPPath being used here by the NodePath::SubPath class; but how?
*/
}
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 3a91f7b4d..5463c3f94 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -1032,7 +1032,8 @@ void sp_selection_lower(Inkscape::Selection *selection, SPDesktop *desktop)
}
DocumentUndo::done(selection->layers()->getDocument(), SP_VERB_SELECTION_LOWER,
- _("Lower"));
+ //TRANSLATORS: "Lower" means "to lower an object" in the undo history
+ C_("Undo action", "Lower"));
}
void sp_selection_lower_to_bottom(Inkscape::Selection *selection, SPDesktop *desktop)
diff --git a/src/sp-object.h b/src/sp-object.h
index bcaa1dac7..3faadb404 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -514,7 +514,7 @@ public:
/**
* Updates the object's repr based on the object's state.
*
- * This method updates the the repr attached to the object to reflect the object's current
+ * This method updates the repr attached to the object to reflect the object's current
* state; see the three-argument version for details.
*
* @param flags object write flags that apply to this update
diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index 1c07f07cc..5f54ad15a 100644
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
@@ -88,7 +88,7 @@ static char const *const tool_names[] = {
};
static char const *const tool_msg[] = {
NULL,
- N_("<b>Click</b> to Select and Tranform objects, <b>Drag</b> to select many objects."),
+ N_("<b>Click</b> to Select and Transform objects, <b>Drag</b> to select many objects."),
N_("Modify selected path points (nodes) directly."),
N_("To tweak a path by pushing, select it and drag over it."),
N_("<b>Drag</b>, <b>click</b> or <b>click and scroll</b> to spray the selected objects."),
diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h
index 2e6bb4bb8..29bcb9a45 100644
--- a/src/ui/dialog/filedialogimpl-win32.h
+++ b/src/ui/dialog/filedialogimpl-win32.h
@@ -140,7 +140,7 @@ public:
/// Shows the file dialog, and blocks until a file
/// has been selected.
- /// @return Returns true if the the user selected a
+ /// @return Returns true if the user selected a
/// file, or false if the user pressed cancel.
bool show();
@@ -341,7 +341,7 @@ public:
/// Shows the file dialog, and blocks until a file
/// has been selected.
- /// @return Returns true if the the user selected a
+ /// @return Returns true if the user selected a
/// file, or false if the user pressed cancel.
bool show();
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 7876f0454..0e2295e36 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -183,7 +183,7 @@ void SPWidgetImpl::dispose(GObject *object)
if (spw->inkscape) {
// Disconnect signals
- // the checks are necessary because when destroy is caused by the the program shutting down,
+ // the checks are necessary because when destroy is caused by the program shutting down,
// the inkscape object may already be (partly?) invalid --bb
if (G_IS_OBJECT(spw->inkscape) && G_OBJECT_GET_CLASS(spw->inkscape)) {
sp_signal_disconnect_by_data(spw->inkscape, spw);