[gnome-software/wip/rancell/reviews: 23/23] Merge branch 'master' into wip/rancell/reviews
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/rancell/reviews: 23/23] Merge branch 'master' into wip/rancell/reviews
- Date: Wed, 24 Feb 2016 00:43:35 +0000 (UTC)
commit 393907f72e696ed66d43a2bc5fbc33bf6a48cd48
Merge: c3d9941 0779986
Author: Robert Ancell <robert ancell canonical com>
Date: Wed Feb 24 13:42:50 2016 +1300
Merge branch 'master' into wip/rancell/reviews
data/org.gnome.software.gschema.xml | 4 +-
po/POTFILES.in | 28 +-
po/pl.po | 988 ++++++++++++++++++------------
po/pt_BR.po | 93 ++--
po/sr.po | 74 ++-
po/sr latin po | 74 ++-
po/zh_TW.po | 277 ++++++---
src/Makefile.am | 2 +
src/gs-app-row.c | 18 +-
src/gs-app-row.ui | 3 +
src/gs-app.c | 1 +
src/gs-category.c | 39 +-
src/gs-page.c | 33 +-
src/gs-page.h | 2 +
src/gs-plugin-loader.c | 14 +
src/gs-review-dialog.ui | 4 +-
src/gs-review-row.c | 52 ++-
src/gs-review-row.ui | 26 +-
src/gs-shell-category.ui | 79 ++-
src/gs-shell-details.c | 23 +-
src/gs-shell-details.ui | 16 +-
src/gs-shell-moderate.c | 14 +
src/gs-update-monitor.c | 15 +-
src/gs-utils.c | 26 +
src/gs-utils.h | 1 +
src/gtk-style.css | 4 +
src/plugins/gs-plugin-appstream.c | 3 +-
src/plugins/gs-plugin-packagekit-proxy.c | 14 +
src/plugins/gs-plugin-xdg-app-reviews.c | 19 +-
src/plugins/gs-plugin-xdg-app.c | 6 +
src/plugins/menu-spec-common.c | 1 +
31 files changed, 1269 insertions(+), 684 deletions(-)
---
diff --cc po/POTFILES.in
index 3dabc52,b32efd6..292740e
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -58,6 -63,4 +63,5 @@@ src/plugins/gs-plugin-moduleset.
src/plugins/gs-plugin-packagekit.c
src/plugins/gs-plugin-packagekit-refine.c
src/plugins/menu-spec-common.c
+[type: gettext/glade]src/plugins/ubuntu-login-dialog.ui
- [type: gettext/glade]src/menus.ui
[type: gettext/glade]src/popular-tile.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]