diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /libs/gtkmm2ext/po/es.po | |
parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) |
fix merge conflicts with master
Diffstat (limited to 'libs/gtkmm2ext/po/es.po')
-rw-r--r-- | libs/gtkmm2ext/po/es.po | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/libs/gtkmm2ext/po/es.po b/libs/gtkmm2ext/po/es.po index 83f1910c3f..220c7501ee 100644 --- a/libs/gtkmm2ext/po/es.po +++ b/libs/gtkmm2ext/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtkmm2ext\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-09 12:26+0100\n" +"POT-Creation-Date: 2013-08-15 15:09-0400\n" "PO-Revision-Date: 2013-02-09 16:21+0100\n" "Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n" "Language-Team: Spanish\n" @@ -53,17 +53,11 @@ msgstr "Lo siento %1, no puedo hacer eso" msgid "Command" msgstr "" -#: keyboard.cc:69 -#: keyboard.cc:72 -#: keyboard.cc:85 -#: keyboard.cc:89 +#: keyboard.cc:69 keyboard.cc:72 keyboard.cc:85 keyboard.cc:89 msgid "Control" msgstr "" -#: keyboard.cc:70 -#: keyboard.cc:73 -#: keyboard.cc:87 -#: keyboard.cc:90 +#: keyboard.cc:70 keyboard.cc:73 keyboard.cc:87 keyboard.cc:90 msgid "Key|Shift" msgstr "" @@ -79,14 +73,15 @@ msgstr "" msgid "Meta" msgstr "" -#: keyboard.cc:134 -#: keyboard.cc:523 +#: keyboard.cc:139 keyboard.cc:531 msgid "Unknown" msgstr "" -#: keyboard.cc:534 +#: keyboard.cc:542 msgid "key bindings file not found at \"%2\" or contains errors." -msgstr "El archivo de combinaciones de teclado no se encontró en \"%2\" o contiene errores." +msgstr "" +"El archivo de combinaciones de teclado no se encontró en \"%2\" o contiene " +"errores." #: tearoff.cc:57 msgid "Click to tear this into its own window" |