Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

boot.php

@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1439' );
+define ( 'FRIENDICA_VERSION',      '3.0.1443' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1154      );
 
@@ -253,6 +253,7 @@ define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
 define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
 
 define ( 'ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke' );
+define ( 'ACTIVITY_MOOD',        NAMESPACE_ZOT . '/activity/mood' );
 
 define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
 define ( 'ACTIVITY_OBJ_NOTE',    NAMESPACE_ACTIVITY_SCHEMA . 'note' );

include/conversation.php

@@ -205,6 +205,20 @@ function localize_item(&$item){
 		$item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
 
 	}
+	if (stristr($item['verb'],ACTIVITY_MOOD)) {
+		$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
+		if(! $verb)
+			return;
+
+		$Aname = $item['author-name'];
+		$Alink = $item['author-link'];
+		$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+		
+		$txt = t('%1$s is currently %2$s');
+
+		$item['body'] = sprintf($txt, $A, t($verb));
+	}
+
     if ($item['verb']===ACTIVITY_TAG){
 		$r = q("SELECT * from `item`,`contact` WHERE 
 		`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -508,6 +522,13 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 			}
 		}
 
+		if(intval(get_config('system','thread_allow')) && $a->theme_thread_allow) {
+			$comments_threaded = true;
+		}
+		else {
+			$comments_threaded = false;
+		}
+
 		if($page_writeable) {
 			$buttons = array(
 				'like' => array( t("I like this \x28toggle\x29"), t("like")),
@@ -524,7 +545,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 					$qcomment = (($qc) ? explode("\n",$qc) : null);
 				}
 				$comment = replace_macros($cmnt_tpl,array(
-					'$return_path' => '', 
+					'$return_path' => '',
+					'$threaded' => $comments_threaded, 
 					'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
 					'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
 					'$id' => $item['item_id'],
@@ -583,6 +605,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 			'osparkle' => $osparkle,
 			'sparkle' => $sparkle,
 			'title' => template_escape($item['title']),
+			'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
+
 			'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 			'lock' => $lock,
 			'location' => template_escape($location),
@@ -815,6 +839,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'title' => template_escape($item['title']),
 					'body' => template_escape($body),
 					'text' => strip_tags(template_escape($body)),
+					'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 					'location' => template_escape($location),
 					'indent' => '',

include/text.php

@@ -727,6 +727,39 @@ function get_poke_verbs() {
 	return $arr;
 }
 
+function get_mood_verbs() {
+	
+	// index is present tense verb
+	// value is array containing past tense verb, translation of present, translation of past
+
+	$arr = array(
+		'happy'      => t('happy'),
+		'sad'        => t('sad'),
+		'mellow'     => t('mellow'),
+		'tired'      => t('tired'),
+		'perky'      => t('perky'),
+		'angry'      => t('angry'),
+		'stupefied'  => t('stupified'),
+		'puzzled'    => t('puzzled'),
+		'interested' => t('interested'),
+		'bitter'     => t('bitter'),
+		'cheerful'   => t('cheerful'),
+		'alive'      => t('alive'),
+		'annoyed'    => t('annoyed'),
+		'anxious'    => t('anxious'),
+		'cranky'     => t('cranky'),
+		'disturbed'  => t('disturbed'),
+		'frustrated' => t('frustrated'),
+		'motivated'  => t('motivated'),
+		'relaxed'    => t('relaxed'),
+		'surprised'  => t('surprised'),
+	);
+
+	call_hooks('mood_verbs', $arr);
+	return $arr;
+}
+
+
 /**
  * 
  * Function: smilies

mod/mood.php

@@ -0,0 +1,142 @@
+<?php
+
+require_once('include/security.php');
+require_once('include/bbcode.php');
+require_once('include/items.php');
+
+
+function mood_init(&$a) {
+
+	if(! local_user())
+		return;
+
+	$uid = local_user();
+	$verb = notags(trim($_GET['verb']));
+	
+	if(! $verb) 
+		return;
+
+	$verbs = get_mood_verbs();
+
+	if(! in_array($verb,$verbs))
+		return;
+
+	$activity = ACTIVITY_MOOD . '#' . urlencode($verb);
+
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
+
+
+	logger('mood: verb ' . $verb, LOGGER_DEBUG);
+
+
+	if($parent) {
+		$r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid 
+			from item where id = %d and parent = %d and uid = %d limit 1",
+			intval($parent),
+			intval($parent),
+			intval($uid)
+		);
+		if(count($r)) {
+			$parent_uri = $r[0]['uri'];
+			$private    = $r[0]['private'];
+			$allow_cid  = $r[0]['allow_cid'];
+			$allow_gid  = $r[0]['allow_gid'];
+			$deny_cid   = $r[0]['deny_cid'];
+			$deny_gid   = $r[0]['deny_gid'];
+		}
+	}
+	else {
+
+		$private = 0;
+
+		$allow_cid     =  $a->user['allow_cid'];
+		$allow_gid     =  $a->user['allow_gid'];
+		$deny_cid      =  $a->user['deny_cid'];
+		$deny_gid      =  $a->user['deny_gid'];
+	}
+
+	$poster = $a->contact;
+
+	$uri = item_new_uri($a->get_hostname(),$uid);
+
+	$action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' , $verbs[$verb]); 
+
+	$arr = array();
+
+	$arr['uid']           = $uid;
+	$arr['uri']           = $uri;
+	$arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
+	$arr['type']          = 'activity';
+	$arr['wall']          = 1;
+	$arr['contact-id']    = $poster['id'];
+	$arr['owner-name']    = $poster['name'];
+	$arr['owner-link']    = $poster['url'];
+	$arr['owner-avatar']  = $poster['thumb'];
+	$arr['author-name']   = $poster['name'];
+	$arr['author-link']   = $poster['url'];
+	$arr['author-avatar'] = $poster['thumb'];
+	$arr['title']         = '';
+	$arr['allow_cid']     = $allow_cid;
+	$arr['allow_gid']     = $allow_gid;
+	$arr['deny_cid']      = $deny_cid;
+	$arr['deny_gid']      = $deny_gid;
+	$arr['last-child']    = 1;
+	$arr['visible']       = 1;
+	$arr['verb']          = $activity;
+	$arr['private']       = $private;
+
+	$arr['origin']        = 1;
+	$arr['body']          = $action;
+
+	$item_id = item_store($arr);
+	if($item_id) {
+		q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+			intval($uid),
+			intval($item_id)
+		);
+		proc_run('php',"include/notifier.php","tag","$item_id");
+	}
+
+
+	call_hooks('post_local_end', $arr);
+
+	proc_run('php',"include/notifier.php","like","$post_id");
+
+	return;
+}
+
+
+
+function mood_content(&$a) {
+
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+
+
+
+	$verbs = get_mood_verbs();
+
+	$shortlist = array();
+	foreach($verbs as $k => $v)
+		if($v !== 'NOTRANSLATION')
+			$shortlist[] = array($k,$v);
+
+
+	$tpl = get_markup_template('mood_content.tpl');
+
+	$o = replace_macros($tpl,array(
+		'$title' => t('Mood'),
+		'$desc' => t('Set your current mood and tell your friends'),
+		'$verbs' => $shortlist,
+		'$parent' => $parent,
+		'$submit' => t('Submit'),
+	));
+
+	return $o;
+
+}

mod/poke.php

@@ -73,7 +73,7 @@ function poke_init(&$a) {
 
 	$poster = $a->contact;
 
-	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+	$uri = item_new_uri($a->get_hostname(),$uid);
 
 	$arr = array();
 

mod/profiles.php

@@ -48,10 +48,15 @@ function profiles_post(&$a) {
 			
 		$name = notags(trim($_POST['name']));
 
+		if(! strlen($name)) {
+			$name = '[No Name]';
+		}
+
 		if($orig[0]['name'] != $name)
 			$namechanged = true;
 
 
+
 		$pdesc = notags(trim($_POST['pdesc']));
 		$gender = notags(trim($_POST['gender']));
 		$address = notags(trim($_POST['address']));

view/comment_item.tpl

@@ -1,6 +1,10 @@
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			{{ if $threaded }}
 			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
 			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ else }}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ endif }}
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />

view/de/strings.php

@@ -602,7 +602,7 @@ $a->strings["Your message:"] = "Deine Nachricht:";
 $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica";
 $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
 $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten dir einige Tipps und Links anbieten, die dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
-$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst.";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest und neue Kontakte knüpfst.";
 $a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> dein Passwort. Außerdem merke dir deine Identifikationsadresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen.";
 $a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn du deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können.";
 $a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust.";
@@ -727,7 +727,7 @@ $a->strings["Normal Account"] = "Normales Konto";
 $a->strings["Soapbox Account"] = "Marktschreier-Konto";
 $a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto";
 $a->strings["Automatic Friend Account"] = "Automatisches Freundekonto";
-$a->strings["Blog Account"] = "";
+$a->strings["Blog Account"] = "Blog Account";
 $a->strings["Private Forum"] = "Privates Forum";
 $a->strings["Message queues"] = "Nachrichten-Warteschlangen";
 $a->strings["Administration"] = "Administration";
@@ -737,6 +737,7 @@ $a->strings["Pending registrations"] = "Anstehende Anmeldungen";
 $a->strings["Version"] = "Version";
 $a->strings["Active plugins"] = "Aktive Plugins";
 $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
+$a->strings["Don't apply a special theme for mobile devices."] = "Kein spezielles Theme für mobile Geräte verwenden.";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Bedarf der Zustimmung";
 $a->strings["Open"] = "Offen";
@@ -751,6 +752,8 @@ $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Thema";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
+$a->strings["Mobile system theme"] = "Systemweites mobiles Thema";
+$a->strings["Theme for mobile devices"] = "Thema für mobile Geräte";
 $a->strings["SSL link policy"] = "Regeln für SSL Links";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
 $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
@@ -770,8 +773,8 @@ $a->strings["Force publish"] = "Erzwinge Veröffentlichung";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen.";
 $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten Verzeichnis";
 $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar.";
-$a->strings["Allow threaded items"] = "";
+$a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen";
-$a->strings["Allow infinite level threading for items on this site."] = "";
+$a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite.";
 $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen.";
 $a->strings["OpenID support"] = "OpenID Unterstützung";
@@ -1169,29 +1172,28 @@ $a->strings["Most active users"] = "Aktivste Nutzer";
 $a->strings["Latest photos"] = "Neueste Fotos";
 $a->strings["Latest likes"] = "Neueste Favoriten";
 $a->strings["event"] = "Veranstaltung";
-$a->strings["Friendicy-Native events"] = "";
 $a->strings["No access"] = "Kein Zugriff";
 $a->strings["Could not open component for editing"] = "";
 $a->strings["Go back to the calendar"] = "Zurück zum Kalender";
-$a->strings["Event data"] = "";
+$a->strings["Event data"] = "Veranstaltungsdetails";
 $a->strings["Calendar"] = "Kalender";
-$a->strings["Special color"] = "";
+$a->strings["Special color"] = "Spezielle Farbe";
-$a->strings["Subject"] = "";
+$a->strings["Subject"] = "Betreff:";
 $a->strings["Starts"] = "Beginnt";
 $a->strings["Ends"] = "Endet";
 $a->strings["Description"] = "Beschreibung";
-$a->strings["Recurrence"] = "";
+$a->strings["Recurrence"] = "Wiederholungen:";
-$a->strings["Frequency"] = "";
+$a->strings["Frequency"] = "Frequenz";
 $a->strings["Daily"] = "Täglich";
 $a->strings["Weekly"] = "Wöchentlich";
 $a->strings["Monthly"] = "Monatlich";
-$a->strings["Yearly"] = "";
+$a->strings["Yearly"] = "Jährlich";
 $a->strings["days"] = "Tage";
 $a->strings["weeks"] = "Wochen";
 $a->strings["months"] = "Monate";
 $a->strings["years"] = "Jahre";
-$a->strings["Interval"] = "";
+$a->strings["Interval"] = "Intervall";
-$a->strings["All %select% %time%"] = "";
+$a->strings["All %select% %time%"] = "Jeden %select% %time%";
 $a->strings["Days"] = "Tage";
 $a->strings["Sunday"] = "Sonntag";
 $a->strings["Monday"] = "Montag";
@@ -1202,44 +1204,46 @@ $a->strings["Friday"] = "Freitag";
 $a->strings["Saturday"] = "Samstag";
 $a->strings["First day of week:"] = "Erster Tag der Woche";
 $a->strings["Day of month"] = "Tag des Monats";
-$a->strings["#num#th of each month"] = "";
+$a->strings["#num#th of each month"] = "#num#ten jedes Monats";
-$a->strings["#num#th-last of each month"] = "";
+$a->strings["#num#th-last of each month"] = "letzten #num#ten jedes Monats";
 $a->strings["#num#th #wkday# of each month"] = "";
 $a->strings["#num#th-last #wkday# of each month"] = "";
 $a->strings["Month"] = "Monat";
-$a->strings["#num#th of the given month"] = "";
+$a->strings["#num#th of the given month"] = "#num#ten des Monats";
-$a->strings["#num#th-last of the given month"] = "";
+$a->strings["#num#th-last of the given month"] = "letzten #num#ten des Monats";
 $a->strings["#num#th #wkday# of the given month"] = "";
 $a->strings["#num#th-last #wkday# of the given month"] = "";
-$a->strings["Repeat until"] = "";
+$a->strings["Repeat until"] = "Wiederholungen";
-$a->strings["Infinite"] = "";
+$a->strings["Infinite"] = "unendlich";
-$a->strings["Until the following date"] = "";
+$a->strings["Until the following date"] = "bis zum folgenden Datum";
-$a->strings["Number of times"] = "";
+$a->strings["Number of times"] = "Bestimmte Anzahl von Wiederholungen";
-$a->strings["Exceptions"] = "";
+$a->strings["Exceptions"] = "Ausnahmen";
-$a->strings["none"] = "";
+$a->strings["none"] = "keine";
 $a->strings["Notification"] = "Benachrichtigung";
-$a->strings["Notify by"] = "";
+$a->strings["Notify by"] = "Benarchrichtigungsmethode";
-$a->strings["E-Mail"] = "";
+$a->strings["E-Mail"] = "E-Mail";
-$a->strings["On Friendica / Display"] = "";
+$a->strings["On Friendica / Display"] = "Bei Friendica / Anzeige";
-$a->strings["Time"] = "";
+$a->strings["Time"] = "Zeit";
 $a->strings["Hours"] = "Stunden";
 $a->strings["Minutes"] = "Minuten";
-$a->strings["Seconds"] = "";
+$a->strings["Seconds"] = "Sekunden";
-$a->strings["Weeks"] = "";
+$a->strings["Weeks"] = "Wochen";
-$a->strings["before the"] = "";
+$a->strings["before the"] = "vor dem";
-$a->strings["start of the event"] = "";
+$a->strings["start of the event"] = "Beginn des Termins";
-$a->strings["end of the event"] = "";
+$a->strings["end of the event"] = "Ende des Termins";
-$a->strings["Add a notification"] = "";
+$a->strings["Add a notification"] = "Benachrichtigung hinzufügen";
-$a->strings["The event #name# will start at #date"] = "";
+$a->strings["The event #name# will start at #date"] = "Der Termin #name# wird am #date anfangen";
-$a->strings["#name# is about to begin."] = "";
+$a->strings["#name# is about to begin."] = "#name# beginnt demnächst.";
-$a->strings["Saved"] = "";
+$a->strings["Saved"] = "Gespeichert";
 $a->strings["U.S. Time Format (mm/dd/YYYY)"] = "U.S. Datumsformat (mm/dd/YYYY)";
 $a->strings["German Time Format (dd.mm.YYYY)"] = "Deutsches Datumsformat (dd.mm.YYYY)";
-$a->strings["Private Events"] = "";
+$a->strings["Private Events"] = "Privater Termin";
+$a->strings["Private Addressbooks"] = "Private Adressbücher";
+$a->strings["Friendica-Native events"] = "Friendica Veranstaltungen";
 $a->strings["Friendica-Contacts"] = "Friendica-Kontakte";
 $a->strings["Your Friendica-Contacts"] = "Deine Friendica-Kontakte";
-$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "";
+$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Entschuldigung. Bei dem Versuch die Datei zu importieren ist etwas schief gelaufen. Vielleicht wurden aber einige der Termine dennoch importiert.";
-$a->strings["Something went wrong when trying to import the file. Sorry."] = "";
+$a->strings["Something went wrong when trying to import the file. Sorry."] = "Entschuldigung. Beim Importieren der Datei ist etwas schief gelaufen.";
 $a->strings["The ICS-File has been imported."] = "Die ICS-Datei wurde importoert.";
 $a->strings["No file was uploaded."] = "Es wurde keine Datei geladen.";
 $a->strings["Import a ICS-file"] = "Importiere eine ICS-Datei";
@@ -1289,6 +1293,8 @@ $a->strings["Show SQL-statements"] = "SQL-Anweisungen anzeigen";
 $a->strings["Private Calendar"] = "Privater Kalender";
 $a->strings["Friendica Events: Mine"] = "Meine Friendica-Veranstaltungen";
 $a->strings["Friendica Events: Contacts"] = "Friendica Veranstaltungen meiner Kontakte";
+$a->strings["Private Addresses"] = "Private Adressen";
+$a->strings["Friendica Contacts"] = "Friendica Kontakte";
 $a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine Friendica ID (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
 $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})";
 $a->strings["OAuth end-point"] = "OAuth Endpunkt";
@@ -1802,7 +1808,7 @@ $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$ss %4\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen Beitrag %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen %3\$s[/url]";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";

view/mood_content.tpl

@@ -0,0 +1,20 @@
+<h3>$title</h3>
+
+<div id="mood-desc">$desc</div>
+
+<form action="mood" method="get">
+<br />
+<br />
+
+<input id="mood-parent" type="hidden" value="$parent" name="parent" />
+
+<select name="verb" id="mood-verb-select" >
+{{ for $verbs as $v }}
+<option value="$v.0">$v.1</option>
+{{ endfor }}
+</select>
+<br />
+<br />
+<input type="submit" name="submit" value="$submit" />
+</form>
+

view/search_item.tpl

@@ -23,7 +23,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 				
 		</div>			
 		<div class="wall-item-content" id="wall-item-content-$item.id" >

view/theme/duepuntozero/comment_item.tpl

@@ -1,6 +1,10 @@
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			{{ if $threaded }}
 			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
 			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ else }}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ endif }}
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />

view/theme/duepuntozero/style.css

@@ -938,6 +938,9 @@ input#dfrn-url {
 .tread-wrapper .tread-wrapper {
 	margin-left: 50px;
 }
+.tread-wrapper .wall-item-comment-wrapper {
+	margin-left: 50px;
+}
 
 .tread-end-wrapper {
 	margin-left: 50px;

view/theme/quattro/mail_conv.tpl

@@ -22,7 +22,10 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
+				<a href="$mail.from_url" target="redir"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name$mail.sparkle">$mail.from_name</span></a>
+                                <span class="wall-item-ago" title="$item.ago">$mail.date</span>
 			</div>
 			
 			<div class="wall-item-actions-social">

view/theme/quattro/profile_vcard.tpl

@@ -45,7 +45,9 @@
 
 	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
 
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+	{{ if $homepage }}<dl class="homepage"><dt
+        class="homepage-label">$homepage</dt><dd class="homepage-url"><a
+        href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
 	{{ inc diaspora_vcard.tpl }}{{ endinc }}
 	

view/theme/quattro/search_item.tpl

@@ -42,7 +42,7 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 			</div>
 			
 			<div class="wall-item-actions-social">

view/theme/quattro/wall_item.tpl

@@ -42,7 +42,11 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir"
+                                title="$item.linktitle"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name$item.sparkle">$item.name</span></a>
+                                <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 			</div>
 			
 			<div class="wall-item-actions-social">

view/theme/quattro/wall_thread.tpl

@@ -64,7 +64,7 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 			</div>
 			
 			<div class="wall-item-actions-social">

view/theme/quattro/wallwall_item.tpl

@@ -46,7 +46,7 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 				 <br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
 				 
 			</div>

view/theme/quattro/wallwall_thread.tpl

@@ -69,7 +69,11 @@
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+				<a href="$item.profile_url" target="redir"
+                                title="$item.linktitle"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name$item.sparkle">$item.name</span></a>
+                                <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
 				 <br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
 				 
 			</div>

view/wall_item.tpl

@@ -24,7 +24,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago" id="wall-item-ago-$item.id" >$item.ago</div>
+				<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 				
 		</div>	
 		<div class="wall-item-content" id="wall-item-content-$item.id" >

view/wall_thread.tpl

@@ -31,7 +31,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago" id="wall-item-ago-$item.id" >$item.ago</div>
+				<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 				
 		</div>	
 		<div class="wall-item-content" id="wall-item-content-$item.id" >

view/wallwall_item.tpl

@@ -29,7 +29,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
+				<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 		</div>			
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>

view/wallwall_thread.tpl

@@ -36,7 +36,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>				
 		</div>			
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>