13 files changed, 20 insertions, 474 deletions
diff --git a/view/de/cropbody.tpl b/view/de/cropbody.tpl
deleted file mode 100644
index 0211fe308..000000000
--- a/view/de/cropbody.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>Bild zuschneiden</h1>
-<p id="cropimage-desc">
-Zur optimalen Darstellung des Bildes kann es nun auf einen Bereich
-zugeschnitten werden. Bitte wähle diesen Bereich.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
-</div>
-
-</form>
diff --git a/view/de/head.tpl b/view/de/head.tpl
deleted file mode 100644
index 17b7706f8..000000000
--- a/view/de/head.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Delete this item?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
diff --git a/view/de/insecure_net.tpl b/view/de/insecure_net.tpl
deleted file mode 100644
index 900f28642..000000000
--- a/view/de/insecure_net.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="profile-edit-insecure">
-<p>
-Das Soziale Netzwerk dem $name angehört ist ein offenes Netzwerk das nur
-eingeschränkte oder nicht existente Privatspäreneinstellungen bietet.
-
-Bitte verhalte dich entsprechend diskret.
-</p>
-</div>
diff --git a/view/de/intros-top.tpl b/view/de/intros-top.tpl
deleted file mode 100644
index e65da1a3f..000000000
--- a/view/de/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Schwebende Freundschafts/Kontakt Benachrichtigungen</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/de/jot-header.tpl b/view/de/jot-header.tpl
deleted file mode 100644
index 62fbe84e4..000000000
--- a/view/de/jot-header.tpl
+++ /dev/null
@@ -1,166 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var editor;
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "specific_textareas",
-	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_blockformats : "blockquote,code",
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	convert_urls: false,
-	content_css: "$baseurl/view/custom_tinymce.css",
-	     //Character count
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onKeyUp.add(function(ed, e) {
-			var txt = tinyMCE.activeEditor.getContent();
-			var text = txt.length;
-			if(txt.length <= 140) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((txt.length > 140) && (txt .length <= 420)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(txt.length > 420) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text(text);
-    	});
-
-		ed.onInit.add(function(ed) {
-			ed.pasteAsPlainText = true;
-		});
-
-	}
-});
-
-</script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#profile-jot-perms img').attr('src', 'images/lock_icon.gif');
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) {
-				$('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif');
-				$('.profile-jot-net input').attr('disabled', false);
-			}
-
-		}).trigger('change');
-
-	});
-
-	function jotGetLink() {
-		reply = prompt("Bitte URL des Links angeben:");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotGetVideo() {
-		reply = prompt("Bitte den YouTube Link angeben:");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("Please enter a video(.ogg) link/URL:");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("Please enter an audio(.ogg) link/URL:");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
-		}
-	}
-
-	function jotGetLocation() {
-		reply = prompt("Wo bist du im Moment?", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-			$('#like-rotator-' + id).hide();
-			$(window).scrollTop(0);
-		});
-	}
-
-
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	$geotag
-
-</script>
-
diff --git a/view/de/msg-header.tpl b/view/de/msg-header.tpl
deleted file mode 100644
index 174e6c985..000000000
--- a/view/de/msg-header.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "specific_textareas",
-	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_blockformats : "blockquote,code",
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	convert_urls: false,
-	content_css: "$baseurl/view/custom_tinymce.css",
-	     //Character count
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onKeyUp.add(function(ed, e) {
-			var txt = tinyMCE.activeEditor.getContent();
-			var text = txt.length;
-			if(txt.length <= 140) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((txt.length > 140) && (txt .length <= 420)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(txt.length > 420) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text(text);
-    	});
-
-		ed.onInit.add(function(ed) {
-			ed.pasteAsPlainText = true;
-		});
-	}
-});
-
-</script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'prvmail-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-	});
-
-	function jotGetLink() {
-		reply = prompt("Please enter a link URL:");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
diff --git a/view/de/profile.php b/view/de/profile.php
deleted file mode 100644
index 40b6abd55..000000000
--- a/view/de/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">In Verbindung treten</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Standort:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Geschlecht: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
diff --git a/view/de/profile_edit.tpl b/view/de/profile_edit.tpl
index 840597ddc..0b0619420 100644
--- a/view/de/profile_edit.tpl
+++ b/view/de/profile_edit.tpl
@@ -136,13 +136,13 @@ $sexual
 
 <div id="profile-edit-pubkeywords-wrapper" >
 <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
-<input type="text" size="32" name="pubkeywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
 </div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
 <div id="profile-edit-prvkeywords-wrapper" >
 <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
-<input type="text" size="32" name="prvkeywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
 </div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
 <div id="profile-edit-prvkeywords-end"></div>
 
diff --git a/view/de/profile_tabs.tpl b/view/de/profile_tabs.tpl
deleted file mode 100644
index 56e7d626f..000000000
--- a/view/de/profile_tabs.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
-	<a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
-	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profil</a>
-	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Fotos</a>
-<div id="profile-tabs-end"></div>
-</div>
-\ No newline at end of file
diff --git a/view/de/registrations-top.tpl b/view/de/registrations-top.tpl
deleted file mode 100644
index d788b515d..000000000
--- a/view/de/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Schwebende Neuanmeldungen</h1>
-
-
diff --git a/view/de/settings.tpl b/view/de/settings.tpl
index 675ef675f..1924fc8e1 100644
--- a/view/de/settings.tpl
+++ b/view/de/settings.tpl
@@ -2,6 +2,8 @@
 
 <div id="plugin-settings-link"><a href="settings/addon">Plugin Einstellungen</a></div>
 
+$uexport
+
 $nickname_block
 
 
@@ -89,6 +91,14 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-blockw-wrapper" >
+<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
+<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
+</div>
+<div id="settings-blockw-end" ></div>
+
+
+
 <div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
 <div id="settings-expire-end"></div>
 
diff --git a/view/de/settings_nick_unset.tpl b/view/de/settings_nick_unset.tpl
deleted file mode 100644
index 2a56fda7a..000000000
--- a/view/de/settings_nick_unset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Deine Profil URL ist im Moment <strong>'$baseurl/profile/$uid'</strong>.
-Wenn du einen Spitznamen wählst kann man diese URL freundlicher ausdrücken
-z.B. <strong>'spitzname@$basepath'</strong>.
-<br />
-Einmal gewählt kann der Spitzname nicht mehr geändert werden. Er
-<strong>muss</strong> mit einem Buchstaben beginnen. Es sind ausschließlich
-Buchstaben, Zahlen sowie Binde- und Unterstriche erlaubt.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Spitzname: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
diff --git a/view/de/strings.php b/view/de/strings.php
index b45ddee69..2d8fe7006 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -272,6 +272,11 @@ $a->strings['Clear browser location'] = 'Browser Standort leeren';
 $a->strings['Permission settings'] = 'Berechtigungseinstellungen';
 $a->strings['CC: email addresses'] = 'CC: EMail Addresse';
 $a->strings['Example: bob@example.com, mary@example.com'] = 'Z.B.: bob@example.com, mary@example.com';
+$a->strings['Please enter a link URL:'] = 'Bitte URL des Links angeben:';
+$a->strings['Please enter a YouTube link:'] = 'Bitte den YouTube Link angeben:';
+$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
+$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
+$a->strings['Where are you right now?'] = 'Wo bist du im Moment?';
 $a->strings['No such group'] = 'Es gibt keine solche Gruppe';
 $a->strings['Group is empty'] = 'Gruppe ist leer';
 $a->strings['Group: '] = 'Gruppe: ';
@@ -326,6 +331,9 @@ $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #cam
 $a->strings['Recent Photos'] = 'Neuste Fotos';
 $a->strings['Upload New Photos'] = 'Weitere Fotos hochladen';
 $a->strings['View Album'] = 'Album betrachten';
+$a->strings['Status'] = 'Status';
+$a->strings['Profile'] = 'Profil';
+$a->strings['Photos'] = 'Fotos';
 $a->strings['Image uploaded but image cropping failed.'] = 'Bilder hochgeladen aber das Zuschneiden ist fehlgeschlagen.';
 $a->strings['Image size reduction [175] failed.'] = 'Image size reduction [175] failed.';
 $a->strings['Image size reduction [80] failed.'] = 'Image size reduction [80] failed.';