From 6faadc966278822299ae35e0f1b790375378711f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 13 Dec 2012 14:15:18 -0800 Subject: [PATCH] anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported. --- boot.php | 2 +- mods/sample-nginx.config | 2 +- util/messages.po | 190 ++++++++++++++++++++++++--------------- view/search_item.tpl | 4 +- view/wall_thread.tpl | 4 +- 5 files changed, 123 insertions(+), 79 deletions(-) diff --git a/boot.php b/boot.php index 2684f726dc..2e1f47d748 100644 --- a/boot.php +++ b/boot.php @@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1555' ); +define ( 'FRIENDICA_VERSION', '3.1.1556' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1157 ); diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config index 843b4b7169..37ad5ed269 100644 --- a/mods/sample-nginx.config +++ b/mods/sample-nginx.config @@ -66,7 +66,7 @@ server { # block these file types - location ~* \.(tpl|md|git|tgz) { + location ~* \.(tpl|md|git|tgz|log|out) { deny all; } diff --git a/util/messages.po b/util/messages.po index 5518cf384e..a663db090f 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.1.1555\n" +"Project-Id-Version: 3.1.1556\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-12 10:00-0800\n" +"POT-Creation-Date: 2012-12-13 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,9 +57,10 @@ msgstr "" #: ../../mod/profiles.php:431 ../../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:510 -#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 -#: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3977 +#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166 +#: ../../addon/fbpost/fbpost.php:172 +#: ../../addon/dav/friendica/layout.fnk.php:354 +#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3977 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -142,10 +143,10 @@ msgstr "" #: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445 #: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028 #: ../../mod/admin.php:1115 ../../mod/profiles.php:604 -#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40 +#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 -#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76 +#: ../../addon/fbpost/fbpost.php:272 ../../addon/yourls/yourls.php:76 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 @@ -154,16 +155,17 @@ msgstr "" #: ../../addon/remote_permissions/remote_permissions.php:195 #: ../../addon/startpage/startpage.php:92 #: ../../addon/geonames/geonames.php:187 -#: ../../addon/forumlist/forumlist.php:175 +#: ../../addon/forumlist/forumlist.php:178 #: ../../addon/impressum/impressum.php:83 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/group_text/group_text.php:84 #: ../../addon/libravatar/libravatar.php:99 -#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87 -#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 -#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95 +#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91 +#: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42 +#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98 +#: ../../addon/gravatar/gravatar.php:95 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 #: ../../addon/jappixmini/jappixmini.php:307 #: ../../addon/statusnet/statusnet.php:278 @@ -171,7 +173,7 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:685 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:700 ../../addon/tumblr/tumblr.php:233 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 @@ -2068,7 +2070,7 @@ msgstr "" #: ../../mod/register.php:91 ../../mod/register.php:145 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 -#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 +#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777 #: ../../addon/public_server/public_server.php:62 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 #: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702 @@ -2194,12 +2196,12 @@ msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" #: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495 -#: ../../addon/fbpost/fbpost.php:144 +#: ../../addon/fbpost/fbpost.php:151 #: ../../addon/remote_permissions/remote_permissions.php:204 #: ../../addon/impressum/impressum.php:78 #: ../../addon/openstreetmap/openstreetmap.php:80 -#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:501 +#: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66 +#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:501 #: ../../addon.old/facebook/facebook.php:495 #: ../../addon.old/fbpost/fbpost.php:144 #: ../../addon.old/impressum/impressum.php:78 @@ -2215,13 +2217,13 @@ msgid "Add application" msgstr "" #: ../../mod/settings.php:562 ../../mod/settings.php:588 -#: ../../addon/statusnet/statusnet.php:679 +#: ../../addon/statusnet/statusnet.php:694 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "" #: ../../mod/settings.php:563 ../../mod/settings.php:589 -#: ../../addon/statusnet/statusnet.php:678 +#: ../../addon/statusnet/statusnet.php:693 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "" @@ -2327,6 +2329,7 @@ msgid "Security:" msgstr "" #: ../../mod/settings.php:731 ../../mod/settings.php:736 +#: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249 #: ../../addon/dav/common/wdcal_edit.inc.php:191 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191 msgid "None" @@ -2766,7 +2769,7 @@ msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:770 #: ../../addon/privacy_image_cache/privacy_image_cache.php:281 -#: ../../addon/fbpost/fbpost.php:267 +#: ../../addon/fbpost/fbpost.php:314 #: ../../addon/dav/friendica/layout.fnk.php:441 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688 #: ../../addon.old/facebook/facebook.php:770 @@ -2968,7 +2971,7 @@ msgid "Connecting" msgstr "" #: ../../mod/newmember.php:49 ../../mod/newmember.php:51 -#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239 +#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:286 #: ../../include/contact_selectors.php:81 #: ../../addon.old/facebook/facebook.php:728 #: ../../addon.old/fbpost/fbpost.php:239 @@ -3654,7 +3657,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:676 +#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:691 #: ../../addon.old/statusnet/statusnet.php:567 msgid "Site name" msgstr "" @@ -4929,22 +4932,22 @@ msgstr "" msgid "%1$s has joined %2$s" msgstr "" -#: ../../addon/fromgplus/fromgplus.php:29 +#: ../../addon/fromgplus/fromgplus.php:33 #: ../../addon.old/fromgplus/fromgplus.php:29 msgid "Google+ Import Settings" msgstr "" -#: ../../addon/fromgplus/fromgplus.php:32 +#: ../../addon/fromgplus/fromgplus.php:36 #: ../../addon.old/fromgplus/fromgplus.php:32 msgid "Enable Google+ Import" msgstr "" -#: ../../addon/fromgplus/fromgplus.php:35 +#: ../../addon/fromgplus/fromgplus.php:39 #: ../../addon.old/fromgplus/fromgplus.php:35 msgid "Google Account ID" msgstr "" -#: ../../addon/fromgplus/fromgplus.php:55 +#: ../../addon/fromgplus/fromgplus.php:59 #: ../../addon.old/fromgplus/fromgplus.php:55 msgid "Google+ Import Settings saved." msgstr "" @@ -4959,7 +4962,7 @@ msgstr "" msgid "Updating contacts" msgstr "" -#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192 +#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:199 #: ../../addon.old/facebook/facebook.php:551 #: ../../addon.old/fbpost/fbpost.php:192 msgid "Facebook API key is missing." @@ -4980,7 +4983,7 @@ msgstr "" msgid "Remove Facebook connector" msgstr "" -#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217 +#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:224 #: ../../addon.old/facebook/facebook.php:576 #: ../../addon.old/fbpost/fbpost.php:217 msgid "" @@ -4988,7 +4991,7 @@ msgid "" "changed.]" msgstr "" -#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224 +#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:231 #: ../../addon.old/facebook/facebook.php:583 #: ../../addon.old/fbpost/fbpost.php:224 msgid "Post to Facebook by default" @@ -5068,13 +5071,13 @@ msgstr "" msgid "Facebook Connector Settings" msgstr "" -#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255 +#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:302 #: ../../addon.old/facebook/facebook.php:744 #: ../../addon.old/fbpost/fbpost.php:255 msgid "Facebook API Key" msgstr "" -#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:262 +#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:309 #: ../../addon.old/facebook/facebook.php:754 #: ../../addon.old/fbpost/fbpost.php:262 msgid "" @@ -5102,13 +5105,13 @@ msgid "" "going on." msgstr "" -#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264 +#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:311 #: ../../addon.old/facebook/facebook.php:766 #: ../../addon.old/fbpost/fbpost.php:264 msgid "App-ID / API-Key" msgstr "" -#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265 +#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:312 #: ../../addon.old/facebook/facebook.php:767 #: ../../addon.old/fbpost/fbpost.php:265 msgid "Application secret" @@ -5152,7 +5155,7 @@ msgstr "" msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282 +#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:329 #: ../../addon/dav/friendica/layout.fnk.php:361 #: ../../addon.old/facebook/facebook.php:799 #: ../../addon.old/fbpost/fbpost.php:282 @@ -5160,13 +5163,13 @@ msgstr "" msgid "The new values have been saved." msgstr "" -#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301 +#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:348 #: ../../addon.old/facebook/facebook.php:823 #: ../../addon.old/fbpost/fbpost.php:301 msgid "Post to Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399 +#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:446 #: ../../addon.old/facebook/facebook.php:921 #: ../../addon.old/fbpost/fbpost.php:399 msgid "" @@ -5174,31 +5177,31 @@ msgid "" "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610 +#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:722 #: ../../addon.old/facebook/facebook.php:1149 #: ../../addon.old/fbpost/fbpost.php:610 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643 +#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:759 #: ../../addon.old/facebook/facebook.php:1182 #: ../../addon.old/fbpost/fbpost.php:643 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683 +#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:799 #: ../../addon.old/facebook/facebook.php:1222 #: ../../addon.old/fbpost/fbpost.php:683 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "" -#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684 +#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:800 #: ../../addon.old/facebook/facebook.php:1223 #: ../../addon.old/fbpost/fbpost.php:684 msgid "Facebook connection became invalid" msgstr "" -#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685 +#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:801 #: ../../addon.old/facebook/facebook.php:1224 #: ../../addon.old/fbpost/fbpost.php:685 #, php-format @@ -5250,23 +5253,31 @@ msgstr "" msgid "Delete the whole cache" msgstr "" -#: ../../addon/fbpost/fbpost.php:172 ../../addon.old/fbpost/fbpost.php:172 +#: ../../addon/fbpost/fbpost.php:179 ../../addon.old/fbpost/fbpost.php:172 msgid "Facebook Post disabled" msgstr "" -#: ../../addon/fbpost/fbpost.php:199 ../../addon.old/fbpost/fbpost.php:199 +#: ../../addon/fbpost/fbpost.php:206 ../../addon.old/fbpost/fbpost.php:199 msgid "Facebook Post" msgstr "" -#: ../../addon/fbpost/fbpost.php:205 ../../addon.old/fbpost/fbpost.php:205 +#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:205 msgid "Install Facebook Post connector for this account." msgstr "" -#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:212 +#: ../../addon/fbpost/fbpost.php:219 ../../addon.old/fbpost/fbpost.php:212 msgid "Remove Facebook Post connector" msgstr "" -#: ../../addon/fbpost/fbpost.php:240 ../../addon.old/fbpost/fbpost.php:240 +#: ../../addon/fbpost/fbpost.php:235 +msgid "Suppress \"View on friendica\"" +msgstr "" + +#: ../../addon/fbpost/fbpost.php:245 +msgid "Post to page/group:" +msgstr "" + +#: ../../addon/fbpost/fbpost.php:287 ../../addon.old/fbpost/fbpost.php:240 msgid "Facebook Post Settings" msgstr "" @@ -5574,12 +5585,12 @@ msgid "%s - Click to open/close" msgstr "" #: ../../addon/page/page.php:62 ../../addon/page/page.php:92 -#: ../../addon/forumlist/forumlist.php:60 ../../addon.old/page/page.php:62 +#: ../../addon/forumlist/forumlist.php:64 ../../addon.old/page/page.php:62 #: ../../addon.old/page/page.php:92 ../../addon.old/forumlist/forumlist.php:60 msgid "Forums" msgstr "" -#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:94 +#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:98 #: ../../addon.old/page/page.php:130 #: ../../addon.old/forumlist/forumlist.php:94 msgid "Forums:" @@ -6501,6 +6512,7 @@ msgid "may only be a partial list" msgstr "" #: ../../addon/remote_permissions/remote_permissions.php:196 +#: ../../addon/altpager/altpager.php:99 msgid "Global" msgstr "" @@ -6509,6 +6521,7 @@ msgid "The posts of every user on this server show the post recipients" msgstr "" #: ../../addon/remote_permissions/remote_permissions.php:197 +#: ../../addon/altpager/altpager.php:100 msgid "Individual" msgstr "" @@ -6604,37 +6617,37 @@ msgstr "" msgid "Upload was cancelled, or server error encountered" msgstr "" -#: ../../addon/forumlist/forumlist.php:63 +#: ../../addon/forumlist/forumlist.php:67 #: ../../addon.old/forumlist/forumlist.php:63 msgid "show/hide" msgstr "" -#: ../../addon/forumlist/forumlist.php:77 +#: ../../addon/forumlist/forumlist.php:81 #: ../../addon.old/forumlist/forumlist.php:77 msgid "No forum subscriptions" msgstr "" -#: ../../addon/forumlist/forumlist.php:131 +#: ../../addon/forumlist/forumlist.php:134 #: ../../addon.old/forumlist/forumlist.php:131 msgid "Forumlist settings updated." msgstr "" -#: ../../addon/forumlist/forumlist.php:159 +#: ../../addon/forumlist/forumlist.php:162 #: ../../addon.old/forumlist/forumlist.php:159 msgid "Forumlist Settings" msgstr "" -#: ../../addon/forumlist/forumlist.php:161 +#: ../../addon/forumlist/forumlist.php:164 #: ../../addon.old/forumlist/forumlist.php:161 msgid "Randomise forum list" msgstr "" -#: ../../addon/forumlist/forumlist.php:164 +#: ../../addon/forumlist/forumlist.php:167 #: ../../addon.old/forumlist/forumlist.php:164 msgid "Show forums on profile page" msgstr "" -#: ../../addon/forumlist/forumlist.php:167 +#: ../../addon/forumlist/forumlist.php:170 #: ../../addon.old/forumlist/forumlist.php:167 msgid "Show forums on network page" msgstr "" @@ -6830,10 +6843,7 @@ msgid "The default zoom level. (1:world, 18:highest)" msgstr "" #: ../../addon/group_text/group_text.php:46 -#: ../../addon/editplain/editplain.php:46 -#: ../../addon.old/group_text/group_text.php:46 -#: ../../addon.old/editplain/editplain.php:46 -msgid "Editplain settings updated." +msgid "Group Text settings updated." msgstr "" #: ../../addon/group_text/group_text.php:76 @@ -6964,16 +6974,24 @@ msgstr "" msgid "Altpager settings updated." msgstr "" -#: ../../addon/altpager/altpager.php:79 +#: ../../addon/altpager/altpager.php:83 #: ../../addon.old/altpager/altpager.php:79 msgid "Alternate Pagination Setting" msgstr "" -#: ../../addon/altpager/altpager.php:81 +#: ../../addon/altpager/altpager.php:85 #: ../../addon.old/altpager/altpager.php:81 msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?" msgstr "" +#: ../../addon/altpager/altpager.php:99 +msgid "Force global use of the alternate pager" +msgstr "" + +#: ../../addon/altpager/altpager.php:100 +msgid "Each user chooses whether to use the alternate pager" +msgstr "" + #: ../../addon/mathjax/mathjax.php:37 ../../addon.old/mathjax/mathjax.php:37 msgid "" "The MathJax addon renders mathematical formulae written using the LaTeX " @@ -6995,6 +7013,12 @@ msgid "" "be either the MathJax CDN or another installation of MathJax." msgstr "" +#: ../../addon/editplain/editplain.php:46 +#: ../../addon.old/group_text/group_text.php:46 +#: ../../addon.old/editplain/editplain.php:46 +msgid "Editplain settings updated." +msgstr "" + #: ../../addon/editplain/editplain.php:76 #: ../../addon.old/editplain/editplain.php:76 msgid "Editplain Settings" @@ -7303,7 +7327,7 @@ msgstr "" msgid "Clear OAuth configuration" msgstr "" -#: ../../addon/statusnet/statusnet.php:677 +#: ../../addon/statusnet/statusnet.php:692 #: ../../addon.old/statusnet/statusnet.php:568 msgid "API URL" msgstr "" @@ -7313,30 +7337,42 @@ msgstr "" msgid "Infinite Improbability Drive" msgstr "" -#: ../../addon/tumblr/tumblr.php:36 ../../addon.old/tumblr/tumblr.php:36 +#: ../../addon/tumblr/tumblr.php:144 +msgid "You are now authenticated to tumblr." +msgstr "" + +#: ../../addon/tumblr/tumblr.php:145 +msgid "return to the connector page" +msgstr "" + +#: ../../addon/tumblr/tumblr.php:158 ../../addon.old/tumblr/tumblr.php:36 msgid "Post to Tumblr" msgstr "" -#: ../../addon/tumblr/tumblr.php:67 ../../addon.old/tumblr/tumblr.php:67 +#: ../../addon/tumblr/tumblr.php:185 ../../addon.old/tumblr/tumblr.php:67 msgid "Tumblr Post Settings" msgstr "" -#: ../../addon/tumblr/tumblr.php:69 ../../addon.old/tumblr/tumblr.php:69 +#: ../../addon/tumblr/tumblr.php:188 +msgid "(Re-)Authenticate your tumblr page" +msgstr "" + +#: ../../addon/tumblr/tumblr.php:192 ../../addon.old/tumblr/tumblr.php:69 msgid "Enable Tumblr Post Plugin" msgstr "" -#: ../../addon/tumblr/tumblr.php:74 ../../addon.old/tumblr/tumblr.php:74 -msgid "Tumblr login" -msgstr "" - -#: ../../addon/tumblr/tumblr.php:79 ../../addon.old/tumblr/tumblr.php:79 -msgid "Tumblr password" -msgstr "" - -#: ../../addon/tumblr/tumblr.php:84 ../../addon.old/tumblr/tumblr.php:84 +#: ../../addon/tumblr/tumblr.php:197 ../../addon.old/tumblr/tumblr.php:84 msgid "Post to Tumblr by default" msgstr "" +#: ../../addon/tumblr/tumblr.php:217 +msgid "Post to page:" +msgstr "" + +#: ../../addon/tumblr/tumblr.php:228 +msgid "You are not authenticated to tumblr" +msgstr "" + #: ../../addon/numfriends/numfriends.php:46 #: ../../addon.old/numfriends/numfriends.php:46 msgid "Numfriends settings updated." @@ -9654,3 +9690,11 @@ msgstr "" #: ../../addon.old/oembed.old/oembed.php:71 msgid "URL to embed:" msgstr "" + +#: ../../addon.old/tumblr/tumblr.php:74 +msgid "Tumblr login" +msgstr "" + +#: ../../addon.old/tumblr/tumblr.php:79 +msgid "Tumblr password" +msgstr "" diff --git a/view/search_item.tpl b/view/search_item.tpl index dfdee1fabc..384f6087ac 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -31,12 +31,12 @@
$item.body
{{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
{{ endif }} {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
{{ endif }}
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl index bcb74ec704..e22cb4c3fb 100644 --- a/view/wall_thread.tpl +++ b/view/wall_thread.tpl @@ -50,12 +50,12 @@ {{ endfor }}
{{ if $item.has_cats }} -
$item.txt_cats {{ for $item.categories as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} [$remove]{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
{{ endif }} {{ if $item.has_folders }} -
$item.txt_folders {{ for $item.folders as $cat }}$cat.name [$remove] {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }} +
$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl}} [$remove]{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
{{ endif }}