Merge branch 'backport' into work

Conflicts:

	openbox/actions/execute.c

1 files changed, 15 insertions, 9 deletions

diff --git a/po/es.po b/po/es.po
index af8bbe03..71e06a4d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.6.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-02-27 04:52+0100\n"
+"POT-Creation-Date: 2008-02-27 21:03-0500\n"
 "PO-Revision-Date: 2008-02-19 00:15+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: español <es@li.org>\n"
@@ -24,16 +24,28 @@ msgstr ""
 msgid "Invalid action \"%s\" requested. No such action exists."
 msgstr "La acción \"%s\" solicitada es inválida. No existe tal acción."
 
-#: openbox/actions/execute.c:92
+#: openbox/actions/execute.c:130 openbox/actions/exit.c:46
+msgid "No"
+msgstr "No"
+
+#: openbox/actions/execute.c:131 openbox/actions/exit.c:47
+msgid "Yes"
+msgstr "Sí"
+
+#: openbox/actions/execute.c:143
 #, c-format
 msgid "Failed to convert the path \"%s\" from utf8"
 msgstr "Falló al convertir la ruta \"%s\" desde utf8"
 
-#: openbox/actions/execute.c:101 openbox/actions/execute.c:120
+#: openbox/actions/execute.c:152 openbox/actions/execute.c:171
 #, c-format
 msgid "Failed to execute \"%s\": %s"
 msgstr "Falló al ejecutar \"%s\": %s"
 
+#: openbox/actions/exit.c:50
+msgid "Are you sure you want to exit Openbox?"
+msgstr ""
+
 #: openbox/client.c:1996
 msgid "Unnamed Window"
 msgstr ""
@@ -430,11 +442,5 @@ msgstr "Error en X: %s"
 msgid "OK"
 msgstr "OK"
 
-#~ msgid "No"
-#~ msgstr "No"
-
-#~ msgid "Yes"
-#~ msgstr "Sí"
-
 #~ msgid "Invalid use of action \"%s\". Action will be ignored."
 #~ msgstr "Uso inválido de la acción \"%s\". La acción sera ignorada."