quiten permanent logging

- Fix missing parameter

.gitignore

@@ -24,11 +24,9 @@
 /ewawi/
 /eworkflow/
 /collabora/
-chunks/
 /groups/
 /header.inc.php
 /jdots/
-/kanban/
 /licenses/
 /managementserver/
 /nbproject/
@@ -47,7 +45,6 @@ chunks/
 /sitemgr/
 /stylite/
 /swool/
-/test/
 /tracker/
 /usage/
 /vendor/
@@ -65,18 +62,3 @@ status/
 smallpart/
 swoolepush/
 webauthn/
-*/js/*.map
-*/js/app.min.js
-addressbook/js/app.js
-admin/js/app.js
-api/js/etemplate/*.js
-api/js/jsapi/egw_app.js
-calendar/js/*.js
-filemanager/js/app.js
-importexport/js/app.js
-infolog/js/app.js
-lit-element-starter-ts/src/my-input.js
-preferences/js/app.js
-resources/js/app.js
-timesheet/js/app.js
-/doc/.phpunit.result.cache

Gruntfile.js

@@ -4,7 +4,7 @@
  * @link http://www.egroupware.org
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @author Ralf Becker <rb@egroupware.org>
- * @copyright (c) 2016-21 by Ralf Becker <rb@egroupware.org>
+ * @copyright (c) 2016 by Ralf Becker <rb@egroupware.org>
  */
 
 /**
@@ -16,21 +16,270 @@
  * To generate the now existing package.json:
  *		npm init
  *		npm install grunt --save-dev
+ *		npm install grunt-terser --save-dev
  *		npm install grunt-newer --save-dev
  *		npm install grunt-contrib-cssmin --save-dev
+ *		npm install grunt-hub --save-dev
  *
  * Building happens by running in your EGroupware directory:
  *
- *		grunt	# runs cssmin for all targets with changed files
+ *		grunt	# runs uglify and cssmin for all targets with changed files
+ * or
+ *		grunt [newer:]terser:<target>	# targets: api, et2, pixelegg, mobile, mail, calendar, ...
  * or
  *		grunt [newer:]cssmin:<target>	# targets: pixelegg, jdots
  *
+ * app.js files can be added like mail target or, if you want automatic dependencies,
+ * you need to add them in egw_framework::$bundle2minurl and egw_framework::get_bundles().
+ *
+ * To update files in Gruntfile after adding new js files you need to run:
+ *
+ *		updateGruntfile.php
+ *
  * Please use only double quotes, as we parse this file as json to update it!
  *
  * @param {object} grunt
  */
 module.exports = function (grunt) {
 	grunt.initConfig({
+		terser: {
+			options: {
+				mangle: false,
+				sourceMap: true,
+				output: {
+					preamble: "/*!\n * EGroupware (http://www.egroupware.org/) minified Javascript\n *\n * full sources are available under https://github.com/EGroupware/egroupware/\n *\n * build <%= grunt.template.today() %>\n */\n"
+				}
+			},
+			api: {
+				files: {
+					"api/js/jsapi.min.js": [
+						"vendor/bower-asset/jquery/dist/jquery.js",
+						"api/js/jquery/jquery.noconflict.js",
+						"vendor/bower-asset/jquery-ui/jquery-ui.js",
+						"api/js/jsapi/jsapi.js",
+						"api/js/egw_json.js",
+						"api/js/jsapi/egw_core.js",
+						"api/js/jsapi/egw_debug.js",
+						"api/js/jsapi/egw_preferences.js",
+						"api/js/jsapi/egw_utils.js",
+						"api/js/jsapi/egw_ready.js",
+						"api/js/jsapi/egw_files.js",
+						"api/js/jsapi/egw_lang.js",
+						"api/js/jsapi/egw_links.js",
+						"api/js/jsapi/egw_open.js",
+						"api/js/jsapi/egw_user.js",
+						"api/js/jsapi/egw_config.js",
+						"api/js/jsapi/egw_images.js",
+						"api/js/jsapi/egw_jsonq.js",
+						"api/js/jsapi/egw_json.js",
+						"api/js/jsapi/egw_store.js",
+						"api/js/jsapi/egw_tooltip.js",
+						"api/js/jsapi/egw_css.js",
+						"api/js/jquery/jquery-ui-timepicker-addon.js",
+						"api/js/jsapi/egw_calendar.js",
+						"api/js/jsapi/egw_data.js",
+						"api/js/jsapi/egw_tail.js",
+						"api/js/jsapi/egw_inheritance.js",
+						"api/js/jsapi/egw_message.js",
+						"api/js/jsapi/egw_notification.js",
+						"api/js/es6-promise.min.js",
+						"api/js/jsapi/app_base.js",
+						"api/js/jsapi/egw_app.js",
+						"api/js/dhtmlxtree/codebase/dhtmlxcommon.js",
+						"api/js/dhtmlxtree/sources/dhtmlxtree.js",
+						"api/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js",
+						"api/js/egw_action/egw_action_common.js",
+						"api/js/egw_action/egw_action.js",
+						"api/js/egw_action/egw_keymanager.js",
+						"api/js/egw_action/egw_menu.js",
+						"api/js/jquery/jquery-tap-and-hold/jquery.tapandhold.js",
+						"api/js/egw_action/egw_action_popup.js",
+						"api/js/egw_action/egw_action_dragdrop.js",
+						"api/js/egw_action/egw_dragdrop_dhtmlx_tree.js",
+						"api/js/dhtmlxMenu/sources/dhtmlxmenu.js",
+						"api/js/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js",
+						"api/js/egw_action/egw_menu_dhtmlx.js",
+						"api/js/jquery/chosen/chosen.jquery.js"
+					]
+				}
+			},
+			et2: {
+				files: {
+					"api/js/etemplate/etemplate2.min.js": [
+						"api/js/etemplate/et2_core_xml.js",
+						"api/js/etemplate/et2_core_interfaces.js",
+						"api/js/etemplate/et2_core_common.js",
+						"api/js/etemplate/et2_core_inheritance.js",
+						"api/js/etemplate/et2_core_phpExpressionCompiler.js",
+						"api/js/etemplate/et2_core_arrayMgr.js",
+						"api/js/etemplate/et2_core_widget.js",
+						"api/js/etemplate/et2_core_DOMWidget.js",
+						"api/js/etemplate/et2_widget_template.js",
+						"api/js/etemplate/et2_widget_grid.js",
+						"api/js/etemplate/et2_core_baseWidget.js",
+						"api/js/etemplate/et2_widget_box.js",
+						"api/js/etemplate/et2_widget_hbox.js",
+						"api/js/etemplate/et2_widget_groupbox.js",
+						"api/js/jquery/splitter.js",
+						"api/js/etemplate/et2_widget_split.js",
+						"api/js/etemplate/et2_widget_button.js",
+						"api/js/etemplate/et2_core_valueWidget.js",
+						"api/js/etemplate/et2_core_inputWidget.js",
+						"api/js/etemplate/et2_widget_color.js",
+						"api/js/jquery/blueimp/js/blueimp-gallery.min.js",
+						"api/js/etemplate/expose.js",
+						"api/js/etemplate/et2_widget_description.js",
+						"api/js/etemplate/et2_widget_entry.js",
+						"api/js/etemplate/et2_widget_textbox.js",
+						"api/js/etemplate/et2_widget_number.js",
+						"api/js/etemplate/et2_widget_password.js",
+						"api/js/jquery/jquery.base64.js",
+						"api/js/etemplate/et2_widget_url.js",
+						"api/js/etemplate/et2_widget_selectbox.js",
+						"api/js/etemplate/et2_widget_checkbox.js",
+						"api/js/etemplate/et2_widget_radiobox.js",
+						"api/js/etemplate/lib/date.js",
+						"api/js/etemplate/et2_widget_date.js",
+						"api/js/etemplate/et2_widget_dialog.js",
+						"vendor/bower-asset/diff2html/dist/diff2html.min.js",
+						"api/js/etemplate/et2_widget_diff.js",
+						"api/js/etemplate/et2_widget_dropdown_button.js",
+						"api/js/etemplate/et2_widget_styles.js",
+						"api/js/etemplate/et2_widget_link.js",
+						"api/js/etemplate/et2_widget_selectAccount.js",
+						"vendor/egroupware/magicsuggest/magicsuggest.js",
+						"api/js/etemplate/et2_widget_taglist.js",
+						"api/js/etemplate/et2_extension_customfields.js",
+						"api/js/etemplate/et2_dataview_view_rowProvider.js",
+						"api/js/etemplate/et2_extension_nextmatch_rowProvider.js",
+						"api/js/etemplate/et2_dataview_view_container.js",
+						"api/js/etemplate/et2_dataview_view_row.js",
+						"api/js/etemplate/et2_dataview_interfaces.js",
+						"vendor/bower-asset/jquery-touchswipe/jquery.touchSwipe.js",
+						"api/js/etemplate/et2_dataview_view_aoi.js",
+						"api/js/etemplate/et2_dataview_controller_selection.js",
+						"api/js/etemplate/et2_dataview_view_tile.js",
+						"api/js/etemplate/et2_dataview_controller.js",
+						"api/js/etemplate/et2_extension_nextmatch_actions.js",
+						"api/js/etemplate/et2_extension_nextmatch_controller.js",
+						"api/js/etemplate/et2_widget_dynheight.js",
+						"api/js/etemplate/et2_dataview_model_columns.js",
+						"api/js/etemplate/et2_dataview_view_spacer.js",
+						"api/js/etemplate/et2_dataview_view_grid.js",
+						"api/js/etemplate/et2_dataview_view_resizeable.js",
+						"api/js/etemplate/et2_dataview.js",
+						"api/js/etemplate/et2_extension_nextmatch.js",
+						"api/js/etemplate/et2_widget_favorites.js",
+						"api/js/etemplate/et2_widget_html.js",
+						"api/js/etemplate/et2_core_editableWidget.js",
+						"api/js/etemplate/et2_widget_htmlarea.js",
+						"api/js/etemplate/et2_widget_tabs.js",
+						"api/js/etemplate/et2_widget_timestamper.js",
+						"api/js/etemplate/et2_widget_toolbar.js",
+						"api/js/etemplate/et2_widget_tree.js",
+						"api/js/etemplate/et2_widget_historylog.js",
+						"api/js/etemplate/et2_widget_hrule.js",
+						"vendor/bower-asset/cropper/dist/cropper.min.js",
+						"api/js/etemplate/et2_widget_image.js",
+						"api/js/etemplate/et2_widget_iframe.js",
+						"api/js/Resumable/resumable.js",
+						"api/js/etemplate/et2_widget_file.js",
+						"api/js/etemplate/et2_widget_progress.js",
+						"api/js/etemplate/et2_widget_portlet.js",
+						"api/js/etemplate/et2_widget_ajaxSelect.js",
+						"api/js/etemplate/vfsSelectUI.js",
+						"api/js/etemplate/et2_widget_vfs.js",
+						"api/js/etemplate/et2_widget_video.js",
+						"api/js/jquery/barcode/jquery-barcode.min.js",
+						"api/js/etemplate/et2_widget_barcode.js",
+						"api/js/etemplate/et2_extension_itempicker_actions.js",
+						"api/js/etemplate/et2_widget_itempicker.js",
+						"api/js/etemplate/et2_widget_script.js",
+						"api/js/etemplate/et2_core_legacyJSFunctions.js",
+						"api/js/etemplate/etemplate2.js"
+					]
+				}
+			},
+			mail: {
+				files: {
+					"mail/js/app.min.js": [
+						"mail/js/app.js"
+					]
+				}
+			},
+			calendar: {
+				files: {
+					"calendar/js/app.min.js": [
+						"calendar/js/View.js",
+						"calendar/js/et2_widget_owner.js",
+						"calendar/js/et2_widget_view.js",
+						"calendar/js/et2_widget_timegrid.js",
+						"calendar/js/et2_widget_event.js",
+						"calendar/js/et2_widget_daycol.js",
+						"calendar/js/et2_widget_planner_row.js",
+						"calendar/js/et2_widget_planner.js",
+						"calendar/js/app.js"
+					]
+				}
+			},
+			jdots: {
+				files: {
+					"jdots/js/fw_jdots.min.js": [
+						"api/js/framework/fw_base.js",
+						"api/js/framework/fw_browser.js",
+						"api/js/jquery/mousewheel/mousewheel.js",
+						"api/js/framework/fw_ui.js",
+						"api/js/framework/fw_classes.js",
+						"api/js/framework/fw_desktop.js",
+						"jdots/js/fw_jdots.js"
+					]
+				}
+			},
+			mobile: {
+				files: {
+					"pixelegg/js/fw_mobile.min.js": [
+						"vendor/bower-asset/fastclick/lib/fastclick.js",
+						"api/js/framework/fw_base.js",
+						"api/js/framework/fw_browser.js",
+						"api/js/jquery/mousewheel/mousewheel.js",
+						"api/js/framework/fw_ui.js",
+						"api/js/framework/fw_classes.js",
+						"pixelegg/js/fw_mobile.js"
+					]
+				}
+			},
+			notifications: {
+				files: {
+					"notifications/js/notificationajaxpopup.min.js": [
+						"notifications/js/notificationajaxpopup.js"
+					]
+				}
+			},
+			pixelegg: {
+				files: {
+					"pixelegg/js/fw_pixelegg.min.js": [
+						"api/js/framework/fw_base.js",
+						"api/js/framework/fw_browser.js",
+						"api/js/jquery/mousewheel/mousewheel.js",
+						"api/js/framework/fw_ui.js",
+						"api/js/framework/fw_classes.js",
+						"api/js/framework/fw_desktop.js",
+						"pixelegg/js/slider.js",
+						"pixelegg/js/fw_pixelegg.js"
+					]
+				}
+			},
+			projectmanager: {
+				files: {
+					"projectmanager/js/app.min.js": [
+						"vendor/npm-asset/dhtmlx-gantt/codebase/dhtmlxgantt.js",
+						"vendor/npm-asset/dhtmlx-gantt/codebase/ext/dhtmlxgantt_marker.js",
+						"projectmanager/js/et2_widget_gantt.js",
+						"projectmanager/js/app.js"
+					]
+				}
+			}
+		},
 		cssmin: {
 			options: {
 				shorthandCompacting: false,
@@ -40,33 +289,47 @@ module.exports = function (grunt) {
 			pixelegg: {
 				files: {
 					"pixelegg/css/pixelegg.min.css": [
-						"node_modules/flatpickr/dist/themes/light.css",
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"vendor/egroupware/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
 						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
 						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
 						"vendor/bower-asset/diff2html/dist/diff2html.css",
 						"vendor/bower-asset/cropper/dist/cropper.min.css",
 						"api/templates/default/css/flags.css",
 						"api/templates/default/css/htmlarea.css",
+						"api/templates/default/def_tutorials.css",
 						"api/templates/default/etemplate2.css",
 						"pixelegg/css/pixelegg.css",
 						"api/templates/default/print.css",
 						"pixelegg/print.css"
 					],
 					"pixelegg/css/mobile.min.css": [
-						"node_modules/flatpickr/dist/themes/light.css",
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"vendor/egroupware/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
 						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
 						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
 						"vendor/bower-asset/diff2html/dist/diff2html.css",
 						"vendor/bower-asset/cropper/dist/cropper.min.css",
 						"api/templates/default/css/flags.css",
 						"api/templates/default/css/htmlarea.css",
+						"api/templates/default/def_tutorials.css",
 						"api/templates/default/etemplate2.css",
 						"pixelegg/css/mobile.css",
 						"api/templates/default/print.css",
 						"pixelegg/print.css"
 					],
 					"pixelegg/mobile/fw_mobile.min.css": [
-						"node_modules/flatpickr/dist/themes/light.css",
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"vendor/egroupware/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
 						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
 						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
 						"api/js/etemplate/lib/jsdifflib/diffview.css",
@@ -79,26 +342,36 @@ module.exports = function (grunt) {
 						"pixelegg/print.css"
 					],
 					"pixelegg/css/monochrome.min.css": [
-						"node_modules/flatpickr/dist/themes/light.css",
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"vendor/egroupware/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
 						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
 						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
 						"vendor/bower-asset/diff2html/dist/diff2html.css",
 						"vendor/bower-asset/cropper/dist/cropper.min.css",
 						"api/templates/default/css/flags.css",
 						"api/templates/default/css/htmlarea.css",
+						"api/templates/default/def_tutorials.css",
 						"api/templates/default/etemplate2.css",
 						"pixelegg/css/monochrome.css",
 						"api/templates/default/print.css",
 						"pixelegg/print.css"
 					],
 					"pixelegg/css/modern.min.css": [
-						"node_modules/flatpickr/dist/themes/light.css",
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"vendor/egroupware/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
 						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
 						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
 						"vendor/bower-asset/diff2html/dist/diff2html.css",
 						"vendor/bower-asset/cropper/dist/cropper.min.css",
 						"api/templates/default/css/flags.css",
 						"api/templates/default/css/htmlarea.css",
+						"api/templates/default/def_tutorials.css",
 						"api/templates/default/etemplate2.css",
 						"pixelegg/css/pixelegg.css",
 						"api/templates/default/print.css",
@@ -109,13 +382,18 @@ module.exports = function (grunt) {
 			jdots: {
 				files: {
 					"jdots/css/high-contrast.min.css": [
-						"node_modules/flatpickr/dist/themes/light.css",
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"vendor/egroupware/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
 						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
 						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
 						"vendor/bower-asset/diff2html/dist/diff2html.css",
 						"vendor/bower-asset/cropper/dist/cropper.min.css",
 						"api/templates/default/css/flags.css",
 						"api/templates/default/css/htmlarea.css",
+						"api/templates/default/def_tutorials.css",
 						"api/templates/default/etemplate2.css",
 						"api/templates/default/default.css",
 						"jdots/egw_fw.css",
@@ -125,13 +403,18 @@ module.exports = function (grunt) {
 						"jdots/print.css"
 					],
 					"jdots/css/jdots.min.css": [
-						"node_modules/flatpickr/dist/themes/light.css",
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"vendor/egroupware/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
 						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
 						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
 						"vendor/bower-asset/diff2html/dist/diff2html.css",
 						"vendor/bower-asset/cropper/dist/cropper.min.css",
 						"api/templates/default/css/flags.css",
 						"api/templates/default/css/htmlarea.css",
+						"api/templates/default/def_tutorials.css",
 						"api/templates/default/etemplate2.css",
 						"api/templates/default/default.css",
 						"jdots/egw_fw.css",
@@ -140,13 +423,18 @@ module.exports = function (grunt) {
 						"jdots/print.css"
 					],
 					"jdots/css/orange-green.min.css": [
-						"node_modules/flatpickr/dist/themes/light.css",
+						"api/js/jquery/chosen/chosen.css",
+						"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css",
+						"vendor/egroupware/magicsuggest/magicsuggest.css",
+						"api/js/jquery/jquery-ui-timepicker-addon.css",
+						"api/js/jquery/blueimp/css/blueimp-gallery.min.css",
 						"api/js/dhtmlxtree/codebase/dhtmlxtree.css",
 						"api/js/egw_action/test/skins/dhtmlxmenu_egw.css",
 						"vendor/bower-asset/diff2html/dist/diff2html.css",
 						"vendor/bower-asset/cropper/dist/cropper.min.css",
 						"api/templates/default/css/flags.css",
 						"api/templates/default/css/htmlarea.css",
+						"api/templates/default/def_tutorials.css",
 						"api/templates/default/etemplate2.css",
 						"api/templates/default/default.css",
 						"jdots/egw_fw.css",
@@ -166,15 +454,18 @@ module.exports = function (grunt) {
 			}
 		}
 	});
+	// Load the plugin that provides the "uglify" task.
+	grunt.loadNpmTasks("grunt-terser");
+
 	// Load plugin for css minificaton
 	grunt.loadNpmTasks("grunt-contrib-cssmin");
 
 	// Load the plugin that runs tasks only on modified files
-	//grunt.loadNpmTasks("grunt-newer");
+	grunt.loadNpmTasks("grunt-newer");
 
 	// uncomment to run Gruntfile.js in apps / sub-directories
 	//grunt.loadNpmTasks('grunt-hub');
 
 	// Default task(s).
-	grunt.registerTask("default", ["cssmin"]);//, 'hub']);
-};
+	grunt.registerTask("default", ["newer:terser", "newer:cssmin"]);//, 'hub']);
+};

README.md

@@ -1,29 +1,24 @@
 # EGroupware
+| Branch | Status | Tools | Usage |
+| ------ | ------ | ----- | ----- |
+| master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | <img src="https://travis-ci.com/images/logos/TravisCI-Full-Color.png" width="108" alt="Travis CI"/> | runs unit-tests after each commit |
+| 20.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=20.1)](https://travis-ci.org/EGroupware/egroupware) | [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png)](https://scrutinizer-ci.com/g/EGroupware/egroupware/) scrutinizer | runs static analysis on our codebase |
+| 19.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=19.1)](https://travis-ci.org/EGroupware/egroupware) | <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcQ2scF5HUwLnJVnk2UhYwWpUXHmLQYNXM5yBw&usqp=CAU" width="110" alt="BrowserStack" /> | manual testing with unusual browser versions or platforms |
 
-| Tools | Usage |
-| ----- | ----- |
-| <img src="https://travis-ci.com/images/logos/TravisCI-Full-Color.png" width="108" alt="Travis CI"/> | runs unit-tests after each commit |
-| [![Scrutinizer CI](https://scrutinizer-ci.com/images/logo.png) scrutinizer](https://scrutinizer-ci.com/g/EGroupware/egroupware/) | runs static analysis on our codebase |
-| <img src="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcQ2scF5HUwLnJVnk2UhYwWpUXHmLQYNXM5yBw&usqp=CAU" width="110" alt="BrowserStack" /> | manual testing with unusual browser versions or platforms |
+### Default and prefered installation method for EGroupware is via your package manager:
 
-### Default and prefered installation method for EGroupware is via your Linux package manager:
+  https://software.opensuse.org/download.html?project=server%3AeGroupWare&package=egroupware-epl
 
-* [Installation & Update instructions](https://github.com/EGroupware/egroupware/wiki/Installation-using-egroupware-docker-RPM-DEB-package)
-* [Distribution specific instructions](https://github.com/EGroupware/egroupware/wiki/Distribution-specific-instructions)
+### Installing EGroupware 20.1 via Docker:
+EGroupware 20.1 can be installed via Docker, in fact the DEB/RPM packages also does that. Instructions on how to run EGroupware in Docker are in [doc/docker](https://github.com/EGroupware/egroupware/tree/20.1/doc/docker) subdirectory.
 
-> Every other method (including a developer installation by cloning the repo) is way more complicated AND does not include all features, as part's of EGroupware are running in different containers, eg. the push-server!
+### Installing EGroupware 19.1 via Docker:
+EGroupware 19.1 can be installed via Docker, in fact the DEB/RPM packages also does that. Instructions on how to run EGroupware in Docker are in [doc/docker](https://github.com/EGroupware/egroupware/tree/19.1/doc/docker) subdirectory.
 
-### Installing EGroupware 21.1 via Docker for non-Linux environments or not supported Linux distros:
-EGroupware 21.1 can be installed via Docker, in fact the DEB/RPM packages also does that. Instructions on how to run EGroupware in Docker are in our [Wiki](https://github.com/EGroupware/egroupware/wiki/Docker-compose-installation) and in [doc/docker](https://github.com/EGroupware/egroupware/tree/21.1/doc/docker) subdirectory.
 
-### Installing EGroupware development version via Docker:
-* this is the prefered developer installation, as it contains eg. a push-server container
-* https://github.com/EGroupware/egroupware/tree/master/doc/docker/development
-
-### Deprecated EGroupware development installation:
+### Installing EGroupware development version:
 * install composer.phar from https://getcomposer.org/download/
-* for JavaScript dependencies and build install nodejs and npm
-* optional: for minified CSS install grunt
+* optional: for minified JavaScript and CSS install nodejs and grunt
 ```
 apt/yum/zypper install nodejs
 npm install -g grunt-cli

SECURITY.md

@@ -1,10 +0,0 @@
-# Security Policy
-
-## Supported Versions
-* next release / master
-* latest released version: **21.1**
-* old released version: 20.1 (major security fixes only!)
-
-Please report security issues to <security@egroupware.org>
-
-If you need to send information in a secure way, please contakt us first, so we can send you our PGP keys to do so.

ViewerJS/compatibility.js

@@ -0,0 +1,577 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* globals VBArray, PDFJS */
+
+'use strict';
+
+// Initializing PDFJS global object here, it case if we need to change/disable
+// some PDF.js features, e.g. range requests
+if (typeof PDFJS === 'undefined') {
+  (typeof window !== 'undefined' ? window : this).PDFJS = {};
+}
+
+// Checking if the typed arrays are supported
+// Support: iOS<6.0 (subarray), IE<10, Android<4.0
+(function checkTypedArrayCompatibility() {
+  if (typeof Uint8Array !== 'undefined') {
+    // Support: iOS<6.0
+    if (typeof Uint8Array.prototype.subarray === 'undefined') {
+        Uint8Array.prototype.subarray = function subarray(start, end) {
+          return new Uint8Array(this.slice(start, end));
+        };
+        Float32Array.prototype.subarray = function subarray(start, end) {
+          return new Float32Array(this.slice(start, end));
+        };
+    }
+
+    // Support: Android<4.1
+    if (typeof Float64Array === 'undefined') {
+      window.Float64Array = Float32Array;
+    }
+    return;
+  }
+
+  function subarray(start, end) {
+    return new TypedArray(this.slice(start, end));
+  }
+
+  function setArrayOffset(array, offset) {
+    if (arguments.length < 2) {
+      offset = 0;
+    }
+    for (var i = 0, n = array.length; i < n; ++i, ++offset) {
+      this[offset] = array[i] & 0xFF;
+    }
+  }
+
+  function TypedArray(arg1) {
+    var result, i, n;
+    if (typeof arg1 === 'number') {
+      result = [];
+      for (i = 0; i < arg1; ++i) {
+        result[i] = 0;
+      }
+    } else if ('slice' in arg1) {
+      result = arg1.slice(0);
+    } else {
+      result = [];
+      for (i = 0, n = arg1.length; i < n; ++i) {
+        result[i] = arg1[i];
+      }
+    }
+
+    result.subarray = subarray;
+    result.buffer = result;
+    result.byteLength = result.length;
+    result.set = setArrayOffset;
+
+    if (typeof arg1 === 'object' && arg1.buffer) {
+      result.buffer = arg1.buffer;
+    }
+    return result;
+  }
+
+  window.Uint8Array = TypedArray;
+  window.Int8Array = TypedArray;
+
+  // we don't need support for set, byteLength for 32-bit array
+  // so we can use the TypedArray as well
+  window.Uint32Array = TypedArray;
+  window.Int32Array = TypedArray;
+  window.Uint16Array = TypedArray;
+  window.Float32Array = TypedArray;
+  window.Float64Array = TypedArray;
+})();
+
+// URL = URL || webkitURL
+// Support: Safari<7, Android 4.2+
+(function normalizeURLObject() {
+  if (!window.URL) {
+    window.URL = window.webkitURL;
+  }
+})();
+
+// Object.defineProperty()?
+// Support: Android<4.0, Safari<5.1
+(function checkObjectDefinePropertyCompatibility() {
+  if (typeof Object.defineProperty !== 'undefined') {
+    var definePropertyPossible = true;
+    try {
+      // some browsers (e.g. safari) cannot use defineProperty() on DOM objects
+      // and thus the native version is not sufficient
+      Object.defineProperty(new Image(), 'id', { value: 'test' });
+      // ... another test for android gb browser for non-DOM objects
+      var Test = function Test() {};
+      Test.prototype = { get id() { } };
+      Object.defineProperty(new Test(), 'id',
+        { value: '', configurable: true, enumerable: true, writable: false });
+    } catch (e) {
+      definePropertyPossible = false;
+    }
+    if (definePropertyPossible) {
+      return;
+    }
+  }
+
+  Object.defineProperty = function objectDefineProperty(obj, name, def) {
+    delete obj[name];
+    if ('get' in def) {
+      obj.__defineGetter__(name, def['get']);
+    }
+    if ('set' in def) {
+      obj.__defineSetter__(name, def['set']);
+    }
+    if ('value' in def) {
+      obj.__defineSetter__(name, function objectDefinePropertySetter(value) {
+        this.__defineGetter__(name, function objectDefinePropertyGetter() {
+          return value;
+        });
+        return value;
+      });
+      obj[name] = def.value;
+    }
+  };
+})();
+
+
+// No XMLHttpRequest#response?
+// Support: IE<11, Android <4.0
+(function checkXMLHttpRequestResponseCompatibility() {
+  var xhrPrototype = XMLHttpRequest.prototype;
+  var xhr = new XMLHttpRequest();
+  if (!('overrideMimeType' in xhr)) {
+    // IE10 might have response, but not overrideMimeType
+    // Support: IE10
+    Object.defineProperty(xhrPrototype, 'overrideMimeType', {
+      value: function xmlHttpRequestOverrideMimeType(mimeType) {}
+    });
+  }
+  if ('responseType' in xhr) {
+    return;
+  }
+
+  // The worker will be using XHR, so we can save time and disable worker.
+  PDFJS.disableWorker = true;
+
+  Object.defineProperty(xhrPrototype, 'responseType', {
+    get: function xmlHttpRequestGetResponseType() {
+      return this._responseType || 'text';
+    },
+    set: function xmlHttpRequestSetResponseType(value) {
+      if (value === 'text' || value === 'arraybuffer') {
+        this._responseType = value;
+        if (value === 'arraybuffer' &&
+            typeof this.overrideMimeType === 'function') {
+          this.overrideMimeType('text/plain; charset=x-user-defined');
+        }
+      }
+    }
+  });
+
+  // Support: IE9
+  if (typeof VBArray !== 'undefined') {
+    Object.defineProperty(xhrPrototype, 'response', {
+      get: function xmlHttpRequestResponseGet() {
+        if (this.responseType === 'arraybuffer') {
+          return new Uint8Array(new VBArray(this.responseBody).toArray());
+        } else {
+          return this.responseText;
+        }
+      }
+    });
+    return;
+  }
+
+  Object.defineProperty(xhrPrototype, 'response', {
+    get: function xmlHttpRequestResponseGet() {
+      if (this.responseType !== 'arraybuffer') {
+        return this.responseText;
+      }
+      var text = this.responseText;
+      var i, n = text.length;
+      var result = new Uint8Array(n);
+      for (i = 0; i < n; ++i) {
+        result[i] = text.charCodeAt(i) & 0xFF;
+      }
+      return result.buffer;
+    }
+  });
+})();
+
+// window.btoa (base64 encode function) ?
+// Support: IE<10
+(function checkWindowBtoaCompatibility() {
+  if ('btoa' in window) {
+    return;
+  }
+
+  var digits =
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+
+  window.btoa = function windowBtoa(chars) {
+    var buffer = '';
+    var i, n;
+    for (i = 0, n = chars.length; i < n; i += 3) {
+      var b1 = chars.charCodeAt(i) & 0xFF;
+      var b2 = chars.charCodeAt(i + 1) & 0xFF;
+      var b3 = chars.charCodeAt(i + 2) & 0xFF;
+      var d1 = b1 >> 2, d2 = ((b1 & 3) << 4) | (b2 >> 4);
+      var d3 = i + 1 < n ? ((b2 & 0xF) << 2) | (b3 >> 6) : 64;
+      var d4 = i + 2 < n ? (b3 & 0x3F) : 64;
+      buffer += (digits.charAt(d1) + digits.charAt(d2) +
+                 digits.charAt(d3) + digits.charAt(d4));
+    }
+    return buffer;
+  };
+})();
+
+// window.atob (base64 encode function)?
+// Support: IE<10
+(function checkWindowAtobCompatibility() {
+  if ('atob' in window) {
+    return;
+  }
+
+  // https://github.com/davidchambers/Base64.js
+  var digits =
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+  window.atob = function (input) {
+    input = input.replace(/=+$/, '');
+    if (input.length % 4 === 1) {
+      throw new Error('bad atob input');
+    }
+    for (
+      // initialize result and counters
+      var bc = 0, bs, buffer, idx = 0, output = '';
+      // get next character
+      buffer = input.charAt(idx++);
+      // character found in table?
+      // initialize bit storage and add its ascii value
+      ~buffer && (bs = bc % 4 ? bs * 64 + buffer : buffer,
+        // and if not first of each 4 characters,
+        // convert the first 8 bits to one ascii character
+        bc++ % 4) ? output += String.fromCharCode(255 & bs >> (-2 * bc & 6)) : 0
+    ) {
+      // try to find character in table (0-63, not found => -1)
+      buffer = digits.indexOf(buffer);
+    }
+    return output;
+  };
+})();
+
+// Function.prototype.bind?
+// Support: Android<4.0, iOS<6.0
+(function checkFunctionPrototypeBindCompatibility() {
+  if (typeof Function.prototype.bind !== 'undefined') {
+    return;
+  }
+
+  Function.prototype.bind = function functionPrototypeBind(obj) {
+    var fn = this, headArgs = Array.prototype.slice.call(arguments, 1);
+    var bound = function functionPrototypeBindBound() {
+      var args = headArgs.concat(Array.prototype.slice.call(arguments));
+      return fn.apply(obj, args);
+    };
+    return bound;
+  };
+})();
+
+// HTMLElement dataset property
+// Support: IE<11, Safari<5.1, Android<4.0
+(function checkDatasetProperty() {
+  var div = document.createElement('div');
+  if ('dataset' in div) {
+    return; // dataset property exists
+  }
+
+  Object.defineProperty(HTMLElement.prototype, 'dataset', {
+    get: function() {
+      if (this._dataset) {
+        return this._dataset;
+      }
+
+      var dataset = {};
+      for (var j = 0, jj = this.attributes.length; j < jj; j++) {
+        var attribute = this.attributes[j];
+        if (attribute.name.substring(0, 5) !== 'data-') {
+          continue;
+        }
+        var key = attribute.name.substring(5).replace(/\-([a-z])/g,
+          function(all, ch) {
+            return ch.toUpperCase();
+          });
+        dataset[key] = attribute.value;
+      }
+
+      Object.defineProperty(this, '_dataset', {
+        value: dataset,
+        writable: false,
+        enumerable: false
+      });
+      return dataset;
+    },
+    enumerable: true
+  });
+})();
+
+// HTMLElement classList property
+// Support: IE<10, Android<4.0, iOS<5.0
+(function checkClassListProperty() {
+  var div = document.createElement('div');
+  if ('classList' in div) {
+    return; // classList property exists
+  }
+
+  function changeList(element, itemName, add, remove) {
+    var s = element.className || '';
+    var list = s.split(/\s+/g);
+    if (list[0] === '') {
+      list.shift();
+    }
+    var index = list.indexOf(itemName);
+    if (index < 0 && add) {
+      list.push(itemName);
+    }
+    if (index >= 0 && remove) {
+      list.splice(index, 1);
+    }
+    element.className = list.join(' ');
+    return (index >= 0);
+  }
+
+  var classListPrototype = {
+    add: function(name) {
+      changeList(this.element, name, true, false);
+    },
+    contains: function(name) {
+      return changeList(this.element, name, false, false);
+    },
+    remove: function(name) {
+      changeList(this.element, name, false, true);
+    },
+    toggle: function(name) {
+      changeList(this.element, name, true, true);
+    }
+  };
+
+  Object.defineProperty(HTMLElement.prototype, 'classList', {
+    get: function() {
+      if (this._classList) {
+        return this._classList;
+      }
+
+      var classList = Object.create(classListPrototype, {
+        element: {
+          value: this,
+          writable: false,
+          enumerable: true
+        }
+      });
+      Object.defineProperty(this, '_classList', {
+        value: classList,
+        writable: false,
+        enumerable: false
+      });
+      return classList;
+    },
+    enumerable: true
+  });
+})();
+
+// Check console compatibility
+// In older IE versions the console object is not available
+// unless console is open.
+// Support: IE<10
+(function checkConsoleCompatibility() {
+  if (!('console' in window)) {
+    window.console = {
+      log: function() {},
+      error: function() {},
+      warn: function() {}
+    };
+  } else if (!('bind' in console.log)) {
+    // native functions in IE9 might not have bind
+    console.log = (function(fn) {
+      return function(msg) { return fn(msg); };
+    })(console.log);
+    console.error = (function(fn) {
+      return function(msg) { return fn(msg); };
+    })(console.error);
+    console.warn = (function(fn) {
+      return function(msg) { return fn(msg); };
+    })(console.warn);
+  }
+})();
+
+// Check onclick compatibility in Opera
+// Support: Opera<15
+(function checkOnClickCompatibility() {
+  // workaround for reported Opera bug DSK-354448:
+  // onclick fires on disabled buttons with opaque content
+  function ignoreIfTargetDisabled(event) {
+    if (isDisabled(event.target)) {
+      event.stopPropagation();
+    }
+  }
+  function isDisabled(node) {
+    return node.disabled || (node.parentNode && isDisabled(node.parentNode));
+  }
+  if (navigator.userAgent.indexOf('Opera') !== -1) {
+    // use browser detection since we cannot feature-check this bug
+    document.addEventListener('click', ignoreIfTargetDisabled, true);
+  }
+})();
+
+// Checks if possible to use URL.createObjectURL()
+// Support: IE
+(function checkOnBlobSupport() {
+  // sometimes IE loosing the data created with createObjectURL(), see #3977
+  if (navigator.userAgent.indexOf('Trident') >= 0) {
+    PDFJS.disableCreateObjectURL = true;
+  }
+})();
+
+// Checks if navigator.language is supported
+(function checkNavigatorLanguage() {
+  if ('language' in navigator) {
+    return;
+  }
+  PDFJS.locale = navigator.userLanguage || 'en-US';
+})();
+
+(function checkRangeRequests() {
+  // Safari has issues with cached range requests see:
+  // https://github.com/mozilla/pdf.js/issues/3260
+  // Last tested with version 6.0.4.
+  // Support: Safari 6.0+
+  var isSafari = Object.prototype.toString.call(
+                  window.HTMLElement).indexOf('Constructor') > 0;
+
+  // Older versions of Android (pre 3.0) has issues with range requests, see:
+  // https://github.com/mozilla/pdf.js/issues/3381.
+  // Make sure that we only match webkit-based Android browsers,
+  // since Firefox/Fennec works as expected.
+  // Support: Android<3.0
+  var regex = /Android\s[0-2][^\d]/;
+  var isOldAndroid = regex.test(navigator.userAgent);
+
+  // Range requests are broken in Chrome 39 and 40, https://crbug.com/442318
+  var isChromeWithRangeBug = /Chrome\/(39|40)\./.test(navigator.userAgent);
+
+  if (isSafari || isOldAndroid || isChromeWithRangeBug) {
+    PDFJS.disableRange = true;
+    PDFJS.disableStream = true;
+  }
+})();
+
+// Check if the browser supports manipulation of the history.
+// Support: IE<10, Android<4.2
+(function checkHistoryManipulation() {
+  // Android 2.x has so buggy pushState support that it was removed in
+  // Android 3.0 and restored as late as in Android 4.2.
+  // Support: Android 2.x
+  if (!history.pushState || navigator.userAgent.indexOf('Android 2.') >= 0) {
+    PDFJS.disableHistory = true;
+  }
+})();
+
+// Support: IE<11, Chrome<21, Android<4.4, Safari<6
+(function checkSetPresenceInImageData() {
+  // IE < 11 will use window.CanvasPixelArray which lacks set function.
+  if (window.CanvasPixelArray) {
+    if (typeof window.CanvasPixelArray.prototype.set !== 'function') {
+      window.CanvasPixelArray.prototype.set = function(arr) {
+        for (var i = 0, ii = this.length; i < ii; i++) {
+          this[i] = arr[i];
+        }
+      };
+    }
+  } else {
+    // Old Chrome and Android use an inaccessible CanvasPixelArray prototype.
+    // Because we cannot feature detect it, we rely on user agent parsing.
+    var polyfill = false, versionMatch;
+    if (navigator.userAgent.indexOf('Chrom') >= 0) {
+      versionMatch = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
+      // Chrome < 21 lacks the set function.
+      polyfill = versionMatch && parseInt(versionMatch[2]) < 21;
+    } else if (navigator.userAgent.indexOf('Android') >= 0) {
+      // Android < 4.4 lacks the set function.
+      // Android >= 4.4 will contain Chrome in the user agent,
+      // thus pass the Chrome check above and not reach this block.
+      polyfill = /Android\s[0-4][^\d]/g.test(navigator.userAgent);
+    } else if (navigator.userAgent.indexOf('Safari') >= 0) {
+      versionMatch = navigator.userAgent.
+        match(/Version\/([0-9]+)\.([0-9]+)\.([0-9]+) Safari\//);
+      // Safari < 6 lacks the set function.
+      polyfill = versionMatch && parseInt(versionMatch[1]) < 6;
+    }
+
+    if (polyfill) {
+      var contextPrototype = window.CanvasRenderingContext2D.prototype;
+      contextPrototype._createImageData = contextPrototype.createImageData;
+      contextPrototype.createImageData = function(w, h) {
+        var imageData = this._createImageData(w, h);
+        imageData.data.set = function(arr) {
+          for (var i = 0, ii = this.length; i < ii; i++) {
+            this[i] = arr[i];
+          }
+        };
+        return imageData;
+      };
+    }
+  }
+})();
+
+// Support: IE<10, Android<4.0, iOS
+(function checkRequestAnimationFrame() {
+  function fakeRequestAnimationFrame(callback) {
+    window.setTimeout(callback, 20);
+  }
+
+  var isIOS = /(iPad|iPhone|iPod)/g.test(navigator.userAgent);
+  if (isIOS) {
+    // requestAnimationFrame on iOS is broken, replacing with fake one.
+    window.requestAnimationFrame = fakeRequestAnimationFrame;
+    return;
+  }
+  if ('requestAnimationFrame' in window) {
+    return;
+  }
+  window.requestAnimationFrame =
+    window.mozRequestAnimationFrame ||
+    window.webkitRequestAnimationFrame ||
+    fakeRequestAnimationFrame;
+})();
+
+(function checkCanvasSizeLimitation() {
+  var isIOS = /(iPad|iPhone|iPod)/g.test(navigator.userAgent);
+  var isAndroid = /Android/g.test(navigator.userAgent);
+  if (isIOS || isAndroid) {
+    // 5MP
+    PDFJS.maxCanvasPixels = 5242880;
+  }
+})();
+
+// Disable fullscreen support for certain problematic configurations.
+// Support: IE11+ (when embedded).
+(function checkFullscreenSupport() {
+  var isEmbeddedIE = (navigator.userAgent.indexOf('Trident') >= 0 &&
+                      window.parent !== window);
+  if (isEmbeddedIE) {
+    PDFJS.disableFullscreen = true;
+  }
+})();

ViewerJS/example.local.css

@@ -0,0 +1,27 @@
+/* This is just a sample file with CSS rules. You should write your own @font-face declarations
+ * to add support for your desired fonts.
+ */
+
+@font-face {
+  font-family: 'Novecentowide Book';
+  src: url("/ViewerJS/fonts/Novecentowide-Bold-webfont.eot");
+  src: url("/ViewerJS/fonts/Novecentowide-Bold-webfont.eot?#iefix") format("embedded-opentype"),
+  url("/ViewerJS/fonts/Novecentowide-Bold-webfont.woff") format("woff"),
+  url("/fonts/Novecentowide-Bold-webfont.ttf") format("truetype"),
+  url("/fonts/Novecentowide-Bold-webfont.svg#NovecentowideBookBold") format("svg");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+    font-family: 'exotica';
+    src: url('/ViewerJS/fonts/Exotica-webfont.eot');
+    src: url('/ViewerJS/fonts/Exotica-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/ViewerJS/fonts/Exotica-webfont.woff') format('woff'),
+         url('/ViewerJS/fonts/Exotica-webfont.ttf') format('truetype'),
+         url('/ViewerJS/fonts/Exotica-webfont.svg#exoticamedium') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+

ViewerJS/pdfjsversion.js

@@ -0,0 +1 @@
+var /**@const{!string}*/pdfjs_version = "v1.1.114";

ViewerJS/text_layer_builder.js

@@ -0,0 +1,419 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* globals CustomStyle, PDFJS */
+
+'use strict';
+
+var MAX_TEXT_DIVS_TO_RENDER = 100000;
+
+var NonWhitespaceRegexp = /\S/;
+
+function isAllWhitespace(str) {
+  return !NonWhitespaceRegexp.test(str);
+}
+
+/**
+ * @typedef {Object} TextLayerBuilderOptions
+ * @property {HTMLDivElement} textLayerDiv - The text layer container.
+ * @property {number} pageIndex - The page index.
+ * @property {PageViewport} viewport - The viewport of the text layer.
+ * @property {PDFFindController} findController
+ */
+
+/**
+ * TextLayerBuilder provides text-selection functionality for the PDF.
+ * It does this by creating overlay divs over the PDF text. These divs
+ * contain text that matches the PDF text they are overlaying. This object
+ * also provides a way to highlight text that is being searched for.
+ * @class
+ */
+var TextLayerBuilder = (function TextLayerBuilderClosure() {
+  function TextLayerBuilder(options) {
+    this.textLayerDiv = options.textLayerDiv;
+    this.renderingDone = false;
+    this.divContentDone = false;
+    this.pageIdx = options.pageIndex;
+    this.pageNumber = this.pageIdx + 1;
+    this.matches = [];
+    this.viewport = options.viewport;
+    this.textDivs = [];
+    this.findController = options.findController || null;
+  }
+
+  TextLayerBuilder.prototype = {
+    _finishRendering: function TextLayerBuilder_finishRendering() {
+      this.renderingDone = true;
+
+      var event = document.createEvent('CustomEvent');
+      event.initCustomEvent('textlayerrendered', true, true, {
+        pageNumber: this.pageNumber
+      });
+      this.textLayerDiv.dispatchEvent(event);
+    },
+
+    renderLayer: function TextLayerBuilder_renderLayer() {
+      var textLayerFrag = document.createDocumentFragment();
+      var textDivs = this.textDivs;
+      var textDivsLength = textDivs.length;
+      var canvas = document.createElement('canvas');
+      var ctx = canvas.getContext('2d');
+
+      // No point in rendering many divs as it would make the browser
+      // unusable even after the divs are rendered.
+      if (textDivsLength > MAX_TEXT_DIVS_TO_RENDER) {
+        this._finishRendering();
+        return;
+      }
+
+      var lastFontSize;
+      var lastFontFamily;
+      for (var i = 0; i < textDivsLength; i++) {
+        var textDiv = textDivs[i];
+        if (textDiv.dataset.isWhitespace !== undefined) {
+          continue;
+        }
+
+        var fontSize = textDiv.style.fontSize;
+        var fontFamily = textDiv.style.fontFamily;
+
+        // Only build font string and set to context if different from last.
+        if (fontSize !== lastFontSize || fontFamily !== lastFontFamily) {
+          ctx.font = fontSize + ' ' + fontFamily;
+          lastFontSize = fontSize;
+          lastFontFamily = fontFamily;
+        }
+
+        var width = ctx.measureText(textDiv.textContent).width;
+        if (width > 0) {
+          textLayerFrag.appendChild(textDiv);
+          var transform;
+          if (textDiv.dataset.canvasWidth !== undefined) {
+            // Dataset values come of type string.
+            var textScale = textDiv.dataset.canvasWidth / width;
+            transform = 'scaleX(' + textScale + ')';
+          } else {
+            transform = '';
+          }
+          var rotation = textDiv.dataset.angle;
+          if (rotation) {
+            transform = 'rotate(' + rotation + 'deg) ' + transform;
+          }
+          if (transform) {
+            CustomStyle.setProp('transform' , textDiv, transform);
+          }
+        }
+      }
+
+      this.textLayerDiv.appendChild(textLayerFrag);
+      this._finishRendering();
+      this.updateMatches();
+    },
+
+    /**
+     * Renders the text layer.
+     * @param {number} timeout (optional) if specified, the rendering waits
+     *   for specified amount of ms.
+     */
+    render: function TextLayerBuilder_render(timeout) {
+      if (!this.divContentDone || this.renderingDone) {
+        return;
+      }
+
+      if (this.renderTimer) {
+        clearTimeout(this.renderTimer);
+        this.renderTimer = null;
+      }
+
+      if (!timeout) { // Render right away
+        this.renderLayer();
+      } else { // Schedule
+        var self = this;
+        this.renderTimer = setTimeout(function() {
+          self.renderLayer();
+          self.renderTimer = null;
+        }, timeout);
+      }
+    },
+
+    appendText: function TextLayerBuilder_appendText(geom, styles) {
+      var style = styles[geom.fontName];
+      var textDiv = document.createElement('div');
+      this.textDivs.push(textDiv);
+      if (isAllWhitespace(geom.str)) {
+        textDiv.dataset.isWhitespace = true;
+        return;
+      }
+      var tx = PDFJS.Util.transform(this.viewport.transform, geom.transform);
+      var angle = Math.atan2(tx[1], tx[0]);
+      if (style.vertical) {
+        angle += Math.PI / 2;
+      }
+      var fontHeight = Math.sqrt((tx[2] * tx[2]) + (tx[3] * tx[3]));
+      var fontAscent = fontHeight;
+      if (style.ascent) {
+        fontAscent = style.ascent * fontAscent;
+      } else if (style.descent) {
+        fontAscent = (1 + style.descent) * fontAscent;
+      }
+
+      var left;
+      var top;
+      if (angle === 0) {
+        left = tx[4];
+        top = tx[5] - fontAscent;
+      } else {
+        left = tx[4] + (fontAscent * Math.sin(angle));
+        top = tx[5] - (fontAscent * Math.cos(angle));
+      }
+      textDiv.style.left = left + 'px';
+      textDiv.style.top = top + 'px';
+      textDiv.style.fontSize = fontHeight + 'px';
+      textDiv.style.fontFamily = style.fontFamily;
+
+      textDiv.textContent = geom.str;
+      // |fontName| is only used by the Font Inspector. This test will succeed
+      // when e.g. the Font Inspector is off but the Stepper is on, but it's
+      // not worth the effort to do a more accurate test.
+      if (PDFJS.pdfBug) {
+        textDiv.dataset.fontName = geom.fontName;
+      }
+      // Storing into dataset will convert number into string.
+      if (angle !== 0) {
+        textDiv.dataset.angle = angle * (180 / Math.PI);
+      }
+      // We don't bother scaling single-char text divs, because it has very
+      // little effect on text highlighting. This makes scrolling on docs with
+      // lots of such divs a lot faster.
+      if (textDiv.textContent.length > 1) {
+        if (style.vertical) {
+          textDiv.dataset.canvasWidth = geom.height * this.viewport.scale;
+        } else {
+          textDiv.dataset.canvasWidth = geom.width * this.viewport.scale;
+        }
+      }
+    },
+
+    setTextContent: function TextLayerBuilder_setTextContent(textContent) {
+      this.textContent = textContent;
+
+      var textItems = textContent.items;
+      for (var i = 0, len = textItems.length; i < len; i++) {
+        this.appendText(textItems[i], textContent.styles);
+      }
+      this.divContentDone = true;
+    },
+
+    convertMatches: function TextLayerBuilder_convertMatches(matches) {
+      var i = 0;
+      var iIndex = 0;
+      var bidiTexts = this.textContent.items;
+      var end = bidiTexts.length - 1;
+      var queryLen = (this.findController === null ?
+                      0 : this.findController.state.query.length);
+      var ret = [];
+
+      for (var m = 0, len = matches.length; m < len; m++) {
+        // Calculate the start position.
+        var matchIdx = matches[m];
+
+        // Loop over the divIdxs.
+        while (i !== end && matchIdx >= (iIndex + bidiTexts[i].str.length)) {
+          iIndex += bidiTexts[i].str.length;
+          i++;
+        }
+
+        if (i === bidiTexts.length) {
+          console.error('Could not find a matching mapping');
+        }
+
+        var match = {
+          begin: {
+            divIdx: i,
+            offset: matchIdx - iIndex
+          }
+        };
+
+        // Calculate the end position.
+        matchIdx += queryLen;
+
+        // Somewhat the same array as above, but use > instead of >= to get
+        // the end position right.
+        while (i !== end && matchIdx > (iIndex + bidiTexts[i].str.length)) {
+          iIndex += bidiTexts[i].str.length;
+          i++;
+        }
+
+        match.end = {
+          divIdx: i,
+          offset: matchIdx - iIndex
+        };
+        ret.push(match);
+      }
+
+      return ret;
+    },
+
+    renderMatches: function TextLayerBuilder_renderMatches(matches) {
+      // Early exit if there is nothing to render.
+      if (matches.length === 0) {
+        return;
+      }
+
+      var bidiTexts = this.textContent.items;
+      var textDivs = this.textDivs;
+      var prevEnd = null;
+      var pageIdx = this.pageIdx;
+      var isSelectedPage = (this.findController === null ?
+        false : (pageIdx === this.findController.selected.pageIdx));
+      var selectedMatchIdx = (this.findController === null ?
+                              -1 : this.findController.selected.matchIdx);
+      var highlightAll = (this.findController === null ?
+                          false : this.findController.state.highlightAll);
+      var infinity = {
+        divIdx: -1,
+        offset: undefined
+      };
+
+      function beginText(begin, className) {
+        var divIdx = begin.divIdx;
+        textDivs[divIdx].textContent = '';
+        appendTextToDiv(divIdx, 0, begin.offset, className);
+      }
+
+      function appendTextToDiv(divIdx, fromOffset, toOffset, className) {
+        var div = textDivs[divIdx];
+        var content = bidiTexts[divIdx].str.substring(fromOffset, toOffset);
+        var node = document.createTextNode(content);
+        if (className) {
+          var span = document.createElement('span');
+          span.className = className;
+          span.appendChild(node);
+          div.appendChild(span);
+          return;
+        }
+        div.appendChild(node);
+      }
+
+      var i0 = selectedMatchIdx, i1 = i0 + 1;
+      if (highlightAll) {
+        i0 = 0;
+        i1 = matches.length;
+      } else if (!isSelectedPage) {
+        // Not highlighting all and this isn't the selected page, so do nothing.
+        return;
+      }
+
+      for (var i = i0; i < i1; i++) {
+        var match = matches[i];
+        var begin = match.begin;
+        var end = match.end;
+        var isSelected = (isSelectedPage && i === selectedMatchIdx);
+        var highlightSuffix = (isSelected ? ' selected' : '');
+
+        if (this.findController) {
+          this.findController.updateMatchPosition(pageIdx, i, textDivs,
+                                                  begin.divIdx, end.divIdx);
+        }
+
+        // Match inside new div.
+        if (!prevEnd || begin.divIdx !== prevEnd.divIdx) {
+          // If there was a previous div, then add the text at the end.
+          if (prevEnd !== null) {
+            appendTextToDiv(prevEnd.divIdx, prevEnd.offset, infinity.offset);
+          }
+          // Clear the divs and set the content until the starting point.
+          beginText(begin);
+        } else {
+          appendTextToDiv(prevEnd.divIdx, prevEnd.offset, begin.offset);
+        }
+
+        if (begin.divIdx === end.divIdx) {
+          appendTextToDiv(begin.divIdx, begin.offset, end.offset,
+                          'highlight' + highlightSuffix);
+        } else {
+          appendTextToDiv(begin.divIdx, begin.offset, infinity.offset,
+                          'highlight begin' + highlightSuffix);
+          for (var n0 = begin.divIdx + 1, n1 = end.divIdx; n0 < n1; n0++) {
+            textDivs[n0].className = 'highlight middle' + highlightSuffix;
+          }
+          beginText(end, 'highlight end' + highlightSuffix);
+        }
+        prevEnd = end;
+      }
+
+      if (prevEnd) {
+        appendTextToDiv(prevEnd.divIdx, prevEnd.offset, infinity.offset);
+      }
+    },
+
+    updateMatches: function TextLayerBuilder_updateMatches() {
+      // Only show matches when all rendering is done.
+      if (!this.renderingDone) {
+        return;
+      }
+
+      // Clear all matches.
+      var matches = this.matches;
+      var textDivs = this.textDivs;
+      var bidiTexts = this.textContent.items;
+      var clearedUntilDivIdx = -1;
+
+      // Clear all current matches.
+      for (var i = 0, len = matches.length; i < len; i++) {
+        var match = matches[i];
+        var begin = Math.max(clearedUntilDivIdx, match.begin.divIdx);
+        for (var n = begin, end = match.end.divIdx; n <= end; n++) {
+          var div = textDivs[n];
+          div.textContent = bidiTexts[n].str;
+          div.className = '';
+        }
+        clearedUntilDivIdx = match.end.divIdx + 1;
+      }
+
+      if (this.findController === null || !this.findController.active) {
+        return;
+      }
+
+      // Convert the matches on the page controller into the match format
+      // used for the textLayer.
+      this.matches = this.convertMatches(this.findController === null ?
+        [] : (this.findController.pageMatches[this.pageIdx] || []));
+      this.renderMatches(this.matches);
+    }
+  };
+  return TextLayerBuilder;
+})();
+
+/**
+ * @constructor
+ * @implements IPDFTextLayerFactory
+ */
+function DefaultTextLayerFactory() {}
+DefaultTextLayerFactory.prototype = {
+  /**
+   * @param {HTMLDivElement} textLayerDiv
+   * @param {number} pageIndex
+   * @param {PageViewport} viewport
+   * @returns {TextLayerBuilder}
+   */
+  createTextLayerBuilder: function (textLayerDiv, pageIndex, viewport) {
+    return new TextLayerBuilder({
+      textLayerDiv: textLayerDiv,
+      pageIndex: pageIndex,
+      viewport: viewport
+    });
+  }
+};

ViewerJS/ui_utils.js

@@ -0,0 +1,394 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+var CSS_UNITS = 96.0 / 72.0;
+var DEFAULT_SCALE = 'auto';
+var UNKNOWN_SCALE = 0;
+var MAX_AUTO_SCALE = 1.25;
+var SCROLLBAR_PADDING = 40;
+var VERTICAL_PADDING = 5;
+
+// optimised CSS custom property getter/setter
+var CustomStyle = (function CustomStyleClosure() {
+
+  // As noted on: http://www.zachstronaut.com/posts/2009/02/17/
+  //              animate-css-transforms-firefox-webkit.html
+  // in some versions of IE9 it is critical that ms appear in this list
+  // before Moz
+  var prefixes = ['ms', 'Moz', 'Webkit', 'O'];
+  var _cache = {};
+
+  function CustomStyle() {}
+
+  CustomStyle.getProp = function get(propName, element) {
+    // check cache only when no element is given
+    if (arguments.length === 1 && typeof _cache[propName] === 'string') {
+      return _cache[propName];
+    }
+
+    element = element || document.documentElement;
+    var style = element.style, prefixed, uPropName;
+
+    // test standard property first
+    if (typeof style[propName] === 'string') {
+      return (_cache[propName] = propName);
+    }
+
+    // capitalize
+    uPropName = propName.charAt(0).toUpperCase() + propName.slice(1);
+
+    // test vendor specific properties
+    for (var i = 0, l = prefixes.length; i < l; i++) {
+      prefixed = prefixes[i] + uPropName;
+      if (typeof style[prefixed] === 'string') {
+        return (_cache[propName] = prefixed);
+      }
+    }
+
+    //if all fails then set to undefined
+    return (_cache[propName] = 'undefined');
+  };
+
+  CustomStyle.setProp = function set(propName, element, str) {
+    var prop = this.getProp(propName);
+    if (prop !== 'undefined') {
+      element.style[prop] = str;
+    }
+  };
+
+  return CustomStyle;
+})();
+
+function getFileName(url) {
+  var anchor = url.indexOf('#');
+  var query = url.indexOf('?');
+  var end = Math.min(
+    anchor > 0 ? anchor : url.length,
+    query > 0 ? query : url.length);
+  return url.substring(url.lastIndexOf('/', end) + 1, end);
+}
+
+/**
+ * Returns scale factor for the canvas. It makes sense for the HiDPI displays.
+ * @return {Object} The object with horizontal (sx) and vertical (sy)
+                    scales. The scaled property is set to false if scaling is
+                    not required, true otherwise.
+ */
+function getOutputScale(ctx) {
+  var devicePixelRatio = window.devicePixelRatio || 1;
+  var backingStoreRatio = ctx.webkitBackingStorePixelRatio ||
+                          ctx.mozBackingStorePixelRatio ||
+                          ctx.msBackingStorePixelRatio ||
+                          ctx.oBackingStorePixelRatio ||
+                          ctx.backingStorePixelRatio || 1;
+  var pixelRatio = devicePixelRatio / backingStoreRatio;
+  return {
+    sx: pixelRatio,
+    sy: pixelRatio,
+    scaled: pixelRatio !== 1
+  };
+}
+
+/**
+ * Scrolls specified element into view of its parent.
+ * element {Object} The element to be visible.
+ * spot {Object} An object with optional top and left properties,
+ *               specifying the offset from the top left edge.
+ */
+function scrollIntoView(element, spot) {
+  // Assuming offsetParent is available (it's not available when viewer is in
+  // hidden iframe or object). We have to scroll: if the offsetParent is not set
+  // producing the error. See also animationStartedClosure.
+  var parent = element.offsetParent;
+  var offsetY = element.offsetTop + element.clientTop;
+  var offsetX = element.offsetLeft + element.clientLeft;
+  if (!parent) {
+    console.error('offsetParent is not set -- cannot scroll');
+    return;
+  }
+  while (parent.clientHeight === parent.scrollHeight) {
+    if (parent.dataset._scaleY) {
+      offsetY /= parent.dataset._scaleY;
+      offsetX /= parent.dataset._scaleX;
+    }
+    offsetY += parent.offsetTop;
+    offsetX += parent.offsetLeft;
+    parent = parent.offsetParent;
+    if (!parent) {
+      return; // no need to scroll
+    }
+  }
+  if (spot) {
+    if (spot.top !== undefined) {
+      offsetY += spot.top;
+    }
+    if (spot.left !== undefined) {
+      offsetX += spot.left;
+      parent.scrollLeft = offsetX;
+    }
+  }
+  parent.scrollTop = offsetY;
+}
+
+/**
+ * Helper function to start monitoring the scroll event and converting them into
+ * PDF.js friendly one: with scroll debounce and scroll direction.
+ */
+function watchScroll(viewAreaElement, callback) {
+  var debounceScroll = function debounceScroll(evt) {
+    if (rAF) {
+      return;
+    }
+    // schedule an invocation of scroll for next animation frame.
+    rAF = window.requestAnimationFrame(function viewAreaElementScrolled() {
+      rAF = null;
+
+      var currentY = viewAreaElement.scrollTop;
+      var lastY = state.lastY;
+      if (currentY !== lastY) {
+        state.down = currentY > lastY;
+      }
+      state.lastY = currentY;
+      callback(state);
+    });
+  };
+
+  var state = {
+    down: true,
+    lastY: viewAreaElement.scrollTop,
+    _eventHandler: debounceScroll
+  };
+
+  var rAF = null;
+  viewAreaElement.addEventListener('scroll', debounceScroll, true);
+  return state;
+}
+
+/**
+ * Use binary search to find the index of the first item in a given array which
+ * passes a given condition. The items are expected to be sorted in the sense
+ * that if the condition is true for one item in the array, then it is also true
+ * for all following items.
+ *
+ * @returns {Number} Index of the first array element to pass the test,
+ *                   or |items.length| if no such element exists.
+ */
+function binarySearchFirstItem(items, condition) {
+  var minIndex = 0;
+  var maxIndex = items.length - 1;
+
+  if (items.length === 0 || !condition(items[maxIndex])) {
+    return items.length;
+  }
+  if (condition(items[minIndex])) {
+    return minIndex;
+  }
+
+  while (minIndex < maxIndex) {
+    var currentIndex = (minIndex + maxIndex) >> 1;
+    var currentItem = items[currentIndex];
+    if (condition(currentItem)) {
+      maxIndex = currentIndex;
+    } else {
+      minIndex = currentIndex + 1;
+    }
+  }
+  return minIndex; /* === maxIndex */
+}
+
+/**
+ * Generic helper to find out what elements are visible within a scroll pane.
+ */
+function getVisibleElements(scrollEl, views, sortByVisibility) {
+  var top = scrollEl.scrollTop, bottom = top + scrollEl.clientHeight;
+  var left = scrollEl.scrollLeft, right = left + scrollEl.clientWidth;
+
+  function isElementBottomBelowViewTop(view) {
+    var element = view.div;
+    var elementBottom =
+      element.offsetTop + element.clientTop + element.clientHeight;
+    return elementBottom > top;
+  }
+
+  var visible = [], view, element;
+  var currentHeight, viewHeight, hiddenHeight, percentHeight;
+  var currentWidth, viewWidth;
+  var firstVisibleElementInd = (views.length === 0) ? 0 :
+    binarySearchFirstItem(views, isElementBottomBelowViewTop);
+
+  for (var i = firstVisibleElementInd, ii = views.length; i < ii; i++) {
+    view = views[i];
+    element = view.div;
+    currentHeight = element.offsetTop + element.clientTop;
+    viewHeight = element.clientHeight;
+
+    if (currentHeight > bottom) {
+      break;
+    }
+
+    currentWidth = element.offsetLeft + element.clientLeft;
+    viewWidth = element.clientWidth;
+    if (currentWidth + viewWidth < left || currentWidth > right) {
+      continue;
+    }
+    hiddenHeight = Math.max(0, top - currentHeight) +
+      Math.max(0, currentHeight + viewHeight - bottom);
+    percentHeight = ((viewHeight - hiddenHeight) * 100 / viewHeight) | 0;
+
+    visible.push({
+      id: view.id,
+      x: currentWidth,
+      y: currentHeight,
+      view: view,
+      percent: percentHeight
+    });
+  }
+
+  var first = visible[0];
+  var last = visible[visible.length - 1];
+
+  if (sortByVisibility) {
+    visible.sort(function(a, b) {
+      var pc = a.percent - b.percent;
+      if (Math.abs(pc) > 0.001) {
+        return -pc;
+      }
+      return a.id - b.id; // ensure stability
+    });
+  }
+  return {first: first, last: last, views: visible};
+}
+
+/**
+ * Event handler to suppress context menu.
+ */
+function noContextMenuHandler(e) {
+  e.preventDefault();
+}
+
+/**
+ * Returns the filename or guessed filename from the url (see issue 3455).
+ * url {String} The original PDF location.
+ * @return {String} Guessed PDF file name.
+ */
+function getPDFFileNameFromURL(url) {
+  var reURI = /^(?:([^:]+:)?\/\/[^\/]+)?([^?#]*)(\?[^#]*)?(#.*)?$/;
+  //            SCHEME      HOST         1.PATH  2.QUERY   3.REF
+  // Pattern to get last matching NAME.pdf
+  var reFilename = /[^\/?#=]+\.pdf\b(?!.*\.pdf\b)/i;
+  var splitURI = reURI.exec(url);
+  var suggestedFilename = reFilename.exec(splitURI[1]) ||
+                           reFilename.exec(splitURI[2]) ||
+                           reFilename.exec(splitURI[3]);
+  if (suggestedFilename) {
+    suggestedFilename = suggestedFilename[0];
+    if (suggestedFilename.indexOf('%') !== -1) {
+      // URL-encoded %2Fpath%2Fto%2Ffile.pdf should be file.pdf
+      try {
+        suggestedFilename =
+          reFilename.exec(decodeURIComponent(suggestedFilename))[0];
+      } catch(e) { // Possible (extremely rare) errors:
+        // URIError "Malformed URI", e.g. for "%AA.pdf"
+        // TypeError "null has no properties", e.g. for "%2F.pdf"
+      }
+    }
+  }
+  return suggestedFilename || 'document.pdf';
+}
+
+var ProgressBar = (function ProgressBarClosure() {
+
+  function clamp(v, min, max) {
+    return Math.min(Math.max(v, min), max);
+  }
+
+  function ProgressBar(id, opts) {
+    this.visible = true;
+
+    // Fetch the sub-elements for later.
+    this.div = document.querySelector(id + ' .progress');
+
+    // Get the loading bar element, so it can be resized to fit the viewer.
+    this.bar = this.div.parentNode;
+
+    // Get options, with sensible defaults.
+    this.height = opts.height || 100;
+    this.width = opts.width || 100;
+    this.units = opts.units || '%';
+
+    // Initialize heights.
+    this.div.style.height = this.height + this.units;
+    this.percent = 0;
+  }
+
+  ProgressBar.prototype = {
+
+    updateBar: function ProgressBar_updateBar() {
+      if (this._indeterminate) {
+        this.div.classList.add('indeterminate');
+        this.div.style.width = this.width + this.units;
+        return;
+      }
+
+      this.div.classList.remove('indeterminate');
+      var progressSize = this.width * this._percent / 100;
+      this.div.style.width = progressSize + this.units;
+    },
+
+    get percent() {
+      return this._percent;
+    },
+
+    set percent(val) {
+      this._indeterminate = isNaN(val);
+      this._percent = clamp(val, 0, 100);
+      this.updateBar();
+    },
+
+    setWidth: function ProgressBar_setWidth(viewer) {
+      if (viewer) {
+        var container = viewer.parentNode;
+        var scrollbarWidth = container.offsetWidth - viewer.offsetWidth;
+        if (scrollbarWidth > 0) {
+          this.bar.setAttribute('style', 'width: calc(100% - ' +
+                                         scrollbarWidth + 'px);');
+        }
+      }
+    },
+
+    hide: function ProgressBar_hide() {
+      if (!this.visible) {
+        return;
+      }
+      this.visible = false;
+      this.bar.classList.add('hidden');
+      document.body.classList.remove('loadingInProgress');
+    },
+
+    show: function ProgressBar_show() {
+      if (this.visible) {
+        return;
+      }
+      this.visible = true;
+      document.body.classList.add('loadingInProgress');
+      this.bar.classList.remove('hidden');
+    }
+  };
+
+  return ProgressBar;
+})();

addressbook/crm.php

@@ -1,98 +0,0 @@
-<?php
-/**
- * EGroupware Addressbook: incomming CTI / open CRM view for a given telephon-number and user
- *
- * Usage: curl --user "<user>:<password>" "https://example.com/egroupware/addressbook/crm.php?from=<phone-number>"
- *
- * @link https://www.egroupware.org
- * @package addressbook
- * @license https://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
- */
-
-use EGroupware\Api;
-
-$GLOBALS['egw_info'] = [
-	'flags' => [
-		'disable_Template_class' => true,
-		'noheader'  => true,
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
-	]
-];
-
-$auth = $_SERVER['HTTP_AUTHORIZATION'] ?? $_SERVER['REDIRECT_HTTP_AUTHORIZATION'] ?? null;
-if (empty($auth) && empty($_SERVER['PHP_AUTH_USER']))
-{
-	http_response_code(401);
-	header('WWW-Authenticate: Basic realm="EGroupware"');
-	header('WWW-Authenticate: Bearer realm="EGroupware CTI"', false);
-	exit;
-}
-
-// basic auth
-if (!empty($_SERVER['PHP_AUTH_USER']) || stripos($auth, 'Basic') === 0)
-{
-	$GLOBALS['egw_info']['flags'] += [
-		'currentapp' => 'addressbook',
-		'autocreate_session_callback' => 'EGroupware\\Api\\Header\\Authenticate::autocreate_session_callback',
-	];
-}
-// bearer token
-else
-{
-	$GLOBALS['egw_info']['flags'] += [
-		'currentapp' => 'login',
-	];
-}
-
-include dirname(__DIR__).'/header.inc.php';
-
-//print_r($_SERVER);
-//echo substr(print_r($GLOBALS['egw_info']['user'], true), 0, 256)." ...\n";
-
-if (stripos($auth, 'Bearer') === 0)
-{
-	http_response_code(500);
-	error_log("crm.php: ToDo: Bearer token support");
-	die("ToDo: Bearer token support\n");
-}
-else
-{
-	$account_id = $GLOBALS['egw_info']['user']['account_id'];
-	$user = $GLOBALS['egw_info']['user']['account_lid'];
-}
-
-if ($_SERVER['REQUEST_METHOD'] === 'GET')
-{
-	if (empty($_GET['from']))
-	{
-		http_response_code(400);
-		error_log("crm.php: Missing 'from' GET parameter");
-		die("Missing 'from' GET parameter\n");
-	}
-	$from = $_GET['from'];
-
-	// fix missing url-encoding of +49...
-	if (preg_match('/^ [\d]+/', $from))
-	{
-		$from[0] = '+';
-	}
-}
-else
-{
-	switch($_SERVER['REQUEST_METHOD'].'-'.$_SERVER['HTTP_CONTENT_TYPE'])
-	{
-		default:
-			http_response_code(500);
-			error_log("crm.php: No support for $_SERVER[REQUEST_METHOD]-$_SERVER[HTTP_CONTENT_TYPE]");
-			die("No support for $_SERVER[REQUEST_METHOD]-$_SERVER[HTTP_CONTENT_TYPE]\n");
-	}
-}
-
-try {
-	$contacts = new Api\Contacts();
-	$contacts->openCrmView($from);
-}
-catch (\Exception $e) {
-	error_log("crm.php: No contact for from=$from found!");
-	die("No contact for from=$from found!\n");
-}

addressbook/inc/class.addressbook_display.inc.php

@@ -18,10 +18,10 @@ use EGroupware\Api;
  */
 class addressbook_display extends addressbook_ui
 {
-	function get_rows(&$query,&$rows,&$readonlys,$id_only=false)
+	function get_rows(&$query,&$rows,&$readonlys)
 	{
 		$query['sitemgr_display'] = ($readonlys['sitemgr_display'] ?$readonlys['sitemgr_display']:'addressbook.display');
-		$total = parent::get_rows($query,$rows,$readonlys, $id_only);
+		$total = parent::get_rows($query,$rows,$readonlys);
 		$query['template'] = $query['sitemgr_display'].'.rows';
 
 		if (is_array($query['fields'])) foreach($query['fields'] as $name)

addressbook/inc/class.addressbook_export_contacts_csv.inc.php

@@ -31,11 +31,6 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
 	{
 		$this->ui= new addressbook_ui();
 		$this->get_selects();
-
-		// Override types so we can specify owner 0 = 'Accounts'
-		$this->types = addressbook_egw_record::$types;
-		$this->types['select-account'] = array_diff($this->types['select-account'], ['owner']);
-		$this->types['select'][] = 'owner';
 	}
 
 	/**
@@ -292,7 +287,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
 			// Some conversion
 			$this->convert($contact, $options);
 			if($options['convert']) {
-				importexport_export_csv::convert($contact, $this->types, 'addressbook',$this->selects);
+				importexport_export_csv::convert($contact, addressbook_egw_record::$types, 'addressbook',$this->selects);
 			} else {
 				// Implode arrays, so they don't say 'Array'
 				foreach($contact->get_record_array() as $key => $value) {
@@ -430,8 +425,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
 	protected function get_selects()
 	{
 		$this->selects = array(
-			'tid' => array('n' => 'Contact'),
-			'owner' => $this->ui->get_addressbooks(Api\Acl::READ)
+			'tid' => array('n' => 'Contact')
 		);
 		foreach($this->ui->content_types as $tid => $data)
 		{

addressbook/inc/class.addressbook_groupdav.inc.php

@@ -13,7 +13,6 @@
 
 use EGroupware\Api;
 use EGroupware\Api\Acl;
-use EGroupware\Api\Contacts\JsContact;
 
 /**
  * CalDAV/CardDAV/GroupDAV access: Addressbook handler
@@ -61,18 +60,6 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 	 */
 	var $home_set_pref;
 
-	/**
-	 * Prefix for JsCardGroup id
-	 */
-	const JS_CARDGROUP_ID_PREFIX = 'list-';
-
-	/**
-	 * Contains IDs for multiget REPORT to be able to report missing ones
-	 *
-	 * @var string[]
-	 */
-	var $requested_multiget_ids;
-
 	/**
 	 * Constructor
 	 *
@@ -85,14 +72,9 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 
 		$this->bo = new Api\Contacts();
 
-		if (Api\CalDAV::isJSON())
-		{
-			self::$path_attr = 'id';
-			self::$path_extension = '';
-		}
 		// since 1.9.007 we allow clients to specify the URL when creating a new contact, as specified by CardDAV
 		// LDAP does NOT have a carddav_name attribute --> stick with id mapped to LDAP attribute uid
-		elseif (version_compare($GLOBALS['egw_info']['apps']['api']['version'], '1.9.007', '<') ||
+		if (version_compare($GLOBALS['egw_info']['apps']['api']['version'], '1.9.007', '<') ||
 			$this->bo->contact_repository != 'sql' ||
 			$this->bo->account_repository != 'sql' && strpos($_SERVER['REQUEST_URI'].'/','/addressbook-accounts/') !== false)
 		{
@@ -105,11 +87,8 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 		}
 		if ($this->debug) error_log(__METHOD__."() contact_repository={$this->bo->contact_repository}, account_repository={$this->bo->account_repository}, REQUEST_URI=$_SERVER[REQUEST_URI] --> path_attr=".self::$path_attr.", path_extension=".self::$path_extension);
 
-		$this->home_set_pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'] ?? [];
-		if (!is_array($this->home_set_pref))
-		{
-			$this->home_set_pref = $this->home_set_pref ? explode(',', $this->home_set_pref) : array();
-		}
+		$this->home_set_pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
+		$this->home_set_pref = $this->home_set_pref ? explode(',',$this->home_set_pref) : array();
 
 		// silently switch "Sync all into one" preference on for OS X addressbook, as it only supports one AB
 		// this restores behavior before Lion (10.7), where AB synced all ABs contained in addressbook-home-set
@@ -185,58 +164,39 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 
 		if (isset($nresults))
 		{
-			$files['files'] = $this->propfind_generator($path, $filter, $files['files'], (int)$nresults);
+			$files['files'] = $this->propfind_callback($path, $filter, array(0, (int)$nresults));
 
 			// hack to support limit with sync-collection report: contacts are returned in modified ASC order (oldest first)
-			// if limit is smaller than full result, return modified-1 as sync-token, so client requests next chunk incl. modified
+			// if limit is smaller then full result, return modified-1 as sync-token, so client requests next chunk incl. modified
 			// (which might contain further entries with identical modification time)
 			if ($options['root']['name'] == 'sync-collection' && $this->bo->total > $nresults)
 			{
 				--$this->sync_collection_token;
-				$files['sync-token-params'][] = true;	// tell get_sync_collection_token that we have more entries
+				$files['sync-token-params'][] = true;	// tel get_sync_collection_token that we have more entries
 			}
 		}
 		else
 		{
-			// return iterator, calling ourselves to return result in chunks
-			$files['files'] = $this->propfind_generator($path,$filter, $files['files']);
+			// return iterator, calling ourself to return result in chunks
+			$files['files'] = new Api\CalDAV\PropfindIterator($this,$path,$filter,$files['files']);
 		}
 		return true;
 	}
 
 	/**
-	 * Chunk-size for DB queries of profind_generator
-	 */
-	const CHUNK_SIZE = 500;
-
-	/**
-	 * Generator for propfind with ability to skip reporting not found ids
+	 * Callback for profind iterator
 	 *
 	 * @param string $path
 	 * @param array& $filter
-	 * @param array $extra extra resources like the collection itself
-	 * @param int|null $nresults option limit of number of results to report
-	 * @param boolean $report_not_found_multiget_ids=true
-	 * @return Generator<array with values for keys path and props>
-	 * @ToDo also use CHUNK_SIZE when querying lists
+	 * @param array|boolean $start =false false=return all or array(start,num)
+	 * @return array with "files" array with values for keys path and props
 	 */
-	function propfind_generator($path, array &$filter, array $extra=[], $nresults=null, $report_not_found_multiget_ids=true)
+	function &propfind_callback($path,array &$filter,$start=false,$report_not_found_multiget_ids=true)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($filter).", ".array2string($start).", $report_not_found_multiget_ids)");
 		$starttime = microtime(true);
 		$filter_in = $filter;
 
-		// yield extra resources like the root itself
-		$yielded = 0;
-		foreach($extra as $resource)
-		{
-			if (++$yielded && isset($nresults) && $yielded > $nresults)
-			{
-				return;
-			}
-			yield $resource;
-		}
-
 		if (($address_data = $filter['address_data']))
 		{
 			$handler = self::_get_handler();
@@ -256,11 +216,10 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 		$sync_collection_report = $filter['sync-collection'];
 		unset($filter['sync-collection']);
 
-		// stop output buffering switched on to log the response, if we should return more than 200 entries
-		if (!empty($this->requested_multiget_ids) && ob_get_level() && count($this->requested_multiget_ids) > 200)
+		if (isset($filter[self::$path_attr]))
 		{
-			$this->caldav->log("### ".count($this->requested_multiget_ids)." resources requested in multiget REPORT --> turning logging off to allow streaming of the response");
-			ob_end_flush();
+			if (!is_array($filter[self::$path_attr])) $filter[self::$path_attr] = (array)$filter[self::$path_attr];
+			$requested_multiget_ids =& $filter[self::$path_attr];
 		}
 
 		$files = array();
@@ -269,69 +228,33 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 		if (!in_array(self::$path_attr,$cols)) $cols[] = self::$path_attr;
 		// we need tid for sync-collection report
 		if (array_key_exists('tid', $filter) && !isset($filter['tid']) && !in_array('tid', $cols)) $cols[] = 'tid';
-		for($chunk=0; ($contacts =& $this->bo->search([], $cols, $order, '', '', False, 'AND',
-			[$chunk*self::CHUNK_SIZE, self::CHUNK_SIZE], $filter)); ++$chunk)
+		if (($contacts =& $this->bo->search(array(),$cols,$order,'','',False,'AND',$start,$filter)))
 		{
-			// filter[tid] === null also returns no longer shared contacts, to remove them from devices, we need to mark them here as deleted
-			// to do so we need to read not deleted sharing info of potential candidates (not deleted and no regular access), as search does NOT
-			$id2key = [];
-			foreach($contacts as $key => &$contact)
-			{
-				if ($contact['tid'] !== Api\Contacts::DELETED_TYPE &&
-					// check for (deleted) shared access
-					(!isset($filter['owner']) || !in_array($contact['owner'], (array)$filter['owner'])) &&
-					!$this->bo->check_perms(Acl::READ, $contact, false, $this->user, 0))
-				{
-					$id2key[$contact['id']] = $key;
-				}
-			}
-			if ($id2key)
-			{
-				foreach($this->bo->read_shared(array_keys($id2key), false) as $id => $shared)
-				{
-					$contacts[$id2key[$id]]['shared'] = $shared;
-					if (!$this->bo->check_perms(Acl::READ, $contact, false, $this->user))
-					{
-						$contacts[$id2key[$id]]['tid'] = Api\Contacts::DELETED_TYPE;
-					}
-				}
-			}
-
-			$is_jscontact = Api\CalDAV::isJSON();
 			foreach($contacts as &$contact)
 			{
 				// remove contact from requested multiget ids, to be able to report not found urls
-				if (!empty($this->requested_multiget_ids) && ($k = array_search($contact[self::$path_attr], $this->requested_multiget_ids)) !== false)
+				if ($requested_multiget_ids && ($k = array_search($contact[self::$path_attr], $requested_multiget_ids)) !== false)
 				{
-					unset($this->requested_multiget_ids[$k]);
+					unset($requested_multiget_ids[$k]);
 				}
 				// sync-collection report: deleted entry need to be reported without properties
 				if ($contact['tid'] == Api\Contacts::DELETED_TYPE)
 				{
-					if (++$yielded && isset($nresults) && $yielded > $nresults)
-					{
-						return;
-					}
-					yield ['path' => $path.urldecode($this->get_path($contact))];
+					$files[] = array('path' => $path.urldecode($this->get_path($contact)));
 					continue;
 				}
 				$props = array(
-					'getcontenttype' => Api\CalDAV::mkprop('getcontenttype', $is_jscontact ? JsContact::MIME_TYPE_JSCARD : 'text/vcard'),
+					'getcontenttype' => Api\CalDAV::mkprop('getcontenttype', 'text/vcard'),
 					'getlastmodified' => $contact['modified'],
 					'displayname' => $contact['n_fn'],
 				);
 				if ($address_data)
 				{
-					$content = $is_jscontact ? JsContact::getJsCard($contact['id'], false) :
-						$handler->getVCard($contact['id'],$this->charset,false);
-					$props['getcontentlength'] = bytes(is_array($content) ? json_encode($content) : $content);
-					$props['address-data'] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'address-data', $content);
+					$content = $handler->getVCard($contact['id'],$this->charset,false);
+					$props['getcontentlength'] = bytes($content);
+					$props[] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'address-data', $content);
 				}
-				if (++$yielded && isset($nresults) && $yielded > $nresults)
-				{
-					return;
-				}
-				yield $this->add_resource($path, $contact, $props);
+				$files[] = $this->add_resource($path, $contact, $props);
 			}
 			// sync-collection report --> return modified of last contact as sync-token
 			if ($sync_collection_report)
@@ -339,110 +262,93 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 				$this->sync_collection_token = $contact['modified'];
 			}
 		}
-
-		// add accounts after contacts, if enabled and stored in different repository
-		if ($this->bo->so_accounts && is_array($filter['owner']) && in_array('0', $filter['owner']))
+		// last chunk or no chunking: add accounts from different repo and report missing multiget urls
+		if (!$start || (empty($contact)?0:count($contacts)) < $start[1])
 		{
-			$accounts_filter = $filter_in;
-			$accounts_filter['owner'] = '0';
-			if ($sync_collection_report) $token_was = $this->sync_collection_token;
-			self::$path_attr = 'id';
-			self::$path_extension = '.vcf';
-			foreach($this->propfind_generator($path, $accounts_filter, [], $nresults, false) as $resource)
+			//error_log(__METHOD__."('$path', ".array2string($filter).", ".array2string($start)."; $report_not_found_multiget_ids) last chunk detected: count()=".count($contacts)." < $start[1]");
+			// add accounts after contacts, if enabled and stored in different repository
+			if ($this->bo->so_accounts && is_array($filter['owner']) && in_array('0', $filter['owner']))
 			{
-				if (++$yielded && isset($nresults) && $yielded > $nresults)
+				$accounts_filter = $filter_in;
+				$accounts_filter['owner'] = '0';
+				if ($sync_collection_report) $token_was = $this->sync_collection_token;
+				self::$path_attr = 'id';
+				self::$path_extension = '.vcf';
+				$files = array_merge($files, $this->propfind_callback($path, $accounts_filter, false, false));
+				self::$path_attr = 'carddav_name';
+				self::$path_extension = '';
+				if ($sync_collection_report && $token_was > $this->sync_collection_token)
 				{
-					return;
+					$this->sync_collection_token = $token_was;
 				}
-				yield $resource;
 			}
-			self::$path_attr = 'carddav_name';
-			self::$path_extension = '';
-			if ($sync_collection_report && $token_was > $this->sync_collection_token)
+			// add groups after contacts, but only if enabled and NOT for '/addressbook/' (!isset($filter['owner'])
+			if (in_array('D',$this->home_set_pref) && (string)$filter['owner'] !== '0')
 			{
-				$this->sync_collection_token = $token_was;
-			}
-		}
-
-		// add groups after contacts, but only if enabled and NOT for '/addressbook/' (!isset($filter['owner'])
-		if (in_array('D',$this->home_set_pref) && (string)$filter['owner'] !== '0')
-		{
-			$where = array(
-				'list_owner' => isset($filter['owner'])?$filter['owner']:array_keys($this->bo->grants)
-			);
-			// add sync-token to support sync-collection report
-			if ($sync_collection_report)
-			{
-				list(,$sync_token) = explode('>', $filter[0]);
-				if ((int)$sync_token) $where[] = 'list_modified>'.$GLOBALS['egw']->db->from_unixtime((int)$sync_token);
-			}
-			if (isset($filter[self::$path_attr]))	// multiget report?
-			{
-				$where['list_'.self::$path_attr] = $filter[self::$path_attr];
-			}
-			//error_log(__METHOD__."() filter=".array2string($filter).", do_groups=".in_array('D',$this->home_set_pref).", where=".array2string($where));
-			if(($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))	// limit to contacts in same AB!
-			{
-				foreach($lists as $list)
+				$where = array(
+					'list_owner' => isset($filter['owner'])?$filter['owner']:array_keys($this->bo->grants)
+				);
+				// add sync-token to support sync-collection report
+				if ($sync_collection_report)
 				{
-					$list[self::$path_attr] = $is_jscontact ? self::JS_CARDGROUP_ID_PREFIX.$list['list_id'] : $list['list_carddav_name'];
-					$etag = $list['list_id'].':'.$list['list_etag'];
-					// for all-in-one addressbook, add selected ABs to etag
-					if (isset($filter['owner']) && is_array($filter['owner']))
+					list(,$sync_token) = explode('>', $filter[0]);
+					if ((int)$sync_token) $where[] = 'list_modified>'.$GLOBALS['egw']->db->from_unixtime((int)$sync_token);
+				}
+				if (isset($filter[self::$path_attr]))	// multiget report?
+				{
+					$where['list_'.self::$path_attr] = $filter[self::$path_attr];
+				}
+				//error_log(__METHOD__."() filter=".array2string($filter).", do_groups=".in_array('D',$this->home_set_pref).", where=".array2string($where));
+				if (($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))	// limit to contacts in same AB!
+				{
+					foreach($lists as $list)
 					{
-						$etag .= ':'.implode('-',$filter['owner']);
-					}
-					$props = array(
-						'getcontenttype' => Api\CalDAV::mkprop('getcontenttype', $is_jscontact ? JsContact::MIME_TYPE_JSCARDGROUP : 'text/vcard'),
-						'getlastmodified' => Api\DateTime::to($list['list_modified'],'ts'),
-						'displayname' => $list['list_name'],
-						'getetag' => '"'.$etag.'"',
-					);
-					if ($address_data)
-					{
-						$content = $is_jscontact ? JsContact::getJsCardGroup($list, false) : $handler->getGroupVCard($list);
-						$props['getcontentlength'] = bytes(is_array($content) ? json_encode($content) : $content);
-						$props['address-data'] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'address-data', $content);
-					}
-					if (++$yielded && isset($nresults) && $yielded > $nresults)
-					{
-						return;
-					}
-					yield $this->add_resource($path, $list, $props);
+						$list[self::$path_attr] = $list['list_carddav_name'];
+						$etag = $list['list_id'].':'.$list['list_etag'];
+						// for all-in-one addressbook, add selected ABs to etag
+						if (isset($filter['owner']) && is_array($filter['owner']))
+						{
+							$etag .= ':'.implode('-',$filter['owner']);
+						}
+						$props = array(
+							'getcontenttype' => Api\CalDAV::mkprop('getcontenttype', 'text/vcard'),
+							'getlastmodified' => Api\DateTime::to($list['list_modified'],'ts'),
+							'displayname' => $list['list_name'],
+							'getetag' => '"'.$etag.'"',
+						);
+						if ($address_data)
+						{
+							$content = $handler->getGroupVCard($list);
+							$props['getcontentlength'] = bytes($content);
+							$props[] = Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'address-data', $content);
+						}
+						$files[] = $this->add_resource($path, $list, $props);
 
-					// remove list from requested multiget ids, to be able to report not found urls
-					if (!empty($this->requested_multiget_ids) && ($k = array_search($list[self::$path_attr], $this->requested_multiget_ids)) !== false)
-					{
-						unset($this->requested_multiget_ids[$k]);
-					}
+						// remove list from requested multiget ids, to be able to report not found urls
+						if ($requested_multiget_ids && ($k = array_search($list[self::$path_attr], $requested_multiget_ids)) !== false)
+						{
+							unset($requested_multiget_ids[$k]);
+						}
 
-					if ($sync_collection_report && $this->sync_collection_token < ($ts=$GLOBALS['egw']->db->from_timestamp($list['list_modified'])))
-					{
-						$this->sync_collection_token = $ts;
+						if ($sync_collection_report && $this->sync_collection_token < ($ts=$GLOBALS['egw']->db->from_timestamp($list['list_modified'])))
+						{
+							$this->sync_collection_token = $ts;
+						}
 					}
 				}
 			}
+			// report not found multiget urls
+			if ($report_not_found_multiget_ids && $requested_multiget_ids)
+			{
+				foreach($requested_multiget_ids as $id)
+				{
+					$files[] = array('path' => $path.$id.self::$path_extension);
+				}
+			}
 		}
 
-		// report not found multiget urls
-		if ($report_not_found_multiget_ids && !empty($this->requested_multiget_ids))
-		{
-			foreach($this->requested_multiget_ids as $id)
-			{
-				if (++$yielded && isset($nresults) && $yielded > $nresults)
-				{
-					return;
-				}
-				yield ['path' => $path.$id.self::$path_extension];
-			}
-		}
-
-		if ($this->debug)
-		{
-			error_log(__METHOD__."($path, filter=".json_encode($filter).', extra='.json_encode($extra).
-				", nresults=$nresults, report_not_found=$report_not_found_multiget_ids) took ".
-				(microtime(true) - $starttime)." to return $yielded resources");
-		}
+		if ($this->debug) error_log(__METHOD__."($path,".array2string($filter).','.array2string($start).") took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		return $files;
 	}
 
 	/**
@@ -506,7 +412,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 						}
 						else
 						{
-							switch($filter['attrs']['collation'])	// todo: which other collations allowed, we are always unicode
+							switch($filter['attrs']['collation'])	// todo: which other collations allowed, we are allways unicode
 							{
 								case 'i;unicode-casemap':
 								default:
@@ -602,10 +508,9 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 			}
 		}
 		// multiget --> fetch the url's
-		$this->requested_multiget_ids = null;
 		if ($options['root']['name'] == 'addressbook-multiget')
 		{
-			$this->requested_multiget_ids = [];
+			$ids = array();
 			foreach($options['other'] as $option)
 			{
 				if ($option['name'] == 'href')
@@ -613,12 +518,12 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 					$parts = explode('/',$option['data']);
 					if (($id = urldecode(array_pop($parts))))
 					{
-						$this->requested_multiget_ids[] = self::$path_extension ? basename($id,self::$path_extension) : $id;
+						$ids[] = self::$path_extension ? basename($id,self::$path_extension) : $id;
 					}
 				}
 			}
-			if ($this->requested_multiget_ids) $filters[self::$path_attr] = $this->requested_multiget_ids;
-			if ($this->debug) error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',', $this->requested_multiget_ids));
+			if ($ids) $filters[self::$path_attr] = $ids;
+			if ($this->debug) error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',',$ids));
 		}
 		elseif ($id)
 		{
@@ -644,22 +549,11 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 		{
 			return $contact;
 		}
-		// jsContact or vCard
-		if (($type=Api\CalDAV::isJSON()))
-		{
-			$options['data'] = $contact['list_id'] ? JsContact::getJsCardGroup($contact, $type) :
-				JsContact::getJsCard($contact, $type);
-			$options['mimetype'] = ($contact['list_id'] ? JsContact::MIME_TYPE_JSCARDGROUP :
-				JsContact::MIME_TYPE_JSCARD).';charset=utf-8';
-		}
-		else
-		{
-			$handler = self::_get_handler();
-			$options['data'] = $contact['list_id'] ? $handler->getGroupVCard($contact) :
-				$handler->getVCard($contact['id'], $this->charset, false);
-			// e.g. Evolution does not understand 'text/vcard'
-			$options['mimetype'] = 'text/x-vcard; charset=' . $this->charset;
-		}
+		$handler = self::_get_handler();
+		$options['data'] = $contact['list_id'] ? $handler->getGroupVCard($contact) :
+			$handler->getVCard($contact['id'],$this->charset,false);
+		// e.g. Evolution does not understand 'text/vcard'
+		$options['mimetype'] = 'text/x-vcard; charset='.$this->charset;
 		header('Content-Encoding: identity');
 		header('ETag: "'.$this->get_etag($contact).'"');
 		return true;
@@ -672,91 +566,45 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 	 * @param int $id
 	 * @param int $user =null account_id of owner, default null
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
-	 * @param string $method='PUT' also called for POST and PATCH
-	 * @param string $content_type=null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options, $id, $user=null, $prefix=null, string $method='PUT', string $content_type=null)
+	function put(&$options,$id,$user=null,$prefix=null)
 	{
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).",$id,$user)");
 
-		$oldContact = $this->_common_get_put_delete($method,$options,$id);
+		$oldContact = $this->_common_get_put_delete('PUT',$options,$id);
 		if (!is_null($oldContact) && !is_array($oldContact))
 		{
 			if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($oldContact));
 			return $oldContact;
 		}
 
-		$type = null;
-		if (($is_json=Api\CalDAV::isJSON($type)))
+		$handler = self::_get_handler();
+		// Fix for Apple Addressbook
+		$vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1',
+			htmlspecialchars_decode($options['content']));
+		$charset = null;
+		if (!empty($options['content_type']))
 		{
-			if (strpos($type, JsContact::MIME_TYPE_JSCARD) === false && strpos($type, JsContact::MIME_TYPE_JSCARDGROUP) === false)
+			$content_type = explode(';', $options['content_type']);
+			if (count($content_type) > 1)
 			{
-				if (!empty($id))
+				array_shift($content_type);
+				foreach ($content_type as $attribute)
 				{
-					$type = strpos($id, self::JS_CARDGROUP_ID_PREFIX) === 0 ? JsContact::MIME_TYPE_JSCARDGROUP : JsContact::MIME_TYPE_JSCARD;
-				}
-				else
-				{
-					$json = json_decode($options['content'], true);
-					$type = is_array($json['members']) ? JsContact::MIME_TYPE_JSCARDGROUP : JsContact::MIME_TYPE_JSCARD;
-				}
-			}
-			$contact = $type === JsContact::MIME_TYPE_JSCARD ?
-				JsContact::parseJsCard($options['content'], $oldContact ?: [], $content_type, $method) :
-				JsContact::parseJsCardGroup($options['content']);
-
-			if (!empty($id) && strpos($id, self::JS_CARDGROUP_ID_PREFIX) === 0)
-			{
-				$id = substr($id, strlen(self::JS_CARDGROUP_ID_PREFIX));
-			}
-			elseif (empty($id))
-			{
-				$contact['cardav_name'] = $contact['uid'].'.vcf';
-				$contact['owner'] = $user;
-			}
-
-			/* uncomment to return parsed data for testing
-			header('Content-Type: application/json');
-			echo json_encode($contact, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
-			return "200 Ok";
-			*/
-		}
-		else
-		{
-			$handler = self::_get_handler();
-			// Fix for Apple Addressbook
-			$vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1',
-				htmlspecialchars_decode($options['content']));
-			$charset = null;
-			if (!empty($options['content_type']))
-			{
-				$content_type = explode(';', $options['content_type']);
-				if (count($content_type) > 1)
-				{
-					array_shift($content_type);
-					foreach ($content_type as $attribute)
+					trim($attribute);
+					list($key, $value) = explode('=', $attribute);
+					switch (strtolower($key))
 					{
-						trim($attribute);
-						list($key, $value) = explode('=', $attribute);
-						// check if value is enclosed in quotes
-						if (in_array($value[0], ['"', "'"], true) && $value[0] === substr($value, -1))
-						{
-							$value = substr($value,1,-1);
-						}
-						switch (strtolower($key))
-						{
-							case 'charset':
-								$charset = strtoupper($value);
-								break;
-						}
+						case 'charset':
+							$charset = strtoupper(substr($value,1,-1));
 					}
 				}
 			}
-
-			$contact = $handler->vcardtoegw($vCard, $charset);
 		}
 
+		$contact = $handler->vcardtoegw($vCard, $charset);
+
 		if (is_array($oldContact) || ($oldContact = $this->bo->read(array('contact_uid' => $contact['uid']))))
 		{
 			$contactId = $oldContact['id'];
@@ -768,7 +616,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 			$contactId = -1;
 			$retval = '201 Created';
 		}
-		$is_group = isset($type) && $type === JsContact::MIME_TYPE_JSCARDGROUP || $contact['##X-ADDRESSBOOKSERVER-KIND'] === 'group';
+		$is_group = $contact['##X-ADDRESSBOOKSERVER-KIND'] == 'group';
 		if ($oldContact && $is_group !== isset($oldContact['list_id']))
 		{
 			throw new Api\Exception\AssertionFailed(__METHOD__."(,'$id',$user,'$prefix') can contact into group or visa-versa!");
@@ -780,19 +628,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 		}
 		elseif ($contactId > 0)
 		{
-			switch(Api\CalDAV\Handler::get_agent())
-			{
-				case 'davx5':
-					// DAVx5 does not always give us our categories back (Seems to depend on client)
-					if(is_null($contact['cat_id']) && $oldContact['cat_id'])
-					{
-						$contact['cat_id'] = $oldContact['cat_id'];
-					}
-					break;
-				default:
-					//
-					$contact['cat_id'] = null;
-			}
+			$contact['cat_id'] = null;
 		}
 		if (is_array($oldContact))
 		{
@@ -809,10 +645,10 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 		}
 		else
 		{
-			$contact['carddav_name'] = (!empty($id) ? basename($id, '.vcf') : $contact['uid']).'.vcf';
+			$contact['carddav_name'] = $id;
 
 			// only set owner, if user is explicitly specified in URL (check via prefix, NOT for /addressbook/) or sync-all-in-one!)
-			if ($prefix && ($is_json || !in_array('O',$this->home_set_pref)) && $user)
+			if ($prefix && !in_array('O',$this->home_set_pref) && $user)
 			{
 				$contact['owner'] = $user;
 			}
@@ -836,8 +672,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 		}
 		if ($this->http_if_match) $contact['etag'] = self::etag2value($this->http_if_match);
 
-		// ignore photo for JSON/REST, it's not yet supported
-		$contact['photo_unchanged'] = $is_json; //false;	// photo needs saving
+		$contact['photo_unchanged'] = false;	// photo needs saving
 		if (!($save_ok = $is_group ? $this->save_group($contact, $oldContact) : $this->bo->save($contact)))
 		{
 			if ($this->debug) error_log(__METHOD__."(,$id) save(".array2string($contact).") failed, Ok=$save_ok");
@@ -856,7 +691,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 			{
 				if (($contact = $this->bo->read_list($save_ok)))
 				{
-					// re-read group to get correct etag (not duplicate etag code here)
+					// re-read group to get correct etag (not dublicate etag code here)
 					$contact = $this->read($contact['list_'.self::$path_attr], $options['path']);
 				}
 			}
@@ -867,18 +702,15 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 			//error_log(__METHOD__."(, $id, '$user') read(_list)($save_ok) returned ".array2string($contact));
 		}
 
-		// send evtl. necessary response headers: Location, etag, ...
-		$this->put_response_headers($contact, $options['path'], $retval,
-			// JSON uses 'id', while CardDAV uses carddav_name !== 'id'
-			(self::$path_attr !== 'id') === !$is_json, null,
-			$is_group && $is_json ? self::JS_CARDGROUP_ID_PREFIX : '');
+		// send evtl. necessary respose headers: Location, etag, ...
+		$this->put_response_headers($contact, $options['path'], $retval, self::$path_attr != 'id');
 
 		if ($this->debug > 1) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($retval));
 		return $retval;
 	}
 
 	/**
-	 * Save distribution-list / group
+	 * Save distribition-list / group
 	 *
 	 * @param array $contact
 	 * @param array|false $oldContact
@@ -897,21 +729,18 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 			$contact['owner'], null, $data)))
 		{
 			// update members given in $contact['##X-ADDRESSBOOKSERVER-MEMBER']
-			$new_members = $contact['members'] ?: $contact['##X-ADDRESSBOOKSERVER-MEMBER'];
-			if (is_string($new_members) && $new_members[1] === ':' && ($n = unserialize($new_members)))
+			$new_members = $contact['##X-ADDRESSBOOKSERVER-MEMBER'];
+			if ($new_members[1] == ':' && ($n = unserialize($new_members)))
 			{
 				$new_members = $n['values'];
 			}
 			else
 			{
-				$new_members = (array)$new_members;
+				$new_members = array($new_members);
 			}
 			foreach($new_members as &$uid)
 			{
-				if (substr($uid, 0, 9) === 'urn:uuid:')
-				{
-					$uid = substr($uid,9);	// cut off "urn:uuid:" prefix
-				}
+				$uid = substr($uid,9);	// cut off "urn:uuid:" prefix
 			}
 			if ($oldContact)
 			{
@@ -948,7 +777,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 			// reread as update of list-members updates etag and modified
 			if (($contact = $this->bo->read_list($list_id)))
 			{
-				// re-read group to get correct etag (not duplicate etag code here)
+				// re-read group to get correct etag (not dublicate etag code here)
 				$contact = $this->read($contact['list_'.self::$path_attr]);
 			}
 		}
@@ -1040,10 +869,14 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 			'addressbook-multiget' => Api\CalDAV::mkprop('supported-report',array(
 				Api\CalDAV::mkprop('report',array(
 					Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-multiget',''))))),
-			'sync-collection' => Api\CalDAV::mkprop('supported-report',array(
-		Api\CalDAV::mkprop('report',array(
-			Api\CalDAV::mkprop('sync-collection',''))))),
 		);
+		// only advertice rfc 6578 sync-collection report, if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
+		if ($GLOBALS['egw_info']['server']['history'])
+		{
+			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report',array(
+				Api\CalDAV::mkprop('report',array(
+					Api\CalDAV::mkprop('sync-collection','')))));
+		}
 		return $props;
 	}
 
@@ -1143,30 +976,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 			unset($tids[Api\Contacts::DELETED_TYPE]);
 			$non_deleted_tids = array_keys($tids);
 		}
-		$keys = ['tid' => $non_deleted_tids];
-
-		// with REST/JSON we only use our id, but DELETE request has neither Accept nor Content-Type header to detect JSON request
-		if (preg_match('/^('.self::JS_CARDGROUP_ID_PREFIX.')?(\d+)$/', $id, $matches))
-		{
-			if (!empty($matches[1]))
-			{
-				$keys = ['list_id' => $matches[2]];
-			}
-			else
-			{
-				$keys['id'] = $id;
-			}
-		}
-		// json with uid
-		elseif (empty(self::$path_extension) && self::$path_attr === 'id' && (string)$id !== (string)(int)$id)
-		{
-			$keys['uid'] = $id;
-		}
-		else
-		{
-			$keys[self::$path_attr] = $id;
-		}
-		$contact = isset($keys['list_id']) ? false: $this->bo->read($keys);
+		$contact = $this->bo->read(array(self::$path_attr => $id, 'tid' => $non_deleted_tids));
 
 		// if contact not found and accounts stored NOT like contacts, try reading it without path-extension as id
 		if (is_null($contact) && $this->bo->so_accounts && ($c = $this->bo->read($test=basename($id, '.vcf'))))
@@ -1186,13 +996,12 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 			$limit_in_ab[] = $GLOBALS['egw_info']['user']['account_id'];
 		}
 		/* we are currently not syncing distribution-lists/groups to /addressbook/ as
-		 * Apple clients use that only as directory gateway*/
-		elseif (Api\CalDAV::isJSON() && $account_lid == 'addressbook')	// /addressbook/ contains all readably contacts
+		 * Apple clients use that only as directory gateway
+		elseif ($account_lid == 'addressbook')	// /addressbook/ contains all readably contacts
 		{
 			$limit_in_ab = array_keys($this->bo->grants);
-		}
-		if (!$contact && ($contact = $this->bo->read_lists(isset($keys['list_id']) ? $keys :
-			['list_'.self::$path_attr => $id],'contact_uid',$limit_in_ab)))
+		}*/
+		if (!$contact && ($contact = $this->bo->read_lists(array('list_'.self::$path_attr => $id),'contact_uid',$limit_in_ab)))
 		{
 			$contact = array_shift($contact);
 			$contact['n_fn'] = $contact['n_family'] = $contact['list_name'];
@@ -1365,4 +1174,4 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 		);
 		return $settings;
 	}
-}
+}

addressbook/inc/class.addressbook_hooks.inc.php

@@ -38,7 +38,7 @@ class addressbook_hooks
 			{
 				display_sidebox($appname, lang('Contact data'), array(
 					array(
-						'text'    => '<div id="'.self::getViewDOMID($_GET['contact_id'], $_GET['crm_list']).'" class="addressbook_view_sidebox"/>',
+						'text'    => '<div id="addressbook_view_sidebox"/>',
 						'no_lang' => true,
 						'link'    => false,
 						'icon'    => false,
@@ -59,9 +59,8 @@ class addressbook_hooks
 					'link' => "javascript:egw.open('','$appname','add')"
 				),
 				'Advanced search' => "javascript:egw_openWindowCentered2('".
-					Egw::link('/index.php',array('menuaction' => 'addressbook.addressbook_ui.extSearch'),false).
+					Egw::link('/index.php',array('menuaction' => 'addressbook.addressbook_ui.search'),false).
 					"','_blank',870,610,'yes')",
-				['text'=>'--'],
 				'Placeholders'    => Egw::link('/index.php','menuaction=api.EGroupware\\Api\\Contacts\\Merge.show_replacements')
 			);
 			display_sidebox($appname,lang('Addressbook menu'),$file);
@@ -103,17 +102,6 @@ class addressbook_hooks
 		}
 	}
 
-	/**
-	 * Generate unique Id for addressbook view sidebox
-	 * @param $contact_id
-	 * @param $view
-	 * @return string
-	 */
-	static function getViewDOMID($contact_id, $view)
-	{
-		return 'addressbook_'.$contact_id.'_'.$view.'_view_sidebox';
-	}
-
 	/**
 	 * populates $settings for the Api\Preferences
 	 *
@@ -291,8 +279,31 @@ class addressbook_hooks
 
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
-			$merge = new Api\Contacts\Merge();
-			$settings += $merge->merge_preferences();
+			$settings['default_document'] = array(
+				'type'   => 'vfs_file',
+				'size'   => 60,
+				'label'  => 'Default document to insert contacts',
+				'name'   => 'default_document',
+				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('addressbook')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','n_fn').' '.
+					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+				'run_lang' => false,
+				'xmlrpc' => True,
+				'admin'  => False,
+			);
+			$settings['document_dir'] = array(
+				'type'   => 'vfs_dirs',
+				'size'   => 60,
+				'label'  => 'Directory with documents to insert contacts',
+				'name'   => 'document_dir',
+				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.',lang('addressbook')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','n_fn').' '.
+					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+				'run_lang' => false,
+				'xmlrpc' => True,
+				'admin'  => False,
+				'default' => '/templates/addressbook',
+			);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['felamimail'] || $GLOBALS['egw_info']['user']['apps']['mail'])
@@ -339,7 +350,10 @@ class addressbook_hooks
 			'query' => 'api.EGroupware\\Api\\Contacts.link_query',
 			'title' => 'api.EGroupware\\Api\\Contacts.link_title',
 			'titles' => 'api.EGroupware\\Api\\Contacts.link_titles',
-			'view' => 'app.addressbook.openCRMview',
+			'view' => array(
+				'menuaction' => 'addressbook.addressbook_ui.view',
+				'ajax' => 'true'
+			),
 			'view_id' => 'contact_id',
 			'list'	=>	array(
 				'menuaction' => 'addressbook.addressbook_ui.index',
@@ -359,7 +373,7 @@ class addressbook_hooks
 			'file_access_user' => true,	// file_access supports 4th parameter $user
 			'file_access'=> 'api.EGroupware\\Api\\Contacts.file_access',
 			'default_types' => array('n' => array('name' => 'contact', 'options' => array('icon' => 'navbar.png','template' => 'addressbook.edit'))),
-			// registers an additional type 'addressbook-email', returning only contacts with email, title has email appended
+			// registers an addtional type 'addressbook-email', returning only contacts with email, title has email appended
 			'additional' => array(
 				'addressbook-email' => array(
 					'query' => 'api.EGroupware\\Api\\Contacts.link_query_email',
@@ -381,34 +395,11 @@ class addressbook_hooks
 			'owner' => array(
 				'key'    => 'egw_addressbook.contact_id',
 				'column' => 'egw_addressbook.contact_owner'
-			),
-			'push_data'  => self::class.'::prepareEntryPush',
+			)
 		);
 		return $links;
 	}
 
-	/**
-	 * Prepare entry to be pushed via Link::notify_update()
-	 *
-	 * Add in shared users
-	 *
-	 * @param $entry
-	 * @return array
-	 */
-	static public function prepareEntryPush($entry)
-	{
-		// Add users / groups this contact is shared with
-		$entry['shared_with'] = [];
-		foreach((array)$entry['shared'] as $id => $share)
-		{
-			$entry['shared_with'][] = $share['shared_with'];
-		}
-		$entry['shared_with'] = array_unique($entry['shared_with']);
-
-		$entry = array_intersect_key($entry, array_flip(['owner','tid','cat_id','shared_with']));
-		return $entry;
-	}
-
 	/**
 	 * Hook called to retrieve a app specific exportLimit
 	 *
@@ -419,11 +410,11 @@ class addressbook_hooks
 	{
 		unset($location);	// not used, but required by function signature
 
-		return $GLOBALS['egw_info']['server']['contact_export_limit'] ?? null;
+		return $GLOBALS['egw_info']['server']['contact_export_limit'];
 	}
 
 	/**
-	 * Register contacts as calendar resources (items which can be scheduled by the calendar)
+	 * Register contacts as calendar resources (items which can be sheduled by the calendar)
 	 *
 	 * @param array $args hook-params (not used)
 	 * @return array
@@ -433,7 +424,7 @@ class addressbook_hooks
 		unset($args);	// not used, but required by function signature
 
 		return array(
-			'type' => 'c',// one char type-identifier for this resource
+			'type' => 'c',// one char type-identifiy for this resources
 			'info' => 'api.EGroupware\\Api\\Contacts.calendar_info',// info method, returns array with id, type & name for a given id
 		);
 	}
@@ -480,7 +471,6 @@ class addressbook_hooks
 			Acl::EDIT    => 'edit',
 			Acl::ADD     => 'add',
 			Acl::DELETE  => 'delete',
-			Acl::CUSTOM1 => 'shared with',	// allows to share into given AB
 		);
 	}
 
@@ -633,4 +623,4 @@ class addressbook_hooks
 			]
 		];
 	}
-}
+}

addressbook/inc/class.addressbook_import_contacts_csv.inc.php

@@ -67,11 +67,12 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv  {
 
 	/**
 	 * imports entries according to given definition object.
-	 * @param importexport_definition $definition
-	 * @param importexport_import_csv|null $import_csv
+	 * @param resource $_stream
+	 * @param string $_charset
+	 * @param definition $_definition
 	 */
-	protected function init(importexport_definition $definition, importexport_import_csv $import_csv = null)
-	{
+	public function init(importexport_definition &$_definition ) {
+
 		// fetch the addressbook bo
 		$this->bocontacts = new addressbook_bo();
 
@@ -96,14 +97,14 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv  {
 
 
 		// set contact owner
-		$contact_owner = isset( $definition->plugin_options['contact_owner'] ) ?
-			$definition->plugin_options['contact_owner'] : $this->user;
+		$contact_owner = isset( $_definition->plugin_options['contact_owner'] ) ?
+			$_definition->plugin_options['contact_owner'] : $this->user;
 
 		// Check to make sure target addressbook is valid
 		if(!in_array($contact_owner, array_keys($this->bocontacts->get_addressbooks(Api\Acl::ADD))))
 		{
 			$this->warnings[0] = lang("Unable to import into %1, using %2",
-				$contact_owner . ' (' . (is_numeric($contact_owner) ? Api\Accounts::username($contact_owner) : $contact_owner) . ')',
+				$contact_owner . ' ('.Api\Accounts::username($record->owner) . ')',
 				Api\Accounts::username($this->user)
 			);
 			$contact_owner = 'personal';
@@ -446,20 +447,7 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv  {
 	 */
 	public function get_options_etpl(importexport_definition &$definition=null)
 	{
-		$contacts = new EGroupware\Api\Contacts();
-		$options = array(
-			'name'        => 'addressbook.import_csv',
-			'content'     => array(
-				'owner_from_csv' => $definition->plugin_options['owner_from_csv'],
-				'owner'          => $definition->plugin_options['contact_owner'] == 'personal' ?
-					$GLOBALS['egw_info']['user']['account_id'] :
-					$definition->plugin_options['contact_owner']
-			),
-			'sel_options' => array(
-				'owner' => $contacts->get_addressbooks(Api\Acl::ADD)
-			)
-		);
-		return $options;
+		// lets do it!
 	}
 
 	/**

addressbook/inc/class.addressbook_import_vcard.inc.php

@@ -91,20 +91,20 @@ class addressbook_import_vcard implements importexport_iface_import_plugin  {
 		$this->definition = $_definition;
 
 		// user, is admin ?
-		$this->is_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']) && $GLOBALS['egw_info']['user']['apps']['admin'];
+		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
-		// set contact owner
-		$contact_owner = isset($_definition->plugin_options['contact_owner']) ?
-			$_definition->plugin_options['contact_owner'] : $this->user;
-		// Import into importer's personal addressbook
-		if($contact_owner == 'personal')
-		{
-			$contact_owner = $this->user;
-		}
+                // set contact owner
+                $contact_owner = isset( $_definition->plugin_options['contact_owner'] ) ?
+                        $_definition->plugin_options['contact_owner'] : $this->user;
+                // Import into importer's personal addressbook
+                if($contact_owner == 'personal')
+                {
+                        $contact_owner = $this->user;
+                }
 
 		// dry run?
-		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
+		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
 
 		// Needed for categories to work right
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
@@ -352,21 +352,16 @@ class addressbook_import_vcard implements importexport_iface_import_plugin  {
 	 */
 	public function get_options_etpl(importexport_definition &$definition=null)
 	{
-		$contacts = new EGroupware\Api\Contacts();
 		$charset = $definition->plugin_options['charset'];
 		if($charset == 'user') $charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
 		return array(
 			'name' => 'addressbook.import_vcard',
 			'content' => array(
-				'file_type'     => 'vcard,ical,vcf',
-				'charset'       => $charset,
-				'contact_owner' => $definition->plugin_options['contact_owner'] == 'personal' ?
-					$GLOBALS['egw_info']['user']['account_id'] :
-					$definition->plugin_options['contact_owner']
+				'file_type' => 'vcard,ical,vcf',
+				'charset' => $charset
 			),
 			'sel_options' => array(
-				'charset'       => Api\Translation::get_installed_charsets(),
-				'contact_owner' => $contacts->get_addressbooks(Api\Acl::ADD)
+				'charset' => Api\Translation::get_installed_charsets()
 			),
 			'preserv' => array()
 		);

addressbook/inc/class.addressbook_ui.inc.php

@@ -18,7 +18,6 @@ use EGroupware\Api\Egw;
 use EGroupware\Api\Acl;
 use EGroupware\Api\Vfs;
 use EGroupware\Api\Etemplate;
-use EGroupware\Kanban\Hooks;
 
 /**
  * General user interface object of the adressbook
@@ -26,7 +25,7 @@ use EGroupware\Kanban\Hooks;
 class addressbook_ui extends addressbook_bo
 {
 	public $public_functions = array(
-		'extSearch'	=> True,
+		'search'	=> True,
 		'edit'		=> True,
 		'view'		=> True,
 		'index'     => True,
@@ -74,11 +73,6 @@ class addressbook_ui extends addressbook_bo
 	 */
 	protected $tmpl;
 
-	/**
-	 * @var array
-	 */
-	public $grouped_views;
-
 	/**
 	 * Constructor
 	 *
@@ -94,8 +88,7 @@ class addressbook_ui extends addressbook_bo
 			'org_name'                  => lang('Organisations'),
 			'org_name,adr_one_locality' => lang('Organisations by location'),
 			'org_name,org_unit'         => lang('Organisations by departments'),
-			'duplicates'                => lang('Duplicates'),
-			'shared_by_me'              => lang('Shared by me'),
+			'duplicates'				=> lang('Duplicates')
 		);
 
 		// make sure the hook for export_limit is registered
@@ -163,32 +156,25 @@ class addressbook_ui extends addressbook_bo
 				{
 					$success = $failed = $action_msg = null;
 					if ($this->action($_content['nm']['action'],$_content['nm']['selected'],$_content['nm']['select_all'],
-						$success,$failed,$action_msg,'index',$msg,$_content['nm']['checkboxes'], $error_msg))
+						$success,$failed,$action_msg,'index',$msg,$_content['nm']['checkboxes']))
 					{
 						$msg .= lang('%1 contact(s) %2',$success,$action_msg);
 						Framework::message($msg);
 					}
 					elseif(is_null($msg))
 					{
-						if (empty($error_msg))
-						{
-							$msg .= lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
-						}
-						else
-						{
-							$msg .= lang('%1 contact(s) %2, %3 failed because of %4 !!!', $success, $action_msg, $failed, $error_msg);
-						}
+						$msg .= lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
 						Framework::message($msg,'error');
 					}
 					$msg = '';
 				}
 			}
-			if (!empty($_content['nm']['rows']['infolog']))
+			if ($_content['nm']['rows']['infolog'])
 			{
 				$org = key($_content['nm']['rows']['infolog']);
 				return $this->infolog_org_view($org);
 			}
-			if (!empty($_content['nm']['rows']['view']))	// show all contacts of an organisation
+			if ($_content['nm']['rows']['view'])	// show all contacts of an organisation
 			{
 				$grouped_view = key($_content['nm']['rows']['view']);
 			}
@@ -254,7 +240,6 @@ class addressbook_ui extends addressbook_bo
 				//'actions'        => $this->get_actions(),		// set on each request, as it depends on some filters
 				'row_id'         => 'id',
 				'row_modified'   => 'modified',
-				'add_on_top_sort_field' => 'modified',
 				'is_parent'      => 'group_count',
 				'parent_id'      => 'parent_id',
 				'favorites'      => true,
@@ -291,7 +276,7 @@ class addressbook_ui extends addressbook_bo
 		}
 
 		// Organisation stuff is not (yet) availible with ldap
-		if($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap' && Api\Header\UserAgent::mobile() == '')
+		if($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')
 		{
 			$content['nm']['header_left'] = 'addressbook.index.left';
 		}
@@ -301,6 +286,7 @@ class addressbook_ui extends addressbook_bo
 			'cc'  => 'Cc',
 			'bcc' => 'Bcc',
 		);
+		$sel_options['adr_one_countrycode']['-custom-'] = lang('No country selected');
 
 		// if there is any export limit set, pass it on to the nextmatch, to be evaluated by the export
 		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit']=$this->config['contact_export_limit'];
@@ -349,12 +335,6 @@ class addressbook_ui extends addressbook_bo
 		}
 		$content['nm']['grouped_view_label'] = $sel_options['grouped_view'][(string) $content['nm']['grouped_view']];
 
-		// allow to also filter by (not) shared contacts
-		$sel_options['shared_with'] = [
-			'not' => lang('not shared'),
-			'shared' => lang('shared'),
-		];
-
 		$this->tmpl->read('addressbook.index');
 		return $this->tmpl->exec('addressbook.addressbook_ui.index',
 			$content,$sel_options,array(),$preserv);
@@ -363,7 +343,7 @@ class addressbook_ui extends addressbook_bo
 	/**
 	 * Get actions / context menu items
 	 *
-	 * @param ?string $tid_filter =null
+	 * @param string $tid_filter =null
 	 * @return array see Etemplate\Widget\Nextmatch::get_actions()
 	 */
 	public function get_actions($tid_filter=null)
@@ -416,25 +396,23 @@ class addressbook_ui extends addressbook_bo
 			),
 		);
 		// CRM view options
+		$crm_count = 0;
 		$crm_apps = array('infolog','tracker');
-		foreach($crm_apps as $crm_index => $app)
+		foreach($crm_apps as $app)
 		{
-			if (!$GLOBALS['egw_info']['user']['apps'][$app])
-			{
-				unset($crm_apps[$crm_index]);
-			}
+			if ($GLOBALS['egw_info']['user']['apps'][$app]) $crm_count++;
 		}
 		if($GLOBALS['egw_info']['user']['apps']['infolog'])
 		{
 			array_splice($crm_apps, 1, 0, 'infolog-organisation');
 		}
-		if(count($crm_apps) > 1)
+		if($crm_count > 1)
 		{
 			foreach($crm_apps as $app)
 			{
 				$actions['view']['children']["view-$app"] = array(
 					'caption' => $app,
-					'icon' => $app == 'infolog-organisation' ? "infolog/navbar" : "$app/navbar"
+					'icon' => "$app/navbar"
 				);
 			}
 		}
@@ -579,45 +557,6 @@ class addressbook_ui extends addressbook_bo
 				'hideOnMobile' => true
 			);
 		}
-		if (($share2addressbooks = $this->get_addressbooks(Acl::EDIT|self::ACL_SHARED, null, null, false)))
-		{
-			unset($share2addressbooks[0]);    // do not offer action to share contact into accounts AB
-			foreach ($share2addressbooks as $owner => $label)
-			{
-				if (substr($owner, -1) === 'p')	// share with private AB makes no sense
-				{
-					unset($share2addressbooks[$owner]);
-					continue;
-				}
-				$icon = $type_label = null;
-				$this->type_icon((int)$owner, substr($owner, -1) == 'p', 'n', $icon, $type_label);
-				$share2addressbooks[$owner] = array(
-					'icon' => $icon,
-					'caption' => $label,
-				);
-			}
-			$actions['shared_with'] = [
-				'caption' => 'Share into addressbook',
-				'children' => [
-					'writable' => [
-						'id' => 'writable',
-						'caption' => 'Share writable',
-						'checkbox' => true,
-					]] + $share2addressbooks + [
-					'unshare' => [
-						'icon' => 'delete',
-						'caption' => 'Unshare',
-						'group' => $group,
-						'enableClass' => 'unshare_contact',
-						'hideOnDisabled' => true,
-						'hideOnMobile' => true
-					]
-				],
-				'prefix' => 'shared_with_',
-				'group' => $group,
-				'hideOnMobile' => true
-			];
-		}
 		$actions['change_type'] = $this->change_type_actions($group);
 		$actions['merge'] = array(
 			'caption' => 'Merge contacts',
@@ -790,10 +729,6 @@ class addressbook_ui extends addressbook_bo
 				'hideOnMobile' => true
 			);
 		}
-		if ($GLOBALS['egw_info']['user']['apps']['kanban'])
-		{
-			$actions['kanban'] = EGroupware\Kanban\Hooks::get_actions(['addressbook'], $group);
-		}
 
 		$actions['geolocation'] = array(
 			'caption' => 'GeoLocation',
@@ -869,7 +804,6 @@ class addressbook_ui extends addressbook_bo
 				'confirm_multiple' => 'Delete these entries',
 				'group' => $group,
 				'disableClass' => 'rowNoDelete',
-				'onExecute' => 'javaScript:app.addressbook.action',
 			);
 		}
 		if ($this->grants[0] & Acl::DELETE)
@@ -1197,32 +1131,6 @@ class addressbook_ui extends addressbook_bo
 		Api\Cache::setSession('addressbook', 'advanced_search', false);
 	}
 
-	/**
-	 * Apply an action to multiple events, but called via AJAX instead of submit
-	 *
-	 * @param string $action
-	 * @param string[] $selected
-	 * @param bool $all_selected All entries are selected, not just what's in $selected
-	 * @param bool $skip_notification
-	 */
-	public function ajax_action($action, $selected, $all_selected, $skip_notification = false)
-	{
-		$success = 0;
-		$failed = 0;
-		$action_msg = '';
-		$session_name = 'index';
-
-		if($this->action($action, $selected, $all_selected, $success, $failed, $action_msg, $session_name, $msg, $skip_notification))
-		{
-			$msg = lang('%1 event(s) %2',$success,$action_msg);
-		}
-		elseif(is_null($msg))
-		{
-			$msg .= lang('%1 event(s) %2, %3 failed because of insufficient rights !!!',$success,$action_msg,$failed);
-		}
-		Api\Json\Response::get()->message($msg);
-	}
-
 	/**
 	 * apply an action to multiple contacts
 	 *
@@ -1233,15 +1141,13 @@ class addressbook_ui extends addressbook_bo
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 contacts 'deleted'
 	 * @param string/array $session_name 'index' or array with session-data depending if we are in the main list or the popup
-	 * @param ?string& $error_msg on return optional error-message
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg, $checkboxes = NULL, &$error_msg=null)
+	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg, $checkboxes = NULL)
 	{
 		//echo "<p>uicontacts::action('$action',".print_r($checked,true).','.(int)$use_all.",...)</p>\n";
 		$success = $failed = 0;
-		$error_msg = null;
-		if ($use_all || in_array($action,array('remove_from_list','delete_list','unshare')))
+		if ($use_all || in_array($action,array('remove_from_list','delete_list')))
 		{
 			// get the whole selection
 			$query = is_array($session_name) ? $session_name : Api\Cache::getSession('addressbook', $session_name);
@@ -1283,11 +1189,6 @@ class addressbook_ui extends addressbook_bo
 			$cat_id = (int)substr($action, 8);
 			$action = substr($action,0,7);
 		}
-		elseif(substr($action, 0, 12) === 'shared_with_')
-		{
-			$shared_with = substr($action, 12);
-			$action = 'shared_with';
-		}
 		// Security: stop non-admins to export more then the configured number of contacts
 		if (in_array($action,array('csv','vcard')) && $this->config['contact_export_limit'] && !Api\Storage\Merge::is_export_limit_excepted() &&
 			(!is_numeric($this->config['contact_export_limit']) || count($checked) > $this->config['contact_export_limit']))
@@ -1410,7 +1311,7 @@ class addressbook_ui extends addressbook_bo
 							));
 							// this does NOT return!
 						}
-						else	// no mass delete of accounts
+						else	// no mass delete of Api\Accounts
 						{
 							$Ok = false;
 						}
@@ -1486,7 +1387,7 @@ class addressbook_ui extends addressbook_bo
 					$action_msg = lang('changed type to %1', lang($this->content_types[$to_type]['name']));
 					if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::EDIT,$contact)))
 					{
-						if (!$contact['owner'])		// no change of accounts
+						if (!$contact['owner'])		// no change of Api\Accounts
 						{
 							$Ok = false;
 						}
@@ -1497,57 +1398,6 @@ class addressbook_ui extends addressbook_bo
 						}
 					}
 					break;
-				case 'shared_with':
-					// as "unshare" is in "shared_with" submenu/children it uses "shared_with_unshare"
-					if ($shared_with === 'unshare')
-					{
-						$action_msg = lang('unshared');
-						if (($Ok = !!($contact = $this->read($id))))
-						{
-							$need_save = false;
-							foreach($contact['shared'] as $key => $shared)
-							{
-								// only unshare contacts shared by current user
-								if (($shared['shared_by'] == $this->user ||
-									$this->check_perms(ACL::EDIT, $contact)) &&
-									// only unshare from given addressbook, or all
-									(empty($query['filter']) || $shared['shared_with'] == (int)$query['filter']))
-								{
-									$need_save = true;
-									unset($contact['shared'][$key]);
-								}
-							}
-							// we might need to ignore acl, as we are allowed to share with just read-rights
-							// setting user and update-time is explicitly desired for sync(-collection)!
-							$Ok = !$need_save || $this->save($contact, true);
-						}
-						break;
-					}
-					$action_msg = lang('shared into addressbook %1', Api\Accounts::username($shared_with));
-					if (($Ok = !!($contact = $this->read($id))))
-					{
-						$new_shared_with = [[
-							'shared_with' => $shared_with,
-							'shared_by' => $this->user,
-							'shared_at' => new Api\DateTime('now'),
-							// only allow to share writable, if user has edit-rights!
-							'shared_writable' => (int)($checkboxes['writable'] && $this->check_perms(Acl::EDIT, $contact)),
-							'contact_id' => $id,
-							'contact' => $contact,
-						]];
-						if ($this->check_shared_with($new_shared_with, $error_msg))	// returns [] if OK
-						{
-							$Ok = false;
-						}
-						else
-						{
-							$contact['shared'][] = $new_shared_with[0];
-							// we might need to ignore acl, as we are allowed to share with just read-rights
-							// setting user and update-time is explicitly desired for sync(-collection)!
-							$Ok = $this->save($contact, true);
-						}
-					}
-					break;
 				default:	// move to an other addressbook
 					if (!(int)$action || !($this->grants[(string) (int) $action] & Acl::EDIT))	// might be ADD in the future
 					{
@@ -1719,13 +1569,6 @@ class addressbook_ui extends addressbook_bo
 			$old_state = Api\Cache::getSession('addressbook', $what);
 		}
 		$GLOBALS['egw']->session->commit_session();
-
-		if ($query['grouped_view'] === 'shared_by_me')
-		{
-			$query['col_filter']['shared_by'] = $this->user;
-			$query['grouped_view'] = '';
-		}
-
 		if (!isset($this->grouped_views[(string) $query['grouped_view']]) || strpos($query['grouped_view'],':') === false)
 		{
 			// we don't have a grouped view, unset the according col_filters
@@ -1735,13 +1578,9 @@ class addressbook_ui extends addressbook_bo
 		if (isset($this->grouped_views[(string) $query['grouped_view']]))
 		{
 			// we have a grouped view, reset the advanced search
-			if (empty($query['search']) && !empty($old_state['advanced_search']))
-			{
-				$query['advanced_search'] = $old_state['advanced_search'];
-			}
+			if(!$query['search'] && $old_state['advanced_search']) $query['advanced_search'] = $old_state['advanced_search'];
 		}
-		// eg. paging in an advanced search
-		elseif(empty($query['search']) && is_array($old_state) && array_key_exists('advanced_search', $old_state))
+		elseif(!$query['search'] && array_key_exists('advanced_search',$old_state))	// eg. paging in an advanced search
 		{
 			$query['advanced_search'] = $old_state['advanced_search'];
 		}
@@ -1854,10 +1693,7 @@ class addressbook_ui extends addressbook_bo
 			if ($query['grouped_view'])	// view the contacts of one organisation only
 			{
 				if (strpos($query['grouped_view'],'*AND*') !== false) $query['grouped_view'] = str_replace('*AND*','&',$query['grouped_view']);
-				if (!is_array($fields = $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields'] ?? []))
-				{
-					$fields = explode(',', $fields);
-				}
+				$fields = explode(',',$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']);
 				foreach(explode('|||',$query['grouped_view']) as $part)
 				{
 					list($name,$value) = explode(':',$part,2);
@@ -1927,26 +1763,19 @@ class addressbook_ui extends addressbook_bo
 				unset($query['advanced_search']['meth_select']);
 			}
 
-			$columsel = $this->prefs['nextmatch-addressbook.index.rows'];
-			$columselection = $columsel ? explode(',',$columsel) : array();
-			$extracols = [];
-			if (in_array('owner_shared_with', $columselection))
-			{
-				$extracols[] = 'shared_with';
-			}
-
 			$rows = parent::search($query['advanced_search'] ? $query['advanced_search'] : $query['search'],$id_only,
-				$order, $extracols, $wildcard,false, $op,[(int)$query['start'], (int)$query['num_rows']], $query['col_filter']);
+				$order,'',$wildcard,false,$op,array((int)$query['start'],(int) $query['num_rows']),$query['col_filter']);
 
 			// do we need to read the custom fields, depends on the column is enabled and customfields
+			$columsel = $this->prefs['nextmatch-addressbook.index.rows'];
 			$available_distib_lists=$this->get_lists(Acl::READ);
+			$columselection = $columsel ? explode(',',$columsel) : array();
 			$ids = $calendar_participants = array();
 			if (!$id_only && $rows)
 			{
 				$show_custom_fields = (in_array('customfields',$columselection) || $this->config['index_load_cfs']) && $this->customfields;
 				$show_calendar = $this->config['disable_event_column'] != 'True' && in_array('calendar_calendar',$columselection);
-				$show_distributionlist = in_array('distribution_list', $columselection) ||
-					is_array($available_distib_lists) && count($available_distib_lists);
+				$show_distributionlist = in_array('distrib_lists',$columselection) || count($available_distib_lists);
 				if ($show_calendar || $show_custom_fields || $show_distributionlist)
 				{
 					foreach($rows as $val)
@@ -1989,11 +1818,6 @@ class addressbook_ui extends addressbook_bo
 		}
 		$order = $query['order'];
 
-		$unshare_grants = [];
-		foreach($this->grants as $grantee => $rights)
-		{
-			if ($rights & (ACL::EDIT|self::ACL_SHARED)) $unshare_grants[] = $grantee;
-		}
 		$readonlys = array();
 		foreach($rows as $n => &$row)
 		{
@@ -2046,7 +1870,7 @@ class addressbook_ui extends addressbook_bo
 				{
 					$row[$name] .= ' '.($row['tel_prefer'] == $name ? $prefer_marker : '');		// .' ' to NOT remove the field
 				}
-				// always show the prefered phone, if not already shown
+				// allways show the prefered phone, if not already shown
 				if (!in_array($row['tel_prefer'],$tel2show) && $row[$row['tel_prefer']])
 				{
 					$row['tel_prefered'] = $row[$row['tel_prefer']].$prefer_marker;
@@ -2070,12 +1894,6 @@ class addressbook_ui extends addressbook_bo
 				}
 				$row['class'] .= 'contact_contact ';
 
-				if (!self::hasPhoto($row))
-				{
-					$row['lname'] = $row['n_family'];
-					$row['fname'] = $row['n_given'];
-					unset($row['photo']);   // no need to send, as there is no photo
-				}
 				unset($row['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 
 				if (isset($customfields[$row['id']]))
@@ -2108,12 +1926,6 @@ class addressbook_ui extends addressbook_bo
 			{
 				$row['cat_id'] = $this->categories->check_list(Acl::READ,$row['cat_id']);
 			}
-
-			if ($query['col_filter']['shared_by'] == $this->user || !empty($row['shared_with']) &&
-				array_intersect($unshare_grants, explode(',', $row['shared_with'])))
-			{
-				$row['class'] .= 'unshare_contact ';
-			}
 		}
 		$rows['no_distribution_list'] = (bool)$query['filter2'];
 
@@ -2129,11 +1941,7 @@ class addressbook_ui extends addressbook_bo
 			$rows['no_event_column'] = true;
 		}
 
-		// If we've changed the sort order on them, update the display
-		if($order !== $query['order'] )
-		{
-			$rows['order'] = $order;
-		}
+		$rows['order'] = $order;
 		$rows['call_popup'] = $this->config['call_popup'];
 		$rows['customfields'] = array_values($this->customfields);
 
@@ -2176,11 +1984,6 @@ class addressbook_ui extends addressbook_bo
 		}
 		$GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $header);
 
-		if ($query['grouped_view'] === '' && $query['col_filter']['shared_by'] == $this->user)
-		{
-			$query['grouped_view'] = 'shared_by_me';
-			unset($query['col_filter']['shared_by']);
-		}
 		return $this->total;
 	}
 
@@ -2240,35 +2043,7 @@ class addressbook_ui extends addressbook_bo
 	{
 		if (is_array($content))
 		{
-			// sync $content['shared'] with $content['shared_values']
-			foreach((array)$content['shared'] as $key => $shared)
-			{
-				$shared_value = $shared['shared_id'].':'.$shared['shared_with'].':'.$shared['shared_by'].':'.$shared['shared_writable'];
-				if (($k = array_search($shared_value, (array)$content['shared_values'])) === false)
-				{
-					unset($content['shared'][$key]);
-				}
-				else
-				{
-					unset($content['shared_values'][$k]);
-				}
-			}
-			foreach((array)$content['shared_values'] as $account_id)
-			{
-				$content['shared'][] = [
-					'contact_id' => $content['id'],
-					'contact' => $content,
-					'shared_with' => $account_id,
-					'shared_by' => $this->user,
-					'shared_at' => new Api\DateTime(),
-					'shared_writable' => (int)(bool)$content['shared_writable'],
-				];
-			}
-			unset($content['shared_values']);
-			// remove invalid shared-with entries (should not happen, as we validate already on client-side)
-			$this->check_shared_with($content['shared']);
-
-			$button = @key($content['button'] ?? []);
+			$button = @key($content['button']);
 			unset($content['button']);
 			$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
 			$content['owner'] = (string) (int) $content['owner'];
@@ -2308,20 +2083,9 @@ class addressbook_ui extends addressbook_bo
 					// Country codes
 					foreach(array('adr_one', 'adr_two') as $c_prefix)
 					{
-						// we store region-name not code
-						if (!empty($content[$c_prefix.'_region']))
+						if ($content[$c_prefix.'_countrycode'] == '-custom-')
 						{
-							$states = Api\Country::get_states($content[$c_prefix.'_countrycode']);
-							if ($states && isset($states[$content[$c_prefix.'_region']]))
-							{
-								$content[$c_prefix.'_region'] = $states[$content[$c_prefix.'_region']];
-							}
-						}
-						// handling custom country-name
-						if (!Api\Country::get_full_name($content[$c_prefix.'_countrycode']))
-						{
-							$content[$c_prefix.'_countryname'] = $content[$c_prefix.'_countrycode'];
-							unset($content[$c_prefix.'_countrycode']);
+							$content[$c_prefix.'_countrycode'] = null;
 						}
 					}
 					$content['msg'] = '';
@@ -2612,26 +2376,6 @@ class addressbook_ui extends addressbook_bo
 				}
 			}
 		}
-		// set $content[shared_options/_values] from $content[shared]
-		$content['shared_options'] = [];
-		$content['shared_values'] = [];
-		foreach((array)$content['shared'] as $shared)
-		{
-			$shared_value = $shared['shared_id'] . ':' . $shared['shared_with'] . ':' . $shared['shared_by'] . ':' . $shared['shared_writable'];
-			$content['shared_values'][] = $shared_value;
-			$sel_options['shared_values'][] = [
-				'value' => $shared_value,
-				'label' => Api\Accounts::username($shared['shared_with']),
-				'title' => lang('%1 shared this contact on %2 with %3 %4',
-								Api\Accounts::username($shared['shared_by']), Api\DateTime::to($shared['shared_at']),
-								Api\Accounts::username($shared['shared_with']), $shared['shared_writable'] ? lang('writable') : lang('readonly')
-				),
-				'icon'  => $shared['shared_writable'] ? 'edit' : 'view',
-			];
-		}
-		// disable shared with UI for non-SQL backends
-		$content['shared_disabled'] = !is_a($this->get_backend($content['id'], $content['owner']), Api\Contacts\Sql::class);
-
 		if ($content['id'])
 		{
 			// last and next calendar date
@@ -2659,25 +2403,6 @@ class addressbook_ui extends addressbook_bo
 		$content['addr_format']  = $this->addr_format_by_country($content['adr_one_countryname']);
 		$content['addr_format2'] = $this->addr_format_by_country($content['adr_two_countryname']);
 
-		// Country codes
-		foreach(array('adr_one', 'adr_two') as $c_prefix)
-		{
-			// handling custom country-name
-			if (empty($content[$c_prefix.'_countrycode']) && !empty($content[$c_prefix.'_countryname']))
-			{
-				$content[$c_prefix.'_countrycode'] = $content[$c_prefix.'_countryname'];
-			}
-			// translate from our stored state-/region-name to the code
-			if (!empty($content[$c_prefix.'_region']) && !empty($content[$c_prefix.'_countrycode']))
-			{
-				$states = Api\Country::get_states($content[$c_prefix.'_countrycode']);
-				if ($states && ($key = array_search($content[$c_prefix.'_region'], $states)))
-				{
-					$content[$c_prefix.'_region'] = $key;
-				}
-			}
-		}
-
 		//_debug_array($content);
 		$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(Acl::DELETE,$content);
 		$readonlys['button[copy]'] = $readonlys['button[edit]'] = $readonlys['button[vcard]'] = true;
@@ -2689,6 +2414,7 @@ class addressbook_ui extends addressbook_bo
 		}
 
 		$sel_options['fileas_type'] = $this->fileas_options($content);
+		$sel_options['adr_one_countrycode']['-custom-'] = lang('Custom');
 		$sel_options['owner'] = $this->get_addressbooks(Acl::ADD);
 		if ($content['owner']) unset($sel_options['owner'][0]);	// do not offer to switch to accounts, as we do not support moving contacts to accounts
 		if ((string) $content['owner'] !== '')
@@ -2734,20 +2460,14 @@ class addressbook_ui extends addressbook_bo
 		if (isset($readonlys['n_fileas'])) $readonlys['fileas_type'] = $readonlys['n_fileas'];
 		// disable not needed tabs
 		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
-		$readonlys['tabs']['custom'] = !$this->customfields ||
-			// only show custom fields tab for LDAP, if we have LDAP CF's defined and an existing contact (as no schema defined)
-			$this->get_backend($content['id'],$content['owner']) == $this->so_accounts &&
-				(empty($content['id']) || !array_filter($this->customfields, static function($cf)
-				{
-					return substr($cf['name'], 0, 5) === 'ldap_';
-				}));
+		$readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'],$content['owner']) == $this->so_accounts;
 		$readonlys['tabs']['custom_private'] = $readonlys['tabs']['custom'] || !$this->config['private_cf_tab'];
 		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
 		if (!$content['id']) $readonlys['button[delete]'] = !$content['id'];
 		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
-		$content['hide_change_org'] = $readonlys['change_org'] = empty($content['org_name']) || $view;
+		$readonlys['change_org'] = empty($content['org_name']) || $view;
 
 		// for editing the own account (by a non-admin), enable only the fields allowed via the "own_account_acl"
 		if (!$content['owner'] && !$this->check_perms(Acl::EDIT, $content))
@@ -2807,7 +2527,7 @@ class addressbook_ui extends addressbook_bo
 		$preserve['old_owner'] = $content['owner'];
 		unset($preserve['jpegphoto'], $content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 		$this->tmpl->setElementAttribute('tabs', 'add_tabs', true);
-		$tabs =& $this->tmpl->getElementAttribute('tabs', 'extraTabs');
+		$tabs =& $this->tmpl->getElementAttribute('tabs', 'tabs');
 		if (($first_call = !isset($tabs)))
 		{
 			$tabs = array();
@@ -2819,7 +2539,7 @@ class addressbook_ui extends addressbook_bo
 		{
 			if (!$extra_tabs) continue;
 
-			foreach(count(array_filter(array_keys($extra_tabs), 'is_int')) ? $extra_tabs : array($extra_tabs) as $extra_tab)
+			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
 				if ($extra_tab['data'] && is_array($extra_tab['data']))
 				{
@@ -2858,47 +2578,6 @@ class addressbook_ui extends addressbook_bo
 		return $this->tmpl->exec('addressbook.addressbook_ui.edit', $content, $sel_options, $readonlys, $preserve, 2);
 	}
 
-	/**
-	 * Check if user has right to share with / into given AB
-	 *
-	 * @param array $_data values for keys "shared_writable", "shared_values" and "contact"
-	 * @return array of entries removed from $shared_with because current user is not allowed to share into
-	 */
-	public function ajax_check_shared(array $_data)
-	{
-		$response = Api\Json\Response::get();
-		try {
-			$shared = [];
-			foreach($_data['shared_values'] as $value)
-			{
-				if (is_numeric($value))
-				{
-					$shared[$value] = [
-						'shared_with' => $value,
-						'shared_by' => $this->user,
-						'shared_writable' => (int)$_data['shared_writable'],
-					];
-				}
-				else
-				{
-					$shared[$value] = array_combine(['shared_id', 'shared_with', 'shared_by', 'shared_writable'], explode(':', $value));
-				}
-				$shared[$value]['contact'] = $_data['contact'];
-			}
-			if (($failed = $this->check_shared_with($shared, $error)))
-			{
-				$response->data(array_keys($failed));
-				$response->message($error ?: lang('You are not allowed to share into the addressbook of %1',
-					implode(', ', array_map(function ($data) {
-						return Api\Accounts::username($data['shared_with']);
-					}, $failed))), 'error');
-			}
-		}
-		catch (\Exception $e) {
-			$response->message($e->getMessage(), 'error');
-		}
-	}
-
 	/**
 	 * Set the readonlys for non-admins editing their own account
 	 *
@@ -2958,17 +2637,11 @@ class addressbook_ui extends addressbook_bo
 	 */
 	public function ajax_check_values($values, $name, $own_id=0)
 	{
-		if (!is_array($fields = $GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields'] ?? []))
-		{
-			$fields = explode(',', $fields);
-		}
+		$fields = explode(',',$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_fields']);
 		$threshold = (int)$GLOBALS['egw_info']['user']['preferences']['addressbook']['duplicate_threshold'];
 
 		$ret = array('doublicates' => array(), 'msg' => null);
 
-		// set not returned n_fileas value, to keep custom fileas value
-		$values['n_fileas'] = $this->fileas($values, $values['fileas_type']);
-
 		// if email changed, check for doublicates
 		if (in_array($name, array('email', 'email_home')) && in_array('contact_'.$name, $fields))
 		{
@@ -3041,8 +2714,8 @@ class addressbook_ui extends addressbook_bo
 
 		if(is_array($content))
 		{
-			$button = key($content['button'] ?? []);
-			switch ($button)
+			$button = key($content['button']);
+			switch ($content['toolbar'] ? $content['toolbar'] : $button)
 			{
 				case 'vcard':
 					Egw::redirect_link('/index.php','menuaction=addressbook.uivcard.out&ab_id=' .$content['id']);
@@ -3098,10 +2771,6 @@ class addressbook_ui extends addressbook_bo
 						unset($contact_id);
 					}
 					break;
-				default:
-					// No button, probably a refresh
-					$content = $this->read($content['id']);
-					break;
 			}
 		}
 		else
@@ -3124,7 +2793,7 @@ class addressbook_ui extends addressbook_bo
 				$_GET['contact_id'] = array_shift($rows);
 				$_GET['index'] = 0;
 			}
-			$contact_id = $_GET['contact_id'] ?? ((int)$_GET['account_id'] ? 'account:'.(int)$_GET['account_id'] : 0);
+			$contact_id = $_GET['contact_id'] ? $_GET['contact_id'] : ((int)$_GET['account_id'] ? 'account:'.(int)$_GET['account_id'] : 0);
 			if(!$contact_id || !is_array($content = $this->read($contact_id)))
 			{
 				Egw::redirect_link('/index.php',array(
@@ -3148,7 +2817,8 @@ class addressbook_ui extends addressbook_bo
 
 		// make everything not explicit mentioned readonly
 		$readonlys['__ALL__'] = true;
-		$readonlys['photo']  = $readonlys['button[copy]'] =false;
+		$readonlys['photo'] = $readonlys['button[cancel]'] = $readonlys['button[copy]'] =
+			$readonlys['button[ok]'] = $readonlys['button[more]'] = $readonlys['toolbar'] = false;
 
 		foreach(array_keys($this->contact_fields) as $key)
 		{
@@ -3213,7 +2883,7 @@ class addressbook_ui extends addressbook_bo
 		{
 			$content['owner'] .= 'p';
 		}
-		$content['hide_change_org'] = true;
+		$this->tmpl->set_cell_attribute('change_org','disabled',true);
 
 		// Prevent double countries - invalid code blanks it, disabling doesn't work
 		$content['adr_one_countrycode'] = '-';
@@ -3248,6 +2918,40 @@ class addressbook_ui extends addressbook_bo
 		// dont show an app-header
 		$GLOBALS['egw_info']['flags']['app_header'] = '';
 
+		$actions = array(
+			'open' => array(
+				'caption' => 'Open',
+				'toolbarDefault' => true,
+			),
+			'copy' => 'Copy',
+			'delete' => array(
+				'caption' => 'Delete',
+				'confirm' => 'Delete this entry',
+			),
+			'cancel' => array(
+				'caption' => 'Cancel',
+				'toolbarDefault' => true,
+				'icon' => 'close'
+			),
+			'back' => array(
+				'caption' => 'Back',
+				'toolbarDefault' => true,
+			),
+			'next' => array(
+				'caption' => 'Next',
+				'toolbarDefault' => true,
+			),
+		);
+		if (!isset($content['index']) || !$content['index'])
+		{
+			unset($actions['back']);
+		}
+		if (!isset($content['index']) || $content['index'] >= $num_rows-1)
+		{
+			unset($actions['next']);
+		}
+		$this->tmpl->setElementAttribute('toolbar', 'actions', $actions);
+
 		// always show sidebox, as it contains contact-data
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
@@ -3256,7 +2960,7 @@ class addressbook_ui extends addressbook_bo
 
 		// Load CRM code
 		Framework::includeJS('.','CRM','addressbook');
-		$content['view_sidebox'] = addressbook_hooks::getViewDOMID($content['id'], $crm_list);
+
 		$this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array(
 			'id' => $content['id'],
 			'index' => $content['index'],
@@ -3358,7 +3062,7 @@ class addressbook_ui extends addressbook_bo
 	 * @param array $_content
 	 * @return string
 	 */
-	function extSearch($_content=array())
+	function search($_content=array())
 	{
 		if(!empty($_content))
 		{
@@ -3375,20 +3079,10 @@ class addressbook_ui extends addressbook_bo
 			}
 			else
 			{
-				if($this->config['private_cf_tab'])
+				$query['advanced_search'] = array_intersect_key($_content,array_flip(array_merge($this->get_contact_columns(),array('operator','meth_select'))));
+				foreach ($query['advanced_search'] as $key => $value)
 				{
-					$_content = array_merge($_content, $_content['private_cfs']);
-				}
-				$query['advanced_search'] = array_intersect_key(
-					$_content,
-					array_flip(array_merge($this->get_contact_columns(), array('operator', 'meth_select')))
-				);
-				foreach($query['advanced_search'] as $key => $value)
-				{
-					if(!$value)
-					{
-						unset($query['advanced_search'][$key]);
-					}
+					if(!$value) unset($query['advanced_search'][$key]);
 				}
 				// Skip n_fn, it causes problems in sql
 				unset($query['advanced_search']['n_fn']);
@@ -3443,28 +3137,13 @@ class addressbook_ui extends addressbook_bo
 		{
 			foreach($this->customfields as $name => $data)
 			{
-				if(substr($data['type'], 0, 6) == 'select' && !($data['rows'] > 1))
+				if (substr($data['type'], 0, 6) == 'select' && !($data['rows'] > 1))
 				{
-					if(!isset($content['#' . $name]))
-					{
-						$content['#' . $name] = '';
-					}
-					if(!isset($data['values']['']))
-					{
-						$sel_options['#' . $name][''] = lang('Select one');
-					}
+					if (!isset($content['#'.$name])) $content['#'.$name] = '';
+					if(!isset($data['values'][''])) $sel_options['#'.$name][''] = lang('Select one');
 				}
 				// Make them not required, otherwise you can't search
-				$this->tmpl->setElementAttribute('#' . $name, 'required', FALSE);
-				if($this->config['private_cf_tab'] == 'True' && $data['private'])
-				{
-					if(isset($content['#' . $name]))
-					{
-						$content['private_cfs']['#' . $name] = $content['#' . $name];
-					}
-					// Private CF tab results in a different ID, turn required off there too
-					$this->tmpl->setElementAttribute('private_cfs[#' . $name . ']', 'required', FALSE);
-				}
+				$this->tmpl->setElementAttribute('#'.$name, 'needed', FALSE);
 			}
 		}
 		// configure edit template as search dialog
@@ -3482,13 +3161,13 @@ class addressbook_ui extends addressbook_bo
 		$readonlys['tabs']['history'] = true;
 		// setting hidebuttons for content will hide the 'normal' addressbook edit dialog buttons
 		$content['hidebuttons'] = true;
-		$content['hide_change_org'] = true;
 		$content['no_tid'] = true;
 		$content['showsearchbuttons'] = true; // enable search operation and search buttons| they're disabled by default
 
 		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
 
-		return $this->tmpl->exec('addressbook.addressbook_ui.extSearch',$content,$sel_options,$readonlys,array(),2);
+		$this->tmpl->set_cell_attribute('change_org','disabled',true);
+		return $this->tmpl->exec('addressbook.addressbook_ui.search',$content,$sel_options,$readonlys,array(),2);
 	}
 
 	/**
@@ -3563,7 +3242,7 @@ class addressbook_ui extends addressbook_bo
 	 * Migrate contacts to or from LDAP (called by Admin >> Addressbook >> Site configuration (Admin only)
 	 *
 	 */
-	function migrate2ldap($type=null)
+	function migrate2ldap()
 	{
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Addressbook').' - '.lang('Migration to LDAP');
 		echo $GLOBALS['egw']->framework->header();
@@ -3575,7 +3254,7 @@ class addressbook_ui extends addressbook_bo
 		}
 		else
 		{
-			parent::migrate2ldap($type ?? $_GET['type']);
+			parent::migrate2ldap($_GET['type']);
 			echo '<p style="margin-top: 20px;"><b>'.lang('Migration finished')."</b></p>\n";
 		}
 		echo $GLOBALS['egw']->framework->footer();
@@ -3662,9 +3341,6 @@ class addressbook_ui extends addressbook_bo
 		}
 		$sel_options['status'] = $this->contact_fields;
 
-		// Addressbook also has an 'owner' field, which has different options.
-		// If we don't put something here (just empty won't work), history log will use
-		// those options instead of the select-account options.
-		$sel_options['history']['owner'] = ['ignore' => 'me'];
+		// custom fields no longer need to be added, historylog-widget "knows" about them
 	}
-}
+}

addressbook/inc/class.addressbook_vcal.inc.php

@@ -369,7 +369,7 @@ class addressbook_vcal extends addressbook_bo
 									}
 									// Horde::logMessage("vCalAddressbook $vcardField omitted due to maximum size $size",
 									//		__FILE__, __LINE__, PEAR_LOG_WARNING);
-									continue 2;
+									continue;
 								}
 								$values = array();
 							}
@@ -401,15 +401,6 @@ class addressbook_vcal extends addressbook_bo
 						}
 						break;
 
-					case 'freebusy_uri':
-						// fix Freebusy URL for users
-						if (!empty($entry['account_id']) && ($user = Api\Accounts::id2name($entry['account_id'])))
-						{
-							$value = Api\Header\Http::fullUrl(Api\Framework::link('/calendar/freebusy.php', ['user' => $user]));
-						}
-						if (!empty($value)) $hasdata++;
-						break;
-
 					case 'n_fn':
 					case 'fileas_type':
 						// mark entries with fileas_type == 'org_name' as X-ABSHOWAS:COMPANY (Apple AB specific)
@@ -434,7 +425,7 @@ class addressbook_vcal extends addressbook_bo
 								}
 								// Horde::logMessage("vCalAddressbook $vcardField omitted due to maximum size $size",
 								//		__FILE__, __LINE__, PEAR_LOG_WARNING);
-								continue 2;
+								continue;
 							}
 							// truncate the value to size
 							$cursize = strlen(implode('', $values));
@@ -533,7 +524,7 @@ class addressbook_vcal extends addressbook_bo
 		return $result;
 	}
 
-	function iCalSearch($_vcard, $contentID=null, $relax=false, $charset=null)
+	function search($_vcard, $contentID=null, $relax=false, $charset=null)
 	{
 		$result = array();
 
@@ -971,12 +962,11 @@ class addressbook_vcal extends addressbook_bo
 				{
 					if (!empty($fieldName))
 					{
-						$value = $vcardValues[$vcardKey]['values'][$fieldKey];
-						if (is_string($value)) $value = trim($value);
+						$value = trim($vcardValues[$vcardKey]['values'][$fieldKey]);
 
 						if ($pref_tel && (($vcardKey == $pref_tel) ||
-							($vcardValues[$vcardKey]['name'] == 'TEL') &&
-							($vcardValues[$vcardKey]['value'] == $vcardValues[$pref_tel]['value'])))
+								($vcardValues[$vcardKey]['name'] == 'TEL') &&
+								($vcardValues[$vcardKey]['value'] == $vcardValues[$pref_tel]['value'])))
 						{
 							$contact['tel_prefer'] = $fieldName;
 						}
@@ -1013,7 +1003,7 @@ class addressbook_vcal extends addressbook_bo
 								if ($vcardValues[$vcardKey]['params']['ENCODING'] === 'SMIME')
 								{
 									// ignore re-importing of S/Mime pubkey for now, as we might be called for a new contact
-									continue 2;
+									continue;
 								}
 								break;
 

addressbook/inc/class.addressbook_wizard_export_contacts_csv.inc.php

@@ -90,7 +90,7 @@ class addressbook_wizard_export_contacts_csv extends importexport_wizard_basic_e
 			unset ($preserv['button']);
 			$field_list = $this->get_field_list($content);
 
-			$settings = $content['explode_multiselects'] ?: $content['plugin_options']['explode_multiselects'] ?: [];
+			$settings = $content['explode_multiselects'] ? $content['explode_multiselects'] : $content['plugin_options']['explode_multiselects'];
 
 			// Skip this step if no fields applicable
 			if(count($field_list) == 0) {
@@ -149,4 +149,4 @@ class addressbook_wizard_export_contacts_csv extends importexport_wizard_basic_e
 		}
 		return $field_list;
 	}
-}
+}

addressbook/inc/class.addressbook_wizard_import_contacts_csv.inc.php

@@ -108,13 +108,13 @@ class addressbook_wizard_import_contacts_csv extends importexport_wizard_basic_i
 		{
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if(!array_key_exists('contact_owner', $content) && $content['plugin_options']) {
+			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists('owner_from_csv', $content) && $content['plugin_options']) {
+			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists('change_owner', $content) && $content['plugin_options']) {
+			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 

addressbook/inc/class.addressbook_wizard_import_vcard.inc.php

@@ -95,10 +95,10 @@ class addressbook_wizard_import_vcard extends addressbook_import_vcard
 		{
 			$content['title'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
-			if (!array_key_exists('contact_owner', $content) && $content['plugin_options']) {
+			if(!array_key_exists($content['contact_owner']) && $content['plugin_options']) {
 				$content['contact_owner'] = $content['plugin_options']['contact_owner'];
 			}
-			if(!array_key_exists('change_owner', $content) && $content['plugin_options']) {
+			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
@@ -107,7 +107,7 @@ class addressbook_wizard_import_vcard extends addressbook_import_vcard
 
 			foreach(array('override_values') as $field)
 			{
-				if(!$content[$field] && is_array($content['plugin_options']) && array_key_exists($field, $content['plugin_options']))
+				if(!$content[$field] && array_key_exists($field, $content['plugin_options']))
 				{
 					$content[$field] = $content['plugin_options'][$field];
 				}
@@ -117,4 +117,4 @@ class addressbook_wizard_import_vcard extends addressbook_import_vcard
 			return 'addressbook.importexport_wizard_vcard_chooseowner';
 		}
 	}
-}
+}

addressbook/inc/class.addressbook_zpush.inc.php

@@ -129,7 +129,7 @@ class addressbook_zpush implements activesync_plugin_write, activesync_plugin_se
 
 		if (!isset($abs) || !$return_all_in_one)
 		{
-			if ($return_all_in_one && ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] ?? null))
+			if ($return_all_in_one && $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'])
 			{
 				$abs = array(
 					$GLOBALS['egw_info']['user']['account_id'] => lang('All'),
@@ -141,7 +141,7 @@ class addressbook_zpush implements activesync_plugin_write, activesync_plugin_se
 
 				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
-				$pref_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'] ?? [];
+				$pref_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
 				if (!is_array($pref_abs))
 				{
 					$pref_abs = $pref_abs ? explode(',',$pref_abs) : [];
@@ -557,7 +557,7 @@ class addressbook_zpush implements activesync_plugin_write, activesync_plugin_se
 
 					case 'cat_id':
 						// for existing entries in all-in-one addressbook, remove addressbook name as category
-						if ($contact && $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] && is_array($message->$key) &&
+						if ($contact && $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
 							($k=array_search($this->get_addressbooks($contact['owner'].($contact['private']?'p':''), false, true),$message->$key)))
 						{
 							unset($message->categories[$k]);
@@ -917,4 +917,4 @@ class addressbook_zpush implements activesync_plugin_write, activesync_plugin_se
 		);
 		return $settings;
 	}
-}
+}

addressbook/js/CRM.js

@@ -0,0 +1,203 @@
+"use strict";
+/**
+ * EGroupware - Addressbook - Javascript UI
+ *
+ * @link: https://www.egroupware.org
+ * @package addressbook
+ * @author Hadi Nategh	<hn-AT-stylite.de>
+ * @copyright (c) 2008-13 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ */
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+/*egw:uses
+    /api/js/jsapi/egw_app.js
+ */
+require("jquery");
+require("jqueryui");
+require("../jsapi/egw_global");
+require("../etemplate/et2_types");
+var egw_app_1 = require("../../api/js/jsapi/egw_app");
+var et2_extension_nextmatch_1 = require("../../api/js/etemplate/et2_extension_nextmatch");
+/**
+ * UI for Addressbook CRM view
+ *
+ */
+var CRMView = /** @class */ (function (_super) {
+    __extends(CRMView, _super);
+    /**
+     * Constructor
+     *
+     * CRM is part of addressbook
+     */
+    function CRMView() {
+        var _this = 
+        // call parent
+        _super.call(this, 'addressbook') || this;
+        // Reference to the list
+        _this.nm = null;
+        // Which addressbook contact id(s) we are showing entries for
+        _this.contact_ids = [];
+        // Private js for the list
+        _this.app_obj = null;
+        // Push data key(s) to check for our contact ID in the entry's ACL data
+        _this.push_contact_ids = ["contact_id"];
+        return _this;
+    }
+    /**
+     * Destructor
+     */
+    CRMView.prototype.destroy = function (_app) {
+        this.nm = null;
+        if (this.app_obj != null) {
+            this.app_obj.destroy(_app);
+        }
+        // call parent
+        _super.prototype.destroy.call(this, _app);
+    };
+    /**
+     * A template from an app is ready, looks like it might be a CRM view.
+     * Check it, get CRM ready, and bind accordingly
+     *
+     * @param et2
+     * @param appname
+     */
+    CRMView.view_ready = function (et2, app_obj) {
+        // Check to see if the template is for a CRM view
+        if (et2.app == app_obj.appname) {
+            return false;
+        }
+        // Make sure object is there, etemplate2 will pick it up and call our et2_ready
+        if (typeof et2.app_obj.crm == "undefined" && app.classes.crm) {
+            et2.app_obj.crm = new app.classes.crm();
+        }
+        if (typeof et2.app_obj.crm == "undefined") {
+            egw.debug("error", "CRMView object is missing");
+            return false;
+        }
+        var crm = et2.app_obj.crm;
+        // We can set this now
+        crm.set_view_obj(app_obj);
+    };
+    /**
+     * This function is called when the etemplate2 object is loaded
+     * and ready.  The associated app [is supposed to have] already called its own et2_ready(),
+     * so any changes done here will override the app.
+     *
+     * @param {etemplate2} et2 newly ready object
+     * @param {string} name Template name
+     */
+    CRMView.prototype.et2_ready = function (et2, name) {
+        // call parent
+        _super.prototype.et2_ready.call(this, et2, name);
+    };
+    /**
+     * Set the associated private app JS
+     * We try and pull the needed info here
+     */
+    CRMView.prototype.set_view_obj = function (app_obj) {
+        this.app_obj = app_obj;
+        // For easy reference later
+        this.nm = app_obj.et2.getDOMWidgetById('nm');
+        var contact_ids = app_obj.et2.getArrayMgr("content").getEntry("action_id") || "";
+        if (typeof contact_ids == "string") {
+            contact_ids = contact_ids.split(",");
+        }
+        this.set_contact_ids(contact_ids);
+        // Override the push handler
+        this._override_push(app_obj);
+    };
+    /**
+     * Set or change which contact IDs we are showing entries for
+     */
+    CRMView.prototype.set_contact_ids = function (ids) {
+        this.contact_ids = ids;
+        var filter = { action_id: this.contact_ids };
+        if (this.nm !== null) {
+            this.nm.applyFilters(filter);
+        }
+    };
+    /**
+     * Handle a push notification about entry changes from the websocket
+     *
+     * @param  pushData
+     * @param {string} pushData.app application name
+     * @param {(string|number)} pushData.id id of entry to refresh or null
+     * @param {string} pushData.type either 'update', 'edit', 'delete', 'add' or null
+     * - update: request just modified data from given rows.  Sorting is not considered,
+     *		so if the sort field is changed, the row will not be moved.
+     * - edit: rows changed, but sorting may be affected.  Requires full reload.
+     * - delete: just delete the given rows clientside (no server interaction neccessary)
+     * - add: ask server for data, add in intelligently
+     * @param {object|null} pushData.acl Extra data for determining relevance.  eg: owner or responsible to decide if update is necessary
+     * @param {number} pushData.account_id User that caused the notification
+     */
+    CRMView.prototype.push = function (pushData) {
+        if (pushData.app !== this.app_obj.appname || !this.nm)
+            return;
+        // If we know about it and it's an update, just update.
+        // This must be before all ACL checks, as contact might have changed and entry needs to be removed
+        // (server responds then with null / no entry causing the entry to disappear)
+        if (pushData.type !== "add" && this.egw.dataHasUID(this.uid(pushData))) {
+            // Check to see if it's in OUR nextmatch
+            var uid_1 = this.uid(pushData);
+            var known = Object.values(this.nm.controller._indexMap).filter(function (row) { return row.uid == uid_1; });
+            var type = pushData.type;
+            if (known && known.length > 0) {
+                if (!this.id_check(pushData.acl)) {
+                    // Was ours, not anymore, and we know this now - no server needed.  Just remove from nm.
+                    type = et2_extension_nextmatch_1.et2_nextmatch.DELETE;
+                }
+                return this.nm.refresh(pushData.id, type);
+            }
+        }
+        if (this.id_check(pushData.acl)) {
+            return this._app_obj_push(pushData);
+        }
+    };
+    /**
+     * Check to see if the given entry is "ours"
+     *
+     * @param entry
+     */
+    CRMView.prototype.id_check = function (entry) {
+        var _this = this;
+        // Check if it's for one of our contacts
+        for (var _i = 0, _a = this.push_contact_ids; _i < _a.length; _i++) {
+            var field = _a[_i];
+            if (entry && entry[field]) {
+                var val = typeof entry[field] == "string" ? [entry[field]] : entry[field];
+                if (val.filter(function (v) { return _this.contact_ids.indexOf(v) >= 0; }).length > 0) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    };
+    /**
+     * Override the list's push handler to do nothing, we'll call it if we want it.
+     *
+     * @param app_obj
+     * @private
+     */
+    CRMView.prototype._override_push = function (app_obj) {
+        this._app_obj_push = app_obj.push.bind(app_obj);
+        app_obj.push = function (pushData) { return false; };
+    };
+    return CRMView;
+}(egw_app_1.EgwApp));
+exports.CRMView = CRMView;
+app.classes.crm = CRMView;
+//# sourceMappingURL=CRM.js.map

addressbook/js/CRM.ts

@@ -4,8 +4,7 @@
  * @link: https://www.egroupware.org
  * @package addressbook
  * @author Hadi Nategh	<hn-AT-stylite.de>
- * @author Ralf Becker <rb-AT-egroupware.org>
- * @copyright (c) 2008-21 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2008-13 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 
@@ -13,10 +12,14 @@
 	/api/js/jsapi/egw_app.js
  */
 
+import 'jquery';
+import 'jqueryui';
+import '../jsapi/egw_global';
+import '../etemplate/et2_types';
+
 import {EgwApp, PushData} from '../../api/js/jsapi/egw_app';
 import {etemplate2} from "../../api/js/etemplate/etemplate2";
 import {et2_nextmatch} from "../../api/js/etemplate/et2_extension_nextmatch";
-import {egw} from "../../api/js/jsapi/egw_global.js";
 
 /**
  * UI for Addressbook CRM view
@@ -24,9 +27,6 @@ import {egw} from "../../api/js/jsapi/egw_global.js";
  */
 export class CRMView extends EgwApp
 {
-	// List ID
-	list_id: string = "";
-
 	// Reference to the list
 	nm: et2_nextmatch = null;
 
@@ -80,23 +80,21 @@ export class CRMView extends EgwApp
 		// Check to see if the template is for a CRM view
 		if(et2.app == app_obj.appname)
 		{
-			return CRMView.reconnect(app_obj);
+			return false;
 		}
 
 		// Make sure object is there, etemplate2 will pick it up and call our et2_ready
-		let crm : CRMView = undefined;
-		// @ts-ignore
 		if(typeof et2.app_obj.crm == "undefined" && app.classes.crm)
 		{
-			// @ts-ignore
-			crm = et2.app_obj.crm = new app.classes.crm();
+			et2.app_obj.crm = new app.classes.crm();
 		}
-		if(typeof crm == "undefined")
+		if(typeof et2.app_obj.crm == "undefined")
 		{
 			egw.debug("error", "CRMView object is missing");
 			return false;
 		}
 
+		let crm = et2.app_obj.crm;
 
 		// We can set this now
 		crm.set_view_obj(app_obj);
@@ -117,36 +115,6 @@ export class CRMView extends EgwApp
 
 	}
 
-	/**
-	 * Our CRM has become disconnected from its list, probably because something submitted.
-	 * Find it, and get things working again.
-	 *
-	 * @param app_obj
-	 */
-	static reconnect(app_obj : EgwApp)
-	{
-		// Check
-		let contact_ids = app_obj.et2.getArrayMgr("content").getEntry("action_id") || "";
-		if(!contact_ids) return;
-
-		for (let existing_app of EgwApp._instances)
-		{
-			if(existing_app instanceof CRMView && existing_app.list_id == app_obj.et2.getInstanceManager().uniqueId)
-			{
-				// List was reloaded.  Rebind.
-				existing_app.app_obj.destroy(existing_app.app_obj.appname);
-				if(!existing_app.nm?.getParent())
-				{
-					try
-					{
-						// This will probably not die cleanly, we had a reference when it was destroyed
-						existing_app.nm.destroy();
-					} catch (e) {}
-				}
-				return existing_app.set_view_obj(app_obj);
-			}
-		}
-	}
 	/**
 	 * Set the associated private app JS
 	 * We try and pull the needed info here
@@ -155,17 +123,7 @@ export class CRMView extends EgwApp
 	{
 		this.app_obj = app_obj;
 
-		// Make sure object is there, etemplate2 will pick it up and call our et2_ready
-		app_obj.et2.getInstanceManager().app_obj.crm = this
-
-		// Make _sure_ we get notified if the list is removed (actions, refresh) - this is not always a full
-		// destruction
-		jQuery(app_obj.et2.getDOMNode()).on('clear', function() {
-			this.nm = null;
-		}.bind(this));
-
 		// For easy reference later
-		this.list_id = app_obj.et2.getInstanceManager().uniqueId;
 		this.nm = <et2_nextmatch>app_obj.et2.getDOMWidgetById('nm');
 
 		let contact_ids = app_obj.et2.getArrayMgr("content").getEntry("action_id") || "";
@@ -274,4 +232,5 @@ export class CRMView extends EgwApp
 	}
 }
 
+
 app.classes.crm = CRMView;

addressbook/js/app.ts

@@ -3,9 +3,8 @@
  *
  * @link: https://www.egroupware.org
  * @package addressbook
- * @author Hadi Nategh <hn-AT-egroupware.org>
- * @author Ralf Becker <rb-AT-egroupware.org>
- * @copyright (c) 2008-21 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @author Hadi Nategh	<hn-AT-stylite.de>
+ * @copyright (c) 2008-13 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 
@@ -13,27 +12,13 @@
 	/api/js/jsapi/egw_app.js
  */
 
-import {EgwApp, PushData} from '../../api/js/jsapi/egw_app';
-import {etemplate2} from "../../api/js/etemplate/etemplate2";
-import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
-import {et2_selectbox} from "../../api/js/etemplate/et2_widget_selectbox";
-import {fetchAll, nm_action, nm_compare_field} from "../../api/js/etemplate/et2_extension_nextmatch_actions";
-import "./CRM";
-import {egw} from "../../api/js/jsapi/egw_global";
-import {LitElement} from "@lion/core";
-import {Et2SelectState} from "../../api/js/etemplate/Et2Select/Et2Select";
-import {Et2SelectCountry} from "../../api/js/etemplate/Et2Select/Et2SelectCountry";
+import 'jquery';
+import 'jqueryui';
+import '../jsapi/egw_global';
+import '../etemplate/et2_types';
 
-/**
- * Object to call app.addressbook.openCRMview with
- */
-export 	interface CrmParams {
-	contact_id: number|string;
-	crm_list?: "infolog"|"tracker"|"infolog-organisation"; // default: use preference
-	title?: string;	// default: link-title of contact_id
-	icon?: string;	// default: avatar for contact_id
-	index?: number;
-}
+import {EgwApp} from '../../api/js/jsapi/egw_app';
+import {etemplate2} from "../../api/js/etemplate/etemplate2";
 
 /**
  * UI for Addressbook
@@ -42,10 +27,6 @@ export 	interface CrmParams {
  */
 class AddressbookApp extends EgwApp
 {
-	// These fields help with push
-	protected push_grant_fields = ["owner","shared_with"];
-	protected push_filter_fields = ["tid","owner","cat_id"]
-
 	/**
 	 * Constructor
 	 *
@@ -79,16 +60,10 @@ class AddressbookApp extends EgwApp
 		// r49769 let's CRM view run under currentapp == "addressbook", which causes
 		// app.addressbook.et2_ready called before app.infolog.et2_ready and therefore
 		// app.addressbook.et2 would point to infolog template, if we not stop here
-		if(name.match(/^infolog|tracker\./))
-		{
-			return;
-		}
+		if (name.match(/^infolog|tracker\./)) return;
 
 		// call parent
-		else
-		{
-			super.et2_ready(et2, name);
-		}
+		super.et2_ready(et2, name);
 
 		switch (name)
 		{
@@ -96,7 +71,10 @@ class AddressbookApp extends EgwApp
 				var content = this.et2.getArrayMgr('content').data;
 				if (typeof content.showsearchbuttons == 'undefined' || !content.showsearchbuttons)
 				{
-					// Instantiate infolog JS too - wrong app, so it won't be done automatically
+					this.show_custom_country(jQuery('select[id*="adr_one_countrycode"]').get(0));
+					this.show_custom_country(jQuery('select[id*="adr_two_countrycode"]').get(0));
+
+					// Instanciate infolog JS too - wrong app, so it won't be done automatically
 					if(typeof window.app.infolog != 'object' && typeof window.app.classes['infolog'] == 'function')
 					{
 						window.app.infolog = new window.app.classes.infolog();
@@ -112,6 +90,13 @@ class AddressbookApp extends EgwApp
 				}
 				break;
 		}
+
+		jQuery('select[id*="adr_one_countrycode"]').each(function() {
+			app.addressbook.show_custom_country(this);
+		});
+		jQuery('select[id*="adr_two_countrycode"]').each(function() {
+			app.addressbook.show_custom_country(this);
+		});
 	}
 
 	/**
@@ -183,53 +168,6 @@ class AddressbookApp extends EgwApp
 		return true;
 	}
 
-	/**
-	 * Handle a push notification about entry changes from the websocket
-	 *
-	 * Get's called for data of all apps, but should only handle data of apps it displays,
-	 * which is by default only it's own, but can be for multiple apps eg. for calendar.
-	 *
-	 * @param  pushData
-	 * @param {string} pushData.app application name
-	 * @param {(string|number)} pushData.id id of entry to refresh or null
-	 * @param {string} pushData.type either 'update', 'edit', 'delete', 'add' or null
-	 * - update: request just modified data from given rows.  Sorting is not considered,
-	 *		so if the sort field is changed, the row will not be moved.
-	 * - edit: rows changed, but sorting may be affected.  Requires full reload.
-	 * - delete: just delete the given rows clientside (no server interaction neccessary)
-	 * - add: requires full reload for proper sorting
-	 * @param {object|null} pushData.acl Extra data for determining relevance.  eg: owner or responsible to decide if update is necessary
-	 * @param {number} pushData.account_id User that caused the notification
-	 */
-	push(pushData : PushData)
-	{
-		// show missed calls on their CRM view
-		let et2_id = this.et2?.getInstanceManager().uniqueId;
-		if (pushData.app === 'stylite' && pushData.acl.missed &&
-			et2_id && et2_id.substr(0, 17) === 'addressbook-view-' &&
-			pushData.acl.account_id == this.egw.user('account_id') &&
-			pushData.acl.contact_id == this.et2.getArrayMgr("content")?.getEntry("id"))
-		{
-			egw_getFramework()?.notifyAppTab(et2_id.substr(17));
-		}
-
-		// don't care about other apps data
-		if(pushData.app !== this.appname) return;
-
-		// Update the contact list
-		if(this.et2 && this.et2.getInstanceManager().name == "addressbook.index")
-		{
-			return super.push(pushData);
-		}
-
-		// Update CRM view (sidebox part), if open
-		let contact_id = this.et2?.getArrayMgr("content")?.getEntry("id") || 0;
-		if(this.et2 && contact_id && contact_id == pushData.id)
-		{
-			this.et2.getInstanceManager().submit();
-		}
-	}
-
 	/**
 	 * Change handler for contact / org selectbox
 	 *
@@ -263,89 +201,34 @@ class AddressbookApp extends EgwApp
 		value[widget.id] = widget.getValue();
 		if(promise)
 		{
-			promise.then(() =>
+			jQuery.when.apply(null, promise).done(function ()
 			{
 				nm.applyFilters(value);
 			});
 		}
 		return !promise;
 	}
-
 	/**
-	 * Open CRM view from addressbook index itself
+	 * Open CRM view
 	 *
 	 * @param _action
 	 * @param _senders
 	 */
 	view(_action, _senders)
 	{
-		let extras : CrmParams = {
-			contact_id: _senders[0].id.split('::').pop(),
-			index: _senders[0]._index
+		var index = _senders[0]._index;
+		var id = _senders[0].id.split('::').pop();
+		var extras : any = {
+			index: index
 		};
-		let data = egw.dataGetUIDdata(_senders[0].id)['data'];
+
 		// CRM list
 		if(_action.id != 'view')
 		{
-			extras.crm_list = _action.id.replace('view-', '');
+			extras.crm_list = _action.id.replace('view-','');
 		}
-		if(!extras.crm_list)
-		{
-			extras.crm_list = <string>egw.preference('crm_list', 'addressbook');
-		}
-		const title_app = extras.crm_list == "tracker" ? " (" + egw.lang(extras.crm_list) + ")" : "";
-		extras.title = ((_action.id.match(/\-organisation/) || extras.crm_list.endsWith("-organisation")) && data.org_name != "")
-					   ? data.org_name
-					   : data.n_fn + title_app;
-		extras.icon = data.photo;
-		return this.openCRMview(extras);
-	}
 
-	/**
-	 * Open a CRM view for a contact: callback for link-registry / egw.open / other apps
-	 *
-	 * @param {CrmParams} _params object with attribute "contact_id" and optional "title", "crm_list", "icon"
-	 * @param {object} _senders use egw.dataGetUIDdata to get contact_id
-	 */
-	openCRMview(_params: CrmParams, _senders?: object)
-	{
-		let contact_id = typeof _params === 'object' ? _params.contact_id : _params;
-		if (typeof _senders === 'object')
-		{
-			let data = egw.dataGetUIDdata(_senders[0].id);
-			contact_id = data.data.contact_id;
-		}
-		if (typeof contact_id !== 'undefined')
-		{
-			let crm_list = _params.crm_list || egw.preference('crm_list', 'addressbook');
-			if (!crm_list || crm_list === '~edit~') crm_list = 'infolog';
-			let url = this.egw.link('/index.php', {
-				menuaction: 'addressbook.addressbook_ui.view',
-				ajax: 'true',
-				contact_id: contact_id,
-				crm_list: crm_list
-			});
-			// no framework, just open the url
-			if (typeof this.egw.window.framework === 'undefined')
-			{
-				return this.egw.open_link(url);
-			}
-			const title = _params.title ? Promise.resolve(_params.title) : this.egw.link_title('addressbook', contact_id, true);
-			title.then(_title =>
-			{
-				this.egw.window.framework.tabLinkHandler(url, {
-					displayName: _title,
-					icon: _params.icon || this.egw.link('/api/avatar.php', {
-						contact_id: contact_id,
-						etag: (new Date).valueOf()/86400|0	// cache for a day, better then no invalidation
-					}),
-					refreshCallback: function() {
-						etemplate2.getById("addressbook-view-"+this.appName)?.app_obj.addressbook.view_set_list();
-					},
-					id: contact_id + '-'+crm_list
-				});
-			});
-		}
+		this.egw.open(id, 'addressbook', 'view', extras, '_self', 'addressbook');
 	}
 
 	/**
@@ -371,28 +254,23 @@ class AddressbookApp extends EgwApp
 	 *
 	 * @param {object} _action
 	 */
-	view_actions(_action, _widget)
+	view_actions(_action)
 	{
+		var id = this.et2.getArrayMgr('content').data.id;
 
-		var et2 = _widget.getInstanceManager();
-		var id = et2.widgetContainer.getArrayMgr('content').data.id;
-
-		switch(_widget.id)
+		switch(_action.id)
 		{
-			case 'button[edit]':
+			case 'open':
 				this.egw.open(id, 'addressbook', 'edit');
 				break;
-			case 'button[copy]':
+			case 'copy':
 				this.egw.open(id, 'addressbook', 'edit', { makecp: 1});
 				break;
-			case 'button[delete]':
-				Et2Dialog.confirm(_widget, egw.lang('Delete this contact?'), egw.lang('Delete'));
-				break;
-			case 'button[close]':
-				framework.activeApp.tab.closeButton.click();
+			case 'cancel':
+				this.egw.open(null, 'addressbook', 'list', null, '_self', 'addressbook');
 				break;
 			default:	// submit all other buttons back to server
-				et2.widgetContainer._inst.submit();
+				this.et2._inst.submit();
 				break;
 		}
 	}
@@ -560,31 +438,6 @@ class AddressbookApp extends EgwApp
 		nm_action(_action, _senders);
 	}
 
-	/**
-	* Actions via ajax
-	*
-	* @param {egwAction} _action
-	* @param {egwActionObject[]} _selected
-	*/
-	action(_action : egwAction, _selected : egwActionObject[])
-	{
-		let all = _action.parent.data.nextmatch?.getSelection().all;
-		let no_notifications = _action.parent.getActionById("no_notifications")?.checked || false;
-		let ids = [];
-		// Loop so we get just the app's ID
-		for(var i = 0; i < _selected.length; i++)
-		{
-			var id = _selected[i].id;
-			ids.push(id.split("::").pop());
-		}
-		switch(_action.id)
-		{
-			case 'delete':
-				egw.json("addressbook.addressbook_ui.ajax_action",[_action.id, ids, all, no_notifications]).sendRequest(true);
-				break;
-		}
-	}
-
 	/**
 	 * [More...] in phones clicked: copy allways shown phone numbers to phone popup
 	 *
@@ -657,35 +510,34 @@ class AddressbookApp extends EgwApp
 	{
 		var confirmdialog = function(_title, _value, _buttons, _egw_or_appname?)
 		{
-			let dialog = new Et2Dialog(_egw_or_appname);
-			dialog.transformAttributes({
-				callback: function(_buttons, _value)
+			return et2_createWidget("dialog",
+			{
+				callback(_buttons, _value)
 				{
-					if(_buttons == Et2Dialog.OK_BUTTON)
+					if (_buttons == et2_dialog.OK_BUTTON)
 					{
 						var id = '';
-						//var content = this.template.widgetContainer.getArrayMgr('content').data;
-						for(var row in _value.grid)
+						var content = this.template.widgetContainer.getArrayMgr('content').data;
+						for (var row in _value.grid)
 						{
-							if(_value.grid[row].confirm == "true" && typeof content[row] != 'undefined')
+							if (_value.grid[row].confirm == "true" && typeof content.grid !='undefined')
 							{
-								id = content[row].confirm;
+								id = this.options.value.content.grid[row].confirm;
 								egw.open(id, 'addressbook');
 
 							}
 						}
 					}
 				},
-				title: _title || egw.lang('Input required'),
-				buttons: _buttons || Et2Dialog.BUTTONS_OK_CANCEL,
+				title: _title||egw.lang('Input required'),
+				buttons: _buttons||et2_dialog.BUTTONS_OK_CANCEL,
 				value: {
 					content: {
 						grid: _value
 					}
 				},
-				template: egw.webserverUrl + '/addressbook/templates/default/dupconfirmdialog.xet'
-			});
-			document.body.appendChild(<LitElement><unknown>dialog);
+				template: egw.webserverUrl+'/addressbook/templates/default/dupconfirmdialog.xet'
+			}, et2_dialog._create_parent(_egw_or_appname));
 		};
 
 		if (_data.msg && _data.doublicates)
@@ -696,11 +548,11 @@ class AddressbookApp extends EgwApp
 			{
 				content.push({"confirm":id,"name":_data.doublicates[id]});
 			}
-			confirmdialog(this.egw.lang('Duplicate warning'), content, Et2Dialog.BUTTONS_OK_CANCEL, this.egw);
+			confirmdialog(this.egw.lang('Duplicate warning'),content,et2_dialog.BUTTONs_OK_CANCEL);
 		}
 		if (typeof _data.fileas_options == 'object' && this.et2)
 		{
-			var selbox = <et2_selectbox>this.et2.getWidgetById('fileas_type');
+			var selbox = this.et2.getWidgetById('fileas_type');
 			if (selbox)
 			{
 				selbox.set_select_options(_data.fileas_sel_options);
@@ -716,20 +568,15 @@ class AddressbookApp extends EgwApp
 	 */
 	check_value(widget, own_id)
 	{
-		// Skip check in advanced search
-		if(this.et2.getArrayMgr("content").getEntry("showsearchbuttons") === true)
-		{
-			return;
-		}
 		// if we edit an account, call account_change to let it do it's stuff too
-		if(this.et2.getWidgetById('account_lid'))
+		if (this.et2.getWidgetById('account_lid'))
 		{
 			this.account_change(null, widget);
 		}
 
 		var values = this.et2._inst.getValues(this.et2);
 
-		if(widget.id.match(/n_/))
+		if (widget.id.match(/n_/))
 		{
 			var value = '';
 			if (values.n_prefix) value += values.n_prefix+" ";
@@ -744,15 +591,34 @@ class AddressbookApp extends EgwApp
 		egw.json('addressbook.addressbook_ui.ajax_check_values', [values, widget.id, own_id],this._confirmdialog_callback,this,true,this).sendRequest();
 	}
 
-	/**
-	 * Set country-code of select-state
-	 *
-	 * @param event
-	 * @param country
-	 */
-	regionSetCountry(event, country : Et2SelectCountry)
+	show_custom_country(selectbox)
 	{
-		(<Et2SelectState><any>this.et2.getWidgetById(country.id.replace('countrycode', 'region')))?.set_country_code(country.value);
+		if(!selectbox) return;
+		var custom_field_name = selectbox.id.replace("countrycode", "countryname");
+		var custom_field = <HTMLInputElement>document.getElementById(custom_field_name);
+		if(custom_field && selectbox.value == "-custom-") {
+			custom_field.style.display = "inline";
+		}
+		else if (custom_field)
+		{
+			if((selectbox.value == "" || selectbox.value == null) && custom_field.value != "")
+			{
+				selectbox.value = "-custom-";
+				// Chosen needs this to update
+				jQuery(selectbox).trigger("liszt:updated");
+
+				custom_field.style.display = "inline";
+			}
+			else
+			{
+				custom_field.style.display = "none";
+			}
+		}
+		var region = this.et2.getWidgetById(selectbox.name.replace('countrycode', 'region'));
+		if (region)
+		{
+			region.set_country_code(selectbox.value);
+		}
 	}
 
 	/**
@@ -804,19 +670,16 @@ class AddressbookApp extends EgwApp
 		var lists = <et2_selectbox><unknown>this.et2.getWidgetById('filter2');
 		let owner_options = this.et2.getArrayMgr('sel_options').getEntry('filter') || {};
 		let callback = function(button, values) {
-			if(button == Et2Dialog.OK_BUTTON)
+			if(button == et2_dialog.OK_BUTTON)
 			{
-				egw.json('addressbook.addressbook_ui.ajax_set_list', [0, values.name, values.owner, contacts],
+				egw.json('addressbook.addressbook_ui.ajax_set_list',[0, values.name, values.owner, contacts],
 					function(result)
 					{
-						if(typeof result == 'object')
-						{
-							return;
-						} // This response not for us
+						if(typeof result == 'object') return; // This response not for us
 						// Update list
 						if(result)
 						{
-							lists.options.select_options.unshift({value: result, label: values.name});
+							lists.options.select_options.unshift({value:result,label:values.name});
 							lists.set_select_options(lists.options.select_options);
 
 							// Set to new list so they can see it easily
@@ -836,7 +699,6 @@ class AddressbookApp extends EgwApp
 								id,
 								values.name
 							);
-							action.setDefaultExecute(action.parent.onExecute.fnct);
 							action.updateAction({group: 1});
 						}
 					}
@@ -844,25 +706,23 @@ class AddressbookApp extends EgwApp
 			}
 		};
 
-		let dialog = new Et2Dialog(this.egw);
-		dialog.transformAttributes({
-			callback: callback,
-			title: 'Add a new list',
-			buttons: Et2Dialog.BUTTONS_OK_CANCEL,
-			value: {
-				content: {
-					owner: owner
-				},
-				sel_options: {
-					owner: owner_options
-				}
-			},
-			template: egw.webserverUrl + '/addressbook/templates/default/add_list_dialog.xet',
-			class: "et2_prompt",
-			width: 400
-		});
 
-		document.body.appendChild(<LitElement><unknown>dialog);
+		let dialog = et2_createWidget("dialog", {
+            callback: callback,
+            title: this.egw.lang('Add a new list'),
+            buttons: et2_dialog.BUTTONS_OK_CANCEL,
+            value: {
+                content: {
+                    owner: owner
+                },
+	            sel_options: {
+                	owner: owner_options
+	            }
+            },
+            template: egw.webserverUrl + '/addressbook/templates/default/add_list_dialog.xet',
+            class: "et2_prompt",
+			minWidth: 400
+        }, this.et2);
 	}
 
 	/**
@@ -886,18 +746,14 @@ class AddressbookApp extends EgwApp
 				value = lists.options.select_options[i];
 			}
 		}
-		Et2Dialog.show_prompt(
-			function(button, name)
-			{
-				if(button == Et2Dialog.OK_BUTTON)
+		et2_dialog.show_prompt(
+			function(button, name) {
+				if(button == et2_dialog.OK_BUTTON)
 				{
-					egw.json('addressbook.addressbook_ui.ajax_set_list', [list, name],
+					egw.json('addressbook.addressbook_ui.ajax_set_list',[list, name],
 						function(result)
 						{
-							if(typeof result == 'object')
-							{
-								return;
-							} // This response not for us
+							if(typeof result == 'object') return; // This response not for us
 							// Update list
 							if(result)
 							{
@@ -949,7 +805,7 @@ class AddressbookApp extends EgwApp
 	 */
 	nm_compare_field()
 	{
-		var field = this.et2?.getWidgetById('filter2');
+		var field = this.et2.getWidgetById('filter2');
 		if (field) var val = field.get_value();
 		if (val)
 		{
@@ -1123,26 +979,24 @@ class AddressbookApp extends EgwApp
 		if(action && action.data && selected.length > 1)
 		{
 			var callback = function(button, value) {
-				if(button == Et2Dialog.OK_BUTTON)
+				if(button == et2_dialog.OK_BUTTON)
 				{
 					var _action = jQuery.extend(true, {}, action);
 					if(value.infolog)
 					{
-						_action.data.menuaction += '&to_app=infolog&info_type=' + value.info_type;
+						_action.data.menuaction += '&to_app=infolog&info_type='+value.info_type;
 					}
 					nm_action(_action, selected, target);
 				}
 			};
-			let dialog = new Et2Dialog(this.egw);
-			dialog.transformAttributes({
+			et2_createWidget("dialog",{
 				callback: callback,
 				title: action.caption,
-				buttons: Et2Dialog.BUTTONS_OK_CANCEL,
-				type: Et2Dialog.QUESTION_MESSAGE,
-				template: egw.webserverUrl + '/addressbook/templates/default/mail_merge_dialog.xet',
+				buttons: et2_dialog.BUTTONS_OK_CANCEL,
+				type: et2_dialog.QUESTION_MESSAGE,
+				template: egw.webserverUrl+'/addressbook/templates/default/mail_merge_dialog.xet',
 				value: {content: {info_type: 'email'}, sel_options: this.et2.getArrayMgr('sel_options').data}
 			});
-			document.body.appendChild(<LitElement><unknown>dialog);
 		}
 		else
 		{
@@ -1323,7 +1177,8 @@ class AddressbookApp extends EgwApp
 	 */
 	getWindowTitle()
 	{
-		return this.et2.getValueById('n_fn');
+		var widget = this.et2.getWidgetById('n_fn');
+		if(widget) return widget.options.value;
 	}
 
 	/**
@@ -1476,6 +1331,7 @@ class AddressbookApp extends EgwApp
 		// defined in addressbook_hooks::config
 		var default_url = 'https://maps.here.com/directions/drive{{%rs=/%rs}}%r0,%t0,%z0,%c0{{%d=/%d}}%r1,%t1,%z1+%c1';
 		var geo_url = egw.config('geolocation_url');
+		if (geo_url) geo_url = geo_url[0];
 		return geo_url || default_url;
 	}
 
@@ -1523,9 +1379,6 @@ class AddressbookApp extends EgwApp
 	 */
 	private videoconference_isUserOnline(_action, _selected)
 	{
-		// ATM we're not supporting status in mobile theme
-		if (egwIsMobile()) return false;
-
 		let list = app.status ? app.status.getEntireList() : {};
 		for (let sel in _selected)
 		{
@@ -1577,31 +1430,6 @@ class AddressbookApp extends EgwApp
 		}
 	}
 
-	/**
-	 * Check if new shared_with value is allowed / user has rights to share into that AB
-	 *
-	 * Remove the entry again, if user is not allowed
-	 */
-	public shared_changed()
-	{
-		let shared = this.et2.getInputWidgetById('shared_values');
-		let value = <Array<string>>shared?.get_value();
-
-		if (value)
-		{
-			this.egw.json('addressbook.addressbook_ui.ajax_check_shared', [{
-				contact: this.et2.getInstanceManager().getValues(this.et2),	// for sharing policy
-				shared_values: value,
-				shared_writable: this.et2.getInputWidgetById('shared_writable').get_value()
-			}], _data => {
-				if (Array.isArray(_data) && _data.length)
-				{
-					// remove not allowed entries
-					shared.set_value(value.filter(val => _data.indexOf(val) === -1));
-				}
-			}).sendRequest();
-		}
-	}
 }
 
-app.classes.addressbook = AddressbookApp;
+app.classes.addressbook = AddressbookApp;

addressbook/lang/egw_bg.lang

@@ -8,7 +8,6 @@
 %1 public keys added.	addressbook	bg	%1 (публичен ключ) за контрола на достъпа са добавени.
 %1 records imported	addressbook	bg	Импортирани са %1 записа
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	bg	%1 записа прочетени (все още не импортирани, може да се %2върнете%3 и да размаркирате Тест Импорт)
-%1 shared this contact on %2 with %3 %4	addressbook	bg	%1 е споделил този контакт на %2 %3 %4
 %1 starts with '%2'	addressbook	bg	%1 започва с '%2'
 %s please calculate the result	addressbook	bg	%s моля, изчислете резултата
 (e.g. 1969)	addressbook	bg	(например 1969г.)
@@ -42,7 +41,7 @@ added by synchronisation	addressbook	bg	Добавен чрез синхрони
 added to distribution list	addressbook	bg	Добавен към пощенски списък
 additional information about using ldap as contact repository	admin	bg	Допълнителна информация относно използване на LDAP като хранилище за контакти
 address book	common	bg	Адресен указател
-address book - vcard in	addressbook	bg	Адресен указател - vCard в
+address book - vcard in	addressbook	bg	Адресен указател - VCard в
 address book - view	addressbook	bg	Адресен указател - преглед
 address line 2	addressbook	bg	Адрес ред 2
 address line 2 (private)	addressbook	bg	Адрес ред 2 (личен)
@@ -60,7 +59,7 @@ addressbook the contact should be shown	addressbook	bg	Адресен указа
 addressbook vcard export	addressbook	bg	Експортиране на vCard в Адресен указател
 addressbook vcard import	addressbook	bg	Импортиране на vCard в Адресен указател
 addressbook-fieldname	addressbook	bg	Адресен указател - име на полето
-addvcard	addressbook	bg	Добавяне на vCard
+addvcard	addressbook	bg	Добавяне на VCard
 advanced search	addressbook	bg	Разширено търсене
 all addressbooks	addressbook	bg	Всички адресни указатели
 all contacts	addressbook	bg	Всички контакти
@@ -238,7 +237,7 @@ example {{nenvlf role}} - if field role is not empty, set a lf without any value
 existing links	addressbook	bg	Съществуващи връзки
 exists	addressbook	bg	Съществува
 export as csv	addressbook	bg	Експорт в CSV
-export as vcard	addressbook	bg	Експорт във vCard
+export as vcard	addressbook	bg	Експорт във VCard
 export contacts	addressbook	bg	Експорт на контактите
 export file name	addressbook	bg	Име на файла за експорт
 export from addressbook	addressbook	bg	Експорт от Адресния указател
@@ -305,18 +304,17 @@ import contacts	addressbook	bg	Импорт на контакти
 import csv-file into addressbook	addressbook	bg	Импорт на CSV-файл в адресния указател
 import file	addressbook	bg	Импорт на файл
 import from	addressbook	bg	Импорт от
-import from ldif, csv, or vcard	addressbook	bg	Импорт от LDIF, CSV или vCard
+import from ldif, csv, or vcard	addressbook	bg	Импорт от LDIF, CSV или VCard
 import from outlook	addressbook	bg	Импорт от Outlook
-import multiple vcard	addressbook	bg	Импорт на множество vCard
+import multiple vcard	addressbook	bg	Импорт на множество VCard
 import next set	addressbook	bg	Импорт на следващ комплект
-import_instructions	addressbook	bg	В Netscape, отворете адресния указател (Addressbook) и изберете <b>Export</b> от меню <b>File</b>. Експортираният файл ще бъде в LDIF формат.<p>В Outlook, изберете папка Контакти (Contacts), изберете <b>Import and Export...</b> от меню <b>File</b> и експортирайте контактите в CSV файл. <p>На Palm Desktop 4.0 или по-нов, отворете адресния указател и изберете <b>Export</b> от меню <b>File</b>. Експортирания файл ще бъде във формат vCard.
+import_instructions	addressbook	bg	В Netscape, отворете адресния указател (Addressbook) и изберете <b>Export</b> от меню <b>File</b>. Експортираният файл ще бъде в LDIF формат.<p>В Outlook, изберете папка Контакти (Contacts), изберете <b>Import and Export...</b> от меню <b>File</b> и експортирайте контактите в CSV файл. <p>На Palm Desktop 4.0 или по-нов, отворете адресния указател и изберете <b>Export</b> от меню <b>File</b>. Експортирания файл ще бъде във формат VCard.
 importer's personal	addressbook	bg	Личен вносител
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	bg	Импортира контакти в Адресния указател от CSV файл (стойности, разделени със запетая). От таб Опции може да изберете друг разделител.
 imports contacts into your addressbook from a vcard file.	addressbook	bg	Импортира контактите в Адресния Ви указател от vCard файл.
 in %1 days (%2) is %3's birthday.	addressbook	bg	Рожденият ден на %3 е след %1 дни (%2).
 income	addressbook	bg	Доход
-infolog	addressbook	bg	Контакт с InfoLog
-infolog-organisation	addressbook	bg	Организация на InfoLog
+infolog	addressbook	bg	Дневник
 insert	addressbook	bg	Въвеждане
 insufficent rights to delete this list!	addressbook	bg	Недостатъчни права за изтриване на списъка!
 insufficent rights to edit this list!	addressbook	bg	Недостатъчни права за редактиране на този списък!
@@ -341,16 +339,15 @@ list already exists!	addressbook	bg	Списъкът вече съществув
 list created	addressbook	bg	Списъкът е създаден
 list creation failed, no rights!	addressbook	bg	Грешка при създаване на списъка: нямате права!
 list of files linked to the current record	addressbook	bg	Списък с файлове, свързани с текущия запис
-load vcard	addressbook	bg	Зареждане на vCard
+load vcard	addressbook	bg	Зареждане на VCard
 location	addressbook	bg	Местоположение
 locations	addressbook	bg	Местоположения
-mail vcard	addressbook	bg	Mail vCard
+mail vcard	addressbook	bg	Mail VCard
 main categories in their own field	addressbook	bg	Основни категории в тяхната област
 manage mapping	addressbook	bg	Управление на съответствията
 mark records as private	addressbook	bg	Маркира записите като лични
 merge contacts	addressbook	bg	Обединяване на контактите
 merge duplicates	addressbook	bg	Обединяване на дубликатите
-merge into first or account, deletes all other!	addressbook	bg	Сливане в първия или акаунта, изтрива всички останали!
 merged	addressbook	bg	Обединени
 message after submitting the form	addressbook	bg	Съобщение след предаване на формата
 message phone	addressbook	bg	Телефон за съобщения
@@ -364,7 +361,7 @@ modem phone	addressbook	bg	Модем
 more ...	addressbook	bg	Още ...
 move to addressbook	addressbook	bg	Премести в Адресния указател
 moved	addressbook	bg	Преместен(и)
-multiple vcard	addressbook	bg	Множество vCard
+multiple vcard	addressbook	bg	Множество VCard
 name for the distribution list	addressbook	bg	Име на пощенския списък
 name of current user, all other contact fields are valid too	addressbook	bg	Име на текущия потребител, останалите полета на контакта също са валидни
 name, address	addressbook	bg	Име, Адрес
@@ -372,11 +369,9 @@ new contact submitted by %1 at %2	addressbook	bg	Новият контакт е
 new window opened to edit infolog for your selection	addressbook	bg	Отворен е нов прoзoрец за редакция в Дневника на избраните елементи
 next date	addressbook	bg	Следваща дата
 no categories selected	addressbook	bg	Няма избрани категории
-no country selected	addressbook	bg	Не е избрана държава
 no distribution list	addressbook	bg	Липсва списък за разпределение
 no fallback	addressbook	bg	Без други опции
-no vcard	addressbook	bg	Липсва vCard
-not shared	addressbook	bg	не се споделят
+no vcard	addressbook	bg	Липсва VCard
 number	addressbook	bg	Номер
 number of records to read (%1)	addressbook	bg	Брой записи за четене (%1)
 open %1 crm view	addressbook	bg	Отваряне на % 1 CRM изглед
@@ -432,7 +427,6 @@ replacements for inserting contacts into documents	addressbook	bg	Замени
 required fields *	addressbook	bg	Задължителни полета *
 role	addressbook	bg	Роля
 room	addressbook	bg	Стая
-search letter	addressbook	bg	Буква за търсене
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	bg	Изберете снимка във формат "портрет". Тя ще бъде преоразмерена на 60 пиксела ширина.
 select a source address to be used in geolocation routing system	addressbook	bg	Изберете източник на адрес, който ще се използва в
 select a view	addressbook	bg	Избор на изглед
@@ -453,12 +447,6 @@ send succeeded to %1	common	bg	Изпратено успешно до %1
 seperator	addressbook	bg	Разделител
 set full name and file as field in contacts of all users (either all or only empty values)	admin	bg	Задане на цялото име и поле „fileas“ в контактите на всички потребители. Или всички, или само празни стойности.
 set only full name	addressbook	bg	Задаване само на пълно име
-share into addressbook	addressbook	bg	Споделяне в адресна книга
-share writable	addressbook	bg	Споделяне, което може да се записва
-shared	addressbook	bg	споделено
-shared by me	addressbook	bg	Споделено от мен
-shared into addressbook %1	addressbook	bg	споделено в адресна книга %1
-shared with	addressbook	bg	Споделено с
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	bg	Да се показват ли колоните за снимка и личен (домашен) адрес, независимо дали са празни или не.
 show	addressbook	bg	Покажи
 show active accounts	addressbook	bg	Покажи активните акаунти
@@ -511,8 +499,6 @@ unable to import into %1, using %2	addressbook	bg	Не е възможно да
 unique id (uid)	addressbook	bg	Уникален идентификационен номер - ID (UID)
 unique id<br />(to update existing records)	addressbook	bg	Уникален ID<br /> за актуализиране на съществуващи записи
 unknown type %1, imported as %2	addressbook	bg	Неизвестен вид % 1, импортиран като % 2
-unshare	addressbook	bg	Вече не споделяте
-unshared	addressbook	bg	вече не се споделят
 update a single entry by passing the fields.	addressbook	bg	Актуализация на единичен запис чрез предаване на полетата.
 update fields by edited organisations?	admin	bg	Полета за актуализиране на редактирани организации
 updated	addressbook	bg	Актуализиран
@@ -529,9 +515,9 @@ use this tag for addresslabels. put the content, you want to repeat, between two
 used for links and for the own sorting of the list	addressbook	bg	Използва се за връзки и за собствено сортиране на списъка
 user groups are automatically shown as distribution lists.	addressbook	bg	Потребителските групи автоматично се показват като пощенски списък.
 user preference	addressbook	bg	Предпочитания на потребителя
-vcard	common	bg	vCard
-vcards require a first name entry.	addressbook	bg	За vCard се изисква въвеждане на първо име.
-vcards require a last name entry.	addressbook	bg	За vCard се изисква въвеждане на фамилно име.
+vcard	common	bg	VCard
+vcards require a first name entry.	addressbook	bg	За VCard се изисква въвеждане на първо име.
+vcards require a last name entry.	addressbook	bg	За VCard се изисква въвеждане на фамилно име.
 verification	addressbook	bg	Проверка
 view linked infolog entries	addressbook	bg	Покзване на свързаните записи от Дневника
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	bg	ВНИМАНИЕ! LDAP е валиден избор само ако НЕ използвате контактите за съхранение и на потребителските акаунти!
@@ -539,7 +525,6 @@ warning: all contacts found will be deleted!	addressbook	bg	ВНИМАНИЕ! В
 weekday	addressbook	bg	Ден от седмицата
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	bg	Как да се изобразяват връзките към Адресния указател в другите приложения? Празните стойности ще бъдат игнорирани. Ако промените тази настройка следва да излезете и влезете в системата отново.
 when viewing a contact, show linked entries from the selected application	addressbook	bg	При преглед на контакт, покажи записи свързани с избраното приложение.
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	bg	Когато обединявате записи в документи, те ще се съхраняват тук. Ако не е предоставена директория, те ще се съхраняват в домашната ви директория (/home/...).
 where to add the email address	addressbook	bg	Къде да се добави E-Mail адрес
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	bg	Какъв формат за адреса да се използва за държавите, за които не е зададен формат по подразбиране? Ако за дадена държава форматът е известен, той се използва, независимо от тази настройка.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	bg	Кой адресен указател да се използва при добавяне на контакт АКО нямате право да добавяте в текущия?
@@ -558,14 +543,13 @@ yes, for the next week	addressbook	bg	Да, за следващата седми
 yes, for today and tomorrow	addressbook	bg	Да, за днес и утре
 yes, only admins can purge deleted items	admin	bg	Да, само администраторите могат да заличават изтрити записи
 yes, users can purge their deleted items	admin	bg	Да, потребителите могат да заличават техните изтрити записи
-you are not allowed to share into the addressbook of %1	addressbook	bg	Не ви е разрешено да споделяте в адресната книга %1
 you are not permitted to delete contact %1	addressbook	bg	Нямате право да изтриете контакта: %1
 you are not permittet to delete this contact	addressbook	bg	Нямате право да изтриете този контакт
 you are not permittet to edit this contact	addressbook	bg	Нямате право да редактирате този контакт
 you are not permittet to view this contact	addressbook	bg	Нямате право да разглеждате този контакт
 you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	bg	LDAP може да се използва като хранилище за контакти, само ако акаунтите се съхраняват и в LDAP!
 you can respond by visiting:	addressbook	bg	За преглед посетете:
-you must select a vcard. (*.vcf)	addressbook	bg	Трябва да изберете vCard. (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	bg	Трябва да изберете vcard. (*.vcf)
 you must select at least 1 column to display	addressbook	bg	Трябва да изберете поне една колона за показване
 you need to select a distribution list	addressbook	bg	Трябва да изберете пощенски списък
 you need to select some contacts first	addressbook	bg	Трябва да изберете контакти

addressbook/lang/egw_cs.lang

@@ -8,7 +8,6 @@
 %1 public keys added.	addressbook	cs	%1 veřejných klíčů bylo přidáno.
 %1 records imported	addressbook	cs	%1 záznamů importováno
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	cs	%1 záznamů načteno (zatím nebyly importovány, můžete se vrátit %2zpět%3 a odškrtnout Testovat Import)
-%1 shared this contact on %2 with %3 %4	addressbook	cs	%1 sdílel tento kontakt na %2 %3 %4
 %1 starts with '%2'	addressbook	cs	%1 začíná s '%2'
 %s please calculate the result	addressbook	cs	%s prosím spočítejte výsledek
 (e.g. 1969)	addressbook	cs	(např. 1969)
@@ -42,7 +41,7 @@ added by synchronisation	addressbook	cs	Přidáno synchronizací
 added to distribution list	addressbook	cs	Přidáno do rozesílacího seznamu
 additional information about using ldap as contact repository	admin	cs	Další informace k používání LDAP jako databáze kontaktů
 address book	common	cs	Adresář
-address book - vcard in	addressbook	cs	Adresář - vCard v
+address book - vcard in	addressbook	cs	Adresář - VCard v
 address book - view	addressbook	cs	Adresář - pohled
 address line 2	addressbook	cs	Adresa - 2. řádek
 address line 2 (private)	addressbook	cs	Adresa - 2. řádek (soukromá)
@@ -60,14 +59,12 @@ addressbook the contact should be shown	addressbook	cs	Kontakty adresáře by m
 addressbook vcard export	addressbook	cs	Export adresáře ve formátu vCard
 addressbook vcard import	addressbook	cs	Import adresáře ve formátu vCard
 addressbook-fieldname	addressbook	cs	Adresář - název položky
-addvcard	addressbook	cs	Přidat vCard
+addvcard	addressbook	cs	Přidat VCard
 advanced search	addressbook	cs	Rozšířené hledání
 all addressbooks	addressbook	cs	Všechny adresáře
 all contacts	addressbook	cs	Všechny kontakty
 all in one field	addressbook	cs	Vše v jednom poli
 all types	addressbook	cs	Všechny typy
-allow	addressbook	cs	Povolit
-allow for contacts only	addressbook	cs	Povolit pouze kontakty
 allow members of following groups to edit contact-data of accounts	addressbook	cs	Dovolit uživatelům patřících do těchto skupin upravovat kontaktní údaje účtů
 allow users to maintain their own account-data	admin	cs	Povolit uživatelům měnit jejich vlastní data
 alt. csv import	addressbook	cs	Alternativní import z CSV
@@ -185,7 +182,6 @@ deletes the photo	addressbook	cs	Maže fotografii
 department	common	cs	Oddělení
 departments	addressbook	cs	oddělení
 directory with documents to insert contacts	addressbook	cs	Adresář s dokumenty pro vložení kontaktů
-disable last/next event column	addressbook	cs	Zakázat sloupec Poslední/následující událost
 display contact	addressbook	cs	Zobrazit kontakt
 displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	cs	Zobrazuje připomínku narozenin na úvodní straně (stránka, na kterou se dostanete když se přihlásíte do EGroupware a kliknete na ikonu Hlavní strana).
 distribution list deleted	addressbook	cs	Rozesílací seznam byl smazán
@@ -202,9 +198,7 @@ don't hide empty columns	addressbook	cs	Neschovávat prázdné sloupce
 download	addressbook	cs	Stáhnout
 download export file (uncheck to debug output in browser)	addressbook	cs	Stáhnout exportní soubor (Odškrtněte debugovací výstup v prohlížeči)
 download this contact as vcard file	addressbook	cs	stáhnout kontakt jako vCard soubor
-duplicate threshold	addressbook	cs	Duplicitní práh
 duplicate warning	addressbook	cs	Opakované varování
-duplicates	addressbook	cs	Duplikáty
 duration	addressbook	cs	Trvání
 each category in its own field	addressbook	cs	Každá kategorie ve vlastním poli
 each option in its own field	addressbook	cs	Každá volba ve vlastním poli
@@ -230,10 +224,11 @@ error: the entry has been updated since you opened it for editing!	addressbook	c
 example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	addressbook	cs	Příklad {{IF n_prefix~Pan~Vážený pane~Vážená paní}} - hledá se výskyt slova "Pan" v poli "n_prefix", pokud je nalezeno, vloží se  text Vážený pane, jinak Vážená paní.
 example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller	preferences	cs	Příklad {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Příklad: Mr Dr. James Miller
 example {{nelf role}} - if field role is not empty, you will get a new line with the value of field role	addressbook	cs	Příklad {{NELF role}} - pokud pole role není prázdné, bude na nový řádek vypsán obsah pole role.
+example {{nelfnv role}} - if field role is not empty, set a lf without any value of the field	addressbook	cs	Příklad {{NELFNV role}} - pokud pole role není prázdné, nastaví se pozice na nový řádek ale obsah pole role nebude vypsáno.
 existing links	addressbook	cs	Stávající odkazy
 exists	addressbook	cs	Stávající
 export as csv	addressbook	cs	Exportovat jako CSV
-export as vcard	addressbook	cs	Exportovat jako vCard
+export as vcard	addressbook	cs	Exportovat jako VCard
 export contacts	addressbook	cs	Exportovat kontakty
 export definition to use for nextmatch export	addressbook	cs	Export definic pro použití v dalších exportech
 export definitition to use for nextmatch export	addressbook	cs	Export definic pro použití v dalších exportech
@@ -257,8 +252,6 @@ field %1 has been updated !	addressbook	cs	Položka %1 byla zaktualizována.
 field name	addressbook	cs	Název položky
 fields for the csv export	addressbook	cs	Položky k exportu do CSV
 fields the user is allowed to edit himself	admin	cs	Položky, které si smí editovat sami uživatelé
-fields to check for duplicates	addressbook	cs	Pole pro kontrolu duplicit
-fields to consider when looking for duplicate contacts.	addressbook	cs	Pole, která je třeba zohlednit při hledání duplicitních kontaktů.
 fields to copy when copying an address?	admin	cs	Které položky se budou kopírovat při kopírování adresy
 fields to show in address list	addressbook	cs	Položky, které se zobrazují v seznamu adres
 fieldseparator	addressbook	cs	Oddělovač položek
@@ -277,8 +270,6 @@ grant addressbook access	common	cs	Přidělit přístup k adresáři
 group %1	addressbook	cs	Skupina %1
 h	addressbook	cs	h
 hide accounts from addressbook	addressbook	cs	Nezobrazovat účty v adresáři
-hide all accounts	addressbook	cs	Skrýt všechny účty
-hide user groups as distribution lists	addressbook	cs	Skrýt skupiny uživatelů jako distribuční seznamy
 hides accounts completly from the adressbook.	addressbook	cs	Kompletně skryje účty před adresářem.
 history logging	admin	cs	Protokolování historie
 home address	addressbook	cs	Domácí adresa
@@ -292,7 +283,6 @@ home state	addressbook	cs	Domov - stát
 home street	addressbook	cs	Domov - ulice
 home zip code	addressbook	cs	Domov - PSČ
 how many contacts should non-admins be able to export	admin	cs	Kolik kontaktů budou moci exportovat uživatelé bez oprávnění administrátora
-how many fields must match for the record to be considered a duplicate.	addressbook	cs	Kolik polí se musí shodovat, aby byl záznam považován za duplicitní.
 html link to the current record	addressbook	cs	HTML odkaz na aktuální záznam
 icon	addressbook	cs	Ikona
 if accounts are already in ldap	admin	cs	pokud jsou účty již v LDAP
@@ -302,18 +292,17 @@ import contacts	addressbook	cs	Importovat kontakty
 import csv-file into addressbook	addressbook	cs	Importovat soubor CSV do adresáře
 import file	addressbook	cs	Importovat soubor
 import from	addressbook	cs	Importovat z
-import from ldif, csv, or vcard	addressbook	cs	Importovat z LDIFu, CSV nebo vCard
+import from ldif, csv, or vcard	addressbook	cs	Importovat z LDIFu, CSV nebo VCard
 import from outlook	addressbook	cs	Importovat z Outlooku
-import multiple vcard	addressbook	cs	Importovat více vCard
+import multiple vcard	addressbook	cs	Importovat více VCard
 import next set	addressbook	cs	Importovat následující sadu
-import_instructions	addressbook	cs	V prohlížeči Netscape otevřete Adresář a vyberte <b>Exportovat</b> z menu <b>Soubor</b>. Exportovaný soubor bude ve formátu LDIF.<p>Nebo v Outlooku vyberte složku s Kontakty, zvolte <b>Import a export</b> z menu <b>Start</b> a vyexportujte své kontakty do souboru typu CSV (text oddělený čárkami).<p>Nebo v Palm Desktopu 4.0 a vyšším vyberte <b>Export</b> z menu <b>File</b>. Exportovaný soubor bude ve formátu vCard.
+import_instructions	addressbook	cs	V prohlížeči Netscape otevřete Adresář a vyberte <b>Exportovat</b> z menu <b>Soubor</b>. Exportovaný soubor bude ve formátu LDIF.<p>Nebo v Outlooku vyberte složku s Kontakty, zvolte <b>Import a export</b> z menu <b>Start</b> a vyexportujte své kontakty do souboru typu CSV (text oddělený čárkami).<p>Nebo v Palm Desktopu 4.0 a vyšším vyberte <b>Export</b> z menu <b>File</b>. Exportovaný soubor bude ve formátu VCard.
 importer's personal	addressbook	cs	osobní toho, kdo prování import
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	cs	Importuje kontakty z CSV souboru do Vašeho adresáře. CSV znamená 'hodnoty oddělené čárkou'. Nicméně v záložce voleb si můžete zvolit jiné oddělovače.
 imports contacts into your addressbook from a vcard file.	addressbook	cs	Importuje kontakty ze souboru vCard do Vašeho adresáře.
 in %1 days (%2) is %3's birthday.	addressbook	cs	Za %1 dní (%2) má %3 narozeniny.
 income	addressbook	cs	Hospodářský výsledek
-infolog	addressbook	cs	InfoLog Kontakt
-infolog-organisation	addressbook	cs	Organizace InfoLog
+infolog	addressbook	cs	InfoLog
 insert	addressbook	cs	Vložit
 insufficent rights to delete this list!	addressbook	cs	Nemáte dostatečná oprávnění ke smazání seznamu!
 insufficent rights to edit this list!	addressbook	cs	Nemáte dostatečná oprávnění k úpravě tohoto seznamu!
@@ -338,8 +327,7 @@ list already exists!	addressbook	cs	Seznam už existuje!
 list created	addressbook	cs	Seznam vytvořen
 list creation failed, no rights!	addressbook	cs	Vytvoření seznamu selhalo, nedostatečná práva!
 list of files linked to the current record	addressbook	cs	Seznam připojených souborů k aktuálnímu záznamu
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	cs	Načtení vlastních polí v indexu, i když je sloupec vlastních polí vypnutý (např. pro jejich zobrazení v konkrétním sloupci indexu).
-load vcard	addressbook	cs	Nahrát vCard
+load vcard	addressbook	cs	Nahrát VCard
 location	addressbook	cs	Umístění
 locations	addressbook	cs	umístění
 mail vcard	addressbook	cs	Odeslat vizitku vCard
@@ -347,7 +335,6 @@ main categories in their own field	addressbook	cs	Hlavní kategorie v jejich vla
 manage mapping	addressbook	cs	Spravovat mapování
 mark records as private	addressbook	cs	Označit záznamy jako soukromé
 merge contacts	addressbook	cs	Sloučit kontakty
-merge duplicates	addressbook	cs	Sloučení duplicit
 merge into first or account, deletes all other!	addressbook	cs	Sloučení do prvního nebo do účtu, smaže všechny ostatní!
 merged	addressbook	cs	sloučeno
 message after submitting the form	addressbook	cs	Zpráva po odeslání formuláře
@@ -362,19 +349,17 @@ modem phone	addressbook	cs	Telefon modemu
 more ...	addressbook	cs	Více ...
 move to addressbook	addressbook	cs	Přesunout do adresáře
 moved	addressbook	cs	přesunuto
-multiple vcard	addressbook	cs	Více vCard
+multiple vcard	addressbook	cs	Více VCard
 name for the distribution list	addressbook	cs	Název distribučního seznamu
 name of current user, all other contact fields are valid too	addressbook	cs	Jméno aktuálního uživatele, všechny ostatní položky kontaktu jsou také platné
 name, address	addressbook	cs	Jméno, adresa
 new contact submitted by %1 at %2	addressbook	cs	Nový kontakt odeslal(a) %1 v %2
-new window opened to edit infolog for your selection	addressbook	cs	Otevřeno nové okno pro editaci InfoLog na základě vašeho výběru
+new window opened to edit infolog for your selection	addressbook	cs	Otevřeno nové okno pro editaci Infologu na základě vašeho výběru
 next date	addressbook	cs	Následující datum
 no categories selected	addressbook	cs	nebyly vybrány žádné kategorie
-no country selected	addressbook	cs	Žádná vybraná země
 no distribution list	addressbook	cs	Neexistuje rozesílací seznam
 no fallback	addressbook	cs	Žádné nouzové řešení
-no vcard	addressbook	cs	Žádná vCard
-not shared	addressbook	cs	nesdílený
+no vcard	addressbook	cs	Žádná VCard
 number	addressbook	cs	Čislo
 number of records to read (%1)	addressbook	cs	Počet záznamů k načtení (%1)
 open %1 crm view	addressbook	cs	Otevřít CRM pohled na %1
@@ -395,7 +380,6 @@ parcel	addressbook	cs	Pozemek
 participants	addressbook	cs	Účastníci
 permission denied !!!	addressbook	cs	Přístup zablokován!!!
 permissiong denied! ask your administrator to allow regular uses to update their public keys.	addressbook	cs	Nemáte oprávnění! Požádejte svého správce o povolení aktualizace veřejných klíčů pro standardní uživatele.
-pgp key	addressbook	cs	PGP klíč
 phone number	common	cs	Telefonní číslo
 phone numbers	common	cs	Telefonní čísla
 photo	addressbook	cs	Fotografie
@@ -423,7 +407,6 @@ region	addressbook	cs	Region
 remove from distribution list	addressbook	cs	Odebrat z rozesílacího seznamu
 remove selected contacts from distribution list	addressbook	cs	Odstranit vybrané kontakty z distribučního seznamu
 removed from distribution list	addressbook	cs	odstraněno z distribučního seznamu
-rename list	addressbook	cs	Přejmenovat seznam
 rename selected distribution list	addressbook	cs	Přejmenovat vybraný rozesílací seznam
 repetition	addressbook	cs	Opakování
 replacements for inserting contacts into documents	addressbook	cs	Náhrady pro vkládání kontaktů do dokumentů
@@ -438,7 +421,6 @@ select addressbook type	addressbook	cs	Vybrat typ adresáře
 select all	addressbook	cs	Vybrat vše
 select an action or addressbook to move to	addressbook	cs	Vybrat akci nebo adresář kam se přesunout
 select an action or addressbook to move to...	addressbook	cs	Vybrat akci nebo adresář kam se přesunout...
-select an opened dialog	addressbook	cs	Výběr otevřeného dialogového okna
 select migration type	admin	cs	Vybrat typ migrace
 select multiple contacts for a further action	addressbook	cs	Vybrat více kontaktů pro další akci
 select phone number as prefered way of contact	addressbook	cs	vybrat telefonní číslo jako preferovaný způsob kontaktu
@@ -451,21 +433,12 @@ send succeeded to %1	common	cs	Odeslání do %1 bylo úspěšné
 seperator	addressbook	cs	Oddělovač
 set full name and file as field in contacts of all users (either all or only empty values)	admin	cs	Nastavit celé jméno a evidovat jako pole v kontaktech všech uživatelů (buď všechny nebo jen prázdné hodnoty)
 set only full name	addressbook	cs	Nastavit jen celé jméno
-share into addressbook	addressbook	cs	Sdílení do adresáře
-share writable	addressbook	cs	Sdílet zapisovatelné
-shared	addressbook	cs	sdílený
-shared by me	addressbook	cs	Sdílený mnou
-shared into addressbook %1	addressbook	cs	sdíleno do adresáře %1
-shared with	addressbook	cs	Sdílené s
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	cs	Mají být sloupce fotografie a domovská adresa vždy zobrazeny i když jsou prázdné
 show	addressbook	cs	Zobrazit
-show active accounts	addressbook	cs	Zobrazit aktivní účty
-show all accounts	addressbook	cs	Zobrazit všechny účty
 show infolog entries for this organisation	addressbook	cs	Zobrazit záznamy InfoLogu pro tuto organizaci
 show the contacts of this organisation	addressbook	cs	Zobrazit kontakty této organizace
 similar contacts found:	addressbook	cs	Nalezeny podobné kontakty:
 size of popup (wxh, eg.400x300, if a popup should be used)	admin	cs	Velikost překryvného okna (ŠxV, např. 400x300, pokud má být překryvné okno používáno)
-smime key	addressbook	cs	S/MIME Klíč
 special	addressbook	cs	Zvláštní
 stadt	addressbook	cs	Město
 start	admin	cs	Start
@@ -509,8 +482,6 @@ unable to import into %1, using %2	addressbook	cs	Nebylo možné importovat do %
 unique id (uid)	addressbook	cs	Unikátní ID (UID)
 unique id<br />(to update existing records)	addressbook	cs	Unikátní ID<br />(pro aktualizaci stávajících záznamů)
 unknown type %1, imported as %2	addressbook	cs	Neznámý typ %1, bylo importováno jako %2
-unshare	addressbook	cs	Již nesdílet
-unshared	addressbook	cs	již není sdílena
 update a single entry by passing the fields.	addressbook	cs	Aktualizovat záznam vyplněním položek.
 update fields by edited organisations?	admin	cs	Aktualizovat položky editovanými organizacemi?
 updated	addressbook	cs	Aktualizováno
@@ -525,19 +496,17 @@ use country list	addressbook	cs	Použít seznam zemí
 use setup for a full account-migration	admin	cs	pro kompletní migraci účtů použijte setup
 use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	cs	Použijte tuto značku pro adresní štítky. Obsah, který chcete opakovat, vložte mezi dvě značky.
 used for links and for the own sorting of the list	addressbook	cs	použito pro odkazy a vlastní třídění seznamu
-user groups are automatically shown as distribution lists.	addressbook	cs	Uživatelské skupiny se automaticky zobrazí jako distribuční seznamy.
 user preference	addressbook	cs	Uživatelské předvolby
-vcard	common	cs	vCard
-vcards require a first name entry.	addressbook	cs	vCard vyžaduje křestní jméno v záznamu
-vcards require a last name entry.	addressbook	cs	vCard vyžaduje příjmení v záznamu
+vcard	common	cs	VCard
+vcards require a first name entry.	addressbook	cs	VCard vyžaduje křestní jméno v záznamu
+vcards require a last name entry.	addressbook	cs	VCard vyžaduje příjmení v záznamu
 verification	addressbook	cs	Ověření
-view linked infolog entries	addressbook	cs	Zobrazit odkazované záznamy v InfoLog
+view linked infolog entries	addressbook	cs	Zobrazit odkazované záznamy v InfoLogu
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	cs	VAROVÁNÍ!! LDAP je použitelný jen v případě, že NEpoužíváte kontakty pro ukládání uživatelských účtů!
 warning: all contacts found will be deleted!	addressbook	cs	VAROVÁNÍ: Všechny kontakty budou smazány!
 weekday	addressbook	cs	Pracovní den
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	cs	Co mají odkazy na adresář zobrazovat v ostatních aplikacích. Prázdné hodnoty budou vynechány. Pokud změníte toto nastavení, musíte se znovu přihlásit!
 when viewing a contact, show linked entries from the selected application	addressbook	cs	Při zobrazení kontaktu zobrazovat také připojené záznamy z vybraných aplikací
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	cs	Při slučování záznamů do dokumentů budou uloženy právě zde. Pokud není zadán žádný adresář, budou uloženy v domovském adresáři (/home/...).
 where to add the email address	addressbook	cs	kam přidat e-mailovou adresu
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	cs	Jaký formát adres má adresář používat u zemí, jejichž adresní formát nezná. Pokud je formát znám, je použit bez ohledu na toto nastavení.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	cs	Který adresář má být vybrán v případě, že přidáváte kontakt a pro aktuální adresář nemáte dostatečná práva.
@@ -556,7 +525,6 @@ yes, for the next week	addressbook	cs	Ano, po následující týden
 yes, for today and tomorrow	addressbook	cs	Ano, po dnešní a zítřejší den
 yes, only admins can purge deleted items	admin	cs	Ano, jen administrátoři mohou odstraňovat smazané položky
 yes, users can purge their deleted items	admin	cs	Ano, uživatelé mohou odstranit jejich smazané záznamy
-you are not allowed to share into the addressbook of %1	addressbook	cs	Nejste oprávněni sdílet do adresáře %1
 you are not permitted to delete contact %1	addressbook	cs	Nemáte oprávnění ke smazání kontaktu %1
 you are not permittet to delete this contact	addressbook	cs	Nemáte oprávnění ke smazání tohoto kontaktu
 you are not permittet to edit this contact	addressbook	cs	Nemáte oprávnění k editaci tohoto kontaktu

addressbook/lang/egw_da.lang

@@ -1,6 +1,5 @@
 %1 records imported	addressbook	da	%1 posteringer importeret
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	da	%1 posteringer læst (ikke implamenteret endnu, du skalgå %2tilbage%3 og fravælge Test import
-%1 shared this contact on %2 with %3 %4	addressbook	da	%1 delte denne kontakt på %2 %3 %4
 (e.g. 1969)	addressbook	da	(f.eks 1969)
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	da	<b>Ingen konverteringstype <none> blev fundet.</b>  Vælg venligst en konverteringstype fra listen
 @-eval() is only availible to admins!!!	addressbook	da	@-eval() er kun tilgængelig for administratorer!!!
@@ -8,14 +7,14 @@ actions	addressbook	da	Handling
 add custom field	addressbook	da	Tilføj valgfrit felt
 added	addressbook	da	Tilføjet
 address book	common	da	Adressebog
-address book - vcard in	addressbook	da	Adressebog - importer vCard
+address book - vcard in	addressbook	da	Adressebog - importer VCard
 address book - view	addressbook	da	Adressebog - kig
 address line 2	addressbook	da	Adresse Linie 2
 address type	addressbook	da	Adresse Type
 addressbook	common	da	Adressebog
 addressbook preferences	addressbook	da	Adressebog preferencer
 addressbook-fieldname	addressbook	da	Adressebog feltnavn
-addvcard	addressbook	da	Tilføj vCard
+addvcard	addressbook	da	Tilføj VCard
 advanced search	addressbook	da	Avanceretsøgning
 alt. csv import	addressbook	da	Alt. CSV Importering
 always	addressbook	da	Altid
@@ -65,9 +64,6 @@ domestic	addressbook	da	Indlands
 download	addressbook	da	Download
 download export file (uncheck to debug output in browser)	addressbook	da	Hent eksporteret fil (fjern flag for fejlmeddelser i browser vinduet)
 download this contact as vcard file	addressbook	da	Download denne kontakt som vCard fil
-duplicate threshold	addressbook	da	Tærskelværdi for dubletter
-duplicate warning	addressbook	da	Advarsel om dubletter
-duplicates	addressbook	da	Duplikater
 duration	addressbook	da	Varighed
 edit custom field	addressbook	da	Ret Valgfrit Felt
 edit custom fields	admin	da	Ret Valgfrie Felter
@@ -86,8 +82,6 @@ fax number	common	da	Faxnummer
 field %1 has been added !	addressbook	da	Felt %1 er tilføjet!
 field %1 has been updated !	addressbook	da	Felt %1 er opdateret!
 field name	addressbook	da	Feltnavn
-fields to check for duplicates	addressbook	da	Felter, der skal kontrolleres for dubletter
-fields to consider when looking for duplicate contacts.	addressbook	da	Felter, der skal tages i betragtning, når du leder efter dubletter af kontakter.
 fields to show in address list	addressbook	da	Felter der skal vises på adresselisten
 fieldseparator	addressbook	da	Feltseperator
 full name	addressbook	da	Fulde Navn
@@ -96,9 +90,6 @@ geo	addressbook	da	GEO
 global categories	addressbook	da	Globale Kategorier
 grant addressbook access	common	da	Tildel adgang til adressbogen
 h	addressbook	da	h
-hide all accounts	addressbook	da	Skjul alle konti
-hide user groups as distribution lists	addressbook	da	Skjul brugergrupper som distributionslister
-hides accounts completly from the adressbook.	addressbook	da	Skjul brugerkonti helt fra adressebogen.
 home city	addressbook	da	Hjem By
 home country	addressbook	da	Hjem Land
 home email	addressbook	da	Hjem EMail
@@ -106,20 +97,18 @@ home phone	addressbook	da	Hjem telefon
 home state	addressbook	da	Hjem Stat
 home street	addressbook	da	Hjem Adresse
 home zip code	addressbook	da	Hjem Postnummer
-how many fields must match for the record to be considered a duplicate.	addressbook	da	Hvor mange felter skal stemme overens, for at posten anses for at være en dublet.
 icon	addressbook	da	Ikon
 import	addressbook	da	Importer
 import contacts	addressbook	da	Importer Kontakter
 import csv-file into addressbook	addressbook	da	Importer CVS-fil til adressebogen
 import file	addressbook	da	Importer Fil
 import from	addressbook	da	Importer fra
-import from ldif, csv, or vcard	addressbook	da	Importer fra LDIF, CVS eller vCard
+import from ldif, csv, or vcard	addressbook	da	Importer fra LDIF, CVS eller VCard
 import from outlook	addressbook	da	Importer fra Outlook
-import multiple vcard	addressbook	da	Importer mange vCards
+import multiple vcard	addressbook	da	Importer mange VCARDs
 import next set	addressbook	da	Impoter næste
 import_instructions	addressbook	da	I Netscape, åben Adressebogen og vælg <b>Export</b> fra <b>File</b> menuen. Den eksporteret fil vil være i LDIF formatet.<p>Eller i Outlook, vælg din kontakt mappe, vælg <b>Import and Export...</b> fra b>File</b> menuen og eksporter dine kontakt personer til en komma separeret fil (CSV). <p>Eller, i Palm Desktop 4.0 eller nyere, brug adressebogen og vælg <b>Export</b> fra <b>File</b> menuen. Den eksporteret fil vil være i VCard formatet
-infolog	addressbook	da	InfoLog Kontakt
-infolog-organisation	addressbook	da	InfoLog Organisation
+infolog	addressbook	da	Opgaver
 international	addressbook	da	International
 label	addressbook	da	Mærkat
 last modified	addressbook	da	Sidst opdateret
@@ -132,20 +121,14 @@ list all categories	addressbook	da	List alle kategorier
 list all customfields	addressbook	da	List alle tilpassede felter
 location	addressbook	da	Sted
 mark records as private	addressbook	da	Markere posteringer som private
-merge duplicates	addressbook	da	Sammenlægning af dubletter
-merge into first or account, deletes all other!	addressbook	da	Flette ind i første eller konto, sletter alle andre!
 message phone	addressbook	da	Meddellelses Telefonnummer
 middle name	addressbook	da	Mellemnavn(e)
 mobile	addressbook	da	Mobil
 mobile phone	addressbook	da	Mobiltelefonnummer
 modem phone	addressbook	da	Modem telefonnummer
 more ...	addressbook	da	Mere ...
-move to addressbook	addressbook	da	Flyt til adressebog
-multiple vcard	addressbook	da	Flere vCards
-no country selected	addressbook	da	Intet land valgt
-no distribution list	addressbook	da	Ingen distributionsliste
-no vcard	addressbook	da	Ingen vCard
-not shared	addressbook	da	ikke delt
+multiple vcard	addressbook	da	Flere VCards
+no vcard	addressbook	da	Ingen VCard
 number	addressbook	da	Nummer
 number of records to read (%1)	addressbook	da	Antal posteringer at læse (%1)
 organisation	addressbook	da	Organisation
@@ -160,7 +143,6 @@ please enter a name for that field !	addressbook	da	Skriv venligst et navn for d
 postal	common	da	Post
 pref	addressbook	da	foretrukket
 prefix	addressbook	da	Prefix
-prevent deleting of contacts	admin	da	Forhindrer sletning af kontakter
 public key	addressbook	da	Offentlig Nøgle
 read a list / search for entries.	addressbook	da	Læs liste / søg for elementer
 read a list of entries.	addressbook	da	Læs en liste af indtastninger
@@ -168,16 +150,9 @@ read a single entry by passing the id and fieldlist.	addressbook	da	Læs et enke
 record access	addressbook	da	Posterings adgang
 record owner	addressbook	da	Posterings ejer
 repetition	addressbook	da	Gentagelse
-search letter	addressbook	da	Søg bogstav
 select all	addressbook	da	Vælg alle
 select the type of conversion	addressbook	da	Vælg type af konvertering
 select the type of conversion:	addressbook	da	Vælg type af konvertering:
-share into addressbook	addressbook	da	Del til adressebog
-share writable	addressbook	da	Del kan skrives
-shared	addressbook	da	delt
-shared by me	addressbook	da	Deles af mig
-shared into addressbook %1	addressbook	da	delt i adressebog %1
-shared with	addressbook	da	Deles med
 show	addressbook	da	Vis
 start	admin	da	Start
 startrecord	addressbook	da	Start postering
@@ -195,25 +170,20 @@ today is %1's birthday!	common	da	I dag er det %1's fødselsdag!
 tomorrow is %1's birthday.	common	da	I morgen er det %1's fødselsdag.
 translation	addressbook	da	Oversættelse
 type	addressbook	da	type
-unshare	addressbook	da	Ikke længere dele
-unshared	addressbook	da	ikke længere delt
 update a single entry by passing the fields.	addressbook	da	opdater et enkelt element ve at sende felter.
 updated	addressbook	da	Opdateret
 use country list	addressbook	da	Brug Lande Liste
-user groups are automatically shown as distribution lists.	addressbook	da	Brugergrupper vises automatisk som distributionslister.
-vcard	common	da	vCard
-vcards require a first name entry.	addressbook	da	vCards kræver et fornavn indtastet.
-vcards require a last name entry.	addressbook	da	vCards kræver et efternavn indtastet.
+vcard	common	da	VCard
+vcards require a first name entry.	addressbook	da	VCards kræver et fornavn indtastet.
+vcards require a last name entry.	addressbook	da	VCards kræver et efternavn indtastet.
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	da	ADVARSEL!! LDAP er kun tilgængeligt hvis du ikke bruger kontakter til at gemme kontoer!
 warning: all contacts found will be deleted!	addressbook	da	ADVARSEL: Alle fundne kontakter vil blive slettet !
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	da	Når du fletter posteringer i dokumenter, gemmes de her. Hvis der ikke er angivet nogen mappe, vil de blive gemt i din hjemmemappe (/home/...)
 work phone	addressbook	da	Arbejds telefon
-you are not allowed to share into the addressbook of %1	addressbook	da	Du har ikke tilladelse til at dele til adressebog %1
 you are not permitted to delete contact %1	addressbook	da	Du har ikke ret til at slettekontakt %1
 you are not permittet to delete this contact	addressbook	da	Du har ikke tilladelse til at slette denne kontakt.
 you are not permittet to edit this contact	addressbook	da	Du har ikke tilladelse til at rette denne kontakt.
 you are not permittet to view this contact	addressbook	da	Du har ikke tilladelse til at se denne kontakt.
-you must select a vcard. (*.vcf)	addressbook	da	Du skal vælge et vCard. (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	da	Du skal vælge et vcard. (*.vcf)
 you must select at least 1 column to display	addressbook	da	Du skal mindst vælge en kolonne
 zip code	common	da	Postnummer
 zip_note	addressbook	da	<p><b>Note:</b>Filen kan være en zip file med komprimeret .csv, .vcf eller .ldif filer. Men, importer kun en type ad gangen.

addressbook/lang/egw_de.lang

@@ -1,7 +1,6 @@
 %1 added	addressbook	de	%1 hinzugefügt
 %1 contact(s) %2	addressbook	de	%1 Kontakt(e) %2
-%1 contact(s) %2, %3 failed because of %4 !!!	addressbook	de	%1 Kontakt(e) %2, %3 nicht da %4!
-%1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	de	%1 Kontakt(e) %2, %3 nicht wegen fehlender Rechte!
+%1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	de	%1 Kontakt(e) %2, %3 nicht wegen fehlender Rechte !!!
 %1 contacts updated (%2 errors).	addressbook	de	%1 Kontakte aktualisiert (%2 Fehler).
 %1 fields in %2 other organisation member(s) changed	addressbook	de	%1 Felder in %2 Mitglied(ern) der Organisation geändert
 %1 key(s) added to public keyserver "%2".	addressbook	de	%1 Schlüssel wurden dem öffentlichen Schlüsselserver "%2" eingetragen.
@@ -9,7 +8,6 @@
 %1 public keys added.	addressbook	de	%1 öffentliche Schlüssel gespeichert.
 %1 records imported	addressbook	de	%1 Datensätze importiert
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	de	%1 Datensätze gelesen (noch nicht importiert, sie können %2zurück%3 gehen und Test-Import ausschalten)
-%1 shared this contact on %2 with %3 %4	addressbook	de	%1 teilte diesen Kontakt am %2 mit %3 %4
 %1 starts with '%2'	addressbook	de	%1 beginnt mit '%2'
 %s please calculate the result	addressbook	de	%s Bitte berechnen Sie das Ergebnis
 (e.g. 1969)	addressbook	de	(z.B. 1969)
@@ -187,7 +185,7 @@ deleted	addressbook	de	gelöscht
 deletes the photo	addressbook	de	Löscht das Foto
 department	common	de	Abteilung
 departments	addressbook	de	Abteilungen
-directory with documents to insert contacts	addressbook	de	Ordner mit Dokumenten zum Einfügen von Kontakten
+directory with documents to insert contacts	addressbook	de	Verzeichnis mit Dokumenten zum Einfügen von Kontakten
 disable	addressbook	de	Deaktivieren
 disable last/next event column	addressbook	de	Spalte Letzer/nächster Termin deaktivieren
 display contact	addressbook	de	Kontakte Anzeigen
@@ -254,7 +252,6 @@ extra	addressbook	de	Extra
 extra encodings	addressbook	de	Extra Encoding
 extra private	addressbook	de	Extra Privat
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	de	%1 Mitglied(er) der Organisation nicht geändert (fehlende Rechte) !!!
-favorite phone	addressbook	de	Bevorzugtes Telefon
 favorites	addressbook	de	Favoriten
 fax	addressbook	de	Telefax
 fax (private)	addressbook	de	Telefax privat
@@ -319,8 +316,8 @@ imports contacts into your addressbook from a csv file. csv means 'comma separat
 imports contacts into your addressbook from a vcard file.	addressbook	de	Importiert Kontakte in Ihr Adressbuch von einer vCard-Datei
 in %1 days (%2) is %3's birthday.	addressbook	de	In %1 Tagen (%2) ist der Geburtstag von %3.
 income	addressbook	de	Einkommen
-infolog	addressbook	de	InfoLog Kontakt
-infolog-organisation	addressbook	de	InfoLog Organisation
+infolog	addressbook	de	InfoLog
+infolog-organisation	addressbook	de	Öffnet Infolog CRM-Ansicht der Organisation
 insert	addressbook	de	einfügen
 insufficent rights to delete this list!	addressbook	de	Keine Rechte vorhanden um diese Liste zu löschen!
 insufficent rights to edit this list!	addressbook	de	Keine Rechte vorhanden um diese Liste zu ändern!
@@ -373,16 +370,13 @@ multiple vcard	addressbook	de	Mehrere vCards
 name for the distribution list	addressbook	de	Name für die Verteilerliste
 name of current user, all other contact fields are valid too	addressbook	de	Name des aktuellen Benutzers, auch alle anderen Kontaktfelder sind erlaubt
 name, address	addressbook	de	Name, Adresse
-name, email, phone	addressbook	de	Name, E-Mail, Telefon
 new contact submitted by %1 at %2	addressbook	de	Neuer Kontakt eingetragen von %1 am %2
 new window opened to edit infolog for your selection	addressbook	de	Es wird ein neues Fenster zum Erstellen des InfoLog-Eintrags geöffnet
 next date	addressbook	de	Nächster Termin
 no categories selected	addressbook	de	keine Kategorien ausgewählt
-no country selected	addressbook	de	Kein Land ausgewählt
 no distribution list	addressbook	de	Keine Verteilerliste
 no fallback	addressbook	de	Keine Ausweichlösung
 no vcard	addressbook	de	Keine vCard
-not shared	addressbook	de	nicht geteilt
 number	addressbook	de	Nummer
 number of records to read (%1)	addressbook	de	Anzahl der einzulesenden Datensätze (%1)
 open %1 crm view	addressbook	de	Öffnet %1 in der CRM-Ansicht
@@ -411,7 +405,7 @@ please enter a name for that field !	addressbook	de	Bitte geben Sie einen Namen
 please select only one category	addressbook	de	Bitte nur eine Kategorie auswählen
 postal	common	de	Postanschrift
 pref	addressbook	de	bevorzugt
-preferred email address to use in distribution lists	addressbook	de	Bevorzugte E-Mail-Adresse für Verteilerlisten
+preferred email address to use in distribution lists	addressbook	de	Bevorzugte E-Mailadresse für Verteilerlisten
 preferred phone	addressbook	de	bevorzugte Telefonnummer
 preferred type of email address to add for distribution lists	addressbook	de	bevorzugter Typ der E-Mailadresse für Verteilerlisten
 prefix	addressbook	de	Anrede
@@ -419,7 +413,6 @@ prevent deleting of contacts	admin	de	Das Löschen von Adressen verhindern
 private address	addressbook	de	Privatadresse
 private custom fields	addressbook	de	Private Benutzerdefinierte Felder
 public key	addressbook	de	öffentlicher Schlüssel
-public sharing url	addressbook	de	Geteilt mit Link
 publish into groups:	addressbook	de	In folgenden Gruppen veröffentlichen:
 read a list / search for entries.	addressbook	de	Lese die Liste / Suche nach Einträgen
 read a list of entries.	addressbook	de	Liest eine Liste von Einträgen.
@@ -439,6 +432,7 @@ replacements for inserting contacts into documents	addressbook	de	Platzhalter f
 required fields *	addressbook	de	unbedingt auszufüllende Felder *
 role	addressbook	de	Beruf
 room	addressbook	de	Raum
+schedule a video conference	addressbook	de	Videokonferenz planen
 search letter	addressbook	de	Suche nach Buchstaben
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	de	Wählen Sie ein hochformatiges jpeg Foto. Es wird 60 Pixel breit skaliert.
 select a source address to be used in geolocation routing system	addressbook	de	Legen Sie fest, wie der Startpunkt für die Routenplanung gesetzt wird.
@@ -456,17 +450,10 @@ select the type of conversion:	addressbook	de	Typ der Umwandlung auswählen:
 select where you want to store / retrieve contacts	admin	de	Auswählen wo Sie Adressen speichern möchten
 selected contacts	addressbook	de	ausgewählte Kontakte
 send emailcopy to receiver	addressbook	de	Versendet eine Kopie der E-Mail zu dem Empfänger
-send fax via email by replacing fax number with an email address	addressbook	de	Fax per E-Mail senden durch ersetzen der Faxnummer mit einer E-Mail-Adresse
 send succeeded to %1	common	de	erfolgreich versandt an
 seperator	addressbook	de	Feldtrenner
 set full name and file as field in contacts of all users (either all or only empty values)	admin	de	Setzt vollen Namen und eigene Sortierung in Kontakten aller Benutzer (entweder alle oder nur leere Werte)
 set only full name	addressbook	de	Nur vollen Namen setzen
-share into addressbook	addressbook	de	Teilen in Adressbuch
-share writable	addressbook	de	Bearbeitbar teilen
-shared	addressbook	de	geteilt
-shared by me	addressbook	de	Von mir geteilt
-shared into addressbook %1	addressbook	de	geteilt in Adressbuch %1
-shared with	addressbook	de	Geteilt mit
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	de	Sollen die Spalten Foto und Privatadresse immer angezeigt werden, auch wenn sie leer sind?
 show	addressbook	de	Anzeigen
 show active accounts	addressbook	de	Zeigt nur aktive Benutzer an
@@ -519,8 +506,6 @@ unable to import into %1, using %2	addressbook	de	Import nach %1 ist nicht mögl
 unique id (uid)	addressbook	de	Eindeutige ID (UID)
 unique id<br />(to update existing records)	addressbook	de	Eindeutige ID<br />(um existierende Datensätze zu aktualisieren)
 unknown type %1, imported as %2	addressbook	de	Unbekannter Typ %!, als %2 importiert
-unshare	addressbook	de	Nicht mehr teilen
-unshared	addressbook	de	nicht mehr geteilt
 update a single entry by passing the fields.	addressbook	de	Aktualisiert einen einzelnen Eintrag durch Übergabe seiner Felder.
 update fields by edited organisations?	admin	de	Welche Felder sollen beim Bearbeiten von Organisationen aktualisiert werden?
 updated	addressbook	de	Aktualisiert
@@ -547,7 +532,6 @@ warning: all contacts found will be deleted!	addressbook	de	WARNUNG: Alle gefund
 weekday	addressbook	de	Wochentag
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	de	Was sollen Verknüpfungen zum Adressbuch in anderen Anwendungen anzeigen. Leere Werte werden ausgelassen. Sie müssen sich neu anmelden, wenn Sie hier eine Änderung vornehmen!
 when viewing a contact, show linked entries from the selected application	addressbook	de	Bei der Ansicht eine Kontaktes werden nur Links zu folgenden Anwendungen gezeigt.
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	de	Wenn Sie Einträge zu Dokumenten zusammenführen, werden sie hier gespeichert. Wenn kein Verzeichnis angegeben wird, werden sie in Ihrem Heimatverzeichnis (/home/...) gespeichert.
 where to add the email address	addressbook	de	wo soll die E-Mail-Adresse hinzugefügt werden
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	de	Welches Format soll das Adressbuch für Adressen verwenden, deren landesübliches Adressformat unbekannt ist. Wenn das Adressformat eines Landes dem Adressbuch bekannt ist, wird das unabhängig von dieser Einstellung benutzt.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	de	Welches Adressbuch soll beim Hinzufügen von Kontakten ausgewählt sein, wenn Sie keine Hinzufügen Rechte zum aktuellen Adressbuch haben.
@@ -566,7 +550,6 @@ yes, for the next week	addressbook	de	Ja, für die nächste Woche
 yes, for today and tomorrow	addressbook	de	Ja, für heute und morgen
 yes, only admins can purge deleted items	admin	de	Ja, nur Administratoren können gelöschte Einträge bereinigen
 yes, users can purge their deleted items	admin	de	Benutzer können Ihre eigenen Datensätze wieder herstellen (z.B. persönliches Adressbuch)
-you are not allowed to share into the addressbook of %1	addressbook	de	Sie dürfen nicht in das Adressbuch von %1 teilen
 you are not permitted to delete contact %1	addressbook	de	Sie haben keine Berechtigungen um den Kontakt %1 zu löschen
 you are not permittet to delete this contact	addressbook	de	Sie haben keine Berechtigung diesen Kontakt zu löschen
 you are not permittet to edit this contact	addressbook	de	Sie haben keine Berechtigung diesen Kontakt zu bearbeiten

addressbook/lang/egw_el.lang

@@ -8,7 +8,6 @@
 %1 public keys added.	addressbook	el	%1 δημόσια κλειδιά προστέθηκαν.
 %1 records imported	addressbook	el	%1 εγγραφές εισήχθησαν
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	el	%1 εγγραφές αναγνώσθηκαν (δεν εισηχθησαν ακόμη, μπορείτε να %2επιστρέψετε%3 και να ξετσεκάρετε τη Δοκιμαστική Εισαγωγή)
-%1 shared this contact on %2 with %3 %4	addressbook	el	%1 μοιράστηκε αυτή την επαφή στο %2 %3 %4
 %1 starts with '%2'	addressbook	el	%1 ξεκινά με '%2'
 %s please calculate the result	addressbook	el	%s παρακαλώ υπολογίστε το αποτέλεσμα
 (e.g. 1969)	addressbook	el	(π.χ. 1969)
@@ -42,7 +41,7 @@ added by synchronisation	addressbook	el	προστέθηκε συγχρονισ
 added to distribution list	addressbook	el	προστέθηκε στη λίστα διανομής
 additional information about using ldap as contact repository	admin	el	Επιπρόσθετες πληροφορίες για τη χρήση του LDAP ως αποθήκη επαφής
 address book	common	el	Επαφές
-address book - vcard in	addressbook	el	Επαφές - vCard in
+address book - vcard in	addressbook	el	Επαφές - VCard in
 address book - view	addressbook	el	Επαφές - εμφάνιση
 address line 2	addressbook	el	Γραμμή Διευθύνσεων 2
 address line 2 (private)	addressbook	el	Γραμμή Διευθύνσεων 2 (προσ.)
@@ -60,7 +59,7 @@ addressbook the contact should be shown	addressbook	el	Βιβλίο διαυθύ
 addressbook vcard export	addressbook	el	Βιβλίο διευθύνσεων εξαγωγή vCard
 addressbook vcard import	addressbook	el	Βιβλίο διευθύνσεων εισαγωγή  vCard
 addressbook-fieldname	addressbook	el	Επαφές-Πεδίο ονόματος
-addvcard	addressbook	el	Προσθήκη vCard
+addvcard	addressbook	el	Προσθήκη VCard
 advanced search	addressbook	el	Αναζήτηση για προχωρημένους
 all addressbooks	addressbook	el	Όλα τα  βιβλία διευθύνσεων
 all contacts	addressbook	el	Όλες οι επαφές
@@ -233,7 +232,7 @@ error: the entry has been updated since you opened it for editing!	addressbook	e
 existing links	addressbook	el	Υπάρχοντες σύνδεσμοι
 exists	addressbook	el	Υπάρχει
 export as csv	addressbook	el	Εξαγωγή ως CSV
-export as vcard	addressbook	el	Εξαγωγή ως vCard
+export as vcard	addressbook	el	Εξαγωγή ως VCard
 export contacts	addressbook	el	Εξαγωγή επαφών
 export definition to use for nextmatch export	addressbook	el	Εξαγωγή ορισμών για χρήση στην εξαγωγή nextmatch
 export definitition to use for nextmatch export	addressbook	el	Εξαγωγή ορισμών για χρήση στην εξαγωγή nextmatch
@@ -299,17 +298,17 @@ import contacts	addressbook	el	Εισαγωγή επαφών
 import csv-file into addressbook	addressbook	el	Εισαγωγή αρχείου CSV στο βιβλίο Διευθύνσεων
 import file	addressbook	el	Εισαγωγή Αρχείου
 import from	addressbook	el	Εισαγωγή από
-import from ldif, csv, or vcard	addressbook	el	Εισαγωγή από LDIF, CSV, ή vCard
+import from ldif, csv, or vcard	addressbook	el	Εισαγωγή από LDIF, CSV, ή VCard
 import from outlook	addressbook	el	Εισαγωγή από το Outlook
-import multiple vcard	addressbook	el	Εισαγωγή  πολλαπλών vCard
+import multiple vcard	addressbook	el	Εισαγωγή  πολλαπλών VCard
 import next set	addressbook	el	Εισαγωγή επόμενου σετ
-import_instructions	addressbook	el	Στο Netscape, ανοίξτε την ατζέντα διευθύνσεων και επιλέξτε <b>Εξαγωγή</b> από το <b>Αρχείο</b>. Το εξαγώγιμο αρχείο θα είναι σε LDIF μορφή.<p>Ή, στο Outlook, επιλέξτε το φάκελο Eπαφών, επιλέξτε<b>Import and Export...</b> από το <b>File</b> menu και εξάγετε τις επαφές σας σε ένα CSV αρχείο.<p>Ή, στο Palm Desktop 4.0 ή μεγαλύτερο, επισκεφθείτε το βιβλίο διευθύνσεων σας και επιλέξτε <b>Export</b> από το <b>File</b> menu.Το εξαγώγιμο αρχείο θα ειναι σε vCard μορφή.
+import_instructions	addressbook	el	Στο Netscape, ανοίξτε την ατζέντα διευθύνσεων και επιλέξτε <b>Εξαγωγή</b> από το <b>Αρχείο</b>. Το εξαγώγιμο αρχείο θα είναι σε LDIF μορφή.<p>Ή, στο Outlook, επιλέξτε το φάκελο Eπαφών, επιλέξτε<b>Import and Export...</b> από το <b>File</b> menu και εξάγετε τις επαφές σας σε ένα CSV αρχείο.<p>Ή, στο Palm Desktop 4.0 ή μεγαλύτερο, επισκεφθείτε το βιβλίο διευθύνσεων σας και επιλέξτε <b>Export</b> από το <b>File</b> menu.Το εξαγώγιμο αρχείο θα ειναι σε VCard μορφή.
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	el	Εισαγάγει επαφές στο βιβλίο διευθύνσεων από ένα αρχείο CSV ( 'Comma Separated Values'). Στις σχετικές ρυθμίσεις μπορείτε να επιλέξετε και χαρακτήρα διαχωρισμού.
 imports contacts into your addressbook from a vcard file.	addressbook	el	Εισαγάγει επαφές στο βιβλίο διευθύνσεων σας από ένα αρχείο vCard
 in %1 days (%2) is %3's birthday.	addressbook	el	Σε %1 ημέρες (%2) είναι του/της %3 τα γενέθλια.
 income	addressbook	el	Εισόδημα
-infolog	addressbook	el	InfoLog Επικοινωνία
-infolog-organisation	addressbook	el	Οργάνωση InfoLog
+infolog	addressbook	el	InfoLog
+infolog-organisation	addressbook	el	Άνοιγμα εμφάνισης Infolog CRM του οργανισμού
 insert	addressbook	el	Εισαγωγή
 insufficent rights to delete this list!	addressbook	el	Ανεπαρκή δικαιώματα για διαγραφή αυτής της λίστας!
 insufficent rights to edit this list!	addressbook	el	Ανεπαρκή δικαιώματα για την επεξεργασία αυτής της λίστας!
@@ -334,11 +333,10 @@ list already exists!	addressbook	el	Η λίστα υπάρχει ήδη
 list created	addressbook	el	Η λίστα δημιουργήθηκε
 list creation failed, no rights!	addressbook	el	Η δημιουργία της λίστας απέτυχε, δεν έχετε το δικαίωμα!
 list of files linked to the current record	addressbook	el	Λίστα αρχείων συνδεδεμένα με την τρέχουσα εγγραφή
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	el	Φόρτωση προσαρμοσμένων πεδίων στο ευρετήριο, ακόμη και αν η στήλη προσαρμοσμένου πεδίου είναι απενεργοποιημένη (π.χ. για να τα εμφανίσετε σε μια συγκεκριμένη στήλη ευρετηρίου)
-load vcard	addressbook	el	Φόρτωση vCard
+load vcard	addressbook	el	Φόρτωση VCard
 location	addressbook	el	Τοποθεσία
 locations	addressbook	el	τοποθεσίες
-mail vcard	addressbook	el	Αποστολή vCard με ηλεκτρονικό ταχυδρομείο
+mail vcard	addressbook	el	Αποστολή VCard με ηλεκτρονικό ταχυδρομείο
 main categories in their own field	addressbook	el	Κύριες κατηγορίες στο δικό τους πεδίο
 manage mapping	addressbook	el	Επεξεργασία αντιστοιχίσεων
 mark records as private	addressbook	el	Σημείωση εγγραφών ως ιδιωτικές
@@ -358,25 +356,23 @@ modem phone	addressbook	el	Τηλέφωνο modem
 more ...	addressbook	el	Περισσότερα
 move to addressbook	addressbook	el	Μεταφορά στο βιβλίο διευθύνσεων
 moved	addressbook	el	μετακινήθηκε
-multiple vcard	addressbook	el	Πολλαπλή vCard
+multiple vcard	addressbook	el	Πολλαπλή VCard
 name for the distribution list	addressbook	el	Όνομα για την λίστα διανομής
 name of current user, all other contact fields are valid too	addressbook	el	Όνομα του συνδεδεμένου χρήστη,  επίσης ισχύουν όλα τα πεδία επαφών.
 name, address	addressbook	el	Όνομα, Διεύθυνση
 new contact submitted by %1 at %2	addressbook	el	Νέα επαφή υπεβλήθει από %1 στις %2
-new window opened to edit infolog for your selection	addressbook	el	Νέο παράθυρο για την επεξεργασία του InfoLog
+new window opened to edit infolog for your selection	addressbook	el	Νέο παράθυρο για την επεξεργασία του Infolog
 next date	addressbook	el	Επόμενη ημερομηνία
 no categories selected	addressbook	el	Δεν έχουν επιλεγεί κατηγορίες
-no country selected	addressbook	el	Δεν έχει επιλεγεί χώρα
 no distribution list	addressbook	el	Δεν υπάρχει λίστα διανομής
 no fallback	addressbook	el	Δεν υπάρχει εναλλακτική
-no vcard	addressbook	el	Οχι vCard
-not shared	addressbook	el	δεν μοιράζεται
+no vcard	addressbook	el	Οχι VCard
 number	addressbook	el	Αριθμός
 number of records to read (%1)	addressbook	el	Αριθμός εγγραφών προς ανάγνωση (%1)
 open %1 crm view	addressbook	el	Άνοιγμα %1 σε εμφάνιση CRM
 open email addresses in external mail program	addressbook	el	Άνοιγμα διευθύνσεων ηλεκτρονικού ταχυδρομείου σε εξωτερική εφαρμογή
 open for editing?	addressbook	el	Άνοιγμα για επεξεργασία;
-open infolog crm view	preferences	el	Άνοιγμα εμφάνισης InfoLog CRM της επαφής
+open infolog crm view	preferences	el	Άνοιγμα εμφάνισης Infolog CRM της επαφής
 open tracking system crm view	preferences	el	Άνοιγμα εμφάνισης Tracker System CRM
 options for type	admin	el	Επιλογές για τον τύπο
 organisation	addressbook	el	οργανισμός
@@ -447,12 +443,6 @@ send succeeded to %1	common	el	Η αποστολή ήταν επιτυχείς
 seperator	addressbook	el	Χαρακτήρας διαχωρισμού
 set full name and file as field in contacts of all users (either all or only empty values)	admin	el	Ορισμός πλήρους ονόματος και πεδίου 'αποθήκευση ως' για όλους τους χρήστες. Είτε όλα ή μόνο κενές τιμές.
 set only full name	addressbook	el	Να ορίζεται μόνο το πλήρες όνομα
-share into addressbook	addressbook	el	Μοιραστείτε στο βιβλίο διευθύνσεων
-share writable	addressbook	el	Μοιραστείτε εγγράψιμο
-shared	addressbook	el	κοινόχρηστο
-shared by me	addressbook	el	Κοινή χρήση από εμένα
-shared into addressbook %1	addressbook	el	κοινή χρήση στο βιβλίο διευθύνσεων %1
-shared with	addressbook	el	Κοινή χρήση με
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	el	Επιθυμείτε να εμφανίζονται πάντα οι στήλες φωτογραφίας και διεύθυνσης οικίας, ακόμα και αν είναι κενές.
 show	addressbook	el	Εμφάνιση
 show active accounts	addressbook	el	Εμφάνιση ενεργών λογαριασμών
@@ -504,8 +494,6 @@ unable to import into %1, using %2	addressbook	el	Αδυναμία εισαγω
 unique id (uid)	addressbook	el	Μοναδικό (Unique) ID (UID)
 unique id<br />(to update existing records)	addressbook	el	Μοναδικό (Unique) ID (UID)<br/>για την ενημέρωση υφιστάμενων εγγραφών
 unknown type %1, imported as %2	addressbook	el	Άγνωστος τύπος %1, έγινε εισαγωγή ως %2
-unshare	addressbook	el	Δεν μοιράζεται πλέον
-unshared	addressbook	el	δεν μοιράζεται πλέον
 update a single entry by passing the fields.	addressbook	el	Ενημέρωση συγκεκριμένης καταχώρησης εισάγωντας τα πεδία.
 update fields by edited organisations?	admin	el	Πεδία που πρέπει να ενημερώνονται όταν γίνεται επεξεργασία οργανισμού.
 updated	addressbook	el	Ενημερώθηκε
@@ -520,9 +508,9 @@ use setup for a full account-migration	admin	el	χρήση της εγκατάσ
 used for links and for the own sorting of the list	addressbook	el	χρησιμοποιείται για συνδέσμους και προσωπικές ταξινομήσεις της λίστας
 user groups are automatically shown as distribution lists.	addressbook	el	Οι ομάδες χρηστών εμφανίζονται αυτόματα ως λίστες διανομής.
 user preference	addressbook	el	Επιλογή χρήστη
-vcard	common	el	vCard
-vcards require a first name entry.	addressbook	el	vCards απαιτούν καταχώρηση ονόματος
-vcards require a last name entry.	addressbook	el	vCards απαιτούν καταχώρηση επίθετου
+vcard	common	el	VCard
+vcards require a first name entry.	addressbook	el	VCards απαιτούν καταχώρηση ονόματος
+vcards require a last name entry.	addressbook	el	VCards απαιτούν καταχώρηση επίθετου
 verification	addressbook	el	Επαλήθευση
 view linked infolog entries	addressbook	el	Εμφάνιση συνδεδεμένων καταχωρήσεων του InfoLog
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	el	ΠΡΟΣΟΧΗ!! Το LDAP ισχύει μόνο εάν ΔΕΝ χρησιμοποιείτε τις επαφές για την αποθήκευση λογαριασμών!
@@ -546,14 +534,13 @@ yes, for the next week	addressbook	el	Ναι, για την επόμενη εβ
 yes, for today and tomorrow	addressbook	el	Ναι, για σήμερα και αύριο
 yes, only admins can purge deleted items	admin	el	Ναι, μόνο ο διαχειριστής μπορεί να καθαρίσει τα αντικείμενα που έχουν διαγραφεί
 yes, users can purge their deleted items	admin	el	Ναι, οι χρήστες μπορούν να καθαρίζουν τα διαγραμμένα αντικείμενα
-you are not allowed to share into the addressbook of %1	addressbook	el	Δεν επιτρέπεται η κοινή χρήση στο βιβλίο διευθύνσεων %1
 you are not permitted to delete contact %1	addressbook	el	Δεν έχετε άδεια να διαγράψετε την επαφή %1
 you are not permittet to delete this contact	addressbook	el	Δεν έχετε άδεια να διαγράψετε αυτήν την επαφή
 you are not permittet to edit this contact	addressbook	el	Δεν έχετε άδεια να επεξεργαστείτε αυτήν την επαφή
 you are not permittet to view this contact	addressbook	el	Δεν έχετε άδεια να δείτε τα στοιχεία αυτής της επαφής
 you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	el	Μπορείτε να χρησιμοποιήσετε το LDAP ως αποθήκη επαφής μόνο αν οι λογαριασμοί αποθηκεύονται στο LDAP επίσης!
 you can respond by visiting:	addressbook	el	Για να το δείτε επισκεφθείτε:
-you must select a vcard. (*.vcf)	addressbook	el	Πρέπει να επιλέξετε μια vCard (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	el	Πρέπει να επιλέξετε μια VCard (*.vcf)
 you must select at least 1 column to display	addressbook	el	Πρέπει να επιλέξετε τουλάχιστο μία στήλη για εμφάνιση
 you need to select a distribution list	addressbook	el	Πρέπει να επιλέξετε μια λίστα διανομής
 you need to select some contacts first	addressbook	el	Πρέπει να επιλέξετε κάποιες επαφές πρώτα

addressbook/lang/egw_en.lang

@@ -1,6 +1,5 @@
 %1 added	addressbook	en	%1 added
 %1 contact(s) %2	addressbook	en	%1 contact(s) %2
-%1 contact(s) %2, %3 failed because of %4 !!!	addressbook	en	%1 contact(s) %2, %3 failed because of %4 !!!
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	en	%1 contact(s) %2, %3 failed because of insufficient rights!
 %1 contacts updated (%2 errors).	addressbook	en	%1 contacts updated (%2 errors).
 %1 fields in %2 other organisation member(s) changed	addressbook	en	%1 fields in %2 other organization member(s) changed.
@@ -9,7 +8,6 @@
 %1 public keys added.	addressbook	en	%1 public keys added.
 %1 records imported	addressbook	en	%1 records imported.
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	en	%1 records read. Not yet imported, you may go %2back%3 and un-check Test import.
-%1 shared this contact on %2 with %3 %4	addressbook	en	%1 shared this contact on %2 with %3 %4
 %1 starts with '%2'	addressbook	en	%1 starts with '%2'
 %s please calculate the result	addressbook	en	%s please calculate the result
 (e.g. 1969)	addressbook	en	(e.g. 1969)
@@ -254,7 +252,6 @@ extra	addressbook	en	Extra
 extra encodings	addressbook	en	Extra encodings
 extra private	addressbook	en	Extra private
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	en	Failed to change %1 organization member(s), insufficient rights!
-favorite phone	addressbook	en	Favorite phone
 favorites	addressbook	en	Favorites
 fax	addressbook	en	Fax
 fax (private)	addressbook	en	fax (private)
@@ -319,8 +316,8 @@ imports contacts into your addressbook from a csv file. csv means 'comma separat
 imports contacts into your addressbook from a vcard file.	addressbook	en	Imports contacts into your Addressbook from a vCard File.
 in %1 days (%2) is %3's birthday.	addressbook	en	In %1 days (%2) is %3's birthday.
 income	addressbook	en	Income
-infolog	addressbook	en	InfoLog contact
-infolog-organisation	addressbook	en	InfoLog organisation
+infolog	addressbook	en	InfoLog
+infolog-organisation	addressbook	en	Open Infolog CRM view of the organisation
 insert	addressbook	en	Insert
 insufficent rights to delete this list!	addressbook	en	Insufficient rights to delete this list!
 insufficent rights to edit this list!	addressbook	en	Insufficent rights to edit this list!
@@ -349,7 +346,7 @@ load custom fields in index, even if custom field column is off (eg. to display
 load vcard	addressbook	en	Load vCard
 location	addressbook	en	Location
 locations	addressbook	en	Locations
-mail vcard	addressbook	en	Mail vCard
+mail vcard	addressbook	en	Mail VCard
 main categories in their own field	addressbook	en	Main categories in their own field
 manage mapping	addressbook	en	Manage mapping
 mark records as private	addressbook	en	Mark records as private
@@ -373,16 +370,13 @@ multiple vcard	addressbook	en	Multiple vCard
 name for the distribution list	addressbook	en	Name for the distribution list
 name of current user, all other contact fields are valid too	addressbook	en	Name of current user, all other contact fields are valid too.
 name, address	addressbook	en	Name, Address
-name, email, phone	addressbook	en	Name, email, phone
 new contact submitted by %1 at %2	addressbook	en	New contact submitted by %1 at %2 .
 new window opened to edit infolog for your selection	addressbook	en	New window opened to edit InfoLog.
 next date	addressbook	en	Next date
 no categories selected	addressbook	en	No categories selected
-no country selected	addressbook	en	No country selected
 no distribution list	addressbook	en	No distribution list
 no fallback	addressbook	en	No fallback
 no vcard	addressbook	en	No vCard
-not shared	addressbook	en	not shared
 number	addressbook	en	Number
 number of records to read (%1)	addressbook	en	Number of records to read (%1)
 open %1 crm view	addressbook	en	Open %1 CRM view
@@ -419,7 +413,6 @@ prevent deleting of contacts	admin	en	Prevent deleting of contacts
 private address	addressbook	en	Private address
 private custom fields	addressbook	en	Private custom fields
 public key	addressbook	en	Public key
-public sharing url	addressbook	en	Public sharing URL
 publish into groups:	addressbook	en	Publish into groups:
 read a list / search for entries.	addressbook	en	Read a list / search for entries.
 read a list of entries.	addressbook	en	Read a list of entries.
@@ -439,6 +432,7 @@ replacements for inserting contacts into documents	addressbook	en	Replacements f
 required fields *	addressbook	en	Required fields *
 role	addressbook	en	Occupation
 room	addressbook	en	Room
+schedule a video conference addressbook	en	Schedule a video conference
 search letter	addressbook	en	Search letter
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	en	Select a portrait format jpeg photo. It will be re-sized to 60 pixel width.
 select a source address to be used in geolocation routing system	addressbook	en	Select a source address to be used in GeoLocation routing system
@@ -456,17 +450,10 @@ select the type of conversion:	addressbook	en	Select the type of conversion:
 select where you want to store / retrieve contacts	admin	en	Select where contacts should be stored / retrieved.
 selected contacts	addressbook	en	Selected contacts
 send emailcopy to receiver	addressbook	en	Send email copy to receiver
-send fax via email by replacing fax number with an email address	addressbook	en	Send fax via email by replacing fax number with an email address
 send succeeded to %1	common	en	Send succeeded to %1
 seperator	addressbook	en	Separator
 set full name and file as field in contacts of all users (either all or only empty values)	admin	en	Set full name and 'fileas' field in contacts of all users. Either all or only empty values.
 set only full name	addressbook	en	Set only full name
-share into addressbook	addressbook	en	Share into addressbook
-share writable	addressbook	en	Share writable
-shared	addressbook	en	shared
-shared by me	addressbook	en	Shared by me
-shared into addressbook %1	addressbook	en	shared into addressbook %1
-shared with	addressbook	en	Shared with
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	en	Are photo and home address always displayed, even if columns are empty.
 show	addressbook	en	Show
 show active accounts	addressbook	en	Show active accounts
@@ -519,8 +506,6 @@ unable to import into %1, using %2	addressbook	en	Unable to import into %1, usin
 unique id (uid)	addressbook	en	Unique ID (UID)
 unique id<br />(to update existing records)	addressbook	en	Unique ID<br />to update existing records
 unknown type %1, imported as %2	addressbook	en	Unknown type %1, imported as %2
-unshare	addressbook	en	Unshare
-unshared	addressbook	en	unshared
 update a single entry by passing the fields.	addressbook	en	Update a single entry by passing the fields.
 update fields by edited organisations?	admin	en	Fields to update of edited organizations
 updated	addressbook	en	Updated
@@ -547,7 +532,6 @@ warning: all contacts found will be deleted!	addressbook	en	WARNING: All contact
 weekday	addressbook	en	Weekday
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	en	Address book links displayed in other applications. Empty values will be left out. You need to log in anew, if you change this setting!
 when viewing a contact, show linked entries from the selected application	addressbook	en	When viewing a contact, show linked entries from the selected application
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	en	When you merge entries into documents, they will be stored here. If no directory is provided, they will be stored in your home directory (/home/...)
 where to add the email address	addressbook	en	Where to add the email address
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	en	Select which address format should be used for countries with unknown address format.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	en	The address book to add contacts, when you have no rights to add to the current address book.
@@ -566,7 +550,6 @@ yes, for the next week	addressbook	en	Yes, for the next week
 yes, for today and tomorrow	addressbook	en	Yes, for today and tomorrow
 yes, only admins can purge deleted items	admin	en	Yes, only admins can purge deleted items
 yes, users can purge their deleted items	admin	en	Yes, users can purge their deleted items
-you are not allowed to share into the addressbook of %1	addressbook	en	You are not allowed to share into the addressbook of %1
 you are not permitted to delete contact %1	addressbook	en	You are not permitted to delete contact %1
 you are not permittet to delete this contact	addressbook	en	You are not permitted to delete this contact
 you are not permittet to edit this contact	addressbook	en	You are not permitted to edit this contact

addressbook/lang/egw_es-es.lang

@@ -8,7 +8,6 @@
 %1 public keys added.	addressbook	es-es	Se han añadido %1 claves públicas
 %1 records imported	addressbook	es-es	Se han importado %1 registros
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	es-es	Se han leído %1 registros (no importados todavía, puede volver %2atrás%3 y desmarcar la prueba de importación)
-%1 shared this contact on %2 with %3 %4	addressbook	es-es	%1 compartió este contacto en %2 %3 %4
 %1 starts with '%2'	addressbook	es-es	%1 empieza por '%2'
 %s please calculate the result	addressbook	es-es	%s por favor, calcule el resultado
 (e.g. 1969)	addressbook	es-es	(p. ej. 1969)
@@ -23,7 +22,7 @@ add %1	addressbook	es-es	Añadir %1
 add a contact to this organisation	addressbook	es-es	Añadir un contacto a esta organización
 add a customfield to link title	addressbook	es-es	Añadir un campo personalizo al título del vínculo
 add a new contact	addressbook	es-es	Añadir un contacto nuevo
-add a new infolog	addressbook	es-es	Añadir un nuevo registro de InfoLog
+add a new infolog	addressbook	es-es	Añadir un nuevo registro de Infolog
 add a new list	addressbook	es-es	Añadir una lista nueva
 add a single entry by passing the fields.	addressbook	es-es	Añadir una entrada simple pasando los campos
 add appointment	addressbook	es-es	Añadir cita
@@ -179,14 +178,11 @@ deletes the photo	addressbook	es-es	Borra la foto
 department	common	es-es	Departamento
 departments	addressbook	es-es	departamentos
 directory with documents to insert contacts	addressbook	es-es	Directorio con documentos para insertar contactos
-disable	addressbook	es-es	Desactivar
-disable last/next event column	addressbook	es-es	Desactivar la columna de último/siguiente evento
 display contact	addressbook	es-es	Mostrar contacto
 displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	es-es	Muestra un recordatorio para los cumpleaños en la página de inicio (la página que se ve al entrar en EGroupware o pulsar en el icono de inicio).
 distribution list deleted	addressbook	es-es	Lista de distribución borrada
 distribution list renamed	addressbook	es-es	Lista de distribución renombrada
 distribution lists	addressbook	es-es	Listas de distribución
-distribution lists as groups	addressbook	es-es	Listas de distribución como grupos
 distribution lists, ...	addressbook	es-es	Listas de distribución, ...
 do you really want to delete this contact?	addressbook	es-es	¿Realmente desea borrar este contacto?
 do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?	addressbook	es-es	¿Desea una libreta de direcciones privada, que no pueden ver otros usuarios (a menos que conceda acceso a su libreta de direcciones personal)?
@@ -197,7 +193,6 @@ don't hide empty columns	addressbook	es-es	No ocultar las columnas vacías
 download	addressbook	es-es	Descargar
 download export file (uncheck to debug output in browser)	addressbook	es-es	Descargar fichero exportado (desmarcar para depurar la salida en el navegador)
 download this contact as vcard file	addressbook	es-es	descargar este contacto como fichero vCard
-duplicate threshold	addressbook	es-es	Umbral de duplicación
 duplicate warning	addressbook	es-es	Advertencia duplicada
 duplicates	addressbook	es-es	Duplicados
 duration	addressbook	es-es	Duración
@@ -253,8 +248,6 @@ field %1 has been updated !	addressbook	es-es	¡El campo %1 ha sido actualizado!
 field name	addressbook	es-es	Nombre del campo
 fields for the csv export	addressbook	es-es	Campos para exportar a CSV
 fields the user is allowed to edit himself	admin	es-es	Campos que el propio usuario puede editar
-fields to check for duplicates	addressbook	es-es	Campos para buscar duplicados
-fields to consider when looking for duplicate contacts.	addressbook	es-es	Campos a considerar cuando se buscan contactos duplicados.
 fields to copy when copying an address?	admin	es-es	Campos a copiar cuando se copia una dirección
 fields to show in address list	addressbook	es-es	Campos a mostrar en la lista de direcciones
 fieldseparator	addressbook	es-es	Separador de campos
@@ -273,7 +266,6 @@ group %1	addressbook	es-es	Grupo %1
 h	addressbook	es-es	h
 hide accounts from addressbook	addressbook	es-es	Ocultar las cuentas de usuario
 hide all accounts	addressbook	es-es	Ocultar todas las cuentas
-hide user groups as distribution lists	addressbook	es-es	Ocultar grupos de usuarios como listas de distribución
 hides accounts completly from the adressbook.	addressbook	es-es	Oculta completamente las cuentas de la libreta de direcciones
 history logging	admin	es-es	Registro de historial
 home address	addressbook	es-es	Domicilio particular
@@ -287,7 +279,6 @@ home state	addressbook	es-es	Provincia de residencia
 home street	addressbook	es-es	Domicilio personal
 home zip code	addressbook	es-es	Código postal
 how many contacts should non-admins be able to export	admin	es-es	Cuántos contactos deben poder exportar usuarios que no son administradores
-how many fields must match for the record to be considered a duplicate.	addressbook	es-es	Cuántos campos deben coincidir para que el registro se considere un duplicado.
 html link to the current record	addressbook	es-es	Enlace HTML al registro actual
 icon	addressbook	es-es	Icono
 if accounts are already in ldap	admin	es-es	si las cuentas ya están en LDAP
@@ -297,11 +288,11 @@ import contacts	addressbook	es-es	Importar contactos
 import csv-file into addressbook	addressbook	es-es	Importar archivo CSV en la Libreta de direcciones
 import file	addressbook	es-es	Importar fichero
 import from	addressbook	es-es	Importar desde
-import from ldif, csv, or vcard	addressbook	es-es	Importar desde LDIF, CSV o vCard
+import from ldif, csv, or vcard	addressbook	es-es	Importar desde LDIF, CSV o VCard
 import from outlook	addressbook	es-es	Importar desde Outlook
-import multiple vcard	addressbook	es-es	Importar múltiples vCards
+import multiple vcard	addressbook	es-es	Importar múltiples VCards
 import next set	addressbook	es-es	Importar el registro siguiente
-import_instructions	addressbook	es-es	Si usa Mozilla o Netscape, abra la libreta de direcciones y seleccione <b>Exportar</b> desde el menú <b>Archivo</b>. El fichero exportado estará en formato LDIF.<p>O, en Outlook, seleccione su carpeta de contactos, luego, en el menú<b>Fichero</b>, <b>Importar y Exportar</b> para guardarlos en un fichero separado por comas (CSV).<p>O, en Palm Desktop 4.0 o superior, visite la libreta de direcciones y seleccione <b>Exportar</b> desde el menú <b>Archivo</b>. El fichero exportado estará en formato vCard.
+import_instructions	addressbook	es-es	Si usa Mozilla o Netscape, abra la libreta de direcciones y seleccione <b>Exportar</b> desde el menú <b>Archivo</b>. El fichero exportado estará en formato LDIF.<p>O, en Outlook, seleccione su carpeta de contactos, luego, en el menú<b>Fichero</b>, <b>Importar y Exportar</b> para guardarlos en un fichero separado por comas (CSV).<p>O, en Palm Desktop 4.0 o superior, visite la libreta de direcciones y seleccione <b>Exportar</b> desde el menú <b>Archivo</b>. El fichero exportado estará en formato VCard.
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	es-es	Importa los contactos en la libreta de direcciones desde un fichero CSV. CSV significa 'Valores separados por comas'. Sin embargo, en la pestaña de opciones, también se pueden elegir otros separadores.
 in %1 days (%2) is %3's birthday.	addressbook	es-es	En %1 días (%2) es el cumpleaños de %3.
 income	addressbook	es-es	Ingresos
@@ -330,14 +321,12 @@ list already exists!	addressbook	es-es	¡La lista ya existe!
 list created	addressbook	es-es	Se ha creado la lista
 list creation failed, no rights!	addressbook	es-es	Falló la creación de lista. No tiene privilegios suficientes.
 list of files linked to the current record	addressbook	es-es	Lista de ficheros vinculados al registro actual
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	es-es	Cargar campos personalizados en el índice, incluso si la columna de campos personalizados está desactivada (por ejemplo, para mostrarlos en una columna específica del índice)
-load vcard	addressbook	es-es	Cargar vCard
+load vcard	addressbook	es-es	Cargar VCard
 location	addressbook	es-es	Ubicación
 locations	addressbook	es-es	ubicaciones
 manage mapping	addressbook	es-es	Administrar los mapeos
 mark records as private	addressbook	es-es	Marcar registros como privados
 merge contacts	addressbook	es-es	Mezclar contactos
-merge duplicates	addressbook	es-es	Fusionar duplicados
 merge into first or account, deletes all other!	addressbook	es-es	¡Mezclar en el primero o cuenta, borra todos los demás!
 merged	addressbook	es-es	Mezclado
 message after submitting the form	addressbook	es-es	Mensaje de después de enviar el formulario
@@ -351,7 +340,7 @@ mobile phone (private)	addressbook	es-es	Teléfono móvil (privado)
 modem phone	addressbook	es-es	Teléfono módem
 more ...	addressbook	es-es	Más...
 moved	addressbook	es-es	movido
-multiple vcard	addressbook	es-es	vCard múltiple
+multiple vcard	addressbook	es-es	VCard múltiple
 name for the distribution list	addressbook	es-es	Nombre para la lista de distribución
 name of current user, all other contact fields are valid too	addressbook	es-es	Nombre del usuario actual. Todos los demás campos del contacto también son válidos.
 name, address	addressbook	es-es	Nombre, Dirección
@@ -359,10 +348,8 @@ new contact submitted by %1 at %2	addressbook	es-es	Nuevo contacto enviado por %
 new window opened to edit infolog for your selection	addressbook	es-es	Se ha abierto una ventana nueva para editar la nota para su selección
 next date	addressbook	es-es	Fecha siguiente
 no categories selected	addressbook	es-es	no se seleccionaron categorías
-no country selected	addressbook	es-es	No hay país seleccionado
 no fallback	addressbook	es-es	Sin respaldo
-no vcard	addressbook	es-es	Sin vCard
-not shared	addressbook	es-es	no compartido
+no vcard	addressbook	es-es	Sin VCard
 number	addressbook	es-es	Número
 number of records to read (%1)	addressbook	es-es	Número de registros a leer (%1)
 open for editing?	addressbook	es-es	¿Abrir para editar?
@@ -429,12 +416,6 @@ send emailcopy to receiver	addressbook	es-es	Enviar copia por correo al destinat
 seperator	addressbook	es-es	Separador
 set full name and file as field in contacts of all users (either all or only empty values)	admin	es-es	Establecer el nombre completo y el fichero como campo de contactos de todos los usuarios (todos o sólo valores vacíos)
 set only full name	addressbook	es-es	Establecer sólo el nombre completo
-share into addressbook	addressbook	es-es	Compartir en la libreta de direcciones
-share writable	addressbook	es-es	Compartir con escritura
-shared	addressbook	es-es	compartido
-shared by me	addressbook	es-es	Compartido por mí
-shared into addressbook %1	addressbook	es-es	compartido en la libreta de direcciones %1
-shared with	addressbook	es-es	Compartido con
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	es-es	¿Mostrar las columnas de foto y domicilio particular, incluso si están vacías?
 show	addressbook	es-es	Mostrar
 show infolog entries for this organisation	addressbook	es-es	Mostrar las entradas del Registro de notas y tareas para esta organización
@@ -478,8 +459,6 @@ type	addressbook	es-es	Tipo
 un-delete	addressbook	es-es	Recuperar
 unique id (uid)	addressbook	es-es	ID único (UID)
 unique id<br />(to update existing records)	addressbook	es-es	ID único<br />(para actualizar los registros existentes)
-unshare	addressbook	es-es	No compartir más
-unshared	addressbook	es-es	ya no se comparte
 update a single entry by passing the fields.	addressbook	es-es	Actualizar una única entrada pasando los campos
 update fields by edited organisations?	admin	es-es	¿Actualizar los campos por organizaciones editadas?
 updated	addressbook	es-es	Actualizado
@@ -492,7 +471,6 @@ use country list	addressbook	es-es	Utilizar lista de países
 use setup for a full account-migration	admin	es-es	Use la instalación para una migración completa de las cuentas
 use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	es-es	Usar esta etiqueta para las etiquetas de direcciones. Ponga el contenido que quiera repetir entre dos etiquetas.
 used for links and for the own sorting of the list	addressbook	es-es	utilizado para los enlaces y para el orden propio de la lista
-user groups are automatically shown as distribution lists.	addressbook	es-es	Los grupos de usuarios se muestran automáticamente como listas de distribución.
 user preference	addressbook	es-es	Preferencia del usuario
 vcard	common	es-es	Tarjeta de visita
 vcards require a first name entry.	addressbook	es-es	Las tarjetas de visita requieren el primer nombre.
@@ -503,7 +481,6 @@ warning!! ldap is valid only if you are not using contacts for accounts storage!
 warning: all contacts found will be deleted!	addressbook	es-es	ATENCIÓN: ¡Se borrarán todos los contactos encontrados!
 weekday	addressbook	es-es	Día semanal
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	es-es	Qué deben mostrar los enlaces a la libreta de direcciones en otras aplicaciones. Los valores vacíos se ignorarán. Es necesario volver a iniciar la sesión si se cambia esta opción.
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	es-es	Cuando se combinen las entradas en los documentos, se almacenarán aquí. Si no se proporciona ningún directorio, se almacenarán en su directorio personal (/home/...)
 where to add the email address	addressbook	es-es	dónde añadir la dirección de correo electrónico
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	es-es	Qué formato de dirección debe usar la libreta de direcciones para países de los que no conoce el formato de las direcciones. Si se conoce el formato de las direcciones, se usa independientemente de lo indicado en esta opción
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	es-es	Qué libreta de direcciones debe seleccionarse al añadir un contacto Y cuando no haya permiso de añadir en la libreta de direcciones actual.
@@ -520,7 +497,6 @@ yes, for the next week	addressbook	es-es	Sí, para la semana siguiente
 yes, for today and tomorrow	addressbook	es-es	Sí, para hoy y mañana
 yes, only admins can purge deleted items	admin	es-es	Sí, sólo los administradores pueden purgar los elementos borrados
 yes, users can purge their deleted items	admin	es-es	Sí, los usuarios pueden purgar sus elementos borrados
-you are not allowed to share into the addressbook of %1	addressbook	es-es	No tiene permiso para compartir a la libreta de direcciones %1
 you are not permitted to delete contact %1	addressbook	es-es	No tiene permiso para borrar el contacto %1
 you are not permittet to delete this contact	addressbook	es-es	No tiene permiso para borrar este contacto
 you are not permittet to edit this contact	addressbook	es-es	No tiene permiso para editar este contacto

addressbook/lang/egw_et.lang

@@ -1,5 +1,4 @@
 %1 added	addressbook	et	%1 lisatud
-%1 shared this contact on %2 with %3 %4	addressbook	et	%1 jagas seda kontakti %2 %3 %4
 accounts	addressbook	et	Kontod
 actions	addressbook	et	Tegevused
 add %1	addressbook	et	Lisa %1
@@ -27,63 +26,34 @@ delete this contact	addressbook	et	Kustuta see kontakt
 deleted	addressbook	et	kustutatud
 doesn't matter	addressbook	et	pole tähtis
 download	addressbook	et	Lae alla
-duplicate threshold	addressbook	et	Duplitseeritud künnis
-duplicate warning	addressbook	et	Duplikaadi hoiatus
-duplicates	addressbook	et	Duplikaadid
 duration	addressbook	et	Kestvus
 email & internet	addressbook	et	Email & Internet
 empty for all	addressbook	et	tühi kõigijaoks
 end	addressbook	et	Lõpp
 existing links	addressbook	et	Eksisteerivad lingid
 fax	addressbook	et	Faks
-fields to check for duplicates	addressbook	et	Väljad duplikaatide kontrollimiseks
-fields to consider when looking for duplicate contacts.	addressbook	et	Väljad, mida dubleerivate kontaktide otsimisel arvesse võtta.
 fieldseparator	addressbook	et	Väljaeraldaja
 full name	addressbook	et	Täis nimi
 general	admin	et	Üldine
 global categories	addressbook	et	Globaalsed Kategooriad
-hide all accounts	addressbook	et	Peida kõik kontod
-hide user groups as distribution lists	addressbook	et	Peida kasutajarühmad kui jaotamisloendid
-hides accounts completly from the adressbook.	addressbook	et	Peida kasutajakontod täielikult aadressiraamatust.
-how many fields must match for the record to be considered a duplicate.	addressbook	et	Mitu välja peab kattuma, et kirjet saaks pidada duplikaadiks.
 icon	addressbook	et	Ikoon
 import	addressbook	et	Import
-infolog	addressbook	et	InfoLog Kontakt
-infolog-organisation	addressbook	et	InfoLog Organisatsioon
+infolog	addressbook	et	InfoLog
 last modified	addressbook	et	Viimati muudetud
 links	addressbook	et	Lingid
 location	addressbook	et	Asukoht
-merge duplicates	addressbook	et	Dubleeringute ühendamine
-merge into first or account, deletes all other!	addressbook	et	Ühenda esimesse või kontosse, kustutab kõik teised!
-move to addressbook	addressbook	et	Liikumine aadressiraamatusse
-no country selected	addressbook	et	Riik ei ole valitud
-no distribution list	addressbook	et	Jaotamisloend puudub
-not shared	addressbook	et	ei ole jagatud
 organisation	addressbook	et	Organisatsioon
 participants	addressbook	et	Osalejad
 permission denied !!!	addressbook	et	Õigused puuduvad !!!
 photo	addressbook	et	Foto
-prevent deleting of contacts	admin	et	Kontaktide kustutamise vältimine
 repetition	addressbook	et	Kordus
-search letter	addressbook	et	Otsi kirja
 select all	addressbook	et	Märgi kõik
-share into addressbook	addressbook	et	Jaga aadressiraamatusse
-share writable	addressbook	et	Jaga kirjutatav
-shared	addressbook	et	jagatud
-shared by me	addressbook	et	Jagatud minu poolt
-shared into addressbook %1	addressbook	et	jagatud aadressiraamatusse %1
-shared with	addressbook	et	Jagatud koos
 show	addressbook	et	Näita
 start	admin	et	Start
 state	common	et	Maakond
 street	common	et	Tänav
 translation	addressbook	et	Tõlkimine
-unshare	addressbook	et	Enam ei jaga
-unshared	addressbook	et	ei ole enam jagatud
 updated	addressbook	et	uuendatud
-user groups are automatically shown as distribution lists.	addressbook	et	Kasutajagrupid kuvatakse automaatselt jaotamisloenditena.
 weekday	addressbook	et	Nädalati
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	et	Kui ühendate kirjeid dokumentidesse, salvestatakse need siia. Kui kataloogi pole antud, salvestatakse need teie kodukataloogi (/home/...).
 wrong - try again ...	addressbook	et	Vale - proovi uuesti ...
-you are not allowed to share into the addressbook of %1	addressbook	et	Teil ei ole lubatud jagada aadressiraamatusse %1
 you can respond by visiting:	addressbook	et	Sa saad vastata külastates:

addressbook/lang/egw_fi.lang

@@ -34,7 +34,7 @@ added by synchronisation	addressbook	fi	Lisätty synkronoinnin yhteydessä
 added to distribution list	addressbook	fi	Lisätty jakelulistalle
 additional information about using ldap as contact repository	admin	fi	Lisätietoa LDAP:n käyttämisestä yhteystietojen varastona.
 address book	common	fi	Osoitekirja
-address book - vcard in	addressbook	fi	Osoitekirja - vCard kohteessa
+address book - vcard in	addressbook	fi	Osoitekirja - VCard kohteessa
 address book - view	addressbook	fi	Osoitekirja - näkymä
 address line 2	addressbook	fi	Osoiterivi 2
 address type	addressbook	fi	Osoitteen tyyppi
@@ -100,6 +100,7 @@ company name	addressbook	fi	Yrityksen nimi
 configuration	common	fi	Konfigurointi
 contact	common	fi	Yhteystieto
 contact application	admin	fi	Yhteystietojen sovellus
+contact copied	addressbook	fi	Yhteystieto kopioitu
 contact deleted	addressbook	fi	Yhteystieto poistettu
 contact fields to show	addressbook	fi	Näytä yhteytietojen kentät
 contact fields:	addressbook	fi	Yhteystiedon kentät:
@@ -164,9 +165,6 @@ don't hide empty columns	addressbook	fi	Älä piiloita tyhjiä sarakkeita
 download	addressbook	fi	Lataa
 download export file (uncheck to debug output in browser)	addressbook	fi	Lataa vientitiedosto (Poista debug valinta selaimesta)
 download this contact as vcard file	addressbook	fi	Lataa tämä kontakti vCard-tiedostona
-duplicate threshold	addressbook	fi	Kaksinkertainen kynnysarvo
-duplicate warning	addressbook	fi	Kaksoiskappaleen varoitus
-duplicates	addressbook	fi	Kaksoiskappaleet
 duration	addressbook	fi	Kesto
 each category in its own field	addressbook	fi	Jokainen kategoria omassa kentissään
 each option in its own field	addressbook	fi	Jokainen arvo omassa kentässään
@@ -192,7 +190,7 @@ example {{nenvlf role}} - if field role is not empty, set a lf without any value
 existing links	addressbook	fi	Olemassaolevat linkit
 exists	addressbook	fi	Olemassaoleva
 export as csv	addressbook	fi	Vie CSV -muodossa
-export as vcard	addressbook	fi	Vie vCard -muodossa
+export as vcard	addressbook	fi	Vie VCard -muodossa
 export contacts	addressbook	fi	Vie yhteystiedot
 export definition to use for nextmatch export	addressbook	fi	Vienti asetukset 'nextmatch' vientiin
 export definitition to use for nextmatch export	addressbook	fi	Vienti asetukset 'nextmatch' vientiin
@@ -213,8 +211,6 @@ field %1 has been updated !	addressbook	fi	Kenttä %1 on päivitetty!
 field name	addressbook	fi	Kentän nimi
 fields for the csv export	addressbook	fi	Kentät CSV -vientiä varten
 fields the user is allowed to edit himself	admin	fi	Kentät, joita käyttäjä voi itse muuttaa
-fields to check for duplicates	addressbook	fi	Kentät, jotka tarkistetaan päällekkäisyyksien varalta
-fields to consider when looking for duplicate contacts.	addressbook	fi	Kentät, jotka otetaan huomioon, kun etsitään päällekkäisiä yhteystietoja.
 fields to copy when copying an address?	admin	fi	Mitkä kentät kopiodaan osoitteesta?
 fields to show in address list	addressbook	fi	Kentät, jotka näkyvät osoitelistassa
 fieldseparator	addressbook	fi	Kenttäerotin
@@ -230,8 +226,6 @@ grant addressbook access	common	fi	Myönnä ACL-oikeuksia osoitekirjaan
 group %1	addressbook	fi	Ryhmä %1
 h	addressbook	fi	t
 hide accounts from addressbook	addressbook	fi	Piiloita käyttäjätilit osoitekirjasta
-hide all accounts	addressbook	fi	Piilota kaikki tilit
-hide user groups as distribution lists	addressbook	fi	Piilota käyttäjäryhmät jakelulistoiksi
 hides accounts completly from the adressbook.	addressbook	fi	Piiloita käyttäjätilit kokonaan osoitekirjasta.
 history logging	admin	fi	Historialoki
 home address	addressbook	fi	Kotiosoite
@@ -245,7 +239,6 @@ home state	addressbook	fi	Osavaltio (yksit.)
 home street	addressbook	fi	Katuosoite (yksit.)
 home zip code	addressbook	fi	Postinumero (yksit.)
 how many contacts should non-admins be able to export	admin	fi	Kuinka monta yhteystietoa muiden kuin ylläpitäjien sallitaan viedä kerralla?
-how many fields must match for the record to be considered a duplicate.	addressbook	fi	Kuinka monen kentän on täsmättävä, jotta tietue katsotaan kaksoiskappaleeksi.
 icon	addressbook	fi	Kuvake
 if accounts are already in ldap	admin	fi	Jos käyttäjätili on jo LDAP:ssa
 ignore first line	addressbook	fi	Ohita ensimmäinen rivi
@@ -254,17 +247,16 @@ import contacts	addressbook	fi	Tuo yhteystiedot
 import csv-file into addressbook	addressbook	fi	Tuo CSV-tiedosto osoitekirjaan
 import file	addressbook	fi	Tuo tiedosto
 import from	addressbook	fi	Tuo kohteesta:
-import from ldif, csv, or vcard	addressbook	fi	Tuo LDIF-, CSV- tai vCard-muodosta
+import from ldif, csv, or vcard	addressbook	fi	Tuo LDIF-, CSV- tai VCard-muodosta
 import from outlook	addressbook	fi	Tuo Outlookista
-import multiple vcard	addressbook	fi	Tuo useita vCard:ja
+import multiple vcard	addressbook	fi	Tuo useita VCard:ja
 import next set	addressbook	fi	Tuo seuraava ryhmä
 import_instructions	addressbook	fi	In Netscape, open the Address book and select <b>Export</b> from the <b>File</b> menu. The file exported will be in LDIF format.<p>Or, in Outlook, select your Contacts folder, select <b>Import and Export...</b> from the <b>File</b> menu and export your contacts into a comma separated text (CSV) file. <p>Or, in Palm Desktop 4.0 or greater, visit your address book and select <b>Export</b> from the <b>File</b> menu. The file exported will be in vCard format.
 importer's personal	addressbook	fi	Tuojan henkilökohtainen
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	fi	Tuo yhteystiedot osoitekirjaan CSV tiedostosta. CVS (Comma Seperated Values) tarkoittaa pilkulla erotettua muotoilua. Voit valita Asetukset välilehdeltä myös muita erotustapoja.
 in %1 days (%2) is %3's birthday.	addressbook	fi	%1:n päivän kuluttua (%2) on syntymäpäivä henkilöllä %3.
 income	addressbook	fi	Tulo
-infolog	addressbook	fi	InfoLog Yhteystiedot
-infolog-organisation	addressbook	fi	InfoLog Organisaatio
+infolog	addressbook	fi	InfoLog
 insert	addressbook	fi	Syötä
 insufficent rights to delete this list!	addressbook	fi	Puuttelliset ACL-oikeudet listan poistamiseksi!
 international	addressbook	fi	Kansainvälinen
@@ -288,7 +280,7 @@ list already exists!	addressbook	fi	Lista on jo olemassa!
 list created	addressbook	fi	Lista luotu
 list creation failed, no rights!	addressbook	fi	Listan luonti epäonnistui, ei riittävästi oikeuksia!
 list of files linked to the current record	addressbook	fi	Lista liitetyistä tiedostoista
-load vcard	addressbook	fi	Lataa vCard
+load vcard	addressbook	fi	Lataa VCard
 location	addressbook	fi	Sijainti
 locations	addressbook	fi	Sijainnit
 mail vcard	addressbook	fi	Lähetä vCard
@@ -296,7 +288,6 @@ main categories in their own field	addressbook	fi	Pääkategoriat omassa kentiss
 manage mapping	addressbook	fi	Hallitse mappingiä
 mark records as private	addressbook	fi	Merkitse tietueet yksityisiksi
 merge contacts	addressbook	fi	Sulauta osoitteet
-merge duplicates	addressbook	fi	Yhdistä kaksoiskappaleet
 merge into first or account, deletes all other!	addressbook	fi	Sulauta ensimmäiseen tietueesseen, poistaa muut tietueet!
 merged	addressbook	fi	Sulautettu
 message after submitting the form	addressbook	fi	Viesti kaavakkeen lähettämisen jälkeen
@@ -306,21 +297,18 @@ migration finished	addressbook	fi	Sulauttaminen valmis
 migration to ldap	admin	fi	Sulauta LDAP:iin
 mobile	addressbook	fi	GSM
 mobile phone	addressbook	fi	Matkapuhelin
-mobile phone (private)	addressbook	fi	matkapuhelin (yksityinen)
 modem phone	addressbook	fi	Modem Phone
 more ...	addressbook	fi	Lisää ...
 move to addressbook	addressbook	fi	Siirrä osoitekirjaan
 moved	addressbook	fi	Siirretty
-multiple vcard	addressbook	fi	Monta vCard
+multiple vcard	addressbook	fi	Monta VCardia
 name for the distribution list	addressbook	fi	Nimeä jakelulista
 name of current user, all other contact fields are valid too	addressbook	fi	Nykyisen käyttäjän nimi, myös muut yhteystietokentät ovat voimassa.
 name, address	addressbook	fi	Nimi, osoite
 new contact submitted by %1 at %2	addressbook	fi	Uusi yhteystieto lisätty: %1, %2
-new window opened to edit infolog for your selection	addressbook	fi	Uusi ikkuna avattu, voit muokata valitsemaasi InfoLog.
+new window opened to edit infolog for your selection	addressbook	fi	Uusi ikkuna avattu, voit muokata valitsemaasi InfoLogia.
 next date	addressbook	fi	Seuraava tapaaminen
 no categories selected	addressbook	fi	Kategorioita ei ole valittu
-no country selected	addressbook	fi	Ei valittua maata
-no distribution list	addressbook	fi	Ei jakelulistaa
 no fallback	addressbook	fi	Ei fallbackiä
 no vcard	addressbook	fi	Ei vCard
 number	addressbook	fi	Numero
@@ -370,7 +358,6 @@ replacements for inserting contacts into documents	addressbook	fi	Komennot (repl
 required fields *	addressbook	fi	Vaaditut kentät *
 role	addressbook	fi	Ammatti
 room	addressbook	fi	Huone
-search letter	addressbook	fi	Hakukirjain
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	fi	Valitse jpeg muodossa oleva kuva. Se muokkautuu 60 pikseliä leveäksi kuvaksi.
 select a view	addressbook	fi	Valitse näkymä
 select addressbook type	addressbook	fi	Valitse osoitekirjan tyyppi
@@ -388,15 +375,9 @@ send emailcopy to receiver	addressbook	fi	Lähetä sähköpostikopio vastaanotta
 seperator	addressbook	fi	Erotin (Separator)
 set full name and file as field in contacts of all users (either all or only empty values)	admin	fi	Aseta "koko nimi" ja "tiedosto nimellä" (File as) kenttä kaikille käyttäjille. (joko kaikki tai tyhjä).
 set only full name	addressbook	fi	Ainoastaan koko nimi
-share into addressbook	addressbook	fi	Jaa osoitekirjaan
-share writable	addressbook	fi	Jaa kirjoitettavissa
-shared	addressbook	fi	jaettu
-shared by me	addressbook	fi	Jaettu minun toimesta
-shared into addressbook %1	addressbook	fi	jaettu osoitekirjaan %1
-shared with	addressbook	fi	Jaettu
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	fi	Näytetäänkö kuva- ja kotiosoitesarake aina, vaikka ne olisivat tyhjiä?
 show	addressbook	fi	Näytä
-show infolog entries for this organisation	addressbook	fi	Näytä InfoLog merkinnät tästä organisaatiosta
+show infolog entries for this organisation	addressbook	fi	Näytä InfoLogin merkinnät tästä organisaatiosta
 show the contacts of this organisation	addressbook	fi	Näytä tämän organisaation yhteystiedot
 similar contacts found:	addressbook	fi	Sama yhteystieto löydetty:
 size of popup (wxh, eg.400x300, if a popup should be used)	admin	fi	Popup ikkunan koko (korkeus x leveys, esim 400 x 300, jos popup ikkunat ovat käytössä)
@@ -441,22 +422,21 @@ updated	addressbook	fi	Päivitetty
 upload or delete the photo	addressbook	fi	Lataa tai poista kuva
 url to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)	admin	fi	URL linkki puhelinnumeroon (käytä %1 = soitettava numero, %u = käyttäjän nimi, %t = käyttäjän puhelin)
 use addressbooks "own sorting" attribute	addressbook	fi	Käytä osoitekirjan "oma lajittelu" vaihtoehtoa
+use an extra category tab?	addressbook	fi	Käytä ylimääräistä kategoria välilehteä.
 use an extra tab for private custom fields?	admin	fi	Käytä ylimääräistä välilehteä yksityisille lisäkentille.
 use country list	addressbook	fi	Käytä maaluetteloa
 use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	fi	Käytä tägiä esim. osoitetarroihin. Lisää haluamasi kentät kahden tägin väliin.
 used for links and for the own sorting of the list	addressbook	fi	Käytä linkeissä ja omassa lajittelulistassa
-user groups are automatically shown as distribution lists.	addressbook	fi	Käyttäjäryhmät näytetään automaattisesti jakelulistoina.
 user preference	addressbook	fi	Käyttäjäasetukset
-vcard	common	fi	vCard
-vcards require a first name entry.	addressbook	fi	vCard vaatii etunimen.
-vcards require a last name entry.	addressbook	fi	vCard vaatii sukunimen.
+vcard	common	fi	VCard
+vcards require a first name entry.	addressbook	fi	VCard vaatii etunimen.
+vcards require a last name entry.	addressbook	fi	VCard vaatii sukunimen.
 verification	addressbook	fi	Varmentaminen
 view linked infolog entries	addressbook	fi	Näytä linkitetyt InfoLog-merkinnät
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	fi	VAROITUS!! LDAP soveltuu vain, jos sitä ei käytetä käyttäjättilien tallentamiseen!
 warning: all contacts found will be deleted!	addressbook	fi	VAROITUS: Kaikki löytyneet osoitteet poistetaan!
 weekday	addressbook	fi	Viikonpäivä
-what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	fi	Mitä osoitekirjan linkin tulisi sisältää muissa sovelluksissa esim. InfoLog. Tyhjiä kenttiä ei kuitenkaan näytetä. Kirjaudu sisään uudellen, jos muutat tätä asetusta!
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	fi	Kun yhdistät merkintöjä asiakirjoihin, ne tallennetaan tähän. Jos hakemistoa ei ole annettu, ne tallennetaan kotihakemistoosi (/home/...).
+what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	fi	Mitä osoitekirjan linkin tulisi sisältää muissa sovelluksissa esim. InfoLogissa. Tyhjiä kenttiä ei kuitenkaan näytetä. Kirjaudu sisään uudellen, jos muutat tätä asetusta!
 where to add the email address	addressbook	fi	Mihin sähköpostiosoite tulisi lisätä?
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	fi	Mitä osoitteen muotoa osoitekirja käyttää maista joiden osoitemuoto on tuntematon. Jos maan osoitemuoto on tiedossa, se käyttää sitä riippumatta tästä asetuksesta.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	fi	Mihin osoitekirjaan yhteystiedot lisätään, JOS sinulla ei ole ACL-oikeuksia lisätä yhteystietoja valitsemaasi/haluamaasi osoitekirjaan.

addressbook/lang/egw_fr.lang

@@ -1,23 +1,22 @@
 #	addressbook	fr	#
 %1 added	addressbook	fr	%1 ajouté
 %1 contact(s) %2	addressbook	fr	%1 contact(s) %2
-%1 contact(s) %2, %3 failed because of %4 !!!	addressbook	fr	%1 contact(s) %2, %3 en échec pour %4 !!!
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	fr	%1 contact(s) %2, %3 en erreur (droits d'accès insuffisants).
 %1 contact(s) added as %2	addressbook	fr	%1 contact(s) ajouté(s) comme %2
 %1 contacts updated (%2 errors).	addressbook	fr	%1 contacts mis à jour (%2 erreurs).
-%1 entries %2, %3 failed.	addressbook	fr	%1 événement(s) %2, %3 en échec.
-%1 event(s) %2	addressbook	fr	%1 événement(s) %2
+%1 entries %2, %3 failed because of insufficent rights !!!	addressbook	fr	%1 entrées %2, %3 en échec pour droits insuffisants !!!
+%1 entries %2, %3 failed.	addressbook	fr	%1 entrées %2, %3 en échec.
 %1 fields in %2 other organisation member(s) changed	addressbook	fr	Le champ %1 dans %2 autre(s) membre(s) de l'organisation a changé.
 %1 key(s) added to public keyserver "%2".	addressbook	fr	%1 clé(s) publique(s) ajoutée(s) au serveur de clés publiques "%2".
 %1 not implemented for %2!	addressbook	fr	%1 non implémenté pour %2 !
 %1 public keys added.	addressbook	fr	%1 clé(s) publique(s) ajoutée(s).
 %1 records imported	addressbook	fr	%1 enregistrements importés.
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	fr	%1 enregistrements lus (non encore importé, vous devriez retourner en arrière %2back%3 et décocher le test de límportation)
-%1 shared this contact on %2 with %3 %4	addressbook	fr	%1 a communiqué ce contact le %2 %3 %4
 %1 starts with '%2'	addressbook	fr	%1 débute avec '%2'
 %s please calculate the result	addressbook	fr	%s calculez s'il vous plait le résultat
 (e.g. 1969)	addressbook	fr	(e.g. 1969)
 (empty = use global limit, no = no export at all)	admin	fr	Vide = pas de limite globale, no = pas d'export du tout
+*	addressbook	fr	*
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	fr	<b>Aucun type de conversion <aucun> n'a pu être trouvé.</b>  SVP choisissez un type de conversion depuis la liste
 @-eval() is only availible to admins!!!	addressbook	fr	@-eval() est disponible uniquement pour les administrateurs!!!
 account id	addressbook	fr	Compte ID
@@ -47,7 +46,7 @@ added by synchronisation	addressbook	fr	ajouté par synchronisation
 added to distribution list	addressbook	fr	ajouté à la liste de diffusion
 additional information about using ldap as contact repository	admin	fr	Informations complémentaires pour utiliser LDAP comme dépôt de contacts
 address book	common	fr	Carnet d'adresses
-address book - vcard in	addressbook	fr	Carnet d'adresses - Entrée vCard
+address book - vcard in	addressbook	fr	Carnet d'adresses - Entrée VCard
 address book - view	addressbook	fr	Carnet d'adresses - Voir
 address line 2	addressbook	fr	Adresse ligne 2
 address line 2 (private)	addressbook	fr	Adresse ligne 2 (privé)
@@ -65,7 +64,7 @@ addressbook the contact should be shown	addressbook	fr	Carnet d'adresse à affic
 addressbook vcard export	addressbook	fr	Import vCard du carnet d'adresses
 addressbook vcard import	addressbook	fr	Import vCard du carnet d'adresses
 addressbook-fieldname	addressbook	fr	Carnet d'adresses - nom du champ
-addvcard	addressbook	fr	Ajouter vCard
+addvcard	addressbook	fr	Ajouter VCard
 advanced search	addressbook	fr	Recherche avancée
 all addressbooks	addressbook	fr	Tous les carnets d'adresses
 all contacts	addressbook	fr	Tous les contacts
@@ -115,7 +114,6 @@ category tree	admin	fr	Arborescence de la catégorie
 cell phone	addressbook	fr	Téléphone portable
 change addressbook when updating	addressbook	fr	Changer le carnet d'adresse à la mise à jour
 change all organisation members	addressbook	fr	Modifier tous les membres de l'organisation
-changed type to %1	addressbook	fr	Type changé en %1
 charset for the csv export	addressbook	fr	Jeu de caractères pour l'export CSV
 charset for the vcard export	addressbook	fr	Jeu de caractères pour l'export vCard
 charset for the vcard import and export	addressbook	fr	Jeu de caractères pour l'export et l'import vCard
@@ -123,6 +121,7 @@ charset of file	addressbook	fr	Jeu de caractères du fichier
 check all	addressbook	fr	Vérifier tout
 choose an icon for this contact type	admin	fr	Choisisser une icône pour ce type de contact
 choose charset	addressbook	fr	Sélectionner un jeu de caractères
+choose export options	addressbook	fr	Choisir les options d'export
 choose owner of imported data	addressbook	fr	Choisisser le propriétaire de données importées
 choose pre-defined map source or use custom url (use %r = street, %t = city, %c = country, %z = zipcode)	admin	fr	Choisir une source de carte pré-définie ou une URL personnalisée ( %r = rue , %t = ville, %c = pays, %z = code postal)
 chosse an etemplate for this contact type	admin	fr	Choisissez un eTemplate pour ce type de contact
@@ -226,6 +225,7 @@ edit phonenumbers	addressbook	fr	Modifier les numéros de téléphone
 edit phonenumbers -	addressbook	fr	Editer les numéros de téléphone -
 either the configured email addesses are wrong or the mail configuration.	addressbook	fr	Soit les adresses email sont fausses, soit la configuration est mauvaise.
 email & internet	addressbook	fr	Email & Internet
+email &amp; internet	addressbook	fr	Email & Internet
 email (private)	addressbook	fr	email (privé)
 email addresses (comma separated) to send the contact data	addressbook	fr	Adresses email, séparées par des virgules, pour envoyer les données des contacts.
 empty	admin	fr	Vide
@@ -241,7 +241,7 @@ error: the entry has been updated since you opened it for editing!	addressbook	f
 existing links	addressbook	fr	Liens existants
 exists	addressbook	fr	Existe
 export as csv	addressbook	fr	Exporter au format CSV
-export as vcard	addressbook	fr	Export au format vCard
+export as vcard	addressbook	fr	Export au format VCard
 export contacts	addressbook	fr	Exporter les contacts
 export definition to use for nextmatch export	addressbook	fr	Définition de l'export à utiliser pour l'export "nextmatch"
 export definitition to use for nextmatch export	addressbook	fr	Définition de l'export à utiliser pour l'export "nextmatch"
@@ -271,9 +271,11 @@ fields to consider when looking for duplicate contacts.	addressbook	fr	Champs à
 fields to copy when copying an address?	admin	fr	Champs à copier lors de la copie d'une adresse
 fields to show in address list	addressbook	fr	Champs à afficher dans la liste des adresses
 fieldseparator	addressbook	fr	Séparateur de champs
+file is not a %1 public key!	addressbook	fr	Le fichier n'est pas une clé publique %1 !
 for read only ldap	admin	fr	pour un LDAP en lecture seule
 for serial letter use this tag. put the content, you want to repeat between two tags.	addressbook	fr	Pour les lettres en série utiliser cette balise. Placer le contenu que vous voulez répéter entre deux balises.
 freebusy uri	addressbook	fr	Freebusy URI
+from file	addressbook	fr	Depuis le fichier
 full name	addressbook	fr	Nom complet
 general	admin	fr	Général
 general fields:	addressbook	fr	Champs généraux :
@@ -311,23 +313,24 @@ import contacts	addressbook	fr	Importer les contacts
 import csv-file into addressbook	addressbook	fr	Importer le fichier CSV dans le carnet d'adresses
 import file	addressbook	fr	Importer le fichier
 import from	addressbook	fr	Importer depuis
-import from ldif, csv, or vcard	addressbook	fr	Importer depuis LDIF, CSV ou vCard
+import from ldif, csv, or vcard	addressbook	fr	Importer depuis LDIF, CSV ou VCard
 import from outlook	addressbook	fr	Importer depuis Outlook
-import multiple vcard	addressbook	fr	Importation vCard Multiple
+import multiple vcard	addressbook	fr	Importation VCard Multiple
 import next set	addressbook	fr	Importer l'élément suivant
-import_instructions	addressbook	fr	Dans Netscape, ouvrir le carnet d´adresses et sélectionner <b>Exporter</b> depuis le menu <b>Fichier</b>. Le fichier exporté sera au format LDIF.<p>Ou, dans Outlook, sélectionner votre dossier des contacts, sélectionner <b>Importer et Exporter...</b> depuis le menu <b>Fichier</b> et exporter vos contacts, séparés par des virgules,  dans un fichier texte (CSV). <p>Ou, dans Palm Desktop 4.0 ou supérieur, consulter votre carnet d´adresses et sélectionner <b>Exporter</b> depuis le menu <b>Fichier</b>. Le fichier exporté sera au format vCard.
+import_instructions	addressbook	fr	Dans Netscape, ouvrir le carnet d´adresses et sélectionner <b>Exporter</b> depuis le menu <b>Fichier</b>. Le fichier exporté sera au format LDIF.<p>Ou, dans Outlook, sélectionner votre dossier des contacts, sélectionner <b>Importer et Exporter...</b> depuis le menu <b>Fichier</b> et exporter vos contacts, séparés par des virgules,  dans un fichier texte (CSV). <p>Ou, dans Palm Desktop 4.0 ou supérieur, consulter votre carnet d´adresses et sélectionner <b>Exporter</b> depuis le menu <b>Fichier</b>. Le fichier exporté sera au format VCard.
 importer's personal	addressbook	fr	répertoire personnel de l'importeur
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	fr	Importer les contacts depuis un fichier CSV.  CSV correspond à des valeurs séparées par des virgules.  Dans les options, vous pouvez choisir d'autres séparateurs.
 imports contacts into your addressbook from a vcard file.	addressbook	fr	Importer les contacts vers votre carnet d'adresses depuis un fichier vCard.
 in %1 days (%2) is %3's birthday.	addressbook	fr	Dans %1 jours (%2) c'est l'anniversaire de %3.
 income	addressbook	fr	Revenus
-infolog	addressbook	fr	Contact InfoLog
-infolog-organisation	addressbook	fr	Organisation InfoLog
+infolog	addressbook	fr	InfoLog
+infolog-organisation	addressbook	fr	Ouvrir la vue Infolog CRM sur l'organisation
 insert	addressbook	fr	Insérer
 insufficent rights to delete this list!	addressbook	fr	Autorisations insuffisantes pour supprimer cette liste !
 insufficent rights to edit this list!	addressbook	fr	Autorisations insuffisantes pour modifier cette list e!
 international	addressbook	fr	International
 internet	addressbook	fr	Internet
+invite to current call	addressbook	fr	Inviter à l'appel en cours
 label	addressbook	fr	Label
 last date	addressbook	fr	Dernier contact
 last modified	addressbook	fr	Dernière modification
@@ -344,14 +347,15 @@ links to specified application.  example: {{links/infolog}}	addressbook	fr	Liens
 list all categories	addressbook	fr	Lister toutes les catégories
 list all customfields	addressbook	fr	Lister tous les champs spécifiques
 list already exists!	addressbook	fr	La liste existe déjà !
+list as seperate columns	addressbook	fr	Lister dans des colonnes séparées
 list created	addressbook	fr	Liste créée
 list creation failed, no rights!	addressbook	fr	La création de la liste a échoué, aucune autorisation!
 list of files linked to the current record	addressbook	fr	Listes des fichiers liés à l'enregistrement courant
 load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	fr	Charger les champs personnalisé sur l'index, même si le champ personnalisé est vide (ie. pour les afficher dans une colonne spécifique)
-load vcard	addressbook	fr	Charger vCard
+load vcard	addressbook	fr	Charger VCard
 location	addressbook	fr	Emplacement
 locations	addressbook	fr	localisations
-mail vcard	addressbook	fr	Email vCard
+mail vcard	addressbook	fr	Email VCard
 main categories in their own field	addressbook	fr	Principales catégories dans leurs propre domaine/champ
 manage mapping	addressbook	fr	Gestion des correspondances
 mark records as private	addressbook	fr	Marquer l´enregistrement comme privé
@@ -371,25 +375,24 @@ modem phone	addressbook	fr	Téléphone modem
 more ...	addressbook	fr	Plus ...
 move to addressbook	addressbook	fr	Déplacer vers le carnet d'adresses
 moved	addressbook	fr	déplacé(s)
-multiple vcard	addressbook	fr	vCard multiples
+multiple vcard	addressbook	fr	VCard multiples
 name for the distribution list	addressbook	fr	Nom de la liste de diffusino
 name of current user, all other contact fields are valid too	addressbook	fr	Nom de l'utilisateur courant, tous les autres champs de contacts sont valides aussi
 name, address	addressbook	fr	Nom, adresse
 new contact submitted by %1 at %2	addressbook	fr	Nouveau contact soumis par %1 à %2.
-new window opened to edit infolog for your selection	addressbook	fr	Nouvelle fenêtre ouverte pour modifier un InfoLog.
+new window opened to edit infolog for your selection	addressbook	fr	Nouvelle fenêtre ouverte pour modifier un infolog.
 next date	addressbook	fr	Date de prochain contact
 no categories selected	addressbook	fr	Aucune catégorie sélectionnée
 no country selected	addressbook	fr	Aucun pays sélectionné
 no distribution list	addressbook	fr	Aucune liste de diffusion
 no fallback	addressbook	fr	Pas de fallback
-no vcard	addressbook	fr	Pas de vCard
-not shared	addressbook	fr	n'a pas été partagé
+no vcard	addressbook	fr	Pas de VCard
 number	addressbook	fr	Numéro
 number of records to read (%1)	addressbook	fr	Nombre d'enregistrements à lire (%1)
 open %1 crm view	addressbook	fr	Ouvrir la vue CRM %1
 open email addresses in external mail program	addressbook	fr	Ouvrir les adresses email dans un programme externe
 open for editing?	addressbook	fr	Ouvrir en modification ?
-open infolog crm view	preferences	fr	Ouvrir la vue CRM de l'InfoLog
+open infolog crm view	preferences	fr	Ouvrir la vue CRM de l'Infolog
 open tracking system crm view	preferences	fr	Ouvrir la vue CRM du Traqueur
 options for type	admin	fr	Options pour le type
 organisation	addressbook	fr	Organisation
@@ -404,6 +407,7 @@ parcel	addressbook	fr	Paquet
 participants	addressbook	fr	Participants
 permission denied !!!	addressbook	fr	Autorisation refusée !
 permissiong denied! ask your administrator to allow regular uses to update their public keys.	addressbook	fr	Autorisation refusée ! Veuillez demander à votre administrateur d'autoriser les utilisateurs réguliers à mettre à jours leurs clés publiques.
+pgp	addressbook	fr	PGP
 pgp key	addressbook	fr	Clé GPG
 phone number	common	fr	Numéro de téléphone
 phone numbers	common	fr	Numéros de téléphone
@@ -425,6 +429,7 @@ read a list / search for entries.	addressbook	fr	Lire une liste / rechercher des
 read a list of entries.	addressbook	fr	Lire une liste d'entrées.
 read a single entry by passing the id and fieldlist.	addressbook	fr	Lire une seule entrée en passant l'ID et la liste des champs.
 read only	addressbook	fr	lecture seule
+readme	addressbook	fr	LISEZ-MOI
 record access	addressbook	fr	Enregistrer l'accès
 record owner	addressbook	fr	Enregistrer le propriétaire
 recovered	addressbook	fr	Récupéré
@@ -439,7 +444,12 @@ replacements for inserting contacts into documents	addressbook	fr	Remplacements
 required fields *	addressbook	fr	Champs nécessaires *
 role	addressbook	fr	Rôle
 room	addressbook	fr	Salle
+s/mime	addressbook	fr	S/MIME
+save as infolog	addressbook	fr	Enregistrer comme infolog
+schedule a video conference	addressbook	fr	Planifier une visio-conférence
 search letter	addressbook	fr	Chercher sur une lettre
+security	addressbook	fr	Sécurité
+select a map or write an url	addressbook	fr	Sélectionner une carte ou inscrire une URL
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	fr	Sélectionner une photo jpeg en mode portrait. Elle sera reformatée en 60 pixels de largeur.
 select a source address to be used in geolocation routing system	addressbook	fr	Sélectionner une adresse source de géolocalisation à utiliser
 select a view	addressbook	fr	Sélectionnez une vue
@@ -448,6 +458,7 @@ select all	addressbook	fr	Sélectionner tout
 select an action or addressbook to move to	addressbook	fr	Sélectionnez une action ou un carnet d'adresses à déplacer
 select an action or addressbook to move to...	addressbook	fr	Sélectionnez une action ou un carnet d'adresses à déplacer...
 select an opened dialog	addressbook	fr	Sélectionner une boîte de dialogue ouverte
+select categories	addressbook	fr	Sélectionner des catégories
 select migration type	admin	fr	Sélectionnez un type de migration
 select multiple contacts for a further action	addressbook	fr	Sélectionner plusieurs contacts pour une même action
 select phone number as prefered way of contact	addressbook	fr	sélectionner le téléphone comme moyen de contact préféré
@@ -460,12 +471,6 @@ send succeeded to %1	common	fr	Succès de l'envoi vers %1
 seperator	addressbook	fr	Séparateur
 set full name and file as field in contacts of all users (either all or only empty values)	admin	fr	Remplir le nom complet et le "afficher comme" dans les fiches contact de tous les utilisateurs. Soit tous, soit seulement les valeurs vides.
 set only full name	addressbook	fr	Définir seulement le nom complet
-share into addressbook	addressbook	fr	Partager dans le carnet d'adresses
-share writable	addressbook	fr	Partager en écriture
-shared	addressbook	fr	partagé
-shared by me	addressbook	fr	Partagé par moi
-shared into addressbook %1	addressbook	fr	partagé dans le carnet d'adresses %1
-shared with	addressbook	fr	Partagé avec
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	fr	Est-ce que les colonnes photo et adresse privée doivent toujours être affichés, même s'ils sont vides.
 show	addressbook	fr	Afficher
 show active accounts	addressbook	fr	Afficher les comptes actifs
@@ -483,6 +488,7 @@ state	common	fr	Région
 state (private)	addressbook	fr	Etat (privé)
 street	common	fr	Rue
 street (private)	addressbook	fr	Rue (privé)
+style	addressbook	fr	Style
 subject for email	addressbook	fr	Sujet du mail
 successfully imported %1 records into your addressbook.	addressbook	fr	%1 enregistrement(s) ont été enregistrés avec succès dans votre carnet d´adresses.
 suffix	addressbook	fr	Suffixe
@@ -495,6 +501,7 @@ that field name has been used already !	addressbook	fr	Ce nom de champ est déj
 the anonymous user has probably no add rights for this addressbook.	addressbook	fr	L'utilisateur anonyme n'a pas de droit pour ajouter des contacts sur ce carnet d'adresses.
 the anonymous user needs add rights for it!	addressbook	fr	L'utilisateur anonyme doit avoir des droits d'ajout !
 the anonymous user needs read it!	addressbook	fr	L'utilisateur anonyme doit avoir des droits de lecture !
+the document can contain placeholder like {{%1}}, to be replaced with the data.	addressbook	fr	Ce document peut contenir des balises telles que {{%1}}, à remplacer avec la valeur.
 the following document-types are supported:	addressbook	fr	Les documents types suivants sont supportés :
 the zip extension is needed, to insert contact data in openoffice or msoffice documents.	addressbook	fr	l'extension zip est nécessaire pour insérer des données de contact dans des documents OpenOffice ou MSOffice
 there was an error saving your data :-(	addressbook	fr	ERREUR à l'enregistrement de données !
@@ -508,6 +515,7 @@ titles of any entries linked to the current record, excluding attached files	add
 to many might exceed your execution-time-limit	addressbook	fr	trop pourrait dépasser votre temps limite d'exécution
 today is %1's birthday!	common	fr	Aujourd'hui c'est l'anniversaire de %1 !
 tomorrow is %1's birthday.	common	fr	Demain c'est l'anniversaire de %1.
+tracker	addressbook	fr	Traqueur
 translation	addressbook	fr	Traduction
 two of: %1	addressbook	fr	Deux de : %1
 type	addressbook	fr	Type
@@ -518,8 +526,6 @@ unable to import into %1, using %2	addressbook	fr	Impossible d'importer dans %1,
 unique id (uid)	addressbook	fr	ID unique (UID)
 unique id<br />(to update existing records)	addressbook	fr	ID Unique<br />pour mettre à jour des enregistrements existants
 unknown type %1, imported as %2	addressbook	fr	Type %1 inconnu, importé comme %2
-unshare	addressbook	fr	Ne plus partager
-unshared	addressbook	fr	ne plus partager
 update a single entry by passing the fields.	addressbook	fr	Mettre à jour une seule entrée en passant les champs.
 update fields by edited organisations?	admin	fr	Champs à mettre à jour pour les organisations modifiées
 updated	addressbook	fr	Mis à jour
@@ -529,24 +535,28 @@ url (private)	addressbook	fr	url (privé)
 url to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)	admin	fr	URL pour le lien téléphone. %1 = numéro à 'appeler, %u = nom du compte, %t = téléphone du compte.
 use a category tree?	addressbook	fr	Utiliser une arborescence pour sélectionner les catégories
 use addressbooks "own sorting" attribute	addressbook	fr	Utiliser l'attribut "tri perso" (own sorting) du carnet d'adresses
+use all	addressbook	fr	Tout utiliser
 use an extra tab for private custom fields?	admin	fr	Utiliser un onglet supplémentaire pour les champs privés extra
 use country list	addressbook	fr	Utiliser la liste des pays
+use field from csv if possible	addressbook	fr	Utiliser le champs du CSV si possible
+use search results	addressbook	fr	Utiliser les résultats de la recherche
 use setup for a full account-migration	admin	fr	Utiliser le setup pour une migration de comptes complète
 use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	fr	Utiliser cette balise pour les étiquettes d'adresse. Placer le contenu que vous voulez répéter entre deux balises.
 used for links and for the own sorting of the list	addressbook	fr	utilisé pour les liens et le tri de la liste
 user groups are automatically shown as distribution lists.	addressbook	fr	Les groupes d'utilisateurs sont automatiquement affichés comme des listes de diffusion.
 user preference	addressbook	fr	Préférences de l'utilisateur
-vcard	common	fr	vCard
-vcards require a first name entry.	addressbook	fr	Les vCards nécessitent une entrée prénom.
-vcards require a last name entry.	addressbook	fr	Les vcards nécessitent une entrée nom de famille.
+vcard	common	fr	VCard
+vcards require a first name entry.	addressbook	fr	Les VCards nécessitent une entrée prénom.
+vcards require a last name entry.	addressbook	fr	Les Vcards nécessitent une entrée nom de famille.
 verification	addressbook	fr	Vérification
+video call	addressbook	fr	Appel vidéo
 view linked infolog entries	addressbook	fr	Afficher les entrées liées à InfoLog
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	fr	ATTENTION!! LDAP est valide seulement si vous n'utilisez PAS les contacts pour le stockage des comptes!
 warning: all contacts found will be deleted!	addressbook	fr	AVERTISSEMENT : Tous les contacts trouvés seront supprimés!
+warning: template "%1" not found, using default template instead.	addressbook	fr	AVERTISSEMENT : Template "%1" non trouvé, le template par défaut est utilisé
 weekday	addressbook	fr	Jour de la semaine
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	fr	Que devraient afficher les liens du carnet d'adresses dans les autres applications. Les valeurs vides ne seront pas prises en compte. Vous devez vous reconnecter si vous modifiez ce paramètre!
 when viewing a contact, show linked entries from the selected application	addressbook	fr	A l'affichage du contact, afficher les entrées liées sur les applications sélectionnées
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	fr	Lorsque vous fusionnez des entrées dans des documents, elles sont stockées ici. Si aucun répertoire n'est fourni, elles seront stockées dans votre répertoire personnel (/home/...).
 where to add the email address	addressbook	fr	Où ajouter des adresses email
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	fr	Sélectionner quel format doit être utilisée pour les pays avec un format d'adresse inconnu.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	fr	Quel carnet d'adresses devra être sélectionné quand vous ajoutez un contact ET que vous n'avez pas d'autorisation pour le carnet d'adresses en cours.
@@ -565,14 +575,13 @@ yes, for the next week	addressbook	fr	Oui, pour la semaine prochaine
 yes, for today and tomorrow	addressbook	fr	Oui, pour aujourd'hui et demain
 yes, only admins can purge deleted items	admin	fr	Oui, les administrateurs seuls peuvent purger les éléménts supprimés
 yes, users can purge their deleted items	admin	fr	Oui, les utilisateurs  peuvent purger leurs éléments supprimés
-you are not allowed to share into the addressbook of %1	addressbook	fr	Vous ne pouvez pas partager dans le carnet d'adresses de %1
 you are not permitted to delete contact %1	addressbook	fr	Vous n'êtes pas autorisés à supprimer le contact %1
 you are not permittet to delete this contact	addressbook	fr	Vous n'êtes pas autorisés à supprimer ce contact
 you are not permittet to edit this contact	addressbook	fr	Vous n'êtes pas autorisés à modifier ce contact
 you are not permittet to view this contact	addressbook	fr	Vous n'êtes pas autorisés à voir ce contact
 you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	fr	Vous ne pouvez utiliser LDAP comme dépôt de contacts que si les comptes sont aussi stockés dans LDAP!
 you can respond by visiting:	addressbook	fr	Pour le voir, visitez :
-you must select a vcard. (*.vcf)	addressbook	fr	Vous devez choisir une vCard. (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	fr	Vous devez choisir une vcard. (*.vcf)
 you must select at least 1 column to display	addressbook	fr	Vous devez choisir au moins 1 colonne à afficher
 you need to select a distribution list	addressbook	fr	Vous devez choisir une liste de diffusion
 you need to select some contacts first	addressbook	fr	Vous devez d'abord choisir les contacts

addressbook/lang/egw_hu.lang

@@ -23,7 +23,7 @@ added	addressbook	hu	Hozzáadva
 added by synchronisation	addressbook	hu	szinkronizáció által hozzáadva
 added to distribution list	addressbook	hu	disztribúciós listához hozzáadva
 address book	common	hu	Címjegyzék
-address book - vcard in	addressbook	hu	Címjegyzék - vCard formában
+address book - vcard in	addressbook	hu	Címjegyzék - VCard formában
 address book - view	addressbook	hu	Címjegyzék - nézet
 address line 2	addressbook	hu	Címsor 2
 address type	addressbook	hu	Címtípus
@@ -33,7 +33,7 @@ addressbook menu	addressbook	hu	Címjegyzék menü
 addressbook preferences	addressbook	hu	Címjegyzék tulajdonságok
 addressbook the contact should be saved to	addressbook	hu	Kapcsolat mentése a következő címjegyzékbe
 addressbook-fieldname	addressbook	hu	Címjegyzék-Mezőnév
-addvcard	addressbook	hu	vCard hozzáadása
+addvcard	addressbook	hu	VCard hozzáadása
 advanced search	addressbook	hu	Kiterjesztett keresés
 all contacts	addressbook	hu	Összes kapcsolat
 allow users to maintain their own account-data	admin	hu	Felhasználók kezelhetik saját felhasználói fiók adataikat
@@ -77,6 +77,7 @@ company name	addressbook	hu	Cégnév
 configuration	common	hu	Konfiguráció
 contact	common	hu	Kapcsolat
 contact application	admin	hu	Kapcsolat alkalmazás
+contact copied	addressbook	hu	Kapcsolat másolva
 contact deleted	addressbook	hu	Kapcsolat törölve
 contact fields to show	addressbook	hu	A következő Kapcsolat mezők megjelenítése
 contact fields:	addressbook	hu	Kapcsolat mezők:
@@ -130,9 +131,6 @@ don't hide empty columns	addressbook	hu	Ne rejtsd el az üres oszlopokat
 download	addressbook	hu	Letölt
 download export file (uncheck to debug output in browser)	addressbook	hu	Export állomány letöltése (Meg kell szüntetni a nyomkövetés megjelenítését a böngészőben, ha be lenne kapcsolva. Ha nem tudja, ez mit jelent, akkor valószínűleg nincs bekapcsolva.)
 download this contact as vcard file	addressbook	hu	Kapcsolat letöltése mint vCard állomány
-duplicate threshold	addressbook	hu	Duplikált küszöbérték
-duplicate warning	addressbook	hu	Duplikátum figyelmeztetés
-duplicates	addressbook	hu	Duplikátumok
 duration	addressbook	hu	Időtartam
 edit custom field	addressbook	hu	Egyedi mező szerkesztése
 edit custom fields	admin	hu	Egyedi mezök szerkesztése
@@ -151,7 +149,7 @@ error saving the contact !!!	addressbook	hu	Hiba a kapcsolat mentésekor !!!
 error: the entry has been updated since you opened it for editing!	addressbook	hu	Hiba: a bejegyzés módosult mióta megnyitottad!
 existing links	addressbook	hu	Meglévő hivatkozások
 export as csv	addressbook	hu	Export CSV formában
-export as vcard	addressbook	hu	Export vCard formában
+export as vcard	addressbook	hu	Export VCard formában
 export contacts	addressbook	hu	Kapcsolatok exportálása
 export file name	addressbook	hu	Export állomány neve
 export from addressbook	addressbook	hu	Export a Címjegyzékből
@@ -168,8 +166,6 @@ field %1 has been updated !	addressbook	hu	%1 mező frissítve!
 field name	addressbook	hu	Mező neve
 fields for the csv export	addressbook	hu	Mezők a CSV exporthoz
 fields the user is allowed to edit himself	admin	hu	Mezők, melyeket a felhasználó saját maga szerkeszthet
-fields to check for duplicates	addressbook	hu	Duplikátumok ellenőrzésére szolgáló mezők
-fields to consider when looking for duplicate contacts.	addressbook	hu	A duplikált kapcsolatok keresésekor figyelembe veendő mezők.
 fields to show in address list	addressbook	hu	Címjegyzékben megjelenő mezők
 fieldseparator	addressbook	hu	Mező elválasztó
 for read only ldap	admin	hu	csak olvasható LDAP-hoz
@@ -183,8 +179,6 @@ grant addressbook access	common	hu	Címjegyzék elérés engedélyezése
 group %1	addressbook	hu	%1 csoport
 h	addressbook	hu	h
 hide accounts from addressbook	addressbook	hu	A felhasználók adatainak elrejtése a címjegyzékből
-hide all accounts	addressbook	hu	Minden fiók elrejtése
-hide user groups as distribution lists	addressbook	hu	Felhasználói csoportok elrejtése terjesztési listaként
 hides accounts completly from the adressbook.	addressbook	hu	A felhasználók összes adatának elrejtése a címjegyzékből
 history logging	admin	hu	Történet követése (log)
 home address	addressbook	hu	Otthoni cím
@@ -196,22 +190,20 @@ home phone	addressbook	hu	Otthoni telefon
 home state	addressbook	hu	Otthoni megye
 home street	addressbook	hu	Otthoni utca
 home zip code	addressbook	hu	Otthoni postai irányítószám
-how many fields must match for the record to be considered a duplicate.	addressbook	hu	Hány mezőnek kell egyeznie ahhoz, hogy a rekord duplikátumnak minősüljön.
 icon	addressbook	hu	Ikon
 import	addressbook	hu	Import
 import contacts	addressbook	hu	Kapcsolat importálás
 import csv-file into addressbook	addressbook	hu	CVS-Állomány importálása a Címjegyzékbe
 import file	addressbook	hu	Állomány importálása
 import from	addressbook	hu	Importálás innen...
-import from ldif, csv, or vcard	addressbook	hu	Importálás LDIF, CSV, vagy vCard formátumból
+import from ldif, csv, or vcard	addressbook	hu	Importálás LDIF, CSV, vagy VCard formátumból
 import from outlook	addressbook	hu	Importálás Outlookból
 import multiple vcard	addressbook	hu	Több vCard importálása
 import next set	addressbook	hu	Következő beállítás importálása
 import_instructions	addressbook	hu	Netscape esetében meg kell nyitni a Címjegyzéket és ki kell választani az <b>Export</b> menüpontot a <b>File</b> menüből. LDIF formátumban történik az exportálás.<p>Outlook esetében a <b>File</b> menüből ki kell választani az <b>Import and export...</b> menüpontot. vCard formátumban történik az exportálás.
 in %1 days (%2) is %3's birthday.	addressbook	hu	%3 születésnapja %1 napon belül eljön (%2).
 income	addressbook	hu	Jövedelem
-infolog	addressbook	hu	InfoLog Kapcsolat
-infolog-organisation	addressbook	hu	InfoLog szervezet
+infolog	addressbook	hu	InfoLog
 insufficent rights to delete this list!	addressbook	hu	Nincs megfelelő jogosultsága törölni ezt a listát!
 international	addressbook	hu	Nemzetközi
 label	addressbook	hu	Címke
@@ -229,13 +221,10 @@ list all customfields	addressbook	hu	Összes egyedi mező listázása
 list already exists!	addressbook	hu	A lista már létezik!
 list created	addressbook	hu	Lista létrehozva
 list creation failed, no rights!	addressbook	hu	Lista létrehozása nem sikerült, nincs jogosultsága!
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	hu	Egyéni mezők betöltése az indexbe, még akkor is, ha az egyéni mező oszlop ki van kapcsolva (pl. egy adott index oszlopban való megjelenítésükhöz).
 load vcard	addressbook	hu	vCard betöltése
 location	addressbook	hu	Helyszín
 locations	addressbook	hu	helyek
 mark records as private	addressbook	hu	Bejegyzés megjelölése magánként
-merge duplicates	addressbook	hu	Duplikátumok egyesítése
-merge into first or account, deletes all other!	addressbook	hu	Egyesítés az első vagy fiókba, törli az összes többit!
 merged	addressbook	hu	hozzáfűzve
 message after submitting the form	addressbook	hu	Űrlap kitöltése utáni üzenet
 message phone	addressbook	hu	Üzenet telefon
@@ -246,16 +235,12 @@ mobile	addressbook	hu	Mobiltelefon
 mobile phone	addressbook	hu	Mobiltelefon
 modem phone	addressbook	hu	Modem telefon
 more ...	addressbook	hu	Tovább...
-move to addressbook	addressbook	hu	Címjegyzékbe áthelyezés
 moved	addressbook	hu	átmozgatva
 multiple vcard	addressbook	hu	Több vCard
 name for the distribution list	addressbook	hu	Disztribúciós lista neve
 name, address	addressbook	hu	Név, Cím
 new contact submitted by %1 at %2	addressbook	hu	Új kapcsolat elküldve %1 által ekkor: %2
-no country selected	addressbook	hu	Nincs kiválasztott ország
-no distribution list	addressbook	hu	Nincs elosztási lista
-no vcard	addressbook	hu	Nem vCard
-not shared	addressbook	hu	nem osztott
+no vcard	addressbook	hu	Nem VCard
 number	addressbook	hu	Szám
 number of records to read (%1)	addressbook	hu	Bejegyzések száma olvasáshoz (%1)
 options for type	admin	hu	Típus opciók
@@ -278,7 +263,6 @@ postal	common	hu	Postai
 pref	addressbook	hu	előtag
 preferred phone	addressbook	hu	preferált telefon
 prefix	addressbook	hu	Előtag
-prevent deleting of contacts	admin	hu	Kapcsolattartók törlésének megakadályozása
 public key	addressbook	hu	Nyilvános kulcs
 publish into groups:	addressbook	hu	Megjelenítés a Csoportokban:
 read a list / search for entries.	addressbook	hu	Bejegyzések listája/keresése.
@@ -293,7 +277,6 @@ repetition	addressbook	hu	Ismétlődés
 required fields *	addressbook	hu	kötelező mezők
 role	addressbook	hu	Szerep
 room	addressbook	hu	Szoba
-search letter	addressbook	hu	Keresés betű
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	hu	Válasszon ki egy arcképes fotót. Át lesz méretezve 60 pixel szélességűre.
 select a view	addressbook	hu	Nézet választása
 select addressbook type	addressbook	hu	Válassza ki a Címjegyzék típusát
@@ -306,12 +289,6 @@ select the type of conversion	addressbook	hu	Konverzió típus kiválasztása
 select the type of conversion:	addressbook	hu	Konverzió típus kiválasztása:
 select where you want to store / retrieve contacts	admin	hu	Válassza ki, hol szeretné tárolni, honnan kérdezné le a kapcsolatait
 selected contacts	addressbook	hu	kiválasztott kapcsolatok
-share into addressbook	addressbook	hu	Megosztás a címjegyzékben
-share writable	addressbook	hu	Megosztás írható
-shared	addressbook	hu	megosztott
-shared by me	addressbook	hu	Általam megosztva
-shared into addressbook %1	addressbook	hu	megosztva a címjegyzékben %1
-shared with	addressbook	hu	Megosztva a
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	hu	A fotó és az otthoni cím oszlopok mindig megjelenítésre kerüljenek, még akkor is, ha üresek?
 show	addressbook	hu	Mutat
 show infolog entries for this organisation	addressbook	hu	Jelenítse meg ehhez a szervezethez tartozó InfoLog bejegyzéseket
@@ -340,13 +317,11 @@ today is %1's birthday!	common	hu	Ma van %1 születésnapja!
 tomorrow is %1's birthday.	common	hu	Holnap van %1 születésnapja.
 translation	addressbook	hu	Fordítás
 type	addressbook	hu	Típus
-unshare	addressbook	hu	Többé nem osztja meg
-unshared	addressbook	hu	már nem közös
 update a single entry by passing the fields.	addressbook	hu	Egy egyedüli bejegyzés frissítése a mezök beírásával.
 updated	addressbook	hu	frissítve
 upload or delete the photo	addressbook	hu	Fotó feltöltése vagy törlése
+use an extra category tab?	addressbook	hu	Használjunk egy extra kategória fület?
 use country list	addressbook	hu	Ország lista használata
-user groups are automatically shown as distribution lists.	addressbook	hu	A felhasználói csoportok automatikusan elosztási listaként jelennek meg.
 vcard	common	hu	vCard
 vcards require a first name entry.	addressbook	hu	A vCard igényel egy vezetéknév bejegyzést.
 vcards require a last name entry.	addressbook	hu	A vCard igényel egy keresztnév bejegyzést.
@@ -355,7 +330,6 @@ view linked infolog entries	addressbook	hu	Kapcsolat InfoLog bejegyzések megtek
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	hu	Figyelem!! Az LDAP csak akkor érvényes, ha felhasználói azonosítók tárolására NEM használjuk a kapcsolatokat!
 warning: all contacts found will be deleted!	addressbook	hu	FIGYELMEZTETÉS: Az összes fellelhető kapcsolat törlődni fog!
 weekday	addressbook	hu	Hétköznap
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	hu	Amikor a bejegyzéseket dokumentumokban egyesíti, azok itt kerülnek tárolásra. Ha nem ad meg könyvtárat, akkor az otthoni könyvtárban (/home/...) lesznek tárolva.
 which charset should be used for the csv export. the system default is the charset of this egroupware installation.	addressbook	hu	Milyen karakterkódolást alkalmazzunk CSV exportnál? Az alapértelmezett karakterkódolás az EGroupware rendszer alapértelmezett karakterkódolásával egyezik meg.
 whole query	addressbook	hu	teljes lekérdezés
 work phone	addressbook	hu	Munkahelyi telefon
@@ -366,7 +340,6 @@ yes, for the next two weeks	addressbook	hu	Igen, a következő két hétre
 yes, for the next week	addressbook	hu	Igen, a következő hétre
 yes, for today and tomorrow	addressbook	hu	Igen, mára és holnapra
 yes, only admins can purge deleted items	admin	hu	Igen, csak az adminisztrátorok távolíthatják el a törölt elemeket
-you are not allowed to share into the addressbook of %1	addressbook	hu	Ön nem oszthatja meg a címjegyzékben %1
 you are not permitted to delete contact %1	addressbook	hu	Nem jogosult a %1 kapcsolat törlésére
 you are not permittet to delete this contact	addressbook	hu	Nem jogosult ennek a kapcsolatnak a törlésére
 you are not permittet to edit this contact	addressbook	hu	Nem jogosult ennek a kapcsolatnak a módosítására

addressbook/lang/egw_id.lang

@@ -74,6 +74,7 @@ company name	addressbook	id	nama lembaga
 configuration	common	id	Konfigurasi
 contact	common	id	Kontak
 contact application	admin	id	Aplikasi Kontak
+contact copied	addressbook	id	Kontak disalin
 contact deleted	addressbook	id	Kontak dihapus
 contact id	addressbook	id	ID Kontak
 contact maintenance	admin	id	Pemeliharaan kontak
@@ -116,9 +117,6 @@ domestic	addressbook	id	Domestik
 don't hide empty columns	addressbook	id	Jangan sembunyikan kolom kosong
 download	addressbook	id	Unduh
 download this contact as vcard file	addressbook	id	unduh kontak sebagai vCard
-duplicate threshold	addressbook	id	Ambang batas duplikat
-duplicate warning	addressbook	id	Peringatan duplikat
-duplicates	addressbook	id	Duplikat
 duration	addressbook	id	Durasi
 edit custom fields	admin	id	edit custom fields
 edit phonenumbers -	addressbook	id	Edit Nomor telepon -
@@ -143,8 +141,6 @@ fax number	common	id	Nomor Fax
 field %1 has been added !	addressbook	id	Field %1 telah ditambahkan!
 field %1 has been updated !	addressbook	id	Field %1 telah dikinikan!
 field name	addressbook	id	Nama Field
-fields to check for duplicates	addressbook	id	Bidang untuk memeriksa duplikat
-fields to consider when looking for duplicate contacts.	addressbook	id	Bidang yang perlu dipertimbangkan saat mencari kontak duplikat.
 fields to show in address list	addressbook	id	Field yang ditampilkan dalam daftar alamat
 fieldseparator	addressbook	id	Pemisah field
 freebusy uri	addressbook	id	URI Senggang/sibuk
@@ -157,8 +153,6 @@ grant addressbook access	common	id	Ijinkan Akses BukuAlamat
 group %1	addressbook	id	Kelompok %1
 h	addressbook	id	h
 hide accounts from addressbook	addressbook	id	Sembunyikan akoun dari bukualamat
-hide all accounts	addressbook	id	Sembunyikan semua akun
-hide user groups as distribution lists	addressbook	id	Sembunyikan grup pengguna sebagai daftar distribusi
 hides accounts completly from the adressbook.	addressbook	id	Sembunyikan sama sekali dari buku alamat.
 history logging	admin	id	Catatan riwayat
 home address	addressbook	id	Alamat Rumah
@@ -170,7 +164,6 @@ home phone	addressbook	id	Telepon Rumah
 home state	addressbook	id	Provinsi Rumah
 home street	addressbook	id	Jalan Rumah
 home zip code	addressbook	id	Kodepos Rumah
-how many fields must match for the record to be considered a duplicate.	addressbook	id	Berapa banyak bidang yang harus cocok agar catatan dianggap duplikat.
 icon	addressbook	id	Ikon
 ignore first line	addressbook	id	abaikan baris pertama
 import	addressbook	id	Impor
@@ -183,8 +176,7 @@ import from outlook	addressbook	id	Impor dari Outlook
 import multiple vcard	addressbook	id	Impor beberapa vCard
 import next set	addressbook	id	Impor kelompok berikutnya
 in %1 days (%2) is %3's birthday.	addressbook	id	Tinggal %1 hari (%2) adalah HUT %3.
-infolog	addressbook	id	Kontak InfoLog
-infolog-organisation	addressbook	id	Organisasi InfoLog
+infolog	addressbook	id	InfoLog
 international	addressbook	id	Internasional
 internet	addressbook	id	Internet
 label	addressbook	id	Label
@@ -197,14 +189,11 @@ links	addressbook	id	Tautan
 list all categories	addressbook	id	Daftar semua kategori
 list already exists!	addressbook	id	Daftar telah ada!
 list created	addressbook	id	Daftar dibuat
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	id	Memuat custom field dalam indeks, bahkan jika kolom custom field tidak aktif (misalnya, untuk menampilkannya dalam kolom indeks tertentu)
 load vcard	addressbook	id	Muatkan vCard
 location	addressbook	id	Lokasi
 locations	addressbook	id	lokasi
 manage mapping	addressbook	id	Mengelola pemetaan
 mark records as private	addressbook	id	Tandai rekaman sebagai privat
-merge duplicates	addressbook	id	Gabungkan duplikat
-merge into first or account, deletes all other!	addressbook	id	Gabungkan ke dalam akun pertama atau akun, hapus semua yang lain!
 merged	addressbook	id	digabung
 message after submitting the form	addressbook	id	Pesan setelah mengirimkan formulir
 middle name	addressbook	id	Nama Tengah
@@ -222,7 +211,6 @@ new contact submitted by %1 at %2	addressbook	id	Kontak baru dikirim oleh %1 pad
 next date	addressbook	id	Tanggal selanjutnya
 no categories selected	addressbook	id	Tiada kategori yang dipilih
 no vcard	addressbook	id	Tiada vCard
-not shared	addressbook	id	tidak dibagikan
 number	addressbook	id	Nomor
 number of records to read (%1)	addressbook	id	Jumlah rekord yang dibaca (%1)
 options for type	admin	id	Opsi Tipe
@@ -258,7 +246,6 @@ repetition	addressbook	id	Pengulangan
 required fields *	addressbook	id	Field diperlukan *
 role	addressbook	id	Peran
 room	addressbook	id	Ruang
-search letter	addressbook	id	Surat pencarian
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	id	Select a portrait format jpeg photo. It will be resized to 60 pixel width.
 select a view	addressbook	id	Pilih tampilan
 select addressbook type	addressbook	id	Pilih tipe buku alamat
@@ -267,12 +254,6 @@ select migration type	admin	id	Pilih tipe migrasi
 select multiple contacts for a further action	addressbook	id	Pilih beberapa kontak untuk tindakan selanjutnya
 selected contacts	addressbook	id	Kontak terpilih
 seperator	addressbook	id	Pemisah
-share into addressbook	addressbook	id	Bagikan ke buku alamat
-share writable	addressbook	id	Bagikan dapat diedit
-shared	addressbook	id	bersama
-shared by me	addressbook	id	Dibagikan oleh saya
-shared into addressbook %1	addressbook	id	dibagikan di buku alamat %1
-shared with	addressbook	id	Berbagi dengan
 show	addressbook	id	Tampilkan
 stadt	addressbook	id	Mulai
 start	admin	id	Mulai
@@ -294,21 +275,16 @@ translation	addressbook	id	Terjemahan
 two of: %1	addressbook	id	dua dari: %1
 type	addressbook	id	Tipe
 unique id (uid)	addressbook	id	Unique ID (UID)
-unshare	addressbook	id	Tidak lagi berbagi
-unshared	addressbook	id	tidak lagi dibagikan
 updated	addressbook	id	Dikinikan
 upload or delete the photo	addressbook	id	Unggah atau hapus foto
 use country list	addressbook	id	Gunakan Daftar Negara
-user groups are automatically shown as distribution lists.	addressbook	id	Grup pengguna secara otomatis ditampilkan sebagai daftar distribusi.
 vcard	common	id	vCard
 verification	addressbook	id	Pengujian
 view linked infolog entries	addressbook	id	Lihat entri InfoLog terkait
 weekday	addressbook	id	Hari kerja
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	id	Ketika Anda menggabungkan entri ke dalam dokumen, entri-entri tersebut akan disimpan di sini. Jika tidak ada direktori yang disediakan, mereka akan disimpan di direktori rumah Anda (/home/...)
 whole query	addressbook	id	seluruh query
 work phone	addressbook	id	Telepon Kerja
 wrong - try again ...	addressbook	id	Keliru - coba lagi...
-you are not allowed to share into the addressbook of %1	addressbook	id	Anda tidak diizinkan untuk berbagi ke buku alamat %1
 you can respond by visiting:	addressbook	id	Untuk melihatnya, kunjungi:
 you must select a vcard. (*.vcf)	addressbook	id	Anda musti memilih vCard. (*.vcf)
 you must select at least 1 column to display	addressbook	id	Anda musti memilih sedikitnya 1 kolom untuk menampilkan

addressbook/lang/egw_it.lang

@@ -8,7 +8,6 @@
 %1 public keys added.	addressbook	it	%1 chiavi pubbliche aggiunte
 %1 records imported	addressbook	it	%1 record importati
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	it	%1 record letti (non ancora importati, è possibile tornare %2indietro%3 e deselezionare Test Importazione)
-%1 shared this contact on %2 with %3 %4	addressbook	it	%1 ha condiviso questo contatto su %2 con %3 %4
 %1 starts with '%2'	addressbook	it	%1 inizia con '%2'
 %s please calculate the result	addressbook	it	%s per favore calcolare il risultato
 (e.g. 1969)	addressbook	it	(es. 1969)
@@ -42,7 +41,7 @@ added by synchronisation	addressbook	it	Aggiunto da sincronizzazione
 added to distribution list	addressbook	it	Aggiunto alla lista di distribuzione
 additional information about using ldap as contact repository	admin	it	Informazione aggiuntiva riguardante l'utilizzo di LDAP come archivio contatti
 address book	common	it	Rubrica
-address book - vcard in	addressbook	it	Rubrica - vCard in
+address book - vcard in	addressbook	it	Rubrica - VCard in
 address book - view	addressbook	it	Rubrica - visualizza
 address line 2	addressbook	it	Indirizzo linea 2
 address line 2 (private)	addressbook	it	Indirizzo linea 2 (privato)
@@ -60,7 +59,7 @@ addressbook the contact should be shown	addressbook	it	La rubrica in cui il cont
 addressbook vcard export	addressbook	it	Esportazione vCard
 addressbook vcard import	addressbook	it	Importazione da vCard rubrica
 addressbook-fieldname	addressbook	it	Rubrica - Nome del Campo
-addvcard	addressbook	it	Aggiungi vCard
+addvcard	addressbook	it	Aggiungi Vcard
 advanced search	addressbook	it	Ricerca avanzata
 all addressbooks	addressbook	it	Tutte le rubriche
 all contacts	addressbook	it	Tutti i contatti
@@ -238,7 +237,7 @@ example {{nenvlf role}} - if field role is not empty, set a lf without any value
 existing links	addressbook	it	Collegamenti esistenti
 exists	addressbook	it	Esiste
 export as csv	addressbook	it	Esporta come CSV
-export as vcard	addressbook	it	Esporta come vCard
+export as vcard	addressbook	it	Esporta come VCard
 export contacts	addressbook	it	Esporta Contatti
 export definition to use for nextmatch export	addressbook	it	Definizione di esportazione da utilizzare per l'esportazione "nextmatch" (corrispondenza successiva)
 export definitition to use for nextmatch export	addressbook	it	Esporta la definizione da utilizzare per la esportazione
@@ -307,11 +306,11 @@ import contacts	addressbook	it	Importa Contatti
 import csv-file into addressbook	addressbook	it	Importa file CSV nella Rubrica
 import file	addressbook	it	Importa File
 import from	addressbook	it	Importa da
-import from ldif, csv, or vcard	addressbook	it	Importa da LDIF, CSV, or vCard
+import from ldif, csv, or vcard	addressbook	it	Importa da LDIF, CSV, or VCard
 import from outlook	addressbook	it	Importa da Outlook
-import multiple vcard	addressbook	it	Importa Molteplici vCard
+import multiple vcard	addressbook	it	Importa Molteplici VCard
 import next set	addressbook	it	Import il prossimo set
-import_instructions	addressbook	it	In Netscape, apri la rubrica e seleziona <b>Esporta</b> dal menu <b>File</b>.  Il file verrà esportato in formato LDIF.<p>O, in Outlook, seleziona la cartella Contatti , seleziona <b>Importa ed esporta...</b> dal menu <b>File</b> ed esporta i contatti nel formato testo separato da virgola (CSV).  <p>O, in Palm Desktop 4.0 o superiore, apri l'agenda e seleziona <b>Esporta</b> dal menu <b>File</b>.  Il file verrà esportato in formato vCard.
+import_instructions	addressbook	it	In Netscape, apri la rubrica e seleziona <b>Esporta</b> dal menu <b>File</b>.  Il file verrà esportato in formato LDIF.<p>O, in Outlook, seleziona la cartella Contatti , seleziona <b>Importa ed esporta...</b> dal menu <b>File</b> ed esporta i contatti nel formato testo separato da virgola (CSV).  <p>O, in Palm Desktop 4.0 o superiore, apri l'agenda e seleziona <b>Esporta</b> dal menu <b>File</b>.  Il file verrà esportato in formato VCard.
 importer's personal	addressbook	it	Personale dell'account importatore
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	it	Importa i contatti da file CSV. CSV sta per 'Comma Separated Values' ovvero valori separati da virgola. Nelle opzioni sarà possibile selezionare anche altri separatori.
 imports contacts into your addressbook from a vcard file.	addressbook	it	Importa contatti nella tua rubrica da un file vCard.
@@ -344,7 +343,7 @@ list created	addressbook	it	Lista creata
 list creation failed, no rights!	addressbook	it	La creazione della lista è fallita, non ci sono i permessi sufficienti
 list of files linked to the current record	addressbook	it	Elenco dei file collegati al record attuale
 load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	it	Carica i campi personalizzati nell'indice, anche quando la colonna del campo è disabilitata (p.es. per mostrarli in una specifica colonna indice)
-load vcard	addressbook	it	Carica vCard
+load vcard	addressbook	it	Carica VCard
 location	addressbook	it	Località
 locations	addressbook	it	Località
 mail vcard	addressbook	it	Invia email vCard
@@ -367,7 +366,7 @@ modem phone	addressbook	it	Telefono modem
 more ...	addressbook	it	Altro ...
 move to addressbook	addressbook	it	Sposta alla rubrica
 moved	addressbook	it	spostato
-multiple vcard	addressbook	it	Molteplici vCard
+multiple vcard	addressbook	it	Molteplici VCard
 name for the distribution list	addressbook	it	Nome della lista di distribuzione
 name of current user, all other contact fields are valid too	addressbook	it	Nome dell'utente corrente, tutti gli altri campi di contatto sono validi pure.
 name, address	addressbook	it	Nome, Indirizzo
@@ -375,11 +374,9 @@ new contact submitted by %1 at %2	addressbook	it	Nuovo contatto inviato da %1 al
 new window opened to edit infolog for your selection	addressbook	it	Nuova finestra aperta per modificare la scheda di Attività
 next date	addressbook	it	Prossima data
 no categories selected	addressbook	it	Nessuna categoria selezionata
-no country selected	addressbook	it	Nessun paese selezionato
 no distribution list	addressbook	it	Nessuna lista di distribuzione
 no fallback	addressbook	it	Nessun fallback
-no vcard	addressbook	it	Nessuna vCard
-not shared	addressbook	it	non condiviso
+no vcard	addressbook	it	Nessuna VCard
 number	addressbook	it	Numero
 number of records to read (%1)	addressbook	it	Numero di record da leggere (%1)
 open %1 crm view	addressbook	it	Apri %1 in vista CRM
@@ -456,12 +453,6 @@ send succeeded to %1	common	it	Inviato con successo a %1
 seperator	addressbook	it	Separatore
 set full name and file as field in contacts of all users (either all or only empty values)	admin	it	Imposta i campi nome completo e "salva come" nei contatti di tutti gli utenti. Tutti o solo quelli vuoti.
 set only full name	addressbook	it	Imposta solo nome completo
-share into addressbook	addressbook	it	Condivisione in rubrica
-share writable	addressbook	it	Condivisione scrivibile
-shared	addressbook	it	condiviso
-shared by me	addressbook	it	Condiviso da me
-shared into addressbook %1	addressbook	it	condiviso nella rubrica %1
-shared with	addressbook	it	Condiviso con
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	it	Mostrare foto e indirizzo abitazione sempre, anche se le colonne sono vuote
 show	addressbook	it	Mostra
 show active accounts	addressbook	it	Mostra account attivi
@@ -514,8 +505,6 @@ unable to import into %1, using %2	addressbook	it	Impossibile importare %1, usan
 unique id (uid)	addressbook	it	ID univoco (UID)
 unique id<br />(to update existing records)	addressbook	it	ID univoco<br /> per l'aggiornamento di voci esistenti
 unknown type %1, imported as %2	addressbook	it	Tipo %1 sconosciuto, importato come %2
-unshare	addressbook	it	Non condividere
-unshared	addressbook	it	non condiviso
 update a single entry by passing the fields.	addressbook	it	Aggiorna una singola voce passando i campi.
 update fields by edited organisations?	admin	it	Campi di organizzazioni modificate da aggiornare
 updated	addressbook	it	Aggiornato
@@ -532,9 +521,9 @@ use this tag for addresslabels. put the content, you want to repeat, between two
 used for links and for the own sorting of the list	addressbook	it	usato per collegamenti e per il proprio ordinamento della lista
 user groups are automatically shown as distribution lists.	addressbook	it	I gruppi di utenti sono automaticamente mostrati come liste di distribuzione
 user preference	addressbook	it	Preferenza utente
-vcard	common	it	vCard
-vcards require a first name entry.	addressbook	it	Le vCard richiedono un valore per il nome.
-vcards require a last name entry.	addressbook	it	Le vCards richiedono un valore per il cognome
+vcard	common	it	VCard
+vcards require a first name entry.	addressbook	it	Le VCard richiedono un valore per il nome.
+vcards require a last name entry.	addressbook	it	Le Vcards richiedono un valore per il cognome
 verification	addressbook	it	Verifica
 view linked infolog entries	addressbook	it	Visualizzare le schede Attività collegate
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	it	ATTENZIONE!! LDAP è utilizzabile solo se NON stai usando i contatti per la memorizzazione dei dati sugli account!
@@ -542,7 +531,6 @@ warning: all contacts found will be deleted!	addressbook	it	ATTENZIONE: Tutti i
 weekday	addressbook	it	Giorno della settimana
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	it	Collegamenti della rubrica, visibili nelle altre applicazioni. I valori vuoti resteranno fuori. Bisognera uscire e accedere di nuovo a EPL se si cambia questa impostazione
 when viewing a contact, show linked entries from the selected application	addressbook	it	Quando si visualizza un contatto, mostra le voci collegate dalla applicazione selezionata
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	it	Quando si uniscono le voci nei documenti, vengono memorizzate qui. Se non viene fornita alcuna directory, verranno memorizzate nella propria directory home (/home/...).
 where to add the email address	addressbook	it	Dove aggiungere l'indirizzo email
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	it	Seleziona il formato di indirizzo da usare per Paesi con formati sconosciuti
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	it	La rubrica da usare per l'aggiunta di contatti, quando non si hanno i permessi per la rubrica corrente
@@ -561,14 +549,13 @@ yes, for the next week	addressbook	it	Sì, per la prossima settimana
 yes, for today and tomorrow	addressbook	it	Sì, per oggi e domani
 yes, only admins can purge deleted items	admin	it	Sì, solo gli amministratori possono cancellare definitivamente gli elementi
 yes, users can purge their deleted items	admin	it	Sì, gli utenti possono rimuovere definitivamente gli elementi eliminati.
-you are not allowed to share into the addressbook of %1	addressbook	it	Non sei autorizzato a condividere nella rubrica di %1
 you are not permitted to delete contact %1	addressbook	it	Non hai il permesso di cancellare il contatto %1
 you are not permittet to delete this contact	addressbook	it	Non hai il permesso di cancellare questo contatto
 you are not permittet to edit this contact	addressbook	it	Non hai il permesso di modificare questo contatto
 you are not permittet to view this contact	addressbook	it	Non hai il permesso di visualizzare questo contatto
 you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	it	LDAP può essere usato come repository di contatto solo se gli account sono memorizzati anche in LDAP!
 you can respond by visiting:	addressbook	it	Puoi rispondere visitando:
-you must select a vcard. (*.vcf)	addressbook	it	Devi selezionare una vCard (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	it	Devi selezionare una vcard (*.vcf)
 you must select at least 1 column to display	addressbook	it	Devi selezionare almeno una colonna da visualizzare
 you need to select a distribution list	addressbook	it	Seleziona lista di distribuzione
 you need to select some contacts first	addressbook	it	Devi prima selezionare qualche contatto

addressbook/lang/egw_ja.lang

@@ -8,13 +8,13 @@
 %1 public keys added.	addressbook	ja	%1 公開キーを追加しました。
 %1 records imported	addressbook	ja	%1 件インポートしました
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	ja	%1 個のレコードを読み込みましたが、まだインポートされていません。画面を戻って予行演習モードを解除してください。
-%1 shared this contact on %2 with %3 %4	addressbook	ja	1 はこのコンタクトを %2 で %3 %4 と共有しました。
 %1 starts with '%2'	addressbook	ja	%1 を %2 で開始
 %s please calculate the result	addressbook	ja	%s 結果を計算してください
 (e.g. 1969)	addressbook	ja	(例 1969)
 (empty = use global limit, no = no export at all)	admin	ja	空 = グローバル・リミットを使用, no = エクスポートしない
-<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	ja	<b>変換タイプ <none> が見つかりません。</b>  一覧から変換タイプを選択してください。
+<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	ja	<b>変換タイプ &lt;none&gt; が見つかりません。</b>  一覧から変換タイプを選択してください。
 @-eval() is only availible to admins!!!	addressbook	ja	@-eval() は管理者専用です!
+access by	addressbook	ja	アクセスするユーザ/グループ
 account id	addressbook	ja	アカウント ID
 account repository	admin	ja	アカウント・リポジトリ
 accounts	addressbook	ja	アカウント
@@ -122,6 +122,7 @@ company	common	ja	会社
 company name	addressbook	ja	会社名
 configuration	common	ja	環境設定
 contact	common	ja	連絡先
+contact	addressbook	ja	連絡先
 contact application	admin	ja	コンタクト・アプリケーション
 contact data	addressbook	ja	コンタクト・データ
 contact deleted	addressbook	ja	コンタクトを削除しました。
@@ -162,6 +163,7 @@ custom	addressbook	ja	カスタム
 custom etemplate for the contactform	addressbook	ja	eTemplate をコンタクト・フォーム用にカスタマイズ
 custom fields	addressbook	ja	カスタム項目
 data exchange settings	addressbook	ja	データ交換設定
+data from	addressbook	ja	データの取得元
 debug output in browser	addressbook	ja	ブラウザにデバッグ情報を出力
 default	addressbook	ja	既定値
 default action on double-click	addressbook	ja	ダブル・クリック時の既定のアクション
@@ -224,10 +226,11 @@ enter the path to the exported file here	addressbook	ja	エクスポート・フ
 error deleting the contact !!!	addressbook	ja	エラー: コンタクトの削除失敗!
 error saving the contact !!!	addressbook	ja	エラー: コンタクトの保存失敗!
 error: the entry has been updated since you opened it for editing!	addressbook	ja	エラー: この項目は、既に他画面で編集中です!
-example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	addressbook	ja	例 {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - 項目 "n_prefix" を "Mr" で検索し, もし見つかれば「Hello Mr.」と出力し、見つからなければ「Hello Ms.」と出力。
-example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller	preferences	ja	例 {{LETTERPREFIXCUSTOM n_prefix title n_family}} - 例: Mr Dr. James Miller
-example {{nelf role}} - if field role is not empty, you will get a new line with the value of field role	addressbook	ja	例 {{NELF role}} - 項目のロールが空でない場合、項目ロールの値と改行を出力。
-example {{nenvlf role}} - if field role is not empty, set a lf without any value of the field	addressbook	ja	例 {{nenvlf role}} - 項目のロールが空でない場合、項目の値でなく改行を出力。
+Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.	addressbook	ja	例 {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - 項目 "n_prefix" を "Mr" で検索し, もし見つかれば「Hello Mr.」と出力し、見つからなければ「Hello Ms.」と出力。
+Example {{LETTERPREFIX}} - Gives a letter prefix without double spaces, if the title is empty for example	addressbook	ja	例 {{LETTERPREFIX}} - ダブル・スペースを挟まずに接頭字を出力(タイトルが空の場合など）。
+Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller	addressbook	ja	例 {{LETTERPREFIXCUSTOM n_prefix title n_family}} - 例: Mr Dr. James Miller
+Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role	addressbook	ja	例 {{NELF role}} - 項目のロールが空でない場合、項目ロールの値と改行を出力。
+Example {{NENVLF role}} - if field role is not empty, set a LF without any value of the field	addressbook	ja	例 {{nenvlf role}} - 項目のロールが空でない場合、項目の値でなく改行を出力。
 existing links	addressbook	ja	定義済みリンク
 exists	addressbook	ja	定義済み
 export as csv	addressbook	ja	CSV としてエクスポート
@@ -276,7 +279,6 @@ group %1	addressbook	ja	グループ %1
 h	addressbook	ja	時間
 hide accounts from addressbook	addressbook	ja	ユーザ・アカウントを隠す
 hide all accounts	addressbook	ja	全アカウントを隠す
-hide user groups as distribution lists	addressbook	ja	配布リストとしてのユーザーグループを非表示にする
 hides accounts completly from the adressbook.	addressbook	ja	アドレス帳でユーザ・アカウントを隠します。
 history logging	admin	ja	履歴を記録
 home address	addressbook	ja	住所（自宅）
@@ -294,6 +296,9 @@ how many fields must match for the record to be considered a duplicate.	addressb
 html link to the current record	addressbook	ja	このレコードに対する HTML リンク
 icon	addressbook	ja	アイコン
 if accounts are already in ldap	admin	ja	アカウントが LDAP に既に存在する場合
+If you specify a directory, full vfs path, %1 displays an action for each document. That action allows to download the specified document with the data inserted.	addressbook	ja	ディレクトリ（VFS フルパス）を指定すると、%1上で各ドキュメントに対するアクションが表示され、ドキュメントをダウンロードすることができるようになります。
+If you specify a document, full vfs path, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.	addressbook	ja	ドキュメント（VFS フルパス）を指定すると、%1の各項目ごとに拡張ドキュメント・アイコンが表示され、ドキュメントをダウンロードすることができるようになります。
+if you specify an export definition, it will be used when you export	addressbook	ja	エクスポート時に使用する設定を指定します。
 ignore first line	addressbook	ja	先頭行を無視
 import	addressbook	ja	インポート
 import contacts	addressbook	ja	インポート
@@ -310,8 +315,7 @@ imports contacts into your addressbook from a csv file. csv means 'comma separat
 imports contacts into your addressbook from a vcard file.	addressbook	ja	vCard ファイルからアドレス帳にコンタクトをインポート。
 in %1 days (%2) is %3's birthday.	addressbook	ja	%1 日後（%2）は %3 さんの誕生日です。
 income	addressbook	ja	収入
-infolog	addressbook	ja	InfoLogお問い合わせ先
-infolog-organisation	addressbook	ja	InfoLogの組織
+infolog	addressbook	ja	インフォログ
 insert	addressbook	ja	挿入
 insufficent rights to delete this list!	addressbook	ja	このリストを削除する権限が不足しています!
 insufficent rights to edit this list!	addressbook	ja	このリストを編集する権限が不足しています!
@@ -336,7 +340,6 @@ list already exists!	addressbook	ja	リストは既に存在します!
 list created	addressbook	ja	リストを作成しました。
 list creation failed, no rights!	addressbook	ja	リストの作成失敗(権限不足)!
 list of files linked to the current record	addressbook	ja	このレコードにリンクするファイルの一覧
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	ja	カスタムフィールド列がオフの場合でも、インデックスにカスタムフィールドをロードします（例：特定のインデックス列に表示する場合）。
 load vcard	addressbook	ja	vCard をロード
 location	addressbook	ja	地域
 locations	addressbook	ja	地域
@@ -368,11 +371,9 @@ new contact submitted by %1 at %2	addressbook	ja	新規コンタクトは %1 に
 new window opened to edit infolog for your selection	addressbook	ja	インフォログ編集ウィンドウを新規に開きました。
 next date	addressbook	ja	次の日付
 no categories selected	addressbook	ja	カテゴリ未選択
-no country selected	addressbook	ja	国が選択されていません
 no distribution list	addressbook	ja	配信リスト無し
 no fallback	addressbook	ja	既定値無し
 no vcard	addressbook	ja	vCard 無し
-not shared	addressbook	ja	ノーシェア
 number	addressbook	ja	番号
 number of records to read (%1)	addressbook	ja	読み込むレコード数（%1）
 open %1 crm view	addressbook	ja	%1 CRM 表示を開く
@@ -387,6 +388,7 @@ organisations by departments	addressbook	ja	部署別 組織・団体
 organisations by location	addressbook	ja	地域別 組織・団体
 other number	addressbook	ja	その他番号
 other phone	addressbook	ja	その他電話番号
+Other Phone	addressbook	ja	その他電話番号
 own sorting	addressbook	ja	独自並べ変え
 pager	common	ja	ページャー
 parcel	addressbook	ja	区画
@@ -425,6 +427,7 @@ rename selected distribution list	addressbook	ja	配信リストの名前を変
 repetition	addressbook	ja	繰返し
 replacements for inserting contacts into documents	addressbook	ja	ドキュメントにコンタクトを埋め込む際の置換値
 required fields *	addressbook	ja	必須項目 *
+rights	addressbook	ja	権限
 role	addressbook	ja	職業
 room	addressbook	ja	部屋番号
 search letter	addressbook	ja	文字検索
@@ -447,12 +450,6 @@ send succeeded to %1	common	ja	%1 への送信成功
 seperator	addressbook	ja	区切り文字
 set full name and file as field in contacts of all users (either all or only empty values)	admin	ja	ユーザの氏名、およびファイル名を設定してください。
 set only full name	addressbook	ja	氏名（フルネーム）でのみ指定
-share into addressbook	addressbook	ja	アドレス帳への共有
-share writable	addressbook	ja	共有編集可能
-shared	addressbook	ja	シェアード
-shared by me	addressbook	ja	共有
-shared into addressbook %1	addressbook	ja	アドレス帳で共有されている %1
-shared with	addressbook	ja	と共有する。
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	ja	カラムが空でも写真と自宅住所を表示しますか？
 show	addressbook	ja	表示
 show active accounts	addressbook	ja	アクティブ・アカウントを表示
@@ -482,6 +479,7 @@ that field name has been used already !	addressbook	ja	項目名は既に存在
 the anonymous user has probably no add rights for this addressbook.	addressbook	ja	追加権限がありません。
 the anonymous user needs add rights for it!	addressbook	ja	追加権限が必要です!
 the anonymous user needs read it!	addressbook	ja	読み取り権限が必要です!
+The document can contain placeholder like {{%1}}, to be replaced with the data.	addressbook	ja	ドキュメントにはプレース・ホルダー（例: {{%1}}）を埋め込むことがで
 the following document-types are supported:	addressbook	ja	下記のドキュメント・タイプがサポートされます:
 the zip extension is needed, to insert contact data in openoffice or msoffice documents.	addressbook	ja	コンタクト・データをオフィス（OpenOffice / マイクロソフト・オフィス）に挿入するためには拡張子が ZIP である必要があります。
 there was an error saving your data :-(	addressbook	ja	エラー: データ保存失敗!
@@ -505,8 +503,6 @@ unable to import into %1, using %2	addressbook	ja	%2 による %1 へのイン
 unique id (uid)	addressbook	ja	固有 ID (UID)
 unique id<br />(to update existing records)	addressbook	ja	固有 ID<br />既存レコードの更新用
 unknown type %1, imported as %2	addressbook	ja	未知のタイプ %1 を %2 としてインポートしました。
-unshare	addressbook	ja	シェア終了
-unshared	addressbook	ja	きょうゆうしなくなった
 update a single entry by passing the fields.	addressbook	ja	項目を送信してデータを更新。
 update fields by edited organisations?	admin	ja	編集済み組織・団体の項目を更新しますか？
 updated	addressbook	ja	更新済み
@@ -521,7 +517,6 @@ use country list	addressbook	ja	国選択リストを使う
 use setup for a full account-migration	admin	ja	アカウント移行時に設定を使う
 use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	ja	アドレスラベル向けタグ。任意のコンテンツをこのタグで囲んで使用します。
 used for links and for the own sorting of the list	addressbook	ja	リンク、およびリストの独自並べ変えで使用。
-user groups are automatically shown as distribution lists.	addressbook	ja	ユーザーグループは自動的に配布リストとして表示されます。
 user preference	addressbook	ja	個人設定
 vcard	common	ja	vCard
 vcards require a first name entry.	addressbook	ja	vCard には、名前（氏名の名）が必要です。
@@ -533,7 +528,6 @@ warning: all contacts found will be deleted!	addressbook	ja	警告: 見つかっ
 weekday	addressbook	ja	曜日
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	ja	アドレス帳のリンクを他のアプリケーションで表示するか否かを指定します。この設定を変更した場合は、再ログイン後に変更が反映されます。
 when viewing a contact, show linked entries from the selected application	addressbook	ja	コンタクト表示時に、指定されたアプリケーションのリンク項目を表示する
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	ja	エントリーを文書に統合すると、ここに保存されます。ディレクトリが指定されていない場合は、ホームディレクトリ(/home/...)に格納されます。
 where to add the email address	addressbook	ja	メール・アドレスの追加先
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	ja	既定の住所書式が未定義である国のデータで使用する住所書式。
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	ja	現在のアドレス帳に対して書き込み権限が無い場合にコンタクトを保存するアドレス帳。
@@ -552,7 +546,6 @@ yes, for the next week	addressbook	ja	はい（翌1週間）
 yes, for today and tomorrow	addressbook	ja	はい（今日と明日）
 yes, only admins can purge deleted items	admin	ja	はい（管理者だけが削除済みデータをパージ可能）
 yes, users can purge their deleted items	admin	ja	はい（ユーザ自身が削除済みデータをパージ可能）
-you are not allowed to share into the addressbook of %1	addressbook	ja	アドレス帳 %1 への共有が許可されていません。
 you are not permitted to delete contact %1	addressbook	ja	コンタクト %1 を削除する権限がありません
 you are not permittet to delete this contact	addressbook	ja	このコンタクトを削除する権限がありません
 you are not permittet to edit this contact	addressbook	ja	このコンタクトを編集する権限がありません

addressbook/lang/egw_km.lang

@@ -1,584 +0,0 @@
-%1 added	addressbook	km	%1 បានបន្ថែម
-%1 contact(s) %2	addressbook	km	%1 អ្នកទំនាក់ទំនង %2
-%1 contact(s) %2, %3 failed because of %4 !!!	addressbook	km	%1 contact(s) %2, %3 បានបរាជ័យដោយសារតែ %4 !!!
-%1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	km	%1 contact(s) %2, %3 បានបរាជ័យដោយសារតែសិទ្ធិមិនគ្រប់គ្រាន់!
-%1 contacts updated (%2 errors).	addressbook	km	ទំនាក់ទំនង %1 បានធ្វើបច្ចុប្បន្នភាព (%2 កំហុស) ។
-%1 fields in %2 other organisation member(s) changed	addressbook	km	វាល %1 ក្នុង %2 សមាជិកស្ថាប័នផ្សេងទៀតបានផ្លាស់ប្តូរ។
-%1 key(s) added to public keyserver "%2".	addressbook	km	%1 key(s) បានបន្ថែមទៅម៉ាស៊ីនបម្រើសោសាធារណៈ "%2"។
-%1 not implemented for %2!	addressbook	km	%1 មិនត្រូវបានអនុវត្តសម្រាប់ %2!
-%1 public keys added.	addressbook	km	%1 នៃកូនសោសាធារណៈបានបន្ថែម។
-%1 records imported	addressbook	km	%1 កំណត់ត្រាបាននាំចូល។
-%1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	km	%1 នៃកំណត់ត្រាបានអាន។ មិន​ទាន់​បាន​នាំ​ចូល​ទេ អ្នក​អាច​ចូល​ទៅ %2back%3 ហើយ​បិទ​ ការ​នាំចូល​សាកល្បង។
-%1 shared this contact on %2 with %3 %4	addressbook	km	%1 បានចែករំលែកអ្នកទំនាក់ទំនងនេះជាមួយ %2 និង %3 %4
-%1 starts with '%2'	addressbook	km	%1 ចាប់ផ្តើមជាមួយ '%2'
-%s please calculate the result	addressbook	km	%s សូមធ្វើការគណនាលទ្ធផល
-(e.g. 1969)	addressbook	km	(ឧទាហរណ៍ 1969)
-(empty = use global limit, no = no export at all)	admin	km	Empty = ប្រើដែនកំណត់សកល, no = មិនធ្វើការនាំចូលទាំងអស់
-<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	km	<b>គ្មានការបម្លែងប្រភេទ <none> អាចធ្វើការផ្លាស់ប្តូរទីតាំង </b> ជ្រើសរើសប្រភេទនៃការបម្លែងពីក្នុងបញ្ជឺ
-@-eval() is only availible to admins!!!	addressbook	km	@-eval() អាចធ្វើការរកបានដោយអ្នកគ្រប់គ្រងតែប៉ុណ្ណោះ!
-account id	addressbook	km	លេខសម្គាល់គណនី
-account repository	admin	km	ឃ្លាំងគណនី
-accounts	addressbook	km	គណនី
-actions	addressbook	km	សកម្មភាព
-add %1	addressbook	km	បន្ថែម 1%
-add a contact to this organisation	addressbook	km	បន្ថែមអ្នកទំនាក់ទំនងម្នាក់ចូលក្នុងស្ថាប៏ននេះ
-add a customfield to link title	addressbook	km	បន្ថែមវាលពិសេសចូលតំណចំណងជើង
-add a new contact	addressbook	km	បន្ថែមអ្នកទំនាក់ទំនងថ្មីម្នាក់
-add a new infolog	addressbook	km	បន្ថែមកំណត់ហេតុទិន្នន័យថ្មីមួយ
-add a new list	addressbook	km	បន្ថែមបញ្ជីថ្មីមួយ
-add a single entry by passing the fields.	addressbook	km	បន្ថែមធាតុតែមួយដោយឆ្លងកាត់វាល
-add appointment	addressbook	km	បន្ថែមការណាត់ជួប
-add business email of whole distribution list?	addressbook	km	បន្ថែមអុីមែលអាជិវកម្មទាំងអស់នៃបញ្ជីចែកចាយ?
-add custom field	addressbook	km	បន្ថែមវាលផ្ទាល់ខ្លួន
-add customfield to links of addressbook, which displays in other applications. the default value is none customfield.	addressbook	km	បន្ថែមវាលផ្ទាល់ខ្លួនទៅកាន់តំណនៃសៀវភៅអាសយដ្ឋានដែលបង្ហាញនៅក្នុងកម្មវិធីផ្សេង។ តម្លៃនៃលំនាំដើមគ្មានវាលផ្ទាល់ខ្លួននោះទេ។
-add emails of whole distribution list?	addressbook	km	បន្ថែមអុីមែលទាំងអស់នៃបញ្ជីចែកចាយ?
-add or delete categories	addressbook	km	បន្ថែម ឬលុបកាតាឡុក
-add to bcc	addressbook	km	បន្ថែមទៅ BCc
-add to cc	addressbook	km	បន្ថែមទៅ Cc
-add to distribution list	addressbook	km	បន្ថែមទៅបញ្ជីចែកចាយ
-add to distribution list:	addressbook	km	បន្ថែមទៅបញ្ជីចែកចាយ:
-add to to	addressbook	km	បន្ថែមទៅ
-added	addressbook	km	បានបន្ថែម
-added by synchronisation	addressbook	km	បានបន្ថែមដោយសមកាលកម្ម
-added to distribution list	addressbook	km	បានបន្ថែមទៅបញ្ជីចែកចាយ
-additional information about using ldap as contact repository	admin	km	ព័ត៌មានបន្ថែមអំពីការប្រើ LDAP ជាឃ្លាំងទំនាក់ទំនង
-address book	common	km	សៀវភៅអាសយដ្ឋាន
-address book - vcard in	addressbook	km	សៀវភៅអាសយដ្ឋាន - vCard ចូល
-address book - view	addressbook	km	សៀវភៅអាសយដ្ឋាន - ទិដ្ឋភាព
-address line 2	addressbook	km	ខ្សែអាសយដ្ឋាន ២
-address line 2 (private)	addressbook	km	ខ្សែអាសយដ្ឋាន ២(ឯកជន)
-address type	addressbook	km	ប្រភេទអាសយដ្ឋាន
-addressbook	common	km	សៀវភៅអាសយដ្ឋាន
-addressbook csv export	addressbook	km	សៀវភៅអាសយដ្ឋាន CSV នាំចេញ
-addressbook csv import	addressbook	km	សៀវភៅអាសយដ្ឋាន CSV នាំចូល
-addressbook field	addressbook	km	វាលនៃសៀវភៅអាសយដ្ឋាន
-addressbook list	addressbook	km	បញ្ជីនៃសៀវភៅអាសយដ្ឋាន
-addressbook menu	addressbook	km	មុឺនុយនៃសៀវភៅអាសយដ្ឋាន
-addressbook of	addressbook	km	សៀវភៅអាសយដ្ឋាននៃ
-addressbook preferences	addressbook	km	ការកំណត់នៃសៀវភៅអាសយដ្ឋាន
-addressbook the contact should be saved to	addressbook	km	សៀវភៅអាសយដ្ឋាននៃការទំនាក់ទំនងគួរតែត្រូវបានរក្សាទុក
-addressbook the contact should be shown	addressbook	km	សៀវភៅអាសយដ្ឋាននៃការទំនាក់ទំនងគួរតែត្រូវបានបង្ហាញ
-addressbook vcard export	addressbook	km	សៀវភៅអាសយដ្ឋាន vCard នាំចេញ
-addressbook vcard import	addressbook	km	សៀវភៅអាសយដ្ឋាន vCard នាំចូល
-addressbook-fieldname	addressbook	km	សៀវភៅអាសយដ្ឋានវាលបញ្ចូលឈ្មោះ
-addvcard	addressbook	km	បន្ថែម vCard
-advanced search	addressbook	km	ការស្វែងរកកម្រិតខ្ពស់
-all addressbooks	addressbook	km	សៀវភៅអាសយដ្ឋានទាំងអស់
-all contacts	addressbook	km	អ្នកទំនាក់ទំនងទាំងអស់
-all in one field	addressbook	km	ក្នុងវាលតែមួយទាំងអស់
-all types	addressbook	km	គ្រប់ប្រភេទ
-allow	addressbook	km	អនុញ្ញាត
-allow for contacts only	addressbook	km	អនុញ្ញាតសម្រាប់អ្នកទំនាក់ទំនងតែប៉ុណ្ណោះ
-allow members of following groups to edit contact-data of accounts	addressbook	km	អនុញ្ញាតអោយសមាជិកនៃក្រុមនេះអាចកែទិន្នន័យអ្នកទំនាក់ទំនងរបស់គណនីណាមួយ
-allow users to maintain their own account-data	admin	km	អនុញ្ញាតឲ្យអ្នកប្រើប្រាស់ថែទាំទិន្នន័យរបស់ខ្លួន
-alt. csv import	addressbook	km	Alt. CSV នាំចូល
-always	addressbook	km	តែងតែ
-apply changes to all members, whose fields have the same previous content	addressbook	km	អនុវត្តការផ្លាស់ប្តូរទៅគ្រប់សមាជិកទាំងអស់ដែលមានវាលដូចមាតិកាមុន។
-apply the action on the whole query, not only the shown contacts!!!	addressbook	km	អនុវត្តការផ្លាស់ប្តូរទៅគ្រប់សំណួរ មិនគ្រាន់តែអ្នកទំនាក់ទំនងដែលបានបង្ហាញនេះទេ!
-are you shure you want to delete this contact?	addressbook	km	តើអ្នកប្រាកដថាចង់លុបទំនាក់ទំនងនេះទេ?
-are you sure you want to delete this field?	addressbook	km	តើអ្នកប្រាកដថាចង់លុបវាលនេះទេ?
-assistent	addressbook	km	ជំនួយការ
-assistent phone	addressbook	km	ជំនួយការទូរស័ព្ទ
-birthday	common	km	ថ្ងៃកំណើត
-birthdays	common	km	ថ្ងៃកំណើត
-blank	addressbook	km	ទទេ
-browser location	addressbook	km	ទីតាំងកម្មវិធីរុករក
-business	common	km	អាជីវកម្ម
-business address	addressbook	km	អាស័យដ្ឋានអាជីវកម្ម
-business address line 2	addressbook	km	បន្ទាត់អាសយដ្ឋានអាជីវកម្ម 2
-business city	addressbook	km	ទីក្រុងពាណិជ្ជកម្ម
-business country	addressbook	km	ប្រទេសអាជីវកម្ម
-business country code	addressbook	km	លេខកូដប្រទេសអាជីវកម្ម
-business email	addressbook	km	អុីមែលអាជីវកម្ម
-business fax	addressbook	km	ទូរសារអាជីវកម្ម
-business phone	addressbook	km	ទូរស័ព្ទអាជីវកម្ម
-business state	addressbook	km	ស្ថានភាពអាជីវកម្ម
-business street	addressbook	km	ផ្លូវអាជីវកម្ម
-business zip code	addressbook	km	លេខកូដប្រៃសណីយ៍អាជីវកម្ម
-calendar fields:	addressbook	km	វាល​ប្រតិទិន៖
-calendar integration	addressbook	km	ការរួមបញ្ចូលប្រតិទិន
-calendar uri	addressbook	km	URI ប្រតិទិន
-can be changed via setup >> configuration	admin	km	អាចផ្លាស់ប្តូរបានតាមរយៈ Setup >> Configuration
-can't create dn %1	addressbook	km	មិនអាចបង្កើត dn %1 បានទេ។
-car phone	addressbook	km	ទូរស័ព្ទឡាន
-categorie	addressbook	km	កាតាឡុក
-categorie added	addressbook	km	បានបន្ថែមកាតាឡុក។
-categorie delete	addressbook	km	កាតាឡុកត្រូវបានលុប។
-categories, notes, ...	addressbook	km	កាតាឡុក, កំណត់ចំណាំ, ...
-category path	addressbook	km	ផ្លូវកាតាឡុក
-category tree	admin	km	កាតាឡុកដើមឈើ
-cell phone	addressbook	km	ទូរស័ព្ទចល័ត
-change addressbook when updating	addressbook	km	ផ្លាស់ប្តូរសៀវភៅអាសយដ្ឋាននៅពេលធ្វើបច្ចុប្បន្នភាព
-change all organisation members	addressbook	km	ផ្លាស់ប្តូរសមាជិកអង្គការទាំងអស់។
-charset for the csv export	addressbook	km	សំណុំតួអក្សរសម្រាប់ការនាំចេញ CSV
-charset for the vcard export	addressbook	km	សំណុំតួអក្សរសម្រាប់ការនាំចេញ vCard
-charset for the vcard import and export	addressbook	km	សំណុំតួអក្សរសម្រាប់ការនាំចូល និងនាំចេញ vCard
-charset of file	addressbook	km	សំណុំនៃឯកសារ
-check all	addressbook	km	ពិនិត្យ​ទាំងអស់
-choose an icon for this contact type	admin	km	ជ្រើសរើសរូបតំណាងសម្រាប់ប្រភេទទំនាក់ទំនងនេះ។
-choose charset	addressbook	km	ជ្រើសរើសសំណុំតួអក្សរ
-choose owner of imported data	addressbook	km	ជ្រើសរើសម្ចាស់ទិន្នន័យដែលបាននាំចូល
-choose pre-defined map source or use custom url (use %r = street, %t = city, %c = country, %z = zipcode)	admin	km	ជ្រើសរើសប្រភពផែនទីដែលបានកំណត់ជាមុន ឬប្រើ URL ផ្ទាល់ខ្លួន (ប្រើ %r = street, %t = city, %c = country, %z = zipcode)
-chosse an etemplate for this contact type	admin	km	ជ្រើសរើស eTemplate សម្រាប់ប្រភេទទំនាក់ទំនងនេះ។
-city	common	km	ទីក្រុង
-city (private)	addressbook	km	ទីក្រុង (ឯកជន)
-cleanup addressbook fields (apply if synchronization creates duplicates)	addressbook	km	សម្អាតវាលសៀវភៅអាសយដ្ឋាន អនុវត្តប្រសិនបើការធ្វើសមកាលកម្មបង្កើតស្ទួន។
-company	common	km	ក្រុមហ៊ុន
-company name	addressbook	km	ឈ្មោះ​ក្រុម​ហ៊ុន
-configuration	common	km	ការកំណត់​រចនាសម្ព័ន្ធ
-contact	common	km	ទំនាក់ទំនង
-contact application	admin	km	ការដាក់ពាក្យទំនាក់ទំនង
-contact data	addressbook	km	ទិន្នន័យទំនាក់ទំនង
-contact deleted	addressbook	km	បានលុបទំនាក់ទំនង។
-contact fields to show	addressbook	km	វាលទំនាក់ទំនងដើម្បីបង្ហាញ
-contact fields:	addressbook	km	វាលទំនាក់ទំនង៖
-contact id	addressbook	km	លេខសម្គាល់ទំនាក់ទំនង
-contact id cannot be changed by import	addressbook	km	លេខសម្គាល់ទំនាក់ទំនងមិនអាចផ្លាស់ប្តូរដោយការនាំចូលបានទេ។
-contact maintenance	admin	km	ទាក់ទងការថែទាំ
-contact modified by %1 at %2	addressbook	km	ទំនាក់ទំនងបានកែប្រែដោយ%1 នៅ% 2 ។
-contact not found!	addressbook	km	រកមិនឃើញទំនាក់ទំនង!
-contact repository	admin	km	ឃ្លាំងទំនាក់ទំនង
-contact saved	addressbook	km	បានរក្សាទុកទំនាក់ទំនង
-contact settings	admin	km	ការកំណត់ទំនាក់ទំនង
-contactform	addressbook	km	ទម្រង់ទំនាក់ទំនង
-contacts	common	km	ទំនាក់ទំនង
-contacts and account contact-data to ldap	admin	km	ទំនាក់ទំនង និងទិន្នន័យទំនាក់ទំនងរបស់គណនីទៅ LDAP
-contacts and account contact-data to sql	admin	km	ទំនាក់ទំនង និងទិន្នន័យទំនាក់ទំនងរបស់គណនីទៅ SQL
-contacts to ldap	admin	km	ទំនាក់ទំនងទៅកាន់ LDAP
-contacts to ldap, account contact-data to sql	admin	km	ទំនាក់ទំនងទៅ LDAP ទិន្នន័យទំនាក់ទំនងគណនីទៅ SQL
-contains	addressbook	km	មាន
-copied	addressbook	km	ចម្លង
-copied by %1, from record #%2.	addressbook	km	ចម្លងដោយ %1 ពីកំណត់ត្រា #%2 ។
-copy a contact and edit the copy	addressbook	km	ចម្លងទំនាក់ទំនង និងកែសម្រួលច្បាប់ចម្លង
-copy instead of move	addressbook	km	ចម្លងជំនួសឱ្យការផ្លាស់ទី
-copy your changes to the clipboard, %1reload the entry%2 and merge them.	addressbook	km	ចម្លងការផ្លាស់ប្ដូររបស់អ្នកទៅក្ដារតម្បៀតខ្ទាស់ %1 ផ្ទុកធាតុឡើងវិញ %2 ហើយបញ្ចូលពួកវាចូលគ្នា។
-country	common	km	ប្រទេស
-country (private)	addressbook	km	ប្រទេស (ឯកជន)
-country code	addressbook	km	លេខ​កូដ​ប្រទេស
-country code (private)	addressbook	km	លេខកូដប្រទេស (ឯកជន)
-create new links	addressbook	km	បង្កើតតំណថ្មី
-created	addressbook	km	បានបង្កើត
-credit	addressbook	km	ឥណទាន
-crm view list	addressbook	km	បញ្ជីទិដ្ឋភាព CRM
-crm-view	addressbook	km	CRM-ទិដ្ឋភាព
-csv-fieldname	addressbook	km	ឈ្មោះវាល CSV
-csv-filename	addressbook	km	ឈ្មោះឯកសារ CSV
-custom	addressbook	km	ផ្ទាល់ខ្លួន
-custom etemplate for the contactform	addressbook	km	គំរូ eTemplate ផ្ទាល់ខ្លួនសម្រាប់ទម្រង់ទំនាក់ទំនង
-custom fields	addressbook	km	វាលផ្ទាល់ខ្លួន
-data exchange settings	addressbook	km	ការកំណត់ការផ្លាស់ប្តូរទិន្នន័យ
-debug output in browser	addressbook	km	ជួសជុលកំហុសលទ្ធផលនៅក្នុងកម្មវិធីរុករក
-default	addressbook	km	លំនាំដើម
-default action on double-click	addressbook	km	សកម្មភាពលំនាំដើមនៅពេលចុចពីរដង
-default address format	addressbook	km	ទម្រង់អាសយដ្ឋានលំនាំដើម
-default addressbook for adding contacts	addressbook	km	សៀវភៅអាសយដ្ឋានលំនាំដើម
-default document to insert contacts	addressbook	km	ឯកសារលំនាំដើមដើម្បីបញ្ចូលទំនាក់ទំនង
-default file as format	addressbook	km	ឯកសារលំនាំដើមជាទម្រង់
-default filter	addressbook	km	តម្រងលំនាំដើម
-default format for fileas, eg. for new entries.	addressbook	km	ទម្រង់លំនាំដើមសម្រាប់ fileas ឧ. សម្រាប់ធាតុថ្មី។
-default geolocation source address	addressbook	km	អាសយដ្ឋានប្រភព GeoLocation លំនាំដើម
-default is to open email addresses in egroupware email application, if user has access to it.	addressbook	km	លំនាំដើមគឺត្រូវបើកអាសយដ្ឋានអុីមែលនៅក្នុងកម្មវិធី EGroupware EMail ប្រសិនបើអ្នកប្រើមានសិទ្ធិចូលប្រើវា។
-defines which email address (business or home) to use as the preferred one for distribution lists in mail.	addressbook	km	អាសយដ្ឋាន​អុីមែល​មួយ​ណា​ត្រូវ​បាន​ប្រើ​ជា​អាសយដ្ឋាន​ដែល​ពេញ​ចិត្ត​សម្រាប់​បញ្ជី​ចែកចាយ។
-delete a single entry by passing the id.	addressbook	km	លុបធាតុតែមួយដោយឆ្លងកាត់លេខសម្គាល់។
-delete selected distribution list!	addressbook	km	លុបបញ្ជីចែកចាយដែលបានជ្រើសរើស!
-delete this contact	addressbook	km	លុបទំនាក់ទំនងនេះ
-delete this organisation including all its contacts	addressbook	km	លុបស្ថាប័ននេះ រួមទាំងទំនាក់ទំនងទាំងអស់របស់វា
-deleted	addressbook	km	បានលុប
-deletes the photo	addressbook	km	លុបរូបថត
-department	common	km	នាយកដ្ឋាន
-departments	addressbook	km	នាយកដ្ឋាន
-directory with documents to insert contacts	addressbook	km	ថតជាមួយឯកសារដើម្បីបញ្ចូលទំនាក់ទំនង
-disable	addressbook	km	បិទ
-disable last/next event column	addressbook	km	បិទជួរឈរព្រឹត្តិការណ៍ចុងក្រោយ/បន្ទាប់
-display contact	addressbook	km	បង្ហាញទំនាក់ទំនង
-displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	km	បង្ហាញថ្ងៃកំណើតនៅលើទំព័រដើម។
-distribution list deleted	addressbook	km	បញ្ជីចែកចាយត្រូវបានលុប
-distribution list renamed	addressbook	km	បានប្តូរឈ្មោះបញ្ជីចែកចាយ
-distribution lists	addressbook	km	បញ្ជីចែកចាយ
-distribution lists as groups	addressbook	km	បញ្ជីចែកចាយជាក្រុម
-distribution lists, ...	addressbook	km	បញ្ជីចែកចាយ, ...
-do you really want to delete this contact?	addressbook	km	តើអ្នកពិតជាចង់លុបទំនាក់ទំនងនេះមែនទេ?
-do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?	addressbook	km	តើ​អ្នក​ចង់​បាន​សៀវភៅ​អាសយដ្ឋាន​ឯកជន​មួយ​ទៀត ដែល​មិន​អាច​មើល​ដោយ​អ្នក​ប្រើ​ផ្សេង​ទៀត​ទេ ប្រសិន​បើ​អ្នក​អនុញ្ញាត​ឱ្យ​ចូល​ទៅ​កាន់​សៀវភៅ​អាសយដ្ឋាន​ផ្ទាល់​ខ្លួន​របស់​អ្នក?
-do your really want to delete this contact?	addressbook	km	តើអ្នកពិតជាចង់លុបទំនាក់ទំនងនេះមែនទេ?
-doesn't matter	addressbook	km	មិនសំខាន់ទេ
-domestic	addressbook	km	ក្នុងស្រុក
-don't hide empty columns	addressbook	km	លាក់ជួរឈរដែលទទេ
-download	addressbook	km	ទាញយក
-download export file (uncheck to debug output in browser)	addressbook	km	ទាញយកឯកសារនាំចេញ។ ដោះធីកដើម្បីជួសជុលកំហុសលទ្ធផលនៅក្នុងកម្មវិធីរុករក។
-download this contact as vcard file	addressbook	km	ទាញយកទំនាក់ទំនងនេះជាឯកសារ vCard
-duplicate threshold	addressbook	km	ស្ទួនកម្រិត
-duplicate warning	addressbook	km	ការព្រមានស្ទួន
-duplicates	addressbook	km	ស្ទួន
-duration	addressbook	km	រយៈពេល
-each category in its own field	addressbook	km	ប្រភេទនីមួយៗនៅក្នុងវិស័យរបស់ខ្លួន។
-each option in its own field	addressbook	km	ជម្រើសនីមួយៗនៅក្នុងវិស័យរបស់ខ្លួន។
-edit contact	addressbook	km	កែសម្រួលទំនាក់ទំនង
-edit custom field	addressbook	km	កែសម្រួលវាលផ្ទាល់ខ្លួន
-edit custom fields	admin	km	កែសម្រួលវាលផ្ទាល់ខ្លួន
-edit extra account-data in the addressbook	admin	km	កែសម្រួលទិន្នន័យគណនីបន្ថែមនៅក្នុងសៀវភៅអាសយដ្ឋាន
-edit phonenumbers	addressbook	km	កែសម្រួលលេខទូរស័ព្ទ
-edit phonenumbers -	addressbook	km	កែសម្រួលលេខទូរស័ព្ទ -
-either the configured email addesses are wrong or the mail configuration.	addressbook	km	ទាំងអាសយដ្ឋានអុីមែលដែលបានកំណត់រចនាសម្ព័ន្ធខុស ឬការកំណត់រចនាសម្ព័ន្ធសំបុត្រ។
-email & internet	addressbook	km	អុីមែល និងអុីនធឺណិត
-email (private)	addressbook	km	អុីមែល (ឯកជន)
-email addresses (comma separated) to send the contact data	addressbook	km	អាសយដ្ឋានអុីមែល សញ្ញាក្បៀសបំបែក ដើម្បីផ្ញើទិន្នន័យទំនាក់ទំនង។
-empty	admin	km	ទទេ
-empty addressbook before importing	addressbook	km	លុបធាតុសៀវភៅអាសយដ្ឋានមិននៅក្នុងបញ្ជី CSV
-empty for all	addressbook	km	ទទេសម្រាប់ទាំងអស់គ្នា
-enable an extra private addressbook	addressbook	km	សៀវភៅអាសយដ្ឋានឯកជនបន្ថែម
-enclosure	addressbook	km	ការរុំព័ទ្ធ
-end	addressbook	km	ចប់
-enter the path to the exported file here	addressbook	km	បញ្ចូលផ្លូវទៅកាន់ឯកសារដែលបាននាំចេញ
-error deleting the contact !!!	addressbook	km	កំហុសក្នុងការលុបទំនាក់ទំនង!
-error saving the contact !!!	addressbook	km	កំហុសក្នុងការរក្សាទុកទំនាក់ទំនង!
-error: the entry has been updated since you opened it for editing!	addressbook	km	កំហុស៖ ធាតុត្រូវបានធ្វើបច្ចុប្បន្នភាពចាប់តាំងពីអ្នកបើកវាកែសម្រួលមក!
-example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	addressbook	km	ឧទាហរណ៍ {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - ស្វែករកក្នុងវាល "n_prefix", សម្រាប់ "Mr", បើរកឃើញ, សរសេរ Hello Mr., ឬសរសេរ Hello Ms.
-example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller	preferences	km	ឧទាហរណ៍ {{LETTERPREFIXCUSTOM n_prefix title n_family}} - ឧទាហរណ៍៖ លោកបណ្ឌិត James Miller
-example {{nelf role}} - if field role is not empty, you will get a new line with the value of field role	addressbook	km	ឧទាហរណ៍ {{NELF role}} - ប្រសិនបើវាលតួនាទីមិនទទេ អ្នកនឹងទទួលបានបន្ទាត់ថ្មីជាមួយនឹងតម្លៃនៃវាលតួនាទី
-example {{nenvlf role}} - if field role is not empty, set a lf without any value of the field	addressbook	km	ឧទាហរណ៍ {{nenvlf role}} - ប្រសិនបើវាលតួនាទីមិនទទេ កំណត់ LF ដោយគ្មានតម្លៃណាមួយនៃវាលនោះ
-existing links	addressbook	km	តំណភ្ជាប់ដែលមានស្រាប់
-exists	addressbook	km	មាន
-export as csv	addressbook	km	នាំចេញជា CSV
-export as vcard	addressbook	km	នាំចេញជា vCard
-export contacts	addressbook	km	នាំចេញទំនាក់ទំនង
-export definition to use for nextmatch export	addressbook	km	នាំចេញនិយមន័យដែលត្រូវប្រើសម្រាប់ការនាំចេញការប្រកួតបន្ទាប់
-export definitition to use for nextmatch export	addressbook	km	នាំចេញនិយមន័យដែលត្រូវប្រើសម្រាប់ការនាំចេញការប្រកួតបន្ទាប់
-export file name	addressbook	km	នាំចេញឈ្មោះឯកសារ
-export from addressbook	addressbook	km	នាំចេញពីសៀវភៅអាសយដ្ឋាន
-export selection	addressbook	km	នាំចេញជម្រើស
-exported	addressbook	km	នាំចេញ
-exports contacts from your addressbook into a csv file.	addressbook	km	នាំចេញទំនាក់ទំនងពីសៀវភៅអាសយដ្ឋានទៅជាឯកសារ CSV ។
-exports contacts from your addressbook into a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	km	នាំចេញទំនាក់ទំនងពីសៀវភៅអាសយដ្ឋានទៅជាឯកសារ CSV ។ CSV មានន័យថា 'តម្លៃបំបែកដោយសញ្ញាក្បៀស'។ នៅក្នុងផ្ទាំងជម្រើស អ្នកក៏អាចជ្រើសរើសសញ្ញាបំបែកផ្សេងទៀត។
-exports contacts from your addressbook into a vcard file.	addressbook	km	នាំចេញទំនាក់ទំនងពីសៀវភៅអាសយដ្ឋានរបស់អ្នកទៅជាឯកសារ vCard ។
-extra	addressbook	km	ការបន្ថែម
-extra encodings	addressbook	km	ការអុិនកូដបន្ថែម
-extra private	addressbook	km	ឯកជនភាពបន្ថែម
-failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	km	បរាជ័យក្នុងការផ្លាស់ប្តូរសមាជិក %1 របស់ស្ថាប័ន សិទ្ធិមិនគ្រប់គ្រាន់!
-favorite phone	addressbook	km	ទូរស័ព្ទដែលចូលចិត្ត
-favorites	addressbook	km	ចំណូលចិត្ត
-fax	addressbook	km	ទូរសារ
-fax (private)	addressbook	km	ទូរសារ (ឯកជន)
-fax number	common	km	លេខទូរសារ
-field %1 has been added !	addressbook	km	វាល %1 ត្រូវបានបន្ថែម!
-field %1 has been updated !	addressbook	km	វាល %1 ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព!
-field name	addressbook	km	ឈ្មោះវាល
-fields for the csv export	addressbook	km	វាលសម្រាប់ការនាំចេញ CSV
-fields the user is allowed to edit himself	admin	km	វាលដែលអ្នកប្រើប្រាស់ត្រូវបានអនុញ្ញាតឱ្យកែសម្រួលខ្លួនឯង
-fields to check for duplicates	addressbook	km	វាលដើម្បីពិនិត្យមើលការស្ទួន
-fields to consider when looking for duplicate contacts.	addressbook	km	វាលដែលត្រូវពិចារណានៅពេលស្វែងរកទំនាក់ទំនងស្ទួន។
-fields to copy when copying an address?	admin	km	វាលដែលត្រូវចម្លងនៅពេលចម្លងអាសយដ្ឋាន
-fields to show in address list	addressbook	km	វាលដែលត្រូវបង្ហាញក្នុងបញ្ជីអាសយដ្ឋាន
-fieldseparator	addressbook	km	អ្នកបំបែកវាល
-for read only ldap	admin	km	សម្រាប់ LDAPដែលអានបានប៉ុណ្ណោះ។
-for serial letter use this tag. put the content, you want to repeat between two tags.	addressbook	km	ប្រើស្លាកនេះសម្រាប់អក្សរសៀរៀល។ ដាក់មាតិកាដែលអ្នកចង់ធ្វើម្តងទៀតរវាងស្លាកពីរ។
-freebusy uri	addressbook	km	FreeBusy URI
-full name	addressbook	km	ឈ្មោះ​ពេញ
-general	admin	km	ទូទៅ
-general fields:	addressbook	km	វាលទូទៅ៖
-general settings	addressbook	km	ការកំណត់​ទូទៅ
-geo	addressbook	km	GEO
-geolocation	addressbook	km	ទីតាំងភូមិសាស្ត្រ
-geolocation integration	admin	km	ការរួមបញ្ចូលទីតាំងភូមិសាស្ត្រ
-global categories	addressbook	km	ប្រភេទសកល
-grant addressbook access	common	km	ផ្តល់សិទ្ធិចូលប្រើសៀវភៅអាសយដ្ឋាន
-group %1	addressbook	km	ក្រុម %1
-h	addressbook	km	h
-hide accounts from addressbook	addressbook	km	លាក់គណនីអ្នកប្រើប្រាស់
-hide all accounts	addressbook	km	លាក់គណនីទាំងអស់។
-hide user groups as distribution lists	addressbook	km	លាក់ក្រុមអ្នកប្រើប្រាស់ជាបញ្ជីចែកចាយ
-hides accounts completly from the adressbook.	addressbook	km	លាក់គណនីអ្នកប្រើប្រាស់ទាំងស្រុងពីសៀវភៅអាសយដ្ឋាន។
-history logging	admin	km	ការកត់ត្រាប្រវត្តិសាស្ត្រ
-home address	addressbook	km	អាសយដ្ឋានផ្ទះ
-home address, birthday, ...	addressbook	km	អាស័យដ្ឋាន ខួបកំណើត...
-home city	addressbook	km	ទីក្រុង
-home country	addressbook	km	ប្រទេសដើម
-home email	addressbook	km	អុីមែលផ្ទះ
-home email if given, else work email	addressbook	km	អុីមែលផ្ទះ ប្រសិនបើត្រូវបានផ្តល់ឱ្យ ឬអុីមែលការងារផ្សេងទៀត។
-home phone	addressbook	km	ទូរស័ព្ទផ្ទះ
-home state	addressbook	km	រដ្ឋ
-home street	addressbook	km	ផ្លូវ
-home zip code	addressbook	km	លេខ​កូដ​តំបន់​
-how many contacts should non-admins be able to export	admin	km	តើទំនាក់ទំនងប៉ុន្មានដែលមិនមែនជាអ្នកគ្រប់គ្រងគួរតែអាចនាំចេញបាន។
-how many fields must match for the record to be considered a duplicate.	addressbook	km	តើមានវាលប៉ុន្មានដែលត្រូវគ្នាសម្រាប់កំណត់ត្រាដែលត្រូវចាត់ទុកថាស្ទួន។
-html link to the current record	addressbook	km	តំណភ្ជាប់ HTML ទៅកំណត់ត្រាបច្ចុប្បន្ន
-icon	addressbook	km	រូបតំណាង
-if accounts are already in ldap	admin	km	ប្រសិនបើគណនីមាននៅក្នុង LDAP រួចហើយ
-ignore first line	addressbook	km	មិនអើពើជួរទីមួយ
-import	addressbook	km	នាំចូល
-import contacts	addressbook	km	នាំចូលទំនាក់ទំនង
-import csv-file into addressbook	addressbook	km	នាំចូលឯកសារ CSV ទៅក្នុងសៀវភៅអាសយដ្ឋាន
-import file	addressbook	km	នាំចូលឯកសារ
-import from	addressbook	km	នាំចូលពី
-import from ldif, csv, or vcard	addressbook	km	នាំចូលពី LDIF, CSV, ឬ vCard
-import from outlook	addressbook	km	នាំចូលពី Outlook
-import multiple vcard	addressbook	km	នាំចូល vCard ច្រើន។
-import next set	addressbook	km	នាំចូលឈុតបន្ទាប់
-import_instructions	addressbook	km	នៅក្នុង Netscape បើកសៀវភៅអាសយដ្ឋាន ហើយជ្រើសរើស <b>នាំចេញ</b> ពីម៉ឺនុយ <b>File</b> ។ ឯកសារដែលបាននាំចេញនឹងមានទម្រង់ LDIF ។<p>ឬនៅក្នុង Outlook ជ្រើសរើសថតទំនាក់ទំនងរបស់អ្នក ជ្រើសរើស <b>នាំចូល និងនាំចេញ...</b> ពីម៉ឺនុយ <b>ឯកសារ</b> ហើយនាំចេញរបស់អ្នក ទំនាក់ទំនងទៅក្នុងឯកសារអត្ថបទបំបែកដោយសញ្ញាក្បៀស (CSV) ។ <p>ឬនៅក្នុង Palm Desktop 4.0 ឬខ្ពស់ជាងនេះ សូមចូលទៅកាន់សៀវភៅអាសយដ្ឋានរបស់អ្នក ហើយជ្រើសរើស <b>នាំចេញ</b> ពីម៉ឺនុយ <b>File</b> ។ ឯកសារដែលបាននាំចេញនឹងមានទម្រង់ vCard ។
-importer's personal	addressbook	km	ផ្ទាល់ខ្លួនរបស់អ្នកនាំចូល
-imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	km	នាំចូលទំនាក់ទំនងទៅក្នុងសៀវភៅអាសយដ្ឋានពីឯកសារ CSV ។ CSV មានន័យថា 'តម្លៃបំបែកដោយសញ្ញាក្បៀស'។ នៅក្នុងផ្ទាំងជម្រើស អ្នកក៏អាចជ្រើសរើសសញ្ញាបំបែកផ្សេងទៀត។
-imports contacts into your addressbook from a vcard file.	addressbook	km	នាំចូលទំនាក់ទំនងទៅក្នុងសៀវភៅអាសយដ្ឋានរបស់អ្នកពីឯកសារ vCard ។
-in %1 days (%2) is %3's birthday.	addressbook	km	ក្នុង %1 ថ្ងៃ (%2) គឺជាថ្ងៃកំណើតរបស់ %3 ។
-income	addressbook	km	ចំណូល
-infolog	addressbook	km	ទំនាក់ទំនង InfoLog
-infolog-organisation	addressbook	km	អង្គការ InfoLog
-insert	addressbook	km	បញ្ចូល
-insufficent rights to delete this list!	addressbook	km	សិទ្ធិមិនគ្រប់គ្រាន់ក្នុងការលុបបញ្ជីនេះ!
-insufficent rights to edit this list!	addressbook	km	សិទ្ធិមិនគ្រប់គ្រាន់ដើម្បីកែសម្រួលបញ្ជីនេះ!
-international	addressbook	km	អន្តរជាតិ
-internet	addressbook	km	អុីនធឺណិត
-label	addressbook	km	ស្លាក​សញ្ញា
-last date	addressbook	km	កាលបរិច្ឆេទចុងក្រោយ
-last modified	addressbook	km	កែប្រែចុងក្រោយ
-last modified by	addressbook	km	កែប្រែចុងក្រោយដោយ
-ldap context for contacts	admin	km	បរិបទ LDAP សម្រាប់ទំនាក់ទំនង
-ldap host for contacts	admin	km	ម៉ាស៊ីន LDAP សម្រាប់ទំនាក់ទំនង
-ldap settings for contacts	admin	km	ការកំណត់ LDAP សម្រាប់ទំនាក់ទំនង
-ldif	addressbook	km	LDIF
-line 2	addressbook	km	ជួរទី 2
-link title for contacts show	addressbook	km	ចំណងជើងតំណសម្រាប់ទំនាក់ទំនង
-links	addressbook	km	តំណភ្ជាប់
-links and attached files	addressbook	km	តំណភ្ជាប់និងឯកសារភ្ជាប់
-links to specified application.  example: {{links/infolog}}	addressbook	km	តំណភ្ជាប់ទៅកម្មវិធីដែលបានបញ្ជាក់។ ឧទាហរណ៍៖ {{links/infolog}}
-list all categories	addressbook	km	រាយប្រភេទទាំងអស់។
-list all customfields	addressbook	km	រាយបញ្ជីវាលផ្ទាល់ខ្លួនទាំងអស់។
-list already exists!	addressbook	km	បញ្ជីមានរួចហើយ!
-list created	addressbook	km	បញ្ជីត្រូវបានបង្កើតឡើង។
-list creation failed, no rights!	addressbook	km	ការបង្កើតបញ្ជីបានបរាជ័យ គ្មានសិទ្ធិទេ!
-list of files linked to the current record	addressbook	km	បញ្ជីឯកសារដែលភ្ជាប់ទៅកំណត់ត្រាបច្ចុប្បន្ន
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	km	ផ្ទុកវាលផ្ទាល់ខ្លួនជាលិបិក្រម ទោះបីជាជួរឈរវាលផ្ទាល់ខ្លួនត្រូវបានបិទ (ឧ. ដើម្បីបង្ហាញពួកវាក្នុងជួរឈរលិបិក្រមជាក់លាក់)
-load vcard	addressbook	km	ផ្ទុក vCard
-location	addressbook	km	ទីតាំង
-locations	addressbook	km	ទីតាំង
-mail vcard	addressbook	km	សំបុត្រ vCard
-main categories in their own field	addressbook	km	ប្រភេទសំខាន់ៗនៅក្នុងវាលរបស់ពួកគេ។
-manage mapping	addressbook	km	គ្រប់គ្រងការធ្វើផែនទី
-mark records as private	addressbook	km	សម្គាល់កំណត់ត្រាជាឯកជន
-merge contacts	addressbook	km	បញ្ចូលទំនាក់ទំនងចូលគ្នា
-merge duplicates	addressbook	km	បញ្ចូល​ការស្ទួនចូលគ្នា
-merge into first or account, deletes all other!	addressbook	km	បញ្ចូលចូលគ្នាទៅក្នុងគណនីដំបូង ឬគណនីលុបផ្សេងទៀតទាំងអស់!
-merged	addressbook	km	បញ្ចូលចូលគ្នា
-message after submitting the form	addressbook	km	សារបន្ទាប់ពីការបញ្ជូនទម្រង់
-message phone	addressbook	km	សារទូរស័ព្ទ
-middle name	addressbook	km	ឈ្មោះ​ក​ណ្តា​ល
-migration finished	addressbook	km	ការប្តូរទីកន្លែងបានបញ្ចប់
-migration to ldap	admin	km	ការផ្លាស់ប្តូរទៅ LDAP
-mobile	addressbook	km	ទូរស័ព្ទ
-mobile phone	addressbook	km	ទូរស័ព្ទចល័ត
-mobile phone (private)	addressbook	km	ទូរស័ព្ទចល័ត (ឯកជន)
-modem phone	addressbook	km	ទូរស័ព្ទម៉ូឌឹម
-more ...	addressbook	km	ច្រើនទៀត...
-move to addressbook	addressbook	km	ផ្លាស់ទីទៅសៀវភៅអាសយដ្ឋាន
-moved	addressbook	km	ផ្លាស់ទី
-multiple vcard	addressbook	km	vCard ច្រើន
-name for the distribution list	addressbook	km	ឈ្មោះសម្រាប់បញ្ជីចែកចាយ
-name of current user, all other contact fields are valid too	addressbook	km	ឈ្មោះអ្នកប្រើប្រាស់បច្ចុប្បន្ន វាលទំនាក់ទំនងផ្សេងទៀតទាំងអស់ក៏មានសុពលភាពផងដែរ។
-name, address	addressbook	km	ឈ្មោះ, អាស័យដ្ឋាន
-name, email, phone	addressbook	km	ឈ្មោះ អុីមែល ទូរស័ព្ទ
-new contact submitted by %1 at %2	addressbook	km	ទំនាក់ទំនងថ្មីបានដាក់ជូនដោយ %1 នៅ %2 ។
-new window opened to edit infolog for your selection	addressbook	km	បង្អួចថ្មីបានបើកដើម្បីកែសម្រួល InfoLog ។
-next date	addressbook	km	កាលបរិច្ឆេទបន្ទាប់
-no categories selected	addressbook	km	គ្មានកាតាឡុកបានជ្រើសរើសទេ
-no country selected	addressbook	km	គ្មានប្រទេសដែលបានជ្រើសរើសទេ
-no distribution list	addressbook	km	មិនមានបញ្ជីចែកចាយទេ។
-no fallback	addressbook	km	គ្មានការថយក្រោយទេ។
-no vcard	addressbook	km	គ្មាន vCard
-not shared	addressbook	km	មិនបានចែករំលែក
-number	addressbook	km	ចំនួន
-number of records to read (%1)	addressbook	km	ចំនួនកំណត់ត្រាដែលត្រូវអាន (%1)
-open %1 crm view	addressbook	km	បើកទិដ្ឋភាព %1 CRM
-open email addresses in external mail program	addressbook	km	បើកអាសយដ្ឋានអុីមែលនៅក្នុងកម្មវិធីសំបុត្រខាងក្រៅ
-open for editing?	addressbook	km	បើកសម្រាប់ការកែសម្រួល?
-open infolog crm view	preferences	km	បើកទិដ្ឋភាព InfoLog CRM នៃទំនាក់ទំនង
-open tracking system crm view	preferences	km	បើកប្រព័ន្ធតាមដានទិដ្ឋភាព CRM
-options for type	admin	km	ជម្រើសសម្រាប់ប្រភេទ
-organisation	addressbook	km	អង្គការ
-organisations	addressbook	km	អង្គការ
-organisations by departments	addressbook	km	អង្គការតាមនាយកដ្ឋាន
-organisations by location	addressbook	km	អង្គការតាមទីតាំង
-other number	addressbook	km	លេខផ្សេងទៀត
-other phone	addressbook	km	ទូរស័ព្ទផ្សេងទៀត
-own sorting	addressbook	km	ការតម្រៀបផ្ទាល់ខ្លួន
-pager	common	km	ទំព័រ
-parcel	addressbook	km	កញ្ចប់
-participants	addressbook	km	អ្នកចូលរួម
-permission denied !!!	addressbook	km	ការអនុញ្ញាតត្រូវបានបដិសេធ!
-permissiong denied! ask your administrator to allow regular uses to update their public keys.	addressbook	km	ការអនុញ្ញាតត្រូវបានបដិសេធ! សួរអ្នកគ្រប់គ្រងរបស់អ្នកឱ្យអនុញ្ញាតឱ្យប្រើជាប្រចាំដើម្បីធ្វើបច្ចុប្បន្នភាពសោសាធារណៈរបស់ពួកគេ។
-pgp key	addressbook	km	គ្រាប់ចុច PGP
-phone number	common	km	លេខទូរសព្ទ
-phone numbers	common	km	លេខទូរសព្ទ
-photo	addressbook	km	រូបថត
-please enter a name for that field !	addressbook	km	បញ្ចូលឈ្មោះទៅក្នុងវាលនោះ!
-please select only one category	addressbook	km	ជ្រើសរើសកាតាឡុកមួយប៉ុណ្ណោះ
-postal	common	km	ប្រៃសណីយ៍
-pref	addressbook	km	បុព្វបទ
-preferred email address to use in distribution lists	addressbook	km	អាសយដ្ឋានអុីមែលដែលពេញចិត្ត
-preferred phone	addressbook	km	ទូរស័ព្ទដែលពេញចិត្ត
-preferred type of email address to add for distribution lists	addressbook	km	ប្រភេទអាសយដ្ឋានអុីមែលដែលពេញចិត្តសម្រាប់បញ្ជីចែកចាយ។
-prefix	addressbook	km	បុព្វបទ
-prevent deleting of contacts	admin	km	ការពារការលុបទំនាក់ទំនង
-private address	addressbook	km	អាសយដ្ឋានឯកជន
-private custom fields	addressbook	km	វាលផ្ទាល់ខ្លួនផ្ទាល់ខ្លួន
-public key	addressbook	km	សោសាធារណៈ
-public sharing url	addressbook	km	URL ចែករំលែកជាសាធារណៈ
-publish into groups:	addressbook	km	ផ្សព្វផ្សាយជាក្រុម៖
-read a list / search for entries.	addressbook	km	អានបញ្ជី / ស្វែងរកធាតុ។
-read a list of entries.	addressbook	km	អានបញ្ជីនៃធាតុ។
-read a single entry by passing the id and fieldlist.	addressbook	km	អានធាតុតែមួយដោយឆ្លងកាត់លេខសម្គាល់ និងបញ្ជីវាល។
-read only	addressbook	km	អាច​បាន​តែ​អាន
-record access	addressbook	km	ការចូលកំណត់ត្រា
-record owner	addressbook	km	ម្ចាស់កំណត់ត្រា
-recovered	addressbook	km	យកបានវិញ
-region	addressbook	km	តំបន់
-remove from distribution list	addressbook	km	លុបចេញពីបញ្ជីចែកចាយ
-remove selected contacts from distribution list	addressbook	km	លុបទំនាក់ទំនងដែលបានជ្រើសរើសចេញពីបញ្ជីចែកចាយ។
-removed from distribution list	addressbook	km	បានដកចេញពីបញ្ជីចែកចាយ។
-rename list	addressbook	km	ប្តូរឈ្មោះបញ្ជី
-rename selected distribution list	addressbook	km	ប្តូរឈ្មោះបញ្ជីចែកចាយដែលបានជ្រើសរើស
-repetition	addressbook	km	ពាក្យដដែលៗ
-replacements for inserting contacts into documents	addressbook	km	ការជំនួសសម្រាប់ការបញ្ចូលទំនាក់ទំនងទៅក្នុងឯកសារ
-required fields *	addressbook	km	វាលដែលត្រូវការ *
-role	addressbook	km	មុខរបរ
-room	addressbook	km	បន្ទប់
-search letter	addressbook	km	ស្វែងរកសំបុត្រ
-select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	km	ជ្រើសរើសទម្រង់បញ្ឈររូបថត jpeg ។ វានឹងមានទំហំឡើងវិញដល់ទទឹង 60 ភីកសែល។
-select a source address to be used in geolocation routing system	addressbook	km	ជ្រើសរើសអាសយដ្ឋានប្រភពដែលត្រូវប្រើនៅក្នុងប្រព័ន្ធកំណត់ទីតាំងភូមិសាស្ត្រ
-select a view	addressbook	km	ជ្រើសរើសទិដ្ឋភាព
-select addressbook type	addressbook	km	ជ្រើសរើសប្រភេទសៀវភៅអាសយដ្ឋាន
-select all	addressbook	km	ជ្រើសរើស​ទាំងអស់
-select an action or addressbook to move to	addressbook	km	ជ្រើសរើសសកម្មភាព ឬសៀវភៅអាសយដ្ឋានដើម្បីផ្លាស់ទីទៅ
-select an action or addressbook to move to...	addressbook	km	ជ្រើសរើសសកម្មភាព ឬសៀវភៅអាសយដ្ឋាន ដើម្បីផ្លាស់ទីទៅ...
-select an opened dialog	addressbook	km	ជ្រើសរើសប្រអប់ដែលបានបើក
-select migration type	admin	km	ជ្រើសរើសប្រភេទការផ្លាស់ប្តូរទីតាំង
-select multiple contacts for a further action	addressbook	km	ជ្រើសរើសទំនាក់ទំនងច្រើនសម្រាប់សកម្មភាពបន្ថែម
-select phone number as prefered way of contact	addressbook	km	ជ្រើសរើសលេខទូរស័ព្ទជាមធ្យោបាយទំនាក់ទំនងដែលពេញចិត្ត
-select the type of conversion	addressbook	km	ជ្រើសរើសប្រភេទនៃការបំប្លែង
-select the type of conversion:	addressbook	km	ជ្រើសរើសប្រភេទនៃការបំប្លែង៖
-select where you want to store / retrieve contacts	admin	km	ជ្រើសរើសកន្លែងដែលទំនាក់ទំនងគួរតែត្រូវបានរក្សាទុក / ទាញយក។
-selected contacts	addressbook	km	ទំនាក់ទំនងដែលបានជ្រើសរើស
-send emailcopy to receiver	addressbook	km	ផ្ញើច្បាប់ចម្លងអុីមែលទៅអ្នកទទួល
-send fax via email by replacing fax number with an email address	addressbook	km	ផ្ញើទូរសារតាមអុីមែលដោយជំនួសលេខទូរសារជាមួយអាសយដ្ឋានអុីមែល
-send succeeded to %1	common	km	ការផ្ញើបានជោគជ័យទៅ %1
-seperator	addressbook	km	សញ្ញាបំបែក
-set full name and file as field in contacts of all users (either all or only empty values)	admin	km	កំណត់ឈ្មោះពេញ និងវាល 'fileas' នៅក្នុងទំនាក់ទំនងរបស់អ្នកប្រើប្រាស់ទាំងអស់។ ទាំងតម្លៃទាំងអស់ ឬតែទទេ។
-set only full name	addressbook	km	កំណត់តែឈ្មោះពេញ
-share into addressbook	addressbook	km	ចែករំលែកទៅក្នុងសៀវភៅអាសយដ្ឋាន
-share writable	addressbook	km	ចែករំលែកអាចសរសេរបាន។
-shared	addressbook	km	ចែករំលែក
-shared by me	addressbook	km	ចែករំលែកដោយខ្ញុំ
-shared into addressbook %1	addressbook	km	ចែករំលែកទៅក្នុងសៀវភៅអាសយដ្ឋាន %1
-shared with	addressbook	km	ចែករំលែកជាមួយ
-should the columns photo and home address always be displayed, even if they are empty.	addressbook	km	តើរូបថត និងអាសយដ្ឋានផ្ទះត្រូវបានបង្ហាញជានិច្ច បើទោះបីជាជួរឈរទទេក៏ដោយ។
-show	addressbook	km	បង្ហាញ
-show active accounts	addressbook	km	បង្ហាញគណនីសកម្ម
-show all accounts	addressbook	km	បង្ហាញគណនីទាំងអស់
-show infolog entries for this organisation	addressbook	km	បង្ហាញធាតុ InfoLog សម្រាប់ស្ថាប័ននេះ
-show the contacts of this organisation	addressbook	km	បង្ហាញទំនាក់ទំនងរបស់ស្ថាប័ននេះ
-similar contacts found:	addressbook	km	ទំនាក់ទំនងស្រដៀងគ្នាបានរកឃើញ៖
-size of popup (wxh, eg.400x300, if a popup should be used)	admin	km	ទំហំនៃការលេចឡើង។ ទទឹង x កម្ពស់ ឧទាហរណ៍ ៤០០x៣០០
-smime key	addressbook	km	សោ S/MIME
-special	addressbook	km	ពិសេស
-stadt	addressbook	km	ទីក្រុង
-start	admin	km	ចាប់ផ្តើម
-startrecord	addressbook	km	ចាប់ផ្តើមកំណត់ត្រា
-state	common	km	រដ្ឋ
-state (private)	addressbook	km	រដ្ឋ (ឯកជន)
-street	common	km	ផ្លូវ
-street (private)	addressbook	km	ផ្លូវ (ឯកជន)
-subject for email	addressbook	km	ប្រធានបទសម្រាប់អុីមែល
-successfully imported %1 records into your addressbook.	addressbook	km	បាននាំចូល %1 record(s) ដោយជោគជ័យទៅក្នុងសៀវភៅអាសយដ្ឋាន។
-suffix	addressbook	km	បច្ច័យ
-tag to mark positions for address labels	addressbook	km	ដាក់ស្លាកដើម្បីសម្គាល់ទីតាំងសម្រាប់ស្លាកអាសយដ្ឋាន
-tel home	addressbook	km	ទូរស័ព្ទផ្ទះ
-telephony integration	admin	km	ការរួមបញ្ចូលទូរស័ព្ទ
-test import (show importable records <u>only</u> in browser)	addressbook	km	សាកល្បងការនាំចូល បង្ហាញកំណត់ត្រាដែលអាចនាំចូលបាន <u>តែ</u> នៅក្នុងកម្មវិធីរុករក
-thank you for contacting us.	addressbook	km	សូមអរគុណសម្រាប់ការទាក់ទងមកយើងខ្ញុំ។
-that field name has been used already !	addressbook	km	ឈ្មោះវាលត្រូវបានប្រើប្រាស់រួចហើយ!
-the anonymous user has probably no add rights for this addressbook.	addressbook	km	អ្នកប្រើប្រាស់អនាមិកមិនមានសិទ្ធិបន្ថែមសម្រាប់សៀវភៅអាសយដ្ឋាននេះទេ។
-the anonymous user needs add rights for it!	addressbook	km	អ្នកប្រើប្រាស់អនាមិកត្រូវការសិទ្ធិបន្ថែម!
-the anonymous user needs read it!	addressbook	km	អ្នកប្រើប្រាស់អនាមិកត្រូវការសិទ្ធិអាន!
-the following document-types are supported:	addressbook	km	ប្រភេទឯកសារខាងក្រោមត្រូវបានគាំទ្រ៖
-the zip extension is needed, to insert contact data in openoffice or msoffice documents.	addressbook	km	ត្រូវការផ្នែកបន្ថែម zip ដើម្បីបញ្ចូលទិន្នន័យទំនាក់ទំនងក្នុងឯកសារ OpenOffice ឬ MSOffice ។
-there was an error saving your data :-(	addressbook	km	កំហុសក្នុងការរក្សាទុកទិន្នន័យ!
-this module displays a contactform, that stores direct into the addressbook.	addressbook	km	ម៉ូឌុលនេះបង្ហាញទម្រង់ទំនាក់ទំនង ដែលរក្សាទុកដោយផ្ទាល់ទៅក្នុងសៀវភៅអាសយដ្ឋាន។
-this module displays block from a adddressbook group.	addressbook	km	ម៉ូឌុលនេះបង្ហាញប្លុកពីក្រុមសៀវភៅអាសយដ្ឋាន។
-this person's first name was not in the address book.	addressbook	km	ឈ្មោះរបស់បុគ្គលនេះមិនមាននៅក្នុងសៀវភៅអាសយដ្ឋានទេ។
-this person's last name was not in the address book.	addressbook	km	នាមត្រកូលរបស់មនុស្សនេះមិនមាននៅក្នុងសៀវភៅអាសយដ្ឋានទេ។
-timezone	addressbook	km	ល្វែងម៉ោង
-title	addressbook	km	ចំណងជើងការងារ
-titles of any entries linked to the current record, excluding attached files	addressbook	km	ចំណងជើងនៃធាតុណាមួយដែលភ្ជាប់ទៅនឹងកំណត់ត្រាបច្ចុប្បន្ន ដោយមិនរាប់បញ្ចូលឯកសារដែលបានភ្ជាប់
-to many might exceed your execution-time-limit	addressbook	km	ចំនួនច្រើនពេកអាចលើសពីដែនកំណត់ពេលវេលាប្រតិបត្តិរបស់អ្នក។
-today is %1's birthday!	common	km	ថ្ងៃ​នេះ​ជា​ថ្ងៃ​ខួប​កំណើត​របស់ %1!
-tomorrow is %1's birthday.	common	km	ថ្ងៃស្អែកជាថ្ងៃកំណើតរបស់ %1។
-translation	addressbook	km	ការបកប្រែ
-two of: %1	addressbook	km	ពីរនៃ៖ %1
-type	addressbook	km	ប្រភេទ
-un-delete	addressbook	km	លុប
-unable to convert "%1" to account id.  using plugin setting (%2) for owner.	addressbook	km	មិនអាចបំប្លែង "%1" ទៅជាលេខសម្គាល់គណនីបានទេ។ ការប្រើប្រាស់ការកំណត់កម្មវិធីជំនួយ (%2) សម្រាប់ម្ចាស់។
-unable to delete	addressbook	km	មិនអាចលុបបានទេ។
-unable to import into %1, using %2	addressbook	km	មិន​អាច​នាំ​ចូល​ទៅ​ក្នុង%1 ដោយ​ប្រើ % 2
-unique id (uid)	addressbook	km	លេខសម្គាល់តែមួយគត់ (UID)
-unique id<br />(to update existing records)	addressbook	km	លេខសម្គាល់តែមួយគត់<br />ដើម្បីធ្វើបច្ចុប្បន្នភាពកំណត់ត្រាដែលមានស្រាប់
-unknown type %1, imported as %2	addressbook	km	មិនស្គាល់ប្រភេទ %1 នាំចូលជា % 2
-unshare	addressbook	km	ឈប់ចែករំលែក
-unshared	addressbook	km	មិនបានចែករំលែក
-update a single entry by passing the fields.	addressbook	km	ធ្វើបច្ចុប្បន្នភាពធាតុតែមួយដោយឆ្លងកាត់វាល។
-update fields by edited organisations?	admin	km	វាលដើម្បីធ្វើបច្ចុប្បន្នភាពនៃអង្គការដែលបានកែសម្រួល
-updated	addressbook	km	បានធ្វើបច្ចុប្បន្នភាព
-upload or delete the photo	addressbook	km	បង្ហោះ ឬលុបរូបថត
-url (business)	addressbook	km	url (អាជីវកម្ម)
-url (private)	addressbook	km	url (ឯកជន)
-url to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)	admin	km	URL ដើម្បីភ្ជាប់លេខទូរស័ព្ទទៅ។ ប្រើ %1 = លេខដើម្បីហៅ, %u = ឈ្មោះគណនី, %t = ទូរស័ព្ទគណនី។
-use a category tree?	addressbook	km	ប្រើមែកធាងសម្រាប់ជ្រើសរើសប្រភេទ
-use addressbooks "own sorting" attribute	addressbook	km	ប្រើសៀវភៅអាសយដ្ឋាន "តម្រៀបផ្ទាល់ខ្លួន" គុណលក្ខណៈ
-use an extra tab for private custom fields?	admin	km	ប្រើផ្ទាំងបន្ថែមសម្រាប់វាលផ្ទាល់ខ្លួនឯកជន
-use country list	addressbook	km	ប្រើបញ្ជីប្រទេស
-use setup for a full account-migration	admin	km	ប្រើការដំឡើងសម្រាប់ការផ្ទេរគណនីពេញលេញ
-use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	km	ប្រើស្លាកនេះសម្រាប់ស្លាកអាសយដ្ឋាន។ ដាក់មាតិកាដែលអ្នកចង់ធ្វើម្តងទៀតរវាងស្លាកពីរ។
-used for links and for the own sorting of the list	addressbook	km	ប្រើសម្រាប់តំណភ្ជាប់ និងសម្រាប់ការតម្រៀបបញ្ជីផ្ទាល់ខ្លួន
-user groups are automatically shown as distribution lists.	addressbook	km	ក្រុមអ្នកប្រើប្រាស់ត្រូវបានបង្ហាញដោយស្វ័យប្រវត្តិជាបញ្ជីចែកចាយ។
-user preference	addressbook	km	ចំណូលចិត្តអ្នកប្រើប្រាស់
-vcard	common	km	vCard
-vcards require a first name entry.	addressbook	km	vCards ទាមទារការបញ្ចូលឈ្មោះដំបូង។
-vcards require a last name entry.	addressbook	km	vCards ទាមទារការបញ្ចូលនាមត្រកូល។
-verification	addressbook	km	ការផ្ទៀងផ្ទាត់
-view linked infolog entries	addressbook	km	មើលធាតុ InfoLog ដែលបានភ្ជាប់
-warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	km	ព្រមាន!! LDAP មានសុពលភាពលុះត្រាតែអ្នកមិនប្រើទំនាក់ទំនងសម្រាប់ការផ្ទុកគណនី!
-warning: all contacts found will be deleted!	addressbook	km	ការព្រមាន៖ ទំនាក់ទំនងទាំងអស់ដែលបានរកឃើញនឹងត្រូវបានលុប!
-weekday	addressbook	km	ថ្ងៃសប្តាហ៍
-what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	km	តំណសៀវភៅអាសយដ្ឋានបង្ហាញនៅក្នុងកម្មវិធីផ្សេងទៀត។ តម្លៃទទេនឹងត្រូវបានទុកចោល។ អ្នកត្រូវចូលម្តងទៀត ប្រសិនបើអ្នកប្តូរការកំណត់នេះ!
-when viewing a contact, show linked entries from the selected application	addressbook	km	នៅពេលមើលទំនាក់ទំនង បង្ហាញធាតុដែលបានភ្ជាប់ពីកម្មវិធីដែលបានជ្រើសរើស
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	km	នៅពេលអ្នកបញ្ចូលធាតុទៅក្នុងឯកសារ ពួកវានឹងត្រូវបានរក្សាទុកនៅទីនេះ។ ប្រសិនបើ​គ្មាន​ថត​ឯកសារ​ត្រូវ​បាន​ផ្តល់​ទេ ពួកវា​នឹង​ត្រូវ​បាន​រក្សាទុក​ក្នុង​ថត​ផ្ទះ​របស់អ្នក (/home/...)
-where to add the email address	addressbook	km	កន្លែងដែលត្រូវបន្ថែមអាសយដ្ឋានអុីមែល
-which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	km	ជ្រើសរើសទម្រង់អាសយដ្ឋានណាមួយដែលគួរប្រើសម្រាប់ប្រទេសដែលមានទម្រង់អាសយដ្ឋានមិនស្គាល់។
-which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	km	សៀវភៅអាសយដ្ឋានដើម្បីបន្ថែមទំនាក់ទំនង នៅពេលដែលអ្នកគ្មានសិទ្ធិបន្ថែមទៅសៀវភៅអាសយដ្ឋានបច្ចុប្បន្ន។
-which charset should be used for the csv export. the system default is the charset of this egroupware installation.	addressbook	km	សំណុំតួអក្សរមួយណាដែលត្រូវប្រើសម្រាប់ការនាំចេញ CSV ។
-which charset should be used for the vcard export.	addressbook	km	សំណុំតួអក្សរមួយណាដែលគួរប្រើសម្រាប់ការនាំចេញ vCard ។
-which charset should be used for the vcard import and export.	addressbook	km	សំណុំតួអក្សរមួយណាដែលគួរប្រើសម្រាប់ការនាំចូល និងនាំចេញ vCard ។
-which fields should be exported. all means every field stored in the addressbook incl. the custom fields. the business or home address only contains name, company and the selected address.	addressbook	km	តើវាលណាដែលត្រូវនាំចេញ។ ទាំងអស់មានន័យថាគ្រប់វាលទាំងអស់ដែលបានរក្សាទុកក្នុងសៀវភៅអាសយដ្ឋានរួមទាំង។ វាលផ្ទាល់ខ្លួន។ អាស័យដ្ឋានអាជីវកម្ម ឬផ្ទះមានតែឈ្មោះ ក្រុមហ៊ុន និងអាសយដ្ឋានដែលបានជ្រើសរើសប៉ុណ្ណោះ។
-whole query	addressbook	km	សំណួរទាំងមូល
-work email if given, else home email	addressbook	km	អុីមែលការងារប្រសិនបើត្រូវបានផ្តល់ឱ្យ អុីមែលផ្ទះផ្សេងទៀត។
-work phone	addressbook	km	ទូរស័ព្ទ​កន្លែងធ្វើការ
-write (update or add) a single entry by passing the fields.	addressbook	km	ធ្វើបច្ចុប្បន្នភាព ឬបន្ថែមធាតុតែមួយដោយឆ្លងកាត់វាល។
-wrong - try again ...	addressbook	km	ខុស - ព្យាយាមម្តងទៀត ...
-yes, for the next three days	addressbook	km	យល់ព្រម សម្រាប់បីថ្ងៃបន្ទាប់
-yes, for the next two weeks	addressbook	km	យល់ព្រម សម្រាប់ពីរសប្តាហ៍បន្ទាប់
-yes, for the next week	addressbook	km	យល់ព្រម សម្រាប់សប្តាហ៍ក្រោយ
-yes, for today and tomorrow	addressbook	km	យល់ព្រម សម្រាប់ថ្ងៃនេះ និងថ្ងៃស្អែក
-yes, only admins can purge deleted items	admin	km	យល់ព្រម មានតែអ្នកគ្រប់គ្រងប៉ុណ្ណោះដែលអាចសម្អាតធាតុដែលបានលុប
-yes, users can purge their deleted items	admin	km	យល់ព្រម អ្នកប្រើប្រាស់អាចសម្អាតធាតុដែលបានលុបរបស់ពួកគេ។
-you are not allowed to share into the addressbook of %1	addressbook	km	អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យចែករំលែកទៅក្នុងសៀវភៅអាសយដ្ឋាននៃ %1 ទេ។
-you are not permitted to delete contact %1	addressbook	km	អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យលុបទំនាក់ទំនង %1 ទេ។
-you are not permittet to delete this contact	addressbook	km	អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យលុបទំនាក់ទំនងនេះទេ។
-you are not permittet to edit this contact	addressbook	km	អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកែសម្រួលទំនាក់ទំនងនេះទេ។
-you are not permittet to view this contact	addressbook	km	អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យមើលទំនាក់ទំនងនេះទេ។
-you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	km	LDAP អាចត្រូវបានប្រើជាឃ្លាំងទំនាក់ទំនងលុះត្រាតែគណនីត្រូវបានរក្សាទុកនៅក្នុង LDAP ផងដែរ!
-you can respond by visiting:	addressbook	km	ដើម្បីមើលវាសូមចូលទៅកាន់៖
-you must select a vcard. (*.vcf)	addressbook	km	ជ្រើសរើស vCard ។ (*.vcf)
-you must select at least 1 column to display	addressbook	km	ជ្រើសរើសយ៉ាងហោចណាស់ 1 ជួរដើម្បីបង្ហាញ
-you need to select a distribution list	addressbook	km	ជ្រើសរើសបញ្ជីចែកចាយ
-you need to select some contacts first	addressbook	km	ជ្រើសរើសទំនាក់ទំនងមួយចំនួនជាមុនសិន
-you need to select some entries first	addressbook	km	អ្នកត្រូវជ្រើសរើសធាតុមួយចំនួនជាមុនសិន
-your new public key has been stored in accounts addressbook.	addressbook	km	សោសាធារណៈថ្មីរបស់អ្នកត្រូវបានរក្សាទុកក្នុងសៀវភៅអាសយដ្ឋានគណនី។
-zip code	common	km	លេខ​កូដ​តំបន់
-zip code (private)	addressbook	km	លេខ​កូដ​តំបន់ (ឯកជន)
-zip_note	addressbook	km	<p><b>ចំណាំ៖</b> ឯកសារអាចជាឯកសារ zip នៃបណ្តុំឯកសារ .csv, .vcf, ឬ .ldif ។ កុំលាយប្រភេទឯកសារក្នុងមួយការនាំចូល។

addressbook/lang/egw_lt.lang

@@ -1,33 +0,0 @@
-%1 shared this contact on %2 with %3 %4	addressbook	lt	%1 pasidalijo šiuo kontaktu %2 %3 %4
-duplicate threshold	addressbook	lt	Dublikato riba
-duplicate warning	addressbook	lt	Įspėjimas dėl pasikartojimo
-duplicates	addressbook	lt	Dublikatai
-fields to check for duplicates	addressbook	lt	Laukai, kuriuose tikrinama, ar nėra dublikatų
-fields to consider when looking for duplicate contacts.	addressbook	lt	Laukai, į kuriuos reikia atsižvelgti ieškant pasikartojančių kontaktų.
-hide accounts from addressbook	addressbook	lt	Paslėpti naudotojų paskyras
-hide all accounts	addressbook	lt	Paslėpti visas paskyras
-hide user groups as distribution lists	addressbook	lt	Paslėpti naudotojų grupes kaip paskirstymo sąrašus
-hides accounts completly from the adressbook.	addressbook	lt	Visiškai paslėpti naudotojų paskyras iš adresų knygos.
-how many fields must match for the record to be considered a duplicate.	addressbook	lt	Kiek laukų turi sutapti, kad įrašas būtų laikomas dublikatu.
-infolog	addressbook	lt	InfoLog kontaktai
-infolog-organisation	addressbook	lt	InfoLog organizacija
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	lt	Įkelti pasirinktinius laukus į rodyklę, net jei pasirinktinių laukų stulpelis išjungtas (pvz., norint juos rodyti konkrečiame rodyklės stulpelyje)
-merge duplicates	addressbook	lt	Sujungti dublikatus
-merge into first or account, deletes all other!	addressbook	lt	Sujungti į pirmąją arba paskyrą, ištrina visus kitus!
-move to addressbook	addressbook	lt	Perkelti į adresų knygelę
-no country selected	addressbook	lt	Šalis nepasirinkta
-no distribution list	addressbook	lt	Nėra paskirstymo sąrašo
-not shared	addressbook	lt	nesidalijama
-prevent deleting of contacts	admin	lt	Neleisti ištrinti kontaktų
-search letter	addressbook	lt	Paieškos raidė
-share into addressbook	addressbook	lt	Bendrinti į adresinę
-share writable	addressbook	lt	Dalijimasis rašomas
-shared	addressbook	lt	bendrinama
-shared by me	addressbook	lt	Dalijamasi su manimi
-shared into addressbook %1	addressbook	lt	pasidalinta į adresų knygelę %1
-shared with	addressbook	lt	Dalijamasi su
-unshare	addressbook	lt	Daugiau nebesidalyti
-unshared	addressbook	lt	nebesidalijama
-user groups are automatically shown as distribution lists.	addressbook	lt	Vartotojų grupės automatiškai rodomos kaip paskirstymo sąrašai.
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	lt	Sujungiant įrašus į dokumentus, jie bus saugomi čia. Jei katalogas nenurodytas, jie bus saugomi jūsų namų kataloge (/home/...).
-you are not allowed to share into the addressbook of %1	addressbook	lt	Jums neleidžiama bendrinti su adresų knyga %1

addressbook/lang/egw_lv.lang

@@ -1,22 +1,21 @@
 %1 records imported	addressbook	lv	Tika importēti %1 ieraksti
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	lv	%1 ieraksti nolasīti (vēl nav importēti, tu vari atgriezties %2 atpakaļ %3 un izslēgt Importēšanas pārbaudi)
-%1 shared this contact on %2 with %3 %4	addressbook	lv	%1 kopīgojis šo kontaktu %2 %3 %4
 (e.g. 1969)	addressbook	lv	(piem?ram, 1969)
-<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	lv	<b>nav pārveidošanas tipa <neviens> nevar tikt novienots.</b> Lūdzu izvēlies pārveidošanas veidu no saraksta.
+<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	lv	<b>nav pārveidošanas tipa &lt;neviens&gt; nevar tikt novienots.</b> Lūdzu izvēlies pārveidošanas veidu no saraksta.
 @-eval() is only availible to admins!!!	addressbook	lv	@-eval() ir pieejams tikai administratoriem!!!
 actions	addressbook	lv	Darbības
 add a single entry by passing the fields.	addressbook	lv	Pievienot vienu ierakstu apejot laukus
 add custom field	addressbook	lv	Pievienot papildus lauku
 added	addressbook	lv	PIevienots
 address book	common	lv	Adrešu grāmata
-address book - vcard in	addressbook	lv	Adrešu grāmata - vCard iekš
+address book - vcard in	addressbook	lv	Adrešu grāmata - Vkarte iekš
 address book - view	addressbook	lv	Adrešu grāmata - skats
 address line 2	addressbook	lv	Adreses 2. rindiņa
 address type	addressbook	lv	Adreses Tips
 addressbook	common	lv	Adrešu grāmata
 addressbook preferences	addressbook	lv	Adrešu grāmatas iestādījumi
 addressbook-fieldname	addressbook	lv	Adrešu grāmatas - Lauka nosaukums
-addvcard	addressbook	lv	Pievienot vCard
+addvcard	addressbook	lv	Pievienot VCard
 advanced search	addressbook	lv	Uzlabota meklēšana
 alt. csv import	addressbook	lv	Alternatīva CSV importēšana
 always	addressbook	lv	Vienmēr
@@ -62,9 +61,6 @@ department	common	lv	Nodaļa
 domestic	addressbook	lv	Kopmītne
 download	addressbook	lv	Lejupielādēt
 download export file (uncheck to debug output in browser)	addressbook	lv	Lejupieldēt eksporta failu (Atķeksē, lai redzētu izvadu pārlūkprogrammā)
-duplicate threshold	addressbook	lv	Dublēšanās slieksnis
-duplicate warning	addressbook	lv	Divkāršs brīdinājums
-duplicates	addressbook	lv	Dublikāti
 duration	addressbook	lv	Izpildes laiks
 edit custom field	addressbook	lv	Mainīt lauku
 edit custom fields	admin	lv	Mainīt laukus
@@ -81,8 +77,6 @@ fax number	common	lv	Faksa numurs
 field %1 has been added !	addressbook	lv	Lauks %1 tika pievienots !
 field %1 has been updated !	addressbook	lv	Lauks %1 tika atjaunināts !
 field name	addressbook	lv	Lauka vārds
-fields to check for duplicates	addressbook	lv	Lauki, kuros pārbauda, vai nav dublikātu
-fields to consider when looking for duplicate contacts.	addressbook	lv	Lauki, kas jāņem vērā, meklējot dublējošos kontaktus.
 fields to show in address list	addressbook	lv	Lauki kuri tiek rādīti adrešu sarakstā
 fieldseparator	addressbook	lv	Lauku atdal?t?js
 full name	addressbook	lv	Pilns vārds
@@ -91,10 +85,6 @@ geo	addressbook	lv	GEO
 global categories	addressbook	lv	Globālās kategorijas
 grant addressbook access	common	lv	Nodrošināt piekļuvi adrešu grāmatai
 h	addressbook	lv	h
-hide accounts from addressbook	addressbook	lv	Paslēpt lietotāju kontus
-hide all accounts	addressbook	lv	Paslēpt visus kontus
-hide user groups as distribution lists	addressbook	lv	Paslēpt lietotāju grupas kā sadales sarakstus
-hides accounts completly from the adressbook.	addressbook	lv	Pilnībā paslēpt lietotāju kontus no adrešu grāmatas.
 home city	addressbook	lv	Pilsēta
 home country	addressbook	lv	Valsts
 home email	addressbook	lv	Mājas e-pasts
@@ -102,19 +92,17 @@ home phone	addressbook	lv	Mājas telefons
 home state	addressbook	lv	Štats
 home street	addressbook	lv	Iela
 home zip code	addressbook	lv	Pasta indekss
-how many fields must match for the record to be considered a duplicate.	addressbook	lv	Cik daudziem laukiem jābūt vienādiem, lai ieraksts tiktu uzskatīts par dublikātu.
 icon	addressbook	lv	Ikona
 import	addressbook	lv	Importēt
 import contacts	addressbook	lv	Importēt kontaktus
 import csv-file into addressbook	addressbook	lv	Importēt CSV-failu adrešu grāmatā
 import file	addressbook	lv	Importēt failu
 import from	addressbook	lv	Importēt no
-import from ldif, csv, or vcard	addressbook	lv	Importēt no LDIF, CSV vai vCard
+import from ldif, csv, or vcard	addressbook	lv	Importēt no LDIF, CSV vai VCard
 import from outlook	addressbook	lv	Importēt no Outlook
-import multiple vcard	addressbook	lv	Importēt vairākas vCard
+import multiple vcard	addressbook	lv	Importēt vairākas VCard
 import next set	addressbook	lv	Importēt nākošo porciju
-infolog	addressbook	lv	InfoLog Kontaktpersona
-infolog-organisation	addressbook	lv	InfoLog organizācija
+infolog	addressbook	lv	Projekti
 international	addressbook	lv	Internacion?ls
 label	addressbook	lv	Eti?ete (label)
 last modified	addressbook	lv	Pēdējo reizi pārveidots
@@ -124,23 +112,16 @@ ldif	addressbook	lv	LDIF
 line 2	addressbook	lv	2. rindiņa
 links	addressbook	lv	Saites
 list all categories	addressbook	lv	Kategoriju saraksts
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	lv	Ielādēt pielāgotos laukus indeksā, pat ja pielāgotā lauka sleja ir izslēgta (piemēram, lai tos parādītu konkrētā indeksa slejā).
-load vcard	addressbook	lv	Ielādēt vCard
+load vcard	addressbook	lv	Ielādēt VCard
 location	addressbook	lv	Novietojums
 mark records as private	addressbook	lv	Iezīmēt ierakstus kā privātus
-merge duplicates	addressbook	lv	Dublikātu apvienošana
-merge into first or account, deletes all other!	addressbook	lv	Apvienot pirmajā vai kontā, dzēš visus pārējos!
 message phone	addressbook	lv	Autoatbildētājs
 middle name	addressbook	lv	Otrais vārds
 mobile	addressbook	lv	Mobīlais
 mobile phone	addressbook	lv	Mobīlais tālrunis
 modem phone	addressbook	lv	Modēma tālrunis
-move to addressbook	addressbook	lv	Pārvietot uz adrešu grāmatu
-multiple vcard	addressbook	lv	Vairākas vCard
-no country selected	addressbook	lv	Nav izvēlēta neviena valsts
-no distribution list	addressbook	lv	Nav izplatīšanas saraksta
-no vcard	addressbook	lv	Nav vCard
-not shared	addressbook	lv	nav koplietoti
+multiple vcard	addressbook	lv	Vairākas VCard
+no vcard	addressbook	lv	Nav VCard
 number of records to read (%1)	addressbook	lv	Lasāmo ierakstu skaits (%1)
 other number	addressbook	lv	Cits nummurs
 other phone	addressbook	lv	Cits telefons
@@ -153,7 +134,6 @@ phone numbers	common	lv	Telefona numuri
 please enter a name for that field !	addressbook	lv	Lūdzu, ievadiet lauka nosaukumu !
 pref	addressbook	lv	prim
 prefix	addressbook	lv	Prefiks
-prevent deleting of contacts	admin	lv	Aizliegt kontaktu dzēšanu
 public key	addressbook	lv	Publiskā atslēga
 read a list of entries.	addressbook	lv	Lasīt ierakstu sarakstu.
 read a single entry by passing the id and fieldlist.	addressbook	lv	Lasīt vienu ierakstu, apejot id un lauku sarakstu
@@ -161,16 +141,9 @@ record access	addressbook	lv	Piekļuve ierakstam
 record owner	addressbook	lv	Ieraksta īpašnieks
 repetition	addressbook	lv	Atkārtojums
 role	addressbook	lv	Loma
-search letter	addressbook	lv	Meklēt burtu
 select all	addressbook	lv	Iezīmēt visus
 select the type of conversion	addressbook	lv	Iezīmēt sarunas veidu
 select the type of conversion:	addressbook	lv	Izvēlēties sarunas veidu:
-share into addressbook	addressbook	lv	Kopīgot adrešu grāmatiņā
-share writable	addressbook	lv	Koplietošana rakstāms
-shared	addressbook	lv	kopīgots
-shared by me	addressbook	lv	kopīgots ar mani
-shared into addressbook %1	addressbook	lv	kopīgots adrešu grāmatiņā %1
-shared with	addressbook	lv	Dalīta ar
 show	addressbook	lv	Rādīt
 startrecord	addressbook	lv	Sākuma ieraksts
 state	common	lv	Štats
@@ -186,20 +159,15 @@ today is %1's birthday!	common	lv	Šodien ir %1 ir dzimšanas diena!
 tomorrow is %1's birthday.	common	lv	Rīt %1 ir dzimšanas diena.
 translation	addressbook	lv	Tulkojums
 type	addressbook	lv	Tips
-unshare	addressbook	lv	vairs nav koplietošanas
-unshared	addressbook	lv	vairs nav koplietojams
 update a single entry by passing the fields.	addressbook	lv	Atjaunini vienu ierakstu apejot lauku
 updated	addressbook	lv	Atjaunināts
 use country list	addressbook	lv	Izmantot valstu sarakstu
-user groups are automatically shown as distribution lists.	addressbook	lv	Lietotāju grupas automātiski tiek parādītas kā sadales saraksti.
-vcard	common	lv	vCard
-vcards require a first name entry.	addressbook	lv	vCard pieprasa vārda ievadīšanu
-vcards require a last name entry.	addressbook	lv	vCard pieprasa uzvārda ievadīšanu
+vcard	common	lv	VCard
+vcards require a first name entry.	addressbook	lv	VCard pieprasa vārda ievadīšanu
+vcards require a last name entry.	addressbook	lv	VCard pieprasa uzvārda ievadīšanu
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	lv	BRĪDINĀJUMS!! LDAP ir derīgs tikai tad, ja tu neizmanto kontaktus kontu glabātuvei!
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	lv	Apvienojot ierakstus dokumentos, tie tiks saglabāti šeit. Ja direktorija nav norādīta, tie tiks saglabāti jūsu mājas direktorijā (/home/...).
 work phone	addressbook	lv	Darba telefons
-you are not allowed to share into the addressbook of %1	addressbook	lv	Jums nav atļauts kopīgot ar adrešu grāmatu %1
-you must select a vcard. (*.vcf)	addressbook	lv	Jums ir jāizvēlas vCard. (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	lv	Jums ir jāizvēlas Vcard. (*.vcf)
 you must select at least 1 column to display	addressbook	lv	Jums ir jāzvēlas vismaz 1 kolonna ko parīdit
 zip code	common	lv	Pasta inekss
 zip_note	addressbook	lv	<p><b>Piezīme:</b> Fails drīkst būt .zip ar sazipotiem .csv, .vcf, or .ldif failiem. Tomēr, vienā zip failā lieciet viena tipa failus.

addressbook/lang/egw_nl.lang

@@ -3,10 +3,9 @@
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	nl	%1 contact(en) %2, %3 mislukt vanwege onvoldoende rechten !!!
 %1 contacts updated (%2 errors).	addressbook	nl	%1 contacten bijgewerkt (%2 fouten)
 %1 fields in %2 other organisation member(s) changed	addressbook	nl	%1 velden in %2 andere organisatie lid/leden gewijzigd
-%1 not implemented for %2!	addressbook	nl	%1 niet geimplementeerd voor %2!
+%1 not implemented for %2!	addressbook	nl	%1 niet geimplemnteerd voor %2!
 %1 records imported	addressbook	nl	%1 adressen geïmporteerd
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	nl	%1 adressen gelezen (nog niet geïmporteerd, U kunt %2terug%3 gaan en "Test Import" uitzetten)
-%1 shared this contact on %2 with %3 %4	addressbook	nl	%1 heeft dit contact gedeeld op %2 %3 %4
 %1 starts with '%2'	addressbook	nl	%1 begint met '%2'
 %s please calculate the result	addressbook	nl	%s bereken svp het resultaat
 (e.g. 1969)	addressbook	nl	(bijv. 1969)
@@ -19,9 +18,9 @@ accounts	addressbook	nl	Accounts
 actions	addressbook	nl	Acties
 add %1	addressbook	nl	%1 toevoegen
 add a contact to this organisation	addressbook	nl	Voeg een contact toe aan deze organisatie
-add a customfield to link title	addressbook	nl	Voeg een zelf gedefinieerd veld toe om titel te linken
+add a customfield to link title	addressbook	nl	Voeg een zelf gedinieerd veld toe om titel te linken
 add a new contact	addressbook	nl	Voeg een contact toe
-add a new infolog	addressbook	nl	Voeg een nieuw InfoLog record toe
+add a new infolog	addressbook	nl	Voeg een nieuw Infolog record toe
 add a new list	addressbook	nl	Voeg een nieuwe lijst toe
 add a single entry by passing the fields.	addressbook	nl	Voeg een enkele invoer toe door door de velden te geven
 add appointment	addressbook	nl	Voeg een afspraak toe
@@ -29,7 +28,7 @@ add business email of whole distribution list?	addressbook	nl	Voeg bedrijfsemail
 add custom field	addressbook	nl	Aangepast veld toevoegen
 add customfield to links of addressbook, which displays in other applications. the default value is none customfield.	addressbook	nl	Voeg aangepast veld toe aan links van adresboek, welke zichtbaar is in andere applicaties. De standaard waarde is geen aangepast veld.
 add emails of whole distribution list?	addressbook	nl	Voeg emailadressen van de hele distributie lijst toe?
-add or delete categories	addressbook	nl	Toevoegen of verwijderen van categoriën
+add or delete categories	addressbook	nl	Toevoegen of verwijderen categoriën
 add to bcc	addressbook	nl	Voeg aan BCc toe
 add to cc	addressbook	nl	Voeg aan CC toe
 add to distribution list	addressbook	nl	Voeg toe aan distributie lijst
@@ -40,7 +39,7 @@ added by synchronisation	addressbook	nl	toegevoegd tijdens synchronisatie
 added to distribution list	addressbook	nl	toegevoegd aan distributielijst
 additional information about using ldap as contact repository	admin	nl	Aanvullende informatie over het gebruik van LDAP als contact repository
 address book	common	nl	Adresboek
-address book - vcard in	addressbook	nl	Adresboek - vCard in
+address book - vcard in	addressbook	nl	Adresboek - VCard in
 address book - view	addressbook	nl	Adresboek - weergave
 address line 2	addressbook	nl	Adresregel 2
 address line 2 (private)	addressbook	nl	Adresregel 2 (prive)
@@ -57,10 +56,10 @@ addressbook the contact should be shown	addressbook	nl	Adresboek waarin de conta
 addressbook vcard export	addressbook	nl	Adresboek vCard export
 addressbook vcard import	addressbook	nl	Adresboek vCard import
 addressbook-fieldname	addressbook	nl	Adresboek-veldnaam
-addvcard	addressbook	nl	vCard toevoegen
+addvcard	addressbook	nl	VCard toevoegen
 advanced search	addressbook	nl	UItgebreid zoeken
 all contacts	addressbook	nl	Alle contacten
-all in one field	addressbook	nl	Alles in 1 veld
+all in one field	addressbook	nl	Alles im 1 veld
 allow members of following groups to edit contact-data of accounts	addressbook	nl	Sta alle leden van de volgende groepen toe alle contact data te wijzigen van accounts
 allow users to maintain their own account-data	admin	nl	Laat gebruikers toe hun eigen accountgegevens te beheren
 alt. csv import	addressbook	nl	Alternatief CSV-bestand importeren
@@ -89,7 +88,7 @@ business zip code	addressbook	nl	Postcode Bedrijf
 calendar fields:	addressbook	nl	Kaldendervelden:
 calendar uri	addressbook	nl	Kalender URI
 can be changed via setup >> configuration	admin	nl	Kan gewijzigd worden via Setup >> Configuratie
-can't create dn %1	addressbook	nl	Kan dn %1 niet aanmaken
+can't create dn %1	addressbook	nl	Kan dn %1 niet maken
 car phone	addressbook	nl	Autotelefoon
 categorie	addressbook	nl	categorie
 categorie added	addressbook	nl	categorie toegevoegd
@@ -116,6 +115,7 @@ company name	addressbook	nl	Bedrijfsnaam
 configuration	common	nl	Instelling
 contact	common	nl	Contact
 contact application	admin	nl	Contactaanvraag
+contact copied	addressbook	nl	Contact gekopieerd
 contact data	addressbook	nl	Contactgegevens
 contact deleted	addressbook	nl	Contact verwijderd
 contact fields to show	addressbook	nl	Contactvelden die getoond moeten worden
@@ -166,14 +166,14 @@ default filter	addressbook	nl	Standaard filter
 default format for fileas, eg. for new entries.	addressbook	nl	Standaard formaat voor bestanden, bijvoorbeeld voor nieuwe invoer.
 default is to open email addresses in egroupware email application, if user has access to it.	addressbook	nl	Standaard is om EMail (berichten) adressen te openen in EGroupware  EMail (berichten) applicatie, als de gebruiker er toegang toe heeft.
 defines which email address (business or home) to use as the preferred one for distribution lists in mail.	addressbook	nl	Bepaalt welk emailadres (zakelijk of prive) gebruikt moet worden als het voorkeursadres voor distributielijsten in email.
-delete a single entry by passing the id.	addressbook	nl	Verwijder een enkel record door het ID te geven.
+delete a single entry by passing the id.	addressbook	nl	Verwijder een enkel record door het ID. te geven
 delete selected distribution list!	addressbook	nl	Verwijder de geselecteerde distributielijst!
 delete this contact	addressbook	nl	Verwijder deze contact
 delete this organisation including all its contacts	addressbook	nl	Verwijder deze organisatie inclusief ALLE contacten
 deleted	addressbook	nl	verwijderd
 deletes the photo	addressbook	nl	Verwijdert de foto
 department	common	nl	Afdeling
-departments	addressbook	nl	Afdelingen
+departments	addressbook	nl	afdelingen
 directory with documents to insert contacts	addressbook	nl	Directory met documenten om contacten in te voegen
 display contact	addressbook	nl	Contact weergeven
 displays a remider for birthdays on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	nl	Toont een herinnering voor verjaardagen op de voorpagina (de pagina die je te zien krijgt als je EGroupware start of wanneer je op het voorpagina ikoon klikt)
@@ -189,9 +189,6 @@ don't hide empty columns	addressbook	nl	Lege kolommen niet verbergen
 download	addressbook	nl	Download
 download export file (uncheck to debug output in browser)	addressbook	nl	Download export bestand (uitzetten om in verkenner te tonen)
 download this contact as vcard file	addressbook	nl	dit contact als vCardbestand downloaden
-duplicate threshold	addressbook	nl	Dubbele drempel
-duplicate warning	addressbook	nl	Duplicaat waarschuwing
-duplicates	addressbook	nl	Duplicaten
 duration	addressbook	nl	Duur
 each category in its own field	addressbook	nl	Elke categorie in zijn eigen veld
 each option in its own field	addressbook	nl	Elke optie in zin eigen veld
@@ -211,8 +208,8 @@ enable an extra private addressbook	addressbook	nl	Maak een extra persoonlijk ad
 enclosure	addressbook	nl	Bijgesloten
 end	addressbook	nl	Einde
 enter the path to the exported file here	addressbook	nl	Geef folder voor het te exporteren bestand hier aan
-error deleting the contact !!!	addressbook	nl	Fout bij verwijderen van het contact !!!
-error saving the contact !!!	addressbook	nl	Fout bij bewaren van het contact !!!
+error deleting the contact !!!	addressbook	nl	Fout bij verwijderen van contact !!!
+error saving the contact !!!	addressbook	nl	Fout bij bewaren van contact !!!
 error: the entry has been updated since you opened it for editing!	addressbook	nl	Fout: het record is gewijzigd sinds jij bent begonnen met wijzigen!
 example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	addressbook	nl	Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.
 example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller	preferences	nl	Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller
@@ -221,7 +218,7 @@ example {{nenvlf role}} - if field role is not empty, set a lf without any value
 existing links	addressbook	nl	Bestaande links
 exists	addressbook	nl	Bestaat
 export as csv	addressbook	nl	Exporteer als CSV
-export as vcard	addressbook	nl	Exporteer als vCard
+export as vcard	addressbook	nl	Exporteer als VCard
 export contacts	addressbook	nl	Exporteer contacten
 export definition to use for nextmatch export	addressbook	nl	Export definitie om te gebruiken bij nextmatch export
 export definitition to use for nextmatch export	addressbook	nl	Export definitie om te gebruiken bij nextmatch export
@@ -245,8 +242,6 @@ field %1 has been updated !	addressbook	nl	Veld 1% bijgewerkt !
 field name	addressbook	nl	Veldnaam
 fields for the csv export	addressbook	nl	Velden voor de CSV export
 fields the user is allowed to edit himself	admin	nl	Velden die de gebruiker zelf mag wijzigen
-fields to check for duplicates	addressbook	nl	Velden om te controleren op duplicaten
-fields to consider when looking for duplicate contacts.	addressbook	nl	Velden waarmee rekening moet worden gehouden bij het zoeken naar dubbele contacten.
 fields to copy when copying an address?	admin	nl	Velden welke moeten worden gekopieerd als er een adres wordt gekopieerd
 fields to show in address list	addressbook	nl	Velden die zichtbaar zijn in adreslijst
 fieldseparator	addressbook	nl	Scheidingssymbool velden
@@ -263,8 +258,6 @@ grant addressbook access	common	nl	Geen toegang adresboek
 group %1	addressbook	nl	Groep %1
 h	addressbook	nl	u
 hide accounts from addressbook	addressbook	nl	Verberg accounts in het adresboek
-hide all accounts	addressbook	nl	Alle accounts verbergen
-hide user groups as distribution lists	addressbook	nl	Verberg gebruikersgroepen als distributielijsten
 hides accounts completly from the adressbook.	addressbook	nl	Hou de accounts helemaal uit het adresboek
 history logging	admin	nl	Historie vastleggen
 home address	addressbook	nl	Privé adres
@@ -278,7 +271,6 @@ home state	addressbook	nl	Privé Provincie / Staat / Streek
 home street	addressbook	nl	Privé Straat
 home zip code	addressbook	nl	Privé Postcode
 how many contacts should non-admins be able to export	admin	nl	Hoeveel contactpersonen moet een niet-beheerder kunnen exporteren
-how many fields must match for the record to be considered a duplicate.	addressbook	nl	Hoeveel velden moeten overeenkomen om de record als een duplicaat te beschouwen.
 html link to the current record	addressbook	nl	HTML link naar huidig record
 icon	addressbook	nl	Icoon
 if accounts are already in ldap	admin	nl	indien accounts reeds in LDAP zitten
@@ -288,18 +280,17 @@ import contacts	addressbook	nl	Contacten Importeren
 import csv-file into addressbook	addressbook	nl	CSV-bestand importeren naar adresboek
 import file	addressbook	nl	Bestand importeren
 import from	addressbook	nl	Importeren vanuit
-import from ldif, csv, or vcard	addressbook	nl	Importeren vanuit LDIF, CSV or vCard
+import from ldif, csv, or vcard	addressbook	nl	Importeren vanuit LDIF, CSV or VCard
 import from outlook	addressbook	nl	Importeren vanuit Outlook
-import multiple vcard	addressbook	nl	Importeer Meervoudige vCard
+import multiple vcard	addressbook	nl	Importeer Meervoudige VCard
 import next set	addressbook	nl	Importeren volgende serie
-import_instructions	addressbook	nl	In Netscape, open het adressenboek en selecteer <b>Exporteren</b> in het menu <b>Bestand</b>. Het bestand wordt geexporteerd in het LDIF formaat.<p>Of, in Outlook, selecteer de contacten-folder, kies <b>Importeren en Exporteren...</b> in het menu <b>Bestand</b> en exportoor als komma gescheiden tekst bestand (CSV).<p>Of, in Palm Desktop 4.0 of nieuwer, kies het adresboek en selecteer <b>Exporteren</b> in het menu <b>Bestand</b>, het bestand wordt geëxporteerd in het vCard formaat.
+import_instructions	addressbook	nl	In Netscape, open het adressenboek en selecteer <b>Exporteren</b> in het menu <b>Bestand</b>. Het bestand wordt geexporteerd in het LDIF formaat.<p>Of, in Outlook, selecteer de contacten-folder, kies <b>Importeren en Exporteren...</b> in het menu <b>Bestand</b> en exportoor als komma gescheiden tekst bestand (CSV).<p>Of, in Palm Desktop 4.0 of nieuwer, kies het adresboek en selecteer <b>Exporteren</b> in het menu <b>Bestand</b>, het bestand wordt geëxporteerd in het VCard formaat.
 importer's personal	addressbook	nl	Importeer eigen
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	nl	Importeert contacten in je adresboek vanuit een CSV bestand. CSV betekent 'Komma gescheiden waarden'. Maar in het Opties tabblad kun je ook andere scheidingstekens kiezen.
 imports contacts into your addressbook from a vcard file.	addressbook	nl	Importeer contacten in uw adresboek van een bestand in vCard
 in %1 days (%2) is %3's birthday.	addressbook	nl	Over %1 dagen (%2) is %3  jarig.
 income	addressbook	nl	Inkomend
-infolog	addressbook	nl	InfoLog Contact
-infolog-organisation	addressbook	nl	InfoLog Organisatie
+infolog	addressbook	nl	InfoLog
 insert	addressbook	nl	Voeg toe
 insufficent rights to delete this list!	addressbook	nl	Niet genoeg rechten om deze lijst te verwijderen!
 international	addressbook	nl	Internationaal
@@ -323,16 +314,14 @@ list already exists!	addressbook	nl	Lijst bestaat reeds!
 list created	addressbook	nl	Lijst aangemaakt
 list creation failed, no rights!	addressbook	nl	Lijst aanmaak is mislukt, geen rechten!
 list of files linked to the current record	addressbook	nl	Lijs van bestanden gelinkt aan huidig record
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	nl	Laad aangepaste velden in index, zelfs als aangepaste veld kolom is uitgeschakeld (bijvoorbeeld om ze weer te geven in een specifieke index kolom)
-load vcard	addressbook	nl	Laad vCard
+load vcard	addressbook	nl	Laad VCard
 location	addressbook	nl	Locatie
 locations	addressbook	nl	locaties
-mail vcard	addressbook	nl	Mail vCard
+mail vcard	addressbook	nl	Mail VCard
 main categories in their own field	addressbook	nl	Hoofd categorien in hun eigen veld
 manage mapping	addressbook	nl	Beheer de mappings
 mark records as private	addressbook	nl	Markeer records als privé
 merge contacts	addressbook	nl	Voeg contacten samen
-merge duplicates	addressbook	nl	Duplicaten samenvoegen
 merge into first or account, deletes all other!	addressbook	nl	Samenvoegen in eerste of in account, verwijdert alle andere!
 merged	addressbook	nl	samengevoegd
 message after submitting the form	addressbook	nl	Bericht na verzenden van het formulier
@@ -347,24 +336,21 @@ modem phone	addressbook	nl	Telefoonmodem
 more ...	addressbook	nl	Meer ...
 move to addressbook	addressbook	nl	Verplaats naar adresboek
 moved	addressbook	nl	verplaatst
-multiple vcard	addressbook	nl	Meervoudige vCard
+multiple vcard	addressbook	nl	Meervoudige VCard
 name for the distribution list	addressbook	nl	Naam voor de distributielijst
 name of current user, all other contact fields are valid too	addressbook	nl	Naam van de huidige gebruiker, alle andere contactvelden zijn ook geldig
 name, address	addressbook	nl	Naam, adres
 new contact submitted by %1 at %2	addressbook	nl	Nieuwe contact toegevoegd op %2 door %1
-new window opened to edit infolog for your selection	addressbook	nl	Nieuw venster geopend waarin de InfoLog voor uw selectie bewerkt wordt
+new window opened to edit infolog for your selection	addressbook	nl	Nieuw venster geopend waarin de Infolog voor uw selectie bewerkt wordt
 next date	addressbook	nl	Volgende datum
 no categories selected	addressbook	nl	geen categorieën geselecteerd
-no country selected	addressbook	nl	Geen land geselecteerd
-no distribution list	addressbook	nl	Geen distributielijst
 no fallback	addressbook	nl	Geen aktie ongedaan maken
-no vcard	addressbook	nl	Geen vCard
-not shared	addressbook	nl	niet gedeeld
+no vcard	addressbook	nl	Geen VCard
 number	addressbook	nl	Nummer/aantal
 number of records to read (%1)	addressbook	nl	Aantal adressen om te lezen (%1)
 open email addresses in external mail program	addressbook	nl	Open EMal adres in extern mail (berichten)programma
 open for editing?	addressbook	nl	Open voor bewerken ?
-open infolog crm view	preferences	nl	Open InfoLog CRM beeld
+open infolog crm view	preferences	nl	Open Infolog CRM beeld
 open tracking system crm view	preferences	nl	Open Tracking systeem CRM beeld
 options for type	admin	nl	Opties voor type
 organisation	addressbook	nl	organisatie
@@ -428,12 +414,6 @@ send succeeded to %1	common	nl	Zend verzenden gelukt naar %1
 seperator	addressbook	nl	Scheidingsteken
 set full name and file as field in contacts of all users (either all or only empty values)	admin	nl	Zet volledige naam en 'bestand als'in contacten van alle gebruikers. Of allemaal vullen of allemaal leeg laten
 set only full name	addressbook	nl	Geef alleen de volledig naam
-share into addressbook	addressbook	nl	Delen in adresboek
-share writable	addressbook	nl	Deel beschrijfbaar
-shared	addressbook	nl	gedeeld
-shared by me	addressbook	nl	Gedeeld door mij
-shared into addressbook %1	addressbook	nl	gedeeld in adresboek %1
-shared with	addressbook	nl	Gedeeld met
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	nl	Moeten de kolommen foto en thuisadres altijd worden weergegeven, zelfs als ze leeg zijn?
 show	addressbook	nl	Toon
 show infolog entries for this organisation	addressbook	nl	InfoLog details van deze organisatie weergeven
@@ -480,8 +460,6 @@ unable to convert "%1" to account id.  using plugin setting (%2) for owner.	addr
 unable to delete	addressbook	nl	Niet mogelijk te verwijderen
 unique id (uid)	addressbook	nl	Uniek ID (UID)
 unique id<br />(to update existing records)	addressbook	nl	Uniek ID <br /> voor bijwerken bestaand record
-unshare	addressbook	nl	Niet langer delen
-unshared	addressbook	nl	niet langer gedeeld
 update a single entry by passing the fields.	addressbook	nl	Een record bijwerken door de velden te geven
 update fields by edited organisations?	admin	nl	Velden van de gewijzigde organisatie bijwerken?
 updated	addressbook	nl	Bijgewerkt
@@ -490,16 +468,16 @@ url (business)	addressbook	nl	url (zakelijk)
 url (private)	addressbook	nl	url (prive)
 url to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)	admin	nl	URL waaraan telefoonnummers gelinkt moeten worden (gebruik %1 = nummer dat je wilt bellen, %u = account naam, %t = account telefoonnummer)
 use addressbooks "own sorting" attribute	addressbook	nl	Gebruik adresboek zijn "eigen sorteer" methode
+use an extra category tab?	addressbook	nl	Een extra categorie tabblad gebruiken?
 use an extra tab for private custom fields?	admin	nl	Een extra categorie tabblad gebruiken voor persoonlijke aangepaste velden?
 use country list	addressbook	nl	Gebruik Landenlijst
 use setup for a full account-migration	admin	nl	gebruik setup voor een volledige accountmigratie
 use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	nl	Gebruik deze tag voor adres labels.Plaats de inhoud welke je wilt herhalen tussen twee tags.
 used for links and for the own sorting of the list	addressbook	nl	gebruikt voor links en voor eigen sortering van de lijst
-user groups are automatically shown as distribution lists.	addressbook	nl	Gebruikersgroepen worden automatisch getoond als distributielijsten.
 user preference	addressbook	nl	Gebrukers voorkeur
-vcard	common	nl	vCard
-vcards require a first name entry.	addressbook	nl	vCard vereist dat de voornaam ingevoerd is.
-vcards require a last name entry.	addressbook	nl	vCard vereist dat de achternaam ingevoerd is.
+vcard	common	nl	VCard
+vcards require a first name entry.	addressbook	nl	VCard vereist dat de voornaam ingevoerd is.
+vcards require a last name entry.	addressbook	nl	VCard vereist dat de achternaam ingevoerd is.
 verification	addressbook	nl	Verificatie
 view linked infolog entries	addressbook	nl	Gekoppelde InfoLog details bekijken
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	nl	WAARSCHUWING!! Alleen LDAP gebruiken als het adresboek niet wordt gebruikt om de accounts op te slaan!
@@ -507,7 +485,6 @@ warning: all contacts found will be deleted!	addressbook	nl	WAARSCHUWING: Alle g
 weekday	addressbook	nl	Werkdag
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	nl	Wat moeten koppelingen aan het adresboek in andere toepassingen moeten weergeven. Lege waardes worden genegeerd. U moet opnieuw inloggen, als u deze instelling wijzigt!
 when viewing a contact, show linked entries from the selected application	addressbook	nl	Bij het bekijken van een contact, toon de verbonden invoer van de geselecteerde invoer
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	nl	Wanneer u vermeldingen in documenten samenvoegt, worden ze hier opgeslagen. Als er geen map is opgegeven, worden ze opgeslagen in uw thuismap (/home/...)
 where to add the email address	addressbook	nl	waar moet het emailadres toegevoegd worden
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	nl	Welk adresformaat moet het adresboek gebruiken voor landen waarvan het adresformaat nog niet bekend is. Indien het adresformaat van een land bekend is wordt het ongeacht deze instelling gebruikt.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	nl	Welke adresboek moet geselecteerd worden wanneer een contact wordt bijgevoegd EN wanneer u geen toevoegingsrecht heb bij het huidige adresboek.
@@ -526,14 +503,13 @@ yes, for the next week	addressbook	nl	Ja, voor de volgende week
 yes, for today and tomorrow	addressbook	nl	Ja, voor vandaag en morgen
 yes, only admins can purge deleted items	admin	nl	Ja, alleen beheerders kunnen gewiste items definitief verwijderen
 yes, users can purge their deleted items	admin	nl	Ja, gebruikers kunnen hun verwijderde items defintief verwijderen
-you are not allowed to share into the addressbook of %1	addressbook	nl	U mag niet delen naar adresboek %1
 you are not permitted to delete contact %1	addressbook	nl	U bent niet bevoegd om contact %1 te verwijderen
 you are not permittet to delete this contact	addressbook	nl	U bent niet bevoegd om dit contact te verwijderen
 you are not permittet to edit this contact	addressbook	nl	U bent niet bevoegd om dit contact te wijzigen
 you are not permittet to view this contact	addressbook	nl	U bent niet bevoegd om dit contact te bekijken
 you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	nl	U kunt LDAP alleen als een contactdatabase gebruiken als de accounts ook in LDAP zijn opgeslagen!
 you can respond by visiting:	addressbook	nl	Om het te bekijken bezoek je:
-you must select a vcard. (*.vcf)	addressbook	nl	U moet een vCard selecteren (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	nl	U moet een VCard selecteren (*.vcf)
 you must select at least 1 column to display	addressbook	nl	U moet een op z'n minst 1 kolom selecteren om weer te geven
 you need to select a distribution list	addressbook	nl	U moet een distributielijst kiezen
 you need to select some contacts first	addressbook	nl	U moet eerst enkele contacten selecteren

addressbook/lang/egw_pl.lang

@@ -6,7 +6,6 @@
 %1 not implemented for %2!	addressbook	pl	%1 nie zaimplementowany dla %2!
 %1 records imported	addressbook	pl	Zaimportowano %1 rekordów
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	pl	Wczytano %1 rekordów (ale jeszcze nie zaimportowano, możesz %2wrócić%3 i skasować zaznaczenie próbnego importu)
-%1 shared this contact on %2 with %3 %4	addressbook	pl	%1 udostępnił ten kontakt na %2 %3 %4
 %1 starts with '%2'	addressbook	pl	%1 zaczyna się od %2
 %s please calculate the result	addressbook	pl	%s proszę obliczyć rezultat
 (e.g. 1969)	addressbook	pl	(np. 1969)
@@ -159,9 +158,6 @@ don't hide empty columns	addressbook	pl	Nie ukrywaj pustych kolumn
 download	addressbook	pl	Pobierz
 download export file (uncheck to debug output in browser)	addressbook	pl	Zapisz plik na dysku (jeżeli nie zaznaczysz, wynik będzie pokazany wyłącznie w oknie przeglądarki)
 download this contact as vcard file	addressbook	pl	sciągnij ten kontakt jako plik vCard
-duplicate threshold	addressbook	pl	Próg dla duplikatów
-duplicate warning	addressbook	pl	Ostrzeżenie o duplikatach
-duplicates	addressbook	pl	Duplikaty
 duration	addressbook	pl	Czas trwania
 edit custom field	addressbook	pl	Edytuj pole użytkownika
 edit custom fields	admin	pl	Edytuj pola użytkownika
@@ -200,8 +196,6 @@ field %1 has been updated !	addressbook	pl	Pole %1 zostało zaktualizowane !
 field name	addressbook	pl	Nazwa pola
 fields for the csv export	addressbook	pl	Pola do wyeksportowania do CSV
 fields the user is allowed to edit himself	admin	pl	Pola, które mogą być edytowane przez użytkownika
-fields to check for duplicates	addressbook	pl	Pola do sprawdzenia pod kątem duplikatów
-fields to consider when looking for duplicate contacts.	addressbook	pl	Pola do uwzględnienia przy wyszukiwaniu zduplikowanych kontaktów.
 fields to show in address list	addressbook	pl	Pola pokazywane na liście adresów
 fieldseparator	addressbook	pl	Separator pól
 for read only ldap	admin	pl	dla dostępu LDAP tylko do odczytu
@@ -216,8 +210,6 @@ grant addressbook access	common	pl	Nadaj prawa dostępu do książki adresowej
 group %1	addressbook	pl	Grupa %1
 h	addressbook	pl	g
 hide accounts from addressbook	addressbook	pl	Ukryj konta z książki adresowej
-hide all accounts	addressbook	pl	Ukryj wszystkie konta
-hide user groups as distribution lists	addressbook	pl	Ukryj grupy użytkowników jako listy dystrybucyjne
 hides accounts completly from the adressbook.	addressbook	pl	Ukrywa całkowicie konta z książki adresowej
 home address	addressbook	pl	Adres domowy
 home address, birthday, ...	addressbook	pl	Adres domowy, urodziny, ...
@@ -230,7 +222,6 @@ home state	addressbook	pl	Wojewdztwo
 home street	addressbook	pl	Ulica
 home zip code	addressbook	pl	Kod pocztowy
 how many contacts should non-admins be able to export	admin	pl	Ile kontaktów może eksportować użytkownik bez praw administratora
-how many fields must match for the record to be considered a duplicate.	addressbook	pl	Ile pól musi się zgadzać, aby rekord został uznany za duplikat.
 icon	addressbook	pl	Ikonka
 if accounts are already in ldap	admin	pl	jeśli konta są już w LDAPie
 ignore first line	addressbook	pl	Ignoruj pierwszą linię
@@ -247,8 +238,7 @@ import_instructions	addressbook	pl	W Netscape, otwórz Książkę Adresową (Add
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	pl	Importuj kontakty do Twojej książki adresowej z pliku CSV.
 in %1 days (%2) is %3's birthday.	addressbook	pl	Za %1 dni są urodziny %3
 income	addressbook	pl	Dochód
-infolog	addressbook	pl	InfoLog Kontakt
-infolog-organisation	addressbook	pl	Organizacja InfoLog
+infolog	addressbook	pl	InfoLog
 insert	addressbook	pl	wstaw
 insufficent rights to delete this list!	addressbook	pl	Brak wystarczających uprawnień do usunięcia listy!
 international	addressbook	pl	Międzynarodowy
@@ -269,13 +259,11 @@ list all customfields	addressbook	pl	Pokaż wszystkie pola użytkownika
 list already exists!	addressbook	pl	Lista już istnieje!
 list created	addressbook	pl	Lista została utworzona
 list creation failed, no rights!	addressbook	pl	Lista NIE została utworzona, brak uprawnień!
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	pl	Wczytaj pola własne do indeksu, nawet jeśli kolumna pola własnego jest wyłączona (np. aby wyświetlić je w określonej kolumnie indeksu)
 load vcard	addressbook	pl	Ładuj vCard
 location	addressbook	pl	Lokalizacja
 locations	addressbook	pl	Lokacje
 manage mapping	addressbook	pl	Zarządzaj mapowaniem
 mark records as private	addressbook	pl	Zaznacz rekordy jako prywatne
-merge duplicates	addressbook	pl	Połącz duplikaty
 merge into first or account, deletes all other!	addressbook	pl	Włącz do pierwszego albo konta, skasuj wszystkie inne!
 merged	addressbook	pl	połączone
 message after submitting the form	addressbook	pl	Wiadomość po przesłaniu formularza
@@ -287,7 +275,6 @@ mobile	addressbook	pl	Komórka
 mobile phone	addressbook	pl	Komórka
 modem phone	addressbook	pl	Numer modemu
 more ...	addressbook	pl	Więcej ...
-move to addressbook	addressbook	pl	Przenieś do książki adresowej
 moved	addressbook	pl	przesunięto
 multiple vcard	addressbook	pl	VCard z wieloma kontaktami
 name for the distribution list	addressbook	pl	Nazwa dla listy dystrybucyjnej
@@ -297,11 +284,8 @@ new contact submitted by %1 at %2	addressbook	pl	Nowy kontakt przesłany przez %
 new window opened to edit infolog for your selection	addressbook	pl	Otwarto nowe okno do edycji Dziennika dla twojej selekcji
 next date	addressbook	pl	Następna data
 no categories selected	addressbook	pl	nie wybrano kategorii
-no country selected	addressbook	pl	Nie wybrano kraju
-no distribution list	addressbook	pl	Brak listy dystrybucyjnej
 no fallback	addressbook	pl	Bez zapasu
 no vcard	addressbook	pl	Bez VCard
-not shared	addressbook	pl	nie dzielony
 number	addressbook	pl	Numer
 number of records to read (%1)	addressbook	pl	Liczba rekordów do wczytania (%1)
 options for type	admin	pl	Opcje typu
@@ -327,7 +311,6 @@ preferred email address to use in distribution lists	addressbook	pl	Preferowany
 preferred phone	addressbook	pl	preferowany nr. telefonu
 preferred type of email address to add for distribution lists	addressbook	pl	preferowany typ adresu email do dodania dla list dystrybucyjnych
 prefix	addressbook	pl	Prefiks (Pan/Pani)
-prevent deleting of contacts	admin	pl	Zapobieganie usuwaniu kontaktów
 private custom fields	addressbook	pl	Prywatne pola własne
 public key	addressbook	pl	Klucz publiczny
 publish into groups:	addressbook	pl	Opublikuj do grup:
@@ -346,7 +329,6 @@ replacements for inserting contacts into documents	addressbook	pl	Zamienniki do
 required fields *	addressbook	pl	pola wymagane *
 role	addressbook	pl	Pozycja
 room	addressbook	pl	Pokój
-search letter	addressbook	pl	Wyszukaj literę
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	pl	Wybierz zdjęcie w formacie JPEG. Będzie zmniejszone do szerokości 60 pikseli.
 select a view	addressbook	pl	Wybierz wygląd
 select addressbook type	addressbook	pl	Wybierz typ książki adresowej
@@ -364,12 +346,6 @@ send emailcopy to receiver	addressbook	pl	Wyślij kopię email do odbiorcy
 seperator	addressbook	pl	Separator
 set full name and file as field in contacts of all users (either all or only empty values)	admin	pl	Ustawi pełną nazwą i plik jako pole w kontaktach wszystkich użytkowników (wszystkie lub tylko puste wartości)
 set only full name	addressbook	pl	Ustaw tylko pełną nazwę
-share into addressbook	addressbook	pl	Udostępnianie do książki adresowej
-share writable	addressbook	pl	Udział edytowalny
-shared	addressbook	pl	wspólny
-shared by me	addressbook	pl	Udostępnione przeze mnie
-shared into addressbook %1	addressbook	pl	udostępnione w książce adresowej %1
-shared with	addressbook	pl	Dzielony z
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	pl	Czy kolumny: zdjęcie i adres domowy powinny być wyświetlane zawsze, nawet jeżeli są puste?
 show	addressbook	pl	Pokaż
 show infolog entries for this organisation	addressbook	pl	Pokaż wpisy InfoLog tej organizacji
@@ -408,8 +384,6 @@ type	addressbook	pl	typ
 un-delete	addressbook	pl	Przywróć
 unique id (uid)	addressbook	pl	Unikatowy ID (UID)
 unique id<br />(to update existing records)	addressbook	pl	Unikatowy ID<br />Do aktualizacji istniejących wpisów
-unshare	addressbook	pl	Nie dzielimy się już
-unshared	addressbook	pl	nie jest już udostępniany
 update a single entry by passing the fields.	addressbook	pl	Aktualizuj pojedyńczy wpis poprzez podawanie wartości pól.
 update fields by edited organisations?	admin	pl	Zaktualizować pola przez edycje organizacji?
 updated	addressbook	pl	Uaktualniony
@@ -420,7 +394,6 @@ use country list	addressbook	pl	Użyj listy krajów
 use setup for a full account-migration	admin	pl	użyj (/setup) w celu pełnej migracji kont
 use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	pl	Użyj tego znacznika dla etykiet adresu. Wstaw zawartość którą chcesz powtórzyć pomiędzy dwa znaczniki.
 used for links and for the own sorting of the list	addressbook	pl	używane w odnośnikach oraz we własnym sortowaniu listy
-user groups are automatically shown as distribution lists.	addressbook	pl	Grupy użytkowników są automatycznie wyświetlane jako listy dystrybucyjne.
 vcard	common	pl	Kartka elektroniczna (VCard)
 vcards require a first name entry.	addressbook	pl	Kartki elektroniczne (VCard) wymagają podania imienia.
 vcards require a last name entry.	addressbook	pl	Kartki elektroniczne (VCard) wymagają podania nazwiska
@@ -430,7 +403,6 @@ warning!! ldap is valid only if you are not using contacts for accounts storage!
 warning: all contacts found will be deleted!	addressbook	pl	UWAGA: Wszystkie znalezione kontakty zostaną skasowane!
 weekday	addressbook	pl	dzień tygodnia
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	pl	Jaką treść powinny mieć odnośniki do książki adresowej widocznie w innych aplikacjach? Puste wartości zostaną pominięte. Musisz na nowo się zalogować, jeżeli zmienisz to ustawienie.
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	pl	Gdy łączysz wpisy w dokumenty, będą one przechowywane w tym miejscu. Jeśli nie podano żadnego katalogu, będą one przechowywane w katalogu domowym (/home/...)
 where to add the email address	addressbook	pl	gdzie dodać adres email
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	pl	Jaki format adresu powinien być używany przez książkę adresową dla państw, które nie mają określonego formatu adresu? Jeżeli format dla danego państwa jest ustalony, ma pierwszeństwo przed powyższym.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	pl	Która książka adresowa powinna być wybrana przy dodawaniu kontaktu, jeżeli nie masz praw zapisu do BIEŻĄCEJ książki adresowej?
@@ -446,7 +418,6 @@ yes, for the next three days	addressbook	pl	Tak, dla następnych trzech dni
 yes, for the next two weeks	addressbook	pl	Tak, dla następnych dwuch tygodni
 yes, for the next week	addressbook	pl	Tak, dla następnego tygodnia
 yes, for today and tomorrow	addressbook	pl	Tak, na dziś i jutro
-you are not allowed to share into the addressbook of %1	addressbook	pl	Nie masz uprawnień do udostępniania w książce adresowej %1
 you are not permitted to delete contact %1	addressbook	pl	Nie masz uprawnień do kasowania kontaktu %1
 you are not permittet to delete this contact	addressbook	pl	Nie masz uprawnień do kasowania tego kontaktu
 you are not permittet to edit this contact	addressbook	pl	Nie masz uprawnień do edytowania tego kontaktu

addressbook/lang/egw_pt-br.lang

@@ -4,7 +4,6 @@
 %1 fields in %2 other organisation member(s) changed	addressbook	pt-br	%1 campo(s) em %2 outro(s) membro(s) da organização alterado(s)
 %1 records imported	addressbook	pt-br	%1 registro(s) importado(s)
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	pt-br	%1 registro(s) lido(s) (não importado(s) ainda. Você deve voltar e desmarcar o campo Testar Importação)
-%1 shared this contact on %2 with %3 %4	addressbook	pt-br	%1 dividiu este contato em %2 %3 %4
 %1 starts with '%2'	addressbook	pt-br	%1 inicia(m) com '%2'
 %s please calculate the result	addressbook	pt-br	%s por favor calcule o resultado
 (e.g. 1969)	addressbook	pt-br	(ex. 1969)
@@ -30,7 +29,7 @@ added by synchronisation	addressbook	pt-br	adicionado por sincronização
 added to distribution list	addressbook	pt-br	adicionado a uma lista de distribuição
 additional information about using ldap as contact repository	admin	pt-br	Informação adicional sobre usar LDAP como respositório de contas
 address book	common	pt-br	Livro de Contatos
-address book - vcard in	addressbook	pt-br	Livro de Contatos - vCard
+address book - vcard in	addressbook	pt-br	Livro de Contatos - VCard
 address book - view	addressbook	pt-br	Livro de Contatos - Exibir
 address line 2	addressbook	pt-br	Endereço Linha 2
 address type	addressbook	pt-br	Tipo de endereço
@@ -43,7 +42,7 @@ addressbook the contact should be saved to	addressbook	pt-br	Livro de Contatos e
 addressbook the contact should be shown	addressbook	pt-br	Livro de Contatos em que o contato deverá ser exibido
 addressbook vcard import	addressbook	pt-br	Importação de endereços vCard
 addressbook-fieldname	addressbook	pt-br	Livro de Contatos - Nome do Campo
-addvcard	addressbook	pt-br	Adicionar vCard
+addvcard	addressbook	pt-br	Adicionar VCard
 advanced search	addressbook	pt-br	Pesquisa avançada
 all contacts	addressbook	pt-br	Todos os contatos
 allow users to maintain their own account-data	admin	pt-br	Permitir usuários a manter seus próprios dados de contatos
@@ -91,6 +90,7 @@ company name	addressbook	pt-br	Nome da empresa
 configuration	common	pt-br	Configuração
 contact	common	pt-br	Contato
 contact application	admin	pt-br	Aplicação de Contatos
+contact copied	addressbook	pt-br	Contato copiado
 contact deleted	addressbook	pt-br	Contato removido
 contact fields to show	addressbook	pt-br	Campos a serem exibidos
 contact fields:	addressbook	pt-br	Campos de contatos:
@@ -148,9 +148,6 @@ don't hide empty columns	addressbook	pt-br	Não ocultar colunas vazias
 download	addressbook	pt-br	Baixar
 download export file (uncheck to debug output in browser)	addressbook	pt-br	Baixar arquivo exportado (Desmarque Depurar no navegador)
 download this contact as vcard file	addressbook	pt-br	baixar este contato como arquivo vCard
-duplicate threshold	addressbook	pt-br	Limiar duplicado
-duplicate warning	addressbook	pt-br	Advertência duplicada
-duplicates	addressbook	pt-br	Duplicações
 duration	addressbook	pt-br	Duração
 edit custom field	addressbook	pt-br	Editar campo personalizado
 edit custom fields	admin	pt-br	Editar campos personalizados
@@ -170,7 +167,7 @@ error: the entry has been updated since you opened it for editing!	addressbook	p
 existing links	addressbook	pt-br	Links existentes
 exists	addressbook	pt-br	Existe
 export as csv	addressbook	pt-br	Exportar como CSV
-export as vcard	addressbook	pt-br	Exportar como vCard
+export as vcard	addressbook	pt-br	Exportar como VCard
 export contacts	addressbook	pt-br	Exportar contatos
 export definition to use for nextmatch export	addressbook	pt-br	Definição Exportar para usar para exportação NextMatch
 export file name	addressbook	pt-br	Exportar arquivo
@@ -188,8 +185,6 @@ field %1 has been updated !	addressbook	pt-br	Campo %1 foi atualizado !
 field name	addressbook	pt-br	Nome do campo
 fields for the csv export	addressbook	pt-br	Campos para a exportação CSV
 fields the user is allowed to edit himself	admin	pt-br	Campos que ao usuário é permitir editar
-fields to check for duplicates	addressbook	pt-br	Campos para verificação de duplicatas
-fields to consider when looking for duplicate contacts.	addressbook	pt-br	Campos a serem considerados ao procurar por contatos duplicados.
 fields to show in address list	addressbook	pt-br	Campos a serem exibidos na lista de endereços
 fieldseparator	addressbook	pt-br	Separador de campos
 for read only ldap	admin	pt-br	para LDAP somente leitura
@@ -205,8 +200,6 @@ grant addressbook access	common	pt-br	Permitir acesso ao Livro de Contatos
 group %1	addressbook	pt-br	Grupo %1
 h	addressbook	pt-br	h
 hide accounts from addressbook	addressbook	pt-br	Ocultar contas do Livro de Contatos
-hide all accounts	addressbook	pt-br	Ocultar todas as contas
-hide user groups as distribution lists	addressbook	pt-br	Ocultar grupos de usuários como listas de distribuição
 hides accounts completly from the adressbook.	addressbook	pt-br	Oculta completamente contas dos Contatos
 history logging	admin	pt-br	Registro de histórico
 home address	addressbook	pt-br	Endereço residencial
@@ -219,7 +212,6 @@ home phone	addressbook	pt-br	Telefone residencial
 home state	addressbook	pt-br	Estado
 home street	addressbook	pt-br	Rua, Av, Trav., etc.
 home zip code	addressbook	pt-br	CEP
-how many fields must match for the record to be considered a duplicate.	addressbook	pt-br	Quantos campos devem coincidir para que o registro seja considerado uma duplicata.
 html link to the current record	addressbook	pt-br	Link HTML para o registro atual
 icon	addressbook	pt-br	Ícone
 if accounts are already in ldap	admin	pt-br	se as contas já estiverem em LDAP
@@ -228,16 +220,15 @@ import contacts	addressbook	pt-br	Importar contatos
 import csv-file into addressbook	addressbook	pt-br	Importar arquivo CSV para o Livro de Contatos
 import file	addressbook	pt-br	Importar arquivo
 import from	addressbook	pt-br	Importar de
-import from ldif, csv, or vcard	addressbook	pt-br	Importar de LDIF, CSV ou vCard
+import from ldif, csv, or vcard	addressbook	pt-br	Importar de LDIF, CSV ou VCard
 import from outlook	addressbook	pt-br	Importar do Outlook
-import multiple vcard	addressbook	pt-br	Importar múltiplo vCard
+import multiple vcard	addressbook	pt-br	Importar múltiplo VCard
 import next set	addressbook	pt-br	Importar próximo conjunto
-import_instructions	addressbook	pt-br	No Netscape, abra o Livro de Contatos e selecione <b>Exportar</b> do menu <b>Arquivo</b>. O arquivo exportado será do format LDIF.<p> Ou, no Outlook, selecione a sua pastas de contatos, selecione <b>Importar e Exportar...</b> do menu <b>Arquivo</b> e exporte seus contatos para um arquivo separado por vírgulas (CSV). Ou no Palmdesktop 4.0 ou superior, vá para seu Livro de Contatos e selecione <b>Exportar</b> do menu <b>Arquivo</b>. O arquivo exportado será do tipo vCard.
+import_instructions	addressbook	pt-br	No Netscape, abra o Livro de Contatos e selecione <b>Exportar</b> do menu <b>Arquivo</b>. O arquivo exportado será do format LDIF.<p> Ou, no Outlook, selecione a sua pastas de contatos, selecione <b>Importar e Exportar...</b> do menu <b>Arquivo</b> e exporte seus contatos para um arquivo separado por vírgulas (CSV). Ou no Palmdesktop 4.0 ou superior, vá para seu Livro de Contatos e selecione <b>Exportar</b> do menu <b>Arquivo</b>. O arquivo exportado será do tipo VCard.
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	pt-br	Importa itens em sua lista de Contatos de um arquivo CVS. CVS significa 'Comma Separated Values' (Valores Separados por Vírgula). Na aba Opções, no entanto, você pode escolher outros separadores.
 in %1 days (%2) is %3's birthday.	addressbook	pt-br	Em %1 dia(s) (%2) será aniversário de %3
 income	addressbook	pt-br	Renda
-infolog	addressbook	pt-br	Contato tarefas
-infolog-organisation	addressbook	pt-br	Organização tarefas
+infolog	addressbook	pt-br	Tarefas
 insert	addressbook	pt-br	Inserir
 insufficent rights to delete this list!	addressbook	pt-br	Direitos insuficientes para remover esta lista!
 international	addressbook	pt-br	Internacional
@@ -259,13 +250,11 @@ list already exists!	addressbook	pt-br	Lista já existe!
 list created	addressbook	pt-br	Lista criada
 list creation failed, no rights!	addressbook	pt-br	Criação da lista falhou. Sem direitos suficientes!
 list of files linked to the current record	addressbook	pt-br	Lista de arquivos vinculados ao registro atual
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	pt-br	Carregar campos personalizados no índice, mesmo que a coluna de campos personalizados esteja desligada (por exemplo, para exibi-los em uma coluna de índice específica)
-load vcard	addressbook	pt-br	Carregar vCard
+load vcard	addressbook	pt-br	Carregar VCard
 location	addressbook	pt-br	Localização
 locations	addressbook	pt-br	Localizações
 manage mapping	addressbook	pt-br	Gerenciar mapeamento
 mark records as private	addressbook	pt-br	Marcar registos como particulares
-merge duplicates	addressbook	pt-br	Fusão de duplicatas
 merge into first or account, deletes all other!	addressbook	pt-br	Mesclar na primeira conta, deletar o restante!
 merged	addressbook	pt-br	mesclado
 message after submitting the form	addressbook	pt-br	Mensagem após enviar o formulário
@@ -277,9 +266,8 @@ mobile	addressbook	pt-br	Celular
 mobile phone	addressbook	pt-br	Telefone celular
 modem phone	addressbook	pt-br	Telefone de Dados (Modem)
 more ...	addressbook	pt-br	Mais...
-move to addressbook	addressbook	pt-br	Mudar para o livro de endereços
 moved	addressbook	pt-br	movido
-multiple vcard	addressbook	pt-br	Múltiplo vCard
+multiple vcard	addressbook	pt-br	Múltiplo VCard
 name for the distribution list	addressbook	pt-br	Nome da lista de distribuição
 name of current user, all other contact fields are valid too	addressbook	pt-br	Nome do usuário atual, todos outros campos são válidos também
 name, address	addressbook	pt-br	Nome, Endereço
@@ -287,10 +275,7 @@ new contact submitted by %1 at %2	addressbook	pt-br	Novo contato informado por %
 new window opened to edit infolog for your selection	addressbook	pt-br	Nova janela aberta para editar sua seleção de Tarefas
 next date	addressbook	pt-br	Próxima data
 no categories selected	addressbook	pt-br	nenhuma categoria selecionada
-no country selected	addressbook	pt-br	Nenhum país selecionado
-no distribution list	addressbook	pt-br	Sem lista de distribuição
-no vcard	addressbook	pt-br	Nenhum vCard
-not shared	addressbook	pt-br	não compartilhado
+no vcard	addressbook	pt-br	Nenhum VCard
 number	addressbook	pt-br	Número
 number of records to read (%1)	addressbook	pt-br	Número de registros a ler (%1)
 options for type	admin	pt-br	Opções para tipo
@@ -316,7 +301,6 @@ preferred email address to use in distribution lists	addressbook	pt-br	Endereço
 preferred phone	addressbook	pt-br	telefone preferencial
 preferred type of email address to add for distribution lists	addressbook	pt-br	Tipo de endereço de email padrão para adicionar em listas de distribuição
 prefix	addressbook	pt-br	Prefixo
-prevent deleting of contacts	admin	pt-br	Impedir a exclusão de contatos
 public key	addressbook	pt-br	Chave pública
 publish into groups:	addressbook	pt-br	Publicar nos grupos:
 read a list / search for entries.	addressbook	pt-br	Ler um lista / pesquisar por entradas
@@ -332,7 +316,6 @@ replacements for inserting contacts into documents	addressbook	pt-br	Substituiç
 required fields *	addressbook	pt-br	campos requeridos *
 role	addressbook	pt-br	Função
 room	addressbook	pt-br	Sala
-search letter	addressbook	pt-br	Carta de busca
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	pt-br	Selecione uma foto no formato jpeg. Ela será alterada para o tamanho de 60 pixels de largura
 select a view	addressbook	pt-br	Selecionar uma exibição
 select addressbook type	addressbook	pt-br	Selecionar tipo de Livro de Contatos
@@ -346,12 +329,6 @@ select the type of conversion:	addressbook	pt-br	Selecione o tipo de conversão:
 select where you want to store / retrieve contacts	admin	pt-br	Selecione onde você quer salvar / recuperar contatos
 selected contacts	addressbook	pt-br	contatos selecionados
 send emailcopy to receiver	addressbook	pt-br	Enviar cópia de e-mail para o receptor
-share into addressbook	addressbook	pt-br	Compartilhar em lista de endereços
-share writable	addressbook	pt-br	Ações que podem ser escritas
-shared	addressbook	pt-br	compartilhado
-shared by me	addressbook	pt-br	Compartilhado por mim
-shared into addressbook %1	addressbook	pt-br	compartilhado em livro de endereços %1
-shared with	addressbook	pt-br	Compartilhado com
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	pt-br	As colunas de fotos e endereço residencial deverão ser exibidas sempre, mesmo se estiverem vazias.
 show	addressbook	pt-br	Exibir
 show infolog entries for this organisation	addressbook	pt-br	Exibir entrada de Tarefas para esta organização
@@ -386,30 +363,27 @@ tomorrow is %1's birthday.	common	pt-br	Amanhã é o aniversário de %1.
 translation	addressbook	pt-br	Tradução
 type	addressbook	pt-br	Tipo
 unable to delete	addressbook	pt-br	Não é possível excluir
-unshare	addressbook	pt-br	Não mais compartilhar
-unshared	addressbook	pt-br	não mais compartilhado
 update a single entry by passing the fields.	addressbook	pt-br	Atualizar uma única entrada informando os campos
 update fields by edited organisations?	admin	pt-br	Atualizar campos por organizações editadas
 updated	addressbook	pt-br	Atualizado
 upload or delete the photo	addressbook	pt-br	Carregar ou remover a foto
 url to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)	admin	pt-br	URL para linkar números de telefones (use %1 = número a ser chamado, %u = nome da conta, %t = número do telefone)
 use addressbooks "own sorting" attribute	addressbook	pt-br	usar catálogos de endereços "possuir classificação" atributo
+use an extra category tab?	addressbook	pt-br	Usar uma aba extra para categoria ?
 use an extra tab for private custom fields?	admin	pt-br	Usar uma aba extra para campos privados personalizados?
 use country list	addressbook	pt-br	Usar lista de países
 use setup for a full account-migration	admin	pt-br	usar setup para uma migração de contas completa
 used for links and for the own sorting of the list	addressbook	pt-br	usado para links e para a ordem própria da lista
-user groups are automatically shown as distribution lists.	addressbook	pt-br	Os grupos de usuários são automaticamente mostrados como listas de distribuição.
 user preference	addressbook	pt-br	Preferência do usuário
-vcard	common	pt-br	vCard
-vcards require a first name entry.	addressbook	pt-br	vCards requer um primeiro nome.
-vcards require a last name entry.	addressbook	pt-br	vCards requerem que o último nome esteja preenchido
+vcard	common	pt-br	VCard
+vcards require a first name entry.	addressbook	pt-br	VCards requer um primeiro nome.
+vcards require a last name entry.	addressbook	pt-br	VCards requerem que o último nome esteja preenchido
 verification	addressbook	pt-br	Verificação
 view linked infolog entries	addressbook	pt-br	Exibir entradas de Tarefas relacionadas
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	pt-br	AVISO!! LDAP é válido somente se você não estiver usando contatos para guardar as contas!
 warning: all contacts found will be deleted!	addressbook	pt-br	AVISO: Todos os contatos encontrados serão removidos!
 weekday	addressbook	pt-br	Dia da semana
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	pt-br	O que deverá ser exibido pelos links para o Livro de Contatos que estão em outros aplicativos. Valores vazios serão desconsiderados. Você precisará fazer novo login ser alterar esta configuração!
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	pt-br	Quando você funde as entradas em documentos, eles serão armazenados aqui. Se nenhum diretório for fornecido, eles serão armazenados em seu diretório pessoal (/home/...)
 where to add the email address	addressbook	pt-br	onde adicionar o endereço de email
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	pt-br	Qual formato de endereço deverá ser usado para países onde o formato padrão não é conhecido. Se o formato de endereço de um país for conhecido, este será usado independente desta configuração.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	pt-br	Qual Livro de Contatos deverá ser selecionado quando estiver incluindo um contato E você não tiver permissão de inclusão.
@@ -425,14 +399,13 @@ yes, for the next two weeks	addressbook	pt-br	Sim, para as próximas duas semana
 yes, for the next week	addressbook	pt-br	Sim, para a próxima semana
 yes, for today and tomorrow	addressbook	pt-br	Sim, para hoje e amanhã
 yes, only admins can purge deleted items	admin	pt-br	Sim, somente administradores podem limpar registros removidos
-you are not allowed to share into the addressbook of %1	addressbook	pt-br	Você não está autorizado a compartilhar para endereçar livro %1
 you are not permitted to delete contact %1	addressbook	pt-br	Você não tem permissão para deletar o contato %1
 you are not permittet to delete this contact	addressbook	pt-br	Você não tem permissão para deletar este contato
 you are not permittet to edit this contact	addressbook	pt-br	Você não tem permissão para editar este contato
 you are not permittet to view this contact	addressbook	pt-br	Você não tem permissão para exibir este contato
 you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	pt-br	Você somente pode usar LDAP como repositório de contas se as contas estiverem salvas em LDAP também!
 you can respond by visiting:	addressbook	pt-br	Para exibi-lo, visite:
-you must select a vcard. (*.vcf)	addressbook	pt-br	Você deve selecionar um vCard. (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	pt-br	Você deve selecionar um vcard. (*.vcf)
 you must select at least 1 column to display	addressbook	pt-br	Você deve selecionar pelo menos uma coluna para ser exibida.
 you need to select a distribution list	addressbook	pt-br	Você deve selecionar uma lista de distribuição
 you need to select some contacts first	addressbook	pt-br	Você deve selecionar alguns contatos primeiro

addressbook/lang/egw_pt.lang

@@ -9,14 +9,14 @@ add a single entry by passing the fields.	addressbook	pt	Adicionar um registo ú
 add custom field	addressbook	pt	Adicionar campo personalizado
 added	addressbook	pt	Adicionado
 address book	common	pt	Livro de Endereços
-address book - vcard in	addressbook	pt	Livro de endereços - vCard
+address book - vcard in	addressbook	pt	Livro de endereços - VCard
 address book - view	addressbook	pt	Livro de endereços - Ver
 address line 2	addressbook	pt	Linha de endereço 2
 address type	addressbook	pt	Tipo de endereço
 addressbook	common	pt	Livro de endereços
 addressbook preferences	addressbook	pt	Preferências do livro de endereços
 addressbook-fieldname	addressbook	pt	Livro de endereços - Nome do campo
-addvcard	addressbook	pt	Adicionar vCard
+addvcard	addressbook	pt	Adicionar VCard
 advanced search	addressbook	pt	Pesquisa avançada
 alt. csv import	addressbook	pt	Importar CSV
 always	addressbook	pt	Sempre
@@ -74,9 +74,6 @@ domestic	addressbook	pt	Doméstico
 download	addressbook	pt	Transferência
 download export file (uncheck to debug output in browser)	addressbook	pt	Transferir ficheiro de exportação (desmarque a opção "fazer debug do resultado no navegador")
 download this contact as vcard file	addressbook	pt	transferor este contacto como ficheiro vCard
-duplicate threshold	addressbook	pt	Duplicar o limiar
-duplicate warning	addressbook	pt	Duplicação do aviso
-duplicates	addressbook	pt	Duplicações
 duration	addressbook	pt	Duração
 edit custom field	addressbook	pt	Editar campo personalizado
 edit custom fields	admin	pt	Editar campos personalizados
@@ -101,8 +98,6 @@ fax number	common	pt	Número de fax
 field %1 has been added !	addressbook	pt	Campo %1 foi adicionado !
 field %1 has been updated !	addressbook	pt	Campo %1 foi actualizado !
 field name	addressbook	pt	Nome do campo
-fields to check for duplicates	addressbook	pt	Campos para verificação de duplicados
-fields to consider when looking for duplicate contacts.	addressbook	pt	Campos a considerar na procura de contactos duplicados.
 fields to show in address list	addressbook	pt	Campos a exibir na lista de endereços
 fieldseparator	addressbook	pt	Separador de campos
 full name	addressbook	pt	Nome completo
@@ -113,10 +108,6 @@ geo	addressbook	pt	GEO
 global categories	addressbook	pt	Categorias gerais
 grant addressbook access	common	pt	Permitir acesso ao livro de endereços
 h	addressbook	pt	h
-hide accounts from addressbook	addressbook	pt	Ocultar contas de utilizador
-hide all accounts	addressbook	pt	Ocultar todas as contas
-hide user groups as distribution lists	addressbook	pt	Ocultar grupos de utilizadores como listas de distribuição
-hides accounts completly from the adressbook.	addressbook	pt	Esconder completamente as contas de utilizador do livro de endereços.
 history logging	admin	pt	Logging História
 home city	addressbook	pt	Cidade
 home country	addressbook	pt	País
@@ -125,7 +116,6 @@ home phone	addressbook	pt	Telefone
 home state	addressbook	pt	Bairro
 home street	addressbook	pt	Rua
 home zip code	addressbook	pt	Código postal
-how many fields must match for the record to be considered a duplicate.	addressbook	pt	Quantos campos devem coincidir para que o registo seja considerado como duplicado.
 html link to the current record	addressbook	pt	Link HTML para o registro atual
 icon	addressbook	pt	Ícone
 import	addressbook	pt	Importar
@@ -133,14 +123,13 @@ import contacts	addressbook	pt	Importar contactos
 import csv-file into addressbook	addressbook	pt	Importar ficheiro CSV para o livro de endereços
 import file	addressbook	pt	Importar ficheiro
 import from	addressbook	pt	Importar de
-import from ldif, csv, or vcard	addressbook	pt	Importar de LDIF, CSV, ou vCard
+import from ldif, csv, or vcard	addressbook	pt	Importar de LDIF, CSV, ou VCard
 import from outlook	addressbook	pt	Importar do Outlook
-import multiple vcard	addressbook	pt	Importar vários vCard
+import multiple vcard	addressbook	pt	Importar vários VCard
 import next set	addressbook	pt	Importar o conjunto seguinte
-import_instructions	addressbook	pt	No Netscape, abra o Livro de endereços e seleccione <b>Exportar</b> do menu <b>Ficheiro</b>. O ficheiro exportado estará em formato LDIF.<p>No Outlook, seleccione a sua pasta de contactos, seleccione <br>Importar e Exportar...</b> do menu <b>Ficheiro</b> e exporte os seus contactos, separados por vírgulas, num ficheiro de texto (CSV).<br>No Palm Desktop 4.0 ou superior, visite o seu livro de endereços e seleccione <br>Exportar</b> do menu <b>Ficheiro</b>. O ficheiro exportado estará em formado vCard.
+import_instructions	addressbook	pt	No Netscape, abra o Livro de endereços e seleccione <b>Exportar</b> do menu <b>Ficheiro</b>. O ficheiro exportado estará em formato LDIF.<p>No Outlook, seleccione a sua pasta de contactos, seleccione <br>Importar e Exportar...</b> do menu <b>Ficheiro</b> e exporte os seus contactos, separados por vírgulas, num ficheiro de texto (CSV).<br>No Palm Desktop 4.0 ou superior, visite o seu livro de endereços e seleccione <br>Exportar</b> do menu <b>Ficheiro</b>. O ficheiro exportado estará em formado VCard.
 income	addressbook	pt	Entrada
-infolog	addressbook	pt	Contacto InfoLog
-infolog-organisation	addressbook	pt	Organização InfoLog
+infolog	addressbook	pt	Acesso à informação
 insert	addressbook	pt	Inserir
 international	addressbook	pt	Internacional
 label	addressbook	pt	Comentário
@@ -154,24 +143,18 @@ links and attached files	addressbook	pt	Links e arquivos anexados
 list all categories	addressbook	pt	Listar todas as categorias
 list all customfields	addressbook	pt	Listar todos os campos personalizados
 list of files linked to the current record	addressbook	pt	Lista de arquivos vinculados ao registro atual
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	pt	Carregar campos personalizados no índice, mesmo que a coluna de campos personalizados esteja desligada (por exemplo, para os mostrar numa coluna de índice específica)
-load vcard	addressbook	pt	Carregar vCard
+load vcard	addressbook	pt	Carregar VCard
 location	addressbook	pt	Local
 manage mapping	addressbook	pt	Gerenciar mapeamento
 mark records as private	addressbook	pt	Marcar registos como privados
-merge duplicates	addressbook	pt	Fusão de duplicados
-merge into first or account, deletes all other!	addressbook	pt	Fusão em primeiro lugar ou conta, elimina todos os outros!
 message phone	addressbook	pt	Telefone de mensagens
 middle name	addressbook	pt	Nome do meio
 mobile	addressbook	pt	Telemóvel
 mobile phone	addressbook	pt	Telemóvel
 modem phone	addressbook	pt	Telefone de dados (Modem)
 more ...	addressbook	pt	Mais..
-multiple vcard	addressbook	pt	Vários vCard
-no country selected	addressbook	pt	Nenhum país seleccionado
-no distribution list	addressbook	pt	Sem lista de distribuição
-no vcard	addressbook	pt	Nenhum vCard
-not shared	addressbook	pt	não partilhado
+multiple vcard	addressbook	pt	Vários VCard
+no vcard	addressbook	pt	Nenhum VCard
 number	addressbook	pt	Número
 number of records to read (%1)	addressbook	pt	Número de registos por ler (%1)
 options for type	admin	pt	Opções por tipo
@@ -198,17 +181,10 @@ record access	addressbook	pt	Acesso ao registo
 record owner	addressbook	pt	Dono do registo
 repetition	addressbook	pt	Repetição
 role	addressbook	pt	Papel
-search letter	addressbook	pt	Pesquisar carta
 select all	addressbook	pt	Seleccionar tudo
 select multiple contacts for a further action	addressbook	pt	Selecionar vários contatos para uma nova acção
 select the type of conversion	addressbook	pt	Seleccionar o tipo de conversão
 select the type of conversion:	addressbook	pt	Seleccionar o tipo de conversão:
-share into addressbook	addressbook	pt	Partilhar em livro de endereços
-share writable	addressbook	pt	Partilhar escrevível
-shared	addressbook	pt	partilhado
-shared by me	addressbook	pt	Partilhado por mim
-shared into addressbook %1	addressbook	pt	partilhado em livro de endereços %1
-shared with	addressbook	pt	Partilhado com
 show	addressbook	pt	Exibir
 start	admin	pt	Início
 startrecord	addressbook	pt	Iniciar registo
@@ -227,29 +203,24 @@ to many might exceed your execution-time-limit	addressbook	pt	Demasiados podem e
 today is %1's birthday!	common	pt	Hoje é o aniversário de %1.
 tomorrow is %1's birthday.	common	pt	Amanhã é o aniversário de %1.
 translation	addressbook	pt	Tradução
-unshare	addressbook	pt	Não partilhar mais
-unshared	addressbook	pt	já não partilhado
 update a single entry by passing the fields.	addressbook	pt	Actualizar um registo único passando os campos.
 updated	addressbook	pt	Actualizado
 use country list	addressbook	pt	Utilizar lista de países
-user groups are automatically shown as distribution lists.	addressbook	pt	Os grupos de utilizadores são automaticamente mostrados como listas de distribuição.
-vcard	common	pt	vCard
-vcards require a first name entry.	addressbook	pt	vCards requer um primeiro nome.
-vcards require a last name entry.	addressbook	pt	vCards requer um apelido.
+vcard	common	pt	VCard
+vcards require a first name entry.	addressbook	pt	VCards requer um primeiro nome.
+vcards require a last name entry.	addressbook	pt	VCards requer um apelido.
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	pt	Aviso!! LDAP é válido apenas se não estiver a utilizar contactos para armazenamento de contas!
 warning: all contacts found will be deleted!	addressbook	pt	Aviso: Todos os contactos encontrados serão eliminados!
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	pt	Ao fundir entradas em documentos, estes serão armazenados aqui. Se não for fornecido nenhum directório, eles serão armazenados no seu directório pessoal (/home/...)
 whole query	addressbook	pt	Consulta Whole
 work phone	addressbook	pt	Telefone de trabalho
 write (update or add) a single entry by passing the fields.	addressbook	pt	Editar (actualizar ou adicionar) um registo único passando os campos.
 yes, only admins can purge deleted items	admin	pt	Sim, só os administradores podem remover os itens excluídos
-you are not allowed to share into the addressbook of %1	addressbook	pt	Não está autorizado a partilhar o livro de endereços %1
 you are not permitted to delete contact %1	addressbook	pt	Não tem permissões para eliminar o contacto %1
 you are not permittet to delete this contact	addressbook	pt	Não tem permissões para eliminar este contacto
 you are not permittet to edit this contact	addressbook	pt	Não tem permissões para editar este contacto
 you are not permittet to view this contact	addressbook	pt	Não tem permissões para ver este contacto
 you can respond by visiting:	addressbook	pt	Você pode responder, visitando
-you must select a vcard. (*.vcf)	addressbook	pt	É necessário seleccionar um vCard. (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	pt	É necessário seleccionar um vcard. (*.vcf)
 you must select at least 1 column to display	addressbook	pt	É necessário seleccionar pelo menos uma coluna a apresentar
 you need to select some entries first	addressbook	pt	Você precisa selecionar algumas entradas em primeiro lugar.
 zip code	common	pt	Código postal

addressbook/lang/egw_ro.lang

@@ -1,33 +0,0 @@
-%1 shared this contact on %2 with %3 %4	addressbook	ro	%1 a partajat acest contact pe %2 %3 %4
-duplicate threshold	addressbook	ro	Pragul de duplicare
-duplicate warning	addressbook	ro	Avertisment de duplicat
-duplicates	addressbook	ro	Dubluri
-fields to check for duplicates	addressbook	ro	Câmpuri pentru a verifica dacă există dubluri
-fields to consider when looking for duplicate contacts.	addressbook	ro	Câmpuri care trebuie luate în considerare atunci când se caută contacte duplicate.
-hide accounts from addressbook	addressbook	ro	Ascundeți conturile de utilizator
-hide all accounts	addressbook	ro	Ascundeți toate conturile
-hide user groups as distribution lists	addressbook	ro	Ascundeți grupurile de utilizatori ca liste de distribuție
-hides accounts completly from the adressbook.	addressbook	ro	Ascundeți complet conturile de utilizator din cartea de adrese.
-how many fields must match for the record to be considered a duplicate.	addressbook	ro	Câte câmpuri trebuie să corespundă pentru ca înregistrarea să fie considerată duplicat.
-infolog	addressbook	ro	InfoLog Contact
-infolog-organisation	addressbook	ro	Organizația InfoLog
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	ro	Încărcați câmpurile personalizate în index, chiar dacă coloana câmpurilor personalizate este dezactivată (de exemplu, pentru a le afișa într-o anumită coloană de index)
-merge duplicates	addressbook	ro	Unificarea dublurilor
-merge into first or account, deletes all other!	addressbook	ro	Fuzionează în primul sau în cont, șterge toate celelalte!
-move to addressbook	addressbook	ro	Mutarea în cartea de adrese
-no country selected	addressbook	ro	Nici o țară selectată
-no distribution list	addressbook	ro	Nici o listă de distribuție
-not shared	addressbook	ro	nu este împărtășită
-prevent deleting of contacts	admin	ro	Prevenirea ștergerii contactelor
-search letter	addressbook	ro	Scrisoare de căutare
-share into addressbook	addressbook	ro	Partajați în agenda de adrese
-share writable	addressbook	ro	Partajare inscriptibilă
-shared	addressbook	ro	partajat
-shared by me	addressbook	ro	Partajat de mine
-shared into addressbook %1	addressbook	ro	partajat în addressbook %1
-shared with	addressbook	ro	Împărtășit cu
-unshare	addressbook	ro	Nu mai partajați
-unshared	addressbook	ro	nu mai este partajat
-user groups are automatically shown as distribution lists.	addressbook	ro	Grupurile de utilizatori sunt afișate automat ca liste de distribuție.
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	ro	Atunci când unificați intrările în documente, acestea vor fi stocate aici. Dacă nu este furnizat niciun director, acestea vor fi stocate în directorul dvs. personal (/home/...).
-you are not allowed to share into the addressbook of %1	addressbook	ro	Nu aveți permisiunea de a partaja în cartea de adrese %1

addressbook/lang/egw_ru.lang

@@ -34,7 +34,7 @@ added by synchronisation	addressbook	ru	Добавлено при синхрон
 added to distribution list	addressbook	ru	Добавлено в список рассылки
 additional information about using ldap as contact repository	admin	ru	Дополнительная информация об использовании LDAP в качестве хранилища контактов
 address book	common	ru	Контакты
-address book - vcard in	addressbook	ru	Адресная книга vCard в
+address book - vcard in	addressbook	ru	Адресная книга VCard в
 address book - view	addressbook	ru	Адресная книга - вид
 address line 2	addressbook	ru	Строка адреса 2
 address type	addressbook	ru	Тип адреса
@@ -50,7 +50,7 @@ addressbook the contact should be shown	addressbook	ru	Адресная книг
 addressbook vcard export	addressbook	ru	Адресная книга, экспорт vCard
 addressbook vcard import	addressbook	ru	Адресная книга, импорт vCard
 addressbook-fieldname	addressbook	ru	Адресная книга - имя поля
-addvcard	addressbook	ru	Добавить vCard
+addvcard	addressbook	ru	Добавить VCard
 advanced search	addressbook	ru	Расширенный поиск
 all contacts	addressbook	ru	Все контакты
 all in one field	addressbook	ru	Все в одном поле
@@ -105,6 +105,7 @@ company name	addressbook	ru	Название компании
 configuration	common	ru	Конфигурирование
 contact	common	ru	Контакт
 contact application	admin	ru	Приложение контакта
+contact copied	addressbook	ru	Контакт скопирован
 contact deleted	addressbook	ru	Контакт удалён
 contact fields to show	addressbook	ru	Поля контакта для просмотра
 contact fields:	addressbook	ru	Поля контакта:
@@ -170,9 +171,6 @@ don't hide empty columns	addressbook	ru	Не скрывать пустые ко
 download	addressbook	ru	Загрузить
 download export file (uncheck to debug output in browser)	addressbook	ru	Загрузить файл экспорта (снимите отметку, чтобы вывести отладку в браузер)
 download this contact as vcard file	addressbook	ru	Загрузить этот контакт как файл vCard
-duplicate threshold	addressbook	ru	Порог дублирования
-duplicate warning	addressbook	ru	Предупреждение о дубликатах
-duplicates	addressbook	ru	Дубликаты
 duration	addressbook	ru	Длительность
 each category in its own field	addressbook	ru	Каждая категория в её собственном поле
 each option in its own field	addressbook	ru	Каждая опция в её собственном поле
@@ -221,8 +219,6 @@ field %1 has been updated !	addressbook	ru	Обновлено поле %1 !
 field name	addressbook	ru	Имя поля
 fields for the csv export	addressbook	ru	Поля для экспорта в CSV
 fields the user is allowed to edit himself	admin	ru	Поля, которые пользователь может редактировать самостоятельно
-fields to check for duplicates	addressbook	ru	Поля для проверки дубликатов
-fields to consider when looking for duplicate contacts.	addressbook	ru	Поля, которые следует учитывать при поиске дубликатов контактов.
 fields to copy when copying an address?	admin	ru	Какие поля копировать при копировании контакта?
 fields to show in address list	addressbook	ru	Какие поля показывать в списке адресов
 fieldseparator	addressbook	ru	Разделитель полей
@@ -239,8 +235,6 @@ grant addressbook access	common	ru	Предоставить доступ к ад
 group %1	addressbook	ru	Группа %1
 h	addressbook	ru	час
 hide accounts from addressbook	addressbook	ru	Скрыть учётные записи из адресной книги
-hide all accounts	addressbook	ru	Скрыть все учетные записи
-hide user groups as distribution lists	addressbook	ru	Скрыть группы пользователей как списки рассылки
 hides accounts completly from the adressbook.	addressbook	ru	Полностью скрывает учётные записи из адресной книги
 history logging	admin	ru	История записей
 home address	addressbook	ru	Домашний адрес
@@ -254,7 +248,6 @@ home state	addressbook	ru	Домашний - регион
 home street	addressbook	ru	Домашний - улица
 home zip code	addressbook	ru	Домашний почтовый индекс
 how many contacts should non-admins be able to export	admin	ru	Сколько контактов может экспортировать не-администратор
-how many fields must match for the record to be considered a duplicate.	addressbook	ru	Сколько полей должно совпадать, чтобы запись считалась дубликатом.
 html link to the current record	addressbook	ru	HTML-ссылка на запись
 icon	addressbook	ru	Пиктограмма
 if accounts are already in ldap	admin	ru	Если учётная запись уже в LDAP
@@ -274,8 +267,7 @@ imports contacts into your addressbook from a csv file. csv means 'comma separat
 imports contacts into your addressbook from a vcard file.	addressbook	ru	Импортирует контакты в вашу адресную книгу из файла vCard
 in %1 days (%2) is %3's birthday.	addressbook	ru	Через %1 день/дней (51) наступит День рождения %3
 income	addressbook	ru	Входящие
-infolog	addressbook	ru	Контакт InfoLog
-infolog-organisation	addressbook	ru	Организация InfoLog
+infolog	addressbook	ru	ИнфоЖурнал
 insert	addressbook	ru	Вставить
 insufficent rights to delete this list!	addressbook	ru	Недостаточно прав для удаления этого списка!
 international	addressbook	ru	Международный
@@ -299,7 +291,6 @@ list already exists!	addressbook	ru	Список уже существует!
 list created	addressbook	ru	Список создан
 list creation failed, no rights!	addressbook	ru	Неудача при создании списка, нет прав!
 list of files linked to the current record	addressbook	ru	Список файлов, связанных с текущей записью
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	ru	Загружать пользовательские поля в индекс, даже если колонка пользовательских полей выключена (например, чтобы отобразить их в определенной колонке индекса)
 load vcard	addressbook	ru	Загрузить vCard
 location	addressbook	ru	Расположени
 locations	addressbook	ru	Местоположения
@@ -308,7 +299,6 @@ main categories in their own field	addressbook	ru	Основные катего
 manage mapping	addressbook	ru	Управление отображениями
 mark records as private	addressbook	ru	Пометить записи как личные
 merge contacts	addressbook	ru	Слияние контактов
-merge duplicates	addressbook	ru	Объединить дубликаты
 merge into first or account, deletes all other!	addressbook	ru	Слить с первым или учётной записью, удалить все остальные!
 merged	addressbook	ru	Слито
 message after submitting the form	addressbook	ru	Сообщение после отправки формы
@@ -330,11 +320,8 @@ new contact submitted by %1 at %2	addressbook	ru	Новый контакт от
 new window opened to edit infolog for your selection	addressbook	ru	Открыто новое окно редактирования выбранной записи ИнфоЖурнала
 next date	addressbook	ru	Следующая дата
 no categories selected	addressbook	ru	Не выбрано категорий
-no country selected	addressbook	ru	Страна не выбрана
-no distribution list	addressbook	ru	Нет списка рассылки
 no fallback	addressbook	ru	Нет резерва
-no vcard	addressbook	ru	Нет визитной карточки vCard
-not shared	addressbook	ru	не разделенный
+no vcard	addressbook	ru	Нет визитной карточки VCard
 number	addressbook	ru	Номер
 number of records to read (%1)	addressbook	ru	Количество записей для чтения (%1)
 open email addresses in external mail program	addressbook	ru	Открывать адреса электронной почты во внешней почтовой программе
@@ -382,7 +369,6 @@ replacements for inserting contacts into documents	addressbook	ru	Подстан
 required fields *	addressbook	ru	Требуемые поля
 role	addressbook	ru	Должность
 room	addressbook	ru	Комната
-search letter	addressbook	ru	Поисковое письмо
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	ru	Выбрать фотографию jpeg портретного формата. Она будет масштабирована до 60 пикселей в ширину
 select a view	addressbook	ru	Выбрать вид
 select addressbook type	addressbook	ru	Выбрать тип адресной книги
@@ -400,12 +386,6 @@ send emailcopy to receiver	addressbook	ru	Отправить копию пись
 seperator	addressbook	ru	Разделитель
 set full name and file as field in contacts of all users (either all or only empty values)	admin	ru	Определите полное имя и файл как поле в контактах для всех пользователей (для всех или пустых величин)
 set only full name	addressbook	ru	Определить только полное имя
-share into addressbook	addressbook	ru	Поделиться в адресной книге
-share writable	addressbook	ru	Общий доступ доступен для записи
-shared	addressbook	ru	общий доступ
-shared by me	addressbook	ru	Разделено мной
-shared into addressbook %1	addressbook	ru	поделиться в записную книжку %1
-shared with	addressbook	ru	Поделиться с
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	ru	Всегда отображать поля фото и домашнего адреса, даже если они пусты
 show	addressbook	ru	Показать
 show infolog entries for this organisation	addressbook	ru	Показать записи ИнфоЖурнала для этой организации
@@ -450,20 +430,18 @@ unable to convert "%1" to account id.  using plugin setting (%2) for owner.	addr
 unable to delete	addressbook	ru	Невозможно удалить
 unique id (uid)	addressbook	ru	Уникальный ID (UID)
 unique id<br />(to update existing records)	addressbook	ru	Уникальный ID<br /> для обновления существующих записей
-unshare	addressbook	ru	Больше не делиться
-unshared	addressbook	ru	больше не делится
 update a single entry by passing the fields.	addressbook	ru	Обновление записи при помощи передачи полей
 update fields by edited organisations?	admin	ru	Обновить поля отредактированной организации?
 updated	addressbook	ru	Обновлено
 upload or delete the photo	addressbook	ru	Выгрузить или удалить фото
 url to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)	admin	ru	URL для связи с телефонными номерами (используйте %1 = номер для звонка,%u = наименование учётной записи, %t = телефон учётной записи)
 use addressbooks "own sorting" attribute	addressbook	ru	Используйте атрибут адресной книги «собственная сортировка»
+use an extra category tab?	addressbook	ru	Использовать дополнительную вкладку категории
 use an extra tab for private custom fields?	admin	ru	Использовать дополнительную закладку для частных пользовательских полей?
 use country list	addressbook	ru	Использовать список стран
 use setup for a full account-migration	admin	ru	Использовать установку для полной миграции учётных записей
 use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	ru	Используйте этот тег для адресных меток. Поместите содержимое, которое нужно повторить, между двумя тэгами.
 used for links and for the own sorting of the list	addressbook	ru	Используется для создания ссылок и собственных условий сортировки списка
-user groups are automatically shown as distribution lists.	addressbook	ru	Группы пользователей автоматически отображаются в виде списков рассылки.
 user preference	addressbook	ru	Пользовательские настройки
 vcard	common	ru	vCard
 vcards require a first name entry.	addressbook	ru	vCard требует наличия имени
@@ -474,7 +452,6 @@ warning!! ldap is valid only if you are not using contacts for accounts storage!
 warning: all contacts found will be deleted!	addressbook	ru	ПРЕДУПРЕЖДЕНИЕ: Все найденные контакты будут удалены!
 weekday	addressbook	ru	Рабочий день
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	ru	Изображение перехода к адресной книге в других приложениях. Значение «пусто» не допустимо. После изменения данной настройки следует выполнить вход в систему снова
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	ru	Когда вы объединяете записи в документы, они будут храниться здесь. Если каталог не указан, они будут храниться в вашем домашнем каталоге (/home/...).
 where to add the email address	addressbook	ru	Куда добавлять адреса электронной почты
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	ru	Какой формат адреса должна использовать адресная книга для стран с неизвестным форматом адреса. Если формат адреса страны известен, он используется вне зависимости от настройки этого параметра
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	ru	Какая адресная книга должна быть выбрана при добавлении контакта, если нет прав на текущую адресную книгу
@@ -493,7 +470,6 @@ yes, for the next week	addressbook	ru	Да, для следующей недел
 yes, for today and tomorrow	addressbook	ru	Да, на сегодня и завтра
 yes, only admins can purge deleted items	admin	ru	Да, только администраторы могут очистить удалённые записи
 yes, users can purge their deleted items	admin	ru	Да, пользователи могут очистить удалённые ими записи
-you are not allowed to share into the addressbook of %1	addressbook	ru	Вам не разрешено делиться информацией в адресной книге %1
 you are not permitted to delete contact %1	addressbook	ru	Вам не разрешено удалять контакт %1
 you are not permittet to delete this contact	addressbook	ru	Вам не разрешено удалять этот контакт
 you are not permittet to edit this contact	addressbook	ru	Вам не разрешено редактировать этот контакт

addressbook/lang/egw_sk.lang

@@ -8,7 +8,6 @@
 %1 public keys added.	addressbook	sk	%1 verejných kľúčov pridaných.
 %1 records imported	addressbook	sk	Bolo naimportovaných %1 záznamov.
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	sk	Bolo prečítaných %1 záznamov (zatiaľ neimportované, môžete se vrátit %2späť%3 a odznačit Test importu)
-%1 shared this contact on %2 with %3 %4	addressbook	sk	%1 zdieľal tento kontakt na %2 s %3 %4
 %1 starts with '%2'	addressbook	sk	%1 začína na '%2'
 %s please calculate the result	addressbook	sk	%s prosím spočítajte výsledok
 (e.g. 1969)	addressbook	sk	(napr. 1969)
@@ -42,7 +41,7 @@ added by synchronisation	addressbook	sk	Pridané cez synchronizáciu
 added to distribution list	addressbook	sk	Pridané do distribučného zoznamu
 additional information about using ldap as contact repository	admin	sk	Ďalšie informácie o používaní LDAP ako zdroja kontaktov
 address book	common	sk	Adresár
-address book - vcard in	addressbook	sk	Adresár - vizitka vCard v
+address book - vcard in	addressbook	sk	Adresár - vizitka VCard v
 address book - view	addressbook	sk	Adresár - pohľad
 address line 2	addressbook	sk	Adresa riadok 2
 address line 2 (private)	addressbook	sk	Adresa riadok 2 (súkromné)
@@ -60,7 +59,7 @@ addressbook the contact should be shown	addressbook	sk	Adresár, v ktorom sa má
 addressbook vcard export	addressbook	sk	Adresár - export vCard
 addressbook vcard import	addressbook	sk	Adresár - import vCard
 addressbook-fieldname	addressbook	sk	Pole adresára
-addvcard	addressbook	sk	Pridať vizitku vCard
+addvcard	addressbook	sk	Pridať vizitku VCard
 advanced search	addressbook	sk	Pokročilé hľadanie
 all addressbooks	addressbook	sk	Všetky adresáre
 all contacts	addressbook	sk	Všetky kontakty
@@ -238,7 +237,7 @@ example {{nenvlf role}} - if field role is not empty, set a lf without any value
 existing links	addressbook	sk	Existujúce odkazy
 exists	addressbook	sk	existuje
 export as csv	addressbook	sk	Exportovať ako CSV
-export as vcard	addressbook	sk	Exportovať ako vizitku vCard
+export as vcard	addressbook	sk	Exportovať ako vizitku VCard
 export contacts	addressbook	sk	Exportovať kontakty
 export definition to use for nextmatch export	addressbook	sk	Exportná definícia pre použitie v exporte
 export definitition to use for nextmatch export	addressbook	sk	Definícia exportu pre použitie v nasledujúcom exporte
@@ -307,11 +306,11 @@ import contacts	addressbook	sk	Importovať kontakty
 import csv-file into addressbook	addressbook	sk	Importovat CSV súbor do Adresára
 import file	addressbook	sk	Importuj súbor
 import from	addressbook	sk	Import z
-import from ldif, csv, or vcard	addressbook	sk	Import z LDIF, CSV alebo vCard
+import from ldif, csv, or vcard	addressbook	sk	Import z LDIF, CSV alebo VCard
 import from outlook	addressbook	sk	Importuj z Outlooku
-import multiple vcard	addressbook	sk	Import viacerých vizitek vCard
+import multiple vcard	addressbook	sk	Import viacerých vizitek VCard
 import next set	addressbook	sk	Importovať ďalšiu sadu
-import_instructions	addressbook	sk	V Netscape otvorte Adresár a vyberte <b>Export<b> v ponuke <b>Súbor</b>. Exportovaný súbor bude vo formáte LDIF.<p>V Outlooku vyberte Kontakty, zvoľte <b>Import a export...</b> z ponuky <b>Súbor</b> a exportujte dáta do súboru s hodnotami oddelenými čiarkami.<p>V Palm Desktop 4.0 a vyššom otvorete adresár a zvoľte <b>Export</b> z ponuky <b>Súbor</b>. Exportované dáta budú vo formáte vCard.
+import_instructions	addressbook	sk	V Netscape otvorte Adresár a vyberte <b>Export<b> v ponuke <b>Súbor</b>. Exportovaný súbor bude vo formáte LDIF.<p>V Outlooku vyberte Kontakty, zvoľte <b>Import a export...</b> z ponuky <b>Súbor</b> a exportujte dáta do súboru s hodnotami oddelenými čiarkami.<p>V Palm Desktop 4.0 a vyššom otvorete adresár a zvoľte <b>Export</b> z ponuky <b>Súbor</b>. Exportované dáta budú vo formáte VCard.
 importer's personal	addressbook	sk	Importérove súkromné
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	sk	Naimportuje kontakty do Vášho Adresára z CSV súboru (CSV znamená Comma Separated Values). V karte možností môžete samozrejme vybrať iný oddeľovač než čiarku.
 imports contacts into your addressbook from a vcard file.	addressbook	sk	Naimportuje kontakty do vášho Adresára zo súboru vCard.
@@ -344,10 +343,10 @@ list created	addressbook	sk	Zoznam bol vytvorený
 list creation failed, no rights!	addressbook	sk	Nepodarilo sa vytvoriť zoznam, nemáte práva!
 list of files linked to the current record	addressbook	sk	Zoznam súborov priložených k súčasnému záznamu
 load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	sk	Nahrať vlastné polia do indexu aj v prípade, keď je vlastné pole vypnuté (napr. aby sa dali zobraziť v určitom stĺpci indexu)
-load vcard	addressbook	sk	Nahrať vizitku vCard
+load vcard	addressbook	sk	Nahrať vizitku VCard
 location	addressbook	sk	Umiestnenie
 locations	addressbook	sk	Umiestnenia
-mail vcard	addressbook	sk	Poslať vCard e-mailom
+mail vcard	addressbook	sk	Poslať VCard e-mailom
 main categories in their own field	addressbook	sk	Hlavné kategórie v samostatných poliach
 manage mapping	addressbook	sk	Správa mapovania
 mark records as private	addressbook	sk	Označiť záznamy ako súkromé
@@ -367,7 +366,7 @@ modem phone	addressbook	sk	Číslo na modem
 more ...	addressbook	sk	Viac ...
 move to addressbook	addressbook	sk	Presunúť do adresára
 moved	addressbook	sk	Presunuté
-multiple vcard	addressbook	sk	Viacero vizitiek vCard
+multiple vcard	addressbook	sk	Viacero vizitiek VCard
 name for the distribution list	addressbook	sk	Názov pre distribučný zoznam
 name of current user, all other contact fields are valid too	addressbook	sk	Meno súčasného používateľa, ostatné kontaktné polia sú tiež platné.
 name, address	addressbook	sk	Meno, Adresa
@@ -375,11 +374,9 @@ new contact submitted by %1 at %2	addressbook	sk	Nový kontakt odoslal %1 %2
 new window opened to edit infolog for your selection	addressbook	sk	Otvorilo sa nové okno pre úpravu Záznamníka pre váš výber
 next date	addressbook	sk	Nasledujúci dátum
 no categories selected	addressbook	sk	neboli vybrané kategórie
-no country selected	addressbook	sk	Žiadna vybraná krajina
 no distribution list	addressbook	sk	Bez distribučného zoznamu
 no fallback	addressbook	sk	Bez návratu
 no vcard	addressbook	sk	Žiadna vizitka
-not shared	addressbook	sk	ni v skupni rabi
 number	addressbook	sk	Číslo
 number of records to read (%1)	addressbook	sk	Počet záznamov k načítaniu (%1)
 open %1 crm view	addressbook	sk	Otvoriť %1 CRM obrazenie
@@ -456,12 +453,6 @@ send succeeded to %1	common	sk	Odoslanie sa podarilo pre %1
 seperator	addressbook	sk	Oddeľovač
 set full name and file as field in contacts of all users (either all or only empty values)	admin	sk	Nastaviť plné meno a súbor ako pole v kontaktoch všetkých používateľov (buď všetky alebo len prázdne hodnoty)
 set only full name	addressbook	sk	Nastaviť len plné meno
-share into addressbook	addressbook	sk	Zdieľať do adresára
-share writable	addressbook	sk	Zdieľať zapisovateľné
-shared	addressbook	sk	zdieľané
-shared by me	addressbook	sk	Zdieľané mnou
-shared into addressbook %1	addressbook	sk	zdieľané do adresára %1
-shared with	addressbook	sk	Zdieľané s
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	sk	Majú sa stĺpce pre fotku a adresu domov zobrazovať vždy, aj keď sú prázdne?
 show	addressbook	sk	Ukázať
 show active accounts	addressbook	sk	Ukázať aktívne účty
@@ -514,8 +505,6 @@ unable to import into %1, using %2	addressbook	sk	Nedá sa naimportovať do %1,
 unique id (uid)	addressbook	sk	Jedinečné ID (UID)
 unique id<br />(to update existing records)	addressbook	sk	Jedinečné ID<br />(pre aktualizáciu existujúcich záznamov)
 unknown type %1, imported as %2	addressbook	sk	Neznámy typ %1, naimportvaný ako %2
-unshare	addressbook	sk	Ni več v skupni rabi
-unshared	addressbook	sk	ni več v skupni rabi
 update a single entry by passing the fields.	addressbook	sk	Aktualizovať jednotlivý záznam podľa zadaných polí
 update fields by edited organisations?	admin	sk	Aktualizovať polia podľa upravených organizácií?
 updated	addressbook	sk	Aktualizované
@@ -532,7 +521,7 @@ use this tag for addresslabels. put the content, you want to repeat, between two
 used for links and for the own sorting of the list	addressbook	sk	Používa sa pre odkazy a vlastné spôsoby triedenia zoznamu
 user groups are automatically shown as distribution lists.	addressbook	sk	Používateľské skupiny sa automaticky ukážu akodistribučné zoznamy.
 user preference	addressbook	sk	Používateľská voľba
-vcard	common	sk	Vizitka vCard
+vcard	common	sk	Vizitka VCard
 vcards require a first name entry.	addressbook	sk	Vizitky potrebujú zadané krstné meno.
 vcards require a last name entry.	addressbook	sk	Vizitky potřebujú zadané priezvisko.
 verification	addressbook	sk	Kontrola
@@ -542,7 +531,6 @@ warning: all contacts found will be deleted!	addressbook	sk	POZOR: Všetky konta
 weekday	addressbook	sk	Deň v týždni
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	sk	Čo sa má v iných aplikáciách zobraziť na mieste odkazu na adresár. Prázdne hodnoty sa vynechajú. Ak zmeníte toto nastavenie, musíte sa znovu prihlásiť!
 when viewing a contact, show linked entries from the selected application	addressbook	sk	Pri zobrazení kontaktu ukázať odkazované položky z vybranej ikácie
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	sk	Pri spájaní záznamov do dokumentov sa budú ukladať sem. Ak nie je uvedený žiadny adresár, budú uložené vo vašom domovskom adresári (/home/...).
 where to add the email address	addressbook	sk	Kde pridať E-mailovú adresu
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	sk	Aký formát adries sa má použiť pre krajiny, u ktorých formát nie je známy? Pozn. Ak formát tej-ktorej krajiny známy JE, tak sa použije, nezávisle od tohto nastavenia.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	sk	Ktorý adresár sa má použiť, keď pridávate nový kontakt A PRITOM nemáte právo pridať ho do aktuálneho adresára.
@@ -561,14 +549,13 @@ yes, for the next week	addressbook	sk	Áno, pre nasledujúci týždeň
 yes, for today and tomorrow	addressbook	sk	Áno, pre dnešok a zajtrajšok
 yes, only admins can purge deleted items	admin	sk	Áno, iba správci môžu vymazať odstránené položky
 yes, users can purge their deleted items	admin	sk	Áno, používatelia môžu vymazať ich odstránené položky
-you are not allowed to share into the addressbook of %1	addressbook	sk	Skupna raba v imeniku ni dovoljena %1
 you are not permitted to delete contact %1	addressbook	sk	Nemáte oprávnenie k odstráneniu kontaktu %1
 you are not permittet to delete this contact	addressbook	sk	Nemáte oprávnenie odstrániť tento kontakt
 you are not permittet to edit this contact	addressbook	sk	Nemáte oprávnenie upraviť tento kontakt
 you are not permittet to view this contact	addressbook	sk	Nemáte oprávnenie vidieť tento kontakt
 you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	sk	LDAP ako zdroj kontaktov sa dá používať len vtedy, keď sú aj účty uložené v LDAP!
 you can respond by visiting:	addressbook	sk	Ak si chcete pozrieť, navštívte:
-you must select a vcard. (*.vcf)	addressbook	sk	Musíte vybrať vCard (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	sk	Musíte vybrať VCard (*.vcf)
 you must select at least 1 column to display	addressbook	sk	Musíte vybrať aspoň 1 stĺpec k zobrazeniu.
 you need to select a distribution list	addressbook	sk	Najprv musíte vybrať distribučný zoznam
 you need to select some contacts first	addressbook	sk	Najprv musíte vybrať nejaké kontakty.

addressbook/lang/egw_sl.lang

@@ -2,15 +2,18 @@
 %1 contact(s) %2	addressbook	sl	%1 stikov %2
 %1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	sl	%1 je kontaktiral %2, pri %3 se je pojavila napaka zaradi premajhnih pravic!
 %1 contacts updated (%2 errors).	addressbook	sl	%1 stikov je bilo posodobljenih (%2 napak).
+%1 copied - the copy can now be edited	addressbook	sl	Kopirano je %1 - kopijo lahko zdaj urejate
+%1 entries %2, %3 failed because of insufficent rights !!!	addressbook	sl	%1 vnosov %2, %3 ni uspelo zaradi nezadostnih pravic!
+%1 entries %2, %3 failed.	addressbook	sl	%1 vnosov %2, %3 ni uspelo.
 %1 fields in %2 other organisation member(s) changed	addressbook	sl	%1 polje %2 članu v drugi organizaciji se je spremenilo
 %1 key(s) added to public keyserver "%2".	addressbook	sl	Ključi %1, dodani javnemu ključevu "%2".
 %1 not implemented for %2!	addressbook	sl	%1 ni implementirano za %2!
 %1 public keys added.	addressbook	sl	Dodani so javni ključ i%1.
 %1 records imported	addressbook	sl	%1 zapisov uvoženih
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	sl	1% zapisov prebranih (niso še uvoženi, lahko greste %2nazaj%3 in odznačite preizkus uvoza)
-%1 shared this contact on %2 with %3 %4	addressbook	sl	%1 je ta stik delil na %2 %3 %4
 %1 starts with '%2'	addressbook	sl	%1 se začne z '%2'
 %s please calculate the result	addressbook	sl	%s izračunaj rezultat
+'%1' is not allowed ('%2')!	addressbook	sl	'%1' ni dovoljeno ('%2')!
 (e.g. 1969)	addressbook	sl	(npr. 1969)
 (empty = use global limit, no = no export at all)	admin	sl	(prazno = uporabi globalno omejitev, ne = izvoz ni dovoljen)
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	sl	<b>Ni tipa prevoda <noben> lahko je zaklenjen.</b> Izberite tip prevoda s seznama.
@@ -42,7 +45,7 @@ added by synchronisation	addressbook	sl	Dodano s sinhronizacijo
 added to distribution list	addressbook	sl	Dodano v distribucijski seznam
 additional information about using ldap as contact repository	admin	sl	Dodatne informacije o uporabi LDAP kot repozitorija za kontakte
 address book	common	sl	Adresar
-address book - vcard in	addressbook	sl	Adresar - vCard
+address book - vcard in	addressbook	sl	Adresar - VCard
 address book - view	addressbook	sl	Adresar - pogled
 address line 2	addressbook	sl	Naslov - 2. vrstica
 address line 2 (private)	addressbook	sl	Naslovna vrstica 2 (zasebna)
@@ -60,9 +63,12 @@ addressbook the contact should be shown	addressbook	sl	Adresar, katerega kontakt
 addressbook vcard export	addressbook	sl	Izvoz vCard adresarja
 addressbook vcard import	addressbook	sl	Uvoz vCard imenika
 addressbook-fieldname	addressbook	sl	Adresar-Ime polja
-addvcard	addressbook	sl	Dodaj vCard
+addvcard	addressbook	sl	Dodaj VCard
+admin	addressbook	sl	Skrbnik
 advanced search	addressbook	sl	Napredno iskanje
+all	addressbook	sl	vse
 all addressbooks	addressbook	sl	Vsi adresarji
+all categories	addressbook	sl	Vse kategorije
 all contacts	addressbook	sl	Vsi kontakti
 all in one field	addressbook	sl	Vse v enem polju
 all types	addressbook	sl	Vse vrste
@@ -100,7 +106,9 @@ car phone	addressbook	sl	Telefon v avtu
 categorie	addressbook	sl	Kategorija
 categorie added	addressbook	sl	Kategorija dodana
 categorie delete	addressbook	sl	Kategorija izbrisana
+categories	addressbook	sl	Kategorije
 categories, notes, ...	addressbook	sl	Kategorije, opombe ...
+category	addressbook	sl	Kategorija
 category path	addressbook	sl	Pot kategorije
 category tree	admin	sl	Drevo kategorij
 cell phone	addressbook	sl	GSM
@@ -112,6 +120,7 @@ charset of file	addressbook	sl	Kodna tabela datoteke
 check all	addressbook	sl	Preveri vse
 choose an icon for this contact type	admin	sl	Izberite ikono za to vrsto stika
 choose charset	addressbook	sl	Izberi nabor znakov
+choose export options	addressbook	sl	Izberite možnosti izvoza
 choose owner of imported data	addressbook	sl	Izberite lastnika uvoženih podatkov
 choose pre-defined map source or use custom url (use %r = street, %t = city, %c = country, %z = zipcode)	admin	sl	Izberite vnaprej določen vir zemljevida ali uporabite URL po meri (uporabite %r = ulica, %t = mesto, %c = država, %z = poštna številka)
 chosse an etemplate for this contact type	admin	sl	Izberite eTemplate za to vrsto stika
@@ -174,6 +183,7 @@ default format for fileas, eg. for new entries.	addressbook	sl	Privzeta oblika z
 default geolocation source address	addressbook	sl	Default GeoLocation source address
 default is to open email addresses in egroupware email application, if user has access to it.	addressbook	sl	Privzeto se odpre e-naslov v programu za e-pošto Egroupware.
 defines which email address (business or home) to use as the preferred one for distribution lists in mail.	addressbook	sl	Določa, kateri e-naslov (domači ali službeni) naj se uporabi kot privzeti za distribucijski seznam.
+delete	addressbook	sl	Izbriši
 delete a single entry by passing the id.	addressbook	sl	Izbriši zapis s podano šifro
 delete selected distribution list!	addressbook	sl	Izbriši izbrane distribucijske sezname!
 delete this contact	addressbook	sl	Izbriši ta stik
@@ -212,6 +222,7 @@ edit extra account-data in the addressbook	admin	sl	Uredi dodatne podatke račun
 edit phonenumbers	addressbook	sl	Urejanje telefonskih številk
 edit phonenumbers -	addressbook	sl	Uredi telefonske številke -
 either the configured email addesses are wrong or the mail configuration.	addressbook	sl	Napačen e-naslov ali konfiguracija.
+email	addressbook	sl	ePošta
 email & internet	addressbook	sl	ePošta in Splet
 email (private)	addressbook	sl	ePošta (zasebno)
 email addresses (comma separated) to send the contact data	addressbook	sl	E-naslovi (ločeni z vejico), na katere pošljem podatke stika
@@ -224,6 +235,7 @@ enter the path to the exported file here	addressbook	sl	Vnesite pot do izhodne d
 error deleting the contact !!!	addressbook	sl	Napaka pri brisanju stika!
 error saving the contact !!!	addressbook	sl	Napaka pri shranjevanju stika!
 error: the entry has been updated since you opened it for editing!	addressbook	sl	Napaka: vnos je bil spremenjen medtem, ko ste imeli odprtega za urejanje!
+exact	addressbook	sl	točno
 example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	addressbook	sl	Primer {{IF n_prefix ~ Mr ~ Pozdravljeni g. ~ Pozdravljeni gospa}} - poiščite polje »n_prefix«, za »gospod«, če najdete, pišite Hello Hello, drugače pišite Hello Ms.
 example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller	preferences	sl	Primer {{LETTERPREFIXCUSTOM n_prefix naslov n_family}} - Primer: g. Dr. James Miller
 example {{nelf role}} - if field role is not empty, you will get a new line with the value of field role	addressbook	sl	Primer {{NELF vloga}} - če poljska vloga ni prazna, boste dobili novo vrstico z vrednostjo vloge na poljubnem mestu
@@ -231,7 +243,7 @@ example {{nenvlf role}} - if field role is not empty, set a lf without any value
 existing links	addressbook	sl	Obstoječe povezave
 exists	addressbook	sl	Obstaja
 export as csv	addressbook	sl	Izvozi v CSV
-export as vcard	addressbook	sl	Izvozi kot vCard
+export as vcard	addressbook	sl	Izvozi kot VCard
 export contacts	addressbook	sl	Izvozi stike
 export definition to use for nextmatch export	addressbook	sl	Izvozna definicija, ki jo je treba uporabiti za izvoz naslednjega računa
 export definitition to use for nextmatch export	addressbook	sl	Izvozna definicija, ki jo je treba uporabiti za izvoz naslednjega računa
@@ -240,6 +252,7 @@ export from addressbook	addressbook	sl	Izvoz iz adresarja
 export selection	addressbook	sl	Izvozi izbor
 exported	addressbook	sl	Izvoženo
 exports contacts from your addressbook into a csv file.	addressbook	sl	Izvozi stike iz adresarja v datoteko CSV.
+exports contacts from your addressbook into a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	addressbook	sl	Izvozi stike iz vašega adresarja v datoteko CSV. CSV pomeni 'Comma Seperated Values' (vrednosti, ločene z vejico). Na zavihku možnosti pa lahko za ločilo polj izberete drugi znak.
 exports contacts from your addressbook into a vcard file.	addressbook	sl	Izvozi stike iz svojega adresarja v datoteko vCard.
 extra	addressbook	sl	Dodatno
 extra encodings	addressbook	sl	Dodatno kodiranje
@@ -259,6 +272,9 @@ fields to consider when looking for duplicate contacts.	addressbook	sl	Polja, ki
 fields to copy when copying an address?	admin	sl	Polja za kopiranje pri kopiranju naslova
 fields to show in address list	addressbook	sl	Polja, ki naj se prikažejo v seznamu
 fieldseparator	addressbook	sl	Ločilo polj
+file is not a %1 public key!	addressbook	sl	Datoteka ni javni ključ %1!
+first name	addressbook	sl	ime
+firstname	addressbook	sl	Ime
 for read only ldap	admin	sl	Za LDAP samo za branje
 for serial letter use this tag. put the content, you want to repeat between two tags.	addressbook	sl	Za tipska pisma uporabite značko. Vsebino, ki jo želite imeti v vseh dokumentih, vnesite med značke.
 freebusy uri	addressbook	sl	Freebusy URI
@@ -275,7 +291,6 @@ group %1	addressbook	sl	Skupina %1
 h	addressbook	sl	h
 hide accounts from addressbook	addressbook	sl	Skrij uporabniške račune iz adresarja
 hide all accounts	addressbook	sl	Skrij vse račune
-hide user groups as distribution lists	addressbook	sl	Skrijte skupine uporabnikov kot distribucijske sezname
 hides accounts completly from the adressbook.	addressbook	sl	Skrij uporabniške račune iz adresarja
 history logging	admin	sl	Beleženje zgodovine
 home address	addressbook	sl	Domači naslov
@@ -293,23 +308,29 @@ how many fields must match for the record to be considered a duplicate.	addressb
 html link to the current record	addressbook	sl	Povezava HTML s trenutnim zapisom
 icon	addressbook	sl	Ikona
 if accounts are already in ldap	admin	sl	Če je račun že v LDAP
+if you specify a directory (full vfs path) here, %1 displays an action for each document. that action allows to download the specified document with the data inserted.	addressbook	sl	Če določite imenik (celotna pot vfs), bo %1 prikazalo dejanje za vsak dokument. To dejanje omogoča prenos določenega dokumenta z vstavljenimi podatki.
+if you specify a directory (full vfs path) here, stiki displays an action for each document. that action allows to download the specified document with the data inserted. the document can contain placeholder like {{n_fn}}, to be replaced with the data. the following document-types are supported:txt,rtf,odt,ods,docx,xml,eml	addressbook	sl	Če določite imenik (celotna pot vfs), bo Stiki prikazal dejanje za vsak dokument. To dejanje omogoča prenos določenega dokumenta z vstavljenimi podatki. Dokument lahko vsebuje vsebnik kot {{n_fn}}, ki ga je treba zamenjati s podatki. Podprte so naslednje vrste dokumentov: txt, rtf, odt, ods, docx, xml, eml
+if you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. that icon allows to download the specified document with the data inserted.	addressbook	sl	Če določite dokument (celotno pot vfs) tukaj, %1 prikaže ikono dodatne ikone za vsak vnos. Ta ikona omogoča prenos določenega dokumenta z vstavljenimi podatki.
+if you specify a document (full vfs path) here, stiki displays an extra document icon for each entry. that icon allows to download the specified document with the data inserted. the document can contain placeholder like {{n_fn}}, to be replaced with the data. the following document-types are supported:txt,rtf,odt,ods,docx,xml,eml	addressbook	sl	Če določite dokument (celotno pot vfs), se za vsak vnos prikaže ikona za dodatno dokumentacijo. Ta ikona omogoča prenos določenega dokumenta z vstavljenimi podatki. Dokument lahko vsebuje vsebnik kot {{n_fn}}, ki ga je treba zamenjati s podatki. Podprte so naslednje vrste dokumentov: txt, rtf, odt, ods, docx, xml, eml
+if you specify an export definition, it will be used when you export	addressbook	sl	Če določite definicijo izvoza, se bo uporabil, ko boste izvozili
 ignore first line	addressbook	sl	Prezri prvo vrstico
 import	addressbook	sl	Uvoz
 import contacts	addressbook	sl	Uvozi  stike
 import csv-file into addressbook	addressbook	sl	Uvozi CSV-polja v imenik
 import file	addressbook	sl	Uvozi datoteko
 import from	addressbook	sl	Uvozi iz
-import from ldif, csv, or vcard	addressbook	sl	Uvoz iz LDIF, CSV ali vCard
+import from ldif, csv, or vcard	addressbook	sl	Uvoz iz LDIF, CSV ali VCard
 import from outlook	addressbook	sl	Uvoz iz Outlook-a
-import multiple vcard	addressbook	sl	Uvoz večih vCard
+import multiple vcard	addressbook	sl	Uvoz večih VCard
 import next set	addressbook	sl	Uvozi naslednji niz
 import_instructions	addressbook	sl	V Netscapu odprite adresar in izberite <b>Export</b> v meniju <b>File</b>. Izvožena datoteka bo v obliki LDIF.<p>V Outlooku izberite mapo Stiki (Contacts), izberite <b>Uvoz/izvoz (Import/Export)</b> v meniju <b>Datoteka (File)</b>. Izvožena datoteka bo v obliki CSV.
 importer's personal	addressbook	sl	Uvoznik je oseben
+imports contacts into your addressbook from a csv file. csv means 'comma seperated values'. however in the options tab you can also choose other seperators.	addressbook	sl	Uvozi stike v vaš adresar iz datoteke CSV. CSV pomeni 'vrednosti, ločene z vejico'. Vendar na zavihku Možnosti lahko izberete drugo ločilo polj.
 imports contacts into your addressbook from a vcard file.	addressbook	sl	Uvozi stike v svoj adresar iz datoteke vCard.
 in %1 days (%2) is %3's birthday.	addressbook	sl	V %1 dneh (%2) je rojstni dan %3.
 income	addressbook	sl	Priliv
 infolog	addressbook	sl	InfoDnevnik
-infolog-organisation	addressbook	sl	Organizacija InfoLog
+input required	addressbook	sl	Potreben je vhod
 insert	addressbook	sl	Vstavi
 insufficent rights to delete this list!	addressbook	sl	Nimate dovolj pravic za brisanje tega seznama!
 insufficent rights to edit this list!	addressbook	sl	Neustrezne pravice za urejanje tega seznama!
@@ -319,6 +340,8 @@ label	addressbook	sl	Značilnosti
 last date	addressbook	sl	Zadnji datum
 last modified	addressbook	sl	Nazadnje spremenjeno
 last modified by	addressbook	sl	Nazadnje spremenil
+last name	addressbook	sl	priimek
+lastname	addressbook	sl	Priimek
 ldap context for contacts	admin	sl	Kontekst LDAP za stike
 ldap host for contacts	admin	sl	Strežnik LDAP za stike
 ldap settings for contacts	admin	sl	Nastavitve LDAP za stike
@@ -334,11 +357,11 @@ list already exists!	addressbook	sl	Seznam že obstaja!
 list created	addressbook	sl	Seznam ustvarjen
 list creation failed, no rights!	addressbook	sl	Napak pri ustvarjanju seznama - nimate pravic!
 list of files linked to the current record	addressbook	sl	Seznam datotek, povezanih s trenutnim zapisom
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	sl	Naloži polja po meri v indeks, tudi če je stolpec za polja po meri izklopljen (npr. če jih želite prikazati v določenem stolpcu indeksa)
-load vcard	addressbook	sl	Naloži vCard
+load vcard	addressbook	sl	Naloži VCard
 location	addressbook	sl	Lokacija
 locations	addressbook	sl	Lokacije
-mail vcard	addressbook	sl	Pošta vCard
+mail vcard	addressbook	sl	Pošta VCard
+main api\categories in their own field	addressbook	sl	Main Api \ Kategorije v svojem polju
 main categories in their own field	addressbook	sl	Glavne kategorije v scojih poljih
 manage mapping	addressbook	sl	Upravljaj mapiranje
 mark records as private	addressbook	sl	Označi zapise kot zasebne
@@ -346,6 +369,7 @@ merge contacts	addressbook	sl	Združi stike
 merge duplicates	addressbook	sl	Spoji dvojnike
 merge into first or account, deletes all other!	addressbook	sl	Spoji v prvi stik, izbriši ostale!
 merged	addressbook	sl	Spojeno
+message	addressbook	sl	sporočilo
 message after submitting the form	addressbook	sl	Sporočilo po oddaji obrazca
 message phone	addressbook	sl	Telefon za sporočila
 middle name	addressbook	sl	Srednje ime
@@ -358,7 +382,7 @@ modem phone	addressbook	sl	Modem
 more ...	addressbook	sl	Več ...
 move to addressbook	addressbook	sl	Premakni v adresar
 moved	addressbook	sl	Premaknjeno
-multiple vcard	addressbook	sl	Več vCard zapisov
+multiple vcard	addressbook	sl	Več VCard zapisov
 name for the distribution list	addressbook	sl	Ime za distribucijski seznam
 name of current user, all other contact fields are valid too	addressbook	sl	Ime trenutnega uporabnika, veljavna so tudi vsa druga polja stika
 name, address	addressbook	sl	Ime, naslov
@@ -369,10 +393,12 @@ no categories selected	addressbook	sl	Nobena kategorija ni izbrana
 no country selected	addressbook	sl	Nobena država ni izbrana
 no distribution list	addressbook	sl	Ni seznama distribucij
 no fallback	addressbook	sl	Brez rezerve
-no vcard	addressbook	sl	Ni vCard zapisov
-not shared	addressbook	sl	ni v skupni rabi
+no vcard	addressbook	sl	Ni VCard zapisov
+none	addressbook	sl	Brez
 number	addressbook	sl	Število
 number of records to read (%1)	addressbook	sl	Število zapisov za branje (%1)
+old fixed definition	addressbook	sl	Stara določena opredelitev
+only supported by a few fully conformant clients (eg. from apple). if you have to enter a url, it will most likely not be supported!	addressbook	sl	Podpira le nekaj popolnoma skladnih strank (npr. Iz Applea). Če morate vnesti URL, najverjetneje ne bo podprt!
 open %1 crm view	addressbook	sl	Open %1 CRM view
 open email addresses in external mail program	addressbook	sl	Odpri e-naslov v zunanjem programu
 open for editing?	addressbook	sl	Odpri za urejanje?
@@ -391,11 +417,14 @@ parcel	addressbook	sl	Dostava
 participants	addressbook	sl	Udeleženci
 permission denied !!!	addressbook	sl	Dostop zavrnjen!
 permissiong denied! ask your administrator to allow regular uses to update their public keys.	addressbook	sl	Dovoljenje je zavrnjeno! Vprašajte svojega skrbnika, da dovolite redne uporabe, da posodobijo svoje javne ključe.
+personal	addressbook	sl	Osebno
+pgp	addressbook	sl	PGP
 phone number	common	sl	Telefonska številka
 phone numbers	common	sl	Telefonske številke
 photo	addressbook	sl	Slika
 please enter a name for that field !	addressbook	sl	Prosim, vpišite ime za to polje!
 please select only one category	addressbook	sl	Izberite samo eno kategorijo
+please update the templatename in your customfields section!	addressbook	sl	Posodobite templatename v razdelku po meri.
 postal	common	sl	Poštni
 pref	addressbook	sl	Privzeto
 preferred email address to use in distribution lists	addressbook	sl	Privzeti e-naslov za uporabo v distribucijskem seznamu.
@@ -403,6 +432,8 @@ preferred phone	addressbook	sl	Privzeti telefon
 preferred type of email address to add for distribution lists	addressbook	sl	Privzeta vrsta e-naslova za dodajanje v distribucijske sezname.
 prefix	addressbook	sl	Predpona
 prevent deleting of contacts	admin	sl	Prepreči brisanje stikov
+primary group	addressbook	sl	Primarna skupina
+private	addressbook	sl	Zasebno
 private address	addressbook	sl	Zasebni naslov
 private custom fields	addressbook	sl	Zasebna lastna polja
 public key	addressbook	sl	Javni ključ
@@ -425,7 +456,11 @@ replacements for inserting contacts into documents	addressbook	sl	Zamenjave za v
 required fields *	addressbook	sl	Zahtevana polja *
 role	addressbook	sl	Vloga
 room	addressbook	sl	Soba
+s/mime	addressbook	sl	S/MIME
+search for '%1'	addressbook	sl	Poiščite "%1"
 search letter	addressbook	sl	Iskanje črke
+select "%1", if your client does not support multiple addressbooks.	addressbook	sl	Izberite "%1", če vaš odjemalec ne podpira več adresarjev.
+select "%1", if your client support groups, eg. os x or ios addressbook.	addressbook	sl	Izberite "%1", če skupine podpore strankam, npr. OS X ali iOS imenik.
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	sl	Izberite pokončno sliko JPEG. Njena velikost bo spremenjena na širino 60 pikslov.
 select a source address to be used in geolocation routing system	addressbook	sl	Izberite naslov vira, ki naj se uporablja v usmerjevalnem sistemu GeoLocation
 select a view	addressbook	sl	Izberite pogled
@@ -435,6 +470,7 @@ select an action or addressbook to move to	addressbook	sl	Izberite dejanje ali a
 select an action or addressbook to move to...	addressbook	sl	Izberite dejanje ali adresar, v katerega želit epremakniti ...
 select migration type	admin	sl	Izberite vrsto migracije
 select multiple contacts for a further action	addressbook	sl	Izberite več stikov za nadaljnja dejanja
+select one	addressbook	sl	Izberi eno
 select phone number as prefered way of contact	addressbook	sl	Izberite telefonsko številko kot privzeto pot komunikacije za kontakt
 select the type of conversion	addressbook	sl	Izberite tip pretvorbe
 select the type of conversion:	addressbook	sl	Izberite tip pretvorbe:
@@ -445,12 +481,6 @@ send succeeded to %1	common	sl	Pošiljanje je uspelo n a 1
 seperator	addressbook	sl	Ločilo
 set full name and file as field in contacts of all users (either all or only empty values)	admin	sl	Nastavi polno ime in datoteko kot polje v stikih za vse uporabnike (vse ali samo prazne vrednosti)
 set only full name	addressbook	sl	Nastavi samo polno ime
-share into addressbook	addressbook	sl	Skupna raba v imeniku
-share writable	addressbook	sl	Skupna raba za pisanje
-shared	addressbook	sl	v skupni rabi
-shared by me	addressbook	sl	v skupni rabi z mano
-shared into addressbook %1	addressbook	sl	v skupni rabi v imeniku %1
-shared with	addressbook	sl	V skupni rabi z
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	sl	Naj bosta stolpca za sliko in domači naslov prikazana vedno, četudi sta prazna?
 show	addressbook	sl	Prikaži
 show active accounts	addressbook	sl	Pokaži aktivne račune
@@ -458,6 +488,7 @@ show all accounts	addressbook	sl	Prikaži vse račune
 show infolog entries for this organisation	addressbook	sl	Prikaži vnose InfoDnevnika za to organizacijo
 show the contacts of this organisation	addressbook	sl	Prikaži kontakte za to organizacijo
 similar contacts found:	addressbook	sl	Podobni kontakti:
+site configuration	addressbook	sl	Konfiguracija spletnega mesta
 size of popup (wxh, eg.400x300, if a popup should be used)	admin	sl	Velikost pojavnega okna (ŠxV, npr. 400x300, če naj se uporabljajo pojavna okna)
 special	addressbook	sl	Poseben
 stadt	addressbook	sl	Začetek
@@ -470,6 +501,7 @@ street (private)	addressbook	sl	Ulica (zasebno)
 subject for email	addressbook	sl	Zadeva sporočila
 successfully imported %1 records into your addressbook.	addressbook	sl	Uspešno prenesenih %1 zapisov v vaš adresar.
 suffix	addressbook	sl	Pripona
+sync all selected into one	addressbook	sl	Sinhroniziraj vse izbrane v eno
 tag to mark positions for address labels	addressbook	sl	Oznaka za označitev položajev oznak adresarja
 tel home	addressbook	sl	Domači telefon
 telephony integration	admin	sl	Integracija telefonije
@@ -479,9 +511,11 @@ that field name has been used already !	addressbook	sl	To ime polja je že v upo
 the anonymous user has probably no add rights for this addressbook.	addressbook	sl	Anonimni uporabnik verjetno nima pravic dodajanja v ta adresar.
 the anonymous user needs add rights for it!	addressbook	sl	Anonimni uporabnik potrebuje pravico dodajanja!
 the anonymous user needs read it!	addressbook	sl	Anonimni uporabnik mora imeti pravico branja.
+the document can contain placeholder like {{%1}}, to be replaced with the data.	addressbook	sl	Dokument lahko vsebuje vsebnik kot {{% 1}}, ki ga je treba zamenjati s podatki.
 the following document-types are supported:	addressbook	sl	Podprte so naslednje vrste dokumentov:
 the zip extension is needed, to insert contact data in openoffice or msoffice documents.	addressbook	sl	Za vstavljanje stikov v dokumente OpenOffice.org ali MSOffice, mora biti končnica zip.
 there was an error saving your data :-(	addressbook	sl	Napaka pri shranjevanju podatkov.
+they will be sub-folders in users home (%1 attribute).	addressbook	sl	V domovih uporabnikov bodo podmape (atribut %1).
 this module displays a contactform, that stores direct into the addressbook.	addressbook	sl	Ta modul prikaže obrazec stika, ki se shrani neposredno v adresar.
 this module displays block from a adddressbook group.	addressbook	sl	Modul prikaže blok iz grupe adresarja.
 this person's first name was not in the address book.	addressbook	sl	Imena te osebe ni v adresarju.
@@ -492,6 +526,7 @@ titles of any entries linked to the current record, excluding attached files	add
 to many might exceed your execution-time-limit	addressbook	sl	Preveč lahko preseže čas izvajanja
 today is %1's birthday!	common	sl	Danes ima rojstni dan %1.
 tomorrow is %1's birthday.	common	sl	Jutri ima rojstni dan %1.
+tracker	addressbook	sl	sledilnik
 translation	addressbook	sl	Prevod
 two of: %1	addressbook	sl	Dva od: %1
 type	addressbook	sl	Vrsta
@@ -502,12 +537,12 @@ unable to import into %1, using %2	addressbook	sl	Ni mogoče uvoziti v %1, z upo
 unique id (uid)	addressbook	sl	Edinstven ID (UID)
 unique id<br />(to update existing records)	addressbook	sl	Edinstven ID<br />(za posodobitev obstoječih zapisov)
 unknown type %1, imported as %2	addressbook	sl	Neznan tip% 1, uvožen kot% 2
-unshare	addressbook	sl	Ni več v skupni rabi
-unshared	addressbook	sl	ni več v skupni rabi
+update	addressbook	sl	nadgradnja
 update a single entry by passing the fields.	addressbook	sl	Popravi en zapis z vnosom polj.
 update fields by edited organisations?	admin	sl	Posodobim polja urejanih organizacij?
 updated	addressbook	sl	Podosodobljeno
 upload or delete the photo	addressbook	sl	Naloži ali izbriši fotografijo
+url	addressbook	sl	url
 url (business)	addressbook	sl	url (službeno)
 url (private)	addressbook	sl	url (zasebno)
 url to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)	admin	sl	URL, na katerega se povežejo številke telefonov (%1 = številka za klicanje, %u = ime računa, %t = telefonska številka računa)
@@ -518,19 +553,18 @@ use country list	addressbook	sl	Uporabi seznam držav
 use setup for a full account-migration	admin	sl	Uporabi namestitev za popolno migracijo računov
 use this tag for addresslabels. put the content, you want to repeat, between two tags.	addressbook	sl	Uporabi to značko za naslov nalepk. Stik, ki ga želite ponoviti, dajte med dve znački.
 used for links and for the own sorting of the list	addressbook	sl	Uporabno za povezave in za lastno razvrščanje seznama
-user groups are automatically shown as distribution lists.	addressbook	sl	Skupine uporabnikov se samodejno prikažejo kot distribucijski seznami.
 user preference	addressbook	sl	Prednost uporabnika
-vcard	common	sl	vCard
-vcards require a first name entry.	addressbook	sl	vCards zahteva vpis imena.
-vcards require a last name entry.	addressbook	sl	vCards zahteva vpis priimka.
+vcard	common	sl	VCard
+vcards require a first name entry.	addressbook	sl	VCards zahteva vpis imena.
+vcards require a last name entry.	addressbook	sl	VCards zahteva vpis priimka.
 verification	addressbook	sl	Potrditev
 view linked infolog entries	addressbook	sl	Poglej povezane vnose InfoDnevnika
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	sl	OPOZORILO!! LDAP je veljaven samo, če ne uporabljate stikov za skladiščenje računov!
 warning: all contacts found will be deleted!	addressbook	sl	Opozorilo: vsi najdeni stiki bodo zbrisani!
+warning: template "%1" not found, using default template instead.	addressbook	sl	OPOZORILO: Šablona "%1" ni bila najdena, namesto tega uporabite privzeto predlogo.
 weekday	addressbook	sl	Delovnik
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	sl	Kaj naj povezave do adresarja prikaže v drugih aplikacijah. Prazne vrednosti bodo izpuščene. Če spremenite nastavitve, se morate ponovno prijaviti!
 when viewing a contact, show linked entries from the selected application	addressbook	sl	Ko si ogledujete vizitko, prikažite povezane vnose iz izbrane aplikacije
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	sl	Ko vnose združite v dokumente, bodo shranjeni tukaj. Če imenik ni naveden, bodo shranjeni v vašem domačem imeniku (/home/...).
 where to add the email address	addressbook	sl	Kje naj se doda e-naslov?
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	sl	Katero obliko naslova naj Adresar uporabi za države, za katere ne pozna oblike. Če je oblika naslova znana, ta nastavitev nima vpliva.
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	sl	Kateri adresar naj se izbere pri dodajanju stika IN nimate pravic dodajanja v trenutni adresar.
@@ -543,20 +577,20 @@ work email if given, else home email	addressbook	sl	Službeni naslov, če je pod
 work phone	addressbook	sl	Telefon
 write (update or add) a single entry by passing the fields.	addressbook	sl	Zapiši (posodobi ali dodaj) zapis s podanimi polji.
 wrong - try again ...	addressbook	sl	Napačno - poskusite znova.
+yes	addressbook	sl	Da
 yes, for the next three days	addressbook	sl	Da, za naslednje tri dni
 yes, for the next two weeks	addressbook	sl	Da, za naslednja dva tedna
 yes, for the next week	addressbook	sl	Da, za naslednji teden
 yes, for today and tomorrow	addressbook	sl	Da, za jutri in pojutrišnjem
 yes, only admins can purge deleted items	admin	sl	Da, samo skrbniki lahko dokončno izbrišejo podatke
 yes, users can purge their deleted items	admin	sl	Da, uporabniki lahko dokončno izbrišejo podatke
-you are not allowed to share into the addressbook of %1	addressbook	sl	Skupna raba v imeniku ni dovoljena %1
 you are not permitted to delete contact %1	addressbook	sl	Nimate dovoljenja brisati stik %1
 you are not permittet to delete this contact	addressbook	sl	Nimate dovoljenja brisati tega stika
 you are not permittet to edit this contact	addressbook	sl	Nimate dovoljenja spremeniti tega stika
 you are not permittet to view this contact	addressbook	sl	Nimate dovoljenja pogledati tega stika
 you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	sl	LDAP lahko uporabite za shranjevanje stikov samo, če LDAP uporabite tudi za shranjevanje računov!
 you can respond by visiting:	addressbook	sl	Za ogled pojdite na:
-you must select a vcard. (*.vcf)	addressbook	sl	Izbrati morate vCard. (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	sl	Izbrati morate VCard. (*.vcf)
 you must select at least 1 column to display	addressbook	sl	Izbrati morate najmanj 1 stolpec za prikaz
 you need to select a distribution list	addressbook	sl	Izbrati morate distribucijski seznam
 you need to select some contacts first	addressbook	sl	Najprej morate izbrati nekaj stikov

addressbook/lang/egw_sv.lang

@@ -20,7 +20,7 @@ added	addressbook	sv	Skapad
 added by synchronisation	addressbook	sv	Infogad av synkroniseringen
 additional information about using ldap as contact repository	admin	sv	Övrig information om hur man använder LDAP som kontaktdatabas
 address book	common	sv	Adressbok
-address book - vcard in	addressbook	sv	Adressbok - vCard i
+address book - vcard in	addressbook	sv	Adressbok - VCard i
 address book - view	addressbook	sv	Adressbok - visa
 address line 2	addressbook	sv	Adressrad 2
 address type	addressbook	sv	Adresstyp
@@ -29,7 +29,7 @@ addressbook menu	addressbook	sv	Adressbok meny
 addressbook preferences	addressbook	sv	Adressbok alternativ
 addressbook the contact should be saved to	addressbook	sv	Adressbok kontakten skall sparas till
 addressbook-fieldname	addressbook	sv	Adressbok fältnamn
-addvcard	addressbook	sv	Lägg till vCard
+addvcard	addressbook	sv	Lägg till VCard
 advanced search	addressbook	sv	Avanserad sökning
 all contacts	addressbook	sv	Alla kontakter
 allow users to maintain their own account-data	admin	sv	Tillåt användare att underhålla sin egen kontaktinformation
@@ -71,6 +71,7 @@ company name	addressbook	sv	Företagsnamn
 configuration	common	sv	Inställningar
 contact	common	sv	Kontakt
 contact application	admin	sv	Kontaktapplikation
+contact copied	addressbook	sv	Kontakten kopierad
 contact deleted	addressbook	sv	Kontakten raderad
 contact id	addressbook	sv	Kontakt ID
 contact repository	admin	sv	Kontaktdatabas
@@ -109,10 +110,7 @@ doesn't matter	addressbook	sv	Oviktigt
 domestic	addressbook	sv	Inrikes
 download	addressbook	sv	Ladda ned
 download export file (uncheck to debug output in browser)	addressbook	sv	Ladda ned exportfil (Kryssa ur för att se felsökningsresultat i webbläsare
-download this contact as vcard file	addressbook	sv	Ladda ner kontakten som en vCard fil
-duplicate threshold	addressbook	sv	Tröskelvärde för duplikat
-duplicate warning	addressbook	sv	Varning för dubbletter
-duplicates	addressbook	sv	Duplikat
+download this contact as vcard file	addressbook	sv	Ladda ner kontakten som en VCard fil
 duration	addressbook	sv	Varaktighet
 edit custom field	addressbook	sv	Ändra anpassat fält
 edit custom fields	admin	sv	Ändra anpassade fält
@@ -129,7 +127,7 @@ error saving the contact !!!	addressbook	sv	Fel vid sparande av kontakten
 error: the entry has been updated since you opened it for editing!	addressbook	sv	Posten har ändrats sedan du öppnade den för skrivning!
 existing links	addressbook	sv	Nuvarande länkar
 export as csv	addressbook	sv	Exportera som CSV
-export as vcard	addressbook	sv	Exportera som vCard
+export as vcard	addressbook	sv	Exportera som VCard
 export contacts	addressbook	sv	Exportera kontakter
 export file name	addressbook	sv	Exportens filnamn
 export from addressbook	addressbook	sv	Exportera från adressboken
@@ -144,8 +142,6 @@ field %1 has been updated !	addressbook	sv	Fält %1 har uppdaterats!
 field name	addressbook	sv	Fältnamn
 fields for the csv export	addressbook	sv	CSV export fält
 fields the user is allowed to edit himself	admin	sv	Fält användaren själv kan ändra
-fields to check for duplicates	addressbook	sv	Fält för kontroll av dubbletter
-fields to consider when looking for duplicate contacts.	addressbook	sv	Fält som ska beaktas när du letar efter dubbla kontakter.
 fields to show in address list	addressbook	sv	Fält att visa i adresslistan
 fieldseparator	addressbook	sv	Fältavskiljare
 for read only ldap	admin	sv	för skrivskyddad LDAP
@@ -157,10 +153,6 @@ global categories	addressbook	sv	Globala kategorier
 grant addressbook access	common	sv	Reglera åtkomst till adressboken
 group %1	addressbook	sv	Grupp %1
 h	addressbook	sv	t
-hide accounts from addressbook	addressbook	sv	Dölja användarkonton
-hide all accounts	addressbook	sv	Dölja alla konton
-hide user groups as distribution lists	addressbook	sv	Dölja användargrupper som distributionslistor
-hides accounts completly from the adressbook.	addressbook	sv	Dölja användarkonton helt och hållet från adressboken.
 home address	addressbook	sv	Hem: Adress
 home address, birthday, ...	addressbook	sv	Hem: Adress, Födelsedag, ...
 home city	addressbook	sv	Hem: Stad
@@ -170,7 +162,6 @@ home phone	addressbook	sv	Hem: Telefon
 home state	addressbook	sv	Hem: Län
 home street	addressbook	sv	Hem: Gata
 home zip code	addressbook	sv	Hem: Postnummer
-how many fields must match for the record to be considered a duplicate.	addressbook	sv	Hur många fält som måste stämma överens för att posten ska betraktas som en dubblett.
 icon	addressbook	sv	Ikon
 if accounts are already in ldap	admin	sv	om konton redan existerar i LDAP
 import	addressbook	sv	Importera
@@ -178,15 +169,14 @@ import contacts	addressbook	sv	Importera kontakter
 import csv-file into addressbook	addressbook	sv	Importera CSV-fil till adressboken
 import file	addressbook	sv	Importera fil
 import from	addressbook	sv	Importera från
-import from ldif, csv, or vcard	addressbook	sv	Importera LDIF, CSV eller vCard
+import from ldif, csv, or vcard	addressbook	sv	Importera LDIF, CSV eller VCard
 import from outlook	addressbook	sv	Importera från OutLook
-import multiple vcard	addressbook	sv	Importera Flera vCard
+import multiple vcard	addressbook	sv	Importera Flera VCard
 import next set	addressbook	sv	Importera nästa set
 import_instructions	addressbook	sv	I Netscape, öpnna adressboken och välj <b>Export</b> från <b>File</b> menyn. Filen kommer att exporteras i LDIF-format.<p>Eller, i Outlook, Välj kontaktmappen, välj sedan <b>Import och Export...</b> från <b>Fil</b> menyn och exportera dina kontakter som komma-separerad textfil (CSV). <p>Eller, i Palm Desktop 4.0 eller senare, Besök adressboken och välj <b>Export</b> från <b>File</b> menyn. Exportfilen kommer att vara i vCard-format.
 in %1 days (%2) is %3's birthday.	addressbook	sv	Om %1 dagar (%2) fyller %3 år
 income	addressbook	sv	Inkomst
-infolog	addressbook	sv	InfoLog Kontakt
-infolog-organisation	addressbook	sv	InfoLog Organisation
+infolog	addressbook	sv	InfoLogg
 international	addressbook	sv	Internationell
 label	addressbook	sv	Etikett
 last modified	addressbook	sv	Senast ändrad
@@ -200,12 +190,10 @@ link title for contacts show	addressbook	sv	Länktitel för kontakter
 links	addressbook	sv	Länkar
 list all categories	addressbook	sv	Visa alla kategorier
 list all customfields	addressbook	sv	Visa alla anpassade fält
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	sv	Ladda in anpassade fält i index, även om kolumnen för anpassade fält är avstängd (t.ex. för att visa dem i en specifik indexkolumn).
-load vcard	addressbook	sv	Ladda vCard
+load vcard	addressbook	sv	Ladda VCard
 location	addressbook	sv	Plats
 locations	addressbook	sv	Placering
 mark records as private	addressbook	sv	Markera posten som privat
-merge duplicates	addressbook	sv	Slå ihop dubbletter
 merge into first or account, deletes all other!	addressbook	sv	Slå samman med första eller konto, radera all annan
 merged	addressbook	sv	Sammanslagna
 message phone	addressbook	sv	Röstbrevlåda
@@ -216,13 +204,10 @@ mobile	addressbook	sv	Mobil
 mobile phone	addressbook	sv	Mobilnummer
 modem phone	addressbook	sv	Modemnummer
 more ...	addressbook	sv	Mer ...
-move to addressbook	addressbook	sv	Flytta till adressboken
 moved	addressbook	sv	Flyttad
-multiple vcard	addressbook	sv	Multipla vCard
+multiple vcard	addressbook	sv	Multipla VCard
 name, address	addressbook	sv	Namn, adress
-no country selected	addressbook	sv	Inget land har valts
-no distribution list	addressbook	sv	Ingen distributionslista
-no vcard	addressbook	sv	Inget vCard
+no vcard	addressbook	sv	Inget VCard
 number	addressbook	sv	Nummer
 number of records to read (%1)	addressbook	sv	Antal poster att läsa (%1)
 options for type	admin	sv	Alternativ för typen
@@ -246,7 +231,6 @@ postal	common	sv	Post
 pref	addressbook	sv	pref
 preferred phone	addressbook	sv	Förvald telefon
 prefix	addressbook	sv	Prefix
-prevent deleting of contacts	admin	sv	Förhindra radering av kontakter
 public key	addressbook	sv	Publik kryptonyckel
 publish into groups:	addressbook	sv	Publicera i grupperna:
 read a list / search for entries.	addressbook	sv	Titta på lista/sök efter poster
@@ -258,7 +242,6 @@ record owner	addressbook	sv	Postens ägare
 repetition	addressbook	sv	Återkommande
 role	addressbook	sv	Roll
 room	addressbook	sv	Rum
-search letter	addressbook	sv	Sök bokstav
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	sv	Välj ett jpeg porträtt foto. Bilden skalas om till 60 pixel.
 select a view	addressbook	sv	Välj vy
 select addressbook type	addressbook	sv	Välj adressbok typ
@@ -271,12 +254,6 @@ select the type of conversion	addressbook	sv	Välj konverteringstyp
 select the type of conversion:	addressbook	sv	Välj konverteringstyp
 select where you want to store / retrieve contacts	admin	sv	Välj var du vill spara / hämta kontakter
 selected contacts	addressbook	sv	Valda kontakter
-share into addressbook	addressbook	sv	Dela i adressboken
-share writable	addressbook	sv	Dela skrivbart
-shared	addressbook	sv	delad
-shared by me	addressbook	sv	Delad av mig
-shared into addressbook %1	addressbook	sv	delad i adressboken %1
-shared with	addressbook	sv	Delat med
 show	addressbook	sv	Visa
 show infolog entries for this organisation	addressbook	sv	Visa organisationens InfoLogg poster
 show the contacts of this organisation	addressbook	sv	Visa organisationens kontakter
@@ -302,19 +279,18 @@ type	addressbook	sv	Typ
 update a single entry by passing the fields.	addressbook	sv	Updatera enskild post genom att ange fälten
 updated	addressbook	sv	Uppdaterad
 upload or delete the photo	addressbook	sv	Ladda upp eller radera foto
+use an extra category tab?	addressbook	sv	Använd extra kategori kolumn
 use country list	addressbook	sv	Använd nationslista
 use setup for a full account-migration	admin	sv	Använd installationen för en komplett konto migrering
 used for links and for the own sorting of the list	addressbook	sv	Används för länkar och sortering av listan
-user groups are automatically shown as distribution lists.	addressbook	sv	Användargrupper visas automatiskt som distributionslistor.
-vcard	common	sv	vCard
-vcards require a first name entry.	addressbook	sv	vCard kräver ett förnamn
-vcards require a last name entry.	addressbook	sv	vCard kräver ett efternamn
-view linked infolog entries	addressbook	sv	Visa länkade InfoLog poster
+vcard	common	sv	VCard
+vcards require a first name entry.	addressbook	sv	VCard kräver ett förnamn
+vcards require a last name entry.	addressbook	sv	VCard kräver ett efternamn
+view linked infolog entries	addressbook	sv	Visa länkade InfoLogg poster
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	sv	WARNING!! LDAP är bara giltigt om du inte använder kontakter för att lagra konton
 warning: all contacts found will be deleted!	addressbook	sv	VARNING: Alla hittade kontakter raderas
 weekday	addressbook	sv	Veckodag
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	sv	Vad ska länkar till adressboken visa i andra applikationer? Tomma värden ignoreras. Do måste logga in återigen för att se förändringar.
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	sv	När du sammanför poster i dokument lagras de här. Om ingen katalog anges kommer de att lagras i din hemkatalog (/home/...).
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	sv	Vilken adressbok ska väljas när konstakter skapas men du saknar behörighet till aktuell?
 which charset should be used for the csv export. the system default is the charset of this egroupware installation.	addressbook	sv	Vilken teckeuppsättning ska användas vid CSV export? Systemets standard är det som används av EGroupware.
 which fields should be exported. all means every field stored in the addressbook incl. the custom fields. the business or home address only contains name, company and the selected address.	addressbook	sv	Vilka fält ska exporteras? Alla betyder alla fält, inklusive anpassade, i adressboken. Företag eller Hem adresserna innehåller endast namn, företag och vald adress.
@@ -331,7 +307,7 @@ you are not permittet to edit this contact	addressbook	sv	Du har inte behörighe
 you are not permittet to view this contact	addressbook	sv	Du har inte behörighet att läsa kontakten
 you can only use ldap as contact repository if the accounts are stored in ldap too!	admin	sv	Du kan bara välja LDAP som kontaktdatabas om konton hanteras i LDAP.
 you can respond by visiting:	addressbook	sv	Du kan svara genom att besöka:
-you must select a vcard. (*.vcf)	addressbook	sv	Du måste välja vCard (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	sv	Du måste välja VCard (*.vcf)
 you must select at least 1 column to display	addressbook	sv	Du måste välja minst 1 kolumn att visa
 you need to select some contacts first	addressbook	sv	Du måste välja kontakter först
 zip code	common	sv	Postnummer

addressbook/lang/egw_tr.lang

@@ -13,14 +13,14 @@ add a single entry by passing the fields.	addressbook	tr	Gerekli alanlar? doldur
 add custom field	addressbook	tr	Özel bir alan ekle
 added	addressbook	tr	Eklendi
 address book	common	tr	Adres Defteri
-address book - vcard in	addressbook	tr	Adres Defteri - vCard
+address book - vcard in	addressbook	tr	Adres Defteri - VCard
 address book - view	addressbook	tr	Adres Defteri - Görüntüle
 address line 2	addressbook	tr	Adres 2. sat?r?
 address type	addressbook	tr	Adres tipi
 addressbook	common	tr	Adres Defteri
 addressbook preferences	addressbook	tr	Adres Defteri Ayarlar?
 addressbook-fieldname	addressbook	tr	Adres Defteri-Alan Ad?
-addvcard	addressbook	tr	vCard Ekle
+addvcard	addressbook	tr	VCard Ekle
 alt. csv import	addressbook	tr	CSV dosyas? ithal et
 always	addressbook	tr	her zaman
 are you shure you want to delete this contact?	addressbook	tr	Bu ba?lant?y? silmek istedi?inize emin misiniz?
@@ -62,9 +62,6 @@ department	common	tr	Bölüm
 domestic	addressbook	tr	Ev
 download	addressbook	tr	?ndir
 download export file (uncheck to debug output in browser)	addressbook	tr	?hraç edilen dosyay? indir. (Hata ay?klama bilgisini taray?c?da görüntülemek için tiki kald?r?n?z.)
-duplicate threshold	addressbook	tr	Yineleme eşiği
-duplicate warning	addressbook	tr	Mükerrer uyarısı
-duplicates	addressbook	tr	Kopyalar
 duration	addressbook	tr	Süre
 edit custom field	addressbook	tr	Özel alan? düzenle
 edit custom fields	admin	tr	Özel alanlar? düzenle
@@ -79,18 +76,12 @@ fax number	common	tr	Fax No
 field %1 has been added !	addressbook	tr	1% alan? eklendi!
 field %1 has been updated !	addressbook	tr	1% alan? güncellendi!
 field name	addressbook	tr	Alan ad?
-fields to check for duplicates	addressbook	tr	Mükerrerlik kontrolü yapılacak alanlar
-fields to consider when looking for duplicate contacts.	addressbook	tr	Mükerrer kişileri ararken dikkate alınacak alanlar.
 fields to show in address list	addressbook	tr	Adres listesinde görüntülecek alanlar
 fieldseparator	addressbook	tr	Alan ayrac?
 full name	addressbook	tr	Tam ?sim
 geo	addressbook	tr	GEO
 global categories	addressbook	tr	Genel kategoriler
 grant addressbook access	common	tr	Adres defteri eri?im hakk? kazan
-hide accounts from addressbook	addressbook	tr	Kullanıcı hesaplarını gizleme
-hide all accounts	addressbook	tr	Tüm hesapları gizle
-hide user groups as distribution lists	addressbook	tr	Kullanıcı gruplarını dağıtım listeleri olarak gizleme
-hides accounts completly from the adressbook.	addressbook	tr	Kullanıcı hesaplarını adres defterinden tamamen gizleyin.
 home city	addressbook	tr	Ev ?ehir
 home country	addressbook	tr	Ev Ülke
 home email	addressbook	tr	Ev E-mail
@@ -98,40 +89,33 @@ home phone	addressbook	tr	Ev tel
 home state	addressbook	tr	Ev eyalet
 home street	addressbook	tr	Ev cadde
 home zip code	addressbook	tr	Ev Posta Kodu
-how many fields must match for the record to be considered a duplicate.	addressbook	tr	Kaydın mükerrer olarak kabul edilmesi için kaç alanın eşleşmesi gerektiği.
 icon	addressbook	tr	Simge
 import	addressbook	tr	?thal Et
 import contacts	addressbook	tr	Ba?lant?lar? ithal et
 import csv-file into addressbook	addressbook	tr	CSV dosyas?n? adres defterine ithal et
 import file	addressbook	tr	Dosya ithal et
 import from	addressbook	tr	?thal edilecek yer:
-import from ldif, csv, or vcard	addressbook	tr	LDIF, CSV ya da vCard'tan ithal et
+import from ldif, csv, or vcard	addressbook	tr	LDIF, CSV ya da VCard'tan ithal et
 import from outlook	addressbook	tr	Outlook'tan ithal et
-import multiple vcard	addressbook	tr	Çoklu vCard ithal et
+import multiple vcard	addressbook	tr	Çoklu Vcard ithal et
 import next set	addressbook	tr	S?radaki grubu ithal et
-import_instructions	addressbook	tr	Netscape kullan?c?lar?, Adressbook'u açmal? ve <b>Dosya</b> menüsündeki, <b>Export/?hraç Et</b> seçene?ini seçmelidirler. ?thal edilen dosyan?n biçimi LDIF olacakt?r.<p>Ya da, Outlook kullan?c?lar?, Contact klasörünü seçtikten sonra <b>File</b> menüsünden Export/Import seçene?ini kullanarak ba?lant?lar?n? CSV dosyas?na ithal edebilirler.<p>Palm Desktop 4.0 ve üstü kullan?c?lar?, AdressBook uygulamas?ndan <b>File</b> menüsündeki Export seçene?ini kullanaran ba?lant?lar?n? vCard oalrak ithal edebilirler.
-infolog	addressbook	tr	InfoLog İletişim
-infolog-organisation	addressbook	tr	InfoLog Organizasyon
+import_instructions	addressbook	tr	Netscape kullan?c?lar?, Adressbook'u açmal? ve <b>Dosya</b> menüsündeki, <b>Export/?hraç Et</b> seçene?ini seçmelidirler. ?thal edilen dosyan?n biçimi LDIF olacakt?r.<p>Ya da, Outlook kullan?c?lar?, Contact klasörünü seçtikten sonra <b>File</b> menüsünden Export/Import seçene?ini kullanarak ba?lant?lar?n? CSV dosyas?na ithal edebilirler.<p>Palm Desktop 4.0 ve üstü kullan?c?lar?, AdressBook uygulamas?ndan <b>File</b> menüsündeki Export seçene?ini kullanaran ba?lant?lar?n? VCard oalrak ithal edebilirler.
 international	addressbook	tr	Uluslararas?
 label	addressbook	tr	Etiket
 ldap context for contacts	admin	tr	Ba?lant?lar için LDAP içeri?i
 ldap host for contacts	admin	tr	Ba?lant?lar için LDAP host
 ldif	addressbook	tr	LDIF
 line 2	addressbook	tr	2. sat?r
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	tr	Özel alan sütunu kapalı olsa bile özel alanları dizine yükleme (örneğin, bunları belirli bir dizin sütununda görüntülemek için)
-load vcard	addressbook	tr	vCard yükle
+load vcard	addressbook	tr	VCard yükle
 location	addressbook	tr	Konum
 mark records as private	addressbook	tr	Kay?tlar? özel olarak i?aretle
-merge duplicates	addressbook	tr	Yinelenenleri birleştirme
-merge into first or account, deletes all other!	addressbook	tr	İlk veya hesapla birleştir, diğerlerini sil!
 message phone	addressbook	tr	Mesaj Tel
 middle name	addressbook	tr	Orta isim
 mobile	addressbook	tr	Mobil
 mobile phone	addressbook	tr	Mobil Tel
 modem phone	addressbook	tr	Modem Tel
-multiple vcard	addressbook	tr	Çoklu vCard
-no vcard	addressbook	tr	vCard yok
-not shared	addressbook	tr	paylaşılmadı
+multiple vcard	addressbook	tr	Çoklu VCard
+no vcard	addressbook	tr	VCard yok
 number of records to read (%1)	addressbook	tr	Okunacak kay?t say?s? (1%)
 other number	addressbook	tr	Di?er No
 other phone	addressbook	tr	Di?er Tel
@@ -150,16 +134,9 @@ read a single entry by passing the id and fieldlist.	addressbook	tr	ID ve alan l
 record access	addressbook	tr	Eri?imi kaydet
 record owner	addressbook	tr	Sahibini kaydet
 repetition	addressbook	tr	Tekrarlama
-search letter	addressbook	tr	Harf ara
 select all	addressbook	tr	Tamam?n? seç
 select the type of conversion	addressbook	tr	Dönü?üm tipini seçiniz
 select the type of conversion:	addressbook	tr	Dönü?üm tipini seçiniz:
-share into addressbook	addressbook	tr	Adres defterinde paylaş
-share writable	addressbook	tr	Düzenlenebilir paylaş
-shared	addressbook	tr	paylaşılan
-shared by me	addressbook	tr	Benim tarafımdan paylaşıldı
-shared into addressbook %1	addressbook	tr	adres defterinde paylaşılan %1
-shared with	addressbook	tr	İle paylaşıldı
 startrecord	addressbook	tr	Kaydetmeye ba?la
 state	common	tr	Durum
 street	common	tr	Cadde
@@ -174,20 +151,15 @@ to many might exceed your execution-time-limit	addressbook	tr	çok fazlas? execu
 today is %1's birthday!	common	tr	Bugün %1'in do?um günü !
 tomorrow is %1's birthday.	common	tr	Yar?n %1'in do?um günü
 translation	addressbook	tr	Tercüme
-unshare	addressbook	tr	Artık paylaşılmıyor
-unshared	addressbook	tr	artık paylaşılmıyor
 update a single entry by passing the fields.	addressbook	tr	Alan de?erleri ile bir alan? güncelle.
 updated	addressbook	tr	Güncelle
 use country list	addressbook	tr	Ülke listesi kullan
-user groups are automatically shown as distribution lists.	addressbook	tr	Kullanıcı grupları otomatik olarak dağıtım listeleri olarak gösterilir.
-vcard	common	tr	vCard
-vcards require a first name entry.	addressbook	tr	vCard özelli?i bir isim gerektirir.
-vcards require a last name entry.	addressbook	tr	vCard özelli?i bir soyad? gerektirir.
+vcard	common	tr	VCard
+vcards require a first name entry.	addressbook	tr	VCard özelli?i bir isim gerektirir.
+vcards require a last name entry.	addressbook	tr	VCard özelli?i bir soyad? gerektirir.
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	tr	UYARI!! LDAP sadece ba?lant?lar?n?z? hesap depolamakta kulland???n?zda geçerlidir.
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	tr	Girişleri belgelerde birleştirdiğinizde, burada saklanacaktır. Herhangi bir dizin belirtilmemişse, bunlar ev dizininizde saklanacaktır (/home/...)
 work phone	addressbook	tr	?? tel
-you are not allowed to share into the addressbook of %1	addressbook	tr	Adres defteri %1 ile paylaşmanıza izin verilmiyor
-you must select a vcard. (*.vcf)	addressbook	tr	Bir vCard seçmelisiniz. (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	tr	Bir VCard seçmelisiniz. (*.vcf)
 you must select at least 1 column to display	addressbook	tr	Görüntülemek için en az bir sütun seçmelisiniz.
 zip code	common	tr	Posta Kodu
 zip_note	addressbook	tr	<p><b>Not:</b> Dosya .csv, .vcf ya da .ldif dosyalar?ndan olu?an bir ZIP ar?ivi olabilir. fakat, ithal edilen dosya tipi ithal i?lemi içinde tek olmal?d?r.

addressbook/lang/egw_uk.lang

@@ -1,21 +1,21 @@
 %1 records imported	addressbook	uk	%1 записів імпортовано
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	uk	%1 записів прочитано (ще не імпортовано, %2поверніться%3 та зніміть відмітку Тестувати Імпорт)
 (e.g. 1969)	addressbook	uk	(наприклад 1969)
-<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	uk	<b>Тип конверсії <немає> не існує.</b> Будь ласка виберіть тип конверсії зі списку
+<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	uk	<b>Тип конверсії &lt;немає&gt; не існує.</b> Будь ласка виберіть тип конверсії зі списку
 @-eval() is only availible to admins!!!	addressbook	uk	@-eval() можуть використовувати тільки адміністратори
 actions	addressbook	uk	Дії
 add a single entry by passing the fields.	addressbook	uk	Додати один запис шляхом заповнення полів
 add custom field	addressbook	uk	Додати власне поле
 added	addressbook	uk	Добавлено
 address book	common	uk	Адресна Книга
-address book - vcard in	addressbook	uk	Адресна Книга - vCard in
+address book - vcard in	addressbook	uk	Адресна Книга - VCard in
 address book - view	addressbook	uk	Адресна Книга - перегляд
 address line 2	addressbook	uk	Рядок 2
 address type	addressbook	uk	Тип адреси
 addressbook	common	uk	Адресна Книга
 addressbook preferences	addressbook	uk	Параметри Адресної Книги
 addressbook-fieldname	addressbook	uk	Адресна Книга - назва поля
-addvcard	addressbook	uk	Додати vCard
+addvcard	addressbook	uk	Додати VCard
 alt. csv import	addressbook	uk	Альтернативний CSV Імпорт
 always	addressbook	uk	Завжди
 are you sure you want to delete this field?	addressbook	uk	Ви дійсно хочете видалити цей запис?
@@ -56,9 +56,6 @@ deleted	addressbook	uk	Видалено
 department	common	uk	Департамент
 domestic	addressbook	uk	Місцевий
 download	addressbook	uk	Загрузити
-duplicate threshold	addressbook	uk	Дублюючий поріг
-duplicate warning	addressbook	uk	Дублююче попередження
-duplicates	addressbook	uk	Дублікати
 duration	addressbook	uk	Тривалість
 edit custom field	addressbook	uk	Редагувати власне поле
 edit custom fields	admin	uk	Редагувати власні поля
@@ -74,18 +71,12 @@ fax number	common	uk	Номер факсу
 field %1 has been added !	addressbook	uk	Поле %1 додано!
 field %1 has been updated !	addressbook	uk	Поле %1 змінено!
 field name	addressbook	uk	Назва поля
-fields to check for duplicates	addressbook	uk	Поля для перевірки на дублікати
-fields to consider when looking for duplicate contacts.	addressbook	uk	Поля, які слід враховувати при пошуку дублікатів контактів.
 fields to show in address list	addressbook	uk	Видимі поля у переліку адрес
 fieldseparator	addressbook	uk	Розділитель полів
 full name	addressbook	uk	Повне ім'я
 geo	addressbook	uk	GEO
 global categories	addressbook	uk	Глобальні категорії
 grant addressbook access	common	uk	Надати доступи до адресної книги
-hide accounts from addressbook	addressbook	uk	Приховати акаунти користувачів
-hide all accounts	addressbook	uk	Приховати всі облікові записи
-hide user groups as distribution lists	addressbook	uk	Приховати групи користувачів у вигляді списків розсилки
-hides accounts completly from the adressbook.	addressbook	uk	Повністю приховати облікові записи користувачів з адресної книги.
 home city	addressbook	uk	Місто
 home country	addressbook	uk	Країна
 home email	addressbook	uk	Домашній EMail
@@ -93,35 +84,29 @@ home phone	addressbook	uk	Телефон
 home state	addressbook	uk	Область
 home street	addressbook	uk	Вулиця
 home zip code	addressbook	uk	Поштовий індекс
-how many fields must match for the record to be considered a duplicate.	addressbook	uk	Скільки полів повинно збігатися, щоб запис вважався дублікатом.
 import	addressbook	uk	Імпорт
 import contacts	addressbook	uk	Імпортувати контакти
 import csv-file into addressbook	addressbook	uk	Імпортувати CSV-файл до Адресної книги
 import file	addressbook	uk	Імпортувати файл
-import from ldif, csv, or vcard	addressbook	uk	Імпортувати LDIF, CSV або vCard
+import from ldif, csv, or vcard	addressbook	uk	Імпортувати LDIF, CSV або VCard
 import from outlook	addressbook	uk	Імпорт з Outlook
 import next set	addressbook	uk	Імпортувати наступний набір
-import_instructions	addressbook	uk	В Нетскейпі(Мозілі) відкрийте Адресну книгу та виберіть <b>Експорт</b> з меню <b>Файл</b>. Файл буде експортовано в форматі LDIF. <p>В Outlook зайдіть в закладку Контакти, виберіть <b>Імпорт та Експорт...</b> в меню <b>Файл</b> та експортуйте ваші контакти в CSV-файл.<p>В  Palm Desktop 4.0 або вище, зайдіть в Адресну книгу та виберіть <b>Експорт</b> в меню <b>Файл</b>. Файл буде експортовано в форматі vCard.
-infolog	addressbook	uk	ІнфоЛог Контакт
-infolog-organisation	addressbook	uk	Організація "ІнфоЛог
+import_instructions	addressbook	uk	В Нетскейпі(Мозілі) відкрийте Адресну книгу та виберіть <b>Експорт</b> з меню <b>Файл</b>. Файл буде експортовано в форматі LDIF. <p>В Outlook зайдіть в закладку Контакти, виберіть <b>Імпорт та Експорт...</b> в меню <b>Файл</b> та експортуйте ваші контакти в CSV-файл.<p>В  Palm Desktop 4.0 або вище, зайдіть в Адресну книгу та виберіть <b>Експорт</b> в меню <b>Файл</b>. Файл буде експортовано в форматі VCard.
+infolog	addressbook	uk	Записки
 international	addressbook	uk	Міжнародний
 label	addressbook	uk	Примітки
 last modified	addressbook	uk	Востаннє змінено
 ldif	addressbook	uk	LDIF
 line 2	addressbook	uk	Рядок 2
 links	addressbook	uk	Посилання
-load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)	addressbook	uk	Завантаження користувацьких полів в індекс, навіть якщо стовпець користувацьких полів вимкнено (наприклад, для відображення їх у певному стовпчику індексу)
 location	addressbook	uk	Місце
 mark records as private	addressbook	uk	Помітити записи як особисті
-merge duplicates	addressbook	uk	Об'єднати дублікати
-merge into first or account, deletes all other!	addressbook	uk	Об'єднання в перший або обліковий запис, видаляє всі інші!
 message phone	addressbook	uk	Телефон автовідповідача
 middle name	addressbook	uk	По батькові
 mobile	addressbook	uk	Мобільний
 mobile phone	addressbook	uk	Мобільний телефон
 modem phone	addressbook	uk	Модемний телефон
-no vcard	addressbook	uk	немає vCard
-not shared	addressbook	uk	не розділяється
+no vcard	addressbook	uk	немає VCard
 number of records to read (%1)	addressbook	uk	Кількість записів для читання (%1)
 other number	addressbook	uk	Інший номер
 other phone	addressbook	uk	Інший телефон
@@ -140,14 +125,7 @@ read a single entry by passing the id and fieldlist.	addressbook	uk	Прочит
 record access	addressbook	uk	Доступи запису
 record owner	addressbook	uk	Власник запису
 repetition	addressbook	uk	Повторення
-search letter	addressbook	uk	Пошуковий лист
 select the type of conversion	addressbook	uk	Виберіть тип конверсії
-share into addressbook	addressbook	uk	Поділитися в адресну книгу
-share writable	addressbook	uk	Поділитися можна редагувати
-shared	addressbook	uk	спільний
-shared by me	addressbook	uk	Поділюся з вами
-shared into addressbook %1	addressbook	uk	поділився в адресній книзі %1
-shared with	addressbook	uk	Спільно з
 startrecord	addressbook	uk	Початковий запис
 state	common	uk	Область
 street	common	uk	Вулиця
@@ -162,20 +140,15 @@ today is %1's birthday!	common	uk	Сьогодні день народження
 tomorrow is %1's birthday.	common	uk	Завтра день народження %1.
 translation	addressbook	uk	Переклад
 type	addressbook	uk	Тип
-unshare	addressbook	uk	Більше не ділитися
-unshared	addressbook	uk	більше не ділиться
 update a single entry by passing the fields.	addressbook	uk	Змінити один запис шляхом заповнення полів.
 updated	addressbook	uk	Змінено
 use country list	addressbook	uk	Використовувати перелік країн
-user groups are automatically shown as distribution lists.	addressbook	uk	Групи користувачів автоматично відображаються у вигляді списків розсилки.
-vcard	common	uk	vCard
-vcards require a first name entry.	addressbook	uk	vCard потребує поле імені.
-vcards require a last name entry.	addressbook	uk	vCard потребує поле прізвища.
+vcard	common	uk	VCard
+vcards require a first name entry.	addressbook	uk	VCard потребує поле імені.
+vcards require a last name entry.	addressbook	uk	VCard потребує поле прізвища.
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	uk	УВАГА!! LDAP можливий тільки якщо Ви НЕ використовуєте контакти для зберігання рахунків користувачів!
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	uk	При об'єднанні записів в документи вони будуть зберігатися тут. Якщо каталог не вказано, вони будуть зберігатися у вашому домашньому каталозі (/home/...)
 work phone	addressbook	uk	Робочий телефон
-you are not allowed to share into the addressbook of %1	addressbook	uk	Ви не маєте права доступу до адресної книги %1
-you must select a vcard. (*.vcf)	addressbook	uk	Необхідно вказати vCard. (*.vcf)
+you must select a vcard. (*.vcf)	addressbook	uk	Необхідно вказати VCard. (*.vcf)
 you must select at least 1 column to display	addressbook	uk	Необхідно вказати мінімум один стовпчик для показу
 zip code	common	uk	Поштовий індекс
 zip_note	addressbook	uk	<p><b>Примітка:</b> Файл може бути zip архівом колекції .csv, .vcf, або .ldif файлів. Але не змішуйте типи файлів в імпорті.

addressbook/lang/egw_zh.lang

@@ -4,7 +4,6 @@
 %1 fields in %2 other organisation member(s) changed	addressbook	zh	在%2的其他组织成员中有%1个字段被更改
 %1 records imported	addressbook	zh	已导入%1条记录
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	zh	已读取%1条记录(但尚未导入，您可以去%2返回%3，并且取消"测试导入"复选框)
-%1 shared this contact on %2 with %3 %4	addressbook	zh	%1在 %2 %3 %4上分享了这个联系人
 %1 starts with '%2'	addressbook	zh	%1以'%2'开始
 %s please calculate the result	addressbook	zh	%s 请计算结果
 (e.g. 1969)	addressbook	zh	(例如:1969)
@@ -82,6 +81,7 @@ company name	addressbook	zh	公司名称
 configuration	common	zh	站点配置
 contact	common	zh	联系人
 contact application	admin	zh	联系人应用程序
+contact copied	addressbook	zh	联系人已复制
 contact deleted	addressbook	zh	联系人已删除
 contact fields to show	addressbook	zh	要显示的联系人字段
 contact fields:	addressbook	zh	联系人字段：
@@ -136,9 +136,6 @@ don't hide empty columns	addressbook	zh	不隐藏空白栏
 download	addressbook	zh	下载
 download export file (uncheck to debug output in browser)	addressbook	zh	下载导出的文件(要在浏览器中显示导出结果，请勿选中该项)
 download this contact as vcard file	addressbook	zh	以 vCard 格式下载这个联系人资料
-duplicate threshold	addressbook	zh	重复的门槛
-duplicate warning	addressbook	zh	重复的警告
-duplicates	addressbook	zh	重复数
 duration	addressbook	zh	期间
 edit custom field	addressbook	zh	编辑自定义字段
 edit custom fields	admin	zh	编辑自定义字段
@@ -173,8 +170,6 @@ field %1 has been updated !	addressbook	zh	字段%1已更新！
 field name	addressbook	zh	字段名
 fields for the csv export	addressbook	zh	导出到 CSV 格式的字段
 fields the user is allowed to edit himself	admin	zh	允许用户自行编辑的字段
-fields to check for duplicates	addressbook	zh	检查重复的字段
-fields to consider when looking for duplicate contacts.	addressbook	zh	寻找重复的联系人时要考虑的字段。
 fields to show in address list	addressbook	zh	请选择联系人列表中的可见字段
 fieldseparator	addressbook	zh	字段分隔符
 for read only ldap	admin	zh	只读的 LDAP
@@ -188,8 +183,6 @@ grant addressbook access	common	zh	授权访问通讯簿
 group %1	addressbook	zh	群组%1
 h	addressbook	zh	时
 hide accounts from addressbook	addressbook	zh	从通讯簿中隐藏帐号
-hide all accounts	addressbook	zh	隐藏所有账户
-hide user groups as distribution lists	addressbook	zh	隐藏作为分发列表的用户组
 hides accounts completly from the adressbook.	addressbook	zh	从通讯簿中完整隐藏帐号。
 home address	addressbook	zh	家庭地址
 home address, birthday, ...	addressbook	zh	家庭地址、生日、...
@@ -201,7 +194,6 @@ home phone	addressbook	zh	家庭电话
 home state	addressbook	zh	省/自治区
 home street	addressbook	zh	居住街道
 home zip code	addressbook	zh	住地邮编
-how many fields must match for the record to be considered a duplicate.	addressbook	zh	必须有多少个字段匹配，记录才会被认为是重复的。
 icon	addressbook	zh	图标
 if accounts are already in ldap	admin	zh	如果帐号已经存在于 LDAP
 import	addressbook	zh	导入
@@ -213,12 +205,11 @@ import from ldif, csv, or vcard	addressbook	zh	从 Ldif、CSV 或 vCard 导入
 import from outlook	addressbook	zh	从 Outlook 导入
 import multiple vcard	addressbook	zh	导入多重 vCard
 import next set	addressbook	zh	导入下一个集合
-import_instructions	addressbook	zh	请按照下列方法从其他应用程序导出通讯簿, 以便导入 EGroupware 中：<p>在 Netscape 中，打开通讯簿，选定<b>文件</b>菜单的<b>导出</b>项，导出的文件将以 LDIF 格式存放。<p>在 Outlook 中，选定将要导出的联系人文件夹，选定<b>文件菜单</b>的<b>导入和导出</b>项，导出的文件将以 CSV 格式存放。<p>在 Palm  Desktop 4.0 或更高版本中，打开通讯簿，选定<b>文件</b>菜单的<b>导出</b>项，导出的文件将以 vCard 格式存放。<p>Palm Desktop 4.0 或是更新的版本，在浏览通讯簿资料时在<b>文件</b>功能选择<b>导出</b>，导出的资料是 vCard 格式。
+import_instructions	addressbook	zh	请按照下列方法从其他应用程序导出通讯簿, 以便导入 EGroupware 中：<p>在 Netscape 中，打开通讯簿，选定<b>文件</b>菜单的<b>导出</b>项，导出的文件将以 LDIF 格式存放。<p>在 Outlook 中，选定将要导出的联系人文件夹，选定<b>文件菜单</b>的<b>导入和导出</b>项，导出的文件将以 CSV 格式存放。<p>在 Palm  Desktop 4.0 或更高版本中，打开通讯簿，选定<b>文件</b>菜单的<b>导出</b>项，导出的文件将以 VCard 格式存放。<p>Palm Desktop 4.0 或是更新的版本，在浏览通讯簿资料时在<b>文件</b>功能选择<b>导出</b>，导出的资料是 vCard 格式。
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	zh	从 CSV 文件导入联系人资料到通讯簿，CSV 是'逗号分隔'方式，不过您可以在选项标签指定其他的分隔符。
 in %1 days (%2) is %3's birthday.	addressbook	zh	在%1 天 (%2) 就是%3的生日。
 income	addressbook	zh	收入
-infolog	addressbook	zh	信息记录仪联系方式
-infolog-organisation	addressbook	zh	信息记录组织
+infolog	addressbook	zh	记事薄
 insufficent rights to delete this list!	addressbook	zh	没有删除这个列表的权限！
 international	addressbook	zh	国际
 label	addressbook	zh	标签
@@ -261,7 +252,6 @@ name, address	addressbook	zh	名称、住址
 new contact submitted by %1 at %2	addressbook	zh	由%1在%2新建并提交了联系人
 next date	addressbook	zh	下一日期
 no vcard	addressbook	zh	没有 vCard
-not shared	addressbook	zh	不共享
 number	addressbook	zh	号码
 number of records to read (%1)	addressbook	zh	读取记录编号(%1)
 options for type	admin	zh	类型选项
@@ -302,7 +292,6 @@ replacements for inserting contacts into documents	addressbook	zh	替换插入
 required fields *	addressbook	zh	必要字段*
 role	addressbook	zh	职务
 room	addressbook	zh	房间
-search letter	addressbook	zh	搜索字母
 select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	zh	选择一个 jpeg 格式的照片，它将被重新调整宽度为60px。
 select a view	addressbook	zh	选择一个查看
 select addressbook type	addressbook	zh	选择通讯簿类型
@@ -315,12 +304,6 @@ select the type of conversion	addressbook	zh	请选择转换类型
 select the type of conversion:	addressbook	zh	请选择转换类型：
 select where you want to store / retrieve contacts	admin	zh	选择你想要在什么位置储存/找回联系人
 selected contacts	addressbook	zh	选择的联系人
-share into addressbook	addressbook	zh	分享到通讯录
-share writable	addressbook	zh	分享可编辑
-shared	addressbook	zh	共享
-shared by me	addressbook	zh	由我分享
-shared into addressbook %1	addressbook	zh	在通讯录中共享 %1
-shared with	addressbook	zh	分享到
 should the columns photo and home address always be displayed, even if they are empty.	addressbook	zh	照片与家庭地址列将会始终显示，即使它们是空的。
 show	addressbook	zh	显示
 show infolog entries for this organisation	addressbook	zh	显示这个组织的相关记事
@@ -351,26 +334,23 @@ today is %1's birthday!	common	zh	今天是%1的生日！
 tomorrow is %1's birthday.	common	zh	明天是%1的生日。
 translation	addressbook	zh	翻译
 type	addressbook	zh	类型
-unshare	addressbook	zh	不再分享
-unshared	addressbook	zh	不再共享
 update a single entry by passing the fields.	addressbook	zh	通过字段来更新单个条目。
 updated	addressbook	zh	更新
 upload or delete the photo	addressbook	zh	上传或删除照片
 url to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)	admin	zh	连接电话号码的网址 (使用 %1 = 拨打号码，%u = 帐户名，%t = 电话帐户)
+use an extra category tab?	addressbook	zh	使用一个额外类别标签？
 use country list	addressbook	zh	使用“国家/地区”列表
 use setup for a full account-migration	admin	zh	使用安装程序来完整帐户迁移
 used for links and for the own sorting of the list	addressbook	zh	使用链接为列表拥有者排序
-user groups are automatically shown as distribution lists.	addressbook	zh	用户组会自动显示为分发列表。
 vcard	common	zh	保存为vCard
 vcards require a first name entry.	addressbook	zh	vCards 需要名字词条。
-vcards require a last name entry.	addressbook	zh	vCards 需要一个姓词条。
+vcards require a last name entry.	addressbook	zh	Vcards 需要一个姓词条。
 verification	addressbook	zh	认证
 view linked infolog entries	addressbook	zh	查看链接的记事条目
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	zh	警告！只有当您不为联系人账户存储时，LDAP才是有效的！
 warning: all contacts found will be deleted!	addressbook	zh	警告：找到的所有联系人都会被删除！
 weekday	addressbook	zh	星期几
 what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting!	addressbook	zh	如何在其他应用程序中显示链接的通讯簿，空的数值数据将被省略。如果您要修改此设置，您需要重新登录！
-when you merge entries into documents, they will be stored here.  if no directory is provided, they will be stored in your home directory (/home/unverricht)	addressbook	zh	当你把条目合并到文件中时，它们将被储存在这里。如果没有提供目录，它们将被存储在你的主目录（/home/...）。
 where to add the email address	addressbook	zh	在哪里添加邮件地址
 which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting.	addressbook	zh	通讯簿在不清楚地址格式的国家要使用的地址格式，如果已经知道，它会使用独立的设定。
 which addressbook should be selected when adding a contact and you have no add rights to the current addressbook.	addressbook	zh	添加联系人时要选择哪个通讯簿，您没有添加到当前通讯簿的权限。
@@ -385,7 +365,6 @@ yes, for the next three days	addressbook	zh	是，在接下来三天
 yes, for the next two weeks	addressbook	zh	是，在接下来两周
 yes, for the next week	addressbook	zh	是，在接下来一周
 yes, for today and tomorrow	addressbook	zh	是，在今天与明天
-you are not allowed to share into the addressbook of %1	addressbook	zh	你不允许分享到地址簿%1
 you are not permitted to delete contact %1	addressbook	zh	您没有权限删除联系人%1
 you are not permittet to delete this contact	addressbook	zh	您没有权限删除这个联系人
 you are not permittet to edit this contact	addressbook	zh	您没有权限编辑这个联系人

addressbook/setup/setup.inc.php

@@ -9,7 +9,7 @@
 /* Basic information about this app */
 $setup_info['addressbook']['name']      = 'addressbook';
 $setup_info['addressbook']['title']     = 'Addressbook';
-$setup_info['addressbook']['version']   = '23.1';
+$setup_info['addressbook']['version']   = '20.1';
 $setup_info['addressbook']['app_order'] = 4;
 $setup_info['addressbook']['enable']    = 1;
 $setup_info['addressbook']['index']    = 'addressbook.addressbook_ui.index&ajax=true';
@@ -52,7 +52,7 @@ $setup_info['addressbook']['hooks']['status-get_actions'] = 'addressbook_hooks::
 /* Dependencies for this app to work */
 $setup_info['addressbook']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('23.1')
+	'versions' => Array('20.1')
 );
 
 // installation checks for addresbook
@@ -64,4 +64,4 @@ $setup_info['addressbook']['check_install'] = array(
 		'func' => 'function_check',
 		'warning' => "The imagecreatefromjpeg function is supplied by the gd extension (complied with jpeg support!). It's needed to upload photos for contacts.",
 	),
-);
+);

addressbook/templates/default/add_list_dialog.xet

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.add_list_dialog" template="" lang="" group="0" version="">
 		<grid>
@@ -9,14 +10,14 @@
 			</columns>
 			<rows>
 			<row>
-				<et2-description  value="Name for the distribution list"></et2-description>
-				<et2-textbox  id="name"></et2-textbox>
+				<description value="Name for the distribution list"/>
+				<textbox id="name"/>
 			</row>
 			<row>
-			<et2-description  value="Addressbook"></et2-description>
-			<et2-select  id="owner"></et2-select>
+			<description value="Addressbook"/>
+			<select id="owner"/>
 			</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>

addressbook/templates/default/admin.types.xet

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.admin.types" template="" lang="" group="0" version="">
 		<template id="admin.customfields.types" content="content_types"/>
@@ -7,4 +8,4 @@
 font-weight: bold;
 }</styles>
 	</template>
-</overlay>
+</overlay>

addressbook/templates/default/app.css

@@ -13,7 +13,7 @@ td.addressbook_sidebox_header {
 	height: 20px;
 	vertical-align: bottom;
 }
-form[id^=addressbook-view].et2_container {
+#addressbook-view.et2_container {
 	height: 0 !important;
 }
 td.addressbook_sidebox_toolbar {
@@ -21,19 +21,13 @@ td.addressbook_sidebox_toolbar {
 	height: 32px;
 }
 
-.addressbook_view_sidebox img.photo {
+div#addressbook_view_sidebox img.photo {
 	width: 68px;
 	padding-right: 3px;
 	height: auto;
 	vertical-align: bottom;
 }
-div.addressbook_view_sidebox .toolbox button{
-	vertical-align: middle;
-}
-div.addressbook_view_sidebox img[id$='_button[delete]'] {
-	float: right;
-	margin-top: 9px;
-}
+
 /**
  * new addressbook.edit
  */
@@ -74,7 +68,10 @@ div.addressbook_edit_general_picture img {
 .custom_country {
 	display: none;
 }
-#addressbook-edit
+input.et2_radiobox {
+	position: relative;
+	left: 7px;
+}
 #addressbook-edit_tel_prefer-tel_work, #addressbook-edit_tel_prefer-tel_cell {
 	left: 7px;
 }
@@ -85,17 +82,10 @@ div.addressbook_edit_general_picture img {
  * Index page
  */
 #addressbook-index img.iphoto {
-    height: auto;
-}
-
-#addressbook-index_nm_filter {
-    order: 1;
-}
-
-#addressbook-index .avatar img.iphoto {
-    border: none;
-    box-shadow: none;
+	width: 100%;
+	height: auto;
 }
+#addressbook-index .avatar img.iphoto {border:none;box-shadow: none;}
 #addressbook-index .avatar span {margin-right: 0;}
 #addressbook-index_org_view, #addressbook-index_addressbook-index-right_add > div.et2_box_widget {
 	top: 0;
@@ -105,16 +95,49 @@ div.addressbook_edit_general_picture img {
 #addressbook-edit_adr_two_locality,
 #addressbook-edit_adr_one_postalcode,
 #addressbook-edit_adr_two_postalcode{
-	
+	padding-top:5px;
+	padding-bottom: 5px;
+}
+#addressbook-edit_adr_one_postalcode,
+#addressbook-edit_adr_two_postalcode{
+	margin-right: -4px;
 }
 div.city_state_postcode #addressbook-edit_adr_two_postalcode,
 div.city_state_postcode #addressbook-edit_adr_one_postalcode {margin-right: 5px !important;}
+#addressbook-edit_role {
+	margin-right: 5px;
+}
 .addressbookHooked .egwGridView_grid label>span.et2_link {
 	display: none;
 }
+/**
+ * adjust width of select-boxes in nextmatch
+ */
+#addressbook-index .filtersContainer {
+	position: absolute;
+	top: 0;	/* Required for Chrome 76+ on Windows */
+	left: 342px;
+	right: 215px;
+}
+#addressbook-index .filtersContainer select {
+	width: 31.5%;
+}
+/* category filter chosen. !important is neccessary to override the width set by chosen*/
+#addressbook-index .nextmatch_header_row .et2_selectbox.select-cat {min-width:auto;width: 31.5% !important;}
+select#addressbook-index_col_filter\[tid\] {
+	width: 100px;
+}
+#addressbook-index_addressbook-index-row select{
+	float: right;
+	width: 134px;
+}
+#addressbook-edit .chzn-container .chzn-results {max-height: 110px}
 
-et2-button#addressbook-index_nm_advanced-search {
-	margin-right: 0 !important;
+#addressbook-index_nm .chzn-drop {width:auto;}
+#addressbook-edit_adr_one_region, #addressbook-edit_adr_two_region {
+	width: 130px;
+    vertical-align: middle;
+    margin-left: 1px;
 }
 .smime_section_border {border-top: 1px solid #e5e5e5;}
 .smime_section_border> * {padding-top: 10px;}

addressbook/templates/default/config.xet

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.config" template="" lang="" group="0" version="16.1">
 		<grid width="100%" class="admin-config egwGridView_grid">
@@ -9,162 +10,156 @@
 			</columns>
 			<rows>
 				<row>
-					<et2-description  value="Telephony integration" span="all" class="subHeader"></et2-description>
+					<description value="Telephony integration" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-description  value="URL to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)" label="%s:"></et2-description>
-					<et2-textbox  id="newsettings[call_link]"></et2-textbox>
+					<description value="URL to link telephone numbers to (use %1 = number to call, %u = account name, %t = account phone)" label="%s:"/>
+					<textbox id="newsettings[call_link]" class="et2_fullWidth"/>
 				</row>
 				<row>
-					<et2-description  value="Size of popup (WxH, eg.400x300, if a popup should be used)" label="%s:"></et2-description>
-					<et2-textbox  id="newsettings[call_popup]"></et2-textbox>
+					<description value="Size of popup (WxH, eg.400x300, if a popup should be used)" label="%s:"/>
+					<textbox id="newsettings[call_popup]" size="10"/>
 				</row>
 				<row>
-					<et2-description  value="Send fax via email by replacing fax number with an email address" label="%s:"></et2-description>
-					<et2-hbox>
-						<et2-textbox  id="newsettings[fax_email_regexp]" placeholder="(.*)"></et2-textbox>
-						<et2-textbox  id="newsettings[fax_email]" placeholder="$1@fax.local"></et2-textbox>
-					</et2-hbox>
+					<description value="GeoLocation integration" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-description  value="GeoLocation integration" span="all" class="subHeader"></et2-description>
+					<description value="Choose pre-defined map source or use custom URL (use %r = street, %t = city, %c = country, %z = zipcode)" label="%s:"/>
+					<taglist id="newsettings[geolocation_url]" maxSelection="1" empty_label="Select a map or write an URL"/>
 				</row>
 				<row>
-					<et2-description  value="Choose pre-defined map source or use custom URL (use %r = street, %t = city, %c = country, %z = zipcode)" label="%s:"></et2-description>
-					<et2-select  id="newsettings[geolocation_url]" allowFreeEntries="true" editModeEnabled="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_search" emptyLabel="Select a map or write an URL"></et2-select>
+					<description value="Calendar integration" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-description  value="Calendar integration" span="all" class="subHeader"></et2-description>
-				</row>
-				<row>
-					<et2-description  value="Disable Last/Next Event column"></et2-description>
-					<et2-select  id="newsettings[disable_event_column]">
+					<description value="Disable Last/Next Event column"/>
+					<select id="newsettings[disable_event_column]">
 						<option value="">Allow</option>
 						<option value="contacts">Allow for contacts only</option>
 						<option value="True">Disabled</option>
-					</et2-select>
+					</select>
 				</row>
 				<row>
-					<et2-description  value="Allow users to maintain their own account-data" span="all" class="subHeader"></et2-description>
+					<description value="Allow users to maintain their own account-data" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-description  value="Fields the user is allowed to edit himself"></et2-description>
-					<et2-select  id="newsettings[own_account_acl]" multiple="true"></et2-select>
+					<description value="Fields the user is allowed to edit himself"/>
+					<select id="newsettings[own_account_acl]" multiple="true" tags="true" class="et2_fullWidth"/>
 				</row>
 				<row>
-					<et2-description  value="General" span="all" class="subHeader"></et2-description>
+					<description value="General" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-description  value="Use a category tree?"></et2-description>
-					<et2-select  id="newsettings[cat_tab]">
+					<description value="Use a category tree?"/>
+					<select id="newsettings[cat_tab]">
 						<option value="True">No</option>
 						<option value="Tree">Yes</option>
-					</et2-select>
+					</select>
 				</row>
 				<row>
-					<et2-description  value="Use an extra tab for private custom fields?"></et2-description>
-					<et2-select  id="newsettings[private_cf_tab]">
+					<description value="Use an extra tab for private custom fields?"/>
+					<select id="newsettings[private_cf_tab]">
 						<option value="">No</option>
 						<option value="True">Yes</option>
-					</et2-select>
+					</select>
 				</row>
 				<row>
-					<et2-description  value="Load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)"></et2-description>
-					<et2-select  id="newsettings[index_load_cfs]" multiple="true"></et2-select>
+					<description value="Load custom fields in index, even if custom field column is off (eg. to display them in a specific index column)"/>
+					<select id="newsettings[index_load_cfs]" multiple="true" tags="true" class="et2_fullWidth"/>
 				</row>
 				<row>
-					<et2-description  value="Update Fields by edited organisations?"></et2-description>
-					<et2-select  id="newsettings[org_fileds_to_update]" multiple="true"></et2-select>
+					<description value="Update Fields by edited organisations?"/>
+					<select id="newsettings[org_fileds_to_update]" multiple="true" tags="true" class="et2_fullWidth"/>
 				</row>
 				<row>
-					<et2-description  value="Fields to copy when copying an address?"></et2-description>
-					<et2-select  id="newsettings[copy_fields]" multiple="true"></et2-select>
+					<description value="Fields to copy when copying an address?"/>
+					<select id="newsettings[copy_fields]" multiple="true" tags="true" class="et2_fullWidth"/>
 				</row>
 				<row>
-					<et2-description  value="Security" span="all" class="subHeader"></et2-description>
+					<description value="Security" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-vbox>
-						<et2-description  value="How many contacts should non-admins be able to export"></et2-description>
-						<et2-description  value="(empty = use global limit, no = no export at all)"></et2-description>
-					</et2-vbox>
-					<et2-textbox  id="newsettings[contact_export_limit]"></et2-textbox>
+					<vbox>
+						<description value="How many contacts should non-admins be able to export"/>
+						<description value="(empty = use global limit, no = no export at all)"/>
+					</vbox>
+					<textbox id="newsettings[contact_export_limit]" size="5"/>
 				</row>
 				<row>
-					<et2-description  value="Allow members of following groups to edit contact-data of accounts" label="%s:"></et2-description>
-					<et2-select-account  id="newsettings[allow_account_edit]" multiple="true" width="100%" accountType="groups"></et2-select-account>
+					<description value="Allow members of following groups to edit contact-data of accounts" label="%s:"/>
+					<select-account id="newsettings[allow_account_edit]" account_type="groups" multiple="true" tags="true" width="100%"/>
 				</row>
 				<row>
-					<et2-description  value="History logging" span="all" class="subHeader"></et2-description>
+					<description value="History logging" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-description  value="Prevent deleting of contacts"></et2-description>
-					<et2-select  id="newsettings[history]">
-						<option value="">Yes, only admins can purge deleted items</option>
+					<description value="Prevent deleting of contacts"/>
+					<select id="newsettings[history]">
+						<option value="">No</option>
+						<option value="history">Yes, only admins can purge deleted items</option>
 						<option value="userpurge">Yes, users can purge their deleted items</option>
-					</et2-select>
+					</select>
 				</row>
 				<row>
-					<et2-description  value="Contact maintenance" span="all" class="subHeader"></et2-description>
+					<description value="Contact maintenance" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-description  value="Set full name and file as field in contacts of all users (either all or only empty values)" label="%s:"></et2-description>
-					<et2-hbox>
-						<et2-select  id="fileas" width="70%" emptyLabel="Set only full name"></et2-select>
-						<et2-button  onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&amp;all=1&amp;type='+this.form.fileas.value;" label="All"></et2-button>
-						<et2-button  onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&amp;type='+this.form.fileas.value;" label="Empty"></et2-button>
-					</et2-hbox>
+					<description value="Set full name and file as field in contacts of all users (either all or only empty values)" label="%s:"/>
+					<hbox>
+						<select id="fileas" empty_label="Set only full name" width="70%"/>
+						<button onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&amp;all=1&amp;type='+this.form.fileas.value;" label="All"/>
+						<button onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_fileas&amp;type='+this.form.fileas.value;" label="Empty"/>
+					</hbox>
 				</row>
 				<row>
-					<et2-description  value="Cleanup addressbook fields (apply if synchronization creates duplicates)" label="%s:"></et2-description>
-					<et2-button  onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_all_cleanup'" label="Start"></et2-button>
+					<description value="Cleanup addressbook fields (apply if synchronization creates duplicates)" label="%s:"/>
+					<button onclick="document.location.href='index.php?menuaction=addressbook.addressbook_ui.admin_set_all_cleanup'" label="Start"/>
 				</row>
 				<row>
-					<et2-description  value="Contact repository" span="all" class="subHeader"></et2-description>
+					<description value="Contact repository" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-description  value="Select where you want to store / retrieve contacts" label="%s:"></et2-description>
-					<et2-select  id="newsettings[contact_repository]"></et2-select>
+					<description value="Select where you want to store / retrieve contacts" label="%s:"/>
+					<select id="newsettings[contact_repository]"/>
 				</row>
 				<row>
-					<et2-description  value="You can only use LDAP as contact repository if the accounts are stored in LDAP too!" span="all"></et2-description>
+					<description value="You can only use LDAP as contact repository if the accounts are stored in LDAP too!" span="all"/>
 				</row>
 				<row>
-					<et2-description  value="Account repository" label="%s:"></et2-description>
-					<et2-hbox>
-						<et2-description  id="newsettings[account_repository]" class="subHeader"></et2-description>
-						<et2-description  value="Can be changed via Setup &gt;&gt; Configuration"></et2-description>
-					</et2-hbox>
+					<description value="Account repository" label="%s:"/>
+					<hbox>
+						<description id="newsettings[account_repository]" class="subHeader"/>
+						<description value="Can be changed via Setup >> Configuration"/>
+					</hbox>
 				</row>
 				<row>
-					<et2-description  value="LDAP settings for contacts" span="all" class="subHeader"></et2-description>
+					<description value="LDAP settings for contacts" span="all" class="subHeader"/>
 				</row>
 				<row>
-					<et2-description  value="LDAP host for contacts" label="%s:"></et2-description>
-					<et2-textbox  id="newsettings[ldap_contact_host]"></et2-textbox>
+					<description value="LDAP host for contacts" label="%s:"/>
+					<textbox id="newsettings[ldap_contact_host]"/>
 				</row>
 				<row>
-					<et2-description  value="LDAP context for contacts" label="%s:"></et2-description>
-					<et2-textbox  id="newsettings[ldap_contact_context]"></et2-textbox>
+					<description value="LDAP context for contacts" label="%s:"/>
+					<textbox id="newsettings[ldap_contact_context]" class="et2_fullWidth"/>
 				</row>
 				<row>
-					<et2-description  value="Additional information about using LDAP as contact repository" class="subHeader"></et2-description>
-					<et2-description  value="README" href="/doc/ldap/README.contacts" extraLinkTarget="_blank"></et2-description>
+					<description value="Additional information about using LDAP as contact repository" class="subHeader"/>
+					<description value="README" href="/doc/ldap/README.contacts" extra_link_target="_blank"/>
 				</row>
 				<row>
-					<et2-description  value="Migration to LDAP"></et2-description>
-					<et2-hbox>
-						<et2-select  id="migrate">
+					<description value="Migration to LDAP"/>
+					<hbox>
+						<select id="migrate">
 							<option value="">Select migration type</option>
 							<option value="contacts" title="if accounts are already in LDAP">contacts to LDAP</option>
 							<option value="contacts,accounts" title="use setup for a full account-migration">contacts and account contact-data to LDAP</option>
 							<option value="contacts,accounts-back" title="for read only LDAP">contacts to LDAP, account contact-data to SQL</option>
 							<option value="sql" title="for read only LDAP">contacts and account contact-data to SQL</option>
-						</et2-select>
-						<et2-button  onclick="if (this.form.migrate.value) document.location.href='index.php?menuaction=addressbook.addressbook_ui.migrate2ldap&amp;type='+this.form.migrate.value;" label="Start"></et2-button>
-					</et2-hbox>
+						</select>
+						<button onclick="if (this.form.migrate.value) document.location.href='index.php?menuaction=addressbook.addressbook_ui.migrate2ldap&amp;type='+this.form.migrate.value;" label="Start"/>
+					</hbox>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>

addressbook/templates/default/contactform.xet

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.contactform" template="" lang="" group="0" version="1.5.001">
 		<grid border="0">
@@ -14,140 +15,140 @@
 			</columns>
 			<rows>
 				<row disabled="!@show[org_name]">
-					<et2-image  src="home"></et2-image>
-					<et2-description  value="Company"></et2-description>
-					<et2-textbox  maxlength="64" id="org_name" span="4"></et2-textbox>
-					<et2-description></et2-description>
+					<image src="home"/>
+					<description value="Company"/>
+					<textbox size="64" maxlength="64" id="org_name" span="4"/>
+					<description/>
 				</row>
 				<row disabled="!@show[org_unit]">
-					<et2-description></et2-description>
-					<et2-description  value="Department"></et2-description>
-					<et2-textbox  maxlength="64" span="4" id="org_unit"></et2-textbox>
-					<et2-description></et2-description>
+					<description/>
+					<description value="Department"/>
+					<textbox size="64" maxlength="64" span="4" id="org_unit"/>
+					<description/>
 				</row>
 				<row valign="top" disabled="!@show[n_fn]">
-					<et2-image  src="accounts"></et2-image>
-					<et2-description  value="Contact"></et2-description>
-					<et2-textbox  maxlength="64" id="n_prefix" placeholder="Prefix"></et2-textbox>
-					<et2-textbox  id="n_given" maxlength="64" align="center"></et2-textbox>
-					<et2-textbox  id="n_family" align="right" maxlength="64" span="2" required="1"></et2-textbox>
-					<et2-description  class="redItalic" value="*"></et2-description>
+					<image src="accounts"/>
+					<description value="Contact"/>
+					<textbox size="10" maxlength="64" id="n_prefix" blur="Prefix"/>
+					<textbox id="n_given" size="20" maxlength="64" align="center"/>
+					<textbox id="n_family" align="right" size="22" maxlength="64" span="2" needed="1"/>
+					<description class="redItalic" value="*"/>
 				</row>
 				<row disabled="!@show[sep1]">
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@show[email]">
-					<et2-image  src="email.png"></et2-image>
-					<et2-description  value="Email"></et2-description>
-					<et2-textbox  maxlength="64" validator="/^[a-z0-9._-]+@[a-z0-9-]+(\.[a-z0-9-]+)+$/i" span="4" id="email" required="1"></et2-textbox>
-					<et2-description  class="redItalic" value="*"></et2-description>
+					<image src="email.png"/>
+					<description value="Email"/>
+					<textbox size="64" maxlength="64" validator="/^[a-z0-9._-]+@[a-z0-9-]+(\.[a-z0-9-]+)+$/i" span="4" id="email" needed="1"/>
+					<description class="redItalic" value="*"/>
 				</row>
 				<row disabled="!@show[tel_work]">
-					<et2-image  src="phone"></et2-image>
-					<et2-description  value="Business phone"></et2-description>
-					<et2-textbox  maxlength="64" span="4" id="tel_work"></et2-textbox>
-					<et2-description></et2-description>
+					<image src="phone"/>
+					<description value="Business phone"/>
+					<textbox size="64" maxlength="64" span="4" id="tel_work"/>
+					<description/>
 				</row>
 				<row disabled="!@show[tel_cell]">
-					<et2-description></et2-description>
-					<et2-description  value="Mobile phone"></et2-description>
-					<et2-textbox  maxlength="64" span="4" id="tel_cell"></et2-textbox>
-					<et2-description></et2-description>
+					<description/>
+					<description value="Mobile phone"/>
+					<textbox size="64" maxlength="64" span="4" id="tel_cell"/>
+					<description/>
 				</row>
 				<row disabled="!@show[tel_fax]">
-					<et2-description></et2-description>
-					<et2-description  value="Fax"></et2-description>
-					<et2-textbox  maxlength="64" span="4" id="tel_fax"></et2-textbox>
-					<et2-description></et2-description>
+					<description/>
+					<description value="Fax"/>
+					<textbox size="64" maxlength="64" span="4" id="tel_fax"/>
+					<description/>
 				</row>
 				<row disabled="!@show[tel_home]">
-					<et2-description></et2-description>
-					<et2-description  value="Home phone"></et2-description>
-					<et2-textbox  maxlength="64" span="4" id="tel_home"></et2-textbox>
-					<et2-description></et2-description>
+					<description/>
+					<description value="Home phone"/>
+					<textbox size="64" maxlength="64" span="4" id="tel_home"/>
+					<description/>
 				</row>
 				<row disabled="!@show[url]">
-					<et2-image  src="internet"></et2-image>
-					<et2-description  value="Internet"></et2-description>
-					<et2-textbox  maxlength="64" span="4" id="url"></et2-textbox>
-					<et2-description></et2-description>
+					<image src="internet"/>
+					<description value="Internet"/>
+					<textbox size="64" maxlength="64" span="4" id="url"/>
+					<description/>
 				</row>
 				<row disabled="!@show[sep2]">
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@show[adr_one_street]">
-					<et2-image  src="home"></et2-image>
-					<et2-description  value="Street"></et2-description>
-					<et2-textbox  maxlength="64" span="4" id="adr_one_street" required="1"></et2-textbox>
-					<et2-description  class="redItalic" value="*"></et2-description>
+					<image src="home"/>
+					<description value="Street"/>
+					<textbox size="64" maxlength="64" span="4" id="adr_one_street" needed="1"/>
+					<description class="redItalic" value="*"/>
 				</row>
 				<row disabled="!@show[adr_one_street2]">
-					<et2-description></et2-description>
-					<et2-description></et2-description>
-					<et2-textbox  maxlength="64" span="4" id="adr_one_street2"></et2-textbox>
-					<et2-description></et2-description>
+					<description/>
+					<description/>
+					<textbox size="64" maxlength="64" span="4" id="adr_one_street2"/>
+					<description/>
 				</row>
 				<row valign="top" disabled="!@show[adr_one_locality]=postcode_city">
-					<et2-description></et2-description>
-					<et2-description  value="City"></et2-description>
-					<et2-textbox  maxlength="64" id="adr_one_postalcode" required="1"></et2-textbox>
-					<et2-textbox  maxlength="64" span="3" id="adr_one_locality" align="right" required="1"></et2-textbox>
-					<et2-description  class="redItalic" value="*"></et2-description>
+					<description/>
+					<description value="City"/>
+					<textbox size="10" maxlength="64" id="adr_one_postalcode" needed="1"/>
+					<textbox size="48" maxlength="64" span="3" id="adr_one_locality" align="right" needed="1"/>
+					<description class="redItalic" value="*"/>
 				</row>
 				<row valign="top" disabled="!@show[adr_one_locality]=city_state_postcode">
-					<et2-description></et2-description>
-					<et2-description  value="Stadt"></et2-description>
-					<et2-textbox  maxlength="64" span="2" id="adr_one_locality" required="1"></et2-textbox>
-					<et2-textbox  maxlength="64" id="adr_one_region" align="center"></et2-textbox>
-					<et2-textbox  maxlength="64" id="adr_one_postalcode" align="right" required="1"></et2-textbox>
-					<et2-description  class="redItalic" value="*"></et2-description>
+					<description/>
+					<description value="Stadt"/>
+					<textbox size="36" maxlength="64" span="2" id="adr_one_locality" needed="1"/>
+					<textbox size="8" maxlength="64" id="adr_one_region" align="center"/>
+					<textbox size="8" maxlength="64" id="adr_one_postalcode" align="right" needed="1"/>
+					<description class="redItalic" value="*"/>
 				</row>
 				<row disabled="!@show[sep3]">
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@show[custom1]">
-					<et2-image  src="gear"></et2-image>
-					<et2-description  value="@customlabel[1]"></et2-description>
-					<et2-textbox  id="@customfield[1]" span="4" required="1"></et2-textbox>
-					<et2-description  class="redItalic" value="*"></et2-description>
+					<image src="gear"/>
+					<description value="@customlabel[1]"/>
+					<textbox id="@customfield[1]" span="4" needed="1" size="64"/>
+					<description class="redItalic" value="*"/>
 				</row>
 				<row disabled="!@show[custom2]">
-					<et2-description></et2-description>
-					<et2-description  value="@customlabel[2]"></et2-description>
-					<et2-textbox  id="@customfield[2]" span="4"></et2-textbox>
-					<et2-description></et2-description>
+					<description/>
+					<description value="@customlabel[2]"/>
+					<textbox id="@customfield[2]" span="4" size="64"/>
+					<description/>
 				</row>
 				<row disabled="!@show[sep4]">
 					<hrule span="all"/>
 				</row>
 				<row valign="top" disabled="!@show[note]">
-					<et2-image  src="edit.png"></et2-image>
-					<et2-description  value="Message"></et2-description>
-					<et2-textarea  rows="5" cols="45" span="4" class="width100" id="note" required="1"></et2-textarea>
+					<image src="edit.png"/>
+					<description value="Message"/>
+					<textbox multiline="true" rows="5" cols="45" span="4" class="width100" needed="1" id="note"/>
 				</row>
 				<row disabled="!@show[sep5]">
 					<hrule span="all"/>
 				</row>
 				<row disabled="!@show[recaptcha]">
-					<et2-description  span="2"></et2-description>
+					<description span="2"/>
 					<html id="recaptcha"/>
-					<et2-description></et2-description>
+					<description/>
 				</row>
 				<row disabled="!@show[captcha]">
-					<et2-image  src="private.svg"></et2-image>
-					<et2-description  value="Verification"></et2-description>
-					<et2-description  value="@captcha_task"></et2-description>
-					<et2-textbox  label="%s please calculate the result" span="3" id="captcha" required="1"></et2-textbox>
-					<et2-description  class="redItalic" value="*"></et2-description>
+					<image src="private.png"/>
+					<description value="Verification"/>
+					<description value="@captcha_task"/>
+					<textbox label="%s please calculate the result" needed="1" span="3" id="captcha" size="3"/>
+					<description class="redItalic" value="*"/>
 				</row>
 				<row>
-					<et2-description></et2-description>
-					<et2-description></et2-description>
-					<et2-button  label="Submit" id="submitit"></et2-button>
-					<et2-description  span="all" class="redItalic" value="required fields *" align="right"></et2-description>
-					<et2-description></et2-description>
-					<et2-description></et2-description>
-					<et2-description></et2-description>
+					<description/>
+					<description/>
+					<button label="Submit" id="submitit"/>
+					<description span="all" class="redItalic" value="required fields *" align="right"/>
+					<description/>
+					<description/>
+					<description/>
 				</row>
 			</rows>
 		</grid>
@@ -155,4 +156,4 @@
 			.width100 textarea { width: 99%; }
 		</styles>
 	</template>
-</overlay>
+</overlay>

addressbook/templates/default/display.xet

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.display.rows" template="" lang="" group="0" version="1.5.001">
 		<grid width="100%" overflow="auto">
@@ -40,32 +41,32 @@
 					<nextmatch-header label="Region" id="adr_one_region"/>
 					<nextmatch-header label="@customlabel[1]" id="custom1"/>
 					<nextmatch-header label="@customlabel[2]" id="custom2"/>
-					<et2-vbox  cellpadding="0" cellspacing="0" >
+					<vbox options="0,0">
 						<nextmatch-header label="select country" id="country"/>
 						<nextmatch-customfilter id="adr_one_countryname" options="select-country,Country,1" class="countrySelect"/>
-					</et2-vbox>
+					</vbox>
 				</row>
 				<row class="row" valign="top">
-					<et2-image  options="1" src="${row}[type]" readonly="true" label="$row_cont[type_label]"></et2-image>
-					<et2-description  id="${row}[org_name]"></et2-description>
-					<et2-description  id="${row}[org_unit]"></et2-description>
-					<et2-description  id="${row}[line1]"></et2-description>
-					<et2-description  id="${row}[email]"></et2-description>
-					<et2-description  id="${row}[tel_work]"></et2-description>
-					<et2-description  id="${row}[tel_cell]"></et2-description>
-					<et2-description  id="${row}[tel_fax]"></et2-description>
-					<et2-description  id="${row}[tel_home]"></et2-description>
-					<et2-description  id="${row}[url]"></et2-description>
-					<et2-vbox>
-						<et2-description  id="${row}[adr_one_street]"></et2-description>
-						<et2-description  id="${row}[adr_one_street2]"></et2-description>
-					</et2-vbox>
-					<et2-description  id="${row}[adr_one_postalcode]"></et2-description>
-					<et2-description  id="${row}[adr_one_locality]"></et2-description>
-					<et2-description  id="${row}[adr_one_region]"></et2-description>
-					<et2-description  id="${row}[custom1]"></et2-description>
-					<et2-description  id="${row}[custom2]"></et2-description>
-					<et2-description  id="${row}[adr_one_countryname]"></et2-description>
+					<image options="1" src="${row}[type]" readonly="true" label="$row_cont[type_label]"/>
+					<description id="${row}[org_name]"/>
+					<description id="${row}[org_unit]"/>
+					<description id="${row}[line1]"/>
+					<description id="${row}[email]"/>
+					<description id="${row}[tel_work]"/>
+					<description id="${row}[tel_cell]"/>
+					<description id="${row}[tel_fax]"/>
+					<description id="${row}[tel_home]"/>
+					<description id="${row}[url]"/>
+					<vbox>
+						<description id="${row}[adr_one_street]"/>
+						<description id="${row}[adr_one_street2]"/>
+					</vbox>
+					<description id="${row}[adr_one_postalcode]"/>
+					<description id="${row}[adr_one_locality]"/>
+					<description id="${row}[adr_one_region]"/>
+					<description id="${row}[custom1]"/>
+					<description id="${row}[custom2]"/>
+					<description id="${row}[adr_one_countryname]"/>
 				</row>
 			</rows>
 		</grid>
@@ -78,12 +79,12 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<et2-description  span="all" class="redItalic" align="center" id="msg" noLang="1"></et2-description>
-					<et2-description></et2-description>
+					<description span="all" class="redItalic" align="center" id="msg" no_lang="1"/>
+					<description/>
 				</row>
 				<row disabled="1">
-					<et2-description></et2-description>
-					<et2-description></et2-description>
+					<description/>
+					<description/>
 				</row>
 				<row>
 					<nextmatch options="addressbook.display.rows" id="nm1" span="all"/>
@@ -91,4 +92,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>

addressbook/templates/default/dupconfirmdialog.xet

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.dupconfirmdialog" template="" lang="" group="0" version="">
 		<grid id="grid">
@@ -9,10 +10,10 @@
 			</columns>
 			<rows>
 				<row>
-					<et2-checkbox  id="${row}[confirm]"></et2-checkbox>
-					<et2-description  id="${row}[name]"></et2-description>
+					<checkbox id="${row}[confirm]"/>
+					<description id="${row}[name]"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>

addressbook/templates/default/edit.xet

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.editname" template="" lang="" group="0" version="1.9.001">
 		<grid class="editname">
@@ -8,133 +9,141 @@
 				<column width="210"/>
 			</columns>
 			<rows>
-                <row>
-                    <et2-description  for="n_prefix" value="prefix"></et2-description>
-                    <et2-textbox  id="n_prefix" tabindex="1" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="honorific-prefix"></et2-textbox>
-                </row>
-                <row>
-                    <et2-description  for="n_given" value="first name"></et2-description>
-                    <et2-textbox  id="n_given" tabindex="2" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="given-name"></et2-textbox>
-                </row>
-                <row>
-                    <et2-description  for="n_middle" value="middle name"></et2-description>
-                    <et2-textbox  id="n_middle" tabindex="3" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="additional-name"></et2-textbox>
-                </row>
-                <row>
-                    <et2-description  for="n_family" value="last name"></et2-description>
-                    <et2-textbox  id="n_family" tabindex="4" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="family-name"></et2-textbox>
-                </row>
-                <row>
-                    <et2-description  for="n_suffix" value="suffix"></et2-description>
-                    <et2-textbox  id="n_suffix" tabindex="5" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="64" autocomplete="honorific-suffix"></et2-textbox>
-                </row>
-                <row>
-                    <et2-description></et2-description>
-                    <et2-button  label="Ok" tabindex="6" id="button[ok]" class="button_ok" onclick="jQuery('table.editname').css('display','none'); jQuery('#'+form::name('org_name')).focus(); return false;" image="check"></et2-button>
-                </row>
-            </rows>
-        </grid>
-    </template>
-    <template id="addressbook.edit.general" template="" lang="" group="0" version="1.9.003">
-        <grid width="94%">
-            <columns>
-                <column width="92"/>
-                <column width="230"/>
-                <column width="50"/>
-                <column width="92"/>
-                <column width="230"/>
-            </columns>
-            <rows>
-                <row>
-                    <et2-description  for="role" value="Role"></et2-description>
-                    <et2-hbox>
-                        <et2-textbox  id="role" tabindex="20" width="60%" maxlength="64" autocomplete="section-one"></et2-textbox>
-                        <et2-textbox  id="room" tabindex="21" placeholder="Room"></et2-textbox>
-                    </et2-hbox>
-                    <et2-description></et2-description>
-                    <et2-description  for="adr_one_street" value="street"></et2-description>
-                    <et2-textbox  id="adr_one_street" tabindex="11" maxlength="64" autocomplete="address-line1"></et2-textbox>
-                </row>
-                <row>
-                    <et2-description  for="assistent" value="Assistent"></et2-description>
-                    <et2-textbox  id="assistent" tabindex="22"></et2-textbox>
-                    <et2-description></et2-description>
-                    <et2-description></et2-description>
-                    <et2-textbox  statustext="address line 2" id="adr_one_street2" tabindex="12" maxlength="64" autocomplete="address-line2"></et2-textbox>
-                </row>
-                <row disabled="@addr_format=city_state_postcode">
-                    <et2-description  for="tel_assistent" value="Assistent phone"></et2-description>
-                    <et2-url-phone  id="tel_assistent" tabindex="23"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_assistent" ro_true="&amp;hearts;" />
-                    <et2-description  for="adr_one_locality" value="city"></et2-description>
-                    <et2-hbox  class="city_state_postcode">
-                        <et2-textbox  statustext="ZIP Code" id="adr_one_postalcode" tabindex="13" width="24%" maxlength="64" autocomplete="postal-code"></et2-textbox>
-                        <et2-textbox  statustext="City" id="adr_one_locality" tabindex="14" maxlength="64" autocomplete="address-level2"></et2-textbox>
-                    </et2-hbox>
-                </row>
-                <row disabled="@addr_format=city_state_postcode">
-                    <et2-description  for="tel_fax" value="fax"></et2-description>
-                    <et2-url-fax  id="tel_fax" tabindex="24" autocomplete="fax"></et2-url-fax>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_fax" ro_true="&amp;hearts;" />
-                    <et2-description  for="adr_one_countryname" value="country"></et2-description>
-                    <et2-select-country  id="adr_one_countrycode" tabindex="15" allowFreeEntries="true" autocomplete="country" onchange="app.addressbook.regionSetCountry" emptyLabel="Select one"></et2-select-country>
-                </row>
-                <row disabled="@addr_format=city_state_postcode">
-                    <et2-description  for="tel_other" value="Other phone"></et2-description>
-                    <et2-url-phone  id="tel_other" tabindex="25" autocomplete="tel"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_other" ro_true="&amp;hearts;" />
-                    <et2-description  value="Region"></et2-description>
-                    <et2-select-state  class="city_state_postcode" statustext="State" allowFreeEntries="true" id="adr_one_region" tabindex="16" maxlength="64" countryCode="$cont[adr_one_countrycode]" emptyLabel="Select one"></et2-select-state>
-                </row>
-                <row disabled="!@addr_format=city_state_postcode">
-                    <et2-description  for="tel_assistent" value="Assistent phone"></et2-description>
-                    <et2-url-phone  id="tel_assistent" tabindex="23"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_assistent" ro_true="&amp;hearts;" />
-                    <et2-description  value="City"></et2-description>
-                    <et2-hbox>
-                        <et2-textbox  statustext="City" id="adr_one_locality" maxlength="64" tabindex="13" autocomplete="address-level2"></et2-textbox>
-                        <et2-select-state  statustext="State" id="adr_one_region" tabindex="14" allowFreeEntries="true" width="130" countryCode="$cont[adr_one_countrycode]" emptyLabel="Select one"></et2-select-state>
-                        <et2-textbox  statustext="ZIP Code" id="adr_one_postalcode" maxlength="64" tabindex="15" autocomplete="postal-code"></et2-textbox>
-                    </et2-hbox>
-                </row>
-                <row disabled="!@addr_format=city_state_postcode">
-                    <et2-description  for="tel_fax" value="fax"></et2-description>
-                    <et2-url-fax  id="tel_fax" tabindex="24" autocomplete="fax"></et2-url-fax>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_fax" ro_true="&amp;hearts;" />
-                    <et2-description  for="adr_one_countryname" value="country"></et2-description>
-                    <et2-select-country  tabindex="16" id="adr_one_countrycode" allowFreeEntries="true" autocomplete="country" onchange="app.addressbook.regionSetCountry" emptyLabel="Select one"></et2-select-country>
-                </row>
-                <row disabled="!@addr_format=city_state_postcode">
-                    <et2-description  for="tel_other" value="Other Phone"></et2-description>
-                    <et2-url-phone  id="tel_other" tabindex="25" autocomplete="tel"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_other" ro_true="&amp;hearts;" />
-                    <et2-description></et2-description>
-                    <et2-description></et2-description>
-                </row>
-                <row>
-                    <et2-description  for="tel_car" value="car phone"></et2-description>
-                    <et2-url-phone  id="tel_car" tabindex="26"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_car" ro_true="&amp;hearts;" />
-                    <et2-description  disabled="@no_tid" for="tid" value="Type"></et2-description>
-                    <et2-select  id="tid" onchange="1" disabled="@no_tid" noLang="1"></et2-select>
-                </row>
-                <row disabled="@shared_disabled" valign="top">
-                    <et2-vbox>
-                        <et2-description  for="shared" value="Shared with"></et2-description>
-                        <et2-checkbox  id="shared_writable" label="writable" statustext="Create new shares writable"></et2-checkbox>
-                    </et2-vbox>
-                    <et2-select-account id="shared_values" multiple="true" span="all"
-                                        onchange="app.addressbook.shared_changed"
-                                        accountType="both"></et2-select-account>
-                </row>
-            </rows>
+				<row>
+					<description for="n_prefix" value="prefix"/>
+					<textbox id="n_prefix" tabindex="1" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="honorific-prefix" />
+				</row>
+				<row>
+					<description for="n_given" value="first name"/>
+					<textbox id="n_given" tabindex="2" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="given-name" />
+				</row>
+				<row>
+					<description for="n_middle" value="middle name"/>
+					<textbox id="n_middle" tabindex="3" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="additional-name" />
+				</row>
+				<row>
+					<description for="n_family" value="last name"/>
+					<textbox id="n_family" tabindex="4" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="family-name" />
+				</row>
+				<row>
+					<description for="n_suffix" value="suffix"/>
+					<textbox id="n_suffix" tabindex="5" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64" autocomplete="honorific-suffix" />
+				</row>
+				<row>
+					<description/>
+					<button label="Ok" tabindex="6" id="button[ok]" class="button_ok" onclick="jQuery('table.editname').css('display','none'); jQuery('#'+form::name('org_name')).focus(); return false;" image="check" background_image="1"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="addressbook.edit.general" template="" lang="" group="0" version="1.9.003">
+		<grid width="100%">
+			<columns>
+				<column width="92"/>
+				<column width="230"/>
+				<column width="50"/>
+				<column width="92"/>
+				<column width="230"/>
+				<column width="50"/>
+			</columns>
+			<rows>
+				<row>
+					<description for="role" value="Role"/>
+					<hbox width="100%">
+						<textbox id="role" tabindex="20" width="60%" maxlength="64" autocomplete="section-one" />
+						<textbox id="room" tabindex="21" width="34%" blur="Room"/>
+					</hbox>
+					<description/>
+					<description for="adr_one_street" value="street"/>
+					<textbox id="adr_one_street" tabindex="11" class="et2_fullWidth" maxlength="64" autocomplete="address-line1"/>
+					<description/>
+				</row>
+				<row>
+					<description for="assistent" value="Assistent"/>
+					<textbox id="assistent" tabindex="22" class="et2_fullWidth"/>
+					<description/>
+					<description/>
+					<textbox statustext="address line 2" id="adr_one_street2" tabindex="12" class="et2_fullWidth" maxlength="64" autocomplete="address-line2"/>
+					<description/>
+				</row>
+				<row disabled="@addr_format=city_state_postcode">
+					<description for="tel_assistent" value="Assistent phone"/>
+					<url-phone id="tel_assistent" tabindex="23" class="et2_fullWidth"/>
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_assistent,&amp;hearts;"/>
+					<description for="adr_one_locality" value="city" />
+					<hbox class="city_state_postcode">
+						<textbox statustext="ZIP Code" id="adr_one_postalcode" tabindex="13" width="24%" maxlength="64" autocomplete="postal-code"/>
+						<textbox statustext="City" id="adr_one_locality" tabindex="14" maxlength="64"  width="70%" autocomplete="address-level2"/>
+					</hbox>
+					<description/>
+				</row>
+				<row disabled="@addr_format=city_state_postcode">
+					<description for="tel_fax" value="fax"/>
+					<url-phone id="tel_fax" tabindex="24" class="et2_fullWidth" autocomplete="fax" />
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax,&amp;hearts;"/>
+					<description for="adr_one_countryname" value="country"/>
+					<vbox  class="city_state_postcode" width="100%">
+						<menulist class="et2_fullWidth">
+							<menupopup type="select-country" submit="1" tags="true" width="100%" class="countrySelect et2_fullWidth" id="adr_one_countrycode" tabindex="15" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="country"/>
+						</menulist>
+						<textbox id="adr_one_countryname" class="custom_country et2_fullWidth" autocomplete="country-name"/>
+					</vbox>
+					<description/>
+				</row>
+				<row disabled="@addr_format=city_state_postcode">
+					<description for="tel_other" value="Other phone"/>
+					<url-phone id="tel_other" tabindex="25" class="et2_fullWidth"  autocomplete="tel" />
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_other,&amp;hearts;"/>
+					<description value="Region"/>
+					<taglist-state  class="city_state_postcode et2_fullWidth" statustext="State" maxSelection="1" multiple="toggle" editModeEnabled="false" country_code="$cont[adr_one_countrycode]" id="adr_one_region" tabindex="16" maxlength="64"/>
+					<description/>
+				</row>
+				<row disabled="!@addr_format=city_state_postcode">
+					<description for="tel_assistent" value="Assistent phone"/>
+					<url-phone id="tel_assistent" tabindex="23" class="et2_fullWidth"/>
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_assistent,&amp;hearts;"/>
+					<description value="City"/>
+					<hbox>
+						<textbox statustext="City" id="adr_one_locality" size="30" maxlength="64" tabindex="13" autocomplete="address-level2"/>
+						<taglist-state statustext="State" maxSelection="1" multiple="toggle" editModeEnabled="false" country_code="$cont[adr_one_countrycode]" id="adr_one_region" tabindex="14" width="130"/>
+						<textbox statustext="ZIP Code" id="adr_one_postalcode" size="5" maxlength="64" tabindex="15" autocomplete="postal-code"/>
+					</hbox>
+					<description/>
+				</row>
+				<row disabled="!@addr_format=city_state_postcode">
+					<description for="tel_fax" value="fax"/>
+					<url-phone id="tel_fax" tabindex="24" class="et2_fullWidth" autocomplete="fax" />
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax,&amp;hearts;"/>
+					<description for="adr_one_countryname" value="country"/>
+					<vbox width="100%" tabindex="16">
+						<menulist tabindex="16">
+							<menupopup type="select-country" tabindex="16" tags="true" width="100%" class="countrySelect et2_fullWidth" id="adr_one_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="country"/>
+						</menulist>
+						<textbox id="adr_one_countryname" class="custom_country et2_fullWidth" tabindex="16" autocomplete="country-name"/>
+					</vbox>
+					<description/>
+				</row>
+				<row disabled="!@addr_format=city_state_postcode">
+					<description for="tel_other" value="Other Phone"/>
+					<url-phone id="tel_other" tabindex="25" class="et2_fullWidth" autocomplete="tel"/>
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_other,&amp;hearts;"/>
+					<description/>
+					<description/>
+					<description/>
+				</row>
+				<row>
+					<description for="tel_car" value="car phone"/>
+					<url-phone id="tel_car" tabindex="26" class="et2_fullWidth"/>
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_car,&amp;hearts;"/>
+					<description disabled="@no_tid" for="tid" value="Type"/>
+					<hbox width="102%">
+						<menulist disabled="@no_tid">
+							<menupopup id="tid" no_lang="1" class="et2_fullWidth" onchange="1"/>
+						</menulist>
+					</hbox>
+					<description/>
+				</row>
+			</rows>
 		</grid>
 	</template>
 	<template id="addressbook.edit.details" template="" lang="" group="0" version="1.9.002">
@@ -149,8 +158,8 @@
 			<rows>
 				<row valign="top">
 					<tree-cat id="cat_id_tree" options="13,,width:99%"/>
-					<et2-select-cat  id="cat_id" width="100%" height="195" multiple="true" placeholder="Category"></et2-select-cat>
-					<et2-description></et2-description>
+					<taglist-cat id="cat_id" empty_label="Category" width="100%" height="195"/>
+					<description/>
 					<grid width="100%">
 						<columns>
 							<column width="92"/>
@@ -158,139 +167,137 @@
 						</columns>
 						<rows>
 							<row valign="top">
-								<et2-description  value="Notes"></et2-description>
-                                <et2-textarea  id="note" rows="10" height="100"></et2-textarea>
+								<description value="Notes"/>
+								<textbox multiline="true" id="note" rows="10" class="et2_fullWidth" height="100"/>
 							</row>
 							<row disabled="@hidebuttons">
-								<et2-description  value="Last date"></et2-description>
-								<et2-link  id="last_link" app=""></et2-link>
+								<description value="Last date"/>
+								<link id="last_link"/>
 							</row>
 							<row disabled="@hidebuttons">
-								<et2-description  value="Next date"></et2-description>
-								<et2-link  id="next_link" app=""></et2-link>
-                            </row>
-                            <row valign="top" class="smime_section_border">
-                                <et2-description  value="SMIME key"></et2-description>
-                                <vfs-upload id="addressbook:$cont[id]:.files/smime-pubkey.crt"
-                                            accept=".crt,.pem,application/x-x509-ca-cert,application/x-x509-user-cert"
-                                            mime="/application\/(x-x509-(ca|user)|pkix)-cert/"
-                                            callback="addressbook.addressbook_ui.pubkey_uploaded"/>
-                            </row>
-                            <row valign="top">
-                                <et2-description  value="PGP key"></et2-description>
-                                <vfs-upload id="addressbook:$cont[id]:.files/pgp-pubkey.asc"
-                                            accept=".asc,application/pgp-keys"
-                                            mime="/(application\/pgp-keys|text\/plain)/"
-                                            callback="addressbook.addressbook_ui.pubkey_uploaded"/>
-                            </row>
-                            <row valign="top">
-                                <et2-description  for="pubkey" value="Public key"></et2-description>
-                                <et2-textarea  id="pubkey" rows="4" resizeRatio="0"></et2-textarea>
-                            </row>
-                        </rows>
-                    </grid>
-                    <et2-description></et2-description>
-                </row>
-            </rows>
-        </grid>
-    </template>
-    <template id="addressbook.edit.home" template="" lang="" group="0" version="1.9.001">
-        <grid width="100%">
-            <columns>
-                <column width="92"/>
-                <column width="230"/>
-                <column width="50"/>
-                <column width="92"/>
-                <column width="230"/>
-                <column width="50"/>
-            </columns>
-            <rows>
-                <row>
-                    <et2-description  for="tel_home" value="Home phone"></et2-description>
-                    <et2-url-phone  id="tel_home" tabindex="27" autocomplete="section-two home tel"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_home" ro_true="&amp;hearts;" />
-                    <et2-description  for="adr_two_street" tabindex="32" value="street"></et2-description>
-                    <et2-textbox  id="adr_two_street" tabindex="33" maxlength="64" autocomplete="section-two address-line1"></et2-textbox>
-                    <et2-description></et2-description>
-                </row>
-                <row>
-                    <et2-description  for="tel_cell_private" value="mobile phone"></et2-description>
-                    <et2-url-phone  id="tel_cell_private" tabindex="28" autocomplete="section-two mobile tel"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_cell_private" ro_true="&amp;hearts;" />
-                    <et2-description></et2-description>
-                    <et2-textbox  statustext="address line 2" id="adr_two_street2" tabindex="34" maxlength="64" autocomplete="section-two address-line2"></et2-textbox>
-                    <et2-description></et2-description>
-                </row>
-                <row disabled="@addr_format=city_state_postcode">
-                    <et2-description  for="tel_fax_home" value="fax"></et2-description>
-                    <et2-url-fax  id="tel_fax_home" tabindex="29" autocomplete="section-two fax tel"></et2-url-fax>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_fax_home" ro_true="&amp;hearts;" />
-                    <et2-description  for="adr_two_locality" value="city"></et2-description>
-                    <et2-hbox  class="city_state_postcode">
-                        <et2-textbox  statustext="ZIP Code" id="adr_two_postalcode" tabindex="34" width="24%" maxlength="64" autocomplete="section-two postal-code"></et2-textbox>
-                        <et2-textbox  statustext="City" id="adr_two_locality" maxlength="64" tabindex="36" autocomplete="section-two address-level2"></et2-textbox>
-                    </et2-hbox>
-                    <et2-description></et2-description>
-                </row>
-                <row disabled="@addr_format=city_state_postcode">
-                    <et2-description  for="tel_pager" value="pager" autocomplete="section-two pager tel"></et2-description>
-                    <et2-url-phone  id="tel_pager" tabindex="30"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_pager" ro_true="&amp;hearts;" />
-                    <et2-description  for="adr_two_countryname" value="country"></et2-description>
-                    <et2-select-country  tabindex="37" id="adr_two_countrycode" allowFreeEntries="true" autocomplete="section-two country" onchange="app.addressbook.regionSetCountry" emptyLabel="Select one"></et2-select-country>
-                    <et2-description></et2-description>
-                </row>
-                <row disabled="@addr_format=city_state_postcode">
-                    <et2-description  for="bday" value="Birthday"></et2-description>
-                    <et2-date  id="bday" tabindex="31" dataFormat="Y-m-d" yearRange="c-90:c+2"></et2-date>
-                    <et2-description></et2-description>
-                    <et2-description  value="Region"></et2-description>
-                    <et2-select-state  statustext="State" id="adr_two_region" tabindex="38" allowFreeEntries="true" maxlength="64" class="city_state_postcode" countryCode="$cont[adr_two_countrycode]" emptyLabel="Select one"></et2-select-state>
-                    <et2-description></et2-description>
-                </row>
-                <row disabled="!@addr_format=city_state_postcode">
-                    <et2-description  for="tel_fax_home" value="fax"></et2-description>
-                    <et2-url-fax  id="tel_fax_home" autocomplete="fax tel"></et2-url-fax>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_fax_home" ro_true="&amp;hearts;" />
-                    <et2-description  value="City"></et2-description>
-                    <et2-hbox>
-                        <et2-textbox  statustext="City" id="adr_two_locality" maxlength="64" autocomplete="section-two address-level2"></et2-textbox>
-                        <et2-select-state  statustext="State" id="adr_two_region" allowFreeEntries="true" width="130" autocomplete="section-two address-level1" countryCode="$cont[adr_one_countrycode]" emptyLabel="Select one"></et2-select-state>
-                        <et2-textbox  statustext="ZIP Code" id="adr_two_postalcode" maxlength="64" autocomplete="section-two postal-code"></et2-textbox>
-                    </et2-hbox>
-                    <et2-description></et2-description>
-                </row>
-                <row disabled="!@addr_format=city_state_postcode">
-                    <et2-description  for="tel_pager" value="pager"></et2-description>
-                    <et2-url-phone  id="tel_pager"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_pager" ro_true="&amp;hearts;" />
-                    <et2-description  for="adr_two_countryname" value="country"></et2-description>
-                    <et2-select-country  id="adr_two_countrycode" allowFreeEntries="true" autocomplete="section-two country" onchange="app.addressbook.regionSetCountry" emptyLabel="Select one"></et2-select-country>
-                    <et2-description></et2-description>
-                </row>
-                <row disabled="!@addr_format=city_state_postcode">
-                    <et2-description  for="bday" value="Birthday"></et2-description>
-                    <et2-date  id="bday" dataFormat="Y-m-d" ></et2-date>
-                    <et2-description></et2-description>
-                    <et2-description></et2-description>
-                    <et2-description></et2-description>
-                    <et2-description></et2-description>
-                </row>
-                <row>
-                    <et2-description  for="email_home" value="EMail"></et2-description>
-                    <et2-url-email  id="email_home" tabindex="32" onchange="app.addressbook.check_value(widget,'$cont[id]');" autocomplete="section-two home email"></et2-url-email>
-                    <et2-description></et2-description>
-                    <et2-description  for="url_home" value="URL"></et2-description>
-                    <et2-url  id="url_home" tabindex="39" autocomplete="section-two url"></et2-url>
-                    <et2-description></et2-description>
-                </row>
-            </rows>
+								<description value="Next date"/>
+								<link id="next_link"/>
+							</row>
+							<row valign="top" class="smime_section_border">
+								<description value="SMIME key"/>
+								<vfs-upload id="addressbook:$cont[id]:.files/smime-pubkey.crt" accept=".crt,.pem,application/x-x509-ca-cert,application/x-x509-user-cert" mime="/application\/(x-x509-(ca|user)|pkix)-cert/" callback="addressbook.addressbook_ui.pubkey_uploaded"/>
+							</row>
+							<row valign="top">
+								<description value="PGP key"/>
+								<vfs-upload id="addressbook:$cont[id]:.files/pgp-pubkey.asc" accept=".asc,application/pgp-keys" mime="/(application\/pgp-keys|text\/plain)/" callback="addressbook.addressbook_ui.pubkey_uploaded"/>
+							</row>
+							<row valign="top">
+								<description for="pubkey" value="Public key"/>
+								<textbox multiline="true" id="pubkey" rows="4" resize_ratio="0" class="et2_fullWidth"/>
+							</row>
+						</rows>
+					</grid>
+					<description/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+	<template id="addressbook.edit.home" template="" lang="" group="0" version="1.9.001">
+		<grid width="100%">
+			<columns>
+				<column width="92"/>
+				<column width="230"/>
+				<column width="50"/>
+				<column width="92"/>
+				<column width="230"/>
+				<column width="50"/>
+			</columns>
+			<rows>
+				<row>
+					<description for="tel_home" value="Home phone"/>
+					<url-phone id="tel_home" tabindex="27" class="et2_fullWidth" autocomplete="section-two home tel" />
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_home,&amp;hearts;"/>
+					<description for="adr_two_street" tabindex="32" value="street"/>
+					<textbox id="adr_two_street" tabindex="33" class="et2_fullWidth" maxlength="64" autocomplete="section-two address-line1" />
+					<description/>
+				</row>
+				<row>
+					<description for="tel_cell_private" value="mobile phone"/>
+					<url-phone id="tel_cell_private" tabindex="28" class="et2_fullWidth" autocomplete="section-two mobile tel" />
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell_private,&amp;hearts;"/>
+					<description/>
+					<textbox statustext="address line 2" id="adr_two_street2" tabindex="34" class="et2_fullWidth" maxlength="64" autocomplete="section-two address-line2" />
+					<description/>
+				</row>
+				<row disabled="@addr_format=city_state_postcode">
+					<description for="tel_fax_home" value="fax"/>
+					<url-phone id="tel_fax_home" tabindex="29" class="et2_fullWidth" autocomplete="section-two fax tel" />
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax_home,&amp;hearts;"/>
+					<description for="adr_two_locality" value="city"/>
+					<hbox class="city_state_postcode">
+						<textbox statustext="ZIP Code" id="adr_two_postalcode" tabindex="34" width="24%" maxlength="64" autocomplete="section-two postal-code" />
+						<textbox statustext="City" id="adr_two_locality" maxlength="64" tabindex="36" width="70%" autocomplete="section-two address-level2" />
+					</hbox>
+					<description/>
+				</row>
+				<row disabled="@addr_format=city_state_postcode">
+					<description for="tel_pager" value="pager" autocomplete="section-two pager tel" />
+					<url-phone id="tel_pager" tabindex="30" class="et2_fullWidth"/>
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_pager,&amp;hearts;"/>
+					<description for="adr_two_countryname" value="country"/>
+					<vbox width="100%" class="city_state_postcode">
+						<menulist class="et2_fullWidth">
+							<menupopup type="select-country" tabindex="37" tags="true" width="100%" class="countrySelect et2_fullWidth" id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="section-two country" />
+						</menulist>
+						<textbox id="adr_two_countryname" class="custom_country et2_fullWidth" autocomplete="section-two country-name" />
+					</vbox>
+					<description/>
+				</row>
+				<row disabled="@addr_format=city_state_postcode">
+					<description for="bday" value="Birthday"/>
+					<date id="bday" tabindex="31" options="Y-m-d"  year_range="c-90:c+2" class="et2_fullWidth"/>
+					<description/>
+					<description value="Region"/>
+					<taglist-state statustext="State" maxSelection="1" multiple="toggle" editModeEnabled="false" country_code="$cont[adr_two_countrycode]" id="adr_two_region" tabindex="38" maxlength="64" class="et2_fullWidth city_state_postcode"/>
+					<description/>
+				</row>
+				<row disabled="!@addr_format=city_state_postcode">
+					<description for="tel_fax_home" value="fax"/>
+					<url-phone id="tel_fax_home" class="et2_fullWidth" autocomplete="fax tel" />
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax_home,&amp;hearts;"/>
+					<description value="City"/>
+					<hbox>
+						<textbox statustext="City" id="adr_two_locality" size="30" maxlength="64" autocomplete="section-two address-level2" />
+						<taglist-state maxSelection="1" multiple="toggle" editModeEnabled="false" country_code="$cont[adr_one_countrycode]" statustext="State" id="adr_two_region" width="130"  autocomplete="section-two address-level1"/>
+						<textbox statustext="ZIP Code" id="adr_two_postalcode" size="5" maxlength="64" autocomplete="section-two postal-code" />
+					</hbox>
+					<description/>
+				</row>
+				<row disabled="!@addr_format=city_state_postcode">
+					<description for="tel_pager" value="pager"/>
+					<url-phone id="tel_pager" class="et2_fullWidth"/>
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_pager,&amp;hearts;"/>
+					<description for="adr_two_countryname" value="country"/>
+					<vbox width="100%">
+						<menulist>
+							<menupopup type="select-country" class="countrySelect et2_fullWidth" tags="true" width="100%" id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="section-two country" />
+						</menulist>
+						<textbox id="adr_two_countryname" class="custom_country et2_fullWidth" autocomplete="section-two country-name" />
+					</vbox>
+					<description/>
+				</row>
+				<row disabled="!@addr_format=city_state_postcode">
+					<description for="bday" value="Birthday"/>
+					<date id="bday" options="Y-m-d" class="et2_fullWidth"/>
+					<description/>
+					<description/>
+					<description/>
+					<description/>
+				</row>
+				<row>
+					<description for="email_home" value="EMail"/>
+					<url-email id="email_home" tabindex="32" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" autocomplete="section-two home email" />
+					<description/>
+					<description for="url_home" value="URL"/>
+					<url id="url_home" tabindex="39" class="et2_fullWidth" autocomplete="section-two url" />
+					<description/>
+				</row>
+			</rows>
 		</grid>
 	</template>
 	<template id="addressbook.edit.links" template="" lang="" group="0" version="1.9.001">
@@ -300,155 +307,164 @@
 			</columns>
 			<rows>
 				<row>
-					<et2-link-to  id="link_to"></et2-link-to>
+					<link-to id="link_to"/>
 				</row>
 				<row class="th">
-					<et2-description  value="Existing links"></et2-description>
+					<description value="Existing links"/>
 				</row>
 				<row>
-					<et2-link-list  id="link_to"></et2-link-list>
-				</row>
-			</rows>
-        </grid>
-    </template>
-    <template id="addressbook.edit.distribution_list" template="" lang="" group="0" version="1.9.001">
-        <et2-box  width="100%" overflow="auto">
-            <et2-description  id="distrib_lists" span="all"></et2-description>
-        </et2-box>
-    </template>
-    <template id="addressbook.edit.custom" template="" lang="" group="0" version="1.9.001">
-        <et2-box  width="100%" overflow="auto">
-            <customfields private="$cont[no_private_cfs]"  type_filter="$cont[tid]"/>
-        </et2-box>
-    </template>
-    <template id="addressbook.edit.custom_private" template="" lang="" group="0" version="1.9.001">
-        <et2-box  width="100%" overflow="auto">
-            <customfields id="private_cfs" private="1"  type_filter="$cont[tid]"/>
-        </et2-box>
-    </template>
-    <template id="addressbook.edit.history" template="" lang="" group="0" version="1.9.001">
-        <historylog id="history" width="100%"/>
-    </template>
-    <template id="addressbook.edit" template="" lang="" group="0" version="1.9.004" class="addressbook_edit">
-        <template id="addressbook.editname"/>
-        <grid class="addressbook_edit" border="1" width="100%">
-            <columns>
-                <column width="100"/>
-                <column width="250"/>
-                <column width="50"/>
-                <column width="100"/>
-                <column width="250"/>
-                <column width="50"/>
-            </columns>
-            <rows>
-                <row class="dialogHeader">
-                    <et2-box  align="center">
-                        <et2-hbox  disabled="@hidebuttons">
-                            <et2-avatar  id="jpegphoto" contactId="$cont[id]" src="$cont[photo]" crop="false" editable="true"></et2-avatar>
-                        </et2-hbox>
-                    </et2-box>
-                    <et2-textbox  id="n_fn" tabindex="-1" class="cursorHand" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" autocomplete="name" placeholder="Name" noLang="1"></et2-textbox>
-                    <et2-description></et2-description>
-                    <et2-description  for="org_name" value="Organisation"></et2-description>
-                    <et2-textbox  id="org_name" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="128" tabindex="7" autocomplete="organization"></et2-textbox>
-                    <et2-appicon></et2-appicon>
-                </row>
-                <row class="dialogHeader2">
-                    <et2-description  for="tel_work" value="Business phone"></et2-description>
-                    <et2-url-phone  id="tel_work" tabindex="17" class="telNumbers" autocomplete="work tel"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_work" ro_true="&amp;hearts;" />
-                    <et2-description  for="org_unit" value="department"></et2-description>
-                    <et2-textbox  id="org_unit" onchange="app.addressbook.check_value(widget,'$cont[id]');" tabindex="8" maxlength="64"></et2-textbox>
-                    <et2-description></et2-description>
-                </row>
-                <row class="dialogHeader3">
-                    <et2-description  for="tel_cell" value="mobile phone"></et2-description>
-                    <et2-url-phone  id="tel_cell" tabindex="18" class="telNumbers" autocomplete="mobile tel"></et2-url-phone>
-                    <radio statustext="select phone number as prefered way of contact" id="tel_prefer"
-                           set_value="tel_cell" ro_true="&amp;hearts;" />
-                    <et2-description  for="title" value="Title"></et2-description>
-                    <et2-textbox  id="title" maxlength="64" tabindex="9" autocomplete="organization-title"></et2-textbox>
-                    <et2-description></et2-description>
-                </row>
-                <row class="dialogHeader4">
-                    <et2-description  for="email" value="email"></et2-description>
-                    <et2-url-email  id="email" onchange="app.addressbook.check_value(widget,'$cont[id]');" tabindex="19" autocomplete="work email"></et2-url-email>
-                    <et2-description></et2-description>
-                    <et2-description  for="url" value="url"></et2-description>
-                    <et2-url  id="url" tabindex="10" autocomplete="url"></et2-url>
-                    <et2-description></et2-description>
-                </row>
-                <row>
-                    <et2-tabbox  id="tabs" span="all" width="100%" tabHeight="320">
-                        <tabs>
-                            <tab id="general" label="Organisation"/>
-                            <tab id="home" label="Private" statustext="Home address, Birthday, ..."/>
-                            <tab id="details" label="Details" statustext="Categories, Notes, ..."/>
-                            <tab id="links" label="Links" statustext="Links"/>
-                            <tab id="distribution_list" label="Distribution lists"
-                                 statustext="Distribution lists, ..."/>
-                            <tab id="custom" label="Extra" statustext="Custom fields"/>
-                            <tab id="custom_private" label="Extra private" statustext="Private custom fields"/>
-                            <tab id="history" label="History"/>
-                        </tabs>
-                        <tabpanels>
-                            <template id="addressbook.edit.general"/>
-                            <template id="addressbook.edit.home"/>
-                            <template id="addressbook.edit.details"/>
-                            <template id="addressbook.edit.links"/>
-                            <template id="addressbook.edit.distribution_list"/>
-                            <template id="addressbook.edit.custom"/>
-                            <template id="addressbook.edit.custom_private"/>
-                            <template id="addressbook.edit.history"/>
-                        </tabpanels>
-                    </et2-tabbox>
-                </row>
-                <row class="dialogOperators">
-                    <et2-description  value="Addressbook"></et2-description>
-                    <et2-select  class="owner" statustext="Addressbook the contact should be saved to" id="owner" onchange="widget.getInstanceManager().submit(null,false,true); return false;" noLang="1"></et2-select>
-                    <et2-description></et2-description>
-                    <et2-description  value="own sorting"></et2-description>
-                    <et2-select  id="fileas_type" class="fileas" placeholder="Name" noLang="1"></et2-select>
-                    <et2-description></et2-description>
-                </row>
-                <row class="dialogOperators">
-					<et2-description  value="Created"></et2-description>
-					<et2-hbox  width="100%">
-						<et2-select-account  id="creator" readonly="true"></et2-select-account>
-						<et2-date-time  id="created" readonly="true" align="right"></et2-date-time>
-					</et2-hbox>
-					<et2-description></et2-description>
-					<et2-description  value="Last modified"></et2-description>
-					<et2-hbox  width="100%">
-						<et2-select-account  id="modifier" readonly="true"></et2-select-account>
-						<et2-date-time  id="modified" readonly="true" align="right"></et2-date-time>
-					</et2-hbox>
-					<et2-description></et2-description>
-				</row>
-				<row disabled="@hidebuttons" class="dialogFooterToolbar">
-					<et2-hbox  span="all" width="100%">
-						<et2-button  accesskey="s" label="Save" id="button[save]" class="button_save" image="save"></et2-button>
-						<et2-button  label="Apply" id="button[apply]" class="button_apply" image="apply"></et2-button>
-						<et2-button  label="Cancel" id="button[cancel]" class="button_cancel" onclick="if($cont[view] || false) return true; window.close(); return false;" image="cancel"></et2-button>
-						<et2-checkbox  statustext="Apply changes to all members, whose fields have the same previous content" label="change all organisation members" id="change_org" span="all" disabled="@hide_change_org"></et2-checkbox>
-						<et2-button  align="right" label="Delete" id="button[delete]" class="button_delete" onclick="et2_dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" image="delete"></et2-button>
-					</et2-hbox>
-
-				</row>
-				<row disabled="!@showsearchbuttons" class="dialogOperators">
-					<et2-hbox  span="all">
-						<et2-select  label="Operator" id="operator" noLang="1"></et2-select>
-						<et2-select  id="meth_select" noLang="1"></et2-select>
-					</et2-hbox>
-				</row>
-				<row disabled="!@showsearchbuttons" class="dialogFooterToolbar">
-					<et2-hbox  span="all">
-						<et2-button  label="Search" id="button[search]" image="search"></et2-button>
-						<et2-button  label="Cancel" id="button[cancelsearch]" image="cancel"></et2-button>
-					</et2-hbox>
+					<link-list id="link_to"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+	<template id="addressbook.edit.distribution_list" template="" lang="" group="0" version="1.9.001">
+		<box width="100%" overflow="auto">
+			<description id="distrib_lists" span="all"/>
+		</box>
+	</template>
+	<template id="addressbook.edit.custom" template="" lang="" group="0" version="1.9.001">
+		<box width="100%" overflow="auto">
+			<customfields options=",$cont[no_private_cfs]" type_filter="$cont[tid]"/>
+		</box>
+	</template>
+	<template id="addressbook.edit.custom_private" template="" lang="" group="0" version="1.9.001">
+		<box width="100%" overflow="auto">
+			<customfields id="private_cfs" options=",1" type_filter="$cont[tid]"/>
+		</box>
+	</template>
+	<template id="addressbook.edit.history" template="" lang="" group="0" version="1.9.001">
+		<historylog id="history" width="100%"/>
+	</template>
+	<template id="addressbook.edit" template="" lang="" group="0" version="1.9.004" class="addressbook_edit">
+		<template id="addressbook.editname"/>
+		<grid class="addressbook_edit" border="1" width="100%">
+			<columns>
+				<column width="100"/>
+				<column width="250"/>
+				<column width="50"/>
+				<column width="100"/>
+				<column width="250"/>
+				<column width="50"/>
+			</columns>
+			<rows>
+				<row class="dialogHeader">
+					<box align="center">
+						<hbox disabled="@hidebuttons" class="avatar">
+							<avatar id="jpegphoto" contact_id="$cont[id]" src="$cont[photo]" crop="false" editable="true"/>
+						</hbox>
+					</box>
+					<textbox id="n_fn" blur="Name" no_lang="1" tabindex="-1" class="cursorHand et2_fullWidth" onclick="jQuery('table.editname').css('display','inline'); var focElem = document.getElementById(form::name('n_prefix')); if (!(typeof(focElem) == 'undefined') &amp;&amp; typeof(focElem.focus)=='function') document.getElementById(form::name('n_prefix')).focus();" autocomplete="name"/>
+					<description/>
+					<description for="org_name" value="Organisation"/>
+					<textbox id="org_name" onchange="app.addressbook.check_value(widget,'$cont[id]');" maxlength="128" tabindex="7" class="et2_fullWidth" autocomplete="organization" />
+					<appicon/>
+				</row>
+				<row class="dialogHeader2">
+					<description for="tel_work" value="Business phone"/>
+					<url-phone id="tel_work" tabindex="17" class="telNumbers et2_fullWidth" autocomplete="work tel"/>
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_work,&amp;hearts;"/>
+					<description for="org_unit" value="department"/>
+					<textbox id="org_unit" onchange="app.addressbook.check_value(widget,'$cont[id]');" tabindex="8" class="et2_fullWidth" maxlength="64"/>
+					<description/>
+				</row>
+				<row class="dialogHeader3">
+					<description for="tel_cell" value="mobile phone"/>
+					<url-phone id="tel_cell" tabindex="18" class="telNumbers et2_fullWidth" autocomplete="mobile tel" />
+					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell,&amp;hearts;"/>
+					<description for="title" value="Title"/>
+					<textbox id="title" size="36" maxlength="64" tabindex="9" class="et2_fullWidth" autocomplete="organization-title" />
+					<description/>
+				</row>
+				<row class="dialogHeader4">
+					<description for="email" value="email"/>
+					<url-email id="email" onchange="app.addressbook.check_value(widget,'$cont[id]');" tabindex="19" class="et2_fullWidth" autocomplete="work email"/>
+					<description/>
+					<description for="url" value="url"/>
+					<url id="url" tabindex="10" class="et2_fullWidth" autocomplete="url" />
+					<description/>
+				</row>
+				<row>
+					<tabbox id="tabs" span="all" width="100%" tab_height="250">
+						<tabs>
+							<tab id="general" label="Organisation"/>
+							<tab id="home" label="Private" statustext="Home address, Birthday, ..."/>
+							<tab id="details" label="Details" statustext="Categories, Notes, ..."/>
+							<tab id="links" label="Links" statustext="Links"/>
+							<tab id="distribution_list" label="Distribution lists" statustext="Distribution lists, ..."/>
+							<tab id="custom" label="Extra" statustext="Custom fields"/>
+							<tab id="custom_private" label="Extra private" statustext="Private custom fields"/>
+							<tab id="history" label="History"/>
+						</tabs>
+						<tabpanels>
+							<template id="addressbook.edit.general"/>
+							<template id="addressbook.edit.home"/>
+							<template id="addressbook.edit.details"/>
+							<template id="addressbook.edit.links"/>
+							<template id="addressbook.edit.distribution_list"/>
+							<template id="addressbook.edit.custom"/>
+							<template id="addressbook.edit.custom_private"/>
+							<template id="addressbook.edit.history"/>
+						</tabpanels>
+					</tabbox>
+				</row>
+				<row class="dialogOperators">
+					<description value="Addressbook"/>
+					<menulist class="et2_fullWidth">
+						<menupopup class="owner" statustext="Addressbook the contact should be saved to" id="owner" no_lang="1" onchange="widget.getInstanceManager().submit(null,false,true); return false;" />
+					</menulist>
+					<description/>
+					<description value="own sorting"/>
+					<menulist>
+						<menupopup blur="Name" id="fileas_type" no_lang="1" class="fileas et2_fullWidth"/>
+					</menulist>
+					<description/>
+				</row>
+				<row class="dialogOperators">
+					<description value="Created"/>
+					<hbox width="100%">
+						<menulist>
+							<menupopup type="select-account" id="creator" readonly="true"/>
+						</menulist>
+						<date-time id="created" readonly="true" align="right"/>
+					</hbox>
+					<description/>
+					<description value="Last modified"/>
+					<hbox width="100%">
+						<menulist>
+							<menupopup type="select-account" id="modifier" readonly="true"/>
+						</menulist>
+						<date-time id="modified" readonly="true" align="right"/>
+					</hbox>
+					<description/>
+				</row>
+				<row disabled="@hidebuttons" class="dialogFooterToolbar">
+					<hbox span="all" width="100%">
+						<button accesskey="s" label="Save" id="button[save]" class="button_save" image="save" background_image="1"/>
+						<button label="Apply" id="button[apply]" class="button_apply" image="apply" background_image="1"/>
+						<button label="Cancel" id="button[cancel]" class="button_cancel" onclick="if($cont[view] || false) return true; window.close(); return false;" image="cancel" background_image="1"/>
+						<checkbox statustext="Apply changes to all members, whose fields have the same previous content" label="change all organisation members" id="change_org" span="all" disabled="@hide_change_org"/>
+						<button align="right" label="Delete" id="button[delete]" class="button_delete" onclick="et2_dialog.confirm(widget,'Do you really want to delete this contact?','Delete')" image="delete" background_image="1"/>
+					</hbox>
+
+				</row>
+				<row disabled="!@showsearchbuttons" class="dialogOperators">
+					<hbox span="all">
+						<menulist>
+							<menupopup label="Operator" id="operator" no_lang="1"/>
+						</menulist>
+						<menulist>
+							<menupopup id="meth_select" no_lang="1"/>
+						</menulist>
+					</hbox>
+				</row>
+				<row disabled="!@showsearchbuttons" class="dialogFooterToolbar">
+					<hbox span="all">
+						<button label="Search" id="button[search]" image="search" background_image="1"/>
+						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
+					</hbox>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>

addressbook/templates/default/export_explode_fields.xet

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.export_explode_fields" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -8,7 +9,7 @@
 			</columns>
 			<rows>
 				<row>
-					<et2-description  value="List as seperate columns"></et2-description>
+					<description value="List as seperate columns"/>
 				</row>
 				<row disabled="!@explode_multiselects">
 					<grid width="100%" id="explode_multiselects">
@@ -18,20 +19,22 @@
 						</columns>
 						<rows>
 							<row class="th">
-								<et2-description  value="Field"></et2-description>
-								<et2-description  value="Style"></et2-description>
+								<description value="Field"/>
+								<description value="Style"/>
 							</row>
 							<row>
-								<et2-description  id="${row}[name]"></et2-description>
-								<et2-select  id="${row}[explode]"></et2-select>
+								<description id="${row}[name]"/>
+								<menulist>
+									<menupopup id="${row}[explode]"/>
+								</menulist>
 							</row>
 						</rows>
 					</grid>
 				</row>
 				<row disabled="@explode_multiselects">
-					<et2-description  value="No multi-select columns selected for export"></et2-description>
+					<description value="No multi-select columns selected for export"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>

addressbook/templates/default/export_vcard_selectors.xet

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.export_vcard_selectors" template="" lang="" group="0" version="1.9.001">
 		<grid>
@@ -8,12 +9,12 @@
 			</columns>
 			<rows>
 				<row>
-					<radio label="Use all" id="selection" set_value="all" />
+					<radio label="Use all" id="selection" options="all"/>
 				</row>
 				<row>
-					<radio label="Use search results" id="selection" set_value="search" />
+					<radio label="Use search results" id="selection" options="search"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>

addressbook/templates/default/home.link.xet

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
 <overlay>
 	<template id="addressbook.home.link" template="" lang="" group="0" version="1.9.001">
-		<et2-hbox  height="100px">
-			<et2-image  src="image" class="photo"></et2-image>
-			<et2-vbox>
-				<et2-description  id="n_fn" class="addressbook_sidebox_name"></et2-description>
-				<et2-description  id="org_name" class="addressbook_sidebox_org"></et2-description>
-				<et2-description  id="org_unit"></et2-description>
-				<et2-description  id="adr_one_locality"></et2-description>
-			</et2-vbox>
-		</et2-hbox>
+		<hbox height="100px">
+			<image src="image" class="photo"/>
+			<vbox>
+				<description id="n_fn" class="addressbook_sidebox_name"/>
+				<description id="org_name" class="addressbook_sidebox_org"/>
+				<description id="org_unit"/>
+				<description id="adr_one_locality"/>
+			</vbox>
+		</hbox>
 		<grid class="tooltip">
 			<columns>
 				<column width="70"/>
@@ -18,36 +19,36 @@
 			</columns>
 			<rows>
 				<row>
-					<et2-description  span="2" value="Phone numbers" class="addressbook_sidebox_header"></et2-description>
+					<description span="2" value="Phone numbers" class="addressbook_sidebox_header"/>
 				</row>
 				<row>
-					<et2-description  for="tel_work" value="Business"></et2-description>
-					<et2-url-phone  id="tel_work" readonly="true"></et2-url-phone>
+					<description for="tel_work" value="Business"/>
+					<url-phone id="tel_work" readonly="true"/>
 				</row>
 				<row>
-					<et2-description  for="tel_cell" value="Mobile phone"></et2-description>
-					<et2-url-phone  id="tel_cell" readonly="true"></et2-url-phone>
+					<description for="tel_cell" value="Mobile phone"/>
+					<url-phone id="tel_cell" readonly="true"/>
 				</row>
 				<row>
-					<et2-description  for="tel_home" value="Private"></et2-description>
-					<et2-url-phone  id="tel_home" readonly="true"></et2-url-phone>
+					<description for="tel_home" value="Private"/>
+					<url-phone id="tel_home" readonly="true"/>
 				</row>
 				<row>
-					<et2-description  for="tel_fax" value="Fax"></et2-description>
-					<et2-url-phone  id="tel_fax" readonly="true"></et2-url-phone>
+					<description for="tel_fax" value="Fax"/>
+					<url-phone id="tel_fax" readonly="true"/>
 				</row>
 				<row>
-					<et2-description  span="2" value="EMail &amp; Internet" class="addressbook_sidebox_header"></et2-description>
+					<description span="2" value="EMail &amp; Internet" class="addressbook_sidebox_header"/>
 				</row>
 				<row>
-					<et2-description  for="email" value="EMail"></et2-description>
-					<et2-url-email  id="email" readonly="true"></et2-url-email>
+					<description for="email" value="EMail"/>
+					<url-email id="email" readonly="true"/>
 				</row>
 				<row>
-					<et2-description  for="url" value="URL"></et2-description>
-					<et2-url  id="url" readonly="true"></et2-url>
+					<description for="url" value="URL"/>
+					<url id="url" readonly="true"/>
 				</row>
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>

addressbook/templates/default/images/accounts.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="m14 18h4v3h-4zm2 4h1l2 7-3 3-3-3 2-7zm8-14a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8zm-4.4863 9.166c1.7e-4 1.2169 0.20298 5.982-1.0059 5.998 0.47857 1.5808 1.2001 3.7568 1.7578 4.7051 4.7904-0.2735 8.7344-0.88476 8.7344-0.88476l-3.25-8.1035s-2.7953-1.1474-6.2363-1.7148zm-7.0273 0.0234c-3.3306 0.57539-6.2363 1.6914-6.2363 1.6914l-3.25 8.1035s3.9208 0.6139 8.7344 0.88671c0.55783-0.94744 1.279-3.1254 1.7578-4.707-1.203-0.016-1.0079-4.7296-1.0059-5.9746z" fill="#62686a"/>
-</svg>

addressbook/templates/default/images/group.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="M16 0a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0-5-5zM7.895 2.053a4.21 4.21 0 1 0 0 8.421 4.211 4.211 0 0 0 2.71-1.03A6.96 6.96 0 0 1 9 5c0-.925.184-1.81.516-2.621a4.21 4.21 0 0 0-1.622-.326zm16.105 0a4.211 4.211 0 0 0-1.518.32c.333.813.517 1.7.517 2.627a6.96 6.96 0 0 1-1.648 4.492 4.21 4.21 0 0 0 2.648.983 4.21 4.21 0 1 0 0-8.422zM16 12c-2.498 0-5.528.15-7 1l1 8 3 1.951V31c.733.678 1.984 1 3 1s2.267-.322 3-1v-8.049L22 21l1-8c-1.473-.85-4.503-1-7-1zm-9.118.178C5.023 12.22 3.048 12.395 2 13l.841 6.736L5.37 21.38v6.78c.617.57 1.67.841 2.525.841s1.91-.27 2.527-.842V23.66l-2.29-1.49zm18.234.002-1.248 9.99-2.394 1.557v4.431c.617.571 1.67.842 2.525.842s1.908-.271 2.526-.842v-6.78l2.527-1.642.842-6.736c-1.028-.594-2.95-.774-4.778-.82z" fill="#62686a"/>
-</svg>

addressbook/templates/default/images/navbar.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="M9.217 8.5c-1.392.06-2.473.917-2.582 1.16-.769.836-.93.727-1.162 2.156A6.39 6.39 0 0 0 5.4 13.1l-.62.668.63 2.085.574-.004c.465.908 1.852 2.037 3.516 2.15 1.664-.113 3.05-1.242 3.516-2.15l.574.004.63-2.085-.62-.668a6.42 6.42 0 0 0-.073-1.284c-.232-1.43-.393-1.32-1.162-2.156-.116-.259-1.339-1.216-2.865-1.16a3.343 3.343 0 0 0-.283 0zM6.457 19C4.273 19.853 4 22.001 4 24h11c0-1.999-.273-4.147-2.457-5 0 .067-1.387 1.275-3.043 1.275S6.457 19.067 6.457 19zM2 3C.892 3 0 3.892 0 5v22c0 1.108.892 2 2 2h28c1.108 0 2-.892 2-2V5c0-1.108-.892-2-2-2zm2 3h11c1.108 0 2 .892 2 2v16c0 1.108-.892 2-2 2H4c-1.108 0-2-.892-2-2V8c0-1.108.892-2 2-2zm17.5 1h7c.831 0 1.5.669 1.5 1.5s-.669 1.5-1.5 1.5h-7c-.831 0-1.5-.669-1.5-1.5S20.669 7 21.5 7zm0 7h7c.831 0 1.5.669 1.5 1.5s-.669 1.5-1.5 1.5h-7c-.831 0-1.5-.669-1.5-1.5s.669-1.5 1.5-1.5zm0 7h7c.831 0 1.5.669 1.5 1.5s-.669 1.5-1.5 1.5h-7c-.831 0-1.5-.669-1.5-1.5s.669-1.5 1.5-1.5z" fill="#036"/>
-</svg>

addressbook/templates/default/images/personal.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="m16 12c-2.4973 0-5.5277 0.14994-7 1l1 8 3 1.9512v8.0488c0.73303 0.67797 1.9842 1 3 1s2.267-0.32203 3-1v-8.0488l3-1.9512 1-8c-1.4723-0.85006-4.5027-1-7-1zm5-7a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#62686a"/>
-</svg>