From 9e15be3b0cdeba44bc003ef9a7958b51391f435b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20T=2E=20Colombini=20G=C3=B3mez?= Date: Wed, 25 Jun 2014 13:52:17 +0200 Subject: [PATCH] VnGui: - Ya no existe ventana principal. --- po/POTFILES.in | 2 - po/ca.po | 496 +++++++++++++++++++++++------------- po/es.po | 519 ++++++++++++++++++++++++++------------ po/nl.po | 478 +++++++++++++++++++++++------------ vn/Makefile.am | 2 - vn/gui/actions.glade | 62 ----- vn/gui/child-window.glade | 26 -- vn/gui/main.glade | 43 ++-- vn/gui/menu.glade | 7 + vn/vn-gui.c | 242 ++++++++---------- vn/vn-gui.h | 2 - 11 files changed, 1127 insertions(+), 752 deletions(-) delete mode 100644 vn/gui/actions.glade delete mode 100644 vn/gui/child-window.glade diff --git a/po/POTFILES.in b/po/POTFILES.in index bb5d729..7802bab 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -52,8 +52,6 @@ vn/column/vn-column-image.c vn/gui/login.glade vn/gui/main.glade vn/gui/menu.glade -vn/gui/child-window.glade -vn/gui/actions.glade vn/gui/date-chooser.glade glade/glade-db-model.c diff --git a/po/ca.po b/po/ca.po index 152855d..faef3e2 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hedera 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-10 12:46+0200\n" +"POT-Creation-Date: 2014-06-25 16:41+0200\n" "PO-Revision-Date: 2013-06-04 13:38+0200\n" "Last-Translator: Alejandro T. Colombini Gómez \n" "Language-Team: Catalan\n" @@ -31,7 +31,7 @@ msgstr "El parametre no pot ser nul" msgid "Incompatible type for this param" msgstr "Tipus incompatible per a aquest parametre" -#: ../gvn/gvn-param.c:443 ../sql/sql-value.c:235 ../vn/vn-field.c:538 +#: ../gvn/gvn-param.c:443 ../sql/sql-value.c:252 ../vn/vn-field.c:538 msgid "Value" msgstr "" @@ -116,34 +116,214 @@ msgstr "" msgid "No" msgstr "" -#: ../sql/sql-render.c:413 +#: ../sql/sql-render.c:430 msgid "Delimiter" msgstr "" -#: ../sql/sql-render.c:414 +#: ../sql/sql-render.c:431 msgid "The character used for delimite the name of fields, tables..." msgstr "" -#: ../sql/sql-value.c:228 ../glade/glade-db-model.c:525 +#: ../sql/sql-value.c:245 ../glade/glade-db-model.c:546 msgid "Param" msgstr "" -#: ../sql/sql-value.c:229 +#: ../sql/sql-value.c:246 msgid "The param which is linked" msgstr "" -#: ../sql/sql-value.c:236 +#: ../sql/sql-value.c:253 msgid "The value" msgstr "" -#: ../sql/sql-string.c:198 ../db/db-model.c:3455 ../db/db-request.c:461 +#: ../sql/sql-string.c:188 ../db/db-model.c:3304 ../db/db-request.c:449 msgid "SQL" msgstr "" -#: ../sql/sql-string.c:199 +#: ../sql/sql-string.c:189 msgid "An arbitrary SQL string" msgstr "" +#: ../sql/sql-delete.c:105 +msgid "Tables" +msgstr "" + +#: ../sql/sql-delete.c:106 +msgid "A list of tables" +msgstr "" + +#: ../sql/sql-dml.c:106 +msgid "Targets" +msgstr "" + +#: ../sql/sql-dml.c:107 +msgid "A list of targets" +msgstr "" + +#: ../sql/sql-dml.c:113 +msgid "Where" +msgstr "" + +#: ../sql/sql-dml.c:114 +msgid "The WHERE section of an statement" +msgstr "" + +#: ../sql/sql-field.c:239 ../sql/sql-function.c:127 ../vn/vn-form.c:231 +msgid "Name" +msgstr "" + +#: ../sql/sql-field.c:240 +#, fuzzy +msgid "The column name" +msgstr "Nom de la columna" + +#: ../sql/sql-field.c:246 +msgid "Target" +msgstr "" + +#: ../sql/sql-field.c:247 +#, fuzzy +msgid "The target name" +msgstr "Nom d'usuari" + +#: ../sql/sql-field.c:253 ../sql/sql-function.c:134 +msgid "Schema" +msgstr "" + +#: ../sql/sql-field.c:254 +#, fuzzy +msgid "The schema name" +msgstr "Nom d'usuari" + +#: ../sql/sql-function.c:128 +#, fuzzy +msgid "The function name" +msgstr "Nom d'usuari" + +#: ../sql/sql-function.c:135 +msgid "The schema to which the function belongs" +msgstr "" + +#: ../sql/sql-function.c:141 +msgid "Parameters" +msgstr "" + +#: ../sql/sql-function.c:142 +msgid "The function parameters" +msgstr "" + +#: ../sql/sql-holder.c:124 +msgid "Identifier" +msgstr "" + +#: ../sql/sql-holder.c:125 +msgid "The holder identifier" +msgstr "" + +#: ../sql/sql-insert.c:151 +msgid "Table" +msgstr "" + +#: ../sql/sql-insert.c:152 +msgid "The table where the row is inserted" +msgstr "" + +#: ../sql/sql-insert.c:158 ../sql/sql-select.c:256 +msgid "Fields" +msgstr "" + +#: ../sql/sql-insert.c:159 ../sql/sql-select.c:257 +msgid "The list of fields" +msgstr "" + +#: ../sql/sql-insert.c:165 +msgid "Values" +msgstr "" + +#: ../sql/sql-insert.c:166 +msgid "The list of values" +msgstr "" + +#: ../sql/sql-list.c:301 +msgid "Length" +msgstr "" + +#: ../sql/sql-list.c:302 +msgid "The length of the list" +msgstr "" + +#: ../sql/sql-list.c:308 +msgid "GType" +msgstr "" + +#: ../sql/sql-list.c:309 +msgid "The allowed type for the items" +msgstr "" + +#: ../sql/sql-select.c:249 +msgid "Distinct" +msgstr "" + +#: ../sql/sql-select.c:250 +msgid "Determines if the #SqlSelect uses the DISTINCT clause" +msgstr "" + +#: ../sql/sql-select.c:263 +msgid "Group" +msgstr "" + +#: ../sql/sql-select.c:264 +msgid "The GROUP BY section" +msgstr "" + +#: ../sql/sql-select.c:270 +msgid "Having" +msgstr "" + +#: ../sql/sql-select.c:271 +msgid "The HAVING clause" +msgstr "" + +#: ../sql/sql-select.c:277 +msgid "Order" +msgstr "" + +#: ../sql/sql-select.c:278 +msgid "The ORDER BY section" +msgstr "" + +#: ../sql/sql-select.c:284 +msgid "Limit count" +msgstr "" + +#: ../sql/sql-select.c:285 +msgid "The COUNT field of the LIMIT clause" +msgstr "" + +#: ../sql/sql-select.c:291 +msgid "Limit offset" +msgstr "" + +#: ../sql/sql-select.c:292 +msgid "The OFFSET field of the LIMIT clause" +msgstr "" + +#: ../sql/sql-select.c:298 +msgid "Next" +msgstr "" + +#: ../sql/sql-select.c:299 +msgid "The next #SqlSelect in case of a statement with more than one" +msgstr "" + +#: ../sql/sql-select.c:305 +msgid "Type" +msgstr "" + +#: ../sql/sql-select.c:306 +msgid "One of the possible options of #SqlSelectType" +msgstr "" + #: ../plugin/mysql/db-mysql.c:68 ../plugin/pg/db-pg.c:111 #, c-format msgid "Can't allocate the needed memory" @@ -162,65 +342,75 @@ msgstr "Recordar" msgid "Wether to rememeber the selection when model is refreshed" msgstr "" -#: ../db/db-model.c:3429 ../db/db-request.c:454 ../vn/vn-gui.c:1470 +#: ../db/db-model.c:3278 ../db/db-request.c:442 ../vn/vn-gui.c:1443 #: ../vn/vn-form.c:245 msgid "Connection" msgstr "" -#: ../db/db-model.c:3430 +#: ../db/db-model.c:3279 msgid "The DbConn that manages the connection to the database" msgstr "" -#: ../db/db-model.c:3437 ../db/db-request.c:468 +#: ../db/db-model.c:3286 msgid "Statement" msgstr "" -#: ../db/db-model.c:3438 +#: ../db/db-model.c:3287 msgid "The statement which retrieves the data" msgstr "" -#: ../db/db-model.c:3445 +#: ../db/db-model.c:3294 msgid "Use file" msgstr "" -#: ../db/db-model.c:3446 +#: ../db/db-model.c:3295 msgid "" "If this is set to TRUE, the \"sql\" property will hold the name of a file " "containing a query, if set to FALSE, \"sql\" is used as an SQL string" msgstr "" -#: ../db/db-model.c:3456 +#: ../db/db-model.c:3305 msgid "" "Depending on the \"use-file\" property this will be the path to a file with " "queries for the model or a SQL string" msgstr "" -#: ../db/db-model.c:3465 +#: ../db/db-model.c:3314 msgid "Main Table" msgstr "" -#: ../db/db-model.c:3466 +#: ../db/db-model.c:3315 msgid "The main table of the model" msgstr "" -#: ../db/db-model.c:3473 +#: ../db/db-model.c:3322 msgid "Update flags" msgstr "" -#: ../db/db-model.c:3474 +#: ../db/db-model.c:3323 msgid "The flags that indicate how a model can be modified" msgstr "" -#: ../db/db-model.c:3482 +#: ../db/db-model.c:3331 msgid "Result position" msgstr "" -#: ../db/db-model.c:3483 +#: ../db/db-model.c:3332 msgid "" "The position where the query that will fill the model will be placed in a " "multi-query" msgstr "" +#: ../db/db-model.c:3342 +msgid "Partial delete" +msgstr "" + +#: ../db/db-model.c:3343 +msgid "" +"When a row is deleted set all the fields from the table to null rather than " +"delete it." +msgstr "" + #: ../db/db-model-holder.c:71 ../db/db-calc.c:329 msgid "Model" msgstr "" @@ -257,7 +447,7 @@ msgstr "" msgid "The user provided data for the function" msgstr "" -#: ../db/db-calc.c:360 ../glade/glade-db-model.c:516 +#: ../db/db-calc.c:360 ../glade/glade-db-model.c:537 msgid "Column" msgstr "" @@ -309,77 +499,73 @@ msgstr "" msgid "The query is empty." msgstr "" -#: ../db/db-conn.c:1041 +#: ../db/db-conn.c:1048 msgid "Plugin" msgstr "" -#: ../db/db-conn.c:1042 +#: ../db/db-conn.c:1049 msgid "The name of the plugin" msgstr "" -#: ../db/db-conn.c:1048 +#: ../db/db-conn.c:1055 msgid "Query path" msgstr "" -#: ../db/db-conn.c:1049 +#: ../db/db-conn.c:1056 msgid "The path where query files are located" msgstr "" -#: ../db/db-conn.c:1055 ../db/db-file-loader.c:716 +#: ../db/db-conn.c:1062 ../db/db-file-loader.c:716 #: ../vn/column/vn-column-image.c:493 msgid "Host" msgstr "" -#: ../db/db-conn.c:1056 +#: ../db/db-conn.c:1063 msgid "The host name to connect to" msgstr "" -#: ../db/db-conn.c:1062 +#: ../db/db-conn.c:1069 msgid "User" msgstr "Usuari" -#: ../db/db-conn.c:1063 +#: ../db/db-conn.c:1070 msgid "The user name" msgstr "Nom d'usuari" -#: ../db/db-conn.c:1069 +#: ../db/db-conn.c:1076 msgid "DB name" msgstr "" -#: ../db/db-conn.c:1070 +#: ../db/db-conn.c:1077 msgid "The default schema" msgstr "" -#: ../db/db-request.c:311 +#: ../db/db-request.c:317 #, c-format msgid "The request was canceled" msgstr "" -#: ../db/db-request.c:455 +#: ../db/db-request.c:443 msgid "The connection used to render and execute the query" msgstr "" -#: ../db/db-request.c:462 +#: ../db/db-request.c:450 msgid "The SQL query to execute" msgstr "" -#: ../db/db-request.c:469 -msgid "The statement to execute" -msgstr "" - -#: ../db/db-request.c:475 +#: ../db/db-request.c:456 msgid "Result" msgstr "" -#: ../db/db-request.c:476 +#: ../db/db-request.c:457 msgid "The result data of the query" msgstr "" -#: ../db/db-request.c:482 +#: ../db/db-request.c:463 msgid "Error" msgstr "" -#: ../db/db-request.c:483 +#: ../db/db-request.c:464 msgid "The GError, if an error ocurred" msgstr "" @@ -439,43 +625,43 @@ msgstr "" msgid "Unknown error" msgstr "" -#: ../vn/vn-gui.c:865 +#: ../vn/vn-gui.c:880 msgid "Closing connection" msgstr "" -#: ../vn/vn-gui.c:867 +#: ../vn/vn-gui.c:882 msgid "Transaction started" msgstr "" -#: ../vn/vn-gui.c:869 +#: ../vn/vn-gui.c:884 msgid "Connecting" msgstr "" -#: ../vn/vn-gui.c:871 +#: ../vn/vn-gui.c:886 msgid "Connection lost" msgstr "" -#: ../vn/vn-gui.c:873 +#: ../vn/vn-gui.c:888 msgid "Connection closed" msgstr "" -#: ../vn/vn-gui.c:875 ../vn/field/vn-http-image.c:116 +#: ../vn/vn-gui.c:890 ../vn/field/vn-http-image.c:116 msgid "Loading" msgstr "" -#: ../vn/vn-gui.c:877 ../vn/gui/main.glade.h:2 +#: ../vn/vn-gui.c:892 msgid "Ready" msgstr "" -#: ../vn/vn-gui.c:1471 +#: ../vn/vn-gui.c:1444 msgid "The connection used by Gui" msgstr "" -#: ../vn/vn-gui.c:1477 +#: ../vn/vn-gui.c:1450 msgid "Application" msgstr "" -#: ../vn/vn-gui.c:1478 +#: ../vn/vn-gui.c:1451 msgid "The application handler for the entire program" msgstr "" @@ -483,74 +669,70 @@ msgstr "" msgid "The iterator used by VnGrid" msgstr "" -#: ../vn/vn-handler.c:73 +#: ../vn/vn-handler.c:74 msgid "Are you sure you want to delete the current selection?" msgstr "" -#: ../vn/vn-handler.c:81 +#: ../vn/vn-handler.c:82 msgid "Are you sure you want to save the changes?" msgstr "" -#: ../vn/vn-handler.c:87 +#: ../vn/vn-handler.c:88 msgid "Are you sure you want to undo all changes?" msgstr "" -#: ../vn/vn-handler.c:213 +#: ../vn/vn-handler.c:214 msgid "Undo changes" msgstr "" -#: ../vn/vn-handler.c:216 +#: ../vn/vn-handler.c:217 msgid "Save changes" msgstr "" -#: ../vn/vn-handler.c:219 +#: ../vn/vn-handler.c:220 msgid "Refresh data" msgstr "" -#: ../vn/vn-handler.c:222 +#: ../vn/vn-handler.c:223 msgid "Remove record" msgstr "" -#: ../vn/vn-handler.c:225 +#: ../vn/vn-handler.c:226 msgid "Add record" msgstr "" -#: ../vn/vn-handler.c:228 +#: ../vn/vn-handler.c:229 msgid "Move to the first row" msgstr "" -#: ../vn/vn-handler.c:231 +#: ../vn/vn-handler.c:232 msgid "Move to the previous row" msgstr "" -#: ../vn/vn-handler.c:234 +#: ../vn/vn-handler.c:235 msgid "Move to the next row" msgstr "" -#: ../vn/vn-handler.c:237 +#: ../vn/vn-handler.c:238 msgid "Move to the last row" msgstr "" -#: ../vn/vn-handler.c:495 +#: ../vn/vn-handler.c:529 msgid "Show flags" msgstr "" -#: ../vn/vn-handler.c:496 +#: ../vn/vn-handler.c:530 msgid "Sets the buttons that will be shown on the interface" msgstr "" -#: ../vn/vn-handler.c:503 +#: ../vn/vn-handler.c:537 msgid "Simple record" msgstr "" -#: ../vn/vn-handler.c:504 +#: ../vn/vn-handler.c:538 msgid "Sets if it is used to handle a iterator with a single record" msgstr "" -#: ../vn/vn-form.c:231 -msgid "Name" -msgstr "" - #: ../vn/vn-form.c:232 msgid "The form name" msgstr "" @@ -575,20 +757,20 @@ msgstr "" msgid "The module" msgstr "" -#: ../vn/vn-login.c:287 ../vn/vn-login.c:289 +#: ../vn/vn-login.c:292 ../vn/vn-login.c:294 msgid "Login error" msgstr "" -#: ../vn/vn-login.c:345 +#: ../vn/vn-login.c:350 #, c-format msgid "Bad connection settings, please check it." msgstr "" -#: ../vn/vn-login.c:481 +#: ../vn/vn-login.c:484 msgid "Application id" msgstr "" -#: ../vn/vn-login.c:482 +#: ../vn/vn-login.c:485 msgid "The application identifier" msgstr "" @@ -664,11 +846,11 @@ msgstr "" msgid "The column of the model shown by combo" msgstr "" -#: ../vn/field/vn-completion.c:328 +#: ../vn/field/vn-completion.c:332 msgid "Field" msgstr "" -#: ../vn/field/vn-completion.c:329 +#: ../vn/field/vn-completion.c:333 msgid "The name of the field used for the search" msgstr "" @@ -835,73 +1017,65 @@ msgid "An optional file loader, if it's NULL the column will create one" msgstr "" #: ../vn/gui/login.glade.h:1 -msgid "Configuration" -msgstr "" +#, fuzzy +msgid "Access" +msgstr "Accés" #: ../vn/gui/login.glade.h:2 -msgid "Plugin:" -msgstr "" +msgid "User:" +msgstr "Usuari:" #: ../vn/gui/login.glade.h:3 -msgid "Host:" -msgstr "" +msgid "Password:" +msgstr "Contrasenya:" #: ../vn/gui/login.glade.h:4 -msgid "Schema:" +msgid "Press here to see the password" msgstr "" #: ../vn/gui/login.glade.h:5 +msgid "Remember" +msgstr "Recordar" + +#: ../vn/gui/login.glade.h:6 +msgid "Configuration" +msgstr "" + +#: ../vn/gui/login.glade.h:7 +msgid "Plugin:" +msgstr "" + +#: ../vn/gui/login.glade.h:8 +msgid "Host:" +msgstr "" + +#: ../vn/gui/login.glade.h:9 +msgid "Schema:" +msgstr "" + +#: ../vn/gui/login.glade.h:10 msgid "SSL CA:" msgstr "" -#: ../vn/gui/login.glade.h:6 +#: ../vn/gui/login.glade.h:11 msgid "" "Path to the file containing the CA certificate, if this is empty SSL won't " "be used" msgstr "" -#: ../vn/gui/login.glade.h:7 -#, fuzzy -msgid "Access" -msgstr "Accés" - -#: ../vn/gui/login.glade.h:8 ../vn/gui/main.glade.h:3 -msgid "User:" -msgstr "Usuari:" - -#: ../vn/gui/login.glade.h:9 -msgid "Password:" -msgstr "Contrasenya:" - -#: ../vn/gui/login.glade.h:10 -msgid "Press here to see the password" -msgstr "" - -#: ../vn/gui/login.glade.h:11 -msgid "Remember" -msgstr "Recordar" - -#: ../vn/gui/main.glade.h:1 ../vn/gui/child-window.glade.h:1 -msgid "Hedera" -msgstr "Hedera" - -#: ../vn/gui/main.glade.h:4 -msgid "[user-name]" -msgstr "[user-name]" - -#: ../vn/gui/main.glade.h:5 +#: ../vn/gui/main.glade.h:1 msgid "Copyright - Verdnatura Levante S. L." msgstr "Copyright - Verdnatura Levante S. L." -#: ../vn/gui/main.glade.h:6 +#: ../vn/gui/main.glade.h:2 msgid "Management and administration of companies" msgstr "" -#: ../vn/gui/main.glade.h:7 +#: ../vn/gui/main.glade.h:3 msgid "www.verdnatura.es" msgstr "www.verdnatura.es" -#: ../vn/gui/main.glade.h:8 +#: ../vn/gui/main.glade.h:4 msgid "" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU Lesser General Public\n" @@ -919,46 +1093,6 @@ msgid "" "02111-1307 USA." msgstr "" -#: ../vn/gui/actions.glade.h:1 -msgid "_Logout" -msgstr "" - -#: ../vn/gui/actions.glade.h:2 -msgid "Logout" -msgstr "" - -#: ../vn/gui/actions.glade.h:3 -msgid "_Quit" -msgstr "" - -#: ../vn/gui/actions.glade.h:4 -msgid "Quit" -msgstr "" - -#: ../vn/gui/actions.glade.h:5 -msgid "_About" -msgstr "" - -#: ../vn/gui/actions.glade.h:6 -msgid "_File" -msgstr "" - -#: ../vn/gui/actions.glade.h:7 -msgid "_Help" -msgstr "" - -#: ../vn/gui/actions.glade.h:8 -msgid "_Reconnect" -msgstr "" - -#: ../vn/gui/actions.glade.h:9 -msgid "Reconnect" -msgstr "" - -#: ../vn/gui/actions.glade.h:10 -msgid "_Close" -msgstr "" - #: ../vn/gui/date-chooser.glade.h:1 ../glade/glade-db-model.c:72 #: ../glade/glade-eprop-model.c:164 msgid "OK" @@ -985,30 +1119,39 @@ msgstr "" msgid "Cancel" msgstr "" -#: ../glade/glade-db-model.c:186 +#: ../glade/glade-db-model.c:184 msgid "Open the SQL Editor" msgstr "" -#: ../glade/glade-db-model.c:263 +#: ../glade/glade-db-model.c:262 msgid "Select a GvnParam" msgstr "" -#: ../glade/glade-db-model.c:331 +#: ../glade/glade-db-model.c:330 msgid "Select the parameter from a list" msgstr "" -#: ../glade/glade-db-model.c:349 +#: ../glade/glade-db-model.c:348 msgid "You need to create at least one GvnParam or derived object" msgstr "" -#: ../glade/glade-db-model.c:480 +#: ../glade/glade-db-model.c:502 msgid "Add or remove links" msgstr "" -#: ../glade/glade-db-model-editor.c:54 +#: ../glade/glade-db-model.c:554 +msgctxt "Verb" +msgid "Link" +msgstr "" + +#: ../glade/glade-db-model-editor.c:62 msgid "List of parameters linked to the model" msgstr "" +#: ../glade/glade-db-model-editor.c:65 +msgid "List of SQLHolders and identifiers" +msgstr "" + #: ../glade/glade-eprop-model.c:129 msgid "Create and set a model for a DbModelHolder" msgstr "" @@ -1045,16 +1188,21 @@ msgstr "" msgid "The model must have \"SQL\" set and \"Use file\" set to 'No'." msgstr "" -#: ../glade/glade-db-iterator.c:143 +#: ../glade/glade-db-iterator.c:144 #, c-format msgid "%s can't have children before automatic generation." msgstr "" -#: ../glade/glade-db-iterator.c:154 +#: ../glade/glade-db-iterator.c:155 #, c-format msgid "%s must have \"Model\" set. %s" msgstr "" +#: ../glade/glade-db-iterator.c:180 +#, c-format +msgid "Automatic generation of params for %s" +msgstr "" + #: ../glade/vn.xml.h:1 msgid "The model held by the object" msgstr "" @@ -1095,14 +1243,20 @@ msgstr "" msgid "Immediate changes" msgstr "" -#: ../module/src/vn-consulter.c:233 +#: ../module/src/vn-consulter.c:234 msgid "Type or select a query" msgstr "" -#: ../module/src/vn-consulter.c:235 +#: ../module/src/vn-consulter.c:236 msgid "Message" msgstr "" +#~ msgid "Hedera" +#~ msgstr "Hedera" + +#~ msgid "[user-name]" +#~ msgstr "[user-name]" + #, fuzzy #~ msgid "Function vn_grid_model_set_sort_func not implemented" #~ msgstr "Funció vn_model_set_sort_func no implementada" diff --git a/po/es.po b/po/es.po index 7cdcffc..cdd3f29 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: hedera 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-10 12:46+0200\n" +"POT-Creation-Date: 2014-06-25 16:41+0200\n" "PO-Revision-Date: 2013-06-04 13:36+0200\n" "Last-Translator: Alejandro T. Colombini Gómez \n" "Language-Team: Spanish\n" @@ -33,7 +33,7 @@ msgstr "El parámetro no puede ser nulo" msgid "Incompatible type for this param" msgstr "Tipo incompatible para este parametro" -#: ../gvn/gvn-param.c:443 ../sql/sql-value.c:235 ../vn/vn-field.c:538 +#: ../gvn/gvn-param.c:443 ../sql/sql-value.c:252 ../vn/vn-field.c:538 msgid "Value" msgstr "Valor" @@ -118,34 +118,210 @@ msgstr "Sí" msgid "No" msgstr "No" -#: ../sql/sql-render.c:413 +#: ../sql/sql-render.c:430 msgid "Delimiter" msgstr "Delimitador" -#: ../sql/sql-render.c:414 +#: ../sql/sql-render.c:431 msgid "The character used for delimite the name of fields, tables..." msgstr "El carácter usado para delimitar los nombres de campos, tablas..." -#: ../sql/sql-value.c:228 ../glade/glade-db-model.c:525 +#: ../sql/sql-value.c:245 ../glade/glade-db-model.c:546 msgid "Param" msgstr "Parámetro" -#: ../sql/sql-value.c:229 +#: ../sql/sql-value.c:246 msgid "The param which is linked" msgstr "El parametro al cual está vinculado" -#: ../sql/sql-value.c:236 +#: ../sql/sql-value.c:253 msgid "The value" msgstr "Valor" -#: ../sql/sql-string.c:198 ../db/db-model.c:3455 ../db/db-request.c:461 +#: ../sql/sql-string.c:188 ../db/db-model.c:3304 ../db/db-request.c:449 msgid "SQL" msgstr "SQL" -#: ../sql/sql-string.c:199 +#: ../sql/sql-string.c:189 msgid "An arbitrary SQL string" msgstr "Una cadena SQL arbitraria" +#: ../sql/sql-delete.c:105 +msgid "Tables" +msgstr "Tablas" + +#: ../sql/sql-delete.c:106 +msgid "A list of tables" +msgstr "Una lista de tablas" + +#: ../sql/sql-dml.c:106 +msgid "Targets" +msgstr "Tablas" + +#: ../sql/sql-dml.c:107 +msgid "A list of targets" +msgstr "Una lista de tablas" + +#: ../sql/sql-dml.c:113 +msgid "Where" +msgstr "Where" + +#: ../sql/sql-dml.c:114 +msgid "The WHERE section of an statement" +msgstr "La parte WHERE de una sentencia" + +#: ../sql/sql-field.c:239 ../sql/sql-function.c:127 ../vn/vn-form.c:231 +msgid "Name" +msgstr "Nombre" + +#: ../sql/sql-field.c:240 +msgid "The column name" +msgstr "El nombre de la columna" + +#: ../sql/sql-field.c:246 +msgid "Target" +msgstr "Tabla" + +#: ../sql/sql-field.c:247 +msgid "The target name" +msgstr "El nombre de la tabla" + +#: ../sql/sql-field.c:253 ../sql/sql-function.c:134 +msgid "Schema" +msgstr "Esquema" + +#: ../sql/sql-field.c:254 +msgid "The schema name" +msgstr "El nombre del esquema" + +#: ../sql/sql-function.c:128 +msgid "The function name" +msgstr "El nombre de la function" + +#: ../sql/sql-function.c:135 +msgid "The schema to which the function belongs" +msgstr "El esquema al cual pertenece la función" + +#: ../sql/sql-function.c:141 +msgid "Parameters" +msgstr "Parámetros" + +#: ../sql/sql-function.c:142 +msgid "The function parameters" +msgstr "Los parametros de la función" + +#: ../sql/sql-holder.c:124 +msgid "Identifier" +msgstr "Identificador" + +#: ../sql/sql-holder.c:125 +msgid "The holder identifier" +msgstr "El identificador del holder" + +#: ../sql/sql-insert.c:151 +msgid "Table" +msgstr "Tabla" + +#: ../sql/sql-insert.c:152 +msgid "The table where the row is inserted" +msgstr "La tabla en la que se inserta la fila" + +#: ../sql/sql-insert.c:158 ../sql/sql-select.c:256 +msgid "Fields" +msgstr "Campos" + +#: ../sql/sql-insert.c:159 ../sql/sql-select.c:257 +msgid "The list of fields" +msgstr "La lista de campos" + +#: ../sql/sql-insert.c:165 +msgid "Values" +msgstr "Valores" + +#: ../sql/sql-insert.c:166 +msgid "The list of values" +msgstr "La lista del valores" + +#: ../sql/sql-list.c:301 +msgid "Length" +msgstr "Longitud" + +#: ../sql/sql-list.c:302 +msgid "The length of the list" +msgstr "La longitud de la lista" + +#: ../sql/sql-list.c:308 +msgid "GType" +msgstr "Tipo Glib" + +#: ../sql/sql-list.c:309 +msgid "The allowed type for the items" +msgstr "El tipo permitido para los elementos" + +#: ../sql/sql-select.c:249 +msgid "Distinct" +msgstr "Distinct" + +#: ../sql/sql-select.c:250 +msgid "Determines if the #SqlSelect uses the DISTINCT clause" +msgstr "Determina si el #SqlSelect usa la cláusula DSITINCT" + +#: ../sql/sql-select.c:263 +msgid "Group" +msgstr "Group" + +#: ../sql/sql-select.c:264 +msgid "The GROUP BY section" +msgstr "La sección GROUP BY" + +#: ../sql/sql-select.c:270 +msgid "Having" +msgstr "Having" + +#: ../sql/sql-select.c:271 +msgid "The HAVING clause" +msgstr "La cláusula HAVING" + +#: ../sql/sql-select.c:277 +msgid "Order" +msgstr "Order" + +#: ../sql/sql-select.c:278 +msgid "The ORDER BY section" +msgstr "La sección ORDER BY" + +#: ../sql/sql-select.c:284 +msgid "Limit count" +msgstr "Limit count" + +#: ../sql/sql-select.c:285 +msgid "The COUNT field of the LIMIT clause" +msgstr "El campo COUNT de la cláusula LIMIT" + +#: ../sql/sql-select.c:291 +msgid "Limit offset" +msgstr "Limit offset" + +#: ../sql/sql-select.c:292 +msgid "The OFFSET field of the LIMIT clause" +msgstr "El campo OFFSET de la cláusula LIMIT" + +#: ../sql/sql-select.c:298 +msgid "Next" +msgstr "Siguiente" + +#: ../sql/sql-select.c:299 +msgid "The next #SqlSelect in case of a statement with more than one" +msgstr "El siguiente #SqlSelect en caso de una sentencia con más de uno" + +#: ../sql/sql-select.c:305 +msgid "Type" +msgstr "Tipo" + +#: ../sql/sql-select.c:306 +msgid "One of the possible options of #SqlSelectType" +msgstr "Una de las posibles opciones de #SqlSelectType" + #: ../plugin/mysql/db-mysql.c:68 ../plugin/pg/db-pg.c:111 #, c-format msgid "Can't allocate the needed memory" @@ -164,28 +340,28 @@ msgid "Wether to rememeber the selection when model is refreshed" msgstr "" "Si se recordará o no la fila seleccionado cuando se refresque el modelo" -#: ../db/db-model.c:3429 ../db/db-request.c:454 ../vn/vn-gui.c:1470 +#: ../db/db-model.c:3278 ../db/db-request.c:442 ../vn/vn-gui.c:1443 #: ../vn/vn-form.c:245 msgid "Connection" msgstr "Conexión" -#: ../db/db-model.c:3430 +#: ../db/db-model.c:3279 msgid "The DbConn that manages the connection to the database" msgstr "La DbConn que controla la conexión a la base de datos" -#: ../db/db-model.c:3437 ../db/db-request.c:468 +#: ../db/db-model.c:3286 msgid "Statement" msgstr "Consulta" -#: ../db/db-model.c:3438 +#: ../db/db-model.c:3287 msgid "The statement which retrieves the data" msgstr "La consulta que recupera los datos" -#: ../db/db-model.c:3445 +#: ../db/db-model.c:3294 msgid "Use file" msgstr "Usa fichero" -#: ../db/db-model.c:3446 +#: ../db/db-model.c:3295 msgid "" "If this is set to TRUE, the \"sql\" property will hold the name of a file " "containing a query, if set to FALSE, \"sql\" is used as an SQL string" @@ -193,7 +369,7 @@ msgstr "" "Si es TRUE, la propiedad \"sql\" contiene el nombre de un archivo, si es " "falso, \"sql\" se usa como una cadena SQL" -#: ../db/db-model.c:3456 +#: ../db/db-model.c:3305 msgid "" "Depending on the \"use-file\" property this will be the path to a file with " "queries for the model or a SQL string" @@ -201,27 +377,27 @@ msgstr "" "Dependiendo de la propiedad \"use-file\", esta propiedad será la ruta a un " "fichero con consultas para el modelo o una cadena SQL" -#: ../db/db-model.c:3465 +#: ../db/db-model.c:3314 msgid "Main Table" msgstr "Tabla principal" -#: ../db/db-model.c:3466 +#: ../db/db-model.c:3315 msgid "The main table of the model" msgstr "La tabla principal del modelo" -#: ../db/db-model.c:3473 +#: ../db/db-model.c:3322 msgid "Update flags" msgstr "Flags de actualización" -#: ../db/db-model.c:3474 +#: ../db/db-model.c:3323 msgid "The flags that indicate how a model can be modified" msgstr "Indican como se puede modificar el modelo" -#: ../db/db-model.c:3482 +#: ../db/db-model.c:3331 msgid "Result position" msgstr "Posición del resultado" -#: ../db/db-model.c:3483 +#: ../db/db-model.c:3332 msgid "" "The position where the query that will fill the model will be placed in a " "multi-query" @@ -229,6 +405,18 @@ msgstr "" "La posición en la que se situa la consulta que pone datos en el modelo en " "una consulta múltiple" +#: ../db/db-model.c:3342 +msgid "Partial delete" +msgstr "Delete parcial" + +#: ../db/db-model.c:3343 +msgid "" +"When a row is deleted set all the fields from the table to null rather than " +"delete it." +msgstr "" +"Cuando una fila es eliminada, poner todos los campos de la tabla a nulo en " +"lugar de borrarla." + #: ../db/db-model-holder.c:71 ../db/db-calc.c:329 msgid "Model" msgstr "Modelo" @@ -265,7 +453,7 @@ msgstr "Datos" msgid "The user provided data for the function" msgstr "Datos proporcionados por el usuario" -#: ../db/db-calc.c:360 ../glade/glade-db-model.c:516 +#: ../db/db-calc.c:360 ../glade/glade-db-model.c:537 msgid "Column" msgstr "Columna" @@ -319,77 +507,73 @@ msgstr "No se puede abrir una nueva conexión, ya está abierta" msgid "The query is empty." msgstr "La consulta está vacía." -#: ../db/db-conn.c:1041 +#: ../db/db-conn.c:1048 msgid "Plugin" msgstr "Plugin" -#: ../db/db-conn.c:1042 +#: ../db/db-conn.c:1049 msgid "The name of the plugin" msgstr "El nombre del plugin" -#: ../db/db-conn.c:1048 +#: ../db/db-conn.c:1055 msgid "Query path" msgstr "Ruta de consultas" -#: ../db/db-conn.c:1049 +#: ../db/db-conn.c:1056 msgid "The path where query files are located" msgstr "La ruta donde se encuentran los archivos de consultas" -#: ../db/db-conn.c:1055 ../db/db-file-loader.c:716 +#: ../db/db-conn.c:1062 ../db/db-file-loader.c:716 #: ../vn/column/vn-column-image.c:493 msgid "Host" msgstr "Host" -#: ../db/db-conn.c:1056 +#: ../db/db-conn.c:1063 msgid "The host name to connect to" msgstr "El nombre del host al que se conectará" -#: ../db/db-conn.c:1062 +#: ../db/db-conn.c:1069 msgid "User" msgstr "Usuario" -#: ../db/db-conn.c:1063 +#: ../db/db-conn.c:1070 msgid "The user name" msgstr "El nombre de usuario" -#: ../db/db-conn.c:1069 +#: ../db/db-conn.c:1076 msgid "DB name" msgstr "Nombre de la BD" -#: ../db/db-conn.c:1070 +#: ../db/db-conn.c:1077 msgid "The default schema" msgstr "El esquema por defecto" -#: ../db/db-request.c:311 +#: ../db/db-request.c:317 #, c-format msgid "The request was canceled" msgstr "Se ha cancelado la petición" -#: ../db/db-request.c:455 +#: ../db/db-request.c:443 msgid "The connection used to render and execute the query" msgstr "La conexión empleada por el módulo" -#: ../db/db-request.c:462 +#: ../db/db-request.c:450 msgid "The SQL query to execute" msgstr "La consulta SQL a ejecutar" -#: ../db/db-request.c:469 -msgid "The statement to execute" -msgstr "La instrucción a ejecutar" - -#: ../db/db-request.c:475 +#: ../db/db-request.c:456 msgid "Result" msgstr "Result" -#: ../db/db-request.c:476 +#: ../db/db-request.c:457 msgid "The result data of the query" msgstr "Los datos resultantes de la consulta" -#: ../db/db-request.c:482 +#: ../db/db-request.c:463 msgid "Error" msgstr "Error" -#: ../db/db-request.c:483 +#: ../db/db-request.c:464 msgid "The GError, if an error ocurred" msgstr "El GError, si ha habido algún error" @@ -451,43 +635,43 @@ msgstr "Error en la base de datos" msgid "Unknown error" msgstr "Error desconocido" -#: ../vn/vn-gui.c:865 +#: ../vn/vn-gui.c:880 msgid "Closing connection" msgstr "Cerrando conexión" -#: ../vn/vn-gui.c:867 +#: ../vn/vn-gui.c:882 msgid "Transaction started" msgstr "Transacción iniciada" -#: ../vn/vn-gui.c:869 +#: ../vn/vn-gui.c:884 msgid "Connecting" msgstr "Conectando" -#: ../vn/vn-gui.c:871 +#: ../vn/vn-gui.c:886 msgid "Connection lost" msgstr "Conexión perdida" -#: ../vn/vn-gui.c:873 +#: ../vn/vn-gui.c:888 msgid "Connection closed" msgstr "Conexión cerrada" -#: ../vn/vn-gui.c:875 ../vn/field/vn-http-image.c:116 +#: ../vn/vn-gui.c:890 ../vn/field/vn-http-image.c:116 msgid "Loading" msgstr "Cargando" -#: ../vn/vn-gui.c:877 ../vn/gui/main.glade.h:2 +#: ../vn/vn-gui.c:892 msgid "Ready" msgstr "Listo" -#: ../vn/vn-gui.c:1471 +#: ../vn/vn-gui.c:1444 msgid "The connection used by Gui" msgstr "La conexión empleada por Gui" -#: ../vn/vn-gui.c:1477 +#: ../vn/vn-gui.c:1450 msgid "Application" msgstr "Aplicación" -#: ../vn/vn-gui.c:1478 +#: ../vn/vn-gui.c:1451 msgid "The application handler for the entire program" msgstr "El manejador de la aplicación para todo el programa" @@ -495,74 +679,70 @@ msgstr "El manejador de la aplicación para todo el programa" msgid "The iterator used by VnGrid" msgstr "El Iterator empleado por VnGrid" -#: ../vn/vn-handler.c:73 +#: ../vn/vn-handler.c:74 msgid "Are you sure you want to delete the current selection?" msgstr "¿Estás seguro de que quieres eliminar los registros seleccionados?" -#: ../vn/vn-handler.c:81 +#: ../vn/vn-handler.c:82 msgid "Are you sure you want to save the changes?" msgstr "¿Estás seguro de que quieres guardar los cambios?" -#: ../vn/vn-handler.c:87 +#: ../vn/vn-handler.c:88 msgid "Are you sure you want to undo all changes?" msgstr "¿Estás seguro de que quieres deshacer todos los cambios?" -#: ../vn/vn-handler.c:213 +#: ../vn/vn-handler.c:214 msgid "Undo changes" msgstr "Deshacer cambios" -#: ../vn/vn-handler.c:216 +#: ../vn/vn-handler.c:217 msgid "Save changes" msgstr "Guardar cambios" -#: ../vn/vn-handler.c:219 +#: ../vn/vn-handler.c:220 msgid "Refresh data" msgstr "Refrescar datos" -#: ../vn/vn-handler.c:222 +#: ../vn/vn-handler.c:223 msgid "Remove record" msgstr "Eliminar registro" -#: ../vn/vn-handler.c:225 +#: ../vn/vn-handler.c:226 msgid "Add record" msgstr "Añadir registro" -#: ../vn/vn-handler.c:228 +#: ../vn/vn-handler.c:229 msgid "Move to the first row" msgstr "Mover a la primera fila" -#: ../vn/vn-handler.c:231 +#: ../vn/vn-handler.c:232 msgid "Move to the previous row" msgstr "Mover a la fila anterior" -#: ../vn/vn-handler.c:234 +#: ../vn/vn-handler.c:235 msgid "Move to the next row" msgstr "Mover a la siguiente fila" -#: ../vn/vn-handler.c:237 +#: ../vn/vn-handler.c:238 msgid "Move to the last row" msgstr "Mover a la última fila" -#: ../vn/vn-handler.c:495 +#: ../vn/vn-handler.c:529 msgid "Show flags" msgstr "Visibilidad" -#: ../vn/vn-handler.c:496 +#: ../vn/vn-handler.c:530 msgid "Sets the buttons that will be shown on the interface" msgstr "Indica los botones que se mostrarán en la interfaz" -#: ../vn/vn-handler.c:503 +#: ../vn/vn-handler.c:537 msgid "Simple record" msgstr "Registro simple" -#: ../vn/vn-handler.c:504 +#: ../vn/vn-handler.c:538 msgid "Sets if it is used to handle a iterator with a single record" msgstr "Indica si se utiliza para manejar solo un registro" -#: ../vn/vn-form.c:231 -msgid "Name" -msgstr "Nombre" - #: ../vn/vn-form.c:232 msgid "The form name" msgstr "El nombre del form" @@ -587,20 +767,20 @@ msgstr "Módulo" msgid "The module" msgstr "El módulo" -#: ../vn/vn-login.c:287 ../vn/vn-login.c:289 +#: ../vn/vn-login.c:292 ../vn/vn-login.c:294 msgid "Login error" msgstr "Error de acceso" -#: ../vn/vn-login.c:345 +#: ../vn/vn-login.c:350 #, c-format msgid "Bad connection settings, please check it." msgstr "Los parámetros de la conexión son incorrectos, compruébelos por favor." -#: ../vn/vn-login.c:481 +#: ../vn/vn-login.c:484 msgid "Application id" msgstr "Id de la aplicación" -#: ../vn/vn-login.c:482 +#: ../vn/vn-login.c:485 msgid "The application identifier" msgstr "El identificador de la aplicación" @@ -678,11 +858,11 @@ msgstr "Columna visible" msgid "The column of the model shown by combo" msgstr "La columna del modelo que se mostrará en el combo" -#: ../vn/field/vn-completion.c:328 +#: ../vn/field/vn-completion.c:332 msgid "Field" msgstr "Campo" -#: ../vn/field/vn-completion.c:329 +#: ../vn/field/vn-completion.c:333 msgid "The name of the field used for the search" msgstr "El nombre del campo usado para la búsqueda" @@ -860,73 +1040,65 @@ msgid "An optional file loader, if it's NULL the column will create one" msgstr "Un cargador de archivos opcional, si es nulo la columna creará uno" #: ../vn/gui/login.glade.h:1 +msgid "Access" +msgstr "Acceso" + +#: ../vn/gui/login.glade.h:2 +msgid "User:" +msgstr "Usuario:" + +#: ../vn/gui/login.glade.h:3 +msgid "Password:" +msgstr "Clave:" + +#: ../vn/gui/login.glade.h:4 +msgid "Press here to see the password" +msgstr "Presiona para ver la contraseña" + +#: ../vn/gui/login.glade.h:5 +msgid "Remember" +msgstr "Recordar" + +#: ../vn/gui/login.glade.h:6 msgid "Configuration" msgstr "Configuración" -#: ../vn/gui/login.glade.h:2 +#: ../vn/gui/login.glade.h:7 msgid "Plugin:" msgstr "Plugin:" -#: ../vn/gui/login.glade.h:3 +#: ../vn/gui/login.glade.h:8 msgid "Host:" msgstr "Host:" -#: ../vn/gui/login.glade.h:4 +#: ../vn/gui/login.glade.h:9 msgid "Schema:" msgstr "Esquema:" -#: ../vn/gui/login.glade.h:5 +#: ../vn/gui/login.glade.h:10 msgid "SSL CA:" msgstr "SSL CA:" -#: ../vn/gui/login.glade.h:6 +#: ../vn/gui/login.glade.h:11 msgid "" "Path to the file containing the CA certificate, if this is empty SSL won't " "be used" msgstr "" "Ruta al archivo con el certificado de la CA, si está vacío, no se usará SSL" -#: ../vn/gui/login.glade.h:7 -msgid "Access" -msgstr "Acceso" - -#: ../vn/gui/login.glade.h:8 ../vn/gui/main.glade.h:3 -msgid "User:" -msgstr "Usuario:" - -#: ../vn/gui/login.glade.h:9 -msgid "Password:" -msgstr "Clave:" - -#: ../vn/gui/login.glade.h:10 -msgid "Press here to see the password" -msgstr "Presiona para ver la contraseña" - -#: ../vn/gui/login.glade.h:11 -msgid "Remember" -msgstr "Recordar" - -#: ../vn/gui/main.glade.h:1 ../vn/gui/child-window.glade.h:1 -msgid "Hedera" -msgstr "Hedera" - -#: ../vn/gui/main.glade.h:4 -msgid "[user-name]" -msgstr "[user-name]" - -#: ../vn/gui/main.glade.h:5 +#: ../vn/gui/main.glade.h:1 msgid "Copyright - Verdnatura Levante S. L." msgstr "Copyright - Verdnatura Levante S. L." -#: ../vn/gui/main.glade.h:6 +#: ../vn/gui/main.glade.h:2 msgid "Management and administration of companies" msgstr "Gestión y administración de empresas" -#: ../vn/gui/main.glade.h:7 +#: ../vn/gui/main.glade.h:3 msgid "www.verdnatura.es" msgstr "www.verdnatura.es" -#: ../vn/gui/main.glade.h:8 +#: ../vn/gui/main.glade.h:4 msgid "" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU Lesser General Public\n" @@ -958,46 +1130,6 @@ msgstr "" "Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA\n" "02111-1307 USA." -#: ../vn/gui/actions.glade.h:1 -msgid "_Logout" -msgstr "_Desconectar" - -#: ../vn/gui/actions.glade.h:2 -msgid "Logout" -msgstr "Desconectar" - -#: ../vn/gui/actions.glade.h:3 -msgid "_Quit" -msgstr "_Salir" - -#: ../vn/gui/actions.glade.h:4 -msgid "Quit" -msgstr "Salir" - -#: ../vn/gui/actions.glade.h:5 -msgid "_About" -msgstr "_Acerca de" - -#: ../vn/gui/actions.glade.h:6 -msgid "_File" -msgstr "_Archivo" - -#: ../vn/gui/actions.glade.h:7 -msgid "_Help" -msgstr "Ay_uda" - -#: ../vn/gui/actions.glade.h:8 -msgid "_Reconnect" -msgstr "_Reconectar" - -#: ../vn/gui/actions.glade.h:9 -msgid "Reconnect" -msgstr "Reconectar" - -#: ../vn/gui/actions.glade.h:10 -msgid "_Close" -msgstr "_Cerrar" - #: ../vn/gui/date-chooser.glade.h:1 ../glade/glade-db-model.c:72 #: ../glade/glade-eprop-model.c:164 msgid "OK" @@ -1024,30 +1156,39 @@ msgstr "Editor SQL" msgid "Cancel" msgstr "Cancelar" -#: ../glade/glade-db-model.c:186 +#: ../glade/glade-db-model.c:184 msgid "Open the SQL Editor" msgstr "Abrir el Editor SQL" -#: ../glade/glade-db-model.c:263 +#: ../glade/glade-db-model.c:262 msgid "Select a GvnParam" msgstr "Elige un GvnParam" -#: ../glade/glade-db-model.c:331 +#: ../glade/glade-db-model.c:330 msgid "Select the parameter from a list" msgstr "Eligir un parametro de una lista" -#: ../glade/glade-db-model.c:349 +#: ../glade/glade-db-model.c:348 msgid "You need to create at least one GvnParam or derived object" msgstr "Necesitas crear por lo menos un GvnParam o algun objeto derivado" -#: ../glade/glade-db-model.c:480 +#: ../glade/glade-db-model.c:502 msgid "Add or remove links" msgstr "Añadir o quitar enlaces" -#: ../glade/glade-db-model-editor.c:54 +#: ../glade/glade-db-model.c:554 +msgctxt "Verb" +msgid "Link" +msgstr "Enlazar" + +#: ../glade/glade-db-model-editor.c:62 msgid "List of parameters linked to the model" msgstr "Lista de parámetros vinculados al modelo" +#: ../glade/glade-db-model-editor.c:65 +msgid "List of SQLHolders and identifiers" +msgstr "Lista de SQLHolders e identificadores" + #: ../glade/glade-eprop-model.c:129 msgid "Create and set a model for a DbModelHolder" msgstr "Crear y poner el modelo a un DbModelHolder" @@ -1084,16 +1225,21 @@ msgstr "Editor del Iterator" msgid "The model must have \"SQL\" set and \"Use file\" set to 'No'." msgstr "El modelo debe tener \"SQL\" asignado y \"Usa fichero\" puesto a 'No'." -#: ../glade/glade-db-iterator.c:143 +#: ../glade/glade-db-iterator.c:144 #, c-format msgid "%s can't have children before automatic generation." msgstr "%s no puede tener hijos antes de la generación automatica." -#: ../glade/glade-db-iterator.c:154 +#: ../glade/glade-db-iterator.c:155 #, c-format msgid "%s must have \"Model\" set. %s" msgstr "%s debe tener \"Modelo\" asignado. %s" +#: ../glade/glade-db-iterator.c:180 +#, c-format +msgid "Automatic generation of params for %s" +msgstr "Generación automatica de params para %s" + #: ../glade/vn.xml.h:1 msgid "The model held by the object" msgstr "La conexión empleada por el objeto" @@ -1134,14 +1280,53 @@ msgstr "Consulta:" msgid "Immediate changes" msgstr "Cambios inmediatos" -#: ../module/src/vn-consulter.c:233 +#: ../module/src/vn-consulter.c:234 msgid "Type or select a query" msgstr "Escribe o elige una consulta" -#: ../module/src/vn-consulter.c:235 +#: ../module/src/vn-consulter.c:236 msgid "Message" msgstr "Mensaje" +#~ msgid "The statement to execute" +#~ msgstr "La instrucción a ejecutar" + +#~ msgid "Hedera" +#~ msgstr "Hedera" + +#~ msgid "[user-name]" +#~ msgstr "[user-name]" + +#~ msgid "_Logout" +#~ msgstr "_Desconectar" + +#~ msgid "Logout" +#~ msgstr "Desconectar" + +#~ msgid "_Quit" +#~ msgstr "_Salir" + +#~ msgid "Quit" +#~ msgstr "Salir" + +#~ msgid "_About" +#~ msgstr "_Acerca de" + +#~ msgid "_File" +#~ msgstr "_Archivo" + +#~ msgid "_Help" +#~ msgstr "Ay_uda" + +#~ msgid "_Reconnect" +#~ msgstr "_Reconectar" + +#~ msgid "Reconnect" +#~ msgstr "Reconectar" + +#~ msgid "_Close" +#~ msgstr "_Cerrar" + #~ msgid "_View" #~ msgstr "_Ver" diff --git a/po/nl.po b/po/nl.po index 346b057..50e2cc8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: hedera 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-10 12:46+0200\n" +"POT-Creation-Date: 2014-06-25 16:41+0200\n" "PO-Revision-Date: 2012-10-09 11:38+0200\n" "Last-Translator: Alejandro T. Colombini Gómez \n" "Language-Team: Dutch\n" @@ -33,7 +33,7 @@ msgstr "" msgid "Incompatible type for this param" msgstr "" -#: ../gvn/gvn-param.c:443 ../sql/sql-value.c:235 ../vn/vn-field.c:538 +#: ../gvn/gvn-param.c:443 ../sql/sql-value.c:252 ../vn/vn-field.c:538 msgid "Value" msgstr "" @@ -118,34 +118,210 @@ msgstr "" msgid "No" msgstr "" -#: ../sql/sql-render.c:413 +#: ../sql/sql-render.c:430 msgid "Delimiter" msgstr "" -#: ../sql/sql-render.c:414 +#: ../sql/sql-render.c:431 msgid "The character used for delimite the name of fields, tables..." msgstr "" -#: ../sql/sql-value.c:228 ../glade/glade-db-model.c:525 +#: ../sql/sql-value.c:245 ../glade/glade-db-model.c:546 msgid "Param" msgstr "" -#: ../sql/sql-value.c:229 +#: ../sql/sql-value.c:246 msgid "The param which is linked" msgstr "" -#: ../sql/sql-value.c:236 +#: ../sql/sql-value.c:253 msgid "The value" msgstr "" -#: ../sql/sql-string.c:198 ../db/db-model.c:3455 ../db/db-request.c:461 +#: ../sql/sql-string.c:188 ../db/db-model.c:3304 ../db/db-request.c:449 msgid "SQL" msgstr "" -#: ../sql/sql-string.c:199 +#: ../sql/sql-string.c:189 msgid "An arbitrary SQL string" msgstr "" +#: ../sql/sql-delete.c:105 +msgid "Tables" +msgstr "" + +#: ../sql/sql-delete.c:106 +msgid "A list of tables" +msgstr "" + +#: ../sql/sql-dml.c:106 +msgid "Targets" +msgstr "" + +#: ../sql/sql-dml.c:107 +msgid "A list of targets" +msgstr "" + +#: ../sql/sql-dml.c:113 +msgid "Where" +msgstr "" + +#: ../sql/sql-dml.c:114 +msgid "The WHERE section of an statement" +msgstr "" + +#: ../sql/sql-field.c:239 ../sql/sql-function.c:127 ../vn/vn-form.c:231 +msgid "Name" +msgstr "" + +#: ../sql/sql-field.c:240 +msgid "The column name" +msgstr "" + +#: ../sql/sql-field.c:246 +msgid "Target" +msgstr "" + +#: ../sql/sql-field.c:247 +msgid "The target name" +msgstr "" + +#: ../sql/sql-field.c:253 ../sql/sql-function.c:134 +msgid "Schema" +msgstr "" + +#: ../sql/sql-field.c:254 +msgid "The schema name" +msgstr "" + +#: ../sql/sql-function.c:128 +msgid "The function name" +msgstr "" + +#: ../sql/sql-function.c:135 +msgid "The schema to which the function belongs" +msgstr "" + +#: ../sql/sql-function.c:141 +msgid "Parameters" +msgstr "" + +#: ../sql/sql-function.c:142 +msgid "The function parameters" +msgstr "" + +#: ../sql/sql-holder.c:124 +msgid "Identifier" +msgstr "" + +#: ../sql/sql-holder.c:125 +msgid "The holder identifier" +msgstr "" + +#: ../sql/sql-insert.c:151 +msgid "Table" +msgstr "" + +#: ../sql/sql-insert.c:152 +msgid "The table where the row is inserted" +msgstr "" + +#: ../sql/sql-insert.c:158 ../sql/sql-select.c:256 +msgid "Fields" +msgstr "" + +#: ../sql/sql-insert.c:159 ../sql/sql-select.c:257 +msgid "The list of fields" +msgstr "" + +#: ../sql/sql-insert.c:165 +msgid "Values" +msgstr "" + +#: ../sql/sql-insert.c:166 +msgid "The list of values" +msgstr "" + +#: ../sql/sql-list.c:301 +msgid "Length" +msgstr "" + +#: ../sql/sql-list.c:302 +msgid "The length of the list" +msgstr "" + +#: ../sql/sql-list.c:308 +msgid "GType" +msgstr "" + +#: ../sql/sql-list.c:309 +msgid "The allowed type for the items" +msgstr "" + +#: ../sql/sql-select.c:249 +msgid "Distinct" +msgstr "" + +#: ../sql/sql-select.c:250 +msgid "Determines if the #SqlSelect uses the DISTINCT clause" +msgstr "" + +#: ../sql/sql-select.c:263 +msgid "Group" +msgstr "" + +#: ../sql/sql-select.c:264 +msgid "The GROUP BY section" +msgstr "" + +#: ../sql/sql-select.c:270 +msgid "Having" +msgstr "" + +#: ../sql/sql-select.c:271 +msgid "The HAVING clause" +msgstr "" + +#: ../sql/sql-select.c:277 +msgid "Order" +msgstr "" + +#: ../sql/sql-select.c:278 +msgid "The ORDER BY section" +msgstr "" + +#: ../sql/sql-select.c:284 +msgid "Limit count" +msgstr "" + +#: ../sql/sql-select.c:285 +msgid "The COUNT field of the LIMIT clause" +msgstr "" + +#: ../sql/sql-select.c:291 +msgid "Limit offset" +msgstr "" + +#: ../sql/sql-select.c:292 +msgid "The OFFSET field of the LIMIT clause" +msgstr "" + +#: ../sql/sql-select.c:298 +msgid "Next" +msgstr "" + +#: ../sql/sql-select.c:299 +msgid "The next #SqlSelect in case of a statement with more than one" +msgstr "" + +#: ../sql/sql-select.c:305 +msgid "Type" +msgstr "" + +#: ../sql/sql-select.c:306 +msgid "One of the possible options of #SqlSelectType" +msgstr "" + #: ../plugin/mysql/db-mysql.c:68 ../plugin/pg/db-pg.c:111 #, c-format msgid "Can't allocate the needed memory" @@ -163,65 +339,75 @@ msgstr "" msgid "Wether to rememeber the selection when model is refreshed" msgstr "" -#: ../db/db-model.c:3429 ../db/db-request.c:454 ../vn/vn-gui.c:1470 +#: ../db/db-model.c:3278 ../db/db-request.c:442 ../vn/vn-gui.c:1443 #: ../vn/vn-form.c:245 msgid "Connection" msgstr "" -#: ../db/db-model.c:3430 +#: ../db/db-model.c:3279 msgid "The DbConn that manages the connection to the database" msgstr "" -#: ../db/db-model.c:3437 ../db/db-request.c:468 +#: ../db/db-model.c:3286 msgid "Statement" msgstr "" -#: ../db/db-model.c:3438 +#: ../db/db-model.c:3287 msgid "The statement which retrieves the data" msgstr "" -#: ../db/db-model.c:3445 +#: ../db/db-model.c:3294 msgid "Use file" msgstr "" -#: ../db/db-model.c:3446 +#: ../db/db-model.c:3295 msgid "" "If this is set to TRUE, the \"sql\" property will hold the name of a file " "containing a query, if set to FALSE, \"sql\" is used as an SQL string" msgstr "" -#: ../db/db-model.c:3456 +#: ../db/db-model.c:3305 msgid "" "Depending on the \"use-file\" property this will be the path to a file with " "queries for the model or a SQL string" msgstr "" -#: ../db/db-model.c:3465 +#: ../db/db-model.c:3314 msgid "Main Table" msgstr "" -#: ../db/db-model.c:3466 +#: ../db/db-model.c:3315 msgid "The main table of the model" msgstr "" -#: ../db/db-model.c:3473 +#: ../db/db-model.c:3322 msgid "Update flags" msgstr "" -#: ../db/db-model.c:3474 +#: ../db/db-model.c:3323 msgid "The flags that indicate how a model can be modified" msgstr "" -#: ../db/db-model.c:3482 +#: ../db/db-model.c:3331 msgid "Result position" msgstr "" -#: ../db/db-model.c:3483 +#: ../db/db-model.c:3332 msgid "" "The position where the query that will fill the model will be placed in a " "multi-query" msgstr "" +#: ../db/db-model.c:3342 +msgid "Partial delete" +msgstr "" + +#: ../db/db-model.c:3343 +msgid "" +"When a row is deleted set all the fields from the table to null rather than " +"delete it." +msgstr "" + #: ../db/db-model-holder.c:71 ../db/db-calc.c:329 msgid "Model" msgstr "" @@ -258,7 +444,7 @@ msgstr "" msgid "The user provided data for the function" msgstr "" -#: ../db/db-calc.c:360 ../glade/glade-db-model.c:516 +#: ../db/db-calc.c:360 ../glade/glade-db-model.c:537 msgid "Column" msgstr "" @@ -310,77 +496,73 @@ msgstr "" msgid "The query is empty." msgstr "" -#: ../db/db-conn.c:1041 +#: ../db/db-conn.c:1048 msgid "Plugin" msgstr "" -#: ../db/db-conn.c:1042 +#: ../db/db-conn.c:1049 msgid "The name of the plugin" msgstr "" -#: ../db/db-conn.c:1048 +#: ../db/db-conn.c:1055 msgid "Query path" msgstr "" -#: ../db/db-conn.c:1049 +#: ../db/db-conn.c:1056 msgid "The path where query files are located" msgstr "" -#: ../db/db-conn.c:1055 ../db/db-file-loader.c:716 +#: ../db/db-conn.c:1062 ../db/db-file-loader.c:716 #: ../vn/column/vn-column-image.c:493 msgid "Host" msgstr "" -#: ../db/db-conn.c:1056 +#: ../db/db-conn.c:1063 msgid "The host name to connect to" msgstr "" -#: ../db/db-conn.c:1062 +#: ../db/db-conn.c:1069 msgid "User" msgstr "" -#: ../db/db-conn.c:1063 +#: ../db/db-conn.c:1070 msgid "The user name" msgstr "" -#: ../db/db-conn.c:1069 +#: ../db/db-conn.c:1076 msgid "DB name" msgstr "" -#: ../db/db-conn.c:1070 +#: ../db/db-conn.c:1077 msgid "The default schema" msgstr "" -#: ../db/db-request.c:311 +#: ../db/db-request.c:317 #, c-format msgid "The request was canceled" msgstr "" -#: ../db/db-request.c:455 +#: ../db/db-request.c:443 msgid "The connection used to render and execute the query" msgstr "" -#: ../db/db-request.c:462 +#: ../db/db-request.c:450 msgid "The SQL query to execute" msgstr "" -#: ../db/db-request.c:469 -msgid "The statement to execute" -msgstr "" - -#: ../db/db-request.c:475 +#: ../db/db-request.c:456 msgid "Result" msgstr "" -#: ../db/db-request.c:476 +#: ../db/db-request.c:457 msgid "The result data of the query" msgstr "" -#: ../db/db-request.c:482 +#: ../db/db-request.c:463 msgid "Error" msgstr "" -#: ../db/db-request.c:483 +#: ../db/db-request.c:464 msgid "The GError, if an error ocurred" msgstr "" @@ -440,43 +622,43 @@ msgstr "" msgid "Unknown error" msgstr "" -#: ../vn/vn-gui.c:865 +#: ../vn/vn-gui.c:880 msgid "Closing connection" msgstr "" -#: ../vn/vn-gui.c:867 +#: ../vn/vn-gui.c:882 msgid "Transaction started" msgstr "" -#: ../vn/vn-gui.c:869 +#: ../vn/vn-gui.c:884 msgid "Connecting" msgstr "" -#: ../vn/vn-gui.c:871 +#: ../vn/vn-gui.c:886 msgid "Connection lost" msgstr "" -#: ../vn/vn-gui.c:873 +#: ../vn/vn-gui.c:888 msgid "Connection closed" msgstr "" -#: ../vn/vn-gui.c:875 ../vn/field/vn-http-image.c:116 +#: ../vn/vn-gui.c:890 ../vn/field/vn-http-image.c:116 msgid "Loading" msgstr "" -#: ../vn/vn-gui.c:877 ../vn/gui/main.glade.h:2 +#: ../vn/vn-gui.c:892 msgid "Ready" msgstr "" -#: ../vn/vn-gui.c:1471 +#: ../vn/vn-gui.c:1444 msgid "The connection used by Gui" msgstr "" -#: ../vn/vn-gui.c:1477 +#: ../vn/vn-gui.c:1450 msgid "Application" msgstr "" -#: ../vn/vn-gui.c:1478 +#: ../vn/vn-gui.c:1451 msgid "The application handler for the entire program" msgstr "" @@ -484,74 +666,70 @@ msgstr "" msgid "The iterator used by VnGrid" msgstr "" -#: ../vn/vn-handler.c:73 +#: ../vn/vn-handler.c:74 msgid "Are you sure you want to delete the current selection?" msgstr "" -#: ../vn/vn-handler.c:81 +#: ../vn/vn-handler.c:82 msgid "Are you sure you want to save the changes?" msgstr "" -#: ../vn/vn-handler.c:87 +#: ../vn/vn-handler.c:88 msgid "Are you sure you want to undo all changes?" msgstr "" -#: ../vn/vn-handler.c:213 +#: ../vn/vn-handler.c:214 msgid "Undo changes" msgstr "" -#: ../vn/vn-handler.c:216 +#: ../vn/vn-handler.c:217 msgid "Save changes" msgstr "" -#: ../vn/vn-handler.c:219 +#: ../vn/vn-handler.c:220 msgid "Refresh data" msgstr "" -#: ../vn/vn-handler.c:222 +#: ../vn/vn-handler.c:223 msgid "Remove record" msgstr "" -#: ../vn/vn-handler.c:225 +#: ../vn/vn-handler.c:226 msgid "Add record" msgstr "" -#: ../vn/vn-handler.c:228 +#: ../vn/vn-handler.c:229 msgid "Move to the first row" msgstr "" -#: ../vn/vn-handler.c:231 +#: ../vn/vn-handler.c:232 msgid "Move to the previous row" msgstr "" -#: ../vn/vn-handler.c:234 +#: ../vn/vn-handler.c:235 msgid "Move to the next row" msgstr "" -#: ../vn/vn-handler.c:237 +#: ../vn/vn-handler.c:238 msgid "Move to the last row" msgstr "" -#: ../vn/vn-handler.c:495 +#: ../vn/vn-handler.c:529 msgid "Show flags" msgstr "" -#: ../vn/vn-handler.c:496 +#: ../vn/vn-handler.c:530 msgid "Sets the buttons that will be shown on the interface" msgstr "" -#: ../vn/vn-handler.c:503 +#: ../vn/vn-handler.c:537 msgid "Simple record" msgstr "" -#: ../vn/vn-handler.c:504 +#: ../vn/vn-handler.c:538 msgid "Sets if it is used to handle a iterator with a single record" msgstr "" -#: ../vn/vn-form.c:231 -msgid "Name" -msgstr "" - #: ../vn/vn-form.c:232 msgid "The form name" msgstr "" @@ -576,20 +754,20 @@ msgstr "" msgid "The module" msgstr "" -#: ../vn/vn-login.c:287 ../vn/vn-login.c:289 +#: ../vn/vn-login.c:292 ../vn/vn-login.c:294 msgid "Login error" msgstr "" -#: ../vn/vn-login.c:345 +#: ../vn/vn-login.c:350 #, c-format msgid "Bad connection settings, please check it." msgstr "" -#: ../vn/vn-login.c:481 +#: ../vn/vn-login.c:484 msgid "Application id" msgstr "" -#: ../vn/vn-login.c:482 +#: ../vn/vn-login.c:485 msgid "The application identifier" msgstr "" @@ -665,11 +843,11 @@ msgstr "" msgid "The column of the model shown by combo" msgstr "" -#: ../vn/field/vn-completion.c:328 +#: ../vn/field/vn-completion.c:332 msgid "Field" msgstr "" -#: ../vn/field/vn-completion.c:329 +#: ../vn/field/vn-completion.c:333 msgid "The name of the field used for the search" msgstr "" @@ -836,72 +1014,64 @@ msgid "An optional file loader, if it's NULL the column will create one" msgstr "" #: ../vn/gui/login.glade.h:1 -msgid "Configuration" +msgid "Access" msgstr "" #: ../vn/gui/login.glade.h:2 -msgid "Plugin:" +msgid "User:" msgstr "" #: ../vn/gui/login.glade.h:3 -msgid "Host:" +msgid "Password:" msgstr "" #: ../vn/gui/login.glade.h:4 -msgid "Schema:" +msgid "Press here to see the password" msgstr "" #: ../vn/gui/login.glade.h:5 -msgid "SSL CA:" +msgid "Remember" msgstr "" #: ../vn/gui/login.glade.h:6 +msgid "Configuration" +msgstr "" + +#: ../vn/gui/login.glade.h:7 +msgid "Plugin:" +msgstr "" + +#: ../vn/gui/login.glade.h:8 +msgid "Host:" +msgstr "" + +#: ../vn/gui/login.glade.h:9 +msgid "Schema:" +msgstr "" + +#: ../vn/gui/login.glade.h:10 +msgid "SSL CA:" +msgstr "" + +#: ../vn/gui/login.glade.h:11 msgid "" "Path to the file containing the CA certificate, if this is empty SSL won't " "be used" msgstr "" -#: ../vn/gui/login.glade.h:7 -msgid "Access" -msgstr "" - -#: ../vn/gui/login.glade.h:8 ../vn/gui/main.glade.h:3 -msgid "User:" -msgstr "" - -#: ../vn/gui/login.glade.h:9 -msgid "Password:" -msgstr "" - -#: ../vn/gui/login.glade.h:10 -msgid "Press here to see the password" -msgstr "" - -#: ../vn/gui/login.glade.h:11 -msgid "Remember" -msgstr "" - -#: ../vn/gui/main.glade.h:1 ../vn/gui/child-window.glade.h:1 -msgid "Hedera" -msgstr "" - -#: ../vn/gui/main.glade.h:4 -msgid "[user-name]" -msgstr "" - -#: ../vn/gui/main.glade.h:5 +#: ../vn/gui/main.glade.h:1 msgid "Copyright - Verdnatura Levante S. L." msgstr "" -#: ../vn/gui/main.glade.h:6 +#: ../vn/gui/main.glade.h:2 msgid "Management and administration of companies" msgstr "" -#: ../vn/gui/main.glade.h:7 +#: ../vn/gui/main.glade.h:3 msgid "www.verdnatura.es" msgstr "" -#: ../vn/gui/main.glade.h:8 +#: ../vn/gui/main.glade.h:4 msgid "" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU Lesser General Public\n" @@ -919,46 +1089,6 @@ msgid "" "02111-1307 USA." msgstr "" -#: ../vn/gui/actions.glade.h:1 -msgid "_Logout" -msgstr "" - -#: ../vn/gui/actions.glade.h:2 -msgid "Logout" -msgstr "" - -#: ../vn/gui/actions.glade.h:3 -msgid "_Quit" -msgstr "" - -#: ../vn/gui/actions.glade.h:4 -msgid "Quit" -msgstr "" - -#: ../vn/gui/actions.glade.h:5 -msgid "_About" -msgstr "" - -#: ../vn/gui/actions.glade.h:6 -msgid "_File" -msgstr "" - -#: ../vn/gui/actions.glade.h:7 -msgid "_Help" -msgstr "" - -#: ../vn/gui/actions.glade.h:8 -msgid "_Reconnect" -msgstr "" - -#: ../vn/gui/actions.glade.h:9 -msgid "Reconnect" -msgstr "" - -#: ../vn/gui/actions.glade.h:10 -msgid "_Close" -msgstr "" - #: ../vn/gui/date-chooser.glade.h:1 ../glade/glade-db-model.c:72 #: ../glade/glade-eprop-model.c:164 msgid "OK" @@ -985,30 +1115,39 @@ msgstr "" msgid "Cancel" msgstr "" -#: ../glade/glade-db-model.c:186 +#: ../glade/glade-db-model.c:184 msgid "Open the SQL Editor" msgstr "" -#: ../glade/glade-db-model.c:263 +#: ../glade/glade-db-model.c:262 msgid "Select a GvnParam" msgstr "" -#: ../glade/glade-db-model.c:331 +#: ../glade/glade-db-model.c:330 msgid "Select the parameter from a list" msgstr "" -#: ../glade/glade-db-model.c:349 +#: ../glade/glade-db-model.c:348 msgid "You need to create at least one GvnParam or derived object" msgstr "" -#: ../glade/glade-db-model.c:480 +#: ../glade/glade-db-model.c:502 msgid "Add or remove links" msgstr "" -#: ../glade/glade-db-model-editor.c:54 +#: ../glade/glade-db-model.c:554 +msgctxt "Verb" +msgid "Link" +msgstr "" + +#: ../glade/glade-db-model-editor.c:62 msgid "List of parameters linked to the model" msgstr "" +#: ../glade/glade-db-model-editor.c:65 +msgid "List of SQLHolders and identifiers" +msgstr "" + #: ../glade/glade-eprop-model.c:129 msgid "Create and set a model for a DbModelHolder" msgstr "" @@ -1045,16 +1184,21 @@ msgstr "" msgid "The model must have \"SQL\" set and \"Use file\" set to 'No'." msgstr "" -#: ../glade/glade-db-iterator.c:143 +#: ../glade/glade-db-iterator.c:144 #, c-format msgid "%s can't have children before automatic generation." msgstr "" -#: ../glade/glade-db-iterator.c:154 +#: ../glade/glade-db-iterator.c:155 #, c-format msgid "%s must have \"Model\" set. %s" msgstr "" +#: ../glade/glade-db-iterator.c:180 +#, c-format +msgid "Automatic generation of params for %s" +msgstr "" + #: ../glade/vn.xml.h:1 msgid "The model held by the object" msgstr "" @@ -1095,10 +1239,10 @@ msgstr "" msgid "Immediate changes" msgstr "" -#: ../module/src/vn-consulter.c:233 +#: ../module/src/vn-consulter.c:234 msgid "Type or select a query" msgstr "" -#: ../module/src/vn-consulter.c:235 +#: ../module/src/vn-consulter.c:236 msgid "Message" msgstr "" diff --git a/vn/Makefile.am b/vn/Makefile.am index 3fe8f45..b854054 100644 --- a/vn/Makefile.am +++ b/vn/Makefile.am @@ -65,8 +65,6 @@ vn_image_DATA = \ vn_gui_DATA = \ gui/login.glade \ gui/main.glade \ - gui/child-window.glade \ - gui/actions.glade \ gui/date-chooser.glade \ gui/menu.glade diff --git a/vn/gui/actions.glade b/vn/gui/actions.glade deleted file mode 100644 index d0fad5a..0000000 --- a/vn/gui/actions.glade +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - _Logout - Logout - gtk-quit - contact-new - - - - - - - _Quit - Quit - window-close - - - - - - - _About - help-about - - - - - - _File - system-file-manager - - - - - _Help - help-contents - - - - - _Reconnect - Reconnect - gtk-connect - - - - - - - _Close - window-close - - - - - - diff --git a/vn/gui/child-window.glade b/vn/gui/child-window.glade deleted file mode 100644 index 5cdc8c5..0000000 --- a/vn/gui/child-window.glade +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - 400 - 300 - False - True - ../image/icon.svg - - - - True - True - False - True - - - - - - - - diff --git a/vn/gui/main.glade b/vn/gui/main.glade index 7b71bf8..d1f6b48 100644 --- a/vn/gui/main.glade +++ b/vn/gui/main.glade @@ -3,14 +3,36 @@ + + False + center + ../image/icon.svg + + + + + + True + True + False + True + vn-notebook + + + + + + + False 5 True ../image/icon.svg dialog + window Hedera - Versión 1.0 + Version 1.0 Copyright - Verdnatura Levante S. L. Management and administration of companies http://www.verdnatura.es @@ -63,23 +85,4 @@ Juan Ferrer Toribio - - False - center - ../image/icon.svg - - - - True - True - False - True - vn-notebook - - - - - - - diff --git a/vn/gui/menu.glade b/vn/gui/menu.glade index ae6fb1a..6b69a6c 100644 --- a/vn/gui/menu.glade +++ b/vn/gui/menu.glade @@ -1,6 +1,13 @@ +
+ + New window + app.new-window + <Primary>n + +
Logout diff --git a/vn/vn-gui.c b/vn/vn-gui.c index 62643a0..121dbce 100644 --- a/vn/vn-gui.c +++ b/vn/vn-gui.c @@ -25,7 +25,6 @@ #include #define MAIN_UI _GUI_DIR"/main.glade" -#define CHILD_WINDOW_UI _GUI_DIR"/child-window.glade" #define MENU_UI _GUI_DIR"/menu.glade" #define MODULE_DTD _DTD_DIR"/module.dtd" @@ -45,6 +44,7 @@ struct _VnWindow { VnGui * obj; GtkWindow * widget; + GtkDialog * about; GtkHeaderBar * header; GtkWidget * menu_button; GtkWidget * spinner; @@ -78,6 +78,7 @@ typedef struct } GuiData; +void vn_gui_on_new_window_activated (GSimpleAction * a, GVariant * v, gpointer obj); void vn_gui_on_logout_activated (GSimpleAction * a, GVariant * v, gpointer obj); void vn_gui_on_open_activated (GSimpleAction * a, GVariant * v, gpointer obj); void vn_gui_on_about_activated (GSimpleAction * a, GVariant * v, gpointer obj); @@ -87,17 +88,16 @@ void vn_gui_on_close_tab_activated (GSimpleAction * a, GVariant * v, gpointer ob static void vn_gui_reconnect (VnGui * obj); static void vn_gui_on_conn_error (DbConn * conn, const GError * error, VnGui * obj); static void vn_gui_on_conn_status_changed (DbConn * conn, DbConnStatus status, VnGui * obj); -static gboolean vn_gui_on_window_focused (GtkWidget * widget, GdkEvent * event, VnWindow * window); void vn_gui_on_open_form_activated (GSimpleAction * action, GVariant * v, gpointer obj); -void vn_gui_on_child_destroyed (GtkWindow * widget, VnWindow * window); +void vn_gui_on_window_destroyed (GtkWindow * widget, VnWindow * window); void vn_gui_on_page_removed (GtkNotebook * notebook, GtkWidget * page, guint num, VnWindow * window); -void vn_gui_on_main_page_removed (GtkNotebook * notebook, GtkWidget * page, guint num, VnWindow * window); static guint signals[LAST_SIGNAL] = {0}; static const GActionEntry app_entries[] = { - {"logout", vn_gui_on_logout_activated} + {"new-window", vn_gui_on_new_window_activated} + ,{"logout", vn_gui_on_logout_activated} ,{"connect", vn_gui_on_open_activated} ,{"about", vn_gui_on_about_activated} ,{"quit", vn_gui_on_exit_activated} @@ -140,11 +140,9 @@ static void gui_data_free (GuiData * gui_data) static void vn_gui_free_window (VnGui * obj, VnWindow * window) { g_signal_handlers_disconnect_by_func (window->widget, - vn_gui_on_child_destroyed, window); + vn_gui_on_window_destroyed, window); g_signal_handlers_disconnect_by_func (window->notebook, vn_gui_on_page_removed, window); - g_signal_handlers_disconnect_by_func (window->notebook, - vn_gui_on_main_page_removed, window); gtk_widget_destroy (GTK_WIDGET (window->widget)); g_free (window); @@ -458,13 +456,11 @@ static VnWindow * vn_gui_add_window (VnGui * obj, GtkWindow * widget, GtkNoteboo window->merge_id = 0; obj->windows = g_slist_prepend (obj->windows, window); + gtk_application_add_window (obj->app, widget); gtk_notebook_set_group_name (notebook, g_application_get_application_id (G_APPLICATION (obj->app))); - g_signal_connect (window->widget, "focus-in-event", - G_CALLBACK (vn_gui_on_window_focused), window); - // Setting header and window menu window->header = g_object_new (GTK_TYPE_HEADER_BAR @@ -551,7 +547,7 @@ static void vn_gui_close (VnGui * obj) g_return_if_fail (VN_IS_GUI (obj)); - if (obj->main_window) + if (obj->windows) { vn_gui_save (obj); g_object_disconnect (obj->conn @@ -565,7 +561,7 @@ static void vn_gui_close (VnGui * obj) g_slist_free (obj->windows); obj->windows = NULL; - obj->main_window = NULL; + obj->active_window = NULL; } } @@ -672,21 +668,25 @@ static void vn_gui_set_show_tabs (VnWindow * window) //--------------------------------------------------- Window handlers /* - * Called when the main window is closed. + * Called when the last window is closed. */ -gboolean vn_gui_on_main_deleted (GtkWidget * widget, GdkEvent * event, VnWindow * window) +gboolean vn_gui_on_last_window_deleted (GtkWidget * widget, GdkEvent * event, VnWindow * window) { - vn_gui_logout (window->obj, TRUE); + VnGui * obj = window->obj; + + if (obj->windows->next) + return FALSE; + + vn_gui_logout (obj, TRUE); return TRUE; } /* - * Called when a child window is closed. + * Called when a window is closed. */ -void vn_gui_on_child_destroyed (GtkWindow * widget, VnWindow * window) +void vn_gui_on_window_destroyed (GtkWindow * widget, VnWindow * window) { VnGui * obj = window->obj; - vn_gui_free_window (obj, window); obj->windows = g_slist_remove (obj->windows, window); } @@ -694,7 +694,7 @@ void vn_gui_on_child_destroyed (GtkWindow * widget, VnWindow * window) /* * Called when any window of the application gets the focus. */ -static gboolean vn_gui_on_window_focused (GtkWidget * widget, GdkEvent * event, VnWindow * window) +gboolean vn_gui_on_window_focused (GtkWidget * widget, GdkEvent * event, VnWindow * window) { window->obj->active_window = window; return FALSE; @@ -757,29 +757,22 @@ void vn_gui_on_switch_page (GtkNotebook * notebook, VnForm * form, guint num, Vn } /* - * Called when a page of the main window is removed from its notebook. - */ -void vn_gui_on_main_page_removed (GtkNotebook * notebook, - GtkWidget * page, guint num, VnWindow * window) -{ - if (gtk_notebook_get_n_pages (notebook) < 1) - { - vn_gui_hide_form (window); - gtk_header_bar_set_title (window->header, window->obj->app_title); - } - - vn_gui_set_show_tabs (window); -} - -/* - * Called when a page of a child window is removed from its notebook, if its - * the last page destroys the window too. + * Called when a page is removed from its notebook. If the window is not the + * last one and its the last page destroys the window too. */ void vn_gui_on_page_removed (GtkNotebook * notebook, GtkWidget * page, guint num, VnWindow * window) { if (gtk_notebook_get_n_pages (notebook) < 1) - gtk_widget_destroy (GTK_WIDGET (window->widget)); + { + if (!window->obj->windows->next) + { + vn_gui_hide_form (window); + gtk_header_bar_set_title (window->header, window->obj->app_title); + } + else + gtk_widget_destroy (GTK_WIDGET (window->widget)); + } vn_gui_set_show_tabs (window); } @@ -805,6 +798,20 @@ void vn_gui_on_open_form_activated (GSimpleAction * a, GVariant * p, gpointer ob g_variant_get_string (g_action_get_state (G_ACTION (a)), NULL), window); } +/* + * New empty window action handler. + */ +void vn_gui_on_new_window_activated (GSimpleAction * a, GVariant * v, gpointer obj) +{ + gint x , y; + VnWindow * w; + VnGui * o = obj; + + gtk_window_get_position (o->active_window->widget, &x, &y); + w = vn_gui_create_window (obj, x + 100, y + 100); + gtk_window_resize (w->widget, 500, 500); +} + /* * Logout action handler. */ @@ -826,7 +833,7 @@ void vn_gui_on_open_activated (GSimpleAction * a, GVariant * v, gpointer obj) */ void vn_gui_on_about_activated (GSimpleAction * a, GVariant * v, gpointer obj) { - gtk_dialog_run (VN_GUI (obj)->about); + gtk_dialog_run (VN_GUI (obj)->active_window->about); } /* @@ -840,12 +847,15 @@ void vn_gui_on_exit_activated (GSimpleAction * a, GVariant * v, gpointer obj) /* * Closes the current tab when the close-tab action is activated. */ -void vn_gui_on_close_tab_activated (GSimpleAction * a, GVariant * v, gpointer obj) +void vn_gui_on_close_tab_activated (GSimpleAction * a, GVariant * v, gpointer w) { - VnWindow * window = obj; + VnWindow * window = w; + VnGui * obj = window->obj; if (window->active_form) vn_gui_close_form (window->obj, window->active_form); + else if (window == obj->active_window && !obj->windows->next) + vn_gui_logout (obj, TRUE); } //--------------------------------------------------- Connection handlers @@ -888,13 +898,11 @@ static void vn_gui_on_conn_status_changed (DbConn * conn, DbConnStatus status, V if (status & DB_CONN_LOADING) { - //gtk_widget_show (win->spinner); gtk_widget_set_opacity (win->spinner, 1); gtk_spinner_start (GTK_SPINNER (win->spinner)); } else { - //gtk_widget_hide (win->spinner); gtk_widget_set_opacity (win->spinner, 0); gtk_spinner_stop (GTK_SPINNER (win->spinner)); } @@ -912,10 +920,10 @@ static void vn_gui_on_conn_status_changed (DbConn * conn, DbConnStatus status, V void vn_gui_open (VnGui * obj) { GtkBuilder * builder; + GKeyFile * config; GError * err = NULL; g_return_if_fail (VN_IS_GUI (obj)); - g_return_if_fail (!obj->main_window); builder = gtk_builder_new (); @@ -948,86 +956,64 @@ void vn_gui_open (VnGui * obj) } } else if (err) - { - g_warning ("VnGui: %s", err->message); - g_clear_error (&err); - } - - if (gtk_builder_add_from_file (builder, MAIN_UI, &err)) - { - GKeyFile * config; - GtkWindow * widget = gtk_builder_get (builder, "window"); - GtkNotebook * notebook = gtk_builder_get (builder, "notebook"); - - obj->about = gtk_builder_get (builder, "about"); - obj->main_window = vn_gui_add_window (obj, widget, notebook); - gtk_builder_connect_signals (GTK_BUILDER (builder), obj->main_window); - - // Restoring interface - - config = g_key_file_new (); - - if (g_key_file_load_from_file (config, obj->config_file, 0, NULL)) - { - gsize m, n; - gsize len; - gint x, y; - gint width, height; - gboolean maximized; - gchar ** windows; - gchar ** forms; - VnWindow * window; - - windows = g_key_file_get_groups (config, &len); - - for (m = 0; m < len; m++) - { - x = g_key_file_get_integer (config, windows[m], "x", NULL); - y = g_key_file_get_integer (config, windows[m], "y", NULL); - width = g_key_file_get_integer (config, windows[m], "width", NULL); - height = g_key_file_get_integer (config, windows[m], "height", NULL); - maximized = g_key_file_get_boolean (config, windows[m], "maximized", NULL); - - if (g_key_file_get_boolean (config, windows[m], "main", NULL)) - { - window = obj->main_window; - gtk_window_move (window->widget, x, y); - } - else - window = vn_gui_create_window (obj, x, y); - - gtk_window_resize (window->widget, width, height); - - if (maximized) - gtk_window_maximize (window->widget); - - forms = g_key_file_get_string_list (config, - windows[m], "forms", NULL, NULL); - - for (n = 0; forms[n]; n++) - vn_gui_open_form_at_window (obj, forms[n], window); - - g_key_file_remove_group (config, windows[m], NULL); - g_strfreev (forms); - } - - g_strfreev (windows); - } - - g_key_file_free (config); - - g_object_connect (obj->conn - ,"signal::error", vn_gui_on_conn_error, obj - ,"signal::status-changed", vn_gui_on_conn_status_changed, obj - ,NULL - ); - } - else if (err) { g_warning ("VnGui: %s", err->message); g_error_free (err); } + // Restoring interface + + config = g_key_file_new (); + + if (g_key_file_load_from_file (config, obj->config_file, 0, NULL)) + { + gsize m, n, len; + gint x, y, width, height; + gboolean maximized; + gchar ** windows, ** forms; + VnWindow * window; + + windows = g_key_file_get_groups (config, &len); + + for (m = 0; m < len; m++) + { + x = g_key_file_get_integer (config, windows[m], "x", NULL); + y = g_key_file_get_integer (config, windows[m], "y", NULL); + width = g_key_file_get_integer (config, windows[m], "width", NULL); + height = g_key_file_get_integer (config, windows[m], "height", NULL); + maximized = g_key_file_get_boolean (config, windows[m], "maximized", NULL); + + window = vn_gui_create_window (obj, x, y); + gtk_window_resize (window->widget, width, height); + + if (maximized) + gtk_window_maximize (window->widget); + + forms = g_key_file_get_string_list (config, windows[m], "forms", NULL, NULL); + + for (n = 0; forms[n]; n++) + vn_gui_open_form_at_window (obj, forms[n], window); + + g_key_file_remove_group (config, windows[m], NULL); + g_strfreev (forms); + } + + g_strfreev (windows); + } + else + { + VnWindow * window = vn_gui_create_window (obj, 100, 100); + gtk_window_resize (window->widget, 500, 400); + } + + g_key_file_free (config); + + g_object_connect (obj->conn + ,"signal::error", vn_gui_on_conn_error, obj + ,"signal::status-changed", vn_gui_on_conn_status_changed, obj + ,NULL + ); + g_object_unref (builder); } @@ -1052,7 +1038,6 @@ void vn_gui_save (VnGui * obj) GKeyFile * config; g_return_if_fail (VN_IS_GUI (obj)); - g_return_if_fail (obj->main_window); // Saving the interface configuration @@ -1080,9 +1065,6 @@ void vn_gui_save (VnGui * obj) // Saving the forms opened at window - if (window == obj->main_window) - g_key_file_set_boolean (config, group, "main", TRUE); - nb_pages = gtk_container_get_children (GTK_CONTAINER (window->notebook)); len = gtk_notebook_get_n_pages (window->notebook); forms = g_new (const gchar *, len); @@ -1118,20 +1100,17 @@ VnWindow * vn_gui_create_window (VnGui * obj, gint x, gint y) GError * err = NULL; g_return_val_if_fail (VN_IS_GUI (obj), NULL); - g_return_val_if_fail (obj->main_window, NULL); builder = gtk_builder_new (); - if (gtk_builder_add_from_file (builder, CHILD_WINDOW_UI, &err)) + if (gtk_builder_add_from_file (builder, MAIN_UI, &err)) { - GtkWindow * widget; - GtkNotebook * notebook; - - widget = gtk_builder_get (builder, "child"); - notebook = gtk_builder_get (builder, "notebook"); + GtkWindow * widget = gtk_builder_get (builder, "window"); + GtkNotebook * notebook = gtk_builder_get (builder, "notebook"); gtk_window_move (widget, x, y); window = vn_gui_add_window (obj, widget, notebook); + window->about = gtk_builder_get (builder, "about"); gtk_builder_connect_signals (builder, window); } else @@ -1168,7 +1147,6 @@ VnForm * vn_gui_open_form_at_window (VnGui * obj, const gchar * form_name, VnWin GtkNotebook * notebook = NULL; g_return_val_if_fail (VN_IS_GUI (obj), NULL); - g_return_val_if_fail (obj->main_window, NULL); iter = g_hash_table_lookup (obj->forms, form_name); @@ -1400,9 +1378,7 @@ static void vn_gui_get_property (VnGui * obj, guint id, static void vn_gui_init (VnGui * obj) { - obj->main_window = NULL; obj->active_window = NULL; - obj->about = NULL; obj->windows = NULL; obj->conn = NULL; obj->app = NULL; diff --git a/vn/vn-gui.h b/vn/vn-gui.h index ec37f31..9f47b6a 100644 --- a/vn/vn-gui.h +++ b/vn/vn-gui.h @@ -47,10 +47,8 @@ struct _VnGui GtkApplication * app; gchar * app_title; - VnWindow * main_window; VnWindow * active_window; GtkTreeStore * tree; - GtkDialog * about; GMenuModel * main_menu; GHashTable * forms;