This commit is contained in:
marijus 2014-02-04 16:19:35 +01:00
commit 4253581733
12 changed files with 1270 additions and 1161 deletions

View File

@ -398,6 +398,7 @@ define ( 'TERM_PCATEGORY', 4 );
define ( 'TERM_FILE', 5 );
define ( 'TERM_SAVEDSEARCH', 6 );
define ( 'TERM_THING', 7 );
define ( 'TERM_BOOKMARK', 8 );
define ( 'TERM_OBJ_POST', 1 );
define ( 'TERM_OBJ_PHOTO', 2 );

View File

@ -822,7 +822,7 @@ function encode_item_xchan($xchan) {
function encode_item_terms($terms) {
$ret = array();
$allowed_export_terms = array( TERM_UNKNOWN, TERM_HASHTAG, TERM_MENTION, TERM_CATEGORY );
$allowed_export_terms = array( TERM_UNKNOWN, TERM_HASHTAG, TERM_MENTION, TERM_CATEGORY, TERM_BOOKMARK );
if($terms) {
foreach($terms as $term) {
@ -834,7 +834,7 @@ function encode_item_terms($terms) {
}
function termtype($t) {
$types = array('unknown','hashtag','mention','category','private_category','file','search');
$types = array('unknown','hashtag','mention','category','private_category','file','search','thing','bookmark');
return(($types[$t]) ? $types[$t] : 'unknown');
}
@ -865,6 +865,12 @@ function decode_tags($t) {
case 'search':
$tag['type'] = TERM_SEARCH;
break;
case 'thing':
$tag['type'] = TERM_THING;
break;
case 'bookmark':
$tag['type'] = TERM_BOOKMARK;
break;
default:
case 'unknown':
$tag['type'] = TERM_UNKNOWN;

View File

@ -442,7 +442,7 @@ function item_message_id() {
$mid = $hash . '@' . get_app()->get_hostname();
$r = q("SELECT `id` FROM `item` WHERE `mid` = '%s' LIMIT 1",
$r = q("SELECT id FROM item WHERE mid = '%s' LIMIT 1",
dbesc($mid));
if(count($r))
$dups = true;
@ -459,7 +459,7 @@ function photo_new_resource() {
do {
$found = false;
$resource = hash('md5',uniqid(mt_rand(),true));
$r = q("SELECT `id` FROM `photo` WHERE `resource_id` = '%s' LIMIT 1",
$r = q("SELECT id FROM photo WHERE resource_id = '%s' LIMIT 1",
dbesc($resource)
);
if(count($r))
@ -593,7 +593,7 @@ function get_tags($s) {
if(substr($mtch,-1,1) === '.')
$mtch = substr($mtch,0,-1);
// ignore strictly numeric tags like #1
if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1)))
if((strpos($mtch,'#') === 0) && ( ctype_digit(substr($mtch,1)) || substr($mtch,1,1) === '^'))
continue;
// try not to catch url fragments
if(strpos($s,$mtch) && preg_match('/[a-zA-z0-9\/]/',substr($s,strpos($s,$mtch)-1,1)))
@ -601,6 +601,18 @@ function get_tags($s) {
$ret[] = $mtch;
}
}
// bookmarks
if(preg_match_all('/#\^\[(url|zrl)=(.*?)\](.*?)\[\/(url|zrl)\]/',$s,$match,PREG_SET_ORDER)) {
foreach($match as $mtch) {
$ret[] = $mtch[0];
}
}
// logger('get_tags: ' . print_r($ret,true));
return $ret;
}
@ -1639,10 +1651,10 @@ function item_post_type($item) {
function undo_post_tagging($s) {
$matches = null;
$cnt = preg_match_all('/([@#])\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER);
$cnt = preg_match_all('/([@#])(\!*)\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$s,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
$s = str_replace($mtch[0], $mtch[1] . $mtch[2] . str_replace(' ','_',$mtch[4]),$s);
}
}
return $s;

View File

@ -74,6 +74,7 @@ function connections_post(&$a) {
$abook_flags = $orig_record[0]['abook_flags'];
$new_friend = false;
if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) {
$abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING );
$new_friend = true;
@ -88,6 +89,7 @@ function connections_post(&$a) {
intval($contact_id),
intval(local_user())
);
if($r)
info( t('Connection updated.') . EOL);
else

View File

@ -32,7 +32,7 @@ function connedit_init(&$a) {
}
function connedit_post(&$a) {
if(! local_user())
return;
@ -86,6 +86,8 @@ function connedit_post(&$a) {
$abook_flags = $orig_record[0]['abook_flags'];
$new_friend = false;
if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) {
$abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING );
$new_friend = true;
@ -100,6 +102,7 @@ function connedit_post(&$a) {
intval($contact_id),
intval(local_user())
);
if($r)
info( t('Connection updated.') . EOL);
else

View File

@ -887,13 +887,24 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
$replaced = false;
$r = null;
$termtype = ((strpos($tag,'#') === 0) ? TERM_HASHTAG : TERM_UNKNOWN);
$termtype = ((strpos($tag,'@') === 0) ? TERM_MENTION : $termtype);
$termtype = ((strpos($tag,'#') === 0) ? TERM_HASHTAG : TERM_UNKNOWN);
$termtype = ((strpos($tag,'@') === 0) ? TERM_MENTION : $termtype);
$termtype = ((strpos($tag,'#^[') === 0) ? TERM_BOOKMARK : $termtype);
//is it a hash tag?
if(strpos($tag,'#') === 0) {
// if the tag is replaced...
if(strpos($tag,'[zrl=')) {
if(strpos($tag,'#^[') === 0) {
if(preg_match('/#\^\[(url|zrl)=(.*?)\](.*?)\[\/(url|zrl)\]/',$tag,$match)) {
$basetag = $match[3];
$url = $match[2];
$replaced = true;
}
}
// if the tag is already replaced...
elseif(strpos($tag,'[zrl=')) {
//...do nothing
return $replaced;
}
@ -904,7 +915,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
$body = str_replace($tag,$newtag,$body);
$replaced = true;
}
else {
if(! $replaced) {
//base tag has the tags name only
$basetag = str_replace('_',' ',substr($tag,1));
//create text for link
@ -961,7 +972,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
$newname = str_replace('_',' ',$name);
//select someone from this user's contacts by name
$r = q("SELECT * FROM abook left join xchan on abook_xchan - xchan_hash
$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash
WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1",
dbesc($newname),
intval($profile_uid)
@ -969,7 +980,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
if(! $r) {
//select someone by attag or nick and the name passed in
$r = q("SELECT * FROM abook left join xchan on abook_xchan - xchan_hash
$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash
WHERE xchan_addr like ('%s') AND abook_channel = %d LIMIT 1",
dbesc($newname . '@%'),
intval($profile_uid)

View File

@ -38,7 +38,7 @@ function page_content(&$a) {
$channel_address = argv(1);
$page_id = argv(2);
dbg(1);
$u = q("select channel_id from channel where channel_address = '%s' limit 1",
dbesc($channel_address)
);
@ -63,7 +63,7 @@ dbg(1);
dbesc($page_id),
intval(ITEM_WEBPAGE)
);
dbg(0);
if(! $r) {
// Check again with no permissions clause to see if it is a permissions issue

View File

@ -763,7 +763,7 @@ function photos_content(&$a) {
/* Check again - this time without specifying permissions */
$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'
$ph = q("SELECT id FROM photo WHERE uid = %d AND resource_id = '%s'
and ( photo_flags = %d or photo_flags = %d )
LIMIT 1",
intval($owner_uid),
@ -875,6 +875,9 @@ function photos_content(&$a) {
if($linked_items) {
xchan_query($linked_items);
$linked_items = fetch_post_tags($linked_items,true);
$link_item = $linked_items[0];
$r = q("select * from item where parent_mid = '%s'
@ -890,6 +893,21 @@ function photos_content(&$a) {
$r = conv_sort($r,'commented');
}
$tags = array();
if($link_item['term']) {
$cnt = 0;
foreach($link_item['term'] as $t)
$tags[$cnt] = array(0 => format_term_for_display($t));
if($can_post && ($ph[0]['uid'] == $owner_uid)) {
$tags[$cnt][1] = 'tagrm?f=&item=' . $link_item['id'];
$tags[$cnt][2] = t('Remove');
}
$cnt ++;
}
if((local_user()) && (local_user() == $link_item['uid'])) {
q("UPDATE `item` SET item_flags = (item_flags ^ %d) WHERE parent = %d and uid = %d and (item_flags & %d)",
intval(ITEM_UNSEEN),
@ -925,7 +943,6 @@ function photos_content(&$a) {
'capt_label' => t('Caption'),
'caption' => $caption_e,
'tag_label' => t('Add a Tag'),
'tags' => $link_item['tag'],
'permissions' => t('Permissions'),
'aclselect' => $aclselect_e,
'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
@ -1067,10 +1084,10 @@ function photos_content(&$a) {
}
$album_e = array($album_link,$ph[0]['album']);
$tags_e = $tags;
$like_e = $like;
$dislike_e = $dislike;
$photo_tpl = get_markup_template('photo_view.tpl');
$o .= replace_macros($photo_tpl, array(
'$id' => $ph[0]['id'],
@ -1081,7 +1098,8 @@ function photos_content(&$a) {
'$prevlink' => $prevlink,
'$nextlink' => $nextlink,
'$desc' => $ph[0]['description'],
'$tags' => $tags_e,
'$tag_hdr' => t('In This Photo:'),
'$tags' => $tags,
'$edit' => $edit,
'$likebuttons' => $likebuttons,
'$like' => $like_e,

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,6 @@ $a->strings["public profile"] = "öffentliches Profil";
$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s auf “%3\$s” geändert";
$a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
$a->strings["Logout"] = "Abmelden";
$a->strings["End this session"] = "Beende diese Sitzung";
$a->strings["Home"] = "Home";
@ -71,6 +70,11 @@ $a->strings["Admin"] = "Admin";
$a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
$a->strings["Nothing new here"] = "Nichts Neues hier";
$a->strings["Please wait..."] = "Bitte warten...";
$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
$a->strings["Permission denied."] = "Zugang verweigert";
$a->strings["Connect"] = "Verbinden";
$a->strings["New window"] = "Neues Fenster";
$a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
@ -115,94 +119,17 @@ $a->strings["second"] = "Sekunde";
$a->strings["seconds"] = "Sekunden";
$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s";
$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden";
$a->strings["view full size"] = "In Vollbildansicht anschauen";
$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\\\, H:i";
$a->strings["Starts:"] = "Beginnt:";
$a->strings["Finishes:"] = "Endet:";
$a->strings["Location:"] = "Ort:";
$a->strings["prev"] = "vorherige";
$a->strings["first"] = "erste";
$a->strings["last"] = "letzte";
$a->strings["next"] = "nächste";
$a->strings["older"] = "älter";
$a->strings["newer"] = "neuer";
$a->strings["No connections"] = "Keine Verbindungen";
$a->strings["%d Connection"] = array(
0 => "%d Verbindung",
1 => "%d Verbindungen",
);
$a->strings["View Connections"] = "Zeige Verbindungen";
$a->strings["Save"] = "Speichern";
$a->strings["poke"] = "anstupsen";
$a->strings["poked"] = "stupste";
$a->strings["ping"] = "anpingen";
$a->strings["pinged"] = "pingte";
$a->strings["prod"] = "knuffen";
$a->strings["prodded"] = "knuffte";
$a->strings["slap"] = "ohrfeigen";
$a->strings["slapped"] = "ohrfeigte";
$a->strings["finger"] = "befummeln";
$a->strings["fingered"] = "befummelte";
$a->strings["rebuff"] = "eine Abfuhr erteilen";
$a->strings["rebuffed"] = "abfuhrerteilte";
$a->strings["happy"] = "glücklich";
$a->strings["sad"] = "traurig";
$a->strings["mellow"] = "sanft";
$a->strings["tired"] = "müde";
$a->strings["perky"] = "frech";
$a->strings["angry"] = "sauer";
$a->strings["stupified"] = "verblüfft";
$a->strings["puzzled"] = "verwirrt";
$a->strings["interested"] = "interessiert";
$a->strings["bitter"] = "verbittert";
$a->strings["cheerful"] = "fröhlich";
$a->strings["alive"] = "lebendig";
$a->strings["annoyed"] = "verärgert";
$a->strings["anxious"] = "unruhig";
$a->strings["cranky"] = "schrullig";
$a->strings["disturbed"] = "verstört";
$a->strings["frustrated"] = "frustriert";
$a->strings["motivated"] = "motiviert";
$a->strings["relaxed"] = "entspannt";
$a->strings["surprised"] = "überrascht";
$a->strings["Monday"] = "Montag";
$a->strings["Tuesday"] = "Dienstag";
$a->strings["Wednesday"] = "Mittwoch";
$a->strings["Thursday"] = "Donnerstag";
$a->strings["Friday"] = "Freitag";
$a->strings["Saturday"] = "Samstag";
$a->strings["Sunday"] = "Sonntag";
$a->strings["January"] = "Januar";
$a->strings["February"] = "Februar";
$a->strings["March"] = "März";
$a->strings["April"] = "April";
$a->strings["May"] = "Mai";
$a->strings["June"] = "Juni";
$a->strings["July"] = "Juli";
$a->strings["August"] = "August";
$a->strings["September"] = "September";
$a->strings["October"] = "Oktober";
$a->strings["November"] = "November";
$a->strings["December"] = "Dezember";
$a->strings["unknown.???"] = "unbekannt.???";
$a->strings["bytes"] = "Bytes";
$a->strings["remove category"] = "Kategorie entfernen";
$a->strings["remove from file"] = "aus der Datei entfernen";
$a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
$a->strings["link to source"] = "Link zum Originalbeitrag";
$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
$a->strings["default"] = "Standard";
$a->strings["Page content type: "] = "Content-Typ der Seite";
$a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
$a->strings["photo"] = "Foto";
$a->strings["event"] = "Ereignis";
$a->strings["status"] = "Status";
$a->strings["comment"] = "Kommentar";
$a->strings["activity"] = "Aktivität";
$a->strings["Design"] = "Design";
$a->strings["Blocks"] = "Blöcke";
$a->strings["Menus"] = "Menüs";
$a->strings["Layouts"] = "Layouts";
$a->strings["Pages"] = "Seiten";
$a->strings["Image/photo"] = "Bild/Foto";
$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
$a->strings["QR code"] = "QR Code";
$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
$a->strings["post"] = "Beitrag";
$a->strings["$1 wrote:"] = "$1 schrieb:";
$a->strings["Delete this item?"] = "Dieses Element löschen?";
$a->strings["Comment"] = "Kommentar";
$a->strings["show more"] = "mehr zeigen";
@ -234,7 +161,6 @@ $a->strings["[no subject]"] = "[no subject]";
$a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
$a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
$a->strings["Profile Photos"] = "Profilfotos";
$a->strings["view full size"] = "In Vollbildansicht anschauen";
$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
$a->strings["Empty name"] = "Namensfeld leer";
$a->strings["Name too long"] = "Name ist zu lang";
@ -258,6 +184,7 @@ $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
$a->strings["Gender:"] = "Geschlecht:";
$a->strings["Status:"] = "Status:";
$a->strings["Homepage:"] = "Homepage:";
$a->strings["Online Now"] = "gerade online";
$a->strings["g A l F d"] = "l, d. F G \\\\U\\\\h\\\\r";
$a->strings["F d"] = "d. F";
$a->strings["[today]"] = "[Heute]";
@ -292,12 +219,6 @@ $a->strings["Love/Romance:"] = "Liebe/Romantik:";
$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
$a->strings["School/education:"] = "Schule/Ausbildung:";
$a->strings["Edit File properties"] = "Dateieigenschaften ändern";
$a->strings["Image/photo"] = "Bild/Foto";
$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
$a->strings["QR code"] = "QR Code";
$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
$a->strings["post"] = "Beitrag";
$a->strings["$1 wrote:"] = "$1 schrieb:";
$a->strings["Embedded content"] = "Eingebetteter Inhalt";
$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
$a->strings["General Features"] = "Allgemeine Funktionen";
@ -365,7 +286,6 @@ $a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sam
$a->strings["add"] = "hinzufügen";
$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
$a->strings["Permission denied."] = "Zugang verweigert";
$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes";
$a->strings["Image file is empty."] = "Bilddatei ist leer.";
$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
@ -524,6 +444,7 @@ $a->strings["Add New Connection"] = "Neue Verbindung hinzufügen";
$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben";
$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara";
$a->strings["Notes"] = "Notizen";
$a->strings["Save"] = "Speichern";
$a->strings["Remove term"] = "Eintrag löschen";
$a->strings["Everything"] = "Alles";
$a->strings["Archives"] = "Archive";
@ -544,6 +465,8 @@ $a->strings["Export channel"] = "Kanal exportieren";
$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)";
$a->strings["Premium Channel Settings"] = "Prämium-Kanal Einstellungen";
$a->strings["Check Mail"] = "E-Mails abrufen";
$a->strings["Chat Rooms"] = "Chaträume";
$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
$a->strings["%d invitation available"] = array(
0 => "%d Einladung verfügbar",
1 => "%d Einladungen verfügbar",
@ -601,6 +524,90 @@ $a->strings["Collection is empty."] = "Sammlung ist leer.";
$a->strings["Collection: %s"] = "Sammlung: %s";
$a->strings["Connection: %s"] = "Verbindung: %s";
$a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
$a->strings["prev"] = "vorherige";
$a->strings["first"] = "erste";
$a->strings["last"] = "letzte";
$a->strings["next"] = "nächste";
$a->strings["older"] = "älter";
$a->strings["newer"] = "neuer";
$a->strings["No connections"] = "Keine Verbindungen";
$a->strings["%d Connection"] = array(
0 => "%d Verbindung",
1 => "%d Verbindungen",
);
$a->strings["View Connections"] = "Zeige Verbindungen";
$a->strings["poke"] = "anstupsen";
$a->strings["poked"] = "stupste";
$a->strings["ping"] = "anpingen";
$a->strings["pinged"] = "pingte";
$a->strings["prod"] = "knuffen";
$a->strings["prodded"] = "knuffte";
$a->strings["slap"] = "ohrfeigen";
$a->strings["slapped"] = "ohrfeigte";
$a->strings["finger"] = "befummeln";
$a->strings["fingered"] = "befummelte";
$a->strings["rebuff"] = "eine Abfuhr erteilen";
$a->strings["rebuffed"] = "abfuhrerteilte";
$a->strings["happy"] = "glücklich";
$a->strings["sad"] = "traurig";
$a->strings["mellow"] = "sanft";
$a->strings["tired"] = "müde";
$a->strings["perky"] = "frech";
$a->strings["angry"] = "sauer";
$a->strings["stupified"] = "verblüfft";
$a->strings["puzzled"] = "verwirrt";
$a->strings["interested"] = "interessiert";
$a->strings["bitter"] = "verbittert";
$a->strings["cheerful"] = "fröhlich";
$a->strings["alive"] = "lebendig";
$a->strings["annoyed"] = "verärgert";
$a->strings["anxious"] = "unruhig";
$a->strings["cranky"] = "schrullig";
$a->strings["disturbed"] = "verstört";
$a->strings["frustrated"] = "frustriert";
$a->strings["motivated"] = "motiviert";
$a->strings["relaxed"] = "entspannt";
$a->strings["surprised"] = "überrascht";
$a->strings["Monday"] = "Montag";
$a->strings["Tuesday"] = "Dienstag";
$a->strings["Wednesday"] = "Mittwoch";
$a->strings["Thursday"] = "Donnerstag";
$a->strings["Friday"] = "Freitag";
$a->strings["Saturday"] = "Samstag";
$a->strings["Sunday"] = "Sonntag";
$a->strings["January"] = "Januar";
$a->strings["February"] = "Februar";
$a->strings["March"] = "März";
$a->strings["April"] = "April";
$a->strings["May"] = "Mai";
$a->strings["June"] = "Juni";
$a->strings["July"] = "Juli";
$a->strings["August"] = "August";
$a->strings["September"] = "September";
$a->strings["October"] = "Oktober";
$a->strings["November"] = "November";
$a->strings["December"] = "Dezember";
$a->strings["unknown.???"] = "unbekannt.???";
$a->strings["bytes"] = "Bytes";
$a->strings["remove category"] = "Kategorie entfernen";
$a->strings["remove from file"] = "aus der Datei entfernen";
$a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
$a->strings["link to source"] = "Link zum Originalbeitrag";
$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
$a->strings["default"] = "Standard";
$a->strings["Page content type: "] = "Content-Typ der Seite";
$a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
$a->strings["photo"] = "Foto";
$a->strings["event"] = "Ereignis";
$a->strings["status"] = "Status";
$a->strings["comment"] = "Kommentar";
$a->strings["activity"] = "Aktivität";
$a->strings["Design"] = "Design";
$a->strings["Blocks"] = "Blöcke";
$a->strings["Menus"] = "Menüs";
$a->strings["Layouts"] = "Layouts";
$a->strings["Pages"] = "Seiten";
$a->strings["Private Message"] = "Private Nachricht";
$a->strings["Delete"] = "Löschen";
$a->strings["Select"] = "Auswählen";
@ -640,10 +647,6 @@ $a->strings["Link"] = "Link";
$a->strings["Video"] = "Video";
$a->strings["Preview"] = "Vorschau";
$a->strings["Encrypt text"] = "Text verschlüsseln";
$a->strings["Welcome "] = "Willkommen";
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilfoto hoch.";
$a->strings["Welcome back "] = "Willkommen zurück";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
$a->strings["channel"] = "Kanal";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht";
@ -1031,6 +1034,8 @@ $a->strings["Policies"] = "Richtlinien";
$a->strings["Advanced"] = "Fortgeschritten";
$a->strings["Site name"] = "Seitenname";
$a->strings["Banner/Logo"] = "Banner/Logo";
$a->strings["Administrator Information"] = "Administrator Informationen";
$a->strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Kontaktinformationen für Administratoren der Seite. Wird auf der siteinfo Seite angezeigt. BBCode kann verwendet werden.";
$a->strings["System language"] = "System-Sprache";
$a->strings["System theme"] = "System-Theme";
$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Standard System-Theme - kann durch Nutzerprofile überschieben werden - <a href='#' id='cnftheme'>Theme.Einstellungen ändern</a>";
@ -1196,6 +1201,9 @@ $a->strings["Add a Tag"] = "Schlagwort hinzufügen";
$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
$a->strings["View Album"] = "Album ansehen";
$a->strings["Recent Photos"] = "Neueste Fotos";
$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
$a->strings["New Chatroom"] = "Neuen Chatraum";
$a->strings["Chatroom Name"] = "Chatraum Name";
$a->strings["- select -"] = "-auswählen-";
$a->strings["Menu updated."] = "Menü aktualisiert.";
$a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
@ -1260,6 +1268,16 @@ $a->strings["Channel added."] = "Kanal hinzugefügt.";
$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut.";
$a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
$a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server";
$a->strings["Version %s"] = "Version %s";
$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
$a->strings["Red"] = "Red";
$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Dieser Server ist Teil der Red-Matrix einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre.";
$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Besuche <a href=\"http://getzot.com\">GetZot.com</a> um mehr über die Red Matrix zu erfahren.";
$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
$a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com";
$a->strings["Site Administrators"] = "Administratoren";
$a->strings["Remote privacy information not available."] = "Entfernte Privatsphären Einstellungen sind nicht verfügbar.";
$a->strings["Visible to:"] = "Sichtbar für:";
$a->strings["Hub not found."] = "Server nicht gefunden.";
@ -1454,6 +1472,8 @@ $a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
$a->strings["Adult Content"] = "Nicht Jugendfreie-Inhalte";
$a->strings["This channel publishes adult content."] = "Dieser Kanal veröffentlicht nicht Jugendfreie-Inhalte";
$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
$a->strings["Prevents showing if you are available for chat"] = "Verhindert es als für Chats verfügbar angezeigt zu werden";
$a->strings["Quick Privacy Settings:"] = "Schnelle Datenschutz-Einstellungen:";
$a->strings["Very Public - extremely permissive"] = "Sehr offen - extrem freizügig";
$a->strings["Typical - default public, privacy when desired"] = "Typisch - Standard öffentlich, Privatheit wenn gewünscht";
@ -1542,7 +1562,6 @@ $a->strings["Recipient"] = "Empfänger";
$a->strings["Choose what you wish to do to recipient"] = "Wähle was du mit dem/r Empfänger/in tun willst";
$a->strings["Make this post private"] = "Diesen Beitrag privat machen";
$a->strings["Wall Photos"] = "Wall Fotos";
$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
$a->strings["Insufficient permissions. Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
$a->strings["Not available."] = "Nicht verfügbar.";
$a->strings["Community"] = "Gemeinschaft";
@ -1558,16 +1577,6 @@ $a->strings["Invalid profile identifier."] = "Ungültiger Profil Identifikator";
$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits Editor";
$a->strings["Click on a contact to add or remove."] = "Wähle einen Kontakt zum Hinzufügen oder Löschen aus.";
$a->strings["Visible To"] = "Sichtbar für";
$a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit sicherem Zuging zum Profil)";
$a->strings["Version %s"] = "Version %s";
$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
$a->strings["Red"] = "Red";
$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Dieser Server ist Teil der Red-Matrix einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre.";
$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Besuche <a href=\"http://getzot.com\">GetZot.com</a> um mehr über die Red Matrix zu erfahren.";
$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
$a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn dies eine neue Seite ist versuche es bitte in 24 Stunden erneut.";
$a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
$a->strings["No messages."] = "Keine Nachrichten.";

View File

@ -30,6 +30,9 @@
{{/if}}
<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
<input type="hidden" name="contact_id" value="{{$contact_id}}">
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
{{if $is_pending}}
@ -50,9 +53,6 @@
<h3>{{$permlbl}}</h3>
<div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
<input type="hidden" name="contact_id" value="{{$contact_id}}">
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
{{* {{if $noperms}}
<div id="noperm-msg" class="warning-text">{{$noperms}}</div>

View File

@ -14,10 +14,12 @@
<div id="photo-photo-end"></div>
<div id="photo-caption">{{$desc}}</div>
{{if $tags}}
<div id="in-this-photo-text">{{$tags.0}}</div>
<div id="in-this-photo">{{$tags.1}}</div>
<div id="in-this-photo-text">{{$tag_hdr}}</div>
{{foreach $tags as $t}}
<div id="in-this-photo">{{$t.0}}</div>
{{if $edit}}<div id="tag-remove"><a href="{{$t.1}}">{{$t.2}}</a></div>{{/if}}
{{/foreach}}
{{/if}}
{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
{{if $edit}}
<div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$edit.edit}}</div>