diff --git a/js/functions.js b/js/functions.js index 85d9ed90a5..1b874ca6b9 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1816,6 +1816,76 @@ $(document).ready(function() { }, 'top.frame_content'); //end $(document).ready for 'Create Table' +/** + * jQuery coding for 'Change Table'. Used on tbl_structure.php * + * Attach Ajax Event handlers for Change Table + */ +$(document).ready(function() { + /** + *Ajax action for submitting the column change form + **/ + $("#append_fields_form input[name=do_save_data]").live('click', function(event) { + event.preventDefault(); + /** + * @var the_form object referring to the export form + */ + var $form = $("#append_fields_form"); + + /* + * First validate the form; if there is a problem, avoid submitting it + * + * checkTableEditForm() needs a pure element and not a jQuery object, + * this is why we pass $form[0] as a parameter (the jQuery object + * is actually an array of DOM elements) + */ + if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) { + // OK, form passed validation step + if ($form.hasClass('ajax')) { + PMA_prepareForAjaxRequest($form); + //User wants to submit the form + $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } else if ($(".error").length != 0) { + $(".error").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + if ($("#change_column_dialog").length > 0) { + $("#change_column_dialog").dialog("close").remove(); + } + /*Reload the field form*/ + $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { + $("#fieldsForm").remove(); + var $temp_div = $("
").append(form_data); + if ($("#sqlqueryresults").length != 0) { + $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); + } else { + $temp_div.find("#fieldsForm").insertAfter(".error"); + } + /*Call the function to display the more options in table*/ + displayMoreTableOpts(); + }); + } else { + var $temp_div = $("
").append(data); + var $error = $temp_div.find(".error code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + } else { + // non-Ajax submit + $form.append(''); + $form.submit(); + } + } + }) // end change table button "do_save_data" + +}, 'top.frame_content'); //end $(document).ready for 'Change Table' + /** * Attach Ajax event handlers for Drop Database. Moved here from db_structure.js * as it was also required on db_create.php diff --git a/js/tbl_structure.js b/js/tbl_structure.js index c58bd5443a..a9b9adae77 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -18,7 +18,7 @@ * */ $(document).ready(function() { - + /** * Attach Event Handler for 'Drop Column' * @@ -181,53 +181,6 @@ $(document).ready(function() { changeColumns(action,url); }); - /** - *Ajax action for submitting the column change form - **/ - $("#append_fields_form input[name=do_save_data].ajax").live('click', function(event) { - event.preventDefault(); - /** - * @var the_form object referring to the export form - */ - var $form = $("#append_fields_form"); - - PMA_prepareForAjaxRequest($form); - //User wants to submit the form - $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { - if ($("#sqlqueryresults").length != 0) { - $("#sqlqueryresults").remove(); - } else if ($(".error").length != 0) { - $(".error").remove(); - } - if (data.success == true) { - PMA_ajaxShowMessage(data.message); - $("
").insertAfter("#topmenucontainer"); - $("#sqlqueryresults").html(data.sql_query); - $("#result_query .notice").remove(); - $("#result_query").prepend((data.message)); - if ($("#change_column_dialog").length > 0) { - $("#change_column_dialog").dialog("close").remove(); - } - /*Reload the field form*/ - $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { - $("#fieldsForm").remove(); - var $temp_div = $("
").append(form_data); - if ($("#sqlqueryresults").length != 0) { - $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); - } else { - $temp_div.find("#fieldsForm").insertAfter(".error"); - } - /*Call the function to display the more options in table*/ - displayMoreTableOpts(); - }); - } else { - var $temp_div = $("
").append(data); - var $error = $temp_div.find(".error code").addClass("error"); - PMA_ajaxShowMessage($error); - } - }) // end $.post() - }) // end insert table button "do_save_data" - /** *Ajax event handler for index edit **/ @@ -239,7 +192,11 @@ $(document).ready(function() { } url = url + "&ajax_request=true"; - var div = $('
'); + /*Remove the hidden dialogs if there are*/ + if ($('#edit_index_dialog').length != 0) { + $('#edit_index_dialog').remove(); + } + var $div = $('
'); /** * @var button_options Object that stores the options passed to jQueryUI @@ -256,7 +213,7 @@ $(document).ready(function() { $.get( "tbl_indexes.php" , url , function(data) { //in the case of an error, show the error message returned. if (data.success != undefined && data.success == false) { - div + $div .append(data.error) .dialog({ title: PMA_messages['strEdit'], @@ -267,7 +224,7 @@ $(document).ready(function() { buttons : button_options_error })// end dialog options } else { - div + $div .append(data) .dialog({ title: PMA_messages['strEdit'], @@ -280,6 +237,7 @@ $(document).ready(function() { //Remove the top menu container from the dialog .find("#topmenucontainer").hide() ; // end dialog options + checkIndexType(); checkIndexName("index_frm"); } PMA_ajaxRemoveMessage($msgbox); @@ -311,22 +269,22 @@ $(document).ready(function() { /*Reload the field form*/ $("#table_index").remove(); - var temp_div = $("
").append(data.index_table); - $(temp_div).find("#table_index").insertAfter("#index_header"); + var $temp_div = $("
").append(data.index_table); + $temp_div.find("#table_index").insertAfter("#index_header"); if ($("#edit_index_dialog").length > 0) { $("#edit_index_dialog").dialog("close").remove(); } } else { if(data.error != undefined) { - var temp_div = $("
").append(data.error); - if($(temp_div).find(".error code").length != 0) { - var error = $(temp_div).find(".error code").addClass("error"); + var $temp_div = $("
").append(data.error); + if ($temp_div.find(".error code").length != 0) { + var $error = $temp_div.find(".error code").addClass("error"); } else { - var error = temp_div; + var $error = $temp_div; } } - PMA_ajaxShowMessage(error); + PMA_ajaxShowMessage($error); } }) // end $.post() @@ -346,8 +304,8 @@ $(document).ready(function() { //User wants to submit the form $.post($form.attr('action'), $form.serialize()+"&add_fields=Go", function(data) { $("#index_columns").remove(); - var temp_div = $("
").append(data); - $(temp_div).find("#index_columns").appendTo("#index_edit_fields"); + var $temp_div = $("
").append(data); + $temp_div.find("#index_columns").appendTo("#index_edit_fields"); }) // end $.post() }) // end insert table button "Go" @@ -394,7 +352,7 @@ function changeColumns(action,url) { if ($('#change_column_dialog').length != 0) { $('#change_column_dialog').remove(); } - var div = $('
'); + var $div = $('
'); /** * @var button_options Object that stores the options passed to jQueryUI @@ -411,7 +369,7 @@ function changeColumns(action,url) { $.get( action , url , function(data) { //in the case of an error, show the error message returned. if (data.success != undefined && data.success == false) { - div + $div .append(data.error) .dialog({ title: PMA_messages['strChangeTbl'], @@ -422,7 +380,7 @@ function changeColumns(action,url) { buttons : button_options_error })// end dialog options } else { - div + $div .append(data) .dialog({ title: PMA_messages['strChangeTbl'], diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 1800aee33d..7cc47991e3 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -194,9 +194,10 @@ class PMA_Index // $columns[names][] // $columns[sub_parts][] foreach ($columns['names'] as $key => $name) { + $sub_part = isset($columns['sub_parts'][$key]) ? $columns['sub_parts'][$key] : ''; $_columns[] = array( 'Column_name' => $name, - 'Sub_part' => $columns['sub_parts'][$key], + 'Sub_part' => $sub_part, ); } } else { diff --git a/po/br.po b/po/br.po index 6d92660791..a501c6e488 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-10 19:45+0200\n" +"PO-Revision-Date: 2011-07-11 20:39+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -2825,7 +2825,7 @@ msgstr "Bannoù gronnet gant" #: libraries/config/messages.inc.php:249 libraries/import/csv.php:81 #: libraries/import/ldi.php:43 msgid "Columns escaped by" -msgstr "" +msgstr "Arouezenn dec'hout" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:83 #: libraries/config/messages.inc.php:90 libraries/config/messages.inc.php:99 @@ -2833,38 +2833,38 @@ msgstr "" #: libraries/config/messages.inc.php:142 libraries/config/messages.inc.php:145 #: libraries/config/messages.inc.php:147 libraries/export/texytext.php:27 msgid "Replace NULL by" -msgstr "" +msgstr "Erlec'hiañ NULL gant" #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:84 msgid "Remove CRLF characters within columns" -msgstr "" +msgstr "Tennañ an arouezennoù dibenn linenn e dibarzh ar bannoù" #: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:245 #: libraries/config/messages.inc.php:253 libraries/import/csv.php:63 #: libraries/import/ldi.php:41 msgid "Columns terminated by" -msgstr "" +msgstr "Bannoù a echu gant" #: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:240 #: libraries/import/csv.php:86 libraries/import/ldi.php:44 msgid "Lines terminated by" -msgstr "" +msgstr "Linennoù a echu gant" #: libraries/config/messages.inc.php:82 msgid "Excel edition" -msgstr "" +msgstr "Stumm Excel" #: libraries/config/messages.inc.php:85 msgid "Database name template" -msgstr "" +msgstr "Patrom anv diaz roadennoù" #: libraries/config/messages.inc.php:86 msgid "Server name template" -msgstr "" +msgstr "Patrom anv servijer" #: libraries/config/messages.inc.php:87 msgid "Table name template" -msgstr "" +msgstr "Patrom anv taolenn" #: libraries/config/messages.inc.php:91 libraries/config/messages.inc.php:104 #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:137 @@ -2872,74 +2872,74 @@ msgstr "" #: libraries/export/latex.php:40 libraries/export/odt.php:32 #: libraries/export/sql.php:116 libraries/export/texytext.php:23 msgid "Dump table" -msgstr "" +msgstr "Ezporzhiañ an daolenn" #: libraries/config/messages.inc.php:92 libraries/export/latex.php:32 msgid "Include table caption" -msgstr "" +msgstr "Enklozañ an istitloù" #: libraries/config/messages.inc.php:95 libraries/config/messages.inc.php:101 #: libraries/export/latex.php:50 libraries/export/latex.php:74 msgid "Table caption" -msgstr "" +msgstr "Istitl eus an daolenn" #: libraries/config/messages.inc.php:96 libraries/config/messages.inc.php:102 msgid "Continued table caption" -msgstr "" +msgstr "Enklozañ an istitloù" #: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103 #: libraries/export/latex.php:54 libraries/export/latex.php:78 msgid "Label key" -msgstr "" +msgstr "Alc'hwez an dikedenn" #: libraries/config/messages.inc.php:98 libraries/config/messages.inc.php:110 #: libraries/config/messages.inc.php:134 libraries/export/odt.php:326 #: libraries/tbl_properties.inc.php:145 msgid "MIME type" -msgstr "" +msgstr "Seurt MIME" #: libraries/config/messages.inc.php:100 libraries/config/messages.inc.php:112 #: libraries/config/messages.inc.php:136 tbl_relation.php:396 msgid "Relations" -msgstr "" +msgstr "Darempredoù" #: libraries/config/messages.inc.php:105 msgid "Export method" -msgstr "" +msgstr "Doare ezporzhiañ" #: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116 msgid "Save on server" -msgstr "" +msgstr "Enrollañ war ar servijer" #: libraries/config/messages.inc.php:115 libraries/config/messages.inc.php:117 #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 msgid "Overwrite existing file(s)" -msgstr "" +msgstr "Frikañ ar restroù zo c'hoazh" #: libraries/config/messages.inc.php:118 msgid "Remember file name template" -msgstr "" +msgstr "Derc'hel soñj eus patrom anv ar restr" #: libraries/config/messages.inc.php:120 msgid "Enclose table and column names with backquotes" -msgstr "" +msgstr "Lakaat krochedoù stouet a bep tu da anvioù an taolennoù hag ar bannoù" #: libraries/config/messages.inc.php:121 libraries/config/messages.inc.php:260 #: libraries/display_export.lib.php:346 msgid "SQL compatibility mode" -msgstr "" +msgstr "Mod kenglotañ gant SQL" #: libraries/config/messages.inc.php:122 libraries/export/sql.php:176 msgid "CREATE TABLE options:" -msgstr "" +msgstr "Dibarzhioù evit CREATE TABLE :" #: libraries/config/messages.inc.php:123 msgid "Creation/Update/Check dates" -msgstr "" +msgstr "Deiziad krouiñ/hizivaat/gwiriañ" #: libraries/config/messages.inc.php:124 msgid "Use delayed inserts" -msgstr "" +msgstr "Ensoc'hadennoù gant dale" #: libraries/config/messages.inc.php:125 libraries/export/sql.php:79 msgid "Disable foreign key checks" diff --git a/po/da.po b/po/da.po index ea2aa503ce..65f4e7f5a4 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-04 10:57+0200\n" -"Last-Translator: \n" +"PO-Revision-Date: 2011-07-11 15:49+0200\n" +"Last-Translator: \n" "Language-Team: danish \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -415,7 +415,7 @@ msgstr "Du skal vælge mindst en kolonne der skal vises" #: db_qbe.php:186 msgid "Switch to" -msgstr "skift til" +msgstr "Skift til" #: db_qbe.php:186 msgid "visual builder" @@ -424,7 +424,7 @@ msgstr "" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:937 msgid "Sort" -msgstr "Sorter" +msgstr "Sortér" #: db_qbe.php:231 db_qbe.php:265 libraries/db_structure.lib.php:97 #: libraries/display_tbl.lib.php:557 libraries/display_tbl.lib.php:898 @@ -504,11 +504,11 @@ msgid "Your SQL query has been executed successfully" msgstr "Din SQL-forespørgsel blev udført korrekt" #: db_routines.php:158 -#, fuzzy, php-format +#, php-format msgid "%d row affected by the last statement inside the procedure" msgid_plural "%d rows affected by the last statement inside the procedure" -msgstr[0] "række påvirket af den sidste SQL-sætning inde i proceduren" -msgstr[1] "rækker påvirket af den sidste SQL-sætning inde i proceduren" +msgstr[0] "%d række påvirket af den sidste SQL-sætning inde i proceduren" +msgstr[1] "%d rækker påvirket af den sidste SQL-sætning inde i proceduren" #: db_routines.php:168 #, php-format @@ -552,30 +552,30 @@ msgid "Export of routine %s" msgstr "Eksport af rutine %s" #: db_routines.php:291 libraries/db_routines.lib.php:911 -#, fuzzy, php-format +#, php-format #| msgid "Invalid server index: %s" msgid "Invalid routine type: \"%s\"" -msgstr "Server indekset %s er ugyldigt" +msgstr "Server-indekset \"%s\" er ugyldigt" #: db_routines.php:312 msgid "Sorry, we failed to restore the dropped routine." -msgstr "" +msgstr "Beklager, det lykkedes ikke at genetablere den slettede rutine." #: db_routines.php:313 msgid "The backed up query was:" -msgstr "" +msgstr "Den gemte forespørgsel var:" #: db_routines.php:317 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Routine %1$s has been modified." -msgstr "Tabel %s er slettet" +msgstr "Tabel \"%1$s\" er slettet" #: db_routines.php:330 -#, fuzzy, php-format +#, php-format #| msgid "Database %1$s has been created." msgid "Routine %1$s has been created." -msgstr "Database %1$s er oprettet," +msgstr "Rutine %1$s er oprettet," #: db_routines.php:338 msgid "One or more errors have occured while processing your request:" @@ -613,7 +613,7 @@ msgstr "mindst ét ​​af ordene" #: db_search.php:43 db_search.php:285 msgid "all words" -msgstr "alle ordene" +msgstr "alle ord" #: db_search.php:44 db_search.php:286 msgid "the exact phrase" @@ -632,8 +632,8 @@ msgstr "Søgeresultater for \"%s\" %s:" #, php-format msgid "%s match inside table %s" msgid_plural "%s matches inside table %s" -msgstr[0] "%s hit i tabel %s" -msgstr[1] "%s hits i tabel %s" +msgstr[0] "%s sammenfald i tabel %s" +msgstr[1] "%s sammenfald i tabel %s" #: db_search.php:231 libraries/common.lib.php:2650 #: libraries/common.lib.php:2834 libraries/common.lib.php:2835 @@ -644,7 +644,7 @@ msgstr "Vis" #: db_search.php:236 #, php-format msgid "Delete the matches for the %s table?" -msgstr "Slet match for %s tabellen?" +msgstr "Slet sammenfald for %s tabellen?" #: db_search.php:236 libraries/display_tbl.lib.php:1338 #: libraries/display_tbl.lib.php:2314 @@ -662,8 +662,8 @@ msgstr "Slet" #, php-format msgid "Total: %s match" msgid_plural "Total: %s matches" -msgstr[0] "I alt: %s hit" -msgstr[1] "I alt %s hits" +msgstr[0] "I alt: %s sammenfald" +msgstr[1] "I alt %s sammenfald" #: db_search.php:272 msgid "Search in database" @@ -682,7 +682,6 @@ msgid "Words are separated by a space character (\" \")." msgstr "Ord adskilles af mellemrums-karakter (\" \")." #: db_search.php:298 -#, fuzzy #| msgid "Inside table(s):" msgid "Inside tables:" msgstr "Indeni tabel(ler):" @@ -698,17 +697,17 @@ msgstr "Ingen tabeller fundet i databasen" #: db_structure.php:270 tbl_operations.php:688 #, php-format msgid "Table %s has been emptied" -msgstr "Tabel %s er tømt" +msgstr "Tabel %s blev tømt" #: db_structure.php:279 tbl_operations.php:705 #, php-format msgid "View %s has been dropped" -msgstr "Visning %s er blevet droppet" +msgstr "Visning %s er blevet slettet" #: db_structure.php:279 tbl_operations.php:705 #, php-format msgid "Table %s has been dropped" -msgstr "Tabel %s er slettet" +msgstr "Tabel %s blev slettet" #: db_structure.php:286 tbl_create.php:269 msgid "Tracking is active." @@ -723,7 +722,7 @@ msgstr "Sporing er ikke aktiv." msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." -msgstr "" +msgstr "Viewet har mindst dette antal rækker. Se venligst %sdokumentationen%s." #: db_structure.php:386 db_structure.php:400 libraries/header.inc.php:152 #: libraries/tbl_info.inc.php:60 tbl_structure.php:212 @@ -757,13 +756,13 @@ msgstr "Med det markerede:" #: server_databases.php:262 server_privileges.php:583 #: server_privileges.php:1669 tbl_structure.php:590 msgid "Check All" -msgstr "Afmærk alt" +msgstr "Vælg alle" #: db_structure.php:483 libraries/display_tbl.lib.php:2335 #: libraries/replication_gui.lib.php:35 server_databases.php:264 #: server_privileges.php:586 server_privileges.php:1673 tbl_structure.php:594 msgid "Uncheck All" -msgstr "Fjern alle mærker" +msgstr "Fravælg alle" #: db_structure.php:488 msgid "Check tables having overhead" @@ -776,7 +775,7 @@ msgstr "Check tabeller der har overhead" #: libraries/tbl_links.inc.php:80 prefs_manage.php:288 #: server_privileges.php:1354 setup/frames/menu.inc.php:21 msgid "Export" -msgstr "Eksport" +msgstr "Eksportér" #: db_structure.php:498 db_structure.php:553 #: libraries/display_tbl.lib.php:2439 tbl_structure.php:628 @@ -784,8 +783,10 @@ msgstr "Eksport" msgid "Print view" msgstr "Vis (udskriftvenlig)" +# By "Empty", if this is an action, it should translate to "Tøm" but if it's a state it should translate to "Tom". #: db_structure.php:502 libraries/common.lib.php:2843 #: libraries/common.lib.php:2844 +#, fuzzy msgid "Empty" msgstr "Tøm" @@ -803,11 +804,11 @@ msgstr "Tjek tabel" #: db_structure.php:508 tbl_operations.php:653 tbl_structure.php:842 #: tbl_structure.php:844 msgid "Optimize table" -msgstr "Optimer tabel" +msgstr "Optimér tabel" #: db_structure.php:510 tbl_operations.php:640 msgid "Repair table" -msgstr "Reparer tabel" +msgstr "Reparér tabel" #: db_structure.php:512 tbl_operations.php:627 msgid "Analyze table" @@ -927,7 +928,7 @@ msgstr "Output" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Kopiér og indsæt de sammensatte værdier i \"Længde/Værdier\"-feltet" #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -1070,10 +1071,9 @@ msgid "You are about to DESTROY a complete table!" msgstr "Du er ved at DESTRUERE en komplet tabel!" #: js/messages.php:33 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to TRUNCATE a complete table!" -msgstr "Du er ved at DESTRUERE en komplet database!" +msgstr "Du er ved at slette en hel tabel!" #: js/messages.php:35 msgid "Deleting tracking data" @@ -1089,12 +1089,13 @@ msgstr "Denne operation kan tage lang tid. Fortsæt alligevel?" #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "Du er ved at deaktivere en BLOB-beholder." #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" msgstr "" +"Er du sikker på at du vil deaktivere alle BLOB-referencer i databasen %s?" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1106,10 +1107,9 @@ msgstr "Dette er ikke et tal!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:49 -#, fuzzy #| msgid "Total" msgid "Total count" -msgstr "Total" +msgstr "Samlet antal" #: js/messages.php:52 msgid "The host name is empty!" @@ -1129,10 +1129,9 @@ msgstr "De to kodeord er ikke ens!" #: js/messages.php:56 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Enhver bruger" +msgstr "Opret bruger" #: js/messages.php:57 msgid "Reloading Privileges" @@ -1157,24 +1156,22 @@ msgid "Edit" msgstr "Ret" #: js/messages.php:64 server_status.php:420 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Server valg" +msgstr "Realtids trafikoversigt" #: js/messages.php:65 server_status.php:423 msgid "Live conn./process chart" -msgstr "" +msgstr "Realtids forbind./opgave-oversigt" #: js/messages.php:66 server_status.php:445 -#, fuzzy #| msgid "Showing SQL query" msgid "Live query chart" -msgstr "Viser SQL-forespørgsel" +msgstr "Realtid forespørgsels-oversigt" #: js/messages.php:68 msgid "Static data" -msgstr "" +msgstr "Statiske data" #. l10n: Total number of queries #: js/messages.php:70 libraries/build_html_for_db.lib.php:45 @@ -1187,7 +1184,7 @@ msgstr "Total" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:602 msgid "Other" -msgstr "" +msgstr "Andet" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1322 @@ -1201,39 +1198,37 @@ msgstr "," #: js/messages.php:78 msgid "KiB sent since last refresh" -msgstr "" +msgstr "KiB sendt siden forrige visning" #: js/messages.php:79 msgid "KiB received since last refresh" -msgstr "" +msgstr "KiB modtaget siden forrige visning" #: js/messages.php:80 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic (in KiB)" -msgstr "Server valg" +msgstr "Server-trafik (i KiB)" #: js/messages.php:81 msgid "Connections since last refresh" -msgstr "" +msgstr "Forbindelser siden sidste visning" #: js/messages.php:82 server_status.php:794 msgid "Processes" msgstr "Processer" #: js/messages.php:83 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "Forbindelser" +msgstr "Forbindelser / Opgaver" #: js/messages.php:84 msgid "Issued queries since last refresh" -msgstr "" +msgstr "Igangsatte forespørgsler siden forrige visning" #: js/messages.php:85 msgid "Issued queries" -msgstr "" +msgstr "Igangsatte forespørgsler" #: js/messages.php:87 server_status.php:402 msgid "Query statistics" @@ -1260,7 +1255,7 @@ msgstr "Felj i udførsel af forespørgsel" #: js/messages.php:97 msgid "Dropping Column" -msgstr "" +msgstr "Sletter kolonne" #: js/messages.php:98 msgid "Adding Primary Key" @@ -1273,16 +1268,14 @@ msgid "OK" msgstr "OK" #: js/messages.php:102 -#, fuzzy #| msgid "Rename database to" msgid "Renaming Databases" -msgstr "Omdøb database til" +msgstr "Omdøber databaser" #: js/messages.php:103 -#, fuzzy #| msgid "Rename database to" msgid "Reload Database" -msgstr "Omdøb database til" +msgstr "Opfrisk database" #: js/messages.php:104 msgid "Copying Database" @@ -1297,28 +1290,24 @@ msgid "Table must have at least one column" msgstr "Tabellen skal have mindst en kolonne" #: js/messages.php:107 -#, fuzzy #| msgid "Create table" msgid "Create Table" msgstr "Opret tabel" #: js/messages.php:112 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Benyt tabeller" +msgstr "Indsæt tabel" #: js/messages.php:113 -#, fuzzy #| msgid "Indexes" msgid "Hide indexes" -msgstr "Indeks" +msgstr "Skjul indekser" #: js/messages.php:114 -#, fuzzy #| msgid "Show grid" msgid "Show indexes" -msgstr "Vis gitter" +msgstr "Vis indekser" #: js/messages.php:117 msgid "Searching" @@ -1333,10 +1322,9 @@ msgid "Show search results" msgstr "Vis søgeresultater" #: js/messages.php:120 -#, fuzzy #| msgid "Browse" msgid "Browsing" -msgstr "Vis" +msgstr "Viser" #: js/messages.php:121 msgid "Deleting" @@ -1345,12 +1333,13 @@ msgstr "Sletter" #: js/messages.php:124 msgid "The definition of a stored function must contain a RETURN statement!" msgstr "" +"Ifølge definitionen på en stored function, skal denne indeholde et RETURN-" +"udtryk." #: js/messages.php:125 -#, fuzzy #| msgid "Missing value in the form!" msgid "Value too long in the form!" -msgstr "Ingen værdi i formularen !" +msgstr "Værdien i formularen er for lang!" #: js/messages.php:128 msgid "" @@ -1465,10 +1454,9 @@ msgid ", latest stable version:" msgstr ", seneste stabile version:" #: js/messages.php:169 -#, fuzzy #| msgid "No databases" msgid "up to date" -msgstr "Ingen databaser" +msgstr "up-to-date" #. l10n: Display text for calendar close link #: js/messages.php:187 @@ -1477,7 +1465,6 @@ msgstr "Færdig" #. l10n: Display text for previous month link in calendar #: js/messages.php:189 -#, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Forrige" @@ -1565,7 +1552,6 @@ msgstr "apr" #. l10n: Short month name #: js/messages.php:219 libraries/common.lib.php:1466 -#, fuzzy #| msgid "May" msgctxt "Short month name" msgid "May" @@ -1608,7 +1594,7 @@ msgstr "dec" #: js/messages.php:236 msgid "Sunday" -msgstr "søndag" +msgstr "Søndag" #: js/messages.php:237 msgid "Monday" @@ -1620,21 +1606,20 @@ msgstr "tirsdag" #: js/messages.php:239 msgid "Wednesday" -msgstr "" +msgstr "Onsdag" #: js/messages.php:240 msgid "Thursday" -msgstr "" +msgstr "Torsdag" #: js/messages.php:241 -#, fuzzy #| msgid "Fri" msgid "Friday" -msgstr "fre" +msgstr "Fredag" #: js/messages.php:242 msgid "Saturday" -msgstr "" +msgstr "Lørdag" #. l10n: Short week day name #: js/messages.php:246 libraries/common.lib.php:1483 @@ -1931,7 +1916,7 @@ msgstr "Sti til tema ikke fundet for tema %s!" #: libraries/Theme_Manager.class.php:286 themes.php:20 themes.php:40 msgid "Theme" -msgstr "" +msgstr "Tema" #: libraries/auth/config.auth.lib.php:76 msgid "Cannot connect: invalid settings." @@ -2388,7 +2373,7 @@ msgstr "Der er ikke nogen filer at uploade" #: libraries/common.lib.php:2849 libraries/common.lib.php:2850 msgid "Execute" -msgstr "" +msgstr "Udfør" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 @@ -2426,12 +2411,11 @@ msgstr "struktur" #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:123 libraries/export/texytext.php:24 msgid "data" -msgstr "" +msgstr "data" #: libraries/config.values.php:98 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:124 libraries/export/texytext.php:24 -#, fuzzy #| msgid "Structure and data" msgid "structure and data" msgstr "Struktur og data" @@ -2637,7 +2621,7 @@ msgstr "" #: libraries/config/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" @@ -2845,7 +2829,6 @@ msgstr "Komprimering" #: libraries/export/latex.php:72 libraries/export/ods.php:25 #: libraries/export/odt.php:58 libraries/export/texytext.php:28 #: libraries/export/xls.php:25 libraries/export/xlsx.php:25 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" msgstr "Indsæt feltnavne i første række" @@ -2859,10 +2842,9 @@ msgstr "Felter skal adskilles med" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:242 #: libraries/config/messages.inc.php:249 libraries/import/csv.php:81 #: libraries/import/ldi.php:43 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "Felter escaped med" +msgstr "Kolonner escapes med" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:83 #: libraries/config/messages.inc.php:90 libraries/config/messages.inc.php:99 @@ -2874,21 +2856,20 @@ msgstr "Erstat NULL med" #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:84 msgid "Remove CRLF characters within columns" -msgstr "Fjern karakterer for linjeskift i felterne" +msgstr "Fjern CRLF-karakterer i kolonnerne" #: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:245 #: libraries/config/messages.inc.php:253 libraries/import/csv.php:63 #: libraries/import/ldi.php:41 msgid "Columns terminated by" -msgstr "Felter afsluttes med" +msgstr "Kolonner afsluttes med" #: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:240 #: libraries/import/csv.php:86 libraries/import/ldi.php:44 msgid "Lines terminated by" -msgstr "Linjer afsluttet med" +msgstr "Linjer afsluttes med" #: libraries/config/messages.inc.php:82 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition" msgstr "Excel-udgave" @@ -2899,11 +2880,11 @@ msgstr "Skabelon for databasenavn" #: libraries/config/messages.inc.php:86 msgid "Server name template" -msgstr "Maske for servernavn" +msgstr "Skabelon for servernavn" #: libraries/config/messages.inc.php:87 msgid "Table name template" -msgstr "Maske for tabelnavn" +msgstr "Skabelon for tabelnavn" #: libraries/config/messages.inc.php:91 libraries/config/messages.inc.php:104 #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:137 @@ -2915,7 +2896,7 @@ msgstr "Dump tabel" #: libraries/config/messages.inc.php:92 libraries/export/latex.php:32 msgid "Include table caption" -msgstr "Inkluder tabeloverskrift" +msgstr "Inkludér tabeloverskrift" #: libraries/config/messages.inc.php:95 libraries/config/messages.inc.php:101 #: libraries/export/latex.php:50 libraries/export/latex.php:74 @@ -2928,6 +2909,7 @@ msgstr "Fortsat tabeloverskrift" #: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103 #: libraries/export/latex.php:54 libraries/export/latex.php:78 +#, fuzzy msgid "Label key" msgstr "Mærke nøgle" @@ -2943,10 +2925,9 @@ msgid "Relations" msgstr "Relationer" #: libraries/config/messages.inc.php:105 -#, fuzzy #| msgid "Export type" msgid "Export method" -msgstr "Eksporttype" +msgstr "Eksport-type" #: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116 msgid "Save on server" @@ -2959,7 +2940,7 @@ msgstr "Overskriv eksisterende fil(er)" #: libraries/config/messages.inc.php:118 msgid "Remember file name template" -msgstr "Husk maske for filnavn" +msgstr "Husk skabelon for filnavn" #: libraries/config/messages.inc.php:120 msgid "Enclose table and column names with backquotes" @@ -2968,11 +2949,11 @@ msgstr "Brug \"backquotes\" omkring tabel -og feltnavne" #: libraries/config/messages.inc.php:121 libraries/config/messages.inc.php:260 #: libraries/display_export.lib.php:346 msgid "SQL compatibility mode" -msgstr "SQL-kompatibilitetsmodus" +msgstr "SQL-kompatibilitets-tilstand" #: libraries/config/messages.inc.php:122 libraries/export/sql.php:176 msgid "CREATE TABLE options:" -msgstr "Muligheder for CREATE TABLE:" +msgstr "Indstillinger til CREATE TABLE:" #: libraries/config/messages.inc.php:123 msgid "Creation/Update/Check dates" @@ -2996,7 +2977,7 @@ msgstr "Brug ignorér inserts" #: libraries/config/messages.inc.php:132 msgid "Syntax to use when inserting data" -msgstr "Syntaks som skal bruges, når der indsættes data" +msgstr "Syntaks der bruges, når der indsættes data" #: libraries/config/messages.inc.php:133 libraries/export/sql.php:268 msgid "Maximal length of created query" @@ -3027,16 +3008,16 @@ msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value" msgstr "" -"Sorteringsrækkefølge for elementer i valgboks med fremmede nøgler; [kbd]" -"content[/kbd] er de refererede data, [kbd]id[/kbd] er nøglens værdi" +"Sorteringsrækkefølge for elementer i valgboks med fremmede nøgler; " +"[kbd]content[/kbd] er de refererede data, [kbd]id[/kbd] er nøglens værdi" #: libraries/config/messages.inc.php:151 msgid "Foreign key dropdown order" -msgstr "Sortër fremmede nøgler i valgboks på:" +msgstr "Sortér fremmede nøgler i valgboks" #: libraries/config/messages.inc.php:152 msgid "A dropdown will be used if fewer items are present" -msgstr "Der vil blive brugt en valgboks, hvis der er færre elementer til stede" +msgstr "Der vil blive brugt en valgboks, hvis der er få elementer til stede" #: libraries/config/messages.inc.php:153 msgid "Foreign key limit" @@ -3079,7 +3060,7 @@ msgstr "Redigeringstilstand" #: libraries/config/messages.inc.php:163 msgid "Customize edit mode" -msgstr "Tilpas redigerinstilstand" +msgstr "Tilpas redigeringstilstand" #: libraries/config/messages.inc.php:165 msgid "Export defaults" @@ -3106,7 +3087,7 @@ msgstr "Bestem indstillinger for nogle af de mest anvendte valgmuligheder" #: libraries/server_links.inc.php:69 libraries/tbl_links.inc.php:89 #: prefs_manage.php:231 setup/frames/menu.inc.php:20 msgid "Import" -msgstr "Import" +msgstr "Importér" #: libraries/config/messages.inc.php:171 msgid "Import defaults" @@ -3161,13 +3142,12 @@ msgstr "Hovedramme" #: libraries/config/messages.inc.php:186 msgid "Microsoft Office" -msgstr "" +msgstr "Microsoft Office" #: libraries/config/messages.inc.php:188 -#, fuzzy #| msgid "Open Document Text" msgid "Open Document" -msgstr "Open Document tekst" +msgstr "Open Document" #: libraries/config/messages.inc.php:190 msgid "Other core settings" @@ -3186,14 +3166,17 @@ msgid "" "Specify browser's title bar text. Refer to [a@Documentation." "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." -msgstr "Angiv browserens titeltekst. " +msgstr "" +"Angiv browserens tekst i titelbaren. Se " +"[a@Documentation.html#cfg_TitleTable]dokumentationen[/a] for tekststrenge " +"der indeholder særlige værdier." #: libraries/config/messages.inc.php:194 #: libraries/navigation_header.inc.php:83 #: libraries/navigation_header.inc.php:86 #: libraries/navigation_header.inc.php:89 msgid "Query window" -msgstr "Foresp. vindue" +msgstr "Forespørgselsvindue" #: libraries/config/messages.inc.php:195 msgid "Customize query window options" @@ -3208,8 +3191,8 @@ msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" -"Bemærk venligst at phpMyAdmin blot er en brugerflade, hvis egenskaber ikke " -"begrænser MySQL" +"Bemærk venligst at phpMyAdmin blot er en brugerflade og at den ikke " +"begrænser mulighederne i MySQL" #: libraries/config/messages.inc.php:198 msgid "Basic settings" @@ -3233,7 +3216,7 @@ msgid "" "what they are for" msgstr "" "Avanceret serverkonfiguration. Lad være med at ændre disse indstillinger med " -"mindre, du ved, hvad de betyder" +"mindre du ved hvad de betyder" #: libraries/config/messages.inc.php:203 msgid "Enter server connection parameters" @@ -3249,16 +3232,21 @@ msgid "" "features, see [a@Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" +"Konfigurér phpMyAdmin configuration storage for at få adgang til flere " +"funktioner. Se dokumentationen for [a@Documentation.html#linked-" +"tables]phpMyAdmin configuration storage[/a]." #: libraries/config/messages.inc.php:206 msgid "Changes tracking" -msgstr "" +msgstr "Ændrer sporing" #: libraries/config/messages.inc.php:207 msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" +"Sporing af ændringer i databasen er udført. phpMyAdmin configuration storage " +"er krævet." #: libraries/config/messages.inc.php:208 msgid "Customize export options" @@ -3279,11 +3267,11 @@ msgstr "" #: libraries/config/messages.inc.php:213 libraries/config/messages.inc.php:218 #: setup/frames/menu.inc.php:17 msgid "SQL queries" -msgstr "" +msgstr "SQL-forespørgsler" #: libraries/config/messages.inc.php:215 msgid "SQL Query box" -msgstr "" +msgstr "SQL Query-boks" #: libraries/config/messages.inc.php:216 msgid "Customize links shown in SQL Query boxes" @@ -3311,7 +3299,7 @@ msgstr "" #: libraries/config/messages.inc.php:222 msgid "Startup" -msgstr "" +msgstr "Opstart" #: libraries/config/messages.inc.php:223 msgid "Customize startup page" @@ -3319,7 +3307,7 @@ msgstr "" #: libraries/config/messages.inc.php:224 msgid "Tabs" -msgstr "" +msgstr "Faner" #: libraries/config/messages.inc.php:225 msgid "Choose how you want tabs to work" @@ -3343,7 +3331,7 @@ msgstr "" #: libraries/config/messages.inc.php:230 msgid "Warnings" -msgstr "" +msgstr "Advarsler" #: libraries/config/messages.inc.php:231 msgid "Disable some of the warnings shown by phpMyAdmin" diff --git a/po/sl.po b/po/sl.po index fa62c87e5b..c960c51c83 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-07 11:50+0200\n" +"PO-Revision-Date: 2011-07-11 21:13+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -5319,10 +5319,10 @@ msgid "vertical" msgstr "navpičnem" #: libraries/display_tbl.lib.php:452 -#, fuzzy, php-format +#, php-format #| msgid "Headers every" msgid "Headers every %s rows" -msgstr "Glave vsakih" +msgstr "Glave vsakih %s vrstic" #: libraries/display_tbl.lib.php:546 msgid "Sort by key"