Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: bug #328 default the text template var on conversations bug #327 - composed private message is lost if no recip specified. revup fixed login-fields, fixed. notofication.png, changed locations German translation * master:
This commit is contained in:
Simon L'nu
commit
dfdf0f1335
15 changed files with 885 additions and 496 deletions
2
boot.php
2
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1276' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1277' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
||||
define ( 'DB_UPDATE_VERSION', 1131 );
|
||||
|
||||
|
|
|
|||
|
|
@ -216,6 +216,9 @@ function bbcode($Text,$preserve_nl = false) {
|
|||
$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
|
||||
|
||||
|
||||
$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
|
||||
|
||||
$Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
|
||||
|
||||
// Try to Oembed
|
||||
$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
|
||||
|
|
@ -224,9 +227,6 @@ function bbcode($Text,$preserve_nl = false) {
|
|||
|
||||
// html5 video and audio
|
||||
|
||||
$Text = preg_replace("/\[video\](.*?)\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
|
||||
|
||||
$Text = preg_replace("/\[audio\](.*?)\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
|
||||
|
||||
$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);
|
||||
|
||||
|
|
|
|||
|
|
@ -10,17 +10,19 @@ function message_post(&$a) {
|
|||
return;
|
||||
}
|
||||
|
||||
$replyto = ((x($_POST,'replyto')) ? notags(trim($_POST['replyto'])) : '');
|
||||
$subject = ((x($_POST,'subject')) ? notags(trim($_POST['subject'])) : '');
|
||||
$body = ((x($_POST,'body')) ? escape_tags(trim($_POST['body'])) : '');
|
||||
$recipient = ((x($_POST,'messageto')) ? intval($_POST['messageto']) : 0 );
|
||||
$replyto = ((x($_REQUEST,'replyto')) ? notags(trim($_REQUEST['replyto'])) : '');
|
||||
$subject = ((x($_REQUEST,'subject')) ? notags(trim($_REQUEST['subject'])) : '');
|
||||
$body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : '');
|
||||
$recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto']) : 0 );
|
||||
|
||||
|
||||
$ret = send_message($recipient, $body, $subject, $replyto);
|
||||
$norecip = false;
|
||||
|
||||
switch($ret){
|
||||
case -1:
|
||||
notice( t('No recipient selected.') . EOL );
|
||||
$norecip = true;
|
||||
break;
|
||||
case -2:
|
||||
notice( t('Unable to locate contact information.') . EOL );
|
||||
|
|
@ -35,6 +37,13 @@ function message_post(&$a) {
|
|||
info( t('Message sent.') . EOL );
|
||||
}
|
||||
|
||||
// fake it to go back to the input form if no recipient listed
|
||||
|
||||
if($norecip) {
|
||||
$a->argc = 2;
|
||||
$a->argv[1] = 'new';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function message_content(&$a) {
|
||||
|
|
@ -151,7 +160,8 @@ function message_content(&$a) {
|
|||
'$header' => t('Send Private Message'),
|
||||
'$to' => t('To:'),
|
||||
'$subject' => t('Subject:'),
|
||||
'$subjtxt' => '',
|
||||
'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
|
||||
'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
|
||||
'$readonly' => '',
|
||||
'$yourmessage' => t('Your message:'),
|
||||
'$select' => $select,
|
||||
|
|
@ -295,6 +305,7 @@ function message_content(&$a) {
|
|||
'$subjtxt' => template_escape($message['title']),
|
||||
'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
|
||||
'$yourmessage' => t('Your message:'),
|
||||
'$text' => '',
|
||||
'$select' => $select,
|
||||
'$parent' => $parent,
|
||||
'$upload' => t('Upload photo'),
|
||||
|
|
|
|||
1205
view/de/messages.po
1205
view/de/messages.po
File diff suppressed because it is too large
Load diff
|
|
@ -409,6 +409,10 @@ $a->strings["Email login name:"] = "E-Mail-Login-Name:";
|
|||
$a->strings["Email password:"] = "E-Mail-Passwort:";
|
||||
$a->strings["Reply-to address:"] = "Reply-to Adresse:";
|
||||
$a->strings["Send public posts to all email contacts:"] = "Sende öffentliche Beiträge an alle E-Mail-Kontakte:";
|
||||
$a->strings["Action after import:"] = "Aktion nach Import:";
|
||||
$a->strings["Mark as seen"] = "Als gelesen markieren";
|
||||
$a->strings["Move to folder"] = "In einen Ordner verschieben";
|
||||
$a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
|
||||
$a->strings["Normal Account"] = "Normaler Account";
|
||||
$a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil";
|
||||
$a->strings["Soapbox Account"] = "Sandkasten-Account";
|
||||
|
|
@ -518,9 +522,9 @@ $a->strings["Create a group of contacts/friends."] = "Eine Gruppe von Kontakten/
|
|||
$a->strings["Group Name: "] = "Gruppenname:";
|
||||
$a->strings["Group removed."] = "Gruppe entfernt.";
|
||||
$a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen.";
|
||||
$a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
|
||||
$a->strings["Group Editor"] = "Gruppeneditor";
|
||||
$a->strings["Members"] = "Mitglieder";
|
||||
$a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
|
||||
$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner";
|
||||
$a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit";
|
||||
$a->strings["Profile"] = "Profil";
|
||||
|
|
@ -643,32 +647,51 @@ $a->strings["Site name"] = "Seitenname";
|
|||
$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"] = "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden.";
|
||||
$a->strings["Maximum image size"] = "Maximale Größe von Bildern";
|
||||
$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit.";
|
||||
$a->strings["Register policy"] = "Registrierungsmethode";
|
||||
$a->strings["Register text"] = "Registrierungstext";
|
||||
$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
|
||||
$a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt";
|
||||
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
|
||||
$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
|
||||
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
|
||||
$a->strings["Allowed email domains"] = "Erlaubte Domains für Emails";
|
||||
$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
|
||||
$a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
|
||||
$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist.";
|
||||
$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["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
|
||||
$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen.";
|
||||
$a->strings["OpenID support"] = "OpenID Unterstützung";
|
||||
$a->strings["OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login.";
|
||||
$a->strings["Gravatar support"] = "Gravatar Unterstützung";
|
||||
$a->strings["Search new user's photo on Gravatar."] = "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer.";
|
||||
$a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen";
|
||||
$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden.";
|
||||
$a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
|
||||
$a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden";
|
||||
$a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
|
||||
$a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server.";
|
||||
$a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
|
||||
$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt.";
|
||||
$a->strings["Enable Diaspora support"] = "Diaspora-Support aktivieren";
|
||||
$a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die eingebaute Diaspora-Verknüpfung.";
|
||||
$a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
|
||||
$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
|
||||
$a->strings["Verify SSL"] = "SSL Überprüfen";
|
||||
$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann.";
|
||||
$a->strings["Proxy user"] = "Proxy Nutzer";
|
||||
$a->strings["Proxy URL"] = "Proxy URL";
|
||||
$a->strings["Network timeout"] = "Netzwerk Wartezeit";
|
||||
$a->strings["%s user blocked"] = array(
|
||||
0 => "%s Nutzer gesperrt",
|
||||
1 => "%s Nutzer gesperrt/entsperrt",
|
||||
$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
|
||||
$a->strings["%s user blocked/unblocked"] = array(
|
||||
0 => "%s Benutzer geblockt/freigegeben",
|
||||
1 => "%s Benutzer geblockt/freigegeben",
|
||||
);
|
||||
$a->strings["%s user deleted"] = array(
|
||||
0 => "%s Nutzer gelöscht",
|
||||
|
|
@ -695,7 +718,11 @@ $a->strings["Disable"] = "Ausschalten";
|
|||
$a->strings["Enable"] = "Einschalten";
|
||||
$a->strings["Toggle"] = "Umschalten";
|
||||
$a->strings["Settings"] = "Einstellungen";
|
||||
$a->strings["Author: "] = "Autor:";
|
||||
$a->strings["Maintainer: "] = "Betreuer:";
|
||||
$a->strings["No themes found."] = "Keine Themen gefunden.";
|
||||
$a->strings["[Experimental]"] = "[Experimentell]";
|
||||
$a->strings["[Unsupported]"] = "[Nicht unterstützt]";
|
||||
$a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
|
||||
$a->strings["Clear"] = "löschen";
|
||||
$a->strings["Debugging"] = "Protokoll führen";
|
||||
|
|
@ -823,6 +850,7 @@ $a->strings["Please join my social network on %s"] = "Bitte trete meinem Soziale
|
|||
$a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen besuche bitte:";
|
||||
$a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code";
|
||||
$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
|
||||
$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde.";
|
||||
$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
|
||||
$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
|
||||
$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
|
||||
|
|
@ -882,6 +910,12 @@ $a->strings["Username:"] = "Nutzername:";
|
|||
$a->strings["Password:"] = "Passwort:";
|
||||
$a->strings["Use SSL "] = "SSL Verwenden ";
|
||||
$a->strings["yourls Settings saved."] = "yourls Einstellungen gespeichert";
|
||||
$a->strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen.";
|
||||
$a->strings["LiveJournal Post Settings"] = "LiveJournal Veröffentlichungs-Einstellungen";
|
||||
$a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivieren";
|
||||
$a->strings["LiveJournal username"] = "LiveJournal Benutzername";
|
||||
$a->strings["LiveJournal password"] = "LiveJournal Passwort";
|
||||
$a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen";
|
||||
$a->strings["\"Not Safe For Work\" Settings"] = "\"Not Safe For Work\"-Einstellungen";
|
||||
$a->strings["Enable NSFW filter"] = "NSFW Filter aktivieren";
|
||||
$a->strings["Comma separated words to treat as NSFW"] = "Wörter, die gefiltert werden sollen (durch Kommas getrennt)";
|
||||
|
|
@ -895,6 +929,7 @@ $a->strings["Most active users"] = "Aktivste Nutzer";
|
|||
$a->strings["Last photos"] = "Letzte Fotos";
|
||||
$a->strings["Last likes"] = "Zuletzt gemocht";
|
||||
$a->strings["event"] = "Veranstaltung";
|
||||
$a->strings["Latest users"] = "Letzte Benutzer";
|
||||
$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 end-point";
|
||||
|
|
@ -914,6 +949,12 @@ $a->strings["\"Cat\" game!"] = "Unentschieden!";
|
|||
$a->strings["I won!"] = "Ich gewinne!";
|
||||
$a->strings["Randplace Settings"] = "Randplace-Einstellungen";
|
||||
$a->strings["Enable Randplace Plugin"] = "Randplace-Plugin aktivieren";
|
||||
$a->strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen";
|
||||
$a->strings["Dreamwidth Post Settings"] = "Dreamwidth Veröffentlichungs-Einstellungen";
|
||||
$a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktivieren";
|
||||
$a->strings["dreamwidth username"] = "Dreamwidth Benutzername";
|
||||
$a->strings["dreamwidth password"] = "Dreamwidth Passwort";
|
||||
$a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen";
|
||||
$a->strings["Post to Drupal"] = "Bei Drupal veröffentlichen";
|
||||
$a->strings["Drupal Post Settings"] = "Drupal-Beitragseinstellungen";
|
||||
$a->strings["Enable Drupal Post Plugin"] = "Veröffentlichung bei Drupal erlauben";
|
||||
|
|
@ -956,6 +997,7 @@ $a->strings[":-)"] = ":-)";
|
|||
$a->strings[":-("] = ":-(";
|
||||
$a->strings["lol"] = "lol";
|
||||
$a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen";
|
||||
$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten.";
|
||||
$a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein";
|
||||
$a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert";
|
||||
$a->strings["Tile Server URL"] = "Tile Server URL";
|
||||
|
|
@ -1002,6 +1044,11 @@ $a->strings["Post to Tumblr by default"] = "Standardmäßig bei Tumblr veröffen
|
|||
$a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
|
||||
$a->strings["Numfriends Settings"] = "Numfriends Einstellungen";
|
||||
$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
|
||||
$a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
|
||||
$a->strings["Gnot Settings"] = "Gnot Einstellungen";
|
||||
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
|
||||
$a->strings["Enable this plugin/addon?"] = "Dieses Plugin/Addon aktivieren?";
|
||||
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica Meldung] Kommentar zum Beitrag #%d";
|
||||
$a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen";
|
||||
$a->strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen";
|
||||
$a->strings["Enable WordPress Post Plugin"] = "WordPress-Plugin aktivieren.";
|
||||
|
|
@ -1034,12 +1081,17 @@ $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlaube
|
|||
$a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
|
||||
$a->strings["Consumer key"] = "Consumer Key";
|
||||
$a->strings["Consumer secret"] = "Consumer Secret";
|
||||
$a->strings["irc Chatroom"] = "irc Chatroom";
|
||||
$a->strings["Post to Posterous"] = "Nach Posterous senden";
|
||||
$a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen";
|
||||
$a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
|
||||
$a->strings["Posterous login"] = "Posterous-Anmeldename";
|
||||
$a->strings["Posterous password"] = "Posterous-Passwort";
|
||||
$a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous";
|
||||
$a->strings["Theme settings"] = "Themen Einstellungen";
|
||||
$a->strings["Alignment"] = "Ausrichtung";
|
||||
$a->strings["Left"] = "Links";
|
||||
$a->strings["Center"] = "Mitte";
|
||||
$a->strings["Gender:"] = "Geschlecht:";
|
||||
$a->strings["j F, Y"] = "j F, Y";
|
||||
$a->strings["j F"] = "j F";
|
||||
|
|
@ -1166,9 +1218,13 @@ $a->strings["December"] = "Dezember";
|
|||
$a->strings["bytes"] = "Byte";
|
||||
$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
|
||||
$a->strings["default"] = "standard";
|
||||
$a->strings["activity"] = "Aktivität";
|
||||
$a->strings["comment"] = "Kommentar";
|
||||
$a->strings["post"] = "Beitrag";
|
||||
$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
|
||||
$a->strings["Attachments:"] = "Anhänge:";
|
||||
$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk";
|
||||
$a->strings["view full size"] = "Volle Größe anzeigen";
|
||||
$a->strings["Embedded content"] = "Eingebetteter Inhalt";
|
||||
$a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
|
||||
$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
|
||||
|
|
@ -1255,32 +1311,37 @@ $a->strings["don't show"] = "nicht zeigen";
|
|||
$a->strings["Friendica Notification"] = "Friendica-Benachrichtigung";
|
||||
$a->strings["Thank You,"] = "Danke,";
|
||||
$a->strings["%s Administrator"] = "der Administrator von %s";
|
||||
$a->strings["New mail received at %s"] = "Neue Nachricht auf %s empfangen";
|
||||
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
|
||||
$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
|
||||
$a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben.";
|
||||
$a->strings["%s sent you %s."] = "%s hat Dir geschickt %s";
|
||||
$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["%s commented on an item at %s"] = "%s kommentierte einen Beitrag auf %s";
|
||||
$a->strings["%s's"] = "%s's";
|
||||
$a->strings["your"] = "Dein";
|
||||
$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica Meldung] Kommentar zum Beitrag #%d von %s";
|
||||
$a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst.";
|
||||
$a->strings["%s commented in %s."] = "%s wurde kommentiert in %s";
|
||||
$a->strings["a watched conversation"] = "eine beobachtete Unterhaltung";
|
||||
$a->strings["%s commented on %s."] = "%s kommentierte %s.";
|
||||
$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
|
||||
$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben";
|
||||
$a->strings["%s posted to your profile wall at %s"] = "%s hat auf deine Pinnwand bei %s gepostet";
|
||||
$a->strings["%s posted to %s"] = "%s schrieb an %s";
|
||||
$a->strings["your profile wall."] = "Deine Pinnwand";
|
||||
$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica Meldung] %s hat Dich erwähnt";
|
||||
$a->strings["%s tagged you at %s"] = "%s hat dich auf %s erwähnt";
|
||||
$a->strings["%s %s."] = "%s %s.";
|
||||
$a->strings["tagged you"] = "erwähnte Dich";
|
||||
$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag";
|
||||
$a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt";
|
||||
$a->strings["%s tagged %s"] = "%s markierte %s";
|
||||
$a->strings["your post"] = "Dein Beitrag";
|
||||
$a->strings["Introduction received at %s"] = "Kontaktanfrage auf %s erhalten";
|
||||
$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
|
||||
$a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten";
|
||||
$a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten.";
|
||||
$a->strings["an introduction"] = "eine Einführung";
|
||||
$a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s";
|
||||
$a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen.";
|
||||
$a->strings["Friend suggestion received at %s"] = "Kontaktvorschlag empfangen auf %s";
|
||||
$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten";
|
||||
$a->strings["You've received a friend suggestion from '%s' at %s"] = "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s";
|
||||
$a->strings["You've received %s for %s from %s."] = "Du hast %s für %s von %s erhalten.";
|
||||
$a->strings["a friend suggestion"] = "ein Freunde Vorschlag";
|
||||
|
|
@ -1289,7 +1350,6 @@ $a->strings["Photo:"] = "Foto:";
|
|||
$a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen.";
|
||||
$a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
|
||||
$a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
|
||||
$a->strings["view full size"] = "Volle Größe anzeigen";
|
||||
$a->strings["image/photo"] = "Bild/Foto";
|
||||
$a->strings["Welcome "] = "Willkommen ";
|
||||
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ $select
|
|||
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly />
|
||||
|
||||
<div id="prvmail-message-label">$yourmessage</div>
|
||||
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" ></textarea>
|
||||
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" >$text</textarea>
|
||||
|
||||
|
||||
<div id="prvmail-submit-wrapper" >
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 795 B After Width: | Height: | Size: 727 B |
|
|
@ -652,6 +652,17 @@ nav .nav-menu-icon {
|
|||
-webkit-border-radius: 5px 5px 0 0;
|
||||
border-radius: 5px 5px 0 0;
|
||||
}
|
||||
nav .nav-menu-icon:hover {
|
||||
background-color: #308dbf;
|
||||
position: relative;
|
||||
height: 22px;
|
||||
padding: 5px;
|
||||
margin: 0px 7px;
|
||||
-moz-border-radius: 5px 5px 0 0;
|
||||
-webkit-border-radius: 5px 5px 0 0;
|
||||
border-radius: 5px 5px 0 0;
|
||||
}
|
||||
|
||||
nav .nav-menu-icon.selected {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
|
@ -1037,13 +1048,22 @@ section {
|
|||
width: 800px;
|
||||
padding: 0px 0px 0px 12px;
|
||||
}
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
#id_password {
|
||||
width: 173px;
|
||||
}
|
||||
#id_openid_url {
|
||||
width: 173px;
|
||||
}
|
||||
#contact-edit-end {
|
||||
margin-top: 140%;
|
||||
}
|
||||
.pager {
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
font-size: 1.0em;
|
||||
margin-top: 140%;
|
||||
}
|
||||
|
||||
.tabs {
|
||||
|
|
@ -1075,6 +1095,10 @@ section {
|
|||
margin-bottom: 0px;
|
||||
width: 775px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #1872A2;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
position: absolute;
|
||||
left: 790px;
|
||||
|
|
@ -1118,6 +1142,7 @@ section {
|
|||
}
|
||||
.wall-item-container .wall-item-location {
|
||||
padding-right: 40px;
|
||||
display: table-cell;
|
||||
}
|
||||
.wall-item-container .wall-item-ago {
|
||||
word-wrap: break-word;
|
||||
|
|
@ -1173,6 +1198,7 @@ section {
|
|||
.wall-item-container .wall-item-actions-social {
|
||||
float: left;
|
||||
margin-bottom: 1px;
|
||||
display: table-cell;
|
||||
}
|
||||
.wall-item-container .wall-item-actions-social a {
|
||||
margin-right: 1em;
|
||||
|
|
@ -1183,6 +1209,7 @@ section {
|
|||
.wall-item-container .wall-item-actions-tools {
|
||||
float: right;
|
||||
width: 80px;
|
||||
display: table-cell;done
|
||||
}
|
||||
.wall-item-container .wall-item-actions-tools a {
|
||||
float: right;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
</div>
|
||||
<div class="wall-item-actions">
|
||||
<div class="wall-item-location">$item.location </div>
|
||||
|
||||
<div class="wall-item-actions-social">
|
||||
|
||||
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div class="wall-item-location">$item.location </div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
|
||||
</div>
|
||||
<div class="wall-item-actions">
|
||||
<div class="wall-item-location">$item.location </div>
|
||||
|
||||
<div class="wall-item-actions-social">
|
||||
|
||||
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div class="wall-item-location">$item.location </div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 758 B After Width: | Height: | Size: 714 B |
|
|
@ -1036,13 +1036,23 @@ section {
|
|||
width: 800px;
|
||||
padding: 0px 0px 0px 12px;
|
||||
}
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
#id_password {
|
||||
width: 173px;
|
||||
}
|
||||
#id_openid_url {
|
||||
width: 173px;
|
||||
}
|
||||
#contact-edit-end {
|
||||
margin-top: 140%;
|
||||
|
||||
}
|
||||
.pager {
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
font-size: 1.0em;
|
||||
margin-top: 140%;
|
||||
}
|
||||
.tabs {
|
||||
|
||||
|
|
@ -1116,6 +1126,7 @@ section {
|
|||
}
|
||||
.wall-item-container .wall-item-location {
|
||||
padding-right: 40px;
|
||||
display: table-cell;
|
||||
}
|
||||
.wall-item-container .wall-item-ago {
|
||||
word-wrap: break-word;
|
||||
|
|
@ -1171,6 +1182,7 @@ section {
|
|||
.wall-item-container .wall-item-actions-social {
|
||||
float: left;
|
||||
margin-bottom: 1px;
|
||||
display: table-cell;
|
||||
}
|
||||
.wall-item-container .wall-item-actions-social a {
|
||||
margin-right: 1em;
|
||||
|
|
@ -1181,6 +1193,7 @@ section {
|
|||
.wall-item-container .wall-item-actions-tools {
|
||||
float: right;
|
||||
width: 80px;
|
||||
display: table-cell;
|
||||
}
|
||||
.wall-item-container .wall-item-actions-tools a {
|
||||
float: right;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ $a->theme_info = array(
|
|||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
|
||||
//contacts
|
||||
$('html').click(function() {
|
||||
$('#nav-contacts-linkmenu').removeClass('selected');
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
</div>
|
||||
<div class="wall-item-actions">
|
||||
<div class="wall-item-location">$item.location </div>
|
||||
|
||||
<div class="wall-item-actions-social">
|
||||
|
||||
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div class="wall-item-location">$item.location </div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
|
||||
</div>
|
||||
<div class="wall-item-actions">
|
||||
<div class="wall-item-location">$item.location </div>
|
||||
|
||||
<div class="wall-item-actions-social">
|
||||
|
||||
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div class="wall-item-location">$item.location </div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
|
|
|
|||
Loading…
Reference in a new issue