diff --git a/ATTENTION b/ATTENTION deleted file mode 100644 index e69de29..0000000 diff --git a/data/media/style.css b/data/media/style.css index ad6cb54..067f3bc 100644 --- a/data/media/style.css +++ b/data/media/style.css @@ -33,7 +33,7 @@ #UberwriterWindow { gtk-key-bindings: window-bindings; - border-radius: 7px 7px 5px 5px; + border-radius: 7px 7px 3px 3px; } #UberwriterWindow.small #UberwriterEditor { diff --git a/debian/rules b/debian/rules index 19f5f61..7cce76f 100755 --- a/debian/rules +++ b/debian/rules @@ -18,8 +18,6 @@ override_dh_install: --install-data=/opt/extras.ubuntu.com/uberwriter \ --install-lib=/opt/extras.ubuntu.com/uberwriter - cp uberwriter_lib/pylocales/locales.db debian/uberwriter/opt/extras.ubuntu.com/uberwriter/uberwriter_lib/pylocales/locales.db - override_dh_python3: dh_python3 /opt/extras.ubuntu.com/uberwriter diff --git a/po/uberwriter.pot b/po/uberwriter.pot index 5de098b..d996022 100644 --- a/po/uberwriter.pot +++ b/po/uberwriter.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-11 17:47+0200\n" +"POT-Creation-Date: 2014-09-12 01:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,259 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:1 -msgid "Export" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:2 -msgid "Smart" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:3 -msgid "Pandoc can automatically make \"--\" to a long dash and more" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:4 -msgid "Normalize" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:5 -msgid "" -"Removes things like double spaces or spaces at the beginning of a paragraph" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:6 -msgid "Table of Contents" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:7 -msgid "Standalone" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:8 -msgid "" -"Use a header and footer to include things like stylesheets and meta " -"information" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:9 -msgid "Number Sections" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:10 -msgid "Strict Markdown" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:11 -msgid "Use \"strict\" markdown instead of \"pandoc\" markdown" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:12 -msgid "Slideshow incremental bullets" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:13 -msgid "Show one bullet point after another in a slideshow" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:14 -msgid "General Options" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:15 -msgid "Highlight syntax" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:16 -msgid "Choose a color theme for syntax highlighting" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:17 -msgid "Highlight style " -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:18 -msgid "Syntax highlighting (HTML, LaTeX)" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:19 -msgid "Self Contained" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:20 -msgid "" -"Produces a HTML that has no external dependencies (all images and " -"stylesheets are included)" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:21 -msgid "HTML 5" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:22 -msgid "Use HTML 5 syntax" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:23 -msgid "Choose a CSS File that you want to use" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:24 -msgid "CSS File" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:25 -msgid "HTML Options" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:26 -msgid "Bibliography File" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:27 -msgid "Commandline Reference" -msgstr "" - -#: ../uberwriter/FormatShortcuts.py:85 -msgid "emphasized text" -msgstr "" - -#: ../uberwriter/FormatShortcuts.py:87 -msgid "strong text" -msgstr "" - -#: ../uberwriter/FormatShortcuts.py:101 -msgid "List item" -msgstr "" - -#: ../uberwriter/FormatShortcuts.py:182 -msgid "Heading" -msgstr "" - -#: ../uberwriter/__init__.py:35 -msgid "Show debug messages (-vv debugs uberwriter_lib also)" -msgstr "" - -#: ../data/ui/AboutUberwriterDialog.ui.h:1 -msgid "" -"# Copyright (C) 2012, Wolf Vollprecht \n" -"# This program is free software: you can redistribute it and/or modify it \n" -"# under the terms of the GNU General Public License version 3, as " -"published \n" -"# by the Free Software Foundation.\n" -"# \n" -"# This program is distributed in the hope that it will be useful, but \n" -"# WITHOUT ANY WARRANTY; without even the implied warranties of \n" -"# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR \n" -"# PURPOSE. See the GNU General Public License for more details.\n" -"# \n" -"# You should have received a copy of the GNU General Public License along \n" -"# with this program. If not, see .\n" -msgstr "" - -#: ../data/ui/AboutUberwriterDialog.ui.h:14 -msgid "Copyright (C) 2012, Wolf Vollprecht " -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:338 -msgid "Save your File" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:484 -msgid "You can not export to PDF." -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:486 -msgid "" -"Please install texlive from the software center." -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:516 -msgid "MarkDown or Plain Text" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:519 -msgid "Open a .md-File" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:541 -msgid "You have not saved your changes." -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:543 -msgid "Close without Saving" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:544 -msgid "Cancel" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:545 -msgid "Save now" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:546 -msgid "Unsaved changes" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:611 -msgid "You can not enable the Spell Checker." -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:613 -msgid "" -"Please install 'hunspell' or 'aspell' dictionarys for your language from the " -"software center." -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:472 -msgid "(no suggestions)" -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:494 -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:497 -msgid "Add \"{}\" to Dictionary" -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:501 -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:503 -msgid "Ignore All" -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:518 -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:520 -msgid "Languages" -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:536 -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:539 -msgid "Suggestions" -msgstr "" - -#: ../uberwriter/UberwriterInlinePreview.py:174 -msgid "Website is not available" -msgstr "" - -#: ../uberwriter/UberwriterInlinePreview.py:176 -msgid "Website is available" -msgstr "" - -#: ../uberwriter/UberwriterInlinePreview.py:375 -msgid "Open Link in Webbrowser" -msgstr "" - -#: ../uberwriter/UberwriterInlinePreview.py:433 -msgid "No matching footnote found" -msgstr "" - -#: ../uberwriter.desktop.in.h:1 -msgid "UberWriter" -msgstr "" - -#: ../uberwriter.desktop.in.h:2 -msgid "UberWriter, a simple and distraction free Markdown Editor" -msgstr "" - #: ../data/ui/UberwriterWindow.ui.h:1 msgid "Case Sensitive" msgstr "" @@ -421,3 +168,256 @@ msgstr "" #: ../data/ui/UberwriterWindow.ui.h:38 msgid "Characters:" msgstr "" + +#: ../data/ui/AboutUberwriterDialog.ui.h:1 +msgid "" +"# Copyright (C) 2012, Wolf Vollprecht \n" +"# This program is free software: you can redistribute it and/or modify it \n" +"# under the terms of the GNU General Public License version 3, as " +"published \n" +"# by the Free Software Foundation.\n" +"# \n" +"# This program is distributed in the hope that it will be useful, but \n" +"# WITHOUT ANY WARRANTY; without even the implied warranties of \n" +"# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR \n" +"# PURPOSE. See the GNU General Public License for more details.\n" +"# \n" +"# You should have received a copy of the GNU General Public License along \n" +"# with this program. If not, see .\n" +msgstr "" + +#: ../data/ui/AboutUberwriterDialog.ui.h:14 +msgid "Copyright (C) 2012, Wolf Vollprecht " +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:472 +msgid "(no suggestions)" +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:494 +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:497 +msgid "Add \"{}\" to Dictionary" +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:501 +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:503 +msgid "Ignore All" +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:518 +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:520 +msgid "Languages" +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:536 +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:539 +msgid "Suggestions" +msgstr "" + +#: ../uberwriter/__init__.py:35 +msgid "Show debug messages (-vv debugs uberwriter_lib also)" +msgstr "" + +#: ../uberwriter/UberwriterInlinePreview.py:174 +msgid "Website is not available" +msgstr "" + +#: ../uberwriter/UberwriterInlinePreview.py:176 +msgid "Website is available" +msgstr "" + +#: ../uberwriter/UberwriterInlinePreview.py:375 +msgid "Open Link in Webbrowser" +msgstr "" + +#: ../uberwriter/UberwriterInlinePreview.py:433 +msgid "No matching footnote found" +msgstr "" + +#: ../uberwriter.desktop.in.h:1 +msgid "UberWriter" +msgstr "" + +#: ../uberwriter.desktop.in.h:2 +msgid "UberWriter, a simple and distraction free Markdown Editor" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:1 +msgid "Export" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:2 +msgid "Smart" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:3 +msgid "Pandoc can automatically make \"--\" to a long dash and more" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:4 +msgid "Normalize" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:5 +msgid "" +"Removes things like double spaces or spaces at the beginning of a paragraph" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:6 +msgid "Table of Contents" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:7 +msgid "Standalone" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:8 +msgid "" +"Use a header and footer to include things like stylesheets and meta " +"information" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:9 +msgid "Number Sections" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:10 +msgid "Strict Markdown" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:11 +msgid "Use \"strict\" markdown instead of \"pandoc\" markdown" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:12 +msgid "Slideshow incremental bullets" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:13 +msgid "Show one bullet point after another in a slideshow" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:14 +msgid "General Options" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:15 +msgid "Highlight syntax" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:16 +msgid "Choose a color theme for syntax highlighting" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:17 +msgid "Highlight style " +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:18 +msgid "Syntax highlighting (HTML, LaTeX)" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:19 +msgid "Self Contained" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:20 +msgid "" +"Produces a HTML that has no external dependencies (all images and " +"stylesheets are included)" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:21 +msgid "HTML 5" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:22 +msgid "Use HTML 5 syntax" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:23 +msgid "Choose a CSS File that you want to use" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:24 +msgid "CSS File" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:25 +msgid "HTML Options" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:26 +msgid "Bibliography File" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:27 +msgid "Commandline Reference" +msgstr "" + +#: ../uberwriter/FormatShortcuts.py:85 +msgid "emphasized text" +msgstr "" + +#: ../uberwriter/FormatShortcuts.py:87 +msgid "strong text" +msgstr "" + +#: ../uberwriter/FormatShortcuts.py:101 +msgid "List item" +msgstr "" + +#: ../uberwriter/FormatShortcuts.py:182 +msgid "Heading" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:338 +msgid "Save your File" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:484 +msgid "You can not export to PDF." +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:486 +msgid "" +"Please install texlive from the software center." +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:516 +msgid "MarkDown or Plain Text" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:519 +msgid "Open a .md-File" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:541 +msgid "You have not saved your changes." +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:543 +msgid "Close without Saving" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:544 +msgid "Cancel" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:545 +msgid "Save now" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:546 +msgid "Unsaved changes" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:611 +msgid "You can not enable the Spell Checker." +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:613 +msgid "" +"Please install 'hunspell' or 'aspell' dictionarys for your language from the " +"software center." +msgstr "" diff --git a/setup.py b/setup.py index 5a1472a..b11bae6 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,9 @@ def move_desktop_file(root, target_data, prefix): # always really be installed into prefix, because while we can install # normal data files anywhere we want, the desktop file needs to exist in # the main system to be found. Only actually useful for /opt installs. - + print("renaming desktop file") + print(root, target_data, prefix) + if(root == '/'): root = '' old_desktop_path = os.path.normpath(root + target_data + '/share/applications') old_desktop_file = old_desktop_path + '/uberwriter.desktop' @@ -70,8 +72,10 @@ def move_desktop_file(root, target_data, prefix): elif target_data != prefix + '/': # This is an /opt install, so rename desktop file to use extras- desktop_file = desktop_path + '/extras-uberwriter.desktop' + print(desktop_file, desktop_path) try: - os.makedirs(desktop_path) + # os.makedirs(desktop_path) + print('renaming to: %s' % desktop_file) os.rename(old_desktop_file, desktop_file) os.rmdir(old_desktop_path) except OSError as e: @@ -81,7 +85,7 @@ def move_desktop_file(root, target_data, prefix): return desktop_file def update_desktop_file(filename, target_pkgdata, target_scripts): - + print("updateing deskop file: %s" % filename) try: fin = open(filename, 'r', encoding="utf-8") fout = open(filename + '.new', 'w', encoding="utf-8") @@ -136,7 +140,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): DistUtilsExtra.auto.setup( name='uberwriter', - version='0.1', + version='1.0', license='GPL-3', author='Wolf Vollprecht', author_email='w.vollprecht@gmail.com', @@ -160,6 +164,7 @@ DistUtilsExtra.auto.setup( "uberwriter" ], package_data={ - 'pylocales' : ['locales.db'] - } - ) \ No newline at end of file + 'uberwriter_lib.pylocales' : ['locales.db'] + }, + data_files=[('uberwriter_lib/pylocales', ['uberwriter_lib/pylocales/locales.db'])] +) \ No newline at end of file diff --git a/uberwriter.desktop.in b/uberwriter.desktop.in index ce1c4b4..281954d 100644 --- a/uberwriter.desktop.in +++ b/uberwriter.desktop.in @@ -6,4 +6,4 @@ Exec=uberwriter %U Icon=/usr/share/uberwriter/media/uberwriter.svg Terminal=false Type=Application -MimeType=text/x-markdown;text/plain; \ No newline at end of file +MimeType=text/x-markdown;text/plain;asdas/dkwodw; \ No newline at end of file