www/gnu/po gnu-history.ar.po gnu-users-never-he...

www-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/gnu/po gnu-history.ar.po gnu-users-never-he...

From:	Hossam Hossny
Subject:	www/gnu/po gnu-history.ar.po gnu-users-never-he...
Date:	Thu, 03 Sep 2009 06:00:54 +0000
CVSROOT:        /web/www
Module name:    www
Changes by:     Hossam Hossny <mbf>     09/09/03 06:00:54

Modified files:
        gnu/po         : gnu-history.ar.po 
                         gnu-users-never-heard-of-gnu.ar.po 
                         linux-and-gnu.ar.po 

Log message:
        Fixes

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ar.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ar.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ar.po?cvsroot=www&r1=1.13&r2=1.14

Patches:
Index: gnu-history.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-history.ar.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnu-history.ar.po   2 Sep 2009 21:20:31 -0000       1.14
+++ gnu-history.ar.po   3 Sep 2009 06:00:42 -0000       1.15
@@ -7,13 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-history\n"
-<<<<<<< gnu-history.ar.po
 "POT-Creation-Date: 2008-03-20 16:25-0400\n"
 "PO-Revision-Date: 2009-09-02 22:06+0200\n"
-=======
-"POT-Creation-Date: 2009-06-29 16:25-0300\n"
-"PO-Revision-Date: 2009-06-29 23:37+0300\n"
->>>>>>> 1.13
 "Last-Translator: Hossam Hossny <address@hidden>\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
@@ -82,27 +77,9 @@
 msgstr "Ø§ÙØ£ÙØ¸ÙØ© Ø´Ø¨ÙÙØ© ÙÙÙÙØ³ Ø£ÙØ«Ø± ÙÙ ÙØ¬Ø±Ø¯ ÙÙØ§Ø©Ø 
ÙÙÙ ØªØªØ¶ÙÙ ÙØªØ±Ø¬ÙØ§ØªØ ÙÙØØ±Ø±Ø§ØªØ ÙÙÙØ³ÙØ§Øª ÙØµÙØµØ 
ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø¨Ø±ÙØ¯Ø ÙØ§ÙÙØ«ÙØ± ÙÙ Ø§ÙØ£Ø´ÙØ§Ø¡ Ø§ÙØ£Ø®Ø±Ù. 
ÙÙÙØ°Ø§Ø ÙØªØ§Ø¨Ø© ÙØ¸Ø§Ù ØªØ´ØºÙÙ ÙØ§ÙÙ ÙÙÙØ© ÙØ¨ÙØ±Ø© 
Ø¬Ø¯Ø§. Ø¨Ø¯Ø£ÙØ§ ÙÙ ÙÙØ§ÙØ± 1984. ÙØ§Ø³ØªØºØ±Ù Ø°ÙÙ Ø³ÙÙØ§ØªÙ 
Ø¹Ø¯Ø©. <a href=\"http://fsf.org/\";>ÙØ¤Ø³Ø³Ø© Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª 
Ø§ÙØØ±Ø©</a> ØªØ£Ø³Ø³Øª ÙÙ Ø£ÙØªÙØ¨Ø± 1985Ø ÙÙ Ø§ÙØ¨Ø¯Ø§ÙØ© ÙØ¬ÙØ¹ 
Ø§ÙØ£ÙÙØ§Ù ÙÙØ³Ø§Ø¹Ø¯Ø© ØªØ·ÙÙØ± Ø¬ÙÙ."
 
 # type: Content of: <p>
-<<<<<<< gnu-history.ar.po
 #: ../../gnu/po/gnu-history.proto:81
 msgid "By 1990 we had either found or written all the major components except 
one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by Linus 
Torvalds in 1991 and made free software in 1992.  Combining Linux with the 
almost-complete GNU system resulted in a complete operating system: the 
GNU/Linux system.  Estimates are that tens of millions of people now use 
GNU/Linux systems, typically via <a 
href=\"/links/links.html#FreeGNULinuxDistributions\">distributions</a> such as 
Slackware, Debian, Red Hat, and others."
 msgstr "Ø¨ØÙÙÙ Ø¹Ø§Ù 1990 Ø£ØµØ¨Ø ÙØ¯ÙÙØ§ ÙÙ Ø§ÙØ£Ø´ÙØ§Ø¡ 
Ø§ÙØ£Ø³Ø§Ø³ÙØ© Ø¨Ø§Ø³ØªØ«ÙØ§Ø¡ Ø´ÙØ¡ ÙØ§ØØ¯&mdash;Ø§ÙÙÙØ§Ø©. ÙÙÙ 
Ø«ÙÙÙ ÙÙÙÙØ³Ø Ø§ÙÙÙØ§Ø© Ø´Ø¨ÙÙØ© ÙÙÙÙØ³Ø ØªÙ ØªØ·ÙÙØ±ÙØ§ 
Ø¨ÙØ§Ø³Ø·Ø© ÙÙÙÙØ³ ØªÙØ±ÙØ§ÙØ¯Ø³ Ø¹Ø§Ù 1991 ÙØ£ØµØ¨ØØª Ø¨Ø±ÙÙØ¬Ø§ 
ØØ±Ø§ ÙÙ Ø¹Ø§Ù 1992. Ø§ÙØ¬ÙØ¹ Ø¨ÙÙ ÙÙÙÙØ³ ÙÙØ¸Ø§Ù Ø¬ÙÙ Ø§ÙÙ
ÙØªÙÙ ØªÙØ±ÙØ¨Ø§ Ø£ÙÙØ± Ø¹Ù ÙØ¸Ø§Ù ØªØ´ØºÙÙ ÙØ§ÙÙ: ÙØ¸Ø§Ù 
Ø¬ÙÙ/ÙÙÙÙØ³.Ø§ÙØªÙØ¯ÙØ±Ø§Øª ØªØ´ÙØ± Ø¥ÙÙ Ø£Ù Ø¹Ø´Ø±Ø§Øª Ø§ÙÙ
ÙØ§ÙÙÙ ÙÙ Ø§ÙÙØ§Ø³ ÙØ³ØªØ®Ø¯ÙÙÙ Ø£ÙØ¸ÙØ© Ø¬ÙÙ/ÙÙÙÙØ³Ø 
Ø¹Ø§Ø¯Ø© ÙÙ Ø®ÙØ§Ù <a 
href=\"/links/links.html#FreeGNULinuxDistributions\">ØªÙØ²ÙØ¹Ø§Øª</a> ÙØ«Ù 
Ø³ÙØ§ÙÙÙØ±Ø ÙØ¯ÙØ¨ÙØ§ÙØ ÙØ±Ø¯ ÙØ§ØªØ ÙØºÙØ±ÙØ§."
-=======
-msgid ""
-"By 1990 we had either found or written all the major components except "
-"one&mdash;the kernel.  Then Linux, a Unix-like kernel, was developed by "
-"Linus Torvalds in 1991 and made free software in 1992.  Combining Linux with "
-"the almost-complete GNU system resulted in a complete operating system: the "
-"GNU/Linux system.  Estimates are that tens of millions of people now use GNU/"
-"Linux systems, typically via <a href=\"/distros\">distributions</a> such as "
-"Slackware, Debian, Red Hat, and others."
-msgstr ""
-"Ø¨ØÙÙÙ Ø¹Ø§Ù 1990 Ø£ØµØ¨Ø ÙØ¯ÙÙØ§ ÙÙ Ø§ÙØ£Ø´ÙØ§Ø¡ 
Ø§ÙØ£Ø³Ø§Ø³ÙØ© Ø¨Ø§Ø³ØªØ«ÙØ§Ø¡ Ø´ÙØ¡ ÙØ§ØØ¯&mdash;"
-"Ø§ÙÙÙØ§Ø©. ÙÙÙ Ø«ÙÙÙ ÙÙÙÙØ³Ø Ø§ÙÙÙØ§Ø© Ø´Ø¨ÙÙØ© 
ÙÙÙÙØ³Ø ØªÙ ØªØ·ÙÙØ±ÙØ§ Ø¨ÙØ§Ø³Ø·Ø© ÙÙÙÙØ³ ØªÙØ±ÙØ§ÙØ¯Ø³ "
-"Ø¹Ø§Ù 1991 ÙØ£ØµØ¨ØØª Ø¨Ø±ÙÙØ¬Ø§ ØØ±Ø§ ÙÙ Ø¹Ø§Ù 1992. Ø§ÙØ¬ÙØ¹ 
Ø¨ÙÙ ÙÙÙÙØ³ ÙÙØ¸Ø§Ù Ø¬ÙÙ Ø§ÙÙÙØªÙÙ "
-"ØªÙØ±ÙØ¨Ø§ Ø£ÙÙØ± Ø¹Ù ÙØ¸Ø§Ù ØªØ´ØºÙÙ ÙØ§ÙÙ: ÙØ¸Ø§Ù 
Ø¬ÙÙ/ÙÙÙÙØ³.Ø§ÙØªÙØ¯ÙØ±Ø§Øª ØªØ´ÙØ± Ø¥ÙÙ Ø£Ù Ø¹Ø´Ø±Ø§Øª "
-"Ø§ÙÙÙØ§ÙÙÙ ÙÙ Ø§ÙÙØ§Ø³ ÙØ³ØªØ®Ø¯ÙÙÙ Ø£ÙØ¸ÙØ© 
Ø¬ÙÙ/ÙÙÙÙØ³Ø Ø¹Ø§Ø¯Ø© ÙÙ Ø®ÙØ§Ù <a href=\"/distros"
-"\">ØªÙØ²ÙØ¹Ø§Øª</a> ÙØ«Ù Ø³ÙØ§ÙÙÙØ±Ø ÙØ¯ÙØ¨ÙØ§ÙØ ÙØ±Ø¯ 
ÙØ§ØªØ ÙØºÙØ±ÙØ§."
->>>>>>> 1.13
 
 # type: Content of: <p>
 #: ../../gnu/po/gnu-history.proto:91
@@ -136,24 +113,9 @@
 msgstr " "
 
 # type: Content of: <div><p>
-<<<<<<< gnu-history.ar.po
 #: ../../gnu/po/gnu-history.proto:131
 msgid "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other ways to contact</a> the FSF.  <br /> Please send 
broken links and other corrections (or suggestions) to <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>."
 msgstr "ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù ÙØ¥Ù.Ø¥Ø³.Ø¥Ù ÙÙØ§Ø³ØªÙØ³Ø§Ø±Ø§Øª Ø¬ÙÙ 
Ù<a href=\"mailto:address@hidden";><em>address@hidden</em></a>. ÙÙØ¬Ø¯ 
Ø£ÙØ¶Ø§ <a href=\"/contact/\">Ø·Ø±Ù Ø£Ø®Ø±Ù ÙÙØ§ØªØµØ§Ù</a> 
Ø¨Ø§ÙØ¥Ù.Ø¥Ø³.Ø¥Ù.  <br /> ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù Ø§ÙÙØµÙØ§Øª Ø§ÙÙ
ÙÙØ·Ø¹Ø© ÙØ£Ù ØªØµØÙØØ§Øª Ø£Ù Ø§ÙØªØ±Ø§ØØ§Øª Ø¥ÙÙ <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>. "
-=======
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF.  <br /> Please send broken links and other corrections "
-"or suggestions to <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>."
-msgstr ""
-"ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù ÙØ¥Ù.Ø¥Ø³.Ø¥Ù ÙÙØ§Ø³ØªÙØ³Ø§Ø±Ø§Øª Ø¬ÙÙ Ù<a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>. ÙÙØ¬Ø¯ Ø£ÙØ¶Ø§ <a href=\"/contact/\">Ø·Ø±Ù 
Ø£Ø®Ø±Ù ÙÙØ§ØªØµØ§Ù</a> "
-"Ø¨Ø§ÙØ¥Ù.Ø¥Ø³.Ø¥Ù.  <br /> ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù Ø§ÙÙØµÙØ§Øª Ø§ÙÙ
ÙÙØ·Ø¹Ø© ÙØ£Ù ØªØµØÙØØ§Øª Ø£Ù Ø§ÙØªØ±Ø§ØØ§Øª "
-"Ø¥ÙÙ <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>. "
->>>>>>> 1.13
 
 # type: Content of: <div><p>
 #: ../../gnu/po/gnu-history.proto:141
@@ -161,28 +123,15 @@
 msgstr "ÙÙ ÙØ¶ÙÙ Ø±Ø§Ø¬Ø¹ <a 
href=\"/server/standards/README.translations.ar.html\">ØªØ¹ÙÙÙØ§Øª 
Ø§ÙØªØ±Ø¬ÙØ©</a> ÙÙØ¹ÙÙÙØ§Øª ØÙÙ ØªÙØ³ÙÙ ÙØªØ³ÙÙÙ ØªØ±Ø¬ÙØ§Øª 
ÙØ°Ù Ø§ÙÙÙØ§ÙØ©."
 
 # type: Content of: <div><p>
-<<<<<<< gnu-history.ar.po
 #: ../../gnu/po/gnu-history.proto:148
 msgid "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007 
Free Software Foundation, Inc.,"
 msgstr "ØÙ Ø§ÙÙØ³Ø® &copy; 1996Ø 1997Ø 1998Ø 1999Ø 2001Ø 2002Ø 
2003Ø 2005Ø 2007 ÙØ¤Ø³Ø³Ø© Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø© Ø§ÙÙØØ¯ÙØ¯Ø©Ø"
-=======
-#, fuzzy
-msgid ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005, 2007, 2009 "
-"Free Software Foundation, Inc."
-msgstr ""
-"ØÙ Ø§ÙÙØ³Ø® &copy; 1996Ø 1997Ø 1998Ø 1999Ø 2001Ø 2002Ø 2003Ø 
2005Ø 2007 ÙØ¤Ø³Ø³Ø© "
-"Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø© Ø§ÙÙØØ¯ÙØ¯Ø©Ø"
->>>>>>> 1.13
 
-<<<<<<< gnu-history.ar.po
 # type: Content of: <div><address>
 #: ../../gnu/po/gnu-history.proto:151
 msgid "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
 msgstr "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
 
-=======
->>>>>>> 1.13
 # type: Content of: <div><p>
 #: ../../gnu/po/gnu-history.proto:152
 msgid "Verbatim copying and distribution of this entire article is permitted 
in any medium without royalty provided this notice is preserved."

Index: gnu-users-never-heard-of-gnu.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ar.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu-users-never-heard-of-gnu.ar.po  2 Sep 2009 21:20:31 -0000       1.6
+++ gnu-users-never-heard-of-gnu.ar.po  3 Sep 2009 06:00:43 -0000       1.7
@@ -15,150 +15,43 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && 
n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 # type: Content of: <title>
-<<<<<<< gnu-users-never-heard-of-gnu.ar.po
 msgid "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software 
Foundation (FSF)"
 msgstr "ÙØ³ØªØ®Ø¯ÙÙ ØºÙÙ Ø§ÙØ°ÙÙ ÙÙ ÙØ³ÙØ¹ÙØ§ Ø¹ÙÙ Ø£Ø¨Ø¯ÙØ§ - 
ÙØ´Ø±ÙØ¹ ØºÙÙ - ÙØ¤Ø³Ø³Ø© Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø© 
(Ø¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù)"
-=======
-msgid ""
-"GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
-"Foundation (FSF)"
-msgstr ""
-"ÙØ³ØªØ®Ø¯ÙÙ Ø¬ÙÙ Ø§ÙØ°ÙÙ ÙÙ ÙØ³ÙØ¹ÙØ§ Ø¹ÙÙ Ø£Ø¨Ø¯ÙØ§ - Ù
Ø´Ø±ÙØ¹ Ø¬ÙÙ - ÙØ¤Ø³Ø³Ø© Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø© "
-"(Ø¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù)"
->>>>>>> 1.5
 
 # type: Content of: <h2>
 msgid "GNU Users Who Have Never Heard of GNU"
 msgstr "ÙØ³ØªØ®Ø¯ÙÙ ØºÙÙ Ø§ÙØ°ÙÙ ÙÙ ÙØ³ÙØ¹ÙØ§ Ø¹ÙÙ Ø£Ø¨Ø¯ÙØ§"
 
 # type: Content of: <p>
-msgid ""
-"<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></strong>"
-msgstr ""
-"<strong>Ø¨ÙÙÙ <a href=\"http://www.stallman.org/\";>Ø±ÙØªØ´Ø§Ø±Ø¯ 
Ø³ØªÙÙÙÙ</a></strong>"
+msgid "<strong>by <a href=\"http://www.stallman.org/\";>Richard 
Stallman</a></strong>"
+msgstr "<strong>Ø¨ÙÙÙ <a href=\"http://www.stallman.org/\";>Ø±ÙØªØ´Ø§Ø±Ø¯ 
Ø³ØªÙÙÙÙ</a></strong>"
 
 # type: Content of: <div><blockquote><p>
-<<<<<<< gnu-users-never-heard-of-gnu.ar.po
 msgid "To learn more about this issue, you can also read our <a 
href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a 
href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a 
href=\"/gnu/linux-and-gnu.html\">Linux and the GNU Project</a>."
 msgstr "ÙØªØ¹ÙÙ Ø§ÙÙØ²ÙØ¯ ØÙÙ ÙØ°Ù Ø§ÙÙØ¶ÙØ©Ø ØªØ³ØªØ·ÙØ¹ 
Ø£ÙØ¶Ø§ ÙØ±Ø§Ø¡Ø©<a href=\"/gnu/gnu-linux-faq.html\">Ø£Ø³Ø¦ÙØ© 
ØºÙÙ/ÙÙÙÙØ³ Ø§ÙØ´Ø§Ø¦Ø¹Ø©</a>Ø ÙØµÙØØªÙØ§ ØÙÙ <a 
href=\"/gnu/why-gnu-linux.html\">ÙÙØ§Ø°Ø§ ØºÙÙ/ÙÙÙÙØ³Ø</a>Ø 
ÙØµÙØØªÙØ§ Ø¹Ù <a href=\"/gnu/linux-and-gnu.html\">ÙÙÙÙØ³ ÙÙØ´Ø±ÙØ¹ 
ØºÙÙ</a>."
-=======
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"ÙØªØ¹ÙÙ Ø§ÙÙØ²ÙØ¯ ØÙÙ ÙØ°Ù Ø§ÙÙØ¶ÙØ©Ø ØªØ³ØªØ·ÙØ¹ Ø£ÙØ¶Ø§ 
ÙØ±Ø§Ø¡Ø©<a href=\"/gnu/gnu-linux-faq."
-"html\">Ø£Ø³Ø¦ÙØ© Ø¬ÙÙ/ÙÙÙÙØ³ Ø§ÙØ´Ø§Ø¦Ø¹Ø©</a>Ø ÙØµÙØØªÙØ§ 
ØÙÙ <a href=\"/gnu/why-gnu-linux."
-"html\">ÙÙØ§Ø°Ø§ Ø¬ÙÙ/ÙÙÙÙØ³Ø</a>Ø ÙØµÙØØªÙØ§ Ø¹Ù <a 
href=\"/gnu/linux-and-gnu.html"
-"\">ÙÙÙÙØ³ ÙÙØ´Ø±ÙØ¹ Ø¬ÙÙ</a>."
->>>>>>> 1.5
 
 # type: Content of: <p>
-<<<<<<< gnu-users-never-heard-of-gnu.ar.po
 msgid "Most people have never heard of GNU.  Even most of the people who use 
the GNU system have never heard of GNU, thanks to so many people and companies 
who teach them to call it &ldquo;Linux&rdquo;.  Nonetheless, the name GNU has 
certain associations, which people will discover once they hear the name.  GNU 
is associated with the ideals of freedom of the free software movement.  That 
association is no accident; the motive for developing GNU was specifically to 
make it possible to use a computer and have freedom."
 msgstr "ÙÙ ÙØ³ÙØ¹ Ø£ÙØ«Ø± Ø§ÙÙØ§Ø³ Ø£Ø¨Ø¯ÙØ§ Ø¹Ù ØºÙÙ. Ø¨Ù ØØªÙ 
Ø£Ù ÙØ¹Ø¸Ù Ø§ÙÙØ§Ø³ Ø§ÙØ°Ù ÙØ³ØªØ®Ø¯ÙÙÙ ÙØ¸Ø§Ù ØºÙÙ ÙÙ ÙØ³Ù
Ø¹ÙØ§ Ø¹Ù ØºÙÙØ Ø§ÙØ´ÙØ± ÙÙØ£Ø´Ø®Ø§Øµ Ø§ÙÙØ«Ø± ÙÙÙØ´Ø±ÙØ§Øª 
Ø§ÙØªÙ Ø¹ÙÙØªÙÙ ØªØ³ÙÙØªÙ &rdquo;ÙÙÙÙØ³&ldquo;. Ø¹ÙÙ ÙÙ 
ØØ§ÙØ ÙÙØ§Ø³Ù ØºÙÙ ØµÙØ© ÙØ¹ÙÙØ© Ø³ÙÙ ÙÙØªØ´ÙÙØ§ Ø§ÙÙØ§Ø³ 
Ø¹ÙØ¯ÙØ§ ÙØ³ÙØ¹ÙÙ Ø§ÙØ§Ø³Ù. ØºÙÙ ÙØªØµÙ Ø¨ÙÙØ±Ø© Ø§ÙØØ±ÙØ© 
ÙØØ±ÙØ© Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø©. ÙØ°Ù Ø§ÙØµÙØ© ÙÙ ØªÙØªØ¬ Ø¨Ù
ØØ¶ ÙØµØ§Ø¯ÙØ© ÙØ£Ù Ø§ÙØØ§ÙØ² ÙØªØ·ÙÙØ± ØºÙÙ ÙØ§Ù Ø£Ø³Ø§Ø³ÙØ§ 
Ø¬Ø¹Ù Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ÙØØ§Ø³ÙØ¨ ÙØ¹ Ø§ÙØªÙØ§Ù Ø§ÙØØ±ÙØ© ÙÙ
ÙÙÙØ§."
-=======
-msgid ""
-"Most people have never heard of GNU.  Even most of the people who use the "
-"GNU system have never heard of GNU, thanks to so many people and companies "
-"who teach them to call it &ldquo;Linux&rdquo;.  Nonetheless, the name GNU "
-"has certain associations, which people will discover once they hear the "
-"name.  GNU is associated with the ideals of freedom of the free software "
-"movement.  That association is no accident; the motive for developing GNU "
-"was specifically to make it possible to use a computer and have freedom."
-msgstr ""
-"ÙÙ ÙØ³ÙØ¹ Ø£ÙØ«Ø± Ø§ÙÙØ§Ø³ Ø£Ø¨Ø¯ÙØ§ Ø¹Ù Ø¬ÙÙ. Ø¨Ù ØØªÙ Ø£Ù Ù
Ø¹Ø¸Ù Ø§ÙÙØ§Ø³ Ø§ÙØ°Ù ÙØ³ØªØ®Ø¯ÙÙÙ ÙØ¸Ø§Ù Ø¬ÙÙ "
-"ÙÙ ÙØ³ÙØ¹ÙØ§ Ø¹Ù Ø¬ÙÙØ Ø§ÙØ´ÙØ± ÙÙØ£Ø´Ø®Ø§Øµ Ø§ÙÙØ«Ø± 
ÙÙÙØ´Ø±ÙØ§Øª Ø§ÙØªÙ Ø¹ÙÙØªÙÙ ØªØ³ÙÙØªÙ &rdquo;"
-"ÙÙÙÙØ³&ldquo;. Ø¹ÙÙ ÙÙ ØØ§ÙØ ÙÙØ§Ø³Ù Ø¬ÙÙ ØµÙØ© ÙØ¹ÙÙØ© 
Ø³ÙÙ ÙÙØªØ´ÙÙØ§ Ø§ÙÙØ§Ø³ Ø¹ÙØ¯ÙØ§ ÙØ³ÙØ¹ÙÙ "
-"Ø§ÙØ§Ø³Ù. Ø¬ÙÙ ÙØªØµÙ Ø¨ÙÙØ±Ø© Ø§ÙØØ±ÙØ© ÙØØ±ÙØ© Ø§ÙØ¨Ø±Ù
Ø¬ÙØ§Øª Ø§ÙØØ±Ø©. ÙØ°Ù Ø§ÙØµÙØ© ÙÙ ØªÙØªØ¬ Ø¨ÙØØ¶ "
-"ÙØµØ§Ø¯ÙØ© ÙØ£Ù Ø§ÙØØ§ÙØ² ÙØªØ·ÙÙØ± Ø¬ÙÙ ÙØ§Ù Ø£Ø³Ø§Ø³ÙØ§ 
Ø¬Ø¹Ù Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ÙØØ§Ø³ÙØ¨ ÙØ¹ Ø§ÙØªÙØ§Ù Ø§ÙØØ±ÙØ© "
-"ÙÙÙÙÙØ§."
->>>>>>> 1.5
 
 # type: Content of: <p>
-<<<<<<< gnu-users-never-heard-of-gnu.ar.po
 msgid "The association between the name GNU and our goals of freedom and 
social solidarity exists in the minds of hundreds of thousands of GNU/Linux 
users that do know about GNU.  It exists in Wikipedia.  And it exists around 
the web; if these users search for GNU, they will find <a 
href=\"http://www.gnu.org\";>www.gnu.org</a>, which talks about free software 
and freedom."
 msgstr "ØªÙØ¬Ø¯ Ø§ÙØµÙØ© Ø¨ÙÙ Ø§Ø³Ù ØºÙÙ ÙÙØ¯ÙÙÙ Ø§ÙØØ±ÙØ© 
ÙØ§ÙØªØ±Ø§Ø¨Ø· Ø§ÙØ§Ø¬ØªÙØ§Ø¹Ù Ø§ÙÙØ°ÙÙ ÙØ³Ø¹Ù ÙÙÙØ§ ÙÙ 
Ø£Ø°ÙØ§Ù ÙØ¦Ø§Øª Ø§ÙØ¢ÙØ§Ù ÙÙ ÙØ³ØªØ®Ø¯ÙÙ ØºÙÙ/ÙÙÙÙØ³ 
Ø§ÙØ°ÙÙ ÙØ¹Ø±ÙÙÙ ØºÙÙ ÙØªÙØ¬Ø¯ ÙÙ ÙÙÙÙØ¨ÙØ¯ÙØ§ ÙØªÙØ¬Ø¯ 
ØÙÙ Ø§ÙÙØ¨Ø Ø¥Ø°Ø§ Ø¨ØØ« ÙØ¤ÙØ§Ø¡ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø¹Ù ØºÙÙØ 
ÙØ³ÙÙ ÙØ¬Ø¯ÙÙ <a 
href=\"http://www.gnu.org/home.ar.html\";>www.gnu.org</a>Ø Ø§ÙØ°Ù 
ÙØªÙØ§ÙÙ Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø© ÙØ§ÙØØ±ÙØ©."
-=======
-msgid ""
-"The association between the name GNU and our goals of freedom and social "
-"solidarity exists in the minds of hundreds of thousands of GNU/Linux users "
-"that do know about GNU.  It exists in Wikipedia.  And it exists around the "
-"web; if these users search for GNU, they will find <a href=\"http://www.gnu.";
-"org\">www.gnu.org</a>, which talks about free software and freedom."
-msgstr ""
-"ØªÙØ¬Ø¯ Ø§ÙØµÙØ© Ø¨ÙÙ Ø§Ø³Ù Ø¬ÙÙ ÙÙØ¯ÙÙÙ Ø§ÙØØ±ÙØ© 
ÙØ§ÙØªØ±Ø§Ø¨Ø· Ø§ÙØ§Ø¬ØªÙØ§Ø¹Ù Ø§ÙÙØ°ÙÙ ÙØ³Ø¹Ù ÙÙÙØ§ ÙÙ "
-"Ø£Ø°ÙØ§Ù ÙØ¦Ø§Øª Ø§ÙØ¢ÙØ§Ù ÙÙ ÙØ³ØªØ®Ø¯ÙÙ Ø¬ÙÙ/ÙÙÙÙØ³ 
Ø§ÙØ°ÙÙ ÙØ¹Ø±ÙÙÙ Ø¬ÙÙ ÙØªÙØ¬Ø¯ ÙÙ ÙÙÙÙØ¨ÙØ¯ÙØ§ "
-"ÙØªÙØ¬Ø¯ ØÙÙ Ø§ÙÙØ¨Ø Ø¥Ø°Ø§ Ø¨ØØ« ÙØ¤ÙØ§Ø¡ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ 
Ø¹Ù Ø¬ÙÙØ ÙØ³ÙÙ ÙØ¬Ø¯ÙÙ <a href=\"http://";
-"www.gnu.org/home.ar.html\">www.gnu.org</a>Ø Ø§ÙØ°Ù ÙØªÙØ§ÙÙ Ø§ÙØ¨Ø±Ù
Ø¬ÙØ§Øª Ø§ÙØØ±Ø© "
-"ÙØ§ÙØØ±ÙØ©."
->>>>>>> 1.5
 
 # type: Content of: <p>
-<<<<<<< gnu-users-never-heard-of-gnu.ar.po
 msgid "A person seeing the name &ldquo;GNU&rdquo; for the first time in 
&ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.  However, 
when people know that the system is basically GNU, that brings them a step 
closer to learning about our ideals.  For instance, they might become curious 
and look for more information about GNU."
 msgstr "ÙÙ ÙØ±Ø¨Ø· Ø§ÙØ´Ø®Øµ Ø§ÙØ°Ù ÙØ±Ù Ø§ÙØ§Ø³Ù 
&rdquo;ØºÙÙ&ldquo; ÙØ£ÙÙ ÙØ±Ø© ÙÙ &rdquo;ØºÙÙ/ÙÙÙÙØ³&ldquo; 
Ø¨ÙÙÙ ÙØ¨ÙÙ Ø£Ù Ø´ÙØ¡ Ø¢Ø®Ø± ÙÙ Ø§ÙÙØØ¸Ø© Ø°Ø§ØªÙØ§. ÙÙÙ 
Ø¹ÙØ¯ÙØ§ ÙØ¹Ø±Ù Ø§ÙÙØ§Ø³ Ø£Ù Ø§ÙÙØ¸Ø§Ù Ø£Ø³Ø§Ø³ÙØ§ ÙÙ ØºÙÙØ 
ÙØ³ÙÙ ÙØ¬Ø°Ø¨ÙÙ Ø°ÙÙ Ø®Ø·ÙØ© Ø£ÙØ±Ø¨ ÙØªØ¹ÙÙ ÙÙÙÙØ§ ÙÙ
Ø¨Ø§Ø¯Ø¦ÙØ§. ÙØ¯ ÙØªÙÙÙÙÙ ÙÙØ¨ØØ« Ø¹Ù Ø§ÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙ
Ø¹ÙÙÙØ§Øª Ø¹Ù ØºÙÙ."
-=======
-msgid ""
-"A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
-"Linux&rdquo; won't immediately associate it with anything.  However, when "
-"people know that the system is basically GNU, that brings them a step closer "
-"to learning about our ideals.  For instance, they might become curious and "
-"look for more information about GNU."
-msgstr ""
-"ÙÙ ÙØ±Ø¨Ø· Ø§ÙØ´Ø®Øµ Ø§ÙØ°Ù ÙØ±Ù Ø§ÙØ§Ø³Ù &rdquo;Ø¬ÙÙ&ldquo; 
ÙØ£ÙÙ ÙØ±Ø© ÙÙ &rdquo;Ø¬ÙÙ/"
-"ÙÙÙÙØ³&ldquo; Ø¨ÙÙÙ ÙØ¨ÙÙ Ø£Ù Ø´ÙØ¡ Ø¢Ø®Ø± ÙÙ Ø§ÙÙØØ¸Ø© 
Ø°Ø§ØªÙØ§. ÙÙÙ Ø¹ÙØ¯ÙØ§ ÙØ¹Ø±Ù Ø§ÙÙØ§Ø³ Ø£Ù "
-"Ø§ÙÙØ¸Ø§Ù Ø£Ø³Ø§Ø³ÙØ§ ÙÙ Ø¬ÙÙØ ÙØ³ÙÙ ÙØ¬Ø°Ø¨ÙÙ Ø°ÙÙ Ø®Ø·ÙØ© 
Ø£ÙØ±Ø¨ ÙØªØ¹ÙÙ ÙÙÙÙØ§ ÙÙØ¨Ø§Ø¯Ø¦ÙØ§. ÙØ¯ "
-"ÙØªÙÙÙÙÙ ÙÙØ¨ØØ« Ø¹Ù Ø§ÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª Ø¹Ù 
Ø¬ÙÙ."
->>>>>>> 1.5
 
 # type: Content of: <p>
-<<<<<<< gnu-users-never-heard-of-gnu.ar.po
 msgid "If they don't look for it, they may encounter it anyway.  The 
&ldquo;open source&rdquo; rhetoric tends to lead people's attention away from 
issues of users' freedom, but not totally; there is still discussion of GNU and 
free software, and people have some chance of coming across it.  When that 
happens, the reader is more likely to pay attention to information about GNU 
(such as that it's the work of a campaign for freedom and community) if he 
knows he is a user of the GNU system."
 msgstr "ÙÙÙ ØØªÙ ÙÙ ÙÙ ÙØ¨ØØ«ÙØ§ Ø¹Ù ØªÙÙ Ø§ÙÙØ¹ÙÙÙØ§ØªØ 
ÙÙØ¯ ÙØµØ§Ø¯ÙÙÙÙØ§ Ø¹ÙÙ ÙÙ ØØ§Ù. Ø¥Ù Ø¯ÙØ§ÙØ© &rdquo;Ø§ÙÙ
ØµØ¯Ø± Ø§ÙÙÙØªÙØ&ldquo; ØªØØ±Ù ØªØ±ÙÙØ² Ø§ÙÙØ§Ø³ Ø¹Ù ÙØ¶Ø§ÙØ§ 
ØØ±ÙØ© Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙØ ÙÙÙ ÙÙØ³ ØªÙØ§ÙØ§Ø ÙØ«ÙÙØ© 
Ø¹ÙØ§ÙØ© ÙØºÙÙ ÙÙÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø©Ø ÙÙØ§Ø²Ø§ÙØª ÙÙÙØ§Ø³ 
ÙØ±ØµØ© Ø§ÙØªØ¹Ø±Ù Ø¹ÙÙÙØ§. Ø¹ÙØ¯ÙØ§ ÙØµØ§Ø¯Ù Ø§ÙÙØ§Ø±Ø¦ ØªÙÙ 
Ø§ÙÙØ¹ÙÙÙØ§ØªØ ÙÙÙ Ø§ÙÙØ±Ø¬Ø Ø£ÙÙ Ø³ÙÙÙÙ Ø¨Ø§ÙÙØ§ ÙÙÙ
Ø¹ÙÙÙØ§Øª Ø§ÙÙØªØ¹ÙÙØ© Ø¨ØºÙÙ (ÙØ«Ù Ø£ÙÙ ØÙÙØ© ÙÙØØ±ÙØ© 
ÙÙÙÙØ¬ØªÙØ¹) Ø¥Ø°Ø§ Ø¹Ø±Ù Ø£ÙÙ ÙØ³ØªØ®Ø¯Ù ÙÙØ¸Ø§Ù ØºÙÙ."
 
 # type: Content of: <p>
 msgid "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness 
of the ideals of freedom for which we developed the GNU system.  It is also 
useful as a reminder for people in our community who know about these ideals, 
in a world where much of discussion of free software takes a totally practical 
(and thus amoral) approach.  When we ask you to call the system 
&ldquo;GNU/Linux&rdquo;, we do so because awareness of GNU slowly but surely 
brings with it awareness of the free software ideals of freedom and community."
 msgstr "ÙØ¹ ÙØ±ÙØ± Ø§ÙÙÙØª Ø³ÙÙ ØªÙØ´Ø± ØªØ³ÙÙØ© Ø§ÙÙØ¸Ø§Ù 
&rdquo;ØºÙÙ/ÙÙÙÙØ³&ldquo; Ø¥Ø¯Ø±Ø§Ù ÙÙÙ Ø§ÙØØ±ÙØ© Ø§ÙØªÙ 
ÙØ£Ø¬ÙÙØ§ Ø·ÙÙØ±ÙØ§ ÙØ¸Ø§Ù ØºÙÙ. ÙÙÙ ÙÙÙØ¯Ø© Ø£ÙØ¶ÙØ§ 
ÙØªØ°ÙØ±Ø© ÙÙÙ ÙØ¹Ø±Ù ÙÙ ÙØ¬ØªÙØ¹ÙØ§ ÙØ°Ù Ø§ÙÙÙÙØ ÙÙ Ø¬Ù 
ÙØ³ÙØ·Ø± ÙÙÙ Ø§ÙÙÙØ§Ø´ Ø§ÙØ¹ÙÙÙ (Ø§ÙØ®Ø§ÙÙ ÙÙ Ø§ÙÙÙÙ 
Ø§ÙØ£Ø®ÙØ§ÙÙØ©) Ø¹ÙÙ Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø©. Ø¹ÙØ¯ÙØ§ ÙØ·ÙØ¨ Ù
ÙÙ ØªØ³ÙÙØ© Ø§ÙÙØ¸Ø§Ù &rdquo;ØºÙÙ/ÙÙÙÙØ³&ldquo; ÙØ¥ÙÙØ§ ÙÙÙÙ
 Ø¨Ø°ÙÙ ÙØ£Ù Ø§ÙÙØ¹Ù Ø¨ØºÙÙ Ø¨Ø·ÙØ¡ ÙÙÙÙÙ Ø¨ÙØ§ Ø´Ù ÙØ¬ÙØ¨ Ù
Ø¹Ù ÙØ¹ Ø§ÙØ²ÙÙ Ø¥Ø¯Ø§Ø±Ù ÙØ¨Ø¯Ø£ÙÙ Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø©: 
Ø§ÙØØ±ÙØ© ÙØ§ÙÙØ¬ØªÙØ¹."
-=======
-msgid ""
-"If they don't look for it, they may encounter it anyway.  The &ldquo;open "
-"source&rdquo; rhetoric tends to lead people's attention away from issues of "
-"users' freedom, but not totally; there is still discussion of GNU and free "
-"software, and people have some chance of coming across it.  When that "
-"happens, the reader is more likely to pay attention to information about GNU "
-"(such as that it's the work of a campaign for freedom and community) if he "
-"knows he is a user of the GNU system."
-msgstr ""
-"ÙÙÙ ØØªÙ ÙÙ ÙÙ ÙØ¨ØØ«ÙØ§ Ø¹Ù ØªÙÙ Ø§ÙÙØ¹ÙÙÙØ§ØªØ ÙÙØ¯ 
ÙØµØ§Ø¯ÙÙÙÙØ§ Ø¹ÙÙ ÙÙ ØØ§Ù. Ø¥Ù Ø¯ÙØ§ÙØ© "
-"&rdquo;Ø§ÙÙØµØ¯Ø± Ø§ÙÙÙØªÙØ&ldquo; ØªØØ±Ù ØªØ±ÙÙØ² Ø§ÙÙØ§Ø³ Ø¹Ù 
ÙØ¶Ø§ÙØ§ ØØ±ÙØ© Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙØ ÙÙÙ "
-"ÙÙØ³ ØªÙØ§ÙØ§Ø ÙØ«ÙÙØ© Ø¹ÙØ§ÙØ© ÙØ¬ÙÙ ÙÙÙØ¨Ø±ÙØ¬ÙØ§Øª 
Ø§ÙØØ±Ø©Ø ÙÙØ§Ø²Ø§ÙØª ÙÙÙØ§Ø³ ÙØ±ØµØ© Ø§ÙØªØ¹Ø±Ù "
-"Ø¹ÙÙÙØ§. Ø¹ÙØ¯ÙØ§ ÙØµØ§Ø¯Ù Ø§ÙÙØ§Ø±Ø¦ ØªÙÙ Ø§ÙÙØ¹ÙÙÙØ§ØªØ 
ÙÙÙ Ø§ÙÙØ±Ø¬Ø Ø£ÙÙ Ø³ÙÙÙÙ Ø¨Ø§ÙÙØ§ ÙÙÙØ¹ÙÙÙØ§Øª "
-"Ø§ÙÙØªØ¹ÙÙØ© Ø¨Ø¬ÙÙ (ÙØ«Ù Ø£ÙÙ ØÙÙØ© ÙÙØØ±ÙØ© ÙÙÙÙØ¬ØªÙ
Ø¹) Ø¥Ø°Ø§ Ø¹Ø±Ù Ø£ÙÙ ÙØ³ØªØ®Ø¯Ù ÙÙØ¸Ø§Ù Ø¬ÙÙ."
-
-# type: Content of: <p>
-msgid ""
-"Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
-"the ideals of freedom for which we developed the GNU system.  It is also "
-"useful as a reminder for people in our community who know about these "
-"ideals, in a world where much of discussion of free software takes a totally "
-"practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we do so because awareness of GNU slowly but surely "
-"brings with it awareness of the free software ideals of freedom and "
-"community."
-msgstr ""
-"ÙØ¹ ÙØ±ÙØ± Ø§ÙÙÙØª Ø³ÙÙ ØªÙØ´Ø± ØªØ³ÙÙØ© Ø§ÙÙØ¸Ø§Ù 
&rdquo;Ø¬ÙÙ/ÙÙÙÙØ³&ldquo; Ø¥Ø¯Ø±Ø§Ù ÙÙÙ Ø§ÙØØ±ÙØ© "
-"Ø§ÙØªÙ ÙØ£Ø¬ÙÙØ§ Ø·ÙÙØ±ÙØ§ ÙØ¸Ø§Ù Ø¬ÙÙ. ÙÙÙ ÙÙÙØ¯Ø© 
Ø£ÙØ¶ÙØ§ ÙØªØ°ÙØ±Ø© ÙÙÙ ÙØ¹Ø±Ù ÙÙ ÙØ¬ØªÙØ¹ÙØ§ ÙØ°Ù "
-"Ø§ÙÙÙÙØ ÙÙ Ø¬Ù ÙØ³ÙØ·Ø± ÙÙÙ Ø§ÙÙÙØ§Ø´ Ø§ÙØ¹ÙÙÙ 
(Ø§ÙØ®Ø§ÙÙ ÙÙ Ø§ÙÙÙÙ Ø§ÙØ£Ø®ÙØ§ÙÙØ©) Ø¹ÙÙ "
-"Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø©. Ø¹ÙØ¯ÙØ§ ÙØ·ÙØ¨ ÙÙÙ ØªØ³ÙÙØ© 
Ø§ÙÙØ¸Ø§Ù &rdquo;Ø¬ÙÙ/ÙÙÙÙØ³&ldquo; ÙØ¥ÙÙØ§ "
-"ÙÙÙÙ Ø¨Ø°ÙÙ ÙØ£Ù Ø§ÙÙØ¹Ù Ø¨Ø¬ÙÙ Ø¨Ø·ÙØ¡ ÙÙÙÙÙ Ø¨ÙØ§ Ø´Ù 
ÙØ¬ÙØ¨ ÙØ¹Ù ÙØ¹ Ø§ÙØ²ÙÙ Ø¥Ø¯Ø§Ø±Ù ÙØ¨Ø¯Ø£ÙÙ "
-"Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª Ø§ÙØØ±Ø©: Ø§ÙØØ±ÙØ© ÙØ§ÙÙØ¬ØªÙØ¹."
->>>>>>> 1.5
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -166,61 +59,25 @@
 msgstr " "
 
 # type: Content of: <div><p>
-<<<<<<< gnu-users-never-heard-of-gnu.ar.po
 msgid "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a 
href=\"/contact/\">other ways to contact</a> the FSF.  <br /> Please send 
broken links and other corrections or suggestions to <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr "ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù ÙØ¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù 
ÙÙØ§Ø³ØªÙØ³Ø§Ø±Ø§Øª ØºÙÙ Ù<a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>. ÙÙØ¬Ø¯ Ø£ÙØ¶Ø§ <a 
href=\"/contact/\">Ø·Ø±Ù Ø£Ø®Ø±Ù ÙÙØ§ØªØµØ§Ù</a> Ø¨Ø§ÙØ¥Ù.Ø¥Ø³.Ø¥Ù.  
<br /> ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù Ø§ÙÙØµÙØ§Øª Ø§ÙÙÙÙØ·Ø¹Ø© ÙØ£Ù 
ØªØµØÙØØ§Øª Ø£Ù Ø§ÙØªØ±Ø§ØØ§Øª Ø¥ÙÙ <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>."
-=======
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF.  <br /> Please send broken links and other corrections "
-"or suggestions to <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>."
-msgstr ""
-"ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù ÙØ¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù ÙÙØ§Ø³ØªÙØ³Ø§Ø±Ø§Øª 
Ø¬ÙÙ Ù<a href=\"mailto:address@hidden";
-"org\"><em>address@hidden</em></a>. ÙÙØ¬Ø¯ Ø£ÙØ¶Ø§ <a 
href=\"/contact/\">Ø·Ø±Ù Ø£Ø®Ø±Ù "
-"ÙÙØ§ØªØµØ§Ù</a> Ø¨Ø§ÙØ¥Ù.Ø¥Ø³.Ø¥Ù.  <br /> ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù 
Ø§ÙÙØµÙØ§Øª Ø§ÙÙÙÙØ·Ø¹Ø© ÙØ£Ù ØªØµØÙØØ§Øª "
-"Ø£Ù Ø§ÙØªØ±Ø§ØØ§Øª Ø¥ÙÙ <a 
href=\"mailto:address@hidden";><em>address@hidden"
-"org</em></a>."
->>>>>>> 1.5
 
 # type: Content of: <div><p>
-<<<<<<< gnu-users-never-heard-of-gnu.ar.po
 msgid "Please see the <a 
href=\"/server/standards/README.translations.html\">Translations README</a> for 
information on coordinating and submitting translations of this article."
 msgstr "ÙÙ ÙØ¶ÙÙ Ø±Ø§Ø¬Ø¹ <a 
href=\"/server/standards/README.translations.ar.html\">ØªØ¹ÙÙÙØ§Øª 
Ø§ÙØªØ±Ø¬ÙØ©</a> ÙÙØ¹ÙÙÙØ§Øª ØÙÙ ØªÙØ³ÙÙ ÙØªØ³ÙÙÙ ØªØ±Ø¬ÙØ§Øª 
ÙØ°Ù Ø§ÙÙÙØ§ÙØ©."
-=======
-msgid ""
-"Please see the <a href=\"/server/standards/README.translations.html"
-"\">Translations README</a> for information on coordinating and submitting "
-"translations of this article."
-msgstr ""
-"ÙÙ ÙØ¶ÙÙ Ø±Ø§Ø¬Ø¹ <a 
href=\"/server/standards/README.translations.html\">ØªØ¹ÙÙÙØ§Øª "
-"Ø§ÙØªØ±Ø¬ÙØ©</a> ÙÙØ¹ÙÙÙØ§Øª ØÙÙ ØªÙØ³ÙÙ ÙØªØ³ÙÙÙ ØªØ±Ø¬Ù
Ø§Øª ÙØ°Ù Ø§ÙÙÙØ§ÙØ©."
->>>>>>> 1.5
 
 # type: Content of: <div><p>
 msgid "Copyright &copy; 2006, 2007 Free Software Foundation, Inc."
 msgstr "ØÙÙÙ Ø§ÙÙØ´Ø± &copy; 2006Ø 2007 ÙØ¤Ø³Ø³Ø© Ø§ÙØ¨Ø±ÙØ¬ÙØ§Øª 
Ø§ÙØØ±Ø©Ø Ø§ÙÙØØ¯ÙØ¯Ø©Ø"
 
 # type: Content of: <div><p>
-msgid ""
-"Verbatim copying and distribution of this entire article are permitted "
-"worldwide, without royalty, in any medium, provided this notice, and the "
-"copyright notice, are preserved."
-msgstr ""
-"ÙØ³ÙØ Ø¨ÙØ³Ø® ÙØªÙØ²ÙØ¹ ÙØ°Ù Ø§ÙÙÙØ§ÙØ© ÙØ§ÙÙØ©Ù 
ØØ±ÙÙÙØ§ ÙÙ Ø£Ù ÙØ³ÙØ·Ø Ø¨Ø´Ø±Ø· Ø¥Ø¨ÙØ§Ø¡ ÙØ°Ø§ Ø§ÙØ¥Ø®Ø·Ø§Ø±."
+msgid "Verbatim copying and distribution of this entire article are permitted 
worldwide, without royalty, in any medium, provided this notice, and the 
copyright notice, are preserved."
+msgstr "ÙØ³ÙØ Ø¨ÙØ³Ø® ÙØªÙØ²ÙØ¹ ÙØ°Ù Ø§ÙÙÙØ§ÙØ© ÙØ§ÙÙØ©Ù 
ØØ±ÙÙÙØ§ ÙÙ Ø£Ù ÙØ³ÙØ·Ø Ø¨Ø´Ø±Ø· Ø¥Ø¨ÙØ§Ø¡ ÙØ°Ø§ Ø§ÙØ¥Ø®Ø·Ø§Ø±."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
-<<<<<<< gnu-users-never-heard-of-gnu.ar.po
 msgstr "ØªØ±Ø¬ÙÙØ§ <a href=\"mailto:address@hidden";><em>Ø£Ø³Ø§ÙØ© 
Ø®Ø§ÙØ¯</em></a><br />.ÙØ±ÙÙ Ø§ÙØªØ±Ø¬ÙØ© Ø§ÙØ¹Ø±Ø¨ÙØ© Ø¨Ø¥Ø´Ø±Ø§Ù <a 
href=\"http://www.cruised.net/\";><em>ØØ³Ø§Ù ØØ³ÙÙ</em></a>."
-=======
-msgstr ""
-"ØªØ±Ø¬ÙÙ <a href=\"mailto:address@hidden";><em>Ø£Ø³Ø§ÙØ© Ø®Ø§ÙØ¯</em></a> 
Ù<a "
-"href=\"http://www.cruised.net/\";><em>ØØ³Ø§Ù ØØ³ÙÙ</em></a><br 
/>.ÙØ±ÙÙ Ø§ÙØªØ±Ø¬ÙØ© "
-"Ø§ÙØ¹Ø±Ø¨ÙØ© Ø¨Ø¥Ø´Ø±Ø§Ù <a href=\"http://www.cruised.net/\";><em>ØØ³Ø§Ù 
ØØ³ÙÙ</em></a>."
->>>>>>> 1.5
 
 # type: Content of: <div><p>
 #.  timestamp start 
@@ -230,3 +87,4 @@
 # type: Content of: <div><h4>
 msgid "Translations of this page"
 msgstr "ØªØ±Ø¬ÙØ§Øª ÙØ°Ù Ø§ÙØµÙØØ©"
+

Index: linux-and-gnu.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ar.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- linux-and-gnu.ar.po 2 Sep 2009 21:20:32 -0000       1.13
+++ linux-and-gnu.ar.po 3 Sep 2009 06:00:43 -0000       1.14
@@ -6,15 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu\n"
-<<<<<<< linux-and-gnu.ar.po
 "POT-Creation-Date: 2009-01-15 16:26-0500\n"
 "PO-Revision-Date: 2009-09-02 22:04+0200\n"
 "Last-Translator: Hossam Hossny <address@hidden>\n"
-=======
-"POT-Creation-Date: 2009-07-17 16:25-0300\n"
-"PO-Revision-Date: 2009-07-19 22:38+0300\n"
-"Last-Translator: Osama Khalid <address@hidden>\n"
->>>>>>> 1.12
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,24 +77,8 @@
 msgstr "ÙÙÙ Ø¥Ø°Ø§ ØØ§ÙÙÙØ§ ÙÙØ§Ø³ ÙØ³Ø§ÙÙØ© ÙØ´Ø±ÙØ¹ Ø¬ÙÙ 
Ø¨ÙØ°Ù Ø§ÙØ·Ø±ÙÙØ© ÙÙØ§Ø°Ø§ Ø³ÙØØ³Ø¨Ø ÙØ¬Ø¯ Ø£ØØ¯ Ø¨Ø§Ø¦Ø¹Ù 
Ø§ÙØ§Ø³Ø·ÙØ§ÙØ§Øª ÙÙ &rdquo;ØªÙØ²ÙØ¹ØªÙ ÙÙÙÙÙØ³&ldquo; Ø£Ù <a 
href=\"/philosophy/categories.ar.html#GNUsoftware\">Ø¨Ø±ÙØ¬ÙØ§Øª Ø¬ÙÙ</a> 
ÙØ§ÙØª Ø£ÙØ¨Ø± ÙÙÙØ±Ø¯ ÙØ¹Ø¯ÙØ¯Ø Ø¨ÙØ±Ø§Ø¨Ø© 28% ÙÙ ÙØ¬ÙÙØ¹ 
Ø§ÙÙÙØ¯ Ø§ÙÙØµØ¯Ø±ÙØ Ø¨ÙØ§ ÙÙÙØ§ Ø¨Ø¹Ø¶ Ø§ÙØ£Ø¬Ø²Ø§Ø¡ 
Ø§ÙØ£Ø³Ø§Ø³ÙØ© Ø§ÙØ¬ÙÙØ±ÙØ© Ø§ÙØªÙ ÙÙÙØ§ÙØ§ ÙÙØ§ ÙÙØ¬Ø¯ 
Ø§ÙÙØ¸Ø§Ù. ÙÙÙÙØ³ ÙÙØØ¯Ù 3% (Ø§ÙÙØ³Ø¨ØªØ§Ù ÙÙ 2008 
ÙØ±ÙØ¨ØªØ§Ù ÙÙ Ø§ÙÙØ³ØªÙØ¯Ø¹ &rdquo;Main&ldquo; 
ÙØ¬Ù&#8204;ÙÙÙØ³ÙØ³Ø ÙÙÙÙØ³ 1.5% ÙØØ²Ù Ø¬ÙÙ 15%.) ÙØ°Ø§ Ø¥Ø°Ø§ 
ÙÙØª Ø¨ØµØ¯Ø¯ Ø¥Ø·ÙØ§Ù Ø§Ø³Ù ÙÙÙØ¸Ø§Ù ÙØ¨ÙÙ Ø¹ÙÙ Ø§ÙØ°ÙÙ 
ÙØªØ¨ÙØ§ Ø§ÙØ¨Ø±Ø§ÙØ¬ ÙÙÙØ ÙØ¥Ù Ø£ÙØ«Ø± Ø§Ø³Ù ÙÙØ§Ø¦ÙØ© ÙÙ 
&rdquo;Ø¬ÙÙ&ldquo;."
 
 # type: Content of: <p>
-<<<<<<< linux-and-gnu.ar.po
 msgid "But that is not the deepest way to consider the question.  The GNU 
Project was not, is not, a project to develop specific software packages.  It 
was not a project <a href=\"/software/gcc/gcc.html\"> to develop a C 
compiler</a>, although we did that.  It was not a project to develop a text 
editor, although we developed one.  The GNU Project set out to develop <em>a 
complete free Unix-like system</em>: GNU."
 msgstr "ÙÙÙ ÙØ°Ø§ ÙÙØ³ Ø§ÙØ³Ø¨ÙÙ Ø§ÙØ£Ø¹ÙÙ ÙÙÙÙ Ø§ÙÙØ¶ÙØ©. 
ÙÙ ÙÙÙ ÙØ´Ø±ÙØ¹ Ø¬ÙÙ -ÙÙÙ ÙÙÙÙ- ÙØ´Ø±ÙØ¹ÙØ§ ÙØªØ·ÙÙØ± 
ØØ²Ù Ø¨Ø±ÙØ¬ÙØ§Øª ÙØØ¯Ø¯Ø©. ÙÙ ÙÙÙ ÙØ´Ø±ÙØ¹ÙØ§ <a 
href=\"/software/gcc/gcc.html\">ÙØªØ·ÙÙØ± ÙØªØ±Ø¬Ù Ø³Ù</a>Ø Ø¹ÙÙ 
Ø§ÙØ±ØºÙ ÙÙ Ø£ÙÙØ§ ÙÙÙØ§ Ø¨Ø°ÙÙØ ÙÙÙ ÙÙÙ ÙØ´Ø±ÙØ¹Ø§ 
ÙØªØ·ÙÙØ± ÙØØ±Ø± ÙØµÙØµØ Ø¹ÙÙ Ø§ÙØ±ØºÙ ÙÙ Ø£ÙÙØ§ Ø·ÙØ±ÙØ§ Ù
ØØ±ÙØ±ÙØ§. Ø¨Ø¯Ø£ ÙØ´Ø±ÙØ¹ Ø¬ÙÙ ÙÙ ØªØ·ÙÙØ± <em>ÙØ¸Ø§Ù Ø´Ø¨ÙÙ 
Ø¨ÙÙÙÙØ³ ØØ± ÙØ§ÙÙ</em>ÙÙ ÙØ¸Ø§Ù Ø§ÙØªØ´ØºÙÙ Ø¬ÙÙ."
-=======
-msgid ""
-"But that is not the deepest way to consider the question.  The GNU Project "
-"was not, is not, a project to develop specific software packages.  It was "
-"not a project <a href=\"/software/gcc/\"> to develop a C compiler</a>, "
-"although we did that.  It was not a project to develop a text editor, "
-"although we developed one.  The GNU Project set out to develop <em>a "
-"complete free Unix-like system</em>: GNU."
-msgstr ""
-"ÙÙÙ ÙØ°Ø§ ÙÙØ³ Ø§ÙØ³Ø¨ÙÙ Ø§ÙØ£Ø¹ÙÙ ÙÙÙÙ Ø§ÙÙØ¶ÙØ©. ÙÙ 
ÙÙÙ ÙØ´Ø±ÙØ¹ Ø¬ÙÙ -ÙÙÙ ÙÙÙÙ- ÙØ´Ø±ÙØ¹ÙØ§ "
-"ÙØªØ·ÙÙØ± ØØ²Ù Ø¨Ø±ÙØ¬ÙØ§Øª ÙØØ¯Ø¯Ø©. ÙÙ ÙÙÙ ÙØ´Ø±ÙØ¹ÙØ§ <a 
href=\"/software/gcc/\">ÙØªØ·ÙÙØ± "
-"ÙØªØ±Ø¬Ù Ø³Ù</a>Ø Ø¹ÙÙ Ø§ÙØ±ØºÙ ÙÙ Ø£ÙÙØ§ ÙÙÙØ§ Ø¨Ø°ÙÙØ 
ÙÙÙ ÙÙÙ ÙØ´Ø±ÙØ¹Ø§ ÙØªØ·ÙÙØ± ÙØØ±Ø± ÙØµÙØµØ "
-"Ø¹ÙÙ Ø§ÙØ±ØºÙ ÙÙ Ø£ÙÙØ§ Ø·ÙØ±ÙØ§ ÙØØ±ÙØ±ÙØ§. Ø¨Ø¯Ø£ ÙØ´Ø±ÙØ¹ 
Ø¬ÙÙ ÙÙ ØªØ·ÙÙØ± <em>ÙØ¸Ø§Ù Ø´Ø¨ÙÙ Ø¨ÙÙÙÙØ³ "
-"ØØ± ÙØ§ÙÙ</em>ÙÙ ÙØ¸Ø§Ù Ø§ÙØªØ´ØºÙÙ Ø¬ÙÙ."
->>>>>>> 1.12
 
 # type: Content of: <p>
 msgid "Many people have made major contributions to the free software in the 
system, and they all deserve credit for their software.  But the reason it is 
<em>an integrated system</em>&mdash;and not just a collection of useful 
programs&mdash;is because the GNU Project set out to make it one.  We made a 
list of the programs needed to make a <em>complete</em> free system, and we 
systematically found, wrote, or found people to write everything on the list.  
We wrote essential but unexciting <a href=\"#unexciting\">(1)</a> components 
because you can't have a system without them.  Some of our system components, 
the programming tools, became popular on their own among programmers, but we 
wrote many components that are not tools <a href=\"#nottools\">(2)</a>.  We 
even developed a chess game, GNU Chess, because a complete system needs games 
too."
@@ -123,26 +101,8 @@
 msgstr "ÙØ¯Ø¹Ù ÙØ´Ø±ÙØ¹ Ø¬ÙÙ Ø£ÙØ¸ÙØ© Ø¬ÙÙ/ÙÙÙÙØ³ ØªÙØ§ÙÙØ§ 
ÙØ¯Ø¹ÙÙ <em>ÙØ¸Ø§Ù</em> Ø¬ÙÙ. ÙÙÙÙØª <a 
href=\"http://fsf.org/\";>Ø¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù</a> Ø¥Ø¹Ø§Ø¯Ø© ÙØªØ§Ø¨Ø© 
Ø§ÙØ§ÙØªØ¯Ø§Ø¯Ø§Øª Ø§ÙÙØªØ¹ÙÙØ© Ø¨ÙÙÙÙØ³ ÙÙÙØªØ¨Ø© Ø¬ÙÙ Ø³Ù. 
ÙÙØµØ¨ØØ§ Ø§ÙØ¢Ù ÙØªÙØ§Ø³ÙÙÙ Ø¨Ø´ÙÙ ÙÙØªØ§Ø²Ø ÙØ£ØØ¯Ø« Ø£ÙØ¸Ù
Ø© Ø¬ÙÙ/ÙÙÙÙØ³ ØªØ³ØªØ®Ø¯Ù Ø¥ØµØ¯Ø§Ø± Ø§ÙÙÙØªØ¨Ø© Ø§ÙØØ§ÙÙ 
Ø¨Ø¯ÙÙ ØªØºÙÙØ±Ø§Øª. ÙÙÙÙØª Ø¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù Ø£ÙØ¶ÙØ§ Ù
ÙØµØ© ÙØ¨ÙØ±Ø© ÙØªØ·ÙÙØ± Ø¯Ø¨ÙØ§Ù Ø¬ÙÙ/ÙÙÙÙØ³."
 
 # type: Content of: <p>
-<<<<<<< linux-and-gnu.ar.po
 msgid "Today there are many different variants of the GNU/Linux system (often 
called &ldquo;distros&rdquo;).  Most of them include non-free 
software&mdash;their developers follow the philosophy associated with Linux 
rather than that of GNU.  But there are also <a 
href=\"/links/links.html#FreeGNULinuxDistributions\"> completely free GNU/Linux 
distros</a>.  The FSF supports computer facilities for two of these 
distributions, <a href=\"http://ututo.org\";>Ututo</a> and <a 
href=\"http://gnewsense.org/\";>gNewSense</a>."
 msgstr "Ø§ÙÙÙÙ ØªÙØ¬Ø¯ ØªÙÙÙØ¹Ø§Øª ÙØ«ÙØ±Ø© ÙØ®ØªÙÙØ© ÙÙ 
ÙØ¸Ø§Ù Ø¬ÙÙ/ÙÙÙÙØ³ (ØªØ³ÙÙ Ø¹Ø§Ø¯Ø© &rdquo;ØªÙØ²ÙØ¹Ø§Øª&ldquo;). Ù
Ø¹Ø¸ÙÙØ§ ØªØØªÙÙ Ø¨Ø±ÙØ¬ÙØ§Øª ØºÙØ± ØØ±Ø©&mdash;ÙØ·ÙØ±ÙÙØ§ 
ÙØªØ¨Ø¹ÙÙ Ø§ÙÙÙØ³ÙØ© Ø§ÙÙØµØ§ØØ¨Ø© ÙÙÙÙÙØ³ Ø¨Ø¯ÙØ§ ÙÙ ØªÙÙ 
Ø§ÙØªÙ ÙØ¬ÙÙ. ÙÙÙ ØªÙØ¬Ø¯ Ø£ÙØ¶Ø§ <a 
href=\"/links/links.html#FreeGNULinuxDistributions\"> ØªÙØ²ÙØ¹Ø§Øª 
Ø¬ÙÙ/ÙÙÙÙØ³ ØØ±Ø© Ø¨Ø§ÙÙØ§ÙÙ</a>. ØªØ¯Ø¹Ù 
Ø¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù Ø§Ø«ÙØªÙÙ ÙÙ ÙØ°Ù Ø§ÙØªÙØ²ÙØ¹Ø§Øª Ù
Ø§Ø¯ÙÙØ§ ÙÙÙØ§ <a href=\"http://ututo.org\";>Ø£ØªÙØªÙ</a> Ù<a 
href=\"http://gnewsense.org/\";>Ø¬Ù&#8204;ÙÙÙØ³ÙØ³</a>."
-=======
-msgid ""
-"Today there are many different variants of the GNU/Linux system (often "
-"called &ldquo;distros&rdquo;).  Most of them include non-free software&mdash;"
-"their developers follow the philosophy associated with Linux rather than "
-"that of GNU.  But there are also <a href=\"/distros/\">completely free GNU/"
-"Linux distros</a>.  The FSF supports computer facilities for two of these "
-"distributions, <a href=\"http://ututo.org\";>Ututo</a> and <a href=\"http://";
-"gnewsense.org/\">gNewSense</a>."
-msgstr ""
-"Ø§ÙÙÙÙ ØªÙØ¬Ø¯ ØªÙÙÙØ¹Ø§Øª ÙØ«ÙØ±Ø© ÙØ®ØªÙÙØ© ÙÙ ÙØ¸Ø§Ù 
Ø¬ÙÙ/ÙÙÙÙØ³ (ØªØ³ÙÙ Ø¹Ø§Ø¯Ø© &rdquo;"
-"ØªÙØ²ÙØ¹Ø§Øª&ldquo;). ÙØ¹Ø¸ÙÙØ§ ØªØØªÙÙ Ø¨Ø±ÙØ¬ÙØ§Øª ØºÙØ± 
ØØ±Ø©&mdash;ÙØ·ÙØ±ÙÙØ§ ÙØªØ¨Ø¹ÙÙ Ø§ÙÙÙØ³ÙØ© "
-"Ø§ÙÙØµØ§ØØ¨Ø© ÙÙÙÙÙØ³ Ø¨Ø¯ÙØ§ ÙÙ ØªÙÙ Ø§ÙØªÙ ÙØ¬ÙÙ. ÙÙÙ 
ØªÙØ¬Ø¯ Ø£ÙØ¶Ø§ <a href=\"/distros\"> "
-"ØªÙØ²ÙØ¹Ø§Øª Ø¬ÙÙ/ÙÙÙÙØ³ ØØ±Ø© Ø¨Ø§ÙÙØ§ÙÙ</a>. ØªØ¯Ø¹Ù 
Ø¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù Ø§Ø«ÙØªÙÙ ÙÙ ÙØ°Ù "
-"Ø§ÙØªÙØ²ÙØ¹Ø§Øª ÙØ§Ø¯ÙÙØ§ ÙÙÙØ§ <a 
href=\"http://ututo.org\";>Ø£ØªÙØªÙ</a> Ù<a href="
-"\"http://gnewsense.org/\";>Ø¬Ù&#8204;ÙÙÙØ³ÙØ³</a>."
->>>>>>> 1.12
 
 # type: Content of: <p>
 msgid "Making a free GNU/Linux distribution is not just a matter of 
eliminating various non-free programs.  Nowadays, the usual version of Linux 
contains non-free programs too.  These programs are intended to be loaded into 
I/O devices when the system starts, and they are included, as long series of 
numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux 
distributions now entails maintaining a <a 
href=\"http://directory.fsf.org/project/linux\";> free version of Linux</a> too."
@@ -194,23 +154,8 @@
 msgstr " "
 
 # type: Content of: <div><p>
-<<<<<<< linux-and-gnu.ar.po
 msgid "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>.  There are also <a 
href=\"/contact/\">other ways to contact</a> the FSF.  <br /> Please send 
broken links and other corrections or suggestions to <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>."
 msgstr "ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù ÙØ¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù 
ÙÙØ§Ø³ØªÙØ³Ø§Ø±Ø§Øª Ø¬ÙÙ Ù<a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>. ÙÙØ¬Ø¯ Ø£ÙØ¶Ø§ <a 
href=\"/contact/\">Ø·Ø±Ù Ø£Ø®Ø±Ù ÙÙØ§ØªØµØ§Ù</a> 
Ø¨Ø§ÙØ¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù.  <br /> ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù Ø§ÙÙØµÙØ§Øª 
Ø§ÙÙÙÙØ·Ø¹Ø© ÙØ£Ù ØªØµØÙØØ§Øª Ø£Ù Ø§ÙØªØ±Ø§ØØ§Øª Ø¥ÙÙ <a 
href=\"mailto:address@hidden";><em>address@hidden</em></a>."
-=======
-msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
-"contact</a> the FSF.  <br /> Please send broken links and other corrections "
-"or suggestions to <a href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>."
-msgstr ""
-"ÙÙ ÙØ¶ÙÙ Ø£Ø±Ø³Ù ÙØ¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù ÙÙØ§Ø³ØªÙØ³Ø§Ø±Ø§Øª 
Ø¬ÙÙ Ù<a href=\"mailto:address@hidden";
-"org\">&lt;address@hidden&gt;</a>. ÙÙØ¬Ø¯ Ø£ÙØ¶Ø§ <a 
href=\"/contact/\">Ø·Ø±Ù Ø£Ø®Ø±Ù "
-"ÙÙØ§ØªØµØ§Ù</a> Ø¨Ø§ÙØ¥Ù&#8204;Ø¥Ø³&#8204;Ø¥Ù.  <br /> ÙÙ ÙØ¶ÙÙ 
Ø£Ø±Ø³Ù Ø§ÙÙØµÙØ§Øª Ø§ÙÙÙÙØ·Ø¹Ø© "
-"ÙØ£Ù ØªØµØÙØØ§Øª Ø£Ù Ø§ÙØªØ±Ø§ØØ§Øª Ø¥ÙÙ <a 
href=\"mailto:address@hidden";>&lt;"
-"address@hidden&gt;</a>."
->>>>>>> 1.12
 
 # type: Content of: <div><p>
 msgid "Please see the <a 
href=\"/server/standards/README.translations.html\">Translations README</a> for 
information on coordinating and submitting translations of this article."
[Prev in Thread]
Current Thread
[Next in Thread]
www/gnu/po gnu-history.ar.po gnu-users-never-he..., Hossam Hossny <=
Prev by Date: www/thankgnus 2009supporters.html
Next by Date: www/po home.ar.po
Previous by thread: www fry/po/happy-birthday-to-gnu-credits.ar.po ...
Next by thread: www/po home.ar.po
Index(es):
- Date
- Thread