merge updated translations from l10n

This includes an (almost) up-to-date French basewiki translation.

1 files changed, 57 insertions, 21 deletions

diff --git a/po/underlays/basewiki/shortcuts.es.po b/po/underlays/basewiki/shortcuts.es.po
index 8ac3759f5..10c26023f 100644
--- a/po/underlays/basewiki/shortcuts.es.po
+++ b/po/underlays/basewiki/shortcuts.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-08-17 01:02+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
@@ -61,7 +61,8 @@ msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
 
 #. type: Bullet: '* '
 msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
-msgstr "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgstr ""
+"[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
 
 #. type: Bullet: '* '
 msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
@@ -76,8 +77,15 @@ msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
-msgstr "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
+#| "\"]]"
+msgid ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
+msgstr ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""
@@ -100,8 +108,10 @@ msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
-msgstr "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgid ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgstr ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""
@@ -112,7 +122,42 @@ msgstr ""
 "\"]]"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
@@ -148,6 +193,8 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Uso: `\\[[!debss package]]`, `\\[[!debss package#version]]`, o `\\[[!debss package/version]]`. Para más detalles, vea http://snapshot.debian.net .\n"
@@ -185,11 +232,6 @@ msgstr ""
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 
 #. type: Plain text
-#| msgid ""
-#| "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the "
-#| "url, \"%s\" is replaced with the text passed to the named shortcut, after "
-#| "url-encoding it, and '%S' is replaced with the raw, non-encoded text. The "
-#| "optional `desc` parameter controls the description of the link."
 msgid ""
 "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
 "\"%s\" is replaced with the text passed to the named shortcut, after [[!"
@@ -198,9 +240,9 @@ msgid ""
 msgstr ""
 "Para añadir un nuevo atajo, utilice la [[directiva|ikiwiki/directive]] "
 "`shortcut`. En el url, «%s» se reemplaza con el texto que se pasa al atajo "
-"nombrado, después de codificarlo mediante el [[!wikipedia url_encoding]], y «%S» se "
-"reemplaza con el texto en bruto, no codificado. El parámetro opcional `desc` "
-"controla la descripción del enlace."
+"nombrado, después de codificarlo mediante el [[!wikipedia url_encoding]], y «%"
+"S» se reemplaza con el texto en bruto, no codificado. El parámetro opcional "
+"`desc` controla la descripción del enlace."
 
 #. type: Plain text
 msgid ""
@@ -215,11 +257,6 @@ msgstr ""
 "un parámetro `desc` que anulará la que se proporcione en la definición."
 
 #. type: Plain text
-#| msgid ""
-#| "If you come up with a shortcut that you think others might find useful, "
-#| "consider contributing it to the [shortcuts page on the ikiwiki ikiwiki]"
-#| "(http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki will "
-#| "include your shortcut in the standard underlay."
 msgid ""
 "If you come up with a shortcut that you think others might find useful, "
 "consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
@@ -230,4 +267,3 @@ msgstr ""
 "aportarlo a la [página de atajos en el wiki ikiwiki](http://ikiwiki.info/"
 "shortcuts/), de tal modo que futuras versiones de ikiwiki puedan incluir su "
 "atajo en la base estándar."
-