diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-06-14 10:06:13 +0200 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-06-14 10:06:13 +0200 |
| commit | c8564c07955ead3e85daa67e1871a2c41df3a6d5 (patch) | |
| tree | 134c228f43e641d34fbf342df2745ece43580fee /core/l10n/nn_NO.php | |
| parent | 0a29d2029a719d42f347edb95bd6486c2ab842a8 (diff) | |
| parent | 6c534c8165d3c3fba64e3cf5c05993a84733eef7 (diff) | |
| download | nextcloud-server-c8564c07955ead3e85daa67e1871a2c41df3a6d5.tar.gz nextcloud-server-c8564c07955ead3e85daa67e1871a2c41df3a6d5.zip | |
Merge branch 'master' into move-maint-start
Conflicts:
lib/util.php
Diffstat (limited to 'core/l10n/nn_NO.php')
| -rw-r--r-- | core/l10n/nn_NO.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index d11ff92fa88..8850d50040a 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -44,11 +44,11 @@ "months ago" => "månadar sidan", "last year" => "i fjor", "years ago" => "år sidan", -"Ok" => "Greitt", -"Cancel" => "Avbryt", "Choose" => "Vel", +"Cancel" => "Avbryt", "Yes" => "Ja", "No" => "Nei", +"Ok" => "Greitt", "The object type is not specified." => "Objekttypen er ikkje spesifisert.", "Error" => "Feil", "The app name is not specified." => "Programnamnet er ikkje spesifisert.", @@ -124,7 +124,6 @@ "Database tablespace" => "Tabellnamnrom for database", "Database host" => "Databasetenar", "Finish setup" => "Fullfør oppsettet", -"web services under your control" => "Vevtenester under din kontroll", "%s is available. Get more information on how to update." => "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer.", "Log out" => "Logg ut", "Automatic logon rejected!" => "Automatisk innlogging avvist!", |