From 36335c3667c1cebea9c2da63e66f213731eef3a9 Mon Sep 17 00:00:00 2001 From: Steven Oliver Date: Tue, 31 Mar 2020 21:40:58 -0400 Subject: [PATCH 1/3] Update website and org name --- CONTRIBUTING.md | 4 +--- README.md | 12 ++++++------ data/balistica.appdata.xml.in | 4 ++-- help/C/bugs.page | 2 +- po/Makevars | 2 +- src/BalisticaApplication.vala | 2 +- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e0d246..d67c6b6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,12 +2,10 @@ If you would like to contribute, check the github issues. Please take any of the tasks you want, but please also comment on the issue so I know you're working on it. -As always please file any and all [bugs](https://github.com/steveno/balistica/issues?state=open). +As always please file any and all [bugs](https://github.com/fusliero/balistica/issues?state=open). ## Uncrustify The code is formated through uncrustify. It's not perfect but it works 90% of the time so I use it. -In order to make it simple for me I use the script found [here](https://gist.github.com/steveno/32f098abb6d08e34da29ba182a93705e). -You only need to make sure you're one directory above balistica when you do. ## Seeing debug messages If you haven't noticed already LibBalistica is sprinkled with debug statements. In order you to see diff --git a/README.md b/README.md index 1f08ddd..d0572aa 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ -# balística ![](https://raw.githubusercontent.com/steveno/balistica/master/data/icons/48x48/apps/balistica.png) -[![Build Status](https://travis-ci.org/steveno/balistica.svg?branch=master)](https://travis-ci.org/steveno/balistica) +# balística ![](https://raw.githubusercontent.com/fusliero/balistica/master/data/icons/48x48/apps/balistica.png) +[![Build Status](https://travis-ci.org/fusliero/balistica.svg?branch=master)](https://travis-ci.org/fusliero/balistica) [![Translation status](https://translate.fedoraproject.org/widgets/balistica/-/svg-badge.svg)](https://translate.fedoraproject.org/engage/balistica/?utm_source=widget) -[![license](https://img.shields.io/github/license/steveno/balistica.svg?style=flat)](https://github.com/steveno/balistica/blob/master/LICENSE.txt) +[![license](https://img.shields.io/github/license/fusliero/balistica.svg?style=flat)](https://github.com/fusliero/balistica/blob/master/LICENSE.txt) ## About balística is a simple open source external ballistics calculator. It's named after the Catalan word for "ballistics" in English. Enjoy! -![balística](https://steveno.github.io/balistica/img/drag_calculation.png) +![balística](https://fusliero.github.io/balistica/img/drag_calculation.png) ## Minimum Requirements * vala >= 0.38.0 * glib-2.0 >= 2.40.0 * gtk+-3.0 >= 3.10.8 * gee-0.8 >= 0.20.0 -* [libbalistica](https://github.com/steveno/libbalistica) >= 1.0 +* [libbalistica](https://github.com/fusliero/libbalistica) >= 1.0 ### Ubuntu ```bash @@ -33,7 +33,7 @@ sudo ninja install ``` ## Contributing -Please see [the contributing file](https://github.com/steveno/balistica/blob/master/CONTRIBUTING.md) +Please see [the contributing file](https://github.com/fusliero/balistica/blob/master/CONTRIBUTING.md) ## DISCLAIMER This program is to be used as REFERENCE or curiosity ONLY. Much like diff --git a/data/balistica.appdata.xml.in b/data/balistica.appdata.xml.in index 881f3cd..9c4a257 100644 --- a/data/balistica.appdata.xml.in +++ b/data/balistica.appdata.xml.in @@ -20,8 +20,8 @@
  • Compute a round's Point Blank Range (PBR)
    • - http://steveno.github.io/balistica/ - http://steveno.github.io/balistica/issues + http://fusliero.github.io/balistica/ + http://fusliero.github.io/balistica/issues oliver.steven@gmail.com GNOME diff --git a/help/C/bugs.page b/help/C/bugs.page index 76b85dd..9cd0c84 100644 --- a/help/C/bugs.page +++ b/help/C/bugs.page @@ -9,5 +9,5 @@ Bugs

    If you think you've found a bug please report it to the projects page on Github.

    -

    balística Issue Tracker

    +

    balística Issue Tracker

    diff --git a/po/Makevars b/po/Makevars index 3e53562..7d86998 100644 --- a/po/Makevars +++ b/po/Makevars @@ -41,7 +41,7 @@ PACKAGE_GNU = no # It can be your email address, or a mailing list address where translators # can write to without being subscribed, or the URL of a web page through # which the translators can contact you. -MSGID_BUGS_ADDRESS = https://github.com/steveno/balistica/issues +MSGID_BUGS_ADDRESS = https://github.com/fusliero/balistica/issues # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. diff --git a/src/BalisticaApplication.vala b/src/BalisticaApplication.vala index ee011cc..2e04b99 100644 --- a/src/BalisticaApplication.vala +++ b/src/BalisticaApplication.vala @@ -180,7 +180,7 @@ public class Application : Gtk.Application { "copyright", _("Copyright \xc2\xa9 2012-2020 Steven Oliver"), "license-type", Gtk.License.GPL_3_0, "program-name", NAME, - "website", "http://steveno.github.io/balistica/", + "website", "http://fusliero.github.io/balistica/", "website-label", "balística Website", "version", VERSION, "logo-icon-name", "balistica") ; From 3817b6ad409b664e1b1f9e5644f42d83104eee9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Fri, 3 Apr 2020 20:09:10 +0200 Subject: [PATCH 2/3] Translated using Weblate (Turkish) Currently translated at 100.0% (117 of 117 strings) Translation: balistica/master Translate-URL: https://translate.fedoraproject.org/projects/balistica/master/tr/ --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 62973ec..13c3972 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-17 08:37-0300\n" -"PO-Revision-Date: 2020-03-18 18:38+0000\n" +"PO-Revision-Date: 2020-03-24 13:38+0000\n" "Last-Translator: Oğuz Ersen \n" "Language-Team: Turkish \n" @@ -234,7 +234,7 @@ msgstr "Tarih/Saat" #: src/LogViewerDialog.vala:51 msgid "Log Level" -msgstr "Log Düzeyi" +msgstr "Log Seviyesi" #: src/LogViewerDialog.vala:52 msgid "Message" From b97e0371546c7f4a9d5e765a63e9c309ec73d802 Mon Sep 17 00:00:00 2001 From: Geert Warrink Date: Fri, 3 Apr 2020 20:09:11 +0200 Subject: [PATCH 3/3] Added translation using Weblate (Dutch) --- po/LINGUAS | 1 + po/nl.po | 523 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 524 insertions(+) create mode 100644 po/nl.po diff --git a/po/LINGUAS b/po/LINGUAS index 296530a..7200a0b 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -2,3 +2,4 @@ es pt_BR tr uk +nl diff --git a/po/nl.po b/po/nl.po new file mode 100644 index 0000000..1aae8f4 --- /dev/null +++ b/po/nl.po @@ -0,0 +1,523 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the balistica package. +# Geert Warrink , 2020. +msgid "" +msgstr "" +"Project-Id-Version: balistica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-17 08:37-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/BalisticaApplication.vala:114 +msgid "Drag" +msgstr "" + +#: src/BalisticaApplication.vala:115 +msgid "Twist" +msgstr "" + +#: src/BalisticaApplication.vala:116 +msgid "Stability" +msgstr "" + +#. The user may have already created the directory, so don't throw EXISTS. +#: src/BalisticaApplication.vala:132 +msgid "Failed to create XDG directory " +msgstr "" + +#: src/BalisticaApplication.vala:181 +msgid "Error showing help" +msgstr "" + +#: src/BalisticaApplication.vala:201 +msgid "An open source external ballistics calculator." +msgstr "" + +#: src/BalisticaApplication.vala:202 +msgid "Copyright © 2012-2018 Steven Oliver" +msgstr "" + +#: src/DragBox.vala:123 +msgid "Range" +msgstr "" + +#: src/DragBox.vala:124 +msgid "Drop Inches" +msgstr "" + +#: src/DragBox.vala:125 +msgid "Drop MOA" +msgstr "" + +#: src/DragBox.vala:126 +msgid "Velocity" +msgstr "" + +#: src/DragBox.vala:127 +msgid "Energy" +msgstr "" + +#: src/DragBox.vala:128 +msgid "Drift" +msgstr "" + +#: src/DragBox.vala:129 +msgid "Windage MOA" +msgstr "" + +#: src/DragBox.vala:130 +msgid "Time" +msgstr "" + +#. Name used to store the calculation +#. Ballistic cofficient +#. Initial velocity (ft/s) +#. Sight height over bore (inches) +#. Projectile weight (grains) +#. Shooting Angle (degrees) +#. Zero range of the rifle (yards) +#. Wind speed (mph) +#. Wind angle (0=headwind, 90=right-to-left, 180=tailwind, 270/-90=left-to-right) +#. It doesn't make sense for any of the following variables +#. to be zero +#: src/DragBox.vala:230 +msgid "Drag Coefficient must be a positive value greater than 0" +msgstr "" + +#: src/DragBox.vala:235 +msgid "Initial Velocity must be a positive value greater than 0" +msgstr "" + +#: src/DragBox.vala:240 +msgid "Sight Height over Bore must be a positive value greater than 0" +msgstr "" + +#: src/DragBox.vala:245 +msgid "Projectile Weight must be a positive value greater than 0" +msgstr "" + +#: src/DragBox.vala:250 +msgid "Zero Range must be a positive value greater than 0" +msgstr "" + +#: src/DragBox.vala:280 +msgid "Error creating solution results" +msgstr "" + +#: src/DragBox.vala:312 +msgid "Cannot export an empty drag solution" +msgstr "" + +#. Create a save as dialog +#: src/DragBox.vala:317 +msgid "Save As" +msgstr "" + +#: src/DragBox.vala:320 +msgid "Cancel" +msgstr "" + +#: src/DragBox.vala:322 +msgid "Save" +msgstr "" + +#: src/DragBox.vala:355 +msgid "Failed to overwrite existing file" +msgstr "" + +#: src/DragBox.vala:365 +msgid "Error selecting file to save as" +msgstr "" + +#: src/DragBox.vala:380 +#, c-format +msgid "Drag Coefficient: %.2f" +msgstr "" + +#: src/DragBox.vala:380 +#, c-format +msgid "Projectile Weight: %.2f" +msgstr "" + +#: src/DragBox.vala:382 +#, c-format +msgid "Initial Velocity: %.2f ft/s" +msgstr "" + +#: src/DragBox.vala:382 +#, c-format +msgid "Zero Range: %.2f yards" +msgstr "" + +#: src/DragBox.vala:382 +#, c-format +msgid "Shooting Angle: %.2f degress" +msgstr "" + +#: src/DragBox.vala:384 +#, c-format +msgid "Wind Velocity: %.2f mph" +msgstr "" + +#: src/DragBox.vala:384 +#, c-format +msgid "Wind Direction: %.2f degress" +msgstr "" + +#: src/DragBox.vala:386 +#, c-format +msgid "Altitude: %.2f ft" +msgstr "" + +#: src/DragBox.vala:386 +#, c-format +msgid "Barometer: %2f in-Hg" +msgstr "" + +#: src/DragBox.vala:386 +#, c-format +msgid "Temperature: %2f F" +msgstr "" + +#: src/DragBox.vala:386 +#, c-format +msgid "Relative Humidity: %.2F%%" +msgstr "" + +#: src/DragBox.vala:391 +msgid "Range (yards)" +msgstr "" + +#: src/DragBox.vala:392 +msgid "Drop (inches)" +msgstr "" + +#: src/DragBox.vala:393 +msgid "Drop (MOA)" +msgstr "" + +#: src/DragBox.vala:394 +msgid "Velocity (ft/s)" +msgstr "" + +#: src/DragBox.vala:395 +msgid "Energy (ft-lb)" +msgstr "" + +#: src/DragBox.vala:396 +msgid "Winddrift (inches)" +msgstr "" + +#: src/DragBox.vala:397 +msgid "Windage (MOA)" +msgstr "" + +#: src/DragBox.vala:398 +msgid "Time (s)" +msgstr "" + +#: src/DragBox.vala:425 +msgid "Error creating HTML output" +msgstr "" + +#: src/LogViewerDialog.vala:50 +msgid "Date/Time" +msgstr "" + +#: src/LogViewerDialog.vala:51 +msgid "Log Level" +msgstr "" + +#: src/LogViewerDialog.vala:52 +msgid "Message" +msgstr "" + +#: src/LogViewerDialog.vala:111 +msgid "Reading log file " +msgstr "" + +#: src/PbrDialog.vala:103 +msgid "Vital Zone size is required to calculate PBR" +msgstr "" + +#: src/PbrDialog.vala:113 +#, c-format +msgid "Near Zero: %.2f yards\n" +msgstr "" + +#: src/PbrDialog.vala:114 +#, c-format +msgid "Far Zero: %.2f yards\n" +msgstr "" + +#: src/PbrDialog.vala:115 +#, c-format +msgid "Minimum PBR: %.2f yards\n" +msgstr "" + +#: src/PbrDialog.vala:116 +#, c-format +msgid "" +"Maximum PBR: %.2f yards\n" +"\n" +msgstr "" + +#: src/PbrDialog.vala:117 +#, c-format +msgid "Sight-in at 100 yards: %.2f\" high" +msgstr "" + +#: src/PreferencesWindow.vala:68 +msgid "Choose save location" +msgstr "" + +#: src/PreferencesWindow.vala:70 +msgid "_Cancel" +msgstr "" + +#: src/PreferencesWindow.vala:71 +msgid "_Select" +msgstr "" + +#: ui/drag.glade:64 +msgid "Name:" +msgstr "" + +#: ui/drag.glade:104 +msgid "Solve" +msgstr "" + +#: ui/drag.glade:120 ui/pbr.glade:53 ui/stability.glade:188 ui/twist.glade:330 +msgid "Reset" +msgstr "" + +#: ui/drag.glade:133 +msgid "Example" +msgstr "" + +#: ui/drag.glade:199 +msgid "Projectile Weight (grains)" +msgstr "" + +#: ui/drag.glade:280 +msgid "" +"0 = headwind\n" +"90 = right to left\n" +"180 = tailwind\n" +"270/-90 = left to right" +msgstr "" + +#: ui/drag.glade:299 ui/pbr.glade:141 +msgid "Initial Velocity (ft/s)" +msgstr "" + +#: ui/drag.glade:311 +msgid "Zero Range (yards)" +msgstr "" + +#: ui/drag.glade:323 +msgid "Sight Height Over Bore (in)" +msgstr "" + +#: ui/drag.glade:337 +msgid "Shooting Angle (deg)" +msgstr "" + +#: ui/drag.glade:349 +msgid "Wind Velocity (mph)" +msgstr "" + +#: ui/drag.glade:361 +msgid "Wind Angle (0-360 deg)" +msgstr "" + +#: ui/drag.glade:373 ui/pbr.glade:153 +msgid "Drag Coefficient" +msgstr "" + +#: ui/drag.glade:460 +msgid "Altitude (ft)" +msgstr "" + +#: ui/drag.glade:472 +msgid "Temperature (F)" +msgstr "" + +#: ui/drag.glade:484 +msgid "Barometric Pressure (Hg)" +msgstr "" + +#: ui/drag.glade:496 +msgid "Relative Humidity (%)" +msgstr "" + +#: ui/drag.glade:619 ui/pbr.glade:219 +msgid "Drag Function" +msgstr "" + +#: ui/drag.glade:690 +msgid "Step Size" +msgstr "" + +#: ui/drag.glade:702 +msgid "Export Results" +msgstr "" + +#: ui/drag.glade:716 +msgid "Calculate PBR" +msgstr "" + +#: ui/drag.glade:742 +msgid "Enable Atmospheric Corrections" +msgstr "" + +#: ui/logviewer.glade:7 +msgid "Log Viewer" +msgstr "" + +#: ui/logviewer.glade:14 +msgid "Refresh" +msgstr "" + +#: ui/logviewer.glade:23 +msgid "Clear" +msgstr "" + +#: ui/pbr.glade:34 +msgid "Point Blank Range (PBR)" +msgstr "" + +#: ui/pbr.glade:40 ui/stability.glade:213 ui/twist.glade:383 +msgid "Calculate" +msgstr "" + +#: ui/pbr.glade:117 +msgid "Vital Zone Size (inches)" +msgstr "" + +#: ui/pbr.glade:129 +msgid "Sight Height (inches)" +msgstr "" + +#: ui/preferences.glade:33 ui/menu.ui:7 +msgid "Preferences" +msgstr "" + +#: ui/preferences.glade:54 +msgid "Directories" +msgstr "" + +#: ui/preferences.glade:70 +msgid "Save Directory" +msgstr "" + +#: ui/preferences.glade:91 +msgid "Browse" +msgstr "" + +#: ui/stability.glade:107 ui/twist.glade:102 ui/twist.glade:249 +msgid "Diameter" +msgstr "" + +#: ui/stability.glade:119 ui/twist.glade:115 ui/twist.glade:261 +msgid "Length" +msgstr "" + +#: ui/stability.glade:131 ui/twist.glade:273 +msgid "Mass" +msgstr "" + +#: ui/stability.glade:143 ui/twist.glade:285 +msgid "Safe Value" +msgstr "" + +#: ui/stability.glade:162 +msgid "Miller Stability" +msgstr "" + +#: ui/twist.glade:127 +msgid "Specific Gravity" +msgstr "" + +#: ui/twist.glade:169 +msgid "Greenhill Twist" +msgstr "" + +#: ui/twist.glade:303 +msgid "Miller Twist Rule" +msgstr "" + +#: ui/twist.glade:355 +msgid "Greenhill" +msgstr "" + +#: ui/twist.glade:369 +msgid "Miller" +msgstr "" + +#: ui/menu.ui:11 +msgid "View Log" +msgstr "" + +#: ui/menu.ui:17 +msgid "Help" +msgstr "" + +#: ui/menu.ui:22 +msgid "About" +msgstr "" + +#: ui/menu.ui:26 +msgid "Quit" +msgstr "" + +#: data/balistica.appdata.xml.in:7 data/balistica.desktop.in:8 +msgid "balistica" +msgstr "" + +#: data/balistica.appdata.xml.in:8 data/balistica.desktop.in:4 +msgid "External ballistics software" +msgstr "" + +#: data/balistica.appdata.xml.in:10 +msgid "" +"balística is a basic ballistics calculator for the Gnome Desktop " +"Environment. It provides the ability to calculate the standard drag " +"functions (G1-G8) along with other minor ballistics related calculations " +"like the Greenhill Formula and the Miller Twist Rule." +msgstr "" + +#: data/balistica.appdata.xml.in:16 +msgid "balística’s features include:" +msgstr "" + +#: data/balistica.appdata.xml.in:18 +msgid "Calculate a round's drag using the G1-G8 drag models" +msgstr "" + +#: data/balistica.appdata.xml.in:19 +msgid "Compute a bullet's twist rate using Greenhill or Miller" +msgstr "" + +#: data/balistica.appdata.xml.in:20 +msgid "Compute a round's Point Blank Range (PBR)" +msgstr "" + +#: data/balistica.desktop.in:3 +msgid "balística" +msgstr "" + +#: data/balistica.desktop.in:6 +msgid "External ballistics calculator" +msgstr "" + +#: data/balistica.desktop.in:7 +msgid "ballistics" +msgstr ""