[Pkg-xfce-commits] [Git][xfce-team/desktop/exo][debian/master] 2 commits: New upstream version 0.12.2

Yves-Alexis Perez gitlab at salsa.debian.org
Fri Jul 6 22:20:25 BST 2018


Yves-Alexis Perez pushed to branch debian/master at xfce / desktop / exo


Commits:
4fdc4509 by Yves-Alexis Perez at 2018-07-06T23:15:33+02:00
New upstream version 0.12.2
- - - - -
52c6b97d by Yves-Alexis Perez at 2018-07-06T23:19:46+02:00
open new changelog entry

- - - - -


11 changed files:

- ChangeLog
- NEWS
- configure
- configure.ac
- debian/changelog
- docs/reference/html/index.html
- docs/reference/version.xml
- exo/exo-config.h
- exo/exo-job.c
- po/da.po
- po/zh_CN.po


Changes:

=====================================
ChangeLog
=====================================
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+commit d18929d4747a909ab16c36dda6974e93d6952c62
+Author: Sean Davis <smd.seandavis at gmail.com>
+Date:   Wed Jun 20 17:57:43 2018 -0400
+
+    Revert "CID 30799: Missing varargs init or cleanup" (bug 14465)
+    
+    This reverts commit a6969cface575deef4d9ab2f3b68880af67d118b.
+
+commit a8a2ffcf02a19b2c4bb3584b10f3c135948a7b5e
+Author: Anonymous <noreply at xfce.org>
+Date:   Mon Jun 18 18:30:04 2018 +0200
+
+    I18n: Update translation da (99%).
+    
+    298 translated messages, 1 untranslated message.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit 538416d7db245a641cb0004c9bfdab0a69ac6f80
+Author: xiaobo zhou <zhouxiaobo.500 at gmail.com>
+Date:   Mon Jun 18 12:30:04 2018 +0200
+
+    I18n: Update translation zh_CN (100%).
+    
+    299 translated messages.
+    
+    Transifex (https://www.transifex.com/xfce/public/).
+
+commit d247395c9404359216fab1587ee449ad6a31af94
+Author: Sean Davis <smd.seandavis at gmail.com>
+Date:   Sun Jun 17 07:31:31 2018 -0400
+
+    Post release updates
+
+commit 8556cdf0e519622a705be07328691e69f6a9271e
+Author: Sean Davis <smd.seandavis at gmail.com>
+Date:   Sun Jun 17 07:04:46 2018 -0400
+
+    Updates for release
+
 commit c138f8a01045ecc30b4bf55e2e512f776a4bd522
 Author: Sean Davis <smd.seandavis at gmail.com>
 Date:   Sun Jun 17 06:24:40 2018 -0400


=====================================
NEWS
=====================================
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+0.12.2 (Stable Release)
+======
+- Bug Fixes:
+  - Fix crash with ExoJob, Thunar (Xfce #14465)
+- Translation updates: Chinese (China), Danish
+
 0.12.1 (Stable Release)
 ======
 - Bug Fixes:


=====================================
configure
=====================================
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac c138f8a.
+# From configure.ac d18929d.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for exo 0.12.1.
+# Generated by GNU Autoconf 2.69 for exo 0.12.2.
 #
 # Report bugs to <https://bugzilla.xfce.org/>.
 #
@@ -594,8 +594,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='exo'
 PACKAGE_TARNAME='exo'
-PACKAGE_VERSION='0.12.1'
-PACKAGE_STRING='exo 0.12.1'
+PACKAGE_VERSION='0.12.2'
+PACKAGE_STRING='exo 0.12.2'
 PACKAGE_BUGREPORT='https://bugzilla.xfce.org/'
 PACKAGE_URL=''
 
@@ -1491,7 +1491,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 exo 0.12.1 to adapt to many kinds of systems.
+\`configure' configures exo 0.12.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1567,7 +1567,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of exo 0.12.1:";;
+     short | recursive ) echo "Configuration of exo 0.12.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1713,7 +1713,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-exo configure 0.12.1
+exo configure 0.12.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2085,7 +2085,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 exo $as_me 0.12.1, which was
+It was created by exo $as_me 0.12.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3065,7 +3065,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='exo'
- VERSION='0.12.1'
+ VERSION='0.12.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3345,7 +3345,7 @@ LIBEXO_VERINFO=1:0:1
 LIBEXO_VERSION_API=1
 LIBEXO_VERSION_MAJOR=0
 LIBEXO_VERSION_MINOR=12
-LIBEXO_VERSION_MICRO=1
+LIBEXO_VERSION_MICRO=2
 
 
 
@@ -19048,7 +19048,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 exo $as_me 0.12.1, which was
+This file was extended by exo $as_me 0.12.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19114,7 +19114,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="\\
-exo config.status 0.12.1
+exo config.status 0.12.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 


=====================================
configure.ac
=====================================
--- a/configure.ac
+++ b/configure.ac
@@ -17,9 +17,9 @@ m4_define([libexo_verinfo], [1:0:1])
 m4_define([libexo_version_api], [1])
 m4_define([libexo_version_major], [0])
 m4_define([libexo_version_minor], [12])
-m4_define([libexo_version_micro], [1])
+m4_define([libexo_version_micro], [2])
 m4_define([libexo_version_nano], [])
-m4_define([libexo_version_build], [c138f8a])
+m4_define([libexo_version_build], [d18929d])
 m4_define([libexo_version_tag], [])
 m4_define([libexo_version], [libexo_version_major().libexo_version_minor().libexo_version_micro()ifelse(libexo_version_nano(), [], [], [.libexo_version_nano()])ifelse(libexo_version_tag(), [git], [libexo_version_tag()-libexo_version_build()], [libexo_version_tag()])])
 
@@ -41,7 +41,7 @@ Copyright (c) 2004-2018 Xfce Development Team])
 AC_INIT([exo], [libexo_version], [https://bugzilla.xfce.org/])
 AC_PREREQ([2.60])
 AC_CONFIG_MACRO_DIR([m4])
-AC_REVISION([c138f8a])
+AC_REVISION([d18929d])
 AC_CANONICAL_TARGET()
 
 dnl ***************************


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+exo (0.12.2-1) UNRELEASED; urgency=medium
+
+  * add gbp.conf following DEP-14
+  * New upstream version 0.12.2
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 06 Jul 2018 23:16:22 +0200
+
 exo (0.12.1-1) unstable; urgency=medium
 
   * d/control: actually update the maintainer.                  closes: #899773


=====================================
docs/reference/html/index.html
=====================================
--- a/docs/reference/html/index.html
+++ b/docs/reference/html/index.html
@@ -37,7 +37,7 @@
 <div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:bluesabre at xfce.org">bluesabre at xfce.org</a>></code></p></div></div>
 </div>
 </div></div>
-<div><p class="releaseinfo">Version 0.12.1
+<div><p class="releaseinfo">Version 0.12.2
 </p></div>
 <div><p class="copyright">Copyright © 2004, 2005, 2006, 2007 os-cillation e.K.</p></div>
 <div><p class="copyright">Copyright © 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Xfce Development Team</p></div>


=====================================
docs/reference/version.xml
=====================================
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-0.12.1
+0.12.2


=====================================
exo/exo-config.h
=====================================
--- a/exo/exo-config.h
+++ b/exo/exo-config.h
@@ -55,7 +55,7 @@ G_BEGIN_DECLS
  * compile time, rather than from the library linked against at
  * application run time.
  **/
-#define EXO_MICRO_VERSION 1
+#define EXO_MICRO_VERSION 2
 
 /**
  * EXO_CHECK_VERSION:


=====================================
exo/exo-job.c
=====================================
--- a/exo/exo-job.c
+++ b/exo/exo-job.c
@@ -393,7 +393,6 @@ exo_job_emit_valist (ExoJob *job,
 
   /* copy the variable argument list */
   G_VA_COPY (data.var_args, var_args);
-  va_end (data.var_args);
 
   /* emit the signal in the main loop */
   exo_job_send_to_mainloop (job,


=====================================
po/da.po
=====================================
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Aputsiak Niels Janussen (Skjalden) <aj at isit.gl>, 2013,2015
 # Aputsiak Niels Janussen (Skjalden) <aj at isit.gl>, 2013,2015
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Exo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-17 00:30+0200\n"
-"PO-Revision-Date: 2018-04-18 18:43+0000\n"
+"POT-Creation-Date: 2018-06-07 06:30+0200\n"
+"PO-Revision-Date: 2018-06-18 11:43+0000\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish (http://www.transifex.com/xfce/exo/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -174,26 +174,26 @@ msgstr "Emblemer"
 msgid "Emoticons"
 msgstr "Emotikoner"
 
-#. EXO_ICON_CHOOSER_CONTEXT_INTERNATIONAL
-#: ../exo/exo-icon-chooser-dialog.c:119
-msgid "International Denominations"
-msgstr "Internationale denominationer"
-
 #. EXO_ICON_CHOOSER_CONTEXT_MIME_TYPES
-#: ../exo/exo-icon-chooser-dialog.c:121
+#: ../exo/exo-icon-chooser-dialog.c:119
 msgid "File Type Icons"
 msgstr "Filtypeikoner"
 
 #. EXO_ICON_CHOOSER_CONTEXT_PLACES
-#: ../exo/exo-icon-chooser-dialog.c:123
+#: ../exo/exo-icon-chooser-dialog.c:121
 msgid "Location Icons"
 msgstr "Placeringsikoner"
 
 #. EXO_ICON_CHOOSER_CONTEXT_STATUS
-#: ../exo/exo-icon-chooser-dialog.c:125
+#: ../exo/exo-icon-chooser-dialog.c:123
 msgid "Status Icons"
 msgstr "Statusikoner"
 
+#. EXO_ICON_CHOOSER_CONTEXT_STOCK
+#: ../exo/exo-icon-chooser-dialog.c:125
+msgid "Stock Icons"
+msgstr ""
+
 #. EXO_ICON_CHOOSER_CONTEXT_OTHER
 #: ../exo/exo-icon-chooser-dialog.c:127
 msgid "Uncategorized Icons"
@@ -565,44 +565,44 @@ msgstr "Vælg et program"
 #: ../exo-desktop-item-edit/exo-die-editor.c:594
 #: ../exo-desktop-item-edit/exo-die-editor.c:638
 #: ../exo-desktop-item-edit/main.c:326 ../exo-desktop-item-edit/main.c:517
-#: ../exo-helper/exo-helper-chooser.c:382
-#: ../exo-helper/exo-helper-chooser.c:527
+#: ../exo-helper/exo-helper-chooser.c:395
+#: ../exo-helper/exo-helper-chooser.c:540
 #: ../exo-helper/exo-helper-launcher-dialog.c:109
 msgid "_Cancel"
 msgstr "_Annuller"
 
 #: ../exo-desktop-item-edit/exo-die-command-entry.c:261
-#: ../exo-helper/exo-helper-chooser.c:383
+#: ../exo-helper/exo-helper-chooser.c:396
 msgid "_Open"
 msgstr "_Åbn"
 
 #: ../exo-desktop-item-edit/exo-die-command-entry.c:266
-#: ../exo-helper/exo-helper-chooser.c:389
+#: ../exo-helper/exo-helper-chooser.c:402
 msgid "All Files"
 msgstr "Alle filer"
 
 #: ../exo-desktop-item-edit/exo-die-command-entry.c:271
-#: ../exo-helper/exo-helper-chooser.c:394
+#: ../exo-helper/exo-helper-chooser.c:407
 msgid "Executable Files"
 msgstr "Kørbare filer"
 
 #: ../exo-desktop-item-edit/exo-die-command-entry.c:286
-#: ../exo-helper/exo-helper-chooser.c:409
+#: ../exo-helper/exo-helper-chooser.c:422
 msgid "Perl Scripts"
 msgstr "Perl-scripter"
 
 #: ../exo-desktop-item-edit/exo-die-command-entry.c:292
-#: ../exo-helper/exo-helper-chooser.c:415
+#: ../exo-helper/exo-helper-chooser.c:428
 msgid "Python Scripts"
 msgstr "Python-scripter"
 
 #: ../exo-desktop-item-edit/exo-die-command-entry.c:298
-#: ../exo-helper/exo-helper-chooser.c:421
+#: ../exo-helper/exo-helper-chooser.c:434
 msgid "Ruby Scripts"
 msgstr "Ruby-scripter"
 
 #: ../exo-desktop-item-edit/exo-die-command-entry.c:304
-#: ../exo-helper/exo-helper-chooser.c:427
+#: ../exo-helper/exo-helper-chooser.c:440
 msgid "Shell Scripts"
 msgstr "Skal-scripter"
 
@@ -693,7 +693,7 @@ msgstr "Vælg et ikon"
 
 #: ../exo-desktop-item-edit/exo-die-editor.c:595
 #: ../exo-desktop-item-edit/exo-die-editor.c:639
-#: ../exo-helper/exo-helper-chooser.c:528
+#: ../exo-helper/exo-helper-chooser.c:541
 #: ../exo-helper/exo-helper-launcher-dialog.c:110
 msgid "_OK"
 msgstr "_OK"
@@ -912,80 +912,80 @@ msgstr "Tryk på venstre musetast for at ændre det valgte program."
 msgid "Application Chooser Button"
 msgstr "Programvælgerknap"
 
-#: ../exo-helper/exo-helper-chooser.c:290
+#: ../exo-helper/exo-helper-chooser.c:303
 msgid "No application selected"
 msgstr "Intet program valgt"
 
-#: ../exo-helper/exo-helper-chooser.c:306
+#: ../exo-helper/exo-helper-chooser.c:319
 msgid "Failed to set default Web Browser"
 msgstr "Kunne ikke vælge foretrukne webbrowser"
 
-#: ../exo-helper/exo-helper-chooser.c:307
+#: ../exo-helper/exo-helper-chooser.c:320
 msgid "Failed to set default Mail Reader"
 msgstr "Kunne ikke vælge foretrukne postprogram"
 
-#: ../exo-helper/exo-helper-chooser.c:308
+#: ../exo-helper/exo-helper-chooser.c:321
 msgid "Failed to set default File Manager"
 msgstr "Kunne ikke indstille forvalgt filhåndtering"
 
-#: ../exo-helper/exo-helper-chooser.c:309
+#: ../exo-helper/exo-helper-chooser.c:322
 msgid "Failed to set default Terminal Emulator"
 msgstr "Kunne ikke vælge foretrukne terminalemulator"
 
 #. allocate the chooser
-#: ../exo-helper/exo-helper-chooser.c:379
+#: ../exo-helper/exo-helper-chooser.c:392
 msgid "Select application"
 msgstr "Vælg program"
 
-#: ../exo-helper/exo-helper-chooser.c:492
+#: ../exo-helper/exo-helper-chooser.c:505
 msgid "Choose a custom Web Browser"
 msgstr "Vælg en brugerdefineret webbrowser"
 
-#: ../exo-helper/exo-helper-chooser.c:493
+#: ../exo-helper/exo-helper-chooser.c:506
 msgid "Choose a custom Mail Reader"
 msgstr "Vælg et brugerdefineret postprogram"
 
-#: ../exo-helper/exo-helper-chooser.c:494
+#: ../exo-helper/exo-helper-chooser.c:507
 msgid "Choose a custom File Manager"
 msgstr "Vælg en tilpasset filhåndtering"
 
-#: ../exo-helper/exo-helper-chooser.c:495
+#: ../exo-helper/exo-helper-chooser.c:508
 msgid "Choose a custom Terminal Emulator"
 msgstr "Vælg en brugerdefineret terminalemulator"
 
-#: ../exo-helper/exo-helper-chooser.c:500
+#: ../exo-helper/exo-helper-chooser.c:513
 msgid ""
 "Specify the application you want to use\n"
 "as default Web Browser for Xfce:"
 msgstr "Angiv programmet du vil bruge\nsom foretrukne webbrowser i Xfce:"
 
-#: ../exo-helper/exo-helper-chooser.c:501
+#: ../exo-helper/exo-helper-chooser.c:514
 msgid ""
 "Specify the application you want to use\n"
 "as default Mail Reader for Xfce:"
 msgstr "Angiv programmet du\nvil bruge som foretrukne postprogram i Xfce:"
 
-#: ../exo-helper/exo-helper-chooser.c:502
+#: ../exo-helper/exo-helper-chooser.c:515
 msgid ""
 "Specify the application you want to use\n"
 "as default File Manager for Xfce:"
 msgstr "Angiv programmet du\nvil bruge som forvalgt filhåndtering i Xfce:"
 
-#: ../exo-helper/exo-helper-chooser.c:503
+#: ../exo-helper/exo-helper-chooser.c:516
 msgid ""
 "Specify the application you want to use\n"
 "as default Terminal Emulator for Xfce:"
 msgstr "Angiv programmet du\nvil bruge som foretrukne terminal i Xfce:"
 
-#: ../exo-helper/exo-helper-chooser.c:567
+#: ../exo-helper/exo-helper-chooser.c:580
 msgid "Browse the file system to choose a custom command."
 msgstr "Gennemse filsystemet for at vælge en brugerdefineret kommando."
 
-#: ../exo-helper/exo-helper-chooser.c:765
+#: ../exo-helper/exo-helper-chooser.c:789
 msgid "_Other..."
 msgstr "_Andet..."
 
-#: ../exo-helper/exo-helper-chooser.c:766
+#: ../exo-helper/exo-helper-chooser.c:790
 msgid "Use a custom application which is not included in the above list."
 msgstr "Brug et brugerdefineret program som ikke er i ovenstående liste."
 
@@ -1017,13 +1017,13 @@ msgid ""
 "Emulator now and click OK to proceed."
 msgstr "Vælg venligst din foretrukne terminal-\nemulator nu og vælg OK for at forsætte."
 
-#: ../exo-helper/exo-helper.c:389
+#: ../exo-helper/exo-helper.c:401
 #, c-format
 msgid "No command specified"
 msgstr "Ingen kommando valgt"
 
-#: ../exo-helper/exo-helper.c:707 ../exo-helper/exo-helper.c:745
-#: ../exo-helper/exo-helper.c:812 ../exo-helper/exo-helper.c:850
+#: ../exo-helper/exo-helper.c:719 ../exo-helper/exo-helper.c:757
+#: ../exo-helper/exo-helper.c:824 ../exo-helper/exo-helper.c:862
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Kunne ikke åbne %s til skrivning"
@@ -1078,7 +1078,7 @@ msgid ""
 "Query the default helper of TYPE, where TYPE is one of the following values."
 msgstr "Efterspørg standardhjælperen af TYPE, hvor TYPE er en af følgende værdier."
 
-#: ../exo-helper/main.c:105
+#: ../exo-helper/main.c:106
 msgid ""
 "The following TYPEs are supported for the --launch and --query commands:\n"
 "\n"
@@ -1088,17 +1088,17 @@ msgid ""
 "  TerminalEmulator - The preferred Terminal Emulator."
 msgstr "Følgende TYPEr understøttes af kommandoerne --launch og --query:\n\n  WebBrowser       - Den fortrukne webbrowser.\n  MailReader       - Den fortrukne postprogram.\n  FileManager      - Den fortrukne filhåndtering.\n  TerminalEmulator - Den fortrukne terminalemulator."
 
-#: ../exo-helper/main.c:115
+#: ../exo-helper/main.c:116
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Skriv \"%s --help\" for anvendelse."
 
-#: ../exo-helper/main.c:174 ../exo-helper/main.c:240
+#: ../exo-helper/main.c:175 ../exo-helper/main.c:241
 #, c-format
 msgid "Invalid helper type \"%s\""
 msgstr "Ugyldig hjælpertype \"%s\""
 
-#: ../exo-helper/main.c:224
+#: ../exo-helper/main.c:225
 #, c-format
 msgid ""
 "%s (Xfce %s)\n"
@@ -1113,7 +1113,7 @@ msgid ""
 "Please report bugs to <%s>.\n"
 msgstr "%s (Xfce %s)\n\nOphavsret (c) 2003-2006\n        os-cillation e.K. Alle rettigheder forbeholdes.\n\nSkrevet af Benedikt Meurer <benny at xfce.org>.\n\nKompileret med  Gtk+-%d.%d.%d, kørende Gtk+-%d.%d.%d.\n\nRapportér venligst fejl til <%s>.\n"
 
-#: ../exo-helper/main.c:250
+#: ../exo-helper/main.c:251
 #, c-format
 msgid "No helper defined for \"%s\"."
 msgstr "Ingen hjælper defineret for \"%s\"."
@@ -1132,7 +1132,7 @@ msgstr "Brave"
 
 #: ../exo-helper/helpers/caja.desktop.in.in.h:1
 msgid "Caja File Manager"
-msgstr "Filhåndteringen Caja"
+msgstr "Caja-filhåndtering"
 
 #: ../exo-helper/helpers/chromium.desktop.in.in.h:1
 msgid "Chromium"
@@ -1250,14 +1250,14 @@ msgstr "NXterm"
 msgid "Opera Browser"
 msgstr "Opera Browser"
 
-#: ../exo-helper/helpers/pcmanfm-qt.desktop.in.in.h:1
-msgid "PCManFM-Qt File Manager"
-msgstr "PCManFM-Qt-filhåndtering"
-
 #: ../exo-helper/helpers/pcmanfm.desktop.in.in.h:1
 msgid "PCMan File Manager"
 msgstr "PCMan-filhåndtering"
 
+#: ../exo-helper/helpers/pcmanfm-qt.desktop.in.in.h:1
+msgid "PCManFM-Qt File Manager"
+msgstr "PCManFM-Qt-filhåndtering"
+
 #: ../exo-helper/helpers/qterminal.desktop.in.in.h:1
 msgid "QTerminal"
 msgstr "QTerminal"
@@ -1272,7 +1272,7 @@ msgstr "QupZilla"
 
 #: ../exo-helper/helpers/rodent.desktop.in.in.h:1
 msgid "Rodent File Manager"
-msgstr "Filhåndteringen Rodent"
+msgstr "Rodent-filhåndtering"
 
 #: ../exo-helper/helpers/rox-filer.desktop.in.in.h:1
 msgid "ROX-Filer"
@@ -1324,7 +1324,7 @@ msgstr "Xfce-terminal"
 
 #: ../exo-helper/helpers/xfe.desktop.in.in.h:1
 msgid "Xfe File Manager"
-msgstr "Filhåndteringen Xfe"
+msgstr "Xfe-filhåndtering"
 
 #: ../exo-helper/helpers/xterm.desktop.in.in.h:1
 msgid "X Terminal"


=====================================
po/zh_CN.po
=====================================
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,6 +10,7 @@
 # Hunt Xu <huntxu at live.cn>, 2009-2010,2012
 # Mingcong Bai <jeffbai at aosc.xyz>, 2016
 # No Body <nemolus at gmail.com>, 2018
+# xiaobo zhou <zhouxiaobo.500 at gmail.com>, 2018
 # 玉堂白鹤 <yjwork at qq.com>, 2015,2017-2018
 # Mingcong Bai <jeffbai at aosc.xyz>, 2015
 msgid ""
@@ -17,8 +18,8 @@ msgstr ""
 "Project-Id-Version: Exo\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-07 06:30+0200\n"
-"PO-Revision-Date: 2018-06-08 16:55+0000\n"
-"Last-Translator: No Body <nemolus at gmail.com>\n"
+"PO-Revision-Date: 2018-06-18 05:31+0000\n"
+"Last-Translator: xiaobo zhou <zhouxiaobo.500 at gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/xfce/exo/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -542,7 +543,7 @@ msgid ""
 "\n"
 "Written by Benedikt Meurer <benny at xfce.org>.\n"
 "\n"
-msgstr "版权 (c) %s\n          os-cillation e.K. 版权所有。\n\n由 Benedikt Meurer <benny at xfce.org> 撰写。\n\n"
+msgstr "版权 (c) %s\n          os-cillation e.K. 版权所有。\n\n代码由 Benedikt Meurer <benny at xfce.org> 编写。\n\n"
 
 #: ../exo-csource/main.c:328 ../exo-desktop-item-edit/main.c:200
 #: ../exo-open/main.c:513



View it on GitLab: https://salsa.debian.org/xfce-team/desktop/exo/compare/e479502a916ef4e2e12aa319f8fdb54ba399275e...52c6b97d8c21e600e81cb6ca7f80ddcc29353518

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/desktop/exo/compare/e479502a916ef4e2e12aa319f8fdb54ba399275e...52c6b97d8c21e600e81cb6ca7f80ddcc29353518
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20180706/0f766462/attachment-0001.html>


More information about the Pkg-xfce-commits mailing list