[playonlinux] 165/230: Merge tag upstream/4.2.1

Bertrand Marc bmarc at moszumanska.debian.org
Sun Jul 9 17:42:08 UTC 2017


This is an automated email from the git hooks/post-receive script.

bmarc pushed a commit to branch master
in repository playonlinux.

commit 14344c1873c13ef4b3e76286c4bdbc4b4b8540d4
Merge: 7377ec4 61e9d37
Author: Bertrand Marc <bmarc at debian.org>
Date:   Sun Jul 9 19:22:25 2017 +0200

    Merge tag upstream/4.2.1

 CHANGELOG                                          |  137 +-
 TRANSLATORS                                        |  199 +-
 bash/analyse_menu                                  |   43 -
 bash/{polshell => bash_wrapper}                    |    4 +-
 bash/bug_report                                    |   40 +-
 bash/check_gl                                      |    1 +
 bash/{delete_gui_files => document_reader}         |   34 +-
 bash/expert/PolShell                               |    9 +-
 bash/first_use                                     |  130 +-
 bash/install                                       |    6 +-
 bash/installpolpackages                            |    1 +
 bash/make_shortcut                                 |   63 +-
 bash/manual_install                                |   53 +-
 bash/{polshell => playonlinux-shell}               |    1 -
 bash/pol_update_list                               |   93 +-
 bash/polconfigurator                               |   14 +-
 bash/polshell                                      |    1 -
 bash/run_app                                       |   93 +-
 bash/startup                                       |   20 +-
 bash/{startup => startup_after_server}             |   46 +-
 bash/system_info                                   |  102 -
 bash/terminals/xterm                               |    2 -
 bash/uninstall                                     |   46 +-
 bash/{installpolpackages => update_git}            |   32 +-
 etc/PlayOnLinux.desktop                            |    8 +-
 etc/modele.png                                     |  Bin 202569 -> 0 bytes
 etc/playonlinux.png                                |  Bin 14029 -> 13718 bytes
 etc/playonlinux15.png                              |  Bin 1051 -> 1048 bytes
 etc/playonlinux16.png                              |  Bin 1707 -> 1124 bytes
 etc/playonlinux22.png                              |  Bin 1600 -> 1633 bytes
 etc/playonlinux32.png                              |  Bin 2526 -> 2503 bytes
 etc/playonmac.icns                                 |  Bin 228523 -> 244772 bytes
 etc/playonmac.png                                  |  Bin 14298 -> 0 bytes
 etc/playonmac_modele.png                           |  Bin 81627 -> 0 bytes
 etc/reload.png                                     |  Bin 947 -> 0 bytes
 lang/locale/ar/LC_MESSAGES/pol.mo                  |  Bin 3767 -> 3586 bytes
 lang/locale/ast/LC_MESSAGES/pol.mo                 |  Bin 3279 -> 3279 bytes
 lang/locale/bg/LC_MESSAGES/pol.mo                  |  Bin 11037 -> 10660 bytes
 lang/locale/bn/LC_MESSAGES/pol.mo                  |  Bin 7584 -> 7584 bytes
 lang/locale/bs/LC_MESSAGES/pol.mo                  |  Bin 987 -> 987 bytes
 lang/locale/ca/LC_MESSAGES/pol.mo                  |  Bin 471 -> 471 bytes
 lang/locale/cs/LC_MESSAGES/pol.mo                  |  Bin 79170 -> 104985 bytes
 lang/locale/da/LC_MESSAGES/pol.mo                  |  Bin 17792 -> 20378 bytes
 lang/locale/de/LC_MESSAGES/pol.mo                  |  Bin 85233 -> 107888 bytes
 lang/locale/el/LC_MESSAGES/pol.mo                  |  Bin 2369 -> 5560 bytes
 lang/locale/en_GB/LC_MESSAGES/pol.mo               |  Bin 15846 -> 98785 bytes
 lang/locale/es/LC_MESSAGES/pol.mo                  |  Bin 80764 -> 93143 bytes
 lang/locale/et/LC_MESSAGES/pol.mo                  |  Bin 5562 -> 42433 bytes
 lang/locale/fi/LC_MESSAGES/pol.mo                  |  Bin 44102 -> 86487 bytes
 lang/locale/fr/LC_MESSAGES/pol.mo                  |  Bin 68613 -> 84542 bytes
 lang/locale/gl/LC_MESSAGES/pol.mo                  |  Bin 13612 -> 16923 bytes
 lang/locale/he/LC_MESSAGES/pol.mo                  |  Bin 9845 -> 26390 bytes
 lang/locale/hr/LC_MESSAGES/pol.mo                  |  Bin 64316 -> 67684 bytes
 lang/locale/hu/LC_MESSAGES/pol.mo                  |  Bin 3917 -> 6139 bytes
 lang/locale/id/LC_MESSAGES/pol.mo                  |  Bin 4129 -> 4238 bytes
 lang/locale/it/LC_MESSAGES/pol.mo                  |  Bin 46109 -> 92056 bytes
 lang/locale/ja/LC_MESSAGES/pol.mo                  |  Bin 2261 -> 2261 bytes
 lang/locale/jv/LC_MESSAGES/pol.mo                  |  Bin 5660 -> 5660 bytes
 lang/locale/ko/LC_MESSAGES/pol.mo                  |  Bin 2784 -> 4896 bytes
 lang/locale/lt/LC_MESSAGES/pol.mo                  |  Bin 10288 -> 9859 bytes
 lang/locale/ms/LC_MESSAGES/pol.mo                  |  Bin 469 -> 103364 bytes
 lang/locale/nb/LC_MESSAGES/pol.mo                  |  Bin 1312 -> 1756 bytes
 lang/locale/nl/LC_MESSAGES/pol.mo                  |  Bin 82231 -> 103220 bytes
 lang/locale/oc/LC_MESSAGES/pol.mo                  |  Bin 3689 -> 3491 bytes
 lang/locale/pl/LC_MESSAGES/pol.mo                  |  Bin 79359 -> 103645 bytes
 lang/locale/pt/LC_MESSAGES/pol.mo                  |  Bin 9497 -> 106092 bytes
 lang/locale/pt_BR/LC_MESSAGES/pol.mo               |  Bin 80789 -> 93833 bytes
 lang/locale/ro/LC_MESSAGES/pol.mo                  |  Bin 66466 -> 82015 bytes
 lang/locale/ru/LC_MESSAGES/pol.mo                  |  Bin 36844 -> 56087 bytes
 lang/locale/sk/LC_MESSAGES/pol.mo                  |  Bin 47194 -> 49571 bytes
 lang/locale/sl/LC_MESSAGES/pol.mo                  |  Bin 2131 -> 2552 bytes
 lang/locale/sr/LC_MESSAGES/pol.mo                  |  Bin 5959 -> 67249 bytes
 lang/locale/sv/LC_MESSAGES/pol.mo                  |  Bin 1947 -> 1966 bytes
 lang/locale/te/LC_MESSAGES/pol.mo                  |  Bin 470 -> 470 bytes
 lang/locale/tr/LC_MESSAGES/pol.mo                  |  Bin 18657 -> 23828 bytes
 lang/locale/uk/LC_MESSAGES/pol.mo                  |  Bin 22086 -> 23528 bytes
 lang/locale/zh_CN/LC_MESSAGES/pol.mo               |  Bin 487 -> 3825 bytes
 lang/locale/zh_TW/LC_MESSAGES/pol.mo               |  Bin 11869 -> 29126 bytes
 lang/po/ar.po                                      | 2911 ++++++++-----
 lang/po/ast.po                                     | 2905 ++++++++-----
 lang/po/bg.po                                      | 3025 ++++++++------
 lang/po/bn.po                                      | 2905 ++++++++-----
 lang/po/bs.po                                      | 2905 ++++++++-----
 lang/po/ca.po                                      | 2905 ++++++++-----
 lang/po/cs.po                                      | 3223 +++++++++------
 lang/po/da.po                                      | 3106 ++++++++------
 lang/po/de.po                                      | 3250 +++++++++------
 lang/po/el.po                                      | 2927 ++++++++-----
 lang/po/en_GB.po                                   | 4302 +++++++++++--------
 lang/po/es.po                                      | 3261 +++++++++------
 lang/po/et.po                                      | 3618 +++++++++-------
 lang/po/fi.po                                      | 3461 ++++++++++------
 lang/po/fr.po                                      | 3551 +++++++++-------
 lang/po/gl.po                                      | 3083 ++++++++------
 lang/po/he.po                                      | 3205 +++++++++------
 lang/po/hr.po                                      | 3114 ++++++++------
 lang/po/hu.po                                      | 2931 ++++++++-----
 lang/po/id.po                                      | 2911 ++++++++-----
 lang/po/it.po                                      | 3594 ++++++++++------
 lang/po/ja.po                                      | 2907 ++++++++-----
 lang/po/jv.po                                      | 2905 ++++++++-----
 lang/po/ko.po                                      | 2924 ++++++++-----
 lang/po/lt.po                                      | 3026 ++++++++------
 lang/po/ms.po                                      | 4349 ++++++++++++--------
 lang/po/nb.po                                      | 2915 ++++++++-----
 lang/po/nl.po                                      | 3274 +++++++++------
 lang/po/oc.po                                      | 2913 ++++++++-----
 lang/po/pl.po                                      | 3221 +++++++++------
 lang/po/pol.pot                                    | 2737 +++++++-----
 lang/po/pt.po                                      | 4148 ++++++++++++-------
 lang/po/pt_BR.po                                   | 3180 ++++++++------
 lang/po/ro.po                                      | 3200 ++++++++------
 lang/po/ru.po                                      | 3169 ++++++++------
 lang/po/sk.po                                      | 3060 ++++++++------
 lang/po/sl.po                                      | 2917 ++++++++-----
 lang/po/sr.po                                      | 3725 ++++++++++-------
 lang/po/sv.po                                      | 2913 ++++++++-----
 lang/po/te.po                                      | 2905 ++++++++-----
 lang/po/tr.po                                      | 3000 ++++++++------
 lang/po/uk.po                                      | 3055 ++++++++------
 lang/po/zh_CN.po                                   | 2939 +++++++------
 lang/po/zh_TW.po                                   | 3283 +++++++++------
 lib/debian.lib                                     |   67 +
 lib/debug.lib                                      |   32 +-
 lib/depend.lib                                     |   90 -
 lib/deprecated.lib                                 |    2 +-
 lib/dosbox.lib                                     |    6 +-
 lib/playonlinux.lib                                |  214 +-
 lib/scripts.lib                                    |  465 ++-
 lib/setupwindow.lib                                |  761 +---
 lib/sources                                        |    9 +-
 lib/variables                                      |   15 +-
 lib/website.lib                                    |   37 +-
 lib/wine.lib                                       |  432 +-
 playonlinux                                        |   98 +-
 playonlinux-bash                                   |    9 +-
 playonlinux-pkg                                    |    5 +-
 playonlinux-shell                                  |   30 +-
 playonlinux-url_handler                            |    5 +-
 playonmac                                          |    4 +-
 plugins/TransgamingCedega_0.3.pol                  |  Bin 45391 -> 0 bytes
 plugins/WineImport_0.3.pol                         |  Bin 9595 -> 0 bytes
 plugins/WineLook_0.4.pol                           |  Bin 9430 -> 0 bytes
 plugins/plugins.lst                                |   17 +-
 plugins/polvault-4.0.1_all.pol                     |  Bin 196388 -> 0 bytes
 plugins/polvault_4.0.3_all.pol                     |  Bin 0 -> 194685 bytes
 python/configure.py                                | 1661 ++++----
 python/debug.py                                    |  473 +--
 python/gui_server.py                               |  272 ++
 python/guiv3.py                                    | 1743 ++++----
 python/install.py                                  |  993 +++--
 python/irc.py                                      |  786 ++--
 python/lib/DirTreeCtrl.py                          |  248 --
 python/lib/Variables.py                            |  131 +-
 python/lib/__init__.py                             |    1 -
 python/lib/irc.py                                  | 1110 ++---
 python/lib/lng.py                                  |   35 +-
 python/lib/playonlinux.py                          |  752 ++--
 python/lib/wine.py                                 |   52 +-
 python/mainwindow.py                               | 2107 ++++++----
 python/options.py                                  |  753 ++--
 python/sp.py                                       | 3484 ++++++++--------
 python/wine_versions.py                            |  674 ++-
 python/wrapper.py                                  |  174 +-
 .../images/install/32/applications-accessories.png |  Bin 0 -> 2441 bytes
 .../images/install/32/applications-development.png |  Bin 0 -> 1925 bytes
 resources/images/install/32/applications-fonts.png |  Bin 0 -> 1202 bytes
 resources/images/install/32/applications-games.png |  Bin 0 -> 2062 bytes
 .../images/install/32/applications-graphics.png    |  Bin 0 -> 2204 bytes
 .../images/install/32/applications-internet.png    |  Bin 0 -> 1979 bytes
 .../images/install/32/applications-multimedia.png  |  Bin 0 -> 1889 bytes
 .../images/install/32/applications-office.png      |  Bin 0 -> 1884 bytes
 resources/images/install/32/applications-other.png |  Bin 0 -> 2248 bytes
 .../images/install/32/applications-science.png     |  Bin 0 -> 1929 bytes
 .../images/install/32/applications-system.png      |  Bin 0 -> 2073 bytes
 resources/images/install/32/emblem-favorite.png    |  Bin 0 -> 1241 bytes
 .../images/install/32/gnome-control-center.png     |  Bin 0 -> 1961 bytes
 .../images/install/32/preferences-desktop.png      |  Bin 0 -> 1582 bytes
 resources/images/install/32/view-refresh.png       |  Bin 0 -> 1282 bytes
 resources/images/install/wait.gif                  |  Bin 0 -> 11106 bytes
 resources/images/install/wait_mini.gif             |  Bin 0 -> 2545 bytes
 resources/images/menu/add.png                      |  Bin 0 -> 363 bytes
 resources/images/menu/delete.png                   |  Bin 630 -> 616 bytes
 resources/images/menu/dialog-ok.png                |  Bin 0 -> 512 bytes
 resources/images/menu/media-playback-start.png     |  Bin 0 -> 458 bytes
 resources/images/menu/media-playback-stop.png      |  Bin 0 -> 217 bytes
 resources/images/menu/people.png                   |  Bin 771 -> 568 bytes
 resources/images/menu/{people.png => people_.png}  |  Bin
 resources/images/menu/settings.png                 |  Bin 0 -> 324 bytes
 resources/images/menu/star.png                     |  Bin 0 -> 657 bytes
 resources/images/menu/update_git.png               |  Bin 0 -> 716 bytes
 resources/images/menu/window-close.png             |  Bin 0 -> 586 bytes
 resources/images/menu/wineserver.png               |  Bin 616 -> 630 bytes
 resources/images/pol_min.png                       |  Bin 120774 -> 28793 bytes
 resources/images/setups/about.png                  |  Bin 0 -> 681 bytes
 resources/images/setups/default/top.png            |  Bin 10239 -> 9297 bytes
 resources/images/setups/face-sad.png               |  Bin 0 -> 11364 bytes
 resources/images/setups/wait.gif                   |  Bin 0 -> 11309 bytes
 resources/images/setups/wait.png                   |  Bin 0 -> 28978 bytes
 resources/images/setups/wait/1.png                 |  Bin 0 -> 1667 bytes
 resources/images/setups/wait/10.png                |  Bin 0 -> 1662 bytes
 resources/images/setups/wait/11.png                |  Bin 0 -> 1649 bytes
 resources/images/setups/wait/12.png                |  Bin 0 -> 1666 bytes
 resources/images/setups/wait/2.png                 |  Bin 0 -> 1667 bytes
 resources/images/setups/wait/3.png                 |  Bin 0 -> 1663 bytes
 resources/images/setups/wait/4.png                 |  Bin 0 -> 1670 bytes
 resources/images/setups/wait/5.png                 |  Bin 0 -> 1657 bytes
 resources/images/setups/wait/6.png                 |  Bin 0 -> 1656 bytes
 resources/images/setups/wait/7.png                 |  Bin 0 -> 1662 bytes
 resources/images/setups/wait/8.png                 |  Bin 0 -> 1670 bytes
 resources/images/setups/wait/9.png                 |  Bin 0 -> 1659 bytes
 resources/images/toolbar/play.png                  |  Bin 0 -> 491 bytes
 resources/images/toolbar/stop.png                  |  Bin 0 -> 2878 bytes
 tests/bash/test-versionlower                       |   43 +
 tests/python/test_versionlower.py                  |   91 +
 215 files changed, 95710 insertions(+), 63107 deletions(-)

diff --cc etc/PlayOnLinux.desktop
index c68596d,08b1d23..198b2a2
--- a/etc/PlayOnLinux.desktop
+++ b/etc/PlayOnLinux.desktop
@@@ -2,11 -2,8 +2,9 @@@
  Version=1.0
  Encoding=UTF-8
  Name=PlayOnLinux
- GenericName=Game
  Comment=PlayOnLinux
- Type=Application
+ Type=Application %F
  Exec=playonlinux
- Icon=playonlinux
- Categories=PlayOnLinux;
- Name[fr_FR]=PlayOnLinux
+ Icon=/usr/share/playonlinux/etc/playonlinux.png
+ Categories=Application;Game
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/playonlinux.git



More information about the Pkg-games-commits mailing list