From 32ba67735e20de52a2b7396fed858b9e99548eeb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 5 Apr 2013 19:06:26 +0200
Subject: [PATCH] Contacts: Better wording for merge dialog.

---
 js/app.js              | 4 ++--
 templates/contacts.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/app.js b/js/app.js
index 052cf9d9..a40ce41e 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1401,7 +1401,7 @@ OC.Contacts = OC.Contacts || {
 			height: 'auto', width: 'auto',
 			buttons: [
 				{
-					text: t('contacts', 'OK'),
+					text: t('contacts', 'Merge contacts'),
 					click:function() {
 						// Do the merging, use $(this) to get dialog
 						var contactid = $(this).find('input:radio:checked').val();
@@ -1610,7 +1610,7 @@ OC.Contacts = OC.Contacts || {
 	},
 	cloudPhotoSelected:function(metadata, path) {
 		var self = this;
-		console.log('cloudPhotoSelected, id', id);
+		console.log('cloudPhotoSelected', metadata);
 		$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),
 				  {path: path, contact: metadata},function(jsondata) {
 			if(jsondata.status == 'success') {
diff --git a/templates/contacts.php b/templates/contacts.php
index 1747e794..ced03cf5 100644
--- a/templates/contacts.php
+++ b/templates/contacts.php
@@ -144,7 +144,7 @@
 
 <script id="mergeContactsTemplate" type="text/template">
 	<div id="dialog-merge-contacts" title="<?php p($l->t('Merge contacts')); ?>">
-		<p><?php p($l->t('Select which contact to merge into')); ?></p>
+		<p><?php p($l->t('Which contact should the data be merged into?')); ?></p>
 		<fieldset>
 			<ul class="mergelist"></ul>
 		</fieldset>