aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/content.tpl2
-rw-r--r--view/en/update_fail_eml.tpl2
-rw-r--r--view/eo/lostpass_eml.tpl2
-rw-r--r--view/eo/messages.po3392
-rw-r--r--view/eo/strings.php288
-rw-r--r--view/event_form.tpl4
-rw-r--r--view/photos_upload.tpl3
-rw-r--r--view/profile_advanced.tpl13
-rw-r--r--view/profile_edit.tpl24
-rw-r--r--view/theme/darkzero-NS/style.css27
-rw-r--r--view/theme/darkzero/style.css31
-rw-r--r--view/theme/diabook/diabook-aerith/style-wide.css38
-rw-r--r--view/theme/diabook/diabook-aerith/style.css57
-rw-r--r--view/theme/diabook/diabook-blue/style-wide.css66
-rw-r--r--view/theme/diabook/diabook-blue/style.css57
-rw-r--r--view/theme/diabook/diabook-dark/style.css57
-rw-r--r--view/theme/diabook/diabook-green/style-wide.css38
-rw-r--r--view/theme/diabook/diabook-green/style.css57
-rw-r--r--view/theme/diabook/diabook-pink/style-wide.css66
-rw-r--r--view/theme/diabook/diabook-pink/style.css57
-rw-r--r--view/theme/diabook/diabook-red/style-wide.css38
-rw-r--r--view/theme/diabook/diabook-red/style.css57
-rw-r--r--view/theme/diabook/directory_item.tpl35
-rw-r--r--view/theme/diabook/jot.tpl2
-rw-r--r--view/theme/diabook/style.css54
-rw-r--r--view/theme/diabook/theme.php2
-rw-r--r--view/theme/dispy/conversation.tpl5
-rw-r--r--view/theme/dispy/dark/style.css10
-rw-r--r--view/theme/dispy/dark/style.less22
-rw-r--r--view/theme/dispy/jot.tpl55
-rw-r--r--view/theme/dispy/light/style.css10
-rw-r--r--view/theme/dispy/light/style.less22
-rw-r--r--view/theme/dispy/wall_item.tpl6
-rw-r--r--view/theme/dispy/wallwall_item.tpl6
-rw-r--r--view/theme/duepuntozero/style.css45
-rw-r--r--view/theme/facepark/screenshot.jpgbin0 -> 76017 bytes
-rw-r--r--view/theme/quattro/Makefile5
-rw-r--r--view/theme/quattro/dark/style.css261
-rw-r--r--view/theme/quattro/green/style.css261
-rw-r--r--view/theme/quattro/icons.less7
-rw-r--r--view/theme/quattro/icons/addon_off.pngbin438 -> 834 bytes
-rw-r--r--view/theme/quattro/icons/addon_on.pngbin428 -> 715 bytes
-rw-r--r--view/theme/quattro/icons/dislike.pngbin0 -> 386 bytes
-rw-r--r--view/theme/quattro/icons/like.pngbin0 -> 388 bytes
-rw-r--r--view/theme/quattro/icons/next.pngbin0 -> 300 bytes
-rw-r--r--view/theme/quattro/icons/prev.pngbin0 -> 336 bytes
-rw-r--r--view/theme/quattro/photo_view.tpl37
-rw-r--r--view/theme/quattro/quattro.less111
-rw-r--r--view/theme/slackr/birthdays_reminder.tpl7
-rw-r--r--view/theme/slackr/style.css11
-rw-r--r--view/theme/testbubble/style.css6
-rw-r--r--view/wall_item.tpl4
-rw-r--r--view/wallwall_item.tpl4
-rw-r--r--view/xrd_host.tpl11
-rw-r--r--view/xrd_person.tpl11
55 files changed, 3638 insertions, 1748 deletions
diff --git a/view/content.tpl b/view/content.tpl
new file mode 100644
index 000000000..466045d39
--- /dev/null
+++ b/view/content.tpl
@@ -0,0 +1,2 @@
+<div id="content-begin"></div>
+<div id="content-end"></div>
diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl
index f68a3dece..548e1a0df 100644
--- a/view/en/update_fail_eml.tpl
+++ b/view/en/update_fail_eml.tpl
@@ -1,5 +1,5 @@
Hey,
-I'm $sitename.
+I'm $sitename;
The friendica developers released update $update recently,
but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and I can't do it alone. Please contact a
diff --git a/view/eo/lostpass_eml.tpl b/view/eo/lostpass_eml.tpl
index aad63b62a..26d1a3c23 100644
--- a/view/eo/lostpass_eml.tpl
+++ b/view/eo/lostpass_eml.tpl
@@ -8,7 +8,7 @@ Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la
sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon.
Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi
-kiu petis lala ŝanĝon.
+kiu petis la ŝanĝon.
Sekvu ĉi tion ligilon por konfirmi vian identecon:
diff --git a/view/eo/messages.po b/view/eo/messages.po
index 390dea96c..26d823d73 100644
--- a/view/eo/messages.po
+++ b/view/eo/messages.po
@@ -9,10 +9,10 @@ msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-05-10 10:00-0700\n"
-"PO-Revision-Date: 2012-05-11 22:39+0000\n"
+"POT-Creation-Date: 2012-06-30 10:00-0700\n"
+"PO-Revision-Date: 2012-07-01 16:55+0000\n"
"Last-Translator: Martin Schmitt <mas@scsy.de>\n"
-"Language-Team: Esperanto (http://www.transifex.net/projects/p/friendica/language/eo/)\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/friendica/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -37,27 +37,28 @@ msgid "Contact update failed."
msgstr "Ĝisdatigo de kontakto malsukcesis."
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
-#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865
-#: ../../mod/editpost.php:10 ../../mod/install.php:171
-#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
-#: ../../mod/settings.php:104 ../../mod/settings.php:521
-#: ../../mod/settings.php:526 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/photos.php:135 ../../mod/photos.php:951
+#: ../../mod/editpost.php:10 ../../mod/install.php:151
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:145
+#: ../../mod/settings.php:106 ../../mod/settings.php:537
+#: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6
#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
#: ../../mod/item.php:140 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
-#: ../../mod/profile_photo.php:163 ../../mod/message.php:44
-#: ../../mod/message.php:96 ../../mod/allfriends.php:9
+#: ../../mod/profile_photo.php:141 ../../mod/profile_photo.php:152
+#: ../../mod/profile_photo.php:165 ../../mod/message.php:45
+#: ../../mod/message.php:97 ../../mod/allfriends.php:9
#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
-#: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:365 ../../mod/delegate.php:6
+#: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:400 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:495
-#: ../../include/items.php:3202 ../../index.php:306
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:508
+#: ../../addon/facebook/facebook.php:514 ../../addon/dav/layout.fnk.php:353
+#: ../../include/items.php:3455 ../../index.php:309
msgid "Permission denied."
msgstr "Malpermesita."
@@ -86,8 +87,8 @@ msgstr "Bonvolu klaki 'malantaŭen' en via retesplorilo <strong>nun</strong> se
msgid "Return to contact editor"
msgstr "Reen al kontakta redaktilo"
-#: ../../mod/crepair.php:148 ../../mod/settings.php:541
-#: ../../mod/settings.php:567 ../../mod/admin.php:643 ../../mod/admin.php:652
+#: ../../mod/crepair.php:148 ../../mod/settings.php:557
+#: ../../mod/settings.php:583 ../../mod/admin.php:659 ../../mod/admin.php:668
msgid "Name"
msgstr "Nomo"
@@ -124,27 +125,33 @@ msgid "New photo from this URL"
msgstr "Nova bildo el tiu adreso"
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958
-#: ../../mod/photos.php:1193 ../../mod/photos.php:1233
-#: ../../mod/photos.php:1273 ../../mod/photos.php:1304
-#: ../../mod/install.php:251 ../../mod/install.php:289
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:322
-#: ../../mod/settings.php:539 ../../mod/settings.php:685
-#: ../../mod/settings.php:746 ../../mod/settings.php:940
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:404
-#: ../../mod/admin.php:640 ../../mod/admin.php:776 ../../mod/admin.php:975
-#: ../../mod/admin.php:1062 ../../mod/profiles.php:534
-#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:597
+#: ../../mod/events.php:436 ../../mod/photos.php:986 ../../mod/photos.php:1057
+#: ../../mod/photos.php:1303 ../../mod/photos.php:1343
+#: ../../mod/photos.php:1383 ../../mod/photos.php:1414
+#: ../../mod/install.php:246 ../../mod/install.php:284
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:343
+#: ../../mod/settings.php:555 ../../mod/settings.php:709
+#: ../../mod/settings.php:770 ../../mod/settings.php:971
+#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:410
+#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792
+#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:569
+#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40
+#: ../../addon/facebook/facebook.php:617
+#: ../../addon/snautofollow/snautofollow.php:64
#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
+#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:208
+#: ../../addon/planets/planets.php:158
#: ../../addon/uhremotestorage/uhremotestorage.php:89
#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
-#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:82
-#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
+#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
+#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
+#: ../../addon/impressum/impressum.php:82
+#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
+#: ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
-#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
+#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
+#: ../../addon/gravatar/gravatar.php:86
#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
#: ../../addon/jappixmini/jappixmini.php:302
#: ../../addon/statusnet/statusnet.php:278
@@ -152,18 +159,18 @@ msgstr "Nova bildo el tiu adreso"
#: ../../addon/statusnet/statusnet.php:318
#: ../../addon/statusnet/statusnet.php:325
#: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:553 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:567 ../../addon/tumblr/tumblr.php:90
#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
-#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
+#: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:387
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:685
+#: ../../view/theme/diabook/theme.php:757
#: ../../view/theme/diabook/config.php:190
#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:555
+#: ../../include/conversation.php:580
msgid "Submit"
msgstr "Sendi"
@@ -171,15 +178,16 @@ msgstr "Sendi"
msgid "Help:"
msgstr "Helpo:"
-#: ../../mod/help.php:34 ../../include/nav.php:86
+#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:116
+#: ../../include/nav.php:86
msgid "Help"
msgstr "Helpo"
-#: ../../mod/help.php:38 ../../index.php:225
+#: ../../mod/help.php:38 ../../index.php:218
msgid "Not Found"
msgstr "Ne trovita"
-#: ../../mod/help.php:41 ../../index.php:228
+#: ../../mod/help.php:41 ../../index.php:221
msgid "Page not found."
msgstr "Paĝo ne trovita"
@@ -188,7 +196,7 @@ msgstr "Paĝo ne trovita"
msgid "File exceeds size limit of %d"
msgstr "Dosiero estas pli granda ol la limito de %d"
-#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
+#: ../../mod/wall_attach.php:99 ../../mod/wall_attach.php:110
msgid "File upload failed."
msgstr "Alŝutado malsukcesis."
@@ -205,84 +213,93 @@ msgstr "Sugesti amikojn"
msgid "Suggest a friend for %s"
msgstr "Sugesti amikon por %s"
-#: ../../mod/events.php:65
-msgid "Event description and start time are required."
-msgstr "Okazo bezonas priskribon kaj startotempon."
+#: ../../mod/events.php:66
+msgid "Event title and start time are required."
+msgstr "Titolo kaj starttempo estas bezonataj por la okazo."
-#: ../../mod/events.php:258
+#: ../../mod/events.php:260
msgid "l, F j"
msgstr "l, F j"
-#: ../../mod/events.php:280
+#: ../../mod/events.php:282
msgid "Edit event"
msgstr "Redakti okazon"
-#: ../../mod/events.php:300 ../../include/text.php:1054
+#: ../../mod/events.php:304 ../../include/text.php:1065
msgid "link to source"
msgstr "ligilo al fonto"
-#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:127
-#: ../../include/nav.php:52 ../../boot.php:1499
+#: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131
+#: ../../include/nav.php:52 ../../boot.php:1559
msgid "Events"
msgstr "Okazoj"
-#: ../../mod/events.php:325
+#: ../../mod/events.php:329
msgid "Create New Event"
msgstr "Krei novan okazon"
-#: ../../mod/events.php:326
+#: ../../mod/events.php:330 ../../addon/dav/layout.fnk.php:154
msgid "Previous"
msgstr "antaŭa"
-#: ../../mod/events.php:327 ../../mod/install.php:210
+#: ../../mod/events.php:331 ../../mod/install.php:205
+#: ../../addon/dav/layout.fnk.php:157
msgid "Next"
msgstr "sekva"
-#: ../../mod/events.php:399
+#: ../../mod/events.php:404
msgid "hour:minute"
msgstr "horo:minuto"
-#: ../../mod/events.php:408
+#: ../../mod/events.php:414
msgid "Event details"
msgstr "Detaloj de okazo"
-#: ../../mod/events.php:409
+#: ../../mod/events.php:415
#, php-format
-msgid "Format is %s %s. Starting date and Description are required."
-msgstr "Formato estas %s %s. Startotempo kaj priskribo estas bezonataj"
+msgid "Format is %s %s. Starting date and Title are required."
+msgstr "Format is %s %s. Titolo kaj starttempo estas bezonataj."
-#: ../../mod/events.php:411
+#: ../../mod/events.php:417
msgid "Event Starts:"
msgstr "Okazo startas:"
-#: ../../mod/events.php:414
+#: ../../mod/events.php:417 ../../mod/events.php:431
+msgid "Required"
+msgstr "Bezonata"
+
+#: ../../mod/events.php:420
msgid "Finish date/time is not known or not relevant"
msgstr "Fina dato/tempo ne estas konata aŭ ne bezonata"
-#: ../../mod/events.php:416
+#: ../../mod/events.php:422
msgid "Event Finishes:"
msgstr "Okazo finas:"
-#: ../../mod/events.php:419
+#: ../../mod/events.php:425
msgid "Adjust for viewer timezone"
msgstr "Agordi al horzono de la leganto"
-#: ../../mod/events.php:421
+#: ../../mod/events.php:427
msgid "Description:"
msgstr "Priskribo"
-#: ../../mod/events.php:423 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1098
+#: ../../mod/events.php:429 ../../include/event.php:40
+#: ../../include/bb2diaspora.php:357 ../../boot.php:1136
msgid "Location:"
msgstr "Loko:"
-#: ../../mod/events.php:425
+#: ../../mod/events.php:431
+msgid "Title:"
+msgstr "Titolo:"
+
+#: ../../mod/events.php:433
msgid "Share this event"
msgstr "Kunhavigi la okazon"
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:818 ../../mod/settings.php:540
-#: ../../mod/settings.php:566 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:556
+#: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45
msgid "Cancel"
msgstr "Nuligi"
@@ -325,249 +342,270 @@ msgid ""
" and/or create new posts for you?"
msgstr "Ĉu rajtigi ĉi tiun programon por atingi viajn afiŝojn kaj kontaktojn kaj/aŭ krei novajn afiŝojn?"
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:806
-#: ../../mod/settings.php:854 ../../mod/settings.php:860
-#: ../../mod/settings.php:868 ../../mod/settings.php:872
-#: ../../mod/settings.php:877 ../../mod/settings.php:883
-#: ../../mod/settings.php:889 ../../mod/settings.php:895
-#: ../../mod/settings.php:931 ../../mod/settings.php:932
-#: ../../mod/settings.php:933 ../../mod/settings.php:934
-#: ../../mod/register.php:532 ../../mod/profiles.php:511
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:833
+#: ../../mod/settings.php:887 ../../mod/settings.php:893
+#: ../../mod/settings.php:901 ../../mod/settings.php:905
+#: ../../mod/settings.php:910 ../../mod/settings.php:916
+#: ../../mod/settings.php:922 ../../mod/settings.php:928
+#: ../../mod/settings.php:958 ../../mod/settings.php:959
+#: ../../mod/settings.php:960 ../../mod/settings.php:961
+#: ../../mod/settings.php:962 ../../mod/register.php:234
+#: ../../mod/profiles.php:546
msgid "Yes"
msgstr "Jes"
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:807
-#: ../../mod/settings.php:854 ../../mod/settings.php:860
-#: ../../mod/settings.php:868 ../../mod/settings.php:872
-#: ../../mod/settings.php:877 ../../mod/settings.php:883
-#: ../../mod/settings.php:889 ../../mod/settings.php:895
-#: ../../mod/settings.php:931 ../../mod/settings.php:932
-#: ../../mod/settings.php:933 ../../mod/settings.php:934
-#: ../../mod/register.php:533 ../../mod/profiles.php:512
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:834
+#: ../../mod/settings.php:887 ../../mod/settings.php:893
+#: ../../mod/settings.php:901 ../../mod/settings.php:905
+#: ../../mod/settings.php:910 ../../mod/settings.php:916
+#: ../../mod/settings.php:922 ../../mod/settings.php:928
+#: ../../mod/settings.php:958 ../../mod/settings.php:959
+#: ../../mod/settings.php:960 ../../mod/settings.php:961
+#: ../../mod/settings.php:962 ../../mod/register.php:235
+#: ../../mod/profiles.php:547
msgid "No"
msgstr "Ne"
-#: ../../mod/photos.php:43 ../../boot.php:1493
+#: ../../mod/photos.php:46 ../../boot.php:1553
msgid "Photo Albums"
msgstr "Bildalbumoj"
-#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
-#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
-#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:526
+#: ../../mod/photos.php:54 ../../mod/photos.php:156 ../../mod/photos.php:965
+#: ../../mod/photos.php:1049 ../../mod/photos.php:1064
+#: ../../mod/photos.php:1492 ../../mod/photos.php:1504
+#: ../../addon/communityhome/communityhome.php:110
+#: ../../view/theme/diabook/theme.php:598
msgid "Contact Photos"
msgstr "Kontaktbildoj"
-#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424
+#: ../../mod/photos.php:61 ../../mod/photos.php:1074 ../../mod/photos.php:1542
msgid "Upload New Photos"
msgstr "Alŝuti novajn bildojn"
-#: ../../mod/photos.php:69 ../../mod/settings.php:20
+#: ../../mod/photos.php:72 ../../mod/settings.php:21
msgid "everybody"
msgstr "ĉiuj"
-#: ../../mod/photos.php:140
+#: ../../mod/photos.php:145
msgid "Contact information unavailable"
msgstr "Kontaktoj informoj ne disponeblas"
-#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950
-#: ../../mod/photos.php:965 ../../mod/register.php:335
-#: ../../mod/register.php:342 ../../mod/register.php:349
-#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
-#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
-#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
+#: ../../mod/photos.php:156 ../../mod/photos.php:660 ../../mod/photos.php:1049
+#: ../../mod/photos.php:1064 ../../mod/profile_photo.php:60
+#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
+#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
+#: ../../mod/profile_photo.php:263
#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:527
+#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:304
+#: ../../include/user.php:311 ../../include/user.php:318
msgid "Profile Photos"
msgstr "Profilbildoj"
-#: ../../mod/photos.php:161
+#: ../../mod/photos.php:166
msgid "Album not found."
msgstr "Albumo ne trovita."
-#: ../../mod/photos.php:179 ../../mod/photos.php:959
+#: ../../mod/photos.php:184 ../../mod/photos.php:1058
msgid "Delete Album"
msgstr "Forviŝi albumon"
-#: ../../mod/photos.php:242 ../../mod/photos.php:1194
+#: ../../mod/photos.php:247 ../../mod/photos.php:1304
msgid "Delete Photo"
msgstr "Forviŝi bildon"
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:591
msgid "was tagged in a"
msgstr "estas markita en"
-#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/photos.php:591 ../../mod/like.php:144 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:498 ../../include/text.php:1305
-#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
+#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1317
+#: ../../include/diaspora.php:1710 ../../include/conversation.php:53
#: ../../include/conversation.php:126
msgid "photo"
msgstr "bildo"
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:591
msgid "by"
msgstr "de"
-#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:696 ../../addon/js_upload/js_upload.php:315
msgid "Image exceeds size limit of "
msgstr "Bildo estas pli granda ol la limito de"
-#: ../../mod/photos.php:639
+#: ../../mod/photos.php:704
msgid "Image file is empty."
msgstr "Bilddosiero estas malplena."
-#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124
-#: ../../mod/wall_upload.php:83
+#: ../../mod/photos.php:736 ../../mod/profile_photo.php:126
+#: ../../mod/wall_upload.php:99
msgid "Unable to process image."
msgstr "Ne eblas procedi la bildon."
-#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257
-#: ../../mod/wall_upload.php:102
+#: ../../mod/photos.php:757 ../../mod/profile_photo.php:259
+#: ../../mod/wall_upload.php:118
msgid "Image upload failed."
msgstr "Alŝuto de bildo malsukcesis."
-#: ../../mod/photos.php:759 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:732 ../../mod/viewcontacts.php:17
+#: ../../mod/photos.php:843 ../../mod/community.php:16
+#: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
msgid "Public access denied."
msgstr "Publika atingo ne permesita."
-#: ../../mod/photos.php:769
+#: ../../mod/photos.php:853
msgid "No photos selected"
msgstr "Neniu bildoj elektita"
-#: ../../mod/photos.php:846
+#: ../../mod/photos.php:932
msgid "Access to this item is restricted."
msgstr "Atingo al tio elemento estas limigita."
-#: ../../mod/photos.php:907
+#: ../../mod/photos.php:996
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr "Vi uzas %1$.2f MB de %2$.2f MB bildkonservejo."
+
+#: ../../mod/photos.php:999
+#, php-format
+msgid "You have used %1$.2f Mbytes of photo storage."
+msgstr "Vi uzas %1$.2f MB de bildkonservejo."
+
+#: ../../mod/photos.php:1005
msgid "Upload Photos"
msgstr "Alŝuti bildojn"
-#: ../../mod/photos.php:910 ../../mod/photos.php:954
+#: ../../mod/photos.php:1009 ../../mod/photos.php:1053
msgid "New album name: "
msgstr "Nomo por nova albumo:"
-#: ../../mod/photos.php:911
+#: ../../mod/photos.php:1010
msgid "or existing album name: "
msgstr "aŭ nomo de estanta albumo:"
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:1011
msgid "Do not show a status post for this upload"
msgstr "Ne kreu statan afiŝon por tio alŝuto."
-#: ../../mod/photos.php:914 ../../mod/photos.php:1189
+#: ../../mod/photos.php:1013 ../../mod/photos.php:1299
msgid "Permissions"
msgstr "Permesoj"
-#: ../../mod/photos.php:969
+#: ../../mod/photos.php:1068
msgid "Edit Album"
msgstr "Redakti albumon"
-#: ../../mod/photos.php:984 ../../mod/photos.php:1407
+#: ../../mod/photos.php:1092 ../../mod/photos.php:1525
msgid "View Photo"
msgstr "Vidi bildon"
-#: ../../mod/photos.php:1019
+#: ../../mod/photos.php:1127
msgid "Permission denied. Access to this item may be restricted."
msgstr "Malpermesita. Atingo al tio elemento eble estas limigita."
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1129
msgid "Photo not available"
msgstr "La bildo ne disponeblas"
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1179
msgid "View photo"
msgstr "Vidi bildon"
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1179
msgid "Edit photo"
msgstr "Redakti bildon"
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1180
msgid "Use as profile photo"
msgstr "Uzi kiel profilbildo"
-#: ../../mod/photos.php:1078 ../../include/conversation.php:480
+#: ../../mod/photos.php:1186 ../../include/conversation.php:490
msgid "Private Message"
msgstr "Privata mesaĝo"
-#: ../../mod/photos.php:1100
+#: ../../mod/photos.php:1208
msgid "View Full Size"
msgstr "Vidi plengrande "
-#: ../../mod/photos.php:1168
+#: ../../mod/photos.php:1276
msgid "Tags: "
msgstr "Markoj:"
-#: ../../mod/photos.php:1171
+#: ../../mod/photos.php:1279
msgid "[Remove any tag]"
msgstr "[Forviŝi iun markon]"
-#: ../../mod/photos.php:1182
+#: ../../mod/photos.php:1289
+msgid "Rotate CW (right)"
+msgstr "Turni horloĝdirekte (dekstren)"
+
+#: ../../mod/photos.php:1290
+msgid "Rotate CCW (left)"
+msgstr "Turni kontraŭhorloĝdirekte (maldekstren)"
+
+#: ../../mod/photos.php:1292
msgid "New album name"
msgstr "Nova nomo de albumo"
-#: ../../mod/photos.php:1185
+#: ../../mod/photos.php:1295
msgid "Caption"
msgstr "Apudskribo"
-#: ../../mod/photos.php:1187
+#: ../../mod/photos.php:1297
msgid "Add a Tag"
msgstr "Aldoni markon"
-#: ../../mod/photos.php:1191
+#: ../../mod/photos.php:1301
msgid ""
"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "Ekzemple: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-#: ../../mod/photos.php:1211 ../../include/conversation.php:529
+#: ../../mod/photos.php:1321 ../../include/conversation.php:554
msgid "I like this (toggle)"
msgstr "Mi ŝatas tion (ŝalti)"
-#: ../../mod/photos.php:1212 ../../include/conversation.php:530
+#: ../../mod/photos.php:1322 ../../include/conversation.php:555
msgid "I don't like this (toggle)"
msgstr "Mi malŝatas tion(ŝalti)"
-#: ../../mod/photos.php:1213 ../../include/conversation.php:964
+#: ../../mod/photos.php:1323 ../../include/conversation.php:993
msgid "Share"
msgstr "Kunhavigi"
-#: ../../mod/photos.php:1214 ../../mod/editpost.php:104
-#: ../../mod/wallmessage.php:145 ../../mod/message.php:213
-#: ../../mod/message.php:405 ../../include/conversation.php:361
-#: ../../include/conversation.php:706 ../../include/conversation.php:983
+#: ../../mod/photos.php:1324 ../../mod/editpost.php:104
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:215
+#: ../../mod/message.php:411 ../../include/conversation.php:371
+#: ../../include/conversation.php:731 ../../include/conversation.php:1012
msgid "Please wait"
msgstr "Bonvolu atendi"
-#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
-#: ../../mod/photos.php:1301 ../../include/conversation.php:552
+#: ../../mod/photos.php:1340 ../../mod/photos.php:1380
+#: ../../mod/photos.php:1411 ../../include/conversation.php:577
msgid "This is you"
msgstr "Tiu estas vi"
-#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
-#: ../../mod/photos.php:1303 ../../include/conversation.php:554
-#: ../../boot.php:512
+#: ../../mod/photos.php:1342 ../../mod/photos.php:1382
+#: ../../mod/photos.php:1413 ../../include/conversation.php:579
+#: ../../boot.php:528
msgid "Comment"
msgstr "Komenti"
-#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
-#: ../../include/conversation.php:564 ../../include/conversation.php:1001
+#: ../../mod/photos.php:1344 ../../mod/editpost.php:125
+#: ../../include/conversation.php:589 ../../include/conversation.php:1030
msgid "Preview"
msgstr "Antaŭrigardi"
-#: ../../mod/photos.php:1331 ../../mod/settings.php:602
-#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:647
-#: ../../include/conversation.php:318 ../../include/conversation.php:584
+#: ../../mod/photos.php:1441 ../../mod/settings.php:618
+#: ../../mod/settings.php:707 ../../mod/group.php:168 ../../mod/admin.php:663
+#: ../../include/conversation.php:328 ../../include/conversation.php:609
msgid "Delete"
msgstr "Forviŝi"
-#: ../../mod/photos.php:1413
+#: ../../mod/photos.php:1531
msgid "View Album"
msgstr "Vidi albumon"
-#: ../../mod/photos.php:1422
+#: ../../mod/photos.php:1540
msgid "Recent Photos"
msgstr "̂Ĵusaj bildoj"
@@ -575,12 +613,12 @@ msgstr "̂Ĵusaj bildoj"
msgid "Not available."
msgstr "Ne disponebla."
-#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:129
+#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:133
#: ../../include/nav.php:101
msgid "Community"
msgstr "Komunumo"
-#: ../../mod/community.php:61 ../../mod/search.php:128
+#: ../../mod/community.php:61 ../../mod/search.php:144
msgid "No results."
msgstr "Nenion trovita."
@@ -624,28 +662,28 @@ msgstr "Elemento ne trovita"
msgid "Edit post"
msgstr "Redakti afiŝon"
-#: ../../mod/editpost.php:80 ../../include/conversation.php:950
+#: ../../mod/editpost.php:80 ../../include/conversation.php:979
msgid "Post to Email"
-msgstr "Sendi tra retpoŝto"
+msgstr "Sendi per retpoŝto"
-#: ../../mod/editpost.php:95 ../../mod/settings.php:601
-#: ../../include/conversation.php:571
+#: ../../mod/editpost.php:95 ../../mod/settings.php:617
+#: ../../include/conversation.php:596
msgid "Edit"
msgstr "Redakti"
#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
-#: ../../mod/message.php:211 ../../mod/message.php:403
-#: ../../include/conversation.php:965
+#: ../../mod/message.php:213 ../../mod/message.php:408
+#: ../../include/conversation.php:994
msgid "Upload photo"
msgstr "Alŝuti bildon"
-#: ../../mod/editpost.php:97 ../../include/conversation.php:967
+#: ../../mod/editpost.php:97 ../../include/conversation.php:996
msgid "Attach file"
msgstr "Kunligi dosieron"
#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
-#: ../../mod/message.php:212 ../../mod/message.php:404
-#: ../../include/conversation.php:969
+#: ../../mod/message.php:214 ../../mod/message.php:409
+#: ../../include/conversation.php:998
msgid "Insert web link"
msgstr "Enmeti retan adreson"
@@ -661,35 +699,35 @@ msgstr "Enmeti videton en formato Vorbis [.ogg]"
msgid "Insert Vorbis [.ogg] audio"
msgstr "Enmeti sonon en formato Vorbis [.ogg]"
-#: ../../mod/editpost.php:102 ../../include/conversation.php:975
+#: ../../mod/editpost.php:102 ../../include/conversation.php:1004
msgid "Set your location"
msgstr "Agordi vian lokon"
-#: ../../mod/editpost.php:103 ../../include/conversation.php:977
+#: ../../mod/editpost.php:103 ../../include/conversation.php:1006
msgid "Clear browser location"
msgstr "Forviŝu retesplorilan lokon"
-#: ../../mod/editpost.php:105 ../../include/conversation.php:984
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1013
msgid "Permission settings"
msgstr "Permesagordoj"
-#: ../../mod/editpost.php:113 ../../include/conversation.php:993
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1022
msgid "CC: email addresses"
msgstr "CC: retpoŝtadresojn"
-#: ../../mod/editpost.php:114 ../../include/conversation.php:994
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1023
msgid "Public post"
msgstr "Publika afiŝo"
-#: ../../mod/editpost.php:117 ../../include/conversation.php:980
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1009
msgid "Set title"
msgstr "Redakti titolon"
-#: ../../mod/editpost.php:119 ../../include/conversation.php:982
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1011
msgid "Categories (comma-separated list)"
msgstr "Kategorioj (disigita per komo)"
-#: ../../mod/editpost.php:120 ../../include/conversation.php:996
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1025
msgid "Example: bob@example.com, mary@example.com"
msgstr "Ekzemple: bob@example.com, mary@example.com"
@@ -697,201 +735,200 @@ msgstr "Ekzemple: bob@example.com, mary@example.com"
msgid "This introduction has already been accepted."
msgstr "Tia prezento jam estas akceptita"
-#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:487
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
msgid "Profile location is not valid or does not contain profile information."
msgstr "La adreso de la profilo ne validas aŭ ne enhavas profilinformojn."
-#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:492
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
msgid "Warning: profile location has no identifiable owner name."
msgstr "Averto: La adreso de la profilo ne enhavas identeblan personan nomon."
-#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:494
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
msgid "Warning: profile location has no profile photo."
msgstr "Averto: La adreso de la profilo ne enhavas bildon."
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:497
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
#, php-format
msgid "%d required parameter was not found at the given location"
msgid_plural "%d required parameters were not found at the given location"
msgstr[0] "%d bezonataj parametroj ne trovita ĉe la donata adreso."
msgstr[1] "%d bezonataj parametroj ne trovita ĉe la donata adreso."
-#: ../../mod/dfrn_request.php:168
+#: ../../mod/dfrn_request.php:170
msgid "Introduction complete."
msgstr "Prezento sukcesis."
-#: ../../mod/dfrn_request.php:192
+#: ../../mod/dfrn_request.php:209
msgid "Unrecoverable protocol error."
msgstr "Neĝustigebla eraro en protokolo."
-#: ../../mod/dfrn_request.php:220
+#: ../../mod/dfrn_request.php:237
msgid "Profile unavailable."
msgstr "Profilo ne estas disponebla."
-#: ../../mod/dfrn_request.php:245
+#: ../../mod/dfrn_request.php:262
#, php-format
msgid "%s has received too many connection requests today."
msgstr "%s hodiaŭ ricevis tro multe da konektpetoj."
-#: ../../mod/dfrn_request.php:246
+#: ../../mod/dfrn_request.php:263
msgid "Spam protection measures have been invoked."
msgstr "Kontraŭspamilo estas aktivita."
-#: ../../mod/dfrn_request.php:247
+#: ../../mod/dfrn_request.php:264
msgid "Friends are advised to please try again in 24 hours."
msgstr "Amikoj, vi bonvolu ripeti post 24 horoj."
-#: ../../mod/dfrn_request.php:309
+#: ../../mod/dfrn_request.php:326
msgid "Invalid locator"
msgstr "Nevalida adreso."
-#: ../../mod/dfrn_request.php:318
+#: ../../mod/dfrn_request.php:335
msgid "Invalid email address."
msgstr "Nevalida repoŝtadreso."
-#: ../../mod/dfrn_request.php:344
+#: ../../mod/dfrn_request.php:361
msgid "This account has not been configured for email. Request failed."
msgstr "La konto ne estas agordita por retpoŝto. La peto malsukcesis."
-#: ../../mod/dfrn_request.php:432
+#: ../../mod/dfrn_request.php:457
msgid "Unable to resolve your name at the provided location."
msgstr "Via nomo ne troveblas al la donita adreso."
-#: ../../mod/dfrn_request.php:445
+#: ../../mod/dfrn_request.php:470
msgid "You have already introduced yourself here."
msgstr "Vi vin jam prezentis tie."
-#: ../../mod/dfrn_request.php:449
+#: ../../mod/dfrn_request.php:474
#, php-format
msgid "Apparently you are already friends with %s."
msgstr "Ŝajnas kvazaŭ vi jam amikiĝis kun %s."
-#: ../../mod/dfrn_request.php:470
+#: ../../mod/dfrn_request.php:495
msgid "Invalid profile URL."
msgstr "Nevalida adreso de profilo."
-#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:23
+#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
msgid "Disallowed profile URL."
msgstr "Malpermesita adreso de profilo."
-#: ../../mod/dfrn_request.php:545 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:122
msgid "Failed to update contact record."
msgstr "Ĝisdatigo de via kontaktrikordo malsukcesis."
-#: ../../mod/dfrn_request.php:566
+#: ../../mod/dfrn_request.php:591
msgid "Your introduction has been sent."
msgstr "Via prezento estas sendita."
-#: ../../mod/dfrn_request.php:619
+#: ../../mod/dfrn_request.php:644
msgid "Please login to confirm introduction."
msgstr "Bonvolu ensaluti por jesigi la prezenton."
-#: ../../mod/dfrn_request.php:633
+#: ../../mod/dfrn_request.php:658
msgid ""
"Incorrect identity currently logged in. Please login to "
"<strong>this</strong> profile."
msgstr "Malĝusta identaĵo ensalutata. Bonvolu ensaluti en <strong>tiun</strong> profilon."
-#: ../../mod/dfrn_request.php:645
+#: ../../mod/dfrn_request.php:669
+msgid "Hide this contact"
+msgstr "Kaŝi tiun kontakton"
+
+#: ../../mod/dfrn_request.php:672
#, php-format
msgid "Welcome home %s."
msgstr "Bonvenon hejme, %s."
-#: ../../mod/dfrn_request.php:646
+#: ../../mod/dfrn_request.php:673
#, php-format
msgid "Please confirm your introduction/connection request to %s."
msgstr "Bonvolu konfirmi vian prezenton / kontaktpeton al %s."
-#: ../../mod/dfrn_request.php:647
+#: ../../mod/dfrn_request.php:674
msgid "Confirm"
msgstr "Konfirmi."
-#: ../../mod/dfrn_request.php:688 ../../include/items.php:2717
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:2881
msgid "[Name Withheld]"
msgstr "[Kaŝita nomo]"
-#: ../../mod/dfrn_request.php:781
+#: ../../mod/dfrn_request.php:808
msgid ""
"Please enter your 'Identity Address' from one of the following supported "
"communications networks:"
msgstr "Bonvolu entajpi vian 'Identecan Adreson' de iu de tiuj subtenataj komunikaj retejoj: "
-#: ../../mod/dfrn_request.php:797
+#: ../../mod/dfrn_request.php:824
msgid "<strike>Connect as an email follower</strike> (Coming soon)"
msgstr "<strike>Konektu kiel retpoŝta sekvanto</strike> (Baldaŭ venos)"
-#: ../../mod/dfrn_request.php:799
+#: ../../mod/dfrn_request.php:826
msgid ""
"If you are not yet a member of the free social web, <a "
"href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public"
" Friendica site and join us today</a>."
msgstr "Se vi ne estas membro de la libra interkona reto, <a href=\"http://dir.friendica.com/siteinfo\">sekvu ĉi-ligilon por trovi publikan Friendica retejon kaj aliĝi kun ni hodiaŭ</a>."
-#: ../../mod/dfrn_request.php:802
+#: ../../mod/dfrn_request.php:829
msgid "Friend/Connection Request"
msgstr "Prezento / Konektpeto"
-#: ../../mod/dfrn_request.php:803
+#: ../../mod/dfrn_request.php:830
msgid ""
"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
"testuser@identi.ca"
msgstr "Ekzemploj: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
-#: ../../mod/dfrn_request.php:804
+#: ../../mod/dfrn_request.php:831
msgid "Please answer the following:"
msgstr "Bonvolu respondi:"
-#: ../../mod/dfrn_request.php:805
+#: ../../mod/dfrn_request.php:832
#, php-format
msgid "Does %s know you?"
msgstr "Ĉu %s konas vin?"
-#: ../../mod/dfrn_request.php:808
+#: ../../mod/dfrn_request.php:835
msgid "Add a personal note:"
msgstr "Aldoni personan noton:"
-#: ../../mod/dfrn_request.php:810 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:837 ../../include/contact_selectors.php:76
msgid "Friendica"
msgstr "Friendica"
-#: ../../mod/dfrn_request.php:811
+#: ../../mod/dfrn_request.php:838
msgid "StatusNet/Federated Social Web"
msgstr "StatusNet/Federaciaj interkonaj retejoj"
-#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:636
+#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:652
#: ../../include/contact_selectors.php:80
msgid "Diaspora"
msgstr "Diaspora"
-#: ../../mod/dfrn_request.php:813
+#: ../../mod/dfrn_request.php:840
#, php-format
msgid ""
" - please do not use this form. Instead, enter %s into your Diaspora search"
" bar."
msgstr " - bonvolu ne uzi ĉi formo. Anstataŭe, entajpu %s en la Diaspora serĉilo."
-#: ../../mod/dfrn_request.php:814
+#: ../../mod/dfrn_request.php:841
msgid "Your Identity Address:"
msgstr "Via identeca adreso:"
-#: ../../mod/dfrn_request.php:817
+#: ../../mod/dfrn_request.php:844
msgid "Submit Request"
msgstr "Sendi peton"
-#: ../../mod/install.php:111
+#: ../../mod/install.php:117
msgid "Friendica Social Communications Server - Setup"
msgstr "Friendica Interkona Komunikada Servilo - Instalo"
-#: ../../mod/install.php:117 ../../mod/install.php:157
-#: ../../mod/install.php:230
-msgid "Database connection"
-msgstr "Datumbaza konekto"
-
-#: ../../mod/install.php:124
+#: ../../mod/install.php:123
msgid "Could not connect to database."
msgstr "Ne eblas konekti la datumbazon."
-#: ../../mod/install.php:128
+#: ../../mod/install.php:127
msgid "Could not create table."
msgstr "Ne eblas krei tabelon."
@@ -899,232 +936,246 @@ msgstr "Ne eblas krei tabelon."
msgid "Your Friendica site database has been installed."
msgstr "La datumbazo de vi Friendica retjo estas instalita."
-#: ../../mod/install.php:134
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "GRAVA: Vi bezonas [mane] agordi planitan taskon por la Friendica poller."
-
-#: ../../mod/install.php:135 ../../mod/install.php:151
-#: ../../mod/install.php:209
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Bonvolu legi la dosieron \"INSTALL.txt\"."
-
-#: ../../mod/install.php:137
-msgid "Proceed to registration"
-msgstr "Pluigi al la registrilo"
-
-#: ../../mod/install.php:143
-msgid "Proceed with Installation"
-msgstr "Pluigi la instalado"
-
-#: ../../mod/install.php:150
+#: ../../mod/install.php:138
msgid ""
"You may need to import the file \"database.sql\" manually using phpmyadmin "
"or mysql."
-msgstr "Vi bezonas mane importi la dosieron \"database.sql\" tra phpmyadmin aŭ mysql."
+msgstr "Vi bezonas mane importi la dosieron \"database.sql\" per phpmyadmin aŭ mysql."
-#: ../../mod/install.php:158
-msgid "Database import failed."
-msgstr "Importo de la datumbazo malsukcesis."
+#: ../../mod/install.php:139 ../../mod/install.php:204
+#: ../../mod/install.php:489
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Bonvolu legi la dosieron \"INSTALL.txt\"."
-#: ../../mod/install.php:206
+#: ../../mod/install.php:201
msgid "System check"
msgstr "Sistema kontrolo"
-#: ../../mod/install.php:211
+#: ../../mod/install.php:206
msgid "Check again"
msgstr "Ree kontroli"
-#: ../../mod/install.php:231
+#: ../../mod/install.php:225
+msgid "Database connection"
+msgstr "Datumbaza konekto"
+
+#: ../../mod/install.php:226
msgid ""
"In order to install Friendica we need to know how to connect to your "
"database."
msgstr "Por instali Friendica, ni bezonas scii kiel konekti al via datumbazo."
-#: ../../mod/install.php:232
+#: ../../mod/install.php:227
msgid ""
"Please contact your hosting provider or site administrator if you have "
"questions about these settings."
msgstr "Bonvolu kontakti vian servilprovizanton aŭ administranton se vi havas demandoj pri ĉi tiaj agordoj."
-#: ../../mod/install.php:233
+#: ../../mod/install.php:228
msgid ""
"The database you specify below should already exist. If it does not, please "
"create it before continuing."
msgstr "La datumbazo nomata malsupren jam ekzistu. Se ĝi ne ekzistas, bonvolu unue krei ĝin antaŭ progresi."
-#: ../../mod/install.php:237
+#: ../../mod/install.php:232
msgid "Database Server Name"
msgstr "Nomo de datumbaza servilo."
-#: ../../mod/install.php:238
+#: ../../mod/install.php:233
msgid "Database Login Name"
msgstr "Salutnomo ĉe la datumbazo."
-#: ../../mod/install.php:239
+#: ../../mod/install.php:234
msgid "Database Login Password"
msgstr "Pasvorto ĉe la datumbazo."
-#: ../../mod/install.php:240
+#: ../../mod/install.php:235
msgid "Database Name"
msgstr "Nomo de la datumbazo."
-#: ../../mod/install.php:241 ../../mod/install.php:280
+#: ../../mod/install.php:236 ../../mod/install.php:275
msgid "Site administrator email address"
msgstr "Retpoŝtadreso de la reteja administranto"
-#: ../../mod/install.php:241 ../../mod/install.php:280
+#: ../../mod/install.php:236 ../../mod/install.php:275
msgid ""
"Your account email address must match this in order to use the web admin "
"panel."
msgstr "La repoŝtadreso de via konto bezonas esti la sama por uzi la TTTa administrilo."
-#: ../../mod/install.php:245 ../../mod/install.php:283
+#: ../../mod/install.php:240 ../../mod/install.php:278
msgid "Please select a default timezone for your website"
msgstr "Bonvolu elekti defaŭltan horzonon por via retejo."
-#: ../../mod/install.php:270
+#: ../../mod/install.php:265
msgid "Site settings"
msgstr "Retejaj agordoj"
-#: ../../mod/install.php:323
+#: ../../mod/install.php:318
msgid "Could not find a command line version of PHP in the web server PATH."
msgstr "Komanda linia versio de PHP ne trovita en $PATH de la retservilo."
-#: ../../mod/install.php:326
+#: ../../mod/install.php:319
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron. See <a "
+"href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
+msgstr "Se vi ne havas komandlinian version de PHP sur la servilo, vi ne eblas plenumi fonan planitan enketon per cron. Bonvolu legi <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
+
+#: ../../mod/install.php:323
msgid "PHP executable path"
msgstr "Vojo de la komanda linia versio de PHP"
-#: ../../mod/install.php:326
-msgid "Enter full path to php executable"
-msgstr "Entajpu plenan vojon al la komanda linia versio de PHP"
+#: ../../mod/install.php:323
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Entajpu la plenan vojon al la php komandodosiero. Vi eblas lasi tion malplena por pluigi la instalado."
-#: ../../mod/install.php:331
+#: ../../mod/install.php:328
msgid "Command line PHP"
msgstr "komanda linia versio de PHP"
-#: ../../mod/install.php:340
+#: ../../mod/install.php:337
msgid ""
"The command line version of PHP on your system does not have "
"\"register_argc_argv\" enabled."
msgstr "En via komanda linia versio de PHP je via sistemo, \"register_argc_argv\" ne estas aktivita."
-#: ../../mod/install.php:341
+#: ../../mod/install.php:338
msgid "This is required for message delivery to work."
msgstr "Tio estas bezonata por la livero de mesaĝoj."
-#: ../../mod/install.php:343
+#: ../../mod/install.php:340
msgid "PHP register_argc_argv"
msgstr "PHP register_argc_argv"
-#: ../../mod/install.php:364
+#: ../../mod/install.php:361
msgid ""
"Error: the \"openssl_pkey_new\" function on this system is not able to "
"generate encryption keys"
msgstr "Eraro: La funkcio \"openssl_pkey_new\" je tia sistemo ne eblas generi ĉifroŝlosilojn."
-#: ../../mod/install.php:365
+#: ../../mod/install.php:362
msgid ""
"If running under Windows, please see "
"\"http://www.php.net/manual/en/openssl.installation.php\"."
msgstr "Se la operaciumo sistemo estas Windows, bonvolu legi: http://www.php.net/manual/en/openssl.installation.php"
-#: ../../mod/install.php:367
+#: ../../mod/install.php:364
msgid "Generate encryption keys"
msgstr "Generi ĉifroŝlosilojn"
-#: ../../mod/install.php:374
+#: ../../mod/install.php:371
msgid "libCurl PHP module"
msgstr "PHP modulo libCurl"
-#: ../../mod/install.php:375
+#: ../../mod/install.php:372
msgid "GD graphics PHP module"
msgstr "PHP modulo GD"
-#: ../../mod/install.php:376
+#: ../../mod/install.php:373
msgid "OpenSSL PHP module"
msgstr "PHP modulo OpenSSL"
-#: ../../mod/install.php:377
+#: ../../mod/install.php:374
msgid "mysqli PHP module"
msgstr "PHP modulo mysqli"
-#: ../../mod/install.php:378
+#: ../../mod/install.php:375
msgid "mb_string PHP module"
msgstr "PHP modulo mb_string"
-#: ../../mod/install.php:383 ../../mod/install.php:385
+#: ../../mod/install.php:380 ../../mod/install.php:382
msgid "Apache mod_rewrite module"
msgstr "Apache mod_rewrite modulo"
-#: ../../mod/install.php:383
+#: ../../mod/install.php:380
msgid ""
"Error: Apache webserver mod-rewrite module is required but not installed."
msgstr "Eraro: La modulo mod_rewrite en la Apache retservilo estas bezonata sed ne instalita."
-#: ../../mod/install.php:390
+#: ../../mod/install.php:388
msgid "Error: libCURL PHP module required but not installed."
msgstr "Eraro: La modulo libCURL en PHP estas bezonata sed ne instalita."
-#: ../../mod/install.php:394
+#: ../../mod/install.php:392
msgid ""
"Error: GD graphics PHP module with JPEG support required but not installed."
msgstr "Eraro: La modulo GD en PHP kun subteno por JPEG estas bezonata sed ne instalita."
-#: ../../mod/install.php:398
+#: ../../mod/install.php:396
msgid "Error: openssl PHP module required but not installed."
msgstr "Eraro: La modulo OpenSSL en PHP estas bezonata sed ne instalita."
-#: ../../mod/install.php:402
+#: ../../mod/install.php:400
msgid "Error: mysqli PHP module required but not installed."
msgstr "Eraro: La modulo mysqli en PHP estas bezonata sed ne instalita."
-#: ../../mod/install.php:406
+#: ../../mod/install.php:404
msgid "Error: mb_string PHP module required but not installed."
msgstr "Eraro: La modulo mb_string en PHP estas bezonata sed ne instalita."
-#: ../../mod/install.php:423
+#: ../../mod/install.php:421
msgid ""
"The web installer needs to be able to create a file called \".htconfig.php\""
" in the top folder of your web server and it is unable to do so."
msgstr "La reta instalilo bezonas skribi dosieron nomata \".htconfig.php\" en la baza dosierujo de la retservilo, sed ne sukcesis."
-#: ../../mod/install.php:424
+#: ../../mod/install.php:422
msgid ""
"This is most often a permission setting, as the web server may not be able "
"to write files in your folder - even if you can."
msgstr "Tio ĉi plej ofte estas agordo rilate al permesoj, ĉar la servilo eble ne povas skribi en via dosierujo, eĉ se vi mem povas skribi."
-#: ../../mod/install.php:425
+#: ../../mod/install.php:423
msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
-msgstr "Bonvolu kontroli la dokumentojn de via servilo aŭ teĥnikiston por ekscii ĉu la situacio ĝustigeblas."
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Friendica top folder."
+msgstr "Post la fino de tiu proceduro, ni donos al vi tekston por konservi en dosiero .htconfig.php en via baza Friendica dosierujo."
-#: ../../mod/install.php:426
+#: ../../mod/install.php:424
msgid ""
-"If not, you may be required to perform a manual installation. Please see the"
-" file \"INSTALL.txt\" for instructions."
-msgstr "Se ne, vi eble bezonas instali mane. Bonvolu legi la dosieron \"INSTALL.txt\" por pluaj instruaĵoj."
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"INSTALL.txt\" for instructions."
+msgstr "Vi ankaŭ povas preterpasi tiun proceduron kaj fari permanan instaladon. Bonvolu legi la dosieron \"INSTALL.txt\" por trovi instrukciojn."
-#: ../../mod/install.php:429
+#: ../../mod/install.php:427
msgid ".htconfig.php is writable"
msgstr ".htconfig.php estas skribebla."
-#: ../../mod/install.php:436
+#: ../../mod/install.php:439
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "Url rewrite en .htaccess ne funkcias. Kontrolu la agordojn de la servilo."
+
+#: ../../mod/install.php:441
+msgid "Url rewrite is working"
+msgstr "URL rewrite funkcias."
+
+#: ../../mod/install.php:451
msgid ""
"The database configuration file \".htconfig.php\" could not be written. "
"Please use the enclosed text to create a configuration file in your web "
"server root."
msgstr "Ne povis skribi la datumbaza agordoj en la dosiero \".htconfig.php\". Bonvolu uzi la inkluzivan tekston por krei agordan dosieron en la baza dosierujo de la retservilo."
-#: ../../mod/install.php:461
+#: ../../mod/install.php:476
msgid "Errors encountered creating database tables."
msgstr "Okazis eraroj dum la kreado de tabeloj en la datumbazo."
+#: ../../mod/install.php:487
+msgid "<h1>What next</h1>"
+msgstr "<h1>Kio sekvas nun?</h1>"
+
+#: ../../mod/install.php:488
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "GRAVA: Vi bezonas [mane] agordi planitan taskon por la Friendica poller."
+
#: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:238
+#: ../../include/bb2diaspora.php:335
msgid "l F d, Y \\@ g:i A"
msgstr "l F d, Y \\@ g:i A"
@@ -1170,11 +1221,11 @@ msgid "is interested in:"
msgstr "interesiĝas pri:"
#: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1042
+#: ../../include/contact_widgets.php:9 ../../boot.php:1080
msgid "Connect"
msgstr "Konekti"
-#: ../../mod/match.php:65 ../../mod/dirfind.php:57
+#: ../../mod/match.php:65 ../../mod/dirfind.php:60
msgid "No matches"
msgstr "Nenio estas trovita"
@@ -1201,8 +1252,8 @@ msgid "Discard"
msgstr "Forviŝi"
#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:296
-#: ../../mod/contacts.php:348
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:316
+#: ../../mod/contacts.php:370
msgid "Ignore"
msgstr "Ignori"
@@ -1214,11 +1265,11 @@ msgstr "Sistemo"
msgid "Network"
msgstr "Reto"
-#: ../../mod/notifications.php:85 ../../mod/network.php:184
+#: ../../mod/notifications.php:85 ../../mod/network.php:300
msgid "Personal"
msgstr "Propra"
-#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:123
+#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:127
#: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home"
msgstr "Hejmo"
@@ -1227,7 +1278,7 @@ msgstr "Hejmo"
msgid "Introductions"
msgstr "Prezentoj"
-#: ../../mod/notifications.php:100 ../../mod/message.php:104
+#: ../../mod/notifications.php:100 ../../mod/message.php:105
#: ../../include/nav.php:128
msgid "Messages"
msgstr "Mesaĝoj"
@@ -1254,7 +1305,7 @@ msgid "suggested by %s"
msgstr "sugestita de %s"
#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:376
msgid "Hide this contact from others"
msgstr "Kaŝi ĉi tiun kontakton al aliaj"
@@ -1267,7 +1318,7 @@ msgid "if applicable"
msgstr "se aplikebla"
#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:645
+#: ../../mod/admin.php:661
msgid "Approve"
msgstr "Aprobi"
@@ -1376,303 +1427,307 @@ msgstr "Ne pli da hejmrilataj atentigoj."
msgid "Home Notifications"
msgstr "Hejmrilataj atentigoj"
-#: ../../mod/contacts.php:63 ../../mod/contacts.php:143
+#: ../../mod/contacts.php:83 ../../mod/contacts.php:163
msgid "Could not access contact record."
msgstr "Ne eblis atingi kontaktrikordo."
-#: ../../mod/contacts.php:77
+#: ../../mod/contacts.php:97
msgid "Could not locate selected profile."
msgstr "Ne trovis elektitan profilon."
-#: ../../mod/contacts.php:100
+#: ../../mod/contacts.php:120
msgid "Contact updated."
msgstr "Kontakto estas ĝisdatigita."
-#: ../../mod/contacts.php:165
+#: ../../mod/contacts.php:185
msgid "Contact has been blocked"
msgstr "Kontakto estas blokita."
-#: ../../mod/contacts.php:165
+#: ../../mod/contacts.php:185
msgid "Contact has been unblocked"
msgstr "Kontakto estas malblokita."
-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:199
msgid "Contact has been ignored"
msgstr "Kontakto estas ignorita."
-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:199
msgid "Contact has been unignored"
msgstr "Kontakto estas malignorita."
-#: ../../mod/contacts.php:195
+#: ../../mod/contacts.php:215
msgid "Contact has been archived"
msgstr "Enarkivigis kontakton"
-#: ../../mod/contacts.php:195
+#: ../../mod/contacts.php:215
msgid "Contact has been unarchived"
msgstr "Elarkivigis kontakton"
-#: ../../mod/contacts.php:208
+#: ../../mod/contacts.php:228
msgid "Contact has been removed."
msgstr "Kontakto estas forigita."
-#: ../../mod/contacts.php:238
+#: ../../mod/contacts.php:258
#, php-format
msgid "You are mutual friends with %s"
msgstr "Vi estas reciproka amiko de %s"
-#: ../../mod/contacts.php:242
+#: ../../mod/contacts.php:262
#, php-format
msgid "You are sharing with %s"
msgstr "Vi kunhavigas kun %s"
-#: ../../mod/contacts.php:247
+#: ../../mod/contacts.php:267
#, php-format
msgid "%s is sharing with you"
msgstr "%s kunhavigas kun vi"
-#: ../../mod/contacts.php:264
+#: ../../mod/contacts.php:284
msgid "Private communications are not available for this contact."
msgstr "Privataj komunikadoj ne disponeblas por ĉi tiu kontakto."
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:287
msgid "Never"
msgstr "Neniam"
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:291
msgid "(Update was successful)"
msgstr "(Ĝisdatigo sukcesis.)"
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:291
msgid "(Update was not successful)"
msgstr "(Ĝisdatigo malsukcesis.)"
-#: ../../mod/contacts.php:273
+#: ../../mod/contacts.php:293
msgid "Suggest friends"
msgstr "Sugesti amikojn"
-#: ../../mod/contacts.php:277
+#: ../../mod/contacts.php:297
#, php-format
msgid "Network type: %s"
msgstr "Reta tipo: %s"
-#: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183
+#: ../../mod/contacts.php:300 ../../include/contact_widgets.php:183
#, php-format
msgid "%d contact in common"
msgid_plural "%d contacts in common"
msgstr[0] "%d komuna kontakto"
msgstr[1] "%d komunaj kontaktoj"
-#: ../../mod/contacts.php:285
+#: ../../mod/contacts.php:305
msgid "View all contacts"
msgstr "Vidi ĉiujn kontaktojn"
-#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:649
+#: ../../mod/contacts.php:310 ../../mod/contacts.php:369
+#: ../../mod/admin.php:665
msgid "Unblock"
msgstr "Malbloki"
-#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:648
+#: ../../mod/contacts.php:310 ../../mod/contacts.php:369
+#: ../../mod/admin.php:664
msgid "Block"
msgstr "Bloki"
-#: ../../mod/contacts.php:293
+#: ../../mod/contacts.php:313
msgid "Toggle Blocked status"
msgstr "Ŝalti/malŝalti Blokitan staton"
-#: ../../mod/contacts.php:296 ../../mod/contacts.php:348
+#: ../../mod/contacts.php:316 ../../mod/contacts.php:370
msgid "Unignore"
msgstr "Malignori"
-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:319
msgid "Toggle Ignored status"
msgstr "Ŝalti/malŝalti Ignoritan staton"
-#: ../../mod/contacts.php:303
+#: ../../mod/contacts.php:323
msgid "Unarchive"
msgstr "Elarkivigi"
-#: ../../mod/contacts.php:303
+#: ../../mod/contacts.php:323
msgid "Archive"
msgstr "Enarkivigi"
-#: ../../mod/contacts.php:306
+#: ../../mod/contacts.php:326
msgid "Toggle Archive status"
msgstr "Ŝalti/malŝalti Enarkivigitan staton"
-#: ../../mod/contacts.php:309
+#: ../../mod/contacts.php:329
msgid "Repair"
msgstr "Ripari"
-#: ../../mod/contacts.php:312
+#: ../../mod/contacts.php:332
msgid "Advanced Contact Settings"
msgstr "Specialaj Kontaktagordoj"
-#: ../../mod/contacts.php:320
+#: ../../mod/contacts.php:338
+msgid "Communications lost with this contact!"
+msgstr "Mi perdis la kommunikadon kun tiu kontakto!"
+
+#: ../../mod/contacts.php:341
msgid "Contact Editor"
msgstr "Kontakta redaktilo."
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:344
msgid "Profile Visibility"
msgstr "Videbleco de profilo"
-#: ../../mod/contacts.php:324
+#: ../../mod/contacts.php:345
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr "Bonvolu elekti la profilon kiu vi volas montri al %s aspektinde kiam sekure aspektante vian profilon."
-#: ../../mod/contacts.php:325
+#: ../../mod/contacts.php:346
msgid "Contact Information / Notes"
msgstr "Kontaktaj informoj / Notoj"
-#: ../../mod/contacts.php:326
+#: ../../mod/contacts.php:347
msgid "Edit contact notes"
msgstr "Redakti kontaktnotojn"
-#: ../../mod/contacts.php:331 ../../mod/contacts.php:522
+#: ../../mod/contacts.php:352 ../../mod/contacts.php:544
#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
#, php-format
msgid "Visit %s's profile [%s]"
msgstr "Viziti la profilon de %s [%s]"
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:353
msgid "Block/Unblock contact"
msgstr "Bloki/Malbloki kontakton"
-#: ../../mod/contacts.php:333
+#: ../../mod/contacts.php:354
msgid "Ignore contact"
msgstr "Ignori kontakton"
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:355
msgid "Repair URL settings"
msgstr "Ripari URL agordoj"
-#: ../../mod/contacts.php:335
+#: ../../mod/contacts.php:356
msgid "View conversations"
msgstr "Vidi konversaciojn"
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:358
msgid "Delete contact"
msgstr "Forviŝi kontakton"
-#: ../../mod/contacts.php:341
+#: ../../mod/contacts.php:362
msgid "Last update:"
msgstr "Plej ĵusa ĝisdatigo:"
-#: ../../mod/contacts.php:342
+#: ../../mod/contacts.php:364
msgid "Update public posts"
msgstr "Ĝisdatigi publikajn afiŝojn"
-#: ../../mod/contacts.php:344 ../../mod/admin.php:1120
+#: ../../mod/contacts.php:366 ../../mod/admin.php:1136
msgid "Update now"
msgstr "Ĝisdatigi nun"
-#: ../../mod/contacts.php:351
+#: ../../mod/contacts.php:373
msgid "Currently blocked"
msgstr "Nuntempe blokata"
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:374
msgid "Currently ignored"
msgstr "Nuntempe ignorata"
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:375
msgid "Currently archived"
msgstr "Nuntempe enarkivigita"
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:376
msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr "Rispondoj/ŝataĵo al viaj publikaj afiŝoj <strong>eble</strong> plu estos videbla"
-#: ../../mod/contacts.php:407
+#: ../../mod/contacts.php:429
msgid "Suggestions"
msgstr "Sugestoj"
-#: ../../mod/contacts.php:410
+#: ../../mod/contacts.php:432
msgid "Suggest potential friends"
msgstr "Sugesti amikojn"
-#: ../../mod/contacts.php:413 ../../mod/group.php:191
+#: ../../mod/contacts.php:435 ../../mod/group.php:191
msgid "All Contacts"
msgstr "Ĉiuj Kontaktoj"
-#: ../../mod/contacts.php:416
+#: ../../mod/contacts.php:438
msgid "Show all contacts"
msgstr "Montri ĉiujn kontaktojn"
-#: ../../mod/contacts.php:419
+#: ../../mod/contacts.php:441
msgid "Unblocked"
msgstr "Malblokita"
-#: ../../mod/contacts.php:422
+#: ../../mod/contacts.php:444
msgid "Only show unblocked contacts"
msgstr "Nur montri neblokitajn kontaktojn"
-#: ../../mod/contacts.php:426
+#: ../../mod/contacts.php:448
msgid "Blocked"
msgstr "Blokita"
-#: ../../mod/contacts.php:429
+#: ../../mod/contacts.php:451
msgid "Only show blocked contacts"
msgstr "Nur montri blokitajn kontaktojn"
-#: ../../mod/contacts.php:433
+#: ../../mod/contacts.php:455
msgid "Ignored"
msgstr "Ignorita"
-#: ../../mod/contacts.php:436
+#: ../../mod/contacts.php:458
msgid "Only show ignored contacts"
msgstr "Nur montri ignoritajn kontaktojn"
-#: ../../mod/contacts.php:440
+#: ../../mod/contacts.php:462
msgid "Archived"
msgstr "Enarkivigita"
-#: ../../mod/contacts.php:443
+#: ../../mod/contacts.php:465
msgid "Only show archived contacts"
msgstr "Nur montri enarkivigitajn kontaktojn"
-#: ../../mod/contacts.php:447
+#: ../../mod/contacts.php:469
msgid "Hidden"
msgstr "Kaŝita"
-#: ../../mod/contacts.php:450
+#: ../../mod/contacts.php:472
msgid "Only show hidden contacts"
msgstr "Nur montri kaŝitajn kontaktojn"
-#: ../../mod/contacts.php:498
+#: ../../mod/contacts.php:520
msgid "Mutual Friendship"
msgstr "Reciproka amikeco"
-#: ../../mod/contacts.php:502
+#: ../../mod/contacts.php:524
msgid "is a fan of yours"
msgstr "estas admiranto de vi"
-#: ../../mod/contacts.php:506
+#: ../../mod/contacts.php:528
msgid "you are a fan of"
msgstr "vi estas admiranto de"
-#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:545 ../../mod/nogroup.php:41
msgid "Edit contact"
msgstr "Redakti kontakton"
-#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:125
+#: ../../mod/contacts.php:566 ../../view/theme/diabook/theme.php:129
#: ../../include/nav.php:139
msgid "Contacts"
msgstr "Kontaktoj"
-#: ../../mod/contacts.php:548
+#: ../../mod/contacts.php:570
msgid "Search your contacts"
msgstr "Serĉi viajn kontaktojn"
-#: ../../mod/contacts.php:549 ../../mod/directory.php:57
+#: ../../mod/contacts.php:571 ../../mod/directory.php:57
msgid "Finding: "
msgstr "Trovata:"
-#: ../../mod/contacts.php:550 ../../mod/directory.php:59
+#: ../../mod/contacts.php:572 ../../mod/directory.php:59
#: ../../include/contact_widgets.php:33
msgid "Find"
msgstr "Trovi"
@@ -1691,12 +1746,13 @@ msgid "Password reset requested at %s"
msgstr "Pasvorta riparado petita je %s"
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:388 ../../mod/register.php:442
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:742
-#: ../../addon/facebook/facebook.php:680
-#: ../../addon/facebook/facebook.php:1170
-#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2726
-#: ../../boot.php:692
+#: ../../mod/register.php:90 ../../mod/register.php:144
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
+#: ../../addon/facebook/facebook.php:700
+#: ../../addon/facebook/facebook.php:1190
+#: ../../addon/public_server/public_server.php:62
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2890
+#: ../../boot.php:730
msgid "Administrator"
msgstr "Administranto"
@@ -1706,7 +1762,7 @@ msgid ""
"Password reset failed."
msgstr "Ne povis konfirmi la peton. (Eble vi sendis ĝin antaŭ.) Pasvorta riparado malsukcesis."
-#: ../../mod/lostpass.php:83 ../../boot.php:824
+#: ../../mod/lostpass.php:83 ../../boot.php:862
msgid "Password Reset"
msgstr "Pasvorta riparado"
@@ -1750,502 +1806,527 @@ msgstr "Salutnomo aŭ retpoŝtadreso: "
msgid "Reset"
msgstr "Repari"
-#: ../../mod/settings.php:49 ../../include/nav.php:137
+#: ../../mod/settings.php:50 ../../include/nav.php:137
msgid "Account settings"
msgstr "Konto"
-#: ../../mod/settings.php:54
+#: ../../mod/settings.php:55
msgid "Display settings"
msgstr "Ekrano"
-#: ../../mod/settings.php:60
+#: ../../mod/settings.php:61
msgid "Connector settings"
msgstr "Konektiloj"
-#: ../../mod/settings.php:65
+#: ../../mod/settings.php:66
msgid "Plugin settings"
msgstr "Kromprogramoj"
-#: ../../mod/settings.php:70
+#: ../../mod/settings.php:71
msgid "Connected apps"
msgstr "Konektitaj programoj"
-#: ../../mod/settings.php:75
+#: ../../mod/settings.php:76
msgid "Export personal data"
msgstr "Eksporto"
-#: ../../mod/settings.php:80
+#: ../../mod/settings.php:81
msgid "Remove account"
msgstr "Forigi konton"
-#: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:571
-#: ../../view/theme/diabook/theme.php:701 ../../include/nav.php:137
+#: ../../mod/settings.php:89 ../../mod/admin.php:751 ../../mod/admin.php:956
+#: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36
+#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
msgid "Settings"
msgstr "Agordoj"
-#: ../../mod/settings.php:131
+#: ../../mod/settings.php:133
msgid "Missing some important data!"
msgstr "Mankas importantaj datumoj!"
-#: ../../mod/settings.php:134 ../../mod/settings.php:565
+#: ../../mod/settings.php:136 ../../mod/settings.php:581
msgid "Update"
msgstr "Ĝisdatigi"
-#: ../../mod/settings.php:239
+#: ../../mod/settings.php:241
msgid "Failed to connect with email account using the settings provided."
msgstr "Ne sukcesis konekti al retpoŝtkonto kun la provizitaj agordoj."
-#: ../../mod/settings.php:244
+#: ../../mod/settings.php:246
msgid "Email settings updated."
msgstr "Retpoŝtagordoj ĝisdatigita"
-#: ../../mod/settings.php:303
+#: ../../mod/settings.php:305
msgid "Passwords do not match. Password unchanged."
msgstr "La pasvortoj ne estas egala. Pasvorto ne ŝanĝita."
-#: ../../mod/settings.php:308
+#: ../../mod/settings.php:310
msgid "Empty passwords are not allowed. Password unchanged."
msgstr "Malplenaj pasvortoj ne estas permesita. Pasvorto ne ŝanĝita."
-#: ../../mod/settings.php:319
+#: ../../mod/settings.php:321
msgid "Password changed."
msgstr "Pasvorto ŝanĝita."
-#: ../../mod/settings.php:321
+#: ../../mod/settings.php:323
msgid "Password update failed. Please try again."
msgstr "Ĝisdatigo de pasvorto malsukcesis. Bonvolu provi refoje."
-#: ../../mod/settings.php:385
+#: ../../mod/settings.php:386
msgid " Please use a shorter name."
msgstr " Bonvolu uzi pli mallongan nomon."
-#: ../../mod/settings.php:387
+#: ../../mod/settings.php:388
msgid " Name too short."
msgstr " Nomo estas tro mallonga."
-#: ../../mod/settings.php:393
+#: ../../mod/settings.php:394
msgid " Not valid email."
msgstr " Repoŝtadreso ne validas."
-#: ../../mod/settings.php:395
+#: ../../mod/settings.php:396
msgid " Cannot change to that email."
msgstr " Ne povas ŝanĝi al tio retpoŝtadreso."
-#: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:480
+#: ../../mod/settings.php:450
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr "Privata forumo ne havas privatecajn agordojn. Defaŭlta privateca grupo estas uzata."
+
+#: ../../mod/settings.php:454
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr "Privata forumo havas nek privatecajn agordojn nek defaŭltan privatecan grupon."
+
+#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:493
#: ../../addon/impressum/impressum.php:77
#: ../../addon/openstreetmap/openstreetmap.php:80
#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:370
+#: ../../addon/twitter/twitter.php:382
msgid "Settings updated."
msgstr "Agordoj ĝisdatigita."
-#: ../../mod/settings.php:538 ../../mod/settings.php:564
-#: ../../mod/settings.php:600
+#: ../../mod/settings.php:554 ../../mod/settings.php:580
+#: ../../mod/settings.php:616
msgid "Add application"
msgstr "Aldoni programon"
-#: ../../mod/settings.php:542 ../../mod/settings.php:568
-#: ../../addon/statusnet/statusnet.php:547
+#: ../../mod/settings.php:558 ../../mod/settings.php:584
+#: ../../addon/statusnet/statusnet.php:561
msgid "Consumer Key"
msgstr "Ŝlosilo de kliento"
-#: ../../mod/settings.php:543 ../../mod/settings.php:569
-#: ../../addon/statusnet/statusnet.php:546
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../addon/statusnet/statusnet.php:560
msgid "Consumer Secret"
msgstr "Sekreto de kliento"
-#: ../../mod/settings.php:544 ../../mod/settings.php:570
+#: ../../mod/settings.php:560 ../../mod/settings.php:586
msgid "Redirect"
msgstr "Alidirekto"
-#: ../../mod/settings.php:545 ../../mod/settings.php:571
+#: ../../mod/settings.php:561 ../../mod/settings.php:587
msgid "Icon url"
msgstr "Piktograma adreso"
-#: ../../mod/settings.php:556
+#: ../../mod/settings.php:572
msgid "You can't edit this application."
msgstr "Ĉi tio programo ne estas redaktebla."
-#: ../../mod/settings.php:599
+#: ../../mod/settings.php:615
msgid "Connected Apps"
msgstr "Konektitaj Programoj"
-#: ../../mod/settings.php:603
+#: ../../mod/settings.php:619
msgid "Client key starts with"
msgstr "Ŝlosilo de kliento komencas kun"
-#: ../../mod/settings.php:604
+#: ../../mod/settings.php:620
msgid "No name"
msgstr "Neniu nomo"
-#: ../../mod/settings.php:605
+#: ../../mod/settings.php:621
msgid "Remove authorization"
msgstr "Forviŝi rajtigon"
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:632
msgid "No Plugin settings configured"
msgstr "Neniom da kromprogramoagordoj farita"
-#: ../../mod/settings.php:624 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:640 ../../addon/widgets/widgets.php:123
msgid "Plugin Settings"
msgstr "Kromprogramoagordoj"
-#: ../../mod/settings.php:636 ../../mod/settings.php:637
+#: ../../mod/settings.php:652 ../../mod/settings.php:653
#, php-format
msgid "Built-in support for %s connectivity is %s"
msgstr "Integrita subteno por %s koneto estas %s"
-#: ../../mod/settings.php:636 ../../mod/settings.php:637
+#: ../../mod/settings.php:652 ../../mod/settings.php:653
msgid "enabled"
msgstr "ŝaltita"
-#: ../../mod/settings.php:636 ../../mod/settings.php:637
+#: ../../mod/settings.php:652 ../../mod/settings.php:653
msgid "disabled"
msgstr "malŝaltita"
-#: ../../mod/settings.php:637
+#: ../../mod/settings.php:653
msgid "StatusNet"
msgstr "StatusNet"
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:685
+msgid "Email access is disabled on this site."
+msgstr "Retpoŝta atingo ne disponeblas ĉi tie."
+
+#: ../../mod/settings.php:691
msgid "Connector Settings"
msgstr "Konektiloagordoj"
-#: ../../mod/settings.php:672
+#: ../../mod/settings.php:696
msgid "Email/Mailbox Setup"
msgstr "Agordoj pri Retpoŝto"
-#: ../../mod/settings.php:673
+#: ../../mod/settings.php:697
msgid ""
"If you wish to communicate with email contacts using this service "
"(optional), please specify how to connect to your mailbox."
-msgstr "Se vi volas uzi ĉi tiun servon por komuniki tra retpoŝto (nedeviga), bonvolu specifi kiel konekti al vian retpoŝtkonton."
+msgstr "Se vi volas uzi ĉi tiun servon por komuniki per retpoŝto (nedeviga), bonvolu specifi kiel konekti al vian retpoŝtkonton."
-#: ../../mod/settings.php:674
+#: ../../mod/settings.php:698
msgid "Last successful email check:"
msgstr "Plej ĵusa sukcesa kontrolo de poŝto:"
-#: ../../mod/settings.php:675
-msgid "Email access is disabled on this site."
-msgstr "Retpoŝta atingo ne disponeblas ĉi tie."
-
-#: ../../mod/settings.php:676
+#: ../../mod/settings.php:700
msgid "IMAP server name:"
msgstr "Nomo de IMAP servilo:"
-#: ../../mod/settings.php:677
+#: ../../mod/settings.php:701
msgid "IMAP port:"
msgstr "Numero de IMAP pordo:"
-#: ../../mod/settings.php:678
+#: ../../mod/settings.php:702
msgid "Security:"
msgstr "Sekureco:"
-#: ../../mod/settings.php:678 ../../mod/settings.php:683
+#: ../../mod/settings.php:702 ../../mod/settings.php:707
msgid "None"
msgstr "Nenio"
-#: ../../mod/settings.php:679
+#: ../../mod/settings.php:703
msgid "Email login name:"
msgstr "Retpoŝta salutnomo:"
-#: ../../mod/settings.php:680
+#: ../../mod/settings.php:704
msgid "Email password:"
msgstr "Retpoŝta pasvorto:"
-#: ../../mod/settings.php:681
+#: ../../mod/settings.php:705
msgid "Reply-to address:"
msgstr "Responda adreso (Reply-to):"
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:706
msgid "Send public posts to all email contacts:"
msgstr "Sendu publikajn afiŝojn al ĉiuj retpoŝtkontaktoj:"
-#: ../../mod/settings.php:683
+#: ../../mod/settings.php:707
msgid "Action after import:"
msgstr "Ago post la importado:"
-#: ../../mod/settings.php:683
+#: ../../mod/settings.php:707
msgid "Mark as seen"
msgstr "Marki kiel legita"
-#: ../../mod/settings.php:683
+#: ../../mod/settings.php:707
msgid "Move to folder"
msgstr "Movi al dosierujo"
-#: ../../mod/settings.php:684
+#: ../../mod/settings.php:708
msgid "Move to folder:"
msgstr "Movi al dosierujo:"
-#: ../../mod/settings.php:744
+#: ../../mod/settings.php:768
msgid "Display Settings"
msgstr "Ekranagordoj"
-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:774
msgid "Display Theme:"
msgstr "Vidiga etoso:"
-#: ../../mod/settings.php:751
+#: ../../mod/settings.php:775
msgid "Update browser every xx seconds"
msgstr "Ĝisdatigu retesplorilon ĉiu xxx sekundoj"
-#: ../../mod/settings.php:751
+#: ../../mod/settings.php:775
msgid "Minimum of 10 seconds, no maximum"
msgstr "Minimume 10 sekundoj, sen maksimumo"
-#: ../../mod/settings.php:752
+#: ../../mod/settings.php:776
msgid "Number of items to display on the network page:"
msgstr "Kvanto da elementoj kiuj estos montrata ĉe la reto paĝo."
-#: ../../mod/settings.php:752
+#: ../../mod/settings.php:776
msgid "Maximum of 100 items"
msgstr "Maksimume 100 eroj"
-#: ../../mod/settings.php:753
+#: ../../mod/settings.php:777
msgid "Don't show emoticons"
msgstr "Ne montru ridetulojn"
-#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:621
-msgid "Normal Account"
-msgstr "Normala konto"
+#: ../../mod/settings.php:848
+msgid "Normal Account Page"
+msgstr "Normala Kontopaĝo"
-#: ../../mod/settings.php:822
+#: ../../mod/settings.php:849
msgid "This account is a normal personal profile"
msgstr "Tiu konto estas normala persona profilo"
-#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:622
-msgid "Soapbox Account"
-msgstr "Soapbox Konto"
+#: ../../mod/settings.php:852
+msgid "Soapbox Page"
+msgstr "Soapbox Paĝo"
-#: ../../mod/settings.php:826
+#: ../../mod/settings.php:853
msgid "Automatically approve all connection/friend requests as read-only fans"
msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel nurlegaj admirantoj"
-#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:623
-msgid "Community/Celebrity Account"
-msgstr "Komunuma/eminentula Konto"
+#: ../../mod/settings.php:856
+msgid "Community Forum/Celebrity Account"
+msgstr "Komunuma Forumo/Eminentula Konto"
-#: ../../mod/settings.php:830
+#: ../../mod/settings.php:857
msgid ""
"Automatically approve all connection/friend requests as read-write fans"
msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel admirantoj kapable legi kaj skribi"
-#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:624
-msgid "Automatic Friend Account"
-msgstr "Aŭtomata Amika Konto"
+#: ../../mod/settings.php:860
+msgid "Automatic Friend Page"
+msgstr "Aŭtomata Amiko Paĝo"
-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:861
msgid "Automatically approve all connection/friend requests as friends"
msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel amikoj"
-#: ../../mod/settings.php:844
+#: ../../mod/settings.php:864
+msgid "Private Forum [Experimental]"
+msgstr "Privata Forumo [eksperimenta]"
+
+#: ../../mod/settings.php:865
+msgid "Private forum - approved members only"
+msgstr "Privata forumo - nur por aprobitaj membroj"
+
+#: ../../mod/settings.php:877
msgid "OpenID:"
msgstr "OpenID:"
-#: ../../mod/settings.php:844
+#: ../../mod/settings.php:877
msgid "(Optional) Allow this OpenID to login to this account."
msgstr "(Nedeviga) Permesi atingon al la konton al ĉi tio OpenID."
-#: ../../mod/settings.php:854
+#: ../../mod/settings.php:887
msgid "Publish your default profile in your local site directory?"
msgstr "Publikigi vian defaŭltan profilon en la loka reteja katalogo?"
-#: ../../mod/settings.php:860
+#: ../../mod/settings.php:893
msgid "Publish your default profile in the global social directory?"
msgstr "Publikigi vian defaŭltan profilon en la tutmonda interkona katalogo?"
-#: ../../mod/settings.php:868
+#: ../../mod/settings.php:901
msgid "Hide your contact/friend list from viewers of your default profile?"
msgstr "Kaŝi vian liston de kontaktoj/amiko al spektantoj de via defaŭlta profilo?"
-#: ../../mod/settings.php:872
+#: ../../mod/settings.php:905
msgid "Hide your profile details from unknown viewers?"
msgstr "Kaŝi viajn profilajn detalojn al nekonataj spektantoj?"
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:910
msgid "Allow friends to post to your profile page?"
msgstr "Ĉu amikoj povu afiŝi al via profilo?"
-#: ../../mod/settings.php:883
+#: ../../mod/settings.php:916
msgid "Allow friends to tag your posts?"
msgstr "Ĉu amikoj povu aldoni markojn al viaj afiŝoj?"
-#: ../../mod/settings.php:889
+#: ../../mod/settings.php:922
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr "Ĉu ni povu sugesti vin kiel amiko al novaj membroj?"
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:928
msgid "Permit unknown people to send you private mail?"
msgstr "Permesigi nekonatulojn sendi retpoŝton al vi?"
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:936
msgid "Profile is <strong>not published</strong>."
msgstr "Profilo <strong>ne estas publika</strong>."
-#: ../../mod/settings.php:912 ../../mod/profile_photo.php:211
+#: ../../mod/settings.php:939 ../../mod/profile_photo.php:213
msgid "or"
msgstr "aŭ"
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:944
msgid "Your Identity Address is"
msgstr "Via identeca adreso estas"
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:955
msgid "Automatically expire posts after this many days:"
msgstr "Automatike senvalidigi afiŝojn post tiom da tagoj:"
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:955
msgid "If empty, posts will not expire. Expired posts will be deleted"
msgstr "Se malplena, afiŝoj neniam senvalidiĝos. Senvalidigitajn afiŝon estos forviŝata"
-#: ../../mod/settings.php:929
+#: ../../mod/settings.php:956
msgid "Advanced expiration settings"
msgstr "Detalaj agordoj rilate al senvalidiĝo"
-#: ../../mod/settings.php:930
+#: ../../mod/settings.php:957
msgid "Advanced Expiration"
msgstr "Detala senvalidiĝo"
-#: ../../mod/settings.php:931
+#: ../../mod/settings.php:958
msgid "Expire posts:"
msgstr "Senvalidigi afiŝojn:"
-#: ../../mod/settings.php:932
+#: ../../mod/settings.php:959
msgid "Expire personal notes:"
msgstr "Senvalidigi personajn notojn:"
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:960
msgid "Expire starred posts:"
msgstr "Senvalidigi steligitajn afiŝojn:"
-#: ../../mod/settings.php:934
+#: ../../mod/settings.php:961
msgid "Expire photos:"
msgstr "Senvalidigi bildojn:"
-#: ../../mod/settings.php:938
+#: ../../mod/settings.php:962
+msgid "Only expire posts by others:"
+msgstr "Nur senvalidigi afiŝojn de aliaj: "
+
+#: ../../mod/settings.php:969
msgid "Account Settings"
msgstr "Kontoagordoj"
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:977
msgid "Password Settings"
msgstr "Agordoj pri Pasvorto"
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:978
msgid "New Password:"
msgstr "Nova pasvorto:"
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:979
msgid "Confirm:"
msgstr "Konfirmi:"
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:979
msgid "Leave password fields blank unless changing"
msgstr "Lasu pasvortkampojn malplenaj se vi ne ŝanĝas la pasvorton."
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:983
msgid "Basic Settings"
msgstr "Bazaj Agordoj"
-#: ../../mod/settings.php:954 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:984 ../../include/profile_advanced.php:15
msgid "Full Name:"
msgstr "Plena Nomo:"
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:985
msgid "Email Address:"
msgstr "Retpoŝtadreso:"
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:986
msgid "Your Timezone:"
msgstr "Via Horzono:"
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:987
msgid "Default Post Location:"
msgstr "Defaŭlta Loko por Afiŝoj:"
-#: ../../mod/settings.php:958
+#: ../../mod/settings.php:988
msgid "Use Browser Location:"
msgstr "Uzu Lokon laŭ Retesplorilo:"
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:991
msgid "Security and Privacy Settings"
msgstr "Agordoj pri Sekureco kaj Privateco"
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:993
msgid "Maximum Friend Requests/Day:"
msgstr "Taga maksimumo da kontaktpetoj:"
-#: ../../mod/settings.php:963 ../../mod/settings.php:978
+#: ../../mod/settings.php:993 ../../mod/settings.php:1012
msgid "(to prevent spam abuse)"
msgstr "(por malhelpi spamaĵojn)"
-#: ../../mod/settings.php:964
+#: ../../mod/settings.php:994
msgid "Default Post Permissions"
msgstr "Defaŭltaj permesoj por afiŝoj"
-#: ../../mod/settings.php:965
+#: ../../mod/settings.php:995
msgid "(click to open/close)"
msgstr "(klaku por malfermi/fermi)"
-#: ../../mod/settings.php:978
+#: ../../mod/settings.php:1012
msgid "Maximum private messages per day from unknown people:"
msgstr "Taga maksimumo da privataj mesaĝoj."
-#: ../../mod/settings.php:981
+#: ../../mod/settings.php:1015
msgid "Notification Settings"
msgstr "Agordoj pri Atentigoj"
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:1016
msgid "By default post a status message when:"
msgstr "Defaŭlte afiŝi statmesaĝon okaze de:"
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:1017
msgid "accepting a friend request"
msgstr "akcepti kontaktpeton"
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1018
msgid "joining a forum/community"
msgstr "aliĝi forumon/komunumon"
-#: ../../mod/settings.php:985
+#: ../../mod/settings.php:1019
msgid "making an <em>interesting</em> profile change"
msgstr "fari <em>interesan</em> profilŝanĝon"
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:1020
msgid "Send a notification email when:"
msgstr "Sendu atentiga repoŝton se:"
-#: ../../mod/settings.php:987
+#: ../../mod/settings.php:1021
msgid "You receive an introduction"
msgstr "Vi ricevas inviton"
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:1022
msgid "Your introductions are confirmed"
msgstr "Viaj prezentoj estas konfirmata."
-#: ../../mod/settings.php:989
+#: ../../mod/settings.php:1023
msgid "Someone writes on your profile wall"
msgstr "Iu skribas je via profila muro."
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:1024
msgid "Someone writes a followup comment"
msgstr "Iu skribas sekvan komenton"
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:1025
msgid "You receive a private message"
msgstr "Vi ricevas privatan mesaĝon."
-#: ../../mod/settings.php:992
+#: ../../mod/settings.php:1026
msgid "You receive a friend suggestion"
msgstr "Vi ricevas amikosugeston"
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:1027
msgid "You are tagged in a post"
msgstr "Vi estas markita en afiŝon"
-#: ../../mod/settings.php:996
-msgid "Advanced Page Settings"
-msgstr "Specialaj agordoj pri paĝoj"
+#: ../../mod/settings.php:1030
+msgid "Advanced Account/Page Type Settings"
+msgstr "Detalaj Agordoj pri Tipo de Konto/Paĝo."
+
+#: ../../mod/settings.php:1031
+msgid "Change the behaviour of this account for special situations"
+msgstr "Agordi la teniĝon de la konto en specialaj situacioj"
#: ../../mod/manage.php:90
msgid "Manage Identities and/or Pages"
@@ -2261,67 +2342,67 @@ msgstr "Ŝalti inter aliaj identecojn aj komunumaj/grupaj paĝoj kiuj kunhavas v
msgid "Select an identity to manage: "
msgstr "Elektu identencon por administrado:"
-#: ../../mod/network.php:43
+#: ../../mod/network.php:97
msgid "Search Results For:"
msgstr "Rezultoj de la serĉado pri:"
-#: ../../mod/network.php:82 ../../mod/search.php:16
+#: ../../mod/network.php:137 ../../mod/search.php:16
msgid "Remove term"
msgstr "Forviŝu terminon"
-#: ../../mod/network.php:91 ../../mod/search.php:13
+#: ../../mod/network.php:146 ../../mod/search.php:13
msgid "Saved Searches"
msgstr "Konservitaj Serĉadoj"
-#: ../../mod/network.php:92 ../../include/group.php:217
+#: ../../mod/network.php:147 ../../include/group.php:244
msgid "add"
msgstr "aldoni"
-#: ../../mod/network.php:171
+#: ../../mod/network.php:287
msgid "Commented Order"
msgstr "Komenta Ordo"
-#: ../../mod/network.php:174
+#: ../../mod/network.php:290
msgid "Sort by Comment Date"
msgstr "Ordigi laŭ Dato de Komento"
-#: ../../mod/network.php:177
+#: ../../mod/network.php:293
msgid "Posted Order"
msgstr "Afiŝita Ordo"
-#: ../../mod/network.php:180
+#: ../../mod/network.php:296
msgid "Sort by Post Date"
msgstr "Ordigi laŭ Dato de Afiŝado"
-#: ../../mod/network.php:187
+#: ../../mod/network.php:303
msgid "Posts that mention or involve you"
msgstr "Afiŝoj menciantaj vin aŭ pri vi"
-#: ../../mod/network.php:190
+#: ../../mod/network.php:306
msgid "New"
msgstr "Nova"
-#: ../../mod/network.php:193
+#: ../../mod/network.php:309
msgid "Activity Stream - by date"
msgstr "Fluo de Aktiveco - laŭ dato"
-#: ../../mod/network.php:196
+#: ../../mod/network.php:312
msgid "Starred"
msgstr "Steligita"
-#: ../../mod/network.php:199
+#: ../../mod/network.php:315
msgid "Favourite Posts"
msgstr "Favorigitaj Afiŝoj"
-#: ../../mod/network.php:202
+#: ../../mod/network.php:318
msgid "Shared Links"
msgstr "Kunhavigitaj Ligiloj"
-#: ../../mod/network.php:205
+#: ../../mod/network.php:321
msgid "Interesting Links"
msgstr "Interesaj Ligiloj"
-#: ../../mod/network.php:281
+#: ../../mod/network.php:388
#, php-format
msgid "Warning: This group contains %s member from an insecure network."
msgid_plural ""
@@ -2329,42 +2410,42 @@ msgid_plural ""
msgstr[0] "Averto: La grupo enhavas %s membron el nesekuraj retejoj."
msgstr[1] "Averto: La grupo enhavas %s membrojn el nesekuraj retejoj."
-#: ../../mod/network.php:284
+#: ../../mod/network.php:391
msgid "Private messages to this group are at risk of public disclosure."
msgstr "La privateco de privataj mesaĝoj al ĉi tiu grupo ne ĉiam estas garantita."
-#: ../../mod/network.php:329
+#: ../../mod/network.php:436
msgid "No such group"
msgstr "Grupo ne estas trovita"
-#: ../../mod/network.php:340
+#: ../../mod/network.php:447
msgid "Group is empty"
msgstr "Grupo estas malplena"
-#: ../../mod/network.php:344
+#: ../../mod/network.php:451
msgid "Group: "
msgstr "Grupo:"
-#: ../../mod/network.php:354
+#: ../../mod/network.php:461
msgid "Contact: "
msgstr "Kontakto:"
-#: ../../mod/network.php:356
+#: ../../mod/network.php:463
msgid "Private messages to this person are at risk of public disclosure."
msgstr "La privateco de privataj mesaĝoj al ĉi tiu persono ne ĉiam estas garantita."
-#: ../../mod/network.php:361
+#: ../../mod/network.php:468
msgid "Invalid contact."
msgstr "Nevalida kontakto."
-#: ../../mod/notes.php:44 ../../boot.php:1505
+#: ../../mod/notes.php:44 ../../boot.php:1565
msgid "Personal Notes"
msgstr "Personaj Notoj"
#: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:748
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:147
-#: ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:768
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:187
+#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652
msgid "Save"
msgstr "Konservi"
@@ -2373,7 +2454,7 @@ msgstr "Konservi"
msgid "Number of daily wall messages for %s exceeded. Message failed."
msgstr "Number of daily wall messages for %s exceeded. Messaĝo malsukcesis."
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:65
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:66
msgid "No recipient selected."
msgstr "Neniom da ricevontoj."
@@ -2381,15 +2462,15 @@ msgstr "Neniom da ricevontoj."
msgid "Unable to check your home location."
msgstr "Ne eblas kontroli vian hejmlokon."
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:72
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:73
msgid "Message could not be sent."
msgstr "Ne povas sendi la mesaĝon."
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:75
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:76
msgid "Message collection failure."
msgstr "Malsukcese provis kolekti mesaĝojn."
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:78
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:79
msgid "Message sent."
msgstr "Mesaĝo estas sendita."
@@ -2397,12 +2478,12 @@ msgstr "Mesaĝo estas sendita."
msgid "No recipient."
msgstr "Neniom da ricevontoj."
-#: ../../mod/wallmessage.php:124 ../../mod/message.php:171
-#: ../../include/conversation.php:918
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:172
+#: ../../include/conversation.php:947
msgid "Please enter a link URL:"
msgstr "Bonvolu entajpu adreson de ligilo:"
-#: ../../mod/wallmessage.php:131 ../../mod/message.php:199
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:200
msgid "Send Private Message"
msgstr "Sendi Privatan Mesaĝon"
@@ -2413,18 +2494,18 @@ msgid ""
"your site allow private mail from unknown senders."
msgstr "Se vi deziras ke %s respondu, bonvolu kontroli ke la privatecaj agordoj je via retejo permesas privatajn mesaĝojn de nekonataj sendantoj."
-#: ../../mod/wallmessage.php:133 ../../mod/message.php:200
-#: ../../mod/message.php:395
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:201
+#: ../../mod/message.php:399
msgid "To:"
msgstr "Al:"
-#: ../../mod/wallmessage.php:134 ../../mod/message.php:204
-#: ../../mod/message.php:396
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:206
+#: ../../mod/message.php:401
msgid "Subject:"
msgstr "Temo:"
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:208
-#: ../../mod/message.php:399 ../../mod/invite.php:113
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:210
+#: ../../mod/message.php:404 ../../mod/invite.php:113
msgid "Your message:"
msgstr "Via mesaĝo:"
@@ -2490,7 +2571,7 @@ msgid ""
"Enter your email access information on your Connector Settings page if you "
"wish to import and interact with friends or mailing lists from your email "
"INBOX"
-msgstr "Entajpu la akreditaĵojn por via retpoŝtkonto en la konektilagordoj se vi volas importi aŭ interagi kun amikoj aŭ dissendlistoj tra via retkesto."
+msgstr "Entajpu la akreditaĵojn por via retpoŝtkonto en la konektilagordoj se vi volas importi aŭ interagi kun amikoj aŭ dissendlistoj pere de via retkesto."
#: ../../mod/newmember.php:34
msgid ""
@@ -2566,7 +2647,7 @@ msgstr "Grupo ne estas trovita."
msgid "Group name changed."
msgstr "La nomo de la grupo estas ŝanĝita."
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
msgid "Permission denied"
msgstr "Malpermesita"
@@ -2606,9 +2687,9 @@ msgstr "Nevaliada profila identigilo."
msgid "Profile Visibility Editor"
msgstr "Redaktilo por profila videbleco."
-#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:124
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
-#: ../../include/nav.php:50 ../../boot.php:1484
+#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
+#: ../../include/nav.php:50 ../../boot.php:1544
msgid "Profile"
msgstr "Profilo"
@@ -2628,193 +2709,125 @@ msgstr "Neniu kontaktojn."
msgid "View Contacts"
msgstr "Vidi Kontaktojn"
-#: ../../mod/register.php:64
-msgid "An invitation is required."
-msgstr "Invio bezonata."
-
-#: ../../mod/register.php:69
-msgid "Invitation could not be verified."
-msgstr "Ne povis kontroli la inviton."
-
-#: ../../mod/register.php:77
-msgid "Invalid OpenID url"
-msgstr "Nevalida OpenID adreso"
-
-#: ../../mod/register.php:92
-msgid "Please enter the required information."
-msgstr "Bonvolu entajpi la bezonatajn informojn."
-
-#: ../../mod/register.php:106
-msgid "Please use a shorter name."
-msgstr "Bonvolu uzi pli mallongan nomon."
-
-#: ../../mod/register.php:108
-msgid "Name too short."
-msgstr "Nomo estas tro mallonga."
-
-#: ../../mod/register.php:123
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Tio ŝajne ne estas via plena (persona, familia) nomo."
-
-#: ../../mod/register.php:128
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Via retpoŝtodomajno ne estas permesita ĉi tie."
-
-#: ../../mod/register.php:131
-msgid "Not a valid email address."
-msgstr "Nevalida retpoŝtadreso."
-
-#: ../../mod/register.php:141
-msgid "Cannot use that email."
-msgstr "Neuzebla retpoŝtadreso."
-
-#: ../../mod/register.php:147
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
-msgstr "Via kaŝnomo nur povas enhavi \"a-z\", \"0-9\", \"-\", kaj \"_\". Ĝi ankaŭ devas komenci kun litero."
-
-#: ../../mod/register.php:153 ../../mod/register.php:264
-msgid "Nickname is already registered. Please choose another."
-msgstr "Tio kaŝnomo jam estas registrita. Bonvolu elekti alian."
-
-#: ../../mod/register.php:163
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr "Tiu kaŝnomo iam estis registrita ĉi tie kaj ne ree uzeblas. Bonvolu elekti alian."
-
-#: ../../mod/register.php:182
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "GRAVA ERARO: La generacio de sekurecaj ĉifroŝlosiloj malsukcesis."
-
-#: ../../mod/register.php:250
-msgid "An error occurred during registration. Please try again."
-msgstr "Eraro okazis dum registrado. Bonvolu provi denove."
-
-#: ../../mod/register.php:286
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "Eraro okazi dum kreado de via defaŭlta profilo. Bonvolu provi denove."
-
-#: ../../mod/register.php:386 ../../mod/regmod.php:52
+#: ../../mod/register.php:88 ../../mod/regmod.php:52
#, php-format
msgid "Registration details for %s"
msgstr "Detaloj de la registrado por %s"
-#: ../../mod/register.php:394
+#: ../../mod/register.php:96
msgid ""
"Registration successful. Please check your email for further instructions."
msgstr "Registrado sukcesis. Bonvolu kontroli vian retpoŝton por pli da instruoj."
-#: ../../mod/register.php:398
+#: ../../mod/register.php:100
msgid "Failed to send email message. Here is the message that failed."
msgstr "Malsukcesis sendi retpoŝton. Jen la malsukcesa mesaĝo."
-#: ../../mod/register.php:403
+#: ../../mod/register.php:105
msgid "Your registration can not be processed."
msgstr "Mi ne povas prilabori vian registradon."
-#: ../../mod/register.php:440
+#: ../../mod/register.php:142
#, php-format
msgid "Registration request at %s"
msgstr "Peto de registrado al %s"
-#: ../../mod/register.php:449
+#: ../../mod/register.php:151
msgid "Your registration is pending approval by the site owner."
msgstr "Via registrado bezonas apropbon de la administranto."
-#: ../../mod/register.php:487
+#: ../../mod/register.php:189
msgid ""
"This site has exceeded the number of allowed daily account registrations. "
"Please try again tomorrow."
msgstr "La retejo transiras la maksimuman kvanton da ĉiutagaj kontaj registradoj. Bonvolu provi denove morgaŭ."
-#: ../../mod/register.php:513
+#: ../../mod/register.php:215
msgid ""
"You may (optionally) fill in this form via OpenID by supplying your OpenID "
"and clicking 'Register'."
-msgstr "Vi ankaŭ (nedeviga) povas plenigi la formularon tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'."
+msgstr "Vi ankaŭ (nedeviga) povas plenigi la formularon per OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'."
-#: ../../mod/register.php:514
+#: ../../mod/register.php:216
msgid ""
"If you are not familiar with OpenID, please leave that field blank and fill "
"in the rest of the items."
msgstr "Se vi ne konas OpenID, bonvolu lasi tiun kampon malplena kaj entajpu la aliajn elementojn."
-#: ../../mod/register.php:515
+#: ../../mod/register.php:217
msgid "Your OpenID (optional): "
msgstr "Via OpenID (nedeviga):"
-#: ../../mod/register.php:529
+#: ../../mod/register.php:231
msgid "Include your profile in member directory?"
msgstr "Aldoni vian profilon al la membrokatalogo?"
-#: ../../mod/register.php:549
+#: ../../mod/register.php:251
msgid "Membership on this site is by invitation only."
msgstr "Membriĝi ĉi tie nur eblas laŭ invito."
-#: ../../mod/register.php:550
+#: ../../mod/register.php:252
msgid "Your invitation ID: "
msgstr "Via invita idento: "
-#: ../../mod/register.php:553 ../../mod/admin.php:405
+#: ../../mod/register.php:255 ../../mod/admin.php:421
msgid "Registration"
msgstr "Registrado"
-#: ../../mod/register.php:561
+#: ../../mod/register.php:263
msgid "Your Full Name (e.g. Joe Smith): "
msgstr "Via Plena Nomo (e.g. Joe Smith): "
-#: ../../mod/register.php:562
+#: ../../mod/register.php:264
msgid "Your Email Address: "
msgstr "Via Retpoŝtadreso: "
-#: ../../mod/register.php:563
+#: ../../mod/register.php:265
msgid ""
"Choose a profile nickname. This must begin with a text character. Your "
"profile address on this site will then be "
"'<strong>nickname@$sitename</strong>'."
msgstr "Elektu kaŝnomon por la profilo. Tiu bezonas komenci kun teksta litero. Poste, via profila adreso ĉi tie estos: '<strong>kaŝnomo@$sitename</strong>'."
-#: ../../mod/register.php:564
+#: ../../mod/register.php:266
msgid "Choose a nickname: "
msgstr "Elektu kaŝnomon: "
-#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:790
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:828
msgid "Register"
msgstr "Registri"
-#: ../../mod/dirfind.php:23
+#: ../../mod/dirfind.php:26
msgid "People Search"
msgstr "Serĉi Membrojn"
-#: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1564
+#: ../../mod/like.php:144 ../../mod/like.php:301 ../../mod/tagger.php:70
+#: ../../addon/facebook/facebook.php:1584
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:493
-#: ../../view/theme/diabook/theme.php:502 ../../include/diaspora.php:1654
+#: ../../view/theme/diabook/theme.php:565
+#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1710
#: ../../include/conversation.php:48 ../../include/conversation.php:57
#: ../../include/conversation.php:121 ../../include/conversation.php:130
msgid "status"
msgstr "staton"
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568
+#: ../../mod/like.php:161 ../../addon/facebook/facebook.php:1588
#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:507 ../../include/diaspora.php:1670
+#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1726
#: ../../include/conversation.php:65
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s ŝatas la %3$s de %2$s"
-#: ../../mod/like.php:146 ../../include/conversation.php:68
+#: ../../mod/like.php:163 ../../include/conversation.php:68
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr "%1$s malŝatas la %3$s de %2$s"
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
-#: ../../mod/admin.php:684 ../../mod/admin.php:883 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3084
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
+#: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3334
msgid "Item not found."
msgstr "Elemento ne estas trovita."
@@ -2822,12 +2835,12 @@ msgstr "Elemento ne estas trovita."
msgid "Access denied."
msgstr "Atingo nepermesita."
-#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:126
-#: ../../include/nav.php:51 ../../boot.php:1490
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
+#: ../../include/nav.php:51 ../../boot.php:1550
msgid "Photos"
msgstr "Bildoj"
-#: ../../mod/fbrowser.php:86
+#: ../../mod/fbrowser.php:96
msgid "Files"
msgstr "Dosieroj"
@@ -2848,39 +2861,39 @@ msgstr "Bonvolu ensaluti."
msgid "Unable to locate original post."
msgstr "Ne eblas trovi originalan afiŝon."
-#: ../../mod/item.php:249
+#: ../../mod/item.php:258
msgid "Empty post discarded."
msgstr "Forviŝis malplenan afiŝon."
-#: ../../mod/item.php:372 ../../mod/wall_upload.php:99
-#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115
+#: ../../mod/item.php:379 ../../mod/wall_upload.php:115
+#: ../../mod/wall_upload.php:124 ../../mod/wall_upload.php:131
#: ../../include/message.php:144
msgid "Wall Photos"
msgstr "Muraj Bildoj"
-#: ../../mod/item.php:781
+#: ../../mod/item.php:784
msgid "System error. Post not saved."
msgstr "Sistema eraro. Afiŝo ne registrita."
-#: ../../mod/item.php:806
+#: ../../mod/item.php:809
#, php-format
msgid ""
"This message was sent to you by %s, a member of the Friendica social "
"network."
msgstr "Ĉi mesaĝo estas sendita al vi de %s, membro de la Friendica interkona reto."
-#: ../../mod/item.php:808
+#: ../../mod/item.php:811
#, php-format
msgid "You may visit them online at %s"
msgstr "Vi povas viziti ilin rete ĉe %s"
-#: ../../mod/item.php:809
+#: ../../mod/item.php:812
msgid ""
"Please contact the sender by replying to this post if you do not wish to "
"receive these messages."
msgstr "Bonvolu rispondi al ĉi mesaĝo kaj kontaktu la sendinto se vi ne volas ricevi tiujn mesaĝojn."
-#: ../../mod/item.php:811
+#: ../../mod/item.php:814
#, php-format
msgid "%s posted an update."
msgstr "%s publikigis afiŝon."
@@ -2890,7 +2903,7 @@ msgid "Image uploaded but image cropping failed."
msgstr "Bildo estas alŝutita, sed malsukcesis tranĉi la bildon."
#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
-#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:266
#, php-format
msgid "Image size reduction [%s] failed."
msgstr "Malsukcesis malpligrandigi [%s] la bildon."
@@ -2905,44 +2918,44 @@ msgstr "Reŝarĝu la paĝon au malplenigu la kaŝmemoro de la retesplorilo se la
msgid "Unable to process image"
msgstr "Ne eblas procezi bildon."
-#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:74
+#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:77
#, php-format
msgid "Image exceeds size limit of %d"
msgstr "Bildo estas pli granda ol la limito %d"
-#: ../../mod/profile_photo.php:207
+#: ../../mod/profile_photo.php:209
msgid "Upload File:"
msgstr "Alŝuti dosieron:"
-#: ../../mod/profile_photo.php:208
+#: ../../mod/profile_photo.php:210
msgid "Upload Profile Photo"
msgstr "Alŝuti profilbildon"
-#: ../../mod/profile_photo.php:209
+#: ../../mod/profile_photo.php:211
msgid "Upload"
msgstr "Alŝuti"
-#: ../../mod/profile_photo.php:211
+#: ../../mod/profile_photo.php:213
msgid "skip this step"
msgstr "Preterpasi tian paŝon"
-#: ../../mod/profile_photo.php:211
+#: ../../mod/profile_photo.php:213
msgid "select a photo from your photo albums"
msgstr "elekti bildon el viaj albumoj"
-#: ../../mod/profile_photo.php:224
+#: ../../mod/profile_photo.php:226
msgid "Crop Image"
msgstr "Stuci Bildon"
-#: ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:227
msgid "Please adjust the image cropping for optimum viewing."
msgstr "Bonvolu agordi la stuco de la bildo por optimuma aspekto."
-#: ../../mod/profile_photo.php:227
+#: ../../mod/profile_photo.php:229
msgid "Done Editing"
msgstr "Finigi Redaktado"
-#: ../../mod/profile_photo.php:255
+#: ../../mod/profile_photo.php:257
msgid "Image uploaded successfully."
msgstr "Bildo estas sukcese enŝutita."
@@ -2968,67 +2981,67 @@ msgstr "Bonvolu entajpi vian pasvorton por kontrolado:"
msgid "New Message"
msgstr "Nova Mesaĝo"
-#: ../../mod/message.php:69
+#: ../../mod/message.php:70
msgid "Unable to locate contact information."
msgstr "Ne eblas trovi kontaktajn informojn."
-#: ../../mod/message.php:119
+#: ../../mod/message.php:120
msgid "Message deleted."
msgstr "Mesaĝo estas forviŝita."
-#: ../../mod/message.php:149
+#: ../../mod/message.php:150
msgid "Conversation removed."
msgstr "Dialogo estas forviŝita."
-#: ../../mod/message.php:244
+#: ../../mod/message.php:247
msgid "No messages."
msgstr "Neniom da mesaĝoj."
-#: ../../mod/message.php:251
+#: ../../mod/message.php:254
#, php-format
msgid "Unknown sender - %s"
msgstr "Nekonata sendanto - %s"
-#: ../../mod/message.php:254
+#: ../../mod/message.php:257
#, php-format
msgid "You and %s"
msgstr "Vi kaj %s"
-#: ../../mod/message.php:257
+#: ../../mod/message.php:260
#, php-format
msgid "%s and You"
msgstr "%s kaj vi"
-#: ../../mod/message.php:267 ../../mod/message.php:388
+#: ../../mod/message.php:270 ../../mod/message.php:392
msgid "Delete conversation"
msgstr "Forviŝi dialogon"
-#: ../../mod/message.php:270
+#: ../../mod/message.php:273
msgid "D, d M Y - g:i A"
msgstr "D, d M Y - g:i A"
-#: ../../mod/message.php:272
+#: ../../mod/message.php:275
#, php-format
msgid "%d message"
msgid_plural "%d messages"
msgstr[0] "%d mesaĝo"
msgstr[1] "%d mesaĝoj"
-#: ../../mod/message.php:307
+#: ../../mod/message.php:310
msgid "Message not available."
msgstr "Mesaĝo nedisponebla."
-#: ../../mod/message.php:372
+#: ../../mod/message.php:375
msgid "Delete message"
msgstr "Forviŝu mesaĝon"
-#: ../../mod/message.php:390
+#: ../../mod/message.php:394
msgid ""
"No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page."
msgstr "Sekura komunikado ne disponeblas. Vi <strong>eble</strong> povus respondi sur la profilpaĝo de la sendanto."
-#: ../../mod/message.php:394
+#: ../../mod/message.php:398
msgid "Send Reply"
msgstr "Respondi"
@@ -3045,19 +3058,19 @@ msgstr "Neniom da amiko al montri."
msgid "Theme settings updated."
msgstr "Gisdatigis agordojn pri etosoj."
-#: ../../mod/admin.php:96 ../../mod/admin.php:403
+#: ../../mod/admin.php:96 ../../mod/admin.php:419
msgid "Site"
msgstr "Retejo"
-#: ../../mod/admin.php:97 ../../mod/admin.php:639 ../../mod/admin.php:651
+#: ../../mod/admin.php:97 ../../mod/admin.php:655 ../../mod/admin.php:667
msgid "Users"
msgstr "Uzantoj"
-#: ../../mod/admin.php:98 ../../mod/admin.php:733 ../../mod/admin.php:775
+#: ../../mod/admin.php:98 ../../mod/admin.php:749 ../../mod/admin.php:791
msgid "Plugins"
msgstr "Kromprogramoj"
-#: ../../mod/admin.php:99 ../../mod/admin.php:938 ../../mod/admin.php:974
+#: ../../mod/admin.php:99 ../../mod/admin.php:954 ../../mod/admin.php:990
msgid "Themes"
msgstr "Etosoj"
@@ -3065,598 +3078,622 @@ msgstr "Etosoj"
msgid "DB updates"
msgstr "DB ĝisdatigoj"
-#: ../../mod/admin.php:101
-msgid "Software Update"
-msgstr "Friendica Ĝisdatigoj"
-
-#: ../../mod/admin.php:115 ../../mod/admin.php:1061
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1077
msgid "Logs"
msgstr "Protokoloj"
-#: ../../mod/admin.php:120
+#: ../../mod/admin.php:120 ../../include/nav.php:146
+msgid "Admin"
+msgstr "Administrado"
+
+#: ../../mod/admin.php:121
+msgid "Plugin Features"
+msgstr "Kromprogramaj Trajtoj"
+
+#: ../../mod/admin.php:123
msgid "User registrations waiting for confirmation"
msgstr "Uzantaj registradoj atendante konfirmon"
-#: ../../mod/admin.php:195 ../../mod/admin.php:402 ../../mod/admin.php:638
-#: ../../mod/admin.php:732 ../../mod/admin.php:774 ../../mod/admin.php:937
-#: ../../mod/admin.php:973 ../../mod/admin.php:1060
+#: ../../mod/admin.php:183 ../../mod/admin.php:637
+msgid "Normal Account"
+msgstr "Normala konto"
+
+#: ../../mod/admin.php:184 ../../mod/admin.php:638
+msgid "Soapbox Account"
+msgstr "Soapbox Konto"
+
+#: ../../mod/admin.php:185 ../../mod/admin.php:639
+msgid "Community/Celebrity Account"
+msgstr "Komunuma/eminentula Konto"
+
+#: ../../mod/admin.php:186 ../../mod/admin.php:640
+msgid "Automatic Friend Account"
+msgstr "Aŭtomata Amika Konto"
+
+#: ../../mod/admin.php:205
+msgid "Message queues"
+msgstr "Mesaĝvicoj"
+
+#: ../../mod/admin.php:210 ../../mod/admin.php:418 ../../mod/admin.php:654
+#: ../../mod/admin.php:748 ../../mod/admin.php:790 ../../mod/admin.php:953
+#: ../../mod/admin.php:989 ../../mod/admin.php:1076
msgid "Administration"
msgstr "Administrado"
-#: ../../mod/admin.php:196
+#: ../../mod/admin.php:211
msgid "Summary"
msgstr "Resumo"
-#: ../../mod/admin.php:197
+#: ../../mod/admin.php:213
msgid "Registered users"
msgstr "Registrataj uzantoj"
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:215
msgid "Pending registrations"
msgstr "Okazontaj registradoj"
-#: ../../mod/admin.php:200
+#: ../../mod/admin.php:216
msgid "Version"
msgstr "Versio"
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:218
msgid "Active plugins"
msgstr "Ŝaltitaj kromprogramoj"
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:357
msgid "Site settings updated."
msgstr "Ĝisdatigis retejaj agordoj."
-#: ../../mod/admin.php:389
+#: ../../mod/admin.php:405
msgid "Closed"
msgstr "Ferma"
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:406
msgid "Requires approval"
msgstr "Bezonas aprobon"
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:407
msgid "Open"
msgstr "Malferma"
-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:411
msgid "No SSL policy, links will track page SSL state"
msgstr "Sen SSL strategio. Ligiloj sekvos la SSL staton de la paĝo."
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:412
msgid "Force all links to use SSL"
msgstr "Devigi ke ĉiuj ligiloj uzu SSL."
-#: ../../mod/admin.php:397
+#: ../../mod/admin.php:413
msgid "Self-signed certificate, use SSL for local links only (discouraged)"
msgstr "Memsubskribita atestilo, nur uzu SSL por lokaj ligiloj (malkuraĝigata)"
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:422
msgid "File upload"
msgstr "Alŝuto"
-#: ../../mod/admin.php:407
+#: ../../mod/admin.php:423
msgid "Policies"
msgstr "Politiko"
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:424
msgid "Advanced"
msgstr "Altnivela"
-#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:544
+#: ../../mod/admin.php:428 ../../addon/statusnet/statusnet.php:558
msgid "Site name"
msgstr "Nomo de retejo"
-#: ../../mod/admin.php:413
+#: ../../mod/admin.php:429
msgid "Banner/Logo"
msgstr "Emblemo"
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:430
msgid "System language"
msgstr "Sistema lingvo"
-#: ../../mod/admin.php:415
+#: ../../mod/admin.php:431
msgid "System theme"
msgstr "Sistema etoso"
-#: ../../mod/admin.php:415
+#: ../../mod/admin.php:431
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr "Defaŭlta sistema etoso - transpasebla de uzantprofiloj - <a href='#' id='cnftheme'>redakti agordoj pri etosoj</a>"
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:432
msgid "SSL link policy"
msgstr "Strategio por SSL ligiloj"
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:432
msgid "Determines whether generated links should be forced to use SSL"
msgstr "Difinas ĉu generotaj ligiloj devige uzu SSL."
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:433
msgid "Maximum image size"
msgstr "Maksimuma bildgrando"
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:433
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr "Maksimuma grando en bajtoj por alŝutotaj bildoj. Defaŭlte 0, kio signifas neniu limito."
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:435
msgid "Register policy"
msgstr "Interkonsento pri registrado"
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:436
msgid "Register text"
msgstr "Interkonsento teksto"
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:436
msgid "Will be displayed prominently on the registration page."
msgstr "Tio estos eminente montrata en la registro paĝo."
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:437
msgid "Accounts abandoned after x days"
msgstr "Kontoj forlasitaj post x tagoj"
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:437
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo."
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:438
msgid "Allowed friend domains"
msgstr "Permesitaj amikaj domainoj"
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:438
msgid ""
"Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr "Perkome disigita listo da domajnoj kiuj rajtas konstrui amikecojn kun ĉi tiu retejo. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn."
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:439
msgid "Allowed email domains"
msgstr "Permesitaj retpoŝtaj domajnoj"
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:439
msgid ""
"Comma separated list of domains which are allowed in email addresses for "
"registrations to this site. Wildcards are accepted. Empty to allow any "
"domains"
msgstr "Perkome disigita listo da domajnoj kiuj uzeblas kiel retpoŝtaj adresoj en novaj registradoj. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn."
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:440
msgid "Block public"
msgstr "Bloki publike"
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:440
msgid ""
"Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in."
msgstr "Elektu por bloki publikan atingon al ĉiuj alie publikajn paĝojn en ĉi tiu retejo kiam vi ne estas ensalutita."
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:441
msgid "Force publish"
msgstr "Devigi publikigon"
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:441
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr "Elektu por devigi la registradon en la loka katalogo al ĉiuj profiloj en ĉi tiu retejo."
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:442
msgid "Global directory update URL"
msgstr "Ĝenerala adreso por ĝisdatigi la katalogon"
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:442
msgid ""
"URL to update the global directory. If this is not set, the global directory"
" is completely unavailable to the application."
msgstr "URL adreso por ĝisdatigi la tutmondan katalogon. Se ne agordita, la tutmonda katatolge tute ne disponeblas al la programo."
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:444
msgid "Block multiple registrations"
msgstr "Bloki pluroblajn registradojn."
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:444
msgid "Disallow users to register additional accounts for use as pages."
msgstr "Malpermesi al uzantoj la permeson por registri pluajn kontojn kiel paĝoj."
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:445
msgid "OpenID support"
msgstr "Subteno por OpenID"
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:445
msgid "OpenID support for registration and logins."
msgstr "Subteni OpenID por registrado kaj ensaluto."
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:446
msgid "Fullname check"
msgstr "Kontroli plenan nomon"
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:446
msgid ""
"Force users to register with a space between firstname and lastname in Full "
"name, as an antispam measure"
msgstr "Kiel kontraŭspamilo, devigi uzantoj al registrado kun spaceto inter la persona nomo kaj la familia nomo."
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:447
msgid "UTF-8 Regular expressions"
msgstr "UTF-8 regulaj exprimoj"
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:447
msgid "Use PHP UTF8 regular expressions"
msgstr "Uzi PHP UTF8 regulajn esprimojn."
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:448
msgid "Show Community Page"
msgstr "Montri Komunuma Paĝo"
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:448
msgid ""
"Display a Community page showing all recent public postings on this site."
msgstr "Montri komunuma paĝo kun ĉiuj ĵusaj afiŝoj en ĉi tiu retejo."
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:449
msgid "Enable OStatus support"
msgstr "Ŝalti subtenon por OStatus"
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:449
msgid ""
"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
"communications in OStatus are public, so privacy warnings will be "
"occasionally displayed."
msgstr "Provizi integritan OStatus (identi.ca, status.net ktp) subtenon. Ĉiuj komunikadoj en OStatus estas publikaj, do privatecaj avertoj aperos de tempo al tempo."
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:450
msgid "Enable Diaspora support"
msgstr "Ŝalti subtenon por Diaspora"
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:450
msgid "Provide built-in Diaspora network compatibility."
msgstr "Provizi integritan Diaspora subtenon."
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:451
msgid "Only allow Friendica contacts"
msgstr "Nur permesigi Friendica kontaktojn"
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:451
msgid ""
"All contacts must use Friendica protocols. All other built-in communication "
"protocols disabled."
msgstr "Ĉiuj kontaktoj devas uzi Friendica protokolojn. Ĉiuj aliaj komunikaj protokoloj malaktivita."
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:452
msgid "Verify SSL"
msgstr "Kontroli SSL"
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:452
msgid ""
"If you wish, you can turn on strict certificate checking. This will mean you"
" cannot connect (at all) to self-signed SSL sites."
msgstr "Se vi deziras, vi povas aktivigi severan kontroladon de SSL atestiloj. Pro tio, vie (tute) ne eblos konekti al SSL retejoj kun memsubskribitaj atestiloj."
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:453
msgid "Proxy user"
msgstr "Uzantnomo por retperanto"
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:454
msgid "Proxy URL"
msgstr "URL adreso de retperanto"
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:455
msgid "Network timeout"
msgstr "Reta tempolimo"
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:455
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "Valoro en sekundoj. Uzu 0 por mallimitigi (ne rekomendata)."
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:456
msgid "Delivery interval"
msgstr "Intervalo de liverado"
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:456
msgid ""
"Delay background delivery processes by this many seconds to reduce system "
"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
"for large dedicated servers."
msgstr "Malfruigi fonan liveradon dum tiom da sekundoj por malpliigi la ŝargon de la sistemo. Rekomendoj: 4-5 por komunaj serviloj, 2-3 por virtualaj privataj serviloj, 0-1 por grandaj dediĉitaj serviloj."
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:457
msgid "Poll interval"
msgstr "Enketintervalo"
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:457
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr "Malfruigi fonajn enketprocesojn je tiom da sekundoj por malpliigi la ŝargon de la sistemo. Se 0, uzas la liverintervalon."
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:458
msgid "Maximum Load Average"
msgstr "Maksimuma Meza Sistemŝargo"
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:458
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr "Maksimuma sistemŝargo post kiu livero- kaj enketprocesoj estos prokrastinataj. - Defaŭlte 50."
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:472
msgid "Update has been marked successful"
msgstr "Ĝisdatigo estas markita sukcesa"
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:482
#, php-format
msgid "Executing %s failed. Check system logs."
msgstr "Ne sukcesis plenumi %s. Kontrolu la sistemprotokolojn."
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:485
#, php-format
msgid "Update %s was successfully applied."
msgstr "Sukcese aplikis la ĝisdatigo %s."
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:489
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr "Ĝisdatigo %s ne liveris elirstaton. "
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:492
#, php-format
msgid "Update function %s could not be found."
msgstr "Ne troveblas ĝisdatigo funkcio %s."
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:507
msgid "No failed updates."
msgstr "Neniom da malsukcesaj ĝisdatigoj."
-#: ../../mod/admin.php:495
+#: ../../mod/admin.php:511
msgid "Failed Updates"
msgstr "Malsukcesaj Ĝisdatigoj"
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:512
msgid ""
"This does not include updates prior to 1139, which did not return a status."
msgstr "Ne inkluzivas ĝisdatigojn antaŭ 1139, kiuj ne liveris elirstaton."
-#: ../../mod/admin.php:497
+#: ../../mod/admin.php:513
msgid "Mark success (if update was manually applied)"
msgstr "Marki sukcesa (se la ĝisdatigo estas instalita mane)"
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:514
msgid "Attempt to execute this update step automatically"
msgstr "Provi automate plenumi ĉi tian paŝon de la ĝisdatigo."
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:539
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] "Blokis/malblokis %s uzanton"
msgstr[1] "Blokis/malblokis %s uzantojn"
-#: ../../mod/admin.php:530
+#: ../../mod/admin.php:546
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] "%s uzanto forviŝita"
msgstr[1] "%s uzanto forviŝitaj"
-#: ../../mod/admin.php:569
+#: ../../mod/admin.php:585
#, php-format
msgid "User '%s' deleted"
msgstr "Uzanto '%s' forviŝita"
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:593
#, php-format
msgid "User '%s' unblocked"
msgstr "Uzanto '%s' malblokita"
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:593
#, php-format
msgid "User '%s' blocked"
msgstr "Uzanto '%s' blokita"
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:657
msgid "select all"
msgstr "elekti ĉiujn"
-#: ../../mod/admin.php:642
+#: ../../mod/admin.php:658
msgid "User registrations waiting for confirm"
msgstr "Registriĝoj atendante aprobon"
-#: ../../mod/admin.php:643
+#: ../../mod/admin.php:659
msgid "Request date"
msgstr "Dato de peto"
-#: ../../mod/admin.php:643 ../../mod/admin.php:652
+#: ../../mod/admin.php:659 ../../mod/admin.php:668
#: ../../include/contact_selectors.php:79
msgid "Email"
msgstr "Retpoŝto"
-#: ../../mod/admin.php:644
+#: ../../mod/admin.php:660
msgid "No registrations."
msgstr "Neniom da registriĝoj."
-#: ../../mod/admin.php:646
+#: ../../mod/admin.php:662
msgid "Deny"
msgstr "Negi"
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:668
msgid "Register date"
msgstr "Dato de registrado"
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:668
msgid "Last login"
msgstr "Plej ĵusa ensaluto"
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:668
msgid "Last item"
msgstr "Plej ĵusa elemento"
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:668
msgid "Account"
msgstr "Konto"
-#: ../../mod/admin.php:654
+#: ../../mod/admin.php:670
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr "La elektitaj uzantkontoj estas forviŝotaj!\\n\\nĈiuj elementoj kiujn ili afiŝis je la retpaĝo estos permanente forviŝitaj.\\n\\nĈu vi certas?"
-#: ../../mod/admin.php:655
+#: ../../mod/admin.php:671
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr "La uzanto {0} estas forviŝota!\\n\\nĈiuj elementoj kiujn li afiŝis je la retpaĝo estos permanente forviŝitaj.\\n\\nĈu vi certas?"
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:712
#, php-format
msgid "Plugin %s disabled."
msgstr "Kromprogramo %s estas malŝaltita."
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:716
#, php-format
msgid "Plugin %s enabled."
msgstr "Kromprogramo %s estas ŝaltita."
-#: ../../mod/admin.php:710 ../../mod/admin.php:908
+#: ../../mod/admin.php:726 ../../mod/admin.php:924
msgid "Disable"
msgstr "Malŝalti"
-#: ../../mod/admin.php:712 ../../mod/admin.php:910
+#: ../../mod/admin.php:728 ../../mod/admin.php:926
msgid "Enable"
msgstr "Ŝalti"
-#: ../../mod/admin.php:734 ../../mod/admin.php:939
+#: ../../mod/admin.php:750 ../../mod/admin.php:955
msgid "Toggle"
msgstr "Ŝalti/Malŝalti"
-#: ../../mod/admin.php:742 ../../mod/admin.php:949
+#: ../../mod/admin.php:758 ../../mod/admin.php:965
msgid "Author: "
msgstr "Aŭtoro: "
-#: ../../mod/admin.php:743 ../../mod/admin.php:950
+#: ../../mod/admin.php:759 ../../mod/admin.php:966
msgid "Maintainer: "
msgstr "Prizorganto: "
-#: ../../mod/admin.php:872
+#: ../../mod/admin.php:888
msgid "No themes found."
msgstr "Ne trovis etosojn."
-#: ../../mod/admin.php:931
+#: ../../mod/admin.php:947
msgid "Screenshot"
msgstr "Ekrankopio"
-#: ../../mod/admin.php:979
+#: ../../mod/admin.php:995
msgid "[Experimental]"
msgstr "[Eksperimenta]"
-#: ../../mod/admin.php:980
+#: ../../mod/admin.php:996
msgid "[Unsupported]"
msgstr "[Nesubtenata]"
-#: ../../mod/admin.php:1007
+#: ../../mod/admin.php:1023
msgid "Log settings updated."
msgstr "Protokolagordoj ĝisdatigitaj."
-#: ../../mod/admin.php:1063
+#: ../../mod/admin.php:1079
msgid "Clear"
msgstr "Forviŝi"
-#: ../../mod/admin.php:1069
+#: ../../mod/admin.php:1085
msgid "Debugging"
msgstr "Sencimigado"
-#: ../../mod/admin.php:1070
+#: ../../mod/admin.php:1086
msgid "Log file"
msgstr "Protokolo"
-#: ../../mod/admin.php:1070
+#: ../../mod/admin.php:1086
msgid ""
"Must be writable by web server. Relative to your Friendica top-level "
"directory."
msgstr "Devas esti skribebla de la retservilo. Relativa al via plej supra Friendica dosierujo."
-#: ../../mod/admin.php:1071
+#: ../../mod/admin.php:1087
msgid "Log level"
msgstr "Protokolnivelo"
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1137
msgid "Close"
msgstr "Fermi"
-#: ../../mod/admin.php:1127
+#: ../../mod/admin.php:1143
msgid "FTP Host"
msgstr "FTP Servilo"
-#: ../../mod/admin.php:1128
+#: ../../mod/admin.php:1144
msgid "FTP Path"
msgstr "FTP Vojo"
-#: ../../mod/admin.php:1129
+#: ../../mod/admin.php:1145
msgid "FTP User"
msgstr "FTP Uzanto"
-#: ../../mod/admin.php:1130
+#: ../../mod/admin.php:1146
msgid "FTP Password"
msgstr "FTP Pasvorto"
-#: ../../mod/profile.php:21 ../../boot.php:955
+#: ../../mod/profile.php:21 ../../boot.php:993
msgid "Requested profile is not available."
msgstr "La petita profilo ne disponeblas."
-#: ../../mod/profile.php:126 ../../mod/display.php:75
+#: ../../mod/profile.php:141 ../../mod/display.php:75
msgid "Access to this profile has been restricted."
msgstr "Atingo al ĉi tio profilo estas limitigita"
-#: ../../mod/profile.php:151
+#: ../../mod/profile.php:166
msgid "Tips for New Members"
msgstr "Konsilo por novaj membroj"
-#: ../../mod/ping.php:177
+#: ../../mod/ping.php:185
msgid "{0} wants to be your friend"
msgstr "{0} volas amikiĝi kun vi"
-#: ../../mod/ping.php:182
+#: ../../mod/ping.php:190
msgid "{0} sent you a message"
msgstr "{0} sendis mesaĝon al vi"
-#: ../../mod/ping.php:187
+#: ../../mod/ping.php:195
msgid "{0} requested registration"
msgstr "{0} petis registradon"
-#: ../../mod/ping.php:193
+#: ../../mod/ping.php:201
#, php-format
msgid "{0} commented %s's post"
msgstr "{0} komentis pri la afiŝo de %s"
-#: ../../mod/ping.php:198
+#: ../../mod/ping.php:206
#, php-format
msgid "{0} liked %s's post"
msgstr "{0} satis la afiŝon de %s"
-#: ../../mod/ping.php:203
+#: ../../mod/ping.php:211
#, php-format
msgid "{0} disliked %s's post"
msgstr "{0} malŝatis la afiŝon de %s"
-#: ../../mod/ping.php:208
+#: ../../mod/ping.php:216
#, php-format
msgid "{0} is now friends with %s"
msgstr "{0} amikiĝis kun %s"
-#: ../../mod/ping.php:213
+#: ../../mod/ping.php:221
msgid "{0} posted"
msgstr "{0} afiŝis"
-#: ../../mod/ping.php:218
+#: ../../mod/ping.php:226
#, php-format
msgid "{0} tagged %s's post with #%s"
msgstr "{0} markis la afiŝon de %s kun #%s"
-#: ../../mod/ping.php:224
+#: ../../mod/ping.php:232
msgid "{0} mentioned you in a post"
msgstr "{0} menciis vin en afiŝo"
@@ -3671,67 +3708,16 @@ msgstr "Eraro en OpenID protokolo. Ne resendis identecon."
#: ../../mod/openid.php:53
msgid ""
"Account not found and OpenID registration is not permitted on this site."
-msgstr "Ne trovis kontoj, kaj registrado tra OpenID estas malpermesita ĉi tie."
+msgstr "Ne trovis kontoj, kaj registrado per OpenID estas malpermesita ĉi tie."
-#: ../../mod/openid.php:93 ../../include/auth.php:90
-#: ../../include/auth.php:153
+#: ../../mod/openid.php:93 ../../include/auth.php:99
+#: ../../include/auth.php:162
msgid "Login failed."
msgstr "Ensalutado malsukcesis."
-#: ../../mod/follow.php:30
-msgid "Connect URL missing."
-msgstr "Ne ekzistas URL adreso por konekti."
-
-#: ../../mod/follow.php:56
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Tiu retpaĝo ne permesas komunikadon kun aliaj retoj."
-
-#: ../../mod/follow.php:57 ../../mod/follow.php:72
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Ne malkovris kongruajn protokolojn por komunikado aŭ fluojn."
-
-#: ../../mod/follow.php:70
-msgid "The profile address specified does not provide adequate information."
-msgstr "La specifita profiladreso ne enhavas sufiĉe da informoj."
-
-#: ../../mod/follow.php:74
-msgid "An author or name was not found."
-msgstr "Ne trovis aŭtoron aŭ nomon."
-
-#: ../../mod/follow.php:76
-msgid "No browser URL could be matched to this address."
-msgstr "Neniu retuma URL adreso kongruas al la adreso."
-
-#: ../../mod/follow.php:78
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Ne eblas kongrui @-stilan identecon adreson al iu konata protokolo au retpoŝtadreso."
-
-#: ../../mod/follow.php:79
-msgid "Use mailto: in front of address to force email check."
-msgstr "Uzu mailto: antaŭ la adreso por devigi la testadon per retpoŝto."
-
-#: ../../mod/follow.php:85
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "Tiu profila adreso apartenas al retejo kiu estas maŝaltita je ĉi tiu retejo."
-
-#: ../../mod/follow.php:90
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Profilo limigata. Ĉi persono ne eblos ricevi rektajn/personajn atentigojn de vi. "
-
-#: ../../mod/follow.php:160
-msgid "Unable to retrieve contact information."
-msgstr "Ne eblas ricevi kontaktinformojn."
-
-#: ../../mod/follow.php:206
-msgid "following"
-msgstr "sekvanta"
+#: ../../mod/follow.php:27
+msgid "Contact added"
+msgstr "Aldonis kontakton"
#: ../../mod/common.php:42
msgid "Common Friends"
@@ -3753,12 +3739,13 @@ msgstr "Programoj"
msgid "No installed applications."
msgstr "Neniom da instalitaj programoj."
-#: ../../mod/search.php:83
-msgid "Search This Site"
-msgstr "Serĉi ĉi-tiun retejon"
+#: ../../mod/search.php:83 ../../include/text.php:649
+#: ../../include/text.php:650 ../../include/nav.php:91
+msgid "Search"
+msgstr "Serĉi"
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:375
-#: ../../mod/profiles.php:489 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:410
+#: ../../mod/profiles.php:524 ../../mod/dfrn_confirm.php:62
msgid "Profile not found."
msgstr "Profilo ne trovita."
@@ -3766,272 +3753,305 @@ msgstr "Profilo ne trovita."
msgid "Profile Name is required."
msgstr "Nomo de profilo estas bezonata."
-#: ../../mod/profiles.php:145
+#: ../../mod/profiles.php:155
msgid "Marital Status"
msgstr "Amrilata Stato"
-#: ../../mod/profiles.php:149
+#: ../../mod/profiles.php:159
msgid "Romantic Partner"
msgstr "Kora Partnero"
-#: ../../mod/profiles.php:153
+#: ../../mod/profiles.php:163
+msgid "Likes"
+msgstr "Ŝatoj"
+
+#: ../../mod/profiles.php:167
+msgid "Dislikes"
+msgstr "Malŝatoj"
+
+#: ../../mod/profiles.php:171
msgid "Work/Employment"
msgstr "Laboro"
-#: ../../mod/profiles.php:156
+#: ../../mod/profiles.php:174
msgid "Religion"
msgstr "Religio"
-#: ../../mod/profiles.php:160
+#: ../../mod/profiles.php:178
msgid "Political Views"
msgstr "Politikaj Opinioj"
-#: ../../mod/profiles.php:164
+#: ../../mod/profiles.php:182
msgid "Gender"
msgstr "Sekso"
-#: ../../mod/profiles.php:168
+#: ../../mod/profiles.php:186
msgid "Sexual Preference"
msgstr "Seksa Prefero"
-#: ../../mod/profiles.php:172
+#: ../../mod/profiles.php:190
msgid "Homepage"
msgstr "Hejmpaĝo"
-#: ../../mod/profiles.php:176
+#: ../../mod/profiles.php:194
msgid "Interests"
msgstr "Interesoj"
-#: ../../mod/profiles.php:181
+#: ../../mod/profiles.php:198
+msgid "Address"
+msgstr "Adreso"
+
+#: ../../mod/profiles.php:205 ../../addon/dav/layout.fnk.php:310
msgid "Location"
msgstr "Loko"
-#: ../../mod/profiles.php:253
+#: ../../mod/profiles.php:288
msgid "Profile updated."
msgstr "Profilo ĝisdatigita."
-#: ../../mod/profiles.php:320
+#: ../../mod/profiles.php:355
msgid " and "
msgstr " kaj "
-#: ../../mod/profiles.php:328
+#: ../../mod/profiles.php:363
msgid "public profile"
msgstr "publika profilo"
-#: ../../mod/profiles.php:331
+#: ../../mod/profiles.php:366
#, php-format
msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
msgstr "%1$s ŝanĝis %2$s al &ldquo;%3$s&rdquo;"
-#: ../../mod/profiles.php:335
+#: ../../mod/profiles.php:367
+#, php-format
+msgid " - Visit %1$s's %2$s"
+msgstr " - Vizitu la %2$s de %1$s"
+
+#: ../../mod/profiles.php:370
#, php-format
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "%1$s havas ĝisdatigigan %2$s, ŝanĝas %3$s."
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:429
msgid "Profile deleted."
msgstr "Profilo forviŝita."
-#: ../../mod/profiles.php:412 ../../mod/profiles.php:446
+#: ../../mod/profiles.php:447 ../../mod/profiles.php:481
msgid "Profile-"
msgstr "Profilo-"
-#: ../../mod/profiles.php:431 ../../mod/profiles.php:473
+#: ../../mod/profiles.php:466 ../../mod/profiles.php:508
msgid "New profile created."
msgstr "Nova profilo kreita."
-#: ../../mod/profiles.php:452
+#: ../../mod/profiles.php:487
msgid "Profile unavailable to clone."
msgstr "Ne eblas kopii profilon."
-#: ../../mod/profiles.php:510
+#: ../../mod/profiles.php:545
msgid "Hide your contact/friend list from viewers of this profile?"
msgstr "Kaŝi vian liston de kontaktoj/amikoj al vidantoj de ĉi-tio profilo?"
-#: ../../mod/profiles.php:533
+#: ../../mod/profiles.php:568
msgid "Edit Profile Details"
msgstr "Redakti Detalojn de Profilo"
-#: ../../mod/profiles.php:535
+#: ../../mod/profiles.php:570
msgid "View this profile"
msgstr "Vidi la profilon."
-#: ../../mod/profiles.php:536
+#: ../../mod/profiles.php:571
msgid "Create a new profile using these settings"
msgstr "Krei novan profilon kun tiaj agordoj"
-#: ../../mod/profiles.php:537
+#: ../../mod/profiles.php:572
msgid "Clone this profile"
msgstr "Kopii ĉi tiun profilon"
-#: ../../mod/profiles.php:538
+#: ../../mod/profiles.php:573
msgid "Delete this profile"
msgstr "Forviŝi ĉi tiun profilon"
-#: ../../mod/profiles.php:539
+#: ../../mod/profiles.php:574
msgid "Profile Name:"
msgstr "Nomo de Profilo:"
-#: ../../mod/profiles.php:540
+#: ../../mod/profiles.php:575
msgid "Your Full Name:"
msgstr "Via Plena Nomo:"
-#: ../../mod/profiles.php:541
+#: ../../mod/profiles.php:576
msgid "Title/Description:"
msgstr "Titolo/Priskribo:"
-#: ../../mod/profiles.php:542
+#: ../../mod/profiles.php:577
msgid "Your Gender:"
msgstr "Via Sekso:"
-#: ../../mod/profiles.php:543
+#: ../../mod/profiles.php:578
#, php-format
msgid "Birthday (%s):"
msgstr "Naskiĝtago (%s):"
-#: ../../mod/profiles.php:544
+#: ../../mod/profiles.php:579
msgid "Street Address:"
msgstr "Adreso:"
-#: ../../mod/profiles.php:545
+#: ../../mod/profiles.php:580
msgid "Locality/City:"
msgstr "Urbo:"
-#: ../../mod/profiles.php:546
+#: ../../mod/profiles.php:581
msgid "Postal/Zip Code:"
msgstr "Poŝtkodo:"
-#: ../../mod/profiles.php:547
+#: ../../mod/profiles.php:582
msgid "Country:"
msgstr "Lando:"
-#: ../../mod/profiles.php:548
+#: ../../mod/profiles.php:583
msgid "Region/State:"
msgstr "Ŝtato:"
-#: ../../mod/profiles.php:549
+#: ../../mod/profiles.php:584
msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
msgstr "<span class=\"heart\">&hearts;</span> Civita Stato:"
-#: ../../mod/profiles.php:550
+#: ../../mod/profiles.php:585
msgid "Who: (if applicable)"
msgstr "Kiu (se aplikeble):"
-#: ../../mod/profiles.php:551
+#: ../../mod/profiles.php:586
msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "Ekzemploj: cathy123, Cathy Williams, cathy@example.com"
-#: ../../mod/profiles.php:552 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:587
+msgid "Since [date]:"
+msgstr "Ekde [dato]:"
+
+#: ../../mod/profiles.php:588 ../../include/profile_advanced.php:46
msgid "Sexual Preference:"
msgstr "Seksa Prefero:"
-#: ../../mod/profiles.php:553
+#: ../../mod/profiles.php:589
msgid "Homepage URL:"
msgstr "Adreso de Hejmpaĝo:"
-#: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:590 ../../include/profile_advanced.php:50
+msgid "Hometown:"
+msgstr "Hejmurbo:"
+
+#: ../../mod/profiles.php:591 ../../include/profile_advanced.php:54
msgid "Political Views:"
msgstr "Politikaj Opinioj:"
-#: ../../mod/profiles.php:555
+#: ../../mod/profiles.php:592
msgid "Religious Views:"
msgstr "Religiaj Opinioj:"
-#: ../../mod/profiles.php:556
+#: ../../mod/profiles.php:593
msgid "Public Keywords:"
msgstr "Publikaj ŝlosilvortoj:"
-#: ../../mod/profiles.php:557
+#: ../../mod/profiles.php:594
msgid "Private Keywords:"
msgstr "Privataj ŝlosilvortoj:"
-#: ../../mod/profiles.php:558
+#: ../../mod/profiles.php:595 ../../include/profile_advanced.php:62
+msgid "Likes:"
+msgstr "Ŝatoj:"
+
+#: ../../mod/profiles.php:596 ../../include/profile_advanced.php:64
+msgid "Dislikes:"
+msgstr "Malŝatoj:"
+
+#: ../../mod/profiles.php:597
msgid "Example: fishing photography software"
msgstr "Ekzemple: fiŝkapti fotografio programaro"
-#: ../../mod/profiles.php:559
+#: ../../mod/profiles.php:598
msgid "(Used for suggesting potential friends, can be seen by others)"
msgstr "(Por sugesti amikoj. Videbla al aliaj.)"
-#: ../../mod/profiles.php:560
+#: ../../mod/profiles.php:599
msgid "(Used for searching profiles, never shown to others)"
msgstr "(Por serĉi profilojn. Neniam videbla al aliaj.)"
-#: ../../mod/profiles.php:561
+#: ../../mod/profiles.php:600
msgid "Tell us about yourself..."
msgstr "Diru al ni pri vi..."
-#: ../../mod/profiles.php:562
+#: ../../mod/profiles.php:601
msgid "Hobbies/Interests"
msgstr "Ŝatokupoj/Interesoj"
-#: ../../mod/profiles.php:563
+#: ../../mod/profiles.php:602
msgid "Contact information and Social Networks"
msgstr "Kontaktaj informoj kaj Interkonaj Retejoj"
-#: ../../mod/profiles.php:564
+#: ../../mod/profiles.php:603
msgid "Musical interests"
msgstr "Muzikaj interesoj"
-#: ../../mod/profiles.php:565
+#: ../../mod/profiles.php:604
msgid "Books, literature"
msgstr "Libroj, literaturo"
-#: ../../mod/profiles.php:566
+#: ../../mod/profiles.php:605
msgid "Television"
msgstr "Televido"
-#: ../../mod/profiles.php:567
+#: ../../mod/profiles.php:606
msgid "Film/dance/culture/entertainment"
msgstr "Filmoj/dancoj/arto/amuzaĵoj"
-#: ../../mod/profiles.php:568
+#: ../../mod/profiles.php:607
msgid "Love/romance"
msgstr "Amo/romanco"
-#: ../../mod/profiles.php:569
+#: ../../mod/profiles.php:608
msgid "Work/employment"
msgstr "Laboro"
-#: ../../mod/profiles.php:570
+#: ../../mod/profiles.php:609
msgid "School/education"
msgstr "Lernejo/eduko"
-#: ../../mod/profiles.php:575
+#: ../../mod/profiles.php:614
msgid ""
"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
"be visible to anybody using the internet."
msgstr "Ĉi tio estas via <strong>publika</strong> profilo. Ĝi <strong>eble</strong> estas videbla al ĉiuj en interreto. "
-#: ../../mod/profiles.php:585 ../../mod/directory.php:111
+#: ../../mod/profiles.php:624 ../../mod/directory.php:111
msgid "Age: "
msgstr "Aĝo:"
-#: ../../mod/profiles.php:620
+#: ../../mod/profiles.php:663
msgid "Edit/Manage Profiles"
msgstr "Redakti/administri Profilojn"
-#: ../../mod/profiles.php:621 ../../boot.php:1064
+#: ../../mod/profiles.php:664 ../../boot.php:1102
msgid "Change profile photo"
msgstr "Ŝanĝi profilbildon"
-#: ../../mod/profiles.php:622 ../../boot.php:1065
+#: ../../mod/profiles.php:665 ../../boot.php:1103
msgid "Create New Profile"
msgstr "Krei novan profilon"
-#: ../../mod/profiles.php:633 ../../boot.php:1075
+#: ../../mod/profiles.php:676 ../../boot.php:1113
msgid "Profile Image"
msgstr "Profilbildo"
-#: ../../mod/profiles.php:635 ../../boot.php:1078
+#: ../../mod/profiles.php:678 ../../boot.php:1116
msgid "visible to everybody"
msgstr "videbla al ĉiuj"
-#: ../../mod/profiles.php:636 ../../boot.php:1079
+#: ../../mod/profiles.php:679 ../../boot.php:1117
msgid "Edit visibility"
msgstr "Redakti videblecon"
-#: ../../mod/filer.php:29 ../../include/conversation.php:922
+#: ../../mod/filer.php:29 ../../include/conversation.php:951
msgid "Save to Folder:"
msgstr "Konservi en Dosierujo:"
@@ -4079,7 +4099,7 @@ msgstr "Aldoni"
msgid "No entries."
msgstr "Neniom da afiŝoj."
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:554
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr "Amikosugestoj"
@@ -4094,12 +4114,7 @@ msgstr "Neniu sugestoj disponeblas. Se ĉi tiu estas nova retejo, bonvolu reprov
msgid "Ignore/Hide"
msgstr "Ignori/Kaŝi"
-#: ../../mod/acl.php:134
-#, php-format
-msgid "%s [%s]"
-msgstr "%s [%s]"
-
-#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:552
+#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:624
msgid "Global Directory"
msgstr "Tutmonda Katalogo"
@@ -4195,7 +4210,7 @@ msgstr "Vi bezonas ĉi-tiun invitkodon: $invite_code"
#: ../../mod/invite.php:116
msgid ""
"Once you have registered, please connect with me via my profile page at:"
-msgstr "Kiam vi registris, bonvolu konekti al mi tra mi profilo ĉe: "
+msgstr "Kiam vi registris, bonvolu konekti al mi pere de mi profilo ĉe: "
#: ../../mod/invite.php:118
msgid ""
@@ -4209,164 +4224,180 @@ msgid ""
" has already been approved."
msgstr "Tio ĉi okazis de tempo al tempo se ambaŭ personoj petas kontakton ka ĝi jam estas aprobita."
-#: ../../mod/dfrn_confirm.php:242
+#: ../../mod/dfrn_confirm.php:237
msgid "Response from remote site was not understood."
msgstr "Ne komprenis la rispondon de la fora retejo."
-#: ../../mod/dfrn_confirm.php:251
+#: ../../mod/dfrn_confirm.php:246
msgid "Unexpected response from remote site: "
msgstr "Neatendita rispondo de la fora retejo:"
-#: ../../mod/dfrn_confirm.php:259
+#: ../../mod/dfrn_confirm.php:254
msgid "Confirmation completed successfully."
msgstr "Konfirmo sukcese kompletigita."
-#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275
-#: ../../mod/dfrn_confirm.php:282
+#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:277
msgid "Remote site reported: "
msgstr "La fora retejo raportis:"
-#: ../../mod/dfrn_confirm.php:273
+#: ../../mod/dfrn_confirm.php:268
msgid "Temporary failure. Please wait and try again."
msgstr "Dumtempa eraro. Bonvolu atendi kaj provi refoje."
-#: ../../mod/dfrn_confirm.php:280
+#: ../../mod/dfrn_confirm.php:275
msgid "Introduction failed or was revoked."
msgstr "La prezento malsukcesis au estas revokita."
-#: ../../mod/dfrn_confirm.php:425
+#: ../../mod/dfrn_confirm.php:420
msgid "Unable to set contact photo."
msgstr "Neeblas agordi la kontaktbildo."
-#: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:510
#: ../../include/conversation.php:101
#, php-format
msgid "%1$s is now friends with %2$s"
msgstr "%1$s amikiĝis kun %2$s"
-#: ../../mod/dfrn_confirm.php:554
+#: ../../mod/dfrn_confirm.php:562
#, php-format
msgid "No user record found for '%s' "
msgstr "Ne trovis uzanton '%s' "
-#: ../../mod/dfrn_confirm.php:564
+#: ../../mod/dfrn_confirm.php:572
msgid "Our site encryption key is apparently messed up."
msgstr "Ŝajnas kvazaŭ la ĉifroŝlosilo de nia retejo estas fuŝita."
-#: ../../mod/dfrn_confirm.php:575
+#: ../../mod/dfrn_confirm.php:583
msgid "Empty site URL was provided or URL could not be decrypted by us."
msgstr "Malplena adreso de retejo provizita, aŭ ni ne povis malĉifri la adreson."
-#: ../../mod/dfrn_confirm.php:596
+#: ../../mod/dfrn_confirm.php:604
msgid "Contact record was not found for you on our site."
msgstr "Kontakto ne trovita por vi en via retejo."
-#: ../../mod/dfrn_confirm.php:610
+#: ../../mod/dfrn_confirm.php:618
#, php-format
msgid "Site public key not available in contact record for URL %s."
msgstr "Publika ŝlosilo de retejo ne disponeblas en la kontaktrikordo por la URL adreso %s."
-#: ../../mod/dfrn_confirm.php:630
+#: ../../mod/dfrn_confirm.php:638
msgid ""
"The ID provided by your system is a duplicate on our system. It should work "
"if you try again."
msgstr "La identeco provizita de via sistemo estas duoblo ĉe nia sistemo. Ĝi eble funkcias se vi provas refoje."
-#: ../../mod/dfrn_confirm.php:641
+#: ../../mod/dfrn_confirm.php:649
msgid "Unable to set your contact credentials on our system."
msgstr "Ne sukcesis agordi la legitimaĵojn de via kontakto ĉe nia sistemo."
-#: ../../mod/dfrn_confirm.php:706
+#: ../../mod/dfrn_confirm.php:716
msgid "Unable to update your contact profile details on our system"
msgstr "Neeblas ĝisdatigi viajn profildetalojn ĉe nia sistemo."
-#: ../../mod/dfrn_confirm.php:740
+#: ../../mod/dfrn_confirm.php:750
#, php-format
msgid "Connection accepted at %s"
msgstr "Konekto akceptita je %s"
-#: ../../mod/dfrn_confirm.php:789
+#: ../../mod/dfrn_confirm.php:799
#, php-format
msgid "%1$s has joined %2$s"
msgstr "%1$s aliĝis al %2$s"
-#: ../../addon/facebook/facebook.php:501
+#: ../../addon/fromgplus/fromgplus.php:29
+msgid "Google+ Import Settings"
+msgstr "Google+ Importo"
+
+#: ../../addon/fromgplus/fromgplus.php:32
+msgid "Enable Google+ Import"
+msgstr "Aktivigi Ĝoogle+ Importon"
+
+#: ../../addon/fromgplus/fromgplus.php:35
+msgid "Google Account ID"
+msgstr "Google Konto ID"
+
+#: ../../addon/fromgplus/fromgplus.php:55
+msgid "Google+ Import Settings saved."
+msgstr "Konservis Agordojn por Google+ Importo."
+
+#: ../../addon/facebook/facebook.php:521
msgid "Facebook disabled"
msgstr "Facebook malŝaltita"
-#: ../../addon/facebook/facebook.php:506
+#: ../../addon/facebook/facebook.php:526
msgid "Updating contacts"
msgstr "Mi ĝisdatigas la kontaktojn."
-#: ../../addon/facebook/facebook.php:529
+#: ../../addon/facebook/facebook.php:549
msgid "Facebook API key is missing."
msgstr "La API ŝlosilo de Facebook ne estas konata ĉi tie."
-#: ../../addon/facebook/facebook.php:536
+#: ../../addon/facebook/facebook.php:556
msgid "Facebook Connect"
msgstr "Kontekto al Facebook"
-#: ../../addon/facebook/facebook.php:542
+#: ../../addon/facebook/facebook.php:562
msgid "Install Facebook connector for this account."
msgstr "Instali la Facebook konektilo por ĉi tiu konto."
-#: ../../addon/facebook/facebook.php:549
+#: ../../addon/facebook/facebook.php:569
msgid "Remove Facebook connector"
msgstr "Forigi la Facebook konektilon."
-#: ../../addon/facebook/facebook.php:554
+#: ../../addon/facebook/facebook.php:574
msgid ""
"Re-authenticate [This is necessary whenever your Facebook password is "
"changed.]"
msgstr "Reaŭtentiĝi [Tio estas bezonata ĉiam kiam vi ŝanĝis vian pasvorton ĉe Facebook.]"
-#: ../../addon/facebook/facebook.php:561
+#: ../../addon/facebook/facebook.php:581
msgid "Post to Facebook by default"
msgstr "Ĉiam afiŝi al Facebook."
-#: ../../addon/facebook/facebook.php:567
+#: ../../addon/facebook/facebook.php:587
msgid ""
"Facebook friend linking has been disabled on this site. The following "
"settings will have no effect."
msgstr "Ligado kun Facebook amikoj estas malaktivita ĉe tiu retejo. La sekvantaj agordoj do ne havas validecon."
-#: ../../addon/facebook/facebook.php:571
+#: ../../addon/facebook/facebook.php:591
msgid ""
"Facebook friend linking has been disabled on this site. If you disable it, "
"you will be unable to re-enable it."
msgstr "Ligado kun Facebook amikoj estas malaktivita ĉe tiu retejo. Se vi malŝaltas ĝin, vi ne eblos ree ŝalti ĝin."
-#: ../../addon/facebook/facebook.php:574
+#: ../../addon/facebook/facebook.php:594
msgid "Link all your Facebook friends and conversations on this website"
msgstr "Alligu ĉiujn viajn Facebook amikojn kaj konversaciojn je ĉi-tiu retejo."
-#: ../../addon/facebook/facebook.php:576
+#: ../../addon/facebook/facebook.php:596
msgid ""
"Facebook conversations consist of your <em>profile wall</em> and your friend"
" <em>stream</em>."
msgstr "Facebok konversacioj konsistas el via <em>profilmuro</em> kaj la <em>fluo</em> de viaj amikoj."
-#: ../../addon/facebook/facebook.php:577
+#: ../../addon/facebook/facebook.php:597
msgid "On this website, your Facebook friend stream is only visible to you."
msgstr "Je ĉi-tiu retejo, la fluo de viaj amikoj ĉe Facebook nur videblas al vi."
-#: ../../addon/facebook/facebook.php:578
+#: ../../addon/facebook/facebook.php:598
msgid ""
"The following settings determine the privacy of your Facebook profile wall "
"on this website."
msgstr "La sekvontaj agordoj difinas la privatecon de via Facebook profilmuro je ĉi-tiu retejo."
-#: ../../addon/facebook/facebook.php:582
+#: ../../addon/facebook/facebook.php:602
msgid ""
"On this website your Facebook profile wall conversations will only be "
"visible to you"
msgstr "Je ĉi-tiu retejo, la conversacioj sur via Facebook profilmuro nur videblas al vi."
-#: ../../addon/facebook/facebook.php:587
+#: ../../addon/facebook/facebook.php:607
msgid "Do not import your Facebook profile wall conversations"
msgstr "Ne importi konversaciojn de via Facebook profilmuro"
-#: ../../addon/facebook/facebook.php:589
+#: ../../addon/facebook/facebook.php:609
msgid ""
"If you choose to link conversations and leave both of these boxes unchecked,"
" your Facebook profile wall will be merged with your profile wall on this "
@@ -4374,120 +4405,120 @@ msgid ""
"who may see the conversations."
msgstr "Se vi elektas alligi conversaciojn kaj ne elektas tiujn butonojn, via Facebook profilmuro estas kunigota kun via profilmuro ĉi tie. Viaj privatecaj agordoj ĉi tie difinos kiu povas vidi la coversaciojn."
-#: ../../addon/facebook/facebook.php:594
+#: ../../addon/facebook/facebook.php:614
msgid "Comma separated applications to ignore"
msgstr "Ignorotaj programoj, disigita per komo"
-#: ../../addon/facebook/facebook.php:678
+#: ../../addon/facebook/facebook.php:698
msgid "Problems with Facebook Real-Time Updates"
msgstr "Problemoj kun Facebook Realtempaj Ĝisdatigoj"
-#: ../../addon/facebook/facebook.php:706
+#: ../../addon/facebook/facebook.php:726
#: ../../include/contact_selectors.php:81
msgid "Facebook"
msgstr "Facebook"
-#: ../../addon/facebook/facebook.php:707
+#: ../../addon/facebook/facebook.php:727
msgid "Facebook Connector Settings"
msgstr "Agordoj por la Facebook konektilo"
-#: ../../addon/facebook/facebook.php:722
+#: ../../addon/facebook/facebook.php:742
msgid "Facebook API Key"
msgstr "Facebook API ŝlosilo"
-#: ../../addon/facebook/facebook.php:732
+#: ../../addon/facebook/facebook.php:752
msgid ""
"Error: it appears that you have specified the App-ID and -Secret in your "
".htconfig.php file. As long as they are specified there, they cannot be set "
"using this form.<br><br>"
-msgstr "Eraro: Ŝajnas kvazaŭ vi agordis la App-ID kaj la sekreton en via .htconfig.php dosiero. Kiam ili estas agordita tie, vi ne povas agordi ĝin tra tiu ĉi formo.<br><br>"
+msgstr "Eraro: Ŝajnas kvazaŭ vi agordis la App-ID kaj la sekreton en via .htconfig.php dosiero. Kiam ili estas agordita tie, vi ne povas agordi ĝin en tiu ĉi formo.<br><br>"
-#: ../../addon/facebook/facebook.php:737
+#: ../../addon/facebook/facebook.php:757
msgid ""
"Error: the given API Key seems to be incorrect (the application access token"
" could not be retrieved)."
msgstr "Eraro: La API ŝlosilo aspektas malĝusta (ne eblas ricevi la programa atingoĵetono)."
-#: ../../addon/facebook/facebook.php:739
+#: ../../addon/facebook/facebook.php:759
msgid "The given API Key seems to work correctly."
msgstr "La API ŝlosilo ŝajne ĝuste funkcias."
-#: ../../addon/facebook/facebook.php:741
+#: ../../addon/facebook/facebook.php:761
msgid ""
"The correctness of the API Key could not be detected. Somthing strange's "
"going on."
msgstr "Ne povis kontroli la ĝustecon de la API ŝlosilo. Ia stranga afero okazas. "
-#: ../../addon/facebook/facebook.php:744
+#: ../../addon/facebook/facebook.php:764
msgid "App-ID / API-Key"
msgstr "Programo ID / API Ŝlosilo"
-#: ../../addon/facebook/facebook.php:745
+#: ../../addon/facebook/facebook.php:765
msgid "Application secret"
msgstr "Programo sekreto"
-#: ../../addon/facebook/facebook.php:746
+#: ../../addon/facebook/facebook.php:766
#, php-format
msgid "Polling Interval in minutes (minimum %1$s minutes)"
msgstr "Intervalo de enketo en minutoj (minimume %1$s minutoj)"
-#: ../../addon/facebook/facebook.php:747
+#: ../../addon/facebook/facebook.php:767
msgid ""
"Synchronize comments (no comments on Facebook are missed, at the cost of "
"increased system load)"
msgstr "Sinkronigi komentojn (vi ricevas ĉiujn komentojn de Facebook, sed la ŝargo de la sistemo iom kreskas)"
-#: ../../addon/facebook/facebook.php:751
+#: ../../addon/facebook/facebook.php:771
msgid "Real-Time Updates"
msgstr "Realtempaj Ĝisdatigoj"
-#: ../../addon/facebook/facebook.php:755
+#: ../../addon/facebook/facebook.php:775
msgid "Real-Time Updates are activated."
msgstr "Realtempaj Ĝisdatigoj estas ŝaltita"
-#: ../../addon/facebook/facebook.php:756
+#: ../../addon/facebook/facebook.php:776
msgid "Deactivate Real-Time Updates"
msgstr "Malŝalti Realtempaj Ĝisdatigoj"
-#: ../../addon/facebook/facebook.php:758
+#: ../../addon/facebook/facebook.php:778
msgid "Real-Time Updates not activated."
msgstr "Realtempaj Ĝisdatigoj estas malŝaltita"
-#: ../../addon/facebook/facebook.php:758
+#: ../../addon/facebook/facebook.php:778
msgid "Activate Real-Time Updates"
msgstr "Ŝalti Realtempaj Ĝisdatigoj"
-#: ../../addon/facebook/facebook.php:777
+#: ../../addon/facebook/facebook.php:797 ../../addon/dav/layout.fnk.php:360
msgid "The new values have been saved."
msgstr "Konservis novajn valorojn."
-#: ../../addon/facebook/facebook.php:801
+#: ../../addon/facebook/facebook.php:821
msgid "Post to Facebook"
msgstr "Afiŝi al Facebook"
-#: ../../addon/facebook/facebook.php:899
+#: ../../addon/facebook/facebook.php:919
msgid ""
"Post to Facebook cancelled because of multi-network access permission "
"conflict."
msgstr "Afiŝado al Facebook nuligita ĉar okazis konflikto en la multretpermesoj."
-#: ../../addon/facebook/facebook.php:1119
+#: ../../addon/facebook/facebook.php:1139
msgid "View on Friendica"
msgstr "Vidi ĉe Friendica"
-#: ../../addon/facebook/facebook.php:1152
+#: ../../addon/facebook/facebook.php:1172
msgid "Facebook post failed. Queued for retry."
msgstr "Malsukcesis afiŝi ĉe Facebook. Enigita en vico."
-#: ../../addon/facebook/facebook.php:1192
+#: ../../addon/facebook/facebook.php:1212
msgid "Your Facebook connection became invalid. Please Re-authenticate."
msgstr "Via Facbook konekto iĝis nevalida. Bonvolu reaŭtentiĝi."
-#: ../../addon/facebook/facebook.php:1193
+#: ../../addon/facebook/facebook.php:1213
msgid "Facebook connection became invalid"
msgstr "Facebook konekto iĝis nevalida."
-#: ../../addon/facebook/facebook.php:1194
+#: ../../addon/facebook/facebook.php:1214
#, php-format
msgid ""
"Hi %1$s,\n"
@@ -4495,23 +4526,35 @@ msgid ""
"The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
msgstr "Saluton %1$s,\n\nla kontekto inter viaj kontoj ĉe %2$s kaj Facebook malvalidiĝis. Tio kutime okazas post kiam via ŝangas vian pasvorton ĉe Facebook. Por reaktivigi la konekto, vi bezonas %3$sreaŭtentiĝi la Facebook konektilon%4$s."
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:144
+#: ../../addon/snautofollow/snautofollow.php:32
+msgid "StatusNet AutoFollow settings updated."
+msgstr "Ĝidatigis StatusNet AutoFollow agordojn."
+
+#: ../../addon/snautofollow/snautofollow.php:56
+msgid "StatusNet AutoFollow Settings"
+msgstr "StatusNet AutoFollow agordoj"
+
+#: ../../addon/snautofollow/snautofollow.php:58
+msgid "Automatically follow any StatusNet followers/mentioners"
+msgstr "Aŭtomate sekvu ĉiujn StatusNet sekvantojn/menciantojn."
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:184
msgid "Lifetime of the cache (in hours)"
msgstr "Vivodaŭro de kaŝmemoro (horoj)"
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:149
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:189
msgid "Cache Statistics"
msgstr "Statistikoj pri kaŝmemoro"
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:152
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:192
msgid "Number of items"
msgstr "Kvanto da eroj"
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:154
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:194
msgid "Size of the cache"
msgstr "Grando de la kaŝmemoro"
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:156
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:196
msgid "Delete the whole cache"
msgstr "Forviŝi la kaŝmemoron"
@@ -4627,21 +4670,45 @@ msgstr "Uzu /expr/ por provizi regulajn esprimojn."
msgid "NSFW Settings saved."
msgstr "NSFW agordoj konservitaj."
-#: ../../addon/nsfw/nsfw.php:120
+#: ../../addon/nsfw/nsfw.php:121
#, php-format
msgid "%s - Click to open/close"
msgstr "%s - Klaku por malfermi/fermi"
-#: ../../addon/page/page.php:48
+#: ../../addon/page/page.php:61 ../../addon/page/page.php:91
msgid "Forums"
msgstr "Forumoj"
-#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:466
-#: ../../boot.php:513
+#: ../../addon/page/page.php:76 ../../addon/page/page.php:110
+#: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188
+#: ../../include/conversation.php:476 ../../boot.php:529
msgid "show more"
msgstr "montri pli"
+#: ../../addon/page/page.php:129
+msgid "Forums:"
+msgstr "Forumoj:"
+
+#: ../../addon/page/page.php:163
+msgid "Page settings updated."
+msgstr "Paĝajn agordojn ĝisdatigita."
+
+#: ../../addon/page/page.php:192
+msgid "Page Settings"
+msgstr "Paĝaj Agordoj"
+
+#: ../../addon/page/page.php:194
+msgid "How many forums to display on sidebar without paging"
+msgstr "Montri tiom da forumoj en la flanka strio sen paĝigo"
+
+#: ../../addon/page/page.php:197
+msgid "Randomise Page/Forum list"
+msgstr "Hazardigi la liston de Paĝoj/Forumoj"
+
+#: ../../addon/page/page.php:200
+msgid "Show pages/forums on profile page"
+msgstr "Montri paĝojn/forumojn sur la profilpaĝo"
+
#: ../../addon/planets/planets.php:150
msgid "Planets Settings"
msgstr "Agordo pri Planets"
@@ -4654,7 +4721,7 @@ msgstr "Ŝalti la Planets kromprogamon"
#: ../../addon/communityhome/communityhome.php:34
#: ../../addon/communityhome/twillingham/communityhome.php:28
#: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:811
+#: ../../include/nav.php:64 ../../boot.php:849
msgid "Login"
msgstr "Ensaluti"
@@ -4682,11 +4749,208 @@ msgid "Latest likes"
msgstr "Ĵusaj ŝatitaĵoj"
#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:490 ../../include/text.php:1303
+#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1315
#: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event"
msgstr "okazo"
+#: ../../addon/dav/common/wdcal_configuration.php:126
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr "Usona datformato (mm/dd/YYYY)"
+
+#: ../../addon/dav/common/wdcal_configuration.php:205
+msgid "German Time Format (dd.mm.YYYY)"
+msgstr "Germana datformato (dd.mm.YYYY)"
+
+#: ../../addon/dav/common/calendar.fnk.php:517
+#: ../../addon/dav/common/calendar.fnk.php:533
+#: ../../addon/dav/layout.fnk.php:200
+msgid "Error"
+msgstr "Eraro"
+
+#: ../../addon/dav/common/calendar.fnk.php:568
+#: ../../addon/dav/common/calendar.fnk.php:637
+#: ../../addon/dav/common/calendar.fnk.php:664
+#: ../../addon/dav/layout.fnk.php:231
+msgid "No access"
+msgstr "No access"
+
+#: ../../addon/dav/layout.fnk.php:119
+msgid "New event"
+msgstr "Nova okazo"
+
+#: ../../addon/dav/layout.fnk.php:123
+msgid "Today"
+msgstr "Hodiaŭ"
+
+#: ../../addon/dav/layout.fnk.php:132
+msgid "Day"
+msgstr "Tago"
+
+#: ../../addon/dav/layout.fnk.php:139
+msgid "Week"
+msgstr "Semajno"
+
+#: ../../addon/dav/layout.fnk.php:146
+msgid "Month"
+msgstr "Monato"
+
+#: ../../addon/dav/layout.fnk.php:151
+msgid "Reload"
+msgstr "Reŝargi"
+
+#: ../../addon/dav/layout.fnk.php:162
+msgid "Date"
+msgstr "Dato"
+
+#: ../../addon/dav/layout.fnk.php:224
+msgid "Not found"
+msgstr "Ne trovita"
+
+#: ../../addon/dav/layout.fnk.php:292 ../../addon/dav/layout.fnk.php:365
+msgid "Go back to the calendar"
+msgstr "Iri reen al la kalendaro"
+
+#: ../../addon/dav/layout.fnk.php:300
+msgid "Starts"
+msgstr "Komencas"
+
+#: ../../addon/dav/layout.fnk.php:305
+msgid "Ends"
+msgstr "Finas"
+
+#: ../../addon/dav/layout.fnk.php:312
+msgid "Description"
+msgstr "Priskribo"
+
+#: ../../addon/dav/layout.fnk.php:315
+msgid "Notification"
+msgstr "Atentigo"
+
+#: ../../addon/dav/layout.fnk.php:324
+msgid "Minutes"
+msgstr "Minutoj"
+
+#: ../../addon/dav/layout.fnk.php:327
+msgid "Hours"
+msgstr "Horoj"
+
+#: ../../addon/dav/layout.fnk.php:330
+msgid "Days"
+msgstr "Tagoj"
+
+#: ../../addon/dav/layout.fnk.php:331
+msgid "before"
+msgstr "antaŭ"
+
+#: ../../addon/dav/layout.fnk.php:367
+msgid "Calendar Settings"
+msgstr "Kalendaraj Agordoj"
+
+#: ../../addon/dav/layout.fnk.php:373
+msgid "Date format"
+msgstr "Datformato"
+
+#: ../../addon/dav/layout.fnk.php:382
+msgid "Time zone"
+msgstr "Horzono"
+
+#: ../../addon/dav/layout.fnk.php:387
+msgid "Limitations"
+msgstr "Limigoj"
+
+#: ../../addon/dav/layout.fnk.php:391
+msgid "Warning"
+msgstr "Averto"
+
+#: ../../addon/dav/layout.fnk.php:395
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
+msgstr "Sinkronigo (iPhone, Thunderbird Lightning, Android, ...)"
+
+#: ../../addon/dav/layout.fnk.php:402
+msgid "Synchronizing this calendar with the iPhone"
+msgstr "Sinkronigi tiun kalendaron kun la iPhone"
+
+#: ../../addon/dav/layout.fnk.php:413
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
+msgstr "Sinkronigi viajn Friendica kontaktojn kun la iPhone"
+
+#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37
+msgid "Friendica-Contacts"
+msgstr "Friendica Kontaktoj"
+
+#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38
+msgid "Your Friendica-Contacts"
+msgstr "Viaj Friendica Kontaktoj"
+
+#: ../../addon/dav/main.php:244
+msgid "Calendar"
+msgstr "Kalendaro"
+
+#: ../../addon/dav/main.php:247
+msgid "Extended calendar with CalDAV-support"
+msgstr "Etendita kalendaro kun CalDAV subteno"
+
+#: ../../addon/dav/main.php:263
+msgid "The database tables have been installed."
+msgstr "La tabeloj estas instalita en la datumbazo"
+
+#: ../../addon/dav/main.php:264
+msgid "An error occurred during the installation."
+msgstr "Eraro okazis dum instalado"
+
+#: ../../addon/dav/main.php:280
+msgid "No system-wide settings yet."
+msgstr "Ankoraŭ ne disponablas tutsistemaj agordoj"
+
+#: ../../addon/dav/main.php:283
+msgid "Database status"
+msgstr "Stato de datumbazo"
+
+#: ../../addon/dav/main.php:286
+msgid "Installed"
+msgstr "Instalita"
+
+#: ../../addon/dav/main.php:289
+msgid "Upgrade needed"
+msgstr "Ĝisdatigo bezonata"
+
+#: ../../addon/dav/main.php:289
+msgid "Upgrade"
+msgstr "Ĝisdatigo"
+
+#: ../../addon/dav/main.php:292
+msgid "Not installed"
+msgstr "Ne instalita"
+
+#: ../../addon/dav/main.php:292
+msgid "Install"
+msgstr "Instali"
+
+#: ../../addon/dav/main.php:297
+msgid "Troubleshooting"
+msgstr "Problemsolvado"
+
+#: ../../addon/dav/main.php:298
+msgid "Manual creation of the database tables:"
+msgstr "Mana kreado de tabeloj en la datumbazo:"
+
+#: ../../addon/dav/main.php:299
+msgid "Show SQL-statements"
+msgstr "Montru SQL ordonojn"
+
+#: ../../addon/dav/calendar.friendica.fnk.php:151
+msgid "Private Calendar"
+msgstr "Privata kalendaro"
+
+#: ../../addon/dav/calendar.friendica.fnk.php:158
+msgid "Friendica Events: Mine"
+msgstr "Friendica Okazoj: Miaj"
+
+#: ../../addon/dav/calendar.friendica.fnk.php:161
+msgid "Friendica Events: Contacts"
+msgstr "Friendica Okazoj: De Kontaktoj"
+
#: ../../addon/uhremotestorage/uhremotestorage.php:84
#, php-format
msgid ""
@@ -4834,11 +5098,23 @@ msgstr "Drupal retejo uzas purajn URL adresojn"
msgid "Post to Drupal by default"
msgstr "Defaŭlte afiŝi ĉe Drupal"
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
-#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:201
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189
msgid "Post from Friendica"
msgstr "Afiŝo de Friendica"
+#: ../../addon/startpage/startpage.php:83
+msgid "Startpage Settings"
+msgstr "Startpaĝaj Agordoj"
+
+#: ../../addon/startpage/startpage.php:85
+msgid "Home page to load after login - leave blank for profile wall"
+msgstr "Hejmpaĝo ŝargonta post la ensaluto - Lasu malplena por profilmuro."
+
+#: ../../addon/startpage/startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr "Ekzemple: &quot;network&quot; aŭ &quot;notifications/system&quot;"
+
#: ../../addon/geonames/geonames.php:143
msgid "Geonames settings updated."
msgstr "Ĝidatigis la Geonames agordojn."
@@ -4851,6 +5127,24 @@ msgstr "Geonames Agordoj"
msgid "Enable Geonames Plugin"
msgstr "Ŝalti la Geonames Kromprogramon"
+#: ../../addon/public_server/public_server.php:126
+#: ../../addon/testdrive/testdrive.php:94
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Via konto ĉe %s senvalidiĝos post kelkaj tagoj."
+
+#: ../../addon/public_server/public_server.php:127
+msgid "Your Friendica account is about to expire."
+msgstr "Via konto ĉe Friendica baldaŭ senvalidiĝos."
+
+#: ../../addon/public_server/public_server.php:128
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
+msgstr "Saluton %1$s,\n\nVia konto ĉe %2$s senvalidiĝos post malpli ol kvin tagoj. Vi povas konservi vian konton se vi ensalutas almenaŭ ĉiujn 30 tagojn. "
+
#: ../../addon/js_upload/js_upload.php:43
msgid "Upload a file"
msgstr "Alŝuti dosieron"
@@ -4946,7 +5240,7 @@ msgstr "Pli da notoj kiuj aperas sub la kontaktinformoj. Vi eblas uzi BBCode ĉi
#: ../../addon/impressum/impressum.php:87
msgid "How to contact the operator via email. (will be displayed obfuscated)"
-msgstr "Kiel kontakti la funkciigiston de la retejo tra retpoŝto. (montriĝos vuale) "
+msgstr "Kiel kontakti la funkciigiston de la retejo per retpoŝto. (montriĝos vuale) "
#: ../../addon/impressum/impressum.php:88
msgid "Footer note"
@@ -4960,6 +5254,18 @@ msgstr "Teksto por la paĝpiedo. Vie eblas uzi BBCode ĉi tie."
msgid "Report Bug"
msgstr "Skribi cimraporton"
+#: ../../addon/notimeline/notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "No Timeline agordojn ĝisdatigita."
+
+#: ../../addon/notimeline/notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "No Timeline Agordoj"
+
+#: ../../addon/notimeline/notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Malaktivigi la Arkivo elektilo sur la profilmuro"
+
#: ../../addon/blockem/blockem.php:51
msgid "\"Blockem\" Settings"
msgstr "\"Blockem\" Agordoj"
@@ -5037,6 +5343,30 @@ msgstr "Defaŭlta zoma faktoro"
msgid "The default zoom level. (1:world, 18:highest)"
msgstr "La defaŭlta zoma faktoro. (1:tutmonda, 18:plej proksima)"
+#: ../../addon/libertree/libertree.php:36
+msgid "Post to libertree"
+msgstr "Afiŝi al libertree"
+
+#: ../../addon/libertree/libertree.php:67
+msgid "libertree Post Settings"
+msgstr "Agordoj por Afiŝoj ĉe libertree"
+
+#: ../../addon/libertree/libertree.php:69
+msgid "Enable Libertree Post Plugin"
+msgstr "Aktivigi Kromprogramon por Afiŝoj ĉe libertree"
+
+#: ../../addon/libertree/libertree.php:74
+msgid "Libertree API token"
+msgstr "Libertree API ĵetono"
+
+#: ../../addon/libertree/libertree.php:79
+msgid "Libertree site URL"
+msgstr "URL adreso de libertree retejo:"
+
+#: ../../addon/libertree/libertree.php:84
+msgid "Post to Libertree by default"
+msgstr "Defaŭlte afiŝi ĉe Libertree"
+
#: ../../addon/mathjax/mathjax.php:37
msgid ""
"The MathJax addon renders mathematical formulae written using the LaTeX "
@@ -5110,16 +5440,11 @@ msgstr "Elektu la ĝustan pritakson de via avataro por via retejo. Vidu README."
msgid "Gravatar settings updated."
msgstr "Gravatar agordoj ĝisdatigitaj."
-#: ../../addon/testdrive/testdrive.php:85
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "Via konto ĉe %s senvalidiĝos post kelkaj tagoj."
-
-#: ../../addon/testdrive/testdrive.php:86
+#: ../../addon/testdrive/testdrive.php:95
msgid "Your Friendica test account is about to expire."
msgstr "Via Friendica provkonto baldaŭ malaktiviĝos."
-#: ../../addon/testdrive/testdrive.php:87
+#: ../../addon/testdrive/testdrive.php:96
#, php-format
msgid ""
"Hi %1$s,\n"
@@ -5277,17 +5602,21 @@ msgid "Send public postings to StatusNet by default"
msgstr "Defaŭlte sendi publikajn afiŝojn al StatusNet"
#: ../../addon/statusnet/statusnet.php:345
-msgid "Send #tag links to StatusNet"
-msgstr "Sendu #marko ligilojn al StatusNet"
+msgid "Send linked #-tags and @-names to StatusNet"
+msgstr "Sendi ligitajn #-etikedojn kaj @-nomon al StatusNet"
#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
msgid "Clear OAuth configuration"
msgstr "Forviŝi OAuth agordojn"
-#: ../../addon/statusnet/statusnet.php:545
+#: ../../addon/statusnet/statusnet.php:559
msgid "API URL"
msgstr "API URL adreso"
+#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr "Senfina Probableca Pelilo"
+
#: ../../addon/tumblr/tumblr.php:36
msgid "Post to Tumblr"
msgstr "Afiŝi al Tumblr"
@@ -5351,30 +5680,38 @@ msgstr "[Friendica:Atentigo] Komento pri konversacio #%d"
msgid "Post to Wordpress"
msgstr "Afiŝi al Wordpress"
-#: ../../addon/wppost/wppost.php:74
+#: ../../addon/wppost/wppost.php:76
msgid "WordPress Post Settings"
msgstr "Agordoj por WordPress afiŝojn"
-#: ../../addon/wppost/wppost.php:76
+#: ../../addon/wppost/wppost.php:78
msgid "Enable WordPress Post Plugin"
msgstr "Ŝalti la Wordpress-afiŝo kromprogramon"
-#: ../../addon/wppost/wppost.php:81
+#: ../../addon/wppost/wppost.php:83
msgid "WordPress username"
msgstr "WordPress salutnomo"
-#: ../../addon/wppost/wppost.php:86
+#: ../../addon/wppost/wppost.php:88
msgid "WordPress password"
msgstr "WordPress pasvorto"
-#: ../../addon/wppost/wppost.php:91
+#: ../../addon/wppost/wppost.php:93
msgid "WordPress API URL"
msgstr "Wordpress API URL adreso"
-#: ../../addon/wppost/wppost.php:96
+#: ../../addon/wppost/wppost.php:98
msgid "Post to WordPress by default"
msgstr "Defaŭlte afiŝi al WordPress"
+#: ../../addon/wppost/wppost.php:103
+msgid "Provide a backlink to the Friendica post"
+msgstr "Provizi re-ligilon al la Friendica afiŝo"
+
+#: ../../addon/wppost/wppost.php:207
+msgid "Read the original post and comment stream on Friendica"
+msgstr "Legi la originalan afiŝon kaj komentfluo ĉe Friendica"
+
#: ../../addon/showmore/showmore.php:38
msgid "\"Show more\" Settings"
msgstr "\"Montri pli\" agordoj"
@@ -5486,14 +5823,14 @@ msgid "Send public postings to Twitter by default"
msgstr "Defaŭlte sendi publikajn afiŝojn al Twitter"
#: ../../addon/twitter/twitter.php:201
-msgid "Send #tag links to Twitter"
-msgstr "Sendu #marko ligilon al Twitter"
+msgid "Send linked #-tags and @-names to Twitter"
+msgstr "Sendi ligitajn #-etikedojn kaj @-nomon al Twitter"
-#: ../../addon/twitter/twitter.php:377
+#: ../../addon/twitter/twitter.php:389
msgid "Consumer key"
msgstr "Ŝlosilo de Kliento"
-#: ../../addon/twitter/twitter.php:378
+#: ../../addon/twitter/twitter.php:390
msgid "Consumer secret"
msgstr "Sekreto de Kliento"
@@ -5606,157 +5943,155 @@ msgstr "Agordi la larĝo por la etoso"
msgid "Color scheme"
msgstr "Kolorskemo"
-#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr "Viaj afiŝoj kaj komunikadoj"
-#: ../../view/theme/diabook/theme.php:124 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50
msgid "Your profile page"
msgstr "Via profilo"
-#: ../../view/theme/diabook/theme.php:125
+#: ../../view/theme/diabook/theme.php:129
msgid "Your contacts"
msgstr "Viaj kontaktoj"
-#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51
msgid "Your photos"
msgstr "Viaj bildoj"
-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52
msgid "Your events"
msgstr "Viaj okazoj"
-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
msgid "Personal notes"
msgstr "Personaj notoj"
-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
msgid "Your personal photos"
msgstr "Viaj personaj bildoj"
-#: ../../view/theme/diabook/theme.php:130
-#: ../../view/theme/diabook/theme.php:571
-#: ../../view/theme/diabook/theme.php:675
+#: ../../view/theme/diabook/theme.php:134
+#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:747
#: ../../view/theme/diabook/config.php:201
msgid "Community Pages"
msgstr "Komunumaj paĝoj"
-#: ../../view/theme/diabook/theme.php:418
-#: ../../view/theme/diabook/theme.php:677
+#: ../../view/theme/diabook/theme.php:490
+#: ../../view/theme/diabook/theme.php:749
#: ../../view/theme/diabook/config.php:203
msgid "Community Profiles"
msgstr "Komunumaj Profiloj"
-#: ../../view/theme/diabook/theme.php:439
-#: ../../view/theme/diabook/theme.php:682
+#: ../../view/theme/diabook/theme.php:511
+#: ../../view/theme/diabook/theme.php:754
#: ../../view/theme/diabook/config.php:208
msgid "Last users"
msgstr "Ĵusaj uzantoj"
-#: ../../view/theme/diabook/theme.php:468
-#: ../../view/theme/diabook/theme.php:684
+#: ../../view/theme/diabook/theme.php:540
+#: ../../view/theme/diabook/theme.php:756
#: ../../view/theme/diabook/config.php:210
msgid "Last likes"
msgstr "Ĵusaj ŝatitaj elementoj"
-#: ../../view/theme/diabook/theme.php:513
-#: ../../view/theme/diabook/theme.php:683
+#: ../../view/theme/diabook/theme.php:585
+#: ../../view/theme/diabook/theme.php:755
#: ../../view/theme/diabook/config.php:209
msgid "Last photos"
msgstr "Ĵusaj bildoj"
-#: ../../view/theme/diabook/theme.php:550
-#: ../../view/theme/diabook/theme.php:680
+#: ../../view/theme/diabook/theme.php:622
+#: ../../view/theme/diabook/theme.php:752
#: ../../view/theme/diabook/config.php:206
msgid "Find Friends"
msgstr "Trovi Amikojn"
-#: ../../view/theme/diabook/theme.php:551
+#: ../../view/theme/diabook/theme.php:623
msgid "Local Directory"
msgstr "Loka Katalogo"
-#: ../../view/theme/diabook/theme.php:553 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr "Similaj Interesoj"
-#: ../../view/theme/diabook/theme.php:555 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr "Inviti amikojn"
-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:676
+#: ../../view/theme/diabook/theme.php:678
+#: ../../view/theme/diabook/theme.php:748
#: ../../view/theme/diabook/config.php:202
msgid "Earth Layers"
msgstr "Tertavoloj (Earth Layers)"
-#: ../../view/theme/diabook/theme.php:611
-#: ../../view/theme/diabook/config.php:198
-msgid "Set zoomfactor for Earth Layer"
-msgstr "Agordi zoman faktoron de Tertavolo"
+#: ../../view/theme/diabook/theme.php:683
+msgid "Set zoomfactor for Earth Layers"
+msgstr "Agordi zoman faktoron por Tertavoloj"
-#: ../../view/theme/diabook/theme.php:612
+#: ../../view/theme/diabook/theme.php:684
#: ../../view/theme/diabook/config.php:199
-msgid "Set longitude (X) for Earth Layer"
-msgstr "Agordi longitudon (X) de Tertavolo"
+msgid "Set longitude (X) for Earth Layers"
+msgstr "Agordi longitudon (X) por Tertavoloj"
-#: ../../view/theme/diabook/theme.php:613
+#: ../../view/theme/diabook/theme.php:685
#: ../../view/theme/diabook/config.php:200
-msgid "Set latitude (Y) for Earth Layer"
-msgstr "Agordi latitudon (Y) de Tertavolo"
+msgid "Set latitude (Y) for Earth Layers"
+msgstr "Agordi latitudon (Y) por Tertavoloj"
-#: ../../view/theme/diabook/theme.php:626
-#: ../../view/theme/diabook/theme.php:678
+#: ../../view/theme/diabook/theme.php:698
+#: ../../view/theme/diabook/theme.php:750
#: ../../view/theme/diabook/config.php:204
msgid "Help or @NewHere ?"
msgstr "Helpu aŭ @NewHere ?"
-#: ../../view/theme/diabook/theme.php:633
-#: ../../view/theme/diabook/theme.php:679
+#: ../../view/theme/diabook/theme.php:705
+#: ../../view/theme/diabook/theme.php:751
#: ../../view/theme/diabook/config.php:205
msgid "Connect Services"
msgstr "Konekti Servojn"
-#: ../../view/theme/diabook/theme.php:640
-#: ../../view/theme/diabook/theme.php:681
-#: ../../view/theme/diabook/config.php:207
+#: ../../view/theme/diabook/theme.php:712
+#: ../../view/theme/diabook/theme.php:753
msgid "Last Tweets"
msgstr "Ĵusaj Pepaĵoj"
-#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:715
#: ../../view/theme/diabook/config.php:197
msgid "Set twitter search term"
msgstr "Agordi Twitter serĉtekston"
-#: ../../view/theme/diabook/theme.php:663
-#: ../../view/theme/diabook/theme.php:664
-#: ../../view/theme/diabook/theme.php:665
-#: ../../view/theme/diabook/theme.php:666
-#: ../../view/theme/diabook/theme.php:667
-#: ../../view/theme/diabook/theme.php:668
-#: ../../view/theme/diabook/theme.php:669
-#: ../../view/theme/diabook/theme.php:670
-#: ../../view/theme/diabook/theme.php:671
-#: ../../view/theme/diabook/theme.php:672 ../../include/acl_selectors.php:288
+#: ../../view/theme/diabook/theme.php:735
+#: ../../view/theme/diabook/theme.php:736
+#: ../../view/theme/diabook/theme.php:737
+#: ../../view/theme/diabook/theme.php:738
+#: ../../view/theme/diabook/theme.php:739
+#: ../../view/theme/diabook/theme.php:740
+#: ../../view/theme/diabook/theme.php:741
+#: ../../view/theme/diabook/theme.php:742
+#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288
msgid "don't show"
msgstr "kaŝi"
-#: ../../view/theme/diabook/theme.php:663
-#: ../../view/theme/diabook/theme.php:664
-#: ../../view/theme/diabook/theme.php:665
-#: ../../view/theme/diabook/theme.php:666
-#: ../../view/theme/diabook/theme.php:667
-#: ../../view/theme/diabook/theme.php:668
-#: ../../view/theme/diabook/theme.php:669
-#: ../../view/theme/diabook/theme.php:670
-#: ../../view/theme/diabook/theme.php:671
-#: ../../view/theme/diabook/theme.php:672 ../../include/acl_selectors.php:287
+#: ../../view/theme/diabook/theme.php:735
+#: ../../view/theme/diabook/theme.php:736
+#: ../../view/theme/diabook/theme.php:737
+#: ../../view/theme/diabook/theme.php:738
+#: ../../view/theme/diabook/theme.php:739
+#: ../../view/theme/diabook/theme.php:740
+#: ../../view/theme/diabook/theme.php:741
+#: ../../view/theme/diabook/theme.php:742
+#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287
msgid "show"
msgstr "montri"
-#: ../../view/theme/diabook/theme.php:673
-msgid "Show/hide boxes at right-hand coloumn:"
-msgstr "Montri/kaŝi kestojn en la desktra kolumno:"
+#: ../../view/theme/diabook/theme.php:745
+msgid "Show/hide boxes at right-hand column:"
+msgstr "Kaŝi/montri kestojn ĉe dekstra kolumno:"
#: ../../view/theme/diabook/config.php:194
#: ../../view/theme/dispy/config.php:74
@@ -5771,6 +6106,14 @@ msgstr "Agordi la distingivon por la meza kolumno"
msgid "Set color scheme"
msgstr "Agordi Kolorskemon"
+#: ../../view/theme/diabook/config.php:198
+msgid "Set zoomfactor for Earth Layer"
+msgstr "Agordi zoman faktoron de Tertavolo"
+
+#: ../../view/theme/diabook/config.php:207
+msgid "Last tweets"
+msgstr "Ĵusaj pepaĵoj"
+
#: ../../view/theme/quattro/config.php:55
msgid "Alignment"
msgstr "Ĝisrandigo"
@@ -5787,7 +6130,7 @@ msgstr "Centren"
msgid "Set colour scheme"
msgstr "Agordi Kolorskemon"
-#: ../../include/profile_advanced.php:17 ../../boot.php:1100
+#: ../../include/profile_advanced.php:17 ../../boot.php:1138
msgid "Gender:"
msgstr "Sekso:"
@@ -5799,8 +6142,7 @@ msgstr "j F, Y"
msgid "j F"
msgstr "j F"
-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
-#: ../../include/items.php:1413
+#: ../../include/profile_advanced.php:30
msgid "Birthday:"
msgstr "Naskiĝtago:"
@@ -5808,59 +6150,64 @@ msgstr "Naskiĝtago:"
msgid "Age:"
msgstr "Aĝo:"
-#: ../../include/profile_advanced.php:37 ../../boot.php:1103
+#: ../../include/profile_advanced.php:37 ../../boot.php:1141
msgid "Status:"
msgstr "Stato:"
-#: ../../include/profile_advanced.php:45 ../../boot.php:1105
+#: ../../include/profile_advanced.php:43
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "por %1$d %2$s"
+
+#: ../../include/profile_advanced.php:48 ../../boot.php:1143
msgid "Homepage:"
msgstr "Hejmpaĝo:"
-#: ../../include/profile_advanced.php:47
+#: ../../include/profile_advanced.php:52
msgid "Tags:"
msgstr "Markoj:"
-#: ../../include/profile_advanced.php:51
+#: ../../include/profile_advanced.php:56
msgid "Religion:"
msgstr "Religio:"
-#: ../../include/profile_advanced.php:53
+#: ../../include/profile_advanced.php:58
msgid "About:"
msgstr "Pri:"
-#: ../../include/profile_advanced.php:55
+#: ../../include/profile_advanced.php:60
msgid "Hobbies/Interests:"
msgstr "Ŝatokupoj/Interesoj:"
-#: ../../include/profile_advanced.php:57
+#: ../../include/profile_advanced.php:67
msgid "Contact information and Social Networks:"
msgstr "Kontaktinformoj kaj Interkonaj Retejoj:"
-#: ../../include/profile_advanced.php:59
+#: ../../include/profile_advanced.php:69
msgid "Musical interests:"
msgstr "Muzaikaj interesoj:"
-#: ../../include/profile_advanced.php:61
+#: ../../include/profile_advanced.php:71
msgid "Books, literature:"
msgstr "Libroj, literaturo:"
-#: ../../include/profile_advanced.php:63
+#: ../../include/profile_advanced.php:73
msgid "Television:"
msgstr "Televido:"
-#: ../../include/profile_advanced.php:65
+#: ../../include/profile_advanced.php:75
msgid "Film/dance/culture/entertainment:"
msgstr "Filmoj/dancoj/arto/amuzaĵoj:"
-#: ../../include/profile_advanced.php:67
+#: ../../include/profile_advanced.php:77
msgid "Love/Romance:"
msgstr "Amo/romanco:"
-#: ../../include/profile_advanced.php:69
+#: ../../include/profile_advanced.php:79
msgid "Work/employment:"
msgstr "Laboro:"
-#: ../../include/profile_advanced.php:71
+#: ../../include/profile_advanced.php:81
msgid "School/education:"
msgstr "Lernejo/eduko:"
@@ -5992,199 +6339,203 @@ msgstr "Alia"
msgid "Undecided"
msgstr "Nedecida"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Males"
msgstr "Viroj"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Females"
msgstr "Inoj"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Gay"
msgstr "Geja"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Lesbian"
msgstr "Lesba"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "No Preference"
msgstr "Neniu Prefero"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Bisexual"
msgstr "Ambaŭseksema"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Autosexual"
msgstr "Memseksema"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Abstinent"
msgstr "Abstinema"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Virgin"
msgstr "Virgulino"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Deviant"
msgstr "Devia"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Fetish"
msgstr "Fetiĉo"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Oodles"
msgstr "Amasa"
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
msgid "Nonsexual"
msgstr "Neseksa"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Single"
msgstr "Sola"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Lonely"
msgstr "Soleca"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Available"
msgstr "Havebla"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Unavailable"
msgstr "Nehavebla"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Has crush"
msgstr "Sekrete enamiĝinta"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Infatuated"
msgstr "Blinda amo"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Dating"
msgstr "Rendevuanta"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Unfaithful"
msgstr "Malfidela"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Sex Addict"
msgstr "Seksmaniulo"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42 ../../include/user.php:278
msgid "Friends"
msgstr "Amikoj"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Friends/Benefits"
msgstr "Amikoj/Avantaĝoj"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Casual"
msgstr "Neformala"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Engaged"
msgstr "Fianĉiginta"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Married"
msgstr "Edziĝinta"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Imaginarily married"
msgstr "Image edziĝinta"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Partners"
msgstr "Geparuloj"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Cohabiting"
msgstr "Kunloĝanta"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Common law"
msgstr "Registrita partnereco "
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Happy"
msgstr "Feliĉa"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Not looking"
msgstr "Ne interesiĝis"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Swinger"
msgstr "Swinger"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Betrayed"
msgstr "Trompita"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Separated"
msgstr "Disiĝinta"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Unstable"
msgstr "Malfirma"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Divorced"
msgstr "Eksedziĝinta"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Imaginarily divorced"
msgstr "Image eksedziĝinta"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Widowed"
msgstr "Vidva"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Uncertain"
msgstr "Ne certa"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "It's complicated"
msgstr "Estas komplika"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Don't care"
msgstr "Egala"
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
msgid "Ask me"
msgstr "Demandu min"
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:341
msgid "Starts:"
msgstr "Ekas:"
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:349
msgid "Finishes:"
msgstr "Finas:"
-#: ../../include/delivery.php:452 ../../include/notifier.php:652
+#: ../../include/delivery.php:456 ../../include/notifier.php:678
msgid "(no subject)"
msgstr "(neniu temo)"
-#: ../../include/delivery.php:459 ../../include/enotify.php:23
-#: ../../include/notifier.php:659
+#: ../../include/delivery.php:463 ../../include/enotify.php:26
+#: ../../include/notifier.php:685
msgid "noreply"
msgstr "nerespondi"
+#: ../../include/Scrape.php:572
+msgid " on Last.fm"
+msgstr " ĉe Last.fm"
+
#: ../../include/text.php:243
msgid "prev"
msgstr "antaŭa"
@@ -6212,156 +6563,147 @@ msgid_plural "%d Contacts"
msgstr[0] "%d Kontakto"
msgstr[1] "%d Kontaktoj"
-#: ../../include/text.php:650 ../../include/nav.php:91
-msgid "Search"
-msgstr "Serĉi"
-
-#: ../../include/text.php:831
+#: ../../include/text.php:835
msgid "Monday"
msgstr "Lundo"
-#: ../../include/text.php:831
+#: ../../include/text.php:835
msgid "Tuesday"
msgstr "Mardo"
-#: ../../include/text.php:831
+#: ../../include/text.php:835
msgid "Wednesday"
msgstr "Merkredo"
-#: ../../include/text.php:831
+#: ../../include/text.php:835
msgid "Thursday"
msgstr "Ĵaŭdo"
-#: ../../include/text.php:831
+#: ../../include/text.php:835
msgid "Friday"
msgstr "Vendredo"
-#: ../../include/text.php:831
+#: ../../include/text.php:835
msgid "Saturday"
msgstr "Sabato"
-#: ../../include/text.php:831
+#: ../../include/text.php:835
msgid "Sunday"
msgstr "Dimanĉo"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "January"
msgstr "Januaro"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "February"
msgstr "Februaro"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "March"
msgstr "Marto"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "April"
msgstr "Aprilo"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "May"
msgstr "Majo"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "June"
msgstr "Junio"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "July"
msgstr "Julio"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "August"
msgstr "Aŭgusto"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "September"
msgstr "Septembro"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "October"
msgstr "Oktobro"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "November"
msgstr "Novembro"
-#: ../../include/text.php:835
+#: ../../include/text.php:839
msgid "December"
msgstr "Decembro"
-#: ../../include/text.php:919
+#: ../../include/text.php:925
msgid "bytes"
msgstr "bajtoj"
-#: ../../include/text.php:934 ../../include/text.php:949
+#: ../../include/text.php:945 ../../include/text.php:960
msgid "remove"
msgstr "forviŝi"
-#: ../../include/text.php:934 ../../include/text.php:949
+#: ../../include/text.php:945 ../../include/text.php:960
msgid "[remove]"
msgstr "[forviŝi]"
-#: ../../include/text.php:937
+#: ../../include/text.php:948
msgid "Categories:"
msgstr "Kategorioj:"
-#: ../../include/text.php:952
+#: ../../include/text.php:963
msgid "Filed under:"
msgstr "Enarkivigita kiel:"
-#: ../../include/text.php:968 ../../include/text.php:980
+#: ../../include/text.php:979 ../../include/text.php:991
msgid "Click to open/close"
msgstr "Klaku por malfermi/fermi"
-#: ../../include/text.php:1085
+#: ../../include/text.php:1097 ../../include/user.php:236
msgid "default"
msgstr "defaŭlta"
-#: ../../include/text.php:1097
+#: ../../include/text.php:1109
msgid "Select an alternate language"
msgstr "Elekti alian lingvon"
-#: ../../include/text.php:1307
+#: ../../include/text.php:1319
msgid "activity"
msgstr "aktiveco"
-#: ../../include/text.php:1309
+#: ../../include/text.php:1321
msgid "comment"
msgstr "komento"
-#: ../../include/text.php:1310
+#: ../../include/text.php:1322
msgid "post"
msgstr "afiŝo"
-#: ../../include/text.php:1465
+#: ../../include/text.php:1477
msgid "Item filed"
msgstr "Enarkivigis elementon "
-#: ../../include/diaspora.php:582
+#: ../../include/diaspora.php:593
msgid "Sharing notification from Diaspora network"
msgstr "Antentigo pri kunhavigado de la Diaspora reto"
-#: ../../include/diaspora.php:1969
+#: ../../include/diaspora.php:2085
msgid "Attachments:"
msgstr "Kunsendaĵoj:"
-#: ../../include/diaspora.php:2152
-#, php-format
-msgid "[Relayed] Comment authored by %s from network %s"
-msgstr "[Plusendita] %s en la reto %s skribis komenton"
-
-#: ../../include/network.php:824
+#: ../../include/network.php:839
msgid "view full size"
msgstr "vidi plengrande"
-#: ../../include/oembed.php:132
+#: ../../include/oembed.php:135
msgid "Embedded content"
msgstr "Enigita enhavo"
-#: ../../include/oembed.php:141
+#: ../../include/oembed.php:144
msgid "Embedding disabled"
msgstr "Malŝaltita enigitado"
@@ -6372,31 +6714,35 @@ msgid ""
"not what you intended, please create another group with a different name."
msgstr "Revivigis malnovan grupon kun la sama nomo. Permesoj por estantaj elementoj <strong>eble</strong> estas validaj por la grupo kaj estontaj membroj. Se tiu ne estas kiun vi atendis, bonvolu krei alian grupon kun alia nomo."
-#: ../../include/group.php:168
+#: ../../include/group.php:176
+msgid "Default privacy group for new contacts"
+msgstr "Defaŭlta privateca grupo por novaj kontaktoj"
+
+#: ../../include/group.php:195
msgid "Everybody"
msgstr "Ĉiuj"
-#: ../../include/group.php:191
+#: ../../include/group.php:218
msgid "edit"
msgstr "redakti"
-#: ../../include/group.php:212
+#: ../../include/group.php:239
msgid "Groups"
msgstr "Grupoj"
-#: ../../include/group.php:213
+#: ../../include/group.php:240
msgid "Edit group"
msgstr "Redakti grupon"
-#: ../../include/group.php:214
+#: ../../include/group.php:241
msgid "Create a new group"
msgstr "Krei novan grupon"
-#: ../../include/group.php:215
+#: ../../include/group.php:242
msgid "Contacts not in any group"
msgstr "Kontaktoj en neniu grupo"
-#: ../../include/nav.php:46 ../../boot.php:810
+#: ../../include/nav.php:46 ../../boot.php:848
msgid "Logout"
msgstr "Elsaluti"
@@ -6404,7 +6750,7 @@ msgstr "Elsaluti"
msgid "End this session"
msgstr "Fini ĉi-tiun seancon"
-#: ../../include/nav.php:49 ../../boot.php:1478
+#: ../../include/nav.php:49 ../../boot.php:1538
msgid "Status"
msgstr "Stato"
@@ -6484,11 +6830,11 @@ msgstr "Administri"
msgid "Manage other pages"
msgstr "Administri aliajn paĝojn"
-#: ../../include/nav.php:138 ../../boot.php:1058
+#: ../../include/nav.php:138 ../../boot.php:1096
msgid "Profiles"
msgstr "Profiloj"
-#: ../../include/nav.php:138 ../../boot.php:1058
+#: ../../include/nav.php:138 ../../boot.php:1096
msgid "Manage/edit profiles"
msgstr "Administri/redakti profilojn"
@@ -6497,14 +6843,10 @@ msgid "Manage/edit friends and contacts"
msgstr "Administri/redakti amikojn kaj kontaktojn"
#: ../../include/nav.php:146
-msgid "Admin"
-msgstr "Administrado"
-
-#: ../../include/nav.php:146
msgid "Site setup and configuration"
msgstr "Agordoj pri la retejo"
-#: ../../include/nav.php:169
+#: ../../include/nav.php:170
msgid "Nothing new here"
msgstr "Estas neniu nova ĉi tie"
@@ -6567,17 +6909,17 @@ msgstr "Ĉio"
msgid "Categories"
msgstr "Kategorioj"
-#: ../../include/auth.php:29
+#: ../../include/auth.php:36
msgid "Logged out."
msgstr "Elsalutita."
-#: ../../include/auth.php:106
+#: ../../include/auth.php:115
msgid ""
"We encountered a problem while logging in with the OpenID you provided. "
"Please check the correct spelling of the ID."
msgstr "Okazis problemo ensalutinta kun via OpenID. Bonvolu kontroli la ID."
-#: ../../include/auth.php:106
+#: ../../include/auth.php:115
msgid "The error message was:"
msgstr "La erarmesaĝo estis:"
@@ -6649,20 +6991,30 @@ msgstr "sekundo"
msgid "seconds"
msgstr "sekundoj"
-#: ../../include/datetime.php:277
+#: ../../include/datetime.php:278
#, php-format
msgid "%1$d %2$s ago"
msgstr "antaŭ %1$d %2$s"
-#: ../../include/onepoll.php:406
+#: ../../include/datetime.php:450 ../../include/items.php:1460
+#, php-format
+msgid "%s's birthday"
+msgstr "Naskiĝtago de %s"
+
+#: ../../include/datetime.php:451 ../../include/items.php:1461
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Feliĉan Naskiĝtagon al %s"
+
+#: ../../include/onepoll.php:399
msgid "From: "
msgstr "De: "
-#: ../../include/bbcode.php:203 ../../include/bbcode.php:223
+#: ../../include/bbcode.php:216 ../../include/bbcode.php:236
msgid "$1 wrote:"
msgstr "$1 skribis:"
-#: ../../include/bbcode.php:238 ../../include/bbcode.php:307
+#: ../../include/bbcode.php:251 ../../include/bbcode.php:328
msgid "Image/photo"
msgstr "Bildo"
@@ -6692,197 +7044,297 @@ msgstr "Dankon,"
msgid "%s Administrator"
msgstr "%s Administranto"
-#: ../../include/enotify.php:35
+#: ../../include/enotify.php:38
#, php-format
msgid "%s <!item_type!>"
msgstr "%s <!item_type!>"
-#: ../../include/enotify.php:39
+#: ../../include/enotify.php:42
#, php-format
msgid "[Friendica:Notify] New mail received at %s"
msgstr "[Friendica:Atentigo] Ricevis novan retpoŝton ĉe %s"
-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:44
#, php-format
-msgid "%s sent you a new private message at %s."
-msgstr "%s sendis novan mesaĝon al vi ĉe %s."
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$s sendis al vi novan privatan mesaĝon ĉe %2$s."
-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:45
#, php-format
-msgid "%s sent you %s."
-msgstr "%s sendis al vi %s."
+msgid "%1$s sent you %2$s."
+msgstr "%1$s sendis al vi %2$s."
-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:45
msgid "a private message"
msgstr "privatan mesaĝon"
-#: ../../include/enotify.php:43
+#: ../../include/enotify.php:46
#, php-format
msgid "Please visit %s to view and/or reply to your private messages."
msgstr "Bonvolu viziti %s por vidi aŭ respondi viajn privatajn mesaĝojn."
#: ../../include/enotify.php:73
#, php-format
-msgid "%s's"
-msgstr "de %s verkita"
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+msgstr "%1$s komentis pri [url=%2$s]%3$s[/url]"
-#: ../../include/enotify.php:77
-msgid "your"
-msgstr "via"
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+msgstr "%1$s komentis pri [url=%2$s]%4$s de %3$s[/url]"
-#: ../../include/enotify.php:84
+#: ../../include/enotify.php:88
#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d by %s"
-msgstr "[Friendica:Atentigo] Komento pri konversacio #%d de %s"
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+msgstr "%1$s komentis pri [url=%2$s]via %3$s[/url]"
-#: ../../include/enotify.php:85
+#: ../../include/enotify.php:98
#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s komentis pri elemento/konversacio kiun vi sekvas."
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica:Atentigo] Komento pri konversacio #%1$d de %2$s"
-#: ../../include/enotify.php:86
+#: ../../include/enotify.php:99
#, php-format
-msgid "%s commented on %s."
-msgstr "%s komentis pri %s."
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s komentis pri elemento/konversacio kiun vi sekvas."
-#: ../../include/enotify.php:88 ../../include/enotify.php:101
-#: ../../include/enotify.php:112 ../../include/enotify.php:123
+#: ../../include/enotify.php:102 ../../include/enotify.php:117
+#: ../../include/enotify.php:130 ../../include/enotify.php:143
#, php-format
msgid "Please visit %s to view and/or reply to the conversation."
msgstr "Bonvolu viziti %s por vidi aŭ respondi la konversacion."
-#: ../../include/enotify.php:95
+#: ../../include/enotify.php:109
#, php-format
msgid "[Friendica:Notify] %s posted to your profile wall"
msgstr "[Friendica:Atentigo] %s afiŝis al via profilmuro"
-#: ../../include/enotify.php:97
+#: ../../include/enotify.php:111
#, php-format
-msgid "%s posted to your profile wall at %s"
-msgstr "%s skribis al via profila muro ĉe %s"
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s skribis al via profilmuro ĉe %2$s"
-#: ../../include/enotify.php:99
+#: ../../include/enotify.php:113
#, php-format
-msgid "%s posted to %s"
-msgstr "%s afiŝis al %s"
+msgid "%1$s posted to [url=%2s]your wall[/url]"
+msgstr "%1$s afiŝis al [url=%2s]via muro[/url]"
-#: ../../include/enotify.php:99
-msgid "your profile wall."
-msgstr "via profilmuro."
-
-#: ../../include/enotify.php:108
+#: ../../include/enotify.php:124
#, php-format
msgid "[Friendica:Notify] %s tagged you"
msgstr "[Friendica:Atentigo] %s markis vin"
-#: ../../include/enotify.php:109
+#: ../../include/enotify.php:125
#, php-format
-msgid "%s tagged you at %s"
-msgstr "%s markis vin kiel %s"
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s markis vin ĉe %2$s"
-#: ../../include/enotify.php:110
+#: ../../include/enotify.php:126
#, php-format
-msgid "%s %s."
-msgstr "%s %s."
+msgid "%1$s [url=%2$s]tagged you[/url]."
+msgstr "%1$s [url=%2$s]markis vin[/url]."
-#: ../../include/enotify.php:110
-msgid "tagged you"
-msgstr "markis vin"
-
-#: ../../include/enotify.php:119
+#: ../../include/enotify.php:137
#, php-format
msgid "[Friendica:Notify] %s tagged your post"
msgstr "[Friendica:Atentigo] %s markis vian afiŝon"
-#: ../../include/enotify.php:120
+#: ../../include/enotify.php:138
#, php-format
-msgid "%s tagged your post at %s"
-msgstr "%s markis vian afiŝon kiel %s"
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$s markis vian afiŝon ĉe %2$s"
-#: ../../include/enotify.php:121
+#: ../../include/enotify.php:139
#, php-format
-msgid "%s tagged %s"
-msgstr "%s markis %s"
-
-#: ../../include/enotify.php:121
-msgid "your post"
-msgstr "vian afiŝon"
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr "%1$s markis [url=%2$s]vian afiŝon[/url]"
-#: ../../include/enotify.php:130
+#: ../../include/enotify.php:150
msgid "[Friendica:Notify] Introduction received"
msgstr "[Friendica:Atentigo] Ricevis prezenton"
-#: ../../include/enotify.php:131
+#: ../../include/enotify.php:151
#, php-format
-msgid "You've received an introduction from '%s' at %s"
-msgstr "Vi ricevis prezento de '%s' ĉe %s"
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr "Vi ricevis prezenton de '%1$s' ĉe %2$s"
-#: ../../include/enotify.php:132
+#: ../../include/enotify.php:152
#, php-format
-msgid "You've received %s from %s."
-msgstr "Vi ricevis %s de %s."
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr "Vi ricevis [url=%1$s]prezenton[/url] de %2$s."
-#: ../../include/enotify.php:132
-msgid "an introduction"
-msgstr "prezenton"
-
-#: ../../include/enotify.php:133 ../../include/enotify.php:150
+#: ../../include/enotify.php:155 ../../include/enotify.php:173
#, php-format
msgid "You may visit their profile at %s"
msgstr "Vi povas vidi la profilon de li aŭ ŝi ĉe %s"
-#: ../../include/enotify.php:135
+#: ../../include/enotify.php:157
#, php-format
msgid "Please visit %s to approve or reject the introduction."
msgstr "Bonvolu viziti %s por aprobi aŭ malaprobi la prezenton."
-#: ../../include/enotify.php:142
+#: ../../include/enotify.php:164
msgid "[Friendica:Notify] Friend suggestion received"
msgstr "[Friendica:Atentigo] Ricevis amikosugeston"
-#: ../../include/enotify.php:143
+#: ../../include/enotify.php:165
#, php-format
-msgid "You've received a friend suggestion from '%s' at %s"
-msgstr "'%s' ĉe %s rekomendis amikon al vi"
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "Vi ricevis amikosugeston de '%1$s' ĉe %2$s"
-#: ../../include/enotify.php:144
+#: ../../include/enotify.php:166
#, php-format
-msgid "You've received %s for %s from %s."
-msgstr "Vi ricevis %s kun %s de %s."
-
-#: ../../include/enotify.php:145
-msgid "a friend suggestion"
-msgstr "sugeston por amikiĝi"
+msgid ""
+"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr "Vi ricevis [url=%1$s]amikosugeston[/url] pri %2$s de %3$s."
-#: ../../include/enotify.php:148
+#: ../../include/enotify.php:171
msgid "Name:"
msgstr "Nomo:"
-#: ../../include/enotify.php:149
+#: ../../include/enotify.php:172
msgid "Photo:"
msgstr "Bildo:"
-#: ../../include/enotify.php:152
+#: ../../include/enotify.php:175
#, php-format
msgid "Please visit %s to approve or reject the suggestion."
msgstr "Bonvolu viziti %s por aprobi aŭ malaprobi la sugeston."
-#: ../../include/items.php:2724
+#: ../../include/follow.php:32
+msgid "Connect URL missing."
+msgstr "Ne ekzistas URL adreso por konekti."
+
+#: ../../include/follow.php:59
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Tiu retpaĝo ne permesas komunikadon kun aliaj retoj."
+
+#: ../../include/follow.php:60 ../../include/follow.php:80
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Ne malkovris kongruajn protokolojn por komunikado aŭ fluojn."
+
+#: ../../include/follow.php:78
+msgid "The profile address specified does not provide adequate information."
+msgstr "La specifita profiladreso ne enhavas sufiĉe da informoj."
+
+#: ../../include/follow.php:82
+msgid "An author or name was not found."
+msgstr "Ne trovis aŭtoron aŭ nomon."
+
+#: ../../include/follow.php:84
+msgid "No browser URL could be matched to this address."
+msgstr "Neniu retuma URL adreso kongruas al la adreso."
+
+#: ../../include/follow.php:86
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Ne eblas kongrui @-stilan identecon adreson al iu konata protokolo au retpoŝtadreso."
+
+#: ../../include/follow.php:87
+msgid "Use mailto: in front of address to force email check."
+msgstr "Uzu mailto: antaŭ la adreso por devigi la testadon per retpoŝto."
+
+#: ../../include/follow.php:93
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "Tiu profila adreso apartenas al retejo kiu estas maŝaltita je ĉi tiu retejo."
+
+#: ../../include/follow.php:103
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Profilo limigata. Ĉi persono ne eblos ricevi rektajn/personajn atentigojn de vi. "
+
+#: ../../include/follow.php:205
+msgid "Unable to retrieve contact information."
+msgstr "Ne eblas ricevi kontaktinformojn."
+
+#: ../../include/follow.php:259
+msgid "following"
+msgstr "sekvanta"
+
+#: ../../include/items.php:2888
msgid "A new person is sharing with you at "
msgstr "Nova persono kunhavigas kun vi ĉe "
-#: ../../include/items.php:2724
+#: ../../include/items.php:2888
msgid "You have a new follower at "
msgstr "Vi havas novan sekvanton ĉe "
-#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
-#: ../../include/bb2diaspora.php:113
-msgid "image/photo"
-msgstr "bildo"
+#: ../../include/items.php:3520
+msgid "Archives"
+msgstr "Arkivoj"
+
+#: ../../include/user.php:38
+msgid "An invitation is required."
+msgstr "Invio bezonata."
+
+#: ../../include/user.php:43
+msgid "Invitation could not be verified."
+msgstr "Ne povis kontroli la inviton."
+
+#: ../../include/user.php:51
+msgid "Invalid OpenID url"
+msgstr "Nevalida OpenID adreso"
+
+#: ../../include/user.php:66
+msgid "Please enter the required information."
+msgstr "Bonvolu entajpi la bezonatajn informojn."
+
+#: ../../include/user.php:80
+msgid "Please use a shorter name."
+msgstr "Bonvolu uzi pli mallongan nomon."
+
+#: ../../include/user.php:82
+msgid "Name too short."
+msgstr "Nomo estas tro mallonga."
+
+#: ../../include/user.php:97
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Tio ŝajne ne estas via plena (persona, familia) nomo."
+
+#: ../../include/user.php:102
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Via retpoŝtodomajno ne estas permesita ĉi tie."
+
+#: ../../include/user.php:105
+msgid "Not a valid email address."
+msgstr "Nevalida retpoŝtadreso."
-#: ../../include/bb2diaspora.php:102
-msgid "link"
-msgstr "ligilo"
+#: ../../include/user.php:115
+msgid "Cannot use that email."
+msgstr "Neuzebla retpoŝtadreso."
+
+#: ../../include/user.php:121
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr "Via kaŝnomo nur povas enhavi \"a-z\", \"0-9\", \"-\", kaj \"_\". Ĝi ankaŭ devas komenci kun litero."
+
+#: ../../include/user.php:127 ../../include/user.php:225
+msgid "Nickname is already registered. Please choose another."
+msgstr "Tio kaŝnomo jam estas registrita. Bonvolu elekti alian."
+
+#: ../../include/user.php:137
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr "Tiu kaŝnomo iam estis registrita ĉi tie kaj ne ree uzeblas. Bonvolu elekti alian."
+
+#: ../../include/user.php:153
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "GRAVA ERARO: La generacio de sekurecaj ĉifroŝlosiloj malsukcesis."
+
+#: ../../include/user.php:211
+msgid "An error occurred during registration. Please try again."
+msgstr "Eraro okazis dum registrado. Bonvolu provi denove."
+
+#: ../../include/user.php:246
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Eraro okazi dum kreado de via defaŭlta profilo. Bonvolu provi denove."
#: ../../include/security.php:21
msgid "Welcome "
@@ -6906,30 +7358,30 @@ msgstr "La sekuriga ĵetono de la formo estis malĝusta. Tio verŝajne okazis ĉ
msgid "stopped following"
msgstr "ne plu sekvas"
-#: ../../include/Contact.php:203 ../../include/conversation.php:817
+#: ../../include/Contact.php:218 ../../include/conversation.php:842
msgid "View Status"
msgstr "Vidi Staton"
-#: ../../include/Contact.php:204 ../../include/conversation.php:818
+#: ../../include/Contact.php:219 ../../include/conversation.php:843
msgid "View Profile"
msgstr "Vidi Profilon"
-#: ../../include/Contact.php:205 ../../include/conversation.php:819
+#: ../../include/Contact.php:220 ../../include/conversation.php:844
msgid "View Photos"
msgstr "Vidi Bildojn"
-#: ../../include/Contact.php:206 ../../include/Contact.php:219
-#: ../../include/conversation.php:820
+#: ../../include/Contact.php:221 ../../include/Contact.php:234
+#: ../../include/conversation.php:845
msgid "Network Posts"
msgstr "Enretaj Afiŝoj"
-#: ../../include/Contact.php:207 ../../include/Contact.php:219
-#: ../../include/conversation.php:821
+#: ../../include/Contact.php:222 ../../include/Contact.php:234
+#: ../../include/conversation.php:846
msgid "Edit Contact"
msgstr "Redakti Kontakton"
-#: ../../include/Contact.php:208 ../../include/Contact.php:219
-#: ../../include/conversation.php:822
+#: ../../include/Contact.php:223 ../../include/Contact.php:234
+#: ../../include/conversation.php:847
msgid "Send PM"
msgstr "Sendi PM"
@@ -6942,309 +7394,321 @@ msgstr "afiŝo/elemento"
msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "%1$s markis la %3$s de %2$s kiel preferita."
-#: ../../include/conversation.php:317 ../../include/conversation.php:583
+#: ../../include/conversation.php:327 ../../include/conversation.php:608
msgid "Select"
msgstr "Elekti"
-#: ../../include/conversation.php:334 ../../include/conversation.php:676
-#: ../../include/conversation.php:677
+#: ../../include/conversation.php:344 ../../include/conversation.php:701
+#: ../../include/conversation.php:702
#, php-format
msgid "View %s's profile @ %s"
msgstr "Vidi la profilon de %s ĉe %s"
-#: ../../include/conversation.php:344 ../../include/conversation.php:688
+#: ../../include/conversation.php:354 ../../include/conversation.php:713
#, php-format
msgid "%s from %s"
msgstr "%s de %s"
-#: ../../include/conversation.php:359
+#: ../../include/conversation.php:369
msgid "View in context"
msgstr "Vidi kun kunteksto"
-#: ../../include/conversation.php:465
+#: ../../include/conversation.php:475
#, php-format
msgid "%d comment"
msgid_plural "%d comments"
msgstr[0] "%d komento"
msgstr[1] "%d komentoj"
-#: ../../include/conversation.php:529
+#: ../../include/conversation.php:554
msgid "like"
msgstr "ŝati"
-#: ../../include/conversation.php:530
+#: ../../include/conversation.php:555
msgid "dislike"
msgstr "malŝati"
-#: ../../include/conversation.php:532
+#: ../../include/conversation.php:557
msgid "Share this"
msgstr "Kunhavigi ĉi tiun"
-#: ../../include/conversation.php:532
+#: ../../include/conversation.php:557
msgid "share"
msgstr "kunhavigi"
-#: ../../include/conversation.php:556
+#: ../../include/conversation.php:581
msgid "Bold"
msgstr "Grasa"
-#: ../../include/conversation.php:557
+#: ../../include/conversation.php:582
msgid "Italic"
msgstr "Kursiva"
-#: ../../include/conversation.php:558
+#: ../../include/conversation.php:583
msgid "Underline"
msgstr "Substreki"
-#: ../../include/conversation.php:559
+#: ../../include/conversation.php:584
msgid "Quote"
msgstr "Citaĵo"
-#: ../../include/conversation.php:560
+#: ../../include/conversation.php:585
msgid "Code"
msgstr "Kodo"
-#: ../../include/conversation.php:561
+#: ../../include/conversation.php:586
msgid "Image"
msgstr "Bildo"
-#: ../../include/conversation.php:562
+#: ../../include/conversation.php:587
msgid "Link"
msgstr "Ligilo"
-#: ../../include/conversation.php:563
+#: ../../include/conversation.php:588
msgid "Video"
msgstr "Video"
-#: ../../include/conversation.php:596
+#: ../../include/conversation.php:621
msgid "add star"
msgstr "aldoni stelon"
-#: ../../include/conversation.php:597
+#: ../../include/conversation.php:622
msgid "remove star"
msgstr "forpreni stelon"
-#: ../../include/conversation.php:598
+#: ../../include/conversation.php:623
msgid "toggle star status"
msgstr "ŝalti/malŝalti steloŝtato"
-#: ../../include/conversation.php:601
+#: ../../include/conversation.php:626
msgid "starred"
msgstr "steligita"
-#: ../../include/conversation.php:602
+#: ../../include/conversation.php:627
msgid "add tag"
msgstr "aldoni markon"
-#: ../../include/conversation.php:606
+#: ../../include/conversation.php:631
msgid "save to folder"
msgstr "konservi en dosierujo"
-#: ../../include/conversation.php:678
+#: ../../include/conversation.php:703
msgid "to"
msgstr "al"
-#: ../../include/conversation.php:679
+#: ../../include/conversation.php:704
msgid "Wall-to-Wall"
msgstr "Muro-al-Muro"
-#: ../../include/conversation.php:680
+#: ../../include/conversation.php:705
msgid "via Wall-To-Wall:"
-msgstr "tra Muro-al-Muro:"
+msgstr "per Muro-al-Muro:"
-#: ../../include/conversation.php:725
+#: ../../include/conversation.php:750
msgid "Delete Selected Items"
msgstr "Forviŝi Elektitajn Elementojn"
-#: ../../include/conversation.php:876
+#: ../../include/conversation.php:905
#, php-format
msgid "%s likes this."
msgstr "%s ŝatas tiun."
-#: ../../include/conversation.php:876
+#: ../../include/conversation.php:905
#, php-format
msgid "%s doesn't like this."
msgstr "%s malŝatas tiun."
-#: ../../include/conversation.php:880
+#: ../../include/conversation.php:909
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgstr "<span %1$s>%2$d homoj</span> ŝatas tiun."
-#: ../../include/conversation.php:882
+#: ../../include/conversation.php:911
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "<span %1$s>%2$d homoj</span>malŝatas tiun."
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:917
msgid "and"
msgstr "kaj"
-#: ../../include/conversation.php:891
+#: ../../include/conversation.php:920
#, php-format
msgid ", and %d other people"
msgstr ", kaj %d aliaj homoj."
-#: ../../include/conversation.php:892
+#: ../../include/conversation.php:921
#, php-format
msgid "%s like this."
msgstr "%s ŝatas tiun."
-#: ../../include/conversation.php:892
+#: ../../include/conversation.php:921
#, php-format
msgid "%s don't like this."
msgstr "%s malŝatas tiun."
-#: ../../include/conversation.php:917
+#: ../../include/conversation.php:946
msgid "Visible to <strong>everybody</strong>"
msgstr "Videbla al <strong>ĉiuj</strong>"
-#: ../../include/conversation.php:919
+#: ../../include/conversation.php:948
msgid "Please enter a video link/URL:"
msgstr "Bonvolu entajpi ligilon/adreson de video:"
-#: ../../include/conversation.php:920
+#: ../../include/conversation.php:949
msgid "Please enter an audio link/URL:"
msgstr "Bonvolu entajpi ligilon/adreson de sono:"
-#: ../../include/conversation.php:921
+#: ../../include/conversation.php:950
msgid "Tag term:"
msgstr "Markfrazo:"
-#: ../../include/conversation.php:923
+#: ../../include/conversation.php:952
msgid "Where are you right now?"
msgstr "Kie vi estas nun?"
-#: ../../include/conversation.php:966
+#: ../../include/conversation.php:995
msgid "upload photo"
msgstr "alŝuti bildon"
-#: ../../include/conversation.php:968
+#: ../../include/conversation.php:997
msgid "attach file"
msgstr "kunsendi dosieron"
-#: ../../include/conversation.php:970
+#: ../../include/conversation.php:999
msgid "web link"
msgstr "TTT ligilo"
-#: ../../include/conversation.php:971
+#: ../../include/conversation.php:1000
msgid "Insert video link"
msgstr "Alglui ligilon de video"
-#: ../../include/conversation.php:972
+#: ../../include/conversation.php:1001
msgid "video link"
msgstr "video ligilo"
-#: ../../include/conversation.php:973
+#: ../../include/conversation.php:1002
msgid "Insert audio link"
msgstr "Alglui ligilon de sono"
-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:1003
msgid "audio link"
msgstr "sono ligilo"
-#: ../../include/conversation.php:976
+#: ../../include/conversation.php:1005
msgid "set location"
msgstr "agordi lokon"
-#: ../../include/conversation.php:978
+#: ../../include/conversation.php:1007
msgid "clear location"
msgstr "forviŝi lokon"
-#: ../../include/conversation.php:985
+#: ../../include/conversation.php:1014
msgid "permissions"
msgstr "permesoj"
-#: ../../boot.php:511
+#: ../../include/plugin.php:388 ../../include/plugin.php:390
+msgid "Click here to upgrade."
+msgstr "Klaku ĉi tie por ĝisdatigi."
+
+#: ../../include/plugin.php:396
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Tia ago preterpasas la limojn de via abono."
+
+#: ../../include/plugin.php:401
+msgid "This action is not available under your subscription plan."
+msgstr "Tia ago ne estas permesita laŭ via abono."
+
+#: ../../boot.php:527
msgid "Delete this item?"
msgstr "Forviŝi ĉi tiun elementon?"
-#: ../../boot.php:514
+#: ../../boot.php:530
msgid "show fewer"
msgstr "montri malpli"
-#: ../../boot.php:687
+#: ../../boot.php:725
#, php-format
msgid "Update %s failed. See error logs."
msgstr "Malsukcesis ĝisdatigi %s. Vidu la protokolojn."
-#: ../../boot.php:689
+#: ../../boot.php:727
#, php-format
msgid "Update Error at %s"
msgstr "Eraro dum ĝisdatigo ĉe %s"
-#: ../../boot.php:789
+#: ../../boot.php:827
msgid "Create a New Account"
msgstr "Krei Novan Konton"
-#: ../../boot.php:813
+#: ../../boot.php:851
msgid "Nickname or Email address: "
msgstr "Kaŝnomo aŭ retpoŝtadreso:"
-#: ../../boot.php:814
+#: ../../boot.php:852
msgid "Password: "
msgstr "Pasvorto:"
-#: ../../boot.php:817
+#: ../../boot.php:855
msgid "Or login using OpenID: "
msgstr "Aŭ ensaluti per OpenID:"
-#: ../../boot.php:823
+#: ../../boot.php:861
msgid "Forgot your password?"
msgstr "Ĉu vi vorgesis vian pasvorton?"
-#: ../../boot.php:990
+#: ../../boot.php:1028
msgid "Edit profile"
msgstr "Redakti profilon"
-#: ../../boot.php:1050
+#: ../../boot.php:1088
msgid "Message"
msgstr "Mesaĝo"
-#: ../../boot.php:1166 ../../boot.php:1242
+#: ../../boot.php:1204 ../../boot.php:1283
msgid "g A l F d"
msgstr "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d"
-#: ../../boot.php:1167 ../../boot.php:1243
+#: ../../boot.php:1205 ../../boot.php:1284
msgid "F d"
msgstr "F d"
-#: ../../boot.php:1212 ../../boot.php:1283
+#: ../../boot.php:1250 ../../boot.php:1324
msgid "[today]"
msgstr "[hodiaŭ]"
-#: ../../boot.php:1224
+#: ../../boot.php:1262
msgid "Birthday Reminders"
msgstr "Memorigilo pri naskiĝtagoj"
-#: ../../boot.php:1225
+#: ../../boot.php:1263
msgid "Birthdays this week:"
msgstr "Naskiĝtagoj ĉi-semajne:"
-#: ../../boot.php:1276
+#: ../../boot.php:1317
msgid "[No description]"
msgstr "[Neniu priskribo]"
-#: ../../boot.php:1294
+#: ../../boot.php:1335
msgid "Event Reminders"
msgstr "Memorigilo pri Okazoj"
-#: ../../boot.php:1295
+#: ../../boot.php:1336
msgid "Events this week:"
msgstr "Okazoj ĉi-semajne:"
-#: ../../boot.php:1481
+#: ../../boot.php:1541
msgid "Status Messages and Posts"
msgstr "Ŝtatmesaĝoj kaj Afiŝoj"
-#: ../../boot.php:1487
+#: ../../boot.php:1547
msgid "Profile Details"
msgstr "Profildetaloj"
-#: ../../boot.php:1502
+#: ../../boot.php:1562
msgid "Events and Calendar"
msgstr "Okazoj kaj Kalendaro"
-#: ../../boot.php:1508
+#: ../../boot.php:1568
msgid "Only You Can See This"
msgstr "Nur Vi Povas Vidi Tiun"
diff --git a/view/eo/strings.php b/view/eo/strings.php
index ba2af413a..236022993 100644
--- a/view/eo/strings.php
+++ b/view/eo/strings.php
@@ -33,7 +33,7 @@ $a->strings["File upload failed."] = "Alŝutado malsukcesis.";
$a->strings["Friend suggestion sent."] = "Amikosugesto sendita.";
$a->strings["Suggest Friends"] = "Sugesti amikojn";
$a->strings["Suggest a friend for %s"] = "Sugesti amikon por %s";
-$a->strings["Event description and start time are required."] = "Okazo bezonas priskribon kaj startotempon.";
+$a->strings["Event title and start time are required."] = "Titolo kaj starttempo estas bezonataj por la okazo.";
$a->strings["l, F j"] = "l, F j";
$a->strings["Edit event"] = "Redakti okazon";
$a->strings["link to source"] = "ligilo al fonto";
@@ -43,13 +43,15 @@ $a->strings["Previous"] = "antaŭa";
$a->strings["Next"] = "sekva";
$a->strings["hour:minute"] = "horo:minuto";
$a->strings["Event details"] = "Detaloj de okazo";
-$a->strings["Format is %s %s. Starting date and Description are required."] = "Formato estas %s %s. Startotempo kaj priskribo estas bezonataj";
+$a->strings["Format is %s %s. Starting date and Title are required."] = "Format is %s %s. Titolo kaj starttempo estas bezonataj.";
$a->strings["Event Starts:"] = "Okazo startas:";
+$a->strings["Required"] = "Bezonata";
$a->strings["Finish date/time is not known or not relevant"] = "Fina dato/tempo ne estas konata aŭ ne bezonata";
$a->strings["Event Finishes:"] = "Okazo finas:";
$a->strings["Adjust for viewer timezone"] = "Agordi al horzono de la leganto";
$a->strings["Description:"] = "Priskribo";
$a->strings["Location:"] = "Loko:";
+$a->strings["Title:"] = "Titolo:";
$a->strings["Share this event"] = "Kunhavigi la okazon";
$a->strings["Cancel"] = "Nuligi";
$a->strings["Tag removed"] = "Marko forviŝita";
@@ -82,6 +84,8 @@ $a->strings["Image upload failed."] = "Alŝuto de bildo malsukcesis.";
$a->strings["Public access denied."] = "Publika atingo ne permesita.";
$a->strings["No photos selected"] = "Neniu bildoj elektita";
$a->strings["Access to this item is restricted."] = "Atingo al tio elemento estas limigita.";
+$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Vi uzas %1$.2f MB de %2$.2f MB bildkonservejo.";
+$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Vi uzas %1$.2f MB de bildkonservejo.";
$a->strings["Upload Photos"] = "Alŝuti bildojn";
$a->strings["New album name: "] = "Nomo por nova albumo:";
$a->strings["or existing album name: "] = "aŭ nomo de estanta albumo:";
@@ -98,6 +102,8 @@ $a->strings["Private Message"] = "Privata mesaĝo";
$a->strings["View Full Size"] = "Vidi plengrande ";
$a->strings["Tags: "] = "Markoj:";
$a->strings["[Remove any tag]"] = "[Forviŝi iun markon]";
+$a->strings["Rotate CW (right)"] = "Turni horloĝdirekte (dekstren)";
+$a->strings["Rotate CCW (left)"] = "Turni kontraŭhorloĝdirekte (maldekstren)";
$a->strings["New album name"] = "Nova nomo de albumo";
$a->strings["Caption"] = "Apudskribo";
$a->strings["Add a Tag"] = "Aldoni markon";
@@ -124,7 +130,7 @@ $a->strings["Installed plugins/addons/apps:"] = "Instalitaj kromprogramoj/progra
$a->strings["No installed plugins/addons/apps"] = "Neniom da instalitaj aldonaĵoj/programoj";
$a->strings["Item not found"] = "Elemento ne trovita";
$a->strings["Edit post"] = "Redakti afiŝon";
-$a->strings["Post to Email"] = "Sendi tra retpoŝto";
+$a->strings["Post to Email"] = "Sendi per retpoŝto";
$a->strings["Edit"] = "Redakti";
$a->strings["Upload photo"] = "Alŝuti bildon";
$a->strings["Attach file"] = "Kunligi dosieron";
@@ -166,6 +172,7 @@ $a->strings["Failed to update contact record."] = "Ĝisdatigo de via kontaktriko
$a->strings["Your introduction has been sent."] = "Via prezento estas sendita.";
$a->strings["Please login to confirm introduction."] = "Bonvolu ensaluti por jesigi la prezenton.";
$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Malĝusta identaĵo ensalutata. Bonvolu ensaluti en <strong>tiun</strong> profilon.";
+$a->strings["Hide this contact"] = "Kaŝi tiun kontakton";
$a->strings["Welcome home %s."] = "Bonvenon hejme, %s.";
$a->strings["Please confirm your introduction/connection request to %s."] = "Bonvolu konfirmi vian prezenton / kontaktpeton al %s.";
$a->strings["Confirm"] = "Konfirmi.";
@@ -185,18 +192,14 @@ $a->strings[" - please do not use this form. Instead, enter %s into your Diaspo
$a->strings["Your Identity Address:"] = "Via identeca adreso:";
$a->strings["Submit Request"] = "Sendi peton";
$a->strings["Friendica Social Communications Server - Setup"] = "Friendica Interkona Komunikada Servilo - Instalo";
-$a->strings["Database connection"] = "Datumbaza konekto";
$a->strings["Could not connect to database."] = "Ne eblas konekti la datumbazon.";
$a->strings["Could not create table."] = "Ne eblas krei tabelon.";
$a->strings["Your Friendica site database has been installed."] = "La datumbazo de vi Friendica retjo estas instalita.";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "GRAVA: Vi bezonas [mane] agordi planitan taskon por la Friendica poller.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Vi bezonas mane importi la dosieron \"database.sql\" per phpmyadmin aŭ mysql.";
$a->strings["Please see the file \"INSTALL.txt\"."] = "Bonvolu legi la dosieron \"INSTALL.txt\".";
-$a->strings["Proceed to registration"] = "Pluigi al la registrilo";
-$a->strings["Proceed with Installation"] = "Pluigi la instalado";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Vi bezonas mane importi la dosieron \"database.sql\" tra phpmyadmin aŭ mysql.";
-$a->strings["Database import failed."] = "Importo de la datumbazo malsukcesis.";
$a->strings["System check"] = "Sistema kontrolo";
$a->strings["Check again"] = "Ree kontroli";
+$a->strings["Database connection"] = "Datumbaza konekto";
$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Por instali Friendica, ni bezonas scii kiel konekti al via datumbazo.";
$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bonvolu kontakti vian servilprovizanton aŭ administranton se vi havas demandoj pri ĉi tiaj agordoj.";
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La datumbazo nomata malsupren jam ekzistu. Se ĝi ne ekzistas, bonvolu unue krei ĝin antaŭ progresi.";
@@ -209,8 +212,9 @@ $a->strings["Your account email address must match this in order to use the web
$a->strings["Please select a default timezone for your website"] = "Bonvolu elekti defaŭltan horzonon por via retejo.";
$a->strings["Site settings"] = "Retejaj agordoj";
$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Komanda linia versio de PHP ne trovita en $PATH de la retservilo.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"] = "Se vi ne havas komandlinian version de PHP sur la servilo, vi ne eblas plenumi fonan planitan enketon per cron. Bonvolu legi <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>";
$a->strings["PHP executable path"] = "Vojo de la komanda linia versio de PHP";
-$a->strings["Enter full path to php executable"] = "Entajpu plenan vojon al la komanda linia versio de PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Entajpu la plenan vojon al la php komandodosiero. Vi eblas lasi tion malplena por pluigi la instalado.";
$a->strings["Command line PHP"] = "komanda linia versio de PHP";
$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "En via komanda linia versio de PHP je via sistemo, \"register_argc_argv\" ne estas aktivita.";
$a->strings["This is required for message delivery to work."] = "Tio estas bezonata por la livero de mesaĝoj.";
@@ -232,11 +236,15 @@ $a->strings["Error: mysqli PHP module required but not installed."] = "Eraro: La
$a->strings["Error: mb_string PHP module required but not installed."] = "Eraro: La modulo mb_string en PHP estas bezonata sed ne instalita.";
$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "La reta instalilo bezonas skribi dosieron nomata \".htconfig.php\" en la baza dosierujo de la retservilo, sed ne sukcesis.";
$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Tio ĉi plej ofte estas agordo rilate al permesoj, ĉar la servilo eble ne povas skribi en via dosierujo, eĉ se vi mem povas skribi.";
-$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Bonvolu kontroli la dokumentojn de via servilo aŭ teĥnikiston por ekscii ĉu la situacio ĝustigeblas.";
-$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Se ne, vi eble bezonas instali mane. Bonvolu legi la dosieron \"INSTALL.txt\" por pluaj instruaĵoj.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Post la fino de tiu proceduro, ni donos al vi tekston por konservi en dosiero .htconfig.php en via baza Friendica dosierujo.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Vi ankaŭ povas preterpasi tiun proceduron kaj fari permanan instaladon. Bonvolu legi la dosieron \"INSTALL.txt\" por trovi instrukciojn.";
$a->strings[".htconfig.php is writable"] = ".htconfig.php estas skribebla.";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Url rewrite en .htaccess ne funkcias. Kontrolu la agordojn de la servilo.";
+$a->strings["Url rewrite is working"] = "URL rewrite funkcias.";
$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Ne povis skribi la datumbaza agordoj en la dosiero \".htconfig.php\". Bonvolu uzi la inkluzivan tekston por krei agordan dosieron en la baza dosierujo de la retservilo.";
$a->strings["Errors encountered creating database tables."] = "Okazis eraroj dum la kreado de tabeloj en la datumbazo.";
+$a->strings["<h1>What next</h1>"] = "<h1>Kio sekvas nun?</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "GRAVA: Vi bezonas [mane] agordi planitan taskon por la Friendica poller.";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Konverto de tempo";
$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica provizas tiun servon por kunhavigi okazojn kun aliaj retoj kaj amikoj en aliaj horzonoj.";
@@ -328,6 +336,7 @@ $a->strings["Archive"] = "Enarkivigi";
$a->strings["Toggle Archive status"] = "Ŝalti/malŝalti Enarkivigitan staton";
$a->strings["Repair"] = "Ripari";
$a->strings["Advanced Contact Settings"] = "Specialaj Kontaktagordoj";
+$a->strings["Communications lost with this contact!"] = "Mi perdis la kommunikadon kun tiu kontakto!";
$a->strings["Contact Editor"] = "Kontakta redaktilo.";
$a->strings["Profile Visibility"] = "Videbleco de profilo";
$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bonvolu elekti la profilon kiu vi volas montri al %s aspektinde kiam sekure aspektante vian profilon.";
@@ -403,6 +412,8 @@ $a->strings[" Please use a shorter name."] = " Bonvolu uzi pli mallongan nomon."
$a->strings[" Name too short."] = " Nomo estas tro mallonga.";
$a->strings[" Not valid email."] = " Repoŝtadreso ne validas.";
$a->strings[" Cannot change to that email."] = " Ne povas ŝanĝi al tio retpoŝtadreso.";
+$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Privata forumo ne havas privatecajn agordojn. Defaŭlta privateca grupo estas uzata.";
+$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Privata forumo havas nek privatecajn agordojn nek defaŭltan privatecan grupon.";
$a->strings["Settings updated."] = "Agordoj ĝisdatigita.";
$a->strings["Add application"] = "Aldoni programon";
$a->strings["Consumer Key"] = "Ŝlosilo de kliento";
@@ -420,11 +431,11 @@ $a->strings["Built-in support for %s connectivity is %s"] = "Integrita subteno p
$a->strings["enabled"] = "ŝaltita";
$a->strings["disabled"] = "malŝaltita";
$a->strings["StatusNet"] = "StatusNet";
+$a->strings["Email access is disabled on this site."] = "Retpoŝta atingo ne disponeblas ĉi tie.";
$a->strings["Connector Settings"] = "Konektiloagordoj";
$a->strings["Email/Mailbox Setup"] = "Agordoj pri Retpoŝto";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Se vi volas uzi ĉi tiun servon por komuniki tra retpoŝto (nedeviga), bonvolu specifi kiel konekti al vian retpoŝtkonton.";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Se vi volas uzi ĉi tiun servon por komuniki per retpoŝto (nedeviga), bonvolu specifi kiel konekti al vian retpoŝtkonton.";
$a->strings["Last successful email check:"] = "Plej ĵusa sukcesa kontrolo de poŝto:";
-$a->strings["Email access is disabled on this site."] = "Retpoŝta atingo ne disponeblas ĉi tie.";
$a->strings["IMAP server name:"] = "Nomo de IMAP servilo:";
$a->strings["IMAP port:"] = "Numero de IMAP pordo:";
$a->strings["Security:"] = "Sekureco:";
@@ -444,14 +455,16 @@ $a->strings["Minimum of 10 seconds, no maximum"] = "Minimume 10 sekundoj, sen ma
$a->strings["Number of items to display on the network page:"] = "Kvanto da elementoj kiuj estos montrata ĉe la reto paĝo.";
$a->strings["Maximum of 100 items"] = "Maksimume 100 eroj";
$a->strings["Don't show emoticons"] = "Ne montru ridetulojn";
-$a->strings["Normal Account"] = "Normala konto";
+$a->strings["Normal Account Page"] = "Normala Kontopaĝo";
$a->strings["This account is a normal personal profile"] = "Tiu konto estas normala persona profilo";
-$a->strings["Soapbox Account"] = "Soapbox Konto";
+$a->strings["Soapbox Page"] = "Soapbox Paĝo";
$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel nurlegaj admirantoj";
-$a->strings["Community/Celebrity Account"] = "Komunuma/eminentula Konto";
+$a->strings["Community Forum/Celebrity Account"] = "Komunuma Forumo/Eminentula Konto";
$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel admirantoj kapable legi kaj skribi";
-$a->strings["Automatic Friend Account"] = "Aŭtomata Amika Konto";
+$a->strings["Automatic Friend Page"] = "Aŭtomata Amiko Paĝo";
$a->strings["Automatically approve all connection/friend requests as friends"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel amikoj";
+$a->strings["Private Forum [Experimental]"] = "Privata Forumo [eksperimenta]";
+$a->strings["Private forum - approved members only"] = "Privata forumo - nur por aprobitaj membroj";
$a->strings["OpenID:"] = "OpenID:";
$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Nedeviga) Permesi atingon al la konton al ĉi tio OpenID.";
$a->strings["Publish your default profile in your local site directory?"] = "Publikigi vian defaŭltan profilon en la loka reteja katalogo?";
@@ -473,6 +486,7 @@ $a->strings["Expire posts:"] = "Senvalidigi afiŝojn:";
$a->strings["Expire personal notes:"] = "Senvalidigi personajn notojn:";
$a->strings["Expire starred posts:"] = "Senvalidigi steligitajn afiŝojn:";
$a->strings["Expire photos:"] = "Senvalidigi bildojn:";
+$a->strings["Only expire posts by others:"] = "Nur senvalidigi afiŝojn de aliaj: ";
$a->strings["Account Settings"] = "Kontoagordoj";
$a->strings["Password Settings"] = "Agordoj pri Pasvorto";
$a->strings["New Password:"] = "Nova pasvorto:";
@@ -503,7 +517,8 @@ $a->strings["Someone writes a followup comment"] = "Iu skribas sekvan komenton";
$a->strings["You receive a private message"] = "Vi ricevas privatan mesaĝon.";
$a->strings["You receive a friend suggestion"] = "Vi ricevas amikosugeston";
$a->strings["You are tagged in a post"] = "Vi estas markita en afiŝon";
-$a->strings["Advanced Page Settings"] = "Specialaj agordoj pri paĝoj";
+$a->strings["Advanced Account/Page Type Settings"] = "Detalaj Agordoj pri Tipo de Konto/Paĝo.";
+$a->strings["Change the behaviour of this account for special situations"] = "Agordi la teniĝon de la konto en specialaj situacioj";
$a->strings["Manage Identities and/or Pages"] = "Administri identecojn kaj/aŭ paĝojn.";
$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Ŝalti inter aliaj identecojn aj komunumaj/grupaj paĝoj kiuj kunhavas viajn kontajn detalojn au por kiuj vi havas \"administranto\" permesojn.";
$a->strings["Select an identity to manage: "] = "Elektu identencon por administrado:";
@@ -557,7 +572,7 @@ $a->strings["Review the other settings, particularly the privacy settings. An un
$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Enŝuti profilbildon se vi ankoraŭ ne havas ĝin. Laŭ studoj, homoj kun realaj biloj de si mem trovas novajn amikon duope pli probable ol homoj sen reala bildo.";
$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Rajtigu la Facebook Konektilon se vi nuntempe havas Facebook konton, kaj ni (nedeviga) enportu viajn Facebook amikojn kaj konversaciojn.";
$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Se</tm> ĉi tiu estas via propra TTT servilo, instali la Facebook kromprogramon eble plifaciligos la transpason al la libera interkona reto.";
-$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Entajpu la akreditaĵojn por via retpoŝtkonto en la konektilagordoj se vi volas importi aŭ interagi kun amikoj aŭ dissendlistoj tra via retkesto.";
+$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Entajpu la akreditaĵojn por via retpoŝtkonto en la konektilagordoj se vi volas importi aŭ interagi kun amikoj aŭ dissendlistoj pere de via retkesto.";
$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Redakti viajn <strong>defaŭltan</strong> profilon kiel vi ŝatas ĝin. Kontrolu la agordojn por kaŝi vian kontaktliston aŭ kaŝi vian profilon al nekonataj vizitantoj.";
$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Aldonu publikajn ŝlosilvortojn al via defaŭlta profilo, kiuj priskribas viajn interesojn. Ni eble povas trovi aliajn uzantojn kun similaj interesoj kaj sugesti amikojn.";
$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "Via kontaktpaĝo estas via portalo por administri amikojn kaj konekti kun amikoj en aliaj retoj. Vi kutime entajpas iliajn adreson aŭ URL adreso en la <em>Aldonu Novan Kontakton</em> dialogon.";
@@ -586,22 +601,6 @@ $a->strings["Visible To"] = "Videbla Al";
$a->strings["All Contacts (with secure profile access)"] = "Ĉiuj Kontaktoj (kun sekura atingo al la profilo)";
$a->strings["No contacts."] = "Neniu kontaktojn.";
$a->strings["View Contacts"] = "Vidi Kontaktojn";
-$a->strings["An invitation is required."] = "Invio bezonata.";
-$a->strings["Invitation could not be verified."] = "Ne povis kontroli la inviton.";
-$a->strings["Invalid OpenID url"] = "Nevalida OpenID adreso";
-$a->strings["Please enter the required information."] = "Bonvolu entajpi la bezonatajn informojn.";
-$a->strings["Please use a shorter name."] = "Bonvolu uzi pli mallongan nomon.";
-$a->strings["Name too short."] = "Nomo estas tro mallonga.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Tio ŝajne ne estas via plena (persona, familia) nomo.";
-$a->strings["Your email domain is not among those allowed on this site."] = "Via retpoŝtodomajno ne estas permesita ĉi tie.";
-$a->strings["Not a valid email address."] = "Nevalida retpoŝtadreso.";
-$a->strings["Cannot use that email."] = "Neuzebla retpoŝtadreso.";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Via kaŝnomo nur povas enhavi \"a-z\", \"0-9\", \"-\", kaj \"_\". Ĝi ankaŭ devas komenci kun litero.";
-$a->strings["Nickname is already registered. Please choose another."] = "Tio kaŝnomo jam estas registrita. Bonvolu elekti alian.";
-$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Tiu kaŝnomo iam estis registrita ĉi tie kaj ne ree uzeblas. Bonvolu elekti alian.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "GRAVA ERARO: La generacio de sekurecaj ĉifroŝlosiloj malsukcesis.";
-$a->strings["An error occurred during registration. Please try again."] = "Eraro okazis dum registrado. Bonvolu provi denove.";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Eraro okazi dum kreado de via defaŭlta profilo. Bonvolu provi denove.";
$a->strings["Registration details for %s"] = "Detaloj de la registrado por %s";
$a->strings["Registration successful. Please check your email for further instructions."] = "Registrado sukcesis. Bonvolu kontroli vian retpoŝton por pli da instruoj.";
$a->strings["Failed to send email message. Here is the message that failed."] = "Malsukcesis sendi retpoŝton. Jen la malsukcesa mesaĝo.";
@@ -609,7 +608,7 @@ $a->strings["Your registration can not be processed."] = "Mi ne povas prilabori
$a->strings["Registration request at %s"] = "Peto de registrado al %s";
$a->strings["Your registration is pending approval by the site owner."] = "Via registrado bezonas apropbon de la administranto.";
$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "La retejo transiras la maksimuman kvanton da ĉiutagaj kontaj registradoj. Bonvolu provi denove morgaŭ.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vi ankaŭ (nedeviga) povas plenigi la formularon tra OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vi ankaŭ (nedeviga) povas plenigi la formularon per OpenID se vi provizas vian OpenID adreson kaj klakas 'Registri'.";
$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Se vi ne konas OpenID, bonvolu lasi tiun kampon malplena kaj entajpu la aliajn elementojn.";
$a->strings["Your OpenID (optional): "] = "Via OpenID (nedeviga):";
$a->strings["Include your profile in member directory?"] = "Aldoni vian profilon al la membrokatalogo?";
@@ -684,9 +683,15 @@ $a->strings["Users"] = "Uzantoj";
$a->strings["Plugins"] = "Kromprogramoj";
$a->strings["Themes"] = "Etosoj";
$a->strings["DB updates"] = "DB ĝisdatigoj";
-$a->strings["Software Update"] = "Friendica Ĝisdatigoj";
$a->strings["Logs"] = "Protokoloj";
+$a->strings["Admin"] = "Administrado";
+$a->strings["Plugin Features"] = "Kromprogramaj Trajtoj";
$a->strings["User registrations waiting for confirmation"] = "Uzantaj registradoj atendante konfirmon";
+$a->strings["Normal Account"] = "Normala konto";
+$a->strings["Soapbox Account"] = "Soapbox Konto";
+$a->strings["Community/Celebrity Account"] = "Komunuma/eminentula Konto";
+$a->strings["Automatic Friend Account"] = "Aŭtomata Amika Konto";
+$a->strings["Message queues"] = "Mesaĝvicoj";
$a->strings["Administration"] = "Administrado";
$a->strings["Summary"] = "Resumo";
$a->strings["Registered users"] = "Registrataj uzantoj";
@@ -825,30 +830,21 @@ $a->strings["{0} tagged %s's post with #%s"] = "{0} markis la afiŝon de %s kun
$a->strings["{0} mentioned you in a post"] = "{0} menciis vin en afiŝo";
$a->strings["Contacts who are not members of a group"] = "Kontaktoj kiuj ne estas en iu grupo";
$a->strings["OpenID protocol error. No ID returned."] = "Eraro en OpenID protokolo. Ne resendis identecon.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Ne trovis kontoj, kaj registrado tra OpenID estas malpermesita ĉi tie.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Ne trovis kontoj, kaj registrado per OpenID estas malpermesita ĉi tie.";
$a->strings["Login failed."] = "Ensalutado malsukcesis.";
-$a->strings["Connect URL missing."] = "Ne ekzistas URL adreso por konekti.";
-$a->strings["This site is not configured to allow communications with other networks."] = "Tiu retpaĝo ne permesas komunikadon kun aliaj retoj.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "Ne malkovris kongruajn protokolojn por komunikado aŭ fluojn.";
-$a->strings["The profile address specified does not provide adequate information."] = "La specifita profiladreso ne enhavas sufiĉe da informoj.";
-$a->strings["An author or name was not found."] = "Ne trovis aŭtoron aŭ nomon.";
-$a->strings["No browser URL could be matched to this address."] = "Neniu retuma URL adreso kongruas al la adreso.";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Ne eblas kongrui @-stilan identecon adreson al iu konata protokolo au retpoŝtadreso.";
-$a->strings["Use mailto: in front of address to force email check."] = "Uzu mailto: antaŭ la adreso por devigi la testadon per retpoŝto.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Tiu profila adreso apartenas al retejo kiu estas maŝaltita je ĉi tiu retejo.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profilo limigata. Ĉi persono ne eblos ricevi rektajn/personajn atentigojn de vi. ";
-$a->strings["Unable to retrieve contact information."] = "Ne eblas ricevi kontaktinformojn.";
-$a->strings["following"] = "sekvanta";
+$a->strings["Contact added"] = "Aldonis kontakton";
$a->strings["Common Friends"] = "Komunaj Amikoj";
$a->strings["No contacts in common."] = "Neniom da komunaj kontaktoj.";
$a->strings["Item has been removed."] = "Elemento estas forviŝita.";
$a->strings["Applications"] = "Programoj";
$a->strings["No installed applications."] = "Neniom da instalitaj programoj.";
-$a->strings["Search This Site"] = "Serĉi ĉi-tiun retejon";
+$a->strings["Search"] = "Serĉi";
$a->strings["Profile not found."] = "Profilo ne trovita.";
$a->strings["Profile Name is required."] = "Nomo de profilo estas bezonata.";
$a->strings["Marital Status"] = "Amrilata Stato";
$a->strings["Romantic Partner"] = "Kora Partnero";
+$a->strings["Likes"] = "Ŝatoj";
+$a->strings["Dislikes"] = "Malŝatoj";
$a->strings["Work/Employment"] = "Laboro";
$a->strings["Religion"] = "Religio";
$a->strings["Political Views"] = "Politikaj Opinioj";
@@ -856,11 +852,13 @@ $a->strings["Gender"] = "Sekso";
$a->strings["Sexual Preference"] = "Seksa Prefero";
$a->strings["Homepage"] = "Hejmpaĝo";
$a->strings["Interests"] = "Interesoj";
+$a->strings["Address"] = "Adreso";
$a->strings["Location"] = "Loko";
$a->strings["Profile updated."] = "Profilo ĝisdatigita.";
$a->strings[" and "] = " kaj ";
$a->strings["public profile"] = "publika profilo";
$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ŝanĝis %2\$s al &ldquo;%3\$s&rdquo;";
+$a->strings[" - Visit %1\$s's %2\$s"] = " - Vizitu la %2\$s de %1\$s";
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s havas ĝisdatigigan %2\$s, ŝanĝas %3\$s.";
$a->strings["Profile deleted."] = "Profilo forviŝita.";
$a->strings["Profile-"] = "Profilo-";
@@ -885,12 +883,16 @@ $a->strings["Region/State:"] = "Ŝtato:";
$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Civita Stato:";
$a->strings["Who: (if applicable)"] = "Kiu (se aplikeble):";
$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Ekzemploj: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Since [date]:"] = "Ekde [dato]:";
$a->strings["Sexual Preference:"] = "Seksa Prefero:";
$a->strings["Homepage URL:"] = "Adreso de Hejmpaĝo:";
+$a->strings["Hometown:"] = "Hejmurbo:";
$a->strings["Political Views:"] = "Politikaj Opinioj:";
$a->strings["Religious Views:"] = "Religiaj Opinioj:";
$a->strings["Public Keywords:"] = "Publikaj ŝlosilvortoj:";
$a->strings["Private Keywords:"] = "Privataj ŝlosilvortoj:";
+$a->strings["Likes:"] = "Ŝatoj:";
+$a->strings["Dislikes:"] = "Malŝatoj:";
$a->strings["Example: fishing photography software"] = "Ekzemple: fiŝkapti fotografio programaro";
$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Por sugesti amikoj. Videbla al aliaj.)";
$a->strings["(Used for searching profiles, never shown to others)"] = "(Por serĉi profilojn. Neniam videbla al aliaj.)";
@@ -926,7 +928,6 @@ $a->strings["No entries."] = "Neniom da afiŝoj.";
$a->strings["Friend Suggestions"] = "Amikosugestoj";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Neniu sugestoj disponeblas. Se ĉi tiu estas nova retejo, bonvolu reprovi post 24 horoj.";
$a->strings["Ignore/Hide"] = "Ignori/Kaŝi";
-$a->strings["%s [%s]"] = "%s [%s]";
$a->strings["Global Directory"] = "Tutmonda Katalogo";
$a->strings["Find on this site"] = "Trovi en ĉi retejo";
$a->strings["Site Directory"] = "Reteja Katalogo";
@@ -948,7 +949,7 @@ $a->strings["Send invitations"] = "Sendi invitojn";
$a->strings["Enter email addresses, one per line:"] = "Entajpu retpoŝtadresojn, po unu por ĉiu linio.";
$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Ni bonkore invitas vin aliĝi kun ni kaj aliaj bonaj amikoj ĉe Friendica. Helpu nin krei pli bonan interkonan reton.";
$a->strings["You will need to supply this invitation code: \$invite_code"] = "Vi bezonas ĉi-tiun invitkodon: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Kiam vi registris, bonvolu konekti al mi tra mi profilo ĉe: ";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Kiam vi registris, bonvolu konekti al mi pere de mi profilo ĉe: ";
$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Por pli da informoj pri Friendica, kaj kial ni pensas ke ĝi estas grava, bonvolu viziti http://friendica.com";
$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Tio ĉi okazis de tempo al tempo se ambaŭ personoj petas kontakton ka ĝi jam estas aprobita.";
$a->strings["Response from remote site was not understood."] = "Ne komprenis la rispondon de la fora retejo.";
@@ -969,6 +970,10 @@ $a->strings["Unable to set your contact credentials on our system."] = "Ne sukce
$a->strings["Unable to update your contact profile details on our system"] = "Neeblas ĝisdatigi viajn profildetalojn ĉe nia sistemo.";
$a->strings["Connection accepted at %s"] = "Konekto akceptita je %s";
$a->strings["%1\$s has joined %2\$s"] = "%1\$s aliĝis al %2\$s";
+$a->strings["Google+ Import Settings"] = "Google+ Importo";
+$a->strings["Enable Google+ Import"] = "Aktivigi Ĝoogle+ Importon";
+$a->strings["Google Account ID"] = "Google Konto ID";
+$a->strings["Google+ Import Settings saved."] = "Konservis Agordojn por Google+ Importo.";
$a->strings["Facebook disabled"] = "Facebook malŝaltita";
$a->strings["Updating contacts"] = "Mi ĝisdatigas la kontaktojn.";
$a->strings["Facebook API key is missing."] = "La API ŝlosilo de Facebook ne estas konata ĉi tie.";
@@ -991,7 +996,7 @@ $a->strings["Problems with Facebook Real-Time Updates"] = "Problemoj kun Faceboo
$a->strings["Facebook"] = "Facebook";
$a->strings["Facebook Connector Settings"] = "Agordoj por la Facebook konektilo";
$a->strings["Facebook API Key"] = "Facebook API ŝlosilo";
-$a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Eraro: Ŝajnas kvazaŭ vi agordis la App-ID kaj la sekreton en via .htconfig.php dosiero. Kiam ili estas agordita tie, vi ne povas agordi ĝin tra tiu ĉi formo.<br><br>";
+$a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Eraro: Ŝajnas kvazaŭ vi agordis la App-ID kaj la sekreton en via .htconfig.php dosiero. Kiam ili estas agordita tie, vi ne povas agordi ĝin en tiu ĉi formo.<br><br>";
$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Eraro: La API ŝlosilo aspektas malĝusta (ne eblas ricevi la programa atingoĵetono).";
$a->strings["The given API Key seems to work correctly."] = "La API ŝlosilo ŝajne ĝuste funkcias.";
$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Ne povis kontroli la ĝustecon de la API ŝlosilo. Ia stranga afero okazas. ";
@@ -1012,6 +1017,9 @@ $a->strings["Facebook post failed. Queued for retry."] = "Malsukcesis afiŝi ĉe
$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Via Facbook konekto iĝis nevalida. Bonvolu reaŭtentiĝi.";
$a->strings["Facebook connection became invalid"] = "Facebook konekto iĝis nevalida.";
$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Saluton %1\$s,\n\nla kontekto inter viaj kontoj ĉe %2\$s kaj Facebook malvalidiĝis. Tio kutime okazas post kiam via ŝangas vian pasvorton ĉe Facebook. Por reaktivigi la konekto, vi bezonas %3\$sreaŭtentiĝi la Facebook konektilon%4\$s.";
+$a->strings["StatusNet AutoFollow settings updated."] = "Ĝidatigis StatusNet AutoFollow agordojn.";
+$a->strings["StatusNet AutoFollow Settings"] = "StatusNet AutoFollow agordoj";
+$a->strings["Automatically follow any StatusNet followers/mentioners"] = "Aŭtomate sekvu ĉiujn StatusNet sekvantojn/menciantojn.";
$a->strings["Lifetime of the cache (in hours)"] = "Vivodaŭro de kaŝmemoro (horoj)";
$a->strings["Cache Statistics"] = "Statistikoj pri kaŝmemoro";
$a->strings["Number of items"] = "Kvanto da eroj";
@@ -1051,6 +1059,12 @@ $a->strings["NSFW Settings saved."] = "NSFW agordoj konservitaj.";
$a->strings["%s - Click to open/close"] = "%s - Klaku por malfermi/fermi";
$a->strings["Forums"] = "Forumoj";
$a->strings["show more"] = "montri pli";
+$a->strings["Forums:"] = "Forumoj:";
+$a->strings["Page settings updated."] = "Paĝajn agordojn ĝisdatigita.";
+$a->strings["Page Settings"] = "Paĝaj Agordoj";
+$a->strings["How many forums to display on sidebar without paging"] = "Montri tiom da forumoj en la flanka strio sen paĝigo";
+$a->strings["Randomise Page/Forum list"] = "Hazardigi la liston de Paĝoj/Forumoj";
+$a->strings["Show pages/forums on profile page"] = "Montri paĝojn/forumojn sur la profilpaĝo";
$a->strings["Planets Settings"] = "Agordo pri Planets";
$a->strings["Enable Planets Plugin"] = "Ŝalti la Planets kromprogamon";
$a->strings["Login"] = "Ensaluti";
@@ -1060,6 +1074,54 @@ $a->strings["Most active users"] = "Plej aktivaj uzantoj";
$a->strings["Latest photos"] = "Ĵusaj bildoj";
$a->strings["Latest likes"] = "Ĵusaj ŝatitaĵoj";
$a->strings["event"] = "okazo";
+$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "Usona datformato (mm/dd/YYYY)";
+$a->strings["German Time Format (dd.mm.YYYY)"] = "Germana datformato (dd.mm.YYYY)";
+$a->strings["Error"] = "Eraro";
+$a->strings["No access"] = "No access";
+$a->strings["New event"] = "Nova okazo";
+$a->strings["Today"] = "Hodiaŭ";
+$a->strings["Day"] = "Tago";
+$a->strings["Week"] = "Semajno";
+$a->strings["Month"] = "Monato";
+$a->strings["Reload"] = "Reŝargi";
+$a->strings["Date"] = "Dato";
+$a->strings["Not found"] = "Ne trovita";
+$a->strings["Go back to the calendar"] = "Iri reen al la kalendaro";
+$a->strings["Starts"] = "Komencas";
+$a->strings["Ends"] = "Finas";
+$a->strings["Description"] = "Priskribo";
+$a->strings["Notification"] = "Atentigo";
+$a->strings["Minutes"] = "Minutoj";
+$a->strings["Hours"] = "Horoj";
+$a->strings["Days"] = "Tagoj";
+$a->strings["before"] = "antaŭ";
+$a->strings["Calendar Settings"] = "Kalendaraj Agordoj";
+$a->strings["Date format"] = "Datformato";
+$a->strings["Time zone"] = "Horzono";
+$a->strings["Limitations"] = "Limigoj";
+$a->strings["Warning"] = "Averto";
+$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sinkronigo (iPhone, Thunderbird Lightning, Android, ...)";
+$a->strings["Synchronizing this calendar with the iPhone"] = "Sinkronigi tiun kalendaron kun la iPhone";
+$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sinkronigi viajn Friendica kontaktojn kun la iPhone";
+$a->strings["Friendica-Contacts"] = "Friendica Kontaktoj";
+$a->strings["Your Friendica-Contacts"] = "Viaj Friendica Kontaktoj";
+$a->strings["Calendar"] = "Kalendaro";
+$a->strings["Extended calendar with CalDAV-support"] = "Etendita kalendaro kun CalDAV subteno";
+$a->strings["The database tables have been installed."] = "La tabeloj estas instalita en la datumbazo";
+$a->strings["An error occurred during the installation."] = "Eraro okazis dum instalado";
+$a->strings["No system-wide settings yet."] = "Ankoraŭ ne disponablas tutsistemaj agordoj";
+$a->strings["Database status"] = "Stato de datumbazo";
+$a->strings["Installed"] = "Instalita";
+$a->strings["Upgrade needed"] = "Ĝisdatigo bezonata";
+$a->strings["Upgrade"] = "Ĝisdatigo";
+$a->strings["Not installed"] = "Ne instalita";
+$a->strings["Install"] = "Instali";
+$a->strings["Troubleshooting"] = "Problemsolvado";
+$a->strings["Manual creation of the database tables:"] = "Mana kreado de tabeloj en la datumbazo:";
+$a->strings["Show SQL-statements"] = "Montru SQL ordonojn";
+$a->strings["Private Calendar"] = "Privata kalendaro";
+$a->strings["Friendica Events: Mine"] = "Friendica Okazoj: Miaj";
+$a->strings["Friendica Events: Contacts"] = "Friendica Okazoj: De Kontaktoj";
$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>"] = "Permesi vian identecon ĉe Friendica (%s) por konekti al eksteraj konservejoj subtenata de unhosted (ekz. OwnCloud). Vidu <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
$a->strings["Template URL (with {category})"] = "URL adreso de ŝablono (kun {category})";
$a->strings["OAuth end-point"] = "OAuth finpunkto";
@@ -1095,9 +1157,15 @@ $a->strings["Drupal site URL"] = "URL adreso de Drupal retejo";
$a->strings["Drupal site uses clean URLS"] = "Drupal retejo uzas purajn URL adresojn";
$a->strings["Post to Drupal by default"] = "Defaŭlte afiŝi ĉe Drupal";
$a->strings["Post from Friendica"] = "Afiŝo de Friendica";
+$a->strings["Startpage Settings"] = "Startpaĝaj Agordoj";
+$a->strings["Home page to load after login - leave blank for profile wall"] = "Hejmpaĝo ŝargonta post la ensaluto - Lasu malplena por profilmuro.";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Ekzemple: &quot;network&quot; aŭ &quot;notifications/system&quot;";
$a->strings["Geonames settings updated."] = "Ĝidatigis la Geonames agordojn.";
$a->strings["Geonames Settings"] = "Geonames Agordoj";
$a->strings["Enable Geonames Plugin"] = "Ŝalti la Geonames Kromprogramon";
+$a->strings["Your account on %s will expire in a few days."] = "Via konto ĉe %s senvalidiĝos post kelkaj tagoj.";
+$a->strings["Your Friendica account is about to expire."] = "Via konto ĉe Friendica baldaŭ senvalidiĝos.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Saluton %1\$s,\n\nVia konto ĉe %2\$s senvalidiĝos post malpli ol kvin tagoj. Vi povas konservi vian konton se vi ensalutas almenaŭ ĉiujn 30 tagojn. ";
$a->strings["Upload a file"] = "Alŝuti dosieron";
$a->strings["Drop files here to upload"] = "Ŝovmeti dosierojn ĉi tie por alŝuti ilin.";
$a->strings["Failed"] = "Malsukcesi";
@@ -1119,10 +1187,13 @@ $a->strings["Profile address of the operator."] = "La profilo de la funkciigisto
$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kiel poŝte kontakti la funkciigisto de la retejo. Vi eblas uzi BBCode ĉi tie.";
$a->strings["Notes"] = "Notoj";
$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Pli da notoj kiuj aperas sub la kontaktinformoj. Vi eblas uzi BBCode ĉi tie.";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Kiel kontakti la funkciigiston de la retejo tra retpoŝto. (montriĝos vuale) ";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Kiel kontakti la funkciigiston de la retejo per retpoŝto. (montriĝos vuale) ";
$a->strings["Footer note"] = "Paĝpiednoto";
$a->strings["Text for the footer. You can use BBCode here."] = "Teksto por la paĝpiedo. Vie eblas uzi BBCode ĉi tie.";
$a->strings["Report Bug"] = "Skribi cimraporton";
+$a->strings["No Timeline settings updated."] = "No Timeline agordojn ĝisdatigita.";
+$a->strings["No Timeline Settings"] = "No Timeline Agordoj";
+$a->strings["Disable Archive selector on profile wall"] = "Malaktivigi la Arkivo elektilo sur la profilmuro";
$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj";
$a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo";
$a->strings["BLOCKEM Settings saved."] = "Konservis Agordojn de BLOCKEM.";
@@ -1141,6 +1212,12 @@ $a->strings["Tile Server URL"] = "Adreso de Kahelservilo";
$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Listo de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">publikaj kahelserviloj</a>";
$a->strings["Default zoom"] = "Defaŭlta zoma faktoro";
$a->strings["The default zoom level. (1:world, 18:highest)"] = "La defaŭlta zoma faktoro. (1:tutmonda, 18:plej proksima)";
+$a->strings["Post to libertree"] = "Afiŝi al libertree";
+$a->strings["libertree Post Settings"] = "Agordoj por Afiŝoj ĉe libertree";
+$a->strings["Enable Libertree Post Plugin"] = "Aktivigi Kromprogramon por Afiŝoj ĉe libertree";
+$a->strings["Libertree API token"] = "Libertree API ĵetono";
+$a->strings["Libertree site URL"] = "URL adreso de libertree retejo:";
+$a->strings["Post to Libertree by default"] = "Defaŭlte afiŝi ĉe Libertree";
$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "La Mathjax kromprogramo bildigas matematikajn formulojn skribitajn en la LaTeX sintakso, cirkaŭigita de la komuna $$ aŭ eqnarray bloko en afiŝoj ĉe via muro, Reto folio kaj privataj mesaĝoj.";
$a->strings["Use the MathJax renderer"] = "Ĉu uzi la Mathjax bildigilo";
$a->strings["MathJax Base URL"] = "Mathjax Baza URL Adreso";
@@ -1158,7 +1235,6 @@ $a->strings["Select default avatar image if none was found at Gravatar. See READ
$a->strings["Rating of images"] = "Pritakso de bildoj";
$a->strings["Select the appropriate avatar rating for your site. See README"] = "Elektu la ĝustan pritakson de via avataro por via retejo. Vidu README.";
$a->strings["Gravatar settings updated."] = "Gravatar agordoj ĝisdatigitaj.";
-$a->strings["Your account on %s will expire in a few days."] = "Via konto ĉe %s senvalidiĝos post kelkaj tagoj.";
$a->strings["Your Friendica test account is about to expire."] = "Via Friendica provkonto baldaŭ malaktiviĝos.";
$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Saluton %1\$s,\n\nVia testkonto ĉe %2\$s senvalidiĝos post malpli ol kvin tagoj. Vi esperas ke vi ĝuis la teston kaj baldaŭ trovosĝustan Friendica retejon por via integrita sociala komunikado. Listo de publikaj retejoj troviĝas ĉe http://dir.friendica.com/siteinfo - kaj por pli da informoj pri kiel instali vian propran Friendica servilon, bonvolu viziti la retejon de la Friendica projekton ĉe http://friendica.com.";
$a->strings["\"pageheader\" Settings"] = "\"pageheader\" Agordoj";
@@ -1193,9 +1269,10 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Averto</strong>: Laŭ viaj privatecaj agordoj (<em>Kaŝi viajn profilajn detalojn al nekonataj spektantoj?</em>), la ligilo en publikaj afiŝoj plusendata al StatusNet gvidas vizitontojn al malplena paĝo sciigante ilin ke atingo al via profilo estas lmitigita.";
$a->strings["Allow posting to StatusNet"] = "Permesi afiŝojn al StatusNet";
$a->strings["Send public postings to StatusNet by default"] = "Defaŭlte sendi publikajn afiŝojn al StatusNet";
-$a->strings["Send #tag links to StatusNet"] = "Sendu #marko ligilojn al StatusNet";
+$a->strings["Send linked #-tags and @-names to StatusNet"] = "Sendi ligitajn #-etikedojn kaj @-nomon al StatusNet";
$a->strings["Clear OAuth configuration"] = "Forviŝi OAuth agordojn";
$a->strings["API URL"] = "API URL adreso";
+$a->strings["Infinite Improbability Drive"] = "Senfina Probableca Pelilo";
$a->strings["Post to Tumblr"] = "Afiŝi al Tumblr";
$a->strings["Tumblr Post Settings"] = "Agordoj pri afiŝoj ĉe Tumblr";
$a->strings["Enable Tumblr Post Plugin"] = "Ŝalti la kromprogramon por Tumblr afiŝoj";
@@ -1217,6 +1294,8 @@ $a->strings["WordPress username"] = "WordPress salutnomo";
$a->strings["WordPress password"] = "WordPress pasvorto";
$a->strings["WordPress API URL"] = "Wordpress API URL adreso";
$a->strings["Post to WordPress by default"] = "Defaŭlte afiŝi al WordPress";
+$a->strings["Provide a backlink to the Friendica post"] = "Provizi re-ligilon al la Friendica afiŝo";
+$a->strings["Read the original post and comment stream on Friendica"] = "Legi la originalan afiŝon kaj komentfluo ĉe Friendica";
$a->strings["\"Show more\" Settings"] = "\"Montri pli\" agordoj";
$a->strings["Enable Show More"] = "Ŝalti \"montri pli\"";
$a->strings["Cutting posts after how much characters"] = "Limitigi afiŝojn al kiom da literoj";
@@ -1239,7 +1318,7 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Averto</strong>: Laŭ viaj privatecaj agordoj (<em>Kaŝi viajn profilajn detalojn al nekonataj spektantoj?</em>), la ligilo en publikaj afiŝoj plusendata al Twitter gvidas vizitontojn al malplena paĝo sciigante ilin ke atingo al via profilo estas lmitigita.";
$a->strings["Allow posting to Twitter"] = "Permesi afiŝojn al Twitter";
$a->strings["Send public postings to Twitter by default"] = "Defaŭlte sendi publikajn afiŝojn al Twitter";
-$a->strings["Send #tag links to Twitter"] = "Sendu #marko ligilon al Twitter";
+$a->strings["Send linked #-tags and @-names to Twitter"] = "Sendi ligitajn #-etikedojn kaj @-nomon al Twitter";
$a->strings["Consumer key"] = "Ŝlosilo de Kliento";
$a->strings["Consumer secret"] = "Sekreto de Kliento";
$a->strings["IRC Settings"] = "IRC Agordoj";
@@ -1285,19 +1364,21 @@ $a->strings["Local Directory"] = "Loka Katalogo";
$a->strings["Similar Interests"] = "Similaj Interesoj";
$a->strings["Invite Friends"] = "Inviti amikojn";
$a->strings["Earth Layers"] = "Tertavoloj (Earth Layers)";
-$a->strings["Set zoomfactor for Earth Layer"] = "Agordi zoman faktoron de Tertavolo";
-$a->strings["Set longitude (X) for Earth Layer"] = "Agordi longitudon (X) de Tertavolo";
-$a->strings["Set latitude (Y) for Earth Layer"] = "Agordi latitudon (Y) de Tertavolo";
+$a->strings["Set zoomfactor for Earth Layers"] = "Agordi zoman faktoron por Tertavoloj";
+$a->strings["Set longitude (X) for Earth Layers"] = "Agordi longitudon (X) por Tertavoloj";
+$a->strings["Set latitude (Y) for Earth Layers"] = "Agordi latitudon (Y) por Tertavoloj";
$a->strings["Help or @NewHere ?"] = "Helpu aŭ @NewHere ?";
$a->strings["Connect Services"] = "Konekti Servojn";
$a->strings["Last Tweets"] = "Ĵusaj Pepaĵoj";
$a->strings["Set twitter search term"] = "Agordi Twitter serĉtekston";
$a->strings["don't show"] = "kaŝi";
$a->strings["show"] = "montri";
-$a->strings["Show/hide boxes at right-hand coloumn:"] = "Montri/kaŝi kestojn en la desktra kolumno:";
+$a->strings["Show/hide boxes at right-hand column:"] = "Kaŝi/montri kestojn ĉe dekstra kolumno:";
$a->strings["Set line-height for posts and comments"] = "Agordi la linigrandon por afiŝoj kaj komentoj";
$a->strings["Set resolution for middle column"] = "Agordi la distingivon por la meza kolumno";
$a->strings["Set color scheme"] = "Agordi Kolorskemon";
+$a->strings["Set zoomfactor for Earth Layer"] = "Agordi zoman faktoron de Tertavolo";
+$a->strings["Last tweets"] = "Ĵusaj pepaĵoj";
$a->strings["Alignment"] = "Ĝisrandigo";
$a->strings["Left"] = "Maldekstren";
$a->strings["Center"] = "Centren";
@@ -1308,6 +1389,7 @@ $a->strings["j F"] = "j F";
$a->strings["Birthday:"] = "Naskiĝtago:";
$a->strings["Age:"] = "Aĝo:";
$a->strings["Status:"] = "Stato:";
+$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
$a->strings["Homepage:"] = "Hejmpaĝo:";
$a->strings["Tags:"] = "Markoj:";
$a->strings["Religion:"] = "Religio:";
@@ -1401,6 +1483,7 @@ $a->strings["Starts:"] = "Ekas:";
$a->strings["Finishes:"] = "Finas:";
$a->strings["(no subject)"] = "(neniu temo)";
$a->strings["noreply"] = "nerespondi";
+$a->strings[" on Last.fm"] = " ĉe Last.fm";
$a->strings["prev"] = "antaŭa";
$a->strings["first"] = "unua";
$a->strings["last"] = "lasta";
@@ -1410,7 +1493,6 @@ $a->strings["%d Contact"] = array(
0 => "%d Kontakto",
1 => "%d Kontaktoj",
);
-$a->strings["Search"] = "Serĉi";
$a->strings["Monday"] = "Lundo";
$a->strings["Tuesday"] = "Mardo";
$a->strings["Wednesday"] = "Merkredo";
@@ -1444,11 +1526,11 @@ $a->strings["post"] = "afiŝo";
$a->strings["Item filed"] = "Enarkivigis elementon ";
$a->strings["Sharing notification from Diaspora network"] = "Antentigo pri kunhavigado de la Diaspora reto";
$a->strings["Attachments:"] = "Kunsendaĵoj:";
-$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Plusendita] %s en la reto %s skribis komenton";
$a->strings["view full size"] = "vidi plengrande";
$a->strings["Embedded content"] = "Enigita enhavo";
$a->strings["Embedding disabled"] = "Malŝaltita enigitado";
$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."] = "Revivigis malnovan grupon kun la sama nomo. Permesoj por estantaj elementoj <strong>eble</strong> estas validaj por la grupo kaj estontaj membroj. Se tiu ne estas kiun vi atendis, bonvolu krei alian grupon kun alia nomo.";
+$a->strings["Default privacy group for new contacts"] = "Defaŭlta privateca grupo por novaj kontaktoj";
$a->strings["Everybody"] = "Ĉiuj";
$a->strings["edit"] = "redakti";
$a->strings["Groups"] = "Grupoj";
@@ -1480,7 +1562,6 @@ $a->strings["Manage other pages"] = "Administri aliajn paĝojn";
$a->strings["Profiles"] = "Profiloj";
$a->strings["Manage/edit profiles"] = "Administri/redakti profilojn";
$a->strings["Manage/edit friends and contacts"] = "Administri/redakti amikojn kaj kontaktojn";
-$a->strings["Admin"] = "Administrado";
$a->strings["Site setup and configuration"] = "Agordoj pri la retejo";
$a->strings["Nothing new here"] = "Estas neniu nova ĉi tie";
$a->strings["Add New Contact"] = "Aldonu Novan Kontakton";
@@ -1521,6 +1602,8 @@ $a->strings["minutes"] = "minutoj";
$a->strings["second"] = "sekundo";
$a->strings["seconds"] = "sekundoj";
$a->strings["%1\$d %2\$s ago"] = "antaŭ %1\$d %2\$s";
+$a->strings["%s's birthday"] = "Naskiĝtago de %s";
+$a->strings["Happy Birthday %s"] = "Feliĉan Naskiĝtagon al %s";
$a->strings["From: "] = "De: ";
$a->strings["$1 wrote:"] = "$1 skribis:";
$a->strings["Image/photo"] = "Bildo";
@@ -1532,45 +1615,67 @@ $a->strings["Thank You,"] = "Dankon,";
$a->strings["%s Administrator"] = "%s Administranto";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Atentigo] Ricevis novan retpoŝton ĉe %s";
-$a->strings["%s sent you a new private message at %s."] = "%s sendis novan mesaĝon al vi ĉe %s.";
-$a->strings["%s sent you %s."] = "%s sendis al vi %s.";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s sendis al vi novan privatan mesaĝon ĉe %2\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s sendis al vi %2\$s.";
$a->strings["a private message"] = "privatan mesaĝon";
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bonvolu viziti %s por vidi aŭ respondi viajn privatajn mesaĝojn.";
-$a->strings["%s's"] = "de %s verkita";
-$a->strings["your"] = "via";
-$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica:Atentigo] Komento pri konversacio #%d de %s";
+$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s komentis pri [url=%2\$s]%3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s komentis pri [url=%2\$s]%4\$s de %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s komentis pri [url=%2\$s]via %3\$s[/url]";
+$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Atentigo] Komento pri konversacio #%1\$d de %2\$s";
$a->strings["%s commented on an item/conversation you have been following."] = "%s komentis pri elemento/konversacio kiun vi sekvas.";
-$a->strings["%s commented on %s."] = "%s komentis pri %s.";
$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bonvolu viziti %s por vidi aŭ respondi la konversacion.";
$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Atentigo] %s afiŝis al via profilmuro";
-$a->strings["%s posted to your profile wall at %s"] = "%s skribis al via profila muro ĉe %s";
-$a->strings["%s posted to %s"] = "%s afiŝis al %s";
-$a->strings["your profile wall."] = "via profilmuro.";
+$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s skribis al via profilmuro ĉe %2\$s";
+$a->strings["%1\$s posted to [url=%2s]your wall[/url]"] = "%1\$s afiŝis al [url=%2s]via muro[/url]";
$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Atentigo] %s markis vin";
-$a->strings["%s tagged you at %s"] = "%s markis vin kiel %s";
-$a->strings["%s %s."] = "%s %s.";
-$a->strings["tagged you"] = "markis vin";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s markis vin ĉe %2\$s";
+$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]markis vin[/url].";
$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Atentigo] %s markis vian afiŝon";
-$a->strings["%s tagged your post at %s"] = "%s markis vian afiŝon kiel %s";
-$a->strings["%s tagged %s"] = "%s markis %s";
-$a->strings["your post"] = "vian afiŝon";
+$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s markis vian afiŝon ĉe %2\$s";
+$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s markis [url=%2\$s]vian afiŝon[/url]";
$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Atentigo] Ricevis prezenton";
-$a->strings["You've received an introduction from '%s' at %s"] = "Vi ricevis prezento de '%s' ĉe %s";
-$a->strings["You've received %s from %s."] = "Vi ricevis %s de %s.";
-$a->strings["an introduction"] = "prezenton";
+$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Vi ricevis prezenton de '%1\$s' ĉe %2\$s";
+$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Vi ricevis [url=%1\$s]prezenton[/url] de %2\$s.";
$a->strings["You may visit their profile at %s"] = "Vi povas vidi la profilon de li aŭ ŝi ĉe %s";
$a->strings["Please visit %s to approve or reject the introduction."] = "Bonvolu viziti %s por aprobi aŭ malaprobi la prezenton.";
$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Atentigo] Ricevis amikosugeston";
-$a->strings["You've received a friend suggestion from '%s' at %s"] = "'%s' ĉe %s rekomendis amikon al vi";
-$a->strings["You've received %s for %s from %s."] = "Vi ricevis %s kun %s de %s.";
-$a->strings["a friend suggestion"] = "sugeston por amikiĝi";
+$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Vi ricevis amikosugeston de '%1\$s' ĉe %2\$s";
+$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Vi ricevis [url=%1\$s]amikosugeston[/url] pri %2\$s de %3\$s.";
$a->strings["Name:"] = "Nomo:";
$a->strings["Photo:"] = "Bildo:";
$a->strings["Please visit %s to approve or reject the suggestion."] = "Bonvolu viziti %s por aprobi aŭ malaprobi la sugeston.";
+$a->strings["Connect URL missing."] = "Ne ekzistas URL adreso por konekti.";
+$a->strings["This site is not configured to allow communications with other networks."] = "Tiu retpaĝo ne permesas komunikadon kun aliaj retoj.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Ne malkovris kongruajn protokolojn por komunikado aŭ fluojn.";
+$a->strings["The profile address specified does not provide adequate information."] = "La specifita profiladreso ne enhavas sufiĉe da informoj.";
+$a->strings["An author or name was not found."] = "Ne trovis aŭtoron aŭ nomon.";
+$a->strings["No browser URL could be matched to this address."] = "Neniu retuma URL adreso kongruas al la adreso.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Ne eblas kongrui @-stilan identecon adreson al iu konata protokolo au retpoŝtadreso.";
+$a->strings["Use mailto: in front of address to force email check."] = "Uzu mailto: antaŭ la adreso por devigi la testadon per retpoŝto.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Tiu profila adreso apartenas al retejo kiu estas maŝaltita je ĉi tiu retejo.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profilo limigata. Ĉi persono ne eblos ricevi rektajn/personajn atentigojn de vi. ";
+$a->strings["Unable to retrieve contact information."] = "Ne eblas ricevi kontaktinformojn.";
+$a->strings["following"] = "sekvanta";
$a->strings["A new person is sharing with you at "] = "Nova persono kunhavigas kun vi ĉe ";
$a->strings["You have a new follower at "] = "Vi havas novan sekvanton ĉe ";
-$a->strings["image/photo"] = "bildo";
-$a->strings["link"] = "ligilo";
+$a->strings["Archives"] = "Arkivoj";
+$a->strings["An invitation is required."] = "Invio bezonata.";
+$a->strings["Invitation could not be verified."] = "Ne povis kontroli la inviton.";
+$a->strings["Invalid OpenID url"] = "Nevalida OpenID adreso";
+$a->strings["Please enter the required information."] = "Bonvolu entajpi la bezonatajn informojn.";
+$a->strings["Please use a shorter name."] = "Bonvolu uzi pli mallongan nomon.";
+$a->strings["Name too short."] = "Nomo estas tro mallonga.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Tio ŝajne ne estas via plena (persona, familia) nomo.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Via retpoŝtodomajno ne estas permesita ĉi tie.";
+$a->strings["Not a valid email address."] = "Nevalida retpoŝtadreso.";
+$a->strings["Cannot use that email."] = "Neuzebla retpoŝtadreso.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Via kaŝnomo nur povas enhavi \"a-z\", \"0-9\", \"-\", kaj \"_\". Ĝi ankaŭ devas komenci kun litero.";
+$a->strings["Nickname is already registered. Please choose another."] = "Tio kaŝnomo jam estas registrita. Bonvolu elekti alian.";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Tiu kaŝnomo iam estis registrita ĉi tie kaj ne ree uzeblas. Bonvolu elekti alian.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "GRAVA ERARO: La generacio de sekurecaj ĉifroŝlosiloj malsukcesis.";
+$a->strings["An error occurred during registration. Please try again."] = "Eraro okazis dum registrado. Bonvolu provi denove.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Eraro okazi dum kreado de via defaŭlta profilo. Bonvolu provi denove.";
$a->strings["Welcome "] = "Bonvenon ";
$a->strings["Please upload a profile photo."] = "Bonvolu alŝuti profilbildon.";
$a->strings["Welcome back "] = "Bonvenon ";
@@ -1612,7 +1717,7 @@ $a->strings["add tag"] = "aldoni markon";
$a->strings["save to folder"] = "konservi en dosierujo";
$a->strings["to"] = "al";
$a->strings["Wall-to-Wall"] = "Muro-al-Muro";
-$a->strings["via Wall-To-Wall:"] = "tra Muro-al-Muro:";
+$a->strings["via Wall-To-Wall:"] = "per Muro-al-Muro:";
$a->strings["Delete Selected Items"] = "Forviŝi Elektitajn Elementojn";
$a->strings["%s likes this."] = "%s ŝatas tiun.";
$a->strings["%s doesn't like this."] = "%s malŝatas tiun.";
@@ -1637,6 +1742,9 @@ $a->strings["audio link"] = "sono ligilo";
$a->strings["set location"] = "agordi lokon";
$a->strings["clear location"] = "forviŝi lokon";
$a->strings["permissions"] = "permesoj";
+$a->strings["Click here to upgrade."] = "Klaku ĉi tie por ĝisdatigi.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Tia ago preterpasas la limojn de via abono.";
+$a->strings["This action is not available under your subscription plan."] = "Tia ago ne estas permesita laŭ via abono.";
$a->strings["Delete this item?"] = "Forviŝi ĉi tiun elementon?";
$a->strings["show fewer"] = "montri malpli";
$a->strings["Update %s failed. See error logs."] = "Malsukcesis ĝisdatigi %s. Vidu la protokolojn.";
diff --git a/view/event_form.tpl b/view/event_form.tpl
index 7d5f8cf4a..536c52b0f 100644
--- a/view/event_form.tpl
+++ b/view/event_form.tpl
@@ -26,6 +26,10 @@ $f_dsel $f_tsel
<div id="event-adjust-break"></div>
+<div id="event-summary-text">$t_text</div>
+<input type="text" id="event-summary" name="summary" value="$t_orig" />
+
+
<div id="event-desc-text">$d_text</div>
<textarea id="event-desc-textarea" name="desc">$d_orig</textarea>
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
index 318a92427..706b3398d 100644
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
@@ -1,4 +1,7 @@
<h3>$pagename</h3>
+
+<div id="photos-usage-message">$usage</div>
+
<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
<div id="photos-upload-new-wrapper" >
<div id="photos-upload-newalbum-div">
diff --git a/view/profile_advanced.tpl b/view/profile_advanced.tpl
index 0b8f31f43..b02b7f27d 100644
--- a/view/profile_advanced.tpl
+++ b/view/profile_advanced.tpl
@@ -89,6 +89,19 @@
</dl>
{{ endif }}
+{{ if $profile.likes }}
+<dl id="aprofile-likes" class="aprofile">
+ <dt>$profile.likes.0</dt>
+ <dd>$profile.likes.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.dislikes }}
+<dl id="aprofile-dislikes" class="aprofile">
+ <dt>$profile.dislikes.0</dt>
+ <dd>$profile.dislikes.1</dd>
+</dl>
+{{ endif }}
{{ if $profile.contact }}
<dl id="aprofile-contact" class="aprofile">
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index ad34b9956..64cd47324 100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -187,6 +187,30 @@ $lbl_hobbies
</div>
+<div id="likes-jot-wrapper" >
+<p id="likes-jot-desc" >
+$lbl_likes
+</p>
+
+<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >$likes</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+</div>
+
+
+<div id="dislikes-jot-wrapper" >
+<p id="dislikes-jot-desc" >
+$lbl_dislikes
+</p>
+
+<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >$dislikes</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+</div>
+
+
<div id="contact-jot-wrapper" >
<p id="contact-jot-desc" >
$lbl_social
diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css
index 9c15329da..5d1bb6310 100644
--- a/view/theme/darkzero-NS/style.css
+++ b/view/theme/darkzero-NS/style.css
@@ -113,7 +113,7 @@ input#acl-search {
.notify-seen {
- background:#666;
+ background:#111;
}
#nav-notifications-menu {
@@ -157,4 +157,27 @@ blockquote {
#datebrowse-sidebar select {
color:#99CCFF !important;
-} \ No newline at end of file
+}
+
+.settings-widget .selected {
+background: #666;
+}
+
+#adminpage table tr:hover {
+ color: #eec;
+ background-color: #666;
+}
+
+input#prvmail-subject {
+background: #222 !important;
+}
+
+/* Events */
+
+.fc-state-highlight {
+background: #666 !important;
+}
+
+.fc-state-disabled, .fc-state-disabled .fc-button-inner {
+color: #000 !important;
+}
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index 8a6099ee8..55644e462 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -111,9 +111,8 @@ input#acl-search {
}
-
.notify-seen {
- background:#666;
+ background:#111;
}
#nav-notifications-menu {
@@ -138,7 +137,7 @@ blockquote {
color:#eec !important;
}
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected{
background:#2e2f2e;
}
@@ -146,11 +145,33 @@ blockquote {
background:#444;
}
-/* This seems okay to me...we might not need a new iconset, lets see how people react */
.editicon {
background-color: #333;
}
#datebrowse-sidebar select {
color:#99CCFF !important;
-} \ No newline at end of file
+}
+
+.settings-widget .selected {
+background: #666;
+}
+
+#adminpage table tr:hover {
+ color: #eec;
+ background-color: #666;
+}
+
+input#prvmail-subject {
+background: #222 !important;
+}
+
+/* Events */
+
+.fc-state-highlight {
+background: #666 !important;
+}
+
+.fc-state-disabled, .fc-state-disabled .fc-button-inner {
+color: #000 !important;
+}
diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css
index 43c0974b1..98c645024 100644
--- a/view/theme/diabook/diabook-aerith/style-wide.css
+++ b/view/theme/diabook/diabook-aerith/style-wide.css
@@ -2822,6 +2822,35 @@ float: left;
/* = Directory = */
/* ============= */
/* contacts menu */
+section .directory-item dl {
+height: auto;
+overflow: auto;
+}
+
+section .directory-item dt {
+float: left;
+margin-left: 0px;
+text-align: right;
+color: #999;
+}
+
+section .directory-item dd {
+float: left;
+margin-left: 5px;
+}
+
+.directory-profile-wrapper {
+float: left;
+max-height: 178px;
+overflow: hidden;
+width: 635px;
+}
+
+.directory-copy-wrapper {
+float:left;
+overflow: hidden;
+}
+
.contact-photo-wrapper {
position: relative;
}
@@ -2862,13 +2891,20 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+float: left;
+height: 200px;
+width: 165px;
+}
+
.directory-item .contact-photo img {
width: 175px;
height: 175px;
diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css
index b512c8bfe..630b331e9 100644
--- a/view/theme/diabook/diabook-aerith/style.css
+++ b/view/theme/diabook/diabook-aerith/style.css
@@ -2808,6 +2808,30 @@ float: left;
/* ============= */
/* = Directory = */
/* ============= */
+section .directory-item dl {
+ height: auto;
+ overflow: auto;
+}
+section .directory-item dt {
+ float: left;
+ margin-left: 0px;
+ text-align: right;
+ color: #999;
+}
+section .directory-item dd {
+ float: left;
+ margin-left: 5px;
+}
+.directory-profile-wrapper {
+ float: left;
+ max-height: 178px;
+ overflow: hidden;
+ width: 635px;
+}
+.directory-copy-wrapper {
+ float: left;
+ overflow: hidden;
+}
/* contacts menu */
.contact-photo-wrapper {
position: relative;
@@ -2849,7 +2873,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2860,17 +2884,42 @@ float: left;
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+ float: left;
+ height: 200px;
+ width: 165px;
+}
.contact-name {
- text-align: left;
font-weight: bold;
- font-size: 12px;
+ font-size: 18px;
+ margin-bottom: -3px;
+ text-align: left;
}
.contact-details {
color: #999999;
}
+.page-type {
+ font-size: 10px;
+ font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+ float: left;
+ width: 305px;
+ margin-right: 10px;
+}
+.directory-profile-wrapper dl {
+ margin-top: 3px;
+ margin-bottom: 3px;
+}
+.directory-profile-title {
+ font-weight: bold;
+ margin-bottom: 3px;
+ font-size: 14px;
+}
#side-bar-photos-albums{
margin-top: 15px;
- }
+}
.photo-top-photo, .photo-album-photo {
-webkit-border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css
index 103047f32..fe1e8f662 100644
--- a/view/theme/diabook/diabook-blue/style-wide.css
+++ b/view/theme/diabook/diabook-blue/style-wide.css
@@ -2778,6 +2778,35 @@ float: left;
/* = Directory = */
/* ============= */
/* contacts menu */
+section .directory-item dl {
+height: auto;
+overflow: auto;
+}
+
+section .directory-item dt {
+float: left;
+margin-left: 0px;
+text-align: right;
+color: #999;
+}
+
+section .directory-item dd {
+float: left;
+margin-left: 5px;
+}
+
+.directory-profile-wrapper {
+float: left;
+max-height: 178px;
+overflow: hidden;
+width: 635px;
+}
+
+.directory-copy-wrapper {
+float:left;
+overflow: hidden;
+}
+
.contact-photo-wrapper {
position: relative;
}
@@ -2818,7 +2847,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2829,14 +2858,47 @@ float: left;
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+float: left;
+height: 200px;
+width: 165px;
+}
+
.contact-name {
text-align: left;
font-weight: bold;
- font-size: 12px;
+ font-size: 18px;
+ margin-bottom: -3px;
}
.contact-details {
color: #999999;
}
+
+
+.page-type {
+font-size: 10px;
+font-style: italic;
+}
+
+.directory-detailscolumn-wrapper {
+float: left;
+width: 305px;
+margin-right: 10px;
+}
+
+.directory-profile-wrapper d1 {
+margin-top: 3px;
+margin-bottom: 3px;
+}
+
+.directory-profile-title {
+font-weight: bold;
+margin-bottom: 3px
+font-size: 14px;
+}
+
+
#side-bar-photos-albums{
margin-top: 15px;
}
diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css
index e7f3fd0bc..952f90775 100644
--- a/view/theme/diabook/diabook-blue/style.css
+++ b/view/theme/diabook/diabook-blue/style.css
@@ -2766,6 +2766,30 @@ float: left;
/* ============= */
/* = Directory = */
/* ============= */
+section .directory-item dl {
+ height: auto;
+ overflow: auto;
+}
+section .directory-item dt {
+ float: left;
+ margin-left: 0px;
+ text-align: right;
+ color: #999;
+}
+section .directory-item dd {
+ float: left;
+ margin-left: 5px;
+}
+.directory-profile-wrapper {
+ float: left;
+ max-height: 178px;
+ overflow: hidden;
+ width: 635px;
+}
+.directory-copy-wrapper {
+ float: left;
+ overflow: hidden;
+}
/* contacts menu */
.contact-photo-wrapper {
position: relative;
@@ -2807,7 +2831,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2818,17 +2842,42 @@ float: left;
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+ float: left;
+ height: 200px;
+ width: 165px;
+}
.contact-name {
- text-align: left;
font-weight: bold;
- font-size: 12px;
+ font-size: 18px;
+ margin-bottom: -3px;
+ text-align: left;
}
.contact-details {
color: #999999;
}
+.page-type {
+ font-size: 10px;
+ font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+ float: left;
+ width: 305px;
+ margin-right: 10px;
+}
+.directory-profile-wrapper dl {
+ margin-top: 3px;
+ margin-bottom: 3px;
+}
+.directory-profile-title {
+ font-weight: bold;
+ margin-bottom: 3px;
+ font-size: 14px;
+}
#side-bar-photos-albums{
margin-top: 15px;
- }
+}
.photo-top-photo, .photo-album-photo {
-webkit-border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
index 189bd30bf..5ef9398ec 100644
--- a/view/theme/diabook/diabook-dark/style.css
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -2780,6 +2780,30 @@ float: left;
/* ============= */
/* = Directory = */
/* ============= */
+section .directory-item dl {
+ height: auto;
+ overflow: auto;
+}
+section .directory-item dt {
+ float: left;
+ margin-left: 0px;
+ text-align: right;
+ color: #999;
+}
+section .directory-item dd {
+ float: left;
+ margin-left: 5px;
+}
+.directory-profile-wrapper {
+ float: left;
+ max-height: 178px;
+ overflow: hidden;
+ width: 635px;
+}
+.directory-copy-wrapper {
+ float: left;
+ overflow: hidden;
+}
/* contacts menu */
.contact-photo-wrapper {
position: relative;
@@ -2821,7 +2845,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2832,17 +2856,42 @@ float: left;
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+ float: left;
+ height: 200px;
+ width: 165px;
+}
.contact-name {
- text-align: left;
font-weight: bold;
- font-size: 12px;
+ font-size: 18px;
+ margin-bottom: -3px;
+ text-align: left;
}
.contact-details {
color: #999999;
}
+.page-type {
+ font-size: 10px;
+ font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+ float: left;
+ width: 305px;
+ margin-right: 10px;
+}
+.directory-profile-wrapper dl {
+ margin-top: 3px;
+ margin-bottom: 3px;
+}
+.directory-profile-title {
+ font-weight: bold;
+ margin-bottom: 3px;
+ font-size: 14px;
+}
#side-bar-photos-albums{
margin-top: 15px;
- }
+}
.photo-top-photo, .photo-album-photo {
-webkit-border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css
index 0a9c5e35c..107bec8bb 100644
--- a/view/theme/diabook/diabook-green/style-wide.css
+++ b/view/theme/diabook/diabook-green/style-wide.css
@@ -2799,6 +2799,35 @@ float: left;
/* = Directory = */
/* ============= */
/* contacts menu */
+section .directory-item dl {
+height: auto;
+overflow: auto;
+}
+
+section .directory-item dt {
+float: left;
+margin-left: 0px;
+text-align: right;
+color: #999;
+}
+
+section .directory-item dd {
+float: left;
+margin-left: 5px;
+}
+
+.directory-profile-wrapper {
+float: left;
+max-height: 178px;
+overflow: hidden;
+width: 635px;
+}
+
+.directory-copy-wrapper {
+float:left;
+overflow: hidden;
+}
+
.contact-photo-wrapper {
position: relative;
}
@@ -2839,13 +2868,20 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+float: left;
+height: 200px;
+width: 165px;
+}
+
.directory-item .contact-photo img {
width: 175px;
height: 175px;
diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css
index 762310e4d..e1993764e 100644
--- a/view/theme/diabook/diabook-green/style.css
+++ b/view/theme/diabook/diabook-green/style.css
@@ -2795,6 +2795,30 @@ float: left;
/* ============= */
/* = Directory = */
/* ============= */
+section .directory-item dl {
+ height: auto;
+ overflow: auto;
+}
+section .directory-item dt {
+ float: left;
+ margin-left: 0px;
+ text-align: right;
+ color: #999;
+}
+section .directory-item dd {
+ float: left;
+ margin-left: 5px;
+}
+.directory-profile-wrapper {
+ float: left;
+ max-height: 178px;
+ overflow: hidden;
+ width: 635px;
+}
+.directory-copy-wrapper {
+ float: left;
+ overflow: hidden;
+}
/* contacts menu */
.contact-photo-wrapper {
position: relative;
@@ -2836,7 +2860,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2847,17 +2871,42 @@ float: left;
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+ float: left;
+ height: 200px;
+ width: 165px;
+}
.contact-name {
- text-align: left;
font-weight: bold;
- font-size: 12px;
+ font-size: 18px;
+ margin-bottom: -3px;
+ text-align: left;
}
.contact-details {
color: #999999;
}
+.page-type {
+ font-size: 10px;
+ font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+ float: left;
+ width: 305px;
+ margin-right: 10px;
+}
+.directory-profile-wrapper dl {
+ margin-top: 3px;
+ margin-bottom: 3px;
+}
+.directory-profile-title {
+ font-weight: bold;
+ margin-bottom: 3px;
+ font-size: 14px;
+}
#side-bar-photos-albums{
margin-top: 15px;
- }
+}
.photo-top-photo, .photo-album-photo {
-webkit-border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css
index e85c58850..df25c4d17 100644
--- a/view/theme/diabook/diabook-pink/style-wide.css
+++ b/view/theme/diabook/diabook-pink/style-wide.css
@@ -2799,6 +2799,36 @@ float: left;
/* = Directory = */
/* ============= */
/* contacts menu */
+
+section .directory-item dl {
+height: auto;
+overflow: auto;
+}
+
+section .directory-item dt {
+float: left;
+margin-left: 0px;
+text-align: right;
+color: #999;
+}
+
+section .directory-item dd {
+float: left;
+margin-left: 5px;
+}
+
+.directory-profile-wrapper {
+float: left;
+max-height: 178px;
+overflow: hidden;
+width: 635px;
+}
+
+.directory-copy-wrapper {
+float:left;
+overflow: hidden;
+}
+
.contact-photo-wrapper {
position: relative;
}
@@ -2839,7 +2869,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2850,14 +2880,46 @@ float: left;
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+float: left;
+height: 200px;
+width: 165px;
+}
+
.contact-name {
text-align: left;
font-weight: bold;
- font-size: 12px;
+ font-size: 18px;
+ margin-bottom: -3px;
}
.contact-details {
color: #999999;
}
+
+.page-type {
+font-size: 10px;
+font-style: italic;
+}
+
+.directory-detailscolumn-wrapper {
+float: left;
+width: 305px;
+margin-right: 10px;
+}
+
+.directory-profile-wrapper d1 {
+margin-top: 3px;
+margin-bottom: 3px;
+}
+
+.directory-profile-title {
+font-weight: bold;
+margin-bottom: 3px
+font-size: 14px;
+}
+
+
#side-bar-photos-albums{
margin-top: 15px;
}
diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css
index 248e3ead0..e9bcd53d0 100644
--- a/view/theme/diabook/diabook-pink/style.css
+++ b/view/theme/diabook/diabook-pink/style.css
@@ -2795,6 +2795,30 @@ float: left;
/* ============= */
/* = Directory = */
/* ============= */
+section .directory-item dl {
+ height: auto;
+ overflow: auto;
+}
+section .directory-item dt {
+ float: left;
+ margin-left: 0px;
+ text-align: right;
+ color: #999;
+}
+section .directory-item dd {
+ float: left;
+ margin-left: 5px;
+}
+.directory-profile-wrapper {
+ float: left;
+ max-height: 178px;
+ overflow: hidden;
+ width: 635px;
+}
+.directory-copy-wrapper {
+ float: left;
+ overflow: hidden;
+}
/* contacts menu */
.contact-photo-wrapper {
position: relative;
@@ -2836,7 +2860,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2847,17 +2871,42 @@ float: left;
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+ float: left;
+ height: 200px;
+ width: 165px;
+}
.contact-name {
- text-align: left;
font-weight: bold;
- font-size: 12px;
+ font-size: 18px;
+ margin-bottom: -3px;
+ text-align: left;
}
.contact-details {
color: #999999;
}
+.page-type {
+ font-size: 10px;
+ font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+ float: left;
+ width: 305px;
+ margin-right: 10px;
+}
+.directory-profile-wrapper dl {
+ margin-top: 3px;
+ margin-bottom: 3px;
+}
+.directory-profile-title {
+ font-weight: bold;
+ margin-bottom: 3px;
+ font-size: 14px;
+}
#side-bar-photos-albums{
margin-top: 15px;
- }
+}
.photo-top-photo, .photo-album-photo {
-webkit-border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css
index b068a2f5d..b05156dc6 100644
--- a/view/theme/diabook/diabook-red/style-wide.css
+++ b/view/theme/diabook/diabook-red/style-wide.css
@@ -2805,6 +2805,35 @@ float: left;
/* = Directory = */
/* ============= */
/* contacts menu */
+section .directory-item dl {
+height: auto;
+overflow: auto;
+}
+
+section .directory-item dt {
+float: left;
+margin-left: 0px;
+text-align: right;
+color: #999;
+}
+
+section .directory-item dd {
+float: left;
+margin-left: 5px;
+}
+
+.directory-profile-wrapper {
+float: left;
+max-height: 178px;
+overflow: hidden;
+width: 635px;
+}
+
+.directory-copy-wrapper {
+float:left;
+overflow: hidden;
+}
+
.contact-photo-wrapper {
position: relative;
}
@@ -2845,13 +2874,20 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+float: left;
+height: 200px;
+width: 165px;
+}
+
.directory-item .contact-photo img {
width: 175px;
height: 175px;
diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css
index 37e26b8b9..72592168b 100644
--- a/view/theme/diabook/diabook-red/style.css
+++ b/view/theme/diabook/diabook-red/style.css
@@ -2793,6 +2793,30 @@ float: left;
/* ============= */
/* = Directory = */
/* ============= */
+section .directory-item dl {
+ height: auto;
+ overflow: auto;
+}
+section .directory-item dt {
+ float: left;
+ margin-left: 0px;
+ text-align: right;
+ color: #999;
+}
+section .directory-item dd {
+ float: left;
+ margin-left: 5px;
+}
+.directory-profile-wrapper {
+ float: left;
+ max-height: 178px;
+ overflow: hidden;
+ width: 635px;
+}
+.directory-copy-wrapper {
+ float: left;
+ overflow: hidden;
+}
/* contacts menu */
.contact-photo-wrapper {
position: relative;
@@ -2834,7 +2858,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2845,17 +2869,42 @@ float: left;
width: 175px;
height: 175px;
}
+
+section .directory-photo-wrapper {
+ float: left;
+ height: 200px;
+ width: 165px;
+}
.contact-name {
- text-align: left;
font-weight: bold;
- font-size: 12px;
+ font-size: 18px;
+ margin-bottom: -3px;
+ text-align: left;
}
.contact-details {
color: #999999;
}
+.page-type {
+ font-size: 10px;
+ font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+ float: left;
+ width: 305px;
+ margin-right: 10px;
+}
+.directory-profile-wrapper dl {
+ margin-top: 3px;
+ margin-bottom: 3px;
+}
+.directory-profile-title {
+ font-weight: bold;
+ margin-bottom: 3px;
+ font-size: 14px;
+}
#side-bar-photos-albums{
margin-top: 15px;
- }
+}
.photo-top-photo, .photo-album-photo {
-webkit-border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
index bc2af16c2..70d197955 100644
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
@@ -3,9 +3,40 @@
<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" >
<div class="directory-photo" id="directory-photo-$id" >
<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
- <img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+ <img class="directory-photo-img photo" src="$photo" alt="$alt-text" title="$alt-text" />
</a>
</div>
</div>
- <div class="contact-name" id="directory-name-$id">$name</div>
+ <div class="directory-profile-wrapper" id="directory-profile-wrapper-$id" >
+ <div class="contact-name" id="directory-name-$id">$name</div>
+ <div class="page-type">$page-type</div>
+ {{ if $pdesc }}<div class="directory-profile-title">$profile.pdesc</div>{{ endif }}
+ <div class="directory-detailcolumns-wrapper" id="directory-detailcolumns-wrapper-$id">
+ <div class="directory-detailscolumn-wrapper" id="directory-detailscolumn1-wrapper-$id">
+ {{ if $location }}
+ <dl class="location"><dt class="location-label">$location</dt>
+ <dd class="adr">
+ {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+ <span class="city-state-zip">
+ <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+ <span class="region">$profile.region</span>
+ <span class="postal-code">$profile.postal-code</span>
+ </span>
+ {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+ </dd>
+ </dl>
+ {{ endif }}
+
+ {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+ </div>
+ <div class="directory-detailscolumn-wrapper" id="directory-detailscolumn2-wrapper-$id">
+ {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+ {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+ </div>
+ </div>
+ <div class="directory-copy-wrapper" id="directory-copy-wrapper-$id" >
+ {{ if $about }}<dl class="directory-copy"><dt class="directory-copy-label">$about</dt><dd class="directory-copy-data">$profile.about</dd></dl>{{ endif }}
+ </div>
+ </div>
</div>
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
index 79151aeed..1d94cb6d3 100644
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
@@ -70,7 +70,7 @@
<div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$acl
- <hr style="clear:both"/>
+ <hr style="clear:both;"/>
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
<div id="profile-jot-email-end"></div>
$jotnets
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 736817c7b..68bfd5d3a 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -2732,6 +2732,30 @@ float: left;
/* ============= */
/* = Directory = */
/* ============= */
+section .directory-item dl {
+ height: auto;
+ overflow: auto;
+}
+section .directory-item dt {
+ float: left;
+ margin-left: 0px;
+ text-align: right;
+ color: #999;
+}
+section .directory-item dd {
+ float: left;
+ margin-left: 5px;
+}
+.directory-profile-wrapper {
+ float: left;
+ max-height: 178px;
+ overflow: hidden;
+ width: 635px;
+}
+.directory-copy-wrapper {
+ float: left;
+ overflow: hidden;
+}
/* contacts menu */
.contact-photo-wrapper {
position: relative;
@@ -2773,7 +2797,7 @@ float: left;
}
.directory-item {
float: left;
- width: 200px;
+ width: 800px;
height: 200px;
}
.directory-item .contact-photo {
@@ -2784,14 +2808,38 @@ float: left;
width: 175px;
height: 175px;
}
+section .directory-photo-wrapper {
+ float: left;
+ height: 200px;
+ width: 165px;
+}
.contact-name {
- text-align: left;
+ font-size: 18px;
font-weight: bold;
- font-size: 12px;
+ margin-bottom: -3px;
+ text-align: left;
}
.contact-details {
color: #999999;
}
+.page-type {
+ font-size: 10px;
+ font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+ float: left;
+ width: 305px;
+ margin-right: 10px;
+}
+.directory-profile-wrapper dl {
+ margin-top: 3px;
+ margin-bottom: 3px;
+}
+.directory-profile-title {
+ font-weight: bold;
+ margin-bottom: 3px;
+ font-size: 14px;
+}
#side-bar-photos-albums li{
list-style-type: disc;
}
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 83079782e..53048df6c 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -528,7 +528,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile-link' => $profile_link,
- '$photo' => $rr[$photo],
+ '$photo' => $a->get_cached_avatar_image($rr[$photo]),
'$alt-text' => $rr['name'],
));
$aside['$lastusers_items'][] = $entry;
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
index ca1b560a6..4a93dacf3 100644
--- a/view/theme/dispy/conversation.tpl
+++ b/view/theme/dispy/conversation.tpl
@@ -19,8 +19,9 @@
<div id="conversation-end"></div>
{{ if $dropping }}
-<div class="delete-checked">
-<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text" onmouseover="imgbright(this);" onmouseout="imgdull(this);">$dropping</span></a>
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
+ <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+ <div id="item-delete-selected-desc" >$dropping</div>
</div>
<div id="item-delete-selected-end"></div>
{{ endif }}
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 327b053ab..8ab192368 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -59,7 +59,7 @@ h6{font-size:xx-small;}
.button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;}
#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:2px outset #d4d580;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
-#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
+#item-delete-selected-desc{float:left;font-size:x-small;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
#group-edit-desc{margin:10px 0px;}
@@ -214,7 +214,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-subtools1{width:30px;height:30px;list-style:none outside none;margin:18px 0 30px -20px;padding:0;}
.wall-item-subtools2{width:25px;height:25px;list-style:none outside none;margin:-78px 0 0 5px;padding:0;}
.wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;}
-.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
+.wall-item-body{margin:1em;text-align:left;overflow-x:auto;}
.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#eeeecc;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;}
@@ -226,7 +226,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wallwall .wall-item-photo-end{clear:both;}
.wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;}
-#item-delete-selected{overflow:auto;width:100%;}
#connect-services-header,#extra-help-header{margin:1.5em 0 0 0;}
#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
.ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
@@ -390,9 +389,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;}
.item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;}
.checkeditem{opacity:1;}
-#item-delete-selected{margin-top:30px;}
-.delete-checked{position:absolute;left:35px;margin-top:20px;}
-#item-delete-selected-icon{float:left;margin-right:5px;}
+#item-delete-selected{margin:3em 5px;position:relative;left:4em;width:15em;overflow:auto;}
+#item-delete-selected-icon{float:left;margin:11px 5px;}
.fc-state-highlight{background:#eeeecc;color:#2e2f2e;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index e3966683b..60b49865e 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -325,6 +325,7 @@ h6 {
}
#item-delete-selected-desc {
float: left;
+ font-size: x-small;
margin-right: 5px;
&:hover {
text-decoration: underline;
@@ -1428,7 +1429,7 @@ nav #nav-notifications-linkmenu {
margin-bottom: 1.4em;
}
.wall-item-body {
- margin: 15px 10px 10px 0px;
+ margin: 1em;
text-align: left;
overflow-x: auto;
}
@@ -1533,10 +1534,6 @@ nav #nav-notifications-linkmenu {
}
}
}
-#item-delete-selected {
- overflow: auto;
- width: 100%;
-}
#connect-services-header,
#extra-help-header {
margin: 1.5em 0 0 0;
@@ -2369,18 +2366,15 @@ div {
opacity: 1;
}
#item-delete-selected {
- margin-top: 30px;
-}
-/* was tired of having no way of moving it around, so
-* here's a little 'hook' to do so */
-.delete-checked {
- position: absolute;
- left: 35px;
- margin-top: 20px;
+ margin: 3em 5px;
+ position: relative;
+ left: 4em;
+ width: 15em;
+ overflow: auto;
}
#item-delete-selected-icon {
float: left;
- margin-right: 5px;
+ margin: 11px 5px;
}
.fc-state-highlight {
background: @main_colour;
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index c6b339457..563d58ce4 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -19,31 +19,32 @@
<div id="jot-tools" class="jothidden" style="display:none">
<div id="profile-jot-submit-wrapper" class="jothidden">
- <div id="profile-upload-wrapper" style="display: $visitor;">
- <div id="wall-image-upload-div"><a class="icon camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
- </div>
- <div id="profile-attach-wrapper" style="display: $visitor;">
- <div id="wall-file-upload-div"><a class="icon attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
- </div>
- <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
- <a class="icon link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
- </div>
- <div id="profile-video-wrapper" style="display: $visitor;">
- <a class="icon video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
- </div>
- <div id="profile-audio-wrapper" style="display: $visitor;">
- <a class="icon audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
- </div>
- <div id="profile-location-wrapper" style="display: $visitor;">
- <a class="icon globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
- </div>
- <div id="profile-nolocation-wrapper" style="display: none;">
- <a class="icon noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
- </div>
+ <div id="profile-upload-wrapper" style="display: $visitor;">
+ <div id="wall-image-upload-div"><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
+ </div>
+ <div id="profile-attach-wrapper" style="display: $visitor;">
+ <div id="wall-file-upload-div"><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
+ </div>
- <div id="profile-jot-plugin-wrapper">
- $jotplugins
- </div>
+ <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
+ <a id="profile-link" class="icon link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
+ </div>
+ <div id="profile-video-wrapper" style="display: $visitor;">
+ <a id="profile-video" class="icon video" onclick="jotVideoURL();return false;" title="$video"></a>
+ </div>
+ <div id="profile-audio-wrapper" style="display: $visitor;">
+ <a id="profile-audio" class="icon audio" onclick="jotAudioURL();return false;" title="$audio"></a>
+ </div>
+ <div id="profile-location-wrapper" style="display: $visitor;">
+ <a id="profile-location" class="icon globe" onclick="jotGetLocation();return false;" title="$setloc"></a>
+ </div>
+ <div id="profile-nolocation-wrapper" style="display: none;">
+ <a id="profile-nolocation" class="icon noglobe" onclick="jotClearLocation();return false;" title="$noloc"></a>
+ </div>
+
+ <div id="profile-jot-plugin-wrapper">
+ $jotplugins
+ </div>
<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
@@ -57,16 +58,16 @@
</div> <!-- /#jot-tools -->
<div id="jot-preview-content" style="display:none;"></div>
+
<div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$acl
<hr style="clear:both" />
- <div id="profile-jot-email-label">$emailcc</div>
- <input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+ <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
<div id="profile-jot-email-end"></div>
$jotnets
</div>
</div>
</form>
-{{ if $content }}<script>initEditor();</script>{{ endif }}
+ {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 194609428..de2717f0c 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -59,7 +59,7 @@ h6{font-size:xx-small;}
.button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;}
#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:2px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
-#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
+#item-delete-selected-desc{float:left;font-size:x-small;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
#group-edit-desc{margin:10px 0px;}
@@ -214,7 +214,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-subtools1{width:30px;height:30px;list-style:none outside none;margin:18px 0 30px -20px;padding:0;}
.wall-item-subtools2{width:25px;height:25px;list-style:none outside none;margin:-78px 0 0 5px;padding:0;}
.wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;}
-.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
+.wall-item-body{margin:1em;text-align:left;overflow-x:auto;}
.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#111111;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;}
@@ -226,7 +226,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wallwall .wall-item-photo-end{clear:both;}
.wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;}
-#item-delete-selected{overflow:auto;width:100%;}
#connect-services-header,#extra-help-header{margin:1.5em 0 0 0;}
#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
.ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
@@ -390,9 +389,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.filesavetags:hover,.categorytags:hover{margin:20px 0;opacity:1.0 !important;}
.item-select{opacity:0.1;margin:5px 0 0 6px !important;}.item-select:hover{opacity:1;}
.checkeditem{opacity:1;}
-#item-delete-selected{margin-top:30px;}
-.delete-checked{position:absolute;left:35px;margin-top:20px;}
-#item-delete-selected-icon{float:left;margin-right:5px;}
+#item-delete-selected{margin:3em 5px;position:relative;left:4em;width:15em;overflow:auto;}
+#item-delete-selected-icon{float:left;margin:11px 5px;}
.fc-state-highlight{background:#eeeeec;color:#111111;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index b0fab994c..e18f9a01b 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -326,6 +326,7 @@ h6 {
}
#item-delete-selected-desc {
float: left;
+ font-size: x-small;
margin-right: 5px;
&:hover {
text-decoration: underline;
@@ -1429,7 +1430,7 @@ nav #nav-notifications-linkmenu {
margin-bottom: 1.4em;
}
.wall-item-body {
- margin: 15px 10px 10px 0px;
+ margin: 1em;
text-align: left;
overflow-x: auto;
}
@@ -1534,10 +1535,6 @@ nav #nav-notifications-linkmenu {
}
}
}
-#item-delete-selected {
- overflow: auto;
- width: 100%;
-}
#connect-services-header,
#extra-help-header {
margin: 1.5em 0 0 0;
@@ -2370,18 +2367,15 @@ div {
opacity: 1;
}
#item-delete-selected {
- margin-top: 30px;
-}
-/* was tired of having no way of moving it around, so
-* here's a little 'hook' to do so */
-.delete-checked {
- position: absolute;
- left: 35px;
- margin-top: 20px;
+ margin: 3em 5px;
+ position: relative;
+ left: 4em;
+ width: 15em;
+ overflow: auto;
}
#item-delete-selected-icon {
float: left;
- margin-right: 5px;
+ margin: 11px 5px;
}
.fc-state-highlight {
background: @bg_colour;
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 115f05ad7..8ffae0403 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -78,9 +78,9 @@
</div>
</div>
<div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
- <div class="wall-item-comment-wrapper">
+ <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+ <div class="wall-item-comment-wrapper" >
$item.comment
</div>
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index da5fa13b3..84da598cd 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -64,7 +64,7 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
{{ if $item.edpost }}
<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
{{ endif }}
-
+
<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
@@ -86,8 +86,8 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
</div>
</div>
<div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<div class="wall-item-comment-separator"></div>
<div class="wall-item-comment-wrapper">
$item.comment
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index be755d411..1be81d738 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -560,7 +560,12 @@ input#dfrn-url {
clear: both;
margin-bottom: 30px;
}
-
+.aprofile dt {
+ font-weight: bold;
+}
+#page-profile .title {
+ font-weight: bold;
+}
#profile-vcard-break {
clear: both;
}
@@ -935,6 +940,10 @@ input#dfrn-url {
background: #EEEEEE;
}
+.wall-item-like.comment, .wall-item-dislike.comment {
+ margin-left: 50px;
+}
+
.wall-item-info {
display: block;
float: left;
@@ -1640,6 +1649,9 @@ input#dfrn-url {
display:block!important;
}
+#photos-usage-message {
+ margin-bottom: 15px;
+}
#acl-wrapper {
@@ -2414,9 +2426,40 @@ aside input[type='text'] {
font-size: 20px;
}
+#event-summary-text {
+ margin-top: 15px;
+}
+
+#event-share-checkbox {
+ float: left;
+ margin-top: 10px;
+}
+
+#event-share-text {
+ float: left;
+ margin-top: 10px;
+ margin-left: 5px;
+}
+
+#event-share-break {
+ clear: both;
+ margin-bottom: 10px;
+}
+
+#event-summary {
+ width: 400px;
+}
+
.vevent {
border: 1px solid #CCCCCC;
}
+
+.vevent .event-summary {
+ margin-left: 10px;
+ margin-right: 10px;
+ font-weight: bold;
+}
+
.vevent .event-description, .vevent .event-location {
margin-left: 10px;
margin-right: 10px;
diff --git a/view/theme/facepark/screenshot.jpg b/view/theme/facepark/screenshot.jpg
new file mode 100644
index 000000000..37adcc54f
--- /dev/null
+++ b/view/theme/facepark/screenshot.jpg
Binary files differ
diff --git a/view/theme/quattro/Makefile b/view/theme/quattro/Makefile
new file mode 100644
index 000000000..5df58c821
--- /dev/null
+++ b/view/theme/quattro/Makefile
@@ -0,0 +1,5 @@
+all:
+ cd dark; make; cd ..
+ cd green; make; cd ..
+
+
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 803a2c2f7..35595c8bc 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -10,10 +10,72 @@
overflow: hidden;
text-indent: -9999px;
padding: 1px;
+ min-width: 22px;
+ height: 22px;
}
.icon.text {
text-indent: 0px;
}
+.icon.notify {
+ background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.gear {
+ background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.like {
+ background-image: url("icons/like.png");
+}
+.icon.dislike {
+ background-image: url("icons/dislike.png");
+}
+.icon.add {
+ background-image: url("../../../images/icons/22/add.png");
+}
+.icon.delete {
+ background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.edit {
+ background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.star {
+ background-image: url("../../../images/icons/22/star.png");
+}
+.icon.menu {
+ background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.link {
+ background-image: url("../../../images/icons/22/link.png");
+}
+.icon.lock {
+ background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.unlock {
+ background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.plugin {
+ background-image: url("../../../images/icons/22/plugin.png");
+}
+.icon.type-unkn {
+ background-image: url("../../../images/icons/22/zip.png");
+}
+.icon.type-audio {
+ background-image: url("../../../images/icons/22/audio.png");
+}
+.icon.type-video {
+ background-image: url("../../../images/icons/22/video.png");
+}
+.icon.type-image {
+ background-image: url("../../../images/icons/22/image.png");
+}
+.icon.type-text {
+ background-image: url("../../../images/icons/22/text.png");
+}
+.icon.language {
+ background-image: url("icons/language.png");
+}
+.icon.text {
+ padding: 10px 0px 0px 25px;
+}
.icon.s10 {
min-width: 10px;
height: 10px;
@@ -24,6 +86,12 @@
.icon.s10.gear {
background-image: url("../../../images/icons/10/gear.png");
}
+.icon.s10.like {
+ background-image: url("icons/like.png");
+}
+.icon.s10.dislike {
+ background-image: url("icons/dislike.png");
+}
.icon.s10.add {
background-image: url("../../../images/icons/10/add.png");
}
@@ -82,6 +150,12 @@
.icon.s16.gear {
background-image: url("../../../images/icons/16/gear.png");
}
+.icon.s16.like {
+ background-image: url("icons/like.png");
+}
+.icon.s16.dislike {
+ background-image: url("icons/dislike.png");
+}
.icon.s16.add {
background-image: url("../../../images/icons/16/add.png");
}
@@ -140,6 +214,12 @@
.icon.s22.gear {
background-image: url("../../../images/icons/22/gear.png");
}
+.icon.s22.like {
+ background-image: url("icons/like.png");
+}
+.icon.s22.dislike {
+ background-image: url("icons/dislike.png");
+}
.icon.s22.add {
background-image: url("../../../images/icons/22/add.png");
}
@@ -198,6 +278,12 @@
.icon.s48.gear {
background-image: url("../../../images/icons/48/gear.png");
}
+.icon.s48.like {
+ background-image: url("icons/like.png");
+}
+.icon.s48.dislike {
+ background-image: url("icons/dislike.png");
+}
.icon.s48.add {
background-image: url("../../../images/icons/48/add.png");
}
@@ -267,7 +353,8 @@ body {
h4 {
font-size: 1.1em;
}
-a, a:link {
+a,
+a:link {
color: #005c94;
text-decoration: none;
}
@@ -336,6 +423,9 @@ code {
.tool .action {
float: right;
}
+.tool > img {
+ float: left;
+}
/* popup notifications */
#jGrowl.top-right {
top: 30px;
@@ -489,7 +579,8 @@ nav #nav-site-linkmenu .menu-popup {
right: 0px;
left: auto;
}
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
background-image: url("../../../images/icons/22/notify_on.png");
}
nav #nav-apps-link.selected {
@@ -599,6 +690,9 @@ aside {
padding: 0px 10px 0px 20px;
border-right: 1px solid #bdcdd4;
}
+aside .profile-edit-side-div {
+ display: none;
+}
aside .vcard .fn {
font-size: 16px;
font-weight: bold;
@@ -678,11 +772,15 @@ aside #profiles-menu {
height: 48px;
}
/* group member */
-#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
+#contact-edit-drop-link,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
float: right;
margin-right: 50px;
}
-#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
+#contact-edit-drop-link .drophide,
+.mail-list-delete-wrapper .drophide,
+.group-delete-wrapper .drophide {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
@@ -691,7 +789,9 @@ aside #profiles-menu {
position: relative;
top: -50px;
}
-#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
+#contact-edit-drop-link .drop,
+.mail-list-delete-wrapper .drop,
+.group-delete-wrapper .drop {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
@@ -821,7 +921,8 @@ section {
display: table;
width: 750px;
}
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+.wall-item-container .wall-item-item,
+.wall-item-container .wall-item-bottom {
display: table-row;
}
.wall-item-container .wall-item-bottom {
@@ -859,11 +960,13 @@ section {
.wall-item-container .wall-item-content img {
max-width: 710px;
}
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+.wall-item-container .wall-item-links,
+.wall-item-container .wall-item-actions {
display: table-cell;
vertical-align: middle;
}
-.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+.wall-item-container .wall-item-links .icon,
+.wall-item-container .wall-item-actions .icon {
opacity: 0.5;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -871,7 +974,8 @@ section {
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
-.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+.wall-item-container .wall-item-links .icon:hover,
+.wall-item-container .wall-item-actions .icon:hover {
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -1015,9 +1119,6 @@ section {
opacity: 0.5;
}
.wwto {
- position: absolute !important;
- width: 25px;
- height: 25px;
background: #FFFFFF;
border: 2px solid #364e59;
height: 25px;
@@ -1248,7 +1349,9 @@ section {
height: 18px;
}*/
/** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
display: block!important;
}
#acl-wrapper {
@@ -1407,10 +1510,12 @@ ul.tabs li .active {
float: left;
width: 200px;
}
-.field input, .field textarea {
+.field input,
+.field textarea {
width: 400px;
}
-.field input[type="checkbox"], .field input[type="radio"] {
+.field input[type="checkbox"],
+.field input[type="radio"] {
width: auto;
}
.field textarea {
@@ -1537,10 +1642,126 @@ ul.tabs li .active {
width: 50px;
float: left;
}
-/* photo */
-.lframe {
+/* photo albums */
+#photo-edit-link-wrap {
+ margin-bottom: 10px;
+}
+#album-edit-link {
+ border-right: 1px solid #364e59;
+ float: left;
+ padding-right: 5px;
+ margin-right: 5px;
+}
+#photo-edit-link,
+#album-edit-link a {
+ background: url("../../../images/icons/16/edit.png") no-repeat left center;
+ padding-left: 18px;
+}
+#photo-toprofile-link {
+ background: url("../../../images/icons/16/user.png") no-repeat left center;
+ padding-left: 18px;
+}
+.photos-upload-link a,
+#photo-top-upload-link {
+ background: url("../../../images/icons/16/add.png") no-repeat left center;
+ padding-left: 18px;
+}
+.photo-top-image-wrapper,
+.photo-album-image-wrapper {
float: left;
margin: 0px 10px 10px 0px;
+ width: 150px;
+ height: 150px;
+ position: relative;
+ overflow: hidden;
+}
+.photo-top-image-wrapper img,
+.photo-album-image-wrapper img {
+ width: 150px;
+}
+.photo-top-image-wrapper .photo-top-album-name,
+.photo-album-image-wrapper .photo-top-album-name,
+.photo-top-image-wrapper .caption,
+.photo-album-image-wrapper .caption {
+ position: absolute;
+ color: #2d2d2d;
+ background-color: #ffffff;
+ width: 100%;
+ -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-transition: all 0.5s ease-in-out;
+ -moz-transition: all 0.5s ease-in-out;
+ -o-transition: all 0.5s ease-in-out;
+ -ms-transition: all 0.5s ease-in-out;
+ transition: all 0.5s ease-in-out;
+ bottom: -150px;
+}
+.photo-top-image-wrapper:hover .photo-top-album-name,
+.photo-album-image-wrapper:hover .photo-top-album-name,
+.photo-top-image-wrapper:hover .caption,
+.photo-album-image-wrapper:hover .caption {
+ bottom: 0px;
+ -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -webkit-transition: all 0.5s ease-in-out;
+ -moz-transition: all 0.5s ease-in-out;
+ -o-transition: all 0.5s ease-in-out;
+ -ms-transition: all 0.5s ease-in-out;
+ transition: all 0.5s ease-in-out;
+}
+#photo-photo {
+ display: block;
+ width: 660px;
+ padding: 50px;
+ margin-bottom: 0px;
+ text-align: center;
+ background-color: #999999;
+}
+#photo-photo img {
+ max-width: 560px;
+}
+#photo-album-title {
+ background: url("../../../images/icons/22/image.png") no-repeat top left;
+ padding-left: 23px;
+ min-height: 22px;
+}
+#photo-album-title a {
+ display: block;
+ padding-top: 5px;
+}
+#photo-caption {
+ display: block;
+ width: 660px;
+ min-height: 55px;
+ background-color: #cccccc;
+ padding: 0 50px 0 50px;
+}
+#photo-next-link > a > div {
+ background: url("icons/next.png") no-repeat center center;
+ float: right;
+ width: 50px;
+ height: 50px;
+}
+#photo-prev-link > a > div {
+ background: url("icons/prev.png") no-repeat center center;
+ float: left;
+ width: 50px;
+ height: 50px;
+}
+#photo-like-div {
+ display: block;
+ width: 660px;
+ height: 30px;
+ background-color: #cccccc;
+ padding: 0 50px 0 50px;
+}
+#photo-like-div .icon {
+ float: left;
+}
+#photo-like-div .like-rotator {
+ float: right;
}
/* profile match wrapper */
.profile-match-wrapper {
@@ -1641,13 +1862,15 @@ ul.tabs li .active {
transition: all 0.2s ease-in-out;
}
/* theme screenshot */
-.screenshot, #theme-preview {
+.screenshot,
+#theme-preview {
position: absolute;
width: 202px;
left: 70%;
top: 50px;
}
-.screenshot img, #theme-preview img {
+.screenshot img,
+#theme-preview img {
width: 200px;
height: 150px;
}
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index ecf4ff986..57fa38aa1 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -10,10 +10,72 @@
overflow: hidden;
text-indent: -9999px;
padding: 1px;
+ min-width: 22px;
+ height: 22px;
}
.icon.text {
text-indent: 0px;
}
+.icon.notify {
+ background-image: url("../../../images/icons/22/notify_off.png");
+}
+.icon.gear {
+ background-image: url("../../../images/icons/22/gear.png");
+}
+.icon.like {
+ background-image: url("icons/like.png");
+}
+.icon.dislike {
+ background-image: url("icons/dislike.png");
+}
+.icon.add {
+ background-image: url("../../../images/icons/22/add.png");
+}
+.icon.delete {
+ background-image: url("../../../images/icons/22/delete.png");
+}
+.icon.edit {
+ background-image: url("../../../images/icons/22/edit.png");
+}
+.icon.star {
+ background-image: url("../../../images/icons/22/star.png");
+}
+.icon.menu {
+ background-image: url("../../../images/icons/22/menu.png");
+}
+.icon.link {
+ background-image: url("../../../images/icons/22/link.png");
+}
+.icon.lock {
+ background-image: url("../../../images/icons/22/lock.png");
+}
+.icon.unlock {
+ background-image: url("../../../images/icons/22/unlock.png");
+}
+.icon.plugin {
+ background-image: url("../../../images/icons/22/plugin.png");
+}
+.icon.type-unkn {
+ background-image: url("../../../images/icons/22/zip.png");
+}
+.icon.type-audio {
+ background-image: url("../../../images/icons/22/audio.png");
+}
+.icon.type-video {
+ background-image: url("../../../images/icons/22/video.png");
+}
+.icon.type-image {
+ background-image: url("../../../images/icons/22/image.png");
+}
+.icon.type-text {
+ background-image: url("../../../images/icons/22/text.png");
+}
+.icon.language {
+ background-image: url("icons/language.png");
+}
+.icon.text {
+ padding: 10px 0px 0px 25px;
+}
.icon.s10 {
min-width: 10px;
height: 10px;
@@ -24,6 +86,12 @@
.icon.s10.gear {
background-image: url("../../../images/icons/10/gear.png");
}
+.icon.s10.like {
+ background-image: url("icons/like.png");
+}
+.icon.s10.dislike {
+ background-image: url("icons/dislike.png");
+}
.icon.s10.add {
background-image: url("../../../images/icons/10/add.png");
}
@@ -82,6 +150,12 @@
.icon.s16.gear {
background-image: url("../../../images/icons/16/gear.png");
}
+.icon.s16.like {
+ background-image: url("icons/like.png");
+}
+.icon.s16.dislike {
+ background-image: url("icons/dislike.png");
+}
.icon.s16.add {
background-image: url("../../../images/icons/16/add.png");
}
@@ -140,6 +214,12 @@
.icon.s22.gear {
background-image: url("../../../images/icons/22/gear.png");
}
+.icon.s22.like {
+ background-image: url("icons/like.png");
+}
+.icon.s22.dislike {
+ background-image: url("icons/dislike.png");
+}
.icon.s22.add {
background-image: url("../../../images/icons/22/add.png");
}
@@ -198,6 +278,12 @@
.icon.s48.gear {
background-image: url("../../../images/icons/48/gear.png");
}
+.icon.s48.like {
+ background-image: url("icons/like.png");
+}
+.icon.s48.dislike {
+ background-image: url("icons/dislike.png");
+}
.icon.s48.add {
background-image: url("../../../images/icons/48/add.png");
}
@@ -267,7 +353,8 @@ body {
h4 {
font-size: 1.1em;
}
-a, a:link {
+a,
+a:link {
color: #009100;
text-decoration: none;
}
@@ -336,6 +423,9 @@ code {
.tool .action {
float: right;
}
+.tool > img {
+ float: left;
+}
/* popup notifications */
#jGrowl.top-right {
top: 30px;
@@ -489,7 +579,8 @@ nav #nav-site-linkmenu .menu-popup {
right: 0px;
left: auto;
}
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
background-image: url("../../../images/icons/22/notify_on.png");
}
nav #nav-apps-link.selected {
@@ -599,6 +690,9 @@ aside {
padding: 0px 10px 0px 20px;
border-right: 1px solid #bdcdd4;
}
+aside .profile-edit-side-div {
+ display: none;
+}
aside .vcard .fn {
font-size: 16px;
font-weight: bold;
@@ -678,11 +772,15 @@ aside #profiles-menu {
height: 48px;
}
/* group member */
-#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
+#contact-edit-drop-link,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
float: right;
margin-right: 50px;
}
-#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
+#contact-edit-drop-link .drophide,
+.mail-list-delete-wrapper .drophide,
+.group-delete-wrapper .drophide {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
@@ -691,7 +789,9 @@ aside #profiles-menu {
position: relative;
top: -50px;
}
-#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
+#contact-edit-drop-link .drop,
+.mail-list-delete-wrapper .drop,
+.group-delete-wrapper .drop {
background-image: url('../../../images/icons/22/delete.png');
display: block;
width: 22px;
@@ -821,7 +921,8 @@ section {
display: table;
width: 750px;
}
-.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
+.wall-item-container .wall-item-item,
+.wall-item-container .wall-item-bottom {
display: table-row;
}
.wall-item-container .wall-item-bottom {
@@ -859,11 +960,13 @@ section {
.wall-item-container .wall-item-content img {
max-width: 710px;
}
-.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
+.wall-item-container .wall-item-links,
+.wall-item-container .wall-item-actions {
display: table-cell;
vertical-align: middle;
}
-.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
+.wall-item-container .wall-item-links .icon,
+.wall-item-container .wall-item-actions .icon {
opacity: 0.5;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -871,7 +974,8 @@ section {
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
-.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
+.wall-item-container .wall-item-links .icon:hover,
+.wall-item-container .wall-item-actions .icon:hover {
opacity: 1;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -1015,9 +1119,6 @@ section {
opacity: 0.5;
}
.wwto {
- position: absolute !important;
- width: 25px;
- height: 25px;
background: #FFFFFF;
border: 2px solid #364e59;
height: 25px;
@@ -1248,7 +1349,9 @@ section {
height: 18px;
}*/
/** acl **/
-#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
+#photo-edit-perms-select,
+#photos-upload-permissions-wrapper,
+#profile-jot-acl-wrapper {
display: block!important;
}
#acl-wrapper {
@@ -1407,10 +1510,12 @@ ul.tabs li .active {
float: left;
width: 200px;
}
-.field input, .field textarea {
+.field input,
+.field textarea {
width: 400px;
}
-.field input[type="checkbox"], .field input[type="radio"] {
+.field input[type="checkbox"],
+.field input[type="radio"] {
width: auto;
}
.field textarea {
@@ -1537,10 +1642,126 @@ ul.tabs li .active {
width: 50px;
float: left;
}
-/* photo */
-.lframe {
+/* photo albums */
+#photo-edit-link-wrap {
+ margin-bottom: 10px;
+}
+#album-edit-link {
+ border-right: 1px solid #364e59;
+ float: left;
+ padding-right: 5px;
+ margin-right: 5px;
+}
+#photo-edit-link,
+#album-edit-link a {
+ background: url("../../../images/icons/16/edit.png") no-repeat left center;
+ padding-left: 18px;
+}
+#photo-toprofile-link {
+ background: url("../../../images/icons/16/user.png") no-repeat left center;
+ padding-left: 18px;
+}
+.photos-upload-link a,
+#photo-top-upload-link {
+ background: url("../../../images/icons/16/add.png") no-repeat left center;
+ padding-left: 18px;
+}
+.photo-top-image-wrapper,
+.photo-album-image-wrapper {
float: left;
margin: 0px 10px 10px 0px;
+ width: 150px;
+ height: 150px;
+ position: relative;
+ overflow: hidden;
+}
+.photo-top-image-wrapper img,
+.photo-album-image-wrapper img {
+ width: 150px;
+}
+.photo-top-image-wrapper .photo-top-album-name,
+.photo-album-image-wrapper .photo-top-album-name,
+.photo-top-image-wrapper .caption,
+.photo-album-image-wrapper .caption {
+ position: absolute;
+ color: #2d2d2d;
+ background-color: #ffffff;
+ width: 100%;
+ -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-transition: all 0.5s ease-in-out;
+ -moz-transition: all 0.5s ease-in-out;
+ -o-transition: all 0.5s ease-in-out;
+ -ms-transition: all 0.5s ease-in-out;
+ transition: all 0.5s ease-in-out;
+ bottom: -150px;
+}
+.photo-top-image-wrapper:hover .photo-top-album-name,
+.photo-album-image-wrapper:hover .photo-top-album-name,
+.photo-top-image-wrapper:hover .caption,
+.photo-album-image-wrapper:hover .caption {
+ bottom: 0px;
+ -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -webkit-transition: all 0.5s ease-in-out;
+ -moz-transition: all 0.5s ease-in-out;
+ -o-transition: all 0.5s ease-in-out;
+ -ms-transition: all 0.5s ease-in-out;
+ transition: all 0.5s ease-in-out;
+}
+#photo-photo {
+ display: block;
+ width: 660px;
+ padding: 50px;
+ margin-bottom: 0px;
+ text-align: center;
+ background-color: #999999;
+}
+#photo-photo img {
+ max-width: 560px;
+}
+#photo-album-title {
+ background: url("../../../images/icons/22/image.png") no-repeat top left;
+ padding-left: 23px;
+ min-height: 22px;
+}
+#photo-album-title a {
+ display: block;
+ padding-top: 5px;
+}
+#photo-caption {
+ display: block;
+ width: 660px;
+ min-height: 55px;
+ background-color: #cccccc;
+ padding: 0 50px 0 50px;
+}
+#photo-next-link > a > div {
+ background: url("icons/next.png") no-repeat center center;
+ float: right;
+ width: 50px;
+ height: 50px;
+}
+#photo-prev-link > a > div {
+ background: url("icons/prev.png") no-repeat center center;
+ float: left;
+ width: 50px;
+ height: 50px;
+}
+#photo-like-div {
+ display: block;
+ width: 660px;
+ height: 30px;
+ background-color: #cccccc;
+ padding: 0 50px 0 50px;
+}
+#photo-like-div .icon {
+ float: left;
+}
+#photo-like-div .like-rotator {
+ float: right;
}
/* profile match wrapper */
.profile-match-wrapper {
@@ -1641,13 +1862,15 @@ ul.tabs li .active {
transition: all 0.2s ease-in-out;
}
/* theme screenshot */
-.screenshot, #theme-preview {
+.screenshot,
+#theme-preview {
position: absolute;
width: 202px;
left: 70%;
top: 50px;
}
-.screenshot img, #theme-preview img {
+.screenshot img,
+#theme-preview img {
width: 200px;
height: 150px;
}
diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
index ae7459dfc..f9be4cc72 100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
@@ -5,6 +5,9 @@
&.notify { background-image: url("../../../images/icons/@{size}/notify_off.png"); }
&.gear { background-image: url("../../../images/icons/@{size}/gear.png"); }
+ &.like { background-image: url("icons/like.png"); }
+ &.dislike { background-image: url("icons/dislike.png"); }
+
&.add { background-image: url("../../../images/icons/@{size}/add.png"); }
&.delete { background-image: url("../../../images/icons/@{size}/delete.png"); }
&.edit { background-image: url("../../../images/icons/@{size}/edit.png"); }
@@ -40,6 +43,10 @@
text-indent: 0px;
}
+ min-width:22px; height: 22px;
+ .icons(22);
+ &.text { padding: 10px 0px 0px 25px; }
+
&.s10 {
min-width:10px; height: 10px;
.icons(10);
diff --git a/view/theme/quattro/icons/addon_off.png b/view/theme/quattro/icons/addon_off.png
index 40b53259a..0fcce4d5a 100644
--- a/view/theme/quattro/icons/addon_off.png
+++ b/view/theme/quattro/icons/addon_off.png
Binary files differ
diff --git a/view/theme/quattro/icons/addon_on.png b/view/theme/quattro/icons/addon_on.png
index 3d9490f15..79ce07f0e 100644
--- a/view/theme/quattro/icons/addon_on.png
+++ b/view/theme/quattro/icons/addon_on.png
Binary files differ
diff --git a/view/theme/quattro/icons/dislike.png b/view/theme/quattro/icons/dislike.png
new file mode 100644
index 000000000..23de426c5
--- /dev/null
+++ b/view/theme/quattro/icons/dislike.png
Binary files differ
diff --git a/view/theme/quattro/icons/like.png b/view/theme/quattro/icons/like.png
new file mode 100644
index 000000000..b65edccc0
--- /dev/null
+++ b/view/theme/quattro/icons/like.png
Binary files differ
diff --git a/view/theme/quattro/icons/next.png b/view/theme/quattro/icons/next.png
new file mode 100644
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/quattro/icons/next.png
Binary files differ
diff --git a/view/theme/quattro/icons/prev.png b/view/theme/quattro/icons/prev.png
new file mode 100644
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/quattro/icons/prev.png
Binary files differ
diff --git a/view/theme/quattro/photo_view.tpl b/view/theme/quattro/photo_view.tpl
new file mode 100644
index 000000000..3b7a66271
--- /dev/null
+++ b/view/theme/quattro/photo_view.tpl
@@ -0,0 +1,37 @@
+<div id="live-display"></div>
+<h3 id="photo-album-title"><a href="$album.0">$album.1</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{ if $tools }}
+<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
+|
+<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
+{{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
+</div>
+
+<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
+{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+<div id="photo-caption">$desc</div>
+{{ if $tags }}
+<div id="in-this-photo-text">$tags.0</div>
+<div id="in-this-photo">$tags.1</div>
+{{ endif }}
+{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
+
+{{ if $edit }}$edit{{ endif }}
+
+{{ if $likebuttons }}
+<div id="photo-like-div">
+ $likebuttons
+ $like
+ $dislike
+</div>
+{{ endif }}
+<div class="wall-item-comment-wrapper">
+ $comments
+</div>
+
+$paginate
+
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 9099f0be1..0dac79bf9 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -27,13 +27,17 @@ h4 { font-size: 1.1em }
.opaque(@v: 0.5){
opacity: @v;
- -webkit-transition: all 0.2s ease-in-out;
- -moz-transition: all 0.2s ease-in-out;
- -o-transition: all 0.2s ease-in-out;
- -ms-transition: all 0.2s ease-in-out;
- transition: all 0.2s ease-in-out;
+ .transition();
}
+.transition(@d: 0.2s){
+ -webkit-transition: all @d ease-in-out;
+ -moz-transition: all @d ease-in-out;
+ -o-transition: all @d ease-in-out;
+ -ms-transition: all @d ease-in-out;
+ transition: all @d ease-in-out;
+}
+
a, a:link { color: @Link; text-decoration: none; }
a:visited { color: @LinkVisited; text-decoration: none; }
@@ -81,6 +85,7 @@ code {
height: auto; overflow: auto;
.label { float: left;}
.action { float: right; }
+ > img { float: left; }
}
@@ -282,6 +287,8 @@ aside {
padding:0px 10px 0px 20px;
border-right: 1px solid @AsideBorder;
+ .profile-edit-side-div { display: none; }
+
.vcard {
.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
.title { margin-bottom: 5px; }
@@ -1068,12 +1075,102 @@ ul.tabs {
width: 50px; float: left;
}
-/* photo */
-.lframe {
+/* photo albums */
+@photosize: 150px;
+
+#photo-edit-link-wrap { margin-bottom: 10px; }
+
+#album-edit-link {
+ border-right: 1px solid @MenuBorder;
+ float: left;
+ padding-right: 5px;
+ margin-right: 5px;
+}
+#photo-edit-link,
+#album-edit-link a {
+ background: url("../../../images/icons/16/edit.png") no-repeat left center;
+ padding-left: 18px;
+}
+#photo-toprofile-link {
+ background: url("../../../images/icons/16/user.png") no-repeat left center;
+ padding-left: 18px;
+}
+
+.photos-upload-link a,
+#photo-top-upload-link {
+ background: url("../../../images/icons/16/add.png") no-repeat left center;
+ padding-left: 18px;
+}
+
+
+.photo-top-image-wrapper,
+.photo-album-image-wrapper {
float: left;
margin: 0px 10px 10px 0px;
+ width:@photosize; height: @photosize;
+ position: relative;
+ overflow: hidden;
+
+ img { width: @photosize; }
+
+ .photo-top-album-name,
+ .caption{
+ position: absolute;
+ color: @Menu;
+ background-color: @MenuBg;
+
+ width: 100%;
+ .shadow(0px, 5px);
+ .transition(0.5s);
+ bottom: -@photosize;
+ }
+
+ &:hover .photo-top-album-name,
+ &:hover .caption {
+ bottom: 0px;
+ .shadow(0px, 0px);
+ .transition(0.5s);
+ }
+}
+
+#photo-photo {
+ display: block; width: 660px;
+ padding: 50px; margin-bottom: 0px;
+ text-align: center;
+ background-color: @Grey3;
+ img { max-width: 560px; }
+}
+#photo-album-title {
+ background: url("../../../images/icons/22/image.png") no-repeat top left;
+ padding-left: 23px;
+ min-height: 22px;
+ a { display: block; padding-top: 5px; }
}
+#photo-caption {
+ display: block; width: 660px;
+ min-height: 55px;
+ background-color: @Grey2;
+ padding:0 50px 0 50px;
+}
+#photo-next-link > a > div {
+ background: url("icons/next.png") no-repeat center center;
+ float: right;
+ width: 50px; height: 50px;
+}
+#photo-prev-link > a > div {
+ background: url("icons/prev.png") no-repeat center center;
+ float: left;
+ width: 50px; height: 50px;
+}
+#photo-like-div {
+ display: block; width: 660px;
+ height: 30px;
+ background-color: @Grey2;
+ padding:0 50px 0 50px;
+ .icon {float: left;}
+ .like-rotator {float: right;}
+}
/* profile match wrapper */
.profile-match-wrapper {
float: left;
diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl
index 8b1378917..1dc65295a 100644
--- a/view/theme/slackr/birthdays_reminder.tpl
+++ b/view/theme/slackr/birthdays_reminder.tpl
@@ -1 +1,8 @@
+{{ if $classtoday }}
+<script>
+ $(document).ready(function() $lbr
+ $('#events-reminder').addClass($.trim('$classtoday'));
+ $rbr);
+</script>
+{{ endif }}
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index ea10cc377..73b436fc6 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -12,6 +12,10 @@
.wall-item-tools {
background: none;
}
+.wall-item-body a:hover {
+ color: #ff6600;
+}
+
.widget {
/* box-shadow: 4px 4px 3px 0 #444444; */
@@ -67,6 +71,8 @@ nav #site-location {
opacity: 1.0;
filter:alpha(opacity=100);
box-shadow: 4px 4px 3px 0 #444444;
+ margin-left: 0px;
+ margin-top: 0px;
}
#events-reminder:hover {
@@ -108,6 +114,8 @@ nav #site-location {
#posted-date-selector {
margin-left: 30px !important;
margin-top: 5px !important;
+ margin-right: 0px !important;
+ margin-bottom: 0px !important;
}
@@ -115,6 +123,9 @@ nav #site-location {
box-shadow: 4px 4px 3px 0 #444444;
margin-left: 25px !important;
margin-top: 0px !important;
+ margin-right: 5px !important;
+ margin-bottom: 5px !important;
+
}
.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected {
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 1e63c7ef6..58f31971b 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -3280,3 +3280,9 @@ ul.menu-popup {
.notify-seen {
background: #000;
}
+
+
+/* Pages profile widget */
+#page-profile div#profile-page-list{
+margin-left: 45px;
+} \ No newline at end of file
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index a6a96d879..dae33b3f7 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -69,8 +69,8 @@
</div>
</div>
<div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<div class="wall-item-comment-wrapper" >
$item.comment
</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 9cbfc991e..a48acfec5 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -74,8 +74,8 @@
</div>
</div>
<div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+ <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+ <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
<div class="wall-item-comment-separator"></div>
<div class="wall-item-comment-wrapper">
$item.comment
diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl
index dbb20256f..94e3c2146 100644
--- a/view/xrd_host.tpl
+++ b/view/xrd_host.tpl
@@ -10,17 +10,6 @@
<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml"
href="$domain/oexchange/xrd" />
- <Link rel="http://purl.org/zot/1.0/post"
- href="$zot_post" />
-
- <Property xmlns:zot="http://purl.og/zot/1.0"
- type="http://purl.org/zot/1.0/version"
- zot:version="1" />
-
- <Property xmlns:zot="http://purl.og/zot/1.0"
- type="http://purl.org/zot/1.0/accept"
- zot:accept="application/atom+xml" />
-
<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
type="http://salmon-protocol.org/ns/magic-key"
mk:key_id="1">$bigkey</Property>
diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl
index a4b921fe1..d79203465 100644
--- a/view/xrd_person.tpl
+++ b/view/xrd_person.tpl
@@ -5,17 +5,6 @@
<Alias>$accturi</Alias>
<Alias>$profile_url</Alias>
- <Link rel="http://purl.org/zot/1.0/post/$nick"
- href="$zot_post" />
-
- <Property xmlns:zot="http://purl.og/zot/1.0"
- type="http://purl.org/zot/1.0/version"
- zot:version="1" />
-
- <Property xmlns:zot="http://purl.og/zot/1.0"
- type="http://purl.org/zot/1.0/accept"
- zot:accept="application/atom+xml" />
-
<Link rel="http://purl.org/macgirvin/dfrn/1.0"
href="$profile_url" />
<Link rel="http://schemas.google.com/g/2010#updates-from"