This commit is contained in:
friendica 2012-09-16 19:20:40 -07:00
commit 59d98647fb
22 changed files with 305 additions and 143 deletions

View file

@ -22,8 +22,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-09-13 10:00-0700\n" "POT-Creation-Date: 2012-09-15 10:00-0700\n"
"PO-Revision-Date: 2012-09-15 08:34+0000\n" "PO-Revision-Date: 2012-09-16 08:41+0000\n"
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -191,7 +191,7 @@ msgstr "Neues Foto von dieser URL"
#: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/theme.php:757
#: ../../view/theme/diabook/config.php:190 #: ../../view/theme/diabook/config.php:190
#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
#: ../../include/conversation.php:591 ../../object/Item.php:532 #: ../../include/conversation.php:601 ../../object/Item.php:532
msgid "Submit" msgid "Submit"
msgstr "Senden" msgstr "Senden"
@ -251,7 +251,7 @@ msgid "link to source"
msgstr "Link zum Originalbeitrag" msgstr "Link zum Originalbeitrag"
#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
#: ../../include/nav.php:52 ../../boot.php:1683 #: ../../include/nav.php:52 ../../boot.php:1689
msgid "Events" msgid "Events"
msgstr "Veranstaltungen" msgstr "Veranstaltungen"
@ -389,7 +389,7 @@ msgstr "Ja"
msgid "No" msgid "No"
msgstr "Nein" msgstr "Nein"
#: ../../mod/photos.php:46 ../../boot.php:1676 #: ../../mod/photos.php:46 ../../boot.php:1682
msgid "Photo Albums" msgid "Photo Albums"
msgstr "Fotoalben" msgstr "Fotoalben"
@ -419,8 +419,8 @@ msgstr "Kontaktinformationen nicht verfügbar"
#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305 #: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111 #: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318 #: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
#: ../../include/user.php:325 ../../include/user.php:332 #: ../../include/user.php:331 ../../include/user.php:338
msgid "Profile Photos" msgid "Profile Photos"
msgstr "Profilbilder" msgstr "Profilbilder"
@ -593,51 +593,51 @@ msgid ""
msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
#: ../../mod/photos.php:1356 ../../mod/content.php:665 #: ../../mod/photos.php:1356 ../../mod/content.php:665
#: ../../include/conversation.php:565 ../../object/Item.php:185 #: ../../include/conversation.php:575 ../../object/Item.php:185
msgid "I like this (toggle)" msgid "I like this (toggle)"
msgstr "Ich mag das (toggle)" msgstr "Ich mag das (toggle)"
#: ../../mod/photos.php:1357 ../../mod/content.php:666 #: ../../mod/photos.php:1357 ../../mod/content.php:666
#: ../../include/conversation.php:566 ../../object/Item.php:186 #: ../../include/conversation.php:576 ../../object/Item.php:186
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "Ich mag das nicht (toggle)" msgstr "Ich mag das nicht (toggle)"
#: ../../mod/photos.php:1358 ../../include/conversation.php:1214 #: ../../mod/photos.php:1358 ../../include/conversation.php:1244
msgid "Share" msgid "Share"
msgstr "Teilen" msgstr "Teilen"
#: ../../mod/photos.php:1359 ../../mod/editpost.php:112 #: ../../mod/photos.php:1359 ../../mod/editpost.php:112
#: ../../mod/content.php:482 ../../mod/content.php:843 #: ../../mod/content.php:482 ../../mod/content.php:843
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:481 ../../include/conversation.php:659 #: ../../mod/message.php:481 ../../include/conversation.php:671
#: ../../include/conversation.php:891 ../../include/conversation.php:1233 #: ../../include/conversation.php:921 ../../include/conversation.php:1263
#: ../../object/Item.php:237 #: ../../object/Item.php:237
msgid "Please wait" msgid "Please wait"
msgstr "Bitte warten" msgstr "Bitte warten"
#: ../../mod/photos.php:1375 ../../mod/photos.php:1416 #: ../../mod/photos.php:1375 ../../mod/photos.php:1416
#: ../../mod/photos.php:1448 ../../mod/content.php:688 #: ../../mod/photos.php:1448 ../../mod/content.php:688
#: ../../include/conversation.php:588 ../../object/Item.php:529 #: ../../include/conversation.php:598 ../../object/Item.php:529
msgid "This is you" msgid "This is you"
msgstr "Das bist du" msgstr "Das bist du"
#: ../../mod/photos.php:1377 ../../mod/photos.php:1418 #: ../../mod/photos.php:1377 ../../mod/photos.php:1418
#: ../../mod/photos.php:1450 ../../mod/content.php:690 #: ../../mod/photos.php:1450 ../../mod/content.php:690
#: ../../include/conversation.php:590 ../../boot.php:574 #: ../../include/conversation.php:600 ../../boot.php:574
#: ../../object/Item.php:531 #: ../../object/Item.php:531
msgid "Comment" msgid "Comment"
msgstr "Kommentar" msgstr "Kommentar"
#: ../../mod/photos.php:1379 ../../mod/editpost.php:133 #: ../../mod/photos.php:1379 ../../mod/editpost.php:133
#: ../../mod/content.php:700 ../../include/conversation.php:600 #: ../../mod/content.php:700 ../../include/conversation.php:610
#: ../../include/conversation.php:1251 ../../object/Item.php:541 #: ../../include/conversation.php:1281 ../../object/Item.php:541
msgid "Preview" msgid "Preview"
msgstr "Vorschau" msgstr "Vorschau"
#: ../../mod/photos.php:1479 ../../mod/content.php:439 #: ../../mod/photos.php:1479 ../../mod/content.php:439
#: ../../mod/content.php:721 ../../mod/settings.php:606 #: ../../mod/content.php:721 ../../mod/settings.php:606
#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694
#: ../../include/conversation.php:440 ../../include/conversation.php:847 #: ../../include/conversation.php:440 ../../include/conversation.php:874
#: ../../object/Item.php:116 #: ../../object/Item.php:116
msgid "Delete" msgid "Delete"
msgstr "Löschen" msgstr "Löschen"
@ -704,7 +704,7 @@ msgstr "Beitrag nicht gefunden"
msgid "Edit post" msgid "Edit post"
msgstr "Beitrag bearbeiten" msgstr "Beitrag bearbeiten"
#: ../../mod/editpost.php:88 ../../include/conversation.php:1200 #: ../../mod/editpost.php:88 ../../include/conversation.php:1230
msgid "Post to Email" msgid "Post to Email"
msgstr "An E-Mail senden" msgstr "An E-Mail senden"
@ -716,17 +716,17 @@ msgstr "Bearbeiten"
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:478 #: ../../mod/message.php:291 ../../mod/message.php:478
#: ../../include/conversation.php:1215 #: ../../include/conversation.php:1245
msgid "Upload photo" msgid "Upload photo"
msgstr "Foto hochladen" msgstr "Foto hochladen"
#: ../../mod/editpost.php:105 ../../include/conversation.php:1217 #: ../../mod/editpost.php:105 ../../include/conversation.php:1247
msgid "Attach file" msgid "Attach file"
msgstr "Datei anhängen" msgstr "Datei anhängen"
#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:479 #: ../../mod/message.php:292 ../../mod/message.php:479
#: ../../include/conversation.php:1219 #: ../../include/conversation.php:1249
msgid "Insert web link" msgid "Insert web link"
msgstr "einen Link einfügen" msgstr "einen Link einfügen"
@ -742,35 +742,35 @@ msgstr "Vorbis [.ogg] Video einfügen"
msgid "Insert Vorbis [.ogg] audio" msgid "Insert Vorbis [.ogg] audio"
msgstr "Vorbis [.ogg] Audio einfügen" msgstr "Vorbis [.ogg] Audio einfügen"
#: ../../mod/editpost.php:110 ../../include/conversation.php:1225 #: ../../mod/editpost.php:110 ../../include/conversation.php:1255
msgid "Set your location" msgid "Set your location"
msgstr "Deinen Standort festlegen" msgstr "Deinen Standort festlegen"
#: ../../mod/editpost.php:111 ../../include/conversation.php:1227 #: ../../mod/editpost.php:111 ../../include/conversation.php:1257
msgid "Clear browser location" msgid "Clear browser location"
msgstr "Browser-Standort leeren" msgstr "Browser-Standort leeren"
#: ../../mod/editpost.php:113 ../../include/conversation.php:1234 #: ../../mod/editpost.php:113 ../../include/conversation.php:1264
msgid "Permission settings" msgid "Permission settings"
msgstr "Berechtigungseinstellungen" msgstr "Berechtigungseinstellungen"
#: ../../mod/editpost.php:121 ../../include/conversation.php:1243 #: ../../mod/editpost.php:121 ../../include/conversation.php:1273
msgid "CC: email addresses" msgid "CC: email addresses"
msgstr "Cc:-E-Mail-Addressen" msgstr "Cc:-E-Mail-Addressen"
#: ../../mod/editpost.php:122 ../../include/conversation.php:1244 #: ../../mod/editpost.php:122 ../../include/conversation.php:1274
msgid "Public post" msgid "Public post"
msgstr "Öffentlicher Beitrag" msgstr "Öffentlicher Beitrag"
#: ../../mod/editpost.php:125 ../../include/conversation.php:1230 #: ../../mod/editpost.php:125 ../../include/conversation.php:1260
msgid "Set title" msgid "Set title"
msgstr "Titel setzen" msgstr "Titel setzen"
#: ../../mod/editpost.php:127 ../../include/conversation.php:1232 #: ../../mod/editpost.php:127 ../../include/conversation.php:1262
msgid "Categories (comma-separated list)" msgid "Categories (comma-separated list)"
msgstr "Kategorien (kommasepariert)" msgstr "Kategorien (kommasepariert)"
#: ../../mod/editpost.php:128 ../../include/conversation.php:1246 #: ../../mod/editpost.php:128 ../../include/conversation.php:1276
msgid "Example: bob@example.com, mary@example.com" msgid "Example: bob@example.com, mary@example.com"
msgstr "Z.B.: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com"
@ -1313,31 +1313,31 @@ msgid "Group: "
msgstr "Gruppe: " msgstr "Gruppe: "
#: ../../mod/content.php:438 ../../mod/content.php:720 #: ../../mod/content.php:438 ../../mod/content.php:720
#: ../../include/conversation.php:439 ../../include/conversation.php:846 #: ../../include/conversation.php:439 ../../include/conversation.php:873
#: ../../object/Item.php:115 #: ../../object/Item.php:115
msgid "Select" msgid "Select"
msgstr "Auswählen" msgstr "Auswählen"
#: ../../mod/content.php:455 ../../mod/content.php:813 #: ../../mod/content.php:455 ../../mod/content.php:813
#: ../../mod/content.php:814 ../../include/conversation.php:627 #: ../../mod/content.php:814 ../../include/conversation.php:639
#: ../../include/conversation.php:628 ../../include/conversation.php:863 #: ../../include/conversation.php:640 ../../include/conversation.php:890
#: ../../object/Item.php:206 ../../object/Item.php:207 #: ../../object/Item.php:206 ../../object/Item.php:207
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "Das Profil von %s auf %s betrachten." msgstr "Das Profil von %s auf %s betrachten."
#: ../../mod/content.php:465 ../../mod/content.php:825 #: ../../mod/content.php:465 ../../mod/content.php:825
#: ../../include/conversation.php:641 ../../include/conversation.php:874 #: ../../include/conversation.php:653 ../../include/conversation.php:904
#: ../../object/Item.php:219 #: ../../object/Item.php:219
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "%s von %s" msgstr "%s von %s"
#: ../../mod/content.php:480 ../../include/conversation.php:889 #: ../../mod/content.php:480 ../../include/conversation.php:919
msgid "View in context" msgid "View in context"
msgstr "Im Zusammenhang betrachten" msgstr "Im Zusammenhang betrachten"
#: ../../mod/content.php:586 ../../include/conversation.php:668 #: ../../mod/content.php:586 ../../include/conversation.php:680
#: ../../object/Item.php:256 #: ../../object/Item.php:256
#, php-format #, php-format
msgid "%d comment" msgid "%d comment"
@ -1347,92 +1347,92 @@ msgstr[1] "%d Kommentare"
#: ../../mod/content.php:587 ../../addon/page/page.php:76 #: ../../mod/content.php:587 ../../addon/page/page.php:76
#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
#: ../../include/contact_widgets.php:195 ../../include/conversation.php:669 #: ../../include/contact_widgets.php:195 ../../include/conversation.php:681
#: ../../boot.php:575 ../../object/Item.php:257 #: ../../boot.php:575 ../../object/Item.php:257
msgid "show more" msgid "show more"
msgstr "mehr anzeigen" msgstr "mehr anzeigen"
#: ../../mod/content.php:665 ../../include/conversation.php:565 #: ../../mod/content.php:665 ../../include/conversation.php:575
#: ../../object/Item.php:185 #: ../../object/Item.php:185
msgid "like" msgid "like"
msgstr "mag ich" msgstr "mag ich"
#: ../../mod/content.php:666 ../../include/conversation.php:566 #: ../../mod/content.php:666 ../../include/conversation.php:576
#: ../../object/Item.php:186 #: ../../object/Item.php:186
msgid "dislike" msgid "dislike"
msgstr "mag ich nicht" msgstr "mag ich nicht"
#: ../../mod/content.php:668 ../../include/conversation.php:568 #: ../../mod/content.php:668 ../../include/conversation.php:578
#: ../../object/Item.php:188 #: ../../object/Item.php:188
msgid "Share this" msgid "Share this"
msgstr "Weitersagen" msgstr "Weitersagen"
#: ../../mod/content.php:668 ../../include/conversation.php:568 #: ../../mod/content.php:668 ../../include/conversation.php:578
#: ../../object/Item.php:188 #: ../../object/Item.php:188
msgid "share" msgid "share"
msgstr "Teilen" msgstr "Teilen"
#: ../../mod/content.php:692 ../../include/conversation.php:592 #: ../../mod/content.php:692 ../../include/conversation.php:602
#: ../../object/Item.php:533 #: ../../object/Item.php:533
msgid "Bold" msgid "Bold"
msgstr "Fett" msgstr "Fett"
#: ../../mod/content.php:693 ../../include/conversation.php:593 #: ../../mod/content.php:693 ../../include/conversation.php:603
#: ../../object/Item.php:534 #: ../../object/Item.php:534
msgid "Italic" msgid "Italic"
msgstr "Kursiv" msgstr "Kursiv"
#: ../../mod/content.php:694 ../../include/conversation.php:594 #: ../../mod/content.php:694 ../../include/conversation.php:604
#: ../../object/Item.php:535 #: ../../object/Item.php:535
msgid "Underline" msgid "Underline"
msgstr "Unterstrichen" msgstr "Unterstrichen"
#: ../../mod/content.php:695 ../../include/conversation.php:595 #: ../../mod/content.php:695 ../../include/conversation.php:605
#: ../../object/Item.php:536 #: ../../object/Item.php:536
msgid "Quote" msgid "Quote"
msgstr "Zitat" msgstr "Zitat"
#: ../../mod/content.php:696 ../../include/conversation.php:596 #: ../../mod/content.php:696 ../../include/conversation.php:606
#: ../../object/Item.php:537 #: ../../object/Item.php:537
msgid "Code" msgid "Code"
msgstr "Code" msgstr "Code"
#: ../../mod/content.php:697 ../../include/conversation.php:597 #: ../../mod/content.php:697 ../../include/conversation.php:607
#: ../../object/Item.php:538 #: ../../object/Item.php:538
msgid "Image" msgid "Image"
msgstr "Bild" msgstr "Bild"
#: ../../mod/content.php:698 ../../include/conversation.php:598 #: ../../mod/content.php:698 ../../include/conversation.php:608
#: ../../object/Item.php:539 #: ../../object/Item.php:539
msgid "Link" msgid "Link"
msgstr "Verweis" msgstr "Verweis"
#: ../../mod/content.php:699 ../../include/conversation.php:599 #: ../../mod/content.php:699 ../../include/conversation.php:609
#: ../../object/Item.php:540 #: ../../object/Item.php:540
msgid "Video" msgid "Video"
msgstr "Video" msgstr "Video"
#: ../../mod/content.php:733 ../../include/conversation.php:529 #: ../../mod/content.php:733 ../../include/conversation.php:539
#: ../../object/Item.php:169 #: ../../object/Item.php:169
msgid "add star" msgid "add star"
msgstr "markieren" msgstr "markieren"
#: ../../mod/content.php:734 ../../include/conversation.php:530 #: ../../mod/content.php:734 ../../include/conversation.php:540
#: ../../object/Item.php:170 #: ../../object/Item.php:170
msgid "remove star" msgid "remove star"
msgstr "Markierung entfernen" msgstr "Markierung entfernen"
#: ../../mod/content.php:735 ../../include/conversation.php:531 #: ../../mod/content.php:735 ../../include/conversation.php:541
#: ../../object/Item.php:171 #: ../../object/Item.php:171
msgid "toggle star status" msgid "toggle star status"
msgstr "Markierung umschalten" msgstr "Markierung umschalten"
#: ../../mod/content.php:738 ../../include/conversation.php:534 #: ../../mod/content.php:738 ../../include/conversation.php:544
#: ../../object/Item.php:174 #: ../../object/Item.php:174
msgid "starred" msgid "starred"
msgstr "markiert" msgstr "markiert"
#: ../../mod/content.php:739 ../../include/conversation.php:535 #: ../../mod/content.php:739 ../../include/conversation.php:545
#: ../../object/Item.php:175 #: ../../object/Item.php:175
msgid "add tag" msgid "add tag"
msgstr "Tag hinzufügen" msgstr "Tag hinzufügen"
@ -1442,17 +1442,17 @@ msgstr "Tag hinzufügen"
msgid "save to folder" msgid "save to folder"
msgstr "In Ordner speichern" msgstr "In Ordner speichern"
#: ../../mod/content.php:815 ../../include/conversation.php:629 #: ../../mod/content.php:815 ../../include/conversation.php:641
#: ../../object/Item.php:208 #: ../../object/Item.php:208
msgid "to" msgid "to"
msgstr "zu" msgstr "zu"
#: ../../mod/content.php:816 ../../include/conversation.php:630 #: ../../mod/content.php:816 ../../include/conversation.php:642
#: ../../object/Item.php:209 #: ../../object/Item.php:209
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "Wall-to-Wall" msgstr "Wall-to-Wall"
#: ../../mod/content.php:817 ../../include/conversation.php:631 #: ../../mod/content.php:817 ../../include/conversation.php:643
#: ../../object/Item.php:210 #: ../../object/Item.php:210
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "via Wall-To-Wall:" msgstr "via Wall-To-Wall:"
@ -2660,7 +2660,7 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela
msgid "Invalid contact." msgid "Invalid contact."
msgstr "Ungültiger Kontakt." msgstr "Ungültiger Kontakt."
#: ../../mod/notes.php:44 ../../boot.php:1690 #: ../../mod/notes.php:44 ../../boot.php:1696
msgid "Personal Notes" msgid "Personal Notes"
msgstr "Persönliche Notizen" msgstr "Persönliche Notizen"
@ -2704,7 +2704,7 @@ msgstr "Kein Empfänger."
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250 #: ../../mod/message.php:242 ../../mod/message.php:250
#: ../../include/conversation.php:1151 ../../include/conversation.php:1168 #: ../../include/conversation.php:1181 ../../include/conversation.php:1198
msgid "Please enter a link URL:" msgid "Please enter a link URL:"
msgstr "Bitte gib die URL des Links ein:" msgstr "Bitte gib die URL des Links ein:"
@ -2787,7 +2787,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
#: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7 #: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7
#: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1666 #: ../../boot.php:1672
msgid "Profile" msgid "Profile"
msgstr "Profil" msgstr "Profil"
@ -3139,7 +3139,7 @@ msgid "Access denied."
msgstr "Zugriff verweigert." msgstr "Zugriff verweigert."
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
#: ../../include/nav.php:51 ../../boot.php:1673 #: ../../include/nav.php:51 ../../boot.php:1679
msgid "Photos" msgid "Photos"
msgstr "Bilder" msgstr "Bilder"
@ -3654,14 +3654,14 @@ msgid "Allow infinite level threading for items on this site."
msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite." msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite."
#: ../../mod/admin.php:470 #: ../../mod/admin.php:470
msgid "No default permissions for new users" msgid "Private posts by default for new users"
msgstr "Keine Standard-Zugriffsrechte für Beiträge neuer Nutzer" msgstr "Private Beiträge als Standard für neue Nutzer"
#: ../../mod/admin.php:470 #: ../../mod/admin.php:470
msgid "" msgid ""
"New users will have no private permissions set for their posts by default, " "Set default post permissions for all new members to the default privacy "
"making their posts public until they change it." "group rather than public."
msgstr "Neue Benutzer werden keine Voreinstellungen für die Zugriffrechte haben, so dass ihre Beiträge öffentlich sind, bis sie es ändern." msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen."
#: ../../mod/admin.php:472 #: ../../mod/admin.php:472
msgid "Block multiple registrations" msgid "Block multiple registrations"
@ -4426,8 +4426,8 @@ msgstr "sichtbar für jeden"
msgid "Edit visibility" msgid "Edit visibility"
msgstr "Sichtbarkeit bearbeiten" msgstr "Sichtbarkeit bearbeiten"
#: ../../mod/filer.php:29 ../../include/conversation.php:1155 #: ../../mod/filer.php:29 ../../include/conversation.php:1185
#: ../../include/conversation.php:1172 #: ../../include/conversation.php:1202
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "In diesen Ordner verschieben:" msgstr "In diesen Ordner verschieben:"
@ -5007,11 +5007,11 @@ msgstr "Cache leeren"
#: ../../addon/fbpost/fbpost.php:172 #: ../../addon/fbpost/fbpost.php:172
msgid "Facebook Post disabled" msgid "Facebook Post disabled"
msgstr "" msgstr "Nach Facebook senden deaktiviert"
#: ../../addon/fbpost/fbpost.php:199 #: ../../addon/fbpost/fbpost.php:199
msgid "Facebook Post" msgid "Facebook Post"
msgstr "Beitrag auf Facebook" msgstr "Facebook Relai"
#: ../../addon/fbpost/fbpost.php:205 #: ../../addon/fbpost/fbpost.php:205
msgid "Install Facebook Post connector for this account." msgid "Install Facebook Post connector for this account."
@ -7494,7 +7494,7 @@ msgid "Sex Addict"
msgstr "Sexbesessen" msgstr "Sexbesessen"
#: ../../include/profile_selectors.php:42 ../../include/user.php:278 #: ../../include/profile_selectors.php:42 ../../include/user.php:278
#: ../../include/user.php:283 #: ../../include/user.php:282
msgid "Friends" msgid "Friends"
msgstr "Freunde" msgstr "Freunde"
@ -7916,7 +7916,7 @@ msgstr "Abmelden"
msgid "End this session" msgid "End this session"
msgstr "Diese Sitzung beenden" msgstr "Diese Sitzung beenden"
#: ../../include/nav.php:49 ../../boot.php:1659 #: ../../include/nav.php:49 ../../boot.php:1665
msgid "Status" msgid "Status"
msgstr "Status" msgstr "Status"
@ -8528,34 +8528,34 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das
msgid "stopped following" msgid "stopped following"
msgstr "wird nicht mehr gefolgt" msgstr "wird nicht mehr gefolgt"
#: ../../include/Contact.php:220 ../../include/conversation.php:1052 #: ../../include/Contact.php:220 ../../include/conversation.php:1082
msgid "Poke" msgid "Poke"
msgstr "Anstupsen" msgstr "Anstupsen"
#: ../../include/Contact.php:221 ../../include/conversation.php:1046 #: ../../include/Contact.php:221 ../../include/conversation.php:1076
msgid "View Status" msgid "View Status"
msgstr "Pinnwand anschauen" msgstr "Pinnwand anschauen"
#: ../../include/Contact.php:222 ../../include/conversation.php:1047 #: ../../include/Contact.php:222 ../../include/conversation.php:1077
msgid "View Profile" msgid "View Profile"
msgstr "Profil anschauen" msgstr "Profil anschauen"
#: ../../include/Contact.php:223 ../../include/conversation.php:1048 #: ../../include/Contact.php:223 ../../include/conversation.php:1078
msgid "View Photos" msgid "View Photos"
msgstr "Bilder anschauen" msgstr "Bilder anschauen"
#: ../../include/Contact.php:224 ../../include/Contact.php:237 #: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:1049 #: ../../include/conversation.php:1079
msgid "Network Posts" msgid "Network Posts"
msgstr "Netzwerkbeiträge" msgstr "Netzwerkbeiträge"
#: ../../include/Contact.php:225 ../../include/Contact.php:237 #: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:1050 #: ../../include/conversation.php:1080
msgid "Edit Contact" msgid "Edit Contact"
msgstr "Kontakt bearbeiten" msgstr "Kontakt bearbeiten"
#: ../../include/Contact.php:226 ../../include/Contact.php:237 #: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:1051 #: ../../include/conversation.php:1081
msgid "Send PM" msgid "Send PM"
msgstr "Private Nachricht senden" msgstr "Private Nachricht senden"
@ -8573,106 +8573,106 @@ msgstr "Nachricht/Beitrag"
msgid "%1$s marked %2$s's %3$s as favorite" msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
#: ../../include/conversation.php:952 #: ../../include/conversation.php:982
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "Lösche die markierten Beiträge" msgstr "Lösche die markierten Beiträge"
#: ../../include/conversation.php:1110 #: ../../include/conversation.php:1140
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "%s mag das." msgstr "%s mag das."
#: ../../include/conversation.php:1110 #: ../../include/conversation.php:1140
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "%s mag das nicht." msgstr "%s mag das nicht."
#: ../../include/conversation.php:1114 #: ../../include/conversation.php:1144
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this." msgid "<span %1$s>%2$d people</span> like this."
msgstr "<span %1$s>%2$d Leute</span> mögen das." msgstr "<span %1$s>%2$d Leute</span> mögen das."
#: ../../include/conversation.php:1116 #: ../../include/conversation.php:1146
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this." msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "<span %1$s>%2$d Leute</span> mögen das nicht." msgstr "<span %1$s>%2$d Leute</span> mögen das nicht."
#: ../../include/conversation.php:1122 #: ../../include/conversation.php:1152
msgid "and" msgid "and"
msgstr "und" msgstr "und"
#: ../../include/conversation.php:1125 #: ../../include/conversation.php:1155
#, php-format #, php-format
msgid ", and %d other people" msgid ", and %d other people"
msgstr " und %d andere" msgstr " und %d andere"
#: ../../include/conversation.php:1126 #: ../../include/conversation.php:1156
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "%s mögen das." msgstr "%s mögen das."
#: ../../include/conversation.php:1126 #: ../../include/conversation.php:1156
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "%s mögen das nicht." msgstr "%s mögen das nicht."
#: ../../include/conversation.php:1150 ../../include/conversation.php:1167 #: ../../include/conversation.php:1180 ../../include/conversation.php:1197
msgid "Visible to <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "Für <strong>jedermann</strong> sichtbar" msgstr "Für <strong>jedermann</strong> sichtbar"
#: ../../include/conversation.php:1152 ../../include/conversation.php:1169 #: ../../include/conversation.php:1182 ../../include/conversation.php:1199
msgid "Please enter a video link/URL:" msgid "Please enter a video link/URL:"
msgstr "Bitte Link/URL zum Video einfügen:" msgstr "Bitte Link/URL zum Video einfügen:"
#: ../../include/conversation.php:1153 ../../include/conversation.php:1170 #: ../../include/conversation.php:1183 ../../include/conversation.php:1200
msgid "Please enter an audio link/URL:" msgid "Please enter an audio link/URL:"
msgstr "Bitte Link/URL zum Audio einfügen:" msgstr "Bitte Link/URL zum Audio einfügen:"
#: ../../include/conversation.php:1154 ../../include/conversation.php:1171 #: ../../include/conversation.php:1184 ../../include/conversation.php:1201
msgid "Tag term:" msgid "Tag term:"
msgstr "Tag:" msgstr "Tag:"
#: ../../include/conversation.php:1156 ../../include/conversation.php:1173 #: ../../include/conversation.php:1186 ../../include/conversation.php:1203
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "Wo hältst du dich jetzt gerade auf?" msgstr "Wo hältst du dich jetzt gerade auf?"
#: ../../include/conversation.php:1216 #: ../../include/conversation.php:1246
msgid "upload photo" msgid "upload photo"
msgstr "Bild hochladen" msgstr "Bild hochladen"
#: ../../include/conversation.php:1218 #: ../../include/conversation.php:1248
msgid "attach file" msgid "attach file"
msgstr "Datei anhängen" msgstr "Datei anhängen"
#: ../../include/conversation.php:1220 #: ../../include/conversation.php:1250
msgid "web link" msgid "web link"
msgstr "Weblink" msgstr "Weblink"
#: ../../include/conversation.php:1221 #: ../../include/conversation.php:1251
msgid "Insert video link" msgid "Insert video link"
msgstr "Video-Adresse einfügen" msgstr "Video-Adresse einfügen"
#: ../../include/conversation.php:1222 #: ../../include/conversation.php:1252
msgid "video link" msgid "video link"
msgstr "Video-Link" msgstr "Video-Link"
#: ../../include/conversation.php:1223 #: ../../include/conversation.php:1253
msgid "Insert audio link" msgid "Insert audio link"
msgstr "Audio-Adresse einfügen" msgstr "Audio-Adresse einfügen"
#: ../../include/conversation.php:1224 #: ../../include/conversation.php:1254
msgid "audio link" msgid "audio link"
msgstr "Audio-Link" msgstr "Audio-Link"
#: ../../include/conversation.php:1226 #: ../../include/conversation.php:1256
msgid "set location" msgid "set location"
msgstr "Ort setzen" msgstr "Ort setzen"
#: ../../include/conversation.php:1228 #: ../../include/conversation.php:1258
msgid "clear location" msgid "clear location"
msgstr "Ort löschen" msgstr "Ort löschen"
#: ../../include/conversation.php:1235 #: ../../include/conversation.php:1265
msgid "permissions" msgid "permissions"
msgstr "Zugriffsrechte" msgstr "Zugriffsrechte"
@ -8770,18 +8770,18 @@ msgstr "Veranstaltungserinnerungen"
msgid "Events this week:" msgid "Events this week:"
msgstr "Veranstaltungen diese Woche" msgstr "Veranstaltungen diese Woche"
#: ../../boot.php:1662 #: ../../boot.php:1668
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "Statusnachrichten und Beiträge" msgstr "Statusnachrichten und Beiträge"
#: ../../boot.php:1669 #: ../../boot.php:1675
msgid "Profile Details" msgid "Profile Details"
msgstr "Profildetails" msgstr "Profildetails"
#: ../../boot.php:1686 #: ../../boot.php:1692
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "Ereignisse und Kalender" msgstr "Ereignisse und Kalender"
#: ../../boot.php:1693 #: ../../boot.php:1699
msgid "Only You Can See This" msgid "Only You Can See This"
msgstr "Nur du kannst das sehen" msgstr "Nur du kannst das sehen"

View file

@ -803,8 +803,8 @@ $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten V
$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["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar.";
$a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen"; $a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen";
$a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite."; $a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite.";
$a->strings["No default permissions for new users"] = "Keine Standard-Zugriffsrechte für Beiträge neuer Nutzer"; $a->strings["Private posts by default for new users"] = "Private Beiträge als Standard für neue Nutzer";
$a->strings["New users will have no private permissions set for their posts by default, making their posts public until they change it."] = "Neue Benutzer werden keine Voreinstellungen für die Zugriffrechte haben, so dass ihre Beiträge öffentlich sind, bis sie es ändern."; $a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen.";
$a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung"; $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen."; $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen.";
$a->strings["OpenID support"] = "OpenID Unterstützung"; $a->strings["OpenID support"] = "OpenID Unterstützung";
@ -1116,8 +1116,8 @@ $a->strings["Cache Statistics"] = "Cache Statistik";
$a->strings["Number of items"] = "Anzahl der Einträge"; $a->strings["Number of items"] = "Anzahl der Einträge";
$a->strings["Size of the cache"] = "Größe des Caches"; $a->strings["Size of the cache"] = "Größe des Caches";
$a->strings["Delete the whole cache"] = "Cache leeren"; $a->strings["Delete the whole cache"] = "Cache leeren";
$a->strings["Facebook Post disabled"] = ""; $a->strings["Facebook Post disabled"] = "Nach Facebook senden deaktiviert";
$a->strings["Facebook Post"] = "Beitrag auf Facebook"; $a->strings["Facebook Post"] = "Facebook Relai";
$a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren."; $a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren.";
$a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen"; $a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen";
$a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen"; $a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen";

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
<ShortName>Friendika@$nodename</ShortName> <ShortName>Friendica@$nodename</ShortName>
<Description>Search in Friendika@$nodename</Description> <Description>Search in Friendica@$nodename</Description>
<Contact>http://bugs.friendika.com/</Contact> <Contact>http://bugs.friendica.com/</Contact>
<Image height="16" width="16" type="image/png">$baseurl/images/friendika-16.png</Image> <Image height="16" width="16" type="image/png">$baseurl/images/friendica-16.png</Image>
<Image height="64" width="64" type="image/png">$baseurl/images/friendika-64.png</Image> <Image height="64" width="64" type="image/png">$baseurl/images/friendica-64.png</Image>
<Url type="text/html" <Url type="text/html"
template="$baseurl/search?search={searchTerms}"/> template="$baseurl/search?search={searchTerms}"/>
<Url type="application/opensearchdescription+xml" <Url type="application/opensearchdescription+xml"

View file

@ -19,4 +19,5 @@
window.allowGID = $allowgid; window.allowGID = $allowgid;
window.denyCID = $denycid; window.denyCID = $denycid;
window.denyGID = $denygid; window.denyGID = $denygid;
window.aclInit = "true";
</script> </script>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -0,0 +1,11 @@
if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude.toFixed(4);
var lon = position.coords.longitude.toFixed(4);
$j('#jot-coord').val(lat + ', ' + lon);
$j('#profile-nolocation-wrapper').show();
});
}

View file

@ -78,7 +78,7 @@
if( last_popup_menu ) { if( last_popup_menu ) {
if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) { if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) {
last_popup_menu.hide(); last_popup_menu.hide();
if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $j('section').show(); if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show();
last_popup_button.removeClass("selected"); last_popup_button.removeClass("selected");
last_popup_menu = null; last_popup_menu = null;
last_popup_button = null; last_popup_button = null;
@ -100,13 +100,13 @@
if (menu.css("display") == "none") { if (menu.css("display") == "none") {
$j(this).parent().addClass("selected"); $j(this).parent().addClass("selected");
menu.show(); menu.show();
if (menu.attr('id') == "nav-notifications-menu" ) $j('section').hide(); if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').hide();
last_popup_menu = menu; last_popup_menu = menu;
last_popup_button = $j(this).parent(); last_popup_button = $j(this).parent();
} else { } else {
$j(this).parent().removeClass("selected"); $j(this).parent().removeClass("selected");
menu.hide(); menu.hide();
if (menu.attr('id') == "nav-notifications-menu" ) $j('section').show(); if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show();
last_popup_menu = null; last_popup_menu = null;
last_popup_button = null; last_popup_button = null;
} }

File diff suppressed because one or more lines are too long

View file

@ -49,7 +49,7 @@ $j(document).ready(function() {
} }
} }
if(typeof acl=="undefined"){ if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
acl = new ACL( acl = new ACL(
baseurl+"/acl", baseurl+"/acl",
[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ] [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]

File diff suppressed because one or more lines are too long

View file

@ -12,7 +12,7 @@ html {
/* width: 320px;*/ /* width: 320px;*/
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
overflow-x:hidden; /* overflow-x:hidden;*/
} }
body { body {
@ -104,7 +104,7 @@ blockquote {
#panel { #panel {
background-color: ivory; background-color: ivory;
position: absolute; position: absolute;
z-index: 2; /* z-index: 2;*/
width: 30%; width: 30%;
padding: 25px; padding: 25px;
border: 1px solid #444; border: 1px solid #444;
@ -256,7 +256,7 @@ nav .nav-link {
-webkit-box-shadow: 3px 3px 5px #555; -webkit-box-shadow: 3px 3px 5px #555;
box-shadow: 3px 3px 5px #555; box-shadow: 3px 3px 5px #555;
z-index: 10000; z-index: 100;
} }
#network-menu-list { #network-menu-list {
@ -1206,7 +1206,7 @@ input#dfrn-url {
position: absolute; position: absolute;
left: 0px; top:110px; left: 0px; top:110px;
display: none; display: none;
z-index: 10000; /* z-index: 10000;*/
} }
.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none } .wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
.wall-item-photo-menu li a { display: block; padding: 2px; } .wall-item-photo-menu li a { display: block; padding: 2px; }
@ -1236,7 +1236,7 @@ input#dfrn-url {
position: absolute; position: absolute;
left: 75px; left: 75px;
top: 80px; top: 80px;
z-index: 100; /* z-index: 100;*/
} }
.wall-item-wrapper { .wall-item-wrapper {
margin-left:10px; margin-left:10px;
@ -1351,6 +1351,10 @@ input#dfrn-url {
} }
.wall-item-content img { .wall-item-content img {
display: block;
margin-top: 10px;
margin-right: auto;
margin-left: auto;
max-width: 290px; max-width: 290px;
border-radius: 7px; border-radius: 7px;
/* -moz-border-radius: 7px;*/ /* -moz-border-radius: 7px;*/
@ -1415,6 +1419,7 @@ input#dfrn-url {
background-repeat: repeat-x;*/ background-repeat: repeat-x;*/
padding: 5px 5px 0px; padding: 5px 5px 0px;
height: 32px; height: 32px;
} }
.wall-item-author { .wall-item-author {
/* margin-top: 10px;*/ /* margin-top: 10px;*/
@ -2025,7 +2030,7 @@ input#dfrn-url {
position: absolute; position: absolute;
left: -30px; top: 80px; left: -30px; top: 80px;
display: none; display: none;
z-index: 10000; z-index: 101;
/* -moz-box-shadow: 3px 3px 5px #555;*/ /* -moz-box-shadow: 3px 3px 5px #555;*/
-webkit-box-shadow: 3px 3px 5px #555; -webkit-box-shadow: 3px 3px 5px #555;
box-shadow: 3px 3px 5px #555; box-shadow: 3px 3px 5px #555;
@ -3595,7 +3600,13 @@ aside input[type='text'] {
background-image: url('images/globe.png'); background-image: url('images/globe.png');
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.noglobe { background-position: -16px -16px;} /*.noglobe { background-position: -16px -16px;}*/
.icon.noglobe {
display: block; width: 24px; height: 24px;
background-size: 100% 100%;
background-image: url('images/noglobe.png');
background-repeat: no-repeat;
}
.no { background-position: -32px -16px;} .no { background-position: -32px -16px;}
.pause { background-position: -48px -16px;} .pause { background-position: -48px -16px;}
.play { background-position: -64px -16px;} .play { background-position: -64px -16px;}
@ -3810,7 +3821,7 @@ aside input[type='text'] {
max-height:150px; max-height:150px;
background-color:#ffffff; background-color:#ffffff;
overflow:auto; overflow:auto;
z-index:100000; z-index:102;
border:1px solid #cccccc; border:1px solid #cccccc;
} }
.acpopupitem { .acpopupitem {
@ -3884,16 +3895,15 @@ ul.notifications-menu-popup {
display: none; display: none;
width: 10em; width: 10em;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px 0.3em;
list-style: none; list-style: none;
z-index: 100000; right: -60px;
right: -55px;
} }
#nav-notifications-menu { #nav-notifications-menu {
width: 300px; width: 300px;
/* max-height: 400px;*/ /* max-height: 400px;*/
height: auto; height: auto;
overflow-y: scroll;overflow-style:scrollbar; /* overflow-y: scroll;overflow-style:scrollbar;*/
background-color:#FFFFFF; background-color:#FFFFFF;
/* -moz-border-radius: 5px;*/ /* -moz-border-radius: 5px;*/
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
@ -3902,6 +3912,7 @@ ul.notifications-menu-popup {
/* -moz-box-shadow: 3px 3px 5px #555;*/ /* -moz-box-shadow: 3px 3px 5px #555;*/
-webkit-box-shadow: 3px 3px 5px #555; -webkit-box-shadow: 3px 3px 5px #555;
box-shadow: 3px 3px 5px #555; box-shadow: 3px 3px 5px #555;
/* z-index: 103;*/
} }
#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; } #nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
#nav-notifications-menu img { float: left; margin-right: 5px; } #nav-notifications-menu img { float: left; margin-right: 5px; }

View file

@ -4,7 +4,7 @@
* Name: Frost--mobile version * Name: Frost--mobile version
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.11 * Version: Version 0.2.12
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */

View file

@ -19,4 +19,5 @@
window.allowGID = $allowgid; window.allowGID = $allowgid;
window.denyCID = $denycid; window.denyCID = $denycid;
window.denyGID = $denygid; window.denyGID = $denygid;
window.aclInit = "true";
</script> </script>

View file

@ -0,0 +1,84 @@
<!DOCTYPE html>
<html>
<head>
<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
<style>
.panel_wrapper div.current{.overflow: auto; height: auto!important; }
.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
.filebrowser ul{ list-style-type: none; padding:0px; }
.filebrowser.folders a { display: block; padding: 0.3em }
.filebrowser.folders a:hover { background-color: #f0f0ee; }
.filebrowser.files.image { overflow: auto; height: auto; }
.filebrowser.files.image img { height:100px;}
.filebrowser.files.image li { display: block; padding: 5px; float: left; }
.filebrowser.files.image span { display: none;}
.filebrowser.files.file img { height:16px; vertical-align: bottom;}
.filebrowser.files a { display: block; padding: 0.3em}
.filebrowser.files a:hover { background-color: #f0f0ee; }
.filebrowser a { text-decoration: none; }
</style>
<script>
var FileBrowserDialogue = {
init : function () {
// Here goes your code for setting your custom things onLoad.
},
mySubmit : function (URL) {
//var URL = document.my_form.my_field.value;
var win = tinyMCEPopup.getWindowArg("window");
// insert information now
win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
// are we an image browser
if (typeof(win.ImageDialog) != "undefined") {
// we are, so update image dimensions...
if (win.ImageDialog.getImageData)
win.ImageDialog.getImageData();
// ... and preview if necessary
if (win.ImageDialog.showPreviewImage)
win.ImageDialog.showPreviewImage(URL);
}
// close popup window
tinyMCEPopup.close();
}
}
tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
</script>
</head>
<body>
<div class="tabs">
<ul >
<li class="current"><span>FileBrowser</span></li>
</ul>
</div>
<div class="panel_wrapper">
<div id="general_panel" class="panel current">
<div class="filebrowser path">
{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
</div>
<div class="filebrowser folders">
<ul>
{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
</ul>
</div>
<div class="filebrowser files $type">
<ul>
{{ for $files as $f }}
<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
{{ endfor }}
</ul>
</div>
</div>
</div>
<div class="mceActionPanel">
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
</div>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -60,6 +60,8 @@
$jotplugins $jotplugins
</div> </div>
<!-- <span id="jot-display-location" style="display: none;"></span>-->
<div id="profile-rotator-wrapper" style="display: $visitor;" > <div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>

View file

@ -0,0 +1,11 @@
if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude.toFixed(4);
var lon = position.coords.longitude.toFixed(4);
$j('#jot-coord').val(lat + ', ' + lon);
$j('#profile-nolocation-wrapper').show();
});
}

View file

@ -17,7 +17,7 @@ $j(document).ready(function() {
});*/ });*/
if(typeof acl=="undefined"){ if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
acl = new ACL( acl = new ACL(
baseurl+"/acl", baseurl+"/acl",
[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ] [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
@ -935,6 +935,37 @@ function jotAudioURL() {
function jotGetLocation() { function jotGetLocation() {
/* if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude;
var lng = position.coords.longitude;
$j.ajax({
type: 'GET',
url: 'http://nominatim.openstreetmap.org/reverse?format=json&lat='+lat+'&lon='+lng,
jsonp: 'json_callback',
contentType: 'application/json',
dataType: 'jsonp',
success: function(json) {
console.log(json);
var locationDisplay = json.address.building+', '+json.address.city+', '+json.address.state;
$j('#jot-location').val(locationDisplay);
$j('#jot-display-location').html('Location: '+locationDisplay);
$j('#jot-display-location').show();
}
});
});
}
else {
reply = prompt(window.whereAreU, $j('#jot-location').val());
if(reply && reply.length) {
$j('#jot-location').val(reply);
}
}*/
reply = prompt(window.whereAreU, $j('#jot-location').val()); reply = prompt(window.whereAreU, $j('#jot-location').val());
if(reply && reply.length) { if(reply && reply.length) {
$j('#jot-location').val(reply); $j('#jot-location').val(reply);

File diff suppressed because one or more lines are too long

View file

@ -8,7 +8,7 @@
<!-- <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>--> <!-- <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
<div class="nav-button-container nav-menu-link" rel="#system-menu-list"> <div class="nav-button-container nav-menu-link" rel="#system-menu-list">
<a class="system-menu-link nav-link" href="$nav.settings.0" title="Main Menu"> <a class="system-menu-link nav-link" href="$nav.settings.0" title="Main Menu">
<img class="system-menu-link" src="/view/theme/frost/images/menu.png"> <img class="system-menu-link" src="$baseurl/view/theme/frost/images/menu.png">
</a> </a>
<ul id="system-menu-list" class="nav-menu-list"> <ul id="system-menu-list" class="nav-menu-list">
{{ if $nav.login }} {{ if $nav.login }}
@ -57,7 +57,7 @@
<!-- <a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>--> <!-- <a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->
<div class="nav-button-container"> <div class="nav-button-container">
<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"> <a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
<img rel="#nav-notifications-menu" src="/view/theme/frost/images/notifications.png"> <img rel="#nav-notifications-menu" src="$baseurl/view/theme/frost/images/notifications.png">
</a> </a>
<span id="notify-update" class="nav-ajax-left"></span> <span id="notify-update" class="nav-ajax-left"></span>
<ul id="nav-notifications-menu" class="notifications-menu-popup"> <ul id="nav-notifications-menu" class="notifications-menu-popup">
@ -71,7 +71,7 @@
<!-- <a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>--> <!-- <a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list"> <div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
<a class="contacts-menu-link nav-link" href="$nav.contacts.0" title="Contacts"> <a class="contacts-menu-link nav-link" href="$nav.contacts.0" title="Contacts">
<img class="contacts-menu-link" src="/view/theme/frost/images/contacts.png"> <img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png">
</a> </a>
{{ if $nav.introductions }} {{ if $nav.introductions }}
<span id="intro-update" class="nav-ajax-left"></span> <span id="intro-update" class="nav-ajax-left"></span>
@ -95,7 +95,7 @@
<!-- <a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>--> <!-- <a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->
<div class="nav-button-container"> <div class="nav-button-container">
<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" > <a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
<img src="/view/theme/frost/images/message.png"> <img src="$baseurl/view/theme/frost/images/message.png">
</a> </a>
<span id="mail-update" class="nav-ajax-left"></span> <span id="mail-update" class="nav-ajax-left"></span>
</div> </div>
@ -104,7 +104,7 @@
<!-- <a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>--> <!-- <a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
<div class="nav-button-container nav-menu-link" rel="#network-menu-list"> <div class="nav-button-container nav-menu-link" rel="#network-menu-list">
<a class="network-menu-link nav-link" href="$nav.network.0" title="Network"> <a class="network-menu-link nav-link" href="$nav.network.0" title="Network">
<img class="network-menu-link" src="/view/theme/frost/images/network.png"> <img class="network-menu-link" src="$baseurl/view/theme/frost/images/network.png">
</a> </a>
{{ if $nav.network }} {{ if $nav.network }}
<span id="net-update" class="nav-ajax-left"></span> <span id="net-update" class="nav-ajax-left"></span>

View file

@ -1309,6 +1309,10 @@ input#dfrn-url {
} }
.wall-item-content img { .wall-item-content img {
display: block;
margin-top: 10px;
margin-right: auto;
margin-left: auto;
max-width: 100%; max-width: 100%;
} }
@ -3418,7 +3422,13 @@ aside input[type='text'] {
background-image: url('images/globe.png'); background-image: url('images/globe.png');
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.noglobe { background-position: -16px -16px;} /*.noglobe { background-position: -16px -16px;}*/
.icon.noglobe {
display: block; width: 24px; height: 24px;
background-size: 100% 100%;
background-image: url('images/noglobe.png');
background-repeat: no-repeat;
}
.no { background-position: -32px -16px;} .no { background-position: -32px -16px;}
.pause { background-position: -48px -16px;} .pause { background-position: -48px -16px;}
.play { background-position: -64px -16px;} .play { background-position: -64px -16px;}

View file

@ -4,7 +4,7 @@
* Name: Frost * Name: Frost
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.9 * Version: Version 0.2.10
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */