From 8955b3a21249ed7edf204ffde76288d385c0c3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20T=2E=20Colombini=20G=C3=B3mez?= Date: Fri, 20 Dec 2013 16:21:03 +0100 Subject: [PATCH] =?UTF-8?q?Cambio=20de=20nombre=20y=20unos=20apa=C3=B1os?= =?UTF-8?q?=20en=20el=20formulario=20de=20e-mail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure.ac | 2 +- data/Makefile.am | 2 +- data/account.ui | 2 +- data/account.xml | 6 +++--- data/{mail-alias.glade => email.glade} | 19 ++++++++++--------- po/POTFILES.in | 4 ++-- po/POTFILES.skip | 2 +- po/es.po | 22 +++++++--------------- src/Makefile.am | 4 ++-- src/{mail-alias.vala => email.vala} | 4 ++-- 10 files changed, 30 insertions(+), 37 deletions(-) rename data/{mail-alias.glade => email.glade} (99%) rename src/{mail-alias.vala => email.vala} (96%) diff --git a/configure.ac b/configure.ac index aea1f7f..995cea0 100644 --- a/configure.ac +++ b/configure.ac @@ -86,7 +86,7 @@ if test x"$UNINSTALLED" = x"yes"; then --vapidir $(UNINSTALLED_DIR)/build/vapi ' AC_SUBST(account_libdir, $libdir/hedera/module) - AC_SUBST(account_datadir,$datadir/hedera/module) + AC_SUBST(account_datadir, $datadir/hedera/module) AC_SUBST(querydir,$account_datadir/sql) else PKG_CHECK_MODULES(ACCOUNT, [hedera]) diff --git a/data/Makefile.am b/data/Makefile.am index e74a7a8..8683a25 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -3,6 +3,6 @@ account_data_DATA = \ account.xml \ account.ui \ users.glade \ - mail-alias.glade + email.glade EXTRA_DIST = $(management_data_DATA) diff --git a/data/account.ui b/data/account.ui index d26d8e8..6eb9fa5 100644 --- a/data/account.ui +++ b/data/account.ui @@ -3,7 +3,7 @@ - + diff --git a/data/account.xml b/data/account.xml index 5e43ba7..dbd0845 100644 --- a/data/account.xml +++ b/data/account.xml @@ -12,9 +12,9 @@ accel="F2">Users
Mail Alias
+ action-name="open-email" + accel="F3">E-Mail diff --git a/data/mail-alias.glade b/data/email.glade similarity index 99% rename from data/mail-alias.glade rename to data/email.glade index fc59fa5..d775ccf 100644 --- a/data/mail-alias.glade +++ b/data/email.glade @@ -4,13 +4,13 @@ - - model-alias + + model-child - - model-child + + model-alias @@ -54,6 +54,7 @@ Alias alias + True @@ -157,15 +158,15 @@ - - - SELECT id, alias FROM mail_alias - - SELECT parent, child FROM mail_alias_child WHERE #p + + + SELECT id, alias FROM mail_alias + + diff --git a/po/POTFILES.in b/po/POTFILES.in index 7abbfcd..8cabe3a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,5 +6,5 @@ src/account.vala src/users.vala data/users.glade -src/mail-alias.vala -data/mail-alias.glade +src/email.vala +data/email.glade diff --git a/po/POTFILES.skip b/po/POTFILES.skip index e68b995..83d41bb 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -2,4 +2,4 @@ src/account.c src/users.c -src/mail-alias.c +src/email.c diff --git a/po/es.po b/po/es.po index 769048e..d960405 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-18 10:54+0100\n" +"POT-Creation-Date: 2013-12-20 16:14+0100\n" "PO-Revision-Date: 2013-09-24 12:09+0200\n" "Last-Translator: Alejandro T. Colombini \n" "Language-Team: none\n" @@ -31,12 +31,8 @@ msgid "Users" msgstr "Usuarios" #: ../data/account.xml.h:4 -msgid "Mail Alias" -msgstr "Alias de correo" - -#: ../data/account.xml.h:5 -msgid "Queries" -msgstr "Consultas" +msgid "E-Mail" +msgstr "E-Mail" #: ../src/users.vala:87 msgid "The password can't be empty." @@ -106,7 +102,7 @@ msgstr "Expira:" msgid "Account" msgstr "Cuenta" -#: ../data/users.glade.h:15 ../data/mail-alias.glade.h:1 +#: ../data/users.glade.h:15 ../data/email.glade.h:1 msgid "Alias" msgstr "Alias" @@ -123,21 +119,17 @@ msgid "Secret:" msgstr "Clave:" #: ../data/users.glade.h:19 -msgid "Call group:" -msgstr "Call group:" - -#: ../data/users.glade.h:20 msgid "SIP" msgstr "SIP" -#: ../data/users.glade.h:21 +#: ../data/users.glade.h:20 msgid "Change password" msgstr "Cambiar contraseƱa" -#: ../data/users.glade.h:22 +#: ../data/users.glade.h:21 msgid "Repeat password:" msgstr "Repetir contraseƱa:" -#: ../data/mail-alias.glade.h:2 +#: ../data/email.glade.h:2 msgid "Children" msgstr "Hijos" diff --git a/src/Makefile.am b/src/Makefile.am index 24f5c4d..ee1da0d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,12 +7,12 @@ libaccount_la_SOURCES = \ config.vapi \ account.vala \ users.vala \ - mail-alias.vala + email.vala libaccount_la_LIBADD = $(ACCOUNT_LIBS) libaccount_la_LDFLAGS = \ -avoid-version \ - -Wl,--export-dynamic + -export-dynamic libaccount_la_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\"$(ACCOUNT_datadir)\" \ diff --git a/src/mail-alias.vala b/src/email.vala similarity index 96% rename from src/mail-alias.vala rename to src/email.vala index c51791c..24f8664 100644 --- a/src/mail-alias.vala +++ b/src/email.vala @@ -17,7 +17,7 @@ using Gtk; -public class Vn.MailAlias : Vn.Form +public class Vn.EMail : Vn.Form { public override void open (Gtk.Builder builder) { @@ -26,4 +26,4 @@ public class Vn.MailAlias : Vn.Form child.link ("parent", alias, "id"); } -} \ No newline at end of file +}