keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge https://github.com/friendica/friendica into pull

Browse source
This commit is contained in:
friendica 2012-11-01 17:21:55 -07:00
commit ce932dfdaf
12 changed files with 429 additions and 420 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/conversation.php
View file

@ -1008,9 +1008,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
function get_item_children($arr, $parent) {
$children = array();
$a = get_app();
foreach($arr as $item) {
if($item['id'] != $item['parent']) {
if(get_config('system','thread_allow')) {
if(get_config('system','thread_allow') && $a->theme_thread_allow) {
// Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent'];
if($thr_parent == '')

10
include/redir.php
View file

@ -12,6 +12,8 @@ function auto_redir(&$a, $contact_nick) {
// same nickname as me on other hubs or other networks. Exclude these by requiring
// that the contact have a local URL. I will be the only person with my nickname at
// this URL, so if a result is found, then I am a contact of the $contact_nick user.
//
// We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
$baseurl = $a->get_baseurl();
$domain_st = strpos($baseurl, "://");
@ -20,7 +22,7 @@ function auto_redir(&$a, $contact_nick) {
$baseurl = substr($baseurl, $domain_st + 3);
$r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 )
AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' LIMIT 1",
AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' AND blocked = 0 AND pending = 0 LIMIT 1",
dbesc($contact_nick),
dbesc($a->user['nickname']),
dbesc($baseurl)
@ -30,10 +32,12 @@ function auto_redir(&$a, $contact_nick) {
return;
$r = q("SELECT * FROM contact WHERE nick = '%s' AND network = '%s' AND uid = %d LIMIT 1",
$r = q("SELECT * FROM contact WHERE nick = '%s'
AND network = '%s' AND uid = %d AND url LIKE '%%%s%%' LIMIT 1",
dbesc($contact_nick),
dbesc(NETWORK_DFRN),
intval(local_user())
intval(local_user()),
dbesc($baseurl)
);
if(! ($r && count($r)))

4
object/Item.php
View file

@ -519,7 +519,8 @@ class Item extends BaseObject {
* _ false on failure
*/
private function get_comment_box($indent) {
if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
$a = $this->get_app();
if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) {
return '';
}
@ -531,7 +532,6 @@ class Item extends BaseObject {
$ww = 'ww';
if($conv->is_writable() && $this->is_writable()) {
$a = $this->get_app();
$qc = $qcomment = null;
/*

320
view/es/messages.po
View file

@ -10,13 +10,14 @@
# Manuel Pérez <blackhalo@member.fsf.org>, 2011-2012.
# Manuel Pérez Monís, 2011.
# Mike Macgirvin, 2010.
# <tobias.diekershoff@gmx.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-10-18 10:00-0700\n"
"PO-Revision-Date: 2012-10-15 08:33+0000\n"
"Last-Translator: Carlos Solís <csolisr@gmail.com>\n"
"POT-Creation-Date: 2012-10-30 10:00-0700\n"
"PO-Revision-Date: 2012-11-01 12:11+0000\n"
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/friendica/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -65,7 +66,7 @@ msgstr "Error al actualizar el Contacto."
#: ../../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:3913
#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914
#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
#: ../../addon.old/facebook/facebook.php:516
#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@ -185,7 +186,7 @@ msgstr "Nueva foto de esta dirección"
#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80
#: ../../view/theme/diabook/theme.php:642
#: ../../view/theme/diabook/theme.php:599
#: ../../view/theme/diabook/config.php:152
#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
@ -288,11 +289,11 @@ msgstr "l, F j"
msgid "Edit event"
msgstr "Editar evento"
#: ../../mod/events.php:323 ../../include/text.php:1187
#: ../../mod/events.php:323 ../../include/text.php:1185
msgid "link to source"
msgstr "Enlace al original"
#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
#: ../../include/nav.php:52 ../../boot.php:1701
msgid "Events"
msgstr "Eventos"
@ -366,7 +367,7 @@ msgstr "Comparte este evento"
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
#: ../../include/conversation.php:995
#: ../../include/conversation.php:996
#: ../../addon.old/js_upload/js_upload.php:45
msgid "Cancel"
msgstr "Cancelar"
@ -444,7 +445,7 @@ msgstr "Álbum de Fotos"
#: ../../mod/photos.php:1095 ../../mod/photos.php:1110
#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
#: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:492
#: ../../view/theme/diabook/theme.php:485
#: ../../addon.old/communityhome/communityhome.php:110
msgid "Contact Photos"
msgstr "Foto del contacto"
@ -467,7 +468,7 @@ msgstr "Información del contacto no disponible"
#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324
#: ../../include/user.php:331 ../../include/user.php:338
#: ../../addon.old/communityhome/communityhome.php:111
msgid "Profile Photos"
@ -491,7 +492,7 @@ msgstr "ha sido etiquetado en"
#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439
#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437
#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
#: ../../include/conversation.php:253
#: ../../addon.old/communityhome/communityhome.php:163
@ -653,15 +654,15 @@ msgstr "Me gusta esto (cambiar)"
msgid "I don't like this (toggle)"
msgstr "No me gusta esto (cambiar)"
#: ../../mod/photos.php:1386 ../../include/conversation.php:956
#: ../../mod/photos.php:1386 ../../include/conversation.php:957
msgid "Share"
msgstr "Compartir"
#: ../../mod/photos.php:1387 ../../mod/editpost.php:118
#: ../../mod/content.php:482 ../../mod/content.php:845
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:481 ../../include/conversation.php:619
#: ../../include/conversation.php:975 ../../object/Item.php:258
#: ../../mod/message.php:481 ../../include/conversation.php:620
#: ../../include/conversation.php:976 ../../object/Item.php:258
msgid "Please wait"
msgstr "Por favor, espera"
@ -679,7 +680,7 @@ msgstr "Comentar"
#: ../../mod/photos.php:1407 ../../mod/photos.php:1450
#: ../../mod/photos.php:1521 ../../mod/editpost.php:139
#: ../../mod/content.php:702 ../../include/conversation.php:993
#: ../../mod/content.php:702 ../../include/conversation.php:994
#: ../../object/Item.php:567
msgid "Preview"
msgstr "Vista previa"
@ -687,7 +688,7 @@ msgstr "Vista previa"
#: ../../mod/photos.php:1489 ../../mod/content.php:439
#: ../../mod/content.php:723 ../../mod/settings.php:606
#: ../../mod/group.php:168 ../../mod/admin.php:696
#: ../../include/conversation.php:564 ../../object/Item.php:117
#: ../../include/conversation.php:565 ../../object/Item.php:117
msgid "Delete"
msgstr "Eliminar"
@ -703,7 +704,7 @@ msgstr "Fotos recientes"
msgid "Not available."
msgstr "No disponible"
#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92
#: ../../include/nav.php:101
msgid "Community"
msgstr "Comunidad"
@ -753,7 +754,7 @@ msgstr "Elemento no encontrado"
msgid "Edit post"
msgstr "Editar publicación"
#: ../../mod/editpost.php:88 ../../include/conversation.php:942
#: ../../mod/editpost.php:88 ../../include/conversation.php:943
msgid "Post to Email"
msgstr "Publicar mediante correo electrónico"
@ -764,85 +765,85 @@ msgstr "Editar"
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:478
#: ../../include/conversation.php:957
#: ../../include/conversation.php:958
msgid "Upload photo"
msgstr "Subir foto"
#: ../../mod/editpost.php:105 ../../include/conversation.php:958
#: ../../mod/editpost.php:105 ../../include/conversation.php:959
msgid "upload photo"
msgstr "subir imagen"
#: ../../mod/editpost.php:106 ../../include/conversation.php:959
#: ../../mod/editpost.php:106 ../../include/conversation.php:960
msgid "Attach file"
msgstr "Adjuntar archivo"
#: ../../mod/editpost.php:107 ../../include/conversation.php:960
#: ../../mod/editpost.php:107 ../../include/conversation.php:961
msgid "attach file"
msgstr "adjuntar archivo"
#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:479
#: ../../include/conversation.php:961
#: ../../include/conversation.php:962
msgid "Insert web link"
msgstr "Insertar enlace"
#: ../../mod/editpost.php:109 ../../include/conversation.php:962
#: ../../mod/editpost.php:109 ../../include/conversation.php:963
msgid "web link"
msgstr "enlace web"
#: ../../mod/editpost.php:110 ../../include/conversation.php:963
#: ../../mod/editpost.php:110 ../../include/conversation.php:964
msgid "Insert video link"
msgstr "Insertar enlace del vídeo"
#: ../../mod/editpost.php:111 ../../include/conversation.php:964
#: ../../mod/editpost.php:111 ../../include/conversation.php:965
msgid "video link"
msgstr "enlace de video"
#: ../../mod/editpost.php:112 ../../include/conversation.php:965
#: ../../mod/editpost.php:112 ../../include/conversation.php:966
msgid "Insert audio link"
msgstr "Insertar vínculo del audio"
#: ../../mod/editpost.php:113 ../../include/conversation.php:966
#: ../../mod/editpost.php:113 ../../include/conversation.php:967
msgid "audio link"
msgstr "enlace de audio"
#: ../../mod/editpost.php:114 ../../include/conversation.php:967
#: ../../mod/editpost.php:114 ../../include/conversation.php:968
msgid "Set your location"
msgstr "Configurar tu localización"
#: ../../mod/editpost.php:115 ../../include/conversation.php:968
#: ../../mod/editpost.php:115 ../../include/conversation.php:969
msgid "set location"
msgstr "establecer tu ubicación"
#: ../../mod/editpost.php:116 ../../include/conversation.php:969
#: ../../mod/editpost.php:116 ../../include/conversation.php:970
msgid "Clear browser location"
msgstr "Borrar la localización del navegador"
#: ../../mod/editpost.php:117 ../../include/conversation.php:970
#: ../../mod/editpost.php:117 ../../include/conversation.php:971
msgid "clear location"
msgstr "limpiar la localización"
#: ../../mod/editpost.php:119 ../../include/conversation.php:976
#: ../../mod/editpost.php:119 ../../include/conversation.php:977
msgid "Permission settings"
msgstr "Configuración de permisos"
#: ../../mod/editpost.php:127 ../../include/conversation.php:985
#: ../../mod/editpost.php:127 ../../include/conversation.php:986
msgid "CC: email addresses"
msgstr "CC: dirección de correo electrónico"
#: ../../mod/editpost.php:128 ../../include/conversation.php:986
#: ../../mod/editpost.php:128 ../../include/conversation.php:987
msgid "Public post"
msgstr "Publicación pública"
#: ../../mod/editpost.php:131 ../../include/conversation.php:972
#: ../../mod/editpost.php:131 ../../include/conversation.php:973
msgid "Set title"
msgstr "Establecer el título"
#: ../../mod/editpost.php:133 ../../include/conversation.php:974
#: ../../mod/editpost.php:133 ../../include/conversation.php:975
msgid "Categories (comma-separated list)"
msgstr "Categorías (lista separada por comas)"
#: ../../mod/editpost.php:134 ../../include/conversation.php:988
#: ../../mod/editpost.php:134 ../../include/conversation.php:989
msgid "Example: bob@example.com, mary@example.com"
msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com"
@ -963,7 +964,7 @@ msgstr "Por favor, confirma tu solicitud de presentación/conexión con %s."
msgid "Confirm"
msgstr "Confirmar"
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
msgid "[Name Withheld]"
msgstr "[Nombre oculto]"
@ -1300,9 +1301,9 @@ msgstr "Conversión horária"
#: ../../mod/localtime.php:26
msgid ""
"Friendika provides this service for sharing events with other networks and "
"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas."
msgstr ""
#: ../../mod/localtime.php:30
#, php-format
@ -1386,24 +1387,24 @@ msgid "Group: "
msgstr "Grupo: "
#: ../../mod/content.php:438 ../../mod/content.php:722
#: ../../include/conversation.php:563 ../../object/Item.php:116
#: ../../include/conversation.php:564 ../../object/Item.php:116
msgid "Select"
msgstr "Seleccionar"
#: ../../mod/content.php:455 ../../mod/content.php:815
#: ../../mod/content.php:816 ../../include/conversation.php:582
#: ../../mod/content.php:816 ../../include/conversation.php:583
#: ../../object/Item.php:227 ../../object/Item.php:228
#, php-format
msgid "View %s's profile @ %s"
msgstr "Ver perfil de %s @ %s"
#: ../../mod/content.php:465 ../../mod/content.php:827
#: ../../include/conversation.php:602 ../../object/Item.php:240
#: ../../include/conversation.php:603 ../../object/Item.php:240
#, php-format
msgid "%s from %s"
msgstr "%s de %s"
#: ../../mod/content.php:480 ../../include/conversation.php:617
#: ../../mod/content.php:480 ../../include/conversation.php:618
msgid "View in context"
msgstr "Verlo en contexto"
@ -1414,7 +1415,7 @@ msgid_plural "%d comments"
msgstr[0] "%d comentario"
msgstr[1] "%d comentarios"
#: ../../mod/content.php:588 ../../include/text.php:1443
#: ../../mod/content.php:588 ../../include/text.php:1441
#: ../../object/Item.php:279 ../../object/Item.php:292
msgid "comment"
msgid_plural "comments"
@ -1546,7 +1547,7 @@ msgstr "Red"
msgid "Personal"
msgstr "Personal"
#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86
#: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home"
msgstr "Inicio"
@ -1991,7 +1992,7 @@ msgstr "eres fan de"
msgid "Edit contact"
msgstr "Modificar contacto"
#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89
#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88
#: ../../include/nav.php:139
msgid "Contacts"
msgstr "Contactos"
@ -2028,7 +2029,7 @@ msgstr "Contraseña restablecida enviada a %s"
#: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302
#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
#: ../../addon.old/facebook/facebook.php:1200
#: ../../addon.old/fbpost/fbpost.php:661
@ -2093,7 +2094,7 @@ msgstr "Configuración de tu cuenta"
#: ../../mod/settings.php:35
msgid "Display settings"
msgstr "Mostrar configuración"
msgstr "Configuración Tema/Visualización"
#: ../../mod/settings.php:41
msgid "Connector settings"
@ -2118,9 +2119,8 @@ msgstr "Eliminar cuenta"
#: ../../mod/settings.php:69 ../../mod/newmember.php:22
#: ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137
#: ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings"
msgstr "Configuración"
@ -2346,7 +2346,7 @@ msgstr "No hay tema especial para dispositivos móviles"
#: ../../mod/settings.php:767
msgid "Display Settings"
msgstr "Mostrar Configuración"
msgstr "Configuración Tema/Visualización"
#: ../../mod/settings.php:773 ../../mod/settings.php:784
msgid "Display Theme:"
@ -2784,7 +2784,7 @@ msgstr "Sin receptor."
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250
#: ../../include/conversation.php:893 ../../include/conversation.php:910
#: ../../include/conversation.php:894 ../../include/conversation.php:911
msgid "Please enter a link URL:"
msgstr "Introduce la dirección del enlace:"
@ -2865,7 +2865,7 @@ msgid ""
msgstr "Revisa las otras configuraciones, especialmente la configuración de privacidad. Un listado de directorio sin publicar es como tener un número de teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que tus amigos y amigos potenciales sepan cómo ponerse en contacto contigo."
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
#: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1684
msgid "Profile"
@ -3190,8 +3190,8 @@ msgstr "Buscar personas"
#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:459
#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835
#: ../../view/theme/diabook/theme.php:452
#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
#: ../../include/conversation.php:120 ../../include/conversation.php:129
#: ../../include/conversation.php:248 ../../include/conversation.php:257
#: ../../addon.old/facebook/facebook.php:1598
@ -3202,7 +3202,7 @@ msgstr "estado"
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
#: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851
#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851
#: ../../include/conversation.php:136
#: ../../addon.old/facebook/facebook.php:1602
#: ../../addon.old/communityhome/communityhome.php:172
@ -3217,7 +3217,7 @@ msgstr "A %1$s no le gusta %3$s de %2$s"
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
#: ../../mod/display.php:145 ../../include/items.php:3779
#: ../../mod/display.php:145 ../../include/items.php:3780
msgid "Item not found."
msgstr "Elemento no encontrado."
@ -3225,7 +3225,7 @@ msgstr "Elemento no encontrado."
msgid "Access denied."
msgstr "Acceso denegado."
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
#: ../../include/nav.php:51 ../../boot.php:1691
msgid "Photos"
msgstr "Fotografías"
@ -4525,8 +4525,8 @@ msgstr "Visible para todos"
msgid "Edit visibility"
msgstr "Editar visibilidad"
#: ../../mod/filer.php:29 ../../include/conversation.php:897
#: ../../include/conversation.php:914
#: ../../mod/filer.php:29 ../../include/conversation.php:898
#: ../../include/conversation.php:915
msgid "Save to Folder:"
msgstr "Guardar en directorio:"
@ -4618,7 +4618,7 @@ msgstr "Fuente (formato Diaspora): "
msgid "diaspora2bb: "
msgstr "diaspora2bb: "
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513
#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr "Sugerencias de amigos"
@ -4633,7 +4633,7 @@ msgstr "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de n
msgid "Ignore/Hide"
msgstr "Ignorar/Ocultar"
#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511
msgid "Global Directory"
msgstr "Directorio global"
@ -5570,7 +5570,7 @@ msgid "Latest likes"
msgstr "Últimos me gusta"
#: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437
#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435
#: ../../include/conversation.php:117 ../../include/conversation.php:245
#: ../../addon.old/communityhome/communityhome.php:155
msgid "event"
@ -5724,7 +5724,7 @@ msgstr "Días"
#: ../../addon/dav/common/wdcal_edit.inc.php:254
#: ../../addon/dav/common/wdcal_edit.inc.php:270
#: ../../addon/dav/common/wdcal_edit.inc.php:293
#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:231
#: ../../addon.old/dav/common/wdcal_edit.inc.php:254
#: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@ -5735,7 +5735,7 @@ msgstr "Domingo"
#: ../../addon/dav/common/wdcal_edit.inc.php:235
#: ../../addon/dav/common/wdcal_edit.inc.php:274
#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:235
#: ../../addon.old/dav/common/wdcal_edit.inc.php:274
#: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@ -5743,35 +5743,35 @@ msgid "Monday"
msgstr "Lunes"
#: ../../addon/dav/common/wdcal_edit.inc.php:238
#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:238
#: ../../addon.old/dav/common/wdcal_edit.inc.php:277
msgid "Tuesday"
msgstr "Martes"
#: ../../addon/dav/common/wdcal_edit.inc.php:241
#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:241
#: ../../addon.old/dav/common/wdcal_edit.inc.php:280
msgid "Wednesday"
msgstr "Miércoles"
#: ../../addon/dav/common/wdcal_edit.inc.php:244
#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:244
#: ../../addon.old/dav/common/wdcal_edit.inc.php:283
msgid "Thursday"
msgstr "Jueves"
#: ../../addon/dav/common/wdcal_edit.inc.php:247
#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:247
#: ../../addon.old/dav/common/wdcal_edit.inc.php:286
msgid "Friday"
msgstr "Viernes"
#: ../../addon/dav/common/wdcal_edit.inc.php:250
#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:250
#: ../../addon.old/dav/common/wdcal_edit.inc.php:289
msgid "Saturday"
@ -7584,137 +7584,135 @@ msgstr "Establecer el ancho para el tema"
msgid "Color scheme"
msgstr "Esquema de color"
#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr "Tus publicaciones y conversaciones"
#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50
msgid "Your profile page"
msgstr "Tu página de perfil"
#: ../../view/theme/diabook/theme.php:89
#: ../../view/theme/diabook/theme.php:88
msgid "Your contacts"
msgstr "Tus contactos"
#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51
msgid "Your photos"
msgstr "Tus fotos"
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52
msgid "Your events"
msgstr "Tus eventos"
#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
msgid "Personal notes"
msgstr "Notas personales"
#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
msgid "Your personal photos"
msgstr "Tus fotos personales"
#: ../../view/theme/diabook/theme.php:94
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:632
#: ../../view/theme/diabook/theme.php:93
#: ../../view/theme/diabook/config.php:163
msgid "Community Pages"
msgstr "Páginas de Comunidad"
#: ../../view/theme/diabook/theme.php:384
#: ../../view/theme/diabook/theme.php:634
#: ../../view/theme/diabook/theme.php:377
#: ../../view/theme/diabook/theme.php:591
#: ../../view/theme/diabook/config.php:165
msgid "Community Profiles"
msgstr "Perfiles de la Comunidad"
#: ../../view/theme/diabook/theme.php:405
#: ../../view/theme/diabook/theme.php:639
#: ../../view/theme/diabook/theme.php:398
#: ../../view/theme/diabook/theme.php:596
#: ../../view/theme/diabook/config.php:170
msgid "Last users"
msgstr "Últimos usuarios"
#: ../../view/theme/diabook/theme.php:434
#: ../../view/theme/diabook/theme.php:641
#: ../../view/theme/diabook/theme.php:427
#: ../../view/theme/diabook/theme.php:598
#: ../../view/theme/diabook/config.php:172
msgid "Last likes"
msgstr "Últimos \"me gusta\""
#: ../../view/theme/diabook/theme.php:479
#: ../../view/theme/diabook/theme.php:640
#: ../../view/theme/diabook/theme.php:472
#: ../../view/theme/diabook/theme.php:597
#: ../../view/theme/diabook/config.php:171
msgid "Last photos"
msgstr "Últimas fotos"
#: ../../view/theme/diabook/theme.php:516
#: ../../view/theme/diabook/theme.php:637
#: ../../view/theme/diabook/theme.php:509
#: ../../view/theme/diabook/theme.php:594
#: ../../view/theme/diabook/config.php:168
msgid "Find Friends"
msgstr "Buscar amigos"
#: ../../view/theme/diabook/theme.php:517
#: ../../view/theme/diabook/theme.php:510
msgid "Local Directory"
msgstr "Directorio local"
#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr "Intereses similares"
#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr "Invitar amigos"
#: ../../view/theme/diabook/theme.php:572
#: ../../view/theme/diabook/theme.php:633
#: ../../view/theme/diabook/theme.php:531
#: ../../view/theme/diabook/theme.php:590
#: ../../view/theme/diabook/config.php:164
msgid "Earth Layers"
msgstr "Minimapa"
#: ../../view/theme/diabook/theme.php:577
#: ../../view/theme/diabook/theme.php:536
msgid "Set zoomfactor for Earth Layers"
msgstr "Configurar zoom en Minimapa"
#: ../../view/theme/diabook/theme.php:578
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/config.php:161
msgid "Set longitude (X) for Earth Layers"
msgstr "Configurar longitud (X) en Minimapa"
#: ../../view/theme/diabook/theme.php:579
#: ../../view/theme/diabook/theme.php:538
#: ../../view/theme/diabook/config.php:162
msgid "Set latitude (Y) for Earth Layers"
msgstr "Configurar latitud (Y) en Minimapa"
#: ../../view/theme/diabook/theme.php:551
#: ../../view/theme/diabook/theme.php:592
#: ../../view/theme/diabook/theme.php:635
#: ../../view/theme/diabook/config.php:166
msgid "Help or @NewHere ?"
msgstr "¿Ayuda o @NuevoAquí?"
#: ../../view/theme/diabook/theme.php:599
#: ../../view/theme/diabook/theme.php:636
#: ../../view/theme/diabook/theme.php:558
#: ../../view/theme/diabook/theme.php:593
#: ../../view/theme/diabook/config.php:167
msgid "Connect Services"
msgstr "Servicios conectados"
#: ../../view/theme/diabook/theme.php:606
#: ../../view/theme/diabook/theme.php:638
#: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:595
msgid "Last Tweets"
msgstr "Últimos tweets"
#: ../../view/theme/diabook/theme.php:609
#: ../../view/theme/diabook/theme.php:568
#: ../../view/theme/diabook/config.php:159
msgid "Set twitter search term"
msgstr "Establecer término de búsqueda en Twitter"
#: ../../view/theme/diabook/theme.php:629
#: ../../view/theme/diabook/theme.php:587
#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
msgid "don't show"
msgstr "no mostrar"
#: ../../view/theme/diabook/theme.php:629
#: ../../view/theme/diabook/theme.php:587
#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
msgid "show"
msgstr "mostrar"
#: ../../view/theme/diabook/theme.php:630
#: ../../view/theme/diabook/theme.php:588
msgid "Show/hide boxes at right-hand column:"
msgstr "Mostrar/Ocultar casillas en la columna derecha:"
@ -8300,79 +8298,79 @@ msgstr "relajado"
msgid "surprised"
msgstr "sorprendido"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "January"
msgstr "Enero"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "February"
msgstr "Febrero"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "March"
msgstr "Marzo"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "April"
msgstr "Abril"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "May"
msgstr "Mayo"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "June"
msgstr "Junio"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "July"
msgstr "Julio"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "August"
msgstr "Agosto"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "September"
msgstr "Septiembre"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "October"
msgstr "Octubre"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "November"
msgstr "Noviembre"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "December"
msgstr "Diciembre"
#: ../../include/text.php:1007
#: ../../include/text.php:1005
msgid "bytes"
msgstr "bytes"
#: ../../include/text.php:1034 ../../include/text.php:1046
#: ../../include/text.php:1032 ../../include/text.php:1044
msgid "Click to open/close"
msgstr "Pulsa para abrir/cerrar"
#: ../../include/text.php:1219 ../../include/user.php:236
#: ../../include/text.php:1217 ../../include/user.php:236
msgid "default"
msgstr "predeterminado"
#: ../../include/text.php:1231
#: ../../include/text.php:1229
msgid "Select an alternate language"
msgstr "Elige otro idioma"
#: ../../include/text.php:1441
#: ../../include/text.php:1439
msgid "activity"
msgstr "Actividad"
#: ../../include/text.php:1444
#: ../../include/text.php:1442
msgid "post"
msgstr "Publicación"
#: ../../include/text.php:1599
#: ../../include/text.php:1597
msgid "Item filed"
msgstr "Elemento archivado"
@ -8665,17 +8663,17 @@ msgstr "segundos"
msgid "%1$d %2$s ago"
msgstr "hace %1$d %2$s"
#: ../../include/datetime.php:472 ../../include/items.php:1688
#: ../../include/datetime.php:472 ../../include/items.php:1689
#, php-format
msgid "%s's birthday"
msgstr "Cumpleaños de %s"
#: ../../include/datetime.php:473 ../../include/items.php:1689
#: ../../include/datetime.php:473 ../../include/items.php:1690
#, php-format
msgid "Happy Birthday %s"
msgstr "Feliz cumpleaños %s"
#: ../../include/onepoll.php:409
#: ../../include/onepoll.php:414
msgid "From: "
msgstr "De: "
@ -8945,15 +8943,15 @@ msgstr "No ha sido posible recibir la información del contacto."
msgid "following"
msgstr "siguiendo"
#: ../../include/items.php:3299
#: ../../include/items.php:3300
msgid "A new person is sharing with you at "
msgstr "Una nueva persona está compartiendo contigo en "
#: ../../include/items.php:3299
#: ../../include/items.php:3300
msgid "You have a new follower at "
msgstr "Tienes un nuevo seguidor en "
#: ../../include/items.php:3980
#: ../../include/items.php:3981
msgid "Archives"
msgstr "Archivos"
@ -9047,34 +9045,34 @@ msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por habe
msgid "stopped following"
msgstr "dejó de seguir"
#: ../../include/Contact.php:220 ../../include/conversation.php:790
#: ../../include/Contact.php:220 ../../include/conversation.php:791
msgid "Poke"
msgstr "Toque"
#: ../../include/Contact.php:221 ../../include/conversation.php:784
#: ../../include/Contact.php:221 ../../include/conversation.php:785
msgid "View Status"
msgstr "Ver estado"
#: ../../include/Contact.php:222 ../../include/conversation.php:785
#: ../../include/Contact.php:222 ../../include/conversation.php:786
msgid "View Profile"
msgstr "Ver perfil"
#: ../../include/Contact.php:223 ../../include/conversation.php:786
#: ../../include/Contact.php:223 ../../include/conversation.php:787
msgid "View Photos"
msgstr "Ver fotos"
#: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:787
#: ../../include/conversation.php:788
msgid "Network Posts"
msgstr "Publicaciones en la red"
#: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:788
#: ../../include/conversation.php:789
msgid "Edit Contact"
msgstr "Editar contacto"
#: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:789
#: ../../include/conversation.php:790
msgid "Send PM"
msgstr "Enviar mensaje privado"
@ -9092,86 +9090,86 @@ msgstr "publicación/tema"
msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "%1$s ha marcado %3$s de %2$s como Favorito"
#: ../../include/conversation.php:594 ../../object/Item.php:218
#: ../../include/conversation.php:595 ../../object/Item.php:218
msgid "Categories:"
msgstr ""
#: ../../include/conversation.php:595 ../../object/Item.php:219
#: ../../include/conversation.php:596 ../../object/Item.php:219
msgid "Filed under:"
msgstr ""
#: ../../include/conversation.php:680
#: ../../include/conversation.php:681
msgid "remove"
msgstr "eliminar"
#: ../../include/conversation.php:684
#: ../../include/conversation.php:685
msgid "Delete Selected Items"
msgstr "Eliminar el elemento seleccionado"
#: ../../include/conversation.php:783
#: ../../include/conversation.php:784
msgid "Follow Thread"
msgstr ""
#: ../../include/conversation.php:852
#: ../../include/conversation.php:853
#, php-format
msgid "%s likes this."
msgstr "A %s le gusta esto."
#: ../../include/conversation.php:852
#: ../../include/conversation.php:853
#, php-format
msgid "%s doesn't like this."
msgstr "A %s no le gusta esto."
#: ../../include/conversation.php:856
#: ../../include/conversation.php:857
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgstr "Le gusta a <span %1$s>%2$d personas</span>."
#: ../../include/conversation.php:858
#: ../../include/conversation.php:859
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "No le gusta a <span %1$s>%2$d personas</span>."
#: ../../include/conversation.php:864
#: ../../include/conversation.php:865
msgid "and"
msgstr "y"
#: ../../include/conversation.php:867
#: ../../include/conversation.php:868
#, php-format
msgid ", and %d other people"
msgstr " y a otras %d personas"
#: ../../include/conversation.php:868
#: ../../include/conversation.php:869
#, php-format
msgid "%s like this."
msgstr "Le gusta a %s."
#: ../../include/conversation.php:868
#: ../../include/conversation.php:869
#, php-format
msgid "%s don't like this."
msgstr "No le gusta a %s."
#: ../../include/conversation.php:892 ../../include/conversation.php:909
#: ../../include/conversation.php:893 ../../include/conversation.php:910
msgid "Visible to <strong>everybody</strong>"
msgstr "Visible para <strong>cualquiera</strong>"
#: ../../include/conversation.php:894 ../../include/conversation.php:911
#: ../../include/conversation.php:895 ../../include/conversation.php:912
msgid "Please enter a video link/URL:"
msgstr "Por favor, introduce la URL/enlace del vídeo:"
#: ../../include/conversation.php:895 ../../include/conversation.php:912
#: ../../include/conversation.php:896 ../../include/conversation.php:913
msgid "Please enter an audio link/URL:"
msgstr "Por favor, introduce la URL/enlace del audio:"
#: ../../include/conversation.php:896 ../../include/conversation.php:913
#: ../../include/conversation.php:897 ../../include/conversation.php:914
msgid "Tag term:"
msgstr "Etiquetar:"
#: ../../include/conversation.php:898 ../../include/conversation.php:915
#: ../../include/conversation.php:899 ../../include/conversation.php:916
msgid "Where are you right now?"
msgstr "¿Dónde estás ahora?"
#: ../../include/conversation.php:977
#: ../../include/conversation.php:978
msgid "permissions"
msgstr "permisos"

6
view/es/strings.php
View file

@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>¿Ahora qué?</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Conversión horária";
$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas.";
$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
$a->strings["UTC time: %s"] = "Tiempo UTC: %s";
$a->strings["Current timezone: %s"] = "Zona horaria actual: %s";
$a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %s";
@ -443,7 +443,7 @@ $a->strings["Enter your email address and submit to have your password reset. Th
$a->strings["Nickname or Email: "] = "Apodo o Correo electrónico: ";
$a->strings["Reset"] = "Restablecer";
$a->strings["Account settings"] = "Configuración de tu cuenta";
$a->strings["Display settings"] = "Mostrar configuración";
$a->strings["Display settings"] = "Configuración Tema/Visualización";
$a->strings["Connector settings"] = "Configuración del conector";
$a->strings["Plugin settings"] = "Configuración de los módulos";
$a->strings["Connected apps"] = "Aplicaciones conectadas";
@ -499,7 +499,7 @@ $a->strings["Mark as seen"] = "Marcar como leído";
$a->strings["Move to folder"] = "Mover a un directorio";
$a->strings["Move to folder:"] = "Mover al directorio:";
$a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles";
$a->strings["Display Settings"] = "Mostrar Configuración";
$a->strings["Display Settings"] = "Configuración Tema/Visualización";
$a->strings["Display Theme:"] = "Utilizar tema:";
$a->strings["Mobile Theme:"] = "Tema móvil:";
$a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos";

326
view/fr/messages.po
View file

@ -3,15 +3,16 @@
# This file is distributed under the same license as the Friendica package.
#
# Translators:
# <domovoy@errlock.org>, 2012.
# <olivier@free-beer.ch>, 2012.
# Olivier <olivier+transifex@migeot.org>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-10-18 10:00-0700\n"
"PO-Revision-Date: 2012-10-18 08:00+0000\n"
"Last-Translator: Olivier <olivier+transifex@migeot.org>\n"
"POT-Creation-Date: 2012-10-30 10:00-0700\n"
"PO-Revision-Date: 2012-10-31 14:33+0000\n"
"Last-Translator: Domovoy <domovoy@errlock.org>\n"
"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -60,7 +61,7 @@ msgstr "Impossible d'appliquer les réglages."
#: ../../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:3913
#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914
#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
#: ../../addon.old/facebook/facebook.php:516
#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@ -180,7 +181,7 @@ msgstr "Nouvelle photo depuis cette URL"
#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80
#: ../../view/theme/diabook/theme.php:642
#: ../../view/theme/diabook/theme.php:599
#: ../../view/theme/diabook/config.php:152
#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
@ -283,11 +284,11 @@ msgstr "l, F j"
msgid "Edit event"
msgstr "Editer l'événement"
#: ../../mod/events.php:323 ../../include/text.php:1187
#: ../../mod/events.php:323 ../../include/text.php:1185
msgid "link to source"
msgstr "lien original"
#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
#: ../../include/nav.php:52 ../../boot.php:1701
msgid "Events"
msgstr "Événements"
@ -361,7 +362,7 @@ msgstr "Partager cet événement"
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
#: ../../include/conversation.php:995
#: ../../include/conversation.php:996
#: ../../addon.old/js_upload/js_upload.php:45
msgid "Cancel"
msgstr "Annuler"
@ -439,7 +440,7 @@ msgstr "Albums photo"
#: ../../mod/photos.php:1095 ../../mod/photos.php:1110
#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
#: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:492
#: ../../view/theme/diabook/theme.php:485
#: ../../addon.old/communityhome/communityhome.php:110
msgid "Contact Photos"
msgstr "Photos du contact"
@ -462,7 +463,7 @@ msgstr "Informations de contact indisponibles"
#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324
#: ../../include/user.php:331 ../../include/user.php:338
#: ../../addon.old/communityhome/communityhome.php:111
msgid "Profile Photos"
@ -486,7 +487,7 @@ msgstr "a été identifié dans"
#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439
#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437
#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
#: ../../include/conversation.php:253
#: ../../addon.old/communityhome/communityhome.php:163
@ -648,15 +649,15 @@ msgstr "J'aime (bascule)"
msgid "I don't like this (toggle)"
msgstr "Je n'aime pas (bascule)"
#: ../../mod/photos.php:1386 ../../include/conversation.php:956
#: ../../mod/photos.php:1386 ../../include/conversation.php:957
msgid "Share"
msgstr "Partager"
#: ../../mod/photos.php:1387 ../../mod/editpost.php:118
#: ../../mod/content.php:482 ../../mod/content.php:845
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:481 ../../include/conversation.php:619
#: ../../include/conversation.php:975 ../../object/Item.php:258
#: ../../mod/message.php:481 ../../include/conversation.php:620
#: ../../include/conversation.php:976 ../../object/Item.php:258
msgid "Please wait"
msgstr "Patientez"
@ -674,7 +675,7 @@ msgstr "Commenter"
#: ../../mod/photos.php:1407 ../../mod/photos.php:1450
#: ../../mod/photos.php:1521 ../../mod/editpost.php:139
#: ../../mod/content.php:702 ../../include/conversation.php:993
#: ../../mod/content.php:702 ../../include/conversation.php:994
#: ../../object/Item.php:567
msgid "Preview"
msgstr "Aperçu"
@ -682,7 +683,7 @@ msgstr "Aperçu"
#: ../../mod/photos.php:1489 ../../mod/content.php:439
#: ../../mod/content.php:723 ../../mod/settings.php:606
#: ../../mod/group.php:168 ../../mod/admin.php:696
#: ../../include/conversation.php:564 ../../object/Item.php:117
#: ../../include/conversation.php:565 ../../object/Item.php:117
msgid "Delete"
msgstr "Supprimer"
@ -698,7 +699,7 @@ msgstr "Photos récentes"
msgid "Not available."
msgstr "Indisponible."
#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92
#: ../../include/nav.php:101
msgid "Community"
msgstr "Communauté"
@ -748,7 +749,7 @@ msgstr "Élément introuvable"
msgid "Edit post"
msgstr "Éditer la publication"
#: ../../mod/editpost.php:88 ../../include/conversation.php:942
#: ../../mod/editpost.php:88 ../../include/conversation.php:943
msgid "Post to Email"
msgstr "Publier aussi par courriel"
@ -759,85 +760,85 @@ msgstr "Éditer"
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:478
#: ../../include/conversation.php:957
#: ../../include/conversation.php:958
msgid "Upload photo"
msgstr "Joindre photo"
#: ../../mod/editpost.php:105 ../../include/conversation.php:958
#: ../../mod/editpost.php:105 ../../include/conversation.php:959
msgid "upload photo"
msgstr "envoi image"
#: ../../mod/editpost.php:106 ../../include/conversation.php:959
#: ../../mod/editpost.php:106 ../../include/conversation.php:960
msgid "Attach file"
msgstr "Joindre fichier"
#: ../../mod/editpost.php:107 ../../include/conversation.php:960
#: ../../mod/editpost.php:107 ../../include/conversation.php:961
msgid "attach file"
msgstr "ajout fichier"
#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:479
#: ../../include/conversation.php:961
#: ../../include/conversation.php:962
msgid "Insert web link"
msgstr "Insérer lien web"
#: ../../mod/editpost.php:109 ../../include/conversation.php:962
#: ../../mod/editpost.php:109 ../../include/conversation.php:963
msgid "web link"
msgstr "lien web"
#: ../../mod/editpost.php:110 ../../include/conversation.php:963
#: ../../mod/editpost.php:110 ../../include/conversation.php:964
msgid "Insert video link"
msgstr "Insérer un lien video"
#: ../../mod/editpost.php:111 ../../include/conversation.php:964
#: ../../mod/editpost.php:111 ../../include/conversation.php:965
msgid "video link"
msgstr "lien vidéo"
#: ../../mod/editpost.php:112 ../../include/conversation.php:965
#: ../../mod/editpost.php:112 ../../include/conversation.php:966
msgid "Insert audio link"
msgstr "Insérer un lien audio"
#: ../../mod/editpost.php:113 ../../include/conversation.php:966
#: ../../mod/editpost.php:113 ../../include/conversation.php:967
msgid "audio link"
msgstr "lien audio"
#: ../../mod/editpost.php:114 ../../include/conversation.php:967
#: ../../mod/editpost.php:114 ../../include/conversation.php:968
msgid "Set your location"
msgstr "Définir votre localisation"
#: ../../mod/editpost.php:115 ../../include/conversation.php:968
#: ../../mod/editpost.php:115 ../../include/conversation.php:969
msgid "set location"
msgstr "spéc. localisation"
#: ../../mod/editpost.php:116 ../../include/conversation.php:969
#: ../../mod/editpost.php:116 ../../include/conversation.php:970
msgid "Clear browser location"
msgstr "Effacer la localisation du navigateur"
#: ../../mod/editpost.php:117 ../../include/conversation.php:970
#: ../../mod/editpost.php:117 ../../include/conversation.php:971
msgid "clear location"
msgstr "supp. localisation"
#: ../../mod/editpost.php:119 ../../include/conversation.php:976
#: ../../mod/editpost.php:119 ../../include/conversation.php:977
msgid "Permission settings"
msgstr "Réglages des permissions"
#: ../../mod/editpost.php:127 ../../include/conversation.php:985
#: ../../mod/editpost.php:127 ../../include/conversation.php:986
msgid "CC: email addresses"
msgstr "CC: adresses de courriel"
#: ../../mod/editpost.php:128 ../../include/conversation.php:986
#: ../../mod/editpost.php:128 ../../include/conversation.php:987
msgid "Public post"
msgstr "Notice publique"
#: ../../mod/editpost.php:131 ../../include/conversation.php:972
#: ../../mod/editpost.php:131 ../../include/conversation.php:973
msgid "Set title"
msgstr "Définir un titre"
#: ../../mod/editpost.php:133 ../../include/conversation.php:974
#: ../../mod/editpost.php:133 ../../include/conversation.php:975
msgid "Categories (comma-separated list)"
msgstr "Catégories (séparées par des virgules)"
#: ../../mod/editpost.php:134 ../../include/conversation.php:988
#: ../../mod/editpost.php:134 ../../include/conversation.php:989
msgid "Example: bob@example.com, mary@example.com"
msgstr "Exemple: bob@exemple.com, mary@exemple.com"
@ -958,7 +959,7 @@ msgstr "Merci de confirmer votre demande d'introduction auprès de %s."
msgid "Confirm"
msgstr "Confirmer"
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
msgid "[Name Withheld]"
msgstr "[Nom non-publié]"
@ -1295,7 +1296,7 @@ msgstr "Conversion temporelle"
#: ../../mod/localtime.php:26
msgid ""
"Friendika provides this service for sharing events with other networks and "
"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire."
@ -1381,24 +1382,24 @@ msgid "Group: "
msgstr "Groupe: "
#: ../../mod/content.php:438 ../../mod/content.php:722
#: ../../include/conversation.php:563 ../../object/Item.php:116
#: ../../include/conversation.php:564 ../../object/Item.php:116
msgid "Select"
msgstr "Sélectionner"
#: ../../mod/content.php:455 ../../mod/content.php:815
#: ../../mod/content.php:816 ../../include/conversation.php:582
#: ../../mod/content.php:816 ../../include/conversation.php:583
#: ../../object/Item.php:227 ../../object/Item.php:228
#, php-format
msgid "View %s's profile @ %s"
msgstr "Voir le profil de %s @ %s"
#: ../../mod/content.php:465 ../../mod/content.php:827
#: ../../include/conversation.php:602 ../../object/Item.php:240
#: ../../include/conversation.php:603 ../../object/Item.php:240
#, php-format
msgid "%s from %s"
msgstr "%s de %s"
#: ../../mod/content.php:480 ../../include/conversation.php:617
#: ../../mod/content.php:480 ../../include/conversation.php:618
msgid "View in context"
msgstr "Voir dans le contexte"
@ -1409,7 +1410,7 @@ msgid_plural "%d comments"
msgstr[0] "%d commentaire"
msgstr[1] "%d commentaires"
#: ../../mod/content.php:588 ../../include/text.php:1443
#: ../../mod/content.php:588 ../../include/text.php:1441
#: ../../object/Item.php:279 ../../object/Item.php:292
msgid "comment"
msgid_plural "comments"
@ -1541,10 +1542,10 @@ msgstr "Réseau"
msgid "Personal"
msgstr "Personnel"
#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86
#: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home"
msgstr "Accueil"
msgstr "Profil"
#: ../../mod/notifications.php:98 ../../include/nav.php:121
msgid "Introductions"
@ -1986,7 +1987,7 @@ msgstr "Vous le/la suivez"
msgid "Edit contact"
msgstr "Éditer le contact"
#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89
#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88
#: ../../include/nav.php:139
msgid "Contacts"
msgstr "Contacts"
@ -2023,7 +2024,7 @@ msgstr "Requête de réinitialisation de mot de passe à %s"
#: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302
#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
#: ../../addon.old/facebook/facebook.php:1200
#: ../../addon.old/fbpost/fbpost.php:661
@ -2113,9 +2114,8 @@ msgstr "Supprimer le compte"
#: ../../mod/settings.php:69 ../../mod/newmember.php:22
#: ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137
#: ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings"
msgstr "Réglages"
@ -2779,7 +2779,7 @@ msgstr "Pas de destinataire."
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250
#: ../../include/conversation.php:893 ../../include/conversation.php:910
#: ../../include/conversation.php:894 ../../include/conversation.php:911
msgid "Please enter a link URL:"
msgstr "Entrez un lien web:"
@ -2860,7 +2860,7 @@ msgid ""
msgstr "Vérifiez les autres réglages, tout particulièrement ceux liés à la vie privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. En général, vous devriez probablement publier votre profil - à moins que tous vos amis (potentiels) sachent déjà comment vous trouver."
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
#: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1684
msgid "Profile"
@ -2901,7 +2901,7 @@ msgstr "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils
#: ../../mod/newmember.php:44
msgid "Connecting"
msgstr ""
msgstr "Connexions"
#: ../../mod/newmember.php:49 ../../mod/newmember.php:51
#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239
@ -3185,8 +3185,8 @@ msgstr "Recherche de personnes"
#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:459
#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835
#: ../../view/theme/diabook/theme.php:452
#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
#: ../../include/conversation.php:120 ../../include/conversation.php:129
#: ../../include/conversation.php:248 ../../include/conversation.php:257
#: ../../addon.old/facebook/facebook.php:1598
@ -3197,7 +3197,7 @@ msgstr "le statut"
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
#: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851
#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851
#: ../../include/conversation.php:136
#: ../../addon.old/facebook/facebook.php:1602
#: ../../addon.old/communityhome/communityhome.php:172
@ -3212,7 +3212,7 @@ msgstr "%1$s n'aime pas %3$s de %2$s"
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
#: ../../mod/display.php:145 ../../include/items.php:3779
#: ../../mod/display.php:145 ../../include/items.php:3780
msgid "Item not found."
msgstr "Élément introuvable."
@ -3220,7 +3220,7 @@ msgstr "Élément introuvable."
msgid "Access denied."
msgstr "Accès refusé."
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
#: ../../include/nav.php:51 ../../boot.php:1691
msgid "Photos"
msgstr "Photos"
@ -4520,8 +4520,8 @@ msgstr "visible par tous"
msgid "Edit visibility"
msgstr "Changer la visibilité"
#: ../../mod/filer.php:29 ../../include/conversation.php:897
#: ../../include/conversation.php:914
#: ../../mod/filer.php:29 ../../include/conversation.php:898
#: ../../include/conversation.php:915
msgid "Save to Folder:"
msgstr "Sauver dans le Dossier:"
@ -4613,7 +4613,7 @@ msgstr "Texte source (format Diaspora) :"
msgid "diaspora2bb: "
msgstr "diaspora2bb :"
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513
#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr "Suggestions d'amitiés/contacts"
@ -4628,7 +4628,7 @@ msgstr "Aucune suggestion. Si ce site est récent, merci de recommencer dans 24h
msgid "Ignore/Hide"
msgstr "Ignorer/cacher"
#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511
msgid "Global Directory"
msgstr "Annuaire global"
@ -5565,7 +5565,7 @@ msgid "Latest likes"
msgstr "Dernières approbations"
#: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437
#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435
#: ../../include/conversation.php:117 ../../include/conversation.php:245
#: ../../addon.old/communityhome/communityhome.php:155
msgid "event"
@ -5591,7 +5591,7 @@ msgstr "Pas d'accès"
#: ../../addon.old/dav/common/wdcal_edit.inc.php:30
#: ../../addon.old/dav/common/wdcal_edit.inc.php:738
msgid "Could not open component for editing"
msgstr ""
msgstr "Échec d'ouverture de l'élément pour édition"
#: ../../addon/dav/common/wdcal_edit.inc.php:140
#: ../../addon/dav/friendica/layout.fnk.php:143
@ -5719,7 +5719,7 @@ msgstr "Jours"
#: ../../addon/dav/common/wdcal_edit.inc.php:254
#: ../../addon/dav/common/wdcal_edit.inc.php:270
#: ../../addon/dav/common/wdcal_edit.inc.php:293
#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:231
#: ../../addon.old/dav/common/wdcal_edit.inc.php:254
#: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@ -5730,7 +5730,7 @@ msgstr "Dimanche"
#: ../../addon/dav/common/wdcal_edit.inc.php:235
#: ../../addon/dav/common/wdcal_edit.inc.php:274
#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:235
#: ../../addon.old/dav/common/wdcal_edit.inc.php:274
#: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@ -5738,35 +5738,35 @@ msgid "Monday"
msgstr "Lundi"
#: ../../addon/dav/common/wdcal_edit.inc.php:238
#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:238
#: ../../addon.old/dav/common/wdcal_edit.inc.php:277
msgid "Tuesday"
msgstr "Mardi"
#: ../../addon/dav/common/wdcal_edit.inc.php:241
#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:241
#: ../../addon.old/dav/common/wdcal_edit.inc.php:280
msgid "Wednesday"
msgstr "Mercredi"
#: ../../addon/dav/common/wdcal_edit.inc.php:244
#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:244
#: ../../addon.old/dav/common/wdcal_edit.inc.php:283
msgid "Thursday"
msgstr "Jeudi"
#: ../../addon/dav/common/wdcal_edit.inc.php:247
#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:247
#: ../../addon.old/dav/common/wdcal_edit.inc.php:286
msgid "Friday"
msgstr "Vendredi"
#: ../../addon/dav/common/wdcal_edit.inc.php:250
#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917
#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915
#: ../../addon.old/dav/common/wdcal_edit.inc.php:250
#: ../../addon.old/dav/common/wdcal_edit.inc.php:289
msgid "Saturday"
@ -6391,7 +6391,7 @@ msgstr "Permissions distantes"
msgid ""
"Allow recipients of your private posts to see the other recipients of the "
"posts"
msgstr ""
msgstr "Autoriser les destinataires de vos messages privés a voir les autres destinataires du message"
#: ../../addon/remote_permissions/remote_permissions.php:57
msgid "Remote Permissions settings updated."
@ -6403,7 +6403,7 @@ msgstr "Visibilité"
#: ../../addon/remote_permissions/remote_permissions.php:177
msgid "may only be a partial list"
msgstr ""
msgstr "peut être une liste partielle"
#: ../../addon/remote_permissions/remote_permissions.php:196
msgid "Global"
@ -7579,137 +7579,135 @@ msgstr "Largeur du thème"
msgid "Color scheme"
msgstr "Palette de couleurs"
#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr "Vos notices et conversations"
#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50
msgid "Your profile page"
msgstr "Votre page de profil"
#: ../../view/theme/diabook/theme.php:89
#: ../../view/theme/diabook/theme.php:88
msgid "Your contacts"
msgstr "Vos contacts"
#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51
msgid "Your photos"
msgstr "Vos photos"
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52
msgid "Your events"
msgstr "Vos événements"
#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
msgid "Personal notes"
msgstr "Notes personnelles"
#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
msgid "Your personal photos"
msgstr "Vos photos personnelles"
#: ../../view/theme/diabook/theme.php:94
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:632
#: ../../view/theme/diabook/theme.php:93
#: ../../view/theme/diabook/config.php:163
msgid "Community Pages"
msgstr "Pages de Communauté"
#: ../../view/theme/diabook/theme.php:384
#: ../../view/theme/diabook/theme.php:634
#: ../../view/theme/diabook/theme.php:377
#: ../../view/theme/diabook/theme.php:591
#: ../../view/theme/diabook/config.php:165
msgid "Community Profiles"
msgstr "Profils communautaires"
#: ../../view/theme/diabook/theme.php:405
#: ../../view/theme/diabook/theme.php:639
#: ../../view/theme/diabook/theme.php:398
#: ../../view/theme/diabook/theme.php:596
#: ../../view/theme/diabook/config.php:170
msgid "Last users"
msgstr "Derniers utilisateurs"
#: ../../view/theme/diabook/theme.php:434
#: ../../view/theme/diabook/theme.php:641
#: ../../view/theme/diabook/theme.php:427
#: ../../view/theme/diabook/theme.php:598
#: ../../view/theme/diabook/config.php:172
msgid "Last likes"
msgstr "Dernièrement aimé"
#: ../../view/theme/diabook/theme.php:479
#: ../../view/theme/diabook/theme.php:640
#: ../../view/theme/diabook/theme.php:472
#: ../../view/theme/diabook/theme.php:597
#: ../../view/theme/diabook/config.php:171
msgid "Last photos"
msgstr "Dernières photos"
#: ../../view/theme/diabook/theme.php:516
#: ../../view/theme/diabook/theme.php:637
#: ../../view/theme/diabook/theme.php:509
#: ../../view/theme/diabook/theme.php:594
#: ../../view/theme/diabook/config.php:168
msgid "Find Friends"
msgstr "Trouver des amis"
#: ../../view/theme/diabook/theme.php:517
#: ../../view/theme/diabook/theme.php:510
msgid "Local Directory"
msgstr "Annuaire local"
#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr "Intérêts similaires"
#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr "Inviter des amis"
#: ../../view/theme/diabook/theme.php:572
#: ../../view/theme/diabook/theme.php:633
#: ../../view/theme/diabook/theme.php:531
#: ../../view/theme/diabook/theme.php:590
#: ../../view/theme/diabook/config.php:164
msgid "Earth Layers"
msgstr "Géolocalisation"
#: ../../view/theme/diabook/theme.php:577
#: ../../view/theme/diabook/theme.php:536
msgid "Set zoomfactor for Earth Layers"
msgstr "Régler le niveau de zoom pour la géolocalisation"
#: ../../view/theme/diabook/theme.php:578
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/config.php:161
msgid "Set longitude (X) for Earth Layers"
msgstr "Régler la longitude (X) pour la géolocalisation"
#: ../../view/theme/diabook/theme.php:579
#: ../../view/theme/diabook/theme.php:538
#: ../../view/theme/diabook/config.php:162
msgid "Set latitude (Y) for Earth Layers"
msgstr "Régler la latitude (Y) pour la géolocalisation"
#: ../../view/theme/diabook/theme.php:551
#: ../../view/theme/diabook/theme.php:592
#: ../../view/theme/diabook/theme.php:635
#: ../../view/theme/diabook/config.php:166
msgid "Help or @NewHere ?"
msgstr "Aide ou @NewHere?"
#: ../../view/theme/diabook/theme.php:599
#: ../../view/theme/diabook/theme.php:636
#: ../../view/theme/diabook/theme.php:558
#: ../../view/theme/diabook/theme.php:593
#: ../../view/theme/diabook/config.php:167
msgid "Connect Services"
msgstr "Connecter des services"
#: ../../view/theme/diabook/theme.php:606
#: ../../view/theme/diabook/theme.php:638
#: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:595
msgid "Last Tweets"
msgstr "Derniers tweets"
#: ../../view/theme/diabook/theme.php:609
#: ../../view/theme/diabook/theme.php:568
#: ../../view/theme/diabook/config.php:159
msgid "Set twitter search term"
msgstr "Rechercher un terme twitter"
#: ../../view/theme/diabook/theme.php:629
#: ../../view/theme/diabook/theme.php:587
#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
msgid "don't show"
msgstr "cacher"
#: ../../view/theme/diabook/theme.php:629
#: ../../view/theme/diabook/theme.php:587
#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
msgid "show"
msgstr "montrer"
#: ../../view/theme/diabook/theme.php:630
#: ../../view/theme/diabook/theme.php:588
msgid "Show/hide boxes at right-hand column:"
msgstr "Montrer/cacher les boîtes dans la colonne de droite :"
@ -7748,7 +7746,7 @@ msgstr "Centre"
#: ../../view/theme/quattro/config.php:69
msgid "Posts font size"
msgstr ""
msgstr "Taille de texte des messages"
#: ../../view/theme/quattro/config.php:70
msgid "Textareas font size"
@ -8295,79 +8293,79 @@ msgstr "détendue"
msgid "surprised"
msgstr "surprise"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "January"
msgstr "Janvier"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "February"
msgstr "Février"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "March"
msgstr "Mars"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "April"
msgstr "Avril"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "May"
msgstr "Mai"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "June"
msgstr "Juin"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "July"
msgstr "Juillet"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "August"
msgstr "Août"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "September"
msgstr "Septembre"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "October"
msgstr "Octobre"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "November"
msgstr "Novembre"
#: ../../include/text.php:921
#: ../../include/text.php:919
msgid "December"
msgstr "Décembre"
#: ../../include/text.php:1007
#: ../../include/text.php:1005
msgid "bytes"
msgstr "octets"
#: ../../include/text.php:1034 ../../include/text.php:1046
#: ../../include/text.php:1032 ../../include/text.php:1044
msgid "Click to open/close"
msgstr "Cliquer pour ouvrir/fermer"
#: ../../include/text.php:1219 ../../include/user.php:236
#: ../../include/text.php:1217 ../../include/user.php:236
msgid "default"
msgstr "défaut"
#: ../../include/text.php:1231
#: ../../include/text.php:1229
msgid "Select an alternate language"
msgstr "Choisir une langue alternative"
#: ../../include/text.php:1441
#: ../../include/text.php:1439
msgid "activity"
msgstr "activité"
#: ../../include/text.php:1444
#: ../../include/text.php:1442
msgid "post"
msgstr "publication"
#: ../../include/text.php:1599
#: ../../include/text.php:1597
msgid "Item filed"
msgstr "Élément classé"
@ -8660,17 +8658,17 @@ msgstr "secondes"
msgid "%1$d %2$s ago"
msgstr "%1$d %2$s auparavant"
#: ../../include/datetime.php:472 ../../include/items.php:1688
#: ../../include/datetime.php:472 ../../include/items.php:1689
#, php-format
msgid "%s's birthday"
msgstr "Anniversaire de %s's"
#: ../../include/datetime.php:473 ../../include/items.php:1689
#: ../../include/datetime.php:473 ../../include/items.php:1690
#, php-format
msgid "Happy Birthday %s"
msgstr "Joyeux anniversaire, %s !"
#: ../../include/onepoll.php:409
#: ../../include/onepoll.php:414
msgid "From: "
msgstr "De: "
@ -8940,15 +8938,15 @@ msgstr "Impossible de récupérer les informations du contact."
msgid "following"
msgstr "following"
#: ../../include/items.php:3299
#: ../../include/items.php:3300
msgid "A new person is sharing with you at "
msgstr "Une nouvelle personne partage avec vous à "
#: ../../include/items.php:3299
#: ../../include/items.php:3300
msgid "You have a new follower at "
msgstr "Vous avez un nouvel abonné à "
#: ../../include/items.php:3980
#: ../../include/items.php:3981
msgid "Archives"
msgstr "Archives"
@ -9042,34 +9040,34 @@ msgstr "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probab
msgid "stopped following"
msgstr "retiré de la liste de suivi"
#: ../../include/Contact.php:220 ../../include/conversation.php:790
#: ../../include/Contact.php:220 ../../include/conversation.php:791
msgid "Poke"
msgstr "Sollicitations (pokes)"
#: ../../include/Contact.php:221 ../../include/conversation.php:784
#: ../../include/Contact.php:221 ../../include/conversation.php:785
msgid "View Status"
msgstr "Voir les statuts"
#: ../../include/Contact.php:222 ../../include/conversation.php:785
#: ../../include/Contact.php:222 ../../include/conversation.php:786
msgid "View Profile"
msgstr "Voir le profil"
#: ../../include/Contact.php:223 ../../include/conversation.php:786
#: ../../include/Contact.php:223 ../../include/conversation.php:787
msgid "View Photos"
msgstr "Voir les photos"
#: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:787
#: ../../include/conversation.php:788
msgid "Network Posts"
msgstr "Posts du Réseau"
#: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:788
#: ../../include/conversation.php:789
msgid "Edit Contact"
msgstr "Éditer le contact"
#: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:789
#: ../../include/conversation.php:790
msgid "Send PM"
msgstr "Message privé"
@ -9087,86 +9085,86 @@ msgstr "publication/élément"
msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "%1$s a marqué le %3$s de %2$s comme favori"
#: ../../include/conversation.php:594 ../../object/Item.php:218
#: ../../include/conversation.php:595 ../../object/Item.php:218
msgid "Categories:"
msgstr "Catégories:"
#: ../../include/conversation.php:595 ../../object/Item.php:219
#: ../../include/conversation.php:596 ../../object/Item.php:219
msgid "Filed under:"
msgstr "Rangé sous:"
#: ../../include/conversation.php:680
#: ../../include/conversation.php:681
msgid "remove"
msgstr "enlever"
#: ../../include/conversation.php:684
#: ../../include/conversation.php:685
msgid "Delete Selected Items"
msgstr "Supprimer les éléments sélectionnés"
#: ../../include/conversation.php:783
#: ../../include/conversation.php:784
msgid "Follow Thread"
msgstr "Suivre le fil"
#: ../../include/conversation.php:852
#: ../../include/conversation.php:853
#, php-format
msgid "%s likes this."
msgstr "%s aime ça."
#: ../../include/conversation.php:852
#: ../../include/conversation.php:853
#, php-format
msgid "%s doesn't like this."
msgstr "%s n'aime pas ça."
#: ../../include/conversation.php:856
#: ../../include/conversation.php:857
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgstr "<span %1$s>%2$d personnes</span> aiment ça."
#: ../../include/conversation.php:858
#: ../../include/conversation.php:859
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "<span %1$s>%2$d personnes</span> n'aiment pas ça."
#: ../../include/conversation.php:864
#: ../../include/conversation.php:865
msgid "and"
msgstr "et"
#: ../../include/conversation.php:867
#: ../../include/conversation.php:868
#, php-format
msgid ", and %d other people"
msgstr ", et %d autres personnes"
#: ../../include/conversation.php:868
#: ../../include/conversation.php:869
#, php-format
msgid "%s like this."
msgstr "%s aiment ça."
#: ../../include/conversation.php:868
#: ../../include/conversation.php:869
#, php-format
msgid "%s don't like this."
msgstr "%s n'aiment pas ça."
#: ../../include/conversation.php:892 ../../include/conversation.php:909
#: ../../include/conversation.php:893 ../../include/conversation.php:910
msgid "Visible to <strong>everybody</strong>"
msgstr "Visible par <strong>tout le monde</strong>"
#: ../../include/conversation.php:894 ../../include/conversation.php:911
#: ../../include/conversation.php:895 ../../include/conversation.php:912
msgid "Please enter a video link/URL:"
msgstr "Entrez un lien/URL video :"
#: ../../include/conversation.php:895 ../../include/conversation.php:912
#: ../../include/conversation.php:896 ../../include/conversation.php:913
msgid "Please enter an audio link/URL:"
msgstr "Entrez un lien/URL audio :"
#: ../../include/conversation.php:896 ../../include/conversation.php:913
#: ../../include/conversation.php:897 ../../include/conversation.php:914
msgid "Tag term:"
msgstr "Tag : "
#: ../../include/conversation.php:898 ../../include/conversation.php:915
#: ../../include/conversation.php:899 ../../include/conversation.php:916
msgid "Where are you right now?"
msgstr "Où êtes-vous présentemment?"
#: ../../include/conversation.php:977
#: ../../include/conversation.php:978
msgid "permissions"
msgstr "permissions"

14
view/fr/strings.php
View file

@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Ensuite</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: Vous devez configurer [manuellement] une tâche programmée pour le 'poller'.";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Conversion temporelle";
$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire.";
$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire.";
$a->strings["UTC time: %s"] = "Temps UTC : %s";
$a->strings["Current timezone: %s"] = "Zone de temps courante : %s";
$a->strings["Converted localtime: %s"] = "Temps local converti : %s";
@ -316,7 +316,7 @@ $a->strings["Ignore"] = "Ignorer";
$a->strings["System"] = "Système";
$a->strings["Network"] = "Réseau";
$a->strings["Personal"] = "Personnel";
$a->strings["Home"] = "Accueil";
$a->strings["Home"] = "Profil";
$a->strings["Introductions"] = "Introductions";
$a->strings["Messages"] = "Messages";
$a->strings["Show Ignored Requests"] = "Voir les demandes ignorées";
@ -629,7 +629,7 @@ $a->strings["Edit Your Profile"] = "Éditer votre Profil";
$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Éditez votre profil <strong>par défaut</strong> à votre convenance. Vérifiez les réglages concernant la visibilité de votre liste d'amis par les visiteurs inconnus.";
$a->strings["Profile Keywords"] = "Mots-clés du profil";
$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils pourront ainsi décrire vos centres d'intérêt, et nous pourrons vous proposer des contacts qui les partagent.";
$a->strings["Connecting"] = "";
$a->strings["Connecting"] = "Connexions";
$a->strings["Facebook"] = "Facebook";
$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Activez et paramétrez le connecteur Facebook si vous avez un compte Facebook et nous pourrons (de manière facultative) importer tous vos amis et conversations Facebook.";
$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Si</em> ceci est votre propre serveur, installer le connecteur Facebook peut adoucir votre transition vers le web social libre.";
@ -1215,7 +1215,7 @@ $a->strings["Latest photos"] = "Dernières photos";
$a->strings["Latest likes"] = "Dernières approbations";
$a->strings["event"] = "évènement";
$a->strings["No access"] = "Pas d'accès";
$a->strings["Could not open component for editing"] = "";
$a->strings["Could not open component for editing"] = "Échec d'ouverture de l'élément pour édition";
$a->strings["Go back to the calendar"] = "Revenir au calendrier";
$a->strings["Event data"] = "Données de l'évènement";
$a->strings["Calendar"] = "Calendrier";
@ -1363,10 +1363,10 @@ $a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth";
$a->strings["dreamwidth password"] = "Mot de passe";
$a->strings["Post to dreamwidth by default"] = "Poster vers Dreamwidth par défaut";
$a->strings["Remote Permissions Settings"] = "Permissions distantes";
$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Autoriser les destinataires de vos messages privés a voir les autres destinataires du message";
$a->strings["Remote Permissions settings updated."] = "Permissions distantes mises-à-jour.";
$a->strings["Visible to"] = "Visibilité";
$a->strings["may only be a partial list"] = "";
$a->strings["may only be a partial list"] = "peut être une liste partielle";
$a->strings["Global"] = "Global";
$a->strings["The posts of every user on this server show the post recipients"] = "Les publications de tous les utilisateurs de ce serveur afficheront leurs destinataires";
$a->strings["Individual"] = "Individuel";
@ -1631,7 +1631,7 @@ $a->strings["Last tweets"] = "Derniers tweets";
$a->strings["Alignment"] = "Alignement";
$a->strings["Left"] = "Gauche";
$a->strings["Center"] = "Centre";
$a->strings["Posts font size"] = "";
$a->strings["Posts font size"] = "Taille de texte des messages";
$a->strings["Textareas font size"] = "";
$a->strings["Set colour scheme"] = "Choisir le schéma de couleurs";
$a->strings["j F, Y"] = "j F, Y";

133
view/it/messages.po
View file

@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-10-21 10:00-0700\n"
"PO-Revision-Date: 2012-10-22 12:47+0000\n"
"POT-Creation-Date: 2012-10-29 10:00-0700\n"
"PO-Revision-Date: 2012-10-25 07:03+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
@ -63,7 +63,7 @@ msgstr "Le modifiche al contatto non sono state salvate."
#: ../../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:3913
#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914
#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
#: ../../addon.old/facebook/facebook.php:516
#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@ -183,7 +183,7 @@ msgstr "Nuova foto da questo URL"
#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80
#: ../../view/theme/diabook/theme.php:642
#: ../../view/theme/diabook/theme.php:599
#: ../../view/theme/diabook/config.php:152
#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
@ -290,7 +290,7 @@ msgstr "Modifca l'evento"
msgid "link to source"
msgstr "Collegamento all'originale"
#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
#: ../../include/nav.php:52 ../../boot.php:1701
msgid "Events"
msgstr "Eventi"
@ -442,7 +442,7 @@ msgstr "Album foto"
#: ../../mod/photos.php:1095 ../../mod/photos.php:1110
#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
#: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:492
#: ../../view/theme/diabook/theme.php:485
#: ../../addon.old/communityhome/communityhome.php:110
msgid "Contact Photos"
msgstr "Foto dei contatti"
@ -465,7 +465,7 @@ msgstr "I dati di questo contatto non sono disponibili"
#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324
#: ../../include/user.php:331 ../../include/user.php:338
#: ../../addon.old/communityhome/communityhome.php:111
msgid "Profile Photos"
@ -489,7 +489,7 @@ msgstr "è stato taggato in una"
#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1437
#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437
#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
#: ../../include/conversation.php:253
#: ../../addon.old/communityhome/communityhome.php:163
@ -701,7 +701,7 @@ msgstr "Foto recenti"
msgid "Not available."
msgstr "Non disponibile."
#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92
#: ../../include/nav.php:101
msgid "Community"
msgstr "Comunità"
@ -961,7 +961,7 @@ msgstr "Conferma la tua richiesta di connessione con %s."
msgid "Confirm"
msgstr "Conferma"
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
msgid "[Name Withheld]"
msgstr "[Nome Nascosto]"
@ -1544,7 +1544,7 @@ msgstr "Rete"
msgid "Personal"
msgstr "Personale"
#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86
#: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home"
msgstr "Home"
@ -1989,7 +1989,7 @@ msgstr "sei un fan di"
msgid "Edit contact"
msgstr "Modifca contatto"
#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89
#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88
#: ../../include/nav.php:139
msgid "Contacts"
msgstr "Contatti"
@ -2026,7 +2026,7 @@ msgstr "Richiesta reimpostazione password su %s"
#: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302
#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
#: ../../addon.old/facebook/facebook.php:1200
#: ../../addon.old/fbpost/fbpost.php:661
@ -2116,9 +2116,8 @@ msgstr ""
#: ../../mod/settings.php:69 ../../mod/newmember.php:22
#: ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137
#: ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings"
msgstr "Impostazioni"
@ -2863,7 +2862,7 @@ msgid ""
msgstr "Guarda le altre impostazioni, in particolare le impostazioni della privacy. Un profilo non pubblicato è come un numero di telefono non in elenco. In genere, dovresti pubblicare il tuo profilo - a meno che tutti i tuoi amici e potenziali tali sappiano esattamente come trovarti."
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
#: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1684
msgid "Profile"
@ -2974,7 +2973,7 @@ msgstr "Nel pannello laterale nella pagina \"Contatti\", ci sono diversi strumen
#: ../../mod/newmember.php:66 ../../include/group.php:270
msgid "Groups"
msgstr "Grouppi"
msgstr "Gruppi"
#: ../../mod/newmember.php:70
msgid "Group Your Contacts"
@ -3188,8 +3187,8 @@ msgstr "Cerca persone"
#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:459
#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835
#: ../../view/theme/diabook/theme.php:452
#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
#: ../../include/conversation.php:120 ../../include/conversation.php:129
#: ../../include/conversation.php:248 ../../include/conversation.php:257
#: ../../addon.old/facebook/facebook.php:1598
@ -3200,7 +3199,7 @@ msgstr "stato"
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
#: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851
#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851
#: ../../include/conversation.php:136
#: ../../addon.old/facebook/facebook.php:1602
#: ../../addon.old/communityhome/communityhome.php:172
@ -3215,7 +3214,7 @@ msgstr "A %1$s non piace %3$s di %2$s"
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
#: ../../mod/display.php:145 ../../include/items.php:3779
#: ../../mod/display.php:145 ../../include/items.php:3780
msgid "Item not found."
msgstr "Elemento non trovato."
@ -3223,7 +3222,7 @@ msgstr "Elemento non trovato."
msgid "Access denied."
msgstr "Accesso negato."
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
#: ../../include/nav.php:51 ../../boot.php:1691
msgid "Photos"
msgstr "Foto"
@ -4616,7 +4615,7 @@ msgstr ""
msgid "diaspora2bb: "
msgstr ""
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513
#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr "Contatti suggeriti"
@ -4631,7 +4630,7 @@ msgstr "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra
msgid "Ignore/Hide"
msgstr "Ignora / Nascondi"
#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511
msgid "Global Directory"
msgstr "Elenco globale"
@ -5568,7 +5567,7 @@ msgid "Latest likes"
msgstr "Ultimi \"mi piace\""
#: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435
#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435
#: ../../include/conversation.php:117 ../../include/conversation.php:245
#: ../../addon.old/communityhome/communityhome.php:155
msgid "event"
@ -7582,137 +7581,135 @@ msgstr ""
msgid "Color scheme"
msgstr "Schema colori"
#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr "I tuoi messaggi e le tue conversazioni"
#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50
msgid "Your profile page"
msgstr "Pagina del tuo profilo"
#: ../../view/theme/diabook/theme.php:89
#: ../../view/theme/diabook/theme.php:88
msgid "Your contacts"
msgstr ""
#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51
msgid "Your photos"
msgstr "Le tue foto"
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52
msgid "Your events"
msgstr "I tuoi eventi"
#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
msgid "Personal notes"
msgstr "Note personali"
#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
msgid "Your personal photos"
msgstr "Le tue foto personali"
#: ../../view/theme/diabook/theme.php:94
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:632
#: ../../view/theme/diabook/theme.php:93
#: ../../view/theme/diabook/config.php:163
msgid "Community Pages"
msgstr ""
#: ../../view/theme/diabook/theme.php:384
#: ../../view/theme/diabook/theme.php:634
#: ../../view/theme/diabook/theme.php:377
#: ../../view/theme/diabook/theme.php:591
#: ../../view/theme/diabook/config.php:165
msgid "Community Profiles"
msgstr ""
#: ../../view/theme/diabook/theme.php:405
#: ../../view/theme/diabook/theme.php:639
#: ../../view/theme/diabook/theme.php:398
#: ../../view/theme/diabook/theme.php:596
#: ../../view/theme/diabook/config.php:170
msgid "Last users"
msgstr "Ultimi utenti"
#: ../../view/theme/diabook/theme.php:434
#: ../../view/theme/diabook/theme.php:641
#: ../../view/theme/diabook/theme.php:427
#: ../../view/theme/diabook/theme.php:598
#: ../../view/theme/diabook/config.php:172
msgid "Last likes"
msgstr "Ultimi \"mi piace\""
#: ../../view/theme/diabook/theme.php:479
#: ../../view/theme/diabook/theme.php:640
#: ../../view/theme/diabook/theme.php:472
#: ../../view/theme/diabook/theme.php:597
#: ../../view/theme/diabook/config.php:171
msgid "Last photos"
msgstr "Ultime foto"
#: ../../view/theme/diabook/theme.php:516
#: ../../view/theme/diabook/theme.php:637
#: ../../view/theme/diabook/theme.php:509
#: ../../view/theme/diabook/theme.php:594
#: ../../view/theme/diabook/config.php:168
msgid "Find Friends"
msgstr "Trova Amici"
#: ../../view/theme/diabook/theme.php:517
#: ../../view/theme/diabook/theme.php:510
msgid "Local Directory"
msgstr "Elenco Locale"
#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr "Interessi simili"
#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr "Invita amici"
#: ../../view/theme/diabook/theme.php:572
#: ../../view/theme/diabook/theme.php:633
#: ../../view/theme/diabook/theme.php:531
#: ../../view/theme/diabook/theme.php:590
#: ../../view/theme/diabook/config.php:164
msgid "Earth Layers"
msgstr ""
#: ../../view/theme/diabook/theme.php:577
#: ../../view/theme/diabook/theme.php:536
msgid "Set zoomfactor for Earth Layers"
msgstr ""
#: ../../view/theme/diabook/theme.php:578
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/config.php:161
msgid "Set longitude (X) for Earth Layers"
msgstr ""
#: ../../view/theme/diabook/theme.php:579
#: ../../view/theme/diabook/theme.php:538
#: ../../view/theme/diabook/config.php:162
msgid "Set latitude (Y) for Earth Layers"
msgstr ""
#: ../../view/theme/diabook/theme.php:551
#: ../../view/theme/diabook/theme.php:592
#: ../../view/theme/diabook/theme.php:635
#: ../../view/theme/diabook/config.php:166
msgid "Help or @NewHere ?"
msgstr "Serve aiuto? Sei nuovo?"
#: ../../view/theme/diabook/theme.php:599
#: ../../view/theme/diabook/theme.php:636
#: ../../view/theme/diabook/theme.php:558
#: ../../view/theme/diabook/theme.php:593
#: ../../view/theme/diabook/config.php:167
msgid "Connect Services"
msgstr "Servizi di conessione"
#: ../../view/theme/diabook/theme.php:606
#: ../../view/theme/diabook/theme.php:638
#: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:595
msgid "Last Tweets"
msgstr ""
#: ../../view/theme/diabook/theme.php:609
#: ../../view/theme/diabook/theme.php:568
#: ../../view/theme/diabook/config.php:159
msgid "Set twitter search term"
msgstr ""
#: ../../view/theme/diabook/theme.php:629
#: ../../view/theme/diabook/theme.php:587
#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
msgid "don't show"
msgstr "non mostrare"
#: ../../view/theme/diabook/theme.php:629
#: ../../view/theme/diabook/theme.php:587
#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
msgid "show"
msgstr "mostra"
#: ../../view/theme/diabook/theme.php:630
#: ../../view/theme/diabook/theme.php:588
msgid "Show/hide boxes at right-hand column:"
msgstr ""
@ -8663,12 +8660,12 @@ msgstr "secondi"
msgid "%1$d %2$s ago"
msgstr "%1$d %2$s fa"
#: ../../include/datetime.php:472 ../../include/items.php:1688
#: ../../include/datetime.php:472 ../../include/items.php:1689
#, php-format
msgid "%s's birthday"
msgstr ""
#: ../../include/datetime.php:473 ../../include/items.php:1689
#: ../../include/datetime.php:473 ../../include/items.php:1690
#, php-format
msgid "Happy Birthday %s"
msgstr ""
@ -8943,15 +8940,15 @@ msgstr "Impossibile recuperare informazioni sul contatto."
msgid "following"
msgstr "segue"
#: ../../include/items.php:3299
#: ../../include/items.php:3300
msgid "A new person is sharing with you at "
msgstr "Una nuova persona sta condividendo con te da "
#: ../../include/items.php:3299
#: ../../include/items.php:3300
msgid "You have a new follower at "
msgstr "Una nuova persona ti segue su "
#: ../../include/items.php:3980
#: ../../include/items.php:3981
msgid "Archives"
msgstr ""

2
view/it/strings.php
View file

@ -641,7 +641,7 @@ $a->strings["Go to Your Site's Directory"] = "";
$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "La pagina Elenco ti permette di trovare altre persone in questa rete o in altri siti. Cerca un link <em>Connetti</em> o <em>Segui</em> nella loro pagina del profilo. Inserisci il tuo Indirizzo Identità, se richiesto.";
$a->strings["Finding New People"] = "";
$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Nel pannello laterale nella pagina \"Contatti\", ci sono diversi strumenti per trovare nuovi amici. Possiamo confrontare le persone per interessi, cercare le persone per nome e fornire suggerimenti basati sui tuoi contatti esistenti. Su un sito nuovo, i suggerimenti sono di solito presenti dopo 24 ore.";
$a->strings["Groups"] = "Grouppi";
$a->strings["Groups"] = "Gruppi";
$a->strings["Group Your Contacts"] = "";
$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Quando avrai alcuni amici, organizzali in gruppi di conversazioni private dalla barra laterale della tua pagina Contatti. Potrai interagire privatamente con ogni gruppo nella tua pagina Rete";
$a->strings["Why Aren't My Posts Public?"] = "";

6
view/theme/vier/style.css
View file

@ -1079,15 +1079,13 @@ section {
padding-bottom: 2px;
}
.tag {
background: url("../../../images/tag_b.png") repeat-x center left;
color: #ffffff;
color: rgb(153,153,153);
padding-left: 3px;
font-size: 10px;
}
.tag a {
padding-right: 8px;
background: url("../../../images/tag.png") no-repeat center right;
color: #ffffff;
color: rgb(153,153,153);
}
.wwto {
position: absolute !important;

2
view/theme/vier/threaded_conversation.tpl
View file

@ -2,7 +2,7 @@ $live_update
{{ for $threads as $item }}
<div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}">
<div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }} $item.toplevel">
{{ if $item.type == tag }}

23
view/theme/vier/wall_thread.tpl
View file

@ -42,7 +42,7 @@
</ul>
</div>
{{ if $item.owner_url }}
{{ if $item.owner_url }}
<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
@ -60,9 +60,18 @@
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.tags as $tag }}
{{ for $item.hashtags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
{{ for $item.mentions as $tag }}
<span class='mention'>$tag</span>
{{ endfor }}
{{ for $item.folders as $cat }}
<span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
{{ endfor }}
{{ for $item.categories as $cat }}
<span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
{{ endfor }}
</div>
</div>
<div class="wall-item-bottom">
@ -71,7 +80,11 @@
</div>
<div class="wall-item-actions">
<div class="wall-item-actions-author">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
<a href="$item.profile_url" target="redir"
title="$item.linktitle"
class="wall-item-name-link"><span
class="wall-item-name$item.sparkle">$item.name</span></a>
<span class="wall-item-ago" title="$item.localtime">$item.ago</span>
{{ if $item.owner_url }}<br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
{{ endif }}
</div>
@ -118,14 +131,14 @@
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div>
{{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
{{ if $item.threaded }}{{ if $item.comment }}
<div class="wall-item-bottom">
<div class="wall-item-links"></div>
<div class="wall-item-comment-wrapper">
$item.comment
</div>
</div>
{{ endif }}{{ endif }}{{ endif }}
{{ endif }}{{ endif }}
</div>