diff options
| author | Andreas Fischer <bantu@owncloud.com> | 2014-04-15 15:44:44 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@owncloud.com> | 2014-04-15 15:44:44 +0200 |
| commit | bd37010f354b8bfcba578b44558fca2035df1923 (patch) | |
| tree | f7c2177bd9587281b2238868cd056b12db14d367 /apps/user_ldap/l10n/nb_NO.php | |
| parent | 9cc41a24603b250b9c657edfc7007bf10e795899 (diff) | |
| parent | 2eeab60378a3e22e19c4f435aa2bf65cc9da7c2a (diff) | |
| download | nextcloud-server-bd37010f354b8bfcba578b44558fca2035df1923.tar.gz nextcloud-server-bd37010f354b8bfcba578b44558fca2035df1923.zip | |
Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (61 commits)
[tx-robot] updated from transifex
Make email display name change translatable again
Ignore jquery.multiselect.js - it's 3rdparty
javascript code cleanup + fixing syntax errors
Revert "close-button for share_dropdown"
close-button for share_dropdown
[tx-robot] updated from transifex
The latest developer manual link
The latest developer manual link
p() and print_unescaped() also take arrays as parameter
Check whether the user has permissions to add personal storage backends
[tx-robot] updated from transifex
Fix a wrong WebDAV Warning with self-signed-certs
fix translation link
upda mailinglist address
fix contribute link
default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
Correctly process request parameters other than GET or POST, dont use globals in the class but inject it
[tx-robot] updated from transifex
use references for middleware to fix problems on 5.3
...
Diffstat (limited to 'apps/user_ldap/l10n/nb_NO.php')
| -rw-r--r-- | apps/user_ldap/l10n/nb_NO.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php index 0b60752e9d9..dd4af3e759e 100644 --- a/apps/user_ldap/l10n/nb_NO.php +++ b/apps/user_ldap/l10n/nb_NO.php @@ -67,7 +67,6 @@ $TRANSLATIONS = array( "Backup (Replica) Port" => "Reserve (Replika) Port", "Disable Main Server" => "Deaktiver hovedtjeneren", "Only connect to the replica server." => "Koble til bare replika-tjeneren.", -"Case insensitve LDAP server (Windows)" => "Case-insensitiv LDAP tjener (Windows)", "Turn off SSL certificate validation." => "Slå av SSL-sertifikat validering", "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din.", "Cache Time-To-Live" => "Levetid i mellomlager", |