Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

v1.0.4: minor, useless update

Signed-off-by: Kwpolska <kwpolska@gmail.com>
  • Loading branch information...
commit 437a535054a80bdb4387624e86b7403f6af16841 1 parent 97b0da1
@Kwpolska authored
View
11 CONTRIBUTING.rst
@@ -2,9 +2,10 @@
Appendix D. Contribution rules
==============================
:Author: Kwpolska <kwpolska@kwpolska.tk>
-:Copyright: See Appendix B.
-:Date: 2012-09-09
-:Version: 1.0.3
+:Copyright: © 2011-2012, Kwpolska.
+:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
+:Date: 2012-10-07
+:Version: 1.0.4
Do you want to contribute to this project? Great! I’d love to see some help,
but you need to comply with some easy rules.
@@ -15,6 +16,10 @@ Issue reporting
GitHub Issues are the best way to report an issue. If you do not have an
account there, get one or mail me.
+When pasting console sessions, please paste them fully, *prompt-to-prompt*, to
+see all the messages and your input. Trim only stuff that you are 1000% sure
+that is not related to the project in question.
+
Code contributions
==================
View
4 PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Kwpolska <kwpolska@kwpolska.tk>
pkgname=trashman
-pkgver=1.0.3
+pkgver=1.0.4
pkgrel=1
pkgdesc='A Python trash manager. Python 3 build.'
arch=('any')
@@ -9,7 +9,7 @@ license=('BSD')
depends=('python')
options=(!emptydirs)
source=("http://pypi.python.org/packages/source/t/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e50ab675f18498dcfe8a7908230c65b9')
+md5sums=('7ffe7357547132883db1da39ba0d5103')
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
View
2  PKGBUILD-git
@@ -1,6 +1,6 @@
# Maintainer: Kwpolska <kwpolska@kwpolska.tk>
pkgname=trashman-git
-pkgver=20120918
+pkgver=20121007
pkgrel=1
pkgdesc='A Python trash manager. Python 3 build, version from git.'
arch=('any')
View
4 README
@@ -4,8 +4,8 @@ Trashman. A Python trash manager.
:Info: This is the README file for Trashman.
:Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-09-09
-:Version: 1.0.3
+:Date: 2012-10-07
+:Version: 1.0.4
PURPOSE
-------
View
4 README.rst
@@ -4,8 +4,8 @@ Trashman. A Python trash manager.
:Info: This is the README file for Trashman.
:Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-09-09
-:Version: 1.0.3
+:Date: 2012-10-07
+:Version: 1.0.4
PURPOSE
-------
View
4 docs/CHANGELOG.rst
@@ -4,8 +4,8 @@ CHANGELOG for Trashman
:Author: Kwpolska <kwpolska@kwpolska.tk>
:Copyright: © 2011-2012, Kwpolska.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-09-09
-:Version: 1.0.3
+:Date: 2012-10-07
+:Version: 1.0.4
.. index:: CHANGELOG
View
4 docs/CONTRIBUTING.rst
@@ -4,8 +4,8 @@ Appendix D. Contribution rules
:Author: Kwpolska <kwpolska@kwpolska.tk>
:Copyright: © 2011-2012, Kwpolska.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-09-09
-:Version: 1.0.3
+:Date: 2012-10-07
+:Version: 1.0.4
Do you want to contribute to this project? Great! I’d love to see some help,
but you need to comply with some easy rules.
View
6 docs/LICENSE.rst
@@ -1,10 +1,10 @@
================================
Appendix A. License for Trashman
================================
-:Info: This is an appendix to the Trashman documentation.
+:Info: This is the license for Trashman.
:Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-09-09
-:Version: 1.0.3
+:Date: 2012-10-07
+:Version: 1.0.4
.. index:: LICENSE
View
4 docs/README.rst
@@ -4,8 +4,8 @@ Trashman. A Python trash manager.
:Info: This is the README file for Trashman.
:Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-09-09
-:Version: 1.0.3
+:Date: 2012-10-07
+:Version: 1.0.4
PURPOSE
-------
View
4 docs/TODO.rst
@@ -4,8 +4,8 @@ Appendix E. TODO for Trashman
:Author: Kwpolska <kwpolska@kwpolska.tk>
:Copyright: © 2011-2012, Kwpolska.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-09-09
-:Version: 1.0.3
+:Date: 2012-10-07
+:Version: 1.0.4
.. index:: TODO
View
4 docs/conf.py
@@ -51,9 +51,9 @@
# built documents.
#
# The short X.Y version.
-version = '1.0.3'
+version = '1.0.4'
# The full version, including alpha/beta/rc tags.
-release = '1.0.3'
+release = '1.0.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
4 docs/functions.rst
@@ -4,8 +4,8 @@ Global Functions and Modules List
:Author: Kwpolska <kwpolska@kwpolska.tk>
:Copyright: © 2011-2012, Kwpolska.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-09-09
-:Version: 1.0.3
+:Date: 2012-10-07
+:Version: 1.0.4
.. index:: global functions
View
4 docs/localization.rst
@@ -4,8 +4,8 @@ Appendix A. Localization Guide
:Author: Kwpolska <kwpolska@kwpolska.tk>
:Copyright: © 2011-2012, Kwpolska.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-09-09
-:Version: 1.0.3
+:Date: 2012-10-07
+:Version: 1.0.4
.. index:: locale
View
BIN  docs/trashman.8.gz
Binary file not shown
View
6 docs/trashman.rst
@@ -4,9 +4,9 @@ Trashman
:Author: Kwpolska <kwpolska@kwpolska.tk>
:Copyright: © 2011-2012, Kwpolska.
-:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2012-09-09
-:Version: 1.0.3
+:License: BSD (see /LICENSE or Appendix B.)
+:Date: 2012-10-07
+:Version: 1.0.4
:Manual section: 1
:Manual group: Trashman manual
View
BIN  locale/en/LC_MESSAGES/trashman.mo
Binary file not shown
View
16 locale/en/LC_MESSAGES/trashman.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 1.0.3\n"
+"Project-Id-Version: 1.0.4\n"
"Report-Msgid-Bugs-To: Kwpolska <kwpolska@kwpolska.tk>\n"
-"POT-Creation-Date: 2012-09-09 13:25+0200\n"
+"POT-Creation-Date: 2012-10-07 15:08+0200\n"
"PO-Revision-Date: 2012-09-09 13:25+0100\n"
"Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
@@ -74,6 +74,10 @@ msgstr "FILE"
msgid "files to trash"
msgstr "files to trash"
+#: trashman/main.py:92 trashman/main.py:117
+msgid "ERROR:"
+msgstr "ERROR:"
+
#: trashman/tmds.py:54
msgid "Cannot create the configuration directory."
msgstr "Cannot create the configuration directory."
@@ -132,11 +136,15 @@ msgstr "emptied the trash\n"
msgid "trashed '{}'\n"
msgstr "trashed ‘{}’\n"
-#: trashman/backends/xdgtrash.py:166
+#: trashman/backends/xdgtrash.py:169
+msgid "no such directory: {} -- cannot restore"
+msgstr ""
+
+#: trashman/backends/xdgtrash.py:176
msgid "restored {} to {}\n"
msgstr "restored {} to {}\n"
-#: trashman/backends/xdgtrash.py:171
+#: trashman/backends/xdgtrash.py:181
msgid "no such file in trash"
msgstr "no such file in trash"
View
BIN  locale/pl/LC_MESSAGES/trashman.mo
Binary file not shown
View
18 locale/pl/LC_MESSAGES/trashman.po
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 1.0.3\n"
+"Project-Id-Version: 1.0.4\n"
"Report-Msgid-Bugs-To: Kwpolska <kwpolska@kwpolska.tk>\n"
-"POT-Creation-Date: 2012-09-09 13:25+0200\n"
+"POT-Creation-Date: 2012-10-07 15:04+0200\n"
"PO-Revision-Date: 2012-09-09 13:24+0100\n"
"Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
@@ -20,7 +20,7 @@ msgstr ""
#. Alternatively, use translation instead of locale.
#: trashman/main.py:29
msgid "LANG locale by AUTHOR <MAIL@IF.YOU.WANT>"
-msgstr "Polskie tłumaczenie autorstwa Kwpolska<kwpolska@kwpolska.tk>"
+msgstr "Polskie tłumaczenie autorstwa Kwpolska <kwpolska@kwpolska.tk>"
#: trashman/main.py:33
msgid "Trashman -- a Python trash manager."
@@ -74,6 +74,10 @@ msgstr "PLIK"
msgid "files to trash"
msgstr "pliki do wyrzucenia"
+#: trashman/main.py:92 trashman/main.py:117
+msgid "ERROR:"
+msgstr "BŁĄD:"
+
#: trashman/tmds.py:54
msgid "Cannot create the configuration directory."
msgstr "Nie można utworzyć katalogu konfiguracji."
@@ -132,11 +136,15 @@ msgstr "opróżniono śmietnik\n"
msgid "trashed '{}'\n"
msgstr "wyrzucony „{}”\n"
-#: trashman/backends/xdgtrash.py:166
+#: trashman/backends/xdgtrash.py:169
+msgid "no such directory: {} -- cannot restore"
+msgstr ""
+
+#: trashman/backends/xdgtrash.py:176
msgid "restored {} to {}\n"
msgstr "przywrócony {} do {}\n"
-#: trashman/backends/xdgtrash.py:171
+#: trashman/backends/xdgtrash.py:181
msgid "no such file in trash"
msgstr "nie ma takiego pliku w śmietniku"
View
18 messages.pot
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 1.0.3\n"
+"Project-Id-Version: 1.0.4\n"
"Report-Msgid-Bugs-To: Kwpolska <kwpolska@kwpolska.tk>\n"
-"POT-Creation-Date: 2012-09-09 13:25+0200\n"
-"PO-Revision-Date: 2012-09-09 13:25+0200\n"
+"POT-Creation-Date: 2012-10-07 15:08+0200\n"
+"PO-Revision-Date: 2012-10-07 15:08+0200\n"
"Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
"Language: en\n"
@@ -74,6 +74,10 @@ msgstr ""
msgid "files to trash"
msgstr ""
+#: trashman/main.py:92 trashman/main.py:117
+msgid "ERROR:"
+msgstr ""
+
#: trashman/tmds.py:54
msgid "Cannot create the configuration directory."
msgstr ""
@@ -132,11 +136,15 @@ msgstr ""
msgid "trashed '{}'\n"
msgstr ""
-#: trashman/backends/xdgtrash.py:166
+#: trashman/backends/xdgtrash.py:169
+msgid "no such directory: {} -- cannot restore"
+msgstr ""
+
+#: trashman/backends/xdgtrash.py:176
msgid "restored {} to {}\n"
msgstr ""
-#: trashman/backends/xdgtrash.py:171
+#: trashman/backends/xdgtrash.py:181
msgid "no such file in trash"
msgstr ""
View
3  release
@@ -28,9 +28,8 @@ sed "s/pkgver=.*/pkgver=$version/" PKGBUILD -i
sed "s/pkgver=.*/pkgver=$datep/g" PKGBUILD-git -i
sed "s/:Date: .*/:Date: $date/g" docs/*.rst -i
-cp docs/README.rst README.rst
+cp docs/README.rst docs/CHANGELOG.rst docs/CONTRIBUTING.rst .
cp docs/README.rst README
-cp docs/CONTRIBUTING.rst CONTRIBUTING.rst
rm docs/$project.8.gz | true
rst2man docs/$project.rst > docs/$project.8
View
2  setup.py
@@ -6,7 +6,7 @@
from distutils.core import setup
setup(name='trashman',
- version='1.0.3',
+ version='1.0.4',
description='A Python trash manager.',
author='Kwpolska',
author_email='kwpolska@kwpolska.tk',
View
4 trashman/__init__.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.3
+# Trashman v1.0.4
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# All rights reserved.
@@ -44,7 +44,7 @@
"""
__title__ = 'Trashman'
-__version__ = '1.0.3'
+__version__ = '1.0.4'
__author__ = 'Kwpolska'
__license__ = '3-clause BSD'
__docformat__ = 'restructuredtext en'
View
2  trashman/backends/__init__.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.3
+# Trashman v1.0.4
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
View
2  trashman/backends/dummytrash.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.3
+# Trashman v1.0.4
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
View
2  trashman/backends/trash.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.3
+# Trashman v1.0.4
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
View
2  trashman/backends/xdgtrash.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.3
+# Trashman v1.0.4
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
View
4 trashman/main.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.3
+# Trashman v1.0.4
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
@@ -28,7 +28,7 @@ def main():
# Alternatively, use translation instead of locale.
locale = _('LANG locale by AUTHOR <MAIL@IF.YOU.WANT>')
if locale != 'LANG locale by AUTHOR <MAIL@IF.YOU.WANT>':
- verstring = '\n'.join([verstring, locale])
+ verstring = ' | '.join([verstring, locale])
DS.log.info('Initialized, parsing arguments.')
parser = argparse.ArgumentParser(description=_('Trashman -- a Python'
' trash manager.'),
View
2  trashman/tmds.py
@@ -1,6 +1,6 @@
#!/usr/bin/python3
# -*- encoding: utf-8 -*-
-# Trashman v1.0.3
+# Trashman v1.0.4
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
Please sign in to comment.
Something went wrong with that request. Please try again.