Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 May 2015 14:46:15 +0000 (16:46 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 May 2015 14:46:15 +0000 (16:46 +0200)
Conflicts:
tine20/ActiveSync/translations/de.po
tine20/Admin/translations/de.po

Change-Id: Id60b9382aae68b77856a5a0dcbe5ffa4db9648ec

1  2 
tine20/ActiveSync/translations/de.po
tine20/Tinebase/Container.php

@@@ -13,106 -14,104 +15,205 @@@ msgstr "
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "Language: de\n"
  "Plural-Forms: nplurals=2; plural=(n != 1);\n"
- "X-Poedit-Country: GB\n"
- "X-Poedit-Language: en\n"
  "X-Poedit-SourceCharset: utf-8\n"
+ "X-Generator: Poedit 1.5.4\n"
+ #: Acl/Rights.php:104
+ msgid "Manage ActiveSync devices"
+ msgstr "ActiveSync Geräte verwalten"
+ #: Acl/Rights.php:105
+ msgid "See, edit and delete ActiveSync devices"
+ msgstr "ActiveSync Geräte sehen, verwalten und löschen"
+ #: js/AdminPanel.js:45
+ msgid "Sync Devices"
+ msgstr "Sync Geräte"
+ #: js/SyncDevicesGridPanel.js:68
+ msgid "ID"
+ msgstr "ID"
+ #: js/SyncDevicesGridPanel.js:69 js/SyncDevicesGridPanel.js:98
+ #: js/EditDialog.js:72
+ msgid "Device ID"
+ msgstr "Geräte ID"
+ #: js/SyncDevicesGridPanel.js:70 js/EditDialog.js:79
+ msgid "Devicetype"
+ msgstr "Gerätetyp"
+ #: js/SyncDevicesGridPanel.js:71 js/EditDialog.js:86
+ msgid "Owner"
+ msgstr "Eigentümer"
+ #: js/SyncDevicesGridPanel.js:72 js/EditDialog.js:98
+ msgid "Policy"
+ msgstr "Richtlinie"
+ #: js/SyncDevicesGridPanel.js:73 js/EditDialog.js:104
+ msgid "AS Version"
+ msgstr "AS Version"
+ #: js/SyncDevicesGridPanel.js:74 js/EditDialog.js:110
+ msgid "Useragent"
+ msgstr "Useragent"
+ #: js/SyncDevicesGridPanel.js:75 js/EditDialog.js:116
+ msgid "Model"
+ msgstr "Modell"
+ #: js/SyncDevicesGridPanel.js:76 js/EditDialog.js:122
+ msgid "IMEI"
+ msgstr "IMEI"
+ #: js/SyncDevicesGridPanel.js:77 js/EditDialog.js:128
+ msgid "Friendly Name"
+ msgstr "Friendly Name"
+ #: js/SyncDevicesGridPanel.js:78 js/EditDialog.js:134
+ msgid "OS"
+ msgstr "OS"
+ #: js/SyncDevicesGridPanel.js:79 js/EditDialog.js:140
+ msgid "OS Language"
+ msgstr "OS Sprache"
+ #: js/SyncDevicesGridPanel.js:80 js/EditDialog.js:146
+ msgid "Phonenumber"
+ msgstr "Telefonnummer"
+ #: js/SyncDevicesGridPanel.js:81
+ msgid "Ping Lifetime"
+ msgstr "Ping Laufzeit"
+ #: js/SyncDevicesGridPanel.js:82
+ msgid "Ping Folder"
+ msgstr "Ping Ordner"
+ #: js/SyncDevicesGridPanel.js:83
+ msgid "Remote Wipe"
+ msgstr "Gerät löschen"
+ #: js/SyncDevicesGridPanel.js:84
+ msgid "Calendarfilter"
+ msgstr "Kalenderfilter"
+ #: js/SyncDevicesGridPanel.js:85
+ msgid "Contactsfilter"
+ msgstr "Kontaktfilter"
+ #: js/SyncDevicesGridPanel.js:86
+ msgid "Emailfilter"
+ msgstr "E-Mailfilter"
+ #: js/SyncDevicesGridPanel.js:87
+ msgid "Tasksfilter"
+ msgstr "Aufgabenfilter"
+ #: js/SyncDevicesGridPanel.js:88
++msgid "Last Ping"
++msgstr "Letzter Ping"
++
++#: js/SyncDevicesGridPanel.js:97
++msgid "Quicksearch"
++msgstr "Schnellsuche"
 +
 +#: Acl/Rights.php:104
 +msgid "Manage ActiveSync devices"
 +msgstr "ActiveSync Endgeräte verwalten"
 +
 +#: Acl/Rights.php:105
 +msgid "See, edit and delete ActiveSync devices"
 +msgstr "ActiveSync Endgeräte sehen, verwalten und löschen"
 +
 +#: js/AdminPanel.js:45
 +msgid "Sync Devices"
 +msgstr "Sync Endgeräte"
 +
 +#: js/SyncDevicesGridPanel.js:68
 +msgid "ID"
 +msgstr "ID"
 +
 +#: js/SyncDevicesGridPanel.js:69 js/SyncDevicesGridPanel.js:98
 +#: js/EditDialog.js:72
 +msgid "Device ID"
 +msgstr "Endgeräte ID"
 +
 +#: js/SyncDevicesGridPanel.js:70 js/EditDialog.js:79
 +msgid "Devicetype"
 +msgstr "Endgerät Typ"
 +
 +#: js/SyncDevicesGridPanel.js:71 js/EditDialog.js:86
 +msgid "Owner"
 +msgstr "Besitzer"
 +
 +#: js/SyncDevicesGridPanel.js:72 js/EditDialog.js:98
 +msgid "Policy"
 +msgstr "Richtlinie"
 +
 +#: js/SyncDevicesGridPanel.js:73 js/EditDialog.js:104
 +msgid "AS Version"
 +msgstr "AS Version"
 +
 +#: js/SyncDevicesGridPanel.js:74 js/EditDialog.js:110
 +msgid "Useragent"
 +msgstr "Useragent"
 +
 +#: js/SyncDevicesGridPanel.js:75 js/EditDialog.js:116
 +msgid "Model"
 +msgstr "Modell"
 +
 +#: js/SyncDevicesGridPanel.js:76 js/EditDialog.js:122
 +msgid "IMEI"
 +msgstr "IMEI"
 +
 +#: js/SyncDevicesGridPanel.js:77 js/EditDialog.js:128
 +msgid "Friendly Name"
 +msgstr ""
 +
 +#: js/SyncDevicesGridPanel.js:78 js/EditDialog.js:134
 +msgid "OS"
 +msgstr "OS"
 +
 +#: js/SyncDevicesGridPanel.js:79 js/EditDialog.js:140
 +msgid "OS Language"
 +msgstr "OS Sprache"
 +
 +#: js/SyncDevicesGridPanel.js:80 js/EditDialog.js:146
 +msgid "Phonenumber"
 +msgstr "Telefonnummer"
 +
 +#: js/SyncDevicesGridPanel.js:81
 +msgid "Ping Lifetime"
 +msgstr ""
 +
 +#: js/SyncDevicesGridPanel.js:82
 +msgid "Ping Folder"
 +msgstr ""
 +
 +#: js/SyncDevicesGridPanel.js:83
 +msgid "Remote Wipe"
 +msgstr ""
 +
 +#: js/SyncDevicesGridPanel.js:84
 +msgid "Calendarfilter"
 +msgstr "Kalenderfilter"
 +
 +#: js/SyncDevicesGridPanel.js:85
 +msgid "Contactsfilter"
 +msgstr "Kontaktfilter"
 +
 +#: js/SyncDevicesGridPanel.js:86
 +msgid "Emailfilter"
 +msgstr "E-Mailfilter"
 +
 +#: js/SyncDevicesGridPanel.js:87
 +msgid "Tasksfilter"
 +msgstr "Aufgabenfilter"
 +
 +#: js/SyncDevicesGridPanel.js:88
  msgid "Last Ping"
  msgstr "Letzter Ping"
  
Simple merge