Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
This commit is contained in:
Madhura Jayaratne
commit
9baeeec061
@ -53,7 +53,9 @@ phpMyAdmin - ChangeLog
|
||||
+ rfe Remove support for Shift + Click on function name to apply to all rows in insert/edit page
|
||||
+ rfe #1634 Don't group tables in tree if the result has only one group
|
||||
|
||||
4.4.9.0 (not yet released)
|
||||
4.4.10.0 (not yet released)
|
||||
|
||||
4.4.9.0 (2015-06-04)
|
||||
- bug #4920 relation view doesn't list fields of table in other database
|
||||
- bug #4905 Sorting by an alias
|
||||
- bug #4931 False error before entering reCAPTCHA
|
||||
|
||||
81
po/nb.po
81
po/nb.po
@ -4,16 +4,16 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2015-05-31 07:27-0400\n"
|
||||
"PO-Revision-Date: 2015-05-28 11:01+0200\n"
|
||||
"PO-Revision-Date: 2015-06-04 19:48+0200\n"
|
||||
"Last-Translator: Kurt Eilertsen <kurt@kheds.com>\n"
|
||||
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
|
||||
"phpmyadmin/master/nb/>\n"
|
||||
"Language-Team: Norwegian Bokmål "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/nb/>\n"
|
||||
"Language: nb\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 2.3-dev\n"
|
||||
"X-Generator: Weblate 2.4-dev\n"
|
||||
|
||||
#: changelog.php:37 license.php:28
|
||||
#, php-format
|
||||
@ -1939,6 +1939,8 @@ msgid ""
|
||||
"No columns in the central list. Make sure the Central columns list for "
|
||||
"database %s has columns that are not present in the current table."
|
||||
msgstr ""
|
||||
"Ingen kolonner i sentral listen. Sørg for at sentral kolonne liste for "
|
||||
"databasen %s ikke har kolonner som er til stede i den aktuelle tabellen."
|
||||
|
||||
#: js/messages.php:344
|
||||
msgid "See more"
|
||||
@ -2198,6 +2200,8 @@ msgid ""
|
||||
"Indicates that you have made changes to this page; you will be prompted for "
|
||||
"confirmation before abandoning changes"
|
||||
msgstr ""
|
||||
"Indikerer at du har gjort endringer til denne siden; du vil bli bedt om "
|
||||
"bekreftelse før du forlater endringer"
|
||||
|
||||
#: js/messages.php:438
|
||||
msgid "Select referenced key"
|
||||
@ -2261,11 +2265,11 @@ msgstr "Vennligst tast inn et gyldig side navn"
|
||||
|
||||
#: js/messages.php:454
|
||||
msgid "Do you want to save the changes to the current page?"
|
||||
msgstr ""
|
||||
msgstr "Ønsker du å lagre endringene i den gjeldende siden?"
|
||||
|
||||
#: js/messages.php:455
|
||||
msgid "Successfully deleted the page"
|
||||
msgstr ""
|
||||
msgstr "Slettet side"
|
||||
|
||||
#: js/messages.php:456
|
||||
msgid "Export relational schema"
|
||||
@ -2306,7 +2310,6 @@ msgid "Click to sort results by this column."
|
||||
msgstr "Klikk for å sortere resultatene etter denne kolonnen."
|
||||
|
||||
#: js/messages.php:468
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC."
|
||||
#| "<br />- Control+Click to remove column from ORDER BY clause"
|
||||
@ -2315,9 +2318,9 @@ msgid ""
|
||||
">- Ctrl+Click or Alt+Click (Mac: Shift+Option+Click) to remove column from "
|
||||
"ORDER BY clause"
|
||||
msgstr ""
|
||||
"Shift + Klikk for å legge denne kolonnen til sorteringsrekkefølgen eller "
|
||||
"veksle mellom stigende/synkende <br /> - Ctrl + Klikk for å fjerne kolonnen "
|
||||
"fra sorteringsrekkefølgen"
|
||||
"Shift + Klikk for å legge denne kolonnen til BESTILLT AV-ledd eller veksle "
|
||||
"mellom STIGENDE/ SYNKENDE<br /> - Ctrl + klikk eller Alt + klikk (Mac: Shift "
|
||||
"+ Option + Klikk). For å fjerne kolonnen fra BESTILLT AV-leddet"
|
||||
|
||||
#: js/messages.php:469
|
||||
msgid "Click to mark/unmark."
|
||||
@ -2349,13 +2352,15 @@ msgstr ""
|
||||
|
||||
#: js/messages.php:476
|
||||
msgid "Please enter a valid hexadecimal string. Valid characters are 0-9, A-F."
|
||||
msgstr ""
|
||||
msgstr "Skriv inn en gyldig heksadesimal streng. Gyldige tegn er 0-9, A-F."
|
||||
|
||||
#: js/messages.php:477
|
||||
msgid ""
|
||||
"Do you really want to see all of the rows? For a big table this could crash "
|
||||
"the browser."
|
||||
msgstr ""
|
||||
"Ønsker du virkelig å se alle radene? For et stort bord kan dette krasje "
|
||||
"nettleseren."
|
||||
|
||||
#: js/messages.php:478
|
||||
#, fuzzy
|
||||
@ -2364,10 +2369,9 @@ msgid "Original length"
|
||||
msgstr "Opprinnelig"
|
||||
|
||||
#: js/messages.php:481
|
||||
#, fuzzy
|
||||
#| msgid "Cancel"
|
||||
msgid "cancel"
|
||||
msgstr "Avbryt"
|
||||
msgstr "avbryt"
|
||||
|
||||
#: js/messages.php:482 libraries/server_status.lib.php:269
|
||||
msgid "Aborted"
|
||||
@ -2375,25 +2379,22 @@ msgstr "Avbrutt"
|
||||
|
||||
#: js/messages.php:484
|
||||
msgid "Success"
|
||||
msgstr ""
|
||||
msgstr "Vellykket"
|
||||
|
||||
#: js/messages.php:485
|
||||
#, fuzzy
|
||||
#| msgid "Import defaults"
|
||||
msgid "Import status"
|
||||
msgstr "Importinnstillinger"
|
||||
msgstr "Import status"
|
||||
|
||||
#: js/messages.php:486 libraries/navigation/Navigation.class.php:112
|
||||
#, fuzzy
|
||||
#| msgid "Log file threshold"
|
||||
msgid "Drop files here"
|
||||
msgstr "Loggfilterskel"
|
||||
msgstr "Legg filene her"
|
||||
|
||||
#: js/messages.php:487
|
||||
#, fuzzy
|
||||
#| msgid "Select Tables"
|
||||
msgid "Select database first"
|
||||
msgstr "Velg tabeller"
|
||||
msgstr "Velg database først"
|
||||
|
||||
#: js/messages.php:492
|
||||
msgid "You can also edit most values<br />by double-clicking directly on them."
|
||||
@ -2445,55 +2446,48 @@ msgstr "Vis skjulte elementer i navigasjonstreet."
|
||||
|
||||
#: js/messages.php:516 libraries/config/messages.inc.php:440
|
||||
#: libraries/navigation/NavigationTree.class.php:1348
|
||||
#, fuzzy
|
||||
#| msgid "Customize main panel"
|
||||
msgid "Link with main panel"
|
||||
msgstr "Tilpasse hovedpanelet"
|
||||
msgstr "Lenke med hovedpanelet"
|
||||
|
||||
#: js/messages.php:517 libraries/navigation/NavigationTree.class.php:1351
|
||||
#, fuzzy
|
||||
#| msgid "Customize main panel"
|
||||
msgid "Unlink from main panel"
|
||||
msgstr "Tilpasse hovedpanelet"
|
||||
msgstr "Fjern lenke fra hovedpanelet"
|
||||
|
||||
#: js/messages.php:518
|
||||
msgid "To filter all databases on server, press Enter after a search term"
|
||||
msgstr ""
|
||||
msgstr "Å filtrere alle databaser på serveren, trykker Enter etter et søkeord"
|
||||
|
||||
#: js/messages.php:519
|
||||
#, php-format
|
||||
msgid "To filter all %s in database, press Enter after a search term"
|
||||
msgstr ""
|
||||
msgstr "Slik filtrerer du alle %s i databasen, trykk Enter etter et søkeord"
|
||||
|
||||
#: js/messages.php:520
|
||||
#, fuzzy
|
||||
#| msgid "Tables"
|
||||
msgid "tables"
|
||||
msgstr "Tabeller"
|
||||
msgstr "tabeller"
|
||||
|
||||
#: js/messages.php:521
|
||||
#, fuzzy
|
||||
#| msgid "Views"
|
||||
msgid "views"
|
||||
msgstr "Visning"
|
||||
msgstr "visning"
|
||||
|
||||
#: js/messages.php:522
|
||||
#, fuzzy
|
||||
#| msgid "Procedures"
|
||||
msgid "procedures"
|
||||
msgstr "Prosedyrer"
|
||||
msgstr "prosedyrer"
|
||||
|
||||
#: js/messages.php:523
|
||||
#, fuzzy
|
||||
#| msgid "Event"
|
||||
msgid "events"
|
||||
msgstr "Hendelse"
|
||||
msgstr "hendelse"
|
||||
|
||||
#: js/messages.php:524
|
||||
#, fuzzy
|
||||
#| msgid "Functions"
|
||||
msgid "functions"
|
||||
msgstr "Funsjoner"
|
||||
msgstr "funksjoner"
|
||||
|
||||
#: js/messages.php:527
|
||||
msgid "The requested page was not found in the history, it may have expired."
|
||||
@ -2563,34 +2557,31 @@ msgstr ""
|
||||
|
||||
#: js/messages.php:557 js/messages.php:569
|
||||
msgid "Some errors have been detected on the server!"
|
||||
msgstr ""
|
||||
msgstr "Noen feil har blitt oppdaget på serveren!"
|
||||
|
||||
#: js/messages.php:559
|
||||
msgid "Please look at the bottom of this window."
|
||||
msgstr ""
|
||||
msgstr "Vennligst se nederst i dette vinduet."
|
||||
|
||||
#: js/messages.php:564 libraries/Error_Handler.class.php:350
|
||||
#, fuzzy
|
||||
#| msgid "Ignore"
|
||||
msgid "Ignore All"
|
||||
msgstr "Ignorer"
|
||||
msgstr "Ignorer alle"
|
||||
|
||||
#: js/messages.php:571
|
||||
msgid ""
|
||||
"As per your settings, they are being submitted currently, please be patient."
|
||||
msgstr ""
|
||||
msgstr "I henhold til dine innstillinger, blir de sendt i dag, vær tålmodig."
|
||||
|
||||
#: js/messages.php:578
|
||||
#, fuzzy
|
||||
#| msgid "Show this query here again"
|
||||
msgid "Execute this query again?"
|
||||
msgstr "Vis denne spørring her igjen"
|
||||
msgstr "Utfør denne spørring igjen?"
|
||||
|
||||
#: js/messages.php:579
|
||||
#, fuzzy
|
||||
#| msgid "Do you really want to delete the search \"%s\"?"
|
||||
msgid "Do you really want to delete this bookmark?"
|
||||
msgstr "Vil du virkelig slette søket \"%s\"?"
|
||||
msgstr "Vil du virkelig slette dette bokmerket?"
|
||||
|
||||
#: js/messages.php:580
|
||||
msgid ""
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
} else echo '[]'; ?>">
|
||||
|
||||
<?php if ($action == 'tbl_create.php'): ?>
|
||||
<div id="table_name_col_no_outer">'
|
||||
<div id="table_name_col_no_outer">
|
||||
<table id="table_name_col_no">
|
||||
<tr class="vmiddle floatleft">
|
||||
<td> <?php echo __('Table name'); ?>:
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
$GLOBALS['pma']->databases, $foreign_db, __('Database')); ?>
|
||||
<?php echo PMA_generateRelationalDropdown('destination_table[' . $myfield_md5 . ']',
|
||||
$tables, $foreign_table, __('Table')); ?>
|
||||
<?php PMA_generateRelationalDropdown('destination_column[' . $myfield_md5 . ']',
|
||||
<?php echo PMA_generateRelationalDropdown('destination_column[' . $myfield_md5 . ']',
|
||||
$columns, $foreign_column, __('Column')); ?>
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
|
||||
@ -261,15 +261,17 @@ class PMA_TblRelationTest extends PHPUnit_Framework_TestCase
|
||||
$html
|
||||
);
|
||||
|
||||
//case 3: PMA_getHtmlForInternalRelationRow
|
||||
$row = PMA_getHtmlForInternalRelationRow(
|
||||
$save_row, 0, true,
|
||||
$existrel, $db
|
||||
);
|
||||
$this->assertContains(
|
||||
$row,
|
||||
$html
|
||||
);
|
||||
/* @todo Find out a better method to test for HTML
|
||||
* //case 3: PMA_getHtmlForInternalRelationRow
|
||||
*$row = PMA_getHtmlForInternalRelationRow(
|
||||
* $save_row, 0, true,
|
||||
* $existrel, $db
|
||||
*);
|
||||
*$this->assertContains(
|
||||
* $row,
|
||||
* $html
|
||||
*);
|
||||
*/
|
||||
|
||||
//case 4: PMA_getHtmlForForeignKeyRow
|
||||
$row = PMA_getHtmlForForeignKeyRow(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
