From 5aa5d463cdfec889cb19318761822049d069d917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Wed, 1 May 2019 17:49:18 +0000 Subject: [PATCH 1/2] =?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 60.5% (1997 of 3300 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/nb_NO/ Signed-off-by: Allan Nordhøy --- po/nb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/nb.po b/po/nb.po index 5c8319653f..f0dae2f365 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-04-27 18:51+0200\n" -"PO-Revision-Date: 2019-04-30 22:58+0000\n" +"PO-Revision-Date: 2019-05-02 18:49+0000\n" "Last-Translator: Allan Nordhøy \n" "Language-Team: Norwegian Bokmål \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.6.1\n" +"X-Generator: Weblate 3.7-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -3620,11 +3620,12 @@ msgstr "" #: libraries/classes/Config/Descriptions.php:80 msgid "Allow third party framing" -msgstr "Tillat tredjeparts innramming" +msgstr "Tillat tredjepartsinnramming" #: libraries/classes/Config/Descriptions.php:82 +#, fuzzy msgid "Show \"Drop database\" link to normal users" -msgstr "Vis \"Drop database\" link for normale brukere" +msgstr "Vis \"Fjern database\"-lenke til normale brukere" #: libraries/classes/Config/Descriptions.php:85 msgid "" @@ -3632,7 +3633,7 @@ msgid "" "authentication." msgstr "" "Hemmelig passordfrase brukt for kryptering av informasjonskapsler i " -"[kbd]cookie[/kbd] autentisering." +"[kbd]kake[/kbd]-identitetsbekreftelse." #: libraries/classes/Config/Descriptions.php:89 msgid "Blowfish secret" From 8f7a917f118b4ffeb42ac17c1415f8173b2a3416 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 2 May 2019 20:47:39 +0200 Subject: [PATCH 2/2] Fix #15237 - [UI] Alignment on login form since merge or #15178 Fixes: #15237 Introduced-by-pull-request: #15178 [ci skip] Signed-off-by: William Desportes --- themes/pmahomme/css/common.css.php | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 8a11df13c5..af6a255837 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -904,6 +904,7 @@ body#loginform div.container { form.login label { width: 10em; font-weight: bolder; + display: inline-block; margin-: 2em; }