Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2014-10-09 21:45:21 +0400
committersgiehl <stefan@piwik.org>2014-10-09 21:45:21 +0400
commita7485bd2ac7598da00b33ee8d686f1ca13aa2731 (patch)
tree9e804e0430c7c0009a025b046d9e808a5758a7f1 /plugins/DevicesDetection
parent0a5829bb2b4af1cf8dbc5062b7f78ac5b343fdba (diff)
parent9c32a948e1fd70c1db09147f634cde4a6bd4e5c4 (diff)
Merge branch 'master' into deprecate_usersettings
Conflicts: tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
Diffstat (limited to 'plugins/DevicesDetection')
-rw-r--r--plugins/DevicesDetection/lang/de.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/DevicesDetection/lang/de.json b/plugins/DevicesDetection/lang/de.json
index 431728a5bb..34f16e5736 100644
--- a/plugins/DevicesDetection/lang/de.json
+++ b/plugins/DevicesDetection/lang/de.json
@@ -16,8 +16,8 @@
"DevicesDetection": "Geräte der Besucher",
"DeviceType": "Gerätetyp",
"FeaturePhone": "Feature-Phone",
- "OperatingSystemFamilies": "Betriebssystem Familie",
- "OperatingSystemVersions": "Betriebssystem Familien",
+ "OperatingSystemFamilies": "Betriebssystem Familien",
+ "OperatingSystemVersions": "Betriebssystem Versionen",
"PluginDescription": "Dieses Plugin stellt erweiterte Informationen über mobile Geräte, wie Marke (Hersteller), Modell (Geräteversion), bessere Gerätetyperkennung (TV, Konsolen, Smartphones, Desktop, etc) und mehr bereit. Dieses Plugin fügt einen neuen Bericht unter 'Besucher > Geräte' hinzu.",
"SmartDisplay": "Smart Display",
"Smartphone": "Smartphone",