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

diff --git a/js/acl.js b/js/acl.js
index 36cf74970fbac1e83df66fa67da46f4d0711040c..abdab97da19aa8fb035b984b3fb126a36534a38a 100644 (file)
--- a/js/acl.js
+++ b/js/acl.js
@@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
                //console.log(html);
                that.list_content.append(html);
        });
-       $(".acl-list-item img[data-src]").each(function(i, el){
-               // Replace data-src attribute with src attribute for every image
+       $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
+               // Add src attribute for images with a data-src attribute
                $(el).attr('src', $(el).data("src"));
-               $(el).removeAttr("data-src");
        });
        that.update_view();
 }

diff --git a/js/main.js b/js/main.js
index 5cdf2a08047d0a13bf7b290ef3f352b3b838b00e..f17d1eaa0f747a2790b3e3070b9944f59231d2bb 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -183,9 +183,8 @@
                                });
 
                                $("img[data-src]", nnm).each(function(i, el){
-                                       // Replace data-src attribute with src attribute for every image
+                                       // Add src attribute for images with a data-src attribute
                                        $(el).attr('src', $(el).data("src"));
-                                       $(el).removeAttr("data-src");
                                });
                        }
 

diff --git a/view/de/messages.po b/view/de/messages.po
index 400dce439098cc4720c5679a3a9ced53d9a3af7b..a3624c4abadad1c46a79ec28689fb296e1aabbdb 100644 (file)
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -16,16 +16,16 @@
 #   <matthias@matthiasmoritz.de>, 2012.
 # Oliver  <post@toktan.org>, 2012.
 #   <sebastian@sebsen.net>, 2012.
-#   <tobias.diekershoff@gmx.net>, 2011-2012.
+#   <tobias.diekershoff@gmx.net>, 2011-2013.
 #   <transifex@zottel.net>, 2011-2012.
 #   <ts+transifex@ml.tschlotfeldt.de>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-12-31 10:00-0800\n"
-"PO-Revision-Date: 2012-12-31 11:02+0000\n"
-"Last-Translator: Sennewood <sebastian@sebsen.net>\n"
+"POT-Creation-Date: 2013-01-01 10:00-0800\n"
+"PO-Revision-Date: 2013-01-02 10:07+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -9567,11 +9567,11 @@ msgstr "%s mag das nicht."
 
 #: ../../include/conversation.php:884
 msgid "like this"
-msgstr "mag ich"
+msgstr "mögen dies"
 
 #: ../../include/conversation.php:888
 msgid "don't like this"
-msgstr "mag ich nicht"
+msgstr "mögen dies nicht"
 
 #: ../../include/conversation.php:895
 msgid "people"

diff --git a/view/de/strings.php b/view/de/strings.php
index 22b23f79bb2aaefbcf44c59ff9bf38a70d39f141..cea444b16af64b2b370eff1a90f4b43ef145c3a8 100644 (file)
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -2059,8 +2059,8 @@ $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
 $a->strings["Follow Thread"] = "Folge der Unterhaltung";
 $a->strings["%s likes this."] = "%s mag das.";
 $a->strings["%s doesn't like this."] = "%s mag das nicht.";
-$a->strings["like this"] = "mag ich";
-$a->strings["don't like this"] = "mag ich nicht";
+$a->strings["like this"] = "mögen dies";
+$a->strings["don't like this"] = "mögen dies nicht";
 $a->strings["people"] = "Leute";
 $a->strings["and"] = "und";
 $a->strings[", and %d other people"] = " und %d andere";

diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js
index 20f0d461895cc1898d8fd28c8def9b9d1798b0c8..4e319577f78b80f2aca06b4ae80e8372920c8f78 100644 (file)
--- a/view/theme/frost-mobile/js/acl.js
+++ b/view/theme/frost-mobile/js/acl.js
@@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
                //console.log(html);
                that.list_content.append(html);
        });
-       $(".acl-list-item img[data-src]").each(function(i, el){
-               // Replace data-src attribute with src attribute for every image
+       $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
+               // Add src attribute for images with a data-src attribute
                $(el).attr('src', $(el).data("src"));
-               $(el).removeAttr("data-src");
        });
        that.update_view();
 }

diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index 197d496646cfcdfab30acc123b7d23d8756ed482..5a15b081bd0cf51ad5286312c05f8295fb3ec20f 100644 (file)
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -189,9 +189,8 @@
                                });
 
                                $("img[data-src]", nnm).each(function(i, el){
-                                       // Replace data-src attribute with src attribute for every image
+                                       // Add src attribute for images with a data-src attribute
                                        $(el).attr('src', $(el).data("src"));
-                                       $(el).removeAttr("data-src");
                                });
                        }
                        notif = eNotif.attr('count');

diff --git a/view/theme/frost/js/acl.js b/view/theme/frost/js/acl.js
index 6b443b248165c582b9f87d863d9e4f6bea3598ca..1c843d7fe383b669e6141ca1d68bcba9ac64194a 100644 (file)
--- a/view/theme/frost/js/acl.js
+++ b/view/theme/frost/js/acl.js
@@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
                //console.log(html);
                that.list_content.append(html);
        });
-       $(".acl-list-item img[data-src]").each(function(i, el){
-               // Replace data-src attribute with src attribute for every image
+       $(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
+               // Add src attribute for images with a data-src attribute
                $(el).attr('src', $(el).data("src"));
-               $(el).removeAttr("data-src");
        });
        that.update_view();
 }

diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 91e79ffc383164f9619dd44e4e663fd8a0c7be49..e47ecff376bd6f40dca6d66994ebe3564d49087d 100644 (file)
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -181,9 +181,8 @@
                                });
 
                                $("img[data-src]", nnm).each(function(i, el){
-                                       // Replace data-src attribute with src attribute for every image
+                                       // Add src attribute for images with a data-src attribute
                                        $(el).attr('src', $(el).data("src"));
-                                       $(el).removeAttr("data-src");
                                });
                        }
                        notif = eNotif.attr('count');