aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/es-es/hmessages.po204
-rw-r--r--view/es-es/hstrings.php3
-rw-r--r--view/nl/hmessages.po212
-rw-r--r--view/nl/hstrings.php11
-rwxr-xr-xview/tpl/conv_item.tpl2
-rwxr-xr-xview/tpl/conv_list.tpl2
-rwxr-xr-xview/tpl/search_item.tpl2
7 files changed, 224 insertions, 212 deletions
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 462abdc17..824ae5e49 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -4,15 +4,17 @@
#
# Translators:
# Alfonso <admin@alfonsomh.eu>, 2015
-# Manuel Jiménez Friaza <mjfriaza@openmailbox.org>, 2015
+# JACOB MALDONADO <axetransit@gmail.com>, 2015
+# jeroenpraat <jeroenpraat@xs4all.nl>, 2015
+# Manuel Jiménez Friaza <mjfriaza@openmailbox.org>, 2015-2016
# Rafael, 2015
# tony baldwin <tonybaldwin@gmx.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-25 00:03-0800\n"
-"PO-Revision-Date: 2015-12-29 12:41+0000\n"
+"POT-Creation-Date: 2016-01-01 00:03-0800\n"
+"PO-Revision-Date: 2016-01-02 11:55+0000\n"
"Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
"Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
"MIME-Version: 1.0\n"
@@ -147,358 +149,358 @@ msgstr "más antiguas"
msgid "newer"
msgstr "más recientes"
-#: ../../include/text.php:785
+#: ../../include/text.php:803
msgid "No connections"
msgstr "Sin conexiones"
-#: ../../include/text.php:797
+#: ../../include/text.php:815
#, php-format
msgid "%d Connection"
msgid_plural "%d Connections"
msgstr[0] "%d Conexión"
msgstr[1] "%d Conexiones"
-#: ../../include/text.php:810 ../../mod/viewconnections.php:101
+#: ../../include/text.php:828 ../../mod/viewconnections.php:101
msgid "View Connections"
msgstr "Ver conexiones"
-#: ../../include/text.php:867 ../../include/text.php:879
+#: ../../include/text.php:885 ../../include/text.php:897
#: ../../include/nav.php:159 ../../include/apps.php:147
#: ../../mod/search.php:40
msgid "Search"
msgstr "Buscar"
-#: ../../include/text.php:868 ../../include/text.php:880
+#: ../../include/text.php:886 ../../include/text.php:898
#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
#: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
#: ../../mod/filer.php:49
msgid "Save"
msgstr "Guardar"
-#: ../../include/text.php:954
+#: ../../include/text.php:972
msgid "poke"
msgstr "un toque"
-#: ../../include/text.php:954 ../../include/conversation.php:243
+#: ../../include/text.php:972 ../../include/conversation.php:243
msgid "poked"
msgstr "ha dado un toque a"
-#: ../../include/text.php:955
+#: ../../include/text.php:973
msgid "ping"
msgstr "un \"ping\""
-#: ../../include/text.php:955
+#: ../../include/text.php:973
msgid "pinged"
msgstr "ha enviado un \"ping\" a"
-#: ../../include/text.php:956
+#: ../../include/text.php:974
msgid "prod"
msgstr "una incitación "
-#: ../../include/text.php:956
+#: ../../include/text.php:974
msgid "prodded"
msgstr "ha incitado a "
-#: ../../include/text.php:957
+#: ../../include/text.php:975
msgid "slap"
msgstr "una bofetada "
-#: ../../include/text.php:957
+#: ../../include/text.php:975
msgid "slapped"
msgstr "ha abofeteado a "
-#: ../../include/text.php:958
+#: ../../include/text.php:976
msgid "finger"
msgstr "un \"finger\" "
-#: ../../include/text.php:958
+#: ../../include/text.php:976
msgid "fingered"
msgstr "envió un \"finger\" a"
-#: ../../include/text.php:959
+#: ../../include/text.php:977
msgid "rebuff"
msgstr "un reproche"
-#: ../../include/text.php:959
+#: ../../include/text.php:977
msgid "rebuffed"
msgstr "ha hecho un reproche a "
-#: ../../include/text.php:969
+#: ../../include/text.php:987
msgid "happy"
msgstr "feliz "
-#: ../../include/text.php:970
+#: ../../include/text.php:988
msgid "sad"
msgstr "triste "
-#: ../../include/text.php:971
+#: ../../include/text.php:989
msgid "mellow"
msgstr "tranquilo/a"
-#: ../../include/text.php:972
+#: ../../include/text.php:990
msgid "tired"
msgstr "cansado/a "
-#: ../../include/text.php:973
+#: ../../include/text.php:991
msgid "perky"
msgstr "vivaz"
-#: ../../include/text.php:974
+#: ../../include/text.php:992
msgid "angry"
msgstr "enfadado/a"
-#: ../../include/text.php:975
-msgid "stupified"
-msgstr "estupefacto/a"
+#: ../../include/text.php:993
+msgid "stupefied"
+msgstr "asombrado"
-#: ../../include/text.php:976
+#: ../../include/text.php:994
msgid "puzzled"
msgstr "perplejo/a"
-#: ../../include/text.php:977
+#: ../../include/text.php:995
msgid "interested"
msgstr "interesado/a"
-#: ../../include/text.php:978
+#: ../../include/text.php:996
msgid "bitter"
msgstr "amargado/a"
-#: ../../include/text.php:979
+#: ../../include/text.php:997
msgid "cheerful"
msgstr "alegre"
-#: ../../include/text.php:980
+#: ../../include/text.php:998
msgid "alive"
msgstr "animado/a"
-#: ../../include/text.php:981
+#: ../../include/text.php:999
msgid "annoyed"
msgstr "molesto/a"
-#: ../../include/text.php:982
+#: ../../include/text.php:1000
msgid "anxious"
msgstr "ansioso/a"
-#: ../../include/text.php:983
+#: ../../include/text.php:1001
msgid "cranky"
msgstr "de mal humor"
-#: ../../include/text.php:984
+#: ../../include/text.php:1002
msgid "disturbed"
msgstr "perturbado/a"
-#: ../../include/text.php:985
+#: ../../include/text.php:1003
msgid "frustrated"
msgstr "frustrado/a"
-#: ../../include/text.php:986
+#: ../../include/text.php:1004
msgid "depressed"
msgstr "deprimido/a"
-#: ../../include/text.php:987
+#: ../../include/text.php:1005
msgid "motivated"
msgstr "motivado/a"
-#: ../../include/text.php:988
+#: ../../include/text.php:1006
msgid "relaxed"
msgstr "relajado/a"
-#: ../../include/text.php:989
+#: ../../include/text.php:1007
msgid "surprised"
msgstr "sorprendido/a"
-#: ../../include/text.php:1161 ../../include/js_strings.php:70
+#: ../../include/text.php:1179 ../../include/js_strings.php:70
msgid "Monday"
msgstr "lunes"
-#: ../../include/text.php:1161 ../../include/js_strings.php:71
+#: ../../include/text.php:1179 ../../include/js_strings.php:71
msgid "Tuesday"
msgstr "martes"
-#: ../../include/text.php:1161 ../../include/js_strings.php:72
+#: ../../include/text.php:1179 ../../include/js_strings.php:72
msgid "Wednesday"
msgstr "miércoles"
-#: ../../include/text.php:1161 ../../include/js_strings.php:73
+#: ../../include/text.php:1179 ../../include/js_strings.php:73
msgid "Thursday"
msgstr "jueves"
-#: ../../include/text.php:1161 ../../include/js_strings.php:74
+#: ../../include/text.php:1179 ../../include/js_strings.php:74
msgid "Friday"
msgstr "viernes"
-#: ../../include/text.php:1161 ../../include/js_strings.php:75
+#: ../../include/text.php:1179 ../../include/js_strings.php:75
msgid "Saturday"
msgstr "sábado"
-#: ../../include/text.php:1161 ../../include/js_strings.php:69
+#: ../../include/text.php:1179 ../../include/js_strings.php:69
msgid "Sunday"
msgstr "domingo"
-#: ../../include/text.php:1165 ../../include/js_strings.php:45
+#: ../../include/text.php:1183 ../../include/js_strings.php:45
msgid "January"
msgstr "enero"
-#: ../../include/text.php:1165 ../../include/js_strings.php:46
+#: ../../include/text.php:1183 ../../include/js_strings.php:46
msgid "February"
msgstr "febrero"
-#: ../../include/text.php:1165 ../../include/js_strings.php:47
+#: ../../include/text.php:1183 ../../include/js_strings.php:47
msgid "March"
msgstr "marzo"
-#: ../../include/text.php:1165 ../../include/js_strings.php:48
+#: ../../include/text.php:1183 ../../include/js_strings.php:48
msgid "April"
msgstr "abril"
-#: ../../include/text.php:1165
+#: ../../include/text.php:1183
msgid "May"
msgstr "mayo"
-#: ../../include/text.php:1165 ../../include/js_strings.php:50
+#: ../../include/text.php:1183 ../../include/js_strings.php:50
msgid "June"
msgstr "junio"
-#: ../../include/text.php:1165 ../../include/js_strings.php:51
+#: ../../include/text.php:1183 ../../include/js_strings.php:51
msgid "July"
msgstr "julio"
-#: ../../include/text.php:1165 ../../include/js_strings.php:52
+#: ../../include/text.php:1183 ../../include/js_strings.php:52
msgid "August"
msgstr "agosto"
-#: ../../include/text.php:1165 ../../include/js_strings.php:53
+#: ../../include/text.php:1183 ../../include/js_strings.php:53
msgid "September"
msgstr "septiembre"
-#: ../../include/text.php:1165 ../../include/js_strings.php:54
+#: ../../include/text.php:1183 ../../include/js_strings.php:54
msgid "October"
msgstr "octubre"
-#: ../../include/text.php:1165 ../../include/js_strings.php:55
+#: ../../include/text.php:1183 ../../include/js_strings.php:55
msgid "November"
msgstr "noviembre"
-#: ../../include/text.php:1165 ../../include/js_strings.php:56
+#: ../../include/text.php:1183 ../../include/js_strings.php:56
msgid "December"
msgstr "diciembre"
-#: ../../include/text.php:1242 ../../include/text.php:1246
+#: ../../include/text.php:1260 ../../include/text.php:1264
msgid "Unknown Attachment"
msgstr "Adjunto no reconocido"
-#: ../../include/text.php:1248 ../../include/RedDAV/RedBrowser.php:237
+#: ../../include/text.php:1266 ../../include/RedDAV/RedBrowser.php:237
#: ../../mod/sharedwithme.php:97
msgid "Size"
msgstr "Tamaño"
-#: ../../include/text.php:1248
+#: ../../include/text.php:1266
msgid "unknown"
msgstr "desconocido"
-#: ../../include/text.php:1284
+#: ../../include/text.php:1302
msgid "remove category"
msgstr "eliminar categoría"
-#: ../../include/text.php:1361
+#: ../../include/text.php:1379
msgid "remove from file"
msgstr "eliminar del fichero"
-#: ../../include/text.php:1392 ../../include/event.php:22
+#: ../../include/text.php:1410 ../../include/event.php:22
#: ../../include/bb2diaspora.php:465
msgid "l F d, Y \\@ g:i A"
msgstr "l d de F, Y \\@ G:i"
-#: ../../include/text.php:1396 ../../include/event.php:30
+#: ../../include/text.php:1414 ../../include/event.php:30
#: ../../include/bb2diaspora.php:471
msgid "Starts:"
msgstr "Comienza:"
-#: ../../include/text.php:1400 ../../include/event.php:40
+#: ../../include/text.php:1418 ../../include/event.php:40
#: ../../include/bb2diaspora.php:479
msgid "Finishes:"
msgstr "Finaliza:"
-#: ../../include/text.php:1407 ../../include/event.php:52
+#: ../../include/text.php:1425 ../../include/event.php:52
#: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
#: ../../mod/directory.php:304
msgid "Location:"
msgstr "Ubicación:"
-#: ../../include/text.php:1503 ../../include/text.php:1514
+#: ../../include/text.php:1521 ../../include/text.php:1532
msgid "Click to open/close"
msgstr "Pulsar para abrir/cerrar"
-#: ../../include/text.php:1698 ../../mod/events.php:623
+#: ../../include/text.php:1716 ../../mod/events.php:623
msgid "Link to Source"
msgstr "Enlazar con la entrada en su ubicación original"
-#: ../../include/text.php:1719 ../../include/text.php:1791
+#: ../../include/text.php:1737 ../../include/text.php:1809
msgid "default"
msgstr "por defecto"
-#: ../../include/text.php:1727
+#: ../../include/text.php:1745
msgid "Page layout"
msgstr "Formato de la página"
-#: ../../include/text.php:1727
+#: ../../include/text.php:1745
msgid "You can create your own with the layouts tool"
msgstr "Puede crear su propio formato gráfico con las herramientas de diseño"
-#: ../../include/text.php:1769
+#: ../../include/text.php:1787
msgid "Page content type"
msgstr "Tipo de contenido de página"
-#: ../../include/text.php:1803
+#: ../../include/text.php:1821
msgid "Select an alternate language"
msgstr "Seleccionar un idioma alternativo"
-#: ../../include/text.php:1922 ../../include/conversation.php:120
+#: ../../include/text.php:1940 ../../include/conversation.php:120
#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
msgid "photo"
msgstr "foto"
-#: ../../include/text.php:1925 ../../include/event.php:904
+#: ../../include/text.php:1943 ../../include/event.php:904
#: ../../include/conversation.php:123 ../../mod/tagger.php:47
#: ../../mod/like.php:363 ../../mod/events.php:249
msgid "event"
msgstr "evento"
-#: ../../include/text.php:1928 ../../include/conversation.php:148
+#: ../../include/text.php:1946 ../../include/conversation.php:148
#: ../../mod/like.php:361 ../../mod/subthread.php:83
msgid "status"
msgstr "el mensaje de estado"
-#: ../../include/text.php:1930 ../../include/conversation.php:150
+#: ../../include/text.php:1948 ../../include/conversation.php:150
#: ../../mod/tagger.php:53
msgid "comment"
msgstr "el comentario"
-#: ../../include/text.php:1935
+#: ../../include/text.php:1953
msgid "activity"
msgstr "actividad"
-#: ../../include/text.php:2230
+#: ../../include/text.php:2248
msgid "Design Tools"
msgstr "Herramientas de diseño"
-#: ../../include/text.php:2233 ../../mod/blocks.php:147
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
msgid "Blocks"
msgstr "Bloques"
-#: ../../include/text.php:2234 ../../mod/menu.php:103
+#: ../../include/text.php:2252 ../../mod/menu.php:103
msgid "Menus"
msgstr "Menús"
-#: ../../include/text.php:2235 ../../mod/layouts.php:174
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
msgid "Layouts"
msgstr "Formato gráfico"
-#: ../../include/text.php:2236
+#: ../../include/text.php:2254
msgid "Pages"
msgstr "Páginas"
-#: ../../include/text.php:2588 ../../include/RedDAV/RedBrowser.php:131
+#: ../../include/text.php:2606 ../../include/RedDAV/RedBrowser.php:131
msgid "Collection"
msgstr "Colección"
@@ -1358,29 +1360,29 @@ msgstr "Álbumes de fotos"
msgid "Upload New Photos"
msgstr "Subir nuevas fotos"
-#: ../../include/acl_selectors.php:240
+#: ../../include/acl_selectors.php:218
msgid "Visible to your default audience"
msgstr "Visible para su público predeterminado."
-#: ../../include/acl_selectors.php:241
+#: ../../include/acl_selectors.php:243
msgid "Show"
msgstr "Mostrar"
-#: ../../include/acl_selectors.php:242
+#: ../../include/acl_selectors.php:244
msgid "Don't show"
msgstr "No mostrar"
-#: ../../include/acl_selectors.php:247
+#: ../../include/acl_selectors.php:249
msgid "Other networks and post services"
msgstr "Otras redes y servicios de publicación"
-#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
+#: ../../include/acl_selectors.php:251 ../../mod/filestorage.php:147
#: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
#: ../../mod/photos.php:998 ../../mod/chat.php:211
msgid "Permissions"
msgstr "Permisos"
-#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
+#: ../../include/acl_selectors.php:252 ../../include/ItemObject.php:384
#: ../../mod/photos.php:1215
msgid "Close"
msgstr "Cerrar"
@@ -3438,19 +3440,19 @@ msgstr "Respuesta incompleta del canal."
msgid "Channel was deleted and no longer exists."
msgstr "El canal ha sido eliminado y ya no existe."
-#: ../../include/follow.php:152 ../../include/follow.php:181
+#: ../../include/follow.php:153 ../../include/follow.php:183
msgid "Protocol disabled."
msgstr "Protocolo deshabilitado."
-#: ../../include/follow.php:171
+#: ../../include/follow.php:173
msgid "Channel discovery failed."
msgstr "El intento de acceder al canal ha fallado."
-#: ../../include/follow.php:197
+#: ../../include/follow.php:199
msgid "local account not found."
msgstr "No se ha encontrado la cuenta local."
-#: ../../include/follow.php:221
+#: ../../include/follow.php:224
msgid "Cannot connect to yourself."
msgstr "No puede conectarse consigo mismo."
@@ -6616,6 +6618,10 @@ msgstr "foro"
msgid "Search Results For:"
msgstr "Buscar resultados para:"
+#: ../../mod/network.php:169 ../../mod/channel.php:131 ../../mod/rpost.php:114
+msgid "Public"
+msgstr "Público/a"
+
#: ../../mod/network.php:207
msgid "Collection is empty"
msgstr "La colección está vacía"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 080917d4f..e3af4e95e 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -51,7 +51,7 @@ $a->strings["mellow"] = "tranquilo/a";
$a->strings["tired"] = "cansado/a ";
$a->strings["perky"] = "vivaz";
$a->strings["angry"] = "enfadado/a";
-$a->strings["stupified"] = "estupefacto/a";
+$a->strings["stupefied"] = "asombrado";
$a->strings["puzzled"] = "perplejo/a";
$a->strings["interested"] = "interesado/a";
$a->strings["bitter"] = "amargado/a";
@@ -1546,6 +1546,7 @@ $a->strings["No such group"] = "No se encuentra el grupo";
$a->strings["No such channel"] = "No se encuentra el canal";
$a->strings["forum"] = "foro";
$a->strings["Search Results For:"] = "Buscar resultados para:";
+$a->strings["Public"] = "Público/a";
$a->strings["Collection is empty"] = "La colección está vacía";
$a->strings["Collection: "] = "Colección:";
$a->strings["Invalid connection."] = "Conexión no válida.";
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index e2317d2c5..4f669bfea 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the Red package.
#
# Translators:
-# jeroenpraat <jeroenpraat@xs4all.nl>, 2015
+# jeroenpraat <jeroenpraat@xs4all.nl>, 2015-2016
msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-25 00:03-0800\n"
-"PO-Revision-Date: 2015-12-26 08:59+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"POT-Creation-Date: 2016-01-01 00:03-0800\n"
+"PO-Revision-Date: 2016-01-02 13:02+0000\n"
+"Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -144,358 +144,358 @@ msgstr "ouder"
msgid "newer"
msgstr "nieuwer"
-#: ../../include/text.php:785
+#: ../../include/text.php:803
msgid "No connections"
msgstr "Geen connecties"
-#: ../../include/text.php:797
+#: ../../include/text.php:815
#, php-format
msgid "%d Connection"
msgid_plural "%d Connections"
msgstr[0] "%d connectie"
msgstr[1] "%d connecties"
-#: ../../include/text.php:810 ../../mod/viewconnections.php:101
+#: ../../include/text.php:828 ../../mod/viewconnections.php:101
msgid "View Connections"
msgstr "Connecties weergeven"
-#: ../../include/text.php:867 ../../include/text.php:879
+#: ../../include/text.php:885 ../../include/text.php:897
#: ../../include/nav.php:159 ../../include/apps.php:147
#: ../../mod/search.php:40
msgid "Search"
msgstr "Zoeken"
-#: ../../include/text.php:868 ../../include/text.php:880
+#: ../../include/text.php:886 ../../include/text.php:898
#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
#: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
#: ../../mod/filer.php:49
msgid "Save"
msgstr "Opslaan"
-#: ../../include/text.php:954
+#: ../../include/text.php:972
msgid "poke"
msgstr "aanstoten"
-#: ../../include/text.php:954 ../../include/conversation.php:243
+#: ../../include/text.php:972 ../../include/conversation.php:243
msgid "poked"
msgstr "aangestoten"
-#: ../../include/text.php:955
+#: ../../include/text.php:973
msgid "ping"
msgstr "ping"
-#: ../../include/text.php:955
+#: ../../include/text.php:973
msgid "pinged"
msgstr "gepingd"
-#: ../../include/text.php:956
+#: ../../include/text.php:974
msgid "prod"
msgstr "por"
-#: ../../include/text.php:956
+#: ../../include/text.php:974
msgid "prodded"
msgstr "gepord"
-#: ../../include/text.php:957
+#: ../../include/text.php:975
msgid "slap"
msgstr "slaan"
-#: ../../include/text.php:957
+#: ../../include/text.php:975
msgid "slapped"
msgstr "sloeg"
-#: ../../include/text.php:958
+#: ../../include/text.php:976
msgid "finger"
msgstr "finger"
-#: ../../include/text.php:958
+#: ../../include/text.php:976
msgid "fingered"
msgstr "gefingerd"
-#: ../../include/text.php:959
+#: ../../include/text.php:977
msgid "rebuff"
msgstr "afpoeieren"
-#: ../../include/text.php:959
+#: ../../include/text.php:977
msgid "rebuffed"
msgstr "afgepoeierd"
-#: ../../include/text.php:969
+#: ../../include/text.php:987
msgid "happy"
msgstr "gelukkig"
-#: ../../include/text.php:970
+#: ../../include/text.php:988
msgid "sad"
msgstr "bedroefd"
-#: ../../include/text.php:971
+#: ../../include/text.php:989
msgid "mellow"
msgstr "mellow"
-#: ../../include/text.php:972
+#: ../../include/text.php:990
msgid "tired"
msgstr "moe"
-#: ../../include/text.php:973
+#: ../../include/text.php:991
msgid "perky"
msgstr "parmantig"
-#: ../../include/text.php:974
+#: ../../include/text.php:992
msgid "angry"
msgstr "boos"
-#: ../../include/text.php:975
-msgid "stupified"
-msgstr "beteuterd"
+#: ../../include/text.php:993
+msgid "stupefied"
+msgstr "verbijsterd"
-#: ../../include/text.php:976
+#: ../../include/text.php:994
msgid "puzzled"
msgstr "verward"
-#: ../../include/text.php:977
+#: ../../include/text.php:995
msgid "interested"
msgstr "geïnteresseerd"
-#: ../../include/text.php:978
+#: ../../include/text.php:996
msgid "bitter"
msgstr "verbitterd"
-#: ../../include/text.php:979
+#: ../../include/text.php:997
msgid "cheerful"
msgstr "vrolijk"
-#: ../../include/text.php:980
+#: ../../include/text.php:998
msgid "alive"
msgstr "levendig"
-#: ../../include/text.php:981
+#: ../../include/text.php:999
msgid "annoyed"
msgstr "geërgerd"
-#: ../../include/text.php:982
+#: ../../include/text.php:1000
msgid "anxious"
msgstr "bezorgd"
-#: ../../include/text.php:983
+#: ../../include/text.php:1001
msgid "cranky"
msgstr "humeurig"
-#: ../../include/text.php:984
+#: ../../include/text.php:1002
msgid "disturbed"
msgstr "verontrust"
-#: ../../include/text.php:985
+#: ../../include/text.php:1003
msgid "frustrated"
msgstr "gefrustreerd "
-#: ../../include/text.php:986
+#: ../../include/text.php:1004
msgid "depressed"
msgstr "gedeprimeerd"
-#: ../../include/text.php:987
+#: ../../include/text.php:1005
msgid "motivated"
msgstr "gemotiveerd"
-#: ../../include/text.php:988
+#: ../../include/text.php:1006
msgid "relaxed"
msgstr "ontspannen"
-#: ../../include/text.php:989
+#: ../../include/text.php:1007
msgid "surprised"
msgstr "verrast"
-#: ../../include/text.php:1161 ../../include/js_strings.php:70
+#: ../../include/text.php:1179 ../../include/js_strings.php:70
msgid "Monday"
msgstr "maandag"
-#: ../../include/text.php:1161 ../../include/js_strings.php:71
+#: ../../include/text.php:1179 ../../include/js_strings.php:71
msgid "Tuesday"
msgstr "dinsdag"
-#: ../../include/text.php:1161 ../../include/js_strings.php:72
+#: ../../include/text.php:1179 ../../include/js_strings.php:72
msgid "Wednesday"
msgstr "woensdag"
-#: ../../include/text.php:1161 ../../include/js_strings.php:73
+#: ../../include/text.php:1179 ../../include/js_strings.php:73
msgid "Thursday"
msgstr "donderdag"
-#: ../../include/text.php:1161 ../../include/js_strings.php:74
+#: ../../include/text.php:1179 ../../include/js_strings.php:74
msgid "Friday"
msgstr "vrijdag"
-#: ../../include/text.php:1161 ../../include/js_strings.php:75
+#: ../../include/text.php:1179 ../../include/js_strings.php:75
msgid "Saturday"
msgstr "zaterdag"
-#: ../../include/text.php:1161 ../../include/js_strings.php:69
+#: ../../include/text.php:1179 ../../include/js_strings.php:69
msgid "Sunday"
msgstr "zondag"
-#: ../../include/text.php:1165 ../../include/js_strings.php:45
+#: ../../include/text.php:1183 ../../include/js_strings.php:45
msgid "January"
msgstr "januari"
-#: ../../include/text.php:1165 ../../include/js_strings.php:46
+#: ../../include/text.php:1183 ../../include/js_strings.php:46
msgid "February"
msgstr "februari"
-#: ../../include/text.php:1165 ../../include/js_strings.php:47
+#: ../../include/text.php:1183 ../../include/js_strings.php:47
msgid "March"
msgstr "maart"
-#: ../../include/text.php:1165 ../../include/js_strings.php:48
+#: ../../include/text.php:1183 ../../include/js_strings.php:48
msgid "April"
msgstr "april"
-#: ../../include/text.php:1165
+#: ../../include/text.php:1183
msgid "May"
msgstr "mei"
-#: ../../include/text.php:1165 ../../include/js_strings.php:50
+#: ../../include/text.php:1183 ../../include/js_strings.php:50
msgid "June"
msgstr "juni"
-#: ../../include/text.php:1165 ../../include/js_strings.php:51
+#: ../../include/text.php:1183 ../../include/js_strings.php:51
msgid "July"
msgstr "juli"
-#: ../../include/text.php:1165 ../../include/js_strings.php:52
+#: ../../include/text.php:1183 ../../include/js_strings.php:52
msgid "August"
msgstr "augustus"
-#: ../../include/text.php:1165 ../../include/js_strings.php:53
+#: ../../include/text.php:1183 ../../include/js_strings.php:53
msgid "September"
msgstr "september"
-#: ../../include/text.php:1165 ../../include/js_strings.php:54
+#: ../../include/text.php:1183 ../../include/js_strings.php:54
msgid "October"
msgstr "oktober"
-#: ../../include/text.php:1165 ../../include/js_strings.php:55
+#: ../../include/text.php:1183 ../../include/js_strings.php:55
msgid "November"
msgstr "november"
-#: ../../include/text.php:1165 ../../include/js_strings.php:56
+#: ../../include/text.php:1183 ../../include/js_strings.php:56
msgid "December"
msgstr "december"
-#: ../../include/text.php:1242 ../../include/text.php:1246
+#: ../../include/text.php:1260 ../../include/text.php:1264
msgid "Unknown Attachment"
msgstr "Onbekende bijlage"
-#: ../../include/text.php:1248 ../../include/RedDAV/RedBrowser.php:237
+#: ../../include/text.php:1266 ../../include/RedDAV/RedBrowser.php:237
#: ../../mod/sharedwithme.php:97
msgid "Size"
msgstr "Grootte"
-#: ../../include/text.php:1248
+#: ../../include/text.php:1266
msgid "unknown"
msgstr "onbekend"
-#: ../../include/text.php:1284
+#: ../../include/text.php:1302
msgid "remove category"
msgstr "categorie verwijderen"
-#: ../../include/text.php:1361
+#: ../../include/text.php:1379
msgid "remove from file"
msgstr "uit map verwijderen"
-#: ../../include/text.php:1392 ../../include/event.php:22
+#: ../../include/text.php:1410 ../../include/event.php:22
#: ../../include/bb2diaspora.php:465
msgid "l F d, Y \\@ g:i A"
msgstr "l d F Y \\@ G:i"
-#: ../../include/text.php:1396 ../../include/event.php:30
+#: ../../include/text.php:1414 ../../include/event.php:30
#: ../../include/bb2diaspora.php:471
msgid "Starts:"
msgstr "Start:"
-#: ../../include/text.php:1400 ../../include/event.php:40
+#: ../../include/text.php:1418 ../../include/event.php:40
#: ../../include/bb2diaspora.php:479
msgid "Finishes:"
msgstr "Einde:"
-#: ../../include/text.php:1407 ../../include/event.php:52
+#: ../../include/text.php:1425 ../../include/event.php:52
#: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
#: ../../mod/directory.php:304
msgid "Location:"
msgstr "Plaats:"
-#: ../../include/text.php:1503 ../../include/text.php:1514
+#: ../../include/text.php:1521 ../../include/text.php:1532
msgid "Click to open/close"
msgstr "Klik om te openen of te sluiten"
-#: ../../include/text.php:1698 ../../mod/events.php:623
+#: ../../include/text.php:1716 ../../mod/events.php:623
msgid "Link to Source"
msgstr "Originele locatie"
-#: ../../include/text.php:1719 ../../include/text.php:1791
+#: ../../include/text.php:1737 ../../include/text.php:1809
msgid "default"
msgstr "standaard"
-#: ../../include/text.php:1727
+#: ../../include/text.php:1745
msgid "Page layout"
msgstr "Pagina-lay-out"
-#: ../../include/text.php:1727
+#: ../../include/text.php:1745
msgid "You can create your own with the layouts tool"
msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
-#: ../../include/text.php:1769
+#: ../../include/text.php:1787
msgid "Page content type"
msgstr "Opmaaktype pagina"
-#: ../../include/text.php:1803
+#: ../../include/text.php:1821
msgid "Select an alternate language"
msgstr "Kies een andere taal"
-#: ../../include/text.php:1922 ../../include/conversation.php:120
+#: ../../include/text.php:1940 ../../include/conversation.php:120
#: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
msgid "photo"
msgstr "foto"
-#: ../../include/text.php:1925 ../../include/event.php:904
+#: ../../include/text.php:1943 ../../include/event.php:904
#: ../../include/conversation.php:123 ../../mod/tagger.php:47
#: ../../mod/like.php:363 ../../mod/events.php:249
msgid "event"
msgstr "gebeurtenis"
-#: ../../include/text.php:1928 ../../include/conversation.php:148
+#: ../../include/text.php:1946 ../../include/conversation.php:148
#: ../../mod/like.php:361 ../../mod/subthread.php:83
msgid "status"
msgstr "bericht"
-#: ../../include/text.php:1930 ../../include/conversation.php:150
+#: ../../include/text.php:1948 ../../include/conversation.php:150
#: ../../mod/tagger.php:53
msgid "comment"
msgstr "reactie"
-#: ../../include/text.php:1935
+#: ../../include/text.php:1953
msgid "activity"
msgstr "activiteit"
-#: ../../include/text.php:2230
+#: ../../include/text.php:2248
msgid "Design Tools"
msgstr "Ontwerp-hulpmiddelen"
-#: ../../include/text.php:2233 ../../mod/blocks.php:147
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
msgid "Blocks"
msgstr "Blokken"
-#: ../../include/text.php:2234 ../../mod/menu.php:103
+#: ../../include/text.php:2252 ../../mod/menu.php:103
msgid "Menus"
msgstr "Menu's"
-#: ../../include/text.php:2235 ../../mod/layouts.php:174
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
msgid "Layouts"
msgstr "Lay-outs"
-#: ../../include/text.php:2236
+#: ../../include/text.php:2254
msgid "Pages"
msgstr "Pagina's"
-#: ../../include/text.php:2588 ../../include/RedDAV/RedBrowser.php:131
+#: ../../include/text.php:2606 ../../include/RedDAV/RedBrowser.php:131
msgid "Collection"
msgstr "map"
@@ -1355,29 +1355,29 @@ msgstr "Fotoalbums"
msgid "Upload New Photos"
msgstr "Nieuwe foto's uploaden"
-#: ../../include/acl_selectors.php:240
+#: ../../include/acl_selectors.php:218
msgid "Visible to your default audience"
msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
-#: ../../include/acl_selectors.php:241
+#: ../../include/acl_selectors.php:243
msgid "Show"
msgstr "Tonen"
-#: ../../include/acl_selectors.php:242
+#: ../../include/acl_selectors.php:244
msgid "Don't show"
msgstr "Niet tonen"
-#: ../../include/acl_selectors.php:247
+#: ../../include/acl_selectors.php:249
msgid "Other networks and post services"
msgstr "Andere netwerken en diensten"
-#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
+#: ../../include/acl_selectors.php:251 ../../mod/filestorage.php:147
#: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
#: ../../mod/photos.php:998 ../../mod/chat.php:211
msgid "Permissions"
msgstr "Permissies"
-#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
+#: ../../include/acl_selectors.php:252 ../../include/ItemObject.php:384
#: ../../mod/photos.php:1215
msgid "Close"
msgstr "Sluiten"
@@ -2504,7 +2504,7 @@ msgstr "Kies"
#: ../../include/conversation.php:664 ../../include/ItemObject.php:89
msgid "Private Message"
-msgstr "Privébericht"
+msgstr "Niet voor iedereen zichtbaar"
#: ../../include/conversation.php:671 ../../include/ItemObject.php:227
msgid "Message signature validated"
@@ -3435,19 +3435,19 @@ msgstr "Antwoord van het kanaal op afstand was niet volledig."
msgid "Channel was deleted and no longer exists."
msgstr "Kanaal is verwijderd en bestaat niet meer."
-#: ../../include/follow.php:152 ../../include/follow.php:181
+#: ../../include/follow.php:153 ../../include/follow.php:183
msgid "Protocol disabled."
msgstr "Protocol uitgeschakeld."
-#: ../../include/follow.php:171
+#: ../../include/follow.php:173
msgid "Channel discovery failed."
msgstr "Kanaal ontdekken mislukt."
-#: ../../include/follow.php:197
+#: ../../include/follow.php:199
msgid "local account not found."
msgstr "lokale account niet gevonden."
-#: ../../include/follow.php:221
+#: ../../include/follow.php:224
msgid "Cannot connect to yourself."
msgstr "Kan niet met jezelf verbinden"
@@ -3489,7 +3489,7 @@ msgstr "Home"
#: ../../include/nav.php:85
msgid "Your posts and conversations"
-msgstr "Jouw berichten en conversaties"
+msgstr "Jouw kanaal"
#: ../../include/nav.php:86
msgid "Your profile page"
@@ -3603,11 +3603,11 @@ msgstr "Markeer alle gridnotificaties als bekeken"
#: ../../include/nav.php:177 ../../include/apps.php:137
msgid "Channel Home"
-msgstr "Tijdlijn kanaal"
+msgstr "Jouw kanaal"
#: ../../include/nav.php:177
msgid "Channel home"
-msgstr "Tijdlijn kanaal"
+msgstr "Jouw kanaal"
#: ../../include/nav.php:178
msgid "Mark all channel notifications seen"
@@ -6613,6 +6613,10 @@ msgstr "forum"
msgid "Search Results For:"
msgstr "Zoekresultaten voor:"
+#: ../../mod/network.php:169 ../../mod/channel.php:131 ../../mod/rpost.php:114
+msgid "Public"
+msgstr "Openbaar"
+
#: ../../mod/network.php:207
msgid "Collection is empty"
msgstr "Collectie is leeg"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index aa750bdea..871af0711 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -51,7 +51,7 @@ $a->strings["mellow"] = "mellow";
$a->strings["tired"] = "moe";
$a->strings["perky"] = "parmantig";
$a->strings["angry"] = "boos";
-$a->strings["stupified"] = "beteuterd";
+$a->strings["stupefied"] = "verbijsterd";
$a->strings["puzzled"] = "verward";
$a->strings["interested"] = "geïnteresseerd";
$a->strings["bitter"] = "verbitterd";
@@ -575,7 +575,7 @@ $a->strings["__ctx:title__ Attending"] = "aanwezig";
$a->strings["__ctx:title__ Not attending"] = "niet aanwezig";
$a->strings["__ctx:title__ Might attend"] = "mogelijk aanwezig";
$a->strings["Select"] = "Kies";
-$a->strings["Private Message"] = "Privébericht";
+$a->strings["Private Message"] = "Niet voor iedereen zichtbaar";
$a->strings["Message signature validated"] = "Berichtkenmerk gevalideerd";
$a->strings["Message signature incorrect"] = "Berichtkenmerk onjuist";
$a->strings["View %s's profile @ %s"] = "Bekijk het profiel van %s @ %s";
@@ -820,7 +820,7 @@ $a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet
$a->strings["Logout"] = "Uitloggen";
$a->strings["End this session"] = "Beëindig deze sessie";
$a->strings["Home"] = "Home";
-$a->strings["Your posts and conversations"] = "Jouw berichten en conversaties";
+$a->strings["Your posts and conversations"] = "Jouw kanaal";
$a->strings["Your profile page"] = "Jouw profielpagina";
$a->strings["Edit Profiles"] = "Bewerk profielen";
$a->strings["Manage/Edit profiles"] = "Beheer/wijzig profielen";
@@ -848,8 +848,8 @@ $a->strings["Channel Directory"] = "Kanalengids";
$a->strings["Grid"] = "Grid";
$a->strings["Your grid"] = "Jouw grid";
$a->strings["Mark all grid notifications seen"] = "Markeer alle gridnotificaties als bekeken";
-$a->strings["Channel Home"] = "Tijdlijn kanaal";
-$a->strings["Channel home"] = "Tijdlijn kanaal";
+$a->strings["Channel Home"] = "Jouw kanaal";
+$a->strings["Channel home"] = "Jouw kanaal";
$a->strings["Mark all channel notifications seen"] = "Alle kanaalnotificaties als gelezen markeren";
$a->strings["Connections"] = "Connecties";
$a->strings["Notices"] = "Notificaties";
@@ -1546,6 +1546,7 @@ $a->strings["No such group"] = "Collectie niet gevonden";
$a->strings["No such channel"] = "Niet zo'n kanaal";
$a->strings["forum"] = "forum";
$a->strings["Search Results For:"] = "Zoekresultaten voor:";
+$a->strings["Public"] = "Openbaar";
$a->strings["Collection is empty"] = "Collectie is leeg";
$a->strings["Collection: "] = "Collectie: ";
$a->strings["Invalid connection."] = "Ongeldige connectie.";
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 08f0d4fbe..553bc3146 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -26,7 +26,7 @@
<div class="wall-item-photo-end" style="clear:both"></div>
</div>
{{if $item.title}}
- <div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+ <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}">
<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
</div>
{{/if}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index cf1310ea6..e7ce22043 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -26,7 +26,7 @@
<div class="wall-item-photo-end" style="clear:both"></div>
</div>
{{if $item.title}}
- <div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+ <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}">
<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
</div>
{{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 24e1b97d5..872551529 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -20,7 +20,7 @@
<div class="wall-item-photo-end" style="clear:both"></div>
</div>
{{if $item.title}}
- <div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+ <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}">
<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
</div>
{{/if}}