[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: stable-1.8 updated (1.7.2-20111231-83-gfce53e0)
The branch, stable-1.8 has been updated
via fce53e03ceeb12966ce53ae9116ddd9333791a50 (commit)
via 61447f19df1a6549dcc68fa66cd8bc1aa1e3ac1d (commit)
via 82e62f3dcb2a55f69a892b9922edeb4fde80244a (commit)
via 18658e26cb65aa99b7dba4954a973000e057929f (commit)
via 7943b8a2c696265b334dbfa4dce1101e95754024 (commit)
from 59eafeb48043ec092e7b33017698a4ed10b0f5f6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/po/ru.po | 61 ++++++++++++++++++++++----------------------
gschem/src/o_cue.c | 22 +++-------------
libgeda/po/ru.po | 70 +++++++++++++++++++++++---------------------------
libgeda/src/s_cue.c | 59 ++++++++++++++++++++++++++----------------
4 files changed, 102 insertions(+), 110 deletions(-)
=================
Commit Messages
=================
commit fce53e03ceeb12966ce53ae9116ddd9333791a50
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: rewrite s_cue_output_single
(cherry picked from commit b3dfc6c7124810598042a78fe2800f36699769c3)
:100644 100644 5eb7eae... fb0580c... M libgeda/src/s_cue.c
commit 61447f19df1a6549dcc68fa66cd8bc1aa1e3ac1d
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: fix printing of junction cues
Closes bug "disappearing dots in gschem" reported by
Gabriel Paubert <paubert@xxxxxxx>. Issue was introduced in
commit 65c68f9.
Additionally, now junction cues are also printed when 3 or
more pins are connected (same behavior as for net segments).
(cherry picked from commit f8a9c86e2e2fa7fa451cd504e62ebee6a3e73d2d)
:100644 100644 f604e11... 5eb7eae... M libgeda/src/s_cue.c
commit 82e62f3dcb2a55f69a892b9922edeb4fde80244a
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: cleanup o_cue_draw_lowlevel
(cherry picked from commit bbcb153180b2c45fe74012059b428b06ad61eaae)
:100644 100644 92ee7f7... 7f6b56d... M gschem/src/o_cue.c
commit 18658e26cb65aa99b7dba4954a973000e057929f
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: fix drawing of junction cues
Closes bug "disappearing dots in gschem" reported by
Gabriel Paubert <paubert@xxxxxxx>. Issue was introduced in
commit 6cae96e.
Additionally, now junction cues are also drawn when 3 or more pins are
connected (same behavior as for net segments).
(cherry picked from commit 0df45c9f859537bf9683b7fa8fb3d4b35828672e)
:100644 100644 7690bae... 92ee7f7... M gschem/src/o_cue.c
commit 7943b8a2c696265b334dbfa4dce1101e95754024
Author: Vladimir Zhbanov <vzhbanov@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Updated Russian translation
:100644 100644 956b67f... 0556067... M gschem/po/ru.po
:100644 100644 5914ddf... e8f2b30... M libgeda/po/ru.po
=========
Changes
=========
commit fce53e03ceeb12966ce53ae9116ddd9333791a50
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: rewrite s_cue_output_single
(cherry picked from commit b3dfc6c7124810598042a78fe2800f36699769c3)
diff --git a/libgeda/src/s_cue.c b/libgeda/src/s_cue.c
index 5eb7eae..fb0580c 100644
--- a/libgeda/src/s_cue.c
+++ b/libgeda/src/s_cue.c
@@ -232,28 +232,48 @@ void s_cue_output_lowlevel_midpoints(TOPLEVEL * toplevel, OBJECT * object,
}
}
-/*! \todo Finish function documentation!!!
- * \brief
+/*! \brief Output cues for a single object
+ *
* \par Function Description
+ * Cues are drawn on pins, nets and buses.
+ * Two types of cues are drawn:
+ * - endpoint cues (identifying unconnected ends of objects)
+ * - junction cues (identifying net/pin/bus junctions)
*
+ * \param [in] toplevel The TOPLEVEL object
+ * \param [in] object The OBJECT to output cues for
+ * \param [in] fp The file handle to output to
+ * \param [in] type The type of output being produced
*/
void s_cue_output_single(TOPLEVEL * toplevel, OBJECT * object, FILE * fp,
int type)
{
- if (!object) {
- return;
- }
-
- if (object->type != OBJ_NET && object->type != OBJ_PIN &&
- object->type != OBJ_BUS) {
- return;
+ g_return_if_fail (object != NULL);
+
+ switch (object->type) {
+ case (OBJ_NET):
+ /*
+ * s_cue_output_lowlevel handles both endpoints and junctions.
+ * The intention of the check is to skip drawing endpoint cues on nets
+ * that are not "fully connected".
+ * Junctions will be drawn correctly, as:
+ * - net-net junctions are handled by s_cue_output_lowlevel_midpoints
+ * - net-pin and pin-pin junctions are handled by case OBJ_PIN below
+ */
+ if (!o_net_is_fully_connected (toplevel, object)) {
+ s_cue_output_lowlevel(toplevel, object, 0, fp, type);
+ s_cue_output_lowlevel(toplevel, object, 1, fp, type);
}
-
- if (object->type != OBJ_NET
- || ((object->type == OBJ_NET)
- && !o_net_is_fully_connected (toplevel, object))) {
- s_cue_output_lowlevel(toplevel, object, 0, fp, type);
- s_cue_output_lowlevel(toplevel, object, 1, fp, type);
+ break;
+ case (OBJ_BUS):
+ s_cue_output_lowlevel(toplevel, object, 0, fp, type);
+ s_cue_output_lowlevel(toplevel, object, 1, fp, type);
+ break;
+ case (OBJ_PIN):
+ s_cue_output_lowlevel(toplevel, object, object->whichend, fp, type);
+ break;
+ default:
+ return;
}
s_cue_output_lowlevel_midpoints(toplevel, object, fp, type);
}
commit 61447f19df1a6549dcc68fa66cd8bc1aa1e3ac1d
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: fix printing of junction cues
Closes bug "disappearing dots in gschem" reported by
Gabriel Paubert <paubert@xxxxxxx>. Issue was introduced in
commit 65c68f9.
Additionally, now junction cues are also printed when 3 or
more pins are connected (same behavior as for net segments).
(cherry picked from commit f8a9c86e2e2fa7fa451cd504e62ebee6a3e73d2d)
diff --git a/libgeda/src/s_cue.c b/libgeda/src/s_cue.c
index f604e11..5eb7eae 100644
--- a/libgeda/src/s_cue.c
+++ b/libgeda/src/s_cue.c
@@ -170,7 +170,7 @@ void s_cue_output_lowlevel(TOPLEVEL * toplevel, OBJECT * object, int whichone,
switch (type) {
case (CONN_ENDPOINT):
- if (object->type == OBJ_NET) { /* only nets have these cues */
+ if (object->type == OBJ_NET || object->type == OBJ_PIN) {
if (count < 1) { /* Didn't find anything connected there */
if (output_type == POSTSCRIPT) {
s_cue_postscript_fillbox(toplevel, fp, x, y);
@@ -182,13 +182,6 @@ void s_cue_output_lowlevel(TOPLEVEL * toplevel, OBJECT * object, int whichone,
s_cue_postscript_junction (toplevel, fp, x, y, bus_involved);
}
}
- else if (object->type == OBJ_PIN
- && count == 0
- && whichone == object->whichend) {
- if (output_type == POSTSCRIPT) {
- s_cue_postscript_fillbox(toplevel, fp, x, y);
- }
- }
break;
case (CONN_MIDPOINT):
commit 82e62f3dcb2a55f69a892b9922edeb4fde80244a
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: cleanup o_cue_draw_lowlevel
(cherry picked from commit bbcb153180b2c45fe74012059b428b06ad61eaae)
diff --git a/gschem/src/o_cue.c b/gschem/src/o_cue.c
index 92ee7f7..7f6b56d 100644
--- a/gschem/src/o_cue.c
+++ b/gschem/src/o_cue.c
@@ -131,10 +131,9 @@ void o_cue_draw_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int whichon
int type, count = 0;
int done = FALSE;
int size;
- int otherone;
- int bus_involved=FALSE;
+ int bus_involved = FALSE;
- if (whichone < 0 || whichone > 1) return;
+ g_return_if_fail (whichone == 0 || whichone == 1);
x = object->line->x[whichone];
y = object->line->y[whichone];
@@ -146,7 +145,7 @@ void o_cue_draw_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int whichon
bus_involved = TRUE;
cl_current = object->conn_list;
- while(cl_current != NULL && !done) {
+ while (cl_current != NULL && !done) {
conn = (CONN *) cl_current->data;
if (conn->x == x && conn->y == y) {
commit 18658e26cb65aa99b7dba4954a973000e057929f
Author: Krzysztof KoÅ?ciuszkiewicz <k.kosciuszkiewicz@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: fix drawing of junction cues
Closes bug "disappearing dots in gschem" reported by
Gabriel Paubert <paubert@xxxxxxx>. Issue was introduced in
commit 6cae96e.
Additionally, now junction cues are also drawn when 3 or more pins are
connected (same behavior as for net segments).
(cherry picked from commit 0df45c9f859537bf9683b7fa8fb3d4b35828672e)
diff --git a/gschem/src/o_cue.c b/gschem/src/o_cue.c
index 7690bae..92ee7f7 100644
--- a/gschem/src/o_cue.c
+++ b/gschem/src/o_cue.c
@@ -181,28 +181,15 @@ void o_cue_draw_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int whichon
switch(type) {
case(CONN_ENDPOINT):
- if (object->type == OBJ_NET) { /* only nets have these cues */
+ if (object->type == OBJ_NET || object->type == OBJ_PIN) {
if (count < 1) { /* Didn't find anything connected there */
size = CUE_BOX_SIZE;
gschem_cairo_center_box (w_current, -1, -1, x, y, size, size);
o_cue_set_color (w_current, NET_ENDPOINT_COLOR);
cairo_fill (w_current->cr);
-
} else if (count >= 2) {
draw_junction_cue (w_current, x, y, bus_involved);
}
- } else if (object->type == OBJ_PIN) {
- /* Didn't find anything connected there */
- if (count < 1 && object->whichend == whichone) {
- size = (bus_involved) ? PIN_CUE_SIZE_BUS : PIN_CUE_SIZE_NET;
-
- otherone = !whichone;
-
- o_cue_set_color (w_current, NET_ENDPOINT_COLOR);
- gschem_cairo_center_box (w_current, -1, -1, x, y, size, size);
- o_cue_set_color (w_current, NET_ENDPOINT_COLOR);
- cairo_fill (w_current->cr);
- }
}
break;
commit 7943b8a2c696265b334dbfa4dce1101e95754024
Author: Vladimir Zhbanov <vzhbanov@xxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Updated Russian translation
diff --git a/gschem/po/ru.po b/gschem/po/ru.po
index 956b67f..0556067 100644
--- a/gschem/po/ru.po
+++ b/gschem/po/ru.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: geda gschem\n"
"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
"POT-Creation-Date: 2012-01-19 18:45+0000\n"
-"PO-Revision-Date: 2011-12-28 23:56+0400\n"
+"PO-Revision-Date: 2012-01-22 21:42+0400\n"
"Last-Translator: Vladimir Zhbanov<vzhbanov@xxxxxxxxx>\n"
"Language-Team: gEDA developers <geda-dev@xxxxxxxx>\n"
"Language: ru\n"
@@ -219,11 +219,11 @@ msgstr "Ð?еизвеÑ?Ñ?нÑ?й Ñ?ип линии (%d) !\n"
#: gschem/src/gschem_pango.c:289
msgid "cairo context"
-msgstr ""
+msgstr "cairo-конÑ?екÑ?Ñ?"
#: gschem/src/gschem_pango.c:290
msgid "the cairo context for the renderer"
-msgstr ""
+msgstr "cairo-конÑ?екÑ?Ñ? длÑ? Ñ?ендеÑ?еÑ?а"
#: gschem/src/i_basic.c:77 gschem/src/x_window.c:524
#: gschem/lib/system-gschemrc.scm:1399
@@ -1162,10 +1162,14 @@ msgid ""
"\n"
"An error occurred while inserting clipboard data: %s."
msgstr ""
+"<b>Ð?едопÑ?Ñ?Ñ?имÑ?е даннÑ?е Ñ?Ñ?емÑ? в Ñ?иÑ?Ñ?емном бÑ?Ñ?еÑ?е обмена.</b>\n"
+"\n"
+"Ð?Ñ?ибка пÑ?и вÑ?Ñ?авке даннÑ?Ñ? из бÑ?Ñ?еÑ?а: %s."
+# Ð?аголовок окна оÑ?ибки
#: gschem/src/x_clipboard.c:251
msgid "Clipboard insertion failed"
-msgstr ""
+msgstr "Ð?Ñ?ибка вÑ?Ñ?авки даннÑ?Ñ? из бÑ?Ñ?еÑ?а обмена"
# Ð?деÑ?Ñ? Ñ? напиÑ?ал "Ð?е Ñ?далоÑ?Ñ? вÑ?делиÑ?Ñ? Ñ?веÑ?" вмеÑ?Ñ?о "назнаÑ?иÑ?Ñ?", Ñ?ак
# как Ñ?еÑ?Ñ? идÑ?Ñ? о Ñ?езеÑ?виÑ?овании полÑ? в colormap.
@@ -2078,7 +2082,7 @@ msgstr "ТекÑ?Ñ?аÑ? Ñ?Ñ?ема Ñ?аÑ?пеÑ?аÑ?ана Ñ? иÑ?полÑ?зова
#: gschem/src/x_rc.c:40
msgid "ERROR: An unknown error occurred while parsing configuration files.\n"
-msgstr ""
+msgstr "Ð?ШÐ?Ð?Ð?Ð?: неизвеÑ?Ñ?наÑ? оÑ?ибка пÑ?и анализе Ñ?айлов наÑ?Ñ?Ñ?оек.\n"
#: gschem/src/x_rc.c:45
msgid ""
@@ -2086,11 +2090,14 @@ msgid ""
"\n"
"The gschem log may contain more information."
msgstr ""
+"Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка пÑ?и анализе Ñ?айлов наÑ?Ñ?Ñ?оек.\n"
+"\n"
+"Ð? жÑ?Ñ?нале gschem можеÑ? бÑ?Ñ?Ñ? болÑ?Ñ?е инÑ?оÑ?маÑ?ии."
#: gschem/src/x_rc.c:57
#, c-format
msgid "ERROR: %s\n"
-msgstr ""
+msgstr "Ð?ШÐ?Ð?Ð?Ð?: %s\n"
#: gschem/src/x_rc.c:60
#, c-format
@@ -2099,10 +2106,13 @@ msgid ""
"\n"
"The gschem log may contain more information."
msgstr ""
+"%s\n"
+"\n"
+"Ð? жÑ?Ñ?нале gschem можеÑ? бÑ?Ñ?Ñ? болÑ?Ñ?е инÑ?оÑ?маÑ?ии."
#: gschem/src/x_rc.c:68
msgid "Cannot load gschem configuration."
-msgstr ""
+msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? Ñ?айлÑ? наÑ?Ñ?Ñ?оек gschem"
#: gschem/src/x_script.c:47 gschem/lib/system-gschemrc.scm:1381
msgid "Execute Script..."
@@ -2237,6 +2247,10 @@ msgid ""
"\n"
"Loading from '%s' failed: %s. The gschem log may contain more information."
msgstr ""
+"<b>Ð?Ñ?и загÑ?Ñ?зке Ñ?казанного Ñ?айла пÑ?оизоÑ?ла оÑ?ибка.</b>\n"
+"\n"
+"Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? Ñ?айл '%s': %s. Ð? жÑ?Ñ?нале gschem можеÑ? бÑ?Ñ?Ñ? болÑ?Ñ?е "
+"инÑ?оÑ?маÑ?ии."
#: gschem/src/x_window.c:750
msgid "Failed to load file"
@@ -2354,7 +2368,7 @@ msgstr "_Ð?Ñ?Ñ?езаÑ?Ñ?"
#: gschem/lib/system-gschemrc.scm:1395
msgid "_Copy"
-msgstr "_Ð?опиÑ?оваÑ?Ñ?"
+msgstr "С_копиÑ?оваÑ?Ñ?"
#: gschem/lib/system-gschemrc.scm:1396
msgid "_Paste"
@@ -2429,23 +2443,23 @@ msgstr "Ð?оказаÑ?Ñ?/Ñ?кÑ?Ñ?Ñ?Ñ? невидимÑ?й Ñ?екÑ?Ñ?"
#: gschem/lib/system-gschemrc.scm:1428
msgid "Copy into 1"
-msgstr "Ð?опиÑ?оваÑ?Ñ? в 1"
+msgstr "СкопиÑ?оваÑ?Ñ? в 1"
#: gschem/lib/system-gschemrc.scm:1429
msgid "Copy into 2"
-msgstr "Ð?опиÑ?оваÑ?Ñ? в 2"
+msgstr "СкопиÑ?оваÑ?Ñ? в 2"
#: gschem/lib/system-gschemrc.scm:1430
msgid "Copy into 3"
-msgstr "Ð?опиÑ?оваÑ?Ñ? в 3"
+msgstr "СкопиÑ?оваÑ?Ñ? в 3"
#: gschem/lib/system-gschemrc.scm:1431
msgid "Copy into 4"
-msgstr "Ð?опиÑ?оваÑ?Ñ? в 4"
+msgstr "СкопиÑ?оваÑ?Ñ? в 4"
#: gschem/lib/system-gschemrc.scm:1432
msgid "Copy into 5"
-msgstr "Ð?опиÑ?оваÑ?Ñ? в 5"
+msgstr "СкопиÑ?оваÑ?Ñ? в 5"
#: gschem/lib/system-gschemrc.scm:1433
msgid "Cut into 1"
@@ -2700,11 +2714,11 @@ msgstr "Ð?кно _кооÑ?динаÑ?..."
#: gschem/lib/system-gschemrc.scm:1542
msgid "gEDA Docu_mentation..."
-msgstr "Ð?окÑ?менÑ?аÑ?иÑ? _gEDA"
+msgstr "Ð?окÑ?менÑ?аÑ?иÑ? _gEDA..."
#: gschem/lib/system-gschemrc.scm:1543
msgid "gschem _FAQ..."
-msgstr "gschem _FAQ"
+msgstr "gschem _FAQ..."
#: gschem/lib/system-gschemrc.scm:1544
msgid "gEDA _Wiki..."
@@ -2712,7 +2726,7 @@ msgstr "gEDA _Wiki..."
#: gschem/lib/system-gschemrc.scm:1545
msgid "Component D_ocumentation..."
-msgstr "Ð?окÑ?менÑ?аÑ?иÑ? на _компоненÑ?"
+msgstr "Ð?окÑ?менÑ?аÑ?иÑ? на _компоненÑ?..."
#: gschem/lib/system-gschemrc.scm:1547
msgid "_Hotkeys..."
@@ -2780,18 +2794,3 @@ msgstr "Ð?едопÑ?Ñ?Ñ?имаÑ? комбинаÑ?иÑ? клавиÑ? ~S."
#, scheme-format
msgid "~S is not a prefix key sequence."
msgstr "~S не Ñ?влÑ?еÑ?Ñ?Ñ? пÑ?еÑ?икÑ?ом клавиÑ?ной поÑ?ледоваÑ?елÑ?ноÑ?Ñ?и."
-
-#~ msgid ""
-#~ "\n"
-#~ "The config option postscript-font-scale is deprecated and will be removed "
-#~ "in gEDA 1.8.0.\n"
-#~ "Printed text is fixed to match on-screen sizes. Please remove this option "
-#~ "from your config files.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ð?аÑ?амеÑ?Ñ? наÑ?Ñ?Ñ?ойки postscript-font-scale Ñ?Ñ?Ñ?аÑ?ел и бÑ?деÑ? Ñ?далÑ?н в gEDA "
-#~ "1.8.0.\n"
-#~ "РазмеÑ? Ñ?екÑ?Ñ?а, вÑ?водимого на пеÑ?аÑ?Ñ?, Ñ?епеÑ?Ñ? вÑ?егда Ñ?ооÑ?веÑ?Ñ?Ñ?вÑ?еÑ? Ñ?азмеÑ?Ñ? "
-#~ "Ñ?екÑ?Ñ?а на Ñ?кÑ?ане. УдалиÑ?е Ñ?Ñ?оÑ? паÑ?амеÑ?Ñ? из Ñ?воего Ñ?айла наÑ?Ñ?Ñ?оек.\n"
-#~ "\n"
diff --git a/libgeda/po/ru.po b/libgeda/po/ru.po
index 5914ddf..e8f2b30 100644
--- a/libgeda/po/ru.po
+++ b/libgeda/po/ru.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: geda\n"
"Report-Msgid-Bugs-To: geda-bug@xxxxxxxx\n"
"POT-Creation-Date: 2012-01-19 18:45+0000\n"
-"PO-Revision-Date: 2011-12-31 09:24+0400\n"
+"PO-Revision-Date: 2012-01-24 14:53+0400\n"
"Last-Translator: Vladimir Zhbanov <vzhbanov@xxxxxxxxx>\n"
"Language-Team: gEDA developers <geda-dev@xxxxxxxx>\n"
"Language: ru\n"
@@ -67,13 +67,13 @@ msgid "File %s is read-only"
msgstr "Файл %s Ñ?олÑ?ко длÑ? Ñ?Ñ?ениÑ?"
#: libgeda/src/a_basic.c:427
-#, fuzzy, c-format
+#, c-format
msgid ""
"Read unexpected attach symbol start marker in [%s] :\n"
">>\n"
"%s<<\n"
msgstr ""
-"Ð?еÑ?меÑ?Ñ?нÑ?й маÑ?кеÑ? наÑ?ала внедÑ?Ñ?нного Ñ?имвола в [%s]:\n"
+"Ð?еÑ?меÑ?Ñ?нÑ?й маÑ?кеÑ? наÑ?ала Ñ?пиÑ?ка пÑ?икÑ?еплÑ?ннÑ?Ñ? аÑ?Ñ?ибÑ?Ñ?ов в [%s]:\n"
">>\n"
"%s<<\n"
@@ -259,21 +259,21 @@ msgstr ""
#: libgeda/src/g_rc.c:233
msgid "Config file already loaded"
-msgstr "Файл конÑ?игÑ?Ñ?аÑ?ии Ñ?же загÑ?Ñ?жен"
+msgstr "Файл наÑ?Ñ?Ñ?оек Ñ?же загÑ?Ñ?жен"
#: libgeda/src/g_rc.c:268
#, c-format
msgid "Parsed config from [%s]\n"
-msgstr "Ð?нализ Ñ?айла конÑ?игÑ?Ñ?аÑ?ии [%s]\n"
+msgstr "Ð?нализ Ñ?айла наÑ?Ñ?Ñ?оек [%s]\n"
#: libgeda/src/g_rc.c:281
#, c-format
msgid "Unable to parse config from [%s]: %s"
-msgstr "Ð?Ñ?ибка пÑ?и анализе Ñ?айла конÑ?игÑ?Ñ?аÑ?ии [%s]: %s"
+msgstr "Ð?Ñ?ибка пÑ?и анализе Ñ?айла наÑ?Ñ?Ñ?оек [%s]: %s"
#: libgeda/src/g_rc.c:298
msgid "ERROR: An unknown error occurred while parsing configuration files."
-msgstr "Ð?ШÐ?Ð?Ð?Ð?: неизвеÑ?Ñ?наÑ? оÑ?ибка пÑ?и анализе Ñ?айлов конÑ?игÑ?Ñ?аÑ?ии"
+msgstr "Ð?ШÐ?Ð?Ð?Ð?: неизвеÑ?Ñ?наÑ? оÑ?ибка пÑ?и анализе Ñ?айлов наÑ?Ñ?Ñ?оек"
#: libgeda/src/g_rc.c:310 libgeda/src/g_rc.c:311
#, c-format
@@ -295,12 +295,12 @@ msgstr ""
#: libgeda/src/o_arc_basic.c:256 libgeda/src/o_arc_basic.c:269
msgid "Failed to parse arc object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении дÑ?ги"
#: libgeda/src/o_arc_basic.c:276
#, c-format
msgid "Found a zero radius arc [ %c %d, %d, %d, %d, %d, %d ]\n"
-msgstr "Ð?Ñ?левой Ñ?адиÑ?Ñ? в опÑ?еделении дÑ?ги [%c %d, %d, %d, %d, %d, %d]\n"
+msgstr "Ð?Ñ?га Ñ? нÑ?левÑ?м Ñ?адиÑ?Ñ?ом [%c %d, %d, %d, %d, %d, %d]\n"
#: libgeda/src/o_arc_basic.c:282 libgeda/src/o_box_basic.c:327
#: libgeda/src/o_bus_basic.c:182 libgeda/src/o_circle_basic.c:289
@@ -329,13 +329,12 @@ msgid "Attempt to attach attribute [%s] to more than one object\n"
msgstr "Ð?опÑ?Ñ?ка пÑ?икÑ?епиÑ?Ñ? аÑ?Ñ?ибÑ?Ñ? [%s] к более Ñ?ем одномÑ? обÑ?екÑ?Ñ?\n"
#: libgeda/src/o_attrib.c:341
-#, fuzzy
msgid "Tried to attach a non-text item as an attribute"
-msgstr "Ð?опÑ?Ñ?ка пÑ?икÑ?епиÑ?Ñ? не Ñ?екÑ?Ñ?овÑ?й Ñ?леменÑ? как аÑ?Ñ?ибÑ?Ñ?!\n"
+msgstr "Ð?опÑ?Ñ?ка пÑ?икÑ?епиÑ?Ñ? не Ñ?екÑ?Ñ?овÑ?й Ñ?леменÑ? как аÑ?Ñ?ибÑ?Ñ?!"
#: libgeda/src/o_attrib.c:348
msgid "Unexpected end-of-file in attribute list"
-msgstr ""
+msgstr "Ð?еожиданнÑ?й конеÑ? Ñ?айла пÑ?и обÑ?абоÑ?ке Ñ?пиÑ?ка аÑ?Ñ?ибÑ?Ñ?ов"
# Ð? Ñ?Ñ?нкÑ?ии o_set_line_options() задаÑ?Ñ?Ñ?Ñ? Ñ?войÑ?Ñ?ва линий Ñ?азнÑ?Ñ? обÑ?екÑ?ов
#: libgeda/src/o_basic.c:196 libgeda/src/o_basic.c:208
@@ -348,7 +347,7 @@ msgstr "Ð?едопÑ?Ñ?Ñ?имое знаÑ?ение длинÑ? Ñ?Ñ?Ñ?иÑ?а, Ñ?Ñ?
#: libgeda/src/o_box_basic.c:287 libgeda/src/o_box_basic.c:316
msgid "Failed to parse box object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении пÑ?Ñ?моÑ?голÑ?ника"
#: libgeda/src/o_box_basic.c:322
#, c-format
@@ -357,7 +356,7 @@ msgstr "Ð?Ñ?Ñ?моÑ?голÑ?ник нÑ?левой Ñ?иÑ?инÑ? или вÑ?Ñ?оÑ?
#: libgeda/src/o_bus_basic.c:160 libgeda/src/o_bus_basic.c:167
msgid "Failed to parse bus object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении Ñ?инÑ?"
#: libgeda/src/o_bus_basic.c:173
#, c-format
@@ -381,17 +380,16 @@ msgstr "Ð?кÑ?Ñ?жноÑ?Ñ?и Ñ? нÑ?левÑ?м Ñ?адиÑ?Ñ?ом недопÑ?Ñ?Ñ?
#: libgeda/src/o_circle_basic.c:246 libgeda/src/o_circle_basic.c:275
msgid "Failed to parse circle object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении окÑ?Ñ?жноÑ?Ñ?и"
#: libgeda/src/o_circle_basic.c:282
-#, fuzzy, c-format
+#, c-format
msgid "Found a zero or negative radius circle [ %c %d %d %d %d ]\n"
-msgstr "Ð?кÑ?Ñ?жноÑ?Ñ?Ñ? Ñ? нÑ?левÑ?м Ñ?адиÑ?Ñ?ом [%c %d %d %d %d]\n"
+msgstr "Ð?кÑ?Ñ?жноÑ?Ñ?Ñ? Ñ? нÑ?левÑ?м или оÑ?Ñ?иÑ?аÑ?елÑ?нÑ?м Ñ?адиÑ?Ñ?ом [%c %d %d %d %d]\n"
#: libgeda/src/o_circle_basic.c:284
-#, fuzzy
msgid "Setting radius to 0\n"
-msgstr "УÑ?Ñ?ановка Ñ?гла повоÑ?оÑ?а в 0\n"
+msgstr "УÑ?Ñ?ановка Ñ?адиÑ?Ñ?а в 0\n"
#: libgeda/src/o_complex_basic.c:422
#, c-format
@@ -404,7 +402,7 @@ msgstr ""
#: libgeda/src/o_complex_basic.c:654
msgid "Failed to parse complex object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении Ñ?оÑ?Ñ?авного обÑ?екÑ?а"
#: libgeda/src/o_complex_basic.c:667
#, c-format
@@ -427,9 +425,8 @@ msgstr ""
"%d %s]\n"
#: libgeda/src/o_complex_basic.c:681
-#, fuzzy
msgid "Setting mirror to 0\n"
-msgstr "УÑ?Ñ?ановка 'mirrored' в 0\n"
+msgstr "УÑ?Ñ?ановка 'mirror' в 0\n"
#: libgeda/src/o_complex_basic.c:994
#, c-format
@@ -524,7 +521,7 @@ msgstr "Ð?омпоненÑ? [%s] Ñ?Ñ?пеÑ?но иÑ?клÑ?Ñ?Ñ?н\n"
#: libgeda/src/o_line_basic.c:229 libgeda/src/o_line_basic.c:247
msgid "Failed to parse line object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении линии"
#: libgeda/src/o_line_basic.c:259
#, c-format
@@ -533,7 +530,7 @@ msgstr "Ð?иниÑ? нÑ?левой длинÑ? [%c %d %d %d %d %d]\n"
#: libgeda/src/o_net_basic.c:156
msgid "Failed to parse net object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении Ñ?оединениÑ?"
#: libgeda/src/o_net_basic.c:161
#, c-format
@@ -542,15 +539,15 @@ msgstr "Соединение нÑ?левой длинÑ? [%c %d %d %d %d %d]\n"
#: libgeda/src/o_path_basic.c:181
msgid "Failed to parse path object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении конÑ?Ñ?Ñ?а"
#: libgeda/src/o_path_basic.c:207
msgid "Unexpected end-of-file when reading path"
-msgstr ""
+msgstr "Ð?еожиданнÑ?й конеÑ? Ñ?айла пÑ?и обÑ?абоÑ?ке конÑ?Ñ?Ñ?а"
#: libgeda/src/o_picture.c:72
msgid "Failed to parse picture definition"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении изобÑ?ажениÑ?"
#: libgeda/src/o_picture.c:77
#, c-format
@@ -653,7 +650,7 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? копиÑ? изобÑ?ажениÑ?
#: libgeda/src/o_pin_basic.c:160 libgeda/src/o_pin_basic.c:168
msgid "Failed to parse pin object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении вÑ?вода"
# Ð? оÑ?игиналÑ?ном Ñ?екÑ?Ñ?е непÑ?авилÑ?но иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? "whichone" вмеÑ?Ñ?о "whichend"
#: libgeda/src/o_pin_basic.c:174
@@ -673,7 +670,7 @@ msgstr ""
#: libgeda/src/o_text_basic.c:356 libgeda/src/o_text_basic.c:366
#: libgeda/src/o_text_basic.c:376
msgid "Failed to parse text object"
-msgstr ""
+msgstr "Ð?Ñ?ибка в опÑ?еделении Ñ?екÑ?Ñ?ового обÑ?екÑ?а"
#: libgeda/src/o_text_basic.c:383
#, c-format
@@ -701,7 +698,7 @@ msgstr "УÑ?Ñ?ановка вÑ?Ñ?авниваниÑ? по левомÑ? нижне
#: libgeda/src/o_text_basic.c:440
#, c-format
msgid "Unexpected end-of-file after %d lines"
-msgstr ""
+msgstr "Ð?еожиданнÑ?й конеÑ? Ñ?айла поÑ?ле %d Ñ?Ñ?Ñ?ок"
#: libgeda/src/s_clib.c:465
#, c-format
@@ -858,19 +855,19 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и [%s] в библиоÑ?екаÑ? иÑ?Ñ?оÑ?
#: libgeda/src/s_slot.c:162
msgid "Did not find slotdef=#:#,#,#... attribute\n"
-msgstr ""
+msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и аÑ?Ñ?ибÑ?Ñ? slotdef=#:#,#,#...\n"
#: libgeda/src/s_slot.c:168
msgid "Improper slotdef syntax: missing \":\".\n"
-msgstr ""
+msgstr "Ð?евеÑ?нÑ?й Ñ?инÑ?акÑ?иÑ? аÑ?Ñ?ибÑ?Ñ?а slotdef: оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? \":\".\n"
#: libgeda/src/s_slot.c:183
msgid "Did not find proper slotdef=#:#,#,#... attribute\n"
-msgstr ""
+msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и аÑ?Ñ?ибÑ?Ñ? slotdef=#:#,#,#... в допÑ?Ñ?Ñ?имом Ñ?оÑ?маÑ?е\n"
#: libgeda/src/s_slot.c:213
msgid "component missing pinseq= attribute\n"
-msgstr ""
+msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? аÑ?Ñ?ибÑ?Ñ? pinseq= длÑ? вÑ?вода компоненÑ?а\n"
#: libgeda/src/scheme_attrib.c:67
msgid "~A is not a valid attribute: invalid string '~A'."
@@ -1032,12 +1029,9 @@ msgstr ""
#: libgeda/src/scheme_page.c:442
msgid "Parse error: ~s"
-msgstr ""
+msgstr "Ð?Ñ?ибка обÑ?абоÑ?ки: ~s"
#: libgeda/scheme/geda/attrib.scm:59
#, scheme-format
msgid "Object ~A is not part of a page"
msgstr "Ð?бÑ?екÑ? ~A не Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?аÑ?Ñ?Ñ?Ñ? Ñ?Ñ?емÑ?"
-
-#~ msgid "Error reading picture definition line: %s.\n"
-#~ msgstr "Ð?Ñ?ибка пÑ?и Ñ?Ñ?ении Ñ?Ñ?Ñ?оки опÑ?еделениÑ? изобÑ?ажениÑ?: %s.\n"
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs