diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-05-21 15:30:19 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-05-21 15:30:19 +0200 |
| commit | 5cd14425f9cc4ff122bd3c324ce9f3be80844e91 (patch) | |
| tree | 60c626e5bcf04af9c50dc7d3e58ab6d3202453cf /apps/files/l10n/nn_NO.php | |
| parent | 9d324db05481620fd9a6883c1315e0b31fc21c45 (diff) | |
| parent | afdad5c74da5c163b01f43046224b376a23f4e60 (diff) | |
| download | nextcloud-server-5cd14425f9cc4ff122bd3c324ce9f3be80844e91.tar.gz nextcloud-server-5cd14425f9cc4ff122bd3c324ce9f3be80844e91.zip | |
Merge branch 'master' into files_encryption
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
Diffstat (limited to 'apps/files/l10n/nn_NO.php')
| -rw-r--r-- | apps/files/l10n/nn_NO.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 2b7c5cf89bd..29593b6f2de 100644 --- a/apps/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php @@ -46,6 +46,7 @@ "{count} folders" => "{count} mapper", "1 file" => "1 fil", "{count} files" => "{count} filer", +"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud", "Unable to rename file" => "Klarte ikkje endra filnamnet", "Upload" => "Last opp", "File handling" => "Filhandtering", |