Imported Upstream version 1.2.0

6 files changed, 69 insertions, 39 deletions

diff --git a/configure b/configure
index ed30c270..c3085a8d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nm-applet 1.1.93.
+# Generated by GNU Autoconf 2.69 for nm-applet 1.2.0.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='nm-applet'
 PACKAGE_TARNAME='network-manager-applet'
-PACKAGE_VERSION='1.1.93'
-PACKAGE_STRING='nm-applet 1.1.93'
+PACKAGE_VERSION='1.2.0'
+PACKAGE_STRING='nm-applet 1.2.0'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1448,7 +1448,7 @@ if test "$ac_init_help" = "long"; then
   # 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 nm-applet 1.1.93 to adapt to many kinds of systems.
+\`configure' configures nm-applet 1.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1519,7 +1519,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nm-applet 1.1.93:";;
+     short | recursive ) echo "Configuration of nm-applet 1.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1691,7 +1691,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nm-applet configure 1.1.93
+nm-applet configure 1.2.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2114,7 +2114,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nm-applet $as_me 1.1.93, which was
+It was created by nm-applet $as_me 1.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2982,7 +2982,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='network-manager-applet'
- VERSION='1.1.93'
+ VERSION='1.2.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12436,7 +12436,7 @@ CC=$lt_save_CC
 
 
 
-NMA_GIT_SHA=189327df5ceb0c3e8567b00db7a2c5f5560c701d
+NMA_GIT_SHA=b9b1832768cd0f1c3ceb331086db5844633990d2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16405,7 +16405,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nm-applet $as_me 1.1.93, which was
+This file was extended by nm-applet $as_me 1.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16471,7 +16471,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-nm-applet config.status 1.1.93
+nm-applet config.status 1.2.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 8c409d97..858c168b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.63])
 AC_INIT([nm-applet],
-        [1.1.93],
+        [1.2.0],
         [https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager],
         [network-manager-applet])
 
diff --git a/org.gnome.nm-connection-editor.appdata.xml.in b/org.gnome.nm-connection-editor.appdata.xml.in
index 4d672ca5..edda48f4 100644
--- a/org.gnome.nm-connection-editor.appdata.xml.in
+++ b/org.gnome.nm-connection-editor.appdata.xml.in
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2015 Ethirajan D <ethirajand@cdac.in> -->
-<application>
-  <id type="desktop">nm-connection-editor.desktop</id>
+<component type="desktop">
+  <id>nm-connection-editor.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
   <_name>NetworkManager</_name>
-  <_summary>NetworkManager for GNOME</_summary>
+  <_summary>NetworkManager connection editor</_summary>
+
   <description>
-    <_p>NetworkManager is a system service for managing and configuring your network connections and devices.</_p>
-    <_p>The nm-connection-editor program works with NetworkManager to create and edit existing connection profiles for NetworkManager.</_p>
+    <_p>NetworkManager is a system service for managing and configuring your
+    network connections and devices.</_p>
+    <_p>The nm-connection-editor program works with NetworkManager to create
+    and edit existing connection profiles for NetworkManager.</_p>
   </description>
-  <url type="homepage">https://wiki.gnome.org/Projects/NetworkManager</url>
+
   <screenshots>
-  <screenshot type="default">https://git.gnome.org/browse/network-manager-applet/plain/data/network-connection-editor.png</screenshot>
+    <screenshot type="default">
+      <image>https://git.gnome.org/browse/network-manager-applet/plain/nm-connection-editor.png</image>
+      <_caption/>
+    </screenshot>
   </screenshots>
-  <project_group>GNOME</project_group>
-  <updatecontact>networkmanager-maint@gnome.bugs</updatecontact>
-  <translation type="gettext">nm-applet</translation>
-</application>
-
 
+  <url type="homepage">https://wiki.gnome.org/Projects/NetworkManager</url>
+  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager</url>
+  <update_contact>networkmanager-maint@gnome.bugs</update_contact>
+  <translation type="gettext">nm-applet</translation>
+  <_developer_name>The NetworkManager Developers</_developer_name>
+</component>
diff --git a/po/pl.po b/po/pl.po
index 360c0c72..809f4d89 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 14:02+0200\n"
-"PO-Revision-Date: 2016-03-29 18:55+0200\n"
+"POT-Creation-Date: 2016-04-13 15:44+0200\n"
+"PO-Revision-Date: 2016-04-13 15:45+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -137,8 +137,8 @@ msgid "NetworkManager"
 msgstr "NetworkManager"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-msgid "NetworkManager for GNOME"
-msgstr "NetworkManager dla środowiska GNOME"
+msgid "NetworkManager connection editor"
+msgstr "Edytor połączeń usługi NetworkManager"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
 msgid ""
@@ -156,6 +156,10 @@ msgstr ""
 "Program nm-connection-editor umożliwia tworzenie i modyfikowanie "
 "istniejących profilów połączeń za pomocą usługi NetworkManager."
 
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:5
+msgid "The NetworkManager Developers"
+msgstr "Programiści projektu NetworkManager"
+
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Uwierzytelnianie 802.1X"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f51d0fbc..cd25e969 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,9 +21,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-nanager-applet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 14:02+0200\n"
-"PO-Revision-Date: 2016-03-31 14:35-0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
+"kManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2016-04-13 13:36+0000\n"
+"PO-Revision-Date: 2016-04-13 10:41-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -151,8 +152,9 @@ msgid "NetworkManager"
 msgstr "NetworkManager"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-msgid "NetworkManager for GNOME"
-msgstr "Gerenciador de redes para o GNOME"
+#| msgid "No network connection"
+msgid "NetworkManager connection editor"
+msgstr "Editor de conexão NetworkManager"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
 msgid ""
@@ -170,6 +172,11 @@ msgstr ""
 "O programa nm-connection-editor funciona com NetworkManager para criar e "
 "editar perfis de conexão existentes para NetworkManager."
 
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:5
+#| msgid "NetworkManager Applet"
+msgid "The NetworkManager Developers"
+msgstr "Os desenvolvedores do NetworkManager"
+
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticação 802.1x"
@@ -3893,6 +3900,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tipo:"
 
+#~ msgid "NetworkManager for GNOME"
+#~ msgstr "Gerenciador de redes para o GNOME"
+
 #~ msgid "_Help"
 #~ msgstr "Aj_uda"
 
diff --git a/po/sv.po b/po/sv.po
index b65c162d..50487867 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,15 +4,16 @@
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 # Påvel Nicklasson <pavel@frimix.se>, 2014.
 # Mattias Eriksson <snaggen@gmail.com>, 2014.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2015, 2016.
 # Josef Andersson <josef.andersson@fripost.org>, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManagerApplet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-05 14:02+0200\n"
-"PO-Revision-Date: 2016-03-29 17:59+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2016-04-13 01:33+0000\n"
+"PO-Revision-Date: 2016-04-13 12:27+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -139,8 +140,8 @@ msgid "NetworkManager"
 msgstr "Nätverkshanteraren"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-msgid "NetworkManager for GNOME"
-msgstr "Nätverkshanteraren för GNOME"
+msgid "NetworkManager connection editor"
+msgstr "Nätverkshanteraren (anslutningsredigerare)"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
 msgid ""
@@ -158,6 +159,10 @@ msgstr ""
 "Programmet nm-connection-editor arbetar med Nätverkshanteraren för att skapa "
 "och redigera befintliga profiler för Nätverkshanteraren."
 
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:5
+msgid "The NetworkManager Developers"
+msgstr "Utvecklarna av Nätverkshanteraren"
+
 #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-autentisering"
@@ -3872,6 +3877,9 @@ msgstr "ogiltig wpa-psk: kan inte tolka nyckel med 64 byte som hexadecimal"
 msgid "_Type:"
 msgstr "_Typ:"
 
+#~ msgid "NetworkManager for GNOME"
+#~ msgstr "Nätverkshanteraren för GNOME"
+
 #~ msgid "_Help"
 #~ msgstr "_Hjälp"