Merge branch 'master' of https://salsa.debian.org/webmaster-team/webwml

1 files changed, 137 insertions, 139 deletions

diff --git a/slovak/po/organization.sk.po b/slovak/po/organization.sk.po
index 449c31ed658..38e100d79e6 100644
--- a/slovak/po/organization.sk.po
+++ b/slovak/po/organization.sk.po
@@ -130,27 +130,27 @@ msgid "Distribution"
 msgstr "Distribúcia"
 
 #: ../../english/intro/organization.data:72
-#: ../../english/intro/organization.data:209
+#: ../../english/intro/organization.data:203
 msgid "Communication and Outreach"
 msgstr "Komunikácia a PR"
 
 #: ../../english/intro/organization.data:74
-#: ../../english/intro/organization.data:212
+#: ../../english/intro/organization.data:206
 msgid "Data Protection team"
 msgstr ""
 
 #: ../../english/intro/organization.data:75
-#: ../../english/intro/organization.data:217
+#: ../../english/intro/organization.data:211
 msgid "Publicity team"
 msgstr "Marketingový tím"
 
 #: ../../english/intro/organization.data:77
-#: ../../english/intro/organization.data:290
+#: ../../english/intro/organization.data:284
 msgid "Membership in other organizations"
 msgstr ""
 
 #: ../../english/intro/organization.data:78
-#: ../../english/intro/organization.data:318
+#: ../../english/intro/organization.data:312
 msgid "Support and Infrastructure"
 msgstr "Podpora a infraštruktúra"
 
@@ -256,110 +256,110 @@ msgstr "Dokumentácia"
 msgid "Work-Needing and Prospective Packages list"
 msgstr "Balíky, ktoré potrebujú pomoc a perspektívne balíky"
 
-#: ../../english/intro/organization.data:220
+#: ../../english/intro/organization.data:214
 msgid "Press Contact"
 msgstr "Tlačový kontakt"
 
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:216
 msgid "Web Pages"
 msgstr "Webstránky"
 
-#: ../../english/intro/organization.data:234
+#: ../../english/intro/organization.data:228
 msgid "Planet Debian"
 msgstr "Planet Debian"
 
-#: ../../english/intro/organization.data:239
+#: ../../english/intro/organization.data:233
 msgid "Outreach"
 msgstr "PR"
 
-#: ../../english/intro/organization.data:244
+#: ../../english/intro/organization.data:238
 msgid "Debian Women Project"
 msgstr "Projekt Ženy Debianu"
 
-#: ../../english/intro/organization.data:252
+#: ../../english/intro/organization.data:246
 msgid "Community"
 msgstr ""
 
-#: ../../english/intro/organization.data:261
+#: ../../english/intro/organization.data:255
 msgid ""
 "To send a private message to all the members of the Community Team, use the "
 "GPG key <a href=\"community-team-pubkey.txt"
 "\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
 msgstr ""
 
-#: ../../english/intro/organization.data:263
+#: ../../english/intro/organization.data:257
 msgid "Events"
 msgstr "Udalosti"
 
-#: ../../english/intro/organization.data:270
+#: ../../english/intro/organization.data:264
 msgid "DebConf Committee"
 msgstr "Komisia DebConf"
 
-#: ../../english/intro/organization.data:277
+#: ../../english/intro/organization.data:271
 msgid "Partner Program"
 msgstr "Partnerský program"
 
-#: ../../english/intro/organization.data:281
+#: ../../english/intro/organization.data:275
 msgid "Hardware Donations Coordination"
 msgstr "Koordinácia darov hardvéru"
 
-#: ../../english/intro/organization.data:296
+#: ../../english/intro/organization.data:290
 msgid "GNOME Foundation"
 msgstr ""
 
-#: ../../english/intro/organization.data:298
+#: ../../english/intro/organization.data:292
 msgid "Linux Professional Institute"
 msgstr ""
 
-#: ../../english/intro/organization.data:300
+#: ../../english/intro/organization.data:294
 msgid "Linux Magazine"
 msgstr ""
 
-#: ../../english/intro/organization.data:302
+#: ../../english/intro/organization.data:296
 msgid "Linux Standards Base"
 msgstr ""
 
-#: ../../english/intro/organization.data:304
+#: ../../english/intro/organization.data:298
 msgid "Free Standards Group"
 msgstr ""
 
-#: ../../english/intro/organization.data:305
+#: ../../english/intro/organization.data:299
 msgid "SchoolForge"
 msgstr ""
 
-#: ../../english/intro/organization.data:308
+#: ../../english/intro/organization.data:302
 msgid ""
 "OASIS: Organization\n"
 "      for the Advancement of Structured Information Standards"
 msgstr ""
 
-#: ../../english/intro/organization.data:311
+#: ../../english/intro/organization.data:305
 msgid ""
 "OVAL: Open Vulnerability\n"
 "      Assessment Language"
 msgstr ""
 
-#: ../../english/intro/organization.data:314
+#: ../../english/intro/organization.data:308
 msgid "Open Source Initiative"
 msgstr ""
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:315
 msgid "Bug Tracking System"
 msgstr "Systém sledovania chýb"
 
-#: ../../english/intro/organization.data:326
+#: ../../english/intro/organization.data:320
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Správa konferencií a archívov konferencií"
 
-#: ../../english/intro/organization.data:335
+#: ../../english/intro/organization.data:329
 msgid "New Members Front Desk"
 msgstr "Recepcia nových členov"
 
-#: ../../english/intro/organization.data:341
+#: ../../english/intro/organization.data:335
 msgid "Debian Account Managers"
 msgstr "Správcovia účtov Debianu"
 
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:339
 msgid ""
 "To send a private message to all DAMs, use the GPG key "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
@@ -367,31 +367,23 @@ msgstr ""
 "Ak chcete poslať súkromnú správu všetkým DAM, použite kľúč GPG "
 "57731224A9762EA155AB2A530CA8D15BB24D96F2."
 
-#: ../../english/intro/organization.data:346
+#: ../../english/intro/organization.data:340
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Správcovia kľúčov (PGP a GPG)"
 
-#: ../../english/intro/organization.data:350
+#: ../../english/intro/organization.data:344
 msgid "Security Team"
 msgstr "Bezpečnostný tím"
 
-#: ../../english/intro/organization.data:361
-msgid "Consultants Page"
-msgstr "Stránka konzultantov"
-
-#: ../../english/intro/organization.data:366
-msgid "CD Vendors Page"
-msgstr "Stránka dodávateľov CD"
-
-#: ../../english/intro/organization.data:369
+#: ../../english/intro/organization.data:355
 msgid "Policy"
 msgstr "Politika"
 
-#: ../../english/intro/organization.data:372
+#: ../../english/intro/organization.data:358
 msgid "System Administration"
 msgstr "Správa systému"
 
-#: ../../english/intro/organization.data:373
+#: ../../english/intro/organization.data:359
 msgid ""
 "This is the address to use when encountering problems on one of Debian's "
 "machines, including password problems or you need a package installed."
@@ -400,7 +392,7 @@ msgstr ""
 "Debianu, aj v prípade že na nich potrebujete nainštalovať balík alebo máte "
 "problém s heslom."
 
-#: ../../english/intro/organization.data:383
+#: ../../english/intro/organization.data:369
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"https://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -410,162 +402,168 @@ msgstr ""
 "\"https://db.debian.org/machines.cgi\">Strojov Debianu</a>, mala by "
 "obsahovať informácie o správcovi každého zo strojov."
 
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:370
 msgid "LDAP Developer Directory Administrator"
 msgstr "Správca LDAP adresára vývojárov"
 
-#: ../../english/intro/organization.data:385
+#: ../../english/intro/organization.data:371
 msgid "Mirrors"
 msgstr "Zrkadlá"
 
-#: ../../english/intro/organization.data:392
+#: ../../english/intro/organization.data:378
 msgid "DNS Maintainer"
 msgstr "Správca DNS"
 
-#: ../../english/intro/organization.data:393
+#: ../../english/intro/organization.data:379
 msgid "Package Tracking System"
 msgstr "Systém sledovania balíkov"
 
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:381
 msgid "Treasurer"
 msgstr ""
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:388
 msgid ""
 "<a name=\"trademark\" href=\"m4_HOME/trademark\">Trademark</a> use requests"
 msgstr ""
 "Žiadosti o použitie <a name=\"trademark\" href=\"m4_HOME/trademark"
 "\">ochranných známok</a>"
 
-#: ../../english/intro/organization.data:406
+#: ../../english/intro/organization.data:392
 #, fuzzy
 msgid "Salsa administrators"
 msgstr "Správcovia Alioth"
 
-#~ msgid "Ports"
-#~ msgstr "Porty"
+#~ msgid "Anti-harassment"
+#~ msgstr "Boj proti obťažovaniu"
 
-#~ msgid "Special Configurations"
-#~ msgstr "Špeciálne konfigurácie"
+#~ msgid "Debian Pure Blends"
+#~ msgstr "Debian Pure Blends"
 
-#~ msgid "Laptops"
-#~ msgstr "Notebooky"
+#~ msgid "Individual Packages"
+#~ msgstr "Jednotlivé balíky"
 
-#~ msgid "Firewalls"
-#~ msgstr "Firewally"
+#~ msgid "Debian for children from 1 to 99"
+#~ msgstr "Debian pre deti od 1 do 99"
 
-#~ msgid "Embedded systems"
-#~ msgstr "Vnorené systémy"
+#~ msgid "Debian for medical practice and research"
+#~ msgstr "Debian pre medicínsku prax a výskum"
 
-#~ msgid "User support"
-#~ msgstr "Používateľská podpora"
+#~ msgid "Debian for education"
+#~ msgstr "Debian pre vzdelávanie"
 
-#~ msgid "Alioth administrators"
-#~ msgstr "Správcovia Alioth"
+#~ msgid "Debian in legal offices"
+#~ msgstr "Debian v právnických kanceláriách"
 
-#~ msgid "Testing Security Team"
-#~ msgstr "Bezpečnostný tím pre „testing“"
+#~ msgid "Debian for people with disabilities"
+#~ msgstr "Debian pre ľudí s postihnutiami"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "Projekt Bezpečnostný audit"
+#~ msgid "Debian for science and related research"
+#~ msgstr "Debian pre vedu a súvisiaci výskum"
 
-#~ msgid "current Debian Project Leader"
-#~ msgstr "súčasný líder projektu Debian"
+#, fuzzy
+#~| msgid "Debian for education"
+#~ msgid "Debian for astronomy"
+#~ msgstr "Debian pre vzdelávanie"
 
-#~ msgid ""
-#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
-#~ "www.buildd.net\">http://www.buildd.net</a>.  Choose an architecture and a "
-#~ "distribution to see the available buildd's and their admins."
-#~ msgstr ""
-#~ "Mená správcov jednotlivých buildd nájdete tiež na <a href=\"http://www."
-#~ "buildd.net\">http://www.buildd.net</a>.  Vyberte si architektúru a "
-#~ "distribúciu pre ktorú chcete zobraziť správcov buildd."
+#~ msgid "Live System Team"
+#~ msgstr "Tím Live systému"
 
-#~ msgid ""
-#~ "The admins responsible for buildd's for a particular arch can be reached "
-#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
-#~ "i386@buildd.debian.org>."
-#~ msgstr ""
-#~ "Správcov zodpovedajúcich za buildd konkrétnej architekúry môžete "
-#~ "zastihnúť na <genericemail arch@buildd.debian.org>, napr. <genericemail "
-#~ "i386@buildd.debian.org>."
+#~ msgid "Auditor"
+#~ msgstr "Auditor"
 
-#~ msgid "Debian for non-profit organisations"
-#~ msgstr "Debian pre neziskové organizácie"
+#~ msgid "Publicity"
+#~ msgstr "Publicita"
 
-#~ msgid "The Universal Operating System as your Desktop"
-#~ msgstr "Univerzálny operačný systém pre pracovnú stanicu"
+#~ msgid "Bits from Debian"
+#~ msgstr "Čriepky z Debianu"
 
-#~ msgid "Accountant"
-#~ msgstr "Účtovník"
+#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
+#~ msgstr "Tím správcov zväzku kľúčov správcov Debianu (DM)"
 
-#~ msgid "Release Team for ``stable''"
-#~ msgstr "Tím vydania „stable“"
+#~ msgid "DebConf chairs"
+#~ msgstr "Predsedovia DebConf"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "Prispôsobené distribúcie Debianu"
+#~ msgid "Volatile Team"
+#~ msgstr "Tím volatile"
 
-#~ msgid "Key Signing Coordination"
-#~ msgstr "Koordinácia podpisovania kľúčov"
+#~ msgid "Vendors"
+#~ msgstr "Dodávatelia"
+
+#~ msgid "Handhelds"
+#~ msgstr "Handheldy"
 
 #~ msgid "Marketing Team"
 #~ msgstr "Marketingový tím"
 
-#~ msgid "Handhelds"
-#~ msgstr "Handheldy"
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Koordinácia podpisovania kľúčov"
 
-#~ msgid "Vendors"
-#~ msgstr "Dodávatelia"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "Prispôsobené distribúcie Debianu"
 
-#~ msgid "Volatile Team"
-#~ msgstr "Tím volatile"
+#~ msgid "Release Team for ``stable''"
+#~ msgstr "Tím vydania „stable“"
 
-#~ msgid "DebConf chairs"
-#~ msgstr "Predsedovia DebConf"
+#~ msgid "Accountant"
+#~ msgstr "Účtovník"
 
-#~ msgid "Debian Maintainer (DM) Keyring Maintainers"
-#~ msgstr "Tím správcov zväzku kľúčov správcov Debianu (DM)"
+#~ msgid "The Universal Operating System as your Desktop"
+#~ msgstr "Univerzálny operačný systém pre pracovnú stanicu"
 
-#~ msgid "Bits from Debian"
-#~ msgstr "Čriepky z Debianu"
+#~ msgid "Debian for non-profit organisations"
+#~ msgstr "Debian pre neziskové organizácie"
 
-#~ msgid "Publicity"
-#~ msgstr "Publicita"
+#~ msgid ""
+#~ "The admins responsible for buildd's for a particular arch can be reached "
+#~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
+#~ "i386@buildd.debian.org>."
+#~ msgstr ""
+#~ "Správcov zodpovedajúcich za buildd konkrétnej architekúry môžete "
+#~ "zastihnúť na <genericemail arch@buildd.debian.org>, napr. <genericemail "
+#~ "i386@buildd.debian.org>."
 
-#~ msgid "Auditor"
-#~ msgstr "Auditor"
+#~ msgid ""
+#~ "Names of individual buildd's admins can also be found on <a href=\"http://"
+#~ "www.buildd.net\">http://www.buildd.net</a>.  Choose an architecture and a "
+#~ "distribution to see the available buildd's and their admins."
+#~ msgstr ""
+#~ "Mená správcov jednotlivých buildd nájdete tiež na <a href=\"http://www."
+#~ "buildd.net\">http://www.buildd.net</a>.  Vyberte si architektúru a "
+#~ "distribúciu pre ktorú chcete zobraziť správcov buildd."
 
-#~ msgid "Live System Team"
-#~ msgstr "Tím Live systému"
+#~ msgid "current Debian Project Leader"
+#~ msgstr "súčasný líder projektu Debian"
 
-#, fuzzy
-#~| msgid "Debian for education"
-#~ msgid "Debian for astronomy"
-#~ msgstr "Debian pre vzdelávanie"
+#~ msgid "Security Audit Project"
+#~ msgstr "Projekt Bezpečnostný audit"
 
-#~ msgid "Debian for science and related research"
-#~ msgstr "Debian pre vedu a súvisiaci výskum"
+#~ msgid "Testing Security Team"
+#~ msgstr "Bezpečnostný tím pre „testing“"
 
-#~ msgid "Debian for people with disabilities"
-#~ msgstr "Debian pre ľudí s postihnutiami"
+#~ msgid "Alioth administrators"
+#~ msgstr "Správcovia Alioth"
 
-#~ msgid "Debian in legal offices"
-#~ msgstr "Debian v právnických kanceláriách"
+#~ msgid "User support"
+#~ msgstr "Používateľská podpora"
 
-#~ msgid "Debian for education"
-#~ msgstr "Debian pre vzdelávanie"
+#~ msgid "Embedded systems"
+#~ msgstr "Vnorené systémy"
 
-#~ msgid "Debian for medical practice and research"
-#~ msgstr "Debian pre medicínsku prax a výskum"
+#~ msgid "Firewalls"
+#~ msgstr "Firewally"
 
-#~ msgid "Debian for children from 1 to 99"
-#~ msgstr "Debian pre deti od 1 do 99"
+#~ msgid "Laptops"
+#~ msgstr "Notebooky"
 
-#~ msgid "Individual Packages"
-#~ msgstr "Jednotlivé balíky"
+#~ msgid "Special Configurations"
+#~ msgstr "Špeciálne konfigurácie"
 
-#~ msgid "Debian Pure Blends"
-#~ msgstr "Debian Pure Blends"
+#~ msgid "Ports"
+#~ msgstr "Porty"
 
-#~ msgid "Anti-harassment"
-#~ msgstr "Boj proti obťažovaniu"
+#~ msgid "CD Vendors Page"
+#~ msgstr "Stránka dodávateľov CD"
+
+#~ msgid "Consultants Page"
+#~ msgstr "Stránka konzultantov"