From 319aac3c761142ab00e3e6016e594d4b84079efc Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 11 Oct 2014 07:57:20 -0400 Subject: [PATCH 01/20] 4.2.10 release Signed-off-by: Marc Delisle --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7eedad5e20..975b173306 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.2.10.0 (not yet released) +4.2.10.0 (2014-10-11) - bug #4361 Can't change font size (when config.inc.php not present) - bug #4542 Tab key in column name not shown - bug PDF export: title not present in PDF diff --git a/README b/README index 16267d601f..2b3ea5e8c1 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.10-dev +Version 4.2.10 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index b308f0078f..c28b6e7e3f 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.2.10-dev' +version = '4.2.10' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index d06bba8585..4807f47d3a 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.2.10-dev'); + $this->set('PMA_VERSION', '4.2.10'); /** * @deprecated */ From 27637d9ca0dd3d23b4db7f2d10761fbaf60e043a Mon Sep 17 00:00:00 2001 From: julianladisch Date: Sat, 18 Oct 2014 02:05:27 +0200 Subject: [PATCH 02/20] Translated using Weblate (German) Currently translated at 100.0% (2768 of 2768 strings) [CI skip] --- po/de.po | 48 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/po/de.po b/po/de.po index 93ff1d1a24..eeaafbc549 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-10-14 10:46+0200\n" -"Last-Translator: Michael Koch \n" +"PO-Revision-Date: 2014-10-18 02:05+0200\n" +"Last-Translator: julianladisch \n" "Language-Team: German " "\n" "Language: de\n" @@ -5135,12 +5135,13 @@ 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 "" -"Sortierreihenfolge für \"FOREIGN KEY\"-Dropdownfelder. [kbd]content[/kbd] " -"ist der referenzierte Wert, [kbd]id[/kbd] ist der Schlüsselwert." +"Sortierreihenfolge für die Einträge in einem Fremdschlüssel-Auswahlmenü. " +"[kbd]content[/kbd] ist der referenzierte Wert, [kbd]id[/kbd] ist der " +"Schlüsselwert." #: libraries/config/messages.inc.php:205 msgid "Foreign key dropdown order" -msgstr "Sortierreihenfolge für \"FOREIGN KEY\"-Dropdownfelder" +msgstr "Sortierreihenfolge im Fremdschlüssel-Auswahlmenü" #: libraries/config/messages.inc.php:207 msgid "A dropdown will be used if fewer items are present." @@ -5149,7 +5150,7 @@ msgstr "" #: libraries/config/messages.inc.php:208 msgid "Foreign key limit" -msgstr "FOREIGN KEY Limit" +msgstr "Fremdschlüssel-Limit" #: libraries/config/messages.inc.php:209 msgid "Browse mode" @@ -6029,30 +6030,27 @@ msgid "Query history length" msgstr "Länge des Abfrageverlaufs" #: libraries/config/messages.inc.php:522 -#, fuzzy #| msgid "Tab displayed when opening a new query window" msgid "Tab displayed when opening a new query window." -msgstr "Angezeigter Tab beim Öffnen eines neuen Abfragefensters" +msgstr "Angezeigter Tab beim Öffnen eines neuen Abfragefensters." #: libraries/config/messages.inc.php:523 msgid "Default query window tab" msgstr "Voreingestellter Tab für Abfragefenster" #: libraries/config/messages.inc.php:524 -#, fuzzy #| msgid "Query window height (in pixels)" msgid "Query window height (in pixels)." -msgstr "Höhe des Abfragefensters (in Pixeln)" +msgstr "Höhe des Abfragefensters (in Pixeln)." #: libraries/config/messages.inc.php:525 msgid "Query window height" msgstr "Höhe des Abfragefensters" #: libraries/config/messages.inc.php:526 -#, fuzzy #| msgid "Query window width (in pixels)" msgid "Query window width (in pixels)." -msgstr "Breite des Abfragefensters (in Pixeln)" +msgstr "Breite des Abfragefensters (in Pixeln)." #: libraries/config/messages.inc.php:527 msgid "Query window width" @@ -6268,7 +6266,6 @@ msgid "Control port" msgstr "Kontroll-Port" #: libraries/config/messages.inc.php:592 -#, fuzzy #| msgid "" #| "Leave blank for no Designer support, suggested: [kbd]pma__designer_coords" #| "[/kbd]" @@ -6276,8 +6273,8 @@ msgid "" "Leave blank for no Designer support, suggested: [kbd]pma__designer_coords[/" "kbd]." msgstr "" -"Leer lassen für keine Designer-Unterstützung, Vorschlag: [kbd]" -"pma__designer_coords[/kbd]" +"Leer lassen für keine Designer-Unterstützung, Vorschlag: " +"[kbd]pma__designer_coords[/kbd]." #: libraries/config/messages.inc.php:595 msgid "Designer table" @@ -12951,8 +12948,8 @@ msgid "" "An internal relation is not necessary when a corresponding FOREIGN KEY " "relation exists." msgstr "" -"Eine interne Beziehung ist nicht notwendig, wenn bereits ein entsprechender " -"FOREIGN KEY existiert." +"Eine interne Beziehung ist nicht notwendig, wenn eine entsprechende " +"Fremdschlüssel-Beziehung existiert." #: libraries/tbl_relation.lib.php:434 msgid "Foreign key constraint" @@ -13221,10 +13218,9 @@ msgid "Toggle relation lines" msgstr "Beziehungen anzeigen an/aus" #: pmd_general.php:146 pmd_pdf.php:103 -#, fuzzy #| msgid "Import/Export coordinates for PDF schema" msgid "Import/Export coordinates for relational schema" -msgstr "Import/Export Koordinaten für das PDF Schema" +msgstr "Import-/Export-Koordinaten für das relationale Schema" #: pmd_general.php:155 msgid "Build Query" @@ -13285,32 +13281,28 @@ msgid "Page has been created." msgstr "Seite wurde erstellt." #: pmd_pdf.php:56 -#, fuzzy #| msgid "Page creation failed" msgid "Page creation has failed!" -msgstr "Seitenerstellung fehlgeschlagen" +msgstr "Seitenerstellung fehlgeschlagen!" #: pmd_pdf.php:114 msgid "Page:" msgstr "Seite:" #: pmd_pdf.php:124 -#, fuzzy #| msgid "Import from selected page" msgid "Import from selected page." -msgstr "Import von ausgewählter Seite" +msgstr "Import von ausgewählter Seite." #: pmd_pdf.php:125 -#, fuzzy #| msgid "Export to selected page" msgid "Export to selected page." -msgstr "Export zu der ausgewählten Seite" +msgstr "Export zu der ausgewählten Seite." #: pmd_pdf.php:127 -#, fuzzy #| msgid "Create a page and export to it" msgid "Create a page and export to it." -msgstr "Eine Seite anlegen und dahin exportieren" +msgstr "Eine Seite anlegen und dahin exportieren." #: pmd_pdf.php:139 msgid "New page name: " @@ -13336,7 +13328,7 @@ msgstr "Fehler: Verknüpfung konnte nicht hinzugefügt werden!" #: pmd_relation_new.php:81 #| msgid "FOREIGN KEY relation added" msgid "FOREIGN KEY relation has been added." -msgstr "FOREIGN KEY Relation wurde hinzugefügt." +msgstr "Fremdschlüssel-Beziehung wurde hinzugefügt." #: pmd_relation_new.php:85 msgid "Error: Relational features are disabled!" From ac27cd2026ec4ac0802d0ebf85f76ba317cb8bd7 Mon Sep 17 00:00:00 2001 From: Tor Stokkan Date: Sat, 18 Oct 2014 07:48:02 +0200 Subject: [PATCH 03/20] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 65.4% (1811 of 2768 strings) [CI skip] --- po/nb.po | 401 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 209 insertions(+), 192 deletions(-) diff --git a/po/nb.po b/po/nb.po index 98b7b5d285..0448378761 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-06-21 16:04+0200\n" -"Last-Translator: Richard G. Nielsen \n" -"Language-Team: Norwegian Bokmål \n" +"PO-Revision-Date: 2014-10-18 07:21+0200\n" +"Last-Translator: Tor Stokkan \n" +"Language-Team: Norwegian Bokmål " +"\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -313,7 +313,7 @@ msgstr "Ingen tilgang!" #: db_structure.php:72 msgid "Favorite List is full!" -msgstr "" +msgstr "Favotittlisten er full!" #: db_tracking.php:75 msgid "Tracked tables" @@ -586,7 +586,6 @@ msgid "Output" msgstr "Utdata" #: gis_data_editor.php:410 -#, fuzzy #| msgid "" #| "Choose \"GeomFromText\" from the \"Function\" column and paste the string " #| "below into the \"Value\" field" @@ -595,7 +594,7 @@ msgid "" "below into the \"Value\" field." msgstr "" "Velg \"GeomFromText\" fra kolonnen \"Funksjon\" og lim teksten nedenfor inn " -"i feltet \"Verdi\"" +"i feltet \"Verdi\"." #: import.php:116 #, php-format @@ -625,10 +624,9 @@ msgstr "" #: import.php:412 import.php:473 libraries/File.class.php:433 #: libraries/File.class.php:527 -#, fuzzy #| msgid "File could not be read" msgid "File could not be read!" -msgstr "Fila kunne ikke leses" +msgstr "Filen kunne ikke leses!" #: import.php:421 import.php:432 import.php:453 import.php:464 #: libraries/File.class.php:593 @@ -651,24 +649,23 @@ msgstr "" "konfigurasjon. Se [doc@faq1-16]FAQ 1.16[/doc]." #: import.php:498 -#, fuzzy #| msgid "" #| "Cannot convert file's character set without character set conversion " #| "library" msgid "" "Cannot convert file's character set without character set conversion library!" msgstr "" -"Kan ikke konvertere filens tegnsett uten tegnsett konverteringsbibliotek" +"Kan ikke konvertere filens tegnsett uten tegnsett konverteringsbibliotek!" #: import.php:536 libraries/display_import.inc.php:32 msgid "Could not load import plugins, please check your installation!" msgstr "Kan ikke starte importerings-tilleggene, kontroller din installasjon!" #: import.php:571 libraries/sql.lib.php:1048 libraries/sql.lib.php:1848 -#, fuzzy, php-format +#, php-format #| msgid "Bookmark %s created" msgid "Bookmark %s has been created." -msgstr "Bokmerke %s opprettet" +msgstr "Bokmerke %s har blitt opprettet." #: import.php:580 #, php-format @@ -681,7 +678,7 @@ msgid "" "file and import will resume." msgstr "" "Skripttids-avbrudd. Hvis du ønsker å fortsette vil importen gjennopptas når " -"du laster opp fila en gang til." +"du laster opp filen en gang til." #: import.php:605 msgid "" @@ -723,9 +720,8 @@ msgid "Change password" msgstr "Endre passord" #: index.php:185 -#, fuzzy msgid "Server connection collation" -msgstr "Kollasjon for SQL-oppkobling" +msgstr "Servertilkobling kollasjon" #: index.php:208 msgid "Appearance Settings" @@ -820,10 +816,10 @@ msgid "" "running with this default, is open to intrusion, and you really should fix " "this security hole by setting a password for user 'root'." msgstr "" -"Konfigurasjonsfila di inneholder innstillinger (root uten passord) som er " -"identiske med MySQLs standard priviligerte brukerkonto. MySQL-tjeneren din " -"er åpen for alle, du bør fikse dette sikkerhetshullet ved å sette passord " -"for brukeren 'root'." +"Konfigurasjonsfilen inneholder innstillinger (root uten passord) som er " +"identiske med MySQLs standard priviligerte brukerkonto. MySQL-tjeneren er " +"åpen for alle, du bør fikse dette sikkerhetshullet ved å sette passord for " +"brukeren 'root'." #: index.php:441 msgid "" @@ -851,10 +847,11 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" -"PHP-parameteret [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] er lavere enn " -"cookie gyldighet konfigurert i phpMyAdmin. På grunn av dette så vil " -"innlogging utløpe raskere enn det som er satt i phpMyAdmin." +"PHP-parameteret " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] er lavere enn cookie gyldighet " +"konfigurert i phpMyAdmin. På grunn av dette så vil innlogging utløpe raskere " +"enn det som er satt i phpMyAdmin." #: index.php:483 msgid "" @@ -868,7 +865,7 @@ msgstr "" #: index.php:495 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." msgstr "" -"Konfigurasjonsfila trenger nå et hemmelig passordfrase (blowfish_secret)." +"Konfigurasjonsfilen trenger nå et hemmelig passordfrase (blowfish_secret)." #: index.php:506 msgid "" @@ -961,6 +958,8 @@ msgid "" "Are you sure you want to navigate away from this page? Press OK to continue " "or Cancel to stay on the current page." msgstr "" +"Er du sikker på at du vil navigere bort fra denne siden? Trykk OK for å " +"fortsette, eller Avbryt for å forbli på den nåværende siden." #: js/messages.php:49 msgid "Missing value in the form!" @@ -1044,10 +1043,9 @@ msgid "Connections / Processes" msgstr "Tilkoblinger/prosesser" #: js/messages.php:79 -#, fuzzy #| msgid "Local monitor configuration incompatible" msgid "Local monitor configuration incompatible!" -msgstr "Lokal monitor-konfigurasjon er inkompatibel" +msgstr "Lokal monitorkonfigurasjon er inkompatibel!" #: js/messages.php:80 msgid "" @@ -1204,10 +1202,9 @@ msgid "Add chart to grid" msgstr "Legg graf til grid" #: js/messages.php:123 -#, fuzzy #| msgid "Please add at least one variable to the series" msgid "Please add at least one variable to the series!" -msgstr "Legg minst én variabel til serien" +msgstr "Legg minst én variabel til serien!" #: js/messages.php:124 libraries/DisplayResults.class.php:1338 #: libraries/TableSearch.class.php:880 libraries/TableSearch.class.php:1047 @@ -1445,8 +1442,7 @@ msgstr "Filtrer spørringer med ord/regexp:" #: js/messages.php:188 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "" -"Grupper spørringer, og ignorer varierende data brukt i WHERE-muligheter" +msgstr "Grupper spørringer, og ignorer varierende data brukt i WHERE-muligheter" #: js/messages.php:189 msgid "Sum of grouped rows:" @@ -1672,10 +1668,9 @@ msgid "Values for a new column" msgstr "Verdier for ny kolonne" #: js/messages.php:264 -#, fuzzy #| msgid "Enter each value in a separate field" msgid "Enter each value in a separate field." -msgstr "Skriv hver verdi i et eget felt" +msgstr "Skriv hver verdi i et eget felt." #: js/messages.php:265 #, php-format @@ -1812,15 +1807,15 @@ msgstr "Ytre ring" #: js/messages.php:321 msgid "Shift + Click on function name to apply to all rows." -msgstr "" +msgstr "Shift + Klikk på funksjonsnavnet til å gjelde alle rader." #: js/messages.php:323 msgid "Do you want to copy encryption key?" -msgstr "" +msgstr "Vil du kopiere krypteringsnøkkel?" #: js/messages.php:324 msgid "Encryption key" -msgstr "" +msgstr "Krypteringsnøkkel" #: js/messages.php:327 msgid "Select referenced key" @@ -1831,10 +1826,9 @@ msgid "Select Foreign Key" msgstr "Velg fremmednøkkel" #: js/messages.php:329 -#, fuzzy #| msgid "Please select the primary key or a unique key" msgid "Please select the primary key or a unique key!" -msgstr "Velg primærnøkkelen eller en unik nøkkel" +msgstr "Velg primærnøkkelen eller en unik nøkkel!" #: js/messages.php:330 pmd_general.php:101 msgid "Choose column to display" @@ -1849,22 +1843,21 @@ msgstr "" "lagrer dem. Ønsker du å fortsette?" #: js/messages.php:337 -#, fuzzy, php-format +#, php-format #| msgid "Add an option for column " msgid "Add an option for column \"%s\"." -msgstr "Legg til valg for kolonne " +msgstr "Legg til valg for kolonne \"%s\"." #: js/messages.php:338 -#, fuzzy, php-format +#, php-format #| msgid "%d object(s) created" msgid "%d object(s) created." -msgstr "%d objekt(er) opprettet" +msgstr "%d objekt(er) opprettet." #: js/messages.php:341 -#, fuzzy #| msgid "Press escape to cancel editing" msgid "Press escape to cancel editing." -msgstr "Trykk escape for å avbryte endring" +msgstr "Trykk Escape for å avbryte endring." #: js/messages.php:342 msgid "" @@ -1875,38 +1868,37 @@ msgstr "" "vil forlate denne siden før du lagrer dataene?" #: js/messages.php:343 -#, fuzzy #| msgid "Drag to reorder" msgid "Drag to reorder." -msgstr "Dra for å omplassere" +msgstr "Dra for å endre rekkefølgen." #: js/messages.php:344 msgid "Click to sort results by this column." -msgstr "" +msgstr "Klikk for å sortere resultatene etter denne kolonnen." #: js/messages.php:345 msgid "" "Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC.
- Control+Click to remove column from ORDER BY clause" msgstr "" +"Shift + Klikk for å legge denne kolonnen til sorteringsrekkefølgen eller " +"veksle mellom stigende/synkende
- Ctrl + Klikk for å fjerne kolonnen " +"fra sorteringsrekkefølgen" #: js/messages.php:346 -#, fuzzy #| msgid "Click to mark/unmark" msgid "Click to mark/unmark." -msgstr "Klikk for å markere/ta vekk markering" +msgstr "Klikk for å markere/fjern markering." #: js/messages.php:347 -#, fuzzy #| msgid "Double-click to copy column name" msgid "Double-click to copy column name." -msgstr "Dobbelklikk for å kopiere kolonnenavn" +msgstr "Dobbelklikk for å kopiere kolonnenavn." #: js/messages.php:349 -#, fuzzy #| msgid "Click the drop-down arrow
to toggle column's visibility" msgid "Click the drop-down arrow
to toggle column's visibility." -msgstr "Klikk pilen som peker ned
for å bytte på kolonnens synlighet" +msgstr "Klikk pilen som peker ned
for å bytte på kolonnens synlighet." #: js/messages.php:351 libraries/DisplayResults.class.php:858 #: libraries/browse_foreigners.lib.php:371 @@ -1933,26 +1925,23 @@ msgid "You can also edit most values
by clicking directly on them." msgstr "Du kan også endre de fleste verdiene
ved å dobbeltklikke på dem." #: js/messages.php:365 -#, fuzzy #| msgid "Go to link" msgid "Go to link:" -msgstr "Gå til link" +msgstr "Gå til link:" #: js/messages.php:366 -#, fuzzy #| msgid "Copy column name" msgid "Copy column name." -msgstr "Kopier kolonnenavn" +msgstr "Kopier kolonnenavn." #: js/messages.php:367 msgid "Right-click the column name to copy it to your clipboard." msgstr "Høyreklikk på kolonnenavnet for å kopiere det til utklippstavlen." #: js/messages.php:368 -#, fuzzy #| msgid "Show data row(s)" msgid "Show data row(s)." -msgstr "Vis datarad(er)" +msgstr "Vis datarad(er)." #: js/messages.php:371 msgid "Generate password" @@ -1979,10 +1968,9 @@ msgid "Hide Panel" msgstr "Skjul panel" #: js/messages.php:381 -#, fuzzy #| msgid "Show logo in left frame" msgid "Show hidden navigation tree items." -msgstr "Vis logo i venstre ramme" +msgstr "Vis skjulte elementer i navigasjonstreet." #: js/messages.php:384 msgid "The requested page was not found in the history, it may have expired." @@ -2039,6 +2027,7 @@ msgid "" "Your export is incomplete, due to a low execution time limit at the PHP " "level!" msgstr "" +"Eksporten er ufullstendig, på grunn av en lav kjøringsfrist på PHP nivå!" #: js/messages.php:408 #, php-format @@ -2046,6 +2035,8 @@ msgid "" "Warning: a form on this page has more than %d fields. On submission, some of " "the fields might be ignored, due to PHP's max_input_vars configuration." msgstr "" +"Advarsel: et skjema på denne siden har mer enn %d felt. Ved innsending kan " +"noen av feltene bli ignorert, på grunn av PHP max_input_vars konfigurasjon." #. l10n: Display text for calendar close link #: js/messages.php:438 @@ -2312,7 +2303,7 @@ msgstr "PHP kastet følgende feil: %s" #: libraries/Advisor.class.php:108 #, php-format msgid "Failed evaluating precondition for rule '%s'." -msgstr "" +msgstr "Mislykket evaluering av forhåndsbetingelse for regelen '%s'." #: libraries/Advisor.class.php:125 #, php-format @@ -2334,6 +2325,8 @@ msgstr "Feil ved formattering av streng for regel \"%s\"." msgid "" "Invalid rule declaration on line %1$s, expected line %2$s of previous rule." msgstr "" +"Ugyldig regeldeklarasjon på linje %1$s, forventet linje %2$s av forrige " +"regel." #: libraries/Advisor.class.php:415 #, php-format @@ -2437,7 +2430,7 @@ msgstr "Eller:" #: libraries/DBQbe.class.php:720 libraries/DBQbe.class.php:810 msgid "And:" -msgstr "" +msgstr "Og:" #: libraries/DBQbe.class.php:724 msgid "Ins" @@ -2453,11 +2446,11 @@ msgstr "Endre:" #: libraries/DBQbe.class.php:805 msgid "Ins:" -msgstr "" +msgstr "Sett inn:" #: libraries/DBQbe.class.php:820 msgid "Del:" -msgstr "" +msgstr "Slett:" #: libraries/DBQbe.class.php:1430 #, php-format @@ -2469,34 +2462,29 @@ msgid "Submit Query" msgstr "Kjør spørring" #: libraries/DBQbe.class.php:1458 -#, fuzzy #| msgid "Search" msgid "Saved bookmarked search:" -msgstr "Søk" +msgstr "Lagret bokmerke søk:" #: libraries/DBQbe.class.php:1460 -#, fuzzy #| msgid "Delete relation" msgid "New bookmark" -msgstr "Slett relasjon" +msgstr "Nytt bokmerke" #: libraries/DBQbe.class.php:1486 -#, fuzzy #| msgid "Delete relation" msgid "Create bookmark" -msgstr "Slett relasjon" +msgstr "Lag bokmerke" #: libraries/DBQbe.class.php:1489 -#, fuzzy #| msgid "Showing bookmark" msgid "Update bookmark" -msgstr "Vis bokmerke" +msgstr "Oppdater bokmerke" #: libraries/DBQbe.class.php:1491 -#, fuzzy #| msgid "Delete relation" msgid "Delete bookmark" -msgstr "Slett relasjon" +msgstr "Slett bokmerke" #: libraries/DatabaseInterface.class.php:1976 msgid "" @@ -2612,15 +2600,13 @@ msgid "Restore column order" msgstr "Tilbakestill kolonnerekkefølge" #: libraries/DisplayResults.class.php:795 -#, fuzzy msgid "Filter rows" -msgstr "Filter" +msgstr "Filter rader" #: libraries/DisplayResults.class.php:797 -#, fuzzy #| msgid "Search in database" msgid "Search this table" -msgstr "Søk i database" +msgstr "Søk i denne tabellen" #: libraries/DisplayResults.class.php:824 libraries/Util.class.php:2446 #: libraries/Util.class.php:2450 @@ -2747,10 +2733,9 @@ msgstr "Velkjent Binær" #: libraries/DisplayResults.class.php:3466 #: libraries/DisplayResults.class.php:3482 -#, fuzzy #| msgid "The row has been deleted." msgid "The row has been deleted." -msgstr "Raden er slettet" +msgstr "Raden er slettet." #: libraries/DisplayResults.class.php:3518 #: libraries/DisplayResults.class.php:5159 libraries/server_status.lib.php:519 @@ -2758,20 +2743,18 @@ msgid "Kill" msgstr "Avslutt" #: libraries/DisplayResults.class.php:4602 libraries/structure.lib.php:776 -#, fuzzy #| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]" msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." -msgstr "Kan være unøyaktig. Se [doc@faq3-11]FAQ 3.11[/doc]" +msgstr "Kan være unøyaktig. Se [doc@faq3-11]FAQ 3.11[/doc]." #: libraries/DisplayResults.class.php:4659 libraries/Message.class.php:180 #: libraries/rte/rte_routines.lib.php:1467 #: libraries/sql_query_form.lib.php:111 libraries/tbl_relation.lib.php:896 #: tbl_find_replace.php:49 tbl_operations.php:185 tbl_row_action.php:111 #: view_operations.php:62 -#, fuzzy #| msgid "Your SQL query has been executed successfully." msgid "Your SQL query has been executed successfully." -msgstr "Kommandoen/spørringen er utført" +msgstr "Kommandoen/spørringen er utført." #: libraries/DisplayResults.class.php:5037 libraries/structure.lib.php:658 #, php-format @@ -2788,7 +2771,7 @@ msgstr "Viser radene %1s - %2s" #: libraries/DisplayResults.class.php:5065 #, php-format msgid "%1$d total, %2$d in query" -msgstr "" +msgstr "%1$d total, %2$d i spørring" #: libraries/DisplayResults.class.php:5070 #, php-format @@ -2796,10 +2779,10 @@ msgid "%d total" msgstr "%d totalt" #: libraries/DisplayResults.class.php:5082 libraries/sql.lib.php:1687 -#, fuzzy, php-format +#, php-format #| msgid "Query took %01.4f sec" msgid "Query took %01.4f seconds." -msgstr "Spørring tok %01.4f sek" +msgstr "Spørring tok %01.4f sekunder." #: libraries/DisplayResults.class.php:5166 #: libraries/DisplayResults.class.php:5172 libraries/mult_submits.inc.php:46 @@ -2868,10 +2851,9 @@ msgid "Visualize GIS data" msgstr "Visualiser GIS data" #: libraries/DisplayResults.class.php:5718 -#, fuzzy #| msgid "Link not found" msgid "Link not found!" -msgstr "Link ikke funnet" +msgstr "Link ikke funnet!" #: libraries/Error_Handler.class.php:71 msgid "Too many error messages, some are not displayed." @@ -2884,20 +2866,20 @@ msgstr "Filen var ikke en opplastet fil." #: libraries/File.class.php:279 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "" -"Opplastingsfila er større enn upload_max_filesize direktivet definert i php." -"ini." +"Opplastingsfilen er større enn upload_max_filesize direktivet definert i " +"php.ini." #: libraries/File.class.php:282 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" -"Opplastingsfila er større enn MAX_FILE_SIZE direktivet som ble spesifisert i " -"HTML-skjemaet." +"Opplastingsfilen er større enn MAX_FILE_SIZE direktivet som ble spesifisert " +"i HTML-skjemaet." #: libraries/File.class.php:285 msgid "The uploaded file was only partially uploaded." -msgstr "Opplastingsfila ble bare delvis opplastet." +msgstr "Opplastingsfilen ble bare delvis opplastet." #: libraries/File.class.php:288 msgid "Missing a temporary folder." @@ -2905,7 +2887,7 @@ msgstr "Mangler en midlertidig mappe." #: libraries/File.class.php:291 msgid "Failed to write file to disk." -msgstr "Klarte ikke å skrive fila til harddisken." +msgstr "Feil ved skriving av fil til disk." #: libraries/File.class.php:294 msgid "File upload stopped by extension." @@ -2916,12 +2898,11 @@ msgid "Unknown error in file upload." msgstr "Ukjent feil oppstod under filopplastingen." #: libraries/File.class.php:476 -#, fuzzy #| msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]" msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]." msgstr "" -"Feil oppstod under forsøk på flytting av den opplastede fila, se " -"[doc@faq1-11]FAQ 1.11[/doc]" +"Feil oppstod under forsøk på flytting av den opplastede filen, se " +"[doc@faq1-11]FAQ 1.11[/doc]." #: libraries/File.class.php:494 msgid "Error while moving uploaded file." @@ -2934,7 +2915,7 @@ msgstr "Kan ikke lese (flyttet) opplastet fil." #: libraries/Footer.class.php:74 #, php-format msgid "Currently running Git revision %1$s from the %2$s branch." -msgstr "" +msgstr "Kjører Git-revisjon %1$s fra %2$s gren." #: libraries/Footer.class.php:81 msgid "Git information missing!" @@ -2947,14 +2928,13 @@ msgstr "Åpne nytt phpMyAdmin vindu" #: libraries/Header.class.php:403 msgid "Click on the bar to scroll to top of page" -msgstr "" +msgstr "Klikk på linjen for å bla til toppen av siden" #: libraries/Header.class.php:684 #: libraries/plugins/auth/AuthenticationCookie.class.php:143 -#, fuzzy #| msgid "Javascript must be enabled past this point" msgid "Javascript must be enabled past this point!" -msgstr "JavaScript må være slått på forbi dette punktet" +msgstr "JavaScript må være slått på forbi dette punktet!" #: libraries/Index.class.php:535 msgid "No index defined!" @@ -3216,88 +3196,77 @@ msgid "Error while creating PDF:" msgstr "Feil oppstod under oppretting av PDF:" #: libraries/RecentFavoriteTable.class.php:150 -#, fuzzy #| msgid "Could not save recent table" msgid "Could not save recent table!" -msgstr "Kunne ikke lagre tabell" +msgstr "Kunne ikke lagre tabell!" #: libraries/RecentFavoriteTable.class.php:154 -#, fuzzy #| msgid "Could not save recent table" msgid "Could not save favorite table!" -msgstr "Kunne ikke lagre tabell" +msgstr "Kunne ikke lagre favorittabell!" #: libraries/RecentFavoriteTable.class.php:231 #: libraries/structure.lib.php:2753 -#, fuzzy #| msgid "Remove chart" msgid "Remove from Favorites" -msgstr "Fjern graf" +msgstr "Fjern fra favoritter" #: libraries/RecentFavoriteTable.class.php:253 -#, fuzzy #| msgid "There are no recent tables" msgid "There are no recent tables." -msgstr "Det er ikke noen nylig brukte tabeller" +msgstr "Det er ikke noen nylig brukte tabeller." #: libraries/RecentFavoriteTable.class.php:254 -#, fuzzy #| msgid "There are no recent tables" msgid "There are no favorite tables." -msgstr "Det er ikke noen nylig brukte tabeller" +msgstr "Det er ingen favorittabeller." #: libraries/RecentFavoriteTable.class.php:269 msgid "Recent tables" msgstr "Tidligere tabeller" #: libraries/RecentFavoriteTable.class.php:271 -#, fuzzy #| msgid "Reset" msgid "Recent" -msgstr "Tilbakestill" +msgstr "Nylige" #: libraries/RecentFavoriteTable.class.php:273 #: libraries/config/messages.inc.php:469 -#, fuzzy #| msgid "Variables" msgid "Favorite tables" -msgstr "Variabler" +msgstr "Favorittabeller" #: libraries/RecentFavoriteTable.class.php:275 -#, fuzzy #| msgid "Variables" msgid "Favorites" -msgstr "Variabler" +msgstr "Favoritter" #: libraries/SavedSearches.class.php:246 msgid "Please provide a name for this bookmarked search." -msgstr "" +msgstr "Vennligst oppgi et navn for dette bokmerkede søket." #: libraries/SavedSearches.class.php:261 -#, fuzzy #| msgid "Missing phpMyAdmin configuration storage tables" msgid "Missing information to save the bookmarked search." -msgstr "Mangler phpMyAdmin konfigurasjonslagertabeller" +msgstr "Mangler informasjon for å lagre bokmerket søk." #: libraries/SavedSearches.class.php:283 libraries/SavedSearches.class.php:320 -#, fuzzy #| msgid "The user %s already exists!" msgid "An entry with this name already exists." -msgstr "Brukeren %s finnes fra før!" +msgstr "En oppføring med dette navnet finnes allerede." #: libraries/SavedSearches.class.php:347 msgid "Missing information to delete the search." -msgstr "" +msgstr "Mangler informasjon for å slette søket." #: libraries/SavedSearches.class.php:375 msgid "Missing information to load the search." -msgstr "" +msgstr "Mangler informasjon for å laste søket." #: libraries/SavedSearches.class.php:394 -#, fuzzy #| msgid "Error while moving uploaded file." msgid "Error while loading the search." -msgstr "Feil oppstod imens den opplastede filen ble flyttet." +msgstr "Feil ved lasting av søket." #: libraries/ServerStatusData.class.php:188 #: libraries/server_status.lib.php:365 @@ -3395,17 +3364,16 @@ msgstr "Alle statusvariabler" #: libraries/ServerStatusData.class.php:378 msgid "Monitor" -msgstr "" +msgstr "Monitor" #: libraries/ServerStatusData.class.php:382 msgid "Advisor" -msgstr "" +msgstr "Rådgiver" #: libraries/StorageEngine.class.php:269 msgid "" "There is no detailed status information available for this storage engine." -msgstr "" -"Det er ikke noen detaljert statusinformasjon for denne lagringsmotoren." +msgstr "Det er ikke noen detaljert statusinformasjon for denne lagringsmotoren." #: libraries/StorageEngine.class.php:370 libraries/structure.lib.php:200 #, php-format @@ -3428,10 +3396,9 @@ msgid "This MySQL server does not support the %s storage engine." msgstr "Denne MySQL tjeneren har ikke støtte for %s lagringsmotoren." #: libraries/Table.class.php:385 -#, fuzzy #| msgid "unknown table status: " msgid "Unknown table status:" -msgstr "ukjent tabellstatus: " +msgstr "Ukjent tabellstatus:" #: libraries/Table.class.php:797 #, php-format @@ -3452,10 +3419,10 @@ msgid "Invalid table name:" msgstr "Ugyldig tabellnavn:" #: libraries/Table.class.php:1381 -#, fuzzy, php-format +#, php-format #| msgid "Error renaming table %1$s to %2$s" msgid "Failed to rename table %1$s to %2$s!" -msgstr "Feil oppstond med endring av tabellnavn fra %1$s til %2$s" +msgstr "Feil ved endring av tabellnavn %1$s til %2$s!" #: libraries/Table.class.php:1400 #, php-format @@ -3463,10 +3430,9 @@ msgid "Table %1$s has been renamed to %2$s." msgstr "Tabellen %1$s har endret navn til %2$s." #: libraries/Table.class.php:1548 -#, fuzzy #| msgid "Could not save table UI preferences" msgid "Could not save table UI preferences!" -msgstr "Kunne ikke lagre preferanser for tabellgrensesnitt" +msgstr "Kunne ikke lagre preferanser for tabellgrensesnitt!" #: libraries/Table.class.php:1577 #, php-format @@ -3474,8 +3440,8 @@ msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" msgstr "" -"Feil ved opprydning av preferansene for tabellgrensesnitt (se $cfg['Servers']" -"[$i]['MaxTableUiprefs'] %s)" +"Feil ved opprydning av preferansene for tabellgrensesnitt (se " +"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)" #: libraries/Table.class.php:1731 #, php-format @@ -3519,7 +3485,7 @@ msgstr "Utvidet søk" #: libraries/TableSearch.class.php:217 libraries/TableSearch.class.php:1224 msgid "Find and Replace" -msgstr "" +msgstr "Finn og erstatt" #: libraries/TableSearch.class.php:240 libraries/insert_edit.lib.php:1399 msgid "Edit/Insert" @@ -3548,7 +3514,7 @@ msgstr "Visningsrekkefølge:" #: libraries/TableSearch.class.php:878 msgid "Use this column to label each point" -msgstr "" +msgstr "Bruk denne kolonnen til å merke hvert punkt" #: libraries/TableSearch.class.php:901 msgid "Maximum rows to plot" @@ -3575,7 +3541,7 @@ msgstr "Utfør en \"spørring ved eksempel\" (jokertegn: \"%\")" #: libraries/TableSearch.class.php:1270 msgid "Browse/Edit the points" -msgstr "" +msgstr "Bla gjennom/rediger punktene" #: libraries/TableSearch.class.php:1277 msgid "How to use" @@ -3591,7 +3557,7 @@ msgstr "Erstatt med:" #: libraries/TableSearch.class.php:1412 msgid "Find and replace - preview" -msgstr "" +msgstr "Finn og erstatt - forhåndsvisning" #: libraries/TableSearch.class.php:1416 msgid "Count" @@ -3645,42 +3611,56 @@ msgstr "Tema:" msgid "" "A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255" msgstr "" +"Et 1-byte heltall, signert område er fra -128 til 127, usignert område er " +"fra 0 til 255" #: libraries/Types.class.php:322 msgid "" "A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to " "65,535" msgstr "" +"Et 2-byte heltall, signert område er fra -32.768 til 32.767, usignert område " +"er fra 0 til 65.535" #: libraries/Types.class.php:324 msgid "" "A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is " "0 to 16,777,215" msgstr "" +"Et 3-byte heltall, signert område er fra -8.388.608 til 8.388.607, usignert " +"er fra 0 til 16.777.215" #: libraries/Types.class.php:326 msgid "" "A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned " "range is 0 to 4,294,967,295" msgstr "" +"Et 4-byte heltall, signert område er fra -2.147.483.648 til 2.147.483.647, " +"usignert er fra 0 til 4.294.967.295" #: libraries/Types.class.php:328 msgid "" "An 8-byte integer, signed range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615" msgstr "" +"Et 8-byte heltall, signert område er fra -9.223.372.036.854.775.808 til " +"9.223.372.036.854.775.807, usignert er fra 0 til 18.446.744.073.709.551.615" #: libraries/Types.class.php:330 libraries/Types.class.php:780 msgid "" "A fixed-point number (M, D) - the maximum number of digits (M) is 65 " "(default 10), the maximum number of decimals (D) is 30 (default 0)" msgstr "" +"Et tall med fast antall desimaler (M, D) - maksimalt antall sifre (M) er 65 (" +"standard 10), maksimalt antall desimaler (D) 30 (standard 0)" #: libraries/Types.class.php:332 msgid "" "A small floating-point number, allowable values are -3.402823466E+38 to " "-1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38" msgstr "" +"Et lite flyttall, tillatte verdier er fra -3,402823466E+38 til -1,175494351E-" +"38, 0, og fra 1,175494351E-38 til 3,402823466E+38" #: libraries/Types.class.php:334 msgid "" @@ -3688,28 +3668,37 @@ msgid "" "-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and " "2.2250738585072014E-308 to 1.7976931348623157E+308" msgstr "" +"Et dobbelt presisjons flyttall, tillatte verdier er fra -1,7976931348623157E+" +"308 til -2,2250738585072014E-308, 0, og fra 2,2250738585072014E-308 til " +"1,7976931348623157E+308" #: libraries/Types.class.php:336 msgid "" "Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for " "FLOAT)" msgstr "" +"Synonym for DOUBLE (unntak: i REAL_AS_FLOAT SQL-modus er det et synonym for " +"FLOAT)" #: libraries/Types.class.php:338 msgid "" "A bit-field type (M), storing M of bits per value (default is 1, maximum is " "64)" msgstr "" +"En bit-felttype (M), lagring av M bits per verdi (standard er 1, maksimum " +"er 64)" #: libraries/Types.class.php:340 msgid "" "A synonym for TINYINT(1), a value of zero is considered false, nonzero " "values are considered true" msgstr "" +"Et synonym for TINYINT (1), en verdi på null ansees som usann, andre verdier " +"enn null anses sanne" #: libraries/Types.class.php:342 msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "" +msgstr "Et alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" #: libraries/Types.class.php:344 libraries/Types.class.php:790 #, php-format @@ -3719,13 +3708,15 @@ msgstr "En dato i området %1$s til %2$s" #: libraries/Types.class.php:346 libraries/Types.class.php:792 #, php-format msgid "A date and time combination, supported range is %1$s to %2$s" -msgstr "" +msgstr "En kombinasjon av dato og klokkeslett, støttet område er %1$s til %2$s" #: libraries/Types.class.php:348 msgid "" "A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 03:14:07 UTC, " "stored as the number of seconds since the epoch (1970-01-01 00:00:00 UTC)" msgstr "" +"Et tidsstempel, område er fra 1970-01-01 00:00:01 UTC til 2038-01-09 03:14:" +"07 UTC, lagret som antall sekunder siden epoken (1970-01-01 00:00:00 UTC)" #: libraries/Types.class.php:350 libraries/Types.class.php:796 #, php-format @@ -3737,12 +3728,16 @@ msgid "" "A year in four-digit (4, default) or two-digit (2) format, the allowable " "values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000" msgstr "" +"Et årstall med fire-sifret format (4, standard) eller to-sifret (2) format, " +"de tillatte verdiene er 70 (1970) til 69 (2069) eller 1901 til 2155 og 0000" #: libraries/Types.class.php:354 msgid "" "A fixed-length (0-255, default 1) string that is always right-padded with " "spaces to the specified length when stored" msgstr "" +"En streng med fast lengde (0-255, standard 1) som alltid har mellomrom på " +"høyre side til den angitte lengden når den lagres" #: libraries/Types.class.php:356 libraries/Types.class.php:798 #, php-format @@ -3750,24 +3745,32 @@ msgid "" "A variable-length (%s) string, the effective maximum length is subject to " "the maximum row size" msgstr "" +"En streng med variabel lengde (%s), effektiv maksimum lengde er avhengig av " +"maksimum radstørrelse" #: libraries/Types.class.php:358 msgid "" "A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with " "a one-byte prefix indicating the length of the value in bytes" msgstr "" +"En TEKST-kolonne med en maksimal lengde på 255 (2^8 - 1) tegn, lagret med en " +"1-byte prefiks som angir lengden av verdien i byte" #: libraries/Types.class.php:360 libraries/Types.class.php:800 msgid "" "A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored " "with a two-byte prefix indicating the length of the value in bytes" msgstr "" +"En TEKST-kolonne med en maksimal lengde på 65.535 (2^16 - 1) tegn, som er " +"lagret med en 2-byte prefiks som angir lengden av verdien i byte" #: libraries/Types.class.php:362 msgid "" "A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, " "stored with a three-byte prefix indicating the length of the value in bytes" msgstr "" +"En TEKST-kolonne med en maksimal lengde på 16.777.215 (2^24 - 1) tegn, som " +"er lagret med en 3-byte prefiks som angir lengden av verdien i byte" #: libraries/Types.class.php:364 msgid "" @@ -3775,56 +3778,73 @@ msgid "" "characters, stored with a four-byte prefix indicating the length of the " "value in bytes" msgstr "" +"En TEKST-kolonne med en maksimal lengde på 4.294.967.295 eller 4GiB (2^32 - " +"1) tegn, som er lagret med en 4-byte prefiks som angir lengden av verdien i " +"byte" #: libraries/Types.class.php:366 msgid "" "Similar to the CHAR type, but stores binary byte strings rather than non-" "binary character strings" msgstr "" +"Lik CHAR type, men lagrer binære byte-strenger i stedet for ikke-binære " +"tegnstrenger" #: libraries/Types.class.php:368 msgid "" "Similar to the VARCHAR type, but stores binary byte strings rather than non-" "binary character strings" msgstr "" +"Lik VARCHAR type, men lagrer binære byte-strenger i stedet for ikke-binære " +"tegnstrenger" #: libraries/Types.class.php:370 msgid "" "A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a " "one-byte prefix indicating the length of the value" msgstr "" +"En BLOB-kolonne med en maksimal lengde på 255 (2^8 - 1) bytes, lagret med en " +"1-byte prefiks som angir lengden av verdien" #: libraries/Types.class.php:372 msgid "" "A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " "with a three-byte prefix indicating the length of the value" msgstr "" +"En BLOB-kolonne med en maksimal lengde på 16.777.215 (2^24 - 1) bytes, " +"lagret med en 3-byte prefiks som angir lengden av verdien" #: libraries/Types.class.php:374 libraries/Types.class.php:804 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a two-byte prefix indicating the length of the value" msgstr "" +"En BLOB-kolonne med en maksimal lengde på 65.535 (2^16 - 1) bytes, lagret " +"med en 2-byte prefiks som angir lengden av verdien" #: libraries/Types.class.php:376 msgid "" "A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "bytes, stored with a four-byte prefix indicating the length of the value" msgstr "" +"En BLOB-kolonne med en maksimal lengde på 4.294.967.295 eller 4GiB (2^32 - 1)" +" bytes, lagret med en 4-byte prefiks som angir lengden av verdien" #: libraries/Types.class.php:378 msgid "" "An enumeration, chosen from the list of up to 65,535 values or the special " "'' error value" msgstr "" +"En nummerering, valgt fra listen på opp til 65.535 verdier eller den " +"spesielle '' feilverdien" #: libraries/Types.class.php:380 msgid "A single value chosen from a set of up to 64 members" -msgstr "" +msgstr "En enkelt verdi valgt fra et sett på opp til 64 medlemmer" #: libraries/Types.class.php:382 msgid "A type that can store a geometry of any type" -msgstr "" +msgstr "En type som kan lagre en geometri av enhver type" #: libraries/Types.class.php:384 msgid "A point in 2-dimensional space" @@ -4992,7 +5012,7 @@ msgstr "Lagre som fil" #: libraries/config/messages.inc.php:111 libraries/config/messages.inc.php:332 msgid "Character set of the file" -msgstr "Filas tegnsett" +msgstr "Filens tegnsett" #: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:128 #: libraries/structure.lib.php:1718 @@ -5401,9 +5421,9 @@ msgid "" "Specify browser's title bar text. Refer to [doc@cfg_TitleTable]documentation" "[/doc] for magic strings that can be used to get special values." msgstr "" -"Spesifiser vindustittelen til nettleseren. Se forøvrig [doc@cfg_TitleTable]" -"dokumentasjon[/doc] for spesielle strenger som kan tas i bruk for å tilgang " -"til spesialverdier." +"Spesifiser vindustittelen til nettleseren. Se forøvrig " +"[doc@cfg_TitleTable]dokumentasjon[/doc] for spesielle strenger som kan tas i " +"bruk for å tilgang til spesialverdier." #: libraries/config/messages.inc.php:255 #: libraries/navigation/NavigationHeader.class.php:218 @@ -5863,8 +5883,7 @@ msgstr "Maksimum størrelse for innskrivningsfelt" msgid "" "The number of items that can be displayed on each page of the navigation " "tree." -msgstr "" -"Antall elementer som kan vises på hver enkelt side av navigasjonstreet." +msgstr "Antall elementer som kan vises på hver enkelt side av navigasjonstreet." #: libraries/config/messages.inc.php:409 msgid "Maximum items in branch" @@ -6363,8 +6382,9 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] " "support, suggested: [kbd]pma__bookmark[/kbd]" msgstr "" -"La stå tom å slå av [a@http://wiki.phpmyadmin.net/pma/bookmark]bokmerke[/a]" -"forslag: [kbd]pma__bookmark[/kbd]" +"La stå tom å slå av " +"[a@http://wiki.phpmyadmin.net/pma/bookmark]bokmerke[/a]forslag: " +"[kbd]pma__bookmark[/kbd]" #: libraries/config/messages.inc.php:563 msgid "Bookmark table" @@ -7616,7 +7636,8 @@ msgid "" "Please be patient, the file is being uploaded. Details about the upload are " "not available." msgstr "" -"Vær tålmodig, fila lastes opp. Detaljer om opplastingen er ikke tilgjengelig." +"Vær tålmodig, filen lastes opp. Detaljer om opplastingen er ikke " +"tilgjengelig." #: libraries/display_import.lib.php:108 msgid "Importing into the current server" @@ -7726,7 +7747,7 @@ msgstr "" #: libraries/display_import.lib.php:458 msgid "The file is being processed, please be patient." -msgstr "Fila er under behandling, venligst vent." +msgstr "Filen er under behandling, vennligst vent." #: libraries/display_select_lang.lib.php:56 #: libraries/display_select_lang.lib.php:57 setup/frames/index.inc.php:96 @@ -7871,7 +7892,7 @@ msgid "" "creating a MyISAM index (during REPAIR TABLE, ALTER TABLE, or LOAD DATA " "INFILE)." msgstr "" -"Maksimum størrelse for den midlertidige fila MySQL har lov til å bruke når " +"Maksimum størrelse for den midlertidige filen MySQL har lov til å bruke når " "den gjennoppretter en MyISAM indeks (med spørringene REPAIR TABLE, ALTER " "TABLE, eller LOAD DATA INFILE)." @@ -7885,7 +7906,7 @@ msgid "" "than using the key cache by the amount specified here, prefer the key cache " "method." msgstr "" -"Hvis den midlertidige fila brukt for hurtig MyISAM indeksopprettelse ville " +"Hvis den midlertidige filen brukt for hurtig MyISAM indeksopprettelse ville " "bli større enn å bruke nøkkelmellomlager med størrelsen spesifisert her, så " "bruk nøkkellagermetoden." @@ -8103,25 +8124,25 @@ msgstr "Automatisk opprette versjoner" #: libraries/export.lib.php:364 #, php-format msgid "Insufficient space to save the file %s." -msgstr "Ikke nok plass til å lagre fila %s." +msgstr "Ikke nok plass til å lagre filen %s." #: libraries/export.lib.php:321 #, php-format msgid "" "File %s already exists on server, change filename or check overwrite option." msgstr "" -"Fila %s eksisterer alt på serveren, endre navnet eller merk av for " +"Filen %s eksisterer alt på serveren, endre navnet eller merk av for " "overskriving av fil." #: libraries/export.lib.php:329 libraries/export.lib.php:337 #, php-format msgid "The web server does not have permission to save the file %s." -msgstr "Webserveren har ikke tillatelse til å lagre fila %s." +msgstr "Webserveren har ikke tillatelse til å lagre filen %s." #: libraries/export.lib.php:370 #, php-format msgid "Dump has been saved to file %s." -msgstr "Dump har blitt lagret til fila %s." +msgstr "Dump har blitt lagret til filen %s." #: libraries/import.lib.php:200 libraries/insert_edit.lib.php:124 #: libraries/rte/rte_routines.lib.php:1487 libraries/sql.lib.php:1681 @@ -8132,8 +8153,7 @@ msgstr "MySQL returnerte ett tomt resultat (m.a.o. ingen rader)." #: libraries/import.lib.php:1227 msgid "" "The following structures have either been created or altered. Here you can:" -msgstr "" -"Følgende strukturer har enten blitt opprettet eller endret. Her kan du:" +msgstr "Følgende strukturer har enten blitt opprettet eller endret. Her kan du:" #: libraries/import.lib.php:1228 #, fuzzy @@ -8593,10 +8613,9 @@ msgstr "Endre tabellrekkefølge ved" #: libraries/navigation/NavigationTree.class.php:1093 #: libraries/navigation/NavigationTree.class.php:1128 -#, fuzzy #| msgid "Save as file" msgid "Clear fast filter" -msgstr "Lagre som fil" +msgstr "Fjern hurtigfilter" #: libraries/navigation/NavigationTree.class.php:1127 #, fuzzy @@ -8999,7 +9018,7 @@ msgstr "Kunne ikke finne signon autentiseringsscriptet:" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:147 #, php-format msgid "File %s does not contain any key id" -msgstr "Fila %s inneholder ingen nøkkel id" +msgstr "Filen %s inneholder ingen nøkkel id" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:195 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:216 @@ -9517,7 +9536,7 @@ msgid "" "The XML file specified was either malformed or incomplete. Please correct " "the issue and try again." msgstr "" -"Den spesifiserte XML-fila var enten skadet eller ufulstendig. Korriger " +"Den spesifiserte XML-filen var enten skadet eller ufulstendig. Korriger " "problemet og prøv igjen." #: libraries/plugins/import/ImportOds.class.php:183 @@ -9547,10 +9566,9 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." msgstr "" #: libraries/plugins/import/ImportShp.class.php:258 -#, fuzzy #| msgid "File %s does not contain any key id" msgid "The imported file does not contain any data!" -msgstr "Fila %s inneholder ingen nøkkel id" +msgstr "Den importerte filen inneholder ingen data!" #: libraries/plugins/import/ImportSql.class.php:71 #, fuzzy @@ -9594,8 +9612,8 @@ msgstr "" "formatert dato. Den første innstillingen er differansen (i timer) som vil " "bli lagt til tidsmerket (Standard: 0). Bruk den andre innstillingen til å " "spesifiser en alternativ datoformatstreng. Den tredje innstillingen avgjør " -"om du ønsker visning som en lokal dato eller som UTC (bruk \"local\" eller " -"\"utc\" strenger). Avhengig av dette, vil datoformatstrengen ha forskjellig " +"om du ønsker visning som en lokal dato eller som UTC (bruk \"local\" eller \"" +"utc\" strenger). Avhengig av dette, vil datoformatstrengen ha forskjellig " "verdi - for \"local\" se dokumentasjonen for PHPs strftime() funksjon og for " "\"utc\" se gmdate() funksjonen." @@ -9827,8 +9845,9 @@ msgid "" "Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php." msgstr "" -"Slå på avansert funksjonalitet i konfigurasjonsfila (config.inc.php), f.eks. med eksempel fra config.sample.inc.php." +"Slå på avansert funksjonalitet i konfigurasjonsfilen " +"(config.inc.php), f.eks. med eksempel fra " +"config.sample.inc.php." #: libraries/relation.lib.php:320 msgid "Re-login to phpMyAdmin to load the updated configuration file." @@ -10199,8 +10218,7 @@ msgstr "Kan ikke koble til master %s." #: libraries/replication_gui.lib.php:980 msgid "" "Unable to read master log position. Possible privilege problem on master." -msgstr "" -"Kan ikke lese masterloggposisjon. Muligens privilegieproblem på master." +msgstr "Kan ikke lese masterloggposisjon. Muligens privilegieproblem på master." #: libraries/replication_gui.lib.php:998 #, fuzzy @@ -10721,10 +10739,9 @@ msgid "Schema of the %s database - Page %s" msgstr "Skjema for %s databasen - Side %s" #: libraries/schema/Export_Relation_Schema.class.php:211 -#, fuzzy #| msgid "File %s does not contain any key id" msgid "This page does not contain any tables!" -msgstr "Fila %s inneholder ingen nøkkel id" +msgstr "Denne siden inneholder ingen tabeller!" #: libraries/schema/Export_Relation_Schema.class.php:239 msgid "SCHEMA ERROR: " @@ -11518,14 +11535,14 @@ msgstr "" #: libraries/server_status.lib.php:84 msgid "This MySQL server works as master in replication process." msgstr "" -"Denne tjeneren er konfigurert som tjener i en replikasjonsprosess." +"Denne tjeneren er konfigurert som tjener i en " +"replikasjonsprosess." #: libraries/server_status.lib.php:89 msgid "This MySQL server works as slave in replication process." msgstr "" -"Denne tjeneren er konfigurert som slave i en replikasjonsprosess." +"Denne tjeneren er konfigurert som slave i en " +"replikasjonsprosess." #: libraries/server_status.lib.php:103 msgid "Replication status" @@ -12450,8 +12467,8 @@ msgid "" "The number of joins without keys that check for key usage after each row. " "(If this is not 0, you should carefully check the indexes of your tables.)" msgstr "" -"Antall joins uten nøkler som kontrollerer for nøkkelbruk etter hver rad " -"(Hvis denne ikke er 0 bør du nøye kontrollere dine tabellindekser.)" +"Antall joins uten nøkler som kontrollerer for nøkkelbruk etter hver rad (" +"Hvis denne ikke er 0 bør du nøye kontrollere dine tabellindekser.)" #: libraries/server_status_variables.lib.php:693 msgid "" @@ -13256,10 +13273,10 @@ msgid "" "quote (\"'\") amongst those values, precede it with a backslash (for example " "'\\\\xyz' or 'a\\'b')." msgstr "" -"Skriv inn verdiene for transformasjon med dette formatet: 'a', 100, b,'c'…" -"
Hvis du trenger å bruke en skråstrek (\"\\\") eller en enkel apostrof " -"(\"'\") blant disse verdiene så sett en skråstrek foran (eks. '\\\\xyz' " -"eller 'a\\'b')." +"Skriv inn verdiene for transformasjon med dette formatet: 'a', 100, b,'c'…<" +"br />Hvis du trenger å bruke en skråstrek (\"\\\") eller en enkel apostrof (" +"\"'\") blant disse verdiene så sett en skråstrek foran (eks. '\\\\xyz' eller " +"'a\\'b')." #: libraries/tbl_columns_definition_form.lib.php:570 #, fuzzy, php-format @@ -13435,8 +13452,8 @@ msgstr "Ingen indeks definert!" #, php-format msgid "Error creating foreign key on %1$s (check data types)" msgstr "" -"Feil oppstod under forsøk på opprettelse av fremmednøkkel på %1$s " -"(kontroller datatyper)" +"Feil oppstod under forsøk på opprettelse av fremmednøkkel på %1$s (" +"kontroller datatyper)" #: libraries/tbl_tracking.lib.php:60 #, fuzzy, php-format From e67abc737a5c2031eea635e4017cf297a330f80a Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 19 Oct 2014 08:48:31 +0530 Subject: [PATCH 04/20] Fix tests Signed-off-by: Madhura Jayaratne --- .../plugin/auth/PMA_AuthenticationCookie_test.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index 623c8ac180..ca09a8d7b7 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -386,21 +386,6 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $result ); - $this->assertContains( - '$("#recaptcha_reload_btn").addClass("disableAjax");', - $result - ); - - $this->assertContains( - '$("#recaptcha_switch_audio_btn").addClass("disableAjax");', - $result - ); - - $this->assertContains( - '$("#recaptcha_switch_img_btn").addClass("disableAjax");', - $result - ); - $attrInstance->setValue(null, $restoreInstance); } From af6e87f27885fe9b8008f3e63612508490799b29 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Fri, 17 Oct 2014 14:17:35 +0200 Subject: [PATCH 05/20] Translated using Weblate (Interlingua) Currently translated at 62.4% (1728 of 2768 strings) [CI skip] --- po/ia.po | 122 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 58 deletions(-) diff --git a/po/ia.po b/po/ia.po index 37dc92c1ab..e729e20134 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-08-06 16:54+0200\n" +"PO-Revision-Date: 2014-10-17 14:17+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -7858,6 +7858,8 @@ msgstr "Modifica nove rango" msgid "" "Use TAB key to move from value to value, or CTRL+arrows to move anywhere" msgstr "" +"Usa le clave TAB pro mover de valor a valor, o CTRL+flechas pro mover lo " +"ubique" #: libraries/insert_edit.lib.php:1979 libraries/sql.lib.php:1678 msgid "Showing SQL query" @@ -7974,7 +7976,7 @@ msgstr "dictionario" #: libraries/mysql_charsets.lib.php:200 msgid "phone book" -msgstr "" +msgstr "agenda" #: libraries/mysql_charsets.lib.php:203 msgid "Hungarian" @@ -8026,23 +8028,23 @@ msgstr "" #: libraries/mysql_charsets.lib.php:239 msgid "Spanish" -msgstr "" +msgstr "Espaniol" #: libraries/mysql_charsets.lib.php:242 msgid "Traditional Spanish" -msgstr "" +msgstr "Espaniol traditional" #: libraries/mysql_charsets.lib.php:245 libraries/mysql_charsets.lib.php:344 msgid "Swedish" -msgstr "" +msgstr "Svedese" #: libraries/mysql_charsets.lib.php:248 libraries/mysql_charsets.lib.php:347 msgid "Thai" -msgstr "" +msgstr "Thai" #: libraries/mysql_charsets.lib.php:251 libraries/mysql_charsets.lib.php:341 msgid "Turkish" -msgstr "" +msgstr "Turco" #: libraries/mysql_charsets.lib.php:254 libraries/mysql_charsets.lib.php:338 msgid "Ukrainian" @@ -8092,7 +8094,7 @@ msgstr "" #: libraries/mysql_charsets.lib.php:332 msgid "Greek" -msgstr "" +msgstr "Greco" #: libraries/mysql_charsets.lib.php:335 msgid "Czech-Slovak" @@ -8109,7 +8111,7 @@ msgstr "Un error ha occurrite quando on incargava le arbore de navigation" #: libraries/navigation/Navigation.class.php:170 msgid "Events:" -msgstr "" +msgstr "Eventos:" #: libraries/navigation/Navigation.class.php:171 msgid "Functions:" @@ -8125,19 +8127,19 @@ msgstr "Tabulas:" #: libraries/navigation/Navigation.class.php:174 msgid "Views:" -msgstr "" +msgstr "Vistas:" #: libraries/navigation/NavigationHeader.class.php:192 msgid "Home" -msgstr "" +msgstr "Domo o Pagina de Initio" #: libraries/navigation/NavigationHeader.class.php:205 msgid "Log out" -msgstr "" +msgstr "Claude session" #: libraries/navigation/NavigationHeader.class.php:228 msgid "phpMyAdmin documentation" -msgstr "" +msgstr "Documentation de phpMyAdmin" #: libraries/navigation/NavigationHeader.class.php:252 msgid "Reload navigation panel" @@ -8148,11 +8150,15 @@ msgstr "Recarga pannello de navigation" msgid "%s other result found" msgid_plural "%s other results found" msgstr[0] "" +"One\n" +"%s il trovava un resultato" msgstr[1] "" +"Other\n" +"%s il trovava altere resultatos" #: libraries/navigation/NavigationTree.class.php:864 msgid "Expand/Collapse" -msgstr "" +msgstr "Expander/Collaber" #: libraries/navigation/NavigationTree.class.php:1091 msgid "Filter databases by name or regex" @@ -8161,7 +8167,7 @@ msgstr "Filtra base de datos per nomine o regex" #: libraries/navigation/NavigationTree.class.php:1093 #: libraries/navigation/NavigationTree.class.php:1128 msgid "Clear fast filter" -msgstr "" +msgstr "Netta filtro rapide" #: libraries/navigation/NavigationTree.class.php:1127 msgid "Filter by name or regex" @@ -8171,23 +8177,23 @@ msgstr "Filtra per nomine o regex" #: libraries/navigation/NodeFactory.class.php:41 #, php-format msgid "Invalid class name \"%1$s\", using default of \"Node\"" -msgstr "" +msgstr "Invalide nomine de classe \"%1$s\", on usa le predefinite per \"Node\"" #: libraries/navigation/NodeFactory.class.php:65 #, php-format msgid "Could not include class \"%1$s\", file \"%2$s\" not found" -msgstr "" +msgstr "Non pote includer le classe \"%1$s\", il non trovava le file \"%2$s\"" #: libraries/navigation/Nodes/Node_Column_Container.class.php:26 #: libraries/navigation/Nodes/Node_Column_Container.class.php:27 #: libraries/sql_query_form.lib.php:281 msgid "Columns" -msgstr "" +msgstr "Columnas" #: libraries/navigation/Nodes/Node_Column_Container.class.php:38 msgctxt "Create new column" msgid "New" -msgstr "" +msgstr "Nove" #: libraries/navigation/Nodes/Node_Database.class.php:34 msgid "Database operations" @@ -8200,24 +8206,24 @@ msgstr "Monstra elementos celate" #: libraries/navigation/Nodes/Node_Database_Container.class.php:36 msgctxt "Create new database" msgid "New" -msgstr "" +msgstr "Nove" #: libraries/navigation/Nodes/Node_Event_Container.class.php:37 msgctxt "Create new event" msgid "New" -msgstr "" +msgstr "Nove" #: libraries/navigation/Nodes/Node_Function_Container.class.php:24 #: libraries/navigation/Nodes/Node_Function_Container.class.php:25 #: libraries/plugins/export/ExportSql.class.php:519 #: libraries/plugins/export/ExportXml.class.php:107 msgid "Functions" -msgstr "" +msgstr "Functiones" #: libraries/navigation/Nodes/Node_Function_Container.class.php:36 msgctxt "Create new function" msgid "New" -msgstr "" +msgstr "Nove" #: libraries/navigation/Nodes/Node_Index.class.php:32 #: libraries/structure.lib.php:1412 libraries/structure.lib.php:2081 @@ -8225,12 +8231,12 @@ msgstr "" #: libraries/tbl_columns_definition_form.lib.php:303 #: libraries/tbl_printview.lib.php:310 msgid "Index" -msgstr "" +msgstr "Indice" #: libraries/navigation/Nodes/Node_Index_Container.class.php:38 msgctxt "Create new index" msgid "New" -msgstr "" +msgstr "Nove" #: libraries/navigation/Nodes/Node_Procedure.class.php:34 msgid "Procedure" @@ -8241,34 +8247,34 @@ msgstr "Procedimento" #: libraries/plugins/export/ExportSql.class.php:501 #: libraries/plugins/export/ExportXml.class.php:111 msgid "Procedures" -msgstr "" +msgstr "Proceduras" #: libraries/navigation/Nodes/Node_Procedure_Container.class.php:38 #: libraries/rte/rte_footer.lib.php:29 msgctxt "Create new procedure" msgid "New" -msgstr "" +msgstr "Nove" #: libraries/navigation/Nodes/Node_Table_Container.class.php:45 msgctxt "Create new table" msgid "New" -msgstr "" +msgstr "Nove" #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:37 msgctxt "Create new trigger" msgid "New" -msgstr "" +msgstr "Nove" #: libraries/navigation/Nodes/Node_View_Container.class.php:26 #: libraries/navigation/Nodes/Node_View_Container.class.php:27 #: libraries/plugins/export/ExportXml.class.php:125 msgid "Views" -msgstr "" +msgstr "Vistas" #: libraries/navigation/Nodes/Node_View_Container.class.php:45 msgctxt "Create new view" msgid "New" -msgstr "" +msgstr "Nove" #: libraries/operations.lib.php:75 msgid "Rename database to:" @@ -11939,7 +11945,7 @@ msgstr "" #: libraries/structure.lib.php:1576 #: libraries/tbl_columns_definition_form.lib.php:178 msgid "You have to add at least one column." -msgstr "" +msgstr "Tu debe adder al minus un columna." #: libraries/structure.lib.php:1587 msgid "Add column" @@ -12506,59 +12512,59 @@ msgstr "" #: pmd_display_field.php:62 pmd_save_pos.php:85 msgid "Modifications have been saved" -msgstr "" +msgstr "Modificationes ha essite salveguardate" #: pmd_general.php:69 msgid "Show/Hide left menu" -msgstr "" +msgstr "Monstra/Cela le menu de sinistra" #: pmd_general.php:74 msgid "View in fullscreen" -msgstr "" +msgstr "Monstra a schermo integre" #: pmd_general.php:79 msgid "Exit fullscreen" -msgstr "" +msgstr "Abandona le modo de schermo integre" #: pmd_general.php:86 msgid "Save position" -msgstr "" +msgstr "Salveguarda le position" #: pmd_general.php:96 pmd_general.php:434 msgid "Create relation" -msgstr "" +msgstr "Crea relation" #: pmd_general.php:106 msgid "Reload" -msgstr "" +msgstr "Recarga" #: pmd_general.php:111 msgid "Help" -msgstr "" +msgstr "Adjuta" #: pmd_general.php:119 msgid "Angular links" -msgstr "" +msgstr "Ligamines angular" #: pmd_general.php:119 msgid "Direct links" -msgstr "" +msgstr "Ligamines directe" #: pmd_general.php:124 msgid "Snap to grid" -msgstr "" +msgstr "Colpos (snap) al grilia" #: pmd_general.php:130 msgid "Small/Big All" -msgstr "" +msgstr "Toto parve/grande" #: pmd_general.php:135 msgid "Toggle small/big" -msgstr "" +msgstr "Commuta inter parve/grande" #: pmd_general.php:140 msgid "Toggle relation lines" -msgstr "" +msgstr "Commuta lineas de relation" #: pmd_general.php:146 pmd_pdf.php:103 msgid "Import/Export coordinates for relational schema" @@ -12566,53 +12572,53 @@ msgstr "" #: pmd_general.php:155 msgid "Build Query" -msgstr "" +msgstr "Construe Query" #: pmd_general.php:162 msgid "Move Menu" -msgstr "" +msgstr "Move menu" #: pmd_general.php:176 msgid "Hide/Show all" -msgstr "" +msgstr "Cela/monstra toto" #: pmd_general.php:180 msgid "Hide/Show Tables with no relation" -msgstr "" +msgstr "Cela/Monstra tabellas con necun relation" #: pmd_general.php:225 msgid "Number of tables:" -msgstr "" +msgstr "Numero de tabellas:" #: pmd_general.php:502 msgid "Delete relation" -msgstr "" +msgstr "Dele relation" #: pmd_general.php:547 pmd_general.php:606 msgid "Relation operator" -msgstr "" +msgstr "Operator de relation" #: pmd_general.php:557 pmd_general.php:616 pmd_general.php:746 #: pmd_general.php:865 msgid "Except" -msgstr "" +msgstr "Excepte" #: pmd_general.php:563 pmd_general.php:624 pmd_general.php:752 #: pmd_general.php:871 msgid "subquery" -msgstr "" +msgstr "subquery" #: pmd_general.php:567 pmd_general.php:669 msgid "Rename to" -msgstr "" +msgstr "Renomina in" #: pmd_general.php:569 pmd_general.php:675 msgid "New name" -msgstr "" +msgstr "Nove nomine" #: pmd_general.php:572 pmd_general.php:795 msgid "Aggregate" -msgstr "" +msgstr "Total" #: pmd_general.php:906 msgid "Active options" From 331d89c0bcbaadd29ddac5db6c0ca35f6792a453 Mon Sep 17 00:00:00 2001 From: Tor Stokkan Date: Sat, 18 Oct 2014 07:54:04 +0200 Subject: [PATCH 06/20] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 65.4% (1813 of 2768 strings) [CI skip] --- po/nb.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/nb.po b/po/nb.po index 0448378761..095c084119 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-10-18 07:21+0200\n" +"PO-Revision-Date: 2014-10-18 07:54+0200\n" "Last-Translator: Tor Stokkan \n" "Language-Team: Norwegian Bokmål " "\n" @@ -5200,10 +5200,9 @@ msgid "Add %s" msgstr "Legg til %s" #: libraries/config/messages.inc.php:178 -#, fuzzy #| msgid "Use hexadecimal for BLOB" msgid "Use hexadecimal for BINARY & BLOB" -msgstr "Bruk heksadesimal for BLOB" +msgstr "Bruk heksadesimal for BINARY & BLOB" #: libraries/config/messages.inc.php:180 msgid "Use ignore inserts" @@ -6196,10 +6195,9 @@ msgid "How to display various action links" msgstr "" #: libraries/config/messages.inc.php:510 -#, fuzzy #| msgid "Disallow BLOB and BINARY columns from editing" msgid "Disallow BLOB and BINARY columns from editing." -msgstr "Ikke tillat BLOB eller BLOB og BINARY kolonner å bli redigert" +msgstr "Ikke tillat redigering av BLOB- eller BINARY-kolonner." #: libraries/config/messages.inc.php:511 msgid "Protect binary columns" @@ -9683,7 +9681,7 @@ msgstr "" #: libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php:33 msgid "Displays a link to download this image." -msgstr "Viser en link til dette bildet (m.a.o. direkte blob-nedlasting)." +msgstr "Viser en link for nedlasting av dette bildet." #: libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php:33 msgid "" From d2aec03f2b0ef8bfc8d45fe582b9580ce14bf29f Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 20 Oct 2014 14:56:40 +0530 Subject: [PATCH 07/20] Do not remove throbber in case of aborted ajax filter calls Signed-off-by: Madhura Jayaratne --- js/navigation.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 90fd346e3c..874101d403 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -1309,19 +1309,21 @@ PMA_fastFilter.filter.prototype.request = function () { type: 'post', dataType: 'json', data: params, - complete: function (jqXHR) { - var data = $.parseJSON(jqXHR.responseText); - self.$this.find('li.fast_filter').find('div.throbber').remove(); - if (data && data.results) { - var $listItem = $('
  • ', {'class': 'moreResults'}) - .appendTo(self.$this.find('li.fast_filter')); - $('', {href: '#'}) - .text(data.results) - .appendTo($listItem) - .click(function (event) { - event.preventDefault(); - self.swap.apply(self, [data.message]); - }); + complete: function (jqXHR, status) { + if (status != 'abort') { + var data = $.parseJSON(jqXHR.responseText); + self.$this.find('li.fast_filter').find('div.throbber').remove(); + if (data && data.results) { + var $listItem = $('
  • ', {'class': 'moreResults'}) + .appendTo(self.$this.find('li.fast_filter')); + $('', {href: '#'}) + .text(data.results) + .appendTo($listItem) + .click(function (event) { + event.preventDefault(); + self.swap.apply(self, [data.message]); + }); + } } } }); From 03b84715f66eba027c6bdbcb0456b986ab013314 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Sun, 19 Oct 2014 20:02:04 +0200 Subject: [PATCH 08/20] Translated using Weblate (Catalan) Currently translated at 83.5% (2484 of 2973 strings) [CI skip] --- po/ca.po | 70 +++++++++++++++++++++++--------------------------------- 1 file changed, 29 insertions(+), 41 deletions(-) diff --git a/po/ca.po b/po/ca.po index a89a64798d..5e27eae4a2 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-10-16 12:25-0400\n" -"PO-Revision-Date: 2014-10-16 07:47+0200\n" +"PO-Revision-Date: 2014-10-19 20:02+0200\n" "Last-Translator: josep constanti \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan " +"\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.10-dev\n" @@ -3717,7 +3717,7 @@ msgstr "Favorites" #: libraries/SavedSearches.class.php:246 msgid "Please provide a name for this bookmarked search." -msgstr "" +msgstr "Proporcioneu un nom per aquesta cerca preferida." #: libraries/SavedSearches.class.php:261 msgid "Missing information to save the bookmarked search." @@ -3729,11 +3729,11 @@ msgstr "Ja existeix una entrada amb aquest nom." #: libraries/SavedSearches.class.php:347 msgid "Missing information to delete the search." -msgstr "" +msgstr "Manca informació per esborrar la cerca." #: libraries/SavedSearches.class.php:375 msgid "Missing information to load the search." -msgstr "" +msgstr "Manca informació per carregar la cerca." #: libraries/SavedSearches.class.php:394 msgid "Error while loading the search." @@ -3970,7 +3970,7 @@ msgstr "Cerca de zoom" #: libraries/TableSearch.class.php:217 libraries/TableSearch.class.php:1227 msgid "Find and Replace" -msgstr "" +msgstr "Troba i substitueix" #: libraries/TableSearch.class.php:240 libraries/insert_edit.lib.php:1353 msgid "Edit/Insert" @@ -4041,7 +4041,7 @@ msgstr "Usar expressió regular" #: libraries/TableSearch.class.php:1474 msgid "Find and replace - preview" -msgstr "" +msgstr "Troba i substitueix - vista prèvia" #: libraries/TableSearch.class.php:1478 msgid "Count" @@ -4811,15 +4811,15 @@ msgstr "Tancat" #: libraries/config.values.php:116 msgid "Ask before sending error reports" -msgstr "" +msgstr "Demanar abans d'enviar informes d'error" #: libraries/config.values.php:117 msgid "Always send error reports" -msgstr "" +msgstr "Enviar sempre els informes d'error" #: libraries/config.values.php:118 msgid "Never send error reports" -msgstr "" +msgstr "No enviar mai informes d'error" #: libraries/config.values.php:147 #: libraries/plugins/export/ExportHtmlword.class.php:69 @@ -4959,7 +4959,7 @@ msgstr "Permet als usuaris configurar aquest valor" #: libraries/config/FormDisplay.tpl.php:393 msgid "Apply" -msgstr "" +msgstr "Aplicar" #: libraries/config/ServerConfigChecks.class.php:168 msgid "You should use SSL connections if your database server supports it." @@ -5579,10 +5579,9 @@ msgstr "Desactiva les comprovacions de claus externes" #: libraries/config/messages.inc.php:166 #: libraries/plugins/export/ExportSql.class.php:155 -#, fuzzy #| msgid "Exporting rows from \"%s\" table" msgid "Export views as tables" -msgstr "Exportar les files de la taula \"%s\"" +msgstr "Exportar les vistes com taules" #: libraries/config/messages.inc.php:167 libraries/config/messages.inc.php:169 #: libraries/config/messages.inc.php:170 libraries/config/messages.inc.php:171 @@ -5594,10 +5593,9 @@ msgid "Add %s" msgstr "Afegeix %s" #: libraries/config/messages.inc.php:174 -#, fuzzy #| msgid "Use hexadecimal for BLOB" msgid "Use hexadecimal for BINARY & BLOB" -msgstr "Usa hexadecimal per a BLOB" +msgstr "Utilitzeu hexadecimal per a BINARY i BLOB" #: libraries/config/messages.inc.php:176 msgid "Use ignore inserts" @@ -5626,17 +5624,15 @@ msgid "Export time in UTC" msgstr "Exporta l'hora en UTC" #: libraries/config/messages.inc.php:195 -#, fuzzy #| msgid "Force secured connection while using phpMyAdmin" msgid "Force secured connection while using phpMyAdmin." -msgstr "Força la connexió segura al usar phpMyAdmin" +msgstr "Forçar una connexió segura en usar phpMyAdmin." #: libraries/config/messages.inc.php:196 msgid "Force SSL connection" msgstr "Força la connexió SSL" #: libraries/config/messages.inc.php:198 -#, fuzzy #| 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" @@ -5644,19 +5640,18 @@ 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 "" -"Ordre de clasificació per a ítems a la llista desplegable de claus externes; " -"[kbd]content[/kbd] és la dada referenciada, [kbd]id[/kbd] és el valor de la " -"clau" +"Ordre de classificació per a ítems a la llista desplegable de claus externes;" +" [kbd]content[/kbd] és la dada referenciada, [kbd]id[/kbd] és el valor de la " +"clau." #: libraries/config/messages.inc.php:201 msgid "Foreign key dropdown order" msgstr "Ordre de claus externes a la llista desplegable" #: libraries/config/messages.inc.php:203 -#, fuzzy #| msgid "A dropdown will be used if fewer items are present" msgid "A dropdown will be used if fewer items are present." -msgstr "Ús de llista desplegable si hi son menys ítems presents" +msgstr "S'utilitzara una llista desplegable si hi ha menys ítems." #: libraries/config/messages.inc.php:204 msgid "Foreign key limit" @@ -5667,18 +5662,16 @@ msgid "Browse mode" msgstr "Mode de navegació" #: libraries/config/messages.inc.php:206 -#, fuzzy #| msgid "Customize browse mode" msgid "Customize browse mode." -msgstr "Configura el mode de navegació" +msgstr "Configura el mode de navegació." #: libraries/config/messages.inc.php:208 libraries/config/messages.inc.php:210 #: libraries/config/messages.inc.php:228 libraries/config/messages.inc.php:239 #: libraries/config/messages.inc.php:241 libraries/config/messages.inc.php:287 -#, fuzzy #| msgid "Customize default options" msgid "Customize default options." -msgstr "Configura les opcions predeterminades" +msgstr "Configura les opcions predeterminades." #: libraries/config/messages.inc.php:209 libraries/config/setup.forms.php:245 #: libraries/config/setup.forms.php:322 @@ -5692,30 +5685,27 @@ msgid "Developer" msgstr "Desenvolupador" #: libraries/config/messages.inc.php:212 -#, fuzzy #| msgid "Settings for phpMyAdmin developers" msgid "Settings for phpMyAdmin developers." -msgstr "Opcions per desenvolupadors de phpMyAdmin" +msgstr "Opcions per desenvolupadors de phpMyAdmin." #: libraries/config/messages.inc.php:213 msgid "Edit mode" msgstr "Mode d'edició" #: libraries/config/messages.inc.php:214 -#, fuzzy #| msgid "Customize edit mode" msgid "Customize edit mode." -msgstr "Configura el mode d'edició" +msgstr "Configura el mode d'edició." #: libraries/config/messages.inc.php:216 msgid "Export defaults" msgstr "Predeterminats d'exportació" #: libraries/config/messages.inc.php:217 -#, fuzzy #| msgid "Customize default export options" msgid "Customize default export options." -msgstr "Configura les opcions predeterminades d'exportació" +msgstr "Configura les opcions predeterminades d'exportació." #: libraries/config/messages.inc.php:218 libraries/config/messages.inc.php:279 #: setup/frames/menu.inc.php:22 @@ -5727,31 +5717,29 @@ msgid "General" msgstr "General" #: libraries/config/messages.inc.php:220 -#, fuzzy #| msgid "Set some commonly used options" msgid "Set some commonly used options." -msgstr "Estableix algunes de les opcions més utilitzades" +msgstr "Estableix algunes de les opcions més utilitzades." #: libraries/config/messages.inc.php:222 msgid "Import defaults" msgstr "Predeterminats d'importació" #: libraries/config/messages.inc.php:223 -#, fuzzy #| msgid "Customize default common import options" msgid "Customize default common import options." -msgstr "Configura les opcions predeterminades d'importació" +msgstr "Configura les opcions predeterminades habituals d'importació." #: libraries/config/messages.inc.php:224 msgid "Import / export" msgstr "Importar / exportar" #: libraries/config/messages.inc.php:226 -#, fuzzy #| msgid "Set import and export directories and compression options" msgid "Set import and export directories and compression options." msgstr "" -"Configura els directoris d'importació i exportació i les opcions d'empaquetat" +"Configura els directoris d'importació i exportació i les opcions " +"d'empaquetat." #: libraries/config/messages.inc.php:227 msgid "LaTeX" From 8a3bf5af9f3333ac7bd526a1d945c0ebf47c3815 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 20 Oct 2014 13:14:05 -0400 Subject: [PATCH 09/20] Refactor code duplication Signed-off-by: Marc Delisle --- import.php | 9 ++------- libraries/core.lib.php | 18 ++++++++++++++++++ server_privileges.php | 9 ++------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/import.php b/import.php index 24dc56d422..68ad03a609 100644 --- a/import.php +++ b/import.php @@ -209,13 +209,8 @@ $post_patterns = array( '/^force_file_/', '/^' . $format . '_/' ); -foreach (array_keys($_POST) as $post_key) { - foreach ($post_patterns as $one_post_pattern) { - if (preg_match($one_post_pattern, $post_key)) { - $GLOBALS[$post_key] = $_POST[$post_key]; - } - } -} + +PMA_setPostAsGlobal($post_patterns); // Check needed parameters PMA_Util::checkParameters(array('import_type', 'format')); diff --git a/libraries/core.lib.php b/libraries/core.lib.php index cdab092651..9b85fd40a5 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -1005,4 +1005,22 @@ function PMA_checkAndFixPMATablesInCurrentDb() } } } + +/** + * Creates some globals from $_POST variables matching a pattern + * + * @param array $post_patterns The patterns to search for + * + * @return void + */ +function PMA_setPostAsGlobal($post_patterns) +{ + foreach (array_keys($_POST) as $post_key) { + foreach ($post_patterns as $one_post_pattern) { + if (preg_match($one_post_pattern, $post_key)) { + $GLOBALS[$post_key] = $_POST[$post_key]; + } + } + } +} ?> diff --git a/server_privileges.php b/server_privileges.php index 616ebd7660..1515d32bbc 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -43,13 +43,8 @@ $post_patterns = array( '/_priv$/i', '/^max_/i' ); -foreach (array_keys($_POST) as $post_key) { - foreach ($post_patterns as $one_post_pattern) { - if (preg_match($one_post_pattern, $post_key)) { - $GLOBALS[$post_key] = $_POST[$post_key]; - } - } -} + +PMA_setPostAsGlobal($post_patterns); require 'libraries/server_common.inc.php'; From a4546feda10327d6a79e644026adba38d1569bbf Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Mon, 20 Oct 2014 19:24:00 +0200 Subject: [PATCH 10/20] Fix #4559: don't use multibytes to read hash. Signed-off-by: Hugues Peccatte --- libraries/Config.class.php | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 24e6776d0d..85f76d5bbc 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -439,7 +439,6 @@ class PMA_Config $pmaString = $GLOBALS['PMA_String']; $branch = false; // are we on any branch? - //@TODO Implement strstr in PMA_String if ($pmaString->strstr($ref_head, '/')) { $ref_head = $pmaString->substr(trim($ref_head), 5); if ($pmaString->substr($ref_head, 0, 11) === 'refs/heads/') { @@ -492,8 +491,7 @@ class PMA_Config $commit = false; if (! isset($_SESSION['PMA_VERSION_COMMITDATA_' . $hash])) { $git_file_name = $git_folder . '/objects/' - . $pmaString->substr($hash, 0, 2) - . '/' . $pmaString->substr($hash, 2); + . substr($hash, 0, 2) . '/' . substr($hash, 2); if (file_exists($git_file_name) ) { if (! $commit = @file_get_contents($git_file_name)) { return; @@ -512,7 +510,7 @@ class PMA_Config // packs. (to look for them in .git/object/pack directory later) foreach (explode("\n", $packs) as $line) { // skip blank lines - if ($pmaString->strlen(trim($line)) == 0) { + if (strlen(trim($line)) == 0) { continue; } // skip non pack lines @@ -520,7 +518,7 @@ class PMA_Config continue; } // parse names - $pack_names[] = $pmaString->substr($line, 2); + $pack_names[] = substr($line, 2); } } else { // '.git/objects/info/packs' file can be missing @@ -534,14 +532,13 @@ class PMA_Config foreach ($dirIterator as $file_info) { $file_name = $file_info->getFilename(); // if this is a .pack file - if ($file_info->isFile() - && $pmaString->substr($file_name, -5) == '.pack' + if ($file_info->isFile() && substr($file_name, -5) == '.pack' ) { $pack_names[] = $file_name; } } } - $hash = $pmaString->strtolower($hash); + $hash = strtolower($hash); foreach ($pack_names as $pack_name) { $index_name = str_replace('.pack', '.idx', $pack_name); @@ -553,22 +550,22 @@ class PMA_Config continue; } // check format - if ($pmaString->substr($index_data, 0, 4) != "\377tOc") { + if (substr($index_data, 0, 4) != "\377tOc") { continue; } // check version - $version = unpack('N', $pmaString->substr($index_data, 4, 4)); + $version = unpack('N', substr($index_data, 4, 4)); if ($version[1] != 2) { continue; } // parse fanout table $fanout = unpack( "N*", - $pmaString->substr($index_data, 8, 256 * 4) + substr($index_data, 8, 256 * 4) ); // find where we should search - $firstbyte = intval($pmaString->substr($hash, 0, 2), 16); + $firstbyte = intval(substr($hash, 0, 2), 16); // array is indexed from 1 and we need to get // previous entry for start if ($firstbyte == 0) { @@ -582,11 +579,9 @@ class PMA_Config $found = false; $offset = 8 + (256 * 4); for ($position = $start; $position < $end; $position++) { - $sha = $pmaString->strtolower( + $sha = strtolower( bin2hex( - $pmaString->substr( - $index_data, $offset + ($position * 20), 20 - ) + substr($index_data, $offset + ($position * 20), 20) ) ); if ($sha == $hash) { @@ -601,7 +596,7 @@ class PMA_Config $offset = 8 + (256 * 4) + (24 * $fanout[256]); $pack_offset = unpack( 'N', - $pmaString->substr($index_data, $offset + ($position * 4), 4) + substr($index_data, $offset + ($position * 4), 4) ); $pack_offset = $pack_offset[1]; @@ -616,14 +611,14 @@ class PMA_Config fseek($pack_file, $pack_offset); // parse header - $header = $pmaString->ord(fread($pack_file, 1)); + $header = ord(fread($pack_file, 1)); $type = ($header >> 4) & 7; $hasnext = ($header & 128) >> 7; $size = $header & 0xf; $offset = 4; while ($hasnext) { - $byte = $pmaString->ord(fread($pack_file, 1)); + $byte = ord(fread($pack_file, 1)); $size |= ($byte & 0x7f) << $offset; $hasnext = ($byte & 128) >> 7; $offset += 7; From f5c271667b61b51de2258cde11cbe30ab484ebdd Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Mon, 20 Oct 2014 21:10:39 +0200 Subject: [PATCH 11/20] Update ChangeLog. Signed-off-by: Hugues Peccatte --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 73763cef3e..6b1676ba42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog + rfe #1535 Keyword-based autocompletion in SQL query editors - bug #4558 Unable to Add Rows while Creating Table + rfe #1547 Wrap No Tables Found message with message box +- bug #4559 Logging in causes 100% CPU usage 4.2.11.0 (not yet released) - bug ReferenceError: Table_onover is not defined From bd68c54d1beeef79d237e8bfda44690834012a76 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 21 Oct 2014 08:42:02 +0530 Subject: [PATCH 12/20] bug #4562 [security] XSS in debug SQL output Signed-off-by: Madhura Jayaratne --- ChangeLog | 3 +++ libraries/DatabaseInterface.class.php | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 975b173306..02d02217d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ phpMyAdmin - ChangeLog ====================== +4.2.10.1 (not yet released) +- bug #4562 [security] XSS in debug SQL output + 4.2.10.0 (2014-10-11) - bug #4361 Can't change font size (when config.inc.php not present) - bug #4542 Tab key in column name not shown diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index c126c17d5d..c7c5171420 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -139,10 +139,11 @@ class PMA_DatabaseInterface $_SESSION['debug']['queries'][$hash] = array(); if ($result == false) { $_SESSION['debug']['queries'][$hash]['error'] - = '' . mysqli_error($link) . ''; + = '' + . htmlspecialchars(mysqli_error($link)) . ''; } $_SESSION['debug']['queries'][$hash]['count'] = 1; - $_SESSION['debug']['queries'][$hash]['query'] = $query; + $_SESSION['debug']['queries'][$hash]['query'] = htmlspecialchars($query); $_SESSION['debug']['queries'][$hash]['time'] = $time; } From 7b8962dede7631298c81e2c1cd267b81f1e08a8c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 21 Oct 2014 08:45:09 +0530 Subject: [PATCH 13/20] bug #4563 [security] XSS in monitor query analyzer Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/server_status_monitor.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02d02217d0..c0597da6e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.2.10.1 (not yet released) - bug #4562 [security] XSS in debug SQL output +- bug #4563 [security] XSS in monitor query analyzer 4.2.10.0 (2014-10-11) - bug #4361 Can't change font size (when config.inc.php not present) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 4432cafdc6..97684d8ced 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1855,7 +1855,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { if (name == 'user_host') { return value.replace(/(\[.*?\])+/g, ''); } - return value; + return escapeHtml(value); }; for (var i = 0, l = rows.length; i < l; i++) { @@ -2011,7 +2011,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { for (i = 0, l = data.explain.length; i < l; i++) { explain += '
    0 ? 'style="display:none;"' : '') + '>'; $.each(data.explain[i], function (key, value) { - value = (value === null) ? 'null' : value; + value = (value === null) ? 'null' : escapeHtml(value); if (key == 'type' && value.toLowerCase() == 'all') { value = '' + value + ''; From d0e3ab3bc9da5a4ed24e485632471fef65cdb556 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 21 Oct 2014 10:26:58 -0400 Subject: [PATCH 14/20] 4.2.10.1 release Signed-off-by: Marc Delisle --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0597da6e9..dbf4de3830 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.2.10.1 (not yet released) +4.2.10.1 (2014-10-21) - bug #4562 [security] XSS in debug SQL output - bug #4563 [security] XSS in monitor query analyzer diff --git a/README b/README index 2b3ea5e8c1..097573345a 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.10 +Version 4.2.10.1 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index c28b6e7e3f..dcd3436e39 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.2.10' +version = '4.2.10.1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 4807f47d3a..8708b1aae8 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.2.10'); + $this->set('PMA_VERSION', '4.2.10.1'); /** * @deprecated */ From 4e7fbc287c0cb366b41ffecf9af667b67778cf1c Mon Sep 17 00:00:00 2001 From: josep constanti Date: Sun, 19 Oct 2014 20:02:01 +0200 Subject: [PATCH 15/20] Translated using Weblate (Catalan) Currently translated at 88.3% (2446 of 2768 strings) [CI skip] --- po/ca.po | 64 +++++++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/po/ca.po b/po/ca.po index 01b9e5d07d..eb6e171fa3 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-10-16 07:47+0200\n" +"PO-Revision-Date: 2014-10-19 20:02+0200\n" "Last-Translator: josep constanti \n" "Language-Team: Catalan " "\n" @@ -3268,7 +3268,7 @@ msgstr "Favorites" #: libraries/SavedSearches.class.php:246 msgid "Please provide a name for this bookmarked search." -msgstr "" +msgstr "Proporcioneu un nom per aquesta cerca preferida." #: libraries/SavedSearches.class.php:261 #| msgid "Missing phpMyAdmin configuration storage tables" @@ -3282,11 +3282,11 @@ msgstr "Ja existeix una entrada amb aquest nom." #: libraries/SavedSearches.class.php:347 msgid "Missing information to delete the search." -msgstr "" +msgstr "Manca informació per esborrar la cerca." #: libraries/SavedSearches.class.php:375 msgid "Missing information to load the search." -msgstr "" +msgstr "Manca informació per carregar la cerca." #: libraries/SavedSearches.class.php:394 #| msgid "Error while moving uploaded file." @@ -3511,7 +3511,7 @@ msgstr "Cerca de zoom" #: libraries/TableSearch.class.php:217 libraries/TableSearch.class.php:1224 msgid "Find and Replace" -msgstr "" +msgstr "Troba i substitueix" #: libraries/TableSearch.class.php:240 libraries/insert_edit.lib.php:1399 msgid "Edit/Insert" @@ -3583,7 +3583,7 @@ msgstr "Reemplaça NULL amb:" #: libraries/TableSearch.class.php:1412 msgid "Find and replace - preview" -msgstr "" +msgstr "Troba i substitueix - vista prèvia" #: libraries/TableSearch.class.php:1416 msgid "Count" @@ -4303,15 +4303,15 @@ msgstr "Tancat" #: libraries/config.values.php:117 msgid "Ask before sending error reports" -msgstr "" +msgstr "Demanar abans d'enviar informes d'error" #: libraries/config.values.php:118 msgid "Always send error reports" -msgstr "" +msgstr "Enviar sempre els informes d'error" #: libraries/config.values.php:119 msgid "Never send error reports" -msgstr "" +msgstr "No enviar mai informes d'error" #: libraries/config.values.php:148 #: libraries/plugins/export/ExportHtmlword.class.php:69 @@ -4456,7 +4456,7 @@ msgstr "Permet als usuaris configurar aquest valor" #: libraries/config/FormDisplay.tpl.php:391 msgid "Apply" -msgstr "" +msgstr "Aplicar" #: libraries/config/FormDisplay.tpl.php:393 libraries/insert_edit.lib.php:1598 #: libraries/schema/User_Schema.class.php:574 prefs_manage.php:335 @@ -5169,10 +5169,9 @@ msgstr "Desactiva les comprovacions de claus externes" #: libraries/config/messages.inc.php:170 #: libraries/plugins/export/ExportSql.class.php:155 -#, fuzzy #| msgid "Exporting rows from \"%s\" table" msgid "Export views as tables" -msgstr "Exportar les files de la taula \"%s\"" +msgstr "Exportar les vistes com taules" #: libraries/config/messages.inc.php:171 libraries/config/messages.inc.php:173 #: libraries/config/messages.inc.php:174 libraries/config/messages.inc.php:175 @@ -5184,10 +5183,9 @@ msgid "Add %s" msgstr "Afegeix %s" #: libraries/config/messages.inc.php:178 -#, fuzzy #| msgid "Use hexadecimal for BLOB" msgid "Use hexadecimal for BINARY & BLOB" -msgstr "Usa hexadecimal per a BLOB" +msgstr "Utilitzeu hexadecimal per a BINARY i BLOB" #: libraries/config/messages.inc.php:180 msgid "Use ignore inserts" @@ -5216,17 +5214,15 @@ msgid "Export time in UTC" msgstr "Exporta l'hora en UTC" #: libraries/config/messages.inc.php:199 -#, fuzzy #| msgid "Force secured connection while using phpMyAdmin" msgid "Force secured connection while using phpMyAdmin." -msgstr "Força la connexió segura al usar phpMyAdmin" +msgstr "Forçar una connexió segura en usar phpMyAdmin." #: libraries/config/messages.inc.php:200 msgid "Force SSL connection" msgstr "Força la connexió SSL" #: libraries/config/messages.inc.php:202 -#, fuzzy #| 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" @@ -5234,19 +5230,18 @@ 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 "" -"Ordre de clasificació per a ítems a la llista desplegable de claus externes; " -"[kbd]content[/kbd] és la dada referenciada, [kbd]id[/kbd] és el valor de la " -"clau" +"Ordre de classificació per a ítems a la llista desplegable de claus externes;" +" [kbd]content[/kbd] és la dada referenciada, [kbd]id[/kbd] és el valor de la " +"clau." #: libraries/config/messages.inc.php:205 msgid "Foreign key dropdown order" msgstr "Ordre de claus externes a la llista desplegable" #: libraries/config/messages.inc.php:207 -#, fuzzy #| msgid "A dropdown will be used if fewer items are present" msgid "A dropdown will be used if fewer items are present." -msgstr "Ús de llista desplegable si hi son menys ítems presents" +msgstr "S'utilitzara una llista desplegable si hi ha menys ítems." #: libraries/config/messages.inc.php:208 msgid "Foreign key limit" @@ -5257,18 +5252,16 @@ msgid "Browse mode" msgstr "Mode de navegació" #: libraries/config/messages.inc.php:210 -#, fuzzy #| msgid "Customize browse mode" msgid "Customize browse mode." -msgstr "Configura el mode de navegació" +msgstr "Configura el mode de navegació." #: libraries/config/messages.inc.php:212 libraries/config/messages.inc.php:214 #: libraries/config/messages.inc.php:232 libraries/config/messages.inc.php:243 #: libraries/config/messages.inc.php:245 libraries/config/messages.inc.php:291 -#, fuzzy #| msgid "Customize default options" msgid "Customize default options." -msgstr "Configura les opcions predeterminades" +msgstr "Configura les opcions predeterminades." #: libraries/config/messages.inc.php:213 libraries/config/setup.forms.php:245 #: libraries/config/setup.forms.php:322 @@ -5282,30 +5275,27 @@ msgid "Developer" msgstr "Desenvolupador" #: libraries/config/messages.inc.php:216 -#, fuzzy #| msgid "Settings for phpMyAdmin developers" msgid "Settings for phpMyAdmin developers." -msgstr "Opcions per desenvolupadors de phpMyAdmin" +msgstr "Opcions per desenvolupadors de phpMyAdmin." #: libraries/config/messages.inc.php:217 msgid "Edit mode" msgstr "Mode d'edició" #: libraries/config/messages.inc.php:218 -#, fuzzy #| msgid "Customize edit mode" msgid "Customize edit mode." -msgstr "Configura el mode d'edició" +msgstr "Configura el mode d'edició." #: libraries/config/messages.inc.php:220 msgid "Export defaults" msgstr "Predeterminats d'exportació" #: libraries/config/messages.inc.php:221 -#, fuzzy #| msgid "Customize default export options" msgid "Customize default export options." -msgstr "Configura les opcions predeterminades d'exportació" +msgstr "Configura les opcions predeterminades d'exportació." #: libraries/config/messages.inc.php:222 libraries/config/messages.inc.php:283 #: setup/frames/menu.inc.php:22 @@ -5317,31 +5307,29 @@ msgid "General" msgstr "General" #: libraries/config/messages.inc.php:224 -#, fuzzy #| msgid "Set some commonly used options" msgid "Set some commonly used options." -msgstr "Estableix algunes de les opcions més utilitzades" +msgstr "Estableix algunes de les opcions més utilitzades." #: libraries/config/messages.inc.php:226 msgid "Import defaults" msgstr "Predeterminats d'importació" #: libraries/config/messages.inc.php:227 -#, fuzzy #| msgid "Customize default common import options" msgid "Customize default common import options." -msgstr "Configura les opcions predeterminades d'importació" +msgstr "Configura les opcions predeterminades habituals d'importació." #: libraries/config/messages.inc.php:228 msgid "Import / export" msgstr "Importar / exportar" #: libraries/config/messages.inc.php:230 -#, fuzzy #| msgid "Set import and export directories and compression options" msgid "Set import and export directories and compression options." msgstr "" -"Configura els directoris d'importació i exportació i les opcions d'empaquetat" +"Configura els directoris d'importació i exportació i les opcions " +"d'empaquetat." #: libraries/config/messages.inc.php:231 msgid "LaTeX" From a00cc2b106177127973bd856d6901886d8c57641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 21 Oct 2014 09:26:08 +0200 Subject: [PATCH 16/20] Translated using Weblate (Czech) Currently translated at 93.7% (2787 of 2973 strings) [CI skip] --- po/cs.po | 122 +++++++++++++++++++++---------------------------------- 1 file changed, 47 insertions(+), 75 deletions(-) diff --git a/po/cs.po b/po/cs.po index 9edb90411f..64a5a68611 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-10-16 12:25-0400\n" -"PO-Revision-Date: 2014-07-15 10:52+0200\n" +"PO-Revision-Date: 2014-10-21 09:26+0200\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Czech \n" +"Language-Team: Czech " +"\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 1.10-dev\n" +"X-Generator: Weblate 2.0-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -256,15 +256,14 @@ msgid "Database %1$s has been copied to %2$s." msgstr "Databáze %1$s byla zkopírována do %2$s." #: db_operations.php:263 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage has been deactivated. To find out " #| "why click %shere%s." msgid "" "The phpMyAdmin configuration storage has been deactivated. %sFind out why%s." msgstr "" -"Některé z rozšířených funkcí phpMyAdmina nelze používat. %sZde%s zjistíte " -"proč." +"Některé z rozšířených funkcí phpMyAdmina nelze používat. %sZjistěte proč%s." #: db_printview.php:48 db_tracking.php:83 db_tracking.php:207 #: libraries/Menu.class.php:246 libraries/config/messages.inc.php:756 @@ -598,20 +597,18 @@ msgstr "" "Z funkcí zvolte „GeomFromText“ a vložte níže uvedený text jako hodnotu." #: import.php:54 -#, fuzzy #| msgid "Success!" msgid "Succeeded" -msgstr "Úspěch!" +msgstr "Úspěch" #: import.php:58 js/messages.php:437 msgid "Failed" -msgstr "" +msgstr "Chyba" #: import.php:62 -#, fuzzy #| msgid "complete inserts" msgid "Incomplete params" -msgstr "úplné inserty" +msgstr "Chybí parametry" #: import.php:166 #, php-format @@ -891,7 +888,7 @@ msgstr "" "lidmi přistupujícími k vašemu nastavení." #: index.php:520 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage is not completely configured, some " #| "extended features have been deactivated. To find out why click %shere%s." @@ -900,7 +897,7 @@ msgid "" "extended features have been deactivated. %sFind out why%s. " msgstr "" "Úložiště nastavení phpMyAdmina není plně dostupné, některé z rozšířených " -"funkcí phpMyAdmina nelze používat. %sZde%s zjistíte proč." +"funkcí phpMyAdmina nelze používat. %sZjistěte proč%s. " #: index.php:526 msgid "" @@ -960,10 +957,9 @@ msgid "Dropping Primary Key/Index" msgstr "Odstraňuji (primární) klíč" #: js/messages.php:43 -#, fuzzy #| msgid "Is a foreign key." msgid "Dropping Foreign key." -msgstr "Jedná se o cizí klíč." +msgstr "Odstraňuji cizí klíč." #: js/messages.php:44 msgid "This operation could take a long time. Proceed anyway?" @@ -1313,11 +1309,11 @@ msgstr "Přerušit monitor" #: js/messages.php:149 libraries/server_status_processes.lib.php:37 msgid "Start auto refresh" -msgstr "" +msgstr "Zapnout automatické obnovování" #: js/messages.php:150 msgid "Stop auto refresh" -msgstr "" +msgstr "Vypnout automatické obnovování" #: js/messages.php:152 msgid "general_log and slow_query_log are enabled." @@ -1855,16 +1851,14 @@ msgid "Add primary key" msgstr "Přidat primární klíč" #: js/messages.php:314 -#, fuzzy #| msgid "A primary key has been added on %s." msgid "Primary key added." -msgstr "Na poli %s byl vytvořen primární klíč." +msgstr "Byl přidán primární klíč." #: js/messages.php:315 libraries/normalization.lib.php:172 -#, fuzzy #| msgid "Taking you to %s." msgid "Taking you to next step…" -msgstr "Přesměrovávám na %s." +msgstr "Přesměrovávám na další krok…" #: js/messages.php:316 #, php-format @@ -1874,10 +1868,9 @@ msgstr "" #: js/messages.php:317 libraries/normalization.lib.php:420 #: libraries/normalization.lib.php:467 libraries/normalization.lib.php:550 #: libraries/normalization.lib.php:610 -#, fuzzy #| msgid "End of line" msgid "End of step" -msgstr "Konec řádku" +msgstr "Konec kroku" #: js/messages.php:318 msgid "Second step of normalization (2NF)" @@ -1924,7 +1917,7 @@ msgstr "" #: js/messages.php:328 msgid "Step" -msgstr "" +msgstr "Krok" #: js/messages.php:329 #, fuzzy @@ -2140,10 +2133,9 @@ msgid "Delete page" msgstr "Odstranit stránku" #: js/messages.php:407 libraries/db_designer.lib.php:382 -#, fuzzy #| msgid "Unit" msgid "Untitled" -msgstr "Jednotka" +msgstr "Beze jména" #: js/messages.php:408 #, fuzzy @@ -2152,10 +2144,9 @@ msgid "Please select a page to continue" msgstr "Zvolte stránku, kterou si přejete změnit" #: js/messages.php:409 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid page name" -msgstr "Prosím zadejte platné číslo!" +msgstr "Prosím zadejte platný název stránky" #: js/messages.php:410 msgid "Do you want to save the changes to the current page?" @@ -2163,7 +2154,7 @@ msgstr "" #: js/messages.php:411 msgid "Successfully deleted the page" -msgstr "" +msgstr "Stránka byla odstraněna" #: js/messages.php:412 #, fuzzy @@ -2245,26 +2236,23 @@ msgstr "" "Prosím zadejte platný šestnáctkový řetězec. Můžete použít znaky 0-9, A-F." #: js/messages.php:435 -#, fuzzy #| msgid "Cancel" msgid "cancel" -msgstr "Zrušit" +msgstr "zrušit" #: js/messages.php:436 libraries/server_status.lib.php:261 msgid "Aborted" msgstr "Přerušené" #: js/messages.php:438 -#, fuzzy #| msgid "Success!" msgid "Success" -msgstr "Úspěch!" +msgstr "Úspěch" #: js/messages.php:439 -#, fuzzy #| msgid "Import defaults" msgid "Import status" -msgstr "Výchozí nastavení importu" +msgstr "Stav importu" #: js/messages.php:440 libraries/navigation/Navigation.class.php:102 #, fuzzy @@ -2782,10 +2770,9 @@ msgid "Expand" msgstr "" #: libraries/Console.class.php:95 libraries/Console.class.php:174 -#, fuzzy #| msgid "subquery" msgid "Requery" -msgstr "poddotaz" +msgstr "Znovu" #: libraries/Console.class.php:97 libraries/DbSearch.class.php:363 #: libraries/DisplayResults.class.php:3506 @@ -2799,17 +2786,17 @@ msgid "Delete" msgstr "Odstranit" #: libraries/Console.class.php:106 -#, fuzzy, php-format +#, php-format #| msgid "New bookmark" msgid "Total %d bookmark" msgid_plural "Total %d bookmarks" -msgstr[0] "Nová záložka" -msgstr[1] "Nová záložka" -msgstr[2] "Nová záložka" +msgstr[0] "Celkem %d záložka" +msgstr[1] "Celkem %d záložky" +msgstr[2] "Celkem %d záložek" #: libraries/Console.class.php:114 msgid "private" -msgstr "" +msgstr "soukromé" #: libraries/Console.class.php:118 libraries/bookmark.lib.php:87 msgid "shared" @@ -2823,16 +2810,14 @@ msgid "%1$s, %2$s and %3$s bookmarks included" msgstr "Položka byla smazána z oblíbených." #: libraries/Console.class.php:128 -#, fuzzy #| msgid "New bookmark" msgid "No bookmarks" -msgstr "Nová záložka" +msgstr "Žádné záložky" #: libraries/Console.class.php:176 -#, fuzzy #| msgid "Explain SQL" msgid "Explain" -msgstr "Vysvětlit SQL" +msgstr "Vysvětlit" #: libraries/Console.class.php:177 libraries/Util.class.php:1287 #: libraries/sql.lib.php:485 @@ -2840,20 +2825,18 @@ msgid "Profiling" msgstr "Profilování" #: libraries/Console.class.php:178 -#, fuzzy #| msgid "Bookmarks" msgid "Bookmark" -msgstr "Záložky" +msgstr "Záložka" #: libraries/Console.class.php:179 msgid "Query failed" msgstr "Dotaz selhal" #: libraries/Console.class.php:181 -#, fuzzy #| msgid "Query execution time" msgid "Queried time" -msgstr "Doba běhu dotazu" +msgstr "Doba běhu" #: libraries/Console.class.php:187 msgid "SQL Query Console" @@ -2921,32 +2904,28 @@ msgid "Refresh" msgstr "Obnovit" #: libraries/Console.class.php:257 -#, fuzzy #| msgid "And" msgid "Add" -msgstr "a" +msgstr "Přidat" #: libraries/Console.class.php:266 -#, fuzzy #| msgid "New bookmark" msgid "Add bookmark" -msgstr "Nová záložka" +msgstr "Přidat záložku" #: libraries/Console.class.php:270 -#, fuzzy #| msgid "Label:" msgid "Label" -msgstr "Název:" +msgstr "Název" #: libraries/Console.class.php:272 msgid "Target database" msgstr "Cílová databáze" #: libraries/Console.class.php:275 -#, fuzzy #| msgid "Create bookmark" msgid "Share this bookmark" -msgstr "Uložit vyhledávání" +msgstr "Sdílet záložku" #: libraries/Console.class.php:291 #, fuzzy @@ -4704,14 +4683,13 @@ msgid "Could not remove columns!" msgstr "Nepodařilo se uložit oblíbenou tabulku!" #: libraries/central_columns.lib.php:509 -#, fuzzy #| msgid "EPS" msgid "YES" -msgstr "EPS" +msgstr "ANO" #: libraries/central_columns.lib.php:509 msgid "NO" -msgstr "" +msgstr "NE" #: libraries/central_columns.lib.php:629 #: libraries/display_create_table.lib.php:60 @@ -4762,10 +4740,9 @@ msgid "on update CURRENT_TIMESTAMP" msgstr "" #: libraries/central_columns.lib.php:889 -#, fuzzy #| msgid "Add column" msgid "Add new column" -msgstr "Přidat sloupec" +msgstr "Přidat nový sloupec" #: libraries/common.inc.php:586 msgid "Failed to read configuration file!" @@ -7899,10 +7876,9 @@ msgid "Skip tables larger than" msgstr "Přeskočit tabulky větší než" #: libraries/display_export.lib.php:783 -#, fuzzy #| msgid "Select a table" msgid "Select database" -msgstr "Zvolte tabulku" +msgstr "Zvolte databázi" #: libraries/display_export.lib.php:785 #, fuzzy @@ -7911,16 +7887,14 @@ msgid "Select table" msgstr "Zvolte tabulku" #: libraries/display_export.lib.php:801 -#, fuzzy #| msgid "database name" msgid "New database name" -msgstr "jméno databáze" +msgstr "Nové jméno databáze" #: libraries/display_export.lib.php:825 -#, fuzzy #| msgid "New table" msgid "New table name" -msgstr "Nová tabulka" +msgstr "Nové jméno tabulky" #: libraries/display_export.lib.php:834 #, fuzzy @@ -14335,16 +14309,14 @@ msgid "Available MIME types" msgstr "Dostupné MIME typy" #: transformation_overview.php:37 -#, fuzzy #| msgid "Available transformations" msgid "Available browser display transformations" -msgstr "Dostupné transformace" +msgstr "Dostupné transformace pro zobrazení" #: transformation_overview.php:38 -#, fuzzy #| msgid "Available transformations" msgid "Available input transformations" -msgstr "Dostupné transformace" +msgstr "Dostupné vstupní transformace" #: transformation_overview.php:53 msgctxt "for MIME transformation" From ef33a839fb8536ecbfc19be243e5b3e20bd0c5eb Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 21 Oct 2014 21:05:06 +0530 Subject: [PATCH 17/20] Avoid accessing undefined indexes Signed-off-by: Madhura Jayaratne --- libraries/relation.lib.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index cf79f12c33..7e9256ac85 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -675,9 +675,10 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') $show_create_table = $GLOBALS['dbi']->fetchValue( $showCreateTableQuery, 0, 1 ); - $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); - - $foreign['foreign_keys_data'] = $analyzed_sql[0]['foreign_keys']; + if ($show_create_table) { + $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); + $foreign['foreign_keys_data'] = $analyzed_sql[0]['foreign_keys']; + } } /** @@ -1889,9 +1890,9 @@ function PMA_getHtmlFixPMATables() } /** - * Gets the relations info and status, depending on the condition + * Gets the relations info and status, depending on the condition * - * @param boolean $condition whether to look for foreigners or not + * @param boolean $condition whether to look for foreigners or not * @param string $db database name * @param string $table table name * From 3334ca3ce6e7542ed5ac26e27a86a3d2b3d5d41b Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 21 Oct 2014 21:20:24 +0530 Subject: [PATCH 18/20] bug #4564 Designer: spaces in table name with edit table link generates bad links Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/db_designer.lib.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2490de0e7e..3d88127c71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ phpMyAdmin - ChangeLog - bug #4558 Unable to Add Rows while Creating Table + rfe #1547 Wrap No Tables Found message with message box - bug #4559 Logging in causes 100% CPU usage +- bug #4564 Designer: spaces in table name with edit table link generates bad links 4.2.11.0 (not yet released) - bug ReferenceError: Table_onover is not defined diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index c07513ec80..e069000a77 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -482,7 +482,7 @@ function PMA_getHTMLTableList($tab_pos, $display_page) $html .= 'onmouseover="this.className=\'L_butt2_2\'" '; $html .= 'onmouseout="this.className=\'L_butt2_1\'" class="L_butt2_1">'; $html .= 'getImgPath('pmd/exec.png') . '"/>'; $html .= ''; @@ -600,7 +600,7 @@ function PMA_getDatabaseTables( $html .= 'onmouseover="this.className=\'small_tab_pref2\';" '; $html .= 'onmouseout="this.className=\'small_tab_pref\';" '; $html .= 'onclick="Start_tab_upd(\'' - . $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i] . '\');">'; + . $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i] . '\');">'; $html .= 'getImgPath('pmd/exec_small.png') . '" />'; From e28912d49e50071cba9632047ed3704f57d4c652 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 21 Oct 2014 21:59:46 +0530 Subject: [PATCH 19/20] bug #4557 PHP fatal error, undefined function __() Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/core.lib.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 04fcb15d2d..0a24092cd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug ReferenceError: Table_onover is not defined - bug #4552 Incorrect routines display for database due to case insensitive checks - bug #4259 reCaptcha sound session expired problem +- bug #4557 PHP fatal error, undefined function __() 4.2.10.1 (2014-10-21) - bug #4562 [security] XSS in debug SQL output diff --git a/libraries/core.lib.php b/libraries/core.lib.php index fa6a0157a5..55f6169815 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -222,7 +222,13 @@ function PMA_fatalError( /* Load gettext for fatal errors */ if (!function_exists('__')) { - include_once GETTEXT_INC; + // It is possible that PMA_fatalError() is called before including vendor_config.php + // which defines GETTEXT_INC. See bug #4557 + if (defined(GETTEXT_INC)) { + include_once GETTEXT_INC; + } else { + include_once './libraries/php-gettext/gettext.inc'; + } } // these variables are used in the included file libraries/error.inc.php From 1e21d7b0dad85dac0e1ca8c6852510e2d178e2dc Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 21 Oct 2014 22:24:44 +0530 Subject: [PATCH 20/20] bug #4568 Date displayed incorrectly when charting a timeline Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/tbl_chart.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a24092cd0..2763231768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #4552 Incorrect routines display for database due to case insensitive checks - bug #4259 reCaptcha sound session expired problem - bug #4557 PHP fatal error, undefined function __() +- bug #4568 Date displayed incorrectly when charting a timeline 4.2.10.1 (2014-10-21) - bug #4562 [security] XSS in debug SQL output diff --git a/js/tbl_chart.js b/js/tbl_chart.js index d945df6f39..95bdc768a0 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -17,12 +17,12 @@ function extractDate(dateString) { matches = dateTimeRegExp.exec(dateString); if (matches !== null && matches.length > 0) { match = matches[0]; - return new Date(match.substr(0, 4), match.substr(5, 2), match.substr(8, 2), match.substr(11, 2), match.substr(14, 2), match.substr(17, 2)); + return new Date(match.substr(0, 4), parseInt(match.substr(5, 2), 10) - 1, match.substr(8, 2), match.substr(11, 2), match.substr(14, 2), match.substr(17, 2)); } else { matches = dateRegExp.exec(dateString); if (matches !== null && matches.length > 0) { match = matches[0]; - return new Date(match.substr(0, 4), match.substr(5, 2), match.substr(8, 2)); + return new Date(match.substr(0, 4), parseInt(match.substr(5, 2), 10) - 1, match.substr(8, 2)); } } return null;