diff --git a/ajax/addcard.php b/ajax/addcard.php
index e9f82f1b..6005d74d 100644
--- a/ajax/addcard.php
+++ b/ajax/addcard.php
@@ -28,13 +28,13 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $aid );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your addressbook!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your addressbook.')))); // Same here (as with the contact error). Could this error be improved?
 	exit();
 }
 
diff --git a/ajax/addproperty.php b/ajax/addproperty.php
index 7df67e3d..a311bba6 100644
--- a/ajax/addproperty.php
+++ b/ajax/addproperty.php
@@ -28,26 +28,26 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Contact could not be found.'))));
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact.'))));
 	exit();
 }
 
 $vcard = OC_Contacts_VCard::parse($card['carddata']);
 // Check if the card is valid
 if(is_null($vcard)){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Unable to parse vCard!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('vCard could not be read.'))));
 	exit();
 }
 
diff --git a/ajax/deletebook.php b/ajax/deletebook.php
index 9e623120..38322f5c 100644
--- a/ajax/deletebook.php
+++ b/ajax/deletebook.php
@@ -29,13 +29,13 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $id );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact.'))));
 	exit();
 }
 
diff --git a/ajax/deletecard.php b/ajax/deletecard.php
index b31c643f..7dde7d30 100644
--- a/ajax/deletecard.php
+++ b/ajax/deletecard.php
@@ -29,20 +29,20 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Contact could not be found.'))));
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact.'))));
 	exit();
 }
 
diff --git a/ajax/deleteproperty.php b/ajax/deleteproperty.php
index df2ae2e1..07cea0b5 100644
--- a/ajax/deleteproperty.php
+++ b/ajax/deleteproperty.php
@@ -31,27 +31,27 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Contact could not be found.'))));
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact.'))));
 	exit();
 }
 
 $vcard = OC_Contacts_VCard::parse($card['carddata']);
 // Check if the card is valid
 if(is_null($vcard)){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Unable to parse vCard!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('vCard could not be read.'))));
 	exit();
 }
 
@@ -62,7 +62,7 @@ for($i=0;$i<count($vcard->children);$i++){
 	}
 }
 if(is_null($line)){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload page!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload the page.'))));
 	exit();
 }
 
diff --git a/ajax/getdetails.php b/ajax/getdetails.php
index 19addd91..ab1f1d66 100644
--- a/ajax/getdetails.php
+++ b/ajax/getdetails.php
@@ -29,27 +29,27 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Contact could not be found.'))));
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact.'))));
 	exit();
 }
 
 $vcard = OC_Contacts_VCard::parse($card['carddata']);
 // Check if the card is valid
 if(is_null($vcard)){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Unable to parse vCard!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('vCard could not be read.'))));
 	exit();
 }
 
diff --git a/ajax/setproperty.php b/ajax/setproperty.php
index 9a4e8eea..9178a6aa 100644
--- a/ajax/setproperty.php
+++ b/ajax/setproperty.php
@@ -29,26 +29,26 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Contact could not be found.'))));
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact.'))));
 	exit();
 }
 
 $vcard = OC_Contacts_VCard::parse($card['carddata']);
 // Check if the card is valid
 if(is_null($vcard)){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Unable to parse vCard!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('vCard could not be read.'))));
 	exit();
 }
 
@@ -59,7 +59,7 @@ for($i=0;$i<count($vcard->children);$i++){
 	}
 }
 if(is_null($line)){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload page!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload the page.'))));
 	exit();
 }
 
diff --git a/ajax/showaddcard.php b/ajax/showaddcard.php
index dea8073a..89c78fcd 100644
--- a/ajax/showaddcard.php
+++ b/ajax/showaddcard.php
@@ -27,7 +27,7 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
diff --git a/ajax/showaddproperty.php b/ajax/showaddproperty.php
index 75dbe01c..718478d4 100644
--- a/ajax/showaddproperty.php
+++ b/ajax/showaddproperty.php
@@ -28,19 +28,19 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Contact could not be found.'))));
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact.'))));
 	exit();
 }
 
diff --git a/ajax/showsetproperty.php b/ajax/showsetproperty.php
index 51187d50..77b90ea8 100644
--- a/ajax/showsetproperty.php
+++ b/ajax/showsetproperty.php
@@ -29,26 +29,26 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in.'))));
 	exit();
 }
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Contact could not be found.'))));
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact.'))));
 	exit();
 }
 
 $vcard = OC_Contacts_VCard::parse($card['carddata']);
 // Check if the card is valid
 if(is_null($vcard)){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Unable to parse vCard!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('vCard could not be read.'))));
 	exit();
 }
 
@@ -59,7 +59,7 @@ for($i=0;$i<count($vcard->children);$i++){
 	}
 }
 if(is_null($line)){
-	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload page!'))));
+	echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload the page.'))));
 	exit();
 }
 
diff --git a/l10n/de.php b/l10n/de.php
new file mode 100644
index 00000000..04a74024
--- /dev/null
+++ b/l10n/de.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Mobile" => "Mobil",
+"Text" => "Text",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Pager",
+"Birthday" => "Geburtstag",
+"Edit" => "Bearbeiten"
+);
diff --git a/l10n/it.php b/l10n/it.php
new file mode 100644
index 00000000..7a57d6fc
--- /dev/null
+++ b/l10n/it.php
@@ -0,0 +1,38 @@
+<?php $TRANSLATIONS = array(
+"You need to log in." => "Bisogna effettuare il login.",
+"This is not your addressbook." => "Questa non è la tua rubrica.",
+"Contact could not be found." => "Il contatto non può essere trovato",
+"This is not your contact." => "Questo non è un tuo contatto.",
+"vCard could not be read." => "La vCard non può essere letta",
+"Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard incorrette. Ricaricare la pagina.",
+"This card is not RFC compatible." => "Questa card non è compatibile con il protocollo RFC.",
+"This card does not contain a photo." => "Questa card non contiene una foto.",
+"Add Contact" => "Aggiungi contatto",
+"Group" => "Gruppo",
+"Name" => "Nome",
+"Create Contact" => "Crea contatto",
+"Address" => "Indirizzo",
+"Telephone" => "Telefono",
+"Email" => "Email",
+"Organization" => "Organizzazione",
+"Work" => "Lavoro",
+"Home" => "Casa",
+"PO Box" => "PO Box",
+"Extended" => "Estendi",
+"Street" => "Via",
+"City" => "Città",
+"Region" => "Regione",
+"Zipcode" => "CAP",
+"Country" => "Stato",
+"Mobile" => "Cellulare",
+"Text" => "Testo",
+"Voice" => "Voce",
+"Fax" => "Fax",
+"Video" => "Video",
+"Pager" => "Pager",
+"Delete" => "Cancella",
+"Add Property" => "Aggiungi proprietà",
+"Birthday" => "Compleanno",
+"Phone" => "Telefono",
+"Edit" => "Modifica"
+);
diff --git a/photo.php b/photo.php
index 1b955a8a..7ba2002b 100644
--- a/photo.php
+++ b/photo.php
@@ -29,20 +29,20 @@ $l10n = new OC_L10N('contacts');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	echo $l10n->t('You need to log in!');
+	echo $l10n->t('You need to log in.');
 	exit();
 }
 
 
 $card = OC_Contacts_VCard::find( $id );
 if( $card === false ){
-	echo $l10n->t('Can not find Contact!');
+	echo $l10n->t('Contact could not be found.');
 	exit();
 }
 
 $addressbook = OC_Contacts_Addressbook::find( $card['addressbookid'] );
 if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
-	echo $l10n->t('This is not your contact!');
+	echo $l10n->t('This is not your contact.'); // This is a weird error, why would it come up? (Better feedback for users?)
 	exit();
 }
 
@@ -50,7 +50,7 @@ $content = OC_Contacts_VCard::parse($card['carddata']);
 
 // invalid vcard
 if( is_null($content)){
-	echo $l10n->t('This card is not RFC compatible!');
+	echo $l10n->t('This card is not RFC compatible.');
 	exit();
 }
 // Photo :-)
@@ -87,4 +87,4 @@ foreach($content->children as $child){
 }
 
 // Not found :-(
-echo $l10n->t('This card does not contain photo data!');
+echo $l10n->t('This card does not contain a photo.');
diff --git a/templates/part.addpropertyform.php b/templates/part.addpropertyform.php
index 32affde9..ad623b0d 100644
--- a/templates/part.addpropertyform.php
+++ b/templates/part.addpropertyform.php
@@ -18,23 +18,23 @@
 			<option value="adr_home" selected="selected"><?php echo $l->t('Home'); ?></option>
 		</select>
 		<?php echo $l->t('PO Box'); ?> <input type="text" name="value[0]" value="">
-		<?php echo $l->t('Extended Address'); ?> <input type="text" name="value[1]" value="">
-		<?php echo $l->t('Street Name'); ?> <input type="text" name="value[2]" value="">
+		<?php echo $l->t('Extended'); ?> <input type="text" name="value[1]" value="">
+		<?php echo $l->t('Street'); ?> <input type="text" name="value[2]" value="">
 		<?php echo $l->t('City'); ?> <input type="text" name="value[3]" value="">
 		<?php echo $l->t('Region'); ?> <input type="text" name="value[4]" value="">
-		<?php echo $l->t('Postal Code'); ?> <input type="text" name="value[5]" value="">
+		<?php echo $l->t('Zipcode'); ?> <input type="text" name="value[5]" value="">
 		<?php echo $l->t('Country'); ?> <input type="text" name="value[6]" value="">
 	</div>
 	<div id="contacts_phonepart">
 		<select name="parameters[TYPE]" size="1">
-			<option value="home"><?php echo $l->t('tel_home'); ?></option>
-			<option value="cell" selected="selected"><?php echo $l->t('tel_cell'); ?></option>
-			<option value="work"><?php echo $l->t('tel_work'); ?></option>
-			<option value="text"><?php echo $l->t('tel_text'); ?></option>
-			<option value="voice"><?php echo $l->t('tel_voice'); ?></option>
-			<option value="fax"><?php echo $l->t('tel_fax'); ?></option>
-			<option value="video"><?php echo $l->t('tel_video'); ?></option>
-			<option value="pager"><?php echo $l->t('tel_pager'); ?></option>
+			<option value="home"><?php echo $l->t('Home'); ?></option>
+			<option value="cell" selected="selected"><?php echo $l->t('Mobile'); ?></option>
+			<option value="work"><?php echo $l->t('Work'); ?></option>
+			<option value="text"><?php echo $l->t('Text'); ?></option>
+			<option value="voice"><?php echo $l->t('Voice'); ?></option>
+			<option value="fax"><?php echo $l->t('Fax'); ?></option>
+			<option value="video"><?php echo $l->t('Video'); ?></option>
+			<option value="pager"><?php echo $l->t('Pager'); ?></option>
 		</select>
 		<input type="text" name="value" value="">
 	</div>
diff --git a/templates/part.property.php b/templates/part.property.php
index d0d2b773..3469f53b 100644
--- a/templates/part.property.php
+++ b/templates/part.property.php
@@ -12,7 +12,7 @@
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</td>
 	<?php elseif($_['property']['name'] == 'ORG'): ?>
-		<td class="contacts_details_left"><?php echo $l->t('Organisation'); ?></td>
+		<td class="contacts_details_left"><?php echo $l->t('Organization'); ?></td>
 		<td class="contacts_details_right">
 			<?php echo $_['property']['value']; ?>
 			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
@@ -26,11 +26,11 @@
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</td>
 	<?php elseif($_['property']['name'] == 'TEL'): ?>
-		<td class="contacts_details_left"><?php echo $l->t('Telephone'); ?></td>
+		<td class="contacts_details_left"><?php echo $l->t('Phone'); ?></td>
 		<td class="contacts_details_right">
 			<?php echo $_['property']['value']; ?>
 			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
-				(<?php echo $l->t('tel_'.strtolower($_['property']['parameters']['TYPE'])); ?>)
+				(<?php echo strtolower($_['property']['parameters']['TYPE']); ?>)
 			<?php endif; ?>
 			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
@@ -40,7 +40,7 @@
 			<?php echo $l->t('Address'); ?>
 			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
 				<br>
-				(<?php echo $l->t('adr_'.strtolower($_['property']['parameters']['TYPE'])); ?>)
+				(<?php echo strtolower($_['property']['parameters']['TYPE']); ?>)
 			<?php endif; ?>
 		</td>
 		<td class="contacts_details_right">
@@ -48,10 +48,10 @@
 			<?php echo $l->t('PO Box'); ?> <?php echo $_['property']['value'][0]; ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][1])): ?>
-			<?php echo $l->t('Extended Address'); ?> <?php echo $_['property']['value'][1]; ?><br>
+			<?php echo $l->t('Extended'); ?> <?php echo $_['property']['value'][1]; ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][2])): ?>
-			<?php echo $l->t('Street Name'); ?> <?php echo $_['property']['value'][2]; ?><br>
+			<?php echo $l->t('Street'); ?> <?php echo $_['property']['value'][2]; ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][3])): ?>
 			<?php echo $l->t('City'); ?> <?php echo $_['property']['value'][3]; ?><br>
@@ -60,7 +60,7 @@
 			<?php echo $l->t('Region'); ?> <?php echo $_['property']['value'][4]; ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][5])): ?>
-			<?php echo $l->t('Postal Code'); ?> <?php echo $_['property']['value'][5]; ?><br>
+			<?php echo $l->t('Zipcode'); ?> <?php echo $_['property']['value'][5]; ?><br>
 			<?php endif; ?>
 			<?php if(!empty($_['property']['value'][6])): ?>
 			<?php echo $l->t('Country'); ?> <?php echo $_['property']['value'][6]; ?> 
diff --git a/templates/part.setpropertyform.php b/templates/part.setpropertyform.php
index 52483ebf..69c78979 100644
--- a/templates/part.setpropertyform.php
+++ b/templates/part.setpropertyform.php
@@ -3,11 +3,11 @@
 	<input type="hidden" name="id" value="<?php echo $_['id']; ?>">
 	<?php if($_['property']['name']=='ADR'): ?>
 		<label><?php echo $l->t('PO Box'); ?></label> <input type="text" name="value[0]" value="<?php echo $_['property']['value'][0]; ?>"><br>
-		<label><?php echo $l->t('Extended Address'); ?></label> <input type="text" name="value[1]" value="<?php echo $_['property']['value'][1]; ?>"><br>
-		<label><?php echo $l->t('Street Name'); ?></label> <input type="text" name="value[2]" value="<?php echo $_['property']['value'][2]; ?>"><br>
+		<label><?php echo $l->t('Extended'); ?></label> <input type="text" name="value[1]" value="<?php echo $_['property']['value'][1]; ?>"><br>
+		<label><?php echo $l->t('Street'); ?></label> <input type="text" name="value[2]" value="<?php echo $_['property']['value'][2]; ?>"><br>
 		<label><?php echo $l->t('City'); ?></label> <input type="text" name="value[3]" value="<?php echo $_['property']['value'][3]; ?>"><br>
 		<label><?php echo $l->t('Region'); ?></label> <input type="text" name="value[4]" value="<?php echo $_['property']['value'][4]; ?>"><br>
-		<label><?php echo $l->t('Postal Code'); ?></label> <input type="text" name="value[5]" value="<?php echo $_['property']['value'][5]; ?>"><br>
+		<label><?php echo $l->t('Zipcode'); ?></label> <input type="text" name="value[5]" value="<?php echo $_['property']['value'][5]; ?>"><br>
 		<label><?php echo $l->t('Country'); ?></label> <input type="text" name="value[6]" value="<?php echo $_['property']['value'][6]; ?>"><br>
 	<?php elseif($_['property']['name']=='TEL'): ?>
 		<input type="text" name="value" value="<?php echo $_['property']['value']; ?>">