From 8465ad6e1e2a59474a19a8ab9eebd675b0d86b34 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 21 Apr 2012 00:22:48 +0530 Subject: [PATCH 01/77] Few more files with unnecessary executable permissions --- include/security.php | 0 view/theme/diabook-aerith/ch_directory_item.tpl | 0 view/theme/diabook-aerith/directory_item.tpl | 0 view/theme/diabook-aerith/group_side.tpl | 0 view/theme/diabook-aerith/icons/block.png | Bin view/theme/diabook-blue/ch_directory_item.tpl | 0 view/theme/diabook-blue/directory_item.tpl | 0 view/theme/diabook-blue/group_side.tpl | 0 view/theme/diabook-blue/icons/block.png | Bin view/theme/diabook-red/ch_directory_item.tpl | 0 view/theme/diabook-red/directory_item.tpl | 0 view/theme/diabook-red/group_side.tpl | 0 view/theme/diabook-red/icons/block.png | Bin view/theme/diabook/ch_directory_item.tpl | 0 view/theme/diabook/communityhome.tpl | 0 view/theme/diabook/contact_template.tpl | 0 .../diabook/diabook-aerith/ch_directory_item.tpl | 0 .../theme/diabook/diabook-aerith/directory_item.tpl | 0 view/theme/diabook/diabook-aerith/group_side.tpl | 0 view/theme/diabook/diabook-aerith/icons/block.png | Bin .../diabook/diabook-blue/ch_directory_item.tpl | 0 view/theme/diabook/diabook-blue/directory_item.tpl | 0 view/theme/diabook/diabook-blue/group_side.tpl | 0 view/theme/diabook/diabook-blue/icons/block.png | Bin .../diabook/diabook-green/ch_directory_item.tpl | 0 view/theme/diabook/diabook-green/directory_item.tpl | 0 view/theme/diabook/diabook-green/group_side.tpl | 0 view/theme/diabook/diabook-green/icons/block.png | Bin .../diabook/diabook-green/icons/notifications3.png | Bin view/theme/diabook/diabook-green/icons/notify3.png | Bin .../diabook/diabook-pink/ch_directory_item.tpl | 0 view/theme/diabook/diabook-pink/directory_item.tpl | 0 view/theme/diabook/diabook-pink/group_side.tpl | 0 view/theme/diabook/diabook-pink/icons/block.png | Bin .../diabook/diabook-pink/icons/notifications3.png | Bin view/theme/diabook/diabook-pink/icons/notify3.png | Bin .../theme/diabook/diabook-red/ch_directory_item.tpl | 0 view/theme/diabook/diabook-red/directory_item.tpl | 0 view/theme/diabook/diabook-red/group_side.tpl | 0 view/theme/diabook/diabook-red/icons/block.png | Bin view/theme/diabook/directory_item.tpl | 0 view/theme/diabook/group_side.tpl | 0 view/theme/diabook/icons/attach.png | Bin view/theme/diabook/icons/audio.png | Bin view/theme/diabook/icons/block.png | Bin view/theme/diabook/icons/camera.png | Bin view/theme/diabook/icons/close_box.png | Bin view/theme/diabook/icons/contacts2.png | Bin view/theme/diabook/icons/drop.png | Bin view/theme/diabook/icons/expand.png | Bin view/theme/diabook/icons/file_as.png | Bin view/theme/diabook/icons/link.png | Bin view/theme/diabook/icons/lock.png | Bin view/theme/diabook/icons/lupe.png | Bin view/theme/diabook/icons/next.png | Bin view/theme/diabook/icons/notifications.png | Bin view/theme/diabook/icons/notifications3.png | Bin view/theme/diabook/icons/notify.png | Bin view/theme/diabook/icons/notify3.png | Bin view/theme/diabook/icons/pencil.png | Bin view/theme/diabook/icons/prev.png | Bin view/theme/diabook/icons/recycle.png | Bin view/theme/diabook/icons/remote.png | Bin view/theme/diabook/icons/scroll_top.png | Bin view/theme/diabook/icons/star.png | Bin view/theme/diabook/icons/starred.png | Bin view/theme/diabook/icons/tagged.png | Bin view/theme/diabook/icons/unlock.png | Bin view/theme/diabook/icons/unstarred.png | Bin view/theme/diabook/icons/video.png | Bin view/theme/diabook/icons/weblink.png | Bin view/theme/diabook/jot.tpl | 0 view/theme/diabook/mail_conv.tpl | 0 view/theme/diabook/search_item.tpl | 0 view/theme/diabook/theme.php | 0 75 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 include/security.php mode change 100755 => 100644 view/theme/diabook-aerith/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook-aerith/directory_item.tpl mode change 100755 => 100644 view/theme/diabook-aerith/group_side.tpl mode change 100755 => 100644 view/theme/diabook-aerith/icons/block.png mode change 100755 => 100644 view/theme/diabook-blue/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook-blue/directory_item.tpl mode change 100755 => 100644 view/theme/diabook-blue/group_side.tpl mode change 100755 => 100644 view/theme/diabook-blue/icons/block.png mode change 100755 => 100644 view/theme/diabook-red/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook-red/directory_item.tpl mode change 100755 => 100644 view/theme/diabook-red/group_side.tpl mode change 100755 => 100644 view/theme/diabook-red/icons/block.png mode change 100755 => 100644 view/theme/diabook/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/communityhome.tpl mode change 100755 => 100644 view/theme/diabook/contact_template.tpl mode change 100755 => 100644 view/theme/diabook/diabook-aerith/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-aerith/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-aerith/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-aerith/icons/block.png mode change 100755 => 100644 view/theme/diabook/diabook-blue/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-blue/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-blue/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-blue/icons/block.png mode change 100755 => 100644 view/theme/diabook/diabook-green/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-green/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-green/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-green/icons/block.png mode change 100755 => 100644 view/theme/diabook/diabook-green/icons/notifications3.png mode change 100755 => 100644 view/theme/diabook/diabook-green/icons/notify3.png mode change 100755 => 100644 view/theme/diabook/diabook-pink/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-pink/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-pink/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-pink/icons/block.png mode change 100755 => 100644 view/theme/diabook/diabook-pink/icons/notifications3.png mode change 100755 => 100644 view/theme/diabook/diabook-pink/icons/notify3.png mode change 100755 => 100644 view/theme/diabook/diabook-red/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-red/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-red/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-red/icons/block.png mode change 100755 => 100644 view/theme/diabook/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/group_side.tpl mode change 100755 => 100644 view/theme/diabook/icons/attach.png mode change 100755 => 100644 view/theme/diabook/icons/audio.png mode change 100755 => 100644 view/theme/diabook/icons/block.png mode change 100755 => 100644 view/theme/diabook/icons/camera.png mode change 100755 => 100644 view/theme/diabook/icons/close_box.png mode change 100755 => 100644 view/theme/diabook/icons/contacts2.png mode change 100755 => 100644 view/theme/diabook/icons/drop.png mode change 100755 => 100644 view/theme/diabook/icons/expand.png mode change 100755 => 100644 view/theme/diabook/icons/file_as.png mode change 100755 => 100644 view/theme/diabook/icons/link.png mode change 100755 => 100644 view/theme/diabook/icons/lock.png mode change 100755 => 100644 view/theme/diabook/icons/lupe.png mode change 100755 => 100644 view/theme/diabook/icons/next.png mode change 100755 => 100644 view/theme/diabook/icons/notifications.png mode change 100755 => 100644 view/theme/diabook/icons/notifications3.png mode change 100755 => 100644 view/theme/diabook/icons/notify.png mode change 100755 => 100644 view/theme/diabook/icons/notify3.png mode change 100755 => 100644 view/theme/diabook/icons/pencil.png mode change 100755 => 100644 view/theme/diabook/icons/prev.png mode change 100755 => 100644 view/theme/diabook/icons/recycle.png mode change 100755 => 100644 view/theme/diabook/icons/remote.png mode change 100755 => 100644 view/theme/diabook/icons/scroll_top.png mode change 100755 => 100644 view/theme/diabook/icons/star.png mode change 100755 => 100644 view/theme/diabook/icons/starred.png mode change 100755 => 100644 view/theme/diabook/icons/tagged.png mode change 100755 => 100644 view/theme/diabook/icons/unlock.png mode change 100755 => 100644 view/theme/diabook/icons/unstarred.png mode change 100755 => 100644 view/theme/diabook/icons/video.png mode change 100755 => 100644 view/theme/diabook/icons/weblink.png mode change 100755 => 100644 view/theme/diabook/jot.tpl mode change 100755 => 100644 view/theme/diabook/mail_conv.tpl mode change 100755 => 100644 view/theme/diabook/search_item.tpl mode change 100755 => 100644 view/theme/diabook/theme.php diff --git a/include/security.php b/include/security.php old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook-aerith/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/block.png b/view/theme/diabook-aerith/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-blue/ch_directory_item.tpl b/view/theme/diabook-blue/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-blue/icons/block.png b/view/theme/diabook-blue/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/ch_directory_item.tpl b/view/theme/diabook-red/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/block.png b/view/theme/diabook-red/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook/diabook-aerith/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-aerith/directory_item.tpl b/view/theme/diabook/diabook-aerith/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-aerith/group_side.tpl b/view/theme/diabook/diabook-aerith/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-aerith/icons/block.png b/view/theme/diabook/diabook-aerith/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-blue/ch_directory_item.tpl b/view/theme/diabook/diabook-blue/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-blue/directory_item.tpl b/view/theme/diabook/diabook-blue/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-blue/group_side.tpl b/view/theme/diabook/diabook-blue/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-blue/icons/block.png b/view/theme/diabook/diabook-blue/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/ch_directory_item.tpl b/view/theme/diabook/diabook-green/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/directory_item.tpl b/view/theme/diabook/diabook-green/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/group_side.tpl b/view/theme/diabook/diabook-green/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/icons/block.png b/view/theme/diabook/diabook-green/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/icons/notifications3.png b/view/theme/diabook/diabook-green/icons/notifications3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/icons/notify3.png b/view/theme/diabook/diabook-green/icons/notify3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/ch_directory_item.tpl b/view/theme/diabook/diabook-pink/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/directory_item.tpl b/view/theme/diabook/diabook-pink/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/group_side.tpl b/view/theme/diabook/diabook-pink/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/icons/block.png b/view/theme/diabook/diabook-pink/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/icons/notifications3.png b/view/theme/diabook/diabook-pink/icons/notifications3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/icons/notify3.png b/view/theme/diabook/diabook-pink/icons/notify3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-red/ch_directory_item.tpl b/view/theme/diabook/diabook-red/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-red/directory_item.tpl b/view/theme/diabook/diabook-red/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-red/group_side.tpl b/view/theme/diabook/diabook-red/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-red/icons/block.png b/view/theme/diabook/diabook-red/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/block.png b/view/theme/diabook/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php old mode 100755 new mode 100644 From 4499ce96a0c5fd7ca9feb2b9b5e62876155aa63e Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 21 Apr 2012 12:00:19 +0530 Subject: [PATCH 02/77] Executable permission missing on script --- util/run_xgettext.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 util/run_xgettext.sh diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh old mode 100644 new mode 100755 From 0fb08e3642e195da071c6f8d01248c3565ae0cc3 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 29 Jun 2012 05:29:29 -0400 Subject: [PATCH 03/77] nav: pass $baseurl to template --- include/nav.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/nav.php b/include/nav.php index a67a8b6141..e26cc8889a 100644 --- a/include/nav.php +++ b/include/nav.php @@ -162,6 +162,7 @@ function nav(&$a) { $tpl = get_markup_template('nav.tpl'); $a->page['nav'] .= replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), '$langselector' => lang_selector(), '$sitelocation' => $sitelocation, '$nav' => $nav, From 8b18ee49ffbc51e4d377a99fd391ee44d876734f Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 29 Jun 2012 05:29:58 -0400 Subject: [PATCH 04/77] quattro: some updates - add makefile to rebuild both css with single command - fix icons in Forums widget - style photos pages --- view/theme/quattro/Makefile | 5 + view/theme/quattro/dark/style.css | 258 +++++++++++++++++++++++-- view/theme/quattro/green/style.css | 258 +++++++++++++++++++++++-- view/theme/quattro/icons.less | 7 + view/theme/quattro/icons/addon_off.png | Bin 438 -> 834 bytes view/theme/quattro/icons/addon_on.png | Bin 428 -> 715 bytes view/theme/quattro/icons/dislike.png | Bin 0 -> 386 bytes view/theme/quattro/icons/like.png | Bin 0 -> 388 bytes view/theme/quattro/icons/next.png | Bin 0 -> 300 bytes view/theme/quattro/icons/prev.png | Bin 0 -> 336 bytes view/theme/quattro/photo_view.tpl | 37 ++++ view/theme/quattro/quattro.less | 111 ++++++++++- 12 files changed, 630 insertions(+), 46 deletions(-) create mode 100644 view/theme/quattro/Makefile create mode 100644 view/theme/quattro/icons/dislike.png create mode 100644 view/theme/quattro/icons/like.png create mode 100644 view/theme/quattro/icons/next.png create mode 100644 view/theme/quattro/icons/prev.png create mode 100644 view/theme/quattro/photo_view.tpl diff --git a/view/theme/quattro/Makefile b/view/theme/quattro/Makefile new file mode 100644 index 0000000000..5df58c821b --- /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 803a2c2f7b..d115453bc6 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 li > 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 { @@ -678,11 +769,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 +786,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 +918,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 +957,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 +971,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 +1116,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1248,7 +1346,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 +1507,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 +1639,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 +1859,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 ecf4ff9860..23fd4cb414 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 li > 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 { @@ -678,11 +769,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 +786,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 +918,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 +957,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 +971,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 +1116,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1248,7 +1346,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 +1507,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 +1639,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 +1859,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 ae7459dfc6..f9be4cc723 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 40b53259a20a616c8b35e779cb1c086023a17125..0fcce4d5abe02fd91f47054311ee2cc6c567eaa3 100644 GIT binary patch literal 834 zcmV-I1HJr-P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY= z4G1NLQnm{K00P2EL_t(I%hi-mXjFF)$G`LY{odQRyNR1*(U?OcwStgCX`tv;QBZ6P zwiiojONpm?5pU973O#!eS|~jPEEN$16+{%#*h8h-Lun304<3@5G}$Jb&E~!Ld%ySl zGrja+((clhUYy&^Fdt^V!wm308}&-ueK@;=gm{mDj{r;nSZ3yXf%%KW`(OR>Ujgqu znmtsnRllyr(QYC_X&pQVSnFY|gZKVIR)neJ2PVVTTDdiF=ZBy74c2Sljy8v0-afpI zt4T~sNe~gFlq?A3LU@f4YOf!8cjoq$3!9+odFS%&?-M2EJGCU4L0v2!SC5K?*@q2o{2v2w>*1i#NZMJv($h1StZHwMcaV z1|yCXhzJ0InZe8m%;bGQ@S$AU(7iPbKIC3_UzS#y(jt-)f(TLwFaRF{ocCm{XKNi< z=R2oQ9Oa%Pm(D)6&V89_gTj_UeiU< zO7ns^Fh@#JHK}kVQXoNGniAbChc@P$XV2#E^aTRI2X7sm>1O)OS~tzJ!jSWUl~NQ~ zpwO1uX^xFdUs_mNJN?P2DgBR6@3ZL}=NgT{GcS#e($4Kobk@80b#WOh?e@dThB*4> z+s8V8S0{P_e_Pixi|b}-VZFd|YI%M&!`$kITj=Doy3?BX~dipMY0CKlx;})BW_pFLO_S znrmbJ_b#;7U*%bLz8_HaOSambODaxoiKL#Sg+;FO_Vn2gQ@qgj2lFC%_ar^g;{X5v M07*qoM6N<$g4D-&&j0`b literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1Ig&jCImu4aCb zLjd_w(~;qe`r|-hQ4-`A%;50sMjD8d?NMQuIzW%m_@`T{iL`ZfI|A7E{-7*my;6?a7idK%Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY= z4GAs_n_j{I00K)%L_t(I%hi-iNK|nY#((EOd?go_~Bw~5w4v<)J{w2e_YKE^w*dv9~SuhSx0WQ>#2rf>W4{mui< zfqyKiW#|-H8WW>vbOB{Rp@8s4U{XeSy&+)yL=H*Y;5)KIib3#l5V-JtMX6eX>I1pV zwZ8)D1nu-6vvlu>O8c-77Qy}i_9s{^p@q*X`58f@3Aw_JwR!VLiKfPvY(0#0o)kJy zLEC=F4ng}MWCxLseL{A(YQU&IqPsrO508*YLF|H;16CoCfK&@)Iv}$hTKa@UGa53! zHlF-#-1~H@AE(91L3tW*03QMi6p$1ow?MKPG0m#Jb98;64yB)0u}n3LaBOhP;FTfte|8te5QN});5y(qXuxdU9ZJXy`FW*mfosF6 z2Vn?d1fBzS5eiFSSCELYxi}3sf;sM7iexX zqpNyG=4J&qg2n-8IRKeK&*q=dW5x=0HL|@BFNjn%UP`A^ x&o=cBf9c+fw@v*$-P?NMQuIzW%m_@|oPNuG31Qb&Bba4!kxSX7DfJ;J=p_f}cDaA$DQ9J=iF6?JWY)|~f cdUZQP!g+>6ff^V*UHx3vIVCg!04kt$cK`qY diff --git a/view/theme/quattro/icons/dislike.png b/view/theme/quattro/icons/dislike.png new file mode 100644 index 0000000000000000000000000000000000000000..23de426c5a6def7113c12ee557789e8d0b6c8d2e GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfzsxE9dR0y+Bi#JY5_^EKaYz zv|rD~QRMi?^Lgv0>T)DyCKz!QQqChO=E7Ie&6HQoqNY-D#Ak zXFkdHGz?8hteN~y^dL_iIuBP?dhmo&Uaze&N9(|%3-We1Yd+Xlo~iq z*(9L0XvKf`Ka%InO(f>AYar!Uc zvs*iSZH~P>KI5lvv(@gyn)iflt^P9}aGo^zYUeGMA06BGKUB-ykbhc=!8yh?Zv7|i b#~bw>=6Z6*G3RRm1Bk)X)z4*}Q$iB})^3>v literal 0 HcmV?d00001 diff --git a/view/theme/quattro/icons/like.png b/view/theme/quattro/icons/like.png new file mode 100644 index 0000000000000000000000000000000000000000..b65edccc07e0125f663ff738e6983ae01a239e96 GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfzsxk@<-kPC!#wJY5_^EKYB| zZ0p71DA4vWz3ix{qk!liP8LTOgHJ3{65Z|}^s4y{Kk+n8oRz84maU{D(b359ug5w$ zXtT-T4!#V>%dr7puZ73n{j>S(BLVRj$-Cq({A4s}GtEg*{S(&k(PPdLqg}a-#Tt+P zbZ+8JV2qx@vHys>?TSfTx^ve&VzYgdXul+UuYaQO>xe@Om|`FCE}wCb&u@Y|_tjI2 zr?Ssk?$xIFQKH*|YroH=(<$<92QSKoRQK_G_Pk%Jt+Z@;;<~vWRlN3}yW1y4MSAB1 zO<4NioH^rNmH@K@?#gRL?i|0fyU?+`qJR1fG3^gc+A+(y*eduE8l!E@JoG-a7|Z-Q cS^k&l@>YB4AFAC<>&kwInMX)pEY`$xA5dtGr;B5V#p$D0 z47nQ}CD=d2=cE|z(QH23VxTeqr29uko>LjyC3H1XO|>Vlv190F-248)yHoq~cI>LN zy>9#c!%U-PHc5zW3O>A*+v9|z>#25e~Z<=f?KE^>B*)`}8=F0&119Q!4X zE$Ei{A`+b0R>@c8rZ2Kqe1Un1)5R#pD);|?6Hdxc`f|!sUN!T!O75E_@%ldtJnZ%@ oV$b=RUGMs}b*mdKI;Vst0AdDj5C8xG literal 0 HcmV?d00001 diff --git a/view/theme/quattro/icons/prev.png b/view/theme/quattro/icons/prev.png new file mode 100644 index 0000000000000000000000000000000000000000..55c1464ba016c02da4c7ccb23d33203e25ab0eb1 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~wj^(N7l!{J zxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwInMX*^WTL;NG*IY*r;B5V#p%6Q z4ZWKjB^Vy4=VoY!aNLp=ky84we#>|DBRl_J3|rB>!?N?5$de0?uFTKK652ma*zOV2 z`^&FeA6r<+-J4$hzVD00QRZn9i=Q@F92RiRx}K8M!Sy$Yp%|n zVSmx{=(@V8I}h7kSl#5SbVE9C^%TqQg!MZ-kIt&-OyG`Lp7cE8Z)0ijMz(8$Iep*k z9M0Mw3G_Z!q!D>b%{w`LXH}$J`=`%eWgLHp{{F!IU841?=b07iX*&;^D6rl;T>fG2 b?GMa0R`K7$PWHC|{l?(w>gTe~DWM4fA?$?c literal 0 HcmV?d00001 diff --git a/view/theme/quattro/photo_view.tpl b/view/theme/quattro/photo_view.tpl new file mode 100644 index 0000000000..3b7a662716 --- /dev/null +++ b/view/theme/quattro/photo_view.tpl @@ -0,0 +1,37 @@ +
+

$album.1

+ + + +
+{{ if $prevlink }}{{ endif }} +{{ if $nextlink }}{{ endif }} +
$desc
+{{ if $tags }} +
$tags.0
+
$tags.1
+{{ endif }} +{{ if $tags.2 }}{{ endif }} + +{{ if $edit }}$edit{{ endif }} + +{{ if $likebuttons }} +
+ $likebuttons + $like + $dislike +
+{{ endif }} +
+ $comments +
+ +$paginate + diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 9099f0be16..2e4c0da389 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; } + li > img { float: left; } } @@ -1068,12 +1073,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; - margin: 0px 10px 10px 0px; + 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; From a03e6b96ea96c81d4cb1a1e8c4e86a8a3a82863e Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 29 Jun 2012 05:47:53 -0400 Subject: [PATCH 05/77] quattro: fix Forum widget, hide edit profile link --- view/theme/quattro/dark/style.css | 5 ++++- view/theme/quattro/green/style.css | 5 ++++- view/theme/quattro/quattro.less | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index d115453bc6..35595c8bc5 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -423,7 +423,7 @@ code { .tool .action { float: right; } -.tool li > img { +.tool > img { float: left; } /* popup notifications */ @@ -690,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; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 23fd4cb414..57fa38aa19 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -423,7 +423,7 @@ code { .tool .action { float: right; } -.tool li > img { +.tool > img { float: left; } /* popup notifications */ @@ -690,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; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 2e4c0da389..0dac79bf9c 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -85,7 +85,7 @@ code { height: auto; overflow: auto; .label { float: left;} .action { float: right; } - li > img { float: left; } + > img { float: left; } } @@ -287,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; } From 78e03abed8e72e29d2463e9de8e279dc86e5d39e Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 29 Jun 2012 20:11:36 -0700 Subject: [PATCH 06/77] convert ent_quotes for jquery calendar title/summary --- boot.php | 2 +- mod/events.php | 4 +- util/messages.po | 138 +++++++++++++++++++++++------------------------ 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/boot.php b/boot.php index 973e3578a6..aa016ef0c7 100644 --- a/boot.php +++ b/boot.php @@ -10,7 +10,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1388' ); +define ( 'FRIENDICA_VERSION', '3.0.1389' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1151 ); diff --git a/mod/events.php b/mod/events.php index 7940e79a42..bf02f83099 100755 --- a/mod/events.php +++ b/mod/events.php @@ -280,10 +280,10 @@ function events_content(&$a) { $last_date = $d; $edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null); - $title = strip_tags(bbcode($rr['summary'])); + $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); if(! $title) { list($title, $_trash) = explode("\n" "Language-Team: LANGUAGE \n" @@ -56,7 +56,7 @@ msgstr "" #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:508 #: ../../addon/facebook/facebook.php:514 ../../addon/dav/layout.fnk.php:353 -#: ../../include/items.php:3447 ../../index.php:309 +#: ../../include/items.php:3455 ../../index.php:309 msgid "Permission denied." msgstr "" @@ -228,7 +228,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1549 +#: ../../include/nav.php:52 ../../boot.php:1551 msgid "Events" msgstr "" @@ -283,7 +283,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:429 ../../include/event.php:40 -#: ../../include/bb2diaspora.php:357 ../../boot.php:1126 +#: ../../include/bb2diaspora.php:357 ../../boot.php:1128 msgid "Location:" msgstr "" @@ -364,7 +364,7 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1543 +#: ../../mod/photos.php:46 ../../boot.php:1545 msgid "Photo Albums" msgstr "" @@ -417,7 +417,7 @@ msgstr "" #: ../../mod/photos.php:591 ../../mod/like.php:144 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 +#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1317 #: ../../include/diaspora.php:1710 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -583,7 +583,7 @@ msgstr "" #: ../../mod/photos.php:1342 ../../mod/photos.php:1382 #: ../../mod/photos.php:1413 ../../include/conversation.php:579 -#: ../../boot.php:518 +#: ../../boot.php:520 msgid "Comment" msgstr "" @@ -845,7 +845,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:2873 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:2881 msgid "[Name Withheld]" msgstr "" @@ -1217,7 +1217,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1070 +#: ../../include/contact_widgets.php:9 ../../boot.php:1072 msgid "Connect" msgstr "" @@ -1747,8 +1747,8 @@ msgstr "" #: ../../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:2882 -#: ../../boot.php:720 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2890 +#: ../../boot.php:722 msgid "Administrator" msgstr "" @@ -1758,7 +1758,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:852 +#: ../../mod/lostpass.php:83 ../../boot.php:854 msgid "Password Reset" msgstr "" @@ -2433,7 +2433,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1555 +#: ../../mod/notes.php:44 ../../boot.php:1557 msgid "Personal Notes" msgstr "" @@ -2684,7 +2684,7 @@ msgstr "" #: ../../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:1534 +#: ../../include/nav.php:50 ../../boot.php:1536 msgid "Profile" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:818 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:820 msgid "Register" msgstr "" @@ -2822,7 +2822,7 @@ msgstr "" #: ../../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:3326 +#: ../../mod/display.php:142 ../../include/items.php:3334 msgid "Item not found." msgstr "" @@ -2831,7 +2831,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1540 +#: ../../include/nav.php:51 ../../boot.php:1542 msgid "Photos" msgstr "" @@ -3634,7 +3634,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:983 +#: ../../mod/profile.php:21 ../../boot.php:985 msgid "Requested profile is not available." msgstr "" @@ -4025,23 +4025,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:664 ../../boot.php:1092 +#: ../../mod/profiles.php:664 ../../boot.php:1094 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:665 ../../boot.php:1093 +#: ../../mod/profiles.php:665 ../../boot.php:1095 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:676 ../../boot.php:1103 +#: ../../mod/profiles.php:676 ../../boot.php:1105 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:678 ../../boot.php:1106 +#: ../../mod/profiles.php:678 ../../boot.php:1108 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:679 ../../boot.php:1107 +#: ../../mod/profiles.php:679 ../../boot.php:1109 msgid "Edit visibility" msgstr "" @@ -4677,7 +4677,7 @@ msgstr "" #: ../../addon/page/page.php:73 ../../addon/page/page.php:107 #: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188 -#: ../../include/conversation.php:476 ../../boot.php:519 +#: ../../include/conversation.php:476 ../../boot.php:521 msgid "show more" msgstr "" @@ -4709,7 +4709,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:839 +#: ../../include/nav.php:64 ../../boot.php:841 msgid "Login" msgstr "" @@ -4737,7 +4737,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1314 +#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1315 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -6123,7 +6123,7 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1128 +#: ../../include/profile_advanced.php:17 ../../boot.php:1130 msgid "Gender:" msgstr "" @@ -6143,7 +6143,7 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1131 +#: ../../include/profile_advanced.php:37 ../../boot.php:1133 msgid "Status:" msgstr "" @@ -6152,7 +6152,7 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: ../../include/profile_advanced.php:48 ../../boot.php:1133 +#: ../../include/profile_advanced.php:48 ../../boot.php:1135 msgid "Homepage:" msgstr "" @@ -6656,27 +6656,27 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1096 ../../include/user.php:236 +#: ../../include/text.php:1097 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1108 +#: ../../include/text.php:1109 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1318 +#: ../../include/text.php:1319 msgid "activity" msgstr "" -#: ../../include/text.php:1320 +#: ../../include/text.php:1321 msgid "comment" msgstr "" -#: ../../include/text.php:1321 +#: ../../include/text.php:1322 msgid "post" msgstr "" -#: ../../include/text.php:1476 +#: ../../include/text.php:1477 msgid "Item filed" msgstr "" @@ -6735,7 +6735,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:838 +#: ../../include/nav.php:46 ../../boot.php:840 msgid "Logout" msgstr "" @@ -6743,7 +6743,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1528 +#: ../../include/nav.php:49 ../../boot.php:1530 msgid "Status" msgstr "" @@ -6823,11 +6823,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1086 +#: ../../include/nav.php:138 ../../boot.php:1088 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1086 +#: ../../include/nav.php:138 ../../boot.php:1088 msgid "Manage/edit profiles" msgstr "" @@ -7248,15 +7248,15 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:2880 +#: ../../include/items.php:2888 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2880 +#: ../../include/items.php:2888 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:3512 +#: ../../include/items.php:3520 msgid "Archives" msgstr "" @@ -7611,96 +7611,96 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:517 +#: ../../boot.php:519 msgid "Delete this item?" msgstr "" -#: ../../boot.php:520 +#: ../../boot.php:522 msgid "show fewer" msgstr "" -#: ../../boot.php:715 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" - #: ../../boot.php:717 #, php-format +msgid "Update %s failed. See error logs." +msgstr "" + +#: ../../boot.php:719 +#, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:817 +#: ../../boot.php:819 msgid "Create a New Account" msgstr "" -#: ../../boot.php:841 +#: ../../boot.php:843 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:842 +#: ../../boot.php:844 msgid "Password: " msgstr "" -#: ../../boot.php:845 +#: ../../boot.php:847 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:851 +#: ../../boot.php:853 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1018 +#: ../../boot.php:1020 msgid "Edit profile" msgstr "" -#: ../../boot.php:1078 +#: ../../boot.php:1080 msgid "Message" msgstr "" -#: ../../boot.php:1194 ../../boot.php:1273 +#: ../../boot.php:1196 ../../boot.php:1275 msgid "g A l F d" msgstr "" -#: ../../boot.php:1195 ../../boot.php:1274 +#: ../../boot.php:1197 ../../boot.php:1276 msgid "F d" msgstr "" -#: ../../boot.php:1240 ../../boot.php:1314 +#: ../../boot.php:1242 ../../boot.php:1316 msgid "[today]" msgstr "" -#: ../../boot.php:1252 +#: ../../boot.php:1254 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1253 +#: ../../boot.php:1255 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1307 +#: ../../boot.php:1309 msgid "[No description]" msgstr "" -#: ../../boot.php:1325 +#: ../../boot.php:1327 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1326 +#: ../../boot.php:1328 msgid "Events this week:" msgstr "" -#: ../../boot.php:1531 +#: ../../boot.php:1533 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1537 +#: ../../boot.php:1539 msgid "Profile Details" msgstr "" -#: ../../boot.php:1552 +#: ../../boot.php:1554 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1558 +#: ../../boot.php:1560 msgid "Only You Can See This" msgstr "" From 31718968c66b77354ed52b06a2f8f8456dd94ee4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 30 Jun 2012 01:29:29 -0700 Subject: [PATCH 07/77] advanced profile theming --- view/theme/duepuntozero/style.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 997c6d315a..1be81d738e 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; } From 6cc844b2f984f445549acc79105ae32baab20484 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 30 Jun 2012 05:16:30 -0700 Subject: [PATCH 08/77] restore 'shareable' to feeds after recent feed privacy re-factoring --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index f2fb2e97b4..bbb6a1f85b 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -546,7 +546,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { } $likebuttons = ''; - $shareable = ((($profile_owner == local_user()) && (! $item['private'] == 1)) ? true : false); + $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false); if($page_writeable) { /* if($toplevelpost) { */ From a3dfb5502966a9c5cd9f67ecebc94a6633d5cec3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 30 Jun 2012 06:27:46 -0700 Subject: [PATCH 09/77] bug #437 --- boot.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/boot.php b/boot.php index aa016ef0c7..1b15eaa63f 100644 --- a/boot.php +++ b/boot.php @@ -352,6 +352,14 @@ if(! class_exists('App')) { if(x($_SERVER,'SERVER_NAME')) { $this->hostname = $_SERVER['SERVER_NAME']; + if(stristr($this->hostname,'xn--')) { + // PHP or webserver may have converted idn to punycode, so + // convert punycode back to utf-8 + require_once('library/simplepie/idn/idna_convert.class.php'); + $x = new idna_convert(); + $this->hostname = $x->decode($s); + } + if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) $this->hostname .= ':' . $_SERVER['SERVER_PORT']; /** From 7747f6fc96458b94cca2513cff1a7397c7d0b50c Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 30 Jun 2012 17:38:02 -0700 Subject: [PATCH 10/77] rev update --- boot.php | 2 +- util/messages.po | 126 +++++++++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 60 deletions(-) diff --git a/boot.php b/boot.php index 1b15eaa63f..b9272c9a68 100644 --- a/boot.php +++ b/boot.php @@ -10,7 +10,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1389' ); +define ( 'FRIENDICA_VERSION', '3.0.1390' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1151 ); diff --git a/util/messages.po b/util/messages.po index c2ade78808..4cd8ca80a4 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1389\n" +"Project-Id-Version: 3.0.1390\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-29 10:00-0700\n" +"POT-Creation-Date: 2012-06-30 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -137,7 +137,7 @@ msgstr "" #: ../../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/page/page.php:164 +#: ../../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 @@ -228,7 +228,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1551 +#: ../../include/nav.php:52 ../../boot.php:1559 msgid "Events" msgstr "" @@ -283,7 +283,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:429 ../../include/event.php:40 -#: ../../include/bb2diaspora.php:357 ../../boot.php:1128 +#: ../../include/bb2diaspora.php:357 ../../boot.php:1136 msgid "Location:" msgstr "" @@ -364,7 +364,7 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1545 +#: ../../mod/photos.php:46 ../../boot.php:1553 msgid "Photo Albums" msgstr "" @@ -583,7 +583,7 @@ msgstr "" #: ../../mod/photos.php:1342 ../../mod/photos.php:1382 #: ../../mod/photos.php:1413 ../../include/conversation.php:579 -#: ../../boot.php:520 +#: ../../boot.php:528 msgid "Comment" msgstr "" @@ -1217,7 +1217,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1072 +#: ../../include/contact_widgets.php:9 ../../boot.php:1080 msgid "Connect" msgstr "" @@ -1748,7 +1748,7 @@ msgstr "" #: ../../addon/facebook/facebook.php:1190 #: ../../addon/public_server/public_server.php:62 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2890 -#: ../../boot.php:722 +#: ../../boot.php:730 msgid "Administrator" msgstr "" @@ -1758,7 +1758,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:854 +#: ../../mod/lostpass.php:83 ../../boot.php:862 msgid "Password Reset" msgstr "" @@ -2433,7 +2433,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1557 +#: ../../mod/notes.php:44 ../../boot.php:1565 msgid "Personal Notes" msgstr "" @@ -2684,7 +2684,7 @@ msgstr "" #: ../../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:1536 +#: ../../include/nav.php:50 ../../boot.php:1544 msgid "Profile" msgstr "" @@ -2788,7 +2788,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:820 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:828 msgid "Register" msgstr "" @@ -2831,7 +2831,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1542 +#: ../../include/nav.php:51 ../../boot.php:1550 msgid "Photos" msgstr "" @@ -3634,7 +3634,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:985 +#: ../../mod/profile.php:21 ../../boot.php:993 msgid "Requested profile is not available." msgstr "" @@ -4025,23 +4025,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:664 ../../boot.php:1094 +#: ../../mod/profiles.php:664 ../../boot.php:1102 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:665 ../../boot.php:1095 +#: ../../mod/profiles.php:665 ../../boot.php:1103 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:676 ../../boot.php:1105 +#: ../../mod/profiles.php:676 ../../boot.php:1113 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:678 ../../boot.php:1108 +#: ../../mod/profiles.php:678 ../../boot.php:1116 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:679 ../../boot.php:1109 +#: ../../mod/profiles.php:679 ../../boot.php:1117 msgid "Edit visibility" msgstr "" @@ -4671,32 +4671,40 @@ msgstr "" msgid "%s - Click to open/close" msgstr "" -#: ../../addon/page/page.php:58 ../../addon/page/page.php:88 +#: ../../addon/page/page.php:61 ../../addon/page/page.php:91 msgid "Forums" msgstr "" -#: ../../addon/page/page.php:73 ../../addon/page/page.php:107 +#: ../../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:521 +#: ../../include/conversation.php:476 ../../boot.php:529 msgid "show more" msgstr "" -#: ../../addon/page/page.php:125 +#: ../../addon/page/page.php:129 +msgid "Forums:" +msgstr "" + +#: ../../addon/page/page.php:163 msgid "Page settings updated." msgstr "" -#: ../../addon/page/page.php:151 +#: ../../addon/page/page.php:192 msgid "Page Settings" msgstr "" -#: ../../addon/page/page.php:153 +#: ../../addon/page/page.php:194 msgid "How many forums to display on sidebar without paging" msgstr "" -#: ../../addon/page/page.php:156 +#: ../../addon/page/page.php:197 msgid "Randomise Page/Forum list" msgstr "" +#: ../../addon/page/page.php:200 +msgid "Show pages/forums on profile page" +msgstr "" + #: ../../addon/planets/planets.php:150 msgid "Planets Settings" msgstr "" @@ -4709,7 +4717,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:841 +#: ../../include/nav.php:64 ../../boot.php:849 msgid "Login" msgstr "" @@ -6123,7 +6131,7 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1130 +#: ../../include/profile_advanced.php:17 ../../boot.php:1138 msgid "Gender:" msgstr "" @@ -6143,7 +6151,7 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1133 +#: ../../include/profile_advanced.php:37 ../../boot.php:1141 msgid "Status:" msgstr "" @@ -6152,7 +6160,7 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: ../../include/profile_advanced.php:48 ../../boot.php:1135 +#: ../../include/profile_advanced.php:48 ../../boot.php:1143 msgid "Homepage:" msgstr "" @@ -6735,7 +6743,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:840 +#: ../../include/nav.php:46 ../../boot.php:848 msgid "Logout" msgstr "" @@ -6743,7 +6751,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1530 +#: ../../include/nav.php:49 ../../boot.php:1538 msgid "Status" msgstr "" @@ -6823,11 +6831,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1088 +#: ../../include/nav.php:138 ../../boot.php:1096 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1088 +#: ../../include/nav.php:138 ../../boot.php:1096 msgid "Manage/edit profiles" msgstr "" @@ -6839,7 +6847,7 @@ msgstr "" msgid "Site setup and configuration" msgstr "" -#: ../../include/nav.php:169 +#: ../../include/nav.php:170 msgid "Nothing new here" msgstr "" @@ -7611,96 +7619,96 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:519 +#: ../../boot.php:527 msgid "Delete this item?" msgstr "" -#: ../../boot.php:522 +#: ../../boot.php:530 msgid "show fewer" msgstr "" -#: ../../boot.php:717 +#: ../../boot.php:725 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:719 +#: ../../boot.php:727 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:819 +#: ../../boot.php:827 msgid "Create a New Account" msgstr "" -#: ../../boot.php:843 +#: ../../boot.php:851 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:844 +#: ../../boot.php:852 msgid "Password: " msgstr "" -#: ../../boot.php:847 +#: ../../boot.php:855 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:853 +#: ../../boot.php:861 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1020 +#: ../../boot.php:1028 msgid "Edit profile" msgstr "" -#: ../../boot.php:1080 +#: ../../boot.php:1088 msgid "Message" msgstr "" -#: ../../boot.php:1196 ../../boot.php:1275 +#: ../../boot.php:1204 ../../boot.php:1283 msgid "g A l F d" msgstr "" -#: ../../boot.php:1197 ../../boot.php:1276 +#: ../../boot.php:1205 ../../boot.php:1284 msgid "F d" msgstr "" -#: ../../boot.php:1242 ../../boot.php:1316 +#: ../../boot.php:1250 ../../boot.php:1324 msgid "[today]" msgstr "" -#: ../../boot.php:1254 +#: ../../boot.php:1262 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1255 +#: ../../boot.php:1263 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1309 +#: ../../boot.php:1317 msgid "[No description]" msgstr "" -#: ../../boot.php:1327 +#: ../../boot.php:1335 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1328 +#: ../../boot.php:1336 msgid "Events this week:" msgstr "" -#: ../../boot.php:1533 +#: ../../boot.php:1541 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1539 +#: ../../boot.php:1547 msgid "Profile Details" msgstr "" -#: ../../boot.php:1554 +#: ../../boot.php:1562 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1560 +#: ../../boot.php:1568 msgid "Only You Can See This" msgstr "" From 2214cd74e55648367cd40baba88d1e2518215945 Mon Sep 17 00:00:00 2001 From: "Zvi ben Yaakov (a.k.a rdc)" Date: Sun, 1 Jul 2012 14:46:03 +0300 Subject: [PATCH 11/77] Added more profile data and CSS styling to the /directory page --- mod/directory.php | 48 +++++++++++++++++++++--- view/theme/diabook/directory_item.tpl | 35 ++++++++++++++++- view/theme/diabook/style.css | 54 +++++++++++++++++++++++++-- 3 files changed, 127 insertions(+), 10 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 930a575b66..8a5685c9a5 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -73,14 +73,12 @@ function directory_content(&$a) { $order = " ORDER BY `name` ASC "; - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", + $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", intval($a->pager['start']), intval($a->pager['itemspage']) ); if(count($r)) { - $tpl = get_markup_template('directory_item.tpl'); - if(in_array('small', $a->argv)) $photo = 'thumb'; else @@ -113,20 +111,60 @@ function directory_content(&$a) { if(strlen($rr['gender'])) $details .= '
' . t('Gender: ') . $rr['gender']; + if($rr['page-flags'] == PAGE_NORMAL) + $page_type = "Personal Profile"; + if($rr['page-flags'] == PAGE_SOAPBOX) + $page_type = "Fan Page"; + if($rr['page-flags'] == PAGE_COMMUNITY) + $page_type = "Community Forum"; + if($rr['page-flags'] == PAGE_FREELOVE) + $page_type = "Open Forum"; + if($rr['page-flags'] == PAGE_PRVGROUP) + $page_type = "Private Group"; + + $profile = $rr; + + if((x($profile,'address') == 1) + || (x($profile,'locality') == 1) + || (x($profile,'region') == 1) + || (x($profile,'postal-code') == 1) + || (x($profile,'country-name') == 1)) + $location = t('Location:'); + + $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); + + $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); + + $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); + + $about = ((x($profile,'about') == 1) ? t('About:') : False); + + $tpl = get_markup_template('directory_item.tpl'); + $entry = replace_macros($tpl,array( '$id' => $rr['id'], '$profile-link' => $profile_link, '$photo' => $a->get_cached_avatar_image($rr[$photo]), '$alt-text' => $rr['name'], '$name' => $rr['name'], - '$details' => $pdesc . $details - + '$details' => $pdesc . $details, + '$page-type' => $page_type, + '$profile' => $profile, + '$location' => template_escape($location), + '$gender' => $gender, + '$pdesc' => $pdesc, + '$marital' => $marital, + '$homepage' => $homepage, + '$about' => $about, )); $arr = array('contact' => $rr, 'entry' => $entry); call_hooks('directory_item', $arr); + + unset($profile); + unset($location); $o .= $entry; diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl index bc2af16c21..70d1979551 100755 --- a/view/theme/diabook/directory_item.tpl +++ b/view/theme/diabook/directory_item.tpl @@ -3,9 +3,40 @@ -
$name
+
+
$name
+
$page-type
+ {{ if $pdesc }}
$profile.pdesc
{{ endif }} +
+
+ {{ if $location }} +
$location
+
+ {{ if $profile.address }}
$profile.address
{{ endif }} + + $profile.locality{{ if $profile.locality }}, {{ endif }} + $profile.region + $profile.postal-code + + {{ if $profile.country-name }}$profile.country-name{{ endif }} +
+
+ {{ endif }} + + {{ if $gender }}
$gender
$profile.gender
{{ endif }} +
+
+ {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} + + {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} +
+
+
+ {{ if $about }}
$about
$profile.about
{{ endif }} +
+
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 736817c7bf..049fb7ba44 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; } +.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; } From 85c078f862fa6a9ce61d50833c448877ba84147e Mon Sep 17 00:00:00 2001 From: Martin Schmitt Date: Sun, 1 Jul 2012 19:13:24 +0200 Subject: [PATCH 12/77] Esperanto -> 100% --- view/eo/lostpass_eml.tpl | 2 +- view/eo/messages.po | 3414 ++++++++++++++++++++++---------------- view/eo/strings.php | 288 +++- 3 files changed, 2138 insertions(+), 1566 deletions(-) diff --git a/view/eo/lostpass_eml.tpl b/view/eo/lostpass_eml.tpl index aad63b62ab..26d1a3c23a 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 390dea96c0..26d823d734 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 \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 nun 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 " "this profile." msgstr "MalÄusta identaĵo ensalutata. Bonvolu ensaluti en tiun 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 "Connect as an email follower (Coming soon)" msgstr "Konektu kiel retpoÅta sekvanto (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, follow this link to find a public" " Friendica site and join us today." msgstr "Se vi ne estas membro de la libra interkona reto, sekvu ĉi-ligilon por trovi publikan Friendica retejon kaj aliÄi kun ni hodiaÅ­." -#: ../../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 'Activating scheduled tasks'" +msgstr "Se vi ne havas komandlinian version de PHP sur la servilo, vi ne eblas plenumi fonan planitan enketon per cron. Bonvolu legi 'Activating scheduled tasks'" + +#: ../../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 "

What next

" +msgstr "

Kio sekvas nun?

" + +#: ../../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 may still be visible" msgstr "Rispondoj/Åataĵo al viaj publikaj afiÅoj eble 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 -msgid "Connector Settings" -msgstr "Konektiloagordoj" - -#: ../../mod/settings.php:672 -msgid "Email/Mailbox Setup" -msgstr "Agordoj pri RetpoÅto" - -#: ../../mod/settings.php:673 -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." - -#: ../../mod/settings.php:674 -msgid "Last successful email check:" -msgstr "Plej ĵusa sukcesa kontrolo de poÅto:" - -#: ../../mod/settings.php:675 +#: ../../mod/settings.php:685 msgid "Email access is disabled on this site." msgstr "RetpoÅta atingo ne disponeblas ĉi tie." -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:691 +msgid "Connector Settings" +msgstr "Konektiloagordoj" + +#: ../../mod/settings.php:696 +msgid "Email/Mailbox Setup" +msgstr "Agordoj pri RetpoÅto" + +#: ../../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 per retpoÅto (nedeviga), bonvolu specifi kiel konekti al vian retpoÅtkonton." + +#: ../../mod/settings.php:698 +msgid "Last successful email check:" +msgstr "Plej ĵusa sukcesa kontrolo de poÅto:" + +#: ../../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 not published." msgstr "Profilo ne estas publika." -#: ../../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 interesting profile change" msgstr "fari interesan 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 " "'nickname@$sitename'." msgstr "Elektu kaÅnomon por la profilo. Tiu bezonas komenci kun teksta litero. Poste, via profila adreso ĉi tie estos: 'kaÅnomo@$sitename'." -#: ../../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 may be able to " "respond from the sender's profile page." msgstr "Sekura komunikado ne disponeblas. Vi eble 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 - change theme settings" msgstr "DefaÅ­lta sistema etoso - transpasebla de uzantprofiloj - redakti agordoj pri etosoj" -#: ../../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 “%3$s”" msgstr "%1$s ÅanÄis %2$s al “%3$s”" -#: ../../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 "♥ Marital Status:" msgstr "♥ 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 public profile.
It may " "be visible to anybody using the internet." msgstr "Ĉi tio estas via publika profilo. Äœi eble 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 profile wall and your friend" " stream." msgstr "Facebok konversacioj konsistas el via profilmuro kaj la fluo 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.

" -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.

" +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.

" -#: ../../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: "network" or "notifications/system"" +msgstr "Ekzemple: "network" aÅ­ "notifications/system"" + #: ../../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 eble 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" @@ -6496,15 +6842,11 @@ msgstr "Administri/redakti profilojn" 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 " msgstr "%s " -#: ../../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:84 +#: ../../include/enotify.php:80 #, 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]%3$s's %4$s[/url]" +msgstr "%1$s komentis pri [url=%2$s]%4$s de %3$s[/url]" -#: ../../include/enotify.php:85 +#: ../../include/enotify.php:88 +#, php-format +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:98 +#, php-format +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:99 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "%s komentis pri elemento/konversacio kiun vi sekvas." -#: ../../include/enotify.php:86 -#, php-format -msgid "%s commented on %s." -msgstr "%s komentis pri %s." - -#: ../../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" +msgid "%1$s tagged [url=%2$s]your post[/url]" +msgstr "%1$s markis [url=%2$s]vian afiÅon[/url]" -#: ../../include/enotify.php:121 -msgid "your post" -msgstr "vian afiÅon" - -#: ../../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." +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:145 -msgid "a friend suggestion" -msgstr "sugeston por amikiÄi" - -#: ../../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/bb2diaspora.php:102 -msgid "link" -msgstr "ligilo" +#: ../../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/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 "%2$d people like this." msgstr "%2$d homoj Åatas tiun." -#: ../../include/conversation.php:882 +#: ../../include/conversation.php:911 #, php-format msgid "%2$d people don't like this." msgstr "%2$d homojmalÅ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 everybody" msgstr "Videbla al ĉiuj" -#: ../../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 ba2af413ae..2360229938 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 this profile."] = "MalÄusta identaĵo ensalutata. Bonvolu ensaluti en tiun 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 'Activating scheduled tasks'"] = "Se vi ne havas komandlinian version de PHP sur la servilo, vi ne eblas plenumi fonan planitan enketon per cron. Bonvolu legi 'Activating scheduled tasks'"; $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["

What next

"] = "

Kio sekvas nun?

"; +$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["If this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "Se ĉ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 default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Redakti viajn defaÅ­ltan 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 Add New Contact 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 Aldonu Novan Kontakton 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 “%3\$s”"] = "%1\$s ÅanÄis %2\$s al “%3\$s”"; +$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["♥ Marital Status:"] = "♥ 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.

"] = "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.

"; +$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.

"] = "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.

"; $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 RemoteStorage WebFinger"] = "Permesi vian identecon ĉe Friendica (%s) por konekti al eksteraj konservejoj subtenata de unhosted (ekz. OwnCloud). Vidu RemoteStorage WebFinger"; $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: "network" or "notifications/system""] = "Ekzemple: "network" aÅ­ "notifications/system""; $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 public tile servers"] = "Listo de publikaj kahelserviloj"; $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 public postings can be posted $a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) 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."] = "Averto: LaÅ­ viaj privatecaj agordoj (KaÅi viajn profilajn detalojn al nekonataj spektantoj?), 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 public postings can be posted $a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) 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."] = "Averto: LaÅ­ viaj privatecaj agordoj (KaÅi viajn profilajn detalojn al nekonataj spektantoj?), 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 may 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 eble 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 "] = "%s "; $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."; From dd71f9446b05274550ebcb3ce4773762832084e3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Jul 2012 18:56:00 -0700 Subject: [PATCH 13/77] config to disable email validation --- boot.php | 2 +- include/network.php | 3 +++ include/text.php | 4 ++++ include/user.php | 4 ++-- util/messages.po | 16 ++++++++-------- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/boot.php b/boot.php index b9272c9a68..26593bc8f0 100644 --- a/boot.php +++ b/boot.php @@ -10,7 +10,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1390' ); +define ( 'FRIENDICA_VERSION', '3.0.1391' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1151 ); diff --git a/include/network.php b/include/network.php index c1a76000ef..9e6f8355b7 100644 --- a/include/network.php +++ b/include/network.php @@ -607,6 +607,9 @@ function validate_url(&$url) { if(! function_exists('validate_email')) { function validate_email($addr) { + if(get_config('system','disable_email_validation')) + return true; + if(! strpos($addr,'@')) return false; $h = substr($addr,strpos($addr,'@') + 1); diff --git a/include/text.php b/include/text.php index 3b0050d387..c3558c6418 100644 --- a/include/text.php +++ b/include/text.php @@ -656,6 +656,10 @@ function search($s,$id='search-box',$url='/search',$save = false) { if(! function_exists('valid_email')) { function valid_email($x){ + + if(get_config('system','disable_email_validation')) + return true; + if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) return true; return false; diff --git a/include/user.php b/include/user.php index 383a3b3e1c..039b30bbd1 100644 --- a/include/user.php +++ b/include/user.php @@ -99,11 +99,11 @@ function create_user($arr) { if(! allowed_email($email)) - $result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL; + $result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL; if((! valid_email($email)) || (! validate_email($email))) $result['message'] .= t('Not a valid email address.') . EOL; - + // Disallow somebody creating an account using openid that uses the admin email address, // since openid bypasses email verification. We'll allow it if there is not yet an admin account. diff --git a/util/messages.po b/util/messages.po index 4cd8ca80a4..7283a5928a 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1390\n" +"Project-Id-Version: 3.0.1391\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-30 10:00-0700\n" +"POT-Creation-Date: 2012-07-01 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -137,7 +137,7 @@ msgstr "" #: ../../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/page/page.php:208 +#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210 #: ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 @@ -4685,23 +4685,23 @@ msgstr "" msgid "Forums:" msgstr "" -#: ../../addon/page/page.php:163 +#: ../../addon/page/page.php:165 msgid "Page settings updated." msgstr "" -#: ../../addon/page/page.php:192 +#: ../../addon/page/page.php:194 msgid "Page Settings" msgstr "" -#: ../../addon/page/page.php:194 +#: ../../addon/page/page.php:196 msgid "How many forums to display on sidebar without paging" msgstr "" -#: ../../addon/page/page.php:197 +#: ../../addon/page/page.php:199 msgid "Randomise Page/Forum list" msgstr "" -#: ../../addon/page/page.php:200 +#: ../../addon/page/page.php:202 msgid "Show pages/forums on profile page" msgstr "" From e2a725ff986f80e45dac842db51fcc007a9683d9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Jul 2012 19:17:21 -0700 Subject: [PATCH 14/77] pagination start off by one --- boot.php | 2 +- mod/message.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 26593bc8f0..a6fa8e26c2 100644 --- a/boot.php +++ b/boot.php @@ -442,7 +442,7 @@ if(! class_exists('App')) { $this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1); $this->pager['itemspage'] = 50; $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage']; - if($this->pager['start'] < 1) + if($this->pager['start'] < 0) $this->pager['start'] = 1; $this->pager['total'] = 0; } diff --git a/mod/message.php b/mod/message.php index 519634be5b..80d2c6d99a 100644 --- a/mod/message.php +++ b/mod/message.php @@ -224,6 +224,7 @@ function message_content(&$a) { // list messages $o .= $header; + $r = q("SELECT count(*) AS `total` FROM `mail` WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", @@ -232,7 +233,7 @@ function message_content(&$a) { ); if(count($r)) $a->set_pager_total($r[0]['total']); - + $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, count( * ) as count @@ -243,6 +244,7 @@ function message_content(&$a) { intval($a->pager['start']), intval($a->pager['itemspage']) ); + if(! count($r)) { info( t('No messages.') . EOL); return $o; From ab2b3304dc7c30f65297d398661b1eccb2723685 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Jul 2012 19:40:03 -0700 Subject: [PATCH 15/77] ...and the other bit --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index a6fa8e26c2..63e4265d95 100644 --- a/boot.php +++ b/boot.php @@ -443,7 +443,7 @@ if(! class_exists('App')) { $this->pager['itemspage'] = 50; $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage']; if($this->pager['start'] < 0) - $this->pager['start'] = 1; + $this->pager['start'] = 0; $this->pager['total'] = 0; } From 74a819980fad6d79998a70b0f6be44803db7e0c7 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Jul 2012 03:40:12 +0100 Subject: [PATCH 16/77] Various theme stuff. Profile group list for testbubble Screenshot for facepark Various niggles in darkzero/NS --- view/theme/darkzero-NS/style.css | 27 +++++++++++++++++++++++-- view/theme/darkzero/style.css | 31 ++++++++++++++++++++++++----- view/theme/facepark/screenshot.jpg | Bin 0 -> 76017 bytes view/theme/testbubble/style.css | 6 ++++++ 4 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 view/theme/facepark/screenshot.jpg diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css index 9c15329da3..5d1bb6310c 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 8a6099ee81..55644e462d 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/facepark/screenshot.jpg b/view/theme/facepark/screenshot.jpg new file mode 100644 index 0000000000000000000000000000000000000000..37adcc54f354d436859f00f48382ef55ed05d0a6 GIT binary patch literal 76017 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 literal 0 HcmV?d00001 diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 1e63c7ef63..58f31971bf 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 From a9c65dfe2725fd18d2fb1f593f9ffb9841729a96 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Jul 2012 23:00:25 -0700 Subject: [PATCH 17/77] "babel" diagnostic - convert bbcode to different formats and back again --- mod/babel.php | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 mod/babel.php diff --git a/mod/babel.php b/mod/babel.php new file mode 100644 index 0000000000..9d87b47f0f --- /dev/null +++ b/mod/babel.php @@ -0,0 +1,56 @@ +', $s); +} + +function babel_content(&$a) { + + $o .= '

Babel Diagnostic

'; + + $o .= '
'; + $o .= t('Source (bbcode) text:') . EOL . '' . EOL; + $o .= '
'; + + $o .= '

'; + + if(x($_REQUEST,'text')) { + + $text = trim($_REQUEST['text']); + $o .= t("Source input: ") . EOL. EOL; + $o .= visible_lf($text) . EOL. EOL; + + $html = bbcode($text); + $o .= t("bb2html: ") . EOL. EOL; + $o .= $html. EOL. EOL; + + $bbcode = html2bbcode($html); + $o .= t("bb2html2bb: ") . EOL. EOL; + $o .= visible_lf($bbcode) . EOL. EOL; + + $diaspora = bb2diaspora($text); + $o .= t("bb2md: ") . EOL. EOL; + $o .= visible_lf($diaspora) . EOL. EOL; + + $html = Markdown($diaspora); + $o .= t("bb2md2html: ") . EOL. EOL; + $o .= $html. EOL. EOL; + + $bbcode = diaspora2bb($diaspora); + $o .= t("bb2dia2bb: ") . EOL. EOL; + $o .= $bbcode . EOL. EOL; + + $bbcode = html2bbcode($html); + $o .= t("bb2md2html2bb: ") . EOL. EOL; + $o .= $bbcode . EOL. EOL; + + + + } + return $o; +} From 315784444af3145e6afba210731f0104d21f9db3 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Jul 2012 01:11:19 -0700 Subject: [PATCH 18/77] try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff --- include/bb2diaspora.php | 4 ++-- include/bbcode.php | 6 +++++- include/html2bbcode.php | 2 +- mod/babel.php | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 77a5f5c2a0..f17e7b549c 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -38,8 +38,8 @@ function diaspora2bb($s) { $s = Markdown($s); $s = str_replace('#','#',$s); - - $s = str_replace("\n",'
',$s); +// we seem to have double linebreaks +// $s = str_replace("\n",'
',$s); $s = html2bbcode($s); // $s = str_replace('*','*',$s); diff --git a/include/bbcode.php b/include/bbcode.php index 9071c767b6..1c6ce1d45f 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -93,11 +93,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // Convert new line chars to html
tags - $Text = nl2br($Text); + +// $Text = nl2br($Text); + $Text = str_replace(array("\r","\n"), array('
','
'), $Text); + if($preserve_nl) $Text = str_replace(array("\n","\r"), array('',''),$Text); + // Set up the parameters for a URL search string $URLSearchString = "^\[\]"; // Set up the parameters for a MAIL search string diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 69ccf41b71..985c36eaa4 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -124,7 +124,7 @@ function html2bbcode($message) $node->nodeValue = str_replace("\n", "\r", $node->nodeValue); $message = $doc->saveHTML(); - $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "
", " ", ""), $message); + $message = str_replace(array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"), array("<", ">", "
", " ", ""), $message); $message = preg_replace('= [\s]*=i', " ", $message); @$doc->loadHTML($message); diff --git a/mod/babel.php b/mod/babel.php index 9d87b47f0f..1c881a5bd2 100644 --- a/mod/babel.php +++ b/mod/babel.php @@ -43,11 +43,11 @@ function babel_content(&$a) { $bbcode = diaspora2bb($diaspora); $o .= t("bb2dia2bb: ") . EOL. EOL; - $o .= $bbcode . EOL. EOL; + $o .= visible_lf($bbcode) . EOL. EOL; $bbcode = html2bbcode($html); $o .= t("bb2md2html2bb: ") . EOL. EOL; - $o .= $bbcode . EOL. EOL; + $o .= visible_lf($bbcode) . EOL. EOL; From ced0a208d8fecedcf2051be1cd16717a698d881a Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Jul 2012 16:34:01 -0700 Subject: [PATCH 19/77] fix double lines --- boot.php | 2 +- include/bbcode.php | 6 +- util/messages.po | 192 +++++++++++++++++++++++++++------------------ 3 files changed, 120 insertions(+), 80 deletions(-) diff --git a/boot.php b/boot.php index 63e4265d95..1983f44e71 100644 --- a/boot.php +++ b/boot.php @@ -10,7 +10,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1391' ); +define ( 'FRIENDICA_VERSION', '3.0.1392' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1151 ); diff --git a/include/bbcode.php b/include/bbcode.php index 1c6ce1d45f..410f88c96b 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -93,8 +93,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // Convert new line chars to html
tags + // nlbr seems to be hopelessly messed up + // $Text = nl2br($Text); -// $Text = nl2br($Text); + // We'll emulate it. + + $Text = str_replace("\r\n","\n", $Text); $Text = str_replace(array("\r","\n"), array('
','
'), $Text); if($preserve_nl) diff --git a/util/messages.po b/util/messages.po index 7283a5928a..8b082f2aa5 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1391\n" +"Project-Id-Version: 3.0.1392\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-01 10:00-0700\n" +"POT-Creation-Date: 2012-07-02 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -130,7 +130,7 @@ msgstr "" #: ../../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/group.php:85 ../../mod/message.php:216 ../../mod/message.php:412 #: ../../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 @@ -223,7 +223,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:304 ../../include/text.php:1065 +#: ../../mod/events.php:304 ../../include/text.php:1069 msgid "link to source" msgstr "" @@ -282,8 +282,9 @@ msgstr "" msgid "Description:" msgstr "" -#: ../../mod/events.php:429 ../../include/event.php:40 -#: ../../include/bb2diaspora.php:357 ../../boot.php:1136 +#: ../../mod/events.php:429 ../../mod/directory.php:132 +#: ../../include/event.php:40 ../../include/bb2diaspora.php:357 +#: ../../boot.php:1136 msgid "Location:" msgstr "" @@ -417,7 +418,7 @@ msgstr "" #: ../../mod/photos.php:591 ../../mod/like.php:144 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1317 +#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1321 #: ../../include/diaspora.php:1710 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -571,7 +572,7 @@ msgstr "" #: ../../mod/photos.php:1324 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:215 -#: ../../mod/message.php:411 ../../include/conversation.php:371 +#: ../../mod/message.php:413 ../../include/conversation.php:371 #: ../../include/conversation.php:731 ../../include/conversation.php:1012 msgid "Please wait" msgstr "" @@ -669,7 +670,7 @@ msgid "Edit" msgstr "" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:213 ../../mod/message.php:408 +#: ../../mod/message.php:213 ../../mod/message.php:410 #: ../../include/conversation.php:994 msgid "Upload photo" msgstr "" @@ -679,7 +680,7 @@ msgid "Attach file" msgstr "" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:214 ../../mod/message.php:409 +#: ../../mod/message.php:214 ../../mod/message.php:411 #: ../../include/conversation.php:998 msgid "Insert web link" msgstr "" @@ -2490,17 +2491,17 @@ msgid "" msgstr "" #: ../../mod/wallmessage.php:133 ../../mod/message.php:201 -#: ../../mod/message.php:399 +#: ../../mod/message.php:401 msgid "To:" msgstr "" #: ../../mod/wallmessage.php:134 ../../mod/message.php:206 -#: ../../mod/message.php:401 +#: ../../mod/message.php:403 msgid "Subject:" msgstr "" #: ../../mod/wallmessage.php:140 ../../mod/message.php:210 -#: ../../mod/message.php:404 ../../mod/invite.php:113 +#: ../../mod/message.php:406 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2987,55 +2988,55 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:247 +#: ../../mod/message.php:249 msgid "No messages." msgstr "" -#: ../../mod/message.php:254 +#: ../../mod/message.php:256 #, php-format msgid "Unknown sender - %s" msgstr "" -#: ../../mod/message.php:257 +#: ../../mod/message.php:259 #, php-format msgid "You and %s" msgstr "" -#: ../../mod/message.php:260 +#: ../../mod/message.php:262 #, php-format msgid "%s and You" msgstr "" -#: ../../mod/message.php:270 ../../mod/message.php:392 +#: ../../mod/message.php:272 ../../mod/message.php:394 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:273 +#: ../../mod/message.php:275 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:275 +#: ../../mod/message.php:277 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: ../../mod/message.php:310 +#: ../../mod/message.php:312 msgid "Message not available." msgstr "" -#: ../../mod/message.php:375 +#: ../../mod/message.php:377 msgid "Delete message" msgstr "" -#: ../../mod/message.php:394 +#: ../../mod/message.php:396 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:398 +#: ../../mod/message.php:400 msgid "Send Reply" msgstr "" @@ -4017,7 +4018,7 @@ msgid "" "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:624 ../../mod/directory.php:111 +#: ../../mod/profiles.php:624 ../../mod/directory.php:109 msgid "Age: " msgstr "" @@ -4093,6 +4094,38 @@ msgstr "" msgid "No entries." msgstr "" +#: ../../mod/babel.php:17 +msgid "Source (bbcode) text:" +msgstr "" + +#: ../../mod/babel.php:25 +msgid "Source input: " +msgstr "" + +#: ../../mod/babel.php:29 +msgid "bb2html: " +msgstr "" + +#: ../../mod/babel.php:33 +msgid "bb2html2bb: " +msgstr "" + +#: ../../mod/babel.php:37 +msgid "bb2md: " +msgstr "" + +#: ../../mod/babel.php:41 +msgid "bb2md2html: " +msgstr "" + +#: ../../mod/babel.php:45 +msgid "bb2dia2bb: " +msgstr "" + +#: ../../mod/babel.php:49 +msgid "bb2md2html2bb: " +msgstr "" + #: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" @@ -4120,11 +4153,30 @@ msgstr "" msgid "Site Directory" msgstr "" -#: ../../mod/directory.php:114 +#: ../../mod/directory.php:112 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:140 +#: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 +#: ../../boot.php:1138 +msgid "Gender:" +msgstr "" + +#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 +#: ../../boot.php:1141 +msgid "Status:" +msgstr "" + +#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 +#: ../../boot.php:1143 +msgid "Homepage:" +msgstr "" + +#: ../../mod/directory.php:140 ../../include/profile_advanced.php:58 +msgid "About:" +msgstr "" + +#: ../../mod/directory.php:178 msgid "No entries (some entries may be hidden)." msgstr "" @@ -4745,7 +4797,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1315 +#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1319 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -6131,10 +6183,6 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1138 -msgid "Gender:" -msgstr "" - #: ../../include/profile_advanced.php:22 msgid "j F, Y" msgstr "" @@ -6151,19 +6199,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1141 -msgid "Status:" -msgstr "" - #: ../../include/profile_advanced.php:43 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/profile_advanced.php:48 ../../boot.php:1143 -msgid "Homepage:" -msgstr "" - #: ../../include/profile_advanced.php:52 msgid "Tags:" msgstr "" @@ -6172,10 +6212,6 @@ msgstr "" msgid "Religion:" msgstr "" -#: ../../include/profile_advanced.php:58 -msgid "About:" -msgstr "" - #: ../../include/profile_advanced.php:60 msgid "Hobbies/Interests:" msgstr "" @@ -6564,127 +6600,127 @@ msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:835 +#: ../../include/text.php:839 msgid "Monday" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:839 msgid "Tuesday" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:839 msgid "Wednesday" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:839 msgid "Thursday" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:839 msgid "Friday" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:839 msgid "Saturday" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:839 msgid "Sunday" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "January" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "February" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "March" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "April" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "May" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "June" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "July" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "August" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "September" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "October" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "November" msgstr "" -#: ../../include/text.php:839 +#: ../../include/text.php:843 msgid "December" msgstr "" -#: ../../include/text.php:925 +#: ../../include/text.php:929 msgid "bytes" msgstr "" -#: ../../include/text.php:945 ../../include/text.php:960 +#: ../../include/text.php:949 ../../include/text.php:964 msgid "remove" msgstr "" -#: ../../include/text.php:945 ../../include/text.php:960 +#: ../../include/text.php:949 ../../include/text.php:964 msgid "[remove]" msgstr "" -#: ../../include/text.php:948 +#: ../../include/text.php:952 msgid "Categories:" msgstr "" -#: ../../include/text.php:963 +#: ../../include/text.php:967 msgid "Filed under:" msgstr "" -#: ../../include/text.php:979 ../../include/text.php:991 +#: ../../include/text.php:983 ../../include/text.php:995 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1097 ../../include/user.php:236 +#: ../../include/text.php:1101 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1109 +#: ../../include/text.php:1113 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1319 +#: ../../include/text.php:1323 msgid "activity" msgstr "" -#: ../../include/text.php:1321 +#: ../../include/text.php:1325 msgid "comment" msgstr "" -#: ../../include/text.php:1322 +#: ../../include/text.php:1326 msgid "post" msgstr "" -#: ../../include/text.php:1477 +#: ../../include/text.php:1481 msgid "Item filed" msgstr "" @@ -6696,7 +6732,7 @@ msgstr "" msgid "Attachments:" msgstr "" -#: ../../include/network.php:839 +#: ../../include/network.php:842 msgid "view full size" msgstr "" @@ -7011,11 +7047,11 @@ msgstr "" msgid "From: " msgstr "" -#: ../../include/bbcode.php:216 ../../include/bbcode.php:236 +#: ../../include/bbcode.php:220 ../../include/bbcode.php:240 msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:251 ../../include/bbcode.php:328 +#: ../../include/bbcode.php:255 ../../include/bbcode.php:332 msgid "Image/photo" msgstr "" From f7144e671c79302f33ef2928955d8100a4ab4cc6 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Jul 2012 16:56:37 -0700 Subject: [PATCH 20/77] fix diabook directory pages (only the normal style - any volunteers for the wide?) --- view/theme/diabook/diabook-aerith/style.css | 57 +++++++++++++++++++-- view/theme/diabook/diabook-blue/style.css | 57 +++++++++++++++++++-- view/theme/diabook/diabook-dark/style.css | 57 +++++++++++++++++++-- view/theme/diabook/diabook-green/style.css | 57 +++++++++++++++++++-- view/theme/diabook/diabook-pink/style.css | 57 +++++++++++++++++++-- view/theme/diabook/diabook-red/style.css | 57 +++++++++++++++++++-- 6 files changed, 318 insertions(+), 24 deletions(-) diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index b512c8bfe2..6b772edf2f 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; } + +.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.css b/view/theme/diabook/diabook-blue/style.css index e7f3fd0bc8..b1de266082 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; } + +.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 189bd30bf4..844ed369e9 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; } + +.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.css b/view/theme/diabook/diabook-green/style.css index 762310e4db..111c31cfef 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; } + +.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.css b/view/theme/diabook/diabook-pink/style.css index 248e3ead07..b0b768df21 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; } + +.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.css b/view/theme/diabook/diabook-red/style.css index 37e26b8b93..16b42d0e10 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; } + +.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; From 3fe5bdbd8de265ffe558fb3c91eac64ccdd2d158 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Thu, 28 Jun 2012 10:33:21 -0600 Subject: [PATCH 21/77] add ability to set maximum pixel length of uploaded pictures --- boot.php | 18 ++++++++++++++++++ mod/photos.php | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/boot.php b/boot.php index 1983f44e71..4c42f19a71 100644 --- a/boot.php +++ b/boot.php @@ -34,6 +34,24 @@ define ( 'JPEG_QUALITY', 100 ); */ define ( 'PNG_QUALITY', 8 ); +/** + * + * An alternate way of limiting picture upload sizes. Specify the maximum pixel + * length that pictures are allowed to be (for non-square pictures, it will apply + * to the longest side). Pictures longer than this length will be resized to be + * this length (on the longest side, the other side will be scaled appropriately). + * Modify this value using + * + * $a->config['system']['max_image_length'] = n; + * + * in .htconfig.php + * + * If you don't want to set a maximum length, set to -1. The default value is + * defined by 'MAX_IMAGE_LENGTH' below. + * + */ +define ( 'MAX_IMAGE_LENGTH', -1 ); + /** * Not yet used diff --git a/mod/photos.php b/mod/photos.php index ea4d7f81f5..624f0bdcaa 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -743,6 +743,12 @@ function photos_post(&$a) { $ph->orient($src); @unlink($src); + $max_length = get_config('system','max_image_length'); + if(! $max_length) + $max_length = MAX_IMAGE_LENGTH; + if($max_length > 0) + $ph->scaleImage($max_length); + $width = $ph->getWidth(); $height = $ph->getHeight(); From 424797138fc9f0d8ce62960c7f99878fe620440c Mon Sep 17 00:00:00 2001 From: "Zvi ben Yaakov (a.k.a rdc)" Date: Tue, 3 Jul 2012 21:49:02 +0300 Subject: [PATCH 22/77] Limiting .directory-photo-wrapper styles to
so as not to interfere with .directory-photo-wrapper in