verdnatura
/
hedera-account
Archived
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cambio de nombre y unos apaños en el formulario de e-mail

This commit is contained in:
Alejandro T. Colombini Gómez 2013-12-20 16:21:03 +01:00
parent 0611badf29
commit 8955b3a212
10 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -86,7 +86,7 @@ if test x"$UNINSTALLED" = x"yes"; then
--vapidir $(UNINSTALLED_DIR)/build/vapi ' --vapidir $(UNINSTALLED_DIR)/build/vapi '
AC_SUBST(account_libdir, $libdir/hedera/module) 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) AC_SUBST(querydir,$account_datadir/sql)
else else
PKG_CHECK_MODULES(ACCOUNT, [hedera]) PKG_CHECK_MODULES(ACCOUNT, [hedera])

2
data/Makefile.am
View File

@ -3,6 +3,6 @@ account_data_DATA = \
account.xml \ account.xml \
account.ui \ account.ui \
users.glade \ users.glade \
mail-alias.glade email.glade
EXTRA_DIST = $(management_data_DATA) EXTRA_DIST = $(management_data_DATA)

2
data/account.ui
View File

@ -3,7 +3,7 @@
<placeholder name="ModuleMenu"> <placeholder name="ModuleMenu">
<menu name="AccountMenu" action="action-menu-account"> <menu name="AccountMenu" action="action-menu-account">
<menuitem name="Users" action="open-users"/> <menuitem name="Users" action="open-users"/>
<menuitem name="MailAlias" action="open-mail-alias"/> <menuitem name="EMail" action="open-email"/>
</menu> </menu>
</placeholder> </placeholder>
</menubar> </menubar>

6
data/account.xml
View File

@ -12,9 +12,9 @@
accel="F2">Users</form> accel="F2">Users</form>
<form <form
translatable="yes" translatable="yes"
name="mail-alias" name="email"
icon="mail-mark-unread" icon="mail-mark-unread"
action-name="open-mail-alias" action-name="open-email"
accel="F3">Mail Alias</form> accel="F3">E-Mail</form>
</form-group> </form-group>
</module> </module>

19
data/mail-alias.glade → data/email.glade
View File

@ -4,13 +4,13 @@
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="VnBatch" id="iterators"> <object class="VnBatch" id="iterators">
<child> <child>
<object class="VnIterator" id="alias"> <object class="VnIterator" id="child">
<property name="model">model-alias</property> <property name="model">model-child</property>
</object> </object>
</child> </child>
<child> <child>
<object class="VnIterator" id="child"> <object class="VnIterator" id="alias">
<property name="model">model-child</property> <property name="model">model-alias</property>
</object> </object>
</child> </child>
</object> </object>
@ -54,6 +54,7 @@
<object class="VnColumnEntry" id="column-alias"> <object class="VnColumnEntry" id="column-alias">
<property name="title" translatable="yes">Alias</property> <property name="title" translatable="yes">Alias</property>
<property name="column_name">alias</property> <property name="column_name">alias</property>
<property name="editable">True</property>
</object> </object>
</child> </child>
</object> </object>
@ -157,15 +158,15 @@
</child> </child>
</object> </object>
<object class="VnBatch" id="models"> <object class="VnBatch" id="models">
<child>
<object class="DbModel" id="model-alias">
<property name="sql">SELECT id, alias FROM mail_alias</property>
</object>
</child>
<child> <child>
<object class="DbModel" id="model-child"> <object class="DbModel" id="model-child">
<property name="sql">SELECT parent, child FROM mail_alias_child WHERE #p</property> <property name="sql">SELECT parent, child FROM mail_alias_child WHERE #p</property>
</object> </object>
</child> </child>
<child>
<object class="DbModel" id="model-alias">
<property name="sql">SELECT id, alias FROM mail_alias</property>
</object>
</child>
</object> </object>
</interface> </interface>

4
po/POTFILES.in
View File

@ -6,5 +6,5 @@ src/account.vala
src/users.vala src/users.vala
data/users.glade data/users.glade
src/mail-alias.vala src/email.vala
data/mail-alias.glade data/email.glade

2
po/POTFILES.skip
View File

@ -2,4 +2,4 @@
src/account.c src/account.c
src/users.c src/users.c
src/mail-alias.c src/email.c

22
po/es.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2013-09-24 12:09+0200\n"
"Last-Translator: Alejandro T. Colombini <atcolombini@verdnatura.es>\n" "Last-Translator: Alejandro T. Colombini <atcolombini@verdnatura.es>\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -31,12 +31,8 @@ msgid "Users"
msgstr "Usuarios" msgstr "Usuarios"
#: ../data/account.xml.h:4 #: ../data/account.xml.h:4
msgid "Mail Alias" msgid "E-Mail"
msgstr "Alias de correo" msgstr "E-Mail"
#: ../data/account.xml.h:5
msgid "Queries"
msgstr "Consultas"
#: ../src/users.vala:87 #: ../src/users.vala:87
msgid "The password can't be empty." msgid "The password can't be empty."
@ -106,7 +102,7 @@ msgstr "Expira:"
msgid "Account" msgid "Account"
msgstr "Cuenta" 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" msgid "Alias"
msgstr "Alias" msgstr "Alias"
@ -123,21 +119,17 @@ msgid "Secret:"
msgstr "Clave:" msgstr "Clave:"
#: ../data/users.glade.h:19 #: ../data/users.glade.h:19
msgid "Call group:"
msgstr "Call group:"
#: ../data/users.glade.h:20
msgid "SIP" msgid "SIP"
msgstr "SIP" msgstr "SIP"
#: ../data/users.glade.h:21 #: ../data/users.glade.h:20
msgid "Change password" msgid "Change password"
msgstr "Cambiar contraseña" msgstr "Cambiar contraseña"
#: ../data/users.glade.h:22 #: ../data/users.glade.h:21
msgid "Repeat password:" msgid "Repeat password:"
msgstr "Repetir contraseña:" msgstr "Repetir contraseña:"
#: ../data/mail-alias.glade.h:2 #: ../data/email.glade.h:2
msgid "Children" msgid "Children"
msgstr "Hijos" msgstr "Hijos"

4
src/Makefile.am
View File

@ -7,12 +7,12 @@ libaccount_la_SOURCES = \
config.vapi \ config.vapi \
account.vala \ account.vala \
users.vala \ users.vala \
mail-alias.vala email.vala
libaccount_la_LIBADD = $(ACCOUNT_LIBS) libaccount_la_LIBADD = $(ACCOUNT_LIBS)
libaccount_la_LDFLAGS = \ libaccount_la_LDFLAGS = \
-avoid-version \ -avoid-version \
-Wl,--export-dynamic -export-dynamic
libaccount_la_CPPFLAGS = \ libaccount_la_CPPFLAGS = \
-DPACKAGE_DATA_DIR=\"$(ACCOUNT_datadir)\" \ -DPACKAGE_DATA_DIR=\"$(ACCOUNT_datadir)\" \

2
src/mail-alias.vala → src/email.vala
View File

@ -17,7 +17,7 @@
using Gtk; using Gtk;
public class Vn.MailAlias : Vn.Form public class Vn.EMail : Vn.Form
{ {
public override void open (Gtk.Builder builder) public override void open (Gtk.Builder builder)
{ {