diff --git a/.tx/config b/.tx/config deleted file mode 100644 index 50b8ef45..00000000 --- a/.tx/config +++ /dev/null @@ -1,392 +0,0 @@ -[main] -host = https://www.transifex.com - -[friendica.addon_appnet_messagespo] -file_filter = appnet/lang//messages.po -source_file = appnet/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_blackout_messagespo] -file_filter = blackout/lang//messages.po -source_file = blackout/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_blockem_messagespo] -file_filter = blockem/lang//messages.po -source_file = blockem/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_blogger_messagespo] -file_filter = blogger/lang//messages.po -source_file = blogger/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_buffer_messagespo] -file_filter = buffer/lang//messages.po -source_file = buffer/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_buglink_messagespo] -file_filter = buglink/lang//messages.po -source_file = buglink/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_cal_messagespo] -file_filter = cal/lang//messages.po -source_file = cal/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_communityhome_messagespo] -file_filter = communityhome/lang//messages.po -source_file = communityhome/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_curweather_messagespo] -file_filter = curweather/lang//messages.po -source_file = curweather/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_dav_messagespo] -file_filter = dav/lang//messages.po -source_file = dav/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_diaspora_messagespo] -file_filter = diaspora/lang//messages.po -source_file = diaspora/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_dwpost_messagespo] -file_filter = dwpost/lang//messages.po -source_file = dwpost/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_editplain_messagespo] -file_filter = editplain/lang//messages.po -source_file = editplain/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_forumdirectory_messagespo] -file_filter = forumdirectory/lang//messages.po -source_file = forumdirectory/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_forumlist_messagespo] -file_filter = forumlist/lang//messages.po -source_file = forumlist/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_fromapp_messagespo] -file_filter = fromapp/lang//messages.po -source_file = fromapp/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_fromgplus_messagespo] -file_filter = fromgplus/lang//messages.po -source_file = fromgplus/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_geonames_messagespo] -file_filter = geonames/lang//messages.po -source_file = geonames/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_gnot_messagespo] -file_filter = gnot/lang//messages.po -source_file = gnot/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_gpluspost_messagespo] -file_filter = gpluspost/lang//messages.po -source_file = gpluspost/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_gravatar_messagespo] -file_filter = gravatar/lang//messages.po -source_file = gravatar/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_group_text_messagespo] -file_filter = group_text/lang//messages.po -source_file = group_text/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_ijpost_messagespo] -file_filter = ijpost/lang//messages.po -source_file = ijpost/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_impressum_messagespo] -file_filter = impressum/lang//messages.po -source_file = impressum/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_infiniteimprobabilitydrive_messagespo] -file_filter = infiniteimprobabilitydrive/lang//messages.po -source_file = infiniteimprobabilitydrive/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_irc_messagespo] -file_filter = irc/lang//messages.po -source_file = irc/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_jappixmini_messagespo] -file_filter = jappixmini/lang//messages.po -source_file = jappixmini/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_js_upload_messagespo] -file_filter = js_upload/lang//messages.po -source_file = js_upload/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_krynn_messagespo] -file_filter = krynn/lang//messages.po -source_file = krynn/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_langfilter_messagespo] -file_filter = langfilter/lang//messages.po -source_file = langfilter/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_libertree_messagespo] -file_filter = libertree/lang//messages.po -source_file = libertree/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_libravatar_messagespo] -file_filter = libravatar/lang//messages.po -source_file = libravatar/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_ljpost_messagespo] -file_filter = ljpost/lang//messages.po -source_file = ljpost/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_mailstream_messagespo] -file_filter = mailstream/lang//messages.po -source_file = mailstream/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_morepokes_messagespo] -file_filter = morepokes/lang//messages.po -source_file = morepokes/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_newmemberwidget_messagespo] -file_filter = newmemberwidget/lang//messages.po -source_file = newmemberwidget/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_notifyall_messagespo] -file_filter = notifyall/lang//messages.po -source_file = notifyall/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_notimeline_messagespo] -file_filter = notimeline/lang//messages.po -source_file = notimeline/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_nsfw_messagespo] -file_filter = nsfw/lang//messages.po -source_file = nsfw/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_numfriends_messagespo] -file_filter = numfriends/lang//messages.po -source_file = numfriends/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_openstreetmap_messagespo] -file_filter = openstreetmap/lang//messages.po -source_file = openstreetmap/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_pageheader_messagespo] -file_filter = pageheader/lang//messages.po -source_file = pageheader/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_piwik_messagespo] -file_filter = piwik/lang//messages.po -source_file = piwik/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_planets_messagespo] -file_filter = planets/lang//messages.po -source_file = planets/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_public_server_messagespo] -file_filter = public_server/lang//messages.po -source_file = public_server/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_pumpio_messagespo] -file_filter = pumpio/lang//messages.po -source_file = pumpio/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_qcomment_messagespo] -file_filter = qcomment/lang//messages.po -source_file = qcomment/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_randplace_messagespo] -file_filter = randplace/lang//messages.po -source_file = randplace/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_remote_permissions_messagespo] -file_filter = remote_permissions/lang//messages.po -source_file = remote_permissions/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_rendertime_messagespo] -file_filter = rendertime/lang//messages.po -source_file = rendertime/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_showmore_messagespo] -file_filter = showmore/lang//messages.po -source_file = showmore/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_smileybutton_messagespo] -file_filter = smileybutton/lang//messages.po -source_file = smileybutton/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_snautofollow_messagespo] -file_filter = snautofollow/lang//messages.po -source_file = snautofollow/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_startpage_messagespo] -file_filter = startpage/lang//messages.po -source_file = startpage/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_statusnet_messagespo] -file_filter = statusnet/lang//messages.po -source_file = statusnet/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_superblock_messagespo] -file_filter = superblock/lang//messages.po -source_file = superblock/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_testdrive_messagespo] -file_filter = testdrive/lang//messages.po -source_file = testdrive/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_tictac_messagespo] -file_filter = tictac/lang//messages.po -source_file = tictac/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_tumblr_messagespo] -file_filter = tumblr/lang//messages.po -source_file = tumblr/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_twitter_messagespo] -file_filter = twitter/lang//messages.po -source_file = twitter/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_uhremotestorage_messagespo] -file_filter = uhremotestorage/lang//messages.po -source_file = uhremotestorage/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_webrtc_messagespo] -file_filter = webrtc/lang//messages.po -source_file = webrtc/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_windowsphonepush_messagespo] -file_filter = windowsphonepush/lang//messages.po -source_file = windowsphonepush/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_wppost_messagespo] -file_filter = wppost/lang//messages.po -source_file = wppost/lang/C/messages.po -source_lang = en -type = PO - -[friendica.addon_yourls_messagespo] -file_filter = yourls/lang//messages.po -source_file = yourls/lang/C/messages.po -source_lang = en -type = PO diff --git a/appnet/appnet.php b/appnet/appnet.php index 0c53a49f..042b2f8c 100644 --- a/appnet/appnet.php +++ b/appnet/appnet.php @@ -5,6 +5,7 @@ * Description: Bidirectional (posting and reading) connector for app.net. * Version: 0.2 * Author: Michael Vogel + * Status: Unsupported */ /* @@ -1118,36 +1119,11 @@ function appnet_expand_annotations($a, $annotations) { function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { - if (function_exists("update_gcontact")) - update_gcontact(array("url" => $contact["canonical_url"], "generation" => 2, - "network" => NETWORK_APPNET, "photo" => $contact["avatar_image"]["url"], - "name" => $contact["name"], "nick" => $contact["username"], - "about" => $contact["description"]["text"], "hide" => true, - "addr" => $contact["username"]."@app.net")); - else { - // Old Code - $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", - dbesc(normalise_link($contact["canonical_url"]))); - - if (count($r) == 0) - q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", - dbesc(normalise_link($contact["canonical_url"])), - dbesc($contact["name"]), - dbesc($contact["username"]), - dbesc($contact["avatar_image"]["url"])); - else - q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'", - dbesc($contact["name"]), - dbesc($contact["username"]), - dbesc($contact["avatar_image"]["url"]), - dbesc(normalise_link($contact["canonical_url"]))); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'", - dbesc(""), - dbesc($contact["description"]["text"]), - dbesc(normalise_link($contact["canonical_url"]))); - } + update_gcontact(array("url" => $contact["canonical_url"], "generation" => 2, + "network" => NETWORK_APPNET, "photo" => $contact["avatar_image"]["url"], + "name" => $contact["name"], "nick" => $contact["username"], + "about" => $contact["description"]["text"], "hide" => true, + "addr" => $contact["username"]."@app.net")); $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", intval($uid), dbesc("adn::".$contact["id"])); @@ -1174,8 +1150,8 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { // create contact record q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`, - `writable`, `blocked`, `readonly`, `pending` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ", + `about`, `writable`, `blocked`, `readonly`, `pending` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, 0, 0, 0 ) ", intval($uid), dbesc(datetime_convert()), dbesc($contact["canonical_url"]), @@ -1190,6 +1166,7 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { dbesc(NETWORK_APPNET), intval(CONTACT_IS_FRIEND), intval(1), + dbesc($contact["description"]["text"]), intval(1) ); @@ -1231,15 +1208,6 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { dbesc(datetime_convert()), intval($contact_id) ); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' - WHERE `id` = %d", - dbesc(""), - dbesc($contact["description"]["text"]), - intval($contact_id) - ); } else { // update profile photos once every two weeks as we have no notification of when they change. @@ -1266,7 +1234,8 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { `nurl` = '%s', `addr` = '%s', `name` = '%s', - `nick` = '%s' + `nick` = '%s', + `about` = '%s' WHERE `id` = %d", dbesc($photos[0]), dbesc($photos[1]), @@ -1279,16 +1248,9 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) { dbesc($contact["username"]."@app.net"), dbesc($contact["name"]), dbesc($contact["username"]), + dbesc($contact["description"]["text"]), intval($r[0]['id']) ); - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' - WHERE `id` = %d", - dbesc(""), - dbesc($contact["description"]["text"]), - intval($r[0]['id']) - ); } } diff --git a/appnet/lang/it/messages.po b/appnet/lang/it/messages.po index 17b933fe..61ad1b72 100644 --- a/appnet/lang/it/messages.po +++ b/appnet/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-22 11:47+0200\n" "PO-Revision-Date: 2014-09-10 10:18+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/blackout/lang/it/messages.po b/blackout/lang/it/messages.po index b9b5ec30..65ab3bc6 100644 --- a/blackout/lang/it/messages.po +++ b/blackout/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-22 13:18+0200\n" "PO-Revision-Date: 2014-09-10 10:22+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/blackout/lang/sv/messages.po b/blackout/lang/sv/messages.po deleted file mode 100644 index 2bb3aba4..00000000 --- a/blackout/lang/sv/messages.po +++ /dev/null @@ -1,52 +0,0 @@ -# ADDON blackout -# Copyright (C) -# This file is distributed under the same license as the Friendica blackout addon package. -# -# -# Translators: -# Jonatan Nyberg , 2017 -msgid "" -msgstr "" -"Project-Id-Version: friendica\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-22 13:18+0200\n" -"PO-Revision-Date: 2017-02-13 20:15+0000\n" -"Last-Translator: Jonatan Nyberg \n" -"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: blackout.php:99 -msgid "Save Settings" -msgstr "Spara inställningar" - -#: blackout.php:100 -msgid "Redirect URL" -msgstr "" - -#: blackout.php:100 -msgid "all your visitors from the web will be redirected to this URL" -msgstr "" - -#: blackout.php:101 -msgid "Begin of the Blackout" -msgstr "" - -#: blackout.php:101 -msgid "" -"format is YYYY year, MM month, DD day, " -"hh hour and mm minute" -msgstr "" - -#: blackout.php:102 -msgid "End of the Blackout" -msgstr "" - -#: blackout.php:108 -msgid "" -"The end-date is prior to the start-date of the blackout, you should fix " -"this." -msgstr "" diff --git a/blackout/lang/sv/strings.php b/blackout/lang/sv/strings.php index f467211a..3ec569a7 100644 --- a/blackout/lang/sv/strings.php +++ b/blackout/lang/sv/strings.php @@ -1,14 +1,3 @@ -strings["Save Settings"] = "Spara inställningar"; -$a->strings["Redirect URL"] = ""; -$a->strings["all your visitors from the web will be redirected to this URL"] = ""; -$a->strings["Begin of the Blackout"] = ""; -$a->strings["format is YYYY year, MM month, DD day, hh hour and mm minute"] = ""; -$a->strings["End of the Blackout"] = ""; -$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = ""; +strings["Submit"] = "Spara"; diff --git a/blockem/lang/it/messages.po b/blockem/lang/it/messages.po index 5e619da5..7c2ab70a 100644 --- a/blockem/lang/it/messages.po +++ b/blockem/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-22 13:18+0200\n" "PO-Revision-Date: 2014-09-10 10:23+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/blogger/lang/it/messages.po b/blogger/lang/it/messages.po index 6babcabf..edb3d545 100644 --- a/blogger/lang/it/messages.po +++ b/blogger/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-22 13:18+0200\n" "PO-Revision-Date: 2014-09-10 10:24+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/buffer/buffer.php b/buffer/buffer.php index 162600d6..89000c1f 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -1,7 +1,7 @@ */ @@ -328,15 +328,14 @@ function buffer_send(&$a,&$b) { if (isset($post["preview"])) $post["preview"] = proxy_url($post["preview"]); - //if ($profile->service == "twitter") { - if ($includedlinks) { - if (isset($post["url"])) - $post["url"] = short_link($post["url"]); - if (isset($post["image"])) - $post["image"] = short_link($post["image"]); - if (isset($post["preview"])) - $post["preview"] = short_link($post["preview"]); - } + //if ($includedlinks) { + // if (isset($post["url"])) + // $post["url"] = short_link($post["url"]); + // if (isset($post["image"])) + // $post["image"] = short_link($post["image"]); + // if (isset($post["preview"])) + // $post["preview"] = short_link($post["preview"]); + //} // Seems like a bug to me // Buffer doesn't add links to Twitter and App.net (but pictures) diff --git a/buffer/lang/it/messages.po b/buffer/lang/it/messages.po index 232cd2d6..05f973de 100644 --- a/buffer/lang/it/messages.po +++ b/buffer/lang/it/messages.po @@ -5,14 +5,14 @@ # # Translators: # fabrixxm , 2014 -# Sandro Santilli , 2015 +# Sandro Santilli , 2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-22 13:18+0200\n" "PO-Revision-Date: 2015-11-01 11:05+0000\n" -"Last-Translator: Sandro Santilli \n" +"Last-Translator: Sandro Santilli \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/buglink/lang/it/messages.po b/buglink/lang/it/messages.po index 63e643ea..5d5bf5ec 100644 --- a/buglink/lang/it/messages.po +++ b/buglink/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-22 13:18+0200\n" "PO-Revision-Date: 2014-09-10 10:27+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/buglink/lang/sv/messages.po b/buglink/lang/sv/messages.po deleted file mode 100644 index 7dbaf0e6..00000000 --- a/buglink/lang/sv/messages.po +++ /dev/null @@ -1,24 +0,0 @@ -# ADDON buglink -# Copyright (C) -# This file is distributed under the same license as the Friendica buglink addon package. -# -# -# Translators: -# Jonatan Nyberg , 2017 -msgid "" -msgstr "" -"Project-Id-Version: friendica\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-22 13:18+0200\n" -"PO-Revision-Date: 2017-02-13 20:15+0000\n" -"Last-Translator: Jonatan Nyberg \n" -"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: buglink.php:15 -msgid "Report Bug" -msgstr "Rapportera bugg" diff --git a/buglink/lang/sv/strings.php b/buglink/lang/sv/strings.php index 513dd4f3..ab4fa67a 100644 --- a/buglink/lang/sv/strings.php +++ b/buglink/lang/sv/strings.php @@ -1,8 +1,2 @@ -strings["Report Bug"] = "Rapportera bugg"; +\n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/communityhome/lang/it/messages.po b/communityhome/lang/it/messages.po index 63961513..b42bba91 100644 --- a/communityhome/lang/it/messages.po +++ b/communityhome/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: 2014-09-10 10:30+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/curweather/lang/it/strings.php b/curweather/lang/it/strings.php index 99525cc1..05319ab4 100644 --- a/curweather/lang/it/strings.php +++ b/curweather/lang/it/strings.php @@ -16,14 +16,14 @@ $a->strings["Show on map"] = "Mostra sulla mappa"; $a->strings["There was a problem accessing the weather data. But have a look"] = "C'è stato un problema accedendo ai dati meteo, ma dai un'occhiata"; $a->strings["at OpenWeatherMap"] = "a OpenWeatherMap"; $a->strings["Current Weather settings updated."] = "Impostazioni Meteo aggiornate."; -$a->strings["No APPID found, please contact your admin to obtain one."] = "APPID non trovata, contatta il tuo amministratore per averne una."; +$a->strings["No APPID found, please contact your admin to optain one."] = "APPID non trovata, contatta il tuo amministratore per averne una."; $a->strings["Save Settings"] = "Salva Impostazioni"; $a->strings["Settings"] = "Impostazioni"; $a->strings["Enter either the name of your location or the zip code."] = "Inserisci il nome della tua posizione o il CAP"; $a->strings["Your Location"] = "La tua Posizione"; $a->strings["Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE."] = "Identificatore della tua posizione (nome o CAP), p.e. Roma, IT or 00186,IT."; $a->strings["Units"] = "Unità"; -$a->strings["select if the temperature should be displayed in °C or °F"] = "scegli se la temperatura deve essere mostrata in °C o in °F"; +$a->strings["select if the temperatur should be displayed in °C or °F"] = "scegli se la temperatura deve essere mostrata in °C o in °F"; $a->strings["Show weather data"] = "Mostra dati meteo"; $a->strings["Curweather settings saved."] = "Impostazioni Curweather salvati."; $a->strings["Caching Interval"] = "Intervallo di cache"; diff --git a/diaspora/lang/it/messages.po b/diaspora/lang/it/messages.po index 514dcbb1..f10e7436 100644 --- a/diaspora/lang/it/messages.po +++ b/diaspora/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-22 13:18+0200\n" "PO-Revision-Date: 2014-09-10 11:57+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/dwpost/lang/it/messages.po b/dwpost/lang/it/messages.po index dbd21016..a3bc0fdb 100644 --- a/dwpost/lang/it/messages.po +++ b/dwpost/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: 2014-10-22 07:54+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/editplain/lang/it/messages.po b/editplain/lang/it/messages.po index 6b931176..c431ba90 100644 --- a/editplain/lang/it/messages.po +++ b/editplain/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: 2014-10-22 07:54+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/forumdirectory/lang/it/messages.po b/forumdirectory/lang/it/messages.po index ca53442c..36134adb 100644 --- a/forumdirectory/lang/it/messages.po +++ b/forumdirectory/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: 2014-09-10 12:04+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/forumlist/lang/sv/messages.po b/forumlist/lang/sv/messages.po deleted file mode 100644 index a16497d2..00000000 --- a/forumlist/lang/sv/messages.po +++ /dev/null @@ -1,60 +0,0 @@ -# ADDON forumlist -# Copyright (C) -# This file is distributed under the same license as the Friendica forumlist addon package. -# -# -# Translators: -# Jonatan Nyberg , 2017 -msgid "" -msgstr "" -"Project-Id-Version: friendica\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2017-02-13 20:15+0000\n" -"Last-Translator: Jonatan Nyberg \n" -"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: forumlist.php:64 -msgid "Forums" -msgstr "Forum" - -#: forumlist.php:67 -msgid "show/hide" -msgstr "" - -#: forumlist.php:81 -msgid "No forum subscriptions" -msgstr "" - -#: forumlist.php:98 -msgid "Forums:" -msgstr "" - -#: forumlist.php:134 -msgid "Forumlist settings updated." -msgstr "" - -#: forumlist.php:162 -msgid "Forumlist Settings" -msgstr "" - -#: forumlist.php:164 -msgid "Randomise forum list" -msgstr "" - -#: forumlist.php:167 -msgid "Show forums on profile page" -msgstr "" - -#: forumlist.php:170 -msgid "Show forums on network page" -msgstr "" - -#: forumlist.php:178 -msgid "Submit" -msgstr "Spara" diff --git a/forumlist/lang/sv/strings.php b/forumlist/lang/sv/strings.php index f2fe884b..3ec569a7 100644 --- a/forumlist/lang/sv/strings.php +++ b/forumlist/lang/sv/strings.php @@ -1,17 +1,3 @@ -strings["Forums"] = "Forum"; -$a->strings["show/hide"] = ""; -$a->strings["No forum subscriptions"] = ""; -$a->strings["Forums:"] = ""; -$a->strings["Forumlist settings updated."] = ""; -$a->strings["Forumlist Settings"] = ""; -$a->strings["Randomise forum list"] = ""; -$a->strings["Show forums on profile page"] = ""; -$a->strings["Show forums on network page"] = ""; -$a->strings["Submit"] = "Spara"; +strings["Submit"] = "Spara"; diff --git a/fromgplus/lang/it/messages.po b/fromgplus/lang/it/messages.po index d47e5cb6..c522dea4 100644 --- a/fromgplus/lang/it/messages.po +++ b/fromgplus/lang/it/messages.po @@ -4,15 +4,15 @@ # # # Translators: -# fabrixxm , 2014-2015,2017 +# fabrixxm , 2014-2015 # Tobias Diekershoff , 2016 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-11-12 16:52+0000\n" -"PO-Revision-Date: 2017-01-18 10:38+0000\n" -"Last-Translator: fabrixxm \n" +"PO-Revision-Date: 2016-11-22 06:48+0000\n" +"Last-Translator: Tobias Diekershoff \n" "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +34,7 @@ msgstr "ID Google Account" #: fromgplus.php:61 msgid "Add keywords to post" -msgstr "Aggiungi parole chiave ai post" +msgstr "" #: fromgplus.php:66 fromgplus.php:95 msgid "Save Settings" @@ -46,7 +46,7 @@ msgstr "Impostazioni Importa Google+ salvate" #: fromgplus.php:96 msgid "Key" -msgstr "Chiave" +msgstr "" #: fromgplus.php:103 msgid "Settings updated." diff --git a/fromgplus/lang/it/strings.php b/fromgplus/lang/it/strings.php index 0e866fc8..f66250f9 100644 --- a/fromgplus/lang/it/strings.php +++ b/fromgplus/lang/it/strings.php @@ -8,8 +8,8 @@ function string_plural_select_it($n){ $a->strings["Google+ Mirror"] = "Mirror Goggle+"; $a->strings["Enable Google+ Import"] = "Abilita Importa da Google+"; $a->strings["Google Account ID"] = "ID Google Account"; -$a->strings["Add keywords to post"] = "Aggiungi parole chiave ai post"; +$a->strings["Add keywords to post"] = ""; $a->strings["Save Settings"] = "Salva Impostazioni"; $a->strings["Google+ Import Settings saved."] = "Impostazioni Importa Google+ salvate"; -$a->strings["Key"] = "Chiave"; +$a->strings["Key"] = ""; $a->strings["Settings updated."] = "Impostazioni aggiornate."; diff --git a/gpluspost/lang/it/messages.po b/gpluspost/lang/it/messages.po index e6d636b4..5ddaf97c 100644 --- a/gpluspost/lang/it/messages.po +++ b/gpluspost/lang/it/messages.po @@ -9,60 +9,60 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-12 16:50+0000\n" +"POT-Creation-Date: 2014-06-23 14:44+0200\n" "PO-Revision-Date: 2014-09-10 12:14+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: gpluspost.php:39 +#: gpluspost.php:38 msgid "Post to Google+" msgstr "Invia a Google+" -#: gpluspost.php:94 +#: gpluspost.php:93 msgid "Enable Google+ Post Plugin" msgstr "Abilita il plugin di invio a Google+" -#: gpluspost.php:109 +#: gpluspost.php:108 msgid "Google+ username" msgstr "Nome utente Google+" -#: gpluspost.php:114 +#: gpluspost.php:113 msgid "Google+ password" msgstr "Password Google+" -#: gpluspost.php:119 +#: gpluspost.php:118 msgid "Google+ page number" msgstr "Numero pagina Google+" -#: gpluspost.php:125 +#: gpluspost.php:124 msgid "Post to Google+ by default" msgstr "Invia sempre a Google+" -#: gpluspost.php:130 +#: gpluspost.php:129 msgid "Do not prevent posting loops" msgstr "Non prevenire i loop di invio" -#: gpluspost.php:136 +#: gpluspost.php:135 msgid "Skip messages without links" msgstr "Salta i messaggi senza collegamenti" -#: gpluspost.php:143 +#: gpluspost.php:142 msgid "Mirror all public posts" msgstr "Ricopia tutti i post pubblici" -#: gpluspost.php:147 +#: gpluspost.php:146 msgid "Mirror Google Account ID" msgstr "Ricopia l'ID Google Account" -#: gpluspost.php:154 +#: gpluspost.php:153 msgid "Save Settings" msgstr "Salva Impostazioni" -#: gpluspost.php:310 +#: gpluspost.php:308 msgid "Google+ post failed. Queued for retry." msgstr "Invio a Google+ fallito. In attesa di riprovare." diff --git a/ijpost/lang/it/messages.po b/ijpost/lang/it/messages.po index aba06846..43e00fb3 100644 --- a/ijpost/lang/it/messages.po +++ b/ijpost/lang/it/messages.po @@ -4,15 +4,15 @@ # # # Translators: -# fabrixxm , 2014-2015 +# fabrixxm , 2014 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2015-08-31 10:15+0000\n" +"PO-Revision-Date: 2014-10-15 08:38+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,7 +25,7 @@ msgstr "Invia a InsaneJournal" #: ijpost.php:70 msgid "InsaneJournal Post Settings" -msgstr "Impostazioni post InsaneJournal" +msgstr "" #: ijpost.php:72 msgid "Enable InsaneJournal Post Plugin" @@ -45,4 +45,4 @@ msgstr "Invia sempre a InsaneJournal" #: ijpost.php:93 msgid "Submit" -msgstr "Invia" +msgstr "" diff --git a/ijpost/lang/it/strings.php b/ijpost/lang/it/strings.php index 73e8bed4..c0328aa0 100644 --- a/ijpost/lang/it/strings.php +++ b/ijpost/lang/it/strings.php @@ -6,9 +6,9 @@ function string_plural_select_it($n){ }} ; $a->strings["Post to Insanejournal"] = "Invia a InsaneJournal"; -$a->strings["InsaneJournal Post Settings"] = "Impostazioni post InsaneJournal"; +$a->strings["InsaneJournal Post Settings"] = ""; $a->strings["Enable InsaneJournal Post Plugin"] = "Abilita il plugin di invio a InsaneJournal"; $a->strings["InsaneJournal username"] = "Nome utente InsaneJournal"; $a->strings["InsaneJournal password"] = "Password InsaneJournal"; $a->strings["Post to InsaneJournal by default"] = "Invia sempre a InsaneJournal"; -$a->strings["Submit"] = "Invia"; +$a->strings["Submit"] = ""; diff --git a/infiniteimprobabilitydrive/lang/it/messages.po b/infiniteimprobabilitydrive/lang/it/messages.po index 2b68b012..75d30d32 100644 --- a/infiniteimprobabilitydrive/lang/it/messages.po +++ b/infiniteimprobabilitydrive/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-22 13:18+0200\n" "PO-Revision-Date: 2014-09-10 12:23+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/js_upload/lang/it/messages.po b/js_upload/lang/it/messages.po index 5d8fe687..1ef59b98 100644 --- a/js_upload/lang/it/messages.po +++ b/js_upload/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: 2014-09-10 12:26+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/langfilter/lang/it/messages.po b/langfilter/lang/it/messages.po index 6eded71f..81cca5dd 100644 --- a/langfilter/lang/it/messages.po +++ b/langfilter/lang/it/messages.po @@ -5,7 +5,7 @@ # # Translators: # fabrixxm , 2015 -# Sandro Santilli , 2015 +# Sandro Santilli , 2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" diff --git a/mailstream/lang/it/messages.po b/mailstream/lang/it/messages.po index 6ee63621..77e9d09b 100644 --- a/mailstream/lang/it/messages.po +++ b/mailstream/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-23 14:45+0200\n" "PO-Revision-Date: 2014-09-10 13:02+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/newmemberwidget/lang/it/messages.po b/newmemberwidget/lang/it/messages.po index f0a8c14f..9c42f60a 100644 --- a/newmemberwidget/lang/it/messages.po +++ b/newmemberwidget/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-01 14:12+0200\n" "PO-Revision-Date: 2014-09-10 14:12+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/notifyall/lang/es/messages.po b/notifyall/lang/es/messages.po index 44185321..5d2536fe 100644 --- a/notifyall/lang/es/messages.po +++ b/notifyall/lang/es/messages.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-14 16:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Albert , 2016\n" +"Last-Translator: Alberto Díaz Tormo , 2016\n" "Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/notifyall/lang/it/messages.po b/notifyall/lang/it/messages.po deleted file mode 100644 index e56126b7..00000000 --- a/notifyall/lang/it/messages.po +++ /dev/null @@ -1,57 +0,0 @@ -# ADDON notifyall -# Copyright (C) -# This file is distributed under the same license as the Friendica notifyall addon package. -# -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-14 16:41+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: fabrixxm , 2017\n" -"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: it\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: notifyall.php:26 -msgid "Send email to all members" -msgstr "Invia email a tutti i membri" - -#: notifyall.php:42 -#, php-format -msgid "%s Administrator" -msgstr "Amministratore %s" - -#: notifyall.php:44 -#, php-format -msgid "%1$s, %2$s Administrator" -msgstr "%1$s, amministratore di %2$s" - -#: notifyall.php:60 -msgid "No recipients found." -msgstr "Nessun destinatario trovato." - -#: notifyall.php:78 -msgid "Emails sent" -msgstr "Email inviate" - -#: notifyall.php:86 -msgid "Send email to all members of this Friendica instance." -msgstr "Invia email a tutti i membri di questa istanza Friendica." - -#: notifyall.php:91 -msgid "Message subject" -msgstr "Oggetto del messaggio" - -#: notifyall.php:92 -msgid "Test mode (only send to administrator)" -msgstr "Modalità test (invia solo agli amministratori)" - -#: notifyall.php:93 -msgid "Submit" -msgstr "Invia" diff --git a/notifyall/lang/it/strings.php b/notifyall/lang/it/strings.php deleted file mode 100644 index c47067b6..00000000 --- a/notifyall/lang/it/strings.php +++ /dev/null @@ -1,16 +0,0 @@ -strings["Send email to all members"] = "Invia email a tutti i membri"; -$a->strings["%s Administrator"] = "Amministratore %s"; -$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, amministratore di %2\$s"; -$a->strings["No recipients found."] = "Nessun destinatario trovato."; -$a->strings["Emails sent"] = "Email inviate"; -$a->strings["Send email to all members of this Friendica instance."] = "Invia email a tutti i membri di questa istanza Friendica."; -$a->strings["Message subject"] = "Oggetto del messaggio"; -$a->strings["Test mode (only send to administrator)"] = "Modalità test (invia solo agli amministratori)"; -$a->strings["Submit"] = "Invia"; diff --git a/pledgie/pledgie.php b/pledgie/pledgie.php index e44255a8..986fd986 100644 --- a/pledgie/pledgie.php +++ b/pledgie/pledgie.php @@ -71,9 +71,9 @@ function pledgie_active(&$a,&$b) { $campaign = get_config('pledgie-campaign','text'); $describe = get_config('pledgie-describe','text'); $b .= '
'; - $b .= $describe . '
Click here to lend your support to: ' . $describe . '!
'; -} + $b .= '.png?skin_name=chrome\' border=\'0\' target=\'_blank\' />'; +} \ No newline at end of file diff --git a/public_server/lang/it/messages.po b/public_server/lang/it/messages.po index 079d46bf..61203344 100644 --- a/public_server/lang/it/messages.po +++ b/public_server/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: 2014-10-15 09:02+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/pumpio/lang/it/messages.po b/pumpio/lang/it/messages.po index 3529a080..c40b63ca 100644 --- a/pumpio/lang/it/messages.po +++ b/pumpio/lang/it/messages.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-23 14:45+0200\n" -"PO-Revision-Date: 2015-11-01 11:05+0000\n" +"POT-Creation-Date: 2014-06-22 13:18+0200\n" +"PO-Revision-Date: 2014-09-10 14:24+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 65f55552..fb7ce8c1 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -976,8 +976,8 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { // create contact record q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`, - `writable`, `blocked`, `readonly`, `pending` ) - VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0)", + `location`, `about`, `writable`, `blocked`, `readonly`, `pending` ) + VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)", intval($uid), dbesc(datetime_convert()), dbesc($contact->url), @@ -992,6 +992,8 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { dbesc(NETWORK_PUMPIO), intval(CONTACT_IS_FRIEND), intval(1), + dbesc($contact->location->displayName), + dbesc($contact->summary), intval(1) ); @@ -1014,15 +1016,6 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { require_once('include/group.php'); group_add_member($uid,'',$contact_id,$g[0]['def_gid']); } - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' - WHERE `id` = %d", - dbesc($contact->location->displayName), - dbesc($contact->summary), - intval($contact_id) - ); } else { $contact_id = $r[0]["id"]; diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php index 346376fa..af843c1d 100644 --- a/pumpio/pumpio_sync.php +++ b/pumpio/pumpio_sync.php @@ -41,21 +41,23 @@ function pumpio_sync_run(&$argv, &$argc){ } } - $lockpath = get_lockpath(); - if ($lockpath != '') { - $pidfile = new pidfile($lockpath, 'pumpio_sync'); - if($pidfile->is_already_running()) { - logger("Already running"); - if ($pidfile->running_time() > 9*60) { - $pidfile->kill(); - logger("killed stale process"); - // Calling a new instance - proc_run('php','addon/pumpio/pumpio_sync.php'); + // This is deprecated with the worker + if (function_exists("get_lockpath")) { + $lockpath = get_lockpath(); + if ($lockpath != '') { + $pidfile = new pidfile($lockpath, 'pumpio_sync'); + if($pidfile->is_already_running()) { + logger("Already running"); + if ($pidfile->running_time() > 9*60) { + $pidfile->kill(); + logger("killed stale process"); + // Calling a new instance + proc_run('php','addon/pumpio/pumpio_sync.php'); + } + exit; } - exit; } } - pumpio_sync($a); } diff --git a/rendertime/lang/it/messages.po b/rendertime/lang/it/messages.po index 6c5c5dce..a77f64e1 100644 --- a/rendertime/lang/it/messages.po +++ b/rendertime/lang/it/messages.po @@ -9,17 +9,17 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"POT-Creation-Date: 2014-06-22 13:18+0200\n" "PO-Revision-Date: 2014-09-10 14:32+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: rendertime.php:29 +#: rendertime.php:30 #, php-format msgid "" "Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, " diff --git a/smileybutton/lang/it/messages.po b/smileybutton/lang/it/messages.po index e3bbf4fe..47060c79 100644 --- a/smileybutton/lang/it/messages.po +++ b/smileybutton/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-23 14:45+0200\n" "PO-Revision-Date: 2014-09-10 14:33+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index bc9bc125..9c44ef02 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -920,36 +920,11 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { if ($contact->statusnet_profile_url == "") return(-1); - if (function_exists("update_gcontact")) - update_gcontact(array("url" => $contact->statusnet_profile_url, - "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url, - "name" => $contact->name, "nick" => $contact->screen_name, - "location" => $contact->location, "about" => $contact->description, - "addr" => statusnet_address($contact), "generation" => 3)); - else { - // Old Code - $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", - dbesc(normalise_link($contact->statusnet_profile_url))); - - if (count($r) == 0) - q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", - dbesc(normalise_link($contact->statusnet_profile_url)), - dbesc($contact->name), - dbesc($contact->screen_name), - dbesc($contact->profile_image_url)); - else - q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'", - dbesc($contact->name), - dbesc($contact->screen_name), - dbesc($contact->profile_image_url), - dbesc(normalise_link($contact->statusnet_profile_url))); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'", - dbesc($contact->location), - dbesc($contact->description), - dbesc(normalise_link($contact->statusnet_profile_url))); - } + update_gcontact(array("url" => $contact->statusnet_profile_url, + "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url, + "name" => $contact->name, "nick" => $contact->screen_name, + "location" => $contact->location, "about" => $contact->description, + "addr" => statusnet_address($contact), "generation" => 3)); $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET)); @@ -966,8 +941,8 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { // create contact record q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`, - `writable`, `blocked`, `readonly`, `pending` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ", + `location`, `about`, `writable`, `blocked`, `readonly`, `pending` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ", intval($uid), dbesc(datetime_convert()), dbesc($contact->statusnet_profile_url), @@ -982,6 +957,8 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { dbesc(NETWORK_STATUSNET), intval(CONTACT_IS_FRIEND), intval(1), + dbesc($contact->location), + dbesc($contact->description), intval(1) ); @@ -1019,16 +996,6 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { dbesc(datetime_convert()), intval($contact_id) ); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' - WHERE `id` = %d", - dbesc($contact->location), - dbesc($contact->description), - intval($contact_id) - ); - } else { // update profile photos once every two weeks as we have no notification of when they change. @@ -1055,7 +1022,9 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { `nurl` = '%s', `addr` = '%s', `name` = '%s', - `nick` = '%s' + `nick` = '%s', + `location` = '%s', + `about` = '%s' WHERE `id` = %d", dbesc($photos[0]), dbesc($photos[1]), @@ -1068,17 +1037,10 @@ function statusnet_fetch_contact($uid, $contact, $create_user) { dbesc(statusnet_address($contact)), dbesc($contact->name), dbesc($contact->screen_name), + dbesc($contact->location), + dbesc($contact->description), intval($r[0]['id']) ); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' - WHERE `id` = %d", - dbesc($contact->location), - dbesc($contact->description), - intval($r[0]['id']) - ); } } diff --git a/tictac/lang/it/messages.po b/tictac/lang/it/messages.po index 4e365574..3cba14d6 100644 --- a/tictac/lang/it/messages.po +++ b/tictac/lang/it/messages.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"POT-Creation-Date: 2014-06-23 14:45+0200\n" "PO-Revision-Date: 2014-09-10 14:43+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/twitter/twitter.php b/twitter/twitter.php index 0f074ba3..74121d29 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -935,36 +935,11 @@ function twitter_fetch_contact($uid, $contact, $create_user) { $avatar = twitter_fix_avatar($contact->profile_image_url_https); - if (function_exists("update_gcontact")) - update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name, - "network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true, - "name" => $contact->name, "nick" => $contact->screen_name, - "location" => $contact->location, "about" => $contact->description, - "addr" => $contact->screen_name."@twitter.com", "generation" => 2)); - else { - // Old Code - $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", - dbesc(normalise_link("https://twitter.com/".$contact->screen_name))); - - if (count($r) == 0) - q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", - dbesc(normalise_link("https://twitter.com/".$contact->screen_name)), - dbesc($contact->name), - dbesc($contact->screen_name), - dbesc($avatar)); - else - q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'", - dbesc($contact->name), - dbesc($contact->screen_name), - dbesc($avatar), - dbesc(normalise_link("https://twitter.com/".$contact->screen_name))); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'", - dbesc($contact->location), - dbesc($contact->description), - dbesc(normalise_link("https://twitter.com/".$contact->screen_name))); - } + update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name, + "network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true, + "name" => $contact->name, "nick" => $contact->screen_name, + "location" => $contact->location, "about" => $contact->description, + "addr" => $contact->screen_name."@twitter.com", "generation" => 2)); $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", intval($uid), dbesc("twitter::".$contact->id_str)); @@ -979,10 +954,10 @@ function twitter_fetch_contact($uid, $contact, $create_user) { if(!count($r)) { // create contact record - q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, + q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`, - `writable`, `blocked`, `readonly`, `pending` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0) ", + `location`, `about`, `writable`, `blocked`, `readonly`, `pending`) + VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)", intval($uid), dbesc(datetime_convert()), dbesc("https://twitter.com/".$contact->screen_name), @@ -997,6 +972,8 @@ function twitter_fetch_contact($uid, $contact, $create_user) { dbesc(NETWORK_TWITTER), intval(CONTACT_IS_FRIEND), intval(1), + dbesc($contact->location), + dbesc($contact->description), intval(1) ); @@ -1021,33 +998,25 @@ function twitter_fetch_contact($uid, $contact, $create_user) { require_once("Photo.php"); - $photos = import_profile_photo($avatar,$uid,$contact_id); + $photos = import_profile_photo($avatar, $uid, $contact_id, true); - q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s' - WHERE `id` = %d", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($contact_id) - ); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', - `about` = '%s' + if ($photos) { + q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s' WHERE `id` = %d", - dbesc($contact->location), - dbesc($contact->description), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), intval($contact_id) ); - + } } else { // update profile photos once every two weeks as we have no notification of when they change. @@ -1062,42 +1031,39 @@ function twitter_fetch_contact($uid, $contact, $create_user) { require_once("Photo.php"); - $photos = import_profile_photo($avatar, $uid, $r[0]['id']); + $photos = import_profile_photo($avatar, $uid, $r[0]['id'], true); - q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s', - `url` = '%s', - `nurl` = '%s', - `addr` = '%s', - `name` = '%s', - `nick` = '%s' - WHERE `id` = %d", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc("https://twitter.com/".$contact->screen_name), - dbesc(normalise_link("https://twitter.com/".$contact->screen_name)), - dbesc($contact->screen_name."@twitter.com"), - dbesc($contact->name), - dbesc($contact->screen_name), - intval($r[0]['id']) - ); - - if (DB_UPDATE_VERSION >= "1177") - q("UPDATE `contact` SET `location` = '%s', + if ($photos) { + q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', + `url` = '%s', + `nurl` = '%s', + `addr` = '%s', + `name` = '%s', + `nick` = '%s', + `location` = '%s', `about` = '%s' WHERE `id` = %d", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc("https://twitter.com/".$contact->screen_name), + dbesc(normalise_link("https://twitter.com/".$contact->screen_name)), + dbesc($contact->screen_name."@twitter.com"), + dbesc($contact->name), + dbesc($contact->screen_name), dbesc($contact->location), dbesc($contact->description), intval($r[0]['id']) ); + } } } diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php index 434cb204..6c76af7c 100644 --- a/twitter/twitter_sync.php +++ b/twitter/twitter_sync.php @@ -49,19 +49,21 @@ function twitter_sync_run($argv, $argc){ $mode = intval($argv[1]); $uid = intval($argv[2]); - /// @todo Replace it with "App::is_already_running" in the next release - $lockpath = get_lockpath(); - if ($lockpath != '') { - $pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid); - if ($pidfile->is_already_running()) { - logger("Already running"); - if ($pidfile->running_time() > 9*60) { - $pidfile->kill(); - logger("killed stale process"); - // Calling a new instance - proc_run('php','addon/twitter/twitter_sync.php', $mode, $uid); + // This is deprecated with the worker + if (function_exists("get_lockpath")) { + $lockpath = get_lockpath(); + if ($lockpath != '') { + $pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid); + if ($pidfile->is_already_running()) { + logger("Already running"); + if ($pidfile->running_time() > 9*60) { + $pidfile->kill(); + logger("killed stale process"); + // Calling a new instance + proc_run('php','addon/twitter/twitter_sync.php', $mode, $uid); + } + exit; } - exit; } } diff --git a/webrtc/lang/it/messages.po b/webrtc/lang/it/messages.po index ae800a32..ef48852e 100644 --- a/webrtc/lang/it/messages.po +++ b/webrtc/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-06-23 14:45+0200\n" "PO-Revision-Date: 2014-09-10 14:50+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/windowsphonepush/lang/it/messages.po b/windowsphonepush/lang/it/messages.po index be085107..c499d6f5 100644 --- a/windowsphonepush/lang/it/messages.po +++ b/windowsphonepush/lang/it/messages.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2014-10-26 15:02+0100\n" "PO-Revision-Date: 2014-10-31 13:46+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/wppost/lang/C/messages.po b/wppost/lang/C/messages.po index 27baa960..1763b2e3 100644 --- a/wppost/lang/C/messages.po +++ b/wppost/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-24 21:06+0100\n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,52 +21,42 @@ msgstr "" msgid "Post to Wordpress" msgstr "" -#: wppost.php:80 wppost.php:84 -msgid "Wordpress Export" +#: wppost.php:76 +msgid "WordPress Post Settings" msgstr "" -#: wppost.php:87 +#: wppost.php:78 msgid "Enable WordPress Post Plugin" msgstr "" -#: wppost.php:92 +#: wppost.php:83 msgid "WordPress username" msgstr "" -#: wppost.php:97 +#: wppost.php:88 msgid "WordPress password" msgstr "" -#: wppost.php:102 +#: wppost.php:93 msgid "WordPress API URL" msgstr "" -#: wppost.php:107 +#: wppost.php:98 msgid "Post to WordPress by default" msgstr "" -#: wppost.php:112 +#: wppost.php:103 msgid "Provide a backlink to the Friendica post" msgstr "" -#: wppost.php:116 -msgid "" -"Text for the backlink, e.g. Read the original post and comment stream on " -"Friendica." +#: wppost.php:110 +msgid "Submit" msgstr "" -#: wppost.php:121 -msgid "Don't post messages that are too short" -msgstr "" - -#: wppost.php:127 -msgid "Save Settings" -msgstr "" - -#: wppost.php:206 -msgid "Read the orig­i­nal post and com­ment stream on Friendica" -msgstr "" - -#: wppost.php:269 +#: wppost.php:201 msgid "Post from Friendica" msgstr "" + +#: wppost.php:207 +msgid "Read the original post and comment stream on Friendica" +msgstr "" diff --git a/wppost/lang/de/messages.po b/wppost/lang/de/messages.po index 57dde23f..973c4407 100644 --- a/wppost/lang/de/messages.po +++ b/wppost/lang/de/messages.po @@ -4,16 +4,14 @@ # # # Translators: -# Andreas H., 2017 -# Tobias Diekershoff , 2014-2015 -# Tobias Diekershoff , 2017 +# bavatar , 2014-2015 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-24 21:06+0100\n" -"PO-Revision-Date: 2017-02-10 11:11+0000\n" -"Last-Translator: Andreas H.\n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2015-07-28 17:31+0000\n" +"Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,52 +23,42 @@ msgstr "" msgid "Post to Wordpress" msgstr "Bei WordPress veröffentlichen" -#: wppost.php:80 wppost.php:84 -msgid "Wordpress Export" -msgstr "Wordpress Export" +#: wppost.php:76 +msgid "WordPress Post Settings" +msgstr "WordPress-Beitragseinstellungen" -#: wppost.php:87 +#: wppost.php:78 msgid "Enable WordPress Post Plugin" msgstr "WordPress Plugin aktivieren" -#: wppost.php:92 +#: wppost.php:83 msgid "WordPress username" msgstr "WordPress-Benutzername" -#: wppost.php:97 +#: wppost.php:88 msgid "WordPress password" msgstr "WordPress-Passwort" -#: wppost.php:102 +#: wppost.php:93 msgid "WordPress API URL" msgstr "WordPress-API-URL" -#: wppost.php:107 +#: wppost.php:98 msgid "Post to WordPress by default" msgstr "Standardmäßig auf WordPress veröffentlichen" -#: wppost.php:112 +#: wppost.php:103 msgid "Provide a backlink to the Friendica post" -msgstr "Einen Link zurück zum Friendica-Beitrag hinzufügen" +msgstr "Einen zurück zum Friendica-Beitrag hinzufügen" -#: wppost.php:116 -msgid "" -"Text for the backlink, e.g. Read the original post and comment stream on " -"Friendica." -msgstr "Text für den Link zurück, z.B. lies den Original-Post und die Kommentare auf Friendica." +#: wppost.php:110 +msgid "Submit" +msgstr "Senden" -#: wppost.php:121 -msgid "Don't post messages that are too short" -msgstr "Zu kurze Mitteilungen nicht posten" - -#: wppost.php:127 -msgid "Save Settings" -msgstr "Einstellungen speichern" - -#: wppost.php:206 -msgid "Read the orig­i­nal post and com­ment stream on Friendica" -msgstr "Lies den Original-Post und die Kommentare auf Friendica" - -#: wppost.php:269 +#: wppost.php:201 msgid "Post from Friendica" msgstr "Post via Friendica" + +#: wppost.php:207 +msgid "Read the original post and comment stream on Friendica" +msgstr "Den Original-Beitrag samt Kommentaren bei Friendica lesen" diff --git a/wppost/lang/de/strings.php b/wppost/lang/de/strings.php index 9cdc292a..48c1688e 100644 --- a/wppost/lang/de/strings.php +++ b/wppost/lang/de/strings.php @@ -6,15 +6,13 @@ function string_plural_select_de($n){ }} ; $a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen"; -$a->strings["Wordpress Export"] = "Wordpress Export"; +$a->strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen"; $a->strings["Enable WordPress Post Plugin"] = "WordPress Plugin aktivieren"; $a->strings["WordPress username"] = "WordPress-Benutzername"; $a->strings["WordPress password"] = "WordPress-Passwort"; $a->strings["WordPress API URL"] = "WordPress-API-URL"; $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen"; -$a->strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen"; -$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Text für den Link zurück, z.B. lies den Original-Post und die Kommentare auf Friendica."; -$a->strings["Don't post messages that are too short"] = "Zu kurze Mitteilungen nicht posten"; -$a->strings["Save Settings"] = "Einstellungen speichern"; -$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Lies den Original-Post und die Kommentare auf Friendica"; +$a->strings["Provide a backlink to the Friendica post"] = "Einen zurück zum Friendica-Beitrag hinzufügen"; +$a->strings["Submit"] = "Senden"; $a->strings["Post from Friendica"] = "Post via Friendica"; +$a->strings["Read the original post and comment stream on Friendica"] = "Den Original-Beitrag samt Kommentaren bei Friendica lesen"; diff --git a/wppost/lang/es/messages.po b/wppost/lang/es/messages.po index baac8034..98365fb1 100644 --- a/wppost/lang/es/messages.po +++ b/wppost/lang/es/messages.po @@ -4,13 +4,13 @@ # # # Translators: -# Albert, 2016-2017 +# Albert, 2016 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-24 21:06+0100\n" -"PO-Revision-Date: 2017-02-25 22:42+0000\n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: 2016-11-19 11:38+0000\n" "Last-Translator: Albert\n" "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n" "MIME-Version: 1.0\n" @@ -23,52 +23,42 @@ msgstr "" msgid "Post to Wordpress" msgstr "Publicar en Wordpress" -#: wppost.php:80 wppost.php:84 -msgid "Wordpress Export" -msgstr "Exportar a Wordpress" +#: wppost.php:76 +msgid "WordPress Post Settings" +msgstr "Ajustes de publicación de WordPress" -#: wppost.php:87 +#: wppost.php:78 msgid "Enable WordPress Post Plugin" msgstr "Habilitar Plugin de publicación de WordPress" -#: wppost.php:92 +#: wppost.php:83 msgid "WordPress username" msgstr "Nombre de usuario de WordPress" -#: wppost.php:97 +#: wppost.php:88 msgid "WordPress password" msgstr "Contraseña de WordPress" -#: wppost.php:102 +#: wppost.php:93 msgid "WordPress API URL" msgstr "URL de API de WordPress" -#: wppost.php:107 +#: wppost.php:98 msgid "Post to WordPress by default" msgstr "Publicar en WordPress por defecto" -#: wppost.php:112 +#: wppost.php:103 msgid "Provide a backlink to the Friendica post" msgstr "Proveer un enlace inverso a la entrada de Friendica" -#: wppost.php:116 -msgid "" -"Text for the backlink, e.g. Read the original post and comment stream on " -"Friendica." -msgstr "Texto para el enlace inverso, e.g. Lea la entrada original y comente en Friendica." +#: wppost.php:110 +msgid "Submit" +msgstr "Enviar" -#: wppost.php:121 -msgid "Don't post messages that are too short" -msgstr "No escriba mensajes demasiado cortos" - -#: wppost.php:127 -msgid "Save Settings" -msgstr "Guardar configuración" - -#: wppost.php:206 -msgid "Read the orig­i­nal post and com­ment stream on Friendica" -msgstr "Leer la publicación original y comente en Friendica" - -#: wppost.php:269 +#: wppost.php:201 msgid "Post from Friendica" msgstr "Publicar desde Friendica" + +#: wppost.php:207 +msgid "Read the original post and comment stream on Friendica" +msgstr "Leer la entrada original y transmitir comentarios en Friendica" diff --git a/wppost/lang/es/strings.php b/wppost/lang/es/strings.php index 13753311..525cb883 100644 --- a/wppost/lang/es/strings.php +++ b/wppost/lang/es/strings.php @@ -6,15 +6,13 @@ function string_plural_select_es($n){ }} ; $a->strings["Post to Wordpress"] = "Publicar en Wordpress"; -$a->strings["Wordpress Export"] = "Exportar a Wordpress"; +$a->strings["WordPress Post Settings"] = "Ajustes de publicación de WordPress"; $a->strings["Enable WordPress Post Plugin"] = "Habilitar Plugin de publicación de WordPress"; $a->strings["WordPress username"] = "Nombre de usuario de WordPress"; $a->strings["WordPress password"] = "Contraseña de WordPress"; $a->strings["WordPress API URL"] = "URL de API de WordPress"; $a->strings["Post to WordPress by default"] = "Publicar en WordPress por defecto"; $a->strings["Provide a backlink to the Friendica post"] = "Proveer un enlace inverso a la entrada de Friendica"; -$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Texto para el enlace inverso, e.g. Lea la entrada original y comente en Friendica."; -$a->strings["Don't post messages that are too short"] = "No escriba mensajes demasiado cortos"; -$a->strings["Save Settings"] = "Guardar configuración"; -$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Leer la publicación original y comente en Friendica"; +$a->strings["Submit"] = "Enviar"; $a->strings["Post from Friendica"] = "Publicar desde Friendica"; +$a->strings["Read the original post and comment stream on Friendica"] = "Leer la entrada original y transmitir comentarios en Friendica"; diff --git a/wppost/lang/it/messages.po b/wppost/lang/it/messages.po index 2369d955..c489959b 100644 --- a/wppost/lang/it/messages.po +++ b/wppost/lang/it/messages.po @@ -4,15 +4,15 @@ # # # Translators: -# fabrixxm , 2014-2015 +# fabrixxm , 2014 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-24 21:06+0100\n" -"PO-Revision-Date: 2017-02-10 08:18+0000\n" +"POT-Creation-Date: 2014-06-23 14:45+0200\n" +"PO-Revision-Date: 2014-09-10 14:51+0000\n" "Last-Translator: fabrixxm \n" -"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,52 +23,46 @@ msgstr "" msgid "Post to Wordpress" msgstr "Invia a Wordpress" -#: wppost.php:80 wppost.php:84 +#: wppost.php:79 wppost.php:83 msgid "Wordpress Export" -msgstr "" +msgstr "Esporta Wordpress" -#: wppost.php:87 +#: wppost.php:86 msgid "Enable WordPress Post Plugin" msgstr "Abilita il plugin di invio a Wordpress" -#: wppost.php:92 +#: wppost.php:91 msgid "WordPress username" msgstr "Nome utente Wordpress" -#: wppost.php:97 +#: wppost.php:96 msgid "WordPress password" msgstr "Password Wordpress" -#: wppost.php:102 +#: wppost.php:101 msgid "WordPress API URL" msgstr "Indirizzo API Wordpress" -#: wppost.php:107 +#: wppost.php:106 msgid "Post to WordPress by default" msgstr "Invia sempre a Wordpress" -#: wppost.php:112 +#: wppost.php:111 msgid "Provide a backlink to the Friendica post" msgstr "Inserisci un link al messaggio originale su Friendica" #: wppost.php:116 -msgid "" -"Text for the backlink, e.g. Read the original post and comment stream on " -"Friendica." -msgstr "" - -#: wppost.php:121 msgid "Don't post messages that are too short" -msgstr "" +msgstr "Non inviare messaggi troppo corti" -#: wppost.php:127 +#: wppost.php:122 msgid "Save Settings" -msgstr "" +msgstr "Salva Impostazioni" -#: wppost.php:206 -msgid "Read the orig­i­nal post and com­ment stream on Friendica" -msgstr "" - -#: wppost.php:269 +#: wppost.php:243 msgid "Post from Friendica" msgstr "Messaggio da Friendica" + +#: wppost.php:255 +msgid "Read the original post and comment stream on Friendica" +msgstr "Leggi il messaggio originale e i commenti su Friendica" diff --git a/wppost/lang/it/strings.php b/wppost/lang/it/strings.php index 3f616900..855d55d2 100644 --- a/wppost/lang/it/strings.php +++ b/wppost/lang/it/strings.php @@ -6,15 +6,14 @@ function string_plural_select_it($n){ }} ; $a->strings["Post to Wordpress"] = "Invia a Wordpress"; -$a->strings["Wordpress Export"] = ""; +$a->strings["Wordpress Export"] = "Esporta Wordpress"; $a->strings["Enable WordPress Post Plugin"] = "Abilita il plugin di invio a Wordpress"; $a->strings["WordPress username"] = "Nome utente Wordpress"; $a->strings["WordPress password"] = "Password Wordpress"; $a->strings["WordPress API URL"] = "Indirizzo API Wordpress"; $a->strings["Post to WordPress by default"] = "Invia sempre a Wordpress"; $a->strings["Provide a backlink to the Friendica post"] = "Inserisci un link al messaggio originale su Friendica"; -$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = ""; -$a->strings["Don't post messages that are too short"] = ""; -$a->strings["Save Settings"] = ""; -$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = ""; +$a->strings["Don't post messages that are too short"] = "Non inviare messaggi troppo corti"; +$a->strings["Save Settings"] = "Salva Impostazioni"; $a->strings["Post from Friendica"] = "Messaggio da Friendica"; +$a->strings["Read the original post and comment stream on Friendica"] = "Leggi il messaggio originale e i commenti su Friendica"; diff --git a/wppost/wppost.php b/wppost/wppost.php index 931b6d81..fc3d3a10 100755 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -3,7 +3,7 @@ /** * Name: WordPress Post Connector * Description: Post to WordPress (or anything else which uses blogger XMLRPC API) - * Version: 1.1 + * Version: 1.0 * Author: Mike Macgirvin */ @@ -71,7 +71,6 @@ function wppost_settings(&$a,&$s) { $wp_username = get_pconfig(local_user(), 'wppost', 'wp_username'); $wp_password = get_pconfig(local_user(), 'wppost', 'wp_password'); $wp_blog = get_pconfig(local_user(), 'wppost', 'wp_blog'); - $wp_backlink_text = get_pconfig(local_user(), 'wppost', 'wp_backlink_text'); /* Add some HTML to the existing form */ @@ -112,10 +111,6 @@ function wppost_settings(&$a,&$s) { $s .= ''; $s .= ''; $s .= '
'; - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; $s .= '
'; $s .= ''; @@ -140,10 +135,6 @@ function wppost_settings_post(&$a,&$b) { set_pconfig(local_user(),'wppost','wp_blog',trim($_POST['wp_blog'])); set_pconfig(local_user(),'wppost','backlink',trim($_POST['wp_backlink'])); set_pconfig(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck'])); - $wp_backlink_text = notags(trim($_POST['wp_backlink_text'])); - $wp_backlink_text = bbcode($wp_backlink_text, false, false, 8); - $wp_backlink_text = html2plain($wp_backlink_text, 0, true); - set_pconfig(local_user(),'wppost','wp_backlink_text', $wp_backlink_text); } @@ -153,34 +144,28 @@ function wppost_post_local(&$a,&$b) { // This can probably be changed to allow editing by pointing to a different API endpoint - if($b['edit']) { + if($b['edit']) return; - } - if((! local_user()) || (local_user() != $b['uid'])) { + if((! local_user()) || (local_user() != $b['uid'])) return; - } - if($b['private'] || $b['parent']) { + if($b['private'] || $b['parent']) return; - } $wp_post = intval(get_pconfig(local_user(),'wppost','post')); $wp_enable = (($wp_post && x($_REQUEST,'wppost_enable')) ? intval($_REQUEST['wppost_enable']) : 0); - if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'wppost','post_by_default'))) { + if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'wppost','post_by_default'))) $wp_enable = 1; - } - if(! $wp_enable) { + if(! $wp_enable) return; - } - if(strlen($b['postopts'])) { + if(strlen($b['postopts'])) $b['postopts'] .= ','; - } - $b['postopts'] .= 'wppost'; + $b['postopts'] .= 'wppost'; } @@ -201,10 +186,6 @@ function wppost_send(&$a,&$b) { $wp_username = xmlify(get_pconfig($b['uid'],'wppost','wp_username')); $wp_password = xmlify(get_pconfig($b['uid'],'wppost','wp_password')); $wp_blog = get_pconfig($b['uid'],'wppost','wp_blog'); - $wp_backlink_text = get_pconfig($b['uid'],'wppost','wp_backlink_text'); - if ($wp_backlink_text == '') { - $wp_backlink_text = t('Read the orig­i­nal post and com­ment stream on Friendica'); - } if($wp_username && $wp_password && $wp_blog) { @@ -220,34 +201,28 @@ function wppost_send(&$a,&$b) { $siteinfo = get_attached_data($b["body"]); // Is it a link to an aricle, a video or a photo? - if (isset($siteinfo["type"])) { - if (in_array($siteinfo["type"], array("link", "audio", "video", "photo"))) { + if (isset($siteinfo["type"])) + if (in_array($siteinfo["type"], array("link", "audio", "video", "photo"))) $postentry = true; - } - } // Does it have a title? - if ($wptitle != "") { + if ($wptitle != "") $postentry = true; - } // Is it larger than 500 characters? - if (strlen($b['body']) > 500) { + if (strlen($b['body']) > 500) $postentry = true; - } - if (!$postentry) { + if (!$postentry) return; - } } // If the title is empty then try to guess if ($wptitle == '') { // Fetch information about the post $siteinfo = get_attached_data($b["body"]); - if (isset($siteinfo["title"])) { + if (isset($siteinfo["title"])) $wptitle = $siteinfo["title"]; - } // If no bookmark is found then take the first line if ($wptitle == '') { @@ -276,10 +251,9 @@ function wppost_send(&$a,&$b) { $post = $title.$post; $wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink')); - if($wp_backlink && $b['plink']) { + if($wp_backlink && $b['plink']) $post .= EOL . EOL . '' - . $wp_backlink_text . '' . EOL . EOL; - } + . t('Read the original post and comment stream on Friendica') . '' . EOL . EOL; $post = xmlify($post); @@ -302,10 +276,10 @@ EOT; logger('wppost: data: ' . $xml, LOGGER_DATA); - if($wp_blog !== 'test') { + if($wp_blog !== 'test') $x = post_url($wp_blog,$xml); - } logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG); } } +