Hello community, here is the log from the commit of package gnome-maps for openSUSE:Factory checked in at 2015-05-18 21:56:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-maps (Old) and /work/SRC/openSUSE:Factory/.gnome-maps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-maps" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-maps/gnome-maps.changes 2015-04-23 07:56:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-maps.new/gnome-maps.changes 2015-05-18 21:56:51.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 12 19:15:41 UTC 2015 - zai...@opensuse.org + +- Update to version 3.16.2: + + Fix favorite popover size. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnome-maps-3.16.1.tar.xz New: ---- gnome-maps-3.16.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-maps.spec ++++++ --- /var/tmp/diff_new_pack.WRPazO/_old 2015-05-18 21:56:52.000000000 +0200 +++ /var/tmp/diff_new_pack.WRPazO/_new 2015-05-18 21:56:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnome-maps -Version: 3.16.1 +Version: 3.16.2 Release: 0 Summary: MAP Application for GNOME 3 License: GPL-2.0+ ++++++ gnome-maps-3.16.1.tar.xz -> gnome-maps-3.16.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.16.1/NEWS new/gnome-maps-3.16.2/NEWS --- old/gnome-maps-3.16.1/NEWS 2015-04-13 21:27:52.000000000 +0200 +++ new/gnome-maps-3.16.2/NEWS 2015-05-12 20:20:40.000000000 +0200 @@ -1,3 +1,17 @@ +3.16.1 - May 12, 2015 +======================= + +Changes since 3.16.1 + +- Fix favorite popover size + +- Added/updated/fixed translations: + - Simplified Chinese + +All contributors to this release: +Dean Chen <wsxy...@gmail.com> +Jonas Danielsson <jo...@threetimestwo.org> + 3.16.1 - April 13, 2015 ======================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.16.1/configure new/gnome-maps-3.16.2/configure --- old/gnome-maps-3.16.1/configure 2015-04-13 21:29:24.000000000 +0200 +++ new/gnome-maps-3.16.2/configure 2015-05-12 20:22:08.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-maps 3.16.1. +# Generated by GNU Autoconf 2.69 for gnome-maps 3.16.2. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-maps>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gnome-maps' PACKAGE_TARNAME='gnome-maps' -PACKAGE_VERSION='3.16.1' -PACKAGE_STRING='gnome-maps 3.16.1' +PACKAGE_VERSION='3.16.2' +PACKAGE_STRING='gnome-maps 3.16.2' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-maps' PACKAGE_URL='' @@ -1390,7 +1390,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-maps 3.16.1 to adapt to many kinds of systems. +\`configure' configures gnome-maps 3.16.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1461,7 +1461,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-maps 3.16.1:";; + short | recursive ) echo "Configuration of gnome-maps 3.16.2:";; esac cat <<\_ACEOF @@ -1587,7 +1587,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-maps configure 3.16.1 +gnome-maps configure 3.16.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1865,7 +1865,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-maps $as_me 3.16.1, which was +It was created by gnome-maps $as_me 3.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2857,7 +2857,7 @@ # Define the identity of the package. PACKAGE='gnome-maps' - VERSION='3.16.1' + VERSION='3.16.2' # Some tools Automake needs. @@ -13436,7 +13436,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-maps $as_me 3.16.1, which was +This file was extended by gnome-maps $as_me 3.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13502,7 +13502,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-maps config.status 3.16.1 +gnome-maps config.status 3.16.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.16.1/configure.ac new/gnome-maps-3.16.2/configure.ac --- old/gnome-maps-3.16.1/configure.ac 2015-04-13 21:24:14.000000000 +0200 +++ new/gnome-maps-3.16.2/configure.ac 2015-05-12 20:19:09.000000000 +0200 @@ -1,6 +1,6 @@ # This file is processed by autoconf to create a configure script AC_INIT([gnome-maps], - [3.16.1], + [3.16.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-maps], [gnome-maps]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.16.1/po/zh_CN.po new/gnome-maps-3.16.2/po/zh_CN.po --- old/gnome-maps-3.16.1/po/zh_CN.po 2015-02-27 20:29:04.000000000 +0100 +++ new/gnome-maps-3.16.2/po/zh_CN.po 2015-05-12 20:18:58.000000000 +0200 @@ -9,15 +9,15 @@ "Project-Id-Version: gnome-maps master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; "maps&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-09-16 05:35+0000\n" -"PO-Revision-Date: 2014-09-23 18:50+0800\n" -"Last-Translator: Yunqiang Su <wzss...@gmail.com>\n" +"POT-Creation-Date: 2015-04-14 09:15+0000\n" +"PO-Revision-Date: 2015-04-13 19:28+0800\n" +"Last-Translator: Deane.Chen <wsxy...@gmail.com>\n" "Language-Team: Chinese (China) <i18n...@googlegroups.com>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.9\n" +"X-Generator: Poedit 1.7.5\n" #: ../data/org.gnome.Maps.appdata.xml.in.h:1 msgid "" @@ -46,196 +46,614 @@ "near Alexanderplatz, Berlin”。" #. Translators: This is the program name. */ -#: ../data/org.gnome.Maps.desktop.in.in.h:1 ../src/application.js:66 -#: ../src/mainWindow.js:302 ../src/main-window.ui.h:1 +#: ../data/org.gnome.Maps.desktop.in.h:1 ../data/ui/main-window.ui.h:1 +#: ../src/application.js:77 ../src/mainWindow.js:366 msgid "Maps" msgstr "地图" -#: ../data/org.gnome.Maps.desktop.in.in.h:2 +#: ../data/org.gnome.Maps.desktop.in.h:2 msgid "A simple maps application" msgstr "一款简单的地图应用程序" -#: ../data/org.gnome.Maps.desktop.in.in.h:3 +#: ../data/org.gnome.Maps.desktop.in.h:3 msgid "Maps;" msgstr "Maps;地图;" -#: ../data/org.gnome.maps.gschema.xml.in.h:1 +#: ../data/org.gnome.Maps.gschema.xml.h:1 msgid "Window size" msgstr "窗口大小" -#: ../data/org.gnome.maps.gschema.xml.in.h:2 +#: ../data/org.gnome.Maps.gschema.xml.h:2 msgid "Window size (width and height)." msgstr "窗口大小(宽度和高度)。" -#: ../data/org.gnome.maps.gschema.xml.in.h:3 +#: ../data/org.gnome.Maps.gschema.xml.h:3 msgid "Window position" msgstr "窗口位置" -#: ../data/org.gnome.maps.gschema.xml.in.h:4 +#: ../data/org.gnome.Maps.gschema.xml.h:4 msgid "Window position (X and Y)." msgstr "窗口位置(水平和竖直)。" -#: ../data/org.gnome.maps.gschema.xml.in.h:5 +#: ../data/org.gnome.Maps.gschema.xml.h:5 msgid "Window maximized" msgstr "窗口最大化" -#: ../data/org.gnome.maps.gschema.xml.in.h:6 +#: ../data/org.gnome.Maps.gschema.xml.h:6 msgid "Window maximization state" msgstr "窗口最大化状态" -#: ../data/org.gnome.maps.gschema.xml.in.h:7 -msgid "Last known location and accuracy" -msgstr "最近已知的位置和精度" - -#: ../data/org.gnome.maps.gschema.xml.in.h:8 -msgid "" -"Last known location (latitude and longitude in degrees) and accuracy (in " -"meters)." -msgstr "最近已知的位置(经纬度)和精度(米)。" - -#: ../data/org.gnome.maps.gschema.xml.in.h:9 -msgid "Description of last known location" -msgstr "最近已知的位置描述" - -#: ../data/org.gnome.maps.gschema.xml.in.h:10 -msgid "Description of last known location of user." -msgstr "对最近已知的用户位置的描述。" - -#: ../data/org.gnome.maps.gschema.xml.in.h:11 +#: ../data/org.gnome.Maps.gschema.xml.h:7 msgid "Maximum number of search results" msgstr "搜索结果的最大数量" -#: ../data/org.gnome.maps.gschema.xml.in.h:12 +#: ../data/org.gnome.Maps.gschema.xml.h:8 msgid "Maximum number of search results from geocode search." msgstr "来自 geocode 搜索结果的最大数量。" -#: ../data/org.gnome.maps.gschema.xml.in.h:13 -msgid "User set last known location" -msgstr "由用户设置 最近已知的位置" - -#: ../data/org.gnome.maps.gschema.xml.in.h:14 -msgid "Whether the last known location was set manually by the user." -msgstr "最近已知的位置 是否是用户手动设置的。" - -#: ../data/org.gnome.maps.gschema.xml.in.h:15 +#: ../data/org.gnome.Maps.gschema.xml.h:9 msgid "Number of recent places to store" msgstr "存储最近地点的数量" -#: ../data/org.gnome.maps.gschema.xml.in.h:16 +#: ../data/org.gnome.Maps.gschema.xml.h:10 msgid "Number of recently visited places to store." msgstr "存储最近拜访过地点的数量。" -#: ../src/app-menu.ui.h:1 +#: ../data/org.gnome.Maps.gschema.xml.h:11 +msgid "Facebook check-in privacy setting" +msgstr "Facebook 签到隐私设置" + +#: ../data/org.gnome.Maps.gschema.xml.h:12 +msgid "" +"Latest used Facebook check-in privacy setting. Possible values are: " +"EVERYONE, FRIENDS_OF_FRIENDS, ALL_FRIENDS or SELF." +msgstr "" +"最近使用的 Facebook 签到隐私设置。可能的值有：EVERYONE, FRIENDS_OF_FRIENDS, " +"ALL_FRIENDS 或 SELF。" + +#: ../data/org.gnome.Maps.gschema.xml.h:13 +msgid "Foursquare check-in privacy setting" +msgstr "Foursquare 签到隐私设置" + +#: ../data/org.gnome.Maps.gschema.xml.h:14 +msgid "" +"Latest used Foursquare check-in privacy setting. Possible values are: " +"public, followers or private." +msgstr "" +"最近使用的 Foursquare 签到隐私设置。可能的值有：public, followers 或 " +"private。" + +#: ../data/org.gnome.Maps.gschema.xml.h:15 +msgid "Foursquare check-in Facebook broadcasting" +msgstr "Foursquare 签到同步到 Facebook" + +#: ../data/org.gnome.Maps.gschema.xml.h:16 +msgid "" +"Indicates if Foursquare should broadcast the check-in as a post in the " +"Facebook account associated with the Foursquare account." +msgstr "" +"表示 Foursquare 是否把签到当成消息发布到 Foursquare 已经关联的 Facebook 帐号" +"上。" + +#: ../data/org.gnome.Maps.gschema.xml.h:17 +msgid "Foursquare check-in Twitter broadcasting" +msgstr "Foursquare 签到同步到 Twitter" + +#: ../data/org.gnome.Maps.gschema.xml.h:18 +msgid "" +"Indicates if Foursquare should broadcast the check-in as a tweet in the " +"Twitter account associated with the Foursquare account." +msgstr "" +"表示 Foursquare 是否把签到当成推文发布到 Foursquare 已经关联的 Twitter 帐号" +"上。" + +#: ../data/ui/app-menu.ui.h:1 msgid "About" msgstr "关于" -#: ../src/app-menu.ui.h:2 +#: ../data/ui/app-menu.ui.h:2 msgid "Quit" msgstr "退出" -#: ../src/context-menu.ui.h:1 +#: ../data/ui/check-in-dialog.ui.h:1 +#, fuzzy +msgid "Visibility" +msgstr "可见" + +#: ../data/ui/check-in-dialog.ui.h:2 +msgid "Post on Facebook" +msgstr "发到 Facebook" + +#: ../data/ui/check-in-dialog.ui.h:3 +msgid "Post on Twitter" +msgstr "发到 Twitter" + +#: ../data/ui/check-in-dialog.ui.h:4 ../data/ui/send-to-dialog.ui.h:2 +msgid "_Cancel" +msgstr "取消(_C)" + +#. Translators: Check in is used as a verb +#: ../data/ui/check-in-dialog.ui.h:5 ../data/ui/map-bubble.ui.h:5 +msgid "C_heck in" +msgstr "签到(_H)" + +#: ../data/ui/check-in-dialog.ui.h:6 +msgid "Everyone" +msgstr "每个人" + +#: ../data/ui/check-in-dialog.ui.h:7 +msgid "Friends of friends" +msgstr "朋友的朋友" + +#: ../data/ui/check-in-dialog.ui.h:8 +msgid "Just friends" +msgstr "仅限朋友" + +#: ../data/ui/check-in-dialog.ui.h:9 +msgid "Just me" +msgstr "仅限自己" + +#: ../data/ui/check-in-dialog.ui.h:10 +msgid "Public" +msgstr "公开" + +#: ../data/ui/check-in-dialog.ui.h:11 +#, fuzzy +msgid "Followers" +msgstr "关注" + +#: ../data/ui/check-in-dialog.ui.h:12 +msgid "Private" +msgstr "私人" + +#: ../data/ui/context-menu.ui.h:1 msgid "What’s here?" msgstr "这是哪里？" -#: ../src/context-menu.ui.h:2 -msgid "I’m here!" -msgstr "我在这！" - -#: ../src/mainWindow.js:300 -msgid "translator-credits" -msgstr "" -"tuhaihe <113232173...@gmail.com>, 2013\n" -"Tong Hui <tongh...@gmail.com>, 2014" - -#: ../src/mainWindow.js:303 -msgid "A map application for GNOME" -msgstr "一款 GNOME 地图应用程序" +#: ../data/ui/location-service-notification.ui.h:1 +msgid "Turn on location services to find your location" +msgstr "开启位置服务来获取您的位置" + +#: ../data/ui/location-service-notification.ui.h:2 +msgid "Location Settings" +msgstr "地点设置" -#: ../src/main-window.ui.h:2 +#: ../data/ui/main-window.ui.h:2 msgid "Go to current location" msgstr "转到当前位置" -#: ../src/main-window.ui.h:3 +#: ../data/ui/main-window.ui.h:3 msgid "Choose map type" msgstr "选择地图类型" -#: ../src/main-window.ui.h:4 +#: ../data/ui/main-window.ui.h:4 msgid "Toggle route planner" msgstr "切换路线规划器" -#: ../src/routeService.js:73 +#: ../data/ui/main-window.ui.h:5 +msgid "Toggle favorites" +msgstr "切换喜爱" + +#: ../data/ui/main-window.ui.h:6 +msgid "Maps is offline!" +msgstr "地图应用处于离线！" + +#: ../data/ui/main-window.ui.h:7 +msgid "" +"Maps need an active internet connection to function properly, but one can't " +"be found." +msgstr "地图应用需要有效的网络连接才能正常运行，但是未发现有效连接。" + +#: ../data/ui/main-window.ui.h:8 +msgid "Check your connection and proxy settings." +msgstr "请检查您的网络连接和代理设置。" + +#: ../data/ui/map-bubble.ui.h:1 +msgid "Add to new route" +msgstr "添加到新路线" + +#: ../data/ui/map-bubble.ui.h:2 +msgid "Open with another application" +msgstr "以其他程序打开" + +#: ../data/ui/map-bubble.ui.h:3 +msgid "Mark as favorite" +msgstr "标记为喜爱" + +#: ../data/ui/map-bubble.ui.h:6 +msgid "Check in here" +msgstr "在这里签到" + +#: ../data/ui/search-popup.ui.h:1 +msgid "Press enter to search" +msgstr "按下 Enter 开始搜索" + +#: ../data/ui/send-to-dialog.ui.h:1 +msgid "Open location" +msgstr "打开位置" + +#: ../data/ui/send-to-dialog.ui.h:3 +msgid "_Open" +msgstr "打开(_O)" + +#: ../data/ui/sidebar.ui.h:1 +msgid "Route search by GraphHopper" +msgstr "通过 GraphHopper 搜索路线" + +#: ../data/ui/social-place-more-results-row.ui.h:1 +msgid "Show more results" +msgstr "显示更多结果" + +#: ../data/ui/user-location-bubble.ui.h:1 ../src/geoclue.js:207 +msgid "Current location" +msgstr "当前位置" + +#. To translators: %s can be "Unknown", "Exact" or "%f km²" +#: ../data/ui/user-location-bubble.ui.h:4 +#, no-c-format +msgid "Accuracy: %s" +msgstr "位置精度：%s" + +#. Translators: %s is the place name that user wanted to check-in */ +#: ../src/checkIn.js:135 +#, javascript-format +msgid "Cannot find \"%s\" in the social service" +msgstr "在社交服务中找不到 \"%s\"" + +#: ../src/checkIn.js:137 +msgid "Cannot find a suitable place to check-in in this location" +msgstr "在此地无法找到符合的签到地点" + +#: ../src/checkIn.js:141 +msgid "" +"Credentials have expired, please open Online Accounts to sign in and enable " +"this account" +msgstr "证书已过期，请打开在线账户登录并启用此帐户" + +#: ../src/checkIn.js:153 ../src/checkInDialog.js:289 +msgid "An error has occurred" +msgstr "发生错误" + +#: ../src/checkInDialog.js:176 +msgid "Select an account" +msgstr "选择帐号" + +#: ../src/checkInDialog.js:181 ../src/checkInDialog.js:253 +msgid "Loading" +msgstr "正在载入" + +#: ../src/checkInDialog.js:205 +msgid "Select a place" +msgstr "选择地点" + +#: ../src/checkInDialog.js:210 +msgid "" +"Maps cannot find the place to check in to with Facebook. Please select one " +"from this list." +msgstr "地图应用无法在 Facebook 中找到签到地点。请在列表中选择。" + +#: ../src/checkInDialog.js:212 +msgid "" +"Maps cannot find the place to check in to with Foursquare. Please select one " +"from this list." +msgstr "地图应用无法在 Foursquare 中找到签到地点。请在列表中选择。" + +#. Translators: %s is the name of the place to check in. +#. */ +#: ../src/checkInDialog.js:227 +#, javascript-format +msgid "Check in to %s" +msgstr "签到于 %s" + +#. Translators: %s is the name of the place to check in. +#. */ +#: ../src/checkInDialog.js:237 +#, javascript-format +msgid "Write an optional message to check in to %s." +msgstr "编写附加信息来签到 %s 。" + +#: ../src/mainWindow.js:314 +msgid "Failed to connect to location service" +msgstr "无法连接到位置服务" + +#: ../src/mainWindow.js:319 +msgid "Position not found" +msgstr "没有找到位置。" + +#: ../src/mainWindow.js:364 +msgid "translator-credits" +msgstr "" +"tuhaihe <113232173...@gmail.com>, 2013\n" +"Tong Hui <tongh...@gmail.com>, 2014\n" +"Deane Chen <wsxy...@gmail.com>, 2015" + +#: ../src/mainWindow.js:367 +msgid "A map application for GNOME" +msgstr "一款 GNOME 地图应用程序" + +#. Translators: +#. * This means wheelchairs have full unrestricted access. +#. */ +#: ../src/place.js:120 +msgid "yes" +msgstr "是" + +#. Translators: +#. * This means wheelchairs have partial access (e.g some areas +#. * can be accessed and others not, areas requiring assistance +#. * by someone pushing up a steep gradient). +#. */ +#: ../src/place.js:127 +msgid "limited" +msgstr "有限制" + +#. Translators: +#. * This means wheelchairs have no unrestricted access +#. * (e.g. stair only access). +#. */ +#: ../src/place.js:133 +msgid "no" +msgstr "否" + +#. Translators: +#. * This means that the way or area is designated or purpose built +#. * for wheelchairs (e.g. elevators designed for wheelchair access +#. * only). This is rarely used. +#. */ +#: ../src/place.js:140 +#, fuzzy +msgid "designated" +msgstr "无障碍" + +#: ../src/routeService.js:69 msgid "No route found." msgstr "没有找到路线。" -#: ../src/routeService.js:80 +#: ../src/routeService.js:76 msgid "Route request failed." msgstr "路线请求失败。" -#: ../src/routeService.js:151 +#: ../src/routeService.js:147 msgid "Start!" msgstr "开始!" -#: ../src/searchResultBubble.js:60 +#: ../src/placeBubble.js:101 +#, javascript-format +msgid "Postal code: %s" +msgstr "邮政编码：%s" + +#: ../src/placeBubble.js:103 #, javascript-format msgid "Country code: %s" msgstr "国家代码：%s" -#: ../src/searchResultBubble.js:66 +#: ../src/placeBubble.js:112 #, javascript-format -msgid "Postal code: %s" -msgstr "邮政编码：%s" +msgid "Population: %s" +msgstr "人口总数：%s" + +#: ../src/placeBubble.js:115 +#, javascript-format +msgid "Opening hours: %s" +msgstr "开始时间：%s" + +#: ../src/placeBubble.js:120 +msgid "Wikipedia" +msgstr "维基百科" + +#: ../src/placeBubble.js:125 +#, javascript-format +msgid "Wheelchair access: %s" +msgstr "轮椅通道：%s" #. Translators: %s is a time expression with the format "%f h" or "%f min" */ -#: ../src/sidebar.js:198 +#: ../src/sidebar.js:197 #, javascript-format msgid "Estimated time: %s" msgstr "估计时间：%s" -#: ../src/user-location-bubble.ui.h:1 -msgid "Current location" -msgstr "当前位置" - -#. To translators: %s can be "Unknown", "Exact" or "%f km²" -#: ../src/user-location-bubble.ui.h:4 -#, no-c-format -msgid "Accuracy: %s" -msgstr "位置精度：%s" +#: ../src/translations.js:55 ../src/translations.js:57 +msgid "around the clock" +msgstr "全天" + +#: ../src/translations.js:59 +msgid "from sunrise to sunset" +msgstr "白天" + +#. Translators: +#. * This is a format string with two separate time ranges +#. * such as "Mo-Fr 10:00-19:00 Sa 12:00-16:00" +#. * The space between the format place holders could be +#. * substituted with the appropriate separator. +#. */ +#: ../src/translations.js:78 +#, javascript-format +msgctxt "time range list" +msgid "%s %s" +msgstr "%s %s" + +#. Translators: +#. * This is a format string with three separate time ranges +#. * such as "Mo-Fr 10:00-19:00 Sa 10:00-17:00 Su 12:00-16:00" +#. * The space between the format place holders could be +#. * substituted with the appropriate separator. +#. */ +#: ../src/translations.js:90 +#, javascript-format +msgctxt "time range list" +msgid "%s %s %s" +msgstr "%s %s %s" + +#. Translators: +#. * This is a format string consisting of a part specifying the days for +#. * which the specified time is applied and the time interval +#. * specification as the second argument. +#. * The space between the format place holders could be substituted with +#. * the appropriate separator or phrase and the ordering of the arguments +#. * can be rearranged with the %n#s syntax. */ +#: ../src/translations.js:121 +#, javascript-format +msgctxt "time range component" +msgid "%s %s" +msgstr "%s %s" + +#. Translators: +#. * This represents a format string consisting of two day interval +#. * specifications. +#. * For example: +#. * Mo-Fr,Sa +#. * where the "Mo-Fr" and "Sa" parts are replaced by the %s +#. * place holder. +#. * The separator (,) could be replaced with a translated variant or +#. * a phrase if appropriate. */ +#: ../src/translations.js:153 +#, javascript-format +msgctxt "day interval list" +msgid "%s,%s" +msgstr "%s,%s" + +#. Translators: +#. * This represents a format string consisting of three day interval +#. * specifications. +#. * For example: +#. * Mo-We,Fr,Su +#. * where the "Mo-We", "Fr", and "Su" parts are replaced by the +#. * %s place holder. +#. * The separator (,) could be replaced with a translated variant or +#. * a phrase if appropriate. */ +#: ../src/translations.js:167 +#, javascript-format +msgctxt "day interval list" +msgid "%s,%s,%s" +msgstr "%s,%s,%s" + +#: ../src/translations.js:186 +msgid "every day" +msgstr "每天" + +#. Translators: +#. * This represents a range of days with a starting and ending day. +#. */ +#: ../src/translations.js:198 +#, javascript-format +msgctxt "day range" +msgid "%s-%s" +msgstr "%s-%s" + +#: ../src/translations.js:209 +msgid "public holidays" +msgstr "公众假期" + +#: ../src/translations.js:211 +msgid "school holidays" +msgstr "学校假期" + +#. Translators: +#. * This is a list with two time intervals, such as: +#. * 09:00-12:00, 13:00-14:00 +#. * The intervals are represented by the %s place holders and +#. * appropriate white space or connected phrase could be modified by +#. * the translation. The order of the arguments can be rearranged +#. * using the %n$s syntax. +#. */ +#: ../src/translations.js:251 +#, javascript-format +msgctxt "time interval list" +msgid "%s, %s" +msgstr "%s, %s" + +#: ../src/translations.js:265 +msgid "not open" +msgstr "未开放" + +#. Translators: +#. * This is a time interval with a starting and an ending time. +#. * The time values are represented by the %s place holders and +#. * appropriate white spacing or connecting phrases can be set by the +#. * translation as needed. The order of the arguments can be rearranged +#. * using the %n$s syntax. +#. */ +#: ../src/translations.js:280 +#, javascript-format +msgctxt "time interval" +msgid "%s-%s" +msgstr "%s-%s" #. Translators: Accuracy of user location information */ -#: ../src/utils.js:165 +#: ../src/utils.js:256 msgid "Unknown" msgstr "未知" #. Translators: Accuracy of user location information */ -#: ../src/utils.js:168 +#: ../src/utils.js:259 msgid "Exact" msgstr "准确" -#: ../src/utils.js:178 -#, javascript-format -msgid "%f km²" -msgstr "%f平方千米" - -#: ../src/utils.js:275 +#: ../src/utils.js:354 #, javascript-format msgid "%f h" msgstr "%f 小时" -#: ../src/utils.js:277 +#: ../src/utils.js:356 #, javascript-format msgid "%f min" -msgstr "%f分钟" +msgstr "%f 分钟" + +#: ../src/utils.js:358 +#, javascript-format +msgid "%f s" +msgstr "%f 秒" -#: ../src/utils.js:287 +#. Translators: This is a distance measured in kilometers */ +#: ../src/utils.js:369 #, javascript-format msgid "%f km" msgstr "%f 千米" -#: ../src/utils.js:289 +#. Translators: This is a distance measured in meters */ +#: ../src/utils.js:372 #, javascript-format msgid "%f m" msgstr "%f 米" +#. Translators: This is a distance measured in miles */ +#: ../src/utils.js:380 +#, javascript-format +msgid "%f mi" +msgstr "%f 英里" + +#. Translators: This is a distance measured in feet */ +#: ../src/utils.js:383 +#, javascript-format +msgid "%f ft" +msgstr "%f 英尺" + +#~ msgid "Last known location and accuracy" +#~ msgstr "最近已知的位置和精度" + +#~ msgid "" +#~ "Last known location (latitude and longitude in degrees) and accuracy (in " +#~ "meters)." +#~ msgstr "最近已知的位置(经纬度)和精度(米)。" + +#~ msgid "Description of last known location" +#~ msgstr "最近已知的位置描述" + +#~ msgid "Description of last known location of user." +#~ msgstr "对最近已知的用户位置的描述。" + +#~ msgid "User set last known location" +#~ msgstr "由用户设置 最近已知的位置" + +#~ msgid "Whether the last known location was set manually by the user." +#~ msgstr "最近已知的位置 是否是用户手动设置的。" + +#~ msgid "I’m here!" +#~ msgstr "我在这！" + +#~ msgid "%f km²" +#~ msgstr "%f平方千米" + #~ msgid " km<sup>2</sup>" #~ msgstr " km<sup>2</sup>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.16.1/src/favoritesPopover.js new/gnome-maps-3.16.2/src/favoritesPopover.js --- old/gnome-maps-3.16.1/src/favoritesPopover.js 2015-04-13 21:14:58.000000000 +0200 +++ new/gnome-maps-3.16.2/src/favoritesPopover.js 2015-05-12 20:18:28.000000000 +0200 @@ -27,7 +27,6 @@ const PlaceStore = imports.placeStore; const _N_VISIBLE = 6; -const _ROW_HEIGHT = 50; const FavoritesPopover = new Lang.Class({ Name: 'FavoritesPopover', @@ -73,9 +72,10 @@ this.connect('notify::rows', (function() { let visible = Math.min(this._rows, _N_VISIBLE); + let separators = visible - 1; // separators are 1px + let height = (PlaceListRow.ROW_HEIGHT + 6) * visible + separators; - // + 6 Makes it pixel perfect - this._scrolledWindow.min_content_height = visible * (PlaceListRow.ROW_HEIGHT + 6); + this._scrolledWindow.min_content_height = height; this._revealer.reveal_child = this._rows > _N_VISIBLE; }).bind(this));
