• mmn's avatar
    Merge branch 'nightly', beginning of 1.2.x · 1e89540c
    mmn authored
    Conflicts:
    	plugins/APC/locale/APC.pot
    	plugins/APC/locale/ast/LC_MESSAGES/APC.po
    	plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
    	plugins/APC/locale/br/LC_MESSAGES/APC.po
    	plugins/APC/locale/de/LC_MESSAGES/APC.po
    	plugins/APC/locale/es/LC_MESSAGES/APC.po
    	plugins/APC/locale/eu/LC_MESSAGES/APC.po
    	plugins/APC/locale/fr/LC_MESSAGES/APC.po
    	plugins/APC/locale/gl/LC_MESSAGES/APC.po
    	plugins/APC/locale/he/LC_MESSAGES/APC.po
    	plugins/APC/locale/ia/LC_MESSAGES/APC.po
    	plugins/APC/locale/id/LC_MESSAGES/APC.po
    	plugins/APC/locale/it/LC_MESSAGES/APC.po
    	plugins/APC/locale/mk/LC_MESSAGES/APC.po
    	plugins/APC/locale/ms/LC_MESSAGES/APC.po
    	plugins/APC/locale/nb/LC_MESSAGES/APC.po
    	plugins/APC/locale/nl/LC_MESSAGES/APC.po
    	plugins/APC/locale/pl/LC_MESSAGES/APC.po
    	plugins/APC/locale/pt/LC_MESSAGES/APC.po
    	plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
    	plugins/APC/locale/ru/LC_MESSAGES/APC.po
    	plugins/APC/locale/tl/LC_MESSAGES/APC.po
    	plugins/APC/locale/uk/LC_MESSAGES/APC.po
    	plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
    	plugins/Adsense/locale/Adsense.pot
    	plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/ca/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/eu/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/he/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/ja/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/lb/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/lt/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/ms/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/nb/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/pl/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/tr/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
    	plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
    	plugins/Aim/locale/Aim.pot
    	plugins/Aim/locale/af/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/ca/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/de/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/es/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/eu/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/fi/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/fr/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/gl/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/ia/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/it/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/mk/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/ms/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/nl/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/pl/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/sv/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/tl/LC_MESSAGES/Aim.po
    	plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
    	plugins/Blog/locale/Blog.pot
    	plugins/Blog/locale/ar/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/br/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/ca/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/de/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/es/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/eu/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/fr/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/gl/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/ia/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/it/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/lt/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/mk/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/nl/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/tl/LC_MESSAGES/Blog.po
    	plugins/Blog/locale/tr/LC_MESSAGES/Blog.po
    	plugins/Irc/locale/Irc.pot
    	plugins/Irc/locale/ca/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/de/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/es/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/eu/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/fi/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/fr/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/gl/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/ia/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/it/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/ja/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/mk/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/nl/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/sv/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/tl/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/tr/LC_MESSAGES/Irc.po
    	plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
    	plugins/Spotify/locale/Spotify.pot
    	plugins/Spotify/locale/de/LC_MESSAGES/Spotify.po
    	plugins/Spotify/locale/es/LC_MESSAGES/Spotify.po
    	plugins/Spotify/locale/fr/LC_MESSAGES/Spotify.po
    	plugins/Spotify/locale/gl/LC_MESSAGES/Spotify.po
    	plugins/Spotify/locale/he/LC_MESSAGES/Spotify.po
    	plugins/Spotify/locale/ia/LC_MESSAGES/Spotify.po
    	plugins/Spotify/locale/mk/LC_MESSAGES/Spotify.po
    	plugins/Spotify/locale/nl/LC_MESSAGES/Spotify.po
    	plugins/Spotify/locale/sv/LC_MESSAGES/Spotify.po
    	plugins/Spotify/locale/tl/LC_MESSAGES/Spotify.po
    	plugins/TinyMCE/locale/TinyMCE.pot
    	plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/de/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/gl/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/ja/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/ms/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
    	plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
    	plugins/XCache/locale/XCache.pot
    	plugins/XCache/locale/ast/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/br/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/de/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/es/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/eu/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/he/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/id/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/ms/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/pl/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
    	plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
    	plugins/YammerImport/locale/YammerImport.pot
    	plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/de/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/es/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/eu/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/ms/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/pl/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/tl/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
    	plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
    1e89540c
Name
Last commit
Last update
..
actions Loading commit data...
classes Loading commit data...
forms Loading commit data...
locale Loading commit data...
GNUsocialVideoPlugin.php Loading commit data...