[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/gnu/po gnu-linux-faq.sr.po
|
From: |
Therese Godefroy |
|
Subject: |
www/gnu/po gnu-linux-faq.sr.po |
|
Date: |
Tue, 23 Jul 2019 13:02:57 -0400 (EDT) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 19/07/23 13:02:57
Modified files:
gnu/po : gnu-linux-faq.sr.po
Log message:
clean up.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.sr.po?cvsroot=www&r1=1.58&r2=1.59
Patches:
Index: gnu-linux-faq.sr.po
===================================================================
RCS file: /webcvs/www/www/gnu/po/gnu-linux-faq.sr.po,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- gnu-linux-faq.sr.po 31 Mar 2018 01:00:37 -0000 1.58
+++ gnu-linux-faq.sr.po 23 Jul 2019 17:02:57 -0000 1.59
@@ -5,6 +5,7 @@
# Oct. 2014: add anchors, remove wrong msgstr's, trivially update a few
# strings (T. Godefroy).
# March 2017: clean up; restore old msgstr's.
+# July 2019: clean up.
#
msgid ""
msgstr ""
@@ -52,6 +53,8 @@
"нам поÑÑавÑаÑÑ Ð¼Ð½Ð¾Ð³Ð° пиÑаÑа. Ðво наÑÑеÑÑиÑ
пиÑаÑа и наÑиÑ
одговоÑа на ÑиÑ
."
#. type: Content of: <ul><li>
+# | <a href=\"#why\">Why do you call [-it-] {+the system we use+} GNU/Linux
+# | and not Linux?</a>
#, fuzzy
#| msgid "<a href=\"#why\">Why do you call it GNU/Linux and not Linux?</a>"
msgid ""
@@ -64,11 +67,9 @@
msgstr "<a href=\"#whycare\">ÐаÑÑо Ñе назив биÑан?</a>"
#. type: Content of: <ul><li>
-#, fuzzy
-#| msgid "<a href=\"#why\">Why do you call it GNU/Linux and not Linux?</a>"
msgid ""
"<a href=\"#what\">What is the real relationship between GNU and Linux?</a>"
-msgstr "<a href=\"#why\">ÐаÑÑо га зовеÑе ÐÐУ Ñа
ÐинÑкÑом а не ÐинÑкÑ?</a>"
+msgstr ""
#. type: Content of: <ul><li>
msgid ""
@@ -166,16 +167,10 @@
msgstr ""
#. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"#osvskernel\">What is the difference between an operating "
-#| "system and a kernel?</a>"
msgid ""
"<a href=\"#kernelmost\">Isn't writing the kernel most of the work in an "
"operating system?</a>"
msgstr ""
-"<a href=\"#osvskernel\">Ðаква Ñе Ñазлика измеÑÑ
опеÑаÑивног ÑиÑÑема и ÑезгÑа?"
-"</a>"
#. type: Content of: <ul><li>
msgid ""
@@ -192,16 +187,10 @@
"ÑобиÑаÑено назваÑи опеÑаÑивни ÑиÑÑем по
ÑезгÑÑ?</a>"
#. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"#force\">Isn't it wrong to force people to call the system "
-#| "“GNU/Linux”?</a>"
msgid ""
"<a href=\"#feel\">Can another system have “the feel of Linux”?</"
"a>"
msgstr ""
-"<a href=\"#force\">ÐÐ°Ñ Ð½Ð¸Ñе погÑеÑно пÑиÑиÑаваÑи
ÑÑде да називаÑÑ ÑиÑÑем "
-"âÐÐУ-ом Ñа ÐинÑкÑомâ?</a>"
#. type: Content of: <ul><li>
msgid ""
@@ -212,27 +201,16 @@
"пÑедÑгаÑак. Ðако би било да пÑедложиÑе
неки кÑаÑи назив?</a>"
#. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"#whyslash\">Why do you write “GNU/Linux” instead of "
-#| "“GNU Linux”?</a>"
msgid ""
"<a href=\"#long1\">How about calling the system “GliNUx” "
"(instead of “GNU/Linux”)?</a>"
msgstr ""
-"<a href=\"#whyslash\">ÐаÑÑо пиÑеÑе âÐÐУ Ñа
ÐинÑкÑомâ ÑмеÑÑо âÐÐУ ÐинÑкÑâ?</a>"
#. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"#long\">The problem with “GNU/Linux” is that it is "
-#| "too long. How about recommending a shorter name?</a>"
msgid ""
"<a href=\"#long2\">The problem with “GNU/Linux” is that it is "
"too long. Why should I go to the trouble of saying “GNU/”?</a>"
msgstr ""
-"<a href=\"#long\">Ðно ÑÑо ÑмеÑа код назива âÐÐУ Ñа
ÐинÑкÑомâ Ñе Ñо ÑÑо Ñе "
-"пÑедÑгаÑак. Ðако би било да пÑедложиÑе
неки кÑаÑи назив?</a>"
#. type: Content of: <ul><li>
msgid ""
@@ -392,10 +370,6 @@
"да ÑÑажиÑе од ÑÑди да коÑиÑÑе назив ÐÐУ Ñа
ÐинÑкÑом?</a>"
#. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"#allgpled\">Should the GNU/[name] convention be applied to all "
-#| "programs that are GPL'ed?</a>"
msgid ""
"<a href=\"#allgpled\">Should the GNU/<i>name</i> convention be applied to "
"all programs that are GPL'ed?</a>"
@@ -424,6 +398,8 @@
"Ñо знаÑи да имам ÑиÑÑем ÐÐУ Ñа
ÐиндовÑом?</a>"
#. type: Content of: <ul><li>
+# | <a href=\"#justlinux\">Can't [-there be-] Linux [-systems-] {+be used+}
+# | without GNU?</a>
#, fuzzy
#| msgid "<a href=\"#justlinux\">Can't there be Linux systems without GNU?</a>"
msgid "<a href=\"#justlinux\">Can't Linux be used without GNU?</a>"
@@ -436,12 +412,10 @@
msgstr ""
#. type: Content of: <ul><li>
-#, fuzzy
-#| msgid "<a href=\"#justlinux\">Can't there be Linux systems without GNU?</a>"
msgid ""
"<a href=\"#linuxsyswithoutgnu\">Are there complete Linux systems [sic] "
"without GNU?</a>"
-msgstr "<a href=\"#justlinux\">Ðоже ли поÑÑоÑаÑи ÑиÑÑем
ÐинÑÐºÑ Ð±ÐµÐ· ÐÐУ-а?</a>"
+msgstr ""
#. type: Content of: <ul><li>
msgid ""
@@ -605,6 +579,8 @@
"дÑÑгаÑиÑим пÑиÑÑÑпом?</a>"
#. type: Content of: <dl><dt>
+# | Why do you call [-it-] {+the system we use+} GNU/Linux and not Linux?
+# | <span class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>
#, fuzzy
#| msgid ""
#| "Why do you call it GNU/Linux and not Linux? <span class=\"anchor-"
@@ -683,16 +659,10 @@
"\">помаже ÑавноÑÑи да ÑоÑи конкÑеÑнÑ
важноÑÑ ÑиÑ
идеала</a>."
#. type: Content of: <dl><dt>
-#, fuzzy
-#| msgid ""
-#| "Why do you call it GNU/Linux and not Linux? <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#why\">#why</a>)</span>"
msgid ""
"What is the real relationship between GNU and Linux? <span class=\"anchor-"
"reference-id\">(<a href=\"#what\">#what</a>)</span>"
msgstr ""
-"ÐаÑÑо га зовеÑе ÐÐУ Ñа ÐинÑкÑом а не
ÐинÑкÑ? <span class=\"anchor-reference-"
-"id\">(<a href=\"#why\">#why</a>)</span>"
#. type: Content of: <dl><dd>
msgid ""
@@ -955,11 +925,6 @@
"ÑпÑаво вÑедноÑÑи Ñлободе изнеле ÑиÑÑем на
ÑвеÑлоÑÑ Ð´Ð°Ð½Ð°."
#. type: Content of: <dl><dt>
-#, fuzzy
-#| msgid ""
-#| "Since everyone knows GNU's role in developing the system, doesn't the "
-#| "“GNU/” in the name go without saying? <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
msgid ""
"Since everyone knows the role of GNU in developing the system, doesn't the "
"“GNU/” in the name go without saying? <span class=\"anchor-"
@@ -1230,6 +1195,12 @@
"изгÑаÑен, онда ниÑе изгÑаÑен ниÑедан
ÑÑÑÑинÑки део кÑÑе, и имаÑе Ñамо ÑÑпÑ."
#. type: Content of: <dl><dd><p>
+# | By contrast, an operating system consists of [-loosely-coupled-] complex
+# | components that can be developed in any order. When you have developed
+# | most of the components, most of the work is done. This is much more like
+# | the International Space Station than like a house. If most of the Space
+# | Station modules were in orbit [-and connected-] but awaiting one [-vital-]
+# | {+other essential+} module, that would be like the GNU system in 1992.
#, fuzzy
#| msgid ""
#| "By contrast, an operating system consists of loosely-coupled complex "
@@ -1851,6 +1822,11 @@
"\">#distronames</a>)</span>"
#. type: Content of: <dl><dd><p>
+# | It means that the people who make the “Foobar Linux” distro
+# | are repeating the common mistake. {+We appreciate that distributions like
+# | Debian, Dragora, Musix, Trisquel, and Venenux have adopted GNU/Linux as
+# | part of their official name, and we hope that if you are involved with a
+# | different distribution, you will encourage it to do the same.+}
#, fuzzy
#| msgid ""
#| "It means that the people who make the “Foobar Linux” distro "
@@ -1876,6 +1852,13 @@
"(<a href=\"#distronames1\">#distronames1</a>)</span>"
#. type: Content of: <dl><dd><p>
+# | [-If it's allowed for them to change-]{+When they spread misinformation by
+# | changing+} “GNU” to {+“Linux”, and call their
+# | version of it+} “Foobar Linux”, it's [-allowed-] {+proper+}
+# | for you to [-change it back and call the distro “Foobar
+# | GNU/Linux”. It can't be more wrong to-] correct the [-mistake
+# | than-] {+misinformation by calling+} it [-was to make the mistake.-]
+# | {+“Foobar GNU/Linux”.+}
#, fuzzy
#| msgid ""
#| "If it's allowed for them to change “GNU” to “Foobar "
@@ -1905,6 +1888,14 @@
"\">#companies</a>)</span>"
#. type: Content of: <dl><dd>
+# | It isn't a choice of one or the other—we ask companies and
+# | organizations and individuals to help spread the [-word.-] {+word about
+# | this.+} In fact, we have asked all three of those companies. Mandrake
+# | [-uses-] {+said it would use+} the term “GNU/Linux” some of
+# | the time, but IBM and Red Hat were unwilling to help. One executive said,
+# | “This is a pure commercial decision; we expect to make more money
+# | calling it ‘Linux’.” In other words, that company did
+# | not care what was right.
#, fuzzy
#| msgid ""
#| "It isn't a choice of one or the other—we ask companies and "
@@ -1931,6 +1922,11 @@
"заÑадиÑи виÑе новÑаâ. ÐÑÑгим ÑеÑима, ÑоÑ
ÑиÑми ниÑе важна иÑÑина."
#. type: Content of: <dl><dd><p>
+# | We can't make them [-change,-] {+do this right,+} but we're not the sort
+# | to give up just because the road isn't easy. You may not have as much
+# | influence at your disposal as IBM or Red Hat, but you can still help.
+# | Together we can change the situation to the point where companies will
+# | make more profit calling it “GNU/Linux”.
#, fuzzy
#| msgid ""
#| "We can't make them change, but we're not the sort to give up just because "
@@ -2484,6 +2480,9 @@
"ÐинÑкÑом."
#. type: Content of: <dl><dt>
+# | Can't [-there be-] Linux [-systems-] {+be used+} without GNU? {+<span
+# | class=\"anchor-reference-id\">(<a
+# | href=\"#justlinux\">#justlinux</a>)</span>+}
#, fuzzy
#| msgid "Can't there be Linux systems without GNU?"
msgid ""
@@ -2494,6 +2493,30 @@
"\">(<a href=\"#justlinux\">#justlinux</a>)</span>"
#. type: Content of: <dl><dd>
+# | [-It is possible to make a system that uses-]Linux [-as the kernel but-]
+# | is [-not based on GNU. I'm told there are small systems,-] used [-for
+# | embedded development, that include Linux but not the GNU system. IBM was
+# | once rumored to be planning to put Linux as the kernel into AIX; whether-]
+# | {+by itself,+} or [-not they actually tried to do this, it is
+# | theoretically possible. What conclusions can we draw-] {+with small other
+# | programs, in some appliances. These small software systems are a far
+# | cry+} from [-this about the naming of various systems?</p>\n<p>\nPeople
+# | who think of-] the [-kernel as more important than all the rest of the
+# | system say, “They all contain Linux, so let's call-] {+GNU/Linux
+# | system. Users do not install+} them [-all Linux systems.” But any
+# | two of these systems are mostly different,-] {+on PCs, for instance,+} and
+# | [-calling-] {+would find+} them [-by the same name-] {+rather
+# | disappointing. It+} is [-misleading. (It leads people-] {+useful+} to
+# | [-think-] {+say+} that [-the kernel is more important than all the rest of
+# | the system, for instance.)</p>\n<p>\nIn the small embedded systems, Linux
+# | may be most of the system; perhaps “Linux systems” is the
+# | right name for them. They are very different from GNU/Linux systems,
+# | which are more GNU than Linux. The hypothetical IBM system would be
+# | different from either of those. The right name for it would be AIX/Linux:
+# | basically AIX, but with Linux as the kernel. These different names
+# | would-] {+these appliances run just Linux, to+} show [-users-] how [-these
+# | systems-] {+different those small platforms+} are [-different.</p>-]
+# | {+from GNU/Linux.+}
#, fuzzy
#| msgid ""
#| "It is possible to make a system that uses Linux as the kernel but is not "
@@ -2612,20 +2635,12 @@
msgstr ""
#. type: Content of: <dl><dt>
-#, fuzzy
-#| msgid ""
-#| "Why not just say “Linux is the GNU kernel” and release some "
-#| "existing version of GNU/Linux under the name “GNU”? <span "
-#| "class=\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
msgid ""
"Is it correct to say “using Linux” if it refers to using GNU/"
"Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
"\"#usegnulinuxandandroidlinuxsyswithoutgnu"
"\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
msgstr ""
-"ÐаÑÑо не ÑеÑи âÐинÑÐºÑ Ñе ÑезгÑо ÐÐУ-аâ и
обÑавиÑи Ð½ÐµÐºÑ Ð¿Ð¾ÑÑоÑеÑÑ Ð²ÐµÑзиÑÑ ÐÐУ-"
-"а Ñа ÐинÑкÑом под именом âÐÐУâ? <span
class=\"anchor-reference-id\">(<a href="
-"\"#linuxgnu\">#linuxgnu</a>)</span>"
#. type: Content of: <dl><dd>
msgid ""
@@ -3184,13 +3199,18 @@
"class=\"anchor-reference-id\">(<a href=\"#winning\">#winning</a>)</span>"
#. type: Content of: <dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life. Non-free software is an example of that amoral approach
+# | and thrives on it. Thus{+,+} in the long run it [-is-] {+would be+}
+# | self-defeating for us to [-bow to-] {+adopt+} that approach. We will
+# | continue talking in terms of right and wrong.
#, fuzzy
#| msgid ""
#| "To care only about what's convenient or who's winning is an amoral "
#| "approach to life. Non-free software is an example of that amoral "
-#| "approach and thrives on it. So in the long run it is self-defeating for "
-#| "us to bow to that approach. We will continue talking in terms of right "
-#| "and wrong."
+#| "approach and thrives on it. Thus in the long run it is self-defeating "
+#| "for us to bow to that approach. We will continue talking in terms of "
+#| "right and wrong."
msgid ""
"To care only about what's convenient or who's winning is an amoral approach "
"to life. Non-free software is an example of that amoral approach and "
@@ -3262,9 +3282,11 @@
"html\"> ÐÐÐÐÐРпÑeводим ÐÐУ-ов веб</a>.)"
#. type: Content of: <div><p>
+# | Copyright © 2001, 2006, 2007, [-2008-] {+2008, 2010, 2011, 2013,
+# | 2014, 2015, 2016, 2017, 2018+} Free Software Foundation, Inc.
#, fuzzy
#| msgid ""
-#| "Copyright © 2001, 2006, 2007, 2008 Free Software Foundation, Inc.,"
+#| "Copyright © 2001, 2006, 2007, 2008 Free Software Foundation, Inc."
msgid ""
"Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016, "
"2017, 2018 Free Software Foundation, Inc."
@@ -3298,7 +3320,6 @@
msgid "Updated:"
msgstr "ÐжÑÑиÑано:"
-# type: Content of: <dl><dd><p>
#~ msgid ""
#~ "If it's allowed for them to change “GNU” to “Foobar "
#~ "Linux”, it's allowed for you to change it back and call the distro "
@@ -3310,47 +3331,30 @@
#~ "иÑпÑавно да Ñе гÑеÑка иÑпÑави него да Ñе
ÑÑини."
#~ msgid ""
-#~ "This page is licensed under a <a rel=\"license\" href=\"http://";
-#~ "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
-#~ "NoDerivs 3.0 United States License</a>."
-#~ msgstr ""
-#~ "Ðва ÑÑÑана Ñе лиÑенÑиÑана под ÑÑловима
лиÑенÑе <a rel=\"license\" href="
-#~ "\"http://creativecommons.org/licenses/by-nd/3.0/us/deed.sr\";>Creative "
-#~ "Commons ÐÑÑоÑÑÑво-Ðез пÑеÑада 3.0 СÐÐ</a>."
-
-# type: Content of: <dl><dd><p>
-#~ msgid ""
#~ "It means that the people who make the “Foobar Linux” distro "
#~ "are repeating the common mistake."
#~ msgstr ""
#~ "То Ñамо знаÑи да ÑÑди коÑи пÑаве
диÑÑÑибÑÑиÑÑ âÐеÑÑонеÑÑо ÐинÑкÑâ "
#~ "понавÑаÑÑ ÑеÑÑÑ Ð³ÑеÑкÑ."
-# type: Content of: <dl><dt>
#~ msgid "Why do you call it GNU/Linux and not Linux?"
#~ msgstr "ÐаÑÑо га зовеÑе ÐÐУ Ñа ÐинÑкÑом а не
ÐинÑкÑ?"
-# type: Content of: <dl><dt>
#~ msgid "Why is the name important?"
#~ msgstr "ÐаÑÑо Ñе назив биÑан?"
-# type: Content of: <dl><dt>
#~ msgid "Should we say “GNU/BSD” too?"
#~ msgstr "ТÑеба ли коÑиÑÑиÑи и назив âÐÐУ Ñа
ÐСÐ-омâ?"
-# type: Content of: <dl><dt>
#~ msgid "Can't there be Linux systems without GNU?"
#~ msgstr "Ðоже ли поÑÑоÑаÑи ÑиÑÑем ÐинÑÐºÑ Ð±ÐµÐ·
ÐÐУ-а?"
-# type: Content of: <dl><dt>
#~ msgid "Isn't it wrong for us to label Linus Torvalds' work as GNU?"
#~ msgstr "ÐÐ°Ñ Ð½Ð¸Ñе погÑеÑно ознаÑаваÑи дело
ÐинÑÑа ТоÑвалдÑа ÐÐУ-ом?"
-# type: Content of: <dl><dt>
#~ msgid "Does Linus Torvalds agree that Linux is just the kernel?"
#~ msgstr "Ðа ли Ñе ÐинÑÑ Ð¢Ð¾ÑÐ²Ð°Ð»Ð´Ñ Ñлаже Ñа Ñим
да Ñе ÐинÑÐºÑ Ñамо ÑезгÑо?"
-# type: Content of: <dl><dd>
#~ msgid ""
#~ "It is possible to make a system that uses Linux as the kernel but is not "
#~ "based on GNU. I'm told there are small systems, used for embedded "
@@ -3367,7 +3371,6 @@
#~ "ÑÑваÑноÑÑи. Ðакве закÑÑÑке о именоваÑÑ
ÑазниÑ
ÑиÑÑема можемо извÑÑи из "
#~ "овога?"
-# type: Content of: <dl><dd><p>
#~ msgid ""
#~ "People who think of the kernel as more important than all the rest of the "
#~ "system say, “They all contain Linux, so let's call them all Linux "
@@ -3382,7 +3385,6 @@
#~ "(Ðа пÑимеÑ, Ñо наводи ÑÑде да ÑмаÑÑаÑÑ
ÑезгÑо важниÑим од Ñелог оÑÑаÑка "
#~ "ÑиÑÑема.)"
-# type: Content of: <dl><dd><p>
#~ msgid ""
#~ "In the small embedded systems, Linux may be most of the system; perhaps "
#~ "“Linux systems” is the right name for them. They are very "
- www/gnu/po gnu-linux-faq.sr.po,
Therese Godefroy <=