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_trashbin | |
| 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_trashbin')
| -rw-r--r-- | apps/files_trashbin/l10n/nb_NO.php | 3 | ||||
| -rw-r--r-- | apps/files_trashbin/l10n/nn_NO.php | 15 |
2 files changed, 16 insertions, 2 deletions
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php index e1dce4b3995..43ad0180494 100644 --- a/apps/files_trashbin/l10n/nb_NO.php +++ b/apps/files_trashbin/l10n/nb_NO.php @@ -13,5 +13,6 @@ "{count} files" => "{count} filer", "Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!", "Restore" => "Gjenopprett", -"Delete" => "Slett" +"Delete" => "Slett", +"Deleted Files" => "Slettet filer" ); diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php index 14345ddcc4d..454ea2b0575 100644 --- a/apps/files_trashbin/l10n/nn_NO.php +++ b/apps/files_trashbin/l10n/nn_NO.php @@ -1,5 +1,18 @@ <?php $TRANSLATIONS = array( +"Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt", +"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s", +"perform restore operation" => "utfør gjenoppretting", "Error" => "Feil", +"delete file permanently" => "slett fila for godt", +"Delete permanently" => "Slett for godt", "Name" => "Namn", -"Delete" => "Slett" +"Deleted" => "Sletta", +"1 folder" => "1 mappe", +"{count} folders" => "{count} mapper", +"1 file" => "1 fil", +"{count} files" => "{count} filer", +"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!", +"Restore" => "Gjenopprett", +"Delete" => "Slett", +"Deleted Files" => "Sletta filer" ); |