diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 06:29:18 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 06:29:18 +0300 |
| commit | 3eb0cf055146c0b77b592cf9ef4bf2eb2e2f1ca3 (patch) | |
| tree | 99817781db0a0626fa4d14f96697f6e04e66f983 /plugins/UserCountry/lang/nb.json | |
| parent | 1854f5c456a76af807431d52bcb19ad207ba658e (diff) | |
| parent | 0f38083969261b95a00c59f1f5596d35365506cd (diff) | |
Merge branch 'master' into 3.0-m03
Conflicts:
core/Version.php
core/WidgetsList.php
plugins/CustomDimensions
plugins/Goals/templates/getGoalReportView.twig
plugins/Goals/templates/getOverviewView.twig
tests/UI/expected-ui-screenshots
Diffstat (limited to 'plugins/UserCountry/lang/nb.json')
| -rw-r--r-- | plugins/UserCountry/lang/nb.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/UserCountry/lang/nb.json b/plugins/UserCountry/lang/nb.json index 34b842e32d..155ec58045 100644 --- a/plugins/UserCountry/lang/nb.json +++ b/plugins/UserCountry/lang/nb.json @@ -1,5 +1,6 @@ { "UserCountry": { + "AssumingNonApache": "Kan ikke finne apache_get_modules-funksjonen. Antar at det ikke er en Apache webserver.", "CannotFindGeoIPDatabaseInArchive": "Kan ikke finne filen %1$s i tar-arkivet %2$s!", "CannotListContent": "Kunne ikke vise innhold for %1$s: %2$s", "CannotLocalizeLocalIP": "IP-adressen %s er en lokal adresse og kan ikke lokaliseres.", @@ -24,6 +25,7 @@ "HowToInstallGeoIpPecl": "Hvordan installerer jeg GeoIP PECL-utvidelsen?", "HowToInstallNginxModule": "Hvordan installerer jeg GeoIP-modulen for Nginx?", "HowToSetupGeoIP_Step1": "%1$sLast ned%2$s GeoLite City-databasen fra %3$sMaxMind%4$s.", + "HttpServerModule": "HTTP Server-modul", "ISPDatabase": "ISP-database", "IWantToDownloadFreeGeoIP": "Jeg vil laste ned gratis GeoIP-database...", "Latitude": "Breddegrad", |