Merge branch 'origin/master' into Weblate

phpmyadmin · Nov 17, 2018 · 22caf42 · 22caf42
2 parents ceec715 + 332a848
commit 22caf42
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/po/nb.po b/po/nb.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-10-31 22:16-0300\n"
-"PO-Revision-Date: 2018-09-29 01:21+0000\n"
+"PO-Revision-Date: 2018-11-17 15:03+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
-"phpmyadmin/master/nb/>\n"
+"phpmyadmin/master/nb_NO/>\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 3.2-dev\n"
+"X-Generator: Weblate 3.3-dev\n"
 
 #: ajax.php:22 ajax.php:51 export.php:208 libraries/classes/Export.php:1214
 msgid "Bad type!"
@@ -894,7 +894,7 @@ msgstr ""
 
 #: js/messages.php:113
 msgid "Save & close"
-msgstr "Lagre & Lukk"
+msgstr "Lagre og lukk"
 
 #: js/messages.php:114 libraries/classes/InsertEdit.php:1926
 #: prefs_manage.php:361 prefs_manage.php:372