Author: robin_listas Date: 2015-09-14 17:03:26 +0200 (Mon, 14 Sep 2015) New Revision: 92700 Modified: trunk/yast/es/po/audit-laf.es.po Log: conflict solving Modified: trunk/yast/es/po/audit-laf.es.po =================================================================== --- trunk/yast/es/po/audit-laf.es.po 2015-09-14 14:46:25 UTC (rev 92699) +++ trunk/yast/es/po/audit-laf.es.po 2015-09-14 15:03:26 UTC (rev 92700) @@ -9,14 +9,13 @@ # Jordi Jaen Pallares <jordi@suse.de>, 1999, 2000, 2001. # Pablo Iranzo Gómez <Pablo.Iranzo@uv.es>, 2000. # Carlos E. Robinson M. <carlos.e.r@opensuse.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. -# Carlos E. R. <robin_listas@no-mx.forums.opensuse.org>, 2014. msgid "" msgstr "" "Project-Id-Version: audit-laf.es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-28 03:12+0100\n" -"Last-Translator: Carlos E. R. <robin_listas@no-mx.forums.opensuse.org>\n" +"Last-Translator: Carlos E. Robinson M. <carlos.e.r@opensuse.org>\n" "Language-Team: Spanish <opensuse-translation-es@opensuse.org>\n" "Language: es\n" "MIME-Version: 1.0\n"