Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  update to the German strings
  add network_tabs hook
  pass autoname(0) test
  rev update
  added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.

* master:

40 files changed, 0 insertions, 0 deletions

diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
index 4873cdd14..4873cdd14 100755..100644
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl
index 48930b48a..48930b48a 100755..100644
--- a/view/theme/diabook-aerith/contact_template.tpl
+++ b/view/theme/diabook-aerith/contact_template.tpl
diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl
index db1936e4b..db1936e4b 100755..100644
--- a/view/theme/diabook-aerith/directory_item.tpl
+++ b/view/theme/diabook-aerith/directory_item.tpl
diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js
index d183c7573..d183c7573 100755..100644
--- a/view/theme/diabook-aerith/fpostit/fpostit.js
+++ b/view/theme/diabook-aerith/fpostit/fpostit.js
diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl
index af183d04d..af183d04d 100755..100644
--- a/view/theme/diabook-aerith/group_side.tpl
+++ b/view/theme/diabook-aerith/group_side.tpl
diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png
index 1958041cf..1958041cf 100755..100644
--- a/view/theme/diabook-aerith/icons/attach.png
+++ b/view/theme/diabook-aerith/icons/attach.png
diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png
index 8d779a409..8d779a409 100755..100644
--- a/view/theme/diabook-aerith/icons/audio.png
+++ b/view/theme/diabook-aerith/icons/audio.png
diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png
index a5c7f1236..a5c7f1236 100755..100644
--- a/view/theme/diabook-aerith/icons/camera.png
+++ b/view/theme/diabook-aerith/icons/camera.png
diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png
index 28e2675b8..28e2675b8 100755..100644
--- a/view/theme/diabook-aerith/icons/close_box.png
+++ b/view/theme/diabook-aerith/icons/close_box.png
diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png
index 2abb82ef2..2abb82ef2 100755..100644
--- a/view/theme/diabook-aerith/icons/drop.png
+++ b/view/theme/diabook-aerith/icons/drop.png
diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png
index 16713fa53..16713fa53 100755..100644
--- a/view/theme/diabook-aerith/icons/file_as.png
+++ b/view/theme/diabook-aerith/icons/file_as.png
diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png
index 0ef666a67..0ef666a67 100755..100644
--- a/view/theme/diabook-aerith/icons/link.png
+++ b/view/theme/diabook-aerith/icons/link.png
diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png
index 7e34bf279..7e34bf279 100755..100644
--- a/view/theme/diabook-aerith/icons/lock.png
+++ b/view/theme/diabook-aerith/icons/lock.png
diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png
index f8b228347..f8b228347 100755..100644
--- a/view/theme/diabook-aerith/icons/lupe.png
+++ b/view/theme/diabook-aerith/icons/lupe.png
diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png
index e2bf7d24d..e2bf7d24d 100755..100644
--- a/view/theme/diabook-aerith/icons/messages.png
+++ b/view/theme/diabook-aerith/icons/messages.png
diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png
index e2bf7d24d..e2bf7d24d 100755..100644
--- a/view/theme/diabook-aerith/icons/messages2.png
+++ b/view/theme/diabook-aerith/icons/messages2.png
diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png
index 7b5e25b90..7b5e25b90 100755..100644
--- a/view/theme/diabook-aerith/icons/next.png
+++ b/view/theme/diabook-aerith/icons/next.png
diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png
index 2b4fbb818..2b4fbb818 100755..100644
--- a/view/theme/diabook-aerith/icons/notifications.png
+++ b/view/theme/diabook-aerith/icons/notifications.png
diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png
index 9765bfd53..9765bfd53 100755..100644
--- a/view/theme/diabook-aerith/icons/notify.png
+++ b/view/theme/diabook-aerith/icons/notify.png
diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png
index 9765bfd53..9765bfd53 100755..100644
--- a/view/theme/diabook-aerith/icons/notify2.png
+++ b/view/theme/diabook-aerith/icons/notify2.png
diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png
index 772e49b17..772e49b17 100755..100644
--- a/view/theme/diabook-aerith/icons/pencil.png
+++ b/view/theme/diabook-aerith/icons/pencil.png
diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg
index fde5eb535..fde5eb535 100755..100644
--- a/view/theme/diabook-aerith/icons/photo-menu.jpg
+++ b/view/theme/diabook-aerith/icons/photo-menu.jpg
diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png
index 55c1464ba..55c1464ba 100755..100644
--- a/view/theme/diabook-aerith/icons/prev.png
+++ b/view/theme/diabook-aerith/icons/prev.png
diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100755..100644
--- a/view/theme/diabook-aerith/icons/recycle.png
+++ b/view/theme/diabook-aerith/icons/recycle.png
diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png
index a560cc55e..a560cc55e 100755..100644
--- a/view/theme/diabook-aerith/icons/remote.png
+++ b/view/theme/diabook-aerith/icons/remote.png
diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100755..100644
--- a/view/theme/diabook-aerith/icons/scroll_top.png
+++ b/view/theme/diabook-aerith/icons/scroll_top.png
diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png
index 2a30ae252..2a30ae252 100755..100644
--- a/view/theme/diabook-aerith/icons/selected.png
+++ b/view/theme/diabook-aerith/icons/selected.png
diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png
index 0b00cb189..0b00cb189 100755..100644
--- a/view/theme/diabook-aerith/icons/star.png
+++ b/view/theme/diabook-aerith/icons/star.png
diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png
index 2b82dfca3..2b82dfca3 100755..100644
--- a/view/theme/diabook-aerith/icons/starred.png
+++ b/view/theme/diabook-aerith/icons/starred.png
diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png
index 144649ef8..144649ef8 100755..100644
--- a/view/theme/diabook-aerith/icons/tagged.png
+++ b/view/theme/diabook-aerith/icons/tagged.png
diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100755..100644
--- a/view/theme/diabook-aerith/icons/unlock.png
+++ b/view/theme/diabook-aerith/icons/unlock.png
diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png
index ba3183f5c..ba3183f5c 100755..100644
--- a/view/theme/diabook-aerith/icons/unstarred.png
+++ b/view/theme/diabook-aerith/icons/unstarred.png
diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png
index a03d1d818..a03d1d818 100755..100644
--- a/view/theme/diabook-aerith/icons/video.png
+++ b/view/theme/diabook-aerith/icons/video.png
diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png
index 216e78344..216e78344 100755..100644
--- a/view/theme/diabook-aerith/icons/weblink.png
+++ b/view/theme/diabook-aerith/icons/weblink.png
diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl
index ee30da7bf..ee30da7bf 100755..100644
--- a/view/theme/diabook-aerith/jot.tpl
+++ b/view/theme/diabook-aerith/jot.tpl
diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl
index 989f17878..989f17878 100755..100644
--- a/view/theme/diabook-aerith/mail_conv.tpl
+++ b/view/theme/diabook-aerith/mail_conv.tpl
diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl
index 511fc73ac..511fc73ac 100755..100644
--- a/view/theme/diabook-aerith/photo_view.tpl
+++ b/view/theme/diabook-aerith/photo_view.tpl
diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl
index 6a1c5c71b..6a1c5c71b 100755..100644
--- a/view/theme/diabook-aerith/rs_common_tabs.tpl
+++ b/view/theme/diabook-aerith/rs_common_tabs.tpl
diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl
index 123834064..123834064 100755..100644
--- a/view/theme/diabook-aerith/search_item.tpl
+++ b/view/theme/diabook-aerith/search_item.tpl
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index e56f0ab74..e56f0ab74 100755..100644
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php