Skip to content

Commit

Permalink
Merge pull request #57 from tobias47n9e/master
Browse files Browse the repository at this point in the history
Merge: Documentation, Icon, Translation
  • Loading branch information
tobias47n9e committed Aug 21, 2015
2 parents 314937e + 91e4ee9 commit 9814f88
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 50 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,6 @@ target/
pynsist_pkgs/
pynsist_pkgs64/
pynsist_pkgs32/

#Glib
*.compiled
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Check the [releases page](https://github.com/tobias47n9e/innstereo/releases) for

Currently the best way to test the program is to do the following on Linux or a Linux-Virtual-Machine. In both cases it is a good idea to test within a virtual environment:

1. Install the Python 3 packages of Matplotlib, Numpy, Git, Scipy.
1. Install the Python 3 packages of Matplotlib, Numpy, Git, Scipy. The project targets GTK+ version 3.14 and above.

2. Download the newest version of MPLStereonet:
```Shell
Expand All @@ -34,7 +34,13 @@ pip3 install git+git://github.com/joferkington/mplstereonet.git
git clone https://github.com/tobias47n9e/innstereo
```

4. Run the program by executing the following code in the project folder.
4. Copy and compile the glib-schemas (as supuser in the project directory):
```Shell
cp /data/org.gtk.innstereo.gschema.xml /usr/share/glib-2.0/schemas/
glib-compile-schemas /usr/share/glib-2.0/schemas/
```

5. Run the program by executing the following code in the project folder.
```Shell
python3 -m innstereo
```
Expand Down
2 changes: 2 additions & 0 deletions innstereo/gui_layout.glade
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Matteo Pasotti

Special thanks to:
Tristan Van Berkom
Joe Kington
Thomas Kluyver
Andreas Kositz
Hugo Ortner
Expand Down Expand Up @@ -4442,6 +4443,7 @@ customizable grid.</property>
<property name="title" translatable="yes">InnStereo</property>
<property name="default_width">1200</property>
<property name="default_height">600</property>
<property name="icon">innstereo_icon_128.png</property>
<signal name="destroy" handler="on_main_window_destroy" swapped="no"/>
<child>
<object class="GtkBox" id="box1">
Expand Down
Binary file added innstereo/innstereo_icon_128.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion known_issues.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Some issues are discussed at the projects issue tracker: https://github.com/tobi
- Drag & Drop for Data View
- Data sorting dialog
- Undo & Redo
- Translations
- Adjustable legend position
- Pixel density adjustment does not work properly

Expand Down
83 changes: 36 additions & 47 deletions po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ msgstr ""
"Project-Id-Version: innstereo\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-07-28 13:05+0200\n"
"PO-Revision-Date: 2015-07-28 14:49+0200\n"
"PO-Revision-Date: 2015-08-17 10:29+0200\n"
"Last-Translator: tobias <tobias47n9e@gmail.com>\n"
"Language-Team: German\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.4\n"

#: innstereo/gui_layout.glade:2191
msgid "*"
Expand Down Expand Up @@ -97,7 +98,7 @@ msgstr "Rotierete Daten Hinzufügen"

#: innstereo/gui_layout.glade:4887
msgid "Adds an empty row to the current layer."
msgstr ""
msgstr "Fügt der ausgewählten Ebene eine leere Zeile hinzu."

#: innstereo/dialog_windows.py:652
msgid "All Files"
Expand All @@ -109,15 +110,15 @@ msgstr "Übernehmen"

#: innstereo/gui_layout.glade:1604
msgid "Assign columns"
msgstr ""
msgstr "Spalten Zuordnen"

#: innstereo/gui_layout.glade:1995
msgid "Blues"
msgstr ""

#: innstereo/gui_layout.glade:3892
msgid "Bottom Cutoff"
msgstr ""
msgstr "Untere Grenze"

#: innstereo/gui_layout.glade:1998
msgid "BuGn"
Expand All @@ -137,11 +138,11 @@ msgstr "Berechnen"

#: innstereo/gui_layout.glade:4495
msgid "Calculate Best Plane"
msgstr ""
msgstr "Berechne durchschnittliche Fläche"

#: innstereo/gui_layout.glade:4480
msgid "Calculate Best Pole"
msgstr ""
msgstr "Berechne durchschnittlichen Polpunkt"

#: innstereo/gui_layout.glade:4568
msgid "Calculate Eigenvector"
Expand All @@ -153,19 +154,16 @@ msgstr "Berechne PT-Achsen"

#: innstereo/gui_layout.glade:4597
msgid "Calculates the P, T, and B axis of each row in a fault plane layer."
msgstr ""
msgstr "Berechnet die P, T und B-Achsen für jede Zeile eines Störungsebene."

#: innstereo/gui_layout.glade:4567
msgid ""
"Calculates the eigenvectors and eigenvalue of the selected datasets and adds "
"it as a new layer."
msgstr ""
"Calculates the eigenvectors and eigenvalue of the selected datasets and adds it as a new layer."
msgstr "Berechnet die Eigenvektoren und -werte des ausgewählten Ebene."

#: innstereo/gui_layout.glade:142 innstereo/gui_layout.glade:826
#: innstereo/gui_layout.glade:1085 innstereo/gui_layout.glade:1152
#: innstereo/gui_layout.glade:1208 innstereo/gui_layout.glade:1266
#: innstereo/gui_layout.glade:1340 innstereo/gui_layout.glade:1497
#: innstereo/gui_layout.glade:2245
#: innstereo/gui_layout.glade:142 innstereo/gui_layout.glade:826 innstereo/gui_layout.glade:1085
#: innstereo/gui_layout.glade:1152 innstereo/gui_layout.glade:1208 innstereo/gui_layout.glade:1266
#: innstereo/gui_layout.glade:1340 innstereo/gui_layout.glade:1497 innstereo/gui_layout.glade:2245
msgid "Cancel"
msgstr "Abbrechen"

Expand All @@ -175,7 +173,7 @@ msgstr "Leinwandfarbe"

#: innstereo/gui_layout.glade:1321
msgid "Choose file to parse"
msgstr ""
msgstr "Datei Auswählen"

#: innstereo/gui_layout.glade:2158
msgid "Circle"
Expand Down Expand Up @@ -234,8 +232,7 @@ msgid "Creates a new fold dataset."
msgstr "Erstellt einen neuen Datensatz für Falten."

#: innstereo/gui_layout.glade:4682
msgid ""
"Creates a new layer group. Selected layers will be placed into the new group."
msgid "Creates a new layer group. Selected layers will be placed into the new group."
msgstr "Erstellt eine neue Gruppenebene. Alle markierten Ebenen werden in die neue Gruppe verschoben."

#: innstereo/gui_layout.glade:4697
Expand Down Expand Up @@ -290,8 +287,7 @@ msgstr "Diamant"
msgid "Diamond thin"
msgstr "Dünner Diamant"

#: innstereo/gui_layout.glade:985 innstereo/gui_layout.glade:1709
#: innstereo/gui_layout.glade:1782
#: innstereo/gui_layout.glade:985 innstereo/gui_layout.glade:1709 innstereo/gui_layout.glade:1782
msgid "Dip"
msgstr "Einfallen"

Expand Down Expand Up @@ -408,14 +404,11 @@ msgid "Finds the ideal plane for a set of linear elements."
msgstr "Berechnet den für alle Lineare bestpassenden Großkreis."

#: innstereo/gui_layout.glade:4509
msgid ""
"Finds the mean vector of a set of linears. At least one linear layer has to "
"be selected."
msgid "Finds the mean vector of a set of linears. At least one linear layer has to be selected."
msgstr "Berechnet die durchschnittliche Richtung aller ausgewählten Lineare."

#: innstereo/gui_layout.glade:4552
msgid ""
"Finds the planes that lie normal to the currently selected linear layers."
msgid "Finds the planes that lie normal to the currently selected linear layers."
msgstr "Findet die Großkreise, die normal auf die ausgewählten Lineare stehen."

#: innstereo/main_ui.py:201
Expand Down Expand Up @@ -464,11 +457,11 @@ msgstr ""

#: innstereo/gui_layout.glade:2194
msgid "Hexagon 1"
msgstr ""
msgstr "Hexagon 1"

#: innstereo/gui_layout.glade:2198
msgid "Hexagon 2"
msgstr ""
msgstr "Hexagon 2"

#: innstereo/gui_layout.glade:229
msgid "Highlight Mode"
Expand Down Expand Up @@ -617,8 +610,7 @@ msgid "Opens a dialog to save the project."
msgstr "Öffnet einen Dialog um das Projekt zu speichern."

#: innstereo/gui_layout.glade:4440
msgid ""
"Opens the plot-properties dialog, that controls the appearance of the plot."
msgid "Opens the plot-properties dialog, that controls the appearance of the plot."
msgstr "Öffnet den Dialog für die allgemeinen Einstellungen."

#: innstereo/gui_layout.glade:2016
Expand Down Expand Up @@ -671,7 +663,7 @@ msgstr "Diagrammeinstellungen"

#: innstereo/gui_layout.glade:2202
msgid "Plus"
msgstr ""
msgstr "Plus"

#: innstereo/gui_layout.glade:2150
msgid "Point"
Expand Down Expand Up @@ -754,9 +746,7 @@ msgid "Rotate Layers"
msgstr "Ebene Rotieren"

#: innstereo/gui_layout.glade:4582
msgid ""
"Rotates the currently selected layers. The rotation settings are set in a "
"dialog."
msgid "Rotates the currently selected layers. The rotation settings are set in a dialog."
msgstr "Rotiert die ausgewählten Ebenen. Öffnet einen Dialog in dem die Rotation angepasst wird."

#: innstereo/gui_layout.glade:1002
Expand Down Expand Up @@ -808,6 +798,8 @@ msgid ""
"Sense of linears is given as the first integer of the column.\n"
"(0 = unknown, 1 = up, 2 = down, 3 = dextral, 4 = sinistral)"
msgstr ""
"Schersinn der Lineare entspricht der ersten Stelle der Spalte.\n"
"(0 = unbekannt, 1 = Aufschiebung, 2 = Abschiebung, 3 = Dextral, 4 = Sinistral)"

#: innstereo/gui_layout.glade:1542
msgid "Separator options"
Expand All @@ -831,7 +823,7 @@ msgstr "Tabelle Anzeigen"

#: innstereo/gui_layout.glade:3494
msgid "Single Line Color"
msgstr ""
msgstr "Konturen einer Farbe"

#: innstereo/gui_layout.glade:2541 innstereo/gui_layout.glade:2874
msgid "Size"
Expand Down Expand Up @@ -867,14 +859,13 @@ msgstr ""

#: innstereo/gui_layout.glade:3752
msgid "Steps"
msgstr ""
msgstr "Intervalle"

#: innstereo/gui_layout.glade:4040
msgid "Stereo and Rose plot"
msgstr "Stereonetz und Rosendiagramm"

#: innstereo/gui_layout.glade:352 innstereo/gui_layout.glade:4024
#: innstereo/gui_layout.glade:4186
#: innstereo/gui_layout.glade:352 innstereo/gui_layout.glade:4024 innstereo/gui_layout.glade:4186
msgid "Stereonet"
msgstr "Stereonetz"

Expand All @@ -896,35 +887,35 @@ msgstr "Stil"

#: innstereo/gui_layout.glade:1870
msgid "Tectonics FPL Notation"
msgstr ""
msgstr "Tectonics FPL Notation"

#: innstereo/dialog_windows.py:319
msgid "Text Files"
msgstr "Textdateien"

#: innstereo/gui_layout.glade:2162
msgid "Triangle down"
msgstr ""
msgstr "Dreieck nach unten"

#: innstereo/gui_layout.glade:2170
msgid "Triangle left"
msgstr ""
msgstr "Dreieck nach links"

#: innstereo/gui_layout.glade:2174
msgid "Triangle right"
msgstr ""
msgstr "Dreieck nach rechts"

#: innstereo/gui_layout.glade:2166
msgid "Triangle up"
msgstr ""
msgstr "Dreieck nach oben"

#: innstereo/gui_layout.glade:3722
msgid "Upper Limit"
msgstr "Obere Grenze"

#: innstereo/gui_layout.glade:2218
msgid "Vertical Line"
msgstr ""
msgstr "Vertikale Linie"

#: innstereo/gui_layout.glade:4255
msgid "View Online Help"
Expand All @@ -936,8 +927,7 @@ msgstr "Webseite Besuchen"

#: innstereo/gui_layout.glade:4872
msgid ""
"When turned on, features can be added to the currently selected layer by "
"clicking on the stereonet."
"When turned on, features can be added to the currently selected layer by clicking on the stereonet."
msgstr ""

#: innstereo/gui_layout.glade:2206
Expand Down Expand Up @@ -1040,8 +1030,7 @@ msgstr "http://innstereo.github.io"
msgid "kamb"
msgstr ""

#: innstereo/gui_layout.glade:3781 innstereo/gui_layout.glade:3954
#: innstereo/gui_layout.glade:3970
#: innstereo/gui_layout.glade:3781 innstereo/gui_layout.glade:3954 innstereo/gui_layout.glade:3970
msgid "label"
msgstr ""

Expand Down

0 comments on commit 9814f88

Please sign in to comment.