Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

This commit is contained in:
mikehomme
2011-03-07 16:04:53 -05:00
5 changed files with 70 additions and 230 deletions

View File

@@ -1764,7 +1764,9 @@ $(document).ready(function() {
//User wants to submit the form
$.post($form.attr('action'), $form.serialize() + "&do_save_data=" + $(this).val(), function(data) {
if(data.success == true) {
$('#properties_message').html('');
$('#properties_message')
.removeClass('error')
.html('');
PMA_ajaxShowMessage(data.message);
// Only if the create table dialog (distinct panel) exists
if ($("#create_table_dialog").length > 0) {
@@ -1802,11 +1804,9 @@ $(document).ready(function() {
*/
var new_last_row_id = 'checkbox_tbl_' + new_last_row_index;
data.new_table_string = data.new_table_string.replace(/checkbox_tbl_/, new_last_row_id);
//append to table
$(data.new_table_string)
.find('input:checkbox')
.val(new_last_row_id)
.end()
.appendTo(tables_table);
//Sort the table
@@ -1818,7 +1818,9 @@ $(document).ready(function() {
window.parent.frame_navigation.location.reload();
}
} else {
$('#properties_message').html(data.error);
$('#properties_message')
.addClass('error')
.html(data.error);
}
}) // end $.post()
} // end if ($form.hasClass('ajax')

View File

@@ -435,12 +435,23 @@ $(document).ready(function() {
var $this_hide = $(this).parent();
$this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor");
var last_column = $this_hide.siblings().length;
var txt=[];
for(var i=4; i < last_column; i++){
txt[i-4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').html();
var txt = [];
var blob_index = [];
var k = 0;
for(var i = 4; i < last_column; i++){
if($this_hide.siblings("td:eq(" + i + ")").children('a:eq(0)').length ){
blob_index[k] = i;
k++;
continue;
}
txt[i - 4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').html();
}
for (var i=4; i < last_column; i++){
k = 0;
for (var i = 4; i < last_column; i++){
if ( blob_index[k] == i){
k++;
continue;
}
if($this_hide.siblings("td:eq(" + i + ")").children().length !=0){
$this_hide.siblings("td:eq(" + i + ")").empty();
$this_hide.siblings("td:eq(" + i + ")").append(txt[i-4]);
@@ -474,13 +485,24 @@ $(document).ready(function() {
$this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor");
}
for( var i=6;i<=rows+2;i++){
txt[i-6]=$this_row.siblings("tr:eq("+i+") td:eq("+pos+") span.original_data").html();
var blob_index = [];
var k = 0;
for( var i = 6; i <= rows + 2; i++){
if( $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ") a:eq(0)").length !=0 ){
blob_index[k] = i;
k++;
continue;
}
txt[i - 6] = $this_row.siblings("tr:eq(" + i + ") td:eq("+pos+") span.original_data").html();
}
for (var i=6;i<=rows+2;i++){
$this_row.siblings("tr:eq("+i+") td:eq("+pos+")").empty();
$this_row.siblings("tr:eq("+i+") td:eq("+pos+")").append(txt[i-6]);
k = 0;
for (var i = 6; i <= rows + 2; i++){
if(blob_index[k] == i){
k++;
continue;
}
$this_row.siblings("tr:eq("+i+") td:eq("+pos+")").empty();
$this_row.siblings("tr:eq("+i+") td:eq("+pos+")").append(txt[ i - 6]);
}
$(this).prev().remove();
$(this).prev().remove();

172
po/da.po
View File

@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-03-05 14:23-0500\n"
"PO-Revision-Date: 2010-07-21 14:55+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"PO-Revision-Date: 2011-03-07 01:17+0200\n"
"Last-Translator: <hjortholm@gmail.com>\n"
"Language-Team: danish <da@li.org>\n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53
#: libraries/display_tbl.lib.php:415 server_privileges.php:1600
@@ -106,7 +106,7 @@ msgstr "Kunne ikke skrive fil til disk."
#: bs_disp_as_mime_type.php:41
msgid "Failed to open remote URL"
msgstr ""
msgstr "Fejl ved åbning af ekstern URL"
#: changelog.php:32 license.php:28
#, php-format
@@ -118,7 +118,7 @@ msgstr ""
#: db_create.php:58
#, php-format
msgid "Database %1$s has been created."
msgstr ""
msgstr "Database %1$s er oprettet,"
#: db_datadict.php:48 db_operations.php:364
msgid "Database comment: "
@@ -139,10 +139,9 @@ msgstr "Tabel kommentarer"
#: tbl_change.php:309 tbl_indexes.php:187 tbl_printview.php:139
#: tbl_relation.php:399 tbl_select.php:112 tbl_structure.php:197
#: tbl_tracking.php:267 tbl_tracking.php:318
#, fuzzy
#| msgid "Column names"
msgid "Column"
msgstr "Kolonnenavne"
msgstr "Kolonnenavn"
#: db_datadict.php:170 db_printview.php:104 libraries/Index.class.php:442
#: libraries/db_events.inc.php:25 libraries/db_routines.inc.php:36
@@ -280,10 +279,9 @@ msgid "Command"
msgstr "Kommando"
#: db_operations.php:433
#, fuzzy
#| msgid "Rename database to"
msgid "Remove database"
msgstr "Omdøb database til"
msgstr "Fjern database"
#: db_operations.php:445
#, php-format
@@ -291,10 +289,9 @@ msgid "Database %s has been dropped."
msgstr "Database %s er slettet."
#: db_operations.php:450
#, fuzzy
#| msgid "Copy database to"
msgid "Drop the database (DROP)"
msgstr "Kopiér database til"
msgstr "Drop databasen (DROP)"
#: db_operations.php:478
msgid "Copy database to"
@@ -359,10 +356,9 @@ msgstr ""
"at se hvorfor, klik %sher%s."
#: db_operations.php:589
#, fuzzy
#| msgid "Relational schema"
msgid "Edit or export relational schema"
msgstr "Relationel skematik"
msgstr "Editer eller eksporter relations skema"
#: db_printview.php:102 db_tracking.php:85 db_tracking.php:186
#: libraries/config/messages.inc.php:487 libraries/db_structure.lib.php:37
@@ -413,12 +409,12 @@ msgid "Last check"
msgstr "Sidste check"
#: db_printview.php:220 db_structure.php:439
#, fuzzy, php-format
#, php-format
#| msgid "%s table(s)"
msgid "%s table"
msgid_plural "%s tables"
msgstr[0] "%s tabel(ler)"
msgstr[1] "%s tabel(ler)"
msgstr[0] "%s tabel"
msgstr[1] "%s tabeller"
#: db_qbe.php:25 import.php:453 libraries/Message.class.php:190
#: libraries/display_tbl.lib.php:2053 libraries/sql_query_form.lib.php:140
@@ -433,7 +429,7 @@ msgstr "Du skal vælge mindst en kolonne der skal vises"
#: db_qbe.php:183
msgid "Switch to"
msgstr ""
msgstr "skift til"
#: db_qbe.php:187
msgid "visual builder"
@@ -490,16 +486,14 @@ msgid "Modify"
msgstr "Ret"
#: db_qbe.php:607
#, fuzzy
#| msgid "Add/Delete Criteria Row"
msgid "Add/Delete criteria rows"
msgstr "Tilføj/Slet kriterie-række"
#: db_qbe.php:619
#, fuzzy
#| msgid "Add/Delete Field Columns"
msgid "Add/Delete columns"
msgstr "Tilføj/Slet felt-kolonne"
msgstr "Tilføj/Slet kolonner"
#: db_qbe.php:632 db_qbe.php:657
msgid "Update Query"
@@ -547,12 +541,12 @@ msgid "Search results for \"<i>%s</i>\" %s:"
msgstr "Søgeresultater for \"<i>%s</i>\" %s:"
#: db_search.php:247
#, fuzzy, php-format
#, php-format
#| msgid "%s match(es) inside table <i>%s</i>"
msgid "%s match inside table <i>%s</i>"
msgid_plural "%s matches inside table <i>%s</i>"
msgstr[0] "%s hit(s) i tabel <i>%s</i>"
msgstr[1] "%s hit(s) i tabel <i>%s</i>"
msgstr[0] "%s hit i tabel <i>%s</i>"
msgstr[1] "%s hits i tabel <i>%s</i>"
#: db_search.php:254 libraries/common.lib.php:2827
#: libraries/common.lib.php:3009 libraries/common.lib.php:3010
@@ -10151,133 +10145,3 @@ msgstr "VIEW navn"
#: view_operations.php:91
msgid "Rename view to"
msgstr ""
#, fuzzy
#~| msgid "Dumping data for table"
#~ msgid "Delete the matches for the "
#~ msgstr "Data dump for tabellen"
#~ msgid "Show left delete link"
#~ msgstr "Vis/skjul venstre menu"
#~ msgid "yes"
#~ msgstr "Ja"
#~ msgid "to/from page"
#~ msgstr "til/fra side"
#~ msgid "Disable Statistics"
#~ msgstr "Slå Statistikker fra"
#~ msgid "Display table filter"
#~ msgstr "Viser kolonne-kommentarer"
#~ msgid ""
#~ "The additional features for working with linked tables have been "
#~ "deactivated. To find out why click %shere%s."
#~ msgstr ""
#~ "De ekstra features for at arbejde med linkede tabeller er deaktiveret. "
#~ "For at se hvorfor, klik %sher%s."
#~ msgid "Ignore duplicate rows"
#~ msgstr "Ignorér gentagne rækker"
#~ msgid "Execute bookmarked query"
#~ msgstr "Udfør forespørgsel iflg. bogmærke"
#~ msgid "No tables"
#~ msgstr "Ingen tabeller"
#~ msgid "SVG"
#~ msgstr "CSV (kommasepareret)"
#~ msgid ""
#~ "Enter each value in a separate field, enclosed in single quotes. If you "
#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst "
#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a"
#~ "\\'b')."
#~ msgstr ""
#~ "Indtast værdier for transformationsindstillinger ud fra følgende format: "
#~ "'a', 100, b,'c'...<br />Skulle du få brug for at indsætte en backslash "
#~ "(\"\\\") eller en apostrof (\"'\") i værdierne, backslash det (for "
#~ "eksempel '\\\\xyz' eller 'a\\'b')."
#~ msgid ""
#~ "Enter each value in a separate field. If you ever need to put a backslash "
#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with "
#~ "a backslash (for example '\\\\xyz' or 'a\\'b')."
#~ msgstr ""
#~ "Indtast værdier for transformationsindstillinger ud fra følgende format: "
#~ "'a', 100, b,'c'...<br />Skulle du få brug for at indsætte en backslash "
#~ "(\"\\\") eller en apostrof (\"'\") i værdierne, backslash det (for "
#~ "eksempel '\\\\xyz' eller 'a\\'b')."
#~ msgid "server name"
#~ msgstr "servernavn"
#~ msgid "database name"
#~ msgstr "databasenavn"
#~ msgid "Edit PDF Pages"
#~ msgstr "Redigér PDF-sider"
#~ msgid "Data Dictionary Format"
#~ msgstr "Data Dictionary-format"
#~ msgid "<code>AUTO_INCREMENT</code>"
#~ msgstr "Tilføj AUTO_INCREMENT værdi"
#~ msgid "Dump %s row(s) starting at row # %s"
#~ msgstr "Dump %s rækker startende med række %s."
#~ msgid "remember template"
#~ msgstr "husk skabelonen"
#~ msgid "Imported file compression will be automatically detected from: %s"
#~ msgstr ""
#~ "Importeret fil-komprimering vil blive automatisk registreret fra: %s"
#~ msgid "Add into comments"
#~ msgstr "Tilføj til kommentarer"
#~ msgid "Invalid column (%s) specified!"
#~ msgstr "Ugyldig kolonne (%s) angivet!"
#~ msgid "Table removal"
#~ msgstr "Tabelnavn"
#~ msgctxt "BLOB repository"
#~ msgid "Enabled"
#~ msgstr "Slået til"
#~ msgctxt "BLOB repository"
#~ msgid "Repair"
#~ msgstr "Reparer tabel"
#~ msgctxt "BLOB repository"
#~ msgid "Disabled"
#~ msgstr "Slået fra"
#~ msgid ""
#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
#~ "extension. Please check your PHP configuration."
#~ msgstr ""
#~ "Kan ikke indlæse [a@http://php.net/%1$s@Dokumentation][em]%1$s[/em][/a] "
#~ "udvidelsen. Tjek venligst din PHP-konfiguration."
#~ msgid ""
#~ "Couldn't load the iconv or recode extension needed for charset "
#~ "conversion. Either configure PHP to enable these extensions or disable "
#~ "charset conversion in phpMyAdmin."
#~ msgstr ""
#~ "Kan ikke indlæse iconv eller omkode nødvendig udvidelse til tegnsæt-"
#~ "konvertering, konfigurer PHP til at tillade brug af disse udvidelser "
#~ "eller slå tegnsæt-konvertering fra i phpMyAdmin."
#~ msgid ""
#~ "Couldn't use the iconv, libiconv, or recode_string functions, although "
#~ "the necessary extensions appear to be loaded. Check your PHP "
#~ "configuration."
#~ msgstr ""
#~ "Kan ikke bruge iconv ejheller libiconv eller recode_string funktionen "
#~ "omend udvidelsen ser ud til at være indlæst. Check din PHP-konfiguration."

View File

@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-03-05 14:23-0500\n"
"PO-Revision-Date: 2011-03-03 15:56+0200\n"
"Last-Translator: <sven-cihar.com@incase.de>\n"
"PO-Revision-Date: 2011-03-07 11:21+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: german <de@li.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -80,7 +80,7 @@ msgstr "OK"
#: browse_foreigners.php:169 browse_foreigners.php:173
#: libraries/Index.class.php:441 tbl_tracking.php:314
msgid "Keyname"
msgstr "Name"
msgstr "Schlüsselname"
#: browse_foreigners.php:170 browse_foreigners.php:172
#: server_collations.php:54 server_collations.php:66 server_engines.php:57
@@ -100,7 +100,7 @@ msgstr "Kein BLOB-Streaming-Server konfiguriert!"
#: bs_disp_as_mime_type.php:35
msgid "Failed to fetch headers"
msgstr "Abrufen des Headers fehlgeschlagen."
msgstr "Das Abrufen der Kopfzeilen ist fehlgeschlagen."
#: bs_disp_as_mime_type.php:41
msgid "Failed to open remote URL"
@@ -288,7 +288,7 @@ msgstr "Datenbank %s wurde gelöscht."
#: db_operations.php:450
msgid "Drop the database (DROP)"
msgstr "Lösche die Datenbank (DROP)"
msgstr "Datenbank löschen (DROP)"
#: db_operations.php:478
msgid "Copy database to"
@@ -815,7 +815,7 @@ msgstr "Werte für die Spalte \"%s\""
#: enum_editor.php:22 libraries/tbl_properties.inc.php:795
msgid "Enter each value in a separate field."
msgstr "Jeden Wert in ein eigenes Feld eingeben."
msgstr "Jeden Wert in einem eigenen Feld eingeben."
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
@@ -1158,7 +1158,7 @@ msgstr "Anzuzeigende Spalte auswählen"
#: js/messages.php:106
msgid "Add an option for column "
msgstr ""
msgstr "Option hinzufügen zu Spalte "
#: js/messages.php:109
msgid "Generate password"

View File

@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-03-05 14:23-0500\n"
"PO-Revision-Date: 2011-03-01 13:57+0200\n"
"Last-Translator: <paalfe@gmail.com>\n"
"PO-Revision-Date: 2011-03-07 11:21+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: norwegian <no@li.org>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -1784,7 +1784,7 @@ msgstr "Kunne ikke åpne fil: %s"
#: libraries/bookmark.lib.php:83
msgid "shared"
msgstr ""
msgstr "delt"
#: libraries/build_html_for_db.lib.php:25
#: libraries/config/messages.inc.php:180 libraries/export/xml.php:36
@@ -10185,51 +10185,3 @@ msgstr "VIEW navn"
#: view_operations.php:91
msgid "Rename view to"
msgstr "Endre tabellens navn"
#, fuzzy
#~| msgid "Delete the matches for the %s table?"
#~ msgid "Delete the matches for the "
#~ msgstr "Slett treffene for %s tabellen?"
#~ msgid "Show left delete link"
#~ msgstr "Skjul/Vis venstre meny"
#~ msgid "yes"
#~ msgstr "Ja"
#~ msgid "closed"
#~ msgstr "Lukk"
#~ msgid "to/from page"
#~ msgstr "til/fra side"
#~ msgid "Disable Statistics"
#~ msgstr "Slå av statistikk"
#~ msgid "Start"
#~ msgstr "Start"
#~ msgid "Stop"
#~ msgstr "Stopp"
#~ msgid "Display table filter"
#~ msgstr "Vis databaser i et tre"
#~ msgid ""
#~ "The additional features for working with linked tables have been "
#~ "deactivated. To find out why click %shere%s."
#~ msgstr ""
#~ "Tilleggsfunksjonene for å kunne jobbe med koblede tabeller er deaktivert. "
#~ "For å finne ut hvorfor, klikk %sher%s."
#~ msgid "Ignore duplicate rows"
#~ msgstr "Ignorer dupliserte rader"
#~ msgid "Execute bookmarked query"
#~ msgstr "Utfør lagret spørring"
#~ msgid "No tables"
#~ msgstr "Ingen tabeller"
#~ msgid "Toggle Query Box Visibility"
#~ msgstr "Slå av/på visning av spørreboks"