summaryrefslogtreecommitdiffstats
path: root/settings/l10n/nb_NO.json
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-07-01 11:36:35 +0200
committerLukas Reschke <lukas@owncloud.com>2016-07-01 11:36:35 +0200
commit179a355b2cd3dc489a54cc27fd717f67373d0b1e (patch)
treef87a5586086635d4cbd18771b442ee771f79e441 /settings/l10n/nb_NO.json
parent8e002b61554308cb4d50570f715303a82136f0fa (diff)
parent2d2d2267f7f38ca29e7b87f40fae62261614b0d1 (diff)
downloadnextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.tar.gz
nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.zip
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
Diffstat (limited to 'settings/l10n/nb_NO.json')
-rw-r--r--settings/l10n/nb_NO.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index f5897d902e4..95f62d13822 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -260,6 +260,7 @@
"Language" : "Språk",
"Help translate" : "Bidra til oversettelsen",
"Name" : "Navn",
+ "Username" : "Brukernavn",
"Done" : "Ferdig",
"Get the apps to sync your files" : "Hent apper som synkroniserer filene dine",
"Desktop client" : "Skrivebordsklient",
@@ -273,7 +274,6 @@
"Show user backend" : "Vis bruker-server",
"Send email to new user" : "Send e-post til ny bruker",
"Show email address" : "Vis e-postadresse",
- "Username" : "Brukernavn",
"E-Mail" : "E-post",
"Create" : "Opprett",
"Admin Recovery Password" : "Administrativt gjenopprettingspassord",