Merge remote-tracking branch 'upstream/develop' into 1611-parseurl
This commit is contained in:
commit
1aa9b7242d
4 changed files with 154 additions and 136 deletions
|
@ -2876,8 +2876,10 @@ class diaspora {
|
||||||
"created_at" => $created,
|
"created_at" => $created,
|
||||||
"provider_display_name" => $item["app"]);
|
"provider_display_name" => $item["app"]);
|
||||||
|
|
||||||
if (count($location) == 0)
|
// Diaspora rejects messages when they contain a location without "lat" or "lng"
|
||||||
|
if (!isset($location["lat"]) OR !isset($location["lng"])) {
|
||||||
unset($message["location"]);
|
unset($message["location"]);
|
||||||
|
}
|
||||||
|
|
||||||
$type = "status_message";
|
$type = "status_message";
|
||||||
}
|
}
|
||||||
|
|
|
@ -269,13 +269,15 @@ function admin_page_federation(&$a) {
|
||||||
// off one % two of them are needed in the query
|
// off one % two of them are needed in the query
|
||||||
// Add more platforms if you like, when one returns 0 known nodes it is not
|
// Add more platforms if you like, when one returns 0 known nodes it is not
|
||||||
// displayed on the stats page.
|
// displayed on the stats page.
|
||||||
$platforms = array('Friendica', 'Diaspora', '%%red%%', 'Hubzilla', 'GNU Social', 'StatusNet');
|
$platforms = array('Friendica', 'Diaspora', '%%red%%', 'Hubzilla', 'BlaBlaNet', 'GNU Social', 'StatusNet', 'Mastodon');
|
||||||
$colors = array('Friendica' => '#ffc018', // orange from the logo
|
$colors = array('Friendica' => '#ffc018', // orange from the logo
|
||||||
'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray
|
'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray
|
||||||
'%%red%%' => '#c50001', // fire red from the logo
|
'%%red%%' => '#c50001', // fire red from the logo
|
||||||
'Hubzilla' => '#43488a', // blue from the logo
|
'Hubzilla' => '#43488a', // blue from the logo
|
||||||
|
'BlaBlaNet' => '#3B5998', // blue from the navbar at blablanet-dot-com
|
||||||
'GNU Social'=> '#a22430', // dark red from the logo
|
'GNU Social'=> '#a22430', // dark red from the logo
|
||||||
'StatusNet' => '#789240'); // the green from the logo (red and blue have already others
|
'StatusNet' => '#789240', // the green from the logo (red and blue have already others
|
||||||
|
'Mastodon' => '#1a9df9'); // blue from the Mastodon logo
|
||||||
$counts = array();
|
$counts = array();
|
||||||
$total = 0;
|
$total = 0;
|
||||||
|
|
||||||
|
@ -283,20 +285,27 @@ function admin_page_federation(&$a) {
|
||||||
// get a total count for the platform, the name and version of the
|
// get a total count for the platform, the name and version of the
|
||||||
// highest version and the protocol tpe
|
// highest version and the protocol tpe
|
||||||
$c = qu('SELECT COUNT(*) AS `total`, `platform`, `network`, `version` FROM `gserver`
|
$c = qu('SELECT COUNT(*) AS `total`, `platform`, `network`, `version` FROM `gserver`
|
||||||
WHERE `platform` LIKE "%s" AND `last_contact` > `last_failure` AND `version` != ""
|
WHERE `platform` LIKE "%s" AND `last_contact` > `last_failure`
|
||||||
ORDER BY `version` ASC;', $p);
|
ORDER BY `version` ASC;', $p);
|
||||||
$total = $total + $c[0]['total'];
|
$total = $total + $c[0]['total'];
|
||||||
|
|
||||||
// what versions for that platform do we know at all?
|
// what versions for that platform do we know at all?
|
||||||
// again only the active nodes
|
// again only the active nodes
|
||||||
$v = qu('SELECT COUNT(*) AS `total`, `version` FROM `gserver`
|
$v = qu('SELECT COUNT(*) AS `total`, `version` FROM `gserver`
|
||||||
WHERE `last_contact` > `last_failure` AND `platform` LIKE "%s" AND `version` != ""
|
WHERE `last_contact` > `last_failure` AND `platform` LIKE "%s"
|
||||||
GROUP BY `version`
|
GROUP BY `version`
|
||||||
ORDER BY `version`;', $p);
|
ORDER BY `version`;', $p);
|
||||||
|
|
||||||
//
|
//
|
||||||
// clean up version numbers
|
// clean up version numbers
|
||||||
//
|
//
|
||||||
|
// some platforms do not provide version information, add a unkown there
|
||||||
|
// to the version string for the displayed list.
|
||||||
|
foreach ($v as $key => $value) {
|
||||||
|
if ($v[$key]['version'] == '') {
|
||||||
|
$v[$key] = array('total'=>$v[$key]['total'], 'version'=>t('unknown'));
|
||||||
|
}
|
||||||
|
}
|
||||||
// in the DB the Diaspora versions have the format x.x.x.x-xx the last
|
// in the DB the Diaspora versions have the format x.x.x.x-xx the last
|
||||||
// part (-xx) should be removed to clean up the versions from the "head
|
// part (-xx) should be removed to clean up the versions from the "head
|
||||||
// commit" information and combined into a single entry for x.x.x.x
|
// commit" information and combined into a single entry for x.x.x.x
|
||||||
|
|
|
@ -35,9 +35,9 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: friendica\n"
|
"Project-Id-Version: friendica\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2016-11-06 16:00+0100\n"
|
"POT-Creation-Date: 2016-11-10 15:43+0100\n"
|
||||||
"PO-Revision-Date: 2016-11-10 09:26+0000\n"
|
"PO-Revision-Date: 2016-11-11 10:10+0000\n"
|
||||||
"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
|
"Last-Translator: Andreas H.\n"
|
||||||
"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
|
"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
@ -78,8 +78,8 @@ msgstr "Leute finden"
|
||||||
msgid "Enter name or interest"
|
msgid "Enter name or interest"
|
||||||
msgstr "Name oder Interessen eingeben"
|
msgstr "Name oder Interessen eingeben"
|
||||||
|
|
||||||
#: include/contact_widgets.php:32 include/Contact.php:325
|
#: include/contact_widgets.php:32 include/conversation.php:981
|
||||||
#: include/conversation.php:981 mod/follow.php:103 mod/allfriends.php:66
|
#: include/Contact.php:347 mod/follow.php:103 mod/allfriends.php:66
|
||||||
#: mod/contacts.php:602 mod/dirfind.php:204 mod/match.php:72
|
#: mod/contacts.php:602 mod/dirfind.php:204 mod/match.php:72
|
||||||
#: mod/suggest.php:83
|
#: mod/suggest.php:83
|
||||||
msgid "Connect/Follow"
|
msgid "Connect/Follow"
|
||||||
|
@ -1168,57 +1168,6 @@ msgstr "(kein Betreff)"
|
||||||
msgid "noreply"
|
msgid "noreply"
|
||||||
msgstr "noreply"
|
msgstr "noreply"
|
||||||
|
|
||||||
#: include/Contact.php:119
|
|
||||||
msgid "stopped following"
|
|
||||||
msgstr "wird nicht mehr gefolgt"
|
|
||||||
|
|
||||||
#: include/Contact.php:311 include/Contact.php:324 include/Contact.php:369
|
|
||||||
#: include/conversation.php:968 include/conversation.php:984
|
|
||||||
#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
|
|
||||||
#: mod/match.php:71 mod/suggest.php:82
|
|
||||||
msgid "View Profile"
|
|
||||||
msgstr "Profil anschauen"
|
|
||||||
|
|
||||||
#: include/Contact.php:368 include/conversation.php:967
|
|
||||||
msgid "View Status"
|
|
||||||
msgstr "Pinnwand anschauen"
|
|
||||||
|
|
||||||
#: include/Contact.php:370 include/conversation.php:969
|
|
||||||
msgid "View Photos"
|
|
||||||
msgstr "Bilder anschauen"
|
|
||||||
|
|
||||||
#: include/Contact.php:371 include/conversation.php:970
|
|
||||||
msgid "Network Posts"
|
|
||||||
msgstr "Netzwerkbeiträge"
|
|
||||||
|
|
||||||
#: include/Contact.php:372 include/conversation.php:971
|
|
||||||
msgid "View Contact"
|
|
||||||
msgstr "Kontakt anzeigen"
|
|
||||||
|
|
||||||
#: include/Contact.php:373
|
|
||||||
msgid "Drop Contact"
|
|
||||||
msgstr "Kontakt löschen"
|
|
||||||
|
|
||||||
#: include/Contact.php:374 include/conversation.php:972
|
|
||||||
msgid "Send PM"
|
|
||||||
msgstr "Private Nachricht senden"
|
|
||||||
|
|
||||||
#: include/Contact.php:375 include/conversation.php:976
|
|
||||||
msgid "Poke"
|
|
||||||
msgstr "Anstupsen"
|
|
||||||
|
|
||||||
#: include/Contact.php:748
|
|
||||||
msgid "Organisation"
|
|
||||||
msgstr "Organisation"
|
|
||||||
|
|
||||||
#: include/Contact.php:751
|
|
||||||
msgid "News"
|
|
||||||
msgstr "Nachrichten"
|
|
||||||
|
|
||||||
#: include/Contact.php:754
|
|
||||||
msgid "Forum"
|
|
||||||
msgstr "Forum"
|
|
||||||
|
|
||||||
#: include/api.php:1019
|
#: include/api.php:1019
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Daily posting limit of %d posts reached. The post was rejected."
|
msgid "Daily posting limit of %d posts reached. The post was rejected."
|
||||||
|
@ -1375,6 +1324,37 @@ msgstr "Lösche die markierten Beiträge"
|
||||||
msgid "Follow Thread"
|
msgid "Follow Thread"
|
||||||
msgstr "Folge der Unterhaltung"
|
msgstr "Folge der Unterhaltung"
|
||||||
|
|
||||||
|
#: include/conversation.php:967 include/Contact.php:390
|
||||||
|
msgid "View Status"
|
||||||
|
msgstr "Pinnwand anschauen"
|
||||||
|
|
||||||
|
#: include/conversation.php:968 include/conversation.php:984
|
||||||
|
#: include/Contact.php:333 include/Contact.php:346 include/Contact.php:391
|
||||||
|
#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
|
||||||
|
#: mod/match.php:71 mod/suggest.php:82
|
||||||
|
msgid "View Profile"
|
||||||
|
msgstr "Profil anschauen"
|
||||||
|
|
||||||
|
#: include/conversation.php:969 include/Contact.php:392
|
||||||
|
msgid "View Photos"
|
||||||
|
msgstr "Bilder anschauen"
|
||||||
|
|
||||||
|
#: include/conversation.php:970 include/Contact.php:393
|
||||||
|
msgid "Network Posts"
|
||||||
|
msgstr "Netzwerkbeiträge"
|
||||||
|
|
||||||
|
#: include/conversation.php:971 include/Contact.php:394
|
||||||
|
msgid "View Contact"
|
||||||
|
msgstr "Kontakt anzeigen"
|
||||||
|
|
||||||
|
#: include/conversation.php:972 include/Contact.php:396
|
||||||
|
msgid "Send PM"
|
||||||
|
msgstr "Private Nachricht senden"
|
||||||
|
|
||||||
|
#: include/conversation.php:976 include/Contact.php:397
|
||||||
|
msgid "Poke"
|
||||||
|
msgstr "Anstupsen"
|
||||||
|
|
||||||
#: include/conversation.php:1094
|
#: include/conversation.php:1094
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%s likes this."
|
msgid "%s likes this."
|
||||||
|
@ -1586,8 +1566,8 @@ msgstr "Vorschau"
|
||||||
#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
|
#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
|
||||||
#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875
|
#: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875
|
||||||
#: mod/contacts.php:445 mod/photos.php:235 mod/photos.php:322
|
#: mod/contacts.php:445 mod/photos.php:235 mod/photos.php:322
|
||||||
#: mod/settings.php:677 mod/settings.php:703 mod/suggest.php:32
|
#: mod/suggest.php:32 mod/videos.php:128 mod/settings.php:677
|
||||||
#: mod/videos.php:128
|
#: mod/settings.php:703
|
||||||
msgid "Cancel"
|
msgid "Cancel"
|
||||||
msgstr "Abbrechen"
|
msgstr "Abbrechen"
|
||||||
|
|
||||||
|
@ -2576,11 +2556,11 @@ msgstr "Möchtest Du wirklich dieses Item löschen?"
|
||||||
#: include/items.php:1914 mod/follow.php:110 mod/api.php:105
|
#: include/items.php:1914 mod/follow.php:110 mod/api.php:105
|
||||||
#: mod/message.php:217 mod/dfrn_request.php:861 mod/profiles.php:648
|
#: mod/message.php:217 mod/dfrn_request.php:861 mod/profiles.php:648
|
||||||
#: mod/profiles.php:651 mod/profiles.php:677 mod/contacts.php:442
|
#: mod/profiles.php:651 mod/profiles.php:677 mod/contacts.php:442
|
||||||
#: mod/register.php:238 mod/settings.php:1158 mod/settings.php:1164
|
#: mod/register.php:238 mod/suggest.php:29 mod/settings.php:1158
|
||||||
#: mod/settings.php:1172 mod/settings.php:1176 mod/settings.php:1181
|
#: mod/settings.php:1164 mod/settings.php:1172 mod/settings.php:1176
|
||||||
#: mod/settings.php:1187 mod/settings.php:1193 mod/settings.php:1199
|
#: mod/settings.php:1181 mod/settings.php:1187 mod/settings.php:1193
|
||||||
#: mod/settings.php:1225 mod/settings.php:1226 mod/settings.php:1227
|
#: mod/settings.php:1199 mod/settings.php:1225 mod/settings.php:1226
|
||||||
#: mod/settings.php:1228 mod/settings.php:1229 mod/suggest.php:29
|
#: mod/settings.php:1227 mod/settings.php:1228 mod/settings.php:1229
|
||||||
msgid "Yes"
|
msgid "Yes"
|
||||||
msgstr "Ja"
|
msgstr "Ja"
|
||||||
|
|
||||||
|
@ -2601,8 +2581,8 @@ msgstr "Ja"
|
||||||
#: mod/contacts.php:350 mod/dirfind.php:11 mod/display.php:475
|
#: mod/contacts.php:350 mod/dirfind.php:11 mod/display.php:475
|
||||||
#: mod/events.php:190 mod/item.php:198 mod/item.php:210 mod/network.php:4
|
#: mod/events.php:190 mod/item.php:198 mod/item.php:210 mod/network.php:4
|
||||||
#: mod/photos.php:159 mod/photos.php:1072 mod/register.php:42
|
#: mod/photos.php:159 mod/photos.php:1072 mod/register.php:42
|
||||||
#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:663
|
#: mod/suggest.php:58 mod/viewcontacts.php:45 mod/settings.php:22
|
||||||
#: mod/suggest.php:58 mod/viewcontacts.php:45 index.php:397
|
#: mod/settings.php:128 mod/settings.php:663 index.php:397
|
||||||
msgid "Permission denied."
|
msgid "Permission denied."
|
||||||
msgstr "Zugriff verweigert."
|
msgstr "Zugriff verweigert."
|
||||||
|
|
||||||
|
@ -3097,6 +3077,26 @@ msgstr "Beitrag"
|
||||||
msgid "Item filed"
|
msgid "Item filed"
|
||||||
msgstr "Beitrag abgelegt"
|
msgstr "Beitrag abgelegt"
|
||||||
|
|
||||||
|
#: include/Contact.php:119
|
||||||
|
msgid "stopped following"
|
||||||
|
msgstr "wird nicht mehr gefolgt"
|
||||||
|
|
||||||
|
#: include/Contact.php:395
|
||||||
|
msgid "Drop Contact"
|
||||||
|
msgstr "Kontakt löschen"
|
||||||
|
|
||||||
|
#: include/Contact.php:770
|
||||||
|
msgid "Organisation"
|
||||||
|
msgstr "Organisation"
|
||||||
|
|
||||||
|
#: include/Contact.php:773
|
||||||
|
msgid "News"
|
||||||
|
msgstr "Nachrichten"
|
||||||
|
|
||||||
|
#: include/Contact.php:776
|
||||||
|
msgid "Forum"
|
||||||
|
msgstr "Forum"
|
||||||
|
|
||||||
#: mod/oexchange.php:25
|
#: mod/oexchange.php:25
|
||||||
msgid "Post successful."
|
msgid "Post successful."
|
||||||
msgstr "Beitrag erfolgreich veröffentlicht."
|
msgstr "Beitrag erfolgreich veröffentlicht."
|
||||||
|
@ -7879,6 +7879,49 @@ msgstr "Spitznamen wählen: "
|
||||||
msgid "Import your profile to this friendica instance"
|
msgid "Import your profile to this friendica instance"
|
||||||
msgstr "Importiere Dein Profil auf diese Friendica Instanz"
|
msgstr "Importiere Dein Profil auf diese Friendica Instanz"
|
||||||
|
|
||||||
|
#: mod/suggest.php:27
|
||||||
|
msgid "Do you really want to delete this suggestion?"
|
||||||
|
msgstr "Möchtest Du wirklich diese Empfehlung löschen?"
|
||||||
|
|
||||||
|
#: mod/suggest.php:71
|
||||||
|
msgid ""
|
||||||
|
"No suggestions available. If this is a new site, please try again in 24 "
|
||||||
|
"hours."
|
||||||
|
msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
|
||||||
|
|
||||||
|
#: mod/suggest.php:84 mod/suggest.php:104
|
||||||
|
msgid "Ignore/Hide"
|
||||||
|
msgstr "Ignorieren/Verbergen"
|
||||||
|
|
||||||
|
#: mod/update_community.php:19 mod/update_display.php:23
|
||||||
|
#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
|
||||||
|
msgid "[Embedded content - reload page to view]"
|
||||||
|
msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"
|
||||||
|
|
||||||
|
#: mod/videos.php:120
|
||||||
|
msgid "Do you really want to delete this video?"
|
||||||
|
msgstr "Möchtest Du dieses Video wirklich löschen?"
|
||||||
|
|
||||||
|
#: mod/videos.php:125
|
||||||
|
msgid "Delete Video"
|
||||||
|
msgstr "Video Löschen"
|
||||||
|
|
||||||
|
#: mod/videos.php:204
|
||||||
|
msgid "No videos selected"
|
||||||
|
msgstr "Keine Videos ausgewählt"
|
||||||
|
|
||||||
|
#: mod/videos.php:396
|
||||||
|
msgid "Recent Videos"
|
||||||
|
msgstr "Neueste Videos"
|
||||||
|
|
||||||
|
#: mod/videos.php:398
|
||||||
|
msgid "Upload New Videos"
|
||||||
|
msgstr "Neues Video hochladen"
|
||||||
|
|
||||||
|
#: mod/viewcontacts.php:72
|
||||||
|
msgid "No contacts."
|
||||||
|
msgstr "Keine Kontakte."
|
||||||
|
|
||||||
#: mod/settings.php:60
|
#: mod/settings.php:60
|
||||||
msgid "Display"
|
msgid "Display"
|
||||||
msgstr "Anzeige"
|
msgstr "Anzeige"
|
||||||
|
@ -8199,6 +8242,12 @@ msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."
|
||||||
msgid "Bandwith Saver Mode"
|
msgid "Bandwith Saver Mode"
|
||||||
msgstr "Bandbreiten-Spar-Modus"
|
msgstr "Bandbreiten-Spar-Modus"
|
||||||
|
|
||||||
|
#: mod/settings.php:1007
|
||||||
|
msgid ""
|
||||||
|
"When enabled, embedded content is not displayed on automatic updates, they "
|
||||||
|
"only show on page reload."
|
||||||
|
msgstr "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden."
|
||||||
|
|
||||||
#: mod/settings.php:1009
|
#: mod/settings.php:1009
|
||||||
msgid "General Theme Settings"
|
msgid "General Theme Settings"
|
||||||
msgstr "Allgemeine Themeneinstellungen"
|
msgstr "Allgemeine Themeneinstellungen"
|
||||||
|
@ -8574,49 +8623,6 @@ msgstr "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige D
|
||||||
msgid "Resend relocate message to contacts"
|
msgid "Resend relocate message to contacts"
|
||||||
msgstr "Umzugsbenachrichtigung erneut an Kontakte senden"
|
msgstr "Umzugsbenachrichtigung erneut an Kontakte senden"
|
||||||
|
|
||||||
#: mod/suggest.php:27
|
|
||||||
msgid "Do you really want to delete this suggestion?"
|
|
||||||
msgstr "Möchtest Du wirklich diese Empfehlung löschen?"
|
|
||||||
|
|
||||||
#: mod/suggest.php:71
|
|
||||||
msgid ""
|
|
||||||
"No suggestions available. If this is a new site, please try again in 24 "
|
|
||||||
"hours."
|
|
||||||
msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
|
|
||||||
|
|
||||||
#: mod/suggest.php:84 mod/suggest.php:104
|
|
||||||
msgid "Ignore/Hide"
|
|
||||||
msgstr "Ignorieren/Verbergen"
|
|
||||||
|
|
||||||
#: mod/update_community.php:19 mod/update_display.php:23
|
|
||||||
#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
|
|
||||||
msgid "[Embedded content - reload page to view]"
|
|
||||||
msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"
|
|
||||||
|
|
||||||
#: mod/videos.php:120
|
|
||||||
msgid "Do you really want to delete this video?"
|
|
||||||
msgstr "Möchtest Du dieses Video wirklich löschen?"
|
|
||||||
|
|
||||||
#: mod/videos.php:125
|
|
||||||
msgid "Delete Video"
|
|
||||||
msgstr "Video Löschen"
|
|
||||||
|
|
||||||
#: mod/videos.php:204
|
|
||||||
msgid "No videos selected"
|
|
||||||
msgstr "Keine Videos ausgewählt"
|
|
||||||
|
|
||||||
#: mod/videos.php:396
|
|
||||||
msgid "Recent Videos"
|
|
||||||
msgstr "Neueste Videos"
|
|
||||||
|
|
||||||
#: mod/videos.php:398
|
|
||||||
msgid "Upload New Videos"
|
|
||||||
msgstr "Neues Video hochladen"
|
|
||||||
|
|
||||||
#: mod/viewcontacts.php:72
|
|
||||||
msgid "No contacts."
|
|
||||||
msgstr "Keine Kontakte."
|
|
||||||
|
|
||||||
#: object/Item.php:370
|
#: object/Item.php:370
|
||||||
msgid "via"
|
msgid "via"
|
||||||
msgstr "via"
|
msgstr "via"
|
||||||
|
|
|
@ -271,18 +271,6 @@ $a->strings["Advanced Profile Settings"] = "Erweiterte Profil-Einstellungen";
|
||||||
$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite";
|
$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite";
|
||||||
$a->strings["(no subject)"] = "(kein Betreff)";
|
$a->strings["(no subject)"] = "(kein Betreff)";
|
||||||
$a->strings["noreply"] = "noreply";
|
$a->strings["noreply"] = "noreply";
|
||||||
$a->strings["stopped following"] = "wird nicht mehr gefolgt";
|
|
||||||
$a->strings["View Profile"] = "Profil anschauen";
|
|
||||||
$a->strings["View Status"] = "Pinnwand anschauen";
|
|
||||||
$a->strings["View Photos"] = "Bilder anschauen";
|
|
||||||
$a->strings["Network Posts"] = "Netzwerkbeiträge";
|
|
||||||
$a->strings["View Contact"] = "Kontakt anzeigen";
|
|
||||||
$a->strings["Drop Contact"] = "Kontakt löschen";
|
|
||||||
$a->strings["Send PM"] = "Private Nachricht senden";
|
|
||||||
$a->strings["Poke"] = "Anstupsen";
|
|
||||||
$a->strings["Organisation"] = "Organisation";
|
|
||||||
$a->strings["News"] = "Nachrichten";
|
|
||||||
$a->strings["Forum"] = "Forum";
|
|
||||||
$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
|
$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
|
||||||
$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
|
$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
|
||||||
$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
|
$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
|
||||||
|
@ -318,6 +306,13 @@ $a->strings["Please wait"] = "Bitte warten";
|
||||||
$a->strings["remove"] = "löschen";
|
$a->strings["remove"] = "löschen";
|
||||||
$a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
|
$a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
|
||||||
$a->strings["Follow Thread"] = "Folge der Unterhaltung";
|
$a->strings["Follow Thread"] = "Folge der Unterhaltung";
|
||||||
|
$a->strings["View Status"] = "Pinnwand anschauen";
|
||||||
|
$a->strings["View Profile"] = "Profil anschauen";
|
||||||
|
$a->strings["View Photos"] = "Bilder anschauen";
|
||||||
|
$a->strings["Network Posts"] = "Netzwerkbeiträge";
|
||||||
|
$a->strings["View Contact"] = "Kontakt anzeigen";
|
||||||
|
$a->strings["Send PM"] = "Private Nachricht senden";
|
||||||
|
$a->strings["Poke"] = "Anstupsen";
|
||||||
$a->strings["%s likes this."] = "%s mag das.";
|
$a->strings["%s likes this."] = "%s mag das.";
|
||||||
$a->strings["%s doesn't like this."] = "%s mag das nicht.";
|
$a->strings["%s doesn't like this."] = "%s mag das nicht.";
|
||||||
$a->strings["%s attends."] = "%s nimmt teil.";
|
$a->strings["%s attends."] = "%s nimmt teil.";
|
||||||
|
@ -719,6 +714,11 @@ $a->strings["comment"] = array(
|
||||||
);
|
);
|
||||||
$a->strings["post"] = "Beitrag";
|
$a->strings["post"] = "Beitrag";
|
||||||
$a->strings["Item filed"] = "Beitrag abgelegt";
|
$a->strings["Item filed"] = "Beitrag abgelegt";
|
||||||
|
$a->strings["stopped following"] = "wird nicht mehr gefolgt";
|
||||||
|
$a->strings["Drop Contact"] = "Kontakt löschen";
|
||||||
|
$a->strings["Organisation"] = "Organisation";
|
||||||
|
$a->strings["News"] = "Nachrichten";
|
||||||
|
$a->strings["Forum"] = "Forum";
|
||||||
$a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
|
$a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
|
||||||
$a->strings["Access denied."] = "Zugriff verweigert.";
|
$a->strings["Access denied."] = "Zugriff verweigert.";
|
||||||
$a->strings["Welcome to %s"] = "Willkommen zu %s";
|
$a->strings["Welcome to %s"] = "Willkommen zu %s";
|
||||||
|
@ -1797,6 +1797,16 @@ $a->strings["Confirm:"] = "Bestätigen:";
|
||||||
$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@\$sitename</strong>' sein.";
|
$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@\$sitename</strong>' sein.";
|
||||||
$a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
|
$a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
|
||||||
$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz";
|
$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz";
|
||||||
|
$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?";
|
||||||
|
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
|
||||||
|
$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
|
||||||
|
$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
|
||||||
|
$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?";
|
||||||
|
$a->strings["Delete Video"] = "Video Löschen";
|
||||||
|
$a->strings["No videos selected"] = "Keine Videos ausgewählt";
|
||||||
|
$a->strings["Recent Videos"] = "Neueste Videos";
|
||||||
|
$a->strings["Upload New Videos"] = "Neues Video hochladen";
|
||||||
|
$a->strings["No contacts."] = "Keine Kontakte.";
|
||||||
$a->strings["Display"] = "Anzeige";
|
$a->strings["Display"] = "Anzeige";
|
||||||
$a->strings["Social Networks"] = "Soziale Netzwerke";
|
$a->strings["Social Networks"] = "Soziale Netzwerke";
|
||||||
$a->strings["Connected apps"] = "Verbundene Programme";
|
$a->strings["Connected apps"] = "Verbundene Programme";
|
||||||
|
@ -1874,6 +1884,7 @@ $a->strings["Don't show notices"] = "Info-Popups nicht anzeigen";
|
||||||
$a->strings["Infinite scroll"] = "Endloses Scrollen";
|
$a->strings["Infinite scroll"] = "Endloses Scrollen";
|
||||||
$a->strings["Automatic updates only at the top of the network page"] = "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist.";
|
$a->strings["Automatic updates only at the top of the network page"] = "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist.";
|
||||||
$a->strings["Bandwith Saver Mode"] = "Bandbreiten-Spar-Modus";
|
$a->strings["Bandwith Saver Mode"] = "Bandbreiten-Spar-Modus";
|
||||||
|
$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden.";
|
||||||
$a->strings["General Theme Settings"] = "Allgemeine Themeneinstellungen";
|
$a->strings["General Theme Settings"] = "Allgemeine Themeneinstellungen";
|
||||||
$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme Einstellungen";
|
$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme Einstellungen";
|
||||||
$a->strings["Content Settings"] = "Einstellungen zum Inhalt";
|
$a->strings["Content Settings"] = "Einstellungen zum Inhalt";
|
||||||
|
@ -1965,16 +1976,6 @@ $a->strings["Change the behaviour of this account for special situations"] = "Ve
|
||||||
$a->strings["Relocate"] = "Umziehen";
|
$a->strings["Relocate"] = "Umziehen";
|
||||||
$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button.";
|
$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button.";
|
||||||
$a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden";
|
$a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden";
|
||||||
$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?";
|
|
||||||
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
|
|
||||||
$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
|
|
||||||
$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
|
|
||||||
$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?";
|
|
||||||
$a->strings["Delete Video"] = "Video Löschen";
|
|
||||||
$a->strings["No videos selected"] = "Keine Videos ausgewählt";
|
|
||||||
$a->strings["Recent Videos"] = "Neueste Videos";
|
|
||||||
$a->strings["Upload New Videos"] = "Neues Video hochladen";
|
|
||||||
$a->strings["No contacts."] = "Keine Kontakte.";
|
|
||||||
$a->strings["via"] = "via";
|
$a->strings["via"] = "via";
|
||||||
$a->strings["Repeat the image"] = "Bild wiederholen";
|
$a->strings["Repeat the image"] = "Bild wiederholen";
|
||||||
$a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen.";
|
$a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen.";
|
||||||
|
|
Loading…
Reference in a new issue