diff options
author | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:42:37 +0200 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:51:44 +0200 |
commit | 5eba5798274823fe3147a8d671ca5e15b3eb7843 (patch) | |
tree | eb9cfb3fc687b8be26dde07a08fd23ca3455991f /l10n/nn_NO/core.po | |
parent | b483f2aab856e3324026588a9702043072fd7ad2 (diff) | |
parent | 3829460ab8cbb6de65c53583a20fd04cbe7927dd (diff) | |
download | nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.tar.gz nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.zip |
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
Diffstat (limited to 'l10n/nn_NO/core.po')
-rw-r--r-- | l10n/nn_NO/core.po | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po index ea511e82074..ea34767b84e 100644 --- a/l10n/nn_NO/core.po +++ b/l10n/nn_NO/core.po @@ -9,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:02+0000\n" +"POT-Creation-Date: 2012-09-06 02:02+0200\n" +"PO-Revision-Date: 2012-09-06 00:03+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nn_NO\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23 msgid "Application name not provided." @@ -31,59 +31,55 @@ msgstr "" msgid "This category already exists: " msgstr "" -#: js/jquery-ui-1.8.16.custom.min.js:511 -msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" -msgstr "" - -#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65 +#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" msgstr "Innstillingar" -#: js/js.js:586 +#: js/js.js:593 msgid "January" msgstr "" -#: js/js.js:586 +#: js/js.js:593 msgid "February" msgstr "" -#: js/js.js:586 +#: js/js.js:593 msgid "March" msgstr "" -#: js/js.js:586 +#: js/js.js:593 msgid "April" msgstr "" -#: js/js.js:586 +#: js/js.js:593 msgid "May" msgstr "" -#: js/js.js:586 +#: js/js.js:593 msgid "June" msgstr "" -#: js/js.js:587 +#: js/js.js:594 msgid "July" msgstr "" -#: js/js.js:587 +#: js/js.js:594 msgid "August" msgstr "" -#: js/js.js:587 +#: js/js.js:594 msgid "September" msgstr "" -#: js/js.js:587 +#: js/js.js:594 msgid "October" msgstr "" -#: js/js.js:587 +#: js/js.js:594 msgid "November" msgstr "" -#: js/js.js:587 +#: js/js.js:594 msgid "December" msgstr "" @@ -115,7 +111,7 @@ msgstr "" msgid "ownCloud password reset" msgstr "" -#: lostpassword/templates/email.php:1 +#: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" msgstr "Bruk føljane link til å tilbakestille passordet ditt: {link}" @@ -245,7 +241,7 @@ msgstr "Fullfør oppsettet" msgid "web services under your control" msgstr "Vev tjenester under din kontroll" -#: templates/layout.user.php:49 +#: templates/layout.user.php:45 msgid "Log out" msgstr "Logg ut" |