aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/bootstrap-red.css7
-rw-r--r--view/css/conversation.css2
-rw-r--r--view/css/mod_profile.css13
-rw-r--r--view/es-es/hmessages.po1597
-rw-r--r--view/es-es/hstrings.php305
-rw-r--r--view/js/acl.js9
-rw-r--r--view/js/autocomplete.js6
-rw-r--r--view/js/icon_translate.js106
-rw-r--r--view/js/main.js10
-rw-r--r--view/js/mod_chat.js4
-rw-r--r--view/js/mod_filestorage.js4
-rw-r--r--view/js/mod_photos.js8
-rw-r--r--view/js/mod_settings.js9
-rw-r--r--view/nl/hmessages.po1598
-rw-r--r--view/nl/hstrings.php305
-rw-r--r--view/theme/redbasic/css/style.css28
-rw-r--r--view/theme/redbasic/js/redbasic.js4
-rw-r--r--view/theme/redbasic/schema/bluegrid.css6
-rwxr-xr-xview/tpl/abook_edit.tpl2
-rwxr-xr-xview/tpl/acl_selector.tpl6
-rwxr-xr-xview/tpl/admin_channels.tpl6
-rwxr-xr-xview/tpl/admin_plugins.tpl4
-rwxr-xr-xview/tpl/admin_plugins_details.tpl2
-rw-r--r--view/tpl/admin_profiles.tpl4
-rw-r--r--view/tpl/admin_queue.tpl2
-rwxr-xr-xview/tpl/admin_users.tpl6
-rw-r--r--view/tpl/app.tpl8
-rw-r--r--view/tpl/attach_edit.tpl6
-rw-r--r--view/tpl/blocklist.tpl8
-rwxr-xr-xview/tpl/channel.tpl12
-rwxr-xr-xview/tpl/channels.tpl2
-rwxr-xr-xview/tpl/chanview.tpl2
-rw-r--r--view/tpl/chat.tpl36
-rw-r--r--view/tpl/chatroom_new.tpl2
-rw-r--r--view/tpl/chatrooms.tpl4
-rw-r--r--view/tpl/cloud_directory.tpl6
-rw-r--r--view/tpl/cloud_header.tpl6
-rwxr-xr-xview/tpl/comment_item.tpl20
-rwxr-xr-xview/tpl/connection_template.tpl10
-rwxr-xr-xview/tpl/connections.tpl6
-rwxr-xr-xview/tpl/conv_item.tpl42
-rwxr-xr-xview/tpl/conv_list.tpl44
-rwxr-xr-xview/tpl/directory_header.tpl2
-rwxr-xr-xview/tpl/direntry.tpl6
-rwxr-xr-xview/tpl/edpost_head.tpl2
-rwxr-xr-xview/tpl/event.tpl6
-rwxr-xr-xview/tpl/event_cal.tpl2
-rwxr-xr-xview/tpl/event_form.tpl36
-rwxr-xr-xview/tpl/event_item_header.tpl2
-rwxr-xr-xview/tpl/events-js.tpl10
-rwxr-xr-xview/tpl/events_cal-js.tpl10
-rwxr-xr-xview/tpl/events_tools_side.tpl4
-rwxr-xr-xview/tpl/field_acheckbox.tpl6
-rwxr-xr-xview/tpl/follow.tpl2
-rwxr-xr-xview/tpl/group_drop.tpl2
-rwxr-xr-xview/tpl/group_side.tpl6
-rwxr-xr-xview/tpl/install_checks.tpl2
-rw-r--r--view/tpl/item_attach.tpl2
-rw-r--r--view/tpl/item_categories.tpl2
-rw-r--r--view/tpl/item_filer.tpl2
-rwxr-xr-xview/tpl/jot-header.tpl15
-rwxr-xr-xview/tpl/jot.tpl56
-rw-r--r--view/tpl/layoutlist.tpl10
-rwxr-xr-xview/tpl/like_noshare.tpl4
-rw-r--r--view/tpl/locmanage.tpl6
-rwxr-xr-xview/tpl/mail_conv.tpl8
-rwxr-xr-xview/tpl/mail_display.tpl6
-rwxr-xr-xview/tpl/match.tpl2
-rw-r--r--view/tpl/menuedit.tpl4
-rw-r--r--view/tpl/menulist.tpl10
-rw-r--r--view/tpl/mitemedit.tpl4
-rw-r--r--view/tpl/mitemlist.tpl8
-rwxr-xr-xview/tpl/nav.tpl44
-rwxr-xr-xview/tpl/peoplefind.tpl2
-rwxr-xr-xview/tpl/photo_album.tpl10
-rwxr-xr-xview/tpl/photo_drop.tpl2
-rwxr-xr-xview/tpl/photo_view.tpl24
-rwxr-xr-xview/tpl/photos_recent.tpl6
-rwxr-xr-xview/tpl/photos_upload.tpl4
-rwxr-xr-xview/tpl/posted_date_widget.tpl10
-rwxr-xr-xview/tpl/profile_advanced.tpl12
-rwxr-xr-xview/tpl/profile_edit.tpl14
-rwxr-xr-xview/tpl/profile_listing_header.tpl2
-rwxr-xr-xview/tpl/profile_vcard.tpl10
-rwxr-xr-xview/tpl/profile_vcard_short.tpl4
-rwxr-xr-xview/tpl/prv_message.tpl28
-rw-r--r--view/tpl/saved_searches.tpl2
-rwxr-xr-xview/tpl/search_item.tpl10
-rw-r--r--view/tpl/searchbox.tpl4
-rwxr-xr-xview/tpl/settings.tpl2
-rwxr-xr-xview/tpl/settings_account.tpl2
-rwxr-xr-xview/tpl/settings_oauth.tpl4
-rw-r--r--view/tpl/sharedwithme.tpl4
-rw-r--r--view/tpl/show_thing.tpl4
-rwxr-xr-xview/tpl/suggest_friends.tpl4
-rw-r--r--view/tpl/thing_edit.tpl2
-rw-r--r--view/tpl/thing_input.tpl2
-rw-r--r--view/tpl/usermenu.tpl2
-rw-r--r--view/tpl/webpagelist.tpl10
-rwxr-xr-xview/tpl/xchan_vcard.tpl2
100 files changed, 2345 insertions, 2385 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 777bf69eb..73d77bb93 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -21,7 +21,8 @@ nav .badge {
}
}
-nav i {
+#navbar-collapse-1 i,
+.navbar-header i {
font-size: 14px;
}
@@ -50,10 +51,6 @@ nav .navbar-collapse .navbar-right {
float: right;
}
-nav .navbar-toggle {
- margin-bottom: 7px;
-}
-
/* nav overrides end */
diff --git a/view/css/conversation.css b/view/css/conversation.css
index e5eb575bf..9b99efba4 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -124,7 +124,7 @@ a.wall-item-name-link {
text-overflow: ellipsis;
}
-.wall-item-ago .icon-ok {
+.wall-item-ago .fa-check {
cursor: pointer;
}
diff --git a/view/css/mod_profile.css b/view/css/mod_profile.css
index e1ceae7f7..35016d10b 100644
--- a/view/css/mod_profile.css
+++ b/view/css/mod_profile.css
@@ -1,16 +1,7 @@
-.aprofile dt {
- font-weight: bold;
-}
-
.profile-thing-list {
list-style-type: none;
}
-.profile-thing-list img {
- margin-bottom: 5px;
+.profile-thing-img {
+ margin: 7px 0px;
}
-
-.profile-thing-list > li {
- margin-bottom: 15px;
-}
-
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 0242dbc1a..a77386393 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-22 00:01-0700\n"
-"PO-Revision-Date: 2016-04-22 10:40+0000\n"
+"POT-Creation-Date: 2016-04-29 00:01-0700\n"
+"PO-Revision-Date: 2016-04-30 09:57+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"
@@ -27,7 +27,7 @@ msgstr ""
msgid "parent"
msgstr "padre"
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2633
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2606
msgid "Collection"
msgstr "Colección"
@@ -52,7 +52,7 @@ msgid "Schedule Outbox"
msgstr "Programar bandeja de salida"
#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797
-#: ../../Zotlabs/Module/Photos.php:1241 ../../include/apps.php:360
+#: ../../Zotlabs/Module/Photos.php:1242 ../../include/apps.php:360
#: ../../include/apps.php:415 ../../include/conversation.php:1037
#: ../../include/widgets.php:1457
msgid "Unknown"
@@ -81,7 +81,7 @@ msgstr "Crear"
#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
#: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366
#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1470
msgid "Upload"
msgstr "Subir"
@@ -129,9 +129,9 @@ msgstr "Editar"
#: ../../Zotlabs/Module/Blocks.php:161
#: ../../Zotlabs/Module/Connections.php:263
#: ../../Zotlabs/Module/Connedit.php:573
-#: ../../Zotlabs/Module/Editblock.php:187
+#: ../../Zotlabs/Module/Editblock.php:180
#: ../../Zotlabs/Module/Editlayout.php:184
-#: ../../Zotlabs/Module/Editwebpage.php:228 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Editwebpage.php:221 ../../Zotlabs/Module/Group.php:177
#: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651
#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191
#: ../../include/ItemObject.php:120 ../../include/apps.php:260
@@ -378,7 +378,7 @@ msgstr "no soportado"
#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
#: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
msgid "No"
msgstr "No"
@@ -398,7 +398,7 @@ msgstr "Sí - con aprobación"
#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
#: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
msgid "Yes"
msgstr "Sí"
@@ -429,7 +429,7 @@ msgstr "Sitio"
#: ../../Zotlabs/Module/Admin.php:1778 ../../Zotlabs/Module/Appman.php:103
#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194
#: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97
-#: ../../Zotlabs/Module/Connedit.php:733 ../../Zotlabs/Module/Events.php:472
+#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:472
#: ../../Zotlabs/Module/Events.php:669
#: ../../Zotlabs/Module/Filestorage.php:160
#: ../../Zotlabs/Module/Fsuggest.php:112 ../../Zotlabs/Module/Group.php:85
@@ -835,14 +835,6 @@ msgstr "Un sitio por línea. Dejar en blanco para permitirlo por defecto desde c
msgid "Block embedded HTML from these domains"
msgstr "Bloquear contenido con HTML incorporado desde estos dominios"
-#: ../../Zotlabs/Module/Admin.php:728
-msgid "Cooperative embed security"
-msgstr "Seguridad cooperativa incorporada"
-
-#: ../../Zotlabs/Module/Admin.php:728
-msgid "Enable to share embed security with other compatible sites/hubs"
-msgstr "Habilitar la compartición de seguridad incorporada con otros sitios compatibles"
-
#: ../../Zotlabs/Module/Admin.php:743
msgid "Update has been marked successful"
msgstr "La actualización ha sido marcada como exitosa"
@@ -962,7 +954,7 @@ msgstr "Fecha de solicitud"
#: ../../Zotlabs/Module/Admin.php:997 ../../Zotlabs/Module/Admin.php:1006
#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../include/contact_selectors.php:81 ../../boot.php:1604
+#: ../../include/contact_selectors.php:81 ../../boot.php:1617
msgid "Email"
msgstr "Correo electrónico"
@@ -1142,7 +1134,7 @@ msgstr "Cambiar"
#: ../../Zotlabs/Module/Admin.php:1274 ../../Zotlabs/Module/Admin.php:1496
#: ../../include/apps.php:134 ../../include/widgets.php:589
-#: ../../include/nav.php:211
+#: ../../include/nav.php:208
msgid "Settings"
msgstr "Ajustes"
@@ -1259,8 +1251,8 @@ msgstr "Información adicional (opcional)"
#: ../../Zotlabs/Module/Admin.php:1695 ../../Zotlabs/Module/Admin.php:1715
#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
-#: ../../include/text.php:905 ../../include/text.php:917
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:905
+#: ../../include/text.php:917 ../../include/widgets.php:201
msgid "Save"
msgstr "Guardar"
@@ -1344,7 +1336,7 @@ msgstr "Nombre de la aplicación"
#: ../../Zotlabs/Module/Appman.php:95 ../../Zotlabs/Module/Appman.php:96
#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
-#: ../../Zotlabs/Module/Profiles.php:712 ../../Zotlabs/Module/Profiles.php:716
+#: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717
#: ../../include/datetime.php:246
msgid "Required"
msgstr "Obligatorio"
@@ -1379,7 +1371,7 @@ msgid "Location (URL) to purchase app"
msgstr "Dirección (URL) donde adquirir la aplicación"
#: ../../Zotlabs/Module/Apps.php:40 ../../include/widgets.php:102
-#: ../../include/nav.php:165
+#: ../../include/nav.php:163
msgid "Apps"
msgstr "Aplicaciones"
@@ -1400,7 +1392,7 @@ msgstr "Canal no encontrado."
msgid "Block Name"
msgstr "Nombre del bloque"
-#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2278
+#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2251
msgid "Blocks"
msgstr "Bloques"
@@ -1458,7 +1450,7 @@ msgid "l, F j"
msgstr "l j F"
#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634
-#: ../../include/text.php:1743
+#: ../../include/text.php:1714
msgid "Link to Source"
msgstr "Enlazar con la entrada en su ubicación original"
@@ -1552,10 +1544,10 @@ msgstr "Por favor, introduzca la dirección del enlace:"
msgid "Encrypt text"
msgstr "Cifrar texto"
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:149
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:148
#: ../../Zotlabs/Module/Editlayout.php:147
#: ../../Zotlabs/Module/Editpost.php:126
-#: ../../Zotlabs/Module/Editwebpage.php:189 ../../Zotlabs/Module/Mail.php:253
+#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:253
#: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1225
msgid "Insert web link"
msgstr "Insertar enlace web"
@@ -1593,7 +1585,7 @@ msgid "No chatrooms available"
msgstr "No hay salas de chat disponibles"
#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Zotlabs/Module/Profiles.php:782
msgid "Create New"
msgstr "Crear"
@@ -1785,13 +1777,13 @@ msgid "Recent activity"
msgstr "Actividad reciente"
#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:834
-#: ../../include/nav.php:189
+#: ../../include/nav.php:186
msgid "Connections"
msgstr "Conexiones"
#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../include/apps.php:147 ../../include/text.php:904
-#: ../../include/text.php:916 ../../include/nav.php:167
+#: ../../include/text.php:904 ../../include/text.php:916
+#: ../../include/apps.php:147 ../../include/nav.php:165
msgid "Search"
msgstr "Buscar"
@@ -2006,73 +1998,77 @@ msgid ""
"connections."
msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:714
+msgid "Connection Tools"
+msgstr "Gestión de las conexiones"
+
+#: ../../Zotlabs/Module/Connedit.php:716
msgid "Slide to adjust your degree of friendship"
msgstr "Deslizar para ajustar el grado de amistad"
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Rate.php:161
+#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Module/Rate.php:161
#: ../../include/js_strings.php:20
msgid "Rating"
msgstr "Valoración"
-#: ../../Zotlabs/Module/Connedit.php:717
+#: ../../Zotlabs/Module/Connedit.php:718
msgid "Slide to adjust your rating"
msgstr "Deslizar para ajustar su valoración"
-#: ../../Zotlabs/Module/Connedit.php:718 ../../Zotlabs/Module/Connedit.php:723
+#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:724
msgid "Optionally explain your rating"
msgstr "Opcionalmente, puede explicar su valoración"
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:721
msgid "Custom Filter"
msgstr "Filtro personalizado"
-#: ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:722
msgid "Only import posts with this text"
msgstr "Importar solo entradas que contengan este texto"
-#: ../../Zotlabs/Module/Connedit.php:721 ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:723
msgid ""
"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
"all posts"
msgstr "Una sola opción por línea: palabras, #etiquetas, /patrones/ o lang=xx. Dejar en blanco para importarlo todo"
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:723
msgid "Do not import posts with this text"
msgstr "No importar entradas que contengan este texto"
-#: ../../Zotlabs/Module/Connedit.php:724
+#: ../../Zotlabs/Module/Connedit.php:725
msgid "This information is public!"
msgstr "¡Esta información es pública!"
-#: ../../Zotlabs/Module/Connedit.php:729
+#: ../../Zotlabs/Module/Connedit.php:730
msgid "Connection Pending Approval"
msgstr "Conexión pendiente de aprobación"
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:733
msgid "inherited"
msgstr "heredado"
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Zotlabs/Module/Connedit.php:735
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
-#: ../../Zotlabs/Module/Connedit.php:736
+#: ../../Zotlabs/Module/Connedit.php:737
msgid "Their Settings"
msgstr "Sus ajustes"
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:738
msgid "My Settings"
msgstr "Mis ajustes"
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:740
msgid "Individual Permissions"
msgstr "Permisos individuales"
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:741
msgid ""
"Some permissions may be inherited from your channel's <a "
"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2080,7 +2076,7 @@ msgid ""
" settings here."
msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
-#: ../../Zotlabs/Module/Connedit.php:741
+#: ../../Zotlabs/Module/Connedit.php:742
msgid ""
"Some permissions may be inherited from your channel's <a "
"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2088,7 +2084,7 @@ msgid ""
"they wont have any impact unless the inherited setting changes."
msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Zotlabs/Module/Connedit.php:743
msgid "Last update:"
msgstr "Última actualización:"
@@ -2236,8 +2232,8 @@ msgid "Age:"
msgstr "Edad:"
#: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1022
-#: ../../include/bb2diaspora.php:509 ../../include/event.php:52
-#: ../../include/text.php:1452
+#: ../../include/text.php:1452 ../../include/bb2diaspora.php:509
+#: ../../include/event.php:52
msgid "Location:"
msgstr "Ubicación:"
@@ -2449,124 +2445,62 @@ msgid "Code"
msgstr "Código"
#: ../../Zotlabs/Module/Editblock.php:147
-#: ../../Zotlabs/Module/Editlayout.php:145
-#: ../../Zotlabs/Module/Editpost.php:124
-#: ../../Zotlabs/Module/Editwebpage.php:187
-#: ../../include/conversation.php:1221
-msgid "Upload photo"
-msgstr "Subir foto"
-
-#: ../../Zotlabs/Module/Editblock.php:148
#: ../../Zotlabs/Module/Editlayout.php:146
#: ../../Zotlabs/Module/Editpost.php:125
-#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:252
+#: ../../Zotlabs/Module/Editwebpage.php:187 ../../Zotlabs/Module/Mail.php:252
#: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1223
msgid "Attach file"
msgstr "Adjuntar fichero"
-#: ../../Zotlabs/Module/Editblock.php:150
-#: ../../Zotlabs/Module/Editlayout.php:148
-#: ../../Zotlabs/Module/Editpost.php:127
-#: ../../Zotlabs/Module/Editwebpage.php:190
-msgid "Insert YouTube video"
-msgstr "Insertar vídeo de YouTube"
-
#: ../../Zotlabs/Module/Editblock.php:151
-#: ../../Zotlabs/Module/Editlayout.php:149
-#: ../../Zotlabs/Module/Editpost.php:128
-#: ../../Zotlabs/Module/Editwebpage.php:191
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Insertar vídeo Vorbis [.ogg]"
-
-#: ../../Zotlabs/Module/Editblock.php:152
-#: ../../Zotlabs/Module/Editlayout.php:150
-#: ../../Zotlabs/Module/Editpost.php:129
-#: ../../Zotlabs/Module/Editwebpage.php:192
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Insertar audio Vorbis [.ogg]"
-
-#: ../../Zotlabs/Module/Editblock.php:153
-#: ../../Zotlabs/Module/Editlayout.php:151
-#: ../../Zotlabs/Module/Editpost.php:130
-#: ../../Zotlabs/Module/Editwebpage.php:193
-#: ../../include/conversation.php:1231
-msgid "Set your location"
-msgstr "Establecer su ubicación"
-
-#: ../../Zotlabs/Module/Editblock.php:154
-#: ../../Zotlabs/Module/Editlayout.php:152
-#: ../../Zotlabs/Module/Editpost.php:131
-#: ../../Zotlabs/Module/Editwebpage.php:194
-#: ../../include/conversation.php:1236
-msgid "Clear browser location"
-msgstr "Eliminar los datos de localización geográfica del navegador"
-
-#: ../../Zotlabs/Module/Editblock.php:155
-#: ../../Zotlabs/Module/Editlayout.php:153
-#: ../../Zotlabs/Module/Editpost.php:135
-#: ../../Zotlabs/Module/Editwebpage.php:195
-#: ../../Zotlabs/Module/Photos.php:1072 ../../include/ItemObject.php:389
-#: ../../include/conversation.php:740 ../../include/conversation.php:1244
-msgid "Please wait"
-msgstr "Espere por favor"
-
-#: ../../Zotlabs/Module/Editblock.php:156
#: ../../Zotlabs/Module/Editlayout.php:154
#: ../../Zotlabs/Module/Editpost.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:196
+#: ../../Zotlabs/Module/Editwebpage.php:191
#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1245
msgid "Permission settings"
msgstr "Configuración de permisos"
-#: ../../Zotlabs/Module/Editblock.php:164
+#: ../../Zotlabs/Module/Editblock.php:159
#: ../../Zotlabs/Module/Editlayout.php:161
#: ../../Zotlabs/Module/Editpost.php:144
-#: ../../Zotlabs/Module/Editwebpage.php:205
+#: ../../Zotlabs/Module/Editwebpage.php:200
#: ../../include/conversation.php:1254
msgid "Public post"
msgstr "Entrada pública"
-#: ../../Zotlabs/Module/Editblock.php:167
+#: ../../Zotlabs/Module/Editblock.php:162
#: ../../Zotlabs/Module/Editpost.php:147
-#: ../../Zotlabs/Module/Editwebpage.php:210
+#: ../../Zotlabs/Module/Editwebpage.php:205
#: ../../include/conversation.php:1239
msgid "Title (optional)"
msgstr "Título (opcional)"
-#: ../../Zotlabs/Module/Editblock.php:170
+#: ../../Zotlabs/Module/Editblock.php:165
#: ../../Zotlabs/Module/Editlayout.php:168
#: ../../Zotlabs/Module/Editpost.php:149
-#: ../../Zotlabs/Module/Editwebpage.php:212
+#: ../../Zotlabs/Module/Editwebpage.php:207
#: ../../include/conversation.php:1243
msgid "Categories (optional, comma-separated list)"
msgstr "Categorías (opcional, lista separada por comas)"
-#: ../../Zotlabs/Module/Editblock.php:171
+#: ../../Zotlabs/Module/Editblock.php:166
#: ../../Zotlabs/Module/Editlayout.php:169
#: ../../Zotlabs/Module/Editpost.php:150
-#: ../../Zotlabs/Module/Editwebpage.php:213
+#: ../../Zotlabs/Module/Editwebpage.php:208
#: ../../include/conversation.php:1256
msgid "Example: bob@example.com, mary@example.com"
msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"
-#: ../../Zotlabs/Module/Editblock.php:176
+#: ../../Zotlabs/Module/Editblock.php:171
#: ../../Zotlabs/Module/Editpost.php:155
-#: ../../Zotlabs/Module/Editwebpage.php:217
+#: ../../Zotlabs/Module/Editwebpage.php:212
#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092
#: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712
#: ../../include/conversation.php:1186 ../../include/page_widgets.php:40
msgid "Preview"
msgstr "Previsualizar"
-#: ../../Zotlabs/Module/Editblock.php:181
-#: ../../Zotlabs/Module/Editlayout.php:178
-#: ../../Zotlabs/Module/Editpost.php:161
-#: ../../Zotlabs/Module/Editwebpage.php:222 ../../Zotlabs/Module/Mail.php:257
-#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269
-msgid "Set expiration date"
-msgstr "Configurar fecha de caducidad"
-
-#: ../../Zotlabs/Module/Editblock.php:186
+#: ../../Zotlabs/Module/Editblock.php:179
msgid "Edit Block"
msgstr "Modificar este bloque"
@@ -2574,6 +2508,43 @@ msgstr "Modificar este bloque"
msgid "Delete layout?"
msgstr "¿Borrar la plantilla?"
+#: ../../Zotlabs/Module/Editlayout.php:145
+#: ../../Zotlabs/Module/Editpost.php:124 ../../include/conversation.php:1221
+msgid "Upload photo"
+msgstr "Subir foto"
+
+#: ../../Zotlabs/Module/Editlayout.php:148
+#: ../../Zotlabs/Module/Editpost.php:127
+msgid "Insert YouTube video"
+msgstr "Insertar vídeo de YouTube"
+
+#: ../../Zotlabs/Module/Editlayout.php:149
+#: ../../Zotlabs/Module/Editpost.php:128
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Insertar vídeo Vorbis [.ogg]"
+
+#: ../../Zotlabs/Module/Editlayout.php:150
+#: ../../Zotlabs/Module/Editpost.php:129
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Insertar audio Vorbis [.ogg]"
+
+#: ../../Zotlabs/Module/Editlayout.php:151
+#: ../../Zotlabs/Module/Editpost.php:130 ../../include/conversation.php:1231
+msgid "Set your location"
+msgstr "Establecer su ubicación"
+
+#: ../../Zotlabs/Module/Editlayout.php:152
+#: ../../Zotlabs/Module/Editpost.php:131 ../../include/conversation.php:1236
+msgid "Clear browser location"
+msgstr "Eliminar los datos de localización geográfica del navegador"
+
+#: ../../Zotlabs/Module/Editlayout.php:153
+#: ../../Zotlabs/Module/Editpost.php:135 ../../Zotlabs/Module/Photos.php:1072
+#: ../../include/ItemObject.php:389 ../../include/conversation.php:740
+#: ../../include/conversation.php:1244
+msgid "Please wait"
+msgstr "Espere por favor"
+
#: ../../Zotlabs/Module/Editlayout.php:164
#: ../../Zotlabs/Module/Layouts.php:128
msgid "Layout Description (Optional)"
@@ -2584,6 +2555,12 @@ msgstr "Descripción de la plantilla (opcional)"
msgid "Layout Name"
msgstr "Nombre de la plantilla"
+#: ../../Zotlabs/Module/Editlayout.php:178
+#: ../../Zotlabs/Module/Editpost.php:161 ../../Zotlabs/Module/Mail.php:257
+#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269
+msgid "Set expiration date"
+msgstr "Configurar fecha de caducidad"
+
#: ../../Zotlabs/Module/Editlayout.php:183
msgid "Edit Layout"
msgstr "Modificar la plantilla"
@@ -2628,7 +2605,7 @@ msgstr "¿Eliminar la página web?"
msgid "Page link title"
msgstr "Título del enlace de la página"
-#: ../../Zotlabs/Module/Editwebpage.php:227
+#: ../../Zotlabs/Module/Editwebpage.php:220
msgid "Edit Webpage"
msgstr "Editar la página web"
@@ -2658,8 +2635,8 @@ msgid "Event not found."
msgstr "Evento no encontrado."
#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
-#: ../../include/event.php:915 ../../include/text.php:1970
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1943
+#: ../../include/conversation.php:123 ../../include/event.php:915
msgid "event"
msgstr "evento"
@@ -2722,7 +2699,7 @@ msgid "Edit Location"
msgstr "Modificar la dirección"
#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:701
+#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:702
#: ../../Zotlabs/Module/Pubsites.php:40 ../../include/js_strings.php:25
msgid "Location"
msgstr "Ubicación"
@@ -2905,7 +2882,7 @@ msgstr "Ayuda:"
#: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
#: ../../Zotlabs/Module/Layouts.php:181 ../../include/apps.php:142
-#: ../../include/nav.php:161
+#: ../../include/nav.php:159
msgid "Help"
msgstr "Ayuda"
@@ -2972,7 +2949,7 @@ msgstr "Foto del perfil 128px"
msgid "Timezone"
msgstr "Huso horario"
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:735
msgid "Homepage URL"
msgstr "Dirección de la página personal"
@@ -3250,7 +3227,7 @@ msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Ha alcanzado su límite de %1$.0f páginas web."
-#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2280
+#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2253
msgid "Layouts"
msgstr "Plantillas"
@@ -3302,13 +3279,13 @@ msgid "Previous action reversed."
msgstr "Acción anterior revocada."
#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
-#: ../../include/text.php:1967
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940
+#: ../../include/conversation.php:120
msgid "photo"
msgstr "foto"
#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/conversation.php:148 ../../include/text.php:1973
+#: ../../include/text.php:1946 ../../include/conversation.php:148
msgid "status"
msgstr "el mensaje de estado"
@@ -3444,7 +3421,7 @@ msgid ""
"Password reset failed."
msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1610
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1623
msgid "Password Reset"
msgstr "Restablecer la contraseña"
@@ -3591,7 +3568,7 @@ msgid "Create a new channel"
msgstr "Crear un nuevo canal"
#: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:132
-#: ../../include/nav.php:209
+#: ../../include/nav.php:206
msgid "Channel Manager"
msgstr "Administración de canales"
@@ -3677,7 +3654,7 @@ msgstr "El menú se puede usar para guardar marcadores"
msgid "Submit and proceed"
msgstr "Enviar y proceder"
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2279
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2252
msgid "Menus"
msgstr "Menús"
@@ -3969,7 +3946,7 @@ msgstr "No hay más notificaciones del sistema"
msgid "System Notifications"
msgstr "Notificaciones del sistema"
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:194
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
msgid "Mark all system notifications seen"
msgstr "Marcar todas las notificaciones de sistema como leídas"
@@ -4111,8 +4088,8 @@ msgstr "Descripción (opcional):"
msgid "Album name could not be decoded"
msgstr "El nombre del álbum no ha podido ser descifrado"
-#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1282
-#: ../../Zotlabs/Module/Photos.php:1299
+#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1283
+#: ../../Zotlabs/Module/Photos.php:1300
msgid "Contact Photos"
msgstr "Fotos de contacto"
@@ -4124,7 +4101,7 @@ msgstr "Mostrar lo más reciente primero"
msgid "Show Oldest First"
msgstr "Mostrar lo más antiguo primero"
-#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1332
+#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1333
#: ../../include/widgets.php:1451
msgid "View Photo"
msgstr "Ver foto"
@@ -4278,35 +4255,39 @@ msgid_plural "Dislikes"
msgstr[0] "No me gusta"
msgstr[1] "No me gusta"
-#: ../../Zotlabs/Module/Photos.php:1242
+#: ../../Zotlabs/Module/Photos.php:1234
+msgid "Photo Tools"
+msgstr "Gestión de las fotos"
+
+#: ../../Zotlabs/Module/Photos.php:1243
msgid "In This Photo:"
msgstr "En esta foto:"
-#: ../../Zotlabs/Module/Photos.php:1247
+#: ../../Zotlabs/Module/Photos.php:1248
msgid "Map"
msgstr "Mapa"
-#: ../../Zotlabs/Module/Photos.php:1255 ../../include/ItemObject.php:378
+#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:378
msgctxt "noun"
msgid "Likes"
msgstr "Me gusta"
-#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:379
+#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:379
msgctxt "noun"
msgid "Dislikes"
msgstr "No me gusta"
-#: ../../Zotlabs/Module/Photos.php:1261 ../../include/ItemObject.php:384
+#: ../../Zotlabs/Module/Photos.php:1262 ../../include/ItemObject.php:384
#: ../../include/acl_selectors.php:252
msgid "Close"
msgstr "Cerrar"
-#: ../../Zotlabs/Module/Photos.php:1338
+#: ../../Zotlabs/Module/Photos.php:1339
msgid "View Album"
msgstr "Ver álbum"
-#: ../../Zotlabs/Module/Photos.php:1349 ../../Zotlabs/Module/Photos.php:1362
-#: ../../Zotlabs/Module/Photos.php:1363
+#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363
+#: ../../Zotlabs/Module/Photos.php:1364
msgid "Recent Photos"
msgstr "Fotos recientes"
@@ -4413,15 +4394,15 @@ msgstr "Estado civil"
msgid "Romantic Partner"
msgstr "Pareja sentimental"
-#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:739
+#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:740
msgid "Likes"
msgstr "Me gusta"
-#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:741
msgid "Dislikes"
msgstr "No me gusta"
-#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:748
msgid "Work/Employment"
msgstr "Trabajo:"
@@ -4461,181 +4442,185 @@ msgstr "Modificar los detalles de este perfil"
msgid "View this profile"
msgstr "Ver este perfil"
-#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:774
+#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775
#: ../../include/identity.php:952
msgid "Edit visibility"
msgstr "Editar visibilidad"
#: ../../Zotlabs/Module/Profiles.php:694
+msgid "Profile Tools"
+msgstr "Gestión del perfil"
+
+#: ../../Zotlabs/Module/Profiles.php:695
msgid "Change cover photo"
msgstr "Cambiar la imagen de portada del perfil"
-#: ../../Zotlabs/Module/Profiles.php:695 ../../include/identity.php:923
+#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:923
msgid "Change profile photo"
msgstr "Cambiar la foto del perfil"
-#: ../../Zotlabs/Module/Profiles.php:696
+#: ../../Zotlabs/Module/Profiles.php:697
msgid "Create a new profile using these settings"
msgstr "Crear un nuevo perfil usando estos ajustes"
-#: ../../Zotlabs/Module/Profiles.php:697
+#: ../../Zotlabs/Module/Profiles.php:698
msgid "Clone this profile"
msgstr "Clonar este perfil"
-#: ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Profiles.php:699
msgid "Delete this profile"
msgstr "Eliminar este perfil"
-#: ../../Zotlabs/Module/Profiles.php:699
+#: ../../Zotlabs/Module/Profiles.php:700
msgid "Add profile things"
msgstr "Añadir cosas al perfil"
-#: ../../Zotlabs/Module/Profiles.php:700 ../../include/conversation.php:1544
+#: ../../Zotlabs/Module/Profiles.php:701 ../../include/conversation.php:1544
#: ../../include/widgets.php:105
msgid "Personal"
msgstr "Personales"
-#: ../../Zotlabs/Module/Profiles.php:702
+#: ../../Zotlabs/Module/Profiles.php:703
msgid "Relation"
msgstr "Relación"
-#: ../../Zotlabs/Module/Profiles.php:703 ../../include/datetime.php:48
+#: ../../Zotlabs/Module/Profiles.php:704 ../../include/datetime.php:48
msgid "Miscellaneous"
msgstr "Varios"
-#: ../../Zotlabs/Module/Profiles.php:705
+#: ../../Zotlabs/Module/Profiles.php:706
msgid "Import profile from file"
msgstr "Importar perfil desde un fichero"
-#: ../../Zotlabs/Module/Profiles.php:706
+#: ../../Zotlabs/Module/Profiles.php:707
msgid "Export profile to file"
msgstr "Exportar perfil a un fichero"
-#: ../../Zotlabs/Module/Profiles.php:707
+#: ../../Zotlabs/Module/Profiles.php:708
msgid "Your gender"
msgstr "Género"
-#: ../../Zotlabs/Module/Profiles.php:708
+#: ../../Zotlabs/Module/Profiles.php:709
msgid "Marital status"
msgstr "Estado civil"
-#: ../../Zotlabs/Module/Profiles.php:709
+#: ../../Zotlabs/Module/Profiles.php:710
msgid "Sexual preference"
msgstr "Preferencia sexual"
-#: ../../Zotlabs/Module/Profiles.php:712
+#: ../../Zotlabs/Module/Profiles.php:713
msgid "Profile name"
msgstr "Nombre del perfil"
-#: ../../Zotlabs/Module/Profiles.php:714
+#: ../../Zotlabs/Module/Profiles.php:715
msgid "This is your default profile."
msgstr "Este es su perfil principal."
-#: ../../Zotlabs/Module/Profiles.php:716
+#: ../../Zotlabs/Module/Profiles.php:717
msgid "Your full name"
msgstr "Nombre completo"
-#: ../../Zotlabs/Module/Profiles.php:717
+#: ../../Zotlabs/Module/Profiles.php:718
msgid "Title/Description"
msgstr "Título o descripción"
-#: ../../Zotlabs/Module/Profiles.php:720
+#: ../../Zotlabs/Module/Profiles.php:721
msgid "Street address"
msgstr "Dirección"
-#: ../../Zotlabs/Module/Profiles.php:721
+#: ../../Zotlabs/Module/Profiles.php:722
msgid "Locality/City"
msgstr "Ciudad"
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Zotlabs/Module/Profiles.php:723
msgid "Region/State"
msgstr "Región o Estado"
-#: ../../Zotlabs/Module/Profiles.php:723
+#: ../../Zotlabs/Module/Profiles.php:724
msgid "Postal/Zip code"
msgstr "Código postal"
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:725
msgid "Country"
msgstr "País"
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:730
msgid "Who (if applicable)"
msgstr "Quién (si es pertinente)"
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:730
msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com"
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:731
msgid "Since (date)"
msgstr "Desde (fecha)"
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Zotlabs/Module/Profiles.php:734
msgid "Tell us about yourself"
msgstr "Háblenos de usted"
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Profiles.php:736
msgid "Hometown"
msgstr "Lugar de nacimiento"
-#: ../../Zotlabs/Module/Profiles.php:736
+#: ../../Zotlabs/Module/Profiles.php:737
msgid "Political views"
msgstr "Ideas políticas"
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:738
msgid "Religious views"
msgstr "Creencias religiosas"
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Zotlabs/Module/Profiles.php:739
msgid "Keywords used in directory listings"
msgstr "Palabras clave utilizadas en los listados de directorios"
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Zotlabs/Module/Profiles.php:739
msgid "Example: fishing photography software"
msgstr "Por ejemplo: software de fotografía submarina"
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:742
msgid "Musical interests"
msgstr "Preferencias musicales"
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:743
msgid "Books, literature"
msgstr "Libros, literatura"
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:744
msgid "Television"
msgstr "Televisión"
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:745
msgid "Film/Dance/Culture/Entertainment"
msgstr "Cine, danza, cultura, entretenimiento"
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Zotlabs/Module/Profiles.php:746
msgid "Hobbies/Interests"
msgstr "Aficiones o intereses"
-#: ../../Zotlabs/Module/Profiles.php:746
+#: ../../Zotlabs/Module/Profiles.php:747
msgid "Love/Romance"
msgstr "Vida sentimental o amorosa"
-#: ../../Zotlabs/Module/Profiles.php:748
+#: ../../Zotlabs/Module/Profiles.php:749
msgid "School/Education"
msgstr "Estudios"
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:750
msgid "Contact information and social networks"
msgstr "Información de contacto y redes sociales"
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Zotlabs/Module/Profiles.php:751
msgid "My other channels"
msgstr "Mis otros canales"
-#: ../../Zotlabs/Module/Profiles.php:770 ../../include/identity.php:948
+#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:948
msgid "Profile Image"
msgstr "Imagen del perfil"
-#: ../../Zotlabs/Module/Profiles.php:780 ../../include/identity.php:930
+#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:930
#: ../../include/nav.php:88
msgid "Edit Profiles"
msgstr "Editar perfiles"
@@ -4831,8 +4816,8 @@ msgstr "sí"
msgid "Membership on this site is by invitation only."
msgstr "Para registrarse en este sitio es necesaria una invitación."
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:148
-#: ../../boot.php:1584
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
+#: ../../boot.php:1597
msgid "Register"
msgstr "Registrarse"
@@ -6140,8 +6125,8 @@ msgstr "Ignorar/Ocultar"
msgid "post"
msgstr "la entrada"
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1975
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948
+#: ../../include/conversation.php:150
msgid "comment"
msgstr "el comentario"
@@ -6743,15 +6728,15 @@ msgstr "Registro revocado para %s"
msgid "Account verified. Please login."
msgstr "Cuenta verificada. Por favor, inicie sesión."
-#: ../../include/account.php:719 ../../include/account.php:721
+#: ../../include/account.php:722 ../../include/account.php:724
msgid "Click here to upgrade."
msgstr "Pulse aquí para actualizar"
-#: ../../include/account.php:727
+#: ../../include/account.php:730
msgid "This action exceeds the limits set by your subscription plan."
msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
-#: ../../include/account.php:732
+#: ../../include/account.php:735
msgid "This action is not available under your subscription plan."
msgstr "Esta acción no está disponible en su plan de suscripción."
@@ -7027,9 +7012,327 @@ msgstr "Visitar %2$s de %1$s"
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
-#: ../../include/api.php:1338
-msgid "Public Timeline"
-msgstr "Cronología pública"
+#: ../../include/text.php:394
+msgid "prev"
+msgstr "anterior"
+
+#: ../../include/text.php:396
+msgid "first"
+msgstr "primera"
+
+#: ../../include/text.php:425
+msgid "last"
+msgstr "última"
+
+#: ../../include/text.php:428
+msgid "next"
+msgstr "próxima"
+
+#: ../../include/text.php:438
+msgid "older"
+msgstr "más antiguas"
+
+#: ../../include/text.php:440
+msgid "newer"
+msgstr "más recientes"
+
+#: ../../include/text.php:822
+msgid "No connections"
+msgstr "Sin conexiones"
+
+#: ../../include/text.php:847
+#, php-format
+msgid "View all %s connections"
+msgstr "Ver todas las %s conexiones"
+
+#: ../../include/text.php:992 ../../include/text.php:997
+msgid "poke"
+msgstr "un toque"
+
+#: ../../include/text.php:992 ../../include/text.php:997
+#: ../../include/conversation.php:243
+msgid "poked"
+msgstr "ha dado un toque a"
+
+#: ../../include/text.php:998
+msgid "ping"
+msgstr "un \"ping\""
+
+#: ../../include/text.php:998
+msgid "pinged"
+msgstr "ha enviado un \"ping\" a"
+
+#: ../../include/text.php:999
+msgid "prod"
+msgstr "una incitación "
+
+#: ../../include/text.php:999
+msgid "prodded"
+msgstr "ha incitado a "
+
+#: ../../include/text.php:1000
+msgid "slap"
+msgstr "una bofetada "
+
+#: ../../include/text.php:1000
+msgid "slapped"
+msgstr "ha abofeteado a "
+
+#: ../../include/text.php:1001
+msgid "finger"
+msgstr "un \"finger\" "
+
+#: ../../include/text.php:1001
+msgid "fingered"
+msgstr "envió un \"finger\" a"
+
+#: ../../include/text.php:1002
+msgid "rebuff"
+msgstr "un reproche"
+
+#: ../../include/text.php:1002
+msgid "rebuffed"
+msgstr "ha hecho un reproche a "
+
+#: ../../include/text.php:1014
+msgid "happy"
+msgstr "feliz "
+
+#: ../../include/text.php:1015
+msgid "sad"
+msgstr "triste "
+
+#: ../../include/text.php:1016
+msgid "mellow"
+msgstr "tranquilo/a"
+
+#: ../../include/text.php:1017
+msgid "tired"
+msgstr "cansado/a "
+
+#: ../../include/text.php:1018
+msgid "perky"
+msgstr "vivaz"
+
+#: ../../include/text.php:1019
+msgid "angry"
+msgstr "enfadado/a"
+
+#: ../../include/text.php:1020
+msgid "stupefied"
+msgstr "asombrado/a"
+
+#: ../../include/text.php:1021
+msgid "puzzled"
+msgstr "perplejo/a"
+
+#: ../../include/text.php:1022
+msgid "interested"
+msgstr "interesado/a"
+
+#: ../../include/text.php:1023
+msgid "bitter"
+msgstr "amargado/a"
+
+#: ../../include/text.php:1024
+msgid "cheerful"
+msgstr "alegre"
+
+#: ../../include/text.php:1025
+msgid "alive"
+msgstr "animado/a"
+
+#: ../../include/text.php:1026
+msgid "annoyed"
+msgstr "molesto/a"
+
+#: ../../include/text.php:1027
+msgid "anxious"
+msgstr "ansioso/a"
+
+#: ../../include/text.php:1028
+msgid "cranky"
+msgstr "de mal humor"
+
+#: ../../include/text.php:1029
+msgid "disturbed"
+msgstr "perturbado/a"
+
+#: ../../include/text.php:1030
+msgid "frustrated"
+msgstr "frustrado/a"
+
+#: ../../include/text.php:1031
+msgid "depressed"
+msgstr "deprimido/a"
+
+#: ../../include/text.php:1032
+msgid "motivated"
+msgstr "motivado/a"
+
+#: ../../include/text.php:1033
+msgid "relaxed"
+msgstr "relajado/a"
+
+#: ../../include/text.php:1034
+msgid "surprised"
+msgstr "sorprendido/a"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "lunes"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "martes"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "miércoles"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "jueves"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "viernes"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "sábado"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "domingo"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:45
+msgid "January"
+msgstr "enero"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:46
+msgid "February"
+msgstr "febrero"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:47
+msgid "March"
+msgstr "marzo"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:48
+msgid "April"
+msgstr "abril"
+
+#: ../../include/text.php:1210
+msgid "May"
+msgstr "mayo"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:50
+msgid "June"
+msgstr "junio"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:51
+msgid "July"
+msgstr "julio"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:52
+msgid "August"
+msgstr "agosto"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:53
+msgid "September"
+msgstr "septiembre"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:54
+msgid "October"
+msgstr "octubre"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:55
+msgid "November"
+msgstr "noviembre"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:56
+msgid "December"
+msgstr "diciembre"
+
+#: ../../include/text.php:1287 ../../include/text.php:1291
+msgid "Unknown Attachment"
+msgstr "Adjunto no reconocido"
+
+#: ../../include/text.php:1293
+msgid "unknown"
+msgstr "desconocido"
+
+#: ../../include/text.php:1329
+msgid "remove category"
+msgstr "eliminar categoría"
+
+#: ../../include/text.php:1406
+msgid "remove from file"
+msgstr "eliminar del fichero"
+
+#: ../../include/text.php:1437 ../../include/bb2diaspora.php:487
+#: ../../include/event.php:22
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d de F, Y \\@ G:i"
+
+#: ../../include/text.php:1441 ../../include/bb2diaspora.php:493
+#: ../../include/event.php:30
+msgid "Starts:"
+msgstr "Comienza:"
+
+#: ../../include/text.php:1445 ../../include/bb2diaspora.php:501
+#: ../../include/event.php:40
+msgid "Finishes:"
+msgstr "Finaliza:"
+
+#: ../../include/text.php:1735 ../../include/text.php:1807
+msgid "default"
+msgstr "por defecto"
+
+#: ../../include/text.php:1743
+msgid "Page layout"
+msgstr "Plantilla de la página"
+
+#: ../../include/text.php:1743
+msgid "You can create your own with the layouts tool"
+msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas"
+
+#: ../../include/text.php:1785
+msgid "Page content type"
+msgstr "Tipo de contenido de la página"
+
+#: ../../include/text.php:1819
+msgid "Select an alternate language"
+msgstr "Seleccionar un idioma alternativo"
+
+#: ../../include/text.php:1953
+msgid "activity"
+msgstr "la actividad"
+
+#: ../../include/text.php:2248
+msgid "Design Tools"
+msgstr "Herramientas de diseño web"
+
+#: ../../include/text.php:2254
+msgid "Pages"
+msgstr "Páginas"
+
+#: ../../include/zot.php:680
+msgid "Invalid data packet"
+msgstr "Paquete de datos no válido"
+
+#: ../../include/zot.php:696
+msgid "Unable to verify channel signature"
+msgstr "No ha sido posible de verificar la firma del canal"
+
+#: ../../include/zot.php:2332
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "No ha sido posible de verificar la firma del sitio para %s"
+
+#: ../../include/zot.php:3670
+msgid "invalid target signature"
+msgstr "La firma recibida no es válida"
#: ../../include/apps.php:128
msgid "Site Admin"
@@ -7044,28 +7347,28 @@ msgstr "Marcadores"
msgid "Address Book"
msgstr "Libreta de direcciones"
-#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1602
+#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1615
msgid "Login"
msgstr "Iniciar sesión"
-#: ../../include/apps.php:133 ../../include/nav.php:182
+#: ../../include/apps.php:133 ../../include/nav.php:179
msgid "Grid"
msgstr "Red"
-#: ../../include/apps.php:137 ../../include/nav.php:185
+#: ../../include/apps.php:137 ../../include/nav.php:182
msgid "Channel Home"
msgstr "Mi canal"
#: ../../include/apps.php:140 ../../include/conversation.php:1667
-#: ../../include/conversation.php:1670 ../../include/nav.php:204
+#: ../../include/conversation.php:1670 ../../include/nav.php:201
msgid "Events"
msgstr "Eventos"
-#: ../../include/apps.php:141 ../../include/nav.php:170
+#: ../../include/apps.php:141 ../../include/nav.php:167
msgid "Directory"
msgstr "Directorio"
-#: ../../include/apps.php:143 ../../include/nav.php:196
+#: ../../include/apps.php:143 ../../include/nav.php:193
msgid "Mail"
msgstr "Correo"
@@ -7105,97 +7408,23 @@ msgstr "Instalar"
msgid "Purchase"
msgstr "Comprar"
-#: ../../include/network.php:659
-msgid "view full size"
-msgstr "Ver en el tamaño original"
-
-#: ../../include/network.php:1827 ../../include/enotify.php:57
-msgid "$Projectname Notification"
-msgstr "Notificación de $Projectname"
-
-#: ../../include/network.php:1828 ../../include/enotify.php:58
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/network.php:1830 ../../include/enotify.php:60
-msgid "Thank You,"
-msgstr "Gracias,"
-
-#: ../../include/network.php:1832 ../../include/enotify.php:62
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrador"
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."
-#: ../../include/network.php:1889
-msgid "No Subject"
-msgstr "Sin asunto"
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
+msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
#: ../../include/bb2diaspora.php:398
msgid "Attachments:"
msgstr "Ficheros adjuntos:"
-#: ../../include/bb2diaspora.php:487 ../../include/event.php:22
-#: ../../include/text.php:1437
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d de F, Y \\@ G:i"
-
#: ../../include/bb2diaspora.php:489
msgid "$Projectname event notification:"
msgstr "Notificación de eventos de $Projectname:"
-#: ../../include/bb2diaspora.php:493 ../../include/event.php:30
-#: ../../include/text.php:1441
-msgid "Starts:"
-msgstr "Comienza:"
-
-#: ../../include/bb2diaspora.php:501 ../../include/event.php:40
-#: ../../include/text.php:1445
-msgid "Finishes:"
-msgstr "Finaliza:"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:801
-#: ../../include/bbcode.php:804 ../../include/bbcode.php:809
-#: ../../include/bbcode.php:812 ../../include/bbcode.php:815
-#: ../../include/bbcode.php:818 ../../include/bbcode.php:823
-#: ../../include/bbcode.php:826 ../../include/bbcode.php:831
-#: ../../include/bbcode.php:834 ../../include/bbcode.php:837
-#: ../../include/bbcode.php:840
-msgid "Image/photo"
-msgstr "Imagen/foto"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:851
-msgid "Encrypted content"
-msgstr "Contenido cifrado"
-
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "Install %s element: "
-msgstr "Instalar el elemento %s:"
-
-#: ../../include/bbcode.php:183
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
-
-#: ../../include/bbcode.php:255
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s escribió %2$s siguiente %3$s"
-
-#: ../../include/bbcode.php:545
-msgid "Different viewers will see this text differently"
-msgstr "Visitantes diferentes verán este texto de forma distinta"
-
-#: ../../include/bbcode.php:762
-msgid "$1 spoiler"
-msgstr "$1 spoiler"
-
-#: ../../include/bbcode.php:789
-msgid "$1 wrote:"
-msgstr "$1 escribió:"
-
#: ../../include/conversation.php:204
#, php-format
msgid "%1$s is now connected with %2$s"
@@ -7206,11 +7435,6 @@ msgstr "%1$s ahora está conectado/a con %2$s"
msgid "%1$s poked %2$s"
msgstr "%1$s ha dado un toque a %2$s"
-#: ../../include/conversation.php:243 ../../include/text.php:992
-#: ../../include/text.php:997
-msgid "poked"
-msgstr "ha dado un toque a"
-
#: ../../include/conversation.php:691
#, php-format
msgid "View %s's profile @ %s"
@@ -7232,7 +7456,7 @@ msgstr "Mostrar en su contexto"
msgid "remove"
msgstr "eliminar"
-#: ../../include/conversation.php:854 ../../include/nav.php:256
+#: ../../include/conversation.php:854 ../../include/nav.php:247
msgid "Loading..."
msgstr "Cargando..."
@@ -7556,6 +7780,10 @@ msgid ""
"form has been opened for too long (>3 hours) before submitting it."
msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"
+#: ../../include/api.php:1338
+msgid "Public Timeline"
+msgstr "Cronología pública"
+
#: ../../include/contact_selectors.php:56
msgid "Frequently"
msgstr "Frecuentemente"
@@ -7756,7 +7984,7 @@ msgstr "Edad:"
msgid "YYYY-MM-DD or MM-DD"
msgstr "AAAA-MM-DD o MM-DD"
-#: ../../include/datetime.php:273 ../../boot.php:2432
+#: ../../include/datetime.php:273 ../../boot.php:2445
msgid "never"
msgstr "nunca"
@@ -7845,6 +8073,23 @@ msgstr "Solo foros públicos"
msgid "This Website Only"
msgstr "Solo este sitio web"
+#: ../../include/enotify.php:57 ../../include/network.php:1827
+msgid "$Projectname Notification"
+msgstr "Notificación de $Projectname"
+
+#: ../../include/enotify.php:58 ../../include/network.php:1828
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../include/enotify.php:60 ../../include/network.php:1830
+msgid "Thank You,"
+msgstr "Gracias,"
+
+#: ../../include/enotify.php:62 ../../include/network.php:1832
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrador"
+
#: ../../include/enotify.php:96
#, php-format
msgid "%s <!item_type!>"
@@ -8390,6 +8635,53 @@ msgstr "Sin canales en ningún grupo"
msgid "add"
msgstr "añadir"
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:813
+#: ../../include/bbcode.php:816 ../../include/bbcode.php:821
+#: ../../include/bbcode.php:824 ../../include/bbcode.php:827
+#: ../../include/bbcode.php:830 ../../include/bbcode.php:835
+#: ../../include/bbcode.php:838 ../../include/bbcode.php:843
+#: ../../include/bbcode.php:846 ../../include/bbcode.php:849
+#: ../../include/bbcode.php:852
+msgid "Image/photo"
+msgstr "Imagen/foto"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:863
+msgid "Encrypted content"
+msgstr "Contenido cifrado"
+
+#: ../../include/bbcode.php:179
+#, php-format
+msgid "Install %s element: "
+msgstr "Instalar el elemento %s:"
+
+#: ../../include/bbcode.php:183
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
+
+#: ../../include/bbcode.php:255
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s escribió %2$s siguiente %3$s"
+
+#: ../../include/bbcode.php:333 ../../include/bbcode.php:341
+msgid "Click to open/close"
+msgstr "Pulsar para abrir/cerrar"
+
+#: ../../include/bbcode.php:341
+msgid "spoiler"
+msgstr "spoiler"
+
+#: ../../include/bbcode.php:556
+msgid "Different viewers will see this text differently"
+msgstr "Visitantes diferentes verán este texto de forma distinta"
+
+#: ../../include/bbcode.php:801
+msgid "$1 wrote:"
+msgstr "$1 escribió:"
+
#: ../../include/items.php:1138 ../../include/items.php:1183
msgid "(Unknown)"
msgstr "(Desconocido)"
@@ -8444,32 +8736,13 @@ msgstr "Conexión no encontrada"
msgid "profile photo"
msgstr "foto del perfil"
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "La imagen excede el límite de %lu bytes del sitio"
-
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "El fichero de imagen está vacío. "
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "La foto no ha podido ser guardada."
-
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr "una nueva foto"
-
-#: ../../include/photos.php:301
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s ha publicado %2$s en %3$s"
+#: ../../include/network.php:659
+msgid "view full size"
+msgstr "Ver en el tamaño original"
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
-msgstr "Subir nuevas fotos"
+#: ../../include/network.php:1889
+msgid "No Subject"
+msgstr "Sin asunto"
#: ../../include/widgets.php:103
msgid "System"
@@ -8568,15 +8841,15 @@ msgstr "Menú de correo privado"
msgid "Combined View"
msgstr "Vista combinada"
-#: ../../include/widgets.php:609 ../../include/nav.php:199
+#: ../../include/widgets.php:609 ../../include/nav.php:196
msgid "Inbox"
msgstr "Bandeja de entrada"
-#: ../../include/widgets.php:614 ../../include/nav.php:200
+#: ../../include/widgets.php:614 ../../include/nav.php:197
msgid "Outbox"
msgstr "Bandeja de salida"
-#: ../../include/widgets.php:619 ../../include/nav.php:201
+#: ../../include/widgets.php:619 ../../include/nav.php:198
msgid "New Message"
msgstr "Nuevo mensaje"
@@ -8708,7 +8981,7 @@ msgstr "Examinar la cola"
msgid "DB updates"
msgstr "Actualizaciones de la base de datos"
-#: ../../include/widgets.php:1368 ../../include/nav.php:219
+#: ../../include/widgets.php:1368 ../../include/nav.php:216
msgid "Admin"
msgstr "Administrador"
@@ -8881,55 +9154,11 @@ msgstr " "
msgid "timeago.numbers"
msgstr "timeago.numbers"
-#: ../../include/js_strings.php:45 ../../include/text.php:1210
-msgid "January"
-msgstr "enero"
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1210
-msgid "February"
-msgstr "febrero"
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1210
-msgid "March"
-msgstr "marzo"
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1210
-msgid "April"
-msgstr "abril"
-
#: ../../include/js_strings.php:49
msgctxt "long"
msgid "May"
msgstr "mayo"
-#: ../../include/js_strings.php:50 ../../include/text.php:1210
-msgid "June"
-msgstr "junio"
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1210
-msgid "July"
-msgstr "julio"
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1210
-msgid "August"
-msgstr "agosto"
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1210
-msgid "September"
-msgstr "septiembre"
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1210
-msgid "October"
-msgstr "octubre"
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1210
-msgid "November"
-msgstr "noviembre"
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1210
-msgid "December"
-msgstr "diciembre"
-
#: ../../include/js_strings.php:57
msgid "Jan"
msgstr "ene"
@@ -8979,34 +9208,6 @@ msgstr "nov"
msgid "Dec"
msgstr "dic"
-#: ../../include/js_strings.php:69 ../../include/text.php:1206
-msgid "Sunday"
-msgstr "domingo"
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1206
-msgid "Monday"
-msgstr "lunes"
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1206
-msgid "Tuesday"
-msgstr "martes"
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1206
-msgid "Wednesday"
-msgstr "miércoles"
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1206
-msgid "Thursday"
-msgstr "jueves"
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1206
-msgid "Friday"
-msgstr "viernes"
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1206
-msgid "Saturday"
-msgstr "sábado"
-
#: ../../include/js_strings.php:76
msgid "Sun"
msgstr "dom"
@@ -9076,14 +9277,166 @@ msgstr "No ha sido posible determinar el remitente. "
msgid "Stored post could not be verified."
msgstr "No se han podido verificar las publicaciones guardadas."
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
+msgid "Logout"
+msgstr "Finalizar sesión"
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
+#: ../../include/nav.php:82 ../../include/nav.php:113
+msgid "End this session"
+msgstr "Finalizar esta sesión"
+
+#: ../../include/nav.php:85 ../../include/nav.php:144
+msgid "Home"
+msgstr "Inicio"
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Sus publicaciones y conversaciones"
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Su página del perfil"
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Administrar/editar perfiles"
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Editar su perfil"
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Sus fotos"
+
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr "Sus ficheros"
+
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
+msgstr "Sus salas de chat"
+
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
+msgstr "Sus marcadores"
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr "Sus páginas web"
+
+#: ../../include/nav.php:110
+msgid "Sign in"
+msgstr "Acceder"
+
+#: ../../include/nav.php:127
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - pulsar para finalizar sesión"
+
+#: ../../include/nav.php:130
+msgid "Remote authentication"
+msgstr "Acceder desde su servidor"
+
+#: ../../include/nav.php:130
+msgid "Click to authenticate to your home hub"
+msgstr "Pulsar para identificarse en su servidor de inicio"
+
+#: ../../include/nav.php:144
+msgid "Home Page"
+msgstr "Página de inicio"
+
+#: ../../include/nav.php:147
+msgid "Create an account"
+msgstr "Crear una cuenta"
+
+#: ../../include/nav.php:159
+msgid "Help and documentation"
+msgstr "Ayuda y documentación"
+
+#: ../../include/nav.php:163
+msgid "Applications, utilities, links, games"
+msgstr "Aplicaciones, utilidades, enlaces, juegos"
+
+#: ../../include/nav.php:165
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
+
+#: ../../include/nav.php:167
+msgid "Channel Directory"
+msgstr "Directorio de canales"
+
+#: ../../include/nav.php:179
+msgid "Your grid"
+msgstr "Mi red"
+
+#: ../../include/nav.php:180
+msgid "Mark all grid notifications seen"
+msgstr "Marcar todas las notificaciones de la red como vistas"
+
+#: ../../include/nav.php:182
+msgid "Channel home"
+msgstr "Mi canal"
+
+#: ../../include/nav.php:183
+msgid "Mark all channel notifications seen"
+msgstr "Marcar todas las notificaciones del canal como leídas"
+
+#: ../../include/nav.php:189
+msgid "Notices"
+msgstr "Avisos"
+
+#: ../../include/nav.php:189
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: ../../include/nav.php:190
+msgid "See all notifications"
+msgstr "Ver todas las notificaciones"
+
+#: ../../include/nav.php:193
+msgid "Private mail"
+msgstr "Correo privado"
+
+#: ../../include/nav.php:194
+msgid "See all private messages"
+msgstr "Ver todas los mensajes privados"
+
+#: ../../include/nav.php:195
+msgid "Mark all private messages seen"
+msgstr "Marcar todos los mensajes privados como leídos"
+
+#: ../../include/nav.php:201
+msgid "Event Calendar"
+msgstr "Calendario de eventos"
+
+#: ../../include/nav.php:202
+msgid "See all events"
+msgstr "Ver todos los eventos"
+
+#: ../../include/nav.php:203
+msgid "Mark all events seen"
+msgstr "Marcar todos los eventos como leidos"
+
+#: ../../include/nav.php:206
+msgid "Manage Your Channels"
+msgstr "Gestionar sus canales"
+
+#: ../../include/nav.php:208
+msgid "Account/Channel Settings"
+msgstr "Ajustes de cuenta/canales"
+
+#: ../../include/nav.php:216
+msgid "Site Setup and Configuration"
+msgstr "Ajustes y configuración del sitio"
+
+#: ../../include/nav.php:252
+msgid "@name, #tag, ?doc, content"
+msgstr "@nombre, #etiqueta, ?ayuda, contenido"
+
+#: ../../include/nav.php:253
+msgid "Please wait..."
+msgstr "Espere por favor…"
#: ../../include/oembed.php:267
msgid "Embedded content"
@@ -9242,400 +9595,32 @@ msgstr "Especial - Repositorio de grupo"
msgid "Custom/Expert Mode"
msgstr "Modo personalizado/experto"
-#: ../../include/text.php:394
-msgid "prev"
-msgstr "anterior"
-
-#: ../../include/text.php:396
-msgid "first"
-msgstr "primera"
-
-#: ../../include/text.php:425
-msgid "last"
-msgstr "última"
-
-#: ../../include/text.php:428
-msgid "next"
-msgstr "próxima"
-
-#: ../../include/text.php:438
-msgid "older"
-msgstr "más antiguas"
-
-#: ../../include/text.php:440
-msgid "newer"
-msgstr "más recientes"
-
-#: ../../include/text.php:822
-msgid "No connections"
-msgstr "Sin conexiones"
-
-#: ../../include/text.php:847
-#, php-format
-msgid "View all %s connections"
-msgstr "Ver todas las %s conexiones"
-
-#: ../../include/text.php:992 ../../include/text.php:997
-msgid "poke"
-msgstr "un toque"
-
-#: ../../include/text.php:998
-msgid "ping"
-msgstr "un \"ping\""
-
-#: ../../include/text.php:998
-msgid "pinged"
-msgstr "ha enviado un \"ping\" a"
-
-#: ../../include/text.php:999
-msgid "prod"
-msgstr "una incitación "
-
-#: ../../include/text.php:999
-msgid "prodded"
-msgstr "ha incitado a "
-
-#: ../../include/text.php:1000
-msgid "slap"
-msgstr "una bofetada "
-
-#: ../../include/text.php:1000
-msgid "slapped"
-msgstr "ha abofeteado a "
-
-#: ../../include/text.php:1001
-msgid "finger"
-msgstr "un \"finger\" "
-
-#: ../../include/text.php:1001
-msgid "fingered"
-msgstr "envió un \"finger\" a"
-
-#: ../../include/text.php:1002
-msgid "rebuff"
-msgstr "un reproche"
-
-#: ../../include/text.php:1002
-msgid "rebuffed"
-msgstr "ha hecho un reproche a "
-
-#: ../../include/text.php:1014
-msgid "happy"
-msgstr "feliz "
-
-#: ../../include/text.php:1015
-msgid "sad"
-msgstr "triste "
-
-#: ../../include/text.php:1016
-msgid "mellow"
-msgstr "tranquilo/a"
-
-#: ../../include/text.php:1017
-msgid "tired"
-msgstr "cansado/a "
-
-#: ../../include/text.php:1018
-msgid "perky"
-msgstr "vivaz"
-
-#: ../../include/text.php:1019
-msgid "angry"
-msgstr "enfadado/a"
-
-#: ../../include/text.php:1020
-msgid "stupefied"
-msgstr "asombrado/a"
-
-#: ../../include/text.php:1021
-msgid "puzzled"
-msgstr "perplejo/a"
-
-#: ../../include/text.php:1022
-msgid "interested"
-msgstr "interesado/a"
-
-#: ../../include/text.php:1023
-msgid "bitter"
-msgstr "amargado/a"
-
-#: ../../include/text.php:1024
-msgid "cheerful"
-msgstr "alegre"
-
-#: ../../include/text.php:1025
-msgid "alive"
-msgstr "animado/a"
-
-#: ../../include/text.php:1026
-msgid "annoyed"
-msgstr "molesto/a"
-
-#: ../../include/text.php:1027
-msgid "anxious"
-msgstr "ansioso/a"
-
-#: ../../include/text.php:1028
-msgid "cranky"
-msgstr "de mal humor"
-
-#: ../../include/text.php:1029
-msgid "disturbed"
-msgstr "perturbado/a"
-
-#: ../../include/text.php:1030
-msgid "frustrated"
-msgstr "frustrado/a"
-
-#: ../../include/text.php:1031
-msgid "depressed"
-msgstr "deprimido/a"
-
-#: ../../include/text.php:1032
-msgid "motivated"
-msgstr "motivado/a"
-
-#: ../../include/text.php:1033
-msgid "relaxed"
-msgstr "relajado/a"
-
-#: ../../include/text.php:1034
-msgid "surprised"
-msgstr "sorprendido/a"
-
-#: ../../include/text.php:1210
-msgid "May"
-msgstr "mayo"
-
-#: ../../include/text.php:1287 ../../include/text.php:1291
-msgid "Unknown Attachment"
-msgstr "Adjunto no reconocido"
-
-#: ../../include/text.php:1293
-msgid "unknown"
-msgstr "desconocido"
-
-#: ../../include/text.php:1329
-msgid "remove category"
-msgstr "eliminar categoría"
-
-#: ../../include/text.php:1406
-msgid "remove from file"
-msgstr "eliminar del fichero"
-
-#: ../../include/text.php:1548 ../../include/text.php:1559
-msgid "Click to open/close"
-msgstr "Pulsar para abrir/cerrar"
-
-#: ../../include/text.php:1764 ../../include/text.php:1836
-msgid "default"
-msgstr "por defecto"
-
-#: ../../include/text.php:1772
-msgid "Page layout"
-msgstr "Plantilla de la página"
-
-#: ../../include/text.php:1772
-msgid "You can create your own with the layouts tool"
-msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas"
-
-#: ../../include/text.php:1814
-msgid "Page content type"
-msgstr "Tipo de contenido de la página"
-
-#: ../../include/text.php:1848
-msgid "Select an alternate language"
-msgstr "Seleccionar un idioma alternativo"
-
-#: ../../include/text.php:1980
-msgid "activity"
-msgstr "la actividad"
-
-#: ../../include/text.php:2275
-msgid "Design Tools"
-msgstr "Herramientas de diseño web"
-
-#: ../../include/text.php:2281
-msgid "Pages"
-msgstr "Páginas"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1601
-msgid "Logout"
-msgstr "Finalizar sesión"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr "Finalizar esta sesión"
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr "Inicio"
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Sus publicaciones y conversaciones"
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "Su página del perfil"
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "Administrar/editar perfiles"
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Editar su perfil"
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Sus fotos"
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Sus ficheros"
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr "Sus salas de chat"
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr "Sus marcadores"
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr "Sus páginas web"
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr "Acceder"
-
-#: ../../include/nav.php:127
+#: ../../include/photos.php:112
#, php-format
-msgid "%s - click to logout"
-msgstr "%s - pulsar para finalizar sesión"
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr "Acceder desde su servidor"
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr "Pulsar para identificarse en su servidor de inicio"
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr "Página de inicio"
-
-#: ../../include/nav.php:148
-msgid "Create an account"
-msgstr "Crear una cuenta"
-
-#: ../../include/nav.php:161
-msgid "Help and documentation"
-msgstr "Ayuda y documentación"
-
-#: ../../include/nav.php:165
-msgid "Applications, utilities, links, games"
-msgstr "Aplicaciones, utilidades, enlaces, juegos"
-
-#: ../../include/nav.php:167
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
-
-#: ../../include/nav.php:170
-msgid "Channel Directory"
-msgstr "Directorio de canales"
-
-#: ../../include/nav.php:182
-msgid "Your grid"
-msgstr "Mi red"
-
-#: ../../include/nav.php:183
-msgid "Mark all grid notifications seen"
-msgstr "Marcar todas las notificaciones de la red como vistas"
-
-#: ../../include/nav.php:185
-msgid "Channel home"
-msgstr "Mi canal"
-
-#: ../../include/nav.php:186
-msgid "Mark all channel notifications seen"
-msgstr "Marcar todas las notificaciones del canal como leídas"
-
-#: ../../include/nav.php:192
-msgid "Notices"
-msgstr "Avisos"
-
-#: ../../include/nav.php:192
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#: ../../include/nav.php:193
-msgid "See all notifications"
-msgstr "Ver todas las notificaciones"
-
-#: ../../include/nav.php:196
-msgid "Private mail"
-msgstr "Correo privado"
-
-#: ../../include/nav.php:197
-msgid "See all private messages"
-msgstr "Ver todas los mensajes privados"
-
-#: ../../include/nav.php:198
-msgid "Mark all private messages seen"
-msgstr "Marcar todos los mensajes privados como leídos"
-
-#: ../../include/nav.php:204
-msgid "Event Calendar"
-msgstr "Calendario de eventos"
-
-#: ../../include/nav.php:205
-msgid "See all events"
-msgstr "Ver todos los eventos"
-
-#: ../../include/nav.php:206
-msgid "Mark all events seen"
-msgstr "Marcar todos los eventos como leidos"
-
-#: ../../include/nav.php:209
-msgid "Manage Your Channels"
-msgstr "Gestionar sus canales"
-
-#: ../../include/nav.php:211
-msgid "Account/Channel Settings"
-msgstr "Ajustes de cuenta/canales"
-
-#: ../../include/nav.php:219
-msgid "Site Setup and Configuration"
-msgstr "Ajustes y configuración del sitio"
-
-#: ../../include/nav.php:261
-msgid "@name, #tag, ?doc, content"
-msgstr "@nombre, #etiqueta, ?ayuda, contenido"
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "La imagen excede el límite de %lu bytes del sitio"
-#: ../../include/nav.php:262
-msgid "Please wait..."
-msgstr "Espere por favor…"
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr "El fichero de imagen está vacío. "
-#: ../../include/zot.php:680
-msgid "Invalid data packet"
-msgstr "Paquete de datos no válido"
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr "La foto no ha podido ser guardada."
-#: ../../include/zot.php:696
-msgid "Unable to verify channel signature"
-msgstr "No ha sido posible de verificar la firma del canal"
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr "una nueva foto"
-#: ../../include/zot.php:2332
+#: ../../include/photos.php:301
#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "No ha sido posible de verificar la firma del sitio para %s"
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s ha publicado %2$s en %3$s"
-#: ../../include/zot.php:3670
-msgid "invalid target signature"
-msgstr "La firma recibida no es válida"
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Subir nuevas fotos"
#: ../../view/theme/redbasic/php/config.php:82
msgid "Focus (Hubzilla default)"
@@ -9794,41 +9779,41 @@ msgstr "La actualización %s ha fallado. Mire el informe de errores."
msgid "Update Error at %s"
msgstr "Error de actualización en %s"
-#: ../../boot.php:1583
+#: ../../boot.php:1596
msgid ""
"Create an account to access services and applications within the Hubzilla"
msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla"
-#: ../../boot.php:1605
+#: ../../boot.php:1618
msgid "Password"
msgstr "Contraseña"
-#: ../../boot.php:1606
+#: ../../boot.php:1619
msgid "Remember me"
msgstr "Recordarme"
-#: ../../boot.php:1609
+#: ../../boot.php:1622
msgid "Forgot your password?"
msgstr "¿Olvidó su contraseña?"
-#: ../../boot.php:2238
+#: ../../boot.php:2251
msgid "toggle mobile"
msgstr "cambiar a modo móvil"
-#: ../../boot.php:2391
+#: ../../boot.php:2404
msgid "Website SSL certificate is not valid. Please correct."
msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
-#: ../../boot.php:2394
+#: ../../boot.php:2407
#, php-format
msgid "[hubzilla] Website SSL error for %s"
msgstr "[hubzilla] Error SSL del sitio web en %s"
-#: ../../boot.php:2431
+#: ../../boot.php:2444
msgid "Cron/Scheduled tasks not running."
msgstr "Las tareas del Planificador/Cron no están funcionando."
-#: ../../boot.php:2435
+#: ../../boot.php:2448
#, php-format
msgid "[hubzilla] Cron tasks not running on %s"
msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index f4512d058..b995ee27b 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -152,8 +152,6 @@ App::$strings["Block communications from these channels"] = "Bloquear la comunic
App::$strings["Allow embedded HTML content only from these domains"] = "Permitir contenido con HTML incorporado solo desde estos dominios";
App::$strings["One site per line. Leave empty to allow from any site by default"] = "Un sitio por línea. Dejar en blanco para permitirlo por defecto desde cualquier sitio";
App::$strings["Block embedded HTML from these domains"] = "Bloquear contenido con HTML incorporado desde estos dominios";
-App::$strings["Cooperative embed security"] = "Seguridad cooperativa incorporada";
-App::$strings["Enable to share embed security with other compatible sites/hubs"] = "Habilitar la compartición de seguridad incorporada con otros sitios compatibles";
App::$strings["Update has been marked successful"] = "La actualización ha sido marcada como exitosa";
App::$strings["Executing %s failed. Check system logs."] = "La ejecución de %s ha fallado. Mirar en los informes del sistema.";
App::$strings["Update %s was successfully applied."] = "La actualización de %s se ha realizado exitosamente.";
@@ -428,6 +426,7 @@ App::$strings["Connection requests will be approved without your interaction"] =
App::$strings["This connection's primary address is"] = "La dirección primaria de esta conexión es";
App::$strings["Available locations:"] = "Ubicaciones disponibles:";
App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones.";
+App::$strings["Connection Tools"] = "Gestión de las conexiones";
App::$strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
App::$strings["Rating"] = "Valoración";
App::$strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración";
@@ -523,25 +522,25 @@ App::$strings["Italic"] = "Itálico ";
App::$strings["Underline"] = "Subrayar";
App::$strings["Quote"] = "Citar";
App::$strings["Code"] = "Código";
-App::$strings["Upload photo"] = "Subir foto";
App::$strings["Attach file"] = "Adjuntar fichero";
-App::$strings["Insert YouTube video"] = "Insertar vídeo de YouTube";
-App::$strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]";
-App::$strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
-App::$strings["Set your location"] = "Establecer su ubicación";
-App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador";
-App::$strings["Please wait"] = "Espere por favor";
App::$strings["Permission settings"] = "Configuración de permisos";
App::$strings["Public post"] = "Entrada pública";
App::$strings["Title (optional)"] = "Título (opcional)";
App::$strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)";
App::$strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com";
App::$strings["Preview"] = "Previsualizar";
-App::$strings["Set expiration date"] = "Configurar fecha de caducidad";
App::$strings["Edit Block"] = "Modificar este bloque";
App::$strings["Delete layout?"] = "¿Borrar la plantilla?";
+App::$strings["Upload photo"] = "Subir foto";
+App::$strings["Insert YouTube video"] = "Insertar vídeo de YouTube";
+App::$strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]";
+App::$strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
+App::$strings["Set your location"] = "Establecer su ubicación";
+App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador";
+App::$strings["Please wait"] = "Espere por favor";
App::$strings["Layout Description (Optional)"] = "Descripción de la plantilla (opcional)";
App::$strings["Layout Name"] = "Nombre de la plantilla";
+App::$strings["Set expiration date"] = "Configurar fecha de caducidad";
App::$strings["Edit Layout"] = "Modificar la plantilla";
App::$strings["Item is not editable"] = "El elemento no es editable";
App::$strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM";
@@ -938,6 +937,7 @@ App::$strings["__ctx:noun__ Dislike"] = array(
0 => "No me gusta",
1 => "No me gusta",
);
+App::$strings["Photo Tools"] = "Gestión de las fotos";
App::$strings["In This Photo:"] = "En esta foto:";
App::$strings["Map"] = "Mapa";
App::$strings["__ctx:noun__ Likes"] = "Me gusta";
@@ -982,6 +982,7 @@ App::$strings["Hide your connections list from viewers of this profile"] = "Ocul
App::$strings["Edit Profile Details"] = "Modificar los detalles de este perfil";
App::$strings["View this profile"] = "Ver este perfil";
App::$strings["Edit visibility"] = "Editar visibilidad";
+App::$strings["Profile Tools"] = "Gestión del perfil";
App::$strings["Change cover photo"] = "Cambiar la imagen de portada del perfil";
App::$strings["Change profile photo"] = "Cambiar la foto del perfil";
App::$strings["Create a new profile using these settings"] = "Crear un nuevo perfil usando estos ajustes";
@@ -1573,7 +1574,85 @@ App::$strings["public profile"] = "el perfil público";
App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ha cambiado %2\$s a &ldquo;%3\$s&rdquo;";
App::$strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s";
App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha actualizado %2\$s, cambiando %3\$s.";
-App::$strings["Public Timeline"] = "Cronología pública";
+App::$strings["prev"] = "anterior";
+App::$strings["first"] = "primera";
+App::$strings["last"] = "última";
+App::$strings["next"] = "próxima";
+App::$strings["older"] = "más antiguas";
+App::$strings["newer"] = "más recientes";
+App::$strings["No connections"] = "Sin conexiones";
+App::$strings["View all %s connections"] = "Ver todas las %s conexiones";
+App::$strings["poke"] = "un toque";
+App::$strings["poked"] = "ha dado un toque a";
+App::$strings["ping"] = "un \"ping\"";
+App::$strings["pinged"] = "ha enviado un \"ping\" a";
+App::$strings["prod"] = "una incitación ";
+App::$strings["prodded"] = "ha incitado a ";
+App::$strings["slap"] = "una bofetada ";
+App::$strings["slapped"] = "ha abofeteado a ";
+App::$strings["finger"] = "un \"finger\" ";
+App::$strings["fingered"] = "envió un \"finger\" a";
+App::$strings["rebuff"] = "un reproche";
+App::$strings["rebuffed"] = "ha hecho un reproche a ";
+App::$strings["happy"] = "feliz ";
+App::$strings["sad"] = "triste ";
+App::$strings["mellow"] = "tranquilo/a";
+App::$strings["tired"] = "cansado/a ";
+App::$strings["perky"] = "vivaz";
+App::$strings["angry"] = "enfadado/a";
+App::$strings["stupefied"] = "asombrado/a";
+App::$strings["puzzled"] = "perplejo/a";
+App::$strings["interested"] = "interesado/a";
+App::$strings["bitter"] = "amargado/a";
+App::$strings["cheerful"] = "alegre";
+App::$strings["alive"] = "animado/a";
+App::$strings["annoyed"] = "molesto/a";
+App::$strings["anxious"] = "ansioso/a";
+App::$strings["cranky"] = "de mal humor";
+App::$strings["disturbed"] = "perturbado/a";
+App::$strings["frustrated"] = "frustrado/a";
+App::$strings["depressed"] = "deprimido/a";
+App::$strings["motivated"] = "motivado/a";
+App::$strings["relaxed"] = "relajado/a";
+App::$strings["surprised"] = "sorprendido/a";
+App::$strings["Monday"] = "lunes";
+App::$strings["Tuesday"] = "martes";
+App::$strings["Wednesday"] = "miércoles";
+App::$strings["Thursday"] = "jueves";
+App::$strings["Friday"] = "viernes";
+App::$strings["Saturday"] = "sábado";
+App::$strings["Sunday"] = "domingo";
+App::$strings["January"] = "enero";
+App::$strings["February"] = "febrero";
+App::$strings["March"] = "marzo";
+App::$strings["April"] = "abril";
+App::$strings["May"] = "mayo";
+App::$strings["June"] = "junio";
+App::$strings["July"] = "julio";
+App::$strings["August"] = "agosto";
+App::$strings["September"] = "septiembre";
+App::$strings["October"] = "octubre";
+App::$strings["November"] = "noviembre";
+App::$strings["December"] = "diciembre";
+App::$strings["Unknown Attachment"] = "Adjunto no reconocido";
+App::$strings["unknown"] = "desconocido";
+App::$strings["remove category"] = "eliminar categoría";
+App::$strings["remove from file"] = "eliminar del fichero";
+App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
+App::$strings["Starts:"] = "Comienza:";
+App::$strings["Finishes:"] = "Finaliza:";
+App::$strings["default"] = "por defecto";
+App::$strings["Page layout"] = "Plantilla de la página";
+App::$strings["You can create your own with the layouts tool"] = "Puede crear su propia disposición gráfica con la herramienta de plantillas";
+App::$strings["Page content type"] = "Tipo de contenido de la página";
+App::$strings["Select an alternate language"] = "Seleccionar un idioma alternativo";
+App::$strings["activity"] = "la actividad";
+App::$strings["Design Tools"] = "Herramientas de diseño web";
+App::$strings["Pages"] = "Páginas";
+App::$strings["Invalid data packet"] = "Paquete de datos no válido";
+App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
+App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
+App::$strings["invalid target signature"] = "La firma recibida no es válida";
App::$strings["Site Admin"] = "Administrador del sitio";
App::$strings["Bookmarks"] = "Marcadores";
App::$strings["Address Book"] = "Libreta de direcciones";
@@ -1592,28 +1671,12 @@ App::$strings["Features"] = "Funcionalidades";
App::$strings["Post"] = "Publicación";
App::$strings["Install"] = "Instalar";
App::$strings["Purchase"] = "Comprar";
-App::$strings["view full size"] = "Ver en el tamaño original";
-App::$strings["\$Projectname Notification"] = "Notificación de \$Projectname";
-App::$strings["\$projectname"] = "\$projectname";
-App::$strings["Thank You,"] = "Gracias,";
-App::$strings["%s Administrator"] = "%s Administrador";
-App::$strings["No Subject"] = "Sin asunto";
+App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado.";
+App::$strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
App::$strings["Attachments:"] = "Ficheros adjuntos:";
-App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
App::$strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
-App::$strings["Starts:"] = "Comienza:";
-App::$strings["Finishes:"] = "Finaliza:";
-App::$strings["Image/photo"] = "Imagen/foto";
-App::$strings["Encrypted content"] = "Contenido cifrado";
-App::$strings["Install %s element: "] = "Instalar el elemento %s:";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
-App::$strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
-App::$strings["$1 spoiler"] = "$1 spoiler";
-App::$strings["$1 wrote:"] = "$1 escribió:";
App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s";
App::$strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s";
-App::$strings["poked"] = "ha dado un toque a";
App::$strings["View %s's profile @ %s"] = "Ver el perfil @ %s de %s";
App::$strings["Categories:"] = "Categorías:";
App::$strings["Filed under:"] = "Archivado bajo:";
@@ -1718,6 +1781,7 @@ App::$strings["User '%s' deleted"] = "El usuario '%s' ha sido eliminado";
App::$strings["Logged out."] = "Desconectado/a.";
App::$strings["Failed authentication"] = "Autenticación fallida.";
App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado";
+App::$strings["Public Timeline"] = "Cronología pública";
App::$strings["Frequently"] = "Frecuentemente";
App::$strings["Hourly"] = "Cada hora";
App::$strings["Twice daily"] = "Dos veces al día";
@@ -1808,6 +1872,10 @@ App::$strings["Directory Options"] = "Opciones del directorio";
App::$strings["Safe Mode"] = "Modo seguro";
App::$strings["Public Forums Only"] = "Solo foros públicos";
App::$strings["This Website Only"] = "Solo este sitio web";
+App::$strings["\$Projectname Notification"] = "Notificación de \$Projectname";
+App::$strings["\$projectname"] = "\$projectname";
+App::$strings["Thank You,"] = "Gracias,";
+App::$strings["%s Administrator"] = "%s Administrador";
App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
App::$strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s";
App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
@@ -1932,6 +2000,15 @@ App::$strings["Edit group"] = "Editar grupo";
App::$strings["Add privacy group"] = "Añadir un grupo de canales";
App::$strings["Channels not in any privacy group"] = "Sin canales en ningún grupo";
App::$strings["add"] = "añadir";
+App::$strings["Image/photo"] = "Imagen/foto";
+App::$strings["Encrypted content"] = "Contenido cifrado";
+App::$strings["Install %s element: "] = "Instalar el elemento %s:";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
+App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
+App::$strings["spoiler"] = "spoiler";
+App::$strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
+App::$strings["$1 wrote:"] = "$1 escribió:";
App::$strings["(Unknown)"] = "(Desconocido)";
App::$strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
App::$strings["Visible to you only."] = "Visible sólo para usted.";
@@ -1945,12 +2022,8 @@ App::$strings["Privacy group is empty."] = "El grupo de canales está vacío.";
App::$strings["Privacy group: %s"] = "Grupo de canales: %s";
App::$strings["Connection not found."] = "Conexión no encontrada";
App::$strings["profile photo"] = "foto del perfil";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
-App::$strings["Image file is empty."] = "El fichero de imagen está vacío. ";
-App::$strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
-App::$strings["a new photo"] = "una nueva foto";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s";
-App::$strings["Upload New Photos"] = "Subir nuevas fotos";
+App::$strings["view full size"] = "Ver en el tamaño original";
+App::$strings["No Subject"] = "Sin asunto";
App::$strings["System"] = "Sistema";
App::$strings["Create Personal App"] = "Crear una aplicación personal";
App::$strings["Edit Personal App"] = "Editar una aplicación personal";
@@ -2052,18 +2125,7 @@ App::$strings["about a year"] = "alrededor de un año";
App::$strings["%d years"] = "%d años";
App::$strings[" "] = " ";
App::$strings["timeago.numbers"] = "timeago.numbers";
-App::$strings["January"] = "enero";
-App::$strings["February"] = "febrero";
-App::$strings["March"] = "marzo";
-App::$strings["April"] = "abril";
App::$strings["__ctx:long__ May"] = "mayo";
-App::$strings["June"] = "junio";
-App::$strings["July"] = "julio";
-App::$strings["August"] = "agosto";
-App::$strings["September"] = "septiembre";
-App::$strings["October"] = "octubre";
-App::$strings["November"] = "noviembre";
-App::$strings["December"] = "diciembre";
App::$strings["Jan"] = "ene";
App::$strings["Feb"] = "feb";
App::$strings["Mar"] = "mar";
@@ -2076,13 +2138,6 @@ App::$strings["Sep"] = "sep";
App::$strings["Oct"] = "oct";
App::$strings["Nov"] = "nov";
App::$strings["Dec"] = "dic";
-App::$strings["Sunday"] = "domingo";
-App::$strings["Monday"] = "lunes";
-App::$strings["Tuesday"] = "martes";
-App::$strings["Wednesday"] = "miércoles";
-App::$strings["Thursday"] = "jueves";
-App::$strings["Friday"] = "viernes";
-App::$strings["Saturday"] = "sábado";
App::$strings["Sun"] = "dom";
App::$strings["Mon"] = "lun";
App::$strings["Tue"] = "mar";
@@ -2099,101 +2154,6 @@ App::$strings["No recipient provided."] = "No se ha especificado ningún destina
App::$strings["[no subject]"] = "[sin asunto]";
App::$strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
App::$strings["Stored post could not be verified."] = "No se han podido verificar las publicaciones guardadas.";
-App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado.";
-App::$strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
-App::$strings["Embedded content"] = "Contenido incorporado";
-App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
-App::$strings["New Page"] = "Nueva página";
-App::$strings["Title"] = "Título";
-App::$strings["Can view my normal stream and posts"] = "Pueden verse mi actividad y publicaciones normales";
-App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
-App::$strings["Can view my connections"] = "Pueden verse mis conexiones";
-App::$strings["Can view my file storage and photos"] = "Pueden verse mi repositorio de ficheros y mis fotos";
-App::$strings["Can view my webpages"] = "Pueden verse mis páginas web";
-App::$strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y contenidos del canal";
-App::$strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)";
-App::$strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'.";
-App::$strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados";
-App::$strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gusta/no me gusta";
-App::$strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención";
-App::$strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos";
-App::$strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)";
-App::$strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos";
-App::$strings["Can edit my webpages"] = "Pueden editarse mis páginas web";
-App::$strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos en canales derivados";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas";
-App::$strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo.";
-App::$strings["Social Networking"] = "Redes sociales";
-App::$strings["Social - Mostly Public"] = "Social - Público en su mayor parte";
-App::$strings["Social - Restricted"] = "Social - Restringido";
-App::$strings["Social - Private"] = "Social - Privado";
-App::$strings["Community Forum"] = "Foro de discusión";
-App::$strings["Forum - Mostly Public"] = "Foro - Público en su mayor parte";
-App::$strings["Forum - Restricted"] = "Foro - Restringido";
-App::$strings["Forum - Private"] = "Foro - Privado";
-App::$strings["Feed Republish"] = "Republicar un \"feed\"";
-App::$strings["Feed - Mostly Public"] = "Feed - Público en su mayor parte";
-App::$strings["Feed - Restricted"] = "Feed - Restringido";
-App::$strings["Special Purpose"] = "Propósito especial";
-App::$strings["Special - Celebrity/Soapbox"] = "Especial - Celebridad / Tribuna improvisada";
-App::$strings["Special - Group Repository"] = "Especial - Repositorio de grupo";
-App::$strings["Custom/Expert Mode"] = "Modo personalizado/experto";
-App::$strings["prev"] = "anterior";
-App::$strings["first"] = "primera";
-App::$strings["last"] = "última";
-App::$strings["next"] = "próxima";
-App::$strings["older"] = "más antiguas";
-App::$strings["newer"] = "más recientes";
-App::$strings["No connections"] = "Sin conexiones";
-App::$strings["View all %s connections"] = "Ver todas las %s conexiones";
-App::$strings["poke"] = "un toque";
-App::$strings["ping"] = "un \"ping\"";
-App::$strings["pinged"] = "ha enviado un \"ping\" a";
-App::$strings["prod"] = "una incitación ";
-App::$strings["prodded"] = "ha incitado a ";
-App::$strings["slap"] = "una bofetada ";
-App::$strings["slapped"] = "ha abofeteado a ";
-App::$strings["finger"] = "un \"finger\" ";
-App::$strings["fingered"] = "envió un \"finger\" a";
-App::$strings["rebuff"] = "un reproche";
-App::$strings["rebuffed"] = "ha hecho un reproche a ";
-App::$strings["happy"] = "feliz ";
-App::$strings["sad"] = "triste ";
-App::$strings["mellow"] = "tranquilo/a";
-App::$strings["tired"] = "cansado/a ";
-App::$strings["perky"] = "vivaz";
-App::$strings["angry"] = "enfadado/a";
-App::$strings["stupefied"] = "asombrado/a";
-App::$strings["puzzled"] = "perplejo/a";
-App::$strings["interested"] = "interesado/a";
-App::$strings["bitter"] = "amargado/a";
-App::$strings["cheerful"] = "alegre";
-App::$strings["alive"] = "animado/a";
-App::$strings["annoyed"] = "molesto/a";
-App::$strings["anxious"] = "ansioso/a";
-App::$strings["cranky"] = "de mal humor";
-App::$strings["disturbed"] = "perturbado/a";
-App::$strings["frustrated"] = "frustrado/a";
-App::$strings["depressed"] = "deprimido/a";
-App::$strings["motivated"] = "motivado/a";
-App::$strings["relaxed"] = "relajado/a";
-App::$strings["surprised"] = "sorprendido/a";
-App::$strings["May"] = "mayo";
-App::$strings["Unknown Attachment"] = "Adjunto no reconocido";
-App::$strings["unknown"] = "desconocido";
-App::$strings["remove category"] = "eliminar categoría";
-App::$strings["remove from file"] = "eliminar del fichero";
-App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
-App::$strings["default"] = "por defecto";
-App::$strings["Page layout"] = "Plantilla de la página";
-App::$strings["You can create your own with the layouts tool"] = "Puede crear su propia disposición gráfica con la herramienta de plantillas";
-App::$strings["Page content type"] = "Tipo de contenido de la página";
-App::$strings["Select an alternate language"] = "Seleccionar un idioma alternativo";
-App::$strings["activity"] = "la actividad";
-App::$strings["Design Tools"] = "Herramientas de diseño web";
-App::$strings["Pages"] = "Páginas";
App::$strings["Logout"] = "Finalizar sesión";
App::$strings["End this session"] = "Finalizar esta sesión";
App::$strings["Home"] = "Inicio";
@@ -2234,10 +2194,51 @@ App::$strings["Account/Channel Settings"] = "Ajustes de cuenta/canales";
App::$strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio";
App::$strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
App::$strings["Please wait..."] = "Espere por favor…";
-App::$strings["Invalid data packet"] = "Paquete de datos no válido";
-App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
-App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
-App::$strings["invalid target signature"] = "La firma recibida no es válida";
+App::$strings["Embedded content"] = "Contenido incorporado";
+App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
+App::$strings["New Page"] = "Nueva página";
+App::$strings["Title"] = "Título";
+App::$strings["Can view my normal stream and posts"] = "Pueden verse mi actividad y publicaciones normales";
+App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
+App::$strings["Can view my connections"] = "Pueden verse mis conexiones";
+App::$strings["Can view my file storage and photos"] = "Pueden verse mi repositorio de ficheros y mis fotos";
+App::$strings["Can view my webpages"] = "Pueden verse mis páginas web";
+App::$strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y contenidos del canal";
+App::$strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)";
+App::$strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'.";
+App::$strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados";
+App::$strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gusta/no me gusta";
+App::$strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención";
+App::$strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos";
+App::$strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)";
+App::$strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos";
+App::$strings["Can edit my webpages"] = "Pueden editarse mis páginas web";
+App::$strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos en canales derivados";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas";
+App::$strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo.";
+App::$strings["Social Networking"] = "Redes sociales";
+App::$strings["Social - Mostly Public"] = "Social - Público en su mayor parte";
+App::$strings["Social - Restricted"] = "Social - Restringido";
+App::$strings["Social - Private"] = "Social - Privado";
+App::$strings["Community Forum"] = "Foro de discusión";
+App::$strings["Forum - Mostly Public"] = "Foro - Público en su mayor parte";
+App::$strings["Forum - Restricted"] = "Foro - Restringido";
+App::$strings["Forum - Private"] = "Foro - Privado";
+App::$strings["Feed Republish"] = "Republicar un \"feed\"";
+App::$strings["Feed - Mostly Public"] = "Feed - Público en su mayor parte";
+App::$strings["Feed - Restricted"] = "Feed - Restringido";
+App::$strings["Special Purpose"] = "Propósito especial";
+App::$strings["Special - Celebrity/Soapbox"] = "Especial - Celebridad / Tribuna improvisada";
+App::$strings["Special - Group Repository"] = "Especial - Repositorio de grupo";
+App::$strings["Custom/Expert Mode"] = "Modo personalizado/experto";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
+App::$strings["Image file is empty."] = "El fichero de imagen está vacío. ";
+App::$strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
+App::$strings["a new photo"] = "una nueva foto";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s";
+App::$strings["Upload New Photos"] = "Subir nuevas fotos";
App::$strings["Focus (Hubzilla default)"] = "Focus (predefinido)";
App::$strings["Theme settings"] = "Ajustes del tema";
App::$strings["Select scheme"] = "Elegir un esquema";
diff --git a/view/js/acl.js b/view/js/acl.js
index 65f1009ed..be215fc91 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -193,19 +193,16 @@ ACL.prototype.update_view = function() {
that.deny_gid.length === 0 && that.deny_cid.length === 0) {
that.showall.removeClass("btn-default").addClass("btn-warning");
/* jot acl */
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
$('.profile-jot-net input').attr('disabled', false);
- if(typeof editor !== 'undefined' && editor !== false) {
- $('#profile-jot-desc').html(ispublic);
- }
} else {
that.showall.removeClass("btn-warning").addClass("btn-default");
/* jot acl */
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
$('.profile-jot-net input').attr('disabled', 'disabled');
- $('#profile-jot-desc').html('&nbsp;');
+
}
$("#acl-list-content .acl-list-item").each(function() {
$(this).removeClass("groupshow grouphide");
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 21ce2d150..41077d427 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -103,7 +103,7 @@ function submit_form(e) {
function getWord(text, caretPos) {
var index = text.indexOf(caretPos);
var postText = text.substring(caretPos, caretPos+8);
- if ((postText.indexOf("[/list]") > 0) || postText.indexOf("[/ul]") > 0 || postText.indexOf("[/ol]") > 0) {
+ if ((postText.indexOf('[/list]') > 0) || postText.indexOf('[/ul]') > 0 || postText.indexOf('[/ol]') > 0 || postText.indexOf('[/dl]') > 0) {
return postText;
}
}
@@ -265,7 +265,7 @@ function string2bb(element) {
$.fn.bbco_autocomplete = function(type) {
if(type=='bbcode') {
- var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer'];
+ var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer'];
var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ];
var elements = open_close_elements.concat(open_elements);
@@ -296,7 +296,7 @@ function string2bb(element) {
replace: function (element) {
element = string2bb(element);
if(open_elements.indexOf(element) < 0) {
- if(element === 'list' || element === 'ol' || element === 'ul') {
+ if(element === 'list' || element === 'ol' || element === 'ul' || element === 'dl') {
return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]'];
}
else if(element === 'table') {
diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js
index fcbc26a3f..41776b096 100644
--- a/view/js/icon_translate.js
+++ b/view/js/icon_translate.js
@@ -2,57 +2,57 @@
$(document).ready(function() {
- $('.icon-smile').addClass('');
- $('.icon-star-empty').addClass('');
- $('.icon-star-full').addClass('');
- $('.icon-star').addClass('');
- $('.icon-remove').addClass('');
- $('.icon-search').addClass('');
- $('.icon-facetime-video').addClass('');
- $('.icon-volume-up').addClass('');
- $('.icon-picture').addClass('');
- $('.icon-align-justify').addClass('');
- $('.icon-question').addClass('');
- $('.icon-ok').addClass('');
- $('.icon-lock').addClass('');
- $('.icon-unlock').addClass('');
- $('.icon-th').addClass('');
- $('.icon-home').addClass('');
- $('.icon-envelope').addClass('');
- $('.icon-calendar').addClass('');
- $('.icon-user').addClass('');
- $('.icon-exclamation').addClass('');
- $('.icon-sitemap').addClass('');
- $('.icon-cogs').addClass('');
- $('.icon-paper-clip').addClass('');
- $('.icon-pencil').addClass('');
- $('.icon-remove').addClass('');
- $('.icon-ok').addClass('');
- $('.icon-folder-close').addClass('');
- $('.icon-camera').addClass('');
- $('.icon-paper-clip').addClass('');
- $('.icon-link').addClass('');
- $('.icon-eraser').addClass('');
- $('.icon-key').addClass('');
- $('.icon-asterisk').addClass('');
- $('.icon-backward').addClass('');
- $('.icon-forward').addClass('');
- $('.icon-external-link').addClass('');
- $('.icon-eye-open').addClass('');
- $('.icon-bold').addClass('');
- $('.icon-italic').addClass('');
- $('.icon-underline').addClass('');
- $('.icon-quote-left').addClass('');
- $('.icon-terminal').addClass('');
- $('.icon-camera').addClass('');
- $('.icon-link').addClass('');
- $('.icon-check-empty').addClass('');
- $('.icon-check').addClass('');
- $('.icon-globe').addClass('');
- $('.icon-circle-blank').addClass('');
- $('.icon-circle').addClass('');
- $('.icon-bookmark').addClass('');
- $('.icon-fullscreen').addClass('');
- $('.icon-share').addClass('');
- $('.icon-plus').addClass('');
+ $('.fa-smile-o').addClass('');
+ $('.fa-star-o').addClass('');
+ $('.fa-star-full').addClass('');
+ $('.fa-star').addClass('');
+ $('.fa-times').addClass('');
+ $('.fa-search').addClass('');
+ $('.fa-video-camera').addClass('');
+ $('.fa-volume-up').addClass('');
+ $('.fa-picture-o').addClass('');
+ $('.fa-align-justify').addClass('');
+ $('.fa-question').addClass('');
+ $('.fa-check').addClass('');
+ $('.fa-lock').addClass('');
+ $('.fa-unlock').addClass('');
+ $('.fa-th').addClass('');
+ $('.fa-home').addClass('');
+ $('.fa-envelope').addClass('');
+ $('.fa-calendar').addClass('');
+ $('.fa-user').addClass('');
+ $('.fa-exclamation').addClass('');
+ $('.fa-sitemap').addClass('');
+ $('.fa-cogs').addClass('');
+ $('.fa-paperclip').addClass('');
+ $('.fa-pencil').addClass('');
+ $('.fa-times').addClass('');
+ $('.fa-check').addClass('');
+ $('.fa-folder').addClass('');
+ $('.fa-camera').addClass('');
+ $('.fa-paperclip').addClass('');
+ $('.fa-link').addClass('');
+ $('.fa-eraser').addClass('');
+ $('.fa-key').addClass('');
+ $('.fa-asterisk').addClass('');
+ $('.fa-backward').addClass('');
+ $('.fa-forward').addClass('');
+ $('.fa-external-link').addClass('');
+ $('.fa-eye').addClass('');
+ $('.fa-bold').addClass('');
+ $('.fa-italic').addClass('');
+ $('.fa-underline').addClass('');
+ $('.fa-quote-left').addClass('');
+ $('.fa-terminal').addClass('');
+ $('.fa-camera').addClass('');
+ $('.fa-link').addClass('');
+ $('.fa-square-o').addClass('');
+ $('.fa-check-square-o').addClass('');
+ $('.fa-globe').addClass('');
+ $('.fa-circle-o').addClass('');
+ $('.fa-circle').addClass('');
+ $('.fa-bookmark').addClass('');
+ $('.fa-arrows-alt').addClass('');
+ $('.fa-share-square-o').addClass('');
+ $('.fa-plus').addClass('');
}); \ No newline at end of file
diff --git a/view/js/main.js b/view/js/main.js
index 748853939..15a6b4b8d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -984,16 +984,16 @@ function dostar(ident) {
if(data.result == 1) {
$('#starred-' + ident).addClass('starred');
$('#starred-' + ident).removeClass('unstarred');
- $('#starred-' + ident).addClass('icon-star-full');
- $('#starred-' + ident).removeClass('icon-star-empty');
+ $('#starred-' + ident).addClass('fa-star-full');
+ $('#starred-' + ident).removeClass('fa-star-o');
$('#star-' + ident).addClass('hidden');
$('#unstar-' + ident).removeClass('hidden');
}
else {
$('#starred-' + ident).addClass('unstarred');
$('#starred-' + ident).removeClass('starred');
- $('#starred-' + ident).addClass('icon-star-empty');
- $('#starred-' + ident).removeClass('icon-star-full');
+ $('#starred-' + ident).addClass('fa-star-o');
+ $('#starred-' + ident).removeClass('fa-star-full');
$('#star-' + ident).removeClass('hidden');
$('#unstar-' + ident).addClass('hidden');
}
@@ -1179,7 +1179,7 @@ function contactgroupChangeMember(gid, cid) {
$('body').css('cursor', 'wait');
$.get('contactgroup/' + gid + '/' + cid, function(data) {
$('body').css('cursor', 'auto');
- $('#group-' + gid).toggleClass('icon-check icon-check-empty');
+ $('#group-' + gid).toggleClass('fa-check-square-o fa-square-o');
});
}
diff --git a/view/js/mod_chat.js b/view/js/mod_chat.js
index f9d2a599c..00becc2fa 100644
--- a/view/js/mod_chat.js
+++ b/view/js/mod_chat.js
@@ -7,11 +7,11 @@ $(document).ready(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
});
if(selstr === null) {
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
}
}).trigger('change');
diff --git a/view/js/mod_filestorage.js b/view/js/mod_filestorage.js
index df04b4a83..c0620c928 100644
--- a/view/js/mod_filestorage.js
+++ b/view/js/mod_filestorage.js
@@ -6,11 +6,11 @@ $(document).ready(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
});
if(selstr === null) {
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
}
}).trigger('change');
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index 34e2e3f25..006be5f23 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -1,10 +1,6 @@
/**
* JavaScript used by mod/photos
*/
-
-// is this variable used anywhere?
-var ispublic = aStr.everybody;
-
$(document).ready(function() {
$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
@@ -17,11 +13,11 @@ $(document).ready(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
});
if(selstr === null) {
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
}
}).trigger('change');
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index e28a18b9f..640c154dd 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -2,9 +2,6 @@
* JavaScript used by mod/settings
*/
-// is this used anywhere?
-var ispublic = aStr.everybody;
-
$(document).ready(function() {
$('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
@@ -20,11 +17,11 @@ $(document).ready(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
});
if(selstr === null) {
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
}
}).trigger('change');
@@ -127,4 +124,4 @@ function channel_privacy_macro(n) {
$('#id_profile_in_directory_onoff .off').addClass('hidden');
$('#id_profile_in_directory').val(1);
}
-} \ No newline at end of file
+}
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 85b3676f1..10ca94afc 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-22 00:01-0700\n"
-"PO-Revision-Date: 2016-04-25 13:03+0000\n"
+"POT-Creation-Date: 2016-04-29 00:01-0700\n"
+"PO-Revision-Date: 2016-04-30 11:56+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"
@@ -22,7 +22,7 @@ msgstr ""
msgid "parent"
msgstr "omhoog"
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2633
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2606
msgid "Collection"
msgstr "map"
@@ -47,7 +47,7 @@ msgid "Schedule Outbox"
msgstr "Planning-postvak UIT"
#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797
-#: ../../Zotlabs/Module/Photos.php:1241 ../../include/apps.php:360
+#: ../../Zotlabs/Module/Photos.php:1242 ../../include/apps.php:360
#: ../../include/apps.php:415 ../../include/conversation.php:1037
#: ../../include/widgets.php:1457
msgid "Unknown"
@@ -76,7 +76,7 @@ msgstr "Aanmaken"
#: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
#: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366
#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1470
msgid "Upload"
msgstr "Uploaden"
@@ -124,9 +124,9 @@ msgstr "Bewerken"
#: ../../Zotlabs/Module/Blocks.php:161
#: ../../Zotlabs/Module/Connections.php:263
#: ../../Zotlabs/Module/Connedit.php:573
-#: ../../Zotlabs/Module/Editblock.php:187
+#: ../../Zotlabs/Module/Editblock.php:180
#: ../../Zotlabs/Module/Editlayout.php:184
-#: ../../Zotlabs/Module/Editwebpage.php:228 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Editwebpage.php:221 ../../Zotlabs/Module/Group.php:177
#: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651
#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191
#: ../../include/ItemObject.php:120 ../../include/apps.php:260
@@ -373,7 +373,7 @@ msgstr "Niet ondersteund"
#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
#: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
msgid "No"
msgstr "Nee"
@@ -393,7 +393,7 @@ msgstr "Ja - met goedkeuring"
#: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141
#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143
#: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619
msgid "Yes"
msgstr "Ja"
@@ -424,7 +424,7 @@ msgstr "Hub-instellingen"
#: ../../Zotlabs/Module/Admin.php:1778 ../../Zotlabs/Module/Appman.php:103
#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194
#: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97
-#: ../../Zotlabs/Module/Connedit.php:733 ../../Zotlabs/Module/Events.php:472
+#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:472
#: ../../Zotlabs/Module/Events.php:669
#: ../../Zotlabs/Module/Filestorage.php:160
#: ../../Zotlabs/Module/Fsuggest.php:112 ../../Zotlabs/Module/Group.php:85
@@ -830,14 +830,6 @@ msgstr "Eén per regel. Laat leeg om standaard vanaf elk domein toe te staan"
msgid "Block embedded HTML from these domains"
msgstr "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren"
-#: ../../Zotlabs/Module/Admin.php:728
-msgid "Cooperative embed security"
-msgstr "Met elkaar ingesloten (embedded) HTML beveiligen"
-
-#: ../../Zotlabs/Module/Admin.php:728
-msgid "Enable to share embed security with other compatible sites/hubs"
-msgstr "Beveiliging omtrent ingesloten (embedded) HTML met andere compatibele hubs delen."
-
#: ../../Zotlabs/Module/Admin.php:743
msgid "Update has been marked successful"
msgstr "Update is als succesvol gemarkeerd"
@@ -957,7 +949,7 @@ msgstr "Tijd/datum verzoek"
#: ../../Zotlabs/Module/Admin.php:997 ../../Zotlabs/Module/Admin.php:1006
#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../include/contact_selectors.php:81 ../../boot.php:1604
+#: ../../include/contact_selectors.php:81 ../../boot.php:1617
msgid "Email"
msgstr "E-mail"
@@ -1137,7 +1129,7 @@ msgstr "Omschakelen"
#: ../../Zotlabs/Module/Admin.php:1274 ../../Zotlabs/Module/Admin.php:1496
#: ../../include/apps.php:134 ../../include/widgets.php:589
-#: ../../include/nav.php:211
+#: ../../include/nav.php:208
msgid "Settings"
msgstr "Instellingen"
@@ -1254,8 +1246,8 @@ msgstr "Extra informatie (optioneel)"
#: ../../Zotlabs/Module/Admin.php:1695 ../../Zotlabs/Module/Admin.php:1715
#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
-#: ../../include/text.php:905 ../../include/text.php:917
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:905
+#: ../../include/text.php:917 ../../include/widgets.php:201
msgid "Save"
msgstr "Opslaan"
@@ -1339,7 +1331,7 @@ msgstr "Naam van app"
#: ../../Zotlabs/Module/Appman.php:95 ../../Zotlabs/Module/Appman.php:96
#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
-#: ../../Zotlabs/Module/Profiles.php:712 ../../Zotlabs/Module/Profiles.php:716
+#: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717
#: ../../include/datetime.php:246
msgid "Required"
msgstr "Vereist"
@@ -1374,7 +1366,7 @@ msgid "Location (URL) to purchase app"
msgstr "Locatie (URL) om de app aan te schaffen"
#: ../../Zotlabs/Module/Apps.php:40 ../../include/widgets.php:102
-#: ../../include/nav.php:165
+#: ../../include/nav.php:163
msgid "Apps"
msgstr "Apps"
@@ -1395,7 +1387,7 @@ msgstr "Kanaal niet gevonden."
msgid "Block Name"
msgstr "Bloknaam"
-#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2278
+#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2251
msgid "Blocks"
msgstr "Blokken"
@@ -1453,7 +1445,7 @@ msgid "l, F j"
msgstr "l j F"
#: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634
-#: ../../include/text.php:1743
+#: ../../include/text.php:1714
msgid "Link to Source"
msgstr "Originele locatie"
@@ -1547,10 +1539,10 @@ msgstr "Vul een URL in:"
msgid "Encrypt text"
msgstr "Tekst versleutelen"
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:149
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:148
#: ../../Zotlabs/Module/Editlayout.php:147
#: ../../Zotlabs/Module/Editpost.php:126
-#: ../../Zotlabs/Module/Editwebpage.php:189 ../../Zotlabs/Module/Mail.php:253
+#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:253
#: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1225
msgid "Insert web link"
msgstr "Weblink invoegen"
@@ -1588,7 +1580,7 @@ msgid "No chatrooms available"
msgstr "Geen chatkanalen beschikbaar"
#: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Zotlabs/Module/Profiles.php:782
msgid "Create New"
msgstr "Nieuwe aanmaken"
@@ -1780,13 +1772,13 @@ msgid "Recent activity"
msgstr "Recente activiteit"
#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:834
-#: ../../include/nav.php:189
+#: ../../include/nav.php:186
msgid "Connections"
msgstr "Connecties"
#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../include/apps.php:147 ../../include/text.php:904
-#: ../../include/text.php:916 ../../include/nav.php:167
+#: ../../include/text.php:904 ../../include/text.php:916
+#: ../../include/apps.php:147 ../../include/nav.php:165
msgid "Search"
msgstr "Zoeken"
@@ -2001,73 +1993,77 @@ msgid ""
"connections."
msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:714
+msgid "Connection Tools"
+msgstr "Hulpmiddelen"
+
+#: ../../Zotlabs/Module/Connedit.php:716
msgid "Slide to adjust your degree of friendship"
msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Rate.php:161
+#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Module/Rate.php:161
#: ../../include/js_strings.php:20
msgid "Rating"
msgstr "Beoordeling"
-#: ../../Zotlabs/Module/Connedit.php:717
+#: ../../Zotlabs/Module/Connedit.php:718
msgid "Slide to adjust your rating"
msgstr "Gebruik de schuif om je beoordeling te geven"
-#: ../../Zotlabs/Module/Connedit.php:718 ../../Zotlabs/Module/Connedit.php:723
+#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:724
msgid "Optionally explain your rating"
msgstr "Verklaar jouw beoordeling (niet verplicht)"
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:721
msgid "Custom Filter"
msgstr "Berichtenfilter"
-#: ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:722
msgid "Only import posts with this text"
msgstr "Importeer alleen berichten met deze tekst"
-#: ../../Zotlabs/Module/Connedit.php:721 ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:723
msgid ""
"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
"all posts"
msgstr "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1) - laat leeg om alle berichten te importeren"
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:723
msgid "Do not import posts with this text"
msgstr "Importeer geen berichten met deze tekst"
-#: ../../Zotlabs/Module/Connedit.php:724
+#: ../../Zotlabs/Module/Connedit.php:725
msgid "This information is public!"
msgstr "Deze informatie is openbaar!"
-#: ../../Zotlabs/Module/Connedit.php:729
+#: ../../Zotlabs/Module/Connedit.php:730
msgid "Connection Pending Approval"
msgstr "Connectie moet nog geaccepteerd worden"
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:733
msgid "inherited"
msgstr "geërfd"
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Zotlabs/Module/Connedit.php:735
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
-#: ../../Zotlabs/Module/Connedit.php:736
+#: ../../Zotlabs/Module/Connedit.php:737
msgid "Their Settings"
msgstr "Hun instellingen"
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:738
msgid "My Settings"
msgstr "Mijn instellingen"
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:740
msgid "Individual Permissions"
msgstr "Individuele permissies"
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:741
msgid ""
"Some permissions may be inherited from your channel's <a "
"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2075,7 +2071,7 @@ msgid ""
" settings here."
msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen."
-#: ../../Zotlabs/Module/Connedit.php:741
+#: ../../Zotlabs/Module/Connedit.php:742
msgid ""
"Some permissions may be inherited from your channel's <a "
"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -2083,7 +2079,7 @@ msgid ""
"they wont have any impact unless the inherited setting changes."
msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "
-#: ../../Zotlabs/Module/Connedit.php:742
+#: ../../Zotlabs/Module/Connedit.php:743
msgid "Last update:"
msgstr "Laatste wijziging:"
@@ -2231,8 +2227,8 @@ msgid "Age:"
msgstr "Leeftijd:"
#: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1022
-#: ../../include/bb2diaspora.php:509 ../../include/event.php:52
-#: ../../include/text.php:1452
+#: ../../include/text.php:1452 ../../include/bb2diaspora.php:509
+#: ../../include/event.php:52
msgid "Location:"
msgstr "Plaats:"
@@ -2444,124 +2440,62 @@ msgid "Code"
msgstr "Broncode"
#: ../../Zotlabs/Module/Editblock.php:147
-#: ../../Zotlabs/Module/Editlayout.php:145
-#: ../../Zotlabs/Module/Editpost.php:124
-#: ../../Zotlabs/Module/Editwebpage.php:187
-#: ../../include/conversation.php:1221
-msgid "Upload photo"
-msgstr "Foto uploaden"
-
-#: ../../Zotlabs/Module/Editblock.php:148
#: ../../Zotlabs/Module/Editlayout.php:146
#: ../../Zotlabs/Module/Editpost.php:125
-#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:252
+#: ../../Zotlabs/Module/Editwebpage.php:187 ../../Zotlabs/Module/Mail.php:252
#: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1223
msgid "Attach file"
msgstr "Bestand toevoegen"
-#: ../../Zotlabs/Module/Editblock.php:150
-#: ../../Zotlabs/Module/Editlayout.php:148
-#: ../../Zotlabs/Module/Editpost.php:127
-#: ../../Zotlabs/Module/Editwebpage.php:190
-msgid "Insert YouTube video"
-msgstr "YouTube-video invoegen"
-
#: ../../Zotlabs/Module/Editblock.php:151
-#: ../../Zotlabs/Module/Editlayout.php:149
-#: ../../Zotlabs/Module/Editpost.php:128
-#: ../../Zotlabs/Module/Editwebpage.php:191
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis-video [.ogg] invoegen"
-
-#: ../../Zotlabs/Module/Editblock.php:152
-#: ../../Zotlabs/Module/Editlayout.php:150
-#: ../../Zotlabs/Module/Editpost.php:129
-#: ../../Zotlabs/Module/Editwebpage.php:192
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis-audio [.ogg] invoegen"
-
-#: ../../Zotlabs/Module/Editblock.php:153
-#: ../../Zotlabs/Module/Editlayout.php:151
-#: ../../Zotlabs/Module/Editpost.php:130
-#: ../../Zotlabs/Module/Editwebpage.php:193
-#: ../../include/conversation.php:1231
-msgid "Set your location"
-msgstr "Locatie instellen"
-
-#: ../../Zotlabs/Module/Editblock.php:154
-#: ../../Zotlabs/Module/Editlayout.php:152
-#: ../../Zotlabs/Module/Editpost.php:131
-#: ../../Zotlabs/Module/Editwebpage.php:194
-#: ../../include/conversation.php:1236
-msgid "Clear browser location"
-msgstr "Locatie van webbrowser wissen"
-
-#: ../../Zotlabs/Module/Editblock.php:155
-#: ../../Zotlabs/Module/Editlayout.php:153
-#: ../../Zotlabs/Module/Editpost.php:135
-#: ../../Zotlabs/Module/Editwebpage.php:195
-#: ../../Zotlabs/Module/Photos.php:1072 ../../include/ItemObject.php:389
-#: ../../include/conversation.php:740 ../../include/conversation.php:1244
-msgid "Please wait"
-msgstr "Even wachten"
-
-#: ../../Zotlabs/Module/Editblock.php:156
#: ../../Zotlabs/Module/Editlayout.php:154
#: ../../Zotlabs/Module/Editpost.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:196
+#: ../../Zotlabs/Module/Editwebpage.php:191
#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1245
msgid "Permission settings"
msgstr "Permissies"
-#: ../../Zotlabs/Module/Editblock.php:164
+#: ../../Zotlabs/Module/Editblock.php:159
#: ../../Zotlabs/Module/Editlayout.php:161
#: ../../Zotlabs/Module/Editpost.php:144
-#: ../../Zotlabs/Module/Editwebpage.php:205
+#: ../../Zotlabs/Module/Editwebpage.php:200
#: ../../include/conversation.php:1254
msgid "Public post"
msgstr "Openbaar bericht"
-#: ../../Zotlabs/Module/Editblock.php:167
+#: ../../Zotlabs/Module/Editblock.php:162
#: ../../Zotlabs/Module/Editpost.php:147
-#: ../../Zotlabs/Module/Editwebpage.php:210
+#: ../../Zotlabs/Module/Editwebpage.php:205
#: ../../include/conversation.php:1239
msgid "Title (optional)"
msgstr "Titel (optioneel)"
-#: ../../Zotlabs/Module/Editblock.php:170
+#: ../../Zotlabs/Module/Editblock.php:165
#: ../../Zotlabs/Module/Editlayout.php:168
#: ../../Zotlabs/Module/Editpost.php:149
-#: ../../Zotlabs/Module/Editwebpage.php:212
+#: ../../Zotlabs/Module/Editwebpage.php:207
#: ../../include/conversation.php:1243
msgid "Categories (optional, comma-separated list)"
msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
-#: ../../Zotlabs/Module/Editblock.php:171
+#: ../../Zotlabs/Module/Editblock.php:166
#: ../../Zotlabs/Module/Editlayout.php:169
#: ../../Zotlabs/Module/Editpost.php:150
-#: ../../Zotlabs/Module/Editwebpage.php:213
+#: ../../Zotlabs/Module/Editwebpage.php:208
#: ../../include/conversation.php:1256
msgid "Example: bob@example.com, mary@example.com"
msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
-#: ../../Zotlabs/Module/Editblock.php:176
+#: ../../Zotlabs/Module/Editblock.php:171
#: ../../Zotlabs/Module/Editpost.php:155
-#: ../../Zotlabs/Module/Editwebpage.php:217
+#: ../../Zotlabs/Module/Editwebpage.php:212
#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092
#: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712
#: ../../include/conversation.php:1186 ../../include/page_widgets.php:40
msgid "Preview"
msgstr "Voorvertoning"
-#: ../../Zotlabs/Module/Editblock.php:181
-#: ../../Zotlabs/Module/Editlayout.php:178
-#: ../../Zotlabs/Module/Editpost.php:161
-#: ../../Zotlabs/Module/Editwebpage.php:222 ../../Zotlabs/Module/Mail.php:257
-#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269
-msgid "Set expiration date"
-msgstr "Verloopdatum instellen"
-
-#: ../../Zotlabs/Module/Editblock.php:186
+#: ../../Zotlabs/Module/Editblock.php:179
msgid "Edit Block"
msgstr "Blok bewerken"
@@ -2569,6 +2503,43 @@ msgstr "Blok bewerken"
msgid "Delete layout?"
msgstr "Lay-out verwijderen?"
+#: ../../Zotlabs/Module/Editlayout.php:145
+#: ../../Zotlabs/Module/Editpost.php:124 ../../include/conversation.php:1221
+msgid "Upload photo"
+msgstr "Foto uploaden"
+
+#: ../../Zotlabs/Module/Editlayout.php:148
+#: ../../Zotlabs/Module/Editpost.php:127
+msgid "Insert YouTube video"
+msgstr "YouTube-video invoegen"
+
+#: ../../Zotlabs/Module/Editlayout.php:149
+#: ../../Zotlabs/Module/Editpost.php:128
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Vorbis-video [.ogg] invoegen"
+
+#: ../../Zotlabs/Module/Editlayout.php:150
+#: ../../Zotlabs/Module/Editpost.php:129
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Vorbis-audio [.ogg] invoegen"
+
+#: ../../Zotlabs/Module/Editlayout.php:151
+#: ../../Zotlabs/Module/Editpost.php:130 ../../include/conversation.php:1231
+msgid "Set your location"
+msgstr "Locatie instellen"
+
+#: ../../Zotlabs/Module/Editlayout.php:152
+#: ../../Zotlabs/Module/Editpost.php:131 ../../include/conversation.php:1236
+msgid "Clear browser location"
+msgstr "Locatie van webbrowser wissen"
+
+#: ../../Zotlabs/Module/Editlayout.php:153
+#: ../../Zotlabs/Module/Editpost.php:135 ../../Zotlabs/Module/Photos.php:1072
+#: ../../include/ItemObject.php:389 ../../include/conversation.php:740
+#: ../../include/conversation.php:1244
+msgid "Please wait"
+msgstr "Even wachten"
+
#: ../../Zotlabs/Module/Editlayout.php:164
#: ../../Zotlabs/Module/Layouts.php:128
msgid "Layout Description (Optional)"
@@ -2579,6 +2550,12 @@ msgstr "Lay-out-omschrijving (optioneel)"
msgid "Layout Name"
msgstr "Naam lay-out"
+#: ../../Zotlabs/Module/Editlayout.php:178
+#: ../../Zotlabs/Module/Editpost.php:161 ../../Zotlabs/Module/Mail.php:257
+#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269
+msgid "Set expiration date"
+msgstr "Verloopdatum instellen"
+
#: ../../Zotlabs/Module/Editlayout.php:183
msgid "Edit Layout"
msgstr "Lay-out bewerken"
@@ -2623,7 +2600,7 @@ msgstr "Webpagina verwijderen?"
msgid "Page link title"
msgstr "Titel van paginalink"
-#: ../../Zotlabs/Module/Editwebpage.php:227
+#: ../../Zotlabs/Module/Editwebpage.php:220
msgid "Edit Webpage"
msgstr "Webpagina bewerken"
@@ -2653,8 +2630,8 @@ msgid "Event not found."
msgstr "Gebeurtenis niet gevonden"
#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
-#: ../../include/event.php:915 ../../include/text.php:1970
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1943
+#: ../../include/conversation.php:123 ../../include/event.php:915
msgid "event"
msgstr "gebeurtenis"
@@ -2717,7 +2694,7 @@ msgid "Edit Location"
msgstr "Locatie bewerken"
#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:701
+#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:702
#: ../../Zotlabs/Module/Pubsites.php:40 ../../include/js_strings.php:25
msgid "Location"
msgstr "Locatie"
@@ -2900,7 +2877,7 @@ msgstr "Hulp:"
#: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
#: ../../Zotlabs/Module/Layouts.php:181 ../../include/apps.php:142
-#: ../../include/nav.php:161
+#: ../../include/nav.php:159
msgid "Help"
msgstr "Hulp"
@@ -2967,7 +2944,7 @@ msgstr "Profielfoto 128px"
msgid "Timezone"
msgstr "Tijdzone"
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:735
msgid "Homepage URL"
msgstr "URL homepagina"
@@ -3245,7 +3222,7 @@ msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
-#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2280
+#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2253
msgid "Layouts"
msgstr "Lay-outs"
@@ -3297,13 +3274,13 @@ msgid "Previous action reversed."
msgstr "Vorige actie omgedraaid"
#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
-#: ../../include/text.php:1967
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940
+#: ../../include/conversation.php:120
msgid "photo"
msgstr "foto"
#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/conversation.php:148 ../../include/text.php:1973
+#: ../../include/text.php:1946 ../../include/conversation.php:148
msgid "status"
msgstr "bericht"
@@ -3439,7 +3416,7 @@ msgid ""
"Password reset failed."
msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1610
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1623
msgid "Password Reset"
msgstr "Wachtwoord vergeten?"
@@ -3586,7 +3563,7 @@ msgid "Create a new channel"
msgstr "Nieuw kanaal aanmaken"
#: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:132
-#: ../../include/nav.php:209
+#: ../../include/nav.php:206
msgid "Channel Manager"
msgstr "Kanaalbeheer"
@@ -3672,7 +3649,7 @@ msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan"
msgid "Submit and proceed"
msgstr "Opslaan en doorgaan"
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2279
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2252
msgid "Menus"
msgstr "Menu's"
@@ -3964,7 +3941,7 @@ msgstr "Geen systeemnotificaties meer."
msgid "System Notifications"
msgstr "Systeemnotificaties"
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:194
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
msgid "Mark all system notifications seen"
msgstr "Markeer alle systeemnotificaties als bekeken"
@@ -4106,8 +4083,8 @@ msgstr "Omschrijving (optioneel):"
msgid "Album name could not be decoded"
msgstr "Albumnaam kon niet gedecodeerd worden"
-#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1282
-#: ../../Zotlabs/Module/Photos.php:1299
+#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1283
+#: ../../Zotlabs/Module/Photos.php:1300
msgid "Contact Photos"
msgstr "Connectiefoto's"
@@ -4119,7 +4096,7 @@ msgstr "Nieuwste eerst weergeven"
msgid "Show Oldest First"
msgstr "Oudste eerst weergeven"
-#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1332
+#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1333
#: ../../include/widgets.php:1451
msgid "View Photo"
msgstr "Foto weergeven"
@@ -4273,35 +4250,39 @@ msgid_plural "Dislikes"
msgstr[0] "vindt dit niet leuk"
msgstr[1] "vinden dit niet leuk"
-#: ../../Zotlabs/Module/Photos.php:1242
+#: ../../Zotlabs/Module/Photos.php:1234
+msgid "Photo Tools"
+msgstr "Hulpmiddelen"
+
+#: ../../Zotlabs/Module/Photos.php:1243
msgid "In This Photo:"
msgstr "Op deze foto:"
-#: ../../Zotlabs/Module/Photos.php:1247
+#: ../../Zotlabs/Module/Photos.php:1248
msgid "Map"
msgstr "Kaart"
-#: ../../Zotlabs/Module/Photos.php:1255 ../../include/ItemObject.php:378
+#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:378
msgctxt "noun"
msgid "Likes"
msgstr "vinden dit leuk"
-#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:379
+#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:379
msgctxt "noun"
msgid "Dislikes"
msgstr "vinden dit niet leuk"
-#: ../../Zotlabs/Module/Photos.php:1261 ../../include/ItemObject.php:384
+#: ../../Zotlabs/Module/Photos.php:1262 ../../include/ItemObject.php:384
#: ../../include/acl_selectors.php:252
msgid "Close"
msgstr "Sluiten"
-#: ../../Zotlabs/Module/Photos.php:1338
+#: ../../Zotlabs/Module/Photos.php:1339
msgid "View Album"
msgstr "Album weergeven"
-#: ../../Zotlabs/Module/Photos.php:1349 ../../Zotlabs/Module/Photos.php:1362
-#: ../../Zotlabs/Module/Photos.php:1363
+#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363
+#: ../../Zotlabs/Module/Photos.php:1364
msgid "Recent Photos"
msgstr "Recente foto's"
@@ -4408,15 +4389,15 @@ msgstr "Huwelijke status"
msgid "Romantic Partner"
msgstr "Romantische partner"
-#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:739
+#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:740
msgid "Likes"
msgstr "Houdt van"
-#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:741
msgid "Dislikes"
msgstr "Houdt niet van"
-#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:748
msgid "Work/Employment"
msgstr "Werk/arbeid"
@@ -4456,181 +4437,185 @@ msgstr "Profiel bewerken"
msgid "View this profile"
msgstr "Profiel weergeven"
-#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:774
+#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775
#: ../../include/identity.php:952
msgid "Edit visibility"
msgstr "Zichtbaarheid bewerken"
#: ../../Zotlabs/Module/Profiles.php:694
+msgid "Profile Tools"
+msgstr "Hulpmiddelen"
+
+#: ../../Zotlabs/Module/Profiles.php:695
msgid "Change cover photo"
msgstr "Omslagfoto wijzigen"
-#: ../../Zotlabs/Module/Profiles.php:695 ../../include/identity.php:923
+#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:923
msgid "Change profile photo"
msgstr "Profielfoto veranderen"
-#: ../../Zotlabs/Module/Profiles.php:696
+#: ../../Zotlabs/Module/Profiles.php:697
msgid "Create a new profile using these settings"
msgstr "Een nieuw profiel aanmaken met dit profiel als basis"
-#: ../../Zotlabs/Module/Profiles.php:697
+#: ../../Zotlabs/Module/Profiles.php:698
msgid "Clone this profile"
msgstr "Dit profiel klonen"
-#: ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Profiles.php:699
msgid "Delete this profile"
msgstr "Dit profiel verwijderen"
-#: ../../Zotlabs/Module/Profiles.php:699
+#: ../../Zotlabs/Module/Profiles.php:700
msgid "Add profile things"
msgstr "Dingen aan je profiel toevoegen"
-#: ../../Zotlabs/Module/Profiles.php:700 ../../include/conversation.php:1544
+#: ../../Zotlabs/Module/Profiles.php:701 ../../include/conversation.php:1544
#: ../../include/widgets.php:105
msgid "Personal"
msgstr "Persoonlijk"
-#: ../../Zotlabs/Module/Profiles.php:702
+#: ../../Zotlabs/Module/Profiles.php:703
msgid "Relation"
msgstr "Relatie"
-#: ../../Zotlabs/Module/Profiles.php:703 ../../include/datetime.php:48
+#: ../../Zotlabs/Module/Profiles.php:704 ../../include/datetime.php:48
msgid "Miscellaneous"
msgstr "Diversen"
-#: ../../Zotlabs/Module/Profiles.php:705
+#: ../../Zotlabs/Module/Profiles.php:706
msgid "Import profile from file"
msgstr "Profiel vanuit bestand importeren"
-#: ../../Zotlabs/Module/Profiles.php:706
+#: ../../Zotlabs/Module/Profiles.php:707
msgid "Export profile to file"
msgstr "Profiel naar bestand exporteren"
-#: ../../Zotlabs/Module/Profiles.php:707
+#: ../../Zotlabs/Module/Profiles.php:708
msgid "Your gender"
msgstr "Jouw geslacht"
-#: ../../Zotlabs/Module/Profiles.php:708
+#: ../../Zotlabs/Module/Profiles.php:709
msgid "Marital status"
msgstr "Burgerlijke staat"
-#: ../../Zotlabs/Module/Profiles.php:709
+#: ../../Zotlabs/Module/Profiles.php:710
msgid "Sexual preference"
msgstr "Seksuele voorkeur"
-#: ../../Zotlabs/Module/Profiles.php:712
+#: ../../Zotlabs/Module/Profiles.php:713
msgid "Profile name"
msgstr "Profielnaam"
-#: ../../Zotlabs/Module/Profiles.php:714
+#: ../../Zotlabs/Module/Profiles.php:715
msgid "This is your default profile."
msgstr "Dit is jouw standaardprofiel"
-#: ../../Zotlabs/Module/Profiles.php:716
+#: ../../Zotlabs/Module/Profiles.php:717
msgid "Your full name"
msgstr "Jouw volledige naam"
-#: ../../Zotlabs/Module/Profiles.php:717
+#: ../../Zotlabs/Module/Profiles.php:718
msgid "Title/Description"
msgstr "Titel/omschrijving"
-#: ../../Zotlabs/Module/Profiles.php:720
+#: ../../Zotlabs/Module/Profiles.php:721
msgid "Street address"
msgstr "Straat en huisnummer"
-#: ../../Zotlabs/Module/Profiles.php:721
+#: ../../Zotlabs/Module/Profiles.php:722
msgid "Locality/City"
msgstr "Woonplaats"
-#: ../../Zotlabs/Module/Profiles.php:722
+#: ../../Zotlabs/Module/Profiles.php:723
msgid "Region/State"
msgstr "Provincie/gewest/deelstaat"
-#: ../../Zotlabs/Module/Profiles.php:723
+#: ../../Zotlabs/Module/Profiles.php:724
msgid "Postal/Zip code"
msgstr "Postcode"
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:725
msgid "Country"
msgstr "Land"
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:730
msgid "Who (if applicable)"
msgstr "Wie (wanneer van toepassing)"
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:730
msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl"
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:731
msgid "Since (date)"
msgstr "Sinds (datum)"
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Zotlabs/Module/Profiles.php:734
msgid "Tell us about yourself"
msgstr "Vertel ons iets over jezelf"
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Profiles.php:736
msgid "Hometown"
msgstr "Oorspronkelijk uit"
-#: ../../Zotlabs/Module/Profiles.php:736
+#: ../../Zotlabs/Module/Profiles.php:737
msgid "Political views"
msgstr "Politieke overtuigingen"
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:738
msgid "Religious views"
msgstr "Religieuze overtuigingen"
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Zotlabs/Module/Profiles.php:739
msgid "Keywords used in directory listings"
msgstr "Trefwoorden voor in de kanalengids"
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../Zotlabs/Module/Profiles.php:739
msgid "Example: fishing photography software"
msgstr "Voorbeeld: muziek, fotografie, software"
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:742
msgid "Musical interests"
msgstr "Muzikale interesses"
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:743
msgid "Books, literature"
msgstr "Boeken/literatuur"
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:744
msgid "Television"
msgstr "Televisie"
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:745
msgid "Film/Dance/Culture/Entertainment"
msgstr "Film/dans/cultuur/entertainment"
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Zotlabs/Module/Profiles.php:746
msgid "Hobbies/Interests"
msgstr "Hobby's/interesses"
-#: ../../Zotlabs/Module/Profiles.php:746
+#: ../../Zotlabs/Module/Profiles.php:747
msgid "Love/Romance"
msgstr "Liefde/romantiek"
-#: ../../Zotlabs/Module/Profiles.php:748
+#: ../../Zotlabs/Module/Profiles.php:749
msgid "School/Education"
msgstr "School/opleiding"
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:750
msgid "Contact information and social networks"
msgstr "Contactinformatie en sociale netwerken"
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Zotlabs/Module/Profiles.php:751
msgid "My other channels"
msgstr "Mijn andere kanalen"
-#: ../../Zotlabs/Module/Profiles.php:770 ../../include/identity.php:948
+#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:948
msgid "Profile Image"
msgstr "Profielfoto"
-#: ../../Zotlabs/Module/Profiles.php:780 ../../include/identity.php:930
+#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:930
#: ../../include/nav.php:88
msgid "Edit Profiles"
msgstr "Bewerk profielen"
@@ -4826,8 +4811,8 @@ msgstr "Ja"
msgid "Membership on this site is by invitation only."
msgstr "Registreren op deze $Projectname-hub kan alleen op uitnodiging."
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:148
-#: ../../boot.php:1584
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
+#: ../../boot.php:1597
msgid "Register"
msgstr "Registreren"
@@ -6135,8 +6120,8 @@ msgstr "Negeren/Verbergen"
msgid "post"
msgstr "bericht"
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1975
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948
+#: ../../include/conversation.php:150
msgid "comment"
msgstr "reactie"
@@ -6738,15 +6723,15 @@ msgstr "Registratie ingetrokken voor %s"
msgid "Account verified. Please login."
msgstr "Account is geverifieerd. Je kan inloggen."
-#: ../../include/account.php:719 ../../include/account.php:721
+#: ../../include/account.php:722 ../../include/account.php:724
msgid "Click here to upgrade."
msgstr "Klik hier om te upgraden."
-#: ../../include/account.php:727
+#: ../../include/account.php:730
msgid "This action exceeds the limits set by your subscription plan."
msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."
-#: ../../include/account.php:732
+#: ../../include/account.php:735
msgid "This action is not available under your subscription plan."
msgstr "Deze handeling is niet mogelijk met jouw abonnement."
@@ -7022,9 +7007,328 @@ msgstr "Bezoek het %2$s van %1$s"
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
-#: ../../include/api.php:1338
-msgid "Public Timeline"
-msgstr "Openbare tijdlijn"
+#: ../../include/text.php:394
+msgid "prev"
+msgstr "vorige"
+
+#: ../../include/text.php:396
+msgid "first"
+msgstr "eerste"
+
+#: ../../include/text.php:425
+msgid "last"
+msgstr "laatste"
+
+#: ../../include/text.php:428
+msgid "next"
+msgstr "volgende"
+
+#: ../../include/text.php:438
+msgid "older"
+msgstr "ouder"
+
+#: ../../include/text.php:440
+msgid "newer"
+msgstr "nieuwer"
+
+#: ../../include/text.php:822
+msgid "No connections"
+msgstr "Geen connecties"
+
+#: ../../include/text.php:847
+#, php-format
+msgid "View all %s connections"
+msgstr "Toon alle %s connecties"
+
+#: ../../include/text.php:992 ../../include/text.php:997
+msgid "poke"
+msgstr "aanstoten"
+
+#: ../../include/text.php:992 ../../include/text.php:997
+#: ../../include/conversation.php:243
+msgid "poked"
+msgstr "aangestoten"
+
+#: ../../include/text.php:998
+msgid "ping"
+msgstr "ping"
+
+#: ../../include/text.php:998
+msgid "pinged"
+msgstr "gepingd"
+
+#: ../../include/text.php:999
+msgid "prod"
+msgstr "por"
+
+#: ../../include/text.php:999
+msgid "prodded"
+msgstr "gepord"
+
+#: ../../include/text.php:1000
+msgid "slap"
+msgstr "slaan"
+
+#: ../../include/text.php:1000
+msgid "slapped"
+msgstr "sloeg"
+
+#: ../../include/text.php:1001
+msgid "finger"
+msgstr "finger"
+
+#: ../../include/text.php:1001
+msgid "fingered"
+msgstr "gefingerd"
+
+#: ../../include/text.php:1002
+msgid "rebuff"
+msgstr "afpoeieren"
+
+#: ../../include/text.php:1002
+msgid "rebuffed"
+msgstr "afgepoeierd"
+
+#: ../../include/text.php:1014
+msgid "happy"
+msgstr "gelukkig"
+
+#: ../../include/text.php:1015
+msgid "sad"
+msgstr "bedroefd"
+
+#: ../../include/text.php:1016
+msgid "mellow"
+msgstr "mellow"
+
+#: ../../include/text.php:1017
+msgid "tired"
+msgstr "moe"
+
+#: ../../include/text.php:1018
+msgid "perky"
+msgstr "parmantig"
+
+#: ../../include/text.php:1019
+msgid "angry"
+msgstr "boos"
+
+#: ../../include/text.php:1020
+msgid "stupefied"
+msgstr "verbijsterd"
+
+#: ../../include/text.php:1021
+msgid "puzzled"
+msgstr "verward"
+
+#: ../../include/text.php:1022
+msgid "interested"
+msgstr "geïnteresseerd"
+
+#: ../../include/text.php:1023
+msgid "bitter"
+msgstr "verbitterd"
+
+#: ../../include/text.php:1024
+msgid "cheerful"
+msgstr "vrolijk"
+
+#: ../../include/text.php:1025
+msgid "alive"
+msgstr "levendig"
+
+#: ../../include/text.php:1026
+msgid "annoyed"
+msgstr "geërgerd"
+
+#: ../../include/text.php:1027
+msgid "anxious"
+msgstr "bezorgd"
+
+#: ../../include/text.php:1028
+msgid "cranky"
+msgstr "humeurig"
+
+#: ../../include/text.php:1029
+msgid "disturbed"
+msgstr "verontrust"
+
+#: ../../include/text.php:1030
+msgid "frustrated"
+msgstr "gefrustreerd "
+
+#: ../../include/text.php:1031
+msgid "depressed"
+msgstr "gedeprimeerd"
+
+#: ../../include/text.php:1032
+msgid "motivated"
+msgstr "gemotiveerd"
+
+#: ../../include/text.php:1033
+msgid "relaxed"
+msgstr "ontspannen"
+
+#: ../../include/text.php:1034
+msgid "surprised"
+msgstr "verrast"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "maandag"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "dinsdag"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "woensdag"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "donderdag"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "vrijdag"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "zaterdag"
+
+#: ../../include/text.php:1206 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "zondag"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:45
+msgid "January"
+msgstr "januari"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:46
+msgid "February"
+msgstr "februari"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:47
+msgid "March"
+msgstr "maart"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:48
+msgid "April"
+msgstr "april"
+
+#: ../../include/text.php:1210
+msgid "May"
+msgstr "mei"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:50
+msgid "June"
+msgstr "juni"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:51
+msgid "July"
+msgstr "juli"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:52
+msgid "August"
+msgstr "augustus"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:53
+msgid "September"
+msgstr "september"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:54
+msgid "October"
+msgstr "oktober"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:55
+msgid "November"
+msgstr "november"
+
+#: ../../include/text.php:1210 ../../include/js_strings.php:56
+msgid "December"
+msgstr "december"
+
+#: ../../include/text.php:1287 ../../include/text.php:1291
+msgid "Unknown Attachment"
+msgstr "Onbekende bijlage"
+
+#: ../../include/text.php:1293
+msgid "unknown"
+msgstr "onbekend"
+
+#: ../../include/text.php:1329
+msgid "remove category"
+msgstr "categorie verwijderen"
+
+#: ../../include/text.php:1406
+msgid "remove from file"
+msgstr "uit map verwijderen"
+
+#: ../../include/text.php:1437 ../../include/bb2diaspora.php:487
+#: ../../include/event.php:22
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
+
+#: ../../include/text.php:1441 ../../include/bb2diaspora.php:493
+#: ../../include/event.php:30
+msgid "Starts:"
+msgstr "Start:"
+
+#: ../../include/text.php:1445 ../../include/bb2diaspora.php:501
+#: ../../include/event.php:40
+msgid "Finishes:"
+msgstr "Einde:"
+
+#: ../../include/text.php:1735 ../../include/text.php:1807
+msgid "default"
+msgstr "standaard"
+
+#: ../../include/text.php:1743
+msgid "Page layout"
+msgstr "Pagina-lay-out"
+
+#: ../../include/text.php:1743
+msgid "You can create your own with the layouts tool"
+msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
+
+#: ../../include/text.php:1785
+msgid "Page content type"
+msgstr "Opmaaktype pagina"
+
+#: ../../include/text.php:1819
+msgid "Select an alternate language"
+msgstr "Kies een andere taal"
+
+#: ../../include/text.php:1953
+msgid "activity"
+msgstr "activiteit"
+
+#: ../../include/text.php:2248
+msgid "Design Tools"
+msgstr "Ontwerp-hulpmiddelen"
+
+
+#: ../../include/text.php:2254
+msgid "Pages"
+msgstr "Pagina's"
+
+#: ../../include/zot.php:680
+msgid "Invalid data packet"
+msgstr "Datapakket ongeldig"
+
+#: ../../include/zot.php:696
+msgid "Unable to verify channel signature"
+msgstr "Kanaalkenmerk kon niet worden geverifieerd. "
+
+#: ../../include/zot.php:2332
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
+
+#: ../../include/zot.php:3670
+msgid "invalid target signature"
+msgstr "ongeldig doelkenmerk"
#: ../../include/apps.php:128
msgid "Site Admin"
@@ -7039,28 +7343,28 @@ msgstr "Bladwijzers"
msgid "Address Book"
msgstr "Connecties"
-#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1602
+#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1615
msgid "Login"
msgstr "Inloggen"
-#: ../../include/apps.php:133 ../../include/nav.php:182
+#: ../../include/apps.php:133 ../../include/nav.php:179
msgid "Grid"
msgstr "Grid"
-#: ../../include/apps.php:137 ../../include/nav.php:185
+#: ../../include/apps.php:137 ../../include/nav.php:182
msgid "Channel Home"
msgstr "Jouw kanaal"
#: ../../include/apps.php:140 ../../include/conversation.php:1667
-#: ../../include/conversation.php:1670 ../../include/nav.php:204
+#: ../../include/conversation.php:1670 ../../include/nav.php:201
msgid "Events"
msgstr "Agenda"
-#: ../../include/apps.php:141 ../../include/nav.php:170
+#: ../../include/apps.php:141 ../../include/nav.php:167
msgid "Directory"
msgstr "Kanalengids"
-#: ../../include/apps.php:143 ../../include/nav.php:196
+#: ../../include/apps.php:143 ../../include/nav.php:193
msgid "Mail"
msgstr "Privéberichten"
@@ -7100,97 +7404,23 @@ msgstr "Installeren"
msgid "Purchase"
msgstr "Aanschaffen"
-#: ../../include/network.php:659
-msgid "view full size"
-msgstr "volledige grootte tonen"
-
-#: ../../include/network.php:1827 ../../include/enotify.php:57
-msgid "$Projectname Notification"
-msgstr "$Projectname-notificatie"
-
-#: ../../include/network.php:1828 ../../include/enotify.php:58
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../include/network.php:1830 ../../include/enotify.php:60
-msgid "Thank You,"
-msgstr "Bedankt,"
-
-#: ../../include/network.php:1832 ../../include/enotify.php:62
-#, php-format
-msgid "%s Administrator"
-msgstr "Beheerder %s"
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
-#: ../../include/network.php:1889
-msgid "No Subject"
-msgstr "Geen onderwerp"
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
+msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
#: ../../include/bb2diaspora.php:398
msgid "Attachments:"
msgstr "Bijlagen:"
-#: ../../include/bb2diaspora.php:487 ../../include/event.php:22
-#: ../../include/text.php:1437
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
-
#: ../../include/bb2diaspora.php:489
msgid "$Projectname event notification:"
msgstr "Notificatie $Projectname-gebeurtenis:"
-#: ../../include/bb2diaspora.php:493 ../../include/event.php:30
-#: ../../include/text.php:1441
-msgid "Starts:"
-msgstr "Start:"
-
-#: ../../include/bb2diaspora.php:501 ../../include/event.php:40
-#: ../../include/text.php:1445
-msgid "Finishes:"
-msgstr "Einde:"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:801
-#: ../../include/bbcode.php:804 ../../include/bbcode.php:809
-#: ../../include/bbcode.php:812 ../../include/bbcode.php:815
-#: ../../include/bbcode.php:818 ../../include/bbcode.php:823
-#: ../../include/bbcode.php:826 ../../include/bbcode.php:831
-#: ../../include/bbcode.php:834 ../../include/bbcode.php:837
-#: ../../include/bbcode.php:840
-msgid "Image/photo"
-msgstr "Afbeelding/foto"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:851
-msgid "Encrypted content"
-msgstr "Versleutelde inhoud"
-
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "Install %s element: "
-msgstr "Installeer %s-element: "
-
-#: ../../include/bbcode.php:183
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."
-
-#: ../../include/bbcode.php:255
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schreef het volgende %2$s %3$s"
-
-#: ../../include/bbcode.php:545
-msgid "Different viewers will see this text differently"
-msgstr "Deze tekst wordt per persoon anders weergeven."
-
-#: ../../include/bbcode.php:762
-msgid "$1 spoiler"
-msgstr "$1 spoiler"
-
-#: ../../include/bbcode.php:789
-msgid "$1 wrote:"
-msgstr "$1 schreef:"
-
#: ../../include/conversation.php:204
#, php-format
msgid "%1$s is now connected with %2$s"
@@ -7201,11 +7431,6 @@ msgstr "%1$s is nu met %2$s verbonden"
msgid "%1$s poked %2$s"
msgstr "%1$s heeft %2$s aangestoten"
-#: ../../include/conversation.php:243 ../../include/text.php:992
-#: ../../include/text.php:997
-msgid "poked"
-msgstr "aangestoten"
-
#: ../../include/conversation.php:691
#, php-format
msgid "View %s's profile @ %s"
@@ -7227,7 +7452,7 @@ msgstr "In context bekijken"
msgid "remove"
msgstr "verwijderen"
-#: ../../include/conversation.php:854 ../../include/nav.php:256
+#: ../../include/conversation.php:854 ../../include/nav.php:247
msgid "Loading..."
msgstr "Aan het laden..."
@@ -7551,6 +7776,10 @@ msgid ""
"form has been opened for too long (>3 hours) before submitting it."
msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "
+#: ../../include/api.php:1338
+msgid "Public Timeline"
+msgstr "Openbare tijdlijn"
+
#: ../../include/contact_selectors.php:56
msgid "Frequently"
msgstr "Regelmatig"
@@ -7751,7 +7980,7 @@ msgstr "Leeftijd:"
msgid "YYYY-MM-DD or MM-DD"
msgstr "JJJJ-MM-DD of MM-DD"
-#: ../../include/datetime.php:273 ../../boot.php:2432
+#: ../../include/datetime.php:273 ../../boot.php:2445
msgid "never"
msgstr "nooit"
@@ -7840,6 +8069,23 @@ msgstr "Alleen openbare forums"
msgid "This Website Only"
msgstr "Alleen deze hub"
+#: ../../include/enotify.php:57 ../../include/network.php:1827
+msgid "$Projectname Notification"
+msgstr "$Projectname-notificatie"
+
+#: ../../include/enotify.php:58 ../../include/network.php:1828
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../include/enotify.php:60 ../../include/network.php:1830
+msgid "Thank You,"
+msgstr "Bedankt,"
+
+#: ../../include/enotify.php:62 ../../include/network.php:1832
+#, php-format
+msgid "%s Administrator"
+msgstr "Beheerder %s"
+
#: ../../include/enotify.php:96
#, php-format
msgid "%s <!item_type!>"
@@ -8385,6 +8631,53 @@ msgstr "Kanalen die zich in geen enkele privacygroep bevinden"
msgid "add"
msgstr "toevoegen"
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:813
+#: ../../include/bbcode.php:816 ../../include/bbcode.php:821
+#: ../../include/bbcode.php:824 ../../include/bbcode.php:827
+#: ../../include/bbcode.php:830 ../../include/bbcode.php:835
+#: ../../include/bbcode.php:838 ../../include/bbcode.php:843
+#: ../../include/bbcode.php:846 ../../include/bbcode.php:849
+#: ../../include/bbcode.php:852
+msgid "Image/photo"
+msgstr "Afbeelding/foto"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:863
+msgid "Encrypted content"
+msgstr "Versleutelde inhoud"
+
+#: ../../include/bbcode.php:179
+#, php-format
+msgid "Install %s element: "
+msgstr "Installeer %s-element: "
+
+#: ../../include/bbcode.php:183
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."
+
+#: ../../include/bbcode.php:255
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schreef het volgende %2$s %3$s"
+
+#: ../../include/bbcode.php:333 ../../include/bbcode.php:341
+msgid "Click to open/close"
+msgstr "Klik om te openen of te sluiten"
+
+#: ../../include/bbcode.php:341
+msgid "spoiler"
+msgstr "spoiler"
+
+#: ../../include/bbcode.php:556
+msgid "Different viewers will see this text differently"
+msgstr "Deze tekst wordt per persoon anders weergeven."
+
+#: ../../include/bbcode.php:801
+msgid "$1 wrote:"
+msgstr "$1 schreef:"
+
#: ../../include/items.php:1138 ../../include/items.php:1183
msgid "(Unknown)"
msgstr "(Onbekend)"
@@ -8439,32 +8732,13 @@ msgstr "Connectie niet gevonden."
msgid "profile photo"
msgstr "profielfoto"
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
-
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr "Afbeeldingsbestand is leeg"
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr "Foto kan niet worden opgeslagen"
-
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr "een nieuwe foto"
-
-#: ../../include/photos.php:301
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s plaatste %2$s op %3$s"
+#: ../../include/network.php:659
+msgid "view full size"
+msgstr "volledige grootte tonen"
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
-msgstr "Nieuwe foto's uploaden"
+#: ../../include/network.php:1889
+msgid "No Subject"
+msgstr "Geen onderwerp"
#: ../../include/widgets.php:103
msgid "System"
@@ -8563,15 +8837,15 @@ msgstr "Privéberichten"
msgid "Combined View"
msgstr "Gecombineerd postvak"
-#: ../../include/widgets.php:609 ../../include/nav.php:199
+#: ../../include/widgets.php:609 ../../include/nav.php:196
msgid "Inbox"
msgstr "Postvak IN"
-#: ../../include/widgets.php:614 ../../include/nav.php:200
+#: ../../include/widgets.php:614 ../../include/nav.php:197
msgid "Outbox"
msgstr "Postvak UIT"
-#: ../../include/widgets.php:619 ../../include/nav.php:201
+#: ../../include/widgets.php:619 ../../include/nav.php:198
msgid "New Message"
msgstr "Nieuw bericht"
@@ -8703,7 +8977,7 @@ msgstr "Inspecteer berichtenwachtrij"
msgid "DB updates"
msgstr "Database-updates"
-#: ../../include/widgets.php:1368 ../../include/nav.php:219
+#: ../../include/widgets.php:1368 ../../include/nav.php:216
msgid "Admin"
msgstr "Beheer"
@@ -8876,55 +9150,11 @@ msgstr " "
msgid "timeago.numbers"
msgstr "timeago.numbers"
-#: ../../include/js_strings.php:45 ../../include/text.php:1210
-msgid "January"
-msgstr "januari"
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1210
-msgid "February"
-msgstr "februari"
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1210
-msgid "March"
-msgstr "maart"
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1210
-msgid "April"
-msgstr "april"
-
#: ../../include/js_strings.php:49
msgctxt "long"
msgid "May"
msgstr "mei"
-#: ../../include/js_strings.php:50 ../../include/text.php:1210
-msgid "June"
-msgstr "juni"
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1210
-msgid "July"
-msgstr "juli"
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1210
-msgid "August"
-msgstr "augustus"
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1210
-msgid "September"
-msgstr "september"
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1210
-msgid "October"
-msgstr "oktober"
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1210
-msgid "November"
-msgstr "november"
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1210
-msgid "December"
-msgstr "december"
-
#: ../../include/js_strings.php:57
msgid "Jan"
msgstr "jan"
@@ -8974,34 +9204,6 @@ msgstr "nov"
msgid "Dec"
msgstr "dec"
-#: ../../include/js_strings.php:69 ../../include/text.php:1206
-msgid "Sunday"
-msgstr "zondag"
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1206
-msgid "Monday"
-msgstr "maandag"
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1206
-msgid "Tuesday"
-msgstr "dinsdag"
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1206
-msgid "Wednesday"
-msgstr "woensdag"
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1206
-msgid "Thursday"
-msgstr "donderdag"
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1206
-msgid "Friday"
-msgstr "vrijdag"
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1206
-msgid "Saturday"
-msgstr "zaterdag"
-
#: ../../include/js_strings.php:76
msgid "Sun"
msgstr "zo"
@@ -9071,14 +9273,166 @@ msgstr "Afzender kan niet bepaald worden."
msgid "Stored post could not be verified."
msgstr "Opgeslagen bericht kon niet worden geverifieerd."
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614
+msgid "Logout"
+msgstr "Uitloggen"
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
+#: ../../include/nav.php:82 ../../include/nav.php:113
+msgid "End this session"
+msgstr "Beëindig deze sessie"
+
+#: ../../include/nav.php:85 ../../include/nav.php:144
+msgid "Home"
+msgstr "Home"
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Jouw kanaal"
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Jouw profielpagina"
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Beheer/wijzig profielen"
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Jouw profiel bewerken"
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Jouw foto's"
+
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr "Jouw bestanden"
+
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
+msgstr "Jouw chatkanalen"
+
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
+msgstr "Jouw bladwijzers"
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr "Jouw webpagina's"
+
+#: ../../include/nav.php:110
+msgid "Sign in"
+msgstr "Inloggen"
+
+#: ../../include/nav.php:127
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - klik om uit te loggen"
+
+#: ../../include/nav.php:130
+msgid "Remote authentication"
+msgstr "Authenticatie op afstand"
+
+#: ../../include/nav.php:130
+msgid "Click to authenticate to your home hub"
+msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
+
+#: ../../include/nav.php:144
+msgid "Home Page"
+msgstr "Homepage"
+
+#: ../../include/nav.php:147
+msgid "Create an account"
+msgstr "Maak een account aan"
+
+#: ../../include/nav.php:159
+msgid "Help and documentation"
+msgstr "Hulp en documentatie"
+
+#: ../../include/nav.php:163
+msgid "Applications, utilities, links, games"
+msgstr "Apps"
+
+#: ../../include/nav.php:165
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie "
+
+#: ../../include/nav.php:167
+msgid "Channel Directory"
+msgstr "Kanalengids"
+
+#: ../../include/nav.php:179
+msgid "Your grid"
+msgstr "Jouw grid"
+
+#: ../../include/nav.php:180
+msgid "Mark all grid notifications seen"
+msgstr "Markeer alle gridnotificaties als bekeken"
+
+#: ../../include/nav.php:182
+msgid "Channel home"
+msgstr "Jouw kanaal"
+
+#: ../../include/nav.php:183
+msgid "Mark all channel notifications seen"
+msgstr "Alle kanaalnotificaties als gelezen markeren"
+
+#: ../../include/nav.php:189
+msgid "Notices"
+msgstr "Notificaties"
+
+#: ../../include/nav.php:189
+msgid "Notifications"
+msgstr "Notificaties"
+
+#: ../../include/nav.php:190
+msgid "See all notifications"
+msgstr "Alle notificaties weergeven"
+
+#: ../../include/nav.php:193
+msgid "Private mail"
+msgstr "Privéberichten"
+
+#: ../../include/nav.php:194
+msgid "See all private messages"
+msgstr "Alle privéberichten weergeven"
+
+#: ../../include/nav.php:195
+msgid "Mark all private messages seen"
+msgstr "Markeer alle privéberichten als bekeken"
+
+#: ../../include/nav.php:201
+msgid "Event Calendar"
+msgstr "Agenda"
+
+#: ../../include/nav.php:202
+msgid "See all events"
+msgstr "Alle gebeurtenissen weergeven"
+
+#: ../../include/nav.php:203
+msgid "Mark all events seen"
+msgstr "Markeer alle gebeurtenissen als bekeken"
+
+#: ../../include/nav.php:206
+msgid "Manage Your Channels"
+msgstr "Beheer je kanalen"
+
+#: ../../include/nav.php:208
+msgid "Account/Channel Settings"
+msgstr "Account-/kanaal-instellingen"
+
+#: ../../include/nav.php:216
+msgid "Site Setup and Configuration"
+msgstr "Hub instellen en beheren"
+
+#: ../../include/nav.php:252
+msgid "@name, #tag, ?doc, content"
+msgstr "@kanaal, #tag, inhoud, ?hulp"
+
+#: ../../include/nav.php:253
+msgid "Please wait..."
+msgstr "Wachten aub..."
#: ../../include/oembed.php:267
msgid "Embedded content"
@@ -9237,400 +9591,32 @@ msgstr "Speciaal - Groepsopslag"
msgid "Custom/Expert Mode"
msgstr "Expertmodus/handmatig aanpassen"
-#: ../../include/text.php:394
-msgid "prev"
-msgstr "vorige"
-
-#: ../../include/text.php:396
-msgid "first"
-msgstr "eerste"
-
-#: ../../include/text.php:425
-msgid "last"
-msgstr "laatste"
-
-#: ../../include/text.php:428
-msgid "next"
-msgstr "volgende"
-
-#: ../../include/text.php:438
-msgid "older"
-msgstr "ouder"
-
-#: ../../include/text.php:440
-msgid "newer"
-msgstr "nieuwer"
-
-#: ../../include/text.php:822
-msgid "No connections"
-msgstr "Geen connecties"
-
-#: ../../include/text.php:847
-#, php-format
-msgid "View all %s connections"
-msgstr "Toon alle %s connecties"
-
-#: ../../include/text.php:992 ../../include/text.php:997
-msgid "poke"
-msgstr "aanstoten"
-
-#: ../../include/text.php:998
-msgid "ping"
-msgstr "ping"
-
-#: ../../include/text.php:998
-msgid "pinged"
-msgstr "gepingd"
-
-#: ../../include/text.php:999
-msgid "prod"
-msgstr "por"
-
-#: ../../include/text.php:999
-msgid "prodded"
-msgstr "gepord"
-
-#: ../../include/text.php:1000
-msgid "slap"
-msgstr "slaan"
-
-#: ../../include/text.php:1000
-msgid "slapped"
-msgstr "sloeg"
-
-#: ../../include/text.php:1001
-msgid "finger"
-msgstr "finger"
-
-#: ../../include/text.php:1001
-msgid "fingered"
-msgstr "gefingerd"
-
-#: ../../include/text.php:1002
-msgid "rebuff"
-msgstr "afpoeieren"
-
-#: ../../include/text.php:1002
-msgid "rebuffed"
-msgstr "afgepoeierd"
-
-#: ../../include/text.php:1014
-msgid "happy"
-msgstr "gelukkig"
-
-#: ../../include/text.php:1015
-msgid "sad"
-msgstr "bedroefd"
-
-#: ../../include/text.php:1016
-msgid "mellow"
-msgstr "mellow"
-
-#: ../../include/text.php:1017
-msgid "tired"
-msgstr "moe"
-
-#: ../../include/text.php:1018
-msgid "perky"
-msgstr "parmantig"
-
-#: ../../include/text.php:1019
-msgid "angry"
-msgstr "boos"
-
-#: ../../include/text.php:1020
-msgid "stupefied"
-msgstr "verbijsterd"
-
-#: ../../include/text.php:1021
-msgid "puzzled"
-msgstr "verward"
-
-#: ../../include/text.php:1022
-msgid "interested"
-msgstr "geïnteresseerd"
-
-#: ../../include/text.php:1023
-msgid "bitter"
-msgstr "verbitterd"
-
-#: ../../include/text.php:1024
-msgid "cheerful"
-msgstr "vrolijk"
-
-#: ../../include/text.php:1025
-msgid "alive"
-msgstr "levendig"
-
-#: ../../include/text.php:1026
-msgid "annoyed"
-msgstr "geërgerd"
-
-#: ../../include/text.php:1027
-msgid "anxious"
-msgstr "bezorgd"
-
-#: ../../include/text.php:1028
-msgid "cranky"
-msgstr "humeurig"
-
-#: ../../include/text.php:1029
-msgid "disturbed"
-msgstr "verontrust"
-
-#: ../../include/text.php:1030
-msgid "frustrated"
-msgstr "gefrustreerd "
-
-#: ../../include/text.php:1031
-msgid "depressed"
-msgstr "gedeprimeerd"
-
-#: ../../include/text.php:1032
-msgid "motivated"
-msgstr "gemotiveerd"
-
-#: ../../include/text.php:1033
-msgid "relaxed"
-msgstr "ontspannen"
-
-#: ../../include/text.php:1034
-msgid "surprised"
-msgstr "verrast"
-
-#: ../../include/text.php:1210
-msgid "May"
-msgstr "mei"
-
-#: ../../include/text.php:1287 ../../include/text.php:1291
-msgid "Unknown Attachment"
-msgstr "Onbekende bijlage"
-
-#: ../../include/text.php:1293
-msgid "unknown"
-msgstr "onbekend"
-
-#: ../../include/text.php:1329
-msgid "remove category"
-msgstr "categorie verwijderen"
-
-#: ../../include/text.php:1406
-msgid "remove from file"
-msgstr "uit map verwijderen"
-
-#: ../../include/text.php:1548 ../../include/text.php:1559
-msgid "Click to open/close"
-msgstr "Klik om te openen of te sluiten"
-
-#: ../../include/text.php:1764 ../../include/text.php:1836
-msgid "default"
-msgstr "standaard"
-
-#: ../../include/text.php:1772
-msgid "Page layout"
-msgstr "Pagina-lay-out"
-
-#: ../../include/text.php:1772
-msgid "You can create your own with the layouts tool"
-msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
-
-#: ../../include/text.php:1814
-msgid "Page content type"
-msgstr "Opmaaktype pagina"
-
-#: ../../include/text.php:1848
-msgid "Select an alternate language"
-msgstr "Kies een andere taal"
-
-#: ../../include/text.php:1980
-msgid "activity"
-msgstr "activiteit"
-
-#: ../../include/text.php:2275
-msgid "Design Tools"
-msgstr "Ontwerp-hulpmiddelen"
-
-#: ../../include/text.php:2281
-msgid "Pages"
-msgstr "Pagina's"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1601
-msgid "Logout"
-msgstr "Uitloggen"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr "Beëindig deze sessie"
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr "Home"
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Jouw kanaal"
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "Jouw profielpagina"
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "Beheer/wijzig profielen"
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Jouw profiel bewerken"
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Jouw foto's"
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Jouw bestanden"
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr "Jouw chatkanalen"
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr "Jouw bladwijzers"
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr "Jouw webpagina's"
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr "Inloggen"
-
-#: ../../include/nav.php:127
+#: ../../include/photos.php:112
#, php-format
-msgid "%s - click to logout"
-msgstr "%s - klik om uit te loggen"
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr "Authenticatie op afstand"
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr "Homepage"
-
-#: ../../include/nav.php:148
-msgid "Create an account"
-msgstr "Maak een account aan"
-
-#: ../../include/nav.php:161
-msgid "Help and documentation"
-msgstr "Hulp en documentatie"
-
-#: ../../include/nav.php:165
-msgid "Applications, utilities, links, games"
-msgstr "Apps"
-
-#: ../../include/nav.php:167
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie "
-
-#: ../../include/nav.php:170
-msgid "Channel Directory"
-msgstr "Kanalengids"
-
-#: ../../include/nav.php:182
-msgid "Your grid"
-msgstr "Jouw grid"
-
-#: ../../include/nav.php:183
-msgid "Mark all grid notifications seen"
-msgstr "Markeer alle gridnotificaties als bekeken"
-
-#: ../../include/nav.php:185
-msgid "Channel home"
-msgstr "Jouw kanaal"
-
-#: ../../include/nav.php:186
-msgid "Mark all channel notifications seen"
-msgstr "Alle kanaalnotificaties als gelezen markeren"
-
-#: ../../include/nav.php:192
-msgid "Notices"
-msgstr "Notificaties"
-
-#: ../../include/nav.php:192
-msgid "Notifications"
-msgstr "Notificaties"
-
-#: ../../include/nav.php:193
-msgid "See all notifications"
-msgstr "Alle notificaties weergeven"
-
-#: ../../include/nav.php:196
-msgid "Private mail"
-msgstr "Privéberichten"
-
-#: ../../include/nav.php:197
-msgid "See all private messages"
-msgstr "Alle privéberichten weergeven"
-
-#: ../../include/nav.php:198
-msgid "Mark all private messages seen"
-msgstr "Markeer alle privéberichten als bekeken"
-
-#: ../../include/nav.php:204
-msgid "Event Calendar"
-msgstr "Agenda"
-
-#: ../../include/nav.php:205
-msgid "See all events"
-msgstr "Alle gebeurtenissen weergeven"
-
-#: ../../include/nav.php:206
-msgid "Mark all events seen"
-msgstr "Markeer alle gebeurtenissen als bekeken"
-
-#: ../../include/nav.php:209
-msgid "Manage Your Channels"
-msgstr "Beheer je kanalen"
-
-#: ../../include/nav.php:211
-msgid "Account/Channel Settings"
-msgstr "Account-/kanaal-instellingen"
-
-#: ../../include/nav.php:219
-msgid "Site Setup and Configuration"
-msgstr "Hub instellen en beheren"
-
-#: ../../include/nav.php:261
-msgid "@name, #tag, ?doc, content"
-msgstr "@kanaal, #tag, inhoud, ?hulp"
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
-#: ../../include/nav.php:262
-msgid "Please wait..."
-msgstr "Wachten aub..."
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr "Afbeeldingsbestand is leeg"
-#: ../../include/zot.php:680
-msgid "Invalid data packet"
-msgstr "Datapakket ongeldig"
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr "Foto kan niet worden opgeslagen"
-#: ../../include/zot.php:696
-msgid "Unable to verify channel signature"
-msgstr "Kanaalkenmerk kon niet worden geverifieerd. "
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr "een nieuwe foto"
-#: ../../include/zot.php:2332
+#: ../../include/photos.php:301
#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s plaatste %2$s op %3$s"
-#: ../../include/zot.php:3670
-msgid "invalid target signature"
-msgstr "ongeldig doelkenmerk"
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Nieuwe foto's uploaden"
#: ../../view/theme/redbasic/php/config.php:82
msgid "Focus (Hubzilla default)"
@@ -9789,41 +9775,41 @@ msgstr "Update %s mislukt. Zie foutenlogboek."
msgid "Update Error at %s"
msgstr "Update-fout op %s"
-#: ../../boot.php:1583
+#: ../../boot.php:1596
msgid ""
"Create an account to access services and applications within the Hubzilla"
msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla"
-#: ../../boot.php:1605
+#: ../../boot.php:1618
msgid "Password"
msgstr "Wachtwoord"
-#: ../../boot.php:1606
+#: ../../boot.php:1619
msgid "Remember me"
msgstr "Aangemeld blijven"
-#: ../../boot.php:1609
+#: ../../boot.php:1622
msgid "Forgot your password?"
msgstr "Wachtwoord vergeten?"
-#: ../../boot.php:2238
+#: ../../boot.php:2251
msgid "toggle mobile"
msgstr "mobiele weergave omschakelen"
-#: ../../boot.php:2391
+#: ../../boot.php:2404
msgid "Website SSL certificate is not valid. Please correct."
msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."
-#: ../../boot.php:2394
+#: ../../boot.php:2407
#, php-format
msgid "[hubzilla] Website SSL error for %s"
msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
-#: ../../boot.php:2431
+#: ../../boot.php:2444
msgid "Cron/Scheduled tasks not running."
msgstr "Cron is niet actief"
-#: ../../boot.php:2435
+#: ../../boot.php:2448
#, php-format
msgid "[hubzilla] Cron tasks not running on %s"
msgstr "[hubzilla] Cron-taken zijn niet actief op %s"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index 72fc4d2e1..197756606 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -152,8 +152,6 @@ App::$strings["Block communications from these channels"] = "Communicatie met de
App::$strings["Allow embedded HTML content only from these domains"] = "Alleen ingesloten (embedded) HTML vanaf deze domeinen toestaan";
App::$strings["One site per line. Leave empty to allow from any site by default"] = "Eén per regel. Laat leeg om standaard vanaf elk domein toe te staan";
App::$strings["Block embedded HTML from these domains"] = "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren";
-App::$strings["Cooperative embed security"] = "Met elkaar ingesloten (embedded) HTML beveiligen";
-App::$strings["Enable to share embed security with other compatible sites/hubs"] = "Beveiliging omtrent ingesloten (embedded) HTML met andere compatibele hubs delen.";
App::$strings["Update has been marked successful"] = "Update is als succesvol gemarkeerd";
App::$strings["Executing %s failed. Check system logs."] = "Uitvoeren van %s is mislukt. Controleer systeemlogboek.";
App::$strings["Update %s was successfully applied."] = "Update %s was geslaagd.";
@@ -428,6 +426,7 @@ App::$strings["Connection requests will be approved without your interaction"] =
App::$strings["This connection's primary address is"] = "Het primaire kanaaladres van deze connectie is";
App::$strings["Available locations:"] = "Beschikbare locaties:";
App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast.";
+App::$strings["Connection Tools"] = "Hulpmiddelen";
App::$strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag";
App::$strings["Rating"] = "Beoordeling";
App::$strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven";
@@ -523,25 +522,25 @@ App::$strings["Italic"] = "Cursief";
App::$strings["Underline"] = "Onderstrepen";
App::$strings["Quote"] = "Citeren";
App::$strings["Code"] = "Broncode";
-App::$strings["Upload photo"] = "Foto uploaden";
App::$strings["Attach file"] = "Bestand toevoegen";
-App::$strings["Insert YouTube video"] = "YouTube-video invoegen";
-App::$strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen";
-App::$strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen";
-App::$strings["Set your location"] = "Locatie instellen";
-App::$strings["Clear browser location"] = "Locatie van webbrowser wissen";
-App::$strings["Please wait"] = "Even wachten";
App::$strings["Permission settings"] = "Permissies";
App::$strings["Public post"] = "Openbaar bericht";
App::$strings["Title (optional)"] = "Titel (optioneel)";
App::$strings["Categories (optional, comma-separated list)"] = "Categorieën (optioneel, door komma's gescheiden lijst)";
App::$strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be";
App::$strings["Preview"] = "Voorvertoning";
-App::$strings["Set expiration date"] = "Verloopdatum instellen";
App::$strings["Edit Block"] = "Blok bewerken";
App::$strings["Delete layout?"] = "Lay-out verwijderen?";
+App::$strings["Upload photo"] = "Foto uploaden";
+App::$strings["Insert YouTube video"] = "YouTube-video invoegen";
+App::$strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen";
+App::$strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen";
+App::$strings["Set your location"] = "Locatie instellen";
+App::$strings["Clear browser location"] = "Locatie van webbrowser wissen";
+App::$strings["Please wait"] = "Even wachten";
App::$strings["Layout Description (Optional)"] = "Lay-out-omschrijving (optioneel)";
App::$strings["Layout Name"] = "Naam lay-out";
+App::$strings["Set expiration date"] = "Verloopdatum instellen";
App::$strings["Edit Layout"] = "Lay-out bewerken";
App::$strings["Item is not editable"] = "Item is niet te bewerken";
App::$strings["Expires YYYY-MM-DD HH:MM"] = "Verloopt op DD-MM-YYYY om HH:MM";
@@ -938,6 +937,7 @@ App::$strings["__ctx:noun__ Dislike"] = array(
0 => "vindt dit niet leuk",
1 => "vinden dit niet leuk",
);
+App::$strings["Photo Tools"] = "Hulpmiddelen";
App::$strings["In This Photo:"] = "Op deze foto:";
App::$strings["Map"] = "Kaart";
App::$strings["__ctx:noun__ Likes"] = "vinden dit leuk";
@@ -982,6 +982,7 @@ App::$strings["Hide your connections list from viewers of this profile"] = "Laat
App::$strings["Edit Profile Details"] = "Profiel bewerken";
App::$strings["View this profile"] = "Profiel weergeven";
App::$strings["Edit visibility"] = "Zichtbaarheid bewerken";
+App::$strings["Profile Tools"] = "Hulpmiddelen";
App::$strings["Change cover photo"] = "Omslagfoto wijzigen";
App::$strings["Change profile photo"] = "Profielfoto veranderen";
App::$strings["Create a new profile using these settings"] = "Een nieuw profiel aanmaken met dit profiel als basis";
@@ -1573,7 +1574,85 @@ App::$strings["public profile"] = "openbaar profiel";
App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s veranderde %2\$s naar &ldquo;%3\$s&rdquo;";
App::$strings["Visit %1\$s's %2\$s"] = "Bezoek het %2\$s van %1\$s";
App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s heeft een aangepaste %2\$s, %3\$s veranderd.";
-App::$strings["Public Timeline"] = "Openbare tijdlijn";
+App::$strings["prev"] = "vorige";
+App::$strings["first"] = "eerste";
+App::$strings["last"] = "laatste";
+App::$strings["next"] = "volgende";
+App::$strings["older"] = "ouder";
+App::$strings["newer"] = "nieuwer";
+App::$strings["No connections"] = "Geen connecties";
+App::$strings["View all %s connections"] = "Toon alle %s connecties";
+App::$strings["poke"] = "aanstoten";
+App::$strings["poked"] = "aangestoten";
+App::$strings["ping"] = "ping";
+App::$strings["pinged"] = "gepingd";
+App::$strings["prod"] = "por";
+App::$strings["prodded"] = "gepord";
+App::$strings["slap"] = "slaan";
+App::$strings["slapped"] = "sloeg";
+App::$strings["finger"] = "finger";
+App::$strings["fingered"] = "gefingerd";
+App::$strings["rebuff"] = "afpoeieren";
+App::$strings["rebuffed"] = "afgepoeierd";
+App::$strings["happy"] = "gelukkig";
+App::$strings["sad"] = "bedroefd";
+App::$strings["mellow"] = "mellow";
+App::$strings["tired"] = "moe";
+App::$strings["perky"] = "parmantig";
+App::$strings["angry"] = "boos";
+App::$strings["stupefied"] = "verbijsterd";
+App::$strings["puzzled"] = "verward";
+App::$strings["interested"] = "geïnteresseerd";
+App::$strings["bitter"] = "verbitterd";
+App::$strings["cheerful"] = "vrolijk";
+App::$strings["alive"] = "levendig";
+App::$strings["annoyed"] = "geërgerd";
+App::$strings["anxious"] = "bezorgd";
+App::$strings["cranky"] = "humeurig";
+App::$strings["disturbed"] = "verontrust";
+App::$strings["frustrated"] = "gefrustreerd ";
+App::$strings["depressed"] = "gedeprimeerd";
+App::$strings["motivated"] = "gemotiveerd";
+App::$strings["relaxed"] = "ontspannen";
+App::$strings["surprised"] = "verrast";
+App::$strings["Monday"] = "maandag";
+App::$strings["Tuesday"] = "dinsdag";
+App::$strings["Wednesday"] = "woensdag";
+App::$strings["Thursday"] = "donderdag";
+App::$strings["Friday"] = "vrijdag";
+App::$strings["Saturday"] = "zaterdag";
+App::$strings["Sunday"] = "zondag";
+App::$strings["January"] = "januari";
+App::$strings["February"] = "februari";
+App::$strings["March"] = "maart";
+App::$strings["April"] = "april";
+App::$strings["May"] = "mei";
+App::$strings["June"] = "juni";
+App::$strings["July"] = "juli";
+App::$strings["August"] = "augustus";
+App::$strings["September"] = "september";
+App::$strings["October"] = "oktober";
+App::$strings["November"] = "november";
+App::$strings["December"] = "december";
+App::$strings["Unknown Attachment"] = "Onbekende bijlage";
+App::$strings["unknown"] = "onbekend";
+App::$strings["remove category"] = "categorie verwijderen";
+App::$strings["remove from file"] = "uit map verwijderen";
+App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+App::$strings["Starts:"] = "Start:";
+App::$strings["Finishes:"] = "Einde:";
+App::$strings["default"] = "standaard";
+App::$strings["Page layout"] = "Pagina-lay-out";
+App::$strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
+App::$strings["Page content type"] = "Opmaaktype pagina";
+App::$strings["Select an alternate language"] = "Kies een andere taal";
+App::$strings["activity"] = "activiteit";
+App::$strings["Design Tools"] = "Ontwerp-hulpmiddelen";
+App::$strings["Pages"] = "Pagina's";
+App::$strings["Invalid data packet"] = "Datapakket ongeldig";
+App::$strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. ";
+App::$strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
+App::$strings["invalid target signature"] = "ongeldig doelkenmerk";
App::$strings["Site Admin"] = "Hubbeheerder";
App::$strings["Bookmarks"] = "Bladwijzers";
App::$strings["Address Book"] = "Connecties";
@@ -1592,28 +1671,12 @@ App::$strings["Features"] = "Extra functies";
App::$strings["Post"] = "Bericht";
App::$strings["Install"] = "Installeren";
App::$strings["Purchase"] = "Aanschaffen";
-App::$strings["view full size"] = "volledige grootte tonen";
-App::$strings["\$Projectname Notification"] = "\$Projectname-notificatie";
-App::$strings["\$projectname"] = "\$projectname";
-App::$strings["Thank You,"] = "Bedankt,";
-App::$strings["%s Administrator"] = "Beheerder %s";
-App::$strings["No Subject"] = "Geen onderwerp";
+App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
+App::$strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
App::$strings["Attachments:"] = "Bijlagen:";
-App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
App::$strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
-App::$strings["Starts:"] = "Start:";
-App::$strings["Finishes:"] = "Einde:";
-App::$strings["Image/photo"] = "Afbeelding/foto";
-App::$strings["Encrypted content"] = "Versleutelde inhoud";
-App::$strings["Install %s element: "] = "Installeer %s-element: ";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
-App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
-App::$strings["$1 spoiler"] = "$1 spoiler";
-App::$strings["$1 wrote:"] = "$1 schreef:";
App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden";
App::$strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten";
-App::$strings["poked"] = "aangestoten";
App::$strings["View %s's profile @ %s"] = "Bekijk het profiel van %s @ %s";
App::$strings["Categories:"] = "Categorieën:";
App::$strings["Filed under:"] = "Bewaard onder:";
@@ -1718,6 +1781,7 @@ App::$strings["User '%s' deleted"] = "Account '%s' verwijderd";
App::$strings["Logged out."] = "Uitgelogd.";
App::$strings["Failed authentication"] = "Mislukte authenticatie";
App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. ";
+App::$strings["Public Timeline"] = "Openbare tijdlijn";
App::$strings["Frequently"] = "Regelmatig";
App::$strings["Hourly"] = "Elk uur";
App::$strings["Twice daily"] = "Twee keer per dag";
@@ -1808,6 +1872,10 @@ App::$strings["Directory Options"] = "Opties kanalengids";
App::$strings["Safe Mode"] = "Veilig zoeken";
App::$strings["Public Forums Only"] = "Alleen openbare forums";
App::$strings["This Website Only"] = "Alleen deze hub";
+App::$strings["\$Projectname Notification"] = "\$Projectname-notificatie";
+App::$strings["\$projectname"] = "\$projectname";
+App::$strings["Thank You,"] = "Bedankt,";
+App::$strings["%s Administrator"] = "Beheerder %s";
App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
App::$strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
@@ -1932,6 +2000,15 @@ App::$strings["Edit group"] = "Privacygroep bewerken";
App::$strings["Add privacy group"] = "Privacygroep toevoegen";
App::$strings["Channels not in any privacy group"] = "Kanalen die zich in geen enkele privacygroep bevinden";
App::$strings["add"] = "toevoegen";
+App::$strings["Image/photo"] = "Afbeelding/foto";
+App::$strings["Encrypted content"] = "Versleutelde inhoud";
+App::$strings["Install %s element: "] = "Installeer %s-element: ";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
+App::$strings["Click to open/close"] = "Klik om te openen of te sluiten";
+App::$strings["spoiler"] = "spoiler";
+App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
+App::$strings["$1 wrote:"] = "$1 schreef:";
App::$strings["(Unknown)"] = "(Onbekend)";
App::$strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
App::$strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
@@ -1945,12 +2022,8 @@ App::$strings["Privacy group is empty."] = "Privacygroep is leeg";
App::$strings["Privacy group: %s"] = "Privacygroep: %s";
App::$strings["Connection not found."] = "Connectie niet gevonden.";
App::$strings["profile photo"] = "profielfoto";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
-App::$strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
-App::$strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
-App::$strings["a new photo"] = "een nieuwe foto";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s";
-App::$strings["Upload New Photos"] = "Nieuwe foto's uploaden";
+App::$strings["view full size"] = "volledige grootte tonen";
+App::$strings["No Subject"] = "Geen onderwerp";
App::$strings["System"] = "Systeem";
App::$strings["Create Personal App"] = "Persoonlijke app maken";
App::$strings["Edit Personal App"] = "Persoonlijke app bewerken";
@@ -2052,18 +2125,7 @@ App::$strings["about a year"] = "ongeveer een jaar";
App::$strings["%d years"] = "%d jaren";
App::$strings[" "] = " ";
App::$strings["timeago.numbers"] = "timeago.numbers";
-App::$strings["January"] = "januari";
-App::$strings["February"] = "februari";
-App::$strings["March"] = "maart";
-App::$strings["April"] = "april";
App::$strings["__ctx:long__ May"] = "mei";
-App::$strings["June"] = "juni";
-App::$strings["July"] = "juli";
-App::$strings["August"] = "augustus";
-App::$strings["September"] = "september";
-App::$strings["October"] = "oktober";
-App::$strings["November"] = "november";
-App::$strings["December"] = "december";
App::$strings["Jan"] = "jan";
App::$strings["Feb"] = "feb";
App::$strings["Mar"] = "mrt";
@@ -2076,13 +2138,6 @@ App::$strings["Sep"] = "sep";
App::$strings["Oct"] = "okt";
App::$strings["Nov"] = "nov";
App::$strings["Dec"] = "dec";
-App::$strings["Sunday"] = "zondag";
-App::$strings["Monday"] = "maandag";
-App::$strings["Tuesday"] = "dinsdag";
-App::$strings["Wednesday"] = "woensdag";
-App::$strings["Thursday"] = "donderdag";
-App::$strings["Friday"] = "vrijdag";
-App::$strings["Saturday"] = "zaterdag";
App::$strings["Sun"] = "zo";
App::$strings["Mon"] = "ma";
App::$strings["Tue"] = "di";
@@ -2099,101 +2154,6 @@ App::$strings["No recipient provided."] = "Geen ontvanger opgegeven.";
App::$strings["[no subject]"] = "[geen onderwerp]";
App::$strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
App::$strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
-App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
-App::$strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
-App::$strings["Embedded content"] = "Ingesloten (embedded) inhoud";
-App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld";
-App::$strings["New Page"] = "Nieuwe pagina";
-App::$strings["Title"] = "Titel";
-App::$strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken";
-App::$strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken";
-App::$strings["Can view my connections"] = "Kan een lijst met mijn connecties bekijken";
-App::$strings["Can view my file storage and photos"] = "Kan mijn foto's en andere bestanden bekijken";
-App::$strings["Can view my webpages"] = "Kan mijn pagina's bekijken";
-App::$strings["Can send me their channel stream and posts"] = "Kan mij de inhoud van hun kanaal en berichten sturen";
-App::$strings["Can post on my channel page (\"wall\")"] = "Kan een bericht in mijn kanaal plaatsen";
-App::$strings["Can comment on or like my posts"] = "Kan op mijn berichten reageren of deze (niet) leuk vinden";
-App::$strings["Can send me private mail messages"] = "Kan mij privéberichten sturen";
-App::$strings["Can like/dislike stuff"] = "Kan dingen leuk of niet leuk vinden";
-App::$strings["Profiles and things other than posts/comments"] = "Profielen en dingen, buiten berichten en reacties";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+";
-App::$strings["Advanced - useful for creating group forum channels"] = "Geavanceerd - nuttig voor groepforums";
-App::$strings["Can chat with me (when available)"] = "Kan met mij chatten (wanneer beschikbaar)";
-App::$strings["Can write to my file storage and photos"] = "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen";
-App::$strings["Can edit my webpages"] = "Kan mijn pagina's bewerken";
-App::$strings["Can source my public posts in derived channels"] = "Kan mijn openbare berichten als bron voor andere kanalen gebruiken";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)";
-App::$strings["Can administer my channel resources"] = "Kan mijn kanaal beheren";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet.";
-App::$strings["Social Networking"] = "Sociaal netwerk";
-App::$strings["Social - Mostly Public"] = "Sociaal - Vrijwel alles openbaar";
-App::$strings["Social - Restricted"] = "Sociaal - Beperkt zichtbaar";
-App::$strings["Social - Private"] = "Sociaal - Verborgen kanaal";
-App::$strings["Community Forum"] = "Groepsforum";
-App::$strings["Forum - Mostly Public"] = "Forum - Vrijwel alles openbaar";
-App::$strings["Forum - Restricted"] = "Forum - Beperkt zichtbaar";
-App::$strings["Forum - Private"] = "Forum - Verborgen kanaal";
-App::$strings["Feed Republish"] = "Feed herpubliceren";
-App::$strings["Feed - Mostly Public"] = "Feed - Vrijwel alles openbaar";
-App::$strings["Feed - Restricted"] = "Feed - Beperkt zichtbaar";
-App::$strings["Special Purpose"] = "Speciaal doel";
-App::$strings["Special - Celebrity/Soapbox"] = "Speciaal - Beroemdheid/alleen volgen";
-App::$strings["Special - Group Repository"] = "Speciaal - Groepsopslag";
-App::$strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen";
-App::$strings["prev"] = "vorige";
-App::$strings["first"] = "eerste";
-App::$strings["last"] = "laatste";
-App::$strings["next"] = "volgende";
-App::$strings["older"] = "ouder";
-App::$strings["newer"] = "nieuwer";
-App::$strings["No connections"] = "Geen connecties";
-App::$strings["View all %s connections"] = "Toon alle %s connecties";
-App::$strings["poke"] = "aanstoten";
-App::$strings["ping"] = "ping";
-App::$strings["pinged"] = "gepingd";
-App::$strings["prod"] = "por";
-App::$strings["prodded"] = "gepord";
-App::$strings["slap"] = "slaan";
-App::$strings["slapped"] = "sloeg";
-App::$strings["finger"] = "finger";
-App::$strings["fingered"] = "gefingerd";
-App::$strings["rebuff"] = "afpoeieren";
-App::$strings["rebuffed"] = "afgepoeierd";
-App::$strings["happy"] = "gelukkig";
-App::$strings["sad"] = "bedroefd";
-App::$strings["mellow"] = "mellow";
-App::$strings["tired"] = "moe";
-App::$strings["perky"] = "parmantig";
-App::$strings["angry"] = "boos";
-App::$strings["stupefied"] = "verbijsterd";
-App::$strings["puzzled"] = "verward";
-App::$strings["interested"] = "geïnteresseerd";
-App::$strings["bitter"] = "verbitterd";
-App::$strings["cheerful"] = "vrolijk";
-App::$strings["alive"] = "levendig";
-App::$strings["annoyed"] = "geërgerd";
-App::$strings["anxious"] = "bezorgd";
-App::$strings["cranky"] = "humeurig";
-App::$strings["disturbed"] = "verontrust";
-App::$strings["frustrated"] = "gefrustreerd ";
-App::$strings["depressed"] = "gedeprimeerd";
-App::$strings["motivated"] = "gemotiveerd";
-App::$strings["relaxed"] = "ontspannen";
-App::$strings["surprised"] = "verrast";
-App::$strings["May"] = "mei";
-App::$strings["Unknown Attachment"] = "Onbekende bijlage";
-App::$strings["unknown"] = "onbekend";
-App::$strings["remove category"] = "categorie verwijderen";
-App::$strings["remove from file"] = "uit map verwijderen";
-App::$strings["Click to open/close"] = "Klik om te openen of te sluiten";
-App::$strings["default"] = "standaard";
-App::$strings["Page layout"] = "Pagina-lay-out";
-App::$strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
-App::$strings["Page content type"] = "Opmaaktype pagina";
-App::$strings["Select an alternate language"] = "Kies een andere taal";
-App::$strings["activity"] = "activiteit";
-App::$strings["Design Tools"] = "Ontwerp-hulpmiddelen";
-App::$strings["Pages"] = "Pagina's";
App::$strings["Logout"] = "Uitloggen";
App::$strings["End this session"] = "Beëindig deze sessie";
App::$strings["Home"] = "Home";
@@ -2234,10 +2194,51 @@ App::$strings["Account/Channel Settings"] = "Account-/kanaal-instellingen";
App::$strings["Site Setup and Configuration"] = "Hub instellen en beheren";
App::$strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp";
App::$strings["Please wait..."] = "Wachten aub...";
-App::$strings["Invalid data packet"] = "Datapakket ongeldig";
-App::$strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. ";
-App::$strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
-App::$strings["invalid target signature"] = "ongeldig doelkenmerk";
+App::$strings["Embedded content"] = "Ingesloten (embedded) inhoud";
+App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld";
+App::$strings["New Page"] = "Nieuwe pagina";
+App::$strings["Title"] = "Titel";
+App::$strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken";
+App::$strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken";
+App::$strings["Can view my connections"] = "Kan een lijst met mijn connecties bekijken";
+App::$strings["Can view my file storage and photos"] = "Kan mijn foto's en andere bestanden bekijken";
+App::$strings["Can view my webpages"] = "Kan mijn pagina's bekijken";
+App::$strings["Can send me their channel stream and posts"] = "Kan mij de inhoud van hun kanaal en berichten sturen";
+App::$strings["Can post on my channel page (\"wall\")"] = "Kan een bericht in mijn kanaal plaatsen";
+App::$strings["Can comment on or like my posts"] = "Kan op mijn berichten reageren of deze (niet) leuk vinden";
+App::$strings["Can send me private mail messages"] = "Kan mij privéberichten sturen";
+App::$strings["Can like/dislike stuff"] = "Kan dingen leuk of niet leuk vinden";
+App::$strings["Profiles and things other than posts/comments"] = "Profielen en dingen, buiten berichten en reacties";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+";
+App::$strings["Advanced - useful for creating group forum channels"] = "Geavanceerd - nuttig voor groepforums";
+App::$strings["Can chat with me (when available)"] = "Kan met mij chatten (wanneer beschikbaar)";
+App::$strings["Can write to my file storage and photos"] = "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen";
+App::$strings["Can edit my webpages"] = "Kan mijn pagina's bewerken";
+App::$strings["Can source my public posts in derived channels"] = "Kan mijn openbare berichten als bron voor andere kanalen gebruiken";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)";
+App::$strings["Can administer my channel resources"] = "Kan mijn kanaal beheren";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet.";
+App::$strings["Social Networking"] = "Sociaal netwerk";
+App::$strings["Social - Mostly Public"] = "Sociaal - Vrijwel alles openbaar";
+App::$strings["Social - Restricted"] = "Sociaal - Beperkt zichtbaar";
+App::$strings["Social - Private"] = "Sociaal - Verborgen kanaal";
+App::$strings["Community Forum"] = "Groepsforum";
+App::$strings["Forum - Mostly Public"] = "Forum - Vrijwel alles openbaar";
+App::$strings["Forum - Restricted"] = "Forum - Beperkt zichtbaar";
+App::$strings["Forum - Private"] = "Forum - Verborgen kanaal";
+App::$strings["Feed Republish"] = "Feed herpubliceren";
+App::$strings["Feed - Mostly Public"] = "Feed - Vrijwel alles openbaar";
+App::$strings["Feed - Restricted"] = "Feed - Beperkt zichtbaar";
+App::$strings["Special Purpose"] = "Speciaal doel";
+App::$strings["Special - Celebrity/Soapbox"] = "Speciaal - Beroemdheid/alleen volgen";
+App::$strings["Special - Group Repository"] = "Speciaal - Groepsopslag";
+App::$strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
+App::$strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
+App::$strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
+App::$strings["a new photo"] = "een nieuwe foto";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s";
+App::$strings["Upload New Photos"] = "Nieuwe foto's uploaden";
App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla-standaard)";
App::$strings["Theme settings"] = "Thema-instellingen";
App::$strings["Select scheme"] = "Kies schema van thema";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 290a1a697..c19005f11 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1383,9 +1383,8 @@ img.mail-conv-sender-photo {
-moz-border-radius: $radiuspx;
}
-.profile-thing-list img, .thing-show img, .thing-edit-links a {
- margin-top: 8px;
- margin-right: 15px;
+.thing-show img {
+ margin: 10px;
}
.abook-self {
@@ -1827,8 +1826,29 @@ nav .badge.mail-update:hover {
margin-top:-3px;
}
+dl.bb-dl > dt {
+ /* overriding the default dl style from bootstrap, as bootstrap's
+ style of a bold unindented line followed by a plain unindented
+ line is already acheivable in bbcode without dl */
+ font-weight: normal;
+}
+dl.dl-terms-monospace > dt { font-family: monospace; }
+dl.dl-terms-bold > dt { font-weight: bold; }
+dl.dl-terms-italic > dt { font-style: italic; }
+dl.dl-terms-underline > dt { text-decoration: underline; }
+dl.dl-terms-large > dt { font-size: 120%; }
+dl.bb-dl:not(.dl-horizontal) > dd {
+ display: block;
+ margin-left: 2em;
+}
+dl.bb-dl > dd > li {
+ /* adding some indent so bullet-list items will line up better with
+ dl descriptions if someone wants to be impure and combine them */
+ margin-left: 1em;
+}
+
.bootstrap-tagsinput .tag:before {
- /* Copied from icon-asterisk, is there a better way to do it? */
+ /* Copied from fa-asterisk, is there a better way to do it? */
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 877bcd840..58c2a9ceb 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -17,7 +17,7 @@ $(document).ready(function() {
$('#css3-calc').remove(); // Remove the test element
$('#expand-aside').click(function() {
- $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
+ $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
$('main').toggleClass('region_1-on');
});
@@ -29,7 +29,7 @@ $(document).ready(function() {
if(!$('#tabs-collapse-1').hasClass('in')){
$('html, body').animate({ scrollTop: 0 }, 'slow');
}
- $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
+ $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up');
});
if($('#tabs-collapse-1').length === 0) {
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 471bed5e4..591e820a1 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -433,7 +433,7 @@ input {
border-color: #AC2925 !important;
}
-a:hover > .icon-trash {
+a:hover > .fa-trash-o {
color: #C9302C !important;
}
@@ -450,10 +450,10 @@ a:hover > .icon-trash {
.navbar-inverse .navbar-toggle .icon-bar {
background-color: #FFF;
}
- .navbar-inverse .navbar-toggle .icon-circle-arrow-down, .navbar-inverse .navbar-toggle .icon-circle-arrow-right, .navbar-inverse .navbar-toggle .icon-circle-arrow-up, .navbar-inverse .navbar-toggle .icon-circle-arrow-left {
+ .navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left {
color: #FFF;
}
- .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-left, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-left {
+ .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left {
color: #43488A;
}
.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 74ba6072d..835948096 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -3,7 +3,7 @@
{{if $notself}}
<div class="dropdown pull-right">
<button id="connection-dropdown" class="btn btn-default btn-xs" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <i class="icon-caret-down"></i>&nbsp;{{$tools_label}}
+ <i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu" aria-labelledby="dLabel">
<li><a href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a></li>
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index 88df7481a..e57fdba12 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -16,7 +16,7 @@
</div>
{{/if}}
<div id="acl-wrapper">
- <button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button>
+ <button id="acl-showall" class="btn btn-block btn-default"><i class="fa fa-globe"></i> {{$showall}}</button>
<input type="text" id="acl-search" placeholder="&#xf002;">
<div id="acl-list">
<div id="acl-list-content"></div>
@@ -26,8 +26,8 @@
<div class="acl-list-item" rel="acl-template" style="display:none">
<img data-src="{0}"><p>{1}</p>
- <button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button>
- <button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button>
+ <button class="acl-button-hide btn btn-xs btn-default"><i class="fa fa-times"></i> {{$hide}}</button>
+ <button class="acl-button-show btn btn-xs btn-default"><i class="fa fa-check"></i> {{$show}}</button>
</div>
</div>
<div class="modal-footer clear">
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 8a2f4458a..6db963304 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -34,9 +34,9 @@
<td class='channel_address'>{{$c.channel_address}}</td>
<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
<td class="tools">
- <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
- <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='icon-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
- <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='icon-trash admin-icons'></i></a>
+ <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
+ <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
+ <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
</td>
</tr>
{{/foreach}}
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
index 0da214c17..4b91f9e46 100755
--- a/view/tpl/admin_plugins.tpl
+++ b/view/tpl/admin_plugins.tpl
@@ -5,9 +5,9 @@
{{foreach $plugins as $p}}
<li class='plugin {{$p.1}}'>
{{if ! $p.2.disabled}}
- <a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='{{if $p.1==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i></a>
+ <a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='fa {{if $p.1==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i></a>
{{else}}
- <i class='icon-stop admin-icons'></i>
+ <i class='fa fa-stop admin-icons'></i>
{{/if}}
<a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>{{if $p.2.disabled}} {{$disabled}}{{/if}}
{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index 5d9e233f9..b8cc72a04 100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -1,7 +1,7 @@
<div class = "generic-content-wrapper-styled" id='adminpage'>
<h1>{{$title}} - {{$page}}</h1>
- <p>{{if ! $info.disabled}}<i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i>{{else}}<i class='icon-stop admin-icons'></i>{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a>{{/if}}</p>
+ <p>{{if ! $info.disabled}}<i class='toggleplugin fa {{if $status==on}}fa-check-square-o{{else}}fa-square-o{{/if}} admin-icons'></i>{{else}}<i class='fa fa-stop admin-icons'></i>{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a>{{/if}}</p>
{{if $info.disabled}}
<p>{{$disabled}}</p>
diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl
index dd7250df0..35685505f 100644
--- a/view/tpl/admin_profiles.tpl
+++ b/view/tpl/admin_profiles.tpl
@@ -1,5 +1,5 @@
<div class="generic-content-wrapper">
-<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-xs pull-right" href="admin/profs/new"><i class="icon-plus-sign"></i>&nbsp;{{$new}}</a><h2>{{$title}}</h2>
+<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-xs pull-right" href="admin/profs/new"><i class="fa fa-plus-circle"></i>&nbsp;{{$new}}</a><h2>{{$title}}</h2>
<div class="clear"></div>
</div>
@@ -28,7 +28,7 @@
<table width="100%">
{{foreach $cust_fields as $field}}
-<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-xs" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="icon-trash"></i>&nbsp;{{$drop}}</a> <a class="btn btn-xs" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="icon-pencil"></i></a></td></tr>
+<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-xs" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</a> <a class="btn btn-xs" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="fa fa-pencil"></i></a></td></tr>
{{/foreach}}
</table>
{{/if}}
diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl
index 56b70bbee..35c2e644a 100644
--- a/view/tpl/admin_queue.tpl
+++ b/view/tpl/admin_queue.tpl
@@ -7,7 +7,7 @@
{{foreach $entries as $e}}
-<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-default"><i class="icon-remove"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-default"><i class="icon-trash"></i></a></td>{{/if}}</tr>
+<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-default"><i class="fa fa-times"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-default"><i class="fa fa-trash-o"></i></a></td>{{/if}}</tr>
{{/foreach}}
</table>
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 8a4b772a8..ae77ef24c 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -33,8 +33,8 @@
<td class="email">{{$u.account_email}}</td>
<td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
<td class="tools">
- <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="icon-thumbs-up-alt admin-icons"></i></a>
- <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="icon-thumbs-down-alt admin-icons"></i></a>
+ <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a>
+ <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a>
</td>
</tr>
{{/foreach}}
@@ -73,7 +73,7 @@
<td class="service_class">{{$u.account_service_class}}</td>
<td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
<td class="tools">
- <a href="{{$baseurl}}/admin/users/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="icon-ban-circle admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="icon-trash admin-icons"></i></a>
+ <a href="{{$baseurl}}/admin/users/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a>
</td>
</tr>
{{/foreach}}
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 3394cd2ae..20a1337c7 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -7,16 +7,16 @@
{{if $app.type !== 'system'}}
{{if $purchase}}
<div class="app-purchase">
- <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a>
+ <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
</div>
{{/if}}
{{if $install || $update || $delete }}
<div class="app-tools">
<form action="{{$hosturl}}appman" method="post">
<input type="hidden" name="papp" value="{{$app.papp}}" />
- {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="icon-download-alt" ></i></button>{{/if}}
- {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default" title="{{$edit}}" ><i class="icon-pencil" ></i></button>{{/if}}
- {{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></button>{{/if}}
+ {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down-alt" ></i></button>{{/if}}
+ {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}}
+ {{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}}
</form>
</div>
{{/if}}
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 44d230ae0..965fb4819 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -8,16 +8,16 @@
<div id="attach-edit-tools-share" class="btn-group form-group">
{{if !$isadir}}
<a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}">
- <i class="icon-share jot-icons"></i>
+ <i class="fa fa-share-square-o jot-icons"></i>
</a>
{{/if}}
<button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}">
- <i class="icon-link jot-icons"></i>
+ <i class="fa fa-link jot-icons"></i>
</button>
</div>
<div id="attach-edit-perms" class="btn-group pull-right">
<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
+ <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
</button>
<button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit">
{{$submit}}
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
index 27dbcbf0c..c88d91463 100644
--- a/view/tpl/blocklist.tpl
+++ b/view/tpl/blocklist.tpl
@@ -2,7 +2,7 @@
<div class="section-title-wrapper">
{{if $editor}}
<div class="pull-right">
- <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('block-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
+ <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('block-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
</div>
{{/if}}
<h2>{{$title}}</h2>
@@ -40,17 +40,17 @@
</td>
<td class="webpage-list-tool">
{{if $edit}}
- <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+ <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $item.bb_element}}
- <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+ <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $edit}}
- <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+ <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
{{/if}}
</td>
<td class="hidden-xs">
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index d306f0aa0..1a84f1e66 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -3,11 +3,11 @@
{{if $channel.default_links}}
{{if $channel.default}}
<div>
- <i class="icon-check"></i>&nbsp;{{$msg_default}}
+ <i class="fa fa-check-square-o"></i>&nbsp;{{$msg_default}}
</div>
{{else}}
<a href="manage/{{$channel.channel_id}}/default" class="make-default-link">
- <i class="icon-check-empty"></i>&nbsp;{{$msg_make_default}}
+ <i class="fa fa-square-o"></i>&nbsp;{{$msg_make_default}}
</a>
{{/if}}
{{/if}}
@@ -17,10 +17,10 @@
</div>
<h3>
{{if $selected == $channel.channel_id}}
- <i class="selected-channel icon-circle" title="{{$msg_selected}}"></i>
+ <i class="selected-channel fa fa-circle" title="{{$msg_selected}}"></i>
{{/if}}
{{if $channel.delegate}}
- <i class="icon-circle-arrow-right" title="{{$delegated_desc}}"></i>
+ <i class="fa fa-arrow-circle-right" title="{{$delegated_desc}}"></i>
{{/if}}
{{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" title="{{$channel.channel_name}}">{{/if}}
{{$channel.channel_name}}
@@ -37,11 +37,11 @@
<div class="channel-notifications-wrapper">
{{if !$channel.delegate}}
<div class="channel-notification">
- <i class="icon-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i>
+ <i class="fa fa-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i>
{{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}}
</div>
<div class="channel-notification">
- <i class="icon-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
+ <i class="fa fa-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
</div>
{{/if}}
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index 1a6012926..171f833ee 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- <a class="btn btn-success btn-xs pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="icon-plus-sign"></i>&nbsp;{{$create.2}}</a>
+ <a class="btn btn-success btn-xs pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="fa fa-plus-circle"></i>&nbsp;{{$create.2}}</a>
<h2>{{$header}}</h2>
</div>
<div class="section-content-wrapper-np">
diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl
index a43ea1b5d..d5f379f74 100755
--- a/view/tpl/chanview.tpl
+++ b/view/tpl/chanview.tpl
@@ -1,2 +1,2 @@
-<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" ><i class="icon-fullscreen"></i></div>
+<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" ><i class="fa fa-arrows-alt"></i></div>
<iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe>
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 9cf5968cb..afdbdeb28 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,13 +1,13 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="icon-resize-full"></i></button>
- <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="icon-resize-small"></i></button>
+ <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
+ <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
{{if $is_owner}}
<form id="chat-destroy" method="post" action="chat">
<input type="hidden" name="room_name" value="{{$room_name}}" />
<input type="hidden" name="action" value="drop" />
- <button class="btn btn-danger btn-xs" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$drop}}</button>
+ <button class="btn btn-danger btn-xs" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</button>
</form>
{{/if}}
</div>
@@ -27,57 +27,57 @@
</div>
<div id="chat-submit-wrapper">
<div id="chat-submit" class="dropup pull-right">
- <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="icon-caret-up"></i></button>
+ <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-caret-up"></i></button>
<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
<ul class="dropdown-menu">
- <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="icon-circle online"></i>&nbsp;{{$online}}</a></li>
- <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="icon-circle away"></i>&nbsp;{{$away}}</a></li>
- <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="icon-circle leave"></i>&nbsp;{{$leave}}</a></li>
+ <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i>&nbsp;{{$online}}</a></li>
+ <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i>&nbsp;{{$away}}</a></li>
+ <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i>&nbsp;{{$leave}}</a></li>
{{if $bookmark_link}}
<li class="divider"></li>
- <li class="nav-item"><a class="nav-link" href="{{$bookmark_link}}" target="_blank" ><i class="icon-bookmark"></i>&nbsp;{{$bookmark}}</a></li>
+ <li class="nav-item"><a class="nav-link" href="{{$bookmark_link}}" target="_blank" ><i class="fa fa-bookmark"></i>&nbsp;{{$bookmark}}</a></li>
{{/if}}
</ul>
</div>
<div id="chat-tools" class="btn-toolbar pull-left">
<div class="btn-group">
<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;">
- <i class="icon-bold jot-icons"></i>
+ <i class="fa fa-bold jot-icons"></i>
</button>
<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'chatText'); return false;">
- <i class="icon-italic jot-icons"></i>
+ <i class="fa fa-italic jot-icons"></i>
</button>
<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'chatText'); return false;">
- <i class="icon-underline jot-icons"></i>
+ <i class="fa fa-underline jot-icons"></i>
</button>
<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'chatText'); return false;">
- <i class="icon-quote-left jot-icons"></i>
+ <i class="fa fa-quote-left jot-icons"></i>
</button>
<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'chatText'); return false;">
- <i class="icon-terminal jot-icons"></i>
+ <i class="fa fa-terminal jot-icons"></i>
</button>
</div>
<div class="btn-group hidden-xs">
<button id="chat-link-wrapper" class="btn btn-default btn-sm" onclick="chatJotGetLink(); return false;" >
- <i id="chat-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
+ <i id="chat-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
</button>
</div>
{{if $feature_encrypt}}
<div class="btn-group hidden-xs">
<button id="chat-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}', '#chatText', $('#chatText').val()); return false;">
- <i id="chat-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i>
+ <i id="chat-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
</button>
</div>
{{/if}}
<div class="btn-group dropup visible-xs">
<button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
- <i id="more-tools-icon" class="icon-caret-up jot-icons"></i>
+ <i id="more-tools-icon" class="fa fa-caret-up jot-icons"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
- <li class="visible-xs"><a href="#" onclick="chatJotGetLink(); return false;" ><i class="icon-link"></i>&nbsp;{{$insert}}</a></li>
+ <li class="visible-xs"><a href="#" onclick="chatJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a></li>
{{if $feature_encrypt}}
<li class="divider"></li>
- <li class="visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li>
+ <li class="visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a></li>
{{/if}}
</ul>
</div>
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
index 8acff2ff5..a40313934 100644
--- a/view/tpl/chatroom_new.tpl
+++ b/view/tpl/chatroom_new.tpl
@@ -4,7 +4,7 @@
{{include file="field_input.tpl" field=$chat_expire}}
{{$acl}}
<div class="btn-group pull-right">
- <button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="icon-{{$lockstate}}"></i></button>
+ <button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button>
<button id="dbtn-submit" class="btn btn-primary" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="clear"></div>
diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
index d35148f7c..04ebbcae4 100644
--- a/view/tpl/chatrooms.tpl
+++ b/view/tpl/chatrooms.tpl
@@ -1,7 +1,7 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
{{if $is_owner}}
- <button type="button" class="btn btn-success btn-xs pull-right" onclick="openClose('chatroom-new');"><i class="icon-plus-sign"></i>&nbsp;{{$newroom}}</button>
+ <button type="button" class="btn btn-success btn-xs pull-right" onclick="openClose('chatroom-new');"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
{{/if}}
<h2>{{$header}}</h2>
</div>
@@ -23,7 +23,7 @@
<td>{{$room.cr_expire}}&nbsp;min</td>
<td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown pull-right{{/if}}">
{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}}
- <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i>
+ <i class="fa fa-lock lockview dropdown-toggle" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i>
<ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul>
{{/if}}
</td>
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index 0c7892c25..c0207c623 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -10,7 +10,7 @@
</tr>
{{if $parentpath}}
<tr>
- <td><i class="icon-level-up"></i>{{*{{$parentpath.icon}}*}}</td>
+ <td><i class="fa fa-level-up"></i>{{*{{$parentpath.icon}}*}}</td>
<td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td>
<td></td><td></td><td></td><td></td>
<td>{{*[{{$parent}}]*}}</td>
@@ -25,8 +25,8 @@
{{if $item.is_owner}}
<td class="cloud-index-tool">{{$item.attachIcon}}</td>
<td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td>
- <td class="cloud-index-tool"><i class="fakelink icon-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
- <td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+ <td class="cloud-index-tool"><i class="fakelink fa fa-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
+ <td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
{{else}}
<td></td><td></td><td></td><td></td>
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
index 076fa16cb..d41cc9d67 100644
--- a/view/tpl/cloud_header.tpl
+++ b/view/tpl/cloud_header.tpl
@@ -2,10 +2,10 @@
{{if $actionspanel}}
<div class="pull-right">
{{if $is_owner}}
- <a href="/sharedwithme" class="btn btn-xs btn-default"><i class="icon-cloud-download"></i>&nbsp;{{$shared}}</a>
+ <a href="/sharedwithme" class="btn btn-xs btn-default"><i class="fa fa-cloud-download"></i>&nbsp;{{$shared}}</a>
{{/if}}
- <button id="files-create-btn" class="btn btn-xs btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i>&nbsp;{{$create}}</button>
- <button id="files-upload-btn" class="btn btn-xs btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
+ <button id="files-create-btn" class="btn btn-xs btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="fa fa-folder-o"></i>&nbsp;{{$create}}</button>
+ <button id="files-upload-btn" class="btn btn-xs btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload}}</button>
</div>
{{/if}}
<h2>{{$header}}</h2>
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 0c0cb984c..1d8bd671d 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -24,36 +24,36 @@
<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
<div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;">
- <i class="icon-bold comment-icon"></i>
+ <i class="fa fa-bold comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;">
- <i class="icon-italic comment-icon"></i>
+ <i class="fa fa-italic comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;">
- <i class="icon-underline comment-icon"></i>
+ <i class="fa fa-underline comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;">
- <i class="icon-quote-left comment-icon"></i>
+ <i class="fa fa-quote-left comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;">
- <i class="icon-terminal comment-icon"></i>
+ <i class="fa fa-terminal comment-icon"></i>
</button>
</div>
<div class='btn-group'>
<!--button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;">
- <i class="icon-camera comment-icon"></i>
+ <i class="fa fa-camera comment-icon"></i>
</button-->
<button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;">
- <i class="icon-link comment-icon"></i>
+ <i class="fa fa-link comment-icon"></i>
</button>
<!--button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;">
- <i class="icon-facetime-video comment-icon"></i>
+ <i class="fa fa-video-camera comment-icon"></i>
</button-->
</div>
{{if $feature_encrypt}}
<div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
- <i class="icon-key comment-icon"></i>
+ <i class="fa fa-key comment-icon"></i>
</button>
</div>
{{/if}}
@@ -62,7 +62,7 @@
<div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}">
{{if $preview}}
<button id="comment-edit-presubmit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}">
- <i class="icon-eye-open comment-icon" ></i>
+ <i class="fa fa-eye comment-icon" ></i>
</button>
{{/if}}
<button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button>
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index e2a14d9a2..a238f5bc7 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -3,18 +3,18 @@
<div class="pull-right">
{{if $contact.approve && $contact.ignore}}
<form action="connedit/{{$contact.id}}" method="post" >
- <button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button>
+ <button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button>
- <a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-xs" title="{{$contact.ignore_hover}}"><i class="icon-ban-circle"></i> {{$contact.ignore}}</a>
+ <a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-xs" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
{{/if}}
- <a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
- <a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a>
+ <a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
+ <a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
{{if $contact.approve}}
</form>
{{/if}}
</div>
- <h3>{{if $contact.public_forum}}<i class="icon-comments-alt"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
+ <h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
</div>
<div class="section-content-tools-wrapper">
<div class="contact-photo-wrapper" >
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index fdd269602..1f7aa05b7 100755
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -2,10 +2,10 @@
<div class="section-title-wrapper">
<div class="dropdown pull-right">
<button type="button" class="btn btn-primary btn-xs" onclick="openClose('contacts-search-form');">
- <i class="icon-search"></i>&nbsp;{{$label}}
+ <i class="fa fa-search"></i>&nbsp;{{$label}}
</button>
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
- <i class="icon-sort"></i>
+ <i class="fa fa-sort"></i>
</button>
<ul class="dropdown-menu">
{{foreach $tabs as $menu}}
@@ -21,7 +21,7 @@
<div class="input-group">
<input type="text" name="search" id="contacts-search" class="widget-input" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
- <button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="icon-search"></i></button>
+ <button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-search"></i></button>
</div>
</div>
</div>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 553bc3146..d9c60fc3b 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -32,14 +32,14 @@
{{/if}}
{{if $item.lock}}
<div class="wall-item-lock dropdown">
- <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+ <i class="fa fa-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
</div>
{{/if}}
<div class="wall-item-author">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
</div>
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
- {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+ {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
</div>
<div class="clear"></div>
</div>
@@ -81,68 +81,68 @@
<div class="wall-item-tools-right btn-group pull-right">
{{if $item.like}}
<button type="button" title="{{$item.like.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
- <i class="icon-thumbs-up-alt" ></i>
+ <i class="fa fa-thumbs-o-up" ></i>
</button>
{{/if}}
{{if $item.dislike}}
<button type="button" title="{{$item.dislike.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
- <i class="icon-thumbs-down-alt" ></i>
+ <i class="fa fa-thumbs-o-down" ></i>
</button>
{{/if}}
{{if $item.isevent}}
<button type="button" title="{{$item.attend.0}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
- <i class="icon-ok" ></i>
+ <i class="fa fa-check" ></i>
</button>
<button type="button" title="{{$item.attend.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'attendno'); return false;">
- <i class="icon-remove" ></i>
+ <i class="fa fa-times" ></i>
</button>
<button type="button" title="{{$item.attend.2}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
- <i class="icon-question" ></i>
+ <i class="fa fa-question" ></i>
</button>
{{/if}}
{{if $item.canvote}}
<button type="button" title="{{$item.conlabels.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'agree'); return false;">
- <i class="icon-ok" ></i>
+ <i class="fa fa-check" ></i>
</button>
<button type="button" title="{{$item.conlabels.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'disagree'); return false;">
- <i class="icon-remove" ></i>
+ <i class="fa fa-times" ></i>
</button>
<button type="button" title="{{$item.conlabels.2}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'abstain'); return false;">
- <i class="icon-question" ></i>
+ <i class="fa fa-question" ></i>
</button>
{{/if}}
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
- <i class="icon-caret-down"></i>
+ <i class="fa fa-caret-down"></i>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
{{if $item.share}}
- <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="fa fa-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li>
{{/if}}
{{if $item.plink}}
- <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link"></i> {{$item.plink.title}}</a></li>
+ <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="fa fa-external-link"></i> {{$item.plink.title}}</a></li>
{{/if}}
{{if $item.edpost}}
- <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil"></i> {{$item.edpost.1}}</a></li>
+ <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost fa fa-pencil"></i> {{$item.edpost.1}}</a></li>
{{/if}}
{{if $item.tagger}}
- <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="icon-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="fa fa-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li>
{{/if}}
{{if $item.filer}}
- <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="icon-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="fa fa-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li>
{{/if}}
{{if $item.bookmark}}
- <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="icon-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="fa fa-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li>
{{/if}}
{{if $item.addtocal}}
- <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="icon-calendar" title="{{$item.addtocal}}"></i> {{$item.addtocal}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="fa fa-calendar" title="{{$item.addtocal}}"></i> {{$item.addtocal}}</a></li>
{{/if}}
{{if $item.star}}
- <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="fa fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
{{/if}}
{{if $item.drop.dropping}}
- <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li>
{{/if}}
{{if $item.item_photo_menu}}
<li role="presentation" class="divider"></li>
@@ -161,7 +161,7 @@
<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count && $item.attachments)}} btn-group{{/if}}">
{{if $item.attachments}}
<div class="btn-group">
- <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+ <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
</div>
{{/if}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index e7ce22043..b1080af34 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -32,14 +32,14 @@
{{/if}}
{{if $item.lock}}
<div class="wall-item-lock dropdown">
- <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+ <i class="fa fa-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
</div>
{{/if}}
<div class="wall-item-author">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
</div>
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
- {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+ {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
</div>
<div class="clear"></div>
</div>
@@ -79,69 +79,69 @@
<div class="wall-item-tools-right btn-group pull-right">
{{if $item.like}}
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false">
- <i class="icon-thumbs-up-alt" title="{{$item.like.0}}"></i>
+ <i class="fa fa-thumbs-o-up" title="{{$item.like.0}}"></i>
</button>
{{/if}}
{{if $item.dislike}}
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false">
- <i class="icon-thumbs-down-alt" title="{{$item.dislike.0}}"></i>
+ <i class="fa fa-thumbs-o-down" title="{{$item.dislike.0}}"></i>
</button>
{{/if}}
{{if $item.isevent}}
<button type="button" title="{{$item.attend.0}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
- <i class="icon-ok" ></i>
+ <i class="fa fa-check" ></i>
</button>
<button type="button" title="{{$item.attend.1}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendno'); return false;">
- <i class="icon-remove" ></i>
+ <i class="fa fa-times" ></i>
</button>
<button type="button" title="{{$item.attend.2}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
- <i class="icon-question" ></i>
+ <i class="fa fa-question" ></i>
</button>
{{/if}}
{{if $item.canvote}}
<button type="button" title="{{$item.conlabels.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'agree'); return false;">
- <i class="icon-ok" ></i>
+ <i class="fa fa-check" ></i>
</button>
<button type="button" title="{{$item.conlabels.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'disagree'); return false;">
- <i class="icon-remove" ></i>
+ <i class="fa fa-times" ></i>
</button>
<button type="button" title="{{$item.conlabels.2}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'abstain'); return false;">
- <i class="icon-question" ></i>
+ <i class="fa fa-question" ></i>
</button>
{{/if}}
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
- <i class="icon-caret-down"></i>
+ <i class="fa fa-caret-down"></i>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
{{if $item.share}}
- <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="fa fa-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li>
{{/if}}
{{if $item.plink}}
- <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="icon-external-link"></i> {{$item.plink.title}}</a></li>
+ <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="fa fa-external-link"></i> {{$item.plink.title}}</a></li>
{{/if}}
{{if $item.edpost}}
- <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost icon-pencil"></i> {{$item.edpost.1}}</a></li>
+ <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost fa fa-pencil"></i> {{$item.edpost.1}}</a></li>
{{/if}}
{{if $item.tagger}}
- <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="icon-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="fa fa-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li>
{{/if}}
{{if $item.filer}}
- <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="icon-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="fa fa-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li>
{{/if}}
{{if $item.bookmark}}
- <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="icon-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="fa fa-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li>
{{/if}}
{{if $item.addtocal}}
- <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="icon-calendar" title="{{$item.addtocal}}"></i> {{$item.addtocal}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="fa fa-calendar" title="{{$item.addtocal}}"></i> {{$item.addtocal}}</a></li>
{{/if}}
{{if $item.star}}
- <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="fa fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
{{/if}}
{{if $item.drop.dropping}}
- <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
+ <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li>
{{/if}}
{{if $item.item_photo_menu}}
<li role="presentation" class="divider"></li>
@@ -154,7 +154,7 @@
<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
{{if $item.attachments}}
<div class="btn-group">
- <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+ <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
</div>
{{/if}}
@@ -166,7 +166,7 @@
{{if $item.unseen_comments}}
<div class="unseen-wall-indicator-{{$item.id}} btn-group">
<button class="btn btn-default btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;">
- <i class="icon-check"></i>
+ <i class="fa fa-check-square-o"></i>
</button>
</div>
{{/if}}
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 79598fc9a..c82fada45 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -2,7 +2,7 @@
<div class="section-title-wrapper">
<div class="btn-group pull-right">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
- <i class="icon-sort"></i>
+ <i class="fa fa-sort"></i>
</button>
<ul class="dropdown-menu">
<li><a href="directory?f=&order=date{{$suggest}}">{{$date}}</a></li>
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 7c2a45473..c9940a347 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -8,13 +8,13 @@
<a class="directory-ignore btn btn-warning btn-xs" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
{{/if}}
{{if $entry.connect}}
- <a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a>
+ <a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conn_label}}</a>
{{/if}}
{{if $entry.viewrate}}
- {{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
+ {{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="fa fa-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
{{/if}}
</div>
- <h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
+ <h3>{{if $entry.public_forum}}<i class="fa fa-comments-o" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="fa fa-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
</div>
<div class="section-content-tools-wrapper directory-collapse">
<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 3be40e978..79a8f347f 100755
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -2,7 +2,7 @@
<div class="section-title-wrapper">
{{if $delete}}
<div class="pull-right">
- <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
+ <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$delete}}</a>
</div>
{{/if}}
<h2>{{$title}}</h2>
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index 3fc2063ef..fe3cfc517 100755
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
@@ -6,9 +6,9 @@
</div>
{{$event.html}}
<div class="event-buttons">
- {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="icon-external-link btn btn-default" ></i></a>{{/if}}
- {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="icon-pencil btn btn-default"></i></a>{{/if}}
- {{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="icon-trash btn btn-default"></i></a>{{/if}}
+ {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="fa fa-external-link btn btn-default" ></i></a>{{/if}}
+ {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="fa fa-pencil btn btn-default"></i></a>{{/if}}
+ {{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="fa fa-trash-o btn btn-default"></i></a>{{/if}}
</div>
<div class="clear"></div>
</div>
diff --git a/view/tpl/event_cal.tpl b/view/tpl/event_cal.tpl
index 61458b263..a88df6d18 100755
--- a/view/tpl/event_cal.tpl
+++ b/view/tpl/event_cal.tpl
@@ -6,7 +6,7 @@
</div>
{{$event.html}}
<div class="event-buttons">
- {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="icon-external-link btn btn-default" ></i></a>{{/if}}
+ {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="fa fa-external-link btn btn-default" ></i></a>{{/if}}
</div>
<div class="clear"></div>
</div>
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index 31e18caeb..5cf660b3b 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -34,30 +34,30 @@
<div id="comment-edit-bb-desc" class="btn-toolbar">
<div class='btn-group'>
<button type="button" class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'desc');">
- <i class="icon-bold comment-icon"></i>
+ <i class="fa fa-bold comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'desc');">
- <i class="icon-italic comment-icon"></i>
+ <i class="fa fa-italic comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'desc');">
- <i class="icon-underline comment-icon"></i>
+ <i class="fa fa-underline comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('none','quote','desc');">
- <i class="icon-quote-left comment-icon"></i>
+ <i class="fa fa-quote-left comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'desc');">
- <i class="icon-terminal comment-icon"></i>
+ <i class="fa fa-terminal comment-icon"></i>
</button>
</div>
<div class='btn-group'>
<button type="button" class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'desc');">
- <i class="icon-camera comment-icon"></i>
+ <i class="fa fa-camera comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'desc');">
- <i class="icon-link comment-icon"></i>
+ <i class="fa fa-link comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'desc');">
- <i class="icon-facetime-video comment-icon"></i>
+ <i class="fa fa-video-camera comment-icon"></i>
</button>
</div>
</div>
@@ -70,33 +70,33 @@
<div id="comment-edit-bb-loc" class="btn-toolbar">
<div class='btn-group'>
<button type="button" class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'loc');">
- <i class="icon-bold comment-icon"></i>
+ <i class="fa fa-bold comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'loc');">
- <i class="icon-italic comment-icon"></i>
+ <i class="fa fa-italic comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'loc');">
- <i class="icon-underline comment-icon"></i>
+ <i class="fa fa-underline comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('none','quote','loc');">
- <i class="icon-quote-left comment-icon"></i>
+ <i class="fa fa-quote-left comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'loc');">
- <i class="icon-terminal comment-icon"></i>
+ <i class="fa fa-terminal comment-icon"></i>
</button>
</div>
<div class='btn-group'>
<button type="button" class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'loc');">
- <i class="icon-camera comment-icon"></i>
+ <i class="fa fa-camera comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'loc');">
- <i class="icon-link comment-icon"></i>
+ <i class="fa fa-link comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'loc');">
- <i class="icon-facetime-video comment-icon"></i>
+ <i class="fa fa-video-camera comment-icon"></i>
</button>
<button type="button" class="btn btn-default btn-xs" title="{{$mapper}}" onclick="insertbbcomment('none','map','loc');">
- <i class="icon-globe comment-icon"></i>
+ <i class="fa fa-globe comment-icon"></i>
</button>
</div>
@@ -114,7 +114,7 @@
<button type="button" class="btn btn-default" onclick="openClose('advanced');">{{$advanced}}</button>
<div class="btn-group pull-right">
- <button id="event-edit-preview-btn" class="btn btn-default" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="icon-eye-open" ></i></button>
+ <button id="event-edit-preview-btn" class="btn btn-default" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button>
{{if ! $eid}}
<button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}"><i id="jot-perms-icon"></i></button>
{{/if}}
diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
index 9547676e9..6247aaf6f 100755
--- a/view/tpl/event_item_header.tpl
+++ b/view/tpl/event_item_header.tpl
@@ -1,5 +1,5 @@
<div class="event-item-title">
- <h3><i class="icon-calendar"></i>&nbsp;{{$title}}</h3>
+ <h3><i class="fa fa-calendar"></i>&nbsp;{{$title}}</h3>
</div>
<div class="event-item-start">
<span class="event-item-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 5c9eb2814..7d5258ecd 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,13 +1,13 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button>
- <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button>
+ <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+ <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button>
<div class="btn-group">
- <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
- <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
- <button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
+ <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+ <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+ <button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
</div>
</div>
<h2 id="title"></h2>
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
index abffb2a92..121c06cb5 100755
--- a/view/tpl/events_cal-js.tpl
+++ b/view/tpl/events_cal-js.tpl
@@ -2,12 +2,12 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button>
- <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button>
+ <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+ <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
<div class="btn-group">
- <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
- <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
- <button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
+ <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+ <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+ <button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
</div>
</div>
<h2 id="title"></h2>
diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl
index 5e20511fc..4f5ef2eb0 100755
--- a/view/tpl/events_tools_side.tpl
+++ b/view/tpl/events_tools_side.tpl
@@ -1,8 +1,8 @@
<div class="widget">
<h3>{{$title}}</h3>
<ul class="nav nav-pills nav-stacked">
- <li><a href="#" onclick="exportDate(); return false;"><i class="icon-download"></i>&nbsp;{{$export}}</a></li>
- <li><a href="#" onclick="openClose('event-upload-form'); return false;"><i class="icon-upload"></i>&nbsp;{{$import}}</a></li>
+ <li><a href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i>&nbsp;{{$export}}</a></li>
+ <li><a href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$import}}</a></li>
</ul>
<div id="event-upload-form" style="display: none;">
<form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index d85c234f1..b54a4f3c3 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -5,7 +5,7 @@
</td>
{{if $notself}}
<td class="abook-them">
- {{if $field.2}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}}
+ {{if $field.2}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
</td>
{{/if}}
<td class="abook-me">
@@ -14,10 +14,10 @@
{{/if}}
{{if $notself && $field.5}}
<input type="hidden" name='{{$field.0}}' value="{{if $field.7}}1{{else}}0{{/if}}" />
- {{if $field.3}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}}
+ {{if $field.3}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
{{/if}}
</td>
<td>
- {{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="icon-check"></i>{{else}} <i class="icon-check-empty"></i>{{/if}}{{/if}}</span>{{/if}}
+ {{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="fa fa-check-square-o"></i>{{else}} <i class="fa fa-square-o"></i>{{/if}}{{/if}}</span>{{/if}}
</td>
</tr>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index 8c1f8d4ca..9c19a288d 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -5,7 +5,7 @@
<div class="input-group">
<input class="widget-input" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
- <button class="btn btn-default btn-sm" type="submit" name="submit" value="{{$follow}}"><i class="icon-plus"></i></button>
+ <button class="btn btn-default btn-sm" type="submit" name="submit" value="{{$follow}}"><i class="fa fa-plus"></i></button>
</div>
</div>
</div>
diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
index 34ee3e3fd..34d0096e0 100755
--- a/view/tpl/group_drop.tpl
+++ b/view/tpl/group_drop.tpl
@@ -2,6 +2,6 @@
<a href="group/drop/{{$id}}?t={{$form_security_token}}"
onclick="return confirmDelete();"
id="group-delete-icon-{{$id}}"
- class="group-delete-icon btn btn-default" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></a>
+ class="group-delete-icon btn btn-default" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></a>
</div>
<div class="group-delete-end"></div>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index af6014359..e58cf060d 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -6,17 +6,17 @@
<li>
{{if $group.cid}}
<a class="pull-right group-edit-tool fakelink" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"/>
- <i id="group-{{$group.id}}" class="{{if $group.ismember}}icon-check{{else}}icon-check-empty{{/if}}"></i>
+ <i id="group-{{$group.id}}" class="fa {{if $group.ismember}}fa-check-square-o{{else}}fa-square-o{{/if}}"></i>
</a>
{{/if}}
{{if $group.edit}}
- <a class="pull-right group-edit-tool" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="group-edit-icon icon-pencil"></i></a>
+ <a class="pull-right group-edit-tool" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="group-edit-icon fa fa-pencil"></i></a>
{{/if}}
<a{{if $group.selected}} class="group-selected"{{/if}} href="{{$group.href}}">{{$group.text}}</a>
</li>
{{/foreach}}
<li>
- <a href="group/new" title="{{$createtext}}" ><i class="icon-plus-sign"></i> {{$createtext}}</a>
+ <a href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a>
</li>
</ul>
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
index 2f773f746..ad0aef6a3 100755
--- a/view/tpl/install_checks.tpl
+++ b/view/tpl/install_checks.tpl
@@ -3,7 +3,7 @@
<form action="{{$baseurl}}/index.php?q=setup" method="post">
<table>
{{foreach $checks as $check}}
- <tr><td>{{$check.title}} </td><td><i class="{{if $check.status}}icon-check{{else}}{{if $check.required}}icon-check-empty{{else}}icon-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+ <tr><td>{{$check.title}} </td><td><i class="fa {{if $check.status}}fa-check-square-o{{else}}{{if $check.required}}fa-square-o{{else}}fa-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
{{if $check.help}}
<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
{{/if}}
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
index 67accc1ec..83cc9a3cd 100644
--- a/view/tpl/item_attach.tpl
+++ b/view/tpl/item_attach.tpl
@@ -1,5 +1,5 @@
{{if $attaches}}
{{foreach $attaches as $a}}
-<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a></li>
+<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="fa {{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a></li>
{{/foreach}}
{{/if}}
diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl
index eea0e0b8f..9ff291747 100644
--- a/view/tpl/item_categories.tpl
+++ b/view/tpl/item_categories.tpl
@@ -1,7 +1,7 @@
{{if $categories}}
<div class="categorytags">
{{foreach $categories as $cat}}
-<span class="item-category"><i class="icon-asterisk cat-icons"></i>{{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
+<span class="item-category"><i class="fa fa-asterisk cat-icons"></i>{{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
{{/foreach}}
</div>
{{/if}}
diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl
index 07163d59a..0cde5caf7 100644
--- a/view/tpl/item_filer.tpl
+++ b/view/tpl/item_filer.tpl
@@ -1,7 +1,7 @@
{{if $categories}}
<div class="filesavetags">
{{foreach $categories as $cat}}
-<span class="item-category"><i class="icon-folder-close cat-icons"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="icon-trash drop-icons"></i></a></span>
+<span class="item-category"><i class="fa fa-folder cat-icons"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="fa fa-trash-o drop-icons"></i></a></span>
{{/foreach}}
</div>
{{/if}}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 085710f55..aeb661008 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -1,7 +1,6 @@
<script language="javascript" type="text/javascript">
var editor = false;
-var textlen = 0;
var plaintext = '{{$editselect}}';
var pretext = '{{$pretext}}';
@@ -75,14 +74,6 @@ function initEditor(cb){
else {
if(cPopup !== null) { cPopup.close(); cPopup = null; }
}
-
- textlen = txt.length;
- if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
- $('#profile-jot-desc').html(ispublic);
- }
- else {
- $('#profile-jot-desc').html('&nbsp;');
- }
});
ed.onInit.add(function(ed) {
@@ -109,8 +100,6 @@ function enableOnUser(){
</script>
<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
<script>
- var ispublic = '{{$ispublic}}';
-
$(document).ready(function() {
/* enable tinymce on focus and click */
$("#profile-jot-text").focus(enableOnUser);
@@ -352,11 +341,11 @@ function enableOnUser(){
function toggleVoting() {
if($('#jot-consensus').val() > 0) {
$('#jot-consensus').val(0);
- $('#profile-voting, #profile-voting-sub').removeClass('icon-check').addClass('icon-check-empty');
+ $('#profile-voting, #profile-voting-sub').removeClass('fa-check-square-o').addClass('fa-square-o');
}
else {
$('#jot-consensus').val(1);
- $('#profile-voting, #profile-voting-sub').removeClass('icon-check-empty').addClass('icon-check');
+ $('#profile-voting, #profile-voting-sub').removeClass('fa-square-o').addClass('fa-check-square-o');
}
}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 9c5ddc620..3de92cddb 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -51,19 +51,19 @@
{{if $bbcode}}
<div class="btn-group">
<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
- <i class="icon-bold jot-icons"></i>
+ <i class="fa fa-bold jot-icons"></i>
</button>
<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
- <i class="icon-italic jot-icons"></i>
+ <i class="fa fa-italic jot-icons"></i>
</button>
<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
- <i class="icon-underline jot-icons"></i>
+ <i class="fa fa-underline jot-icons"></i>
</button>
<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
- <i class="icon-quote-left jot-icons"></i>
+ <i class="fa fa-quote-left jot-icons"></i>
</button>
<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
- <i class="icon-terminal jot-icons"></i>
+ <i class="fa fa-terminal jot-icons"></i>
</button>
</div>
{{/if}}
@@ -71,24 +71,24 @@
<div class="btn-group hidden-xs hidden-sm">
{{if $writefiles}}
<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
- <i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i>
+ <i id="wall-file-upload-icon" class="fa fa-paperclip jot-icons"></i>
</button>
{{/if}}
{{if $weblink}}
<button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">
- <i id="profile-link" class="icon-link jot-icons"></i>
+ <i id="profile-link" class="fa fa-link jot-icons"></i>
</button>
{{/if}}
</div>
<div class="btn-group hidden-xs hidden-sm">
{{if $setloc}}
<button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
- <i id="profile-location" class="icon-globe jot-icons"></i>
+ <i id="profile-location" class="fa fa-globe jot-icons"></i>
</button>
{{/if}}
- {{if $noloc}}
- <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
- <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
+ {{if $clearloc}}
+ <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
+ <i id="profile-nolocation" class="fa fa-circle-o jot-icons"></i>
</button>
{{/if}}
{{else}}
@@ -96,53 +96,53 @@
{{/if}}
{{if $feature_expire}}
<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
- <i id="profile-expires" class="icon-eraser jot-icons"></i>
+ <i id="profile-expires" class="fa fa-eraser jot-icons"></i>
</button>
{{/if}}
{{if $feature_future}}
<button id="profile-future-wrapper" class="btn btn-default btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
- <i id="profile-future" class="icon-time jot-icons"></i>
+ <i id="profile-future" class="fa fa-clock-o jot-icons"></i>
</button>
{{/if}}
{{if $feature_encrypt}}
<button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
- <i id="profile-encrypt" class="icon-key jot-icons"></i>
+ <i id="profile-encrypt" class="fa fa-key jot-icons"></i>
</button>
{{/if}}
{{if $feature_voting}}
<button id="profile-voting-wrapper" class="btn btn-default btn-sm" title="{{$voting}}" onclick="toggleVoting();return false;">
- <i id="profile-voting" class="icon-check-empty jot-icons"></i>
+ <i id="profile-voting" class="fa fa-square-o jot-icons"></i>
</button>
{{/if}}
</div>
- {{if $writefiles || $weblink || $setloc || $noloc || $feature_expire || $feature_encrypt || $feature_voting}}
+ {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}}
<div class="btn-group visible-xs visible-sm">
<button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
- <i id="more-tools-icon" class="icon-caret-down jot-icons"></i>
+ <i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i>
</button>
<ul class="dropdown-menu dropdown-menu" role="menu">
{{if $visitor}}
{{if $writefiles}}
- <li><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>
+ <li><a id="wall-file-upload-sub" href="#" ><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a></li>
{{/if}}
{{if $weblink}}
- <li><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$weblink}}</a></li>
+ <li><a href="#" onclick="jotGetLink(); return false;"><i class="fa fa-link"></i>&nbsp;{{$weblink}}</a></li>
{{/if}}
-i {{if $setloc}}
- <li><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i>&nbsp;{{$setloc}}</a></li>
+ {{if $setloc}}
+ <li><a href="#" onclick="jotGetLocation(); return false;"><i class="fa fa-globe"></i>&nbsp;{{$setloc}}</a></li>
{{/if}}
- {{if $noloc}}
- <li><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i>&nbsp;{{$noloc}}</a></li>
+ {{if $clearloc}}
+ <li><a href="#" onclick="jotClearLocation(); return false;"><i class="fa fa-circle-o"></i>&nbsp;{{$clearloc}}</a></li>
{{/if}}
{{/if}}
{{if $feature_expire}}
- <li><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i>&nbsp;{{$expires}}</a></li>
+ <li><a href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i>&nbsp;{{$expires}}</a></li>
{{/if}}
{{if $feature_encrypt}}
- <li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li>
+ <li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a></li>
{{/if}}
{{if $feature_voting}}
- <li><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i>&nbsp;{{$voting}}</a></li>
+ <li><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="fa fa-square-o"></i>&nbsp;{{$voting}}</a></li>
{{/if}}
</ul>
</div>
@@ -154,12 +154,12 @@ i {{if $setloc}}
<div id="profile-jot-submit-right" class="btn-group pull-right">
{{if $preview}}
<button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
- <i class="icon-eye-open jot-icons" ></i>
+ <i class="fa fa-eye jot-icons" ></i>
</button>
{{/if}}
{{if $showacl}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>{{if $bang}}&nbsp;<i class="icon-exclamation jot-icons"></i>{{/if}}
+ <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{if $bang}}&nbsp;<i class="fa fa-exclamation jot-icons"></i>{{/if}}
</button>
{{/if}}
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit" >{{$share}}</button>
diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl
index cf172e197..d0b81af0c 100644
--- a/view/tpl/layoutlist.tpl
+++ b/view/tpl/layoutlist.tpl
@@ -2,8 +2,8 @@
<div class="section-title-wrapper">
{{if $editor}}
<div class="pull-right">
- <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('layout-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
- <a href="{{$help.url}}" target="_blank" class="btn btn-xs btn-warning" title="{{$help.title}}"><i class="icon-info"></i>&nbsp;{{$help.text}}</a>
+ <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('layout-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+ <a href="{{$help.url}}" target="_blank" class="btn btn-xs btn-warning" title="{{$help.title}}"><i class="fa fa-info"></i>&nbsp;{{$help.text}}</a>
</div>
{{/if}}
<h2>{{$title}}</h2>
@@ -42,17 +42,17 @@
</td>
<td class="webpage-list-tool">
{{if $edit}}
- <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+ <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $item.bb_element}}
- <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+ <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $edit}}
- <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+ <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
{{/if}}
</td>
<td class="hidden-xs">
diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
index 3ce7eb497..67f5868cb 100755
--- a/view/tpl/like_noshare.tpl
+++ b/view/tpl/like_noshare.tpl
@@ -1,5 +1,5 @@
<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
- <i class="icon-thumbs-up-alt item-tool btn btn-default" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
- <i class="icon-thumbs-down-alt item-tool btn btn-default" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
+ <i class="fa fa-thumbs-o-up item-tool btn btn-default" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
+ <i class="fa fa-thumbs-o-down item-tool btn btn-default" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
<div id="like-rotator-{{$id}}" class="like-rotator"></div>
</div>
diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
index 89d5295ad..a450c2847 100644
--- a/view/tpl/locmanage.tpl
+++ b/view/tpl/locmanage.tpl
@@ -8,7 +8,7 @@
$.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; });
}
</script>
- <button class="btn btn-success btn-xs pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="icon-refresh"></i>&nbsp;{{$sync}}</button>
+ <button class="btn btn-success btn-xs pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="fa fa-refresh"></i>&nbsp;{{$sync}}</button>
<h2>{{$header}}</h2>
</div>
<div class="section-content-wrapper-np">
@@ -31,8 +31,8 @@
<tr class="locs-index-row">
<td>{{$hub.hubloc_addr}}</td>
<td class="hidden-xs">{{$hub.hubloc_url}}</td>
- <td>{{if $hub.primary}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty primehub" onclick="primehub({{$hub.hubloc_id}}); return false;"></i>{{/if}}</td>
- <td><i class="icon-trash drophub" onclick="drophub({{$hub.hubloc_id}}); return false;"></i></td>
+ <td>{{if $hub.primary}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o primehub" onclick="primehub({{$hub.hubloc_id}}); return false;"></i>{{/if}}</td>
+ <td><i class="fa fa-trash-o drophub" onclick="drophub({{$hub.hubloc_id}}); return false;"></i></td>
</tr>
{{/if}}
{{/foreach}}
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 5e5d9808d..249e13a04 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -15,22 +15,22 @@
</div>
{{if $mail.attachments}}
<div class="dropdown pull-left">
- <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+ <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</ul>
</div>
{{/if}}
<div class="pull-right dropdown">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
- <i class="icon-caret-down"></i>
+ <i class="fa fa-caret-down"></i>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
{{if $mail.can_recall}}
<li>
- <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="icon-undo mail-icons"></i>&nbsp;{{$mail.recall}}</a>
+ <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-undo mail-icons"></i>&nbsp;{{$mail.recall}}</a>
</li>
{{/if}}
<li>
- <a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="icon-trash mail-icons"></i>&nbsp;{{$mail.delete}}</a>
+ <a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-trash-o mail-icons"></i>&nbsp;{{$mail.delete}}</a>
</li>
{{if $mail.can_recall}}
<li class="divider"></li>
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index a7754daf2..748c118ef 100755
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
@@ -1,10 +1,10 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button>
- <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button>
+ <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+ <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
{{if $mailbox == 'combined'}}
- <a class="btn btn-xs btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
+ <a class="btn btn-xs btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a>
{{/if}}
</div>
<h2>{{$prvmsg_header}}</h2>
diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl
index 41587430b..a5ebb043c 100755
--- a/view/tpl/match.tpl
+++ b/view/tpl/match.tpl
@@ -10,7 +10,7 @@
</div>
<div class="profile-match-end"></div>
{{if $connlnk}}
- <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}"><i class="icon-plus connect-icon"></i> {{$conntxt}}</a></div>
+ <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$conntxt}}</a></div>
{{/if}}
</div>
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index 5c8734ef7..28236ff15 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -3,7 +3,7 @@
<div class="section-title-wrapper">
{{if $menu_edit_link}}
<div class="pull-right">
- <a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="icon-edit"></i>&nbsp;{{$editcontents}}</a>
+ <a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$editcontents}}</a>
</div>
{{/if}}
<h2>{{$header}}</h2>
@@ -23,7 +23,7 @@
{{include file="field_checkbox.tpl" field=$menu_bookmark}}
<div class="menuedit-submit-wrapper form-group pull-right" >
- <button type="submit" name="submit" class="btn btn-primary">{{$submit}}&nbsp;<i class="icon-caret-right"></i></button>
+ <button type="submit" name="submit" class="btn btn-primary">{{$submit}}&nbsp;<i class="fa fa-caret-right"></i></button>
</div>
<div class="clear"></div>
</form>
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl
index 743165cc3..f38619923 100644
--- a/view/tpl/menulist.tpl
+++ b/view/tpl/menulist.tpl
@@ -1,7 +1,7 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+ <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
</div>
<h2>{{$title}}</h2>
<div class="clear"></div>
@@ -24,12 +24,12 @@
</tr>
{{foreach $menus as $m }}
<tr id="menu-list-item-{{$m.menu_id}}">
- <td>{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
+ <td>{{if $m.bookmark}}<i class="fa fa-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
<td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
<td>{{$m.menu_desc}}</td>
- <td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
- <td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="icon-share"></i></a></td>
- <td class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+ <td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
+ <td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a></td>
+ <td class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
<td class="hidden-xs">{{$m.menu_created}}</td>
<td class="hidden-xs">{{$m.menu_edited}}</td>
</tr>
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index f9dc4e2cc..865c587ec 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -25,10 +25,10 @@
<div class="pull-right form-group">
<div class="btn-group">
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+ <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
</button>
{{if $submit_more}}
- <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
+ <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="fa fa-caret-right"></i></button>
{{/if}}
<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
</div>
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index 8686d4204..90388ece2 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -1,7 +1,7 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
+ <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$hintnew}}</button>
</div>
<h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2>
<div class="clear"></div>
@@ -23,9 +23,9 @@
<tr id="mitem-list-item-{{$m.mitem_id}}">
<td width="1%">{{$m.mitem_desc}}</td>
<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
- <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
- <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td>
- <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+ <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
+ <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
+ <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
</tr>
{{/foreach}}
</table>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 14fb8a982..5c8c097da 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -6,14 +6,14 @@
<span class="icon-bar"></span>
</button>
<button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1">
- <i class="icon-circle-arrow-down" id="expand-tabs-icon"></i>
+ <i class="fa fa-arrow-circle-down" id="expand-tabs-icon"></i>
</button>
<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1">
- <i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
+ <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button>
{{if $nav.help.6}}
<button id="context-help-btn"class="navbar-toggle" type="button" onclick="contextualHelp(); return false;">
- <i class="icon-question-sign"></i>
+ <i class="fa fa-question-circle"></i>
</button>
{{/if}}
{{if $userinfo}}
@@ -73,7 +73,7 @@
{{if $nav.network}}
<li class="{{$sel.network}} hidden-xs">
- <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><i class="icon-th"></i></a>
+ <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><i class="fa fa-th"></i></a>
<span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span>
<ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network">
{{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}}
@@ -82,14 +82,14 @@
</ul>
</li>
<li class="{{$sel.network}} visible-xs">
- <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a>
+ <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="fa fa-th"></i></a>
<span class="net-update badge" rel="#nav-network-menu"></span>
</li>
{{/if}}
{{if $nav.home}}
<li class="{{$sel.home}} hidden-xs">
- <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" id="{{$nav.home.4}}"><i class="icon-home"></i></a>
+ <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" id="{{$nav.home.4}}"><i class="fa fa-home"></i></a>
<span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span>
<ul id="nav-home-menu" class="dropdown-menu" rel="home">
{{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}}
@@ -98,7 +98,7 @@
</ul>
</li>
<li class="{{$sel.home}} visible-xs">
- <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a>
+ <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="fa fa-home"></i></a>
<span class="home-update badge" rel="#nav-home-menu"></span>
</li>
{{/if}}
@@ -106,7 +106,7 @@
{{if $nav.messages}}
<li class="{{$sel.messages}} hidden-xs">
- <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><i class="icon-envelope"></i></a>
+ <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><i class="fa fa-envelope"></i></a>
<span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span>
<ul id="nav-messages-menu" class="dropdown-menu" rel="messages">
<li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
@@ -115,14 +115,14 @@
</ul>
</li>
<li class="{{$sel.messages}} visible-xs">
- <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a>
+ <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope"></i></a>
<span class="mail-update badge" rel="#nav-messages-menu"></span>
</li>
{{/if}}
{{if $nav.all_events}}
<li class="{{$sel.all_events}} hidden-xs">
- <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" id='{{$nav.all_events.4}}'><i class="icon-calendar"></i></a>
+ <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" id='{{$nav.all_events.4}}'><i class="fa fa-calendar"></i></a>
<span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span>
<ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
<li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
@@ -131,14 +131,14 @@
</ul>
</li>
<li class="{{$sel.all_events}} visible-xs">
- <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a>
+ <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="fa fa-calendar"></i></a>
<span class="all_events-update badge" rel="#nav-all_events-menu"></span>
</li>
{{/if}}
{{if $nav.intros}}
<li class="{{$sel.intros}} hidden-xs">
- <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}"><i class="icon-user"></i></a>
+ <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}"><i class="fa fa-user"></i></a>
<span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span>
<ul id="nav-intros-menu" class="dropdown-menu" rel="intros">
<li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
@@ -146,14 +146,14 @@
</ul>
</li>
<li class="{{$sel.intros}} visible-xs">
- <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a>
+ <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="fa fa-user"></i></a>
<span class="intro-update badge" rel="#nav-intros-menu"></span>
</li>
{{/if}}
{{if $nav.notifications}}
<li class="{{$sel.notifications}} hidden-xs">
- <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><i class="icon-exclamation"></i></a>
+ <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><i class="fa fa-exclamation"></i></a>
<span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span>
<ul id="nav-notify-menu" class="dropdown-menu" rel="notify">
<li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
@@ -162,7 +162,7 @@
</ul>
</li>
<li class="{{$sel.notifications}} visible-xs">
- <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a>
+ <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation"></i></a>
<span class="notify-update badge" rel="#nav-notify-menu"></span>
</li>
{{/if}}
@@ -170,11 +170,11 @@
<ul class="nav navbar-nav navbar-right">
<li class="hidden-xs">
<form method="get" action="search" role="search">
- <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/>
+ <div id="nav-search-spinner"></div><input class="fa-search" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/>
</form>
</li>
<li class="visible-xs">
- <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a>
+ <a href="/search" title="{{$nav.search.3}}"><i class="fa fa-search"></i></a>
</li>
{{if $powered_by}}
@@ -182,19 +182,19 @@
{{/if}}
{{if $nav.directory}}
<li class="{{$sel.directory}}">
- <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="icon-sitemap"></i></a>
+ <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="fa fa-sitemap"></i></a>
</li>
{{/if}}
{{if $nav.apps}}
<li class="{{$sel.apps}}">
- <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="icon-cogs"></i></a>
+ <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="fa fa-cogs"></i></a>
</li>
{{/if}}
{{if $nav.help}}
<li class="{{$sel.help}}{{if $nav.help.6}} hidden-xs{{/if}}">
- <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}</a>
+ <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="fa fa-question-circle"></i>{{else}}<i class="fa fa-question"></i>{{/if}}</a>
</li>
{{/if}}
</ul>
@@ -204,8 +204,8 @@
<div id="contextual-help-content" class="contextual-help-content">
{{$nav.help.5}}
<div class="pull-right">
- <a class="contextual-help-tool" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="icon-question"></i></a>
- <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="icon-remove"></i></a>
+ <a class="contextual-help-tool" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i></a>
+ <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a>
</div>
</div>
{{/if}}
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index d7d48cfd2..0b7f792a6 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -6,7 +6,7 @@
<div class="input-group">
<input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
- <button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
+ <button class="btn btn-default btn-sm" type="submit" name="submit"><i class="fa fa-search"></i></button>
</div>
</div>
</div>
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 3007c0bcc..e6cb61637 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,17 +1,17 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button>
- <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button>
+ <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+ <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
{{if $order}}
- <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
+ <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a>
{{/if}}
<div class="btn-group btn-group">
{{if $album_edit.1}}
- <i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+ <i class="fa fa-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
{{/if}}
{{if $can_post}}
- <button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+ <button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
{{/if}}
</div>
</div>
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
index 24aff0209..9c0a65d1c 100755
--- a/view/tpl/photo_drop.tpl
+++ b/view/tpl/photo_drop.tpl
@@ -1,3 +1,3 @@
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
- <a class="btn btn-default btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="icon-trash"></i></a>
+ <a class="btn btn-default btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="fa fa-trash-o"></i></a>
</div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index ca2b5e090..76259a8be 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -5,25 +5,25 @@
{{if $tools || $map || $edit}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
- <i class="icon-caret-down"></i>&nbsp;{{$tools_label}}
+ <i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu">
{{if $tools}}
<li class="nav-item">
- <a class="nav-link" href="{{$tools.profile.0}}"><i class="icon-user"></i>&nbsp;{{$tools.profile.1}}</a>
+ <a class="nav-link" href="{{$tools.profile.0}}"><i class="fa fa-user"></i>&nbsp;{{$tools.profile.1}}</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="{{$tools.cover.0}}"><i class="icon-picture"></i>&nbsp;{{$tools.cover.1}}</a>
+ <a class="nav-link" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i>&nbsp;{{$tools.cover.1}}</a>
</li>
{{/if}}
{{if $map}}
<li class="nav-item">
- <a class="nav-link" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="icon-globe"></i>&nbsp;{{$map_text}}</a>
+ <a class="nav-link" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i>&nbsp;{{$map_text}}</a>
</li>
{{/if}}
{{if $edit}}
<li class="nav-item">
- <a class="nav-link" href="#" title="" onclick="openClose('photo-edit'); return false;"><i class="icon-pencil"></i>&nbsp;{{$edit.edit}}</a>
+ <a class="nav-link" href="#" title="" onclick="openClose('photo-edit'); return false;"><i class="fa fa-pencil"></i>&nbsp;{{$edit.edit}}</a>
</li>
{{/if}}
</ul>
@@ -31,17 +31,17 @@
{{/if}}
{{if $lock}}
<div class="btn-group">
- <button id="lockview" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="icon-lock"></i></button>
+ <button id="lockview" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="fa fa-lock"></i></button>
<ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
</div>
{{/if}}
{{if $prevlink || $nextlink}}
<div class="btn-group">
{{if $prevlink}}
- <a href="{{$prevlink.0}}" class="btn btn-default btn-xs" title="{{$prevlink.1}}"><i class="icon-backward"></i></a>
+ <a href="{{$prevlink.0}}" class="btn btn-default btn-xs" title="{{$prevlink.1}}"><i class="fa fa-backward"></i></a>
{{/if}}
{{if $nextlink}}
- <a href="{{$nextlink.0}}" class="btn btn-default btn-xs" title="{{$nextlink.1}}"><i class="icon-forward"></i></a>
+ <a href="{{$nextlink.0}}" class="btn btn-default btn-xs" title="{{$nextlink.1}}"><i class="fa fa-forward"></i></a>
{{/if}}
</div>
{{/if}}
@@ -96,7 +96,7 @@
<div class="form-group btn-group pull-right">
{{if $edit.aclselect}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i>
+ <i id="jot-perms-icon" class="fa fa-{{$edit.lockstate}}"></i>
</button>
{{/if}}
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
@@ -111,7 +111,7 @@
<div class="photo-item-tools-left" id="in-this-photo">
<span id="in-this-photo-text">{{$tag_hdr}}</span>
{{foreach $tags as $t}}
- {{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}" onclick="return confirmDelete();"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
+ {{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}" onclick="return confirmDelete();"><i class="fa fa-times"></i></a>&nbsp;</span>{{/if}}
{{/foreach}}
</div>
{{/if}}
@@ -155,10 +155,10 @@
{{if $likebuttons}}
<div class="photo-item-tools-right btn-group pull-right">
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false">
- <i class="icon-thumbs-up-alt" title="{{$likebuttons.likethis}}"></i>
+ <i class="fa fa-thumbs-o-up" title="{{$likebuttons.likethis}}"></i>
</button>
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false">
- <i class="icon-thumbs-down-alt" title="{{$likebuttons.nolike}}"></i>
+ <i class="fa fa-thumbs-o-down" title="{{$likebuttons.nolike}}"></i>
</button>
</div>
<div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 3e296658f..c40dda145 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,10 +1,10 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button>
- <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button>
+ <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+ <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
{{if $can_post}}
- <button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+ <button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
{{/if}}
</div>
<h2>{{$title}}</h2>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 5bcef5dc1..6b98a8ac4 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -30,7 +30,7 @@
<div class="btn-group">
{{if $lockstate}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+ <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
</button>
{{/if}}
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
@@ -49,7 +49,7 @@
<div id="photos-upload-perms" class="btn-group pull-right">
{{if $lockstate}}
<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+ <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
</button>
{{/if}}
<div class="pull-right">
diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
index 6298ca0aa..8b442e4b9 100755
--- a/view/tpl/posted_date_widget.tpl
+++ b/view/tpl/posted_date_widget.tpl
@@ -2,13 +2,13 @@
function toggle_posted_date_button() {
if($('#posted-date-dropdown').is(':visible')) {
- $('#posted-date-icon').removeClass('icon-caret-up');
- $('#posted-date-icon').addClass('icon-caret-down');
+ $('#posted-date-icon').removeClass('fa-caret-up');
+ $('#posted-date-icon').addClass('fa-caret-down');
$('#posted-date-dropdown').hide();
}
else {
- $('#posted-date-icon').addClass('icon-caret-up');
- $('#posted-date-icon').removeClass('icon-caret-down');
+ $('#posted-date-icon').addClass('fa-caret-up');
+ $('#posted-date-icon').removeClass('fa-caret-down');
$('#posted-date-dropdown').show();
}
}
@@ -40,7 +40,7 @@ function toggle_posted_date_button() {
{{/foreach}}
{{if $cutoff}}
</div>
- <button class="btn btn-default btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="icon-caret-down"></i></button>
+ <button class="btn btn-default btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="fa fa-caret-down"></i></button>
{{/if}}
</ul>
</div>
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index f928aa3ee..c617e6c14 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -9,11 +9,11 @@
{{/if}}
{{if $profile.canlike}}
<button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" >
- <i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i>
+ <i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i>
</button>
{{/if}}
{{if $editmenu.multi}}
- <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="icon-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+ <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
<ul class="dropdown-menu" role="menu">
{{foreach $editmenu.menu.entries as $e}}
<li>
@@ -24,7 +24,7 @@
{{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}}
</ul>
{{elseif $editmenu}}
- <a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="icon-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
+ <a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i>&nbsp;{{$editmenu.edit.3}}</a>
{{/if}}
</div>
<h2>{{$title}}</h2>
@@ -71,7 +71,7 @@
{{if $f == 'marital'}}
{{if $profile.marital}}
<dl id="aprofile-marital" class="aprofile">
- <dt><span class="heart"><i class="icon-heart"></i>&nbsp;</span>{{$profile.marital.0}}</dt>
+ <dt><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$profile.marital.0}}</dt>
<dd>{{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}</dd>
</dl>
{{/if}}
@@ -273,11 +273,11 @@
<b>{{$profile.fullname.1}} {{$key}}</b>
<ul class="profile-thing-list">
{{foreach $items as $item}}
- <li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}}
+ <li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" class="profile-thing-img" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}}
<a href="{{$item.url}}" >{{$item.term}}</a>
{{if $profile.canlike}}<br />
<button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" >
- <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
+ <i class="fa fa-thumbs-o-up" title="{{$likethis}}"></i>
</button>
{{/if}}
{{if $item.like_count}}
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 4908646b9..deabc2795 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -2,24 +2,24 @@
<div class="section-title-wrapper">
<div class="dropdown pull-right" id="profile-edit-links">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <i class="icon-caret-down"></i>&nbsp;{{$tools_label}}
+ <i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu">
<li class="nav-item">
- <a class="nav-link" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="icon-user"></i>&nbsp;{{$profpic}}</a>
+ <a class="nav-link" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-user"></i>&nbsp;{{$profpic}}</a>
</li>
{{if $is_default}}
<li class="nav-item">
- <a href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="icon-picture"></i>&nbsp;{{$coverpic}}</a>
+ <a href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-picture-o"></i>&nbsp;{{$coverpic}}</a>
</li>
{{/if}}
{{if ! $is_default}}
<li class="nav-item">
- <a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="icon-pencil"></i>&nbsp;{{$editvis}}</a>
+ <a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil"></i>&nbsp;{{$editvis}}</a>
</li>
{{/if}}
<li class="nav-item">
- <a href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="icon-plus-sign"></i>&nbsp;{{$addthing}}</a>
+ <a href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="fa fa-plus-circle"></i>&nbsp;{{$addthing}}</a>
</li>
<li class="divider"></li>
<li class="nav-item">
@@ -44,7 +44,7 @@
{{if ! $is_default}}
<li class="divider"></li>
<li class="nav-item">
- <a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$del_prof}}</a>
+ <a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$del_prof}}</a>
</li>
{{/if}}
<ul>
@@ -164,7 +164,7 @@
<div class="section-content-tools-wrapper">
{{if $fields.marital }}
<div id="profile-edit-marital-wrapper" class="form-group field" >
- <label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart"><i class="icon-heart"></i>&nbsp;</span>{{$lbl_marital}}</label>
+ <label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$lbl_marital}}</label>
{{if $advanced}}
{{$marital}}
{{else}}
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
index 2f39f0903..fade7be7c 100755
--- a/view/tpl/profile_listing_header.tpl
+++ b/view/tpl/profile_listing_header.tpl
@@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- <a class="btn btn-success btn-xs pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="icon-plus-sign"></i>&nbsp;{{$cr_new}}</a>
+ <a class="btn btn-success btn-xs pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="fa fa-plus-circle"></i>&nbsp;{{$cr_new}}</a>
<h2>{{$header}}</h2>
</div>
<div class="section-content-wrapper">
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index cff1e4e14..b4d21b6e7 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -3,12 +3,12 @@
<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
{{/if}}
{{if $connect}}
- <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+ <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
{{/if}}
{{if ! $zcard}}
{{if $editmenu.multi}}
<div class="dropdown">
- <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" href="#" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a>
+ <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
<ul class="dropdown-menu" role="menu">
{{foreach $editmenu.menu.entries as $e}}
<li>
@@ -20,12 +20,12 @@
</ul>
</div>
{{elseif $editmenu}}
- <a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a>
+ <a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
{{/if}}
{{/if}}
{{if ! $zcard}}
- <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
+ <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}
{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
@@ -45,7 +45,7 @@
{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
- {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="icon-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+ {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
index d3762d950..0984a4e5f 100755
--- a/view/tpl/profile_vcard_short.tpl
+++ b/view/tpl/profile_vcard_short.tpl
@@ -1,7 +1,7 @@
{{$contact_block}}
{{if $connect}}
- <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+ <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
{{/if}}
@@ -26,7 +26,7 @@
{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
- {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="icon-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+ {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 20f5df39a..0c9b9ba1d 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -41,39 +41,39 @@
<div id="prvmail-tools" class="btn-toolbar pull-left">
<div class="btn-group">
<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
- <i class="icon-bold jot-icons"></i>
+ <i class="fa fa-bold jot-icons"></i>
</button>
<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;">
- <i class="icon-italic jot-icons"></i>
+ <i class="fa fa-italic jot-icons"></i>
</button>
<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;">
- <i class="icon-underline jot-icons"></i>
+ <i class="fa fa-underline jot-icons"></i>
</button>
<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;">
- <i class="icon-quote-left jot-icons"></i>
+ <i class="fa fa-quote-left jot-icons"></i>
</button>
<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;">
- <i class="icon-terminal jot-icons"></i>
+ <i class="fa fa-terminal jot-icons"></i>
</button>
</div>
<div class="btn-group hidden-xs">
<button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" >
- <i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
+ <i id="prvmail-attach" class="fa fa-paperclip jot-icons" title="{{$attach}}"></i>
</button>
<button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" >
- <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
+ <i id="prvmail-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i>
</button>
</div>
{{if $feature_expire || $feature_encrypt}}
<div class="btn-group hidden-sm hidden-xs">
{{if $feature_expire}}
<button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" >
- <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i>
+ <i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i>
</button>
{{/if}}
{{if $feature_encrypt}}
<button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
- <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i>
+ <i id="prvmail-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i>
</button>
{{/if}}
</div>
@@ -81,15 +81,15 @@
<div class="btn-group visible-xs visible-sm">
<button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
- <i id="more-tools-icon" class="icon-caret-down jot-icons"></i>
+ <i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
- <li class="visible-xs"><a href="#" id="prvmail-attach-sub"><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>
- <li class="visible-xs"><a href="#" onclick="prvmailJotGetLink(); return false;" ><i class="icon-link"></i>&nbsp;{{$insert}}</a></li>
+ <li class="visible-xs"><a href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a></li>
+ <li class="visible-xs"><a href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i>&nbsp;{{$insert}}</a></li>
{{if $feature_expire || $feature_encrypt}}
<li class="divider visible-xs"></li>
- <li class="visible-sm visible-xs"><a href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="icon-eraser"></i>&nbsp;{{$expires}}</a></li>
- <li class="visible-sm visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li>
+ <li class="visible-sm visible-xs"><a href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i>&nbsp;{{$expires}}</a></li>
+ <li class="visible-sm visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a></li>
{{/if}}
</ul>
</div>
diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl
index 1f7861078..2065cd714 100644
--- a/view/tpl/saved_searches.tpl
+++ b/view/tpl/saved_searches.tpl
@@ -5,7 +5,7 @@
<ul id="saved-search-list" class="nav nav-pills nav-stacked">
{{foreach $saved as $search}}
<li id="search-term-{{$search.id}}">
- <a class="pull-right group-edit-tool" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="group-edit-icon icon-trash" ></i></a>
+ <a class="pull-right group-edit-tool" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropfa-floppy-od-search-term-{{$search.id}}" class="group-edit-icon fa fa-trash-o" ></i></a>
<a id="saved-search-term-{{$search.id}}"{{if $search.selected}} class="search-selected"{{/if}} href="{{$search.srchlink}}">{{$search.displayterm}}</a>
</li>
{{/foreach}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 872551529..51fa8b8dc 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -26,14 +26,14 @@
{{/if}}
{{if $item.lock}}
<div class="wall-item-lock dropdown">
- <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+ <i class="fa fa-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
</div>
{{/if}}
<div class="wall-item-author">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" 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>{{/if}}
</div>
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
- {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+ {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
</div>
<div class="clear"></div>
</div>
@@ -71,7 +71,7 @@
<div class="wall-item-tools">
<div class="wall-item-tools-right btn-group pull-right">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
- <i class="icon-caret-down"></i>
+ <i class="fa fa-caret-down"></i>
</button>
<ul class="dropdown-menu">
{{if $item.item_photo_menu}}
@@ -79,13 +79,13 @@
{{/if}}
{{if $item.drop.dropping}}
<li role="presentation" class="divider"></li>
- <li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
+ <li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li>
{{/if}}
</ul>
</div>
{{if $item.attachments}}
<div class="wall-item-tools-left btn-group">
- <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+ <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
<ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
</div>
{{/if}}
diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl
index f4301f0f5..8eb169b4a 100644
--- a/view/tpl/searchbox.tpl
+++ b/view/tpl/searchbox.tpl
@@ -3,9 +3,9 @@
<div id="{{$id}}" class="input-group">
<input class="widget-input" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
<div class="input-group-btn">
- <button type="submit" name="submit" class="btn btn-default btn-sm" id="search-submit" value="{{$search_label}}"><i class="icon-search"></i></button>
+ <button type="submit" name="submit" class="btn btn-default btn-sm" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
{{if $savedsearch}}
- <button type="submit" name="searchsave" class="btn btn-default btn-sm" id="search-save" value="{{$save_label}}"><i class="icon-save"></i></button>
+ <button type="submit" name="searchsave" class="btn btn-default btn-sm" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button>
{{/if}}
</div>
</div>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 6f50f820a..ab5b2f93c 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- {{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>{{/if}}
+ {{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>{{/if}}
<h2>{{$ptitle}}</h2>
<div class="clear"></div>
</div>
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index 4a93e0610..06f47bbe1 100755
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
@@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- <a title="{{$removeaccount}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
+ <a title="{{$removeaccount}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>
<h2>{{$title}}</h2>
<div class="clear"></div>
</div>
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
index 94d76028a..02ca26234 100755
--- a/view/tpl/settings_oauth.tpl
+++ b/view/tpl/settings_oauth.tpl
@@ -25,8 +25,8 @@
{{/if}}
{{/if}}
{{if $app.my}}
- <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="icon-pencil btn btn-default"></i></a>
- <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-trash btn btn-default"></i></a>
+ <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-default"></i></a>
+ <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-default"></i></a>
{{/if}}
</div>
{{/foreach}}
diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl
index 4ffacc241..697e0488d 100644
--- a/view/tpl/sharedwithme.tpl
+++ b/view/tpl/sharedwithme.tpl
@@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a>
+ <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="fa fa-trash-o"></i>&nbsp;{{$dropall}}</a>
<h2>{{$header}}</h2>
</div>
<div class="section-content-wrapper-np">
@@ -16,7 +16,7 @@
<tr id="cloud-index-{{$item.id}}">
<td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
- <td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
+ <td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
<td class="hidden-xs">{{$item.objfilesize}}</td>
<td class="hidden-xs">{{$item.objedited}}</td>
</tr>
diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl
index c98003ea2..85d7934b5 100644
--- a/view/tpl/show_thing.tpl
+++ b/view/tpl/show_thing.tpl
@@ -6,8 +6,8 @@
</div>
{{if $canedit}}
<div class="thing-edit-links">
-<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-default" ><i class="icon-pencil thing-edit-icon"></i></a>
-<a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default" ><i class="icon-trash drop-icons"></i></a>
+<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-default" ><i class="fa fa-pencil thing-edit-icon"></i></a>
+<a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default" ><i class="fa fa-trash-o drop-icons"></i></a>
</div>
<div class="thing-edit-links-end"></div>
{{/if}}
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
index 2008193f9..26d9da7ce 100755
--- a/view/tpl/suggest_friends.tpl
+++ b/view/tpl/suggest_friends.tpl
@@ -4,13 +4,13 @@
<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
</a>
</div>
- <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="icon-remove drop-icons btn btn-default"></i></a>
+ <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="fa fa-times drop-icons btn btn-default"></i></a>
<div class="profile-match-break"></div>
<div class="profile-match-name">
<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
</div>
<div class="profile-match-end"></div>
{{if $entry.connlnk}}
- <div class="profile-match-connect btn btn-default"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="icon-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
+ <div class="profile-match-connect btn btn-default"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conntxt}}</a></div>
{{/if}}
</div>
diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl
index d513d2855..356693782 100644
--- a/view/tpl/thing_edit.tpl
+++ b/view/tpl/thing_edit.tpl
@@ -33,7 +33,7 @@
{{if $lockstate}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+ <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
</button>
{{/if}}
diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl
index 22f8f5cb6..75497e878 100644
--- a/view/tpl/thing_input.tpl
+++ b/view/tpl/thing_input.tpl
@@ -33,7 +33,7 @@
{{if $lockstate}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+ <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
</button>
{{/if}}
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
index 4ecf823dd..547c5f308 100644
--- a/view/tpl/usermenu.tpl
+++ b/view/tpl/usermenu.tpl
@@ -2,7 +2,7 @@
<div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
{{/if}}
{{if $menu.menu_desc}}
- <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
+ <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
{{/if}}
{{if $items}}
<ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills nav-stacked{{elseif !$wrap || $class}} {{$class}}{{/if}}">
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index 864705121..524460408 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -2,7 +2,7 @@
<div class="section-title-wrapper">
{{if $editor}}
<div class="pull-right">
- <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
+ <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
</div>
{{/if}}
<h2>{{$listtitle}}</h2>
@@ -41,23 +41,23 @@
</td>
<td class="webpage-list-tool dropdown">
{{if $item.lockstate=='lock'}}
- <i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
+ <i class="fa fa-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
<ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $edit}}
- <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+ <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $item.bb_element}}
- <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+ <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $edit}}
- <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+ <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
{{/if}}
</td>
<td class="hidden-xs">
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index 52bf6ab47..9a1e23beb 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,7 +1,7 @@
<div id="vcard" class="vcard">
<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
{{if $connect}}
-<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
{{/if}}
<div class="fn">{{$name}}</div>
</div>