Merge branch '2016.11-develop' into 2017.02 2017.02
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 07:57:09 +0000 (09:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 07:57:09 +0000 (09:57 +0200)
Change-Id: I2777aae751aae52bf381399950e07c52fba7b9a1

15 files changed:
1  2 
tine20/Addressbook/translations/template.pot
tine20/Felamimail/Controller/Message/Send.php
tine20/Timetracker/Setup/Update/Release10.php
tine20/Timetracker/Setup/setup.xml
tine20/Timetracker/js/TimesheetEditDialog.js
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/Server/WebDAV.php
tine20/Tinebase/js/LoginPanel.js
tine20/Tinebase/js/tineInit.js
tine20/Tinebase/js/widgets/tags/TagsPanel.js
tine20/composer.json
tine20/composer.lock

@@@ -13,418 -13,344 +13,460 @@@ msgstr "
  "X-Poedit-SourceCharset: utf-8\n"
  "Plural-Forms: nplurals=2; plural=n != 1;\n"
  
 -#: js/ContactFilterModel.js:35 js/ContactGrid.js:162 js/Model.js:100
 -#: js/Model.js:185
 -msgid "Contact"
 -msgid_plural "Contacts"
 +#: Export/Pdf.php:37
 +msgid "Business Contact Data"
 +msgstr ""
 +
 +#: Export/Pdf.php:39
 +msgid "Organisation / Unit"
 +msgstr ""
 +
 +#: Export/Pdf.php:44
 +msgid "Business Address"
 +msgstr ""
 +
- #: Export/Pdf.php:52 js/ContactGrid.js:306
++#: Export/Pdf.php:52 js/ContactGrid.js:306 js/ContactGrid.js:232
 +msgid "Email"
 +msgstr ""
 +
 +#: Export/Pdf.php:55
 +msgid "Telephone Work"
 +msgstr ""
 +
 +#: Export/Pdf.php:58
 +msgid "Telephone Cellphone"
 +msgstr ""
 +
 +#: Export/Pdf.php:61
 +msgid "Telephone Car"
 +msgstr ""
 +
 +#: Export/Pdf.php:64
 +msgid "Telephone Fax"
 +msgstr ""
 +
 +#: Export/Pdf.php:67
 +msgid "Telephone Page"
 +msgstr ""
 +
 +#: Export/Pdf.php:70
 +msgid "URL"
 +msgstr ""
 +
 +#: Export/Pdf.php:73
 +msgid "Role"
 +msgstr ""
 +
 +#: Export/Pdf.php:76 js/ContactEditDialog.js:165 js/Model.js:33
- #: js/ContactGrid.js:295
++#: js/ContactGrid.js:295 js/ContactEditDialog.js:186 js/ContactGrid.js:220
 +msgid "Room"
 +msgstr ""
 +
 +#: Export/Pdf.php:79
 +msgid "Assistant"
 +msgstr ""
 +
 +#: Export/Pdf.php:82
 +msgid "Assistant Telephone"
 +msgstr ""
 +
 +#: Export/Pdf.php:86
 +msgid "Private Contact Data"
 +msgstr ""
 +
- #: Export/Pdf.php:88 js/ContactEditDialog.js:326 js/Model.js:43
- #: js/Model.js:179 js/Model.js:180 js/Model.js:181 js/Model.js:182
- #: js/Model.js:183
++#: Export/Pdf.php:88 js/ContactEditDialog.js:326 js/Model.js:43 js/Model.js:179
++#: js/Model.js:180 js/Model.js:181 js/Model.js:182 js/Model.js:183
++#: js/ContactEditDialog.js:355 js/Model.js:210 js/Model.js:211 js/Model.js:212
++#: js/Model.js:213 js/Model.js:214 js/Printer/ContactRecord.js:72
 +msgid "Private Address"
 +msgstr ""
 +
 +#: Export/Pdf.php:96
 +msgid "Email Home"
 +msgstr ""
 +
 +#: Export/Pdf.php:99
 +msgid "Telephone Home"
 +msgstr ""
 +
 +#: Export/Pdf.php:102
 +msgid "Telephone Cellphone Private"
 +msgstr ""
 +
 +#: Export/Pdf.php:105
 +msgid "Telephone Fax Home"
 +msgstr ""
 +
 +#: Export/Pdf.php:108
 +msgid "URL Home"
 +msgstr ""
 +
 +#: Export/Pdf.php:112
 +msgid "Other Data"
 +msgstr ""
 +
 +#: Export/Pdf.php:114 js/ContactEditDialog.js:192 js/Model.js:26
- #: js/Model.js:173 js/ContactGrid.js:321
++#: js/Model.js:173 js/ContactGrid.js:321 js/ContactEditDialog.js:221
++#: js/ContactGrid.js:247 js/Model.js:204
 +msgid "Birthday"
 +msgstr ""
 +
 +#: Export/Pdf.php:117 js/ContactEditDialog.js:186 js/Model.js:30
- #: js/Model.js:168 js/ContactGrid.js:293
++#: js/Model.js:168 js/ContactGrid.js:293 js/ContactEditDialog.js:215
++#: js/ContactGrid.js:218 js/Model.js:199
 +msgid "Job Title"
 +msgstr ""
 +
 +#: Export/Doc.php:63
 +msgid "Dear Mister"
 +msgstr ""
 +
 +#: Export/Doc.php:65
 +msgid "Dear Miss"
 +msgstr ""
 +
 +#: Export/Doc.php:67
 +msgid "Dear"
 +msgstr ""
 +
 +#: Export/Doc.php:83
 +msgid "Mister"
 +msgstr ""
 +
 +#: Export/Doc.php:85
 +msgid "Misses"
 +msgstr ""
 +
 +#: Controller.php:129
 +#, python-format
 +msgid "%s's personal addressbook"
 +msgstr ""
 +
 +#: Controller.php:184 js/Model.js:240 js/ListGridDetailsPanel.js:57
- #: js/ListGridDetailsPanel.js:83
++#: js/ListGridDetailsPanel.js:83 js/Model.js:282
 +msgid "Lists"
 +msgstr ""
 +
 +#: Controller.php:193 js/Model.js:338 js/ContactGrid.js:322
- #: js/ListRoleGridPanel.js:50
++#: js/ListRoleGridPanel.js:50 js/ContactGrid.js:248 js/Model.js:380
 +msgid "List Roles"
 +msgstr ""
 +
- #: Controller.php:201 js/Model.js:369
++#: Controller.php:201 js/Model.js:369 js/Model.js:411 Controller.php:202
 +msgid "Industries"
 +msgstr ""
 +
 +#: Acl/Rights.php:122
 +msgid "manage shared addressbooks"
 +msgstr ""
 +
 +#: Acl/Rights.php:123
 +msgid "Create new shared addressbook folders"
 +msgstr ""
 +
 +#: Acl/Rights.php:126
 +msgid "manage shared addressbook favorites"
 +msgstr ""
 +
 +#: Acl/Rights.php:127
 +msgid "Create or update shared addressbook favorites"
 +msgstr ""
 +
 +#: Acl/Rights.php:130
 +msgid "Manage lists in CoreData"
 +msgstr ""
 +
 +#: Acl/Rights.php:131
 +msgid "View, create, delete or update lists in CoreData application"
 +msgstr ""
 +
 +#: Acl/Rights.php:134
 +msgid "Manage list roles in CoreData"
 +msgstr ""
 +
 +#: Acl/Rights.php:135
 +msgid "View, create, delete or update list roles in CoreData application"
 +msgstr ""
 +
 +#: Model/Contact.php:557 js/ContactEditDialog.js:145 js/Model.js:369
++#: js/ContactEditDialog.js:209 js/ContactGrid.js:251 js/Model.js:411
 +msgid "Industry"
 +msgid_plural "Industries"
  msgstr[0] ""
  msgstr[1] ""
  
 -#: js/MapPanel.js:40 js/ContactEditDialog.js:45 js/ContactEditDialog.js:54
 -msgid "Map"
 +#: js/ListSearchCombo.js:27
 +msgid "Search for system groups ..."
  msgstr ""
  
 -#: js/MapPanel.js:58
 -msgid "Company address"
 +#: js/ListSearchCombo.js:28
 +msgid "Search for groups ..."
  msgstr ""
  
 -#: js/MapPanel.js:65
 -msgid "Private address"
 +#: js/CardDAVContainerPropertiesHookField.js:35
 +msgid "CardDAV URL"
  msgstr ""
  
 -#: js/ListMemberFilterModel.js:37
 -msgid "Member of List"
 -msgstr ""
 +#: js/ContactFilterModel.js:35 js/Model.js:97 js/Model.js:154
- #: js/ContactGrid.js:255
++#: js/ContactGrid.js:255 js/ContactGrid.js:162 js/Model.js:100 js/Model.js:185
 +msgid "Contact"
 +msgid_plural "Contacts"
 +msgstr[0] ""
 +msgstr[1] ""
  
- #: js/ListRoleMemberFilterModel.js:37 js/Model.js:338
 -#: js/contactListsGridPanel.js:55 js/ContactGrid.js:200 js/Model.js:215
 -#: js/ListGrid.js:100
 -msgid "Type"
++#: js/ListRoleMemberFilterModel.js:37 js/Model.js:338 js/Model.js:380
 +msgid "List Role"
 +msgid_plural "List Roles"
 +msgstr[0] ""
 +msgstr[1] ""
 +
 +#: js/ListMemberRoleGridPanel.js:37 js/ListRoleGridPanel.js:71
++#: js/Printer/ListRecord.js:40
 +msgid "Members"
  msgstr ""
  
- #: js/ListMemberRoleGridPanel.js:207
 -#: js/contactListsGridPanel.js:56 js/Model.js:19 js/Model.js:302
 -#: js/ListRoleGridPanel.js:65 js/Addressbook.js:75 js/Addressbook.js:110
 -#: js/ListEditDialog.js:98 js/ListEditDialog.js:181 js/ListGrid.js:102
 -msgid "Name"
++#: js/ListMemberRoleGridPanel.js:207 js/ListMemberRoleGridPanel.js:221
 +msgid "Remove Member"
  msgstr ""
  
 -#: js/ContactEditDialog.js:64 js/ContactEditDialog.js:79 js/ContactGrid.js:231
 -#: js/Model.js:51
 -msgid "Preferred Address"
 +#: js/ContactEditDialog.js:42 js/ContactEditDialog.js:51 js/MapPanel.js:40
++#: js/ContactEditDialog.js:45 js/ContactEditDialog.js:54
 +msgid "Map"
  msgstr ""
  
- #: js/ContactEditDialog.js:80
 -#: js/ContactEditDialog.js:114
++#: js/ContactEditDialog.js:80 js/ContactEditDialog.js:114
  msgid "Personal Information"
  msgstr ""
  
 -#: js/ContactEditDialog.js:130 js/ContactGrid.js:202 js/Model.js:29
 +#: js/ContactEditDialog.js:96 js/Model.js:29 js/Model.js:190
- #: js/ContactGrid.js:277
++#: js/ContactGrid.js:277 js/ContactEditDialog.js:130 js/ContactGrid.js:202
+ #: js/Model.js:221
  msgid "Salutation"
  msgstr ""
  
 -#: js/ContactEditDialog.js:146 js/ContactGrid.js:210 js/Model.js:22
 +#: js/ContactEditDialog.js:112 js/Model.js:22 js/Model.js:161
- #: js/ContactGrid.js:285
++#: js/ContactGrid.js:285 js/ContactEditDialog.js:146 js/ContactGrid.js:210
+ #: js/Model.js:192
  msgid "Title"
  msgstr ""
  
 -#: js/ContactEditDialog.js:151 js/ContactGrid.js:213 js/Model.js:20
 +#: js/ContactEditDialog.js:117 js/Model.js:20 js/Model.js:162
- #: js/ContactGrid.js:288
++#: js/ContactGrid.js:288 js/ContactEditDialog.js:151 js/ContactGrid.js:213
+ #: js/Model.js:193
  msgid "First Name"
  msgstr ""
  
 -#: js/ContactEditDialog.js:156 js/ContactGrid.js:211 js/Model.js:21
 +#: js/ContactEditDialog.js:122 js/Model.js:21 js/Model.js:164
- #: js/ContactGrid.js:286
++#: js/ContactGrid.js:286 js/ContactEditDialog.js:156 js/ContactGrid.js:211
+ #: js/Model.js:195
  msgid "Middle Name"
  msgstr ""
  
 -#: js/ContactEditDialog.js:161 js/ContactGrid.js:212 js/Model.js:19
 +#: js/ContactEditDialog.js:127 js/Model.js:19 js/Model.js:163
- #: js/ContactGrid.js:287
++#: js/ContactGrid.js:287 js/ContactEditDialog.js:161 js/ContactGrid.js:212
+ #: js/Model.js:194
  msgid "Last Name"
  msgstr ""
  
 -#: js/ContactEditDialog.js:167 js/ContactGrid.js:216 js/Model.js:27
 -#: js/Model.js:196 Config.php:165 Setup/Update/Release5.php:196
 +#: js/ContactEditDialog.js:133 js/Model.js:27 js/Model.js:165
 +#: js/ContactGridDetailsPanel.js:131 js/ContactGrid.js:291 Config.php:110
- #: Setup/Update/Release5.php:196
++#: Setup/Update/Release5.php:196 js/ContactEditDialog.js:167
++#: js/ContactGrid.js:216 js/Model.js:196 Config.php:165
  msgid "Company"
  msgstr ""
  
 -#: js/ContactEditDialog.js:172 js/ContactGrid.js:217 js/Model.js:28
 +#: js/ContactEditDialog.js:138 js/Model.js:28 js/Model.js:166
- #: js/ContactGrid.js:292
++#: js/ContactGrid.js:292 js/ContactEditDialog.js:172 js/ContactGrid.js:217
+ #: js/Model.js:197
  msgid "Unit"
  msgstr ""
  
- #: js/ContactEditDialog.js:157 js/Model.js:23
 -#: js/ContactEditDialog.js:178 js/Model.js:23
++#: js/ContactEditDialog.js:157 js/Model.js:23 js/ContactEditDialog.js:178
  msgid "Suffix"
  msgstr ""
  
 -#: js/ContactEditDialog.js:182 js/ContactGrid.js:219 js/Model.js:31
 +#: js/ContactEditDialog.js:161 js/Model.js:31 js/Model.js:172
- #: js/ContactGrid.js:294
++#: js/ContactGrid.js:294 js/ContactEditDialog.js:182 js/ContactGrid.js:219
+ #: js/Model.js:203
  msgid "Job Role"
  msgstr ""
  
 -#: js/ContactEditDialog.js:186 js/ContactGrid.js:220 js/Model.js:33
 -#: Export/Pdf.php:76
 -msgid "Room"
 -msgstr ""
 -
 -#: js/ContactEditDialog.js:203 js/ContactGrid.js:215 js/Model.js:24
 +#: js/ContactEditDialog.js:181 js/Model.js:24 js/ContactGrid.js:290
++#: js/ContactEditDialog.js:203 js/ContactGrid.js:215
  msgid "Display Name"
  msgstr ""
  
- #: js/ContactEditDialog.js:200
 -#: js/ContactEditDialog.js:209 js/ContactGrid.js:251 js/Model.js:411
 -msgid "Industry"
 -msgid_plural "Industries"
 -msgstr[0] ""
 -msgstr[1] ""
 -
 -#: js/ContactEditDialog.js:215 js/ContactGrid.js:218 js/Model.js:30
 -#: js/Model.js:199 Export/Pdf.php:117
 -msgid "Job Title"
 -msgstr ""
 -
 -#: js/ContactEditDialog.js:221 js/ContactGrid.js:247 js/Model.js:26
 -#: js/Model.js:204 Export/Pdf.php:114
 -msgid "Birthday"
 -msgstr ""
 -
 -#: js/ContactEditDialog.js:229 js/Printer/ContactRecord.js:42
++#: js/ContactEditDialog.js:200 js/ContactEditDialog.js:229
++#: js/Printer/ContactRecord.js:42
  msgid "Contact Information"
  msgstr ""
  
 -#: js/ContactEditDialog.js:238 js/ContactGridDetailsPanel.js:117
 -#: js/ContactGrid.js:233 js/Model.js:52 js/Model.js:198
 +#: js/ContactEditDialog.js:209 js/Model.js:51 js/Model.js:167
 +#: js/ContactGridDetailsPanel.js:139 js/ContactGridDetailsPanel.js:163
- #: js/ContactGrid.js:307
++#: js/ContactGrid.js:307 js/ContactEditDialog.js:238
++#: js/ContactGridDetailsPanel.js:117 js/ContactGrid.js:233 js/Model.js:52
++#: js/Model.js:198
  msgid "Phone"
  msgstr ""
  
- #: js/ContactEditDialog.js:214 js/Model.js:52
- #: js/ContactGridDetailsPanel.js:140 js/ContactGridDetailsPanel.js:164
- #: js/ContactGrid.js:308
++#: js/ContactEditDialog.js:214 js/Model.js:52 js/ContactGridDetailsPanel.js:140
++#: js/ContactGridDetailsPanel.js:164 js/ContactGrid.js:308
+ #: js/ContactEditDialog.js:243 js/ContactGridDetailsPanel.js:121
+ #: js/ContactGrid.js:234 js/Model.js:53
  msgid "Mobile"
  msgstr ""
  
- #: js/ContactEditDialog.js:219 js/Model.js:53
- #: js/ContactGridDetailsPanel.js:141 js/ContactGridDetailsPanel.js:165
- #: js/ContactGrid.js:309
++#: js/ContactEditDialog.js:219 js/Model.js:53 js/ContactGridDetailsPanel.js:141
++#: js/ContactGridDetailsPanel.js:165 js/ContactGrid.js:309
+ #: js/ContactEditDialog.js:248 js/ContactGridDetailsPanel.js:125
+ #: js/ContactGrid.js:235 js/Model.js:54
  msgid "Fax"
  msgstr ""
  
 +#: js/ContactEditDialog.js:224 js/Model.js:57 js/ContactGrid.js:312
+ #: js/ContactEditDialog.js:253 js/ContactGrid.js:238 js/Model.js:58
  msgid "Phone (private)"
  msgstr ""
  
 +#: js/ContactEditDialog.js:229 js/Model.js:59 js/ContactGrid.js:314
+ #: js/ContactEditDialog.js:258 js/ContactGrid.js:240 js/Model.js:60
  msgid "Mobile (private)"
  msgstr ""
  
 +#: js/ContactEditDialog.js:234 js/Model.js:58 js/ContactGrid.js:313
+ #: js/ContactEditDialog.js:263 js/ContactGrid.js:239 js/Model.js:59
  msgid "Fax (private)"
  msgstr ""
  
 +#: js/ContactEditDialog.js:239 js/Model.js:62 js/Model.js:170
 +#: js/ContactGridDetailsPanel.js:142 js/ContactGridDetailsPanel.js:166
+ #: js/ContactEditDialog.js:268 js/ContactGridDetailsPanel.js:129 js/Model.js:63
+ #: js/Model.js:201
  msgid "E-Mail"
  msgstr ""
  
- #: js/ContactEditDialog.js:245 js/Model.js:63
 -#: js/ContactEditDialog.js:274 js/Model.js:64
++#: js/ContactEditDialog.js:245 js/Model.js:63 js/ContactEditDialog.js:274
++#: js/Model.js:64
  msgid "E-Mail (private)"
  msgstr ""
  
- #: js/ContactEditDialog.js:252 js/Model.js:64
- #: js/ContactGridDetailsPanel.js:144 js/ContactGridDetailsPanel.js:168
- #: js/ContactGrid.js:316
++#: js/ContactEditDialog.js:252 js/Model.js:64 js/ContactGridDetailsPanel.js:144
++#: js/ContactGridDetailsPanel.js:168 js/ContactGrid.js:316
+ #: js/ContactEditDialog.js:281 js/ContactGridDetailsPanel.js:135
+ #: js/ContactGrid.js:242 js/Model.js:65
  msgid "Web"
  msgstr ""
  
 -#: js/ContactEditDialog.js:326 js/Model.js:34 js/Model.js:205 js/Model.js:206
 -#: js/Model.js:207 js/Model.js:208 js/Model.js:209
 -#: js/Printer/ContactRecord.js:67
 +#: js/ContactEditDialog.js:297 js/Model.js:34 js/Model.js:174 js/Model.js:175
- #: js/Model.js:176 js/Model.js:177 js/Model.js:178
++#: js/Model.js:176 js/Model.js:177 js/Model.js:178 js/ContactEditDialog.js:326
++#: js/Model.js:205 js/Model.js:206 js/Model.js:207 js/Model.js:208
++#: js/Model.js:209 js/Printer/ContactRecord.js:67
  msgid "Company Address"
  msgstr ""
  
 -#: js/ContactEditDialog.js:329 js/ContactEditDialog.js:358
 +#: js/ContactEditDialog.js:300 js/ContactEditDialog.js:329 js/Model.js:174
- #: js/Model.js:179 js/ContactGrid.js:296
++#: js/Model.js:179 js/ContactGrid.js:296 js/ContactEditDialog.js:358
+ #: js/ContactGrid.js:221 js/Model.js:205 js/Model.js:210
  msgid "Street"
  msgstr ""
  
 -#: js/ContactEditDialog.js:333 js/ContactEditDialog.js:362
 +#: js/ContactEditDialog.js:304 js/ContactEditDialog.js:333
++#: js/ContactEditDialog.js:362
  msgid "Street 2"
  msgstr ""
  
 -#: js/ContactEditDialog.js:337 js/ContactEditDialog.js:366
 +#: js/ContactEditDialog.js:308 js/ContactEditDialog.js:337 js/Model.js:175
- #: js/Model.js:180 js/ContactGrid.js:298
++#: js/Model.js:180 js/ContactGrid.js:298 js/ContactEditDialog.js:366
+ #: js/ContactGrid.js:223 js/Model.js:206 js/Model.js:211
  msgid "Region"
  msgstr ""
  
 -#: js/ContactEditDialog.js:341 js/ContactEditDialog.js:370 js/Model.js:207
 -#: js/Model.js:212
 +#: js/ContactEditDialog.js:312 js/ContactEditDialog.js:341 js/Model.js:176
- #: js/Model.js:181
++#: js/Model.js:181 js/ContactEditDialog.js:370 js/Model.js:207 js/Model.js:212
  msgid "Postal Code"
  msgstr ""
  
 -#: js/ContactEditDialog.js:345 js/ContactEditDialog.js:374
 +#: js/ContactEditDialog.js:316 js/ContactEditDialog.js:345 js/Model.js:177
- #: js/Model.js:182 js/ContactGrid.js:297
++#: js/Model.js:182 js/ContactGrid.js:297 js/ContactEditDialog.js:374
+ #: js/ContactGrid.js:222 js/Model.js:208 js/Model.js:213
  msgid "City"
  msgstr ""
  
 -#: js/ContactEditDialog.js:350 js/ContactEditDialog.js:379
 +#: js/ContactEditDialog.js:321 js/ContactEditDialog.js:350 js/Model.js:178
- #: js/Model.js:183 js/ContactGrid.js:300
++#: js/Model.js:183 js/ContactGrid.js:300 js/ContactEditDialog.js:379
+ #: js/ContactGrid.js:225 js/Model.js:209 js/Model.js:214
  msgid "Country"
  msgstr ""
  
 -#: js/ContactEditDialog.js:355 js/Model.js:43 js/Model.js:210 js/Model.js:211
 -#: js/Model.js:212 js/Model.js:213 js/Model.js:214
 -#: js/Printer/ContactRecord.js:72 Export/Pdf.php:88
 -msgid "Private Address"
 -msgstr ""
 -
 +#: js/ContactEditDialog.js:376 js/Addressbook.js:80 js/Addressbook.js:115
 +#: js/Model.js:68 js/Model.js:169 js/Model.js:261 js/ListEditDialog.js:118
+ #: js/ContactEditDialog.js:405 js/Model.js:69 js/Model.js:200 js/Model.js:303
+ #: js/Addressbook.js:81 js/Addressbook.js:116 js/ListEditDialog.js:133
  msgid "Description"
  msgstr ""
  
 +#: js/ContactEditDialog.js:390 js/ListEditDialog.js:132
+ #: js/ContactEditDialog.js:419 js/ListEditDialog.js:147
  msgid "Enter description"
  msgstr ""
  
 -#: js/ContactEditDialog.js:423 js/Model.js:83
 -msgid "Groups"
 +#: js/ContactEditDialog.js:428
 +msgid "Export as pdf"
  msgstr ""
  
 +#: js/ContactEditDialog.js:435 js/ContactEditDialog.js:479
+ #: js/ContactEditDialog.js:466 js/ContactEditDialog.js:524
  msgid "Parse address"
  msgstr ""
  
- #: js/ContactEditDialog.js:471
 -#: js/ContactEditDialog.js:474
 -msgid "Print contact"
 -msgstr ""
 -
 -#: js/ContactEditDialog.js:516
++#: js/ContactEditDialog.js:471 js/ContactEditDialog.js:516
  msgid "Paste address"
  msgstr ""
  
- #: js/ContactEditDialog.js:471
 -#: js/ContactEditDialog.js:516
++#: js/ContactEditDialog.js:471 js/ContactEditDialog.js:516
  msgid "Please paste an address or a URI to a vcard that should be parsed:"
  msgstr ""
  
- #: js/ContactEditDialog.js:497
 -#: js/ContactEditDialog.js:542
++#: js/ContactEditDialog.js:497 js/ContactEditDialog.js:542
  msgid "Failed to parse address!"
  msgstr ""
  
- #: js/ContactEditDialog.js:497
 -#: js/ContactEditDialog.js:542
++#: js/ContactEditDialog.js:497 js/ContactEditDialog.js:542
  msgid "The address could not be read."
  msgstr ""
  
- #: js/ContactEditDialog.js:514
 -#: js/ContactEditDialog.js:559
++#: js/ContactEditDialog.js:514 js/ContactEditDialog.js:559
  msgid "End token mode"
  msgstr ""
  
 -#: js/ContactGridDetailsPanel.js:79 js/ContactGrid.js:187
 -msgid "Business"
 -msgstr ""
 -
 -#: js/ContactGridDetailsPanel.js:148 js/ContactGrid.js:189
 -msgid "Private"
 -msgstr ""
 -
 -#: js/ContactGrid.js:110
 -msgid "Import contacts"
 -msgstr ""
 -
 -#: js/ContactGrid.js:162
 -msgid "Contact of a user account"
 -msgstr ""
 -
 -#: js/ContactGrid.js:169
 -msgid "No name"
 -msgstr ""
 -
 -#: js/ContactGrid.js:191
 -msgid "Not set"
 -msgstr ""
 -
 -#: js/ContactGrid.js:201 js/ListGrid.js:101
 -msgid "Tags"
 -msgstr ""
 -
 -#: js/ContactGrid.js:214
 -msgid "Full Name"
 -msgstr ""
 -
 -#: js/ContactGrid.js:224
 -msgid "Postalcode"
 -msgstr ""
 -
 -#: js/ContactGrid.js:226
 -msgid "Street (private)"
 -msgstr ""
 -
 -#: js/ContactGrid.js:227
 -msgid "City (private)"
 -msgstr ""
 -
 -#: js/ContactGrid.js:228
 -msgid "Region (private)"
 -msgstr ""
 -
 -#: js/ContactGrid.js:229
 -msgid "Postalcode (private)"
 -msgstr ""
 -
 -#: js/ContactGrid.js:230
 -msgid "Country (private)"
 -msgstr ""
 -
 -#: js/ContactGrid.js:232 Export/Pdf.php:52
 -msgid "Email"
 -msgstr ""
 -
 -#: js/ContactGrid.js:236
 -msgid "Car phone"
 -msgstr ""
 -
 -#: js/ContactGrid.js:237
 -msgid "Pager"
 -msgstr ""
 -
 -#: js/ContactGrid.js:241
 -msgid "Email (private)"
 -msgstr ""
 -
 -#: js/ContactGrid.js:243
 -msgid "URL (private)"
 +#: js/Addressbook.js:22
 +msgid "New Contact"
  msgstr ""
  
 -#: js/ContactGrid.js:244
 -msgid "Note"
 -msgstr ""
 +#: js/Addressbook.js:32 js/Model.js:101 js/Model.js:244 js/Model.js:295
++#: js/Model.js:104 js/Model.js:286 js/Model.js:337
 +msgid "Addressbook"
 +msgid_plural "Addressbooks"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#: js/ContactGrid.js:245
 -msgid "Timezone"
 +#: js/Addressbook.js:67 js/Addressbook.js:102 js/ListRoleGridPanel.js:58
++#: js/Addressbook.js:68 js/Addressbook.js:103
 +msgid "ID"
  msgstr ""
  
 -#: js/ContactGrid.js:246
 -msgid "Geo"
 +#: js/Addressbook.js:74 js/Addressbook.js:109 js/Model.js:19 js/Model.js:260
 +#: js/ListGrid.js:102 js/ListEditDialog.js:83 js/ListEditDialog.js:166
- #: js/ListRoleGridPanel.js:65
++#: js/ListRoleGridPanel.js:65 js/contactListsGridPanel.js:56 js/Model.js:302
++#: js/Addressbook.js:75 js/Addressbook.js:110 js/ListEditDialog.js:98
++#: js/ListEditDialog.js:181
 +msgid "Name"
  msgstr ""
  
 -#: js/ContactGrid.js:248 js/Model.js:380 js/ListRoleGridPanel.js:50
 -#: Controller.php:193
 -msgid "List Roles"
 +#: js/ListMemberFilterModel.js:37
 +msgid "Member of List"
  msgstr ""
  
 -#: js/ListRoleMemberFilterModel.js:37 js/Model.js:380
 -msgid "List Role"
 -msgid_plural "List Roles"
 -msgstr[0] ""
 -msgstr[1] ""
 -
  #: js/Model.js:34
  msgid "Street (Company Address)"
  msgstr ""
@@@ -481,461 -407,562 +523,571 @@@ msgstr "
  msgid "Country (Private Address)"
  msgstr ""
  
- #: js/Model.js:51
 -#: js/Model.js:52
++#: js/Model.js:51 js/Model.js:52
  msgid "Company Communication"
  msgstr ""
  
- #: js/Model.js:57
 -#: js/Model.js:58
++#: js/Model.js:57 js/Model.js:58
  msgid "Private Communication"
  msgstr ""
  
- #: js/Model.js:65
 -#: js/Model.js:66
++#: js/Model.js:65 js/Model.js:66
  msgid "Web (private)"
  msgstr ""
  
- #: js/Model.js:97 js/ContactGridDetailsPanel.js:62
 -#: js/Model.js:100
++#: js/Model.js:97 js/ContactGridDetailsPanel.js:62 js/Model.js:100
  msgid "Contacts"
  msgstr ""
  
- #: js/Model.js:101 js/Model.js:244 js/Model.js:295
 -#: js/Model.js:104 js/Model.js:286 js/Model.js:337 js/Addressbook.js:32
 -msgid "Addressbook"
 -msgid_plural "Addressbooks"
 -msgstr[0] ""
 -msgstr[1] ""
 -
 -#: js/Model.js:104 js/Model.js:286 js/Model.js:337
++#: js/Model.js:101 js/Model.js:244 js/Model.js:295 js/Model.js:104
++#: js/Model.js:286 js/Model.js:337
  msgid "Addressbooks"
  msgstr ""
  
- #: js/Model.js:154 js/Model.js:254
 -#: js/Model.js:170
 -msgid "Resource"
 -msgid_plural "Resources"
 -msgstr[0] ""
 -msgstr[1] ""
 -
 -#: js/Model.js:170
 -msgid "Resources"
 -msgstr ""
 -
 -#: js/Model.js:185 js/Model.js:296
++#: js/Model.js:154 js/Model.js:254 js/Model.js:185 js/Model.js:296
  msgid "User Account"
  msgstr ""
  
- #: js/Model.js:157
 -#: js/Model.js:188
++#: js/Model.js:157 js/Model.js:188
  msgid "Quick Search"
  msgstr ""
  
 -#: js/Model.js:216 js/Model.js:304
 +#: js/Model.js:184 js/ListGrid.js:100 js/ContactGrid.js:275
++#: js/contactListsGridPanel.js:55 js/ContactGrid.js:200 js/Model.js:215
 +msgid "Type"
 +msgstr ""
 +
- #: js/Model.js:185 js/Model.js:262
++#: js/Model.js:185 js/Model.js:262 js/Model.js:216 js/Model.js:304
  msgid "Last Modified Time"
  msgstr ""
  
- #: js/Model.js:186 js/Model.js:263
 -#: js/Model.js:217 js/Model.js:305
++#: js/Model.js:186 js/Model.js:263 js/Model.js:217 js/Model.js:305
  msgid "Last Modified By"
  msgstr ""
  
- #: js/Model.js:187 js/Model.js:264
 -#: js/Model.js:218 js/Model.js:306
++#: js/Model.js:187 js/Model.js:264 js/Model.js:218 js/Model.js:306
  msgid "Creation Time"
  msgstr ""
  
- #: js/Model.js:188 js/Model.js:265
 -#: js/Model.js:219 js/Model.js:307
++#: js/Model.js:188 js/Model.js:265 js/Model.js:219 js/Model.js:307
  msgid "Created By"
  msgstr ""
  
 -#: js/Model.js:282 js/Model.js:296 js/ListGridDetailsPanel.js:86
 +#: js/Model.js:240 js/Model.js:254 js/ListGridDetailsPanel.js:86
++#: js/Model.js:282 js/Model.js:296
  msgid "List"
  msgid_plural "Lists"
  msgstr[0] ""
  msgstr[1] ""
  
 -#: js/Model.js:282 js/ListGridDetailsPanel.js:57 js/ListGridDetailsPanel.js:83
 -#: Controller.php:184
 -msgid "Lists"
 -msgstr ""
 -
 +#: js/Model.js:257 js/Model.js:322 js/Model.js:352 js/Model.js:383
+ #: js/Model.js:299 js/Model.js:364 js/Model.js:394 js/Model.js:425
  msgid "Quick search"
  msgstr ""
  
- #: js/Model.js:291
 -#: js/Model.js:333
++#: js/Model.js:291 js/Model.js:333
  msgid "Email Address"
  msgid_plural "Email Addresses"
  msgstr[0] ""
  msgstr[1] ""
  
- #: js/Model.js:291
 -#: js/Model.js:333
++#: js/Model.js:291 js/Model.js:333
  msgid "Email Addresses"
  msgstr ""
  
 -#: js/Model.js:411 Controller.php:202
 -msgid "Industries"
 +#: js/ListGridDetailsPanel.js:60
 +msgid "Select list"
  msgstr ""
  
- #: js/ListGrid.js:101 js/ContactGrid.js:276
 -#: js/ListMemberRoleGridPanel.js:37 js/ListRoleGridPanel.js:71
 -#: js/Printer/ListRecord.js:40
 -msgid "Members"
++#: js/ListGrid.js:101 js/ContactGrid.js:276 js/ContactGrid.js:201
 +msgid "Tags"
  msgstr ""
  
- #: js/ListGrid.js:103 js/ListEditDialog.js:89
 -#: js/ListMemberRoleGridPanel.js:221
 -msgid "Remove Member"
++#: js/ListGrid.js:103 js/ListEditDialog.js:89 js/ListEditDialog.js:104
 +msgid "List type"
  msgstr ""
  
 -#: js/ContactSearchCombo.js:68
 -msgid "Search for users ..."
 +#: js/ListGrid.js:104
 +msgid "Emails"
  msgstr ""
  
 -#: js/ContactSearchCombo.js:69
 -msgid "Search for Contacts ..."
 +#: js/ListGrid.js:146
 +msgid "System Group"
  msgstr ""
  
 -#: js/ListGridDetailsPanel.js:60
 -msgid "Select list"
 +#: js/ListGrid.js:146
 +msgid "Group"
  msgstr ""
  
- #: js/ListEditDialog.js:71
 -#: js/CardDAVContainerPropertiesHookField.js:35
 -msgid "CardDAV URL"
++#: js/ListEditDialog.js:71 js/ListEditDialog.js:86
 +msgid "List Information"
  msgstr ""
  
- #: js/ListEditDialog.js:166
 -#: js/ListRoleGridPanel.js:58 js/Addressbook.js:68 js/Addressbook.js:103
 -msgid "ID"
++#: js/ListEditDialog.js:166 js/ListEditDialog.js:181
 +#, python-brace-format
 +msgid "{0} must be given"
  msgstr ""
  
 -#: js/Addressbook.js:22
 -msgid "New Contact"
 +#: js/MapPanel.js:58
 +msgid "Company address"
  msgstr ""
  
 -#: js/Printer/ListRecord.js:56
 -msgid "Customfields"
 +#: js/MapPanel.js:65
 +msgid "Private address"
  msgstr ""
  
 -#: js/Printer/ListRecord.js:67 js/Printer/ContactRecord.js:79
 -msgid "Related to"
 +#: js/ContactGridDetailsPanel.js:65
 +msgid "Select contact"
  msgstr ""
  
- #: js/ContactGridDetailsPanel.js:155
 -#: js/ListSearchCombo.js:27
 -msgid "Search for system groups ..."
++#: js/ContactGridDetailsPanel.js:155 js/ContactGridDetailsPanel.js:148
++#: js/ContactGrid.js:189
 +msgid "Private"
  msgstr ""
  
 -#: js/ListSearchCombo.js:28
 -msgid "Search for groups ..."
 +#: js/ContactGridDetailsPanel.js:178
 +msgid "Info"
  msgstr ""
  
 -#: js/ListEditDialog.js:55
 +#: js/ContactGridDetailsPanel.js:214
 +msgid "Insecure link"
 +msgstr ""
 +
 +#: js/ContactGridDetailsPanel.js:214
 +msgid "Please review this link in edit dialog."
 +msgstr ""
 +
 +#: js/ContactGrid.js:110 js/ContactGrid.js:111 js/ContactGrid.js:112
  #, python-brace-format
 -msgid "Print {0}"
 +msgid "Export {0}"
 +msgid_plural "Export {0}"
 +msgstr[0] ""
 +msgstr[1] ""
 +
 +#: js/ContactGrid.js:121
 +msgid "Export as PDF"
  msgstr ""
  
 -#: js/ListEditDialog.js:86
 -msgid "List Information"
 +#: js/ContactGrid.js:128
 +msgid "Export as CSV"
  msgstr ""
  
 -#: js/ListEditDialog.js:104 js/ListGrid.js:103
 -msgid "List type"
 +#: js/ContactGrid.js:135
 +msgid "Export as ODS"
  msgstr ""
  
 -#: js/ListEditDialog.js:181
 -#, python-brace-format
 -msgid "{0} must be given"
 +#: js/ContactGrid.js:142
 +msgid "Export as XLS"
  msgstr ""
  
 -#: js/ListGrid.js:104
 -msgid "Emails"
 +#: js/ContactGrid.js:149
 +msgid "Export as DOC"
  msgstr ""
  
 -#: js/ListGrid.js:146
 -msgid "System Group"
 +#: js/ContactGrid.js:156
 +msgid "Export as ..."
  msgstr ""
  
- #: js/ContactGrid.js:168
 -#: js/ListGrid.js:146
 -msgid "Group"
++#: js/ContactGrid.js:168 js/ContactGrid.js:110
 +msgid "Import contacts"
  msgstr ""
  
- #: js/ContactGrid.js:255
 -#: Controller/Contact.php:589
 -msgid "Uploaded new contact image."
++#: js/ContactGrid.js:255 js/ContactGrid.js:162
 +msgid "Contact of a user account"
  msgstr ""
  
- #: js/ContactGrid.js:262
 -#: Frontend/Cli.php:216
 -msgid ""
 -"This contact has been automatically added by the system as an event attender"
++#: js/ContactGrid.js:262 js/ContactGrid.js:169
 +msgid "No name"
  msgstr ""
  
- #: js/ContactGrid.js:289
 -#: Frontend/CardDAV/AllContacts.php:41
 -msgid "All Contacts"
++#: js/ContactGrid.js:289 js/ContactGrid.js:214
 +msgid "Full Name"
  msgstr ""
  
- #: js/ContactGrid.js:299
 -#: Import/definitions/adb_outlook_import_csv.xml:10
 -msgid "Import CSV formated contacts from Exchange / Outlook address book"
++#: js/ContactGrid.js:299 js/ContactGrid.js:224
 +msgid "Postalcode"
  msgstr ""
  
- #: js/ContactGrid.js:301
 -#: Import/definitions/adb_outlook_import_csv.xml:14
 -msgid "Contact CSV import from Outlook address book"
++#: js/ContactGrid.js:301 js/ContactGrid.js:226
 +msgid "Street (private)"
  msgstr ""
  
- #: js/ContactGrid.js:302
 -#: Import/definitions/adb_mac_import_csv.xml:17
 -msgid "Contact CSV import from mac address book"
++#: js/ContactGrid.js:302 js/ContactGrid.js:227
 +msgid "City (private)"
  msgstr ""
  
- #: js/ContactGrid.js:303
 -#: Import/definitions/adb_tine_import_csv.xml:11
 -msgid "Tine 2.0 contact CSV import"
++#: js/ContactGrid.js:303 js/ContactGrid.js:228
 +msgid "Region (private)"
  msgstr ""
  
- #: js/ContactGrid.js:304
 -#: Import/definitions/adb_tine_import_csv.xml:13
 -msgid "Import CSV formated contacts from Tine 2.0 address book"
++#: js/ContactGrid.js:304 js/ContactGrid.js:229
 +msgid "Postalcode (private)"
  msgstr ""
  
- #: js/ContactGrid.js:305
 -#: Import/definitions/adb_tine_import_csv.xml:19
 -msgid "Import list (###CURRENTDATE###)"
++#: js/ContactGrid.js:305 js/ContactGrid.js:230
 +msgid "Country (private)"
  msgstr ""
  
- #: js/ContactGrid.js:310
 -#: Import/definitions/adb_tine_import_csv.xml:21
 -msgid ""
 -"Contacts imported on ###CURRENTDATE### at ###CURRENTTIME### by "
 -"###USERFULLNAME###"
++#: js/ContactGrid.js:310 js/ContactGrid.js:236
 +msgid "Car phone"
  msgstr ""
  
- #: js/ContactGrid.js:311
 -#: Import/definitions/adb_outlook2007_de_import_csv.xml:10
 -msgid "Import CSV formated contacts from Outlook 2007 German address book"
++#: js/ContactGrid.js:311 js/ContactGrid.js:237
 +msgid "Pager"
 +msgstr ""
 +
- #: js/ContactGrid.js:315
++#: js/ContactGrid.js:315 js/ContactGrid.js:241
 +msgid "Email (private)"
 +msgstr ""
 +
- #: js/ContactGrid.js:317
++#: js/ContactGrid.js:317 js/ContactGrid.js:243
 +msgid "URL (private)"
 +msgstr ""
 +
- #: js/ContactGrid.js:318
++#: js/ContactGrid.js:318 js/ContactGrid.js:244
 +msgid "Note"
 +msgstr ""
 +
- #: js/ContactGrid.js:319
++#: js/ContactGrid.js:319 js/ContactGrid.js:245
 +msgid "Timezone"
 +msgstr ""
 +
- #: js/ContactGrid.js:320
++#: js/ContactGrid.js:320 js/ContactGrid.js:246
 +msgid "Geo"
 +msgstr ""
 +
 +#: js/ContactSearchCombo.js:68
 +msgid "Search for users ..."
 +msgstr ""
 +
 +#: js/ContactSearchCombo.js:69
 +msgid "Search for Contacts ..."
 +msgstr ""
 +
- #: Controller/Contact.php:592
++#: Controller/Contact.php:348 Controller/Contact.php:589
 +msgid "Uploaded new contact image."
 +msgstr ""
 +
- #: Controller/Contact.php:601
- msgid "Deleted contact image."
- msgstr ""
 +#: Preference.php:28
 +msgid "All contacts"
  msgstr ""
  
 -#: Import/definitions/adb_outlook2007_de_import_csv.xml:15
 -msgid "CSV Outlook 2007 German"
 +#: Preference.php:81
 +msgid "Default Addressbook"
  msgstr ""
  
 -#: Import/definitions/adb_import_vcard.xml:9
 -msgid "Import vCard formated contacts"
 +#: Preference.php:82
 +msgid "The default addressbook for new contacts"
  msgstr ""
  
 -#: Import/definitions/adb_import_vcard.xml:15
 -msgid "Contact VCARD import"
 +#: Preference.php:85
 +msgid "Default Favorite"
  msgstr ""
  
 -#: Import/definitions/adb_google_import_csv.xml:11
 -msgid "Import CSV formated contacts from Google address book"
 +#: Preference.php:86
 +msgid "The default favorite which is loaded on addressbook startup"
  msgstr ""
  
 -#: Import/definitions/adb_google_import_csv.xml:13
 -msgid "Contact import from Google address book"
 +#: Preference.php:89
 +msgid "Contacts ODS export configuration"
  msgstr ""
  
 -#: Import/definitions/adb_lxoffice_import_csv.xml:11
 -msgid "LX-Office CSV Contact import"
 +#: Preference.php:90
 +msgid "Use this configuration for the contact ODS export."
  msgstr ""
  
 -#: Import/definitions/adb_lxoffice_import_csv.xml:13
 -msgid "Import CSV formated contacts from LX-Office"
 +#: Preference.php:93
 +msgid "Contacts XLS export configuration"
  msgstr ""
  
 -#: Config.php:95
 -msgid "Enabled Features"
 +#: Preference.php:94
 +msgid "Use this configuration for the contact XLS export."
  msgstr ""
  
 -#: Config.php:97
 -msgid "Enabled Features in Calendar Application."
 +#: Preference.php:165
 +msgid "default"
  msgstr ""
  
- #: Frontend/Cli.php:114
 -#: Config.php:105
 -msgid "Addressbook List View"
++#: Frontend/Cli.php:114 Frontend/Cli.php:216
 +msgid ""
 +"This contact has been automatically added by the system as an event attender"
  msgstr ""
  
 -#: Config.php:107
 -msgid "Shows an additional view for lists inside the addressbook"
 +#: Frontend/CardDAV/AllContacts.php:41
 +msgid "All Contacts"
  msgstr ""
  
- #: Config.php:67
 -#: Config.php:110
 -msgid "Addressbook Industries"
++#: Config.php:67 Config.php:95
 +msgid "Enabled Features"
  msgstr ""
  
- #: Config.php:69
 -#: Config.php:111
 -msgid "Add Industry field to Adressbook"
++#: Config.php:69 Config.php:97
 +msgid "Enabled Features in Calendar Application."
  msgstr ""
  
- #: Config.php:76
 -#: Config.php:114
 -msgid "Manage resources in Addressbook"
++#: Config.php:76 Config.php:105
 +msgid "Addressbook List View"
  msgstr ""
  
 -#: Config.php:115
 -msgid "Show the resources grid also inside the Addressbook"
 +#: Config.php:77
 +msgid "Shows an additional view for lists inside the addressbook)"
  msgstr ""
  
- #: Config.php:85
 -#: Config.php:125
++#: Config.php:85 Config.php:125
  msgid "Contact duplicate check fields"
  msgstr ""
  
- #: Config.php:87
 -#: Config.php:127
++#: Config.php:87 Config.php:127
  msgid ""
  "These fields are checked when a new contact is created. If a record with the "
  "same data in the fields is found, a duplicate exception is thrown."
  msgstr ""
  
- #: Config.php:99
 -#: Config.php:144
 -msgid "Contact Hidden Criteria"
 -msgstr ""
 -
 -#: Config.php:146
 -msgid "The contact is hidden if it is ... (one of: disabled, expired or never"
 -msgstr ""
 -
 -#: Config.php:153
++#: Config.php:99 Config.php:153
  msgid "Contact salutations available"
  msgstr ""
  
- #: Config.php:101
 -#: Config.php:155
++#: Config.php:101 Config.php:155
  msgid ""
  "Possible contact salutations. Please note that additional values might "
  "impact other Addressbook systems on export or syncronisation."
  msgstr ""
  
- #: Config.php:108 Setup/Update/Release5.php:194
 -#: Config.php:163 Setup/Update/Release5.php:194
++#: Config.php:108 Setup/Update/Release5.php:194 Config.php:163
  msgid "Mr"
  msgstr ""
  
- #: Config.php:109 Setup/Update/Release5.php:195
 -#: Config.php:164 Setup/Update/Release5.php:195
++#: Config.php:109 Setup/Update/Release5.php:195 Config.php:164
  msgid "Ms"
  msgstr ""
  
- #: Config.php:116
 -#: Config.php:171
++#: Config.php:116 Config.php:171
  msgid "Parsing rules for addresses"
  msgstr ""
  
- #: Config.php:118
 -#: Config.php:173
++#: Config.php:118 Config.php:173
  msgid "Path to a XML file with address parsing rules."
  msgstr ""
  
- #: Config.php:126
 -#: Config.php:181
++#: Config.php:126 Config.php:181
  msgid "List types available"
  msgstr ""
  
- #: Config.php:128
 -#: Config.php:183
++#: Config.php:128 Config.php:183
  msgid "List types available."
  msgstr ""
  
- #: Config.php:135
 -#: Config.php:190
++#: Config.php:135 Config.php:190
  msgid "Department"
  msgstr ""
  
- #: Config.php:136
 -#: Config.php:191
++#: Config.php:136 Config.php:191
  msgid "Mailing list"
  msgstr ""
  
- #: Config.php:141
 -#: Config.php:196
++#: Config.php:141 Config.php:196
  msgid "Use Nominatim during contact import"
  msgstr ""
  
 -#: Config.php:206 Config.php:208
 -msgid "Sync Backends"
 +#: Import/definitions/adb_outlook2007_de_import_csv.xml:10
 +msgid "Import CSV formated contacts from Outlook 2007 German address book"
  msgstr ""
  
 -#: Setup/Initialize.php:125 Setup/Update/Release3.php:37
 -msgid "All contacts I have read grants for"
 +#: Import/definitions/adb_outlook2007_de_import_csv.xml:15
 +msgid "CSV Outlook 2007 German"
  msgstr ""
  
 -#: Setup/Initialize.php:130
 -msgid "My company"
 +#: Import/definitions/adb_lxoffice_import_csv.xml:11
 +msgid "LX-Office CSV Contact import"
  msgstr ""
  
 -#: Setup/Initialize.php:131
 -msgid "All coworkers in my company"
 +#: Import/definitions/adb_lxoffice_import_csv.xml:13
 +msgid "Import CSV formated contacts from LX-Office"
  msgstr ""
  
 -#: Setup/Initialize.php:144
 -msgid "My contacts"
 +#: Import/definitions/adb_tine_import_csv.xml:11
 +msgid "Tine 2.0 contact CSV import"
  msgstr ""
  
 -#: Setup/Initialize.php:145
 -msgid "All contacts in my Addressbooks"
 +#: Import/definitions/adb_tine_import_csv.xml:13
 +msgid "Import CSV formated contacts from Tine 2.0 address book"
  msgstr ""
  
 -#: Setup/Initialize.php:157
 -msgid "Last modified by me"
 +#: Import/definitions/adb_tine_import_csv.xml:19
 +msgid "Import list (###CURRENTDATE###)"
  msgstr ""
  
 -#: Setup/Initialize.php:158
 -msgid "All contacts that I have last modified"
 +#: Import/definitions/adb_tine_import_csv.xml:21
 +msgid ""
 +"Contacts imported on ###CURRENTDATE### at ###CURRENTTIME### by "
 +"###USERFULLNAME###"
  msgstr ""
  
 -#: Setup/setup.xml:965
 -msgid "Internal Contacts"
 +#: Import/definitions/adb_outlook_import_csv.xml:10
 +msgid "Import CSV formated contacts from Exchange / Outlook address book"
  msgstr ""
  
 -#: Controller.php:129
 -#, python-format
 -msgid "%s's personal addressbook"
 +#: Import/definitions/adb_outlook_import_csv.xml:14
 +msgid "Contact CSV import from Outlook address book"
  msgstr ""
  
 -#: Acl/Rights.php:122
 -msgid "manage shared addressbooks"
 +#: Import/definitions/adb_google_import_csv.xml:11
 +msgid "Import CSV formated contacts from Google address book"
  msgstr ""
  
 -#: Acl/Rights.php:123
 -msgid "Create new shared addressbook folders"
 +#: Import/definitions/adb_google_import_csv.xml:13
 +msgid "Contact import from Google address book"
  msgstr ""
  
 -#: Acl/Rights.php:126
 -msgid "manage shared addressbook favorites"
 +#: Import/definitions/adb_mac_import_csv.xml:17
 +msgid "Contact CSV import from mac address book"
  msgstr ""
  
 -#: Acl/Rights.php:127
 -msgid "Create or update shared addressbook favorites"
 +#: Import/definitions/adb_import_vcard.xml:9
 +msgid "Import vCard formated contacts"
  msgstr ""
  
 -#: Acl/Rights.php:130
 -msgid "Manage lists in CoreData"
 +#: Import/definitions/adb_import_vcard.xml:15
 +msgid "Contact VCARD import"
  msgstr ""
  
- #: Setup/setup.xml:936
 -#: Acl/Rights.php:131
 -msgid "View, create, delete or update lists in CoreData application"
++#: Setup/setup.xml:936 Setup/setup.xml:965
 +msgid "Internal Contacts"
  msgstr ""
  
 -#: Acl/Rights.php:134
 -msgid "Manage list roles in CoreData"
 +#: Setup/Initialize.php:117 Setup/Update/Release3.php:37
++#: Setup/Initialize.php:125
 +msgid "All contacts I have read grants for"
  msgstr ""
  
- #: Setup/Initialize.php:122
 -#: Acl/Rights.php:135
 -msgid "View, create, delete or update list roles in CoreData application"
++#: Setup/Initialize.php:122 Setup/Initialize.php:130
 +msgid "My company"
  msgstr ""
  
- #: Setup/Initialize.php:123
 -#: Export/Pdf.php:37
 -msgid "Business Contact Data"
++#: Setup/Initialize.php:123 Setup/Initialize.php:131
 +msgid "All coworkers in my company"
  msgstr ""
  
- #: Setup/Initialize.php:136
 -#: Export/Pdf.php:39
 -msgid "Organisation / Unit"
++#: Setup/Initialize.php:136 Setup/Initialize.php:144
 +msgid "My contacts"
  msgstr ""
  
- #: Setup/Initialize.php:137
 -#: Export/Pdf.php:44
 -msgid "Business Address"
++#: Setup/Initialize.php:137 Setup/Initialize.php:145
 +msgid "All contacts in my Addressbooks"
  msgstr ""
  
- #: Setup/Initialize.php:149
 -#: Export/Pdf.php:55
 -msgid "Telephone Work"
++#: Setup/Initialize.php:149 Setup/Initialize.php:157
 +msgid "Last modified by me"
  msgstr ""
  
- #: Setup/Initialize.php:150
 -#: Export/Pdf.php:58
 -msgid "Telephone Cellphone"
++#: Setup/Initialize.php:150 Setup/Initialize.php:158
 +msgid "All contacts that I have last modified"
  msgstr ""
 -#: Export/Pdf.php:61
 -msgid "Telephone Car"
 -#: Export/Pdf.php:64
 -msgid "Telephone Fax"
++#: js/ContactEditDialog.js:64 js/ContactEditDialog.js:79 js/ContactGrid.js:231
++#: js/Model.js:51
++msgid "Preferred Address"
+ msgstr ""
 -#: Export/Pdf.php:67
 -msgid "Telephone Page"
++#: js/ContactEditDialog.js:423 js/Model.js:83
++msgid "Groups"
+ msgstr ""
 -#: Export/Pdf.php:70
 -msgid "URL"
++#: js/ContactEditDialog.js:474
++msgid "Print contact"
+ msgstr ""
 -#: Export/Pdf.php:73
 -msgid "Role"
++#: js/ContactGridDetailsPanel.js:79 js/ContactGrid.js:187
++msgid "Business"
+ msgstr ""
 -#: Export/Pdf.php:79
 -msgid "Assistant"
++#: js/ContactGrid.js:191
++msgid "Not set"
+ msgstr ""
 -#: Export/Pdf.php:82
 -msgid "Assistant Telephone"
++#: js/Model.js:170
++msgid "Resource"
++msgid_plural "Resources"
++msgstr[0] ""
++msgstr[1] ""
++
++#: js/Model.js:170
++msgid "Resources"
+ msgstr ""
 -#: Export/Pdf.php:86
 -msgid "Private Contact Data"
++#: js/Printer/ListRecord.js:56
++msgid "Customfields"
+ msgstr ""
 -#: Export/Pdf.php:96
 -msgid "Email Home"
++#: js/Printer/ListRecord.js:67 js/Printer/ContactRecord.js:79
++msgid "Related to"
+ msgstr ""
 -#: Export/Pdf.php:99
 -msgid "Telephone Home"
++#: js/ListEditDialog.js:55
++#, python-brace-format
++msgid "Print {0}"
+ msgstr ""
 -#: Export/Pdf.php:102
 -msgid "Telephone Cellphone Private"
++#: Config.php:107
++msgid "Shows an additional view for lists inside the addressbook"
+ msgstr ""
 -#: Export/Pdf.php:105
 -msgid "Telephone Fax Home"
++#: Config.php:110
++msgid "Addressbook Industries"
+ msgstr ""
 -#: Export/Pdf.php:108
 -msgid "URL Home"
++#: Config.php:111
++msgid "Add Industry field to Adressbook"
+ msgstr ""
 -#: Export/Pdf.php:112
 -msgid "Other Data"
++#: Config.php:114
++msgid "Manage resources in Addressbook"
+ msgstr ""
 -
 -#: Preference.php:28
 -msgid "All contacts"
 -msgstr ""
 -
 -#: Preference.php:81
 -msgid "Default Addressbook"
 -msgstr ""
 -
 -#: Preference.php:82
 -msgid "The default addressbook for new contacts"
 -msgstr ""
 -
 -#: Preference.php:85
 -msgid "Default Favorite"
 -msgstr ""
 -
 -#: Preference.php:86
 -msgid "The default favorite which is loaded on addressbook startup"
 -msgstr ""
 -
 -#: Preference.php:89
 -msgid "Contacts ODS export configuration"
 -msgstr ""
 -
 -#: Preference.php:90
 -msgid "Use this configuration for the contact ODS export."
 -msgstr ""
 -
 -#: Preference.php:93
 -msgid "Contacts XLS export configuration"
 -msgstr ""
 -
 -#: Preference.php:94
 -msgid "Use this configuration for the contact XLS export."
 -msgstr ""
 -
 -#: Preference.php:165
 -msgid "default"
 -msgstr ""
++#: Config.php:115
++msgid "Show the resources grid also inside the Addressbook"
++msgstr ""
++
++#: Config.php:144
++msgid "Contact Hidden Criteria"
++msgstr ""
++
++#: Config.php:146
++msgid "The contact is hidden if it is ... (one of: disabled, expired or never"
++msgstr ""
++
++#: Config.php:206 Config.php:208
++msgid "Sync Backends"
+ msgstr ""
+ #: Export/definitions/adb_default_ods.xml:7
+ msgid "OpenDocument all data"
+ msgstr ""
+ #: Export/definitions/adb_list_doc.xml:5 Export/definitions/adb_doc.xml:5
+ msgid "Word details"
+ msgstr ""
+ #: Export/definitions/adb_pdf.xml:5
+ msgid "PDF details"
+ msgstr ""
+ #: Export/definitions/adb_csv.xml:5
+ msgid "CSV all data"
+ msgstr ""
+ #: Export/definitions/adb_list_xls.xml:5 Export/definitions/adb_xls.xml:5
+ msgid "Excel all data"
+ msgstr ""
+ #: Export/definitions/adb_by_company_xls.xml:7
+ msgid "Excel phone list"
+ msgstr ""
+ #: Export/definitions/adb_by_company_xls.xml:9
+ msgid "Excel phone list grouped by company"
+ msgstr ""
+ #: Export/definitions/adb_doc_letter.xml:6
+ msgid "Word letter"
+ msgstr ""
@@@ -67,126 -62,10 +67,131 @@@ class Timetracker_Setup_Update_Release1
          $this->setApplicationVersion('Timetracker', '10.2');
      }
  
-      * update to 10.3
+     public function update_2()
+     {
+         $this->setApplicationVersion('Timetracker', '10.3');
+     }
++
 +    /**
-     public function update_2()
++     * update to 10.4
 +     *
 +     * @return void
 +     */
-         $this->setApplicationVersion('Timetracker', '10.3');
++    public function update_3()
 +    {
 +        if (! $this->_backend->tableExists('timetracker_timeaccount_fav')) {
 +            $declaration = new Setup_Backend_Schema_Table_Xml('<table>
 +                <name>timetracker_timeaccount_fav</name>
 +                <version>1</version>
 +                <declaration>
 +                    <field>
 +                        <name>id</name>
 +                        <type>text</type>
 +                        <length>40</length>
 +                        <notnull>true</notnull>
 +                    </field>
 +                    <field>
 +                        <name>account_id</name>
 +                        <type>text</type>
 +                        <length>40</length>
 +                        <notnull>true</notnull>
 +                    </field>
 +                    <field>
 +                        <name>timeaccount_id</name>
 +                        <type>text</type>
 +                        <length>40</length>
 +                        <notnull>false</notnull>
 +                    </field>
 +                    <field>
 +                        <name>created_by</name>
 +                        <type>text</type>
 +                        <length>40</length>
 +                    </field>
 +                    <field>
 +                        <name>creation_time</name>
 +                        <type>datetime</type>
 +                    </field>
 +                    <field>
 +                        <name>last_modified_by</name>
 +                        <type>text</type>
 +                        <length>40</length>
 +                    </field>
 +                    <field>
 +                        <name>last_modified_time</name>
 +                        <type>datetime</type>
 +                    </field>
 +                    <field>
 +                        <name>is_deleted</name>
 +                        <type>boolean</type>
 +                        <default>false</default>
 +                    </field>
 +                    <field>
 +                        <name>deleted_by</name>
 +                        <type>text</type>
 +                        <length>40</length>
 +                    </field>
 +                    <field>
 +                        <name>deleted_time</name>
 +                        <type>datetime</type>
 +                    </field>
 +                    <index>
 +                        <name>id</name>
 +                        <primary>true</primary>
 +                        <field>
 +                            <name>id</name>
 +                        </field>
 +                    </index>
 +                    <index>
 +                        <name>timesheet_favorites--timesheet_id::id</name>
 +                        <field>
 +                            <name>timeaccount_id</name>
 +                        </field>
 +                        <foreign>true</foreign>
 +                        <reference>
 +                            <table>timetracker_timeaccount</table>
 +                            <field>id</field>
 +                        </reference>
 +                    </index>
 +                    <index>
 +                        <name>timesheet_favorites--account_id::id</name>
 +                        <field>
 +                            <name>account_id</name>
 +                        </field>
 +                        <foreign>true</foreign>
 +                        <reference>
 +                            <table>accounts</table>
 +                            <field>id</field>
 +                            <ondelete>CASCADE</ondelete>
 +                        </reference>
 +                    </index>
 +                </declaration>
 +            </table>');
 +
 +            $this->_backend->createTable($declaration, 'Timetracker', 'timetracker_timeaccount_fav');
 +            $this->setTableVersion('timetracker_timeaccount_fav', 1);
 +        }
-     public function update_3()
++        $this->setApplicationVersion('Timetracker', '10.4');
 +    }
 +
 +    /**
 +     * 0012470: Don't shorten description in export
 +     */
-         $this->setApplicationVersion('Timetracker', '10.4');
++    public function update_4()
 +    {
 +        Setup_Controller::getInstance()->createImportExportDefinitions(Tinebase_Application::getInstance()->getApplicationByName('Timetracker'));
-      * update to 10.5
++        $this->setApplicationVersion('Timetracker', '10.5');
 +    }
 +
 +    /**
-     public function update_4()
++     * update to 10.6
 +     *
 +     * Add fulltext index to field description of timesheet
 +     * - re-run update 0 + 1 because 2017.02 added update 2 + 3
 +     */
-         $this->setApplicationVersion('Timetracker', '10.5');
++    public function update_5()
 +    {
 +        $this->update_0();
 +        $this->update_1();
++        $this->setApplicationVersion('Timetracker', '10.6');
 +    }
  }
@@@ -2,7 -2,7 +2,7 @@@
  <application>
      <name>Timetracker</name>
      <!-- gettext('Timetracker') -->   
-     <version>10.5</version>
 -    <version>10.3</version>
++    <version>10.6</version>
      <order>60</order>
      <status>enabled</status>
      <depends>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge