summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml3
-rw-r--r--.travis.yml6
-rw-r--r--capplets/time-admin/src/time-zones.h2
-rw-r--r--mate-control-center.pot2
4 files changed, 8 insertions, 5 deletions
diff --git a/.build.yml b/.build.yml
index a1fdeaf9..06c41964 100644
--- a/.build.yml
+++ b/.build.yml
@@ -63,7 +63,8 @@ requires:
- libsystemd-dev
- make
- mate-common
- - policykit-1
+ - polkitd
+ - pkexec
- python3-lxml
- shared-mime-info
- xsltproc
diff --git a/.travis.yml b/.travis.yml
index a8dc5a32..95209182 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,8 @@ notifications:
deploy:
- provider: pages
- edge: true
+ edge:
+ branch: v2.0.3-beta.4
token: $GITHUB_TOKEN
keep_history: false
committer_from_gh: true
@@ -51,7 +52,8 @@ deploy:
all_branches: true
condition: ${DISTRO} =~ ^fedora.*$
- provider: script
- edge: true
+ edge:
+ branch: v2.0.3-beta.4
script: ./docker-build --verbose --config .build.yml --release github
on:
tags: true
diff --git a/capplets/time-admin/src/time-zones.h b/capplets/time-admin/src/time-zones.h
index 55cdd46b..0d4f8540 100644
--- a/capplets/time-admin/src/time-zones.h
+++ b/capplets/time-admin/src/time-zones.h
@@ -361,7 +361,7 @@ N_("Europe/Isle_of_Man");
N_("Europe/Istanbul");
N_("Europe/Jersey");
N_("Europe/Kaliningrad");
-N_("Europe/Kiev");
+N_("Europe/Kyiv");
N_("Europe/Kirov");
N_("Europe/Lisbon");
N_("Europe/Ljubljana");
diff --git a/mate-control-center.pot b/mate-control-center.pot
index a4c3f19e..17e47838 100644
--- a/mate-control-center.pot
+++ b/mate-control-center.pot
@@ -4334,7 +4334,7 @@ msgid "Europe/Kaliningrad"
msgstr ""
#: capplets/time-admin/src/time-zones.h:364
-msgid "Europe/Kiev"
+msgid "Europe/Kyiv"
msgstr ""
#: capplets/time-admin/src/time-zones.h:365