summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2013-11-06 15:43:13 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2013-11-06 15:43:13 (GMT)
commit963f304365c9b22418e044d46188d3cfc7c1771a (patch)
tree3a4157b23ab42f04bc9a3a0411232e0442c073f5
parent5f43d74609c88ac3e383d8b490ad9fd90ef20d49 (diff)
parent1a0d2619b14415e383752cb7ef190a7be2589e48 (diff)
downloadroundcubemail-plugins-kolab-963f304365c9b22418e044d46188d3cfc7c1771a.tar.gz
Merge branch 'roundcubemail-plugins-kolab-3.1' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab into roundcubemail-plugins-kolab-3.1
-rw-r--r--plugins/kolab_activesync/localization/en_US.inc2
-rw-r--r--plugins/kolab_zpush/localization/en_US.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/kolab_activesync/localization/en_US.inc b/plugins/kolab_activesync/localization/en_US.inc
index 4672b12..baea661 100644
--- a/plugins/kolab_activesync/localization/en_US.inc
+++ b/plugins/kolab_activesync/localization/en_US.inc
@@ -11,7 +11,7 @@ $labels['modefolder'] = 'Force folder mode';
$labels['synchronize'] = 'Synchronize';
$labels['withalarms'] = 'With alarms';
$labels['syncsettings'] = 'Synchronization settings';
-$labels['deviceconfig'] = 'Device configration';
+$labels['deviceconfig'] = 'Device configuration';
$labels['folderstosync'] = 'Folders to synchronize';
$labels['mail'] = 'Email';
$labels['contact'] = 'Address Books';
diff --git a/plugins/kolab_zpush/localization/en_US.inc b/plugins/kolab_zpush/localization/en_US.inc
index 2537d4d..56e2790 100644
--- a/plugins/kolab_zpush/localization/en_US.inc
+++ b/plugins/kolab_zpush/localization/en_US.inc
@@ -11,7 +11,7 @@ $labels['modefolder'] = 'Force folder mode';
$labels['synchronize'] = 'Synchronize';
$labels['withalarms'] = 'With alarms';
$labels['syncsettings'] = 'Synchronization settings';
-$labels['deviceconfig'] = 'Device configration';
+$labels['deviceconfig'] = 'Device configuration';
$labels['folderstosync'] = 'Folders to synchronize';
$labels['mail'] = 'Email';
$labels['contact'] = 'Address Books';