1
0

Accepting request 520232 from GNOME:Next

Resub, now with patch + extra diff to fix the last fail in finish translation

OBS-URL: https://build.opensuse.org/request/show/520232
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=357
This commit is contained in:
Bjørn Lie 2017-09-01 18:45:43 +00:00 committed by Git OBS Bridge
parent c7e905b054
commit f4bb03aaaf
5 changed files with 211 additions and 5 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:55540de3e04761635a58e3baf33b6f4866326a8ed9a3a0affc11e3a6bb166c06
size 7401528

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ebb706a317d60e8f5077f73519d2faf485e202801b123eefae81e68c79cc3a2b
size 7384212

View File

@ -0,0 +1,181 @@
From 69667d83cd2c9fc437914fd7464d272e6f968199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= <jiri.gronroos@iki.fi>
Date: Fri, 1 Sep 2017 14:08:27 +0000
Subject: Update Finnish translation
---
po/fi.po | 44 +++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/po/fi.po b/po/fi.po
index d589d1c..0ff67f4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -26,8 +26,8 @@ msgstr ""
"Project-Id-Version: gnome-control-center\n"
"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-29 08:17+0000\n"
-"PO-Revision-Date: 2017-08-31 10:30+0300\n"
+"POT-Creation-Date: 2017-08-31 07:30+0000\n"
+"PO-Revision-Date: 2017-09-01 17:04+0300\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
"Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
"Language: fi\n"
@@ -35,7 +35,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 1.8.7.1\n"
"X-POT-Import-Date: 2012-03-07 10:37:43+0000\n"
"X-Project-Style: gnome\n"
@@ -137,7 +137,7 @@ msgstr "Voit lisätä kuvia %s-kansioon, jolloin ne näkyvät täällä"
#: ../panels/privacy/cc-privacy-panel.c:1049
#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
#: ../panels/search/cc-search-locations-dialog.c:642
-#: ../panels/sharing/cc-sharing-panel.c:375
+#: ../panels/sharing/cc-sharing-panel.c:382
#: ../panels/user-accounts/data/account-dialog.ui.h:2
#: ../panels/user-accounts/data/join-dialog.ui.h:2
#: ../panels/user-accounts/data/password-dialog.ui.h:2
@@ -1501,9 +1501,7 @@ msgstr "Tiedot"
#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
msgid "Remo­vable Media"
-msgstr ""
-"Erilliset\n"
-"tallennusvälineet"
+msgstr "Erilliset tallennusvälineet"
#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
msgid "Configure Removable Media settings"
@@ -2106,7 +2104,7 @@ msgid "Single click, secondary button"
msgstr "Yksi napsautus, toissijainen painike"
#. add proxy to device list
-#: ../panels/network/cc-network-panel.c:581
+#: ../panels/network/cc-network-panel.c:579
msgid "Network proxy"
msgstr "Verkon välityspalvelin"
@@ -2114,17 +2112,17 @@ msgstr "Verkon välityspalvelin"
#. * window for vpn connections, it is also used to display
#. * vpn connections in the device list.
#.
-#: ../panels/network/cc-network-panel.c:717 ../panels/network/net-vpn.c:192
+#: ../panels/network/cc-network-panel.c:715 ../panels/network/net-vpn.c:192
#: ../panels/network/net-vpn.c:321
#, c-format
msgid "%s VPN"
msgstr "%s - VPN"
-#: ../panels/network/cc-network-panel.c:781 ../panels/network/wifi.ui.h:7
+#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7
msgid "Oops, something has gone wrong. Please contact your software vendor."
msgstr "Hups, jokin taisi mennä pieleen. Ota yhteys sovellustoimittajaan."
-#: ../panels/network/cc-network-panel.c:787
+#: ../panels/network/cc-network-panel.c:785
msgid "NetworkManager needs to be running."
msgstr "NetworkManagerin tulee olla käynnissä."
@@ -2597,7 +2595,7 @@ msgstr "Valitse tuotava tiedosto"
#: ../panels/network/connection-editor/vpn-helpers.c:182
#: ../panels/printers/pp-details-dialog.c:320
-#: ../panels/sharing/cc-sharing-panel.c:376
+#: ../panels/sharing/cc-sharing-panel.c:383
#: ../panels/user-accounts/um-photo-dialog.c:222
msgid "_Open"
msgstr "_Avaa"
@@ -5298,32 +5296,32 @@ msgstr "Asetukset"
msgid "No networks selected for sharing"
msgstr "Ei verkkoja valittu jakamista varten"
-#: ../panels/sharing/cc-sharing-panel.c:266
+#: ../panels/sharing/cc-sharing-panel.c:273
msgctxt "service is enabled"
msgid "On"
msgstr "Päällä"
-#: ../panels/sharing/cc-sharing-panel.c:268
-#: ../panels/sharing/cc-sharing-panel.c:295
+#: ../panels/sharing/cc-sharing-panel.c:275
+#: ../panels/sharing/cc-sharing-panel.c:302
msgctxt "service is disabled"
msgid "Off"
msgstr "Pois"
-#: ../panels/sharing/cc-sharing-panel.c:298
+#: ../panels/sharing/cc-sharing-panel.c:305
msgctxt "service is enabled"
msgid "Enabled"
msgstr "Käytössä"
-#: ../panels/sharing/cc-sharing-panel.c:301
+#: ../panels/sharing/cc-sharing-panel.c:308
msgctxt "service is active"
msgid "Active"
msgstr "Aktiivinen"
-#: ../panels/sharing/cc-sharing-panel.c:372
+#: ../panels/sharing/cc-sharing-panel.c:379
msgid "Choose a Folder"
msgstr "Valitse kansio"
-#: ../panels/sharing/cc-sharing-panel.c:683
+#: ../panels/sharing/cc-sharing-panel.c:690
#, c-format
msgid ""
"Personal File Sharing allows you to share your Public folder with others on "
@@ -5332,7 +5330,7 @@ msgstr ""
"Henkilökohtaisen tiedostonjaon avulla voit jakaa julkisen kansiosi verkon "
"muiden käyttäjien kanssa käyttäen osoitetta <a href=\"dav://%s\">dav://%s</a>"
-#: ../panels/sharing/cc-sharing-panel.c:685
+#: ../panels/sharing/cc-sharing-panel.c:692
#, c-format
msgid ""
"When remote login is enabled, remote users can connect using the Secure "
@@ -5343,7 +5341,7 @@ msgstr ""
"Secure Shell -komentoa:\n"
"<a href=\"ssh %s\">ssh %s</a>"
-#: ../panels/sharing/cc-sharing-panel.c:687
+#: ../panels/sharing/cc-sharing-panel.c:694
#, c-format
msgid ""
"Screen sharing allows remote users to view or control your screen by "
@@ -5352,11 +5350,11 @@ msgstr ""
"Näytön jakaminen sallii etäkäyttäjien seurata ja hallita näyttöäsi "
"yhdistämällä kohteeseen <a href=\"vnc://%s\">vnc://%s</a>"
-#: ../panels/sharing/cc-sharing-panel.c:799
+#: ../panels/sharing/cc-sharing-panel.c:806
msgid "Copy"
msgstr "Kopioi"
-#: ../panels/sharing/cc-sharing-panel.c:1125
+#: ../panels/sharing/cc-sharing-panel.c:1233
msgid "Sharing"
msgstr "Jakaminen"
--
cgit v0.12
--- gnome-control-center-3.25.92-orig/po/fi.po 2017-09-01 14:20:48.000000000 +0200
+++ gnome-control-center-3.25.92/po/fi.po 2017-09-01 18:51:53.651290930 +0200
@@ -1473,8 +1473,7 @@
#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
msgid "Ab­out"
msgstr ""
-"Järjestelmä-\n"
-"tiedot"
+"Järjestelmä-tiedot"
#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
#: ../panels/info/gnome-info-panel.desktop.in.in.h:3

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Fri Sep 1 12:51:26 UTC 2017 - zaitor@opensuse.org
- Update to version 3.25.92:
+ A few more layout adjustments for the new shell.
+ Make Devices and Details rows selectable.
+ Crash and memory leak fixes.
+ Display:
- Fix the two output UI to start with the current
configuration.
- Ensure we generate the UI initially on two output mode.
- Don't show inactive monitors in the arrangement widget.
- Show refresh rates with two digits after the radix.
- Round the displayed scale values logically.
- Fix some valid scaled multi monitor layouts being rejected by
mutter.
+ Sharing: Add Wayland screen sharing support - only shown if
mutter advertises the capability.
+ Updated translations.
- Add gnome-control-center-fix-finish-translation.patch: Fix the
finish translation, it broke the build.
-------------------------------------------------------------------
Thu Aug 31 10:50:11 UTC 2017 - zaitor@opensuse.org

View File

@ -29,7 +29,7 @@
%define with_cacert_patch 0
Name: gnome-control-center
Version: 3.25.91
Version: 3.25.92
Release: 0
Summary: The GNOME Control Center
License: GPL-2.0+
@ -52,6 +52,8 @@ Patch20: gnome-control-center-disable-error-message-for-NM.patch
Patch21: gnome-control-center-info-never-use-gnome-software.patch
# PATCH-FIX-OPENSUSE gnome-control-center-more-power-button-actions.patch bsc#993381 fezhang@suse.com -- power: Bring back the "shutdown" and "interactive" power button actions.
Patch22: gnome-control-center-more-power-button-actions.patch
# PATCH-FIX-UPSTREAM gnome-control-center-fix-finish-translation.patch zaitor@opensuse.org -- Fix broken finish translation.
Patch23: gnome-control-center-fix-finish-translation.patch
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@ -78,7 +80,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.53.0
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.18.2
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.19.93
BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.25.90
BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.25.92
BuildRequires: pkgconfig(goa-1.0) >= 3.25.3
BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
@ -217,6 +219,7 @@ translation-update-upstream
%patch21 -p1
%patch22 -p1
%endif
%patch23 -p1
%build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh