Skip to content

Commit

Permalink
Merge pull request #40 from forrestguice/prep-release-0.2.0
Browse files Browse the repository at this point in the history 
release 0.2.0
  • Loading branch information
@forrestguice
forrestguice authored Aug 13, 2016
2 parents b2e40e3 + 2e2f5d4 commit 9b54a2a
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 140 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android
applicationId "com.forrestguice.suntimeswidget"
minSdkVersion 10
targetSdkVersion 23
versionCode 4
versionName "0.1.1"
versionCode 5
versionName "0.2.0"

buildConfigField "java.util.Date", "BUILD_TIME", "new java.util.Date(" + getDateAsMillis() + "L)"
buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
Expand Down
30 changes: 10 additions & 20 deletions app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<string name="configLabel_location_lat">Breitengrad (Lat.):</string> <!-- edittext label -->
<string name="configHint_location_lat">34.54</string> <!-- edittext hint -->
<string name="configLabel_location_lon">Längengrad (Lon.):</string> <!-- edittext label -->
<string name="configHint_location_lon">-112.4677778</string> <!-- edittext hint -->
<string name="configHint_location_lon">-112.46777</string> <!-- edittext hint -->
<string name="configLabel_location_name">Name:</string> <!-- edittext label -->
<string name="configHint_location_name">(optional)</string> <!-- edittext hint -->

Expand Down Expand Up @@ -287,35 +287,25 @@
</string-array>

<!-- App Setting: locale mode -->
<!-- TODO -->
<string name="configLabel_locale">Language Settings (de)</string> <!-- group title -->
<!-- TODO: verify translation / fix -->
<string name="configLabel_locale">Spracheinstellungen</string> <!-- group title -->

<string name="configLabel_localeMode">Mode</string>
<string name="configLabel_localeMode">Modus:</string>
<string name="configLabel_localeMode_summary"><xliff:g id="localeMode_display" example="System Locale">%s</xliff:g></string>
<string-array name="localeMode_display"> <!-- one-to-one with localeMode_values -->
<item>System</item>
<item>User Defined</item>
</string-array>
<string-array name="localeMode_values" translatable="false"> <!-- one-to-one with localeMode_display -->
<item>SYSTEM_LOCALE</item>
<item>CUSTOM_LOCALE</item>
<item>Benutzerdefiniert</item>
</string-array>

<!-- App Setting: custom Locale -->
<!-- TODO -->
<string name="configLabel_localeSelect">Language</string>
<!-- TODO: verify translation / fix -->
<string name="configLabel_localeSelect">Sprache</string>
<string name="configLabel_localeSelect_summary"><xliff:g id="locale_display" example="English">%s</xliff:g></string>
<string-array name="locale_display"> <!-- one-to-one with locale_values -->
<item>English</item>
<item>Englisch</item>
<item>Esperanto</item>
<item>German</item>
<item>Polish</item>
</string-array>
<string-array name="locale_values" translatable="false"> <!-- one-to-one with locale_display -->
<item>en</item>
<item>eo</item>
<item>de</item>
<item>pl</item>
<item>Deutsche</item>
<item>Polieren</item>
</string-array>

<!--
Expand Down
56 changes: 1 addition & 55 deletions app/src/main/res/values-eo/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,6 @@
<item>Malhela etoso</item>
<item>Hela (tage) / malhela (nokte)</item>
</string-array>
<string-array name="appThemes_values" translatable="false"> <!-- config values (one-to-one with appThemes_display) -->
<item>light</item>
<item>dark</item>
<item>daynight</item>
</string-array>

<!-- App Setting: Date "on tap" action -->
<string-array name="dateTapActions_display"> <!-- display values (one-to-one with dateTapActions_values) -->
Expand All @@ -246,12 +241,6 @@
<item>Montri aplikaĵon Kalendaro</item>
<item>Agordi propran daton</item>
</string-array>
<string-array name="dateTapActions_values" translatable="false"> <!-- config values (one-to-one with dateTapActions_display) -->
<item>NOTHING</item>
<item>SWAP_CARD</item>
<item>SHOW_CALENDAR</item>
<item>CONFIG_DATE</item>
</string-array>

<!-- App Setting: Clock UI "on tap" action -->
<string-array name="clockTapActions_display"> <!-- display values (one-to-one with clockTapActions_values) -->
Expand All @@ -260,12 +249,6 @@
<item>Montri sekvan noton</item>
<item>Montri antaŭan noton</item>
</string-array>
<string-array name="clockTapActions_values" translatable="false"> <!-- config values (one-to-one with clockTapActions_display) -->
<item>NOTHING</item>
<item>ALARM</item>
<item>NEXT_NOTE</item>
<item>PREV_NOTE</item>
</string-array>

<!-- App Setting: Note UI "on tap" action -->
<string-array name="noteTapActions_display"> <!-- display values (one-to-one with noteTapActions_values) -->
Expand All @@ -274,12 +257,6 @@
<item>Montri sekvan noton</item>
<item>Montri antaŭan noton</item>
</string-array>
<string-array name="noteTapActions_values" translatable="false"> <!-- config values (one-to-one with noteTapActions_display) -->
<item>NOTHING</item>
<item>ALARM</item>
<item>NEXT_NOTE</item>
<item>PREV_NOTE</item>
</string-array>

<!-- App Setting: GPS fix time limit -->
<string name="configLabel_getFix_maxElapse">Tempolimo de GPS</string>
Expand All @@ -291,13 +268,6 @@
<item>5 minutoj</item>
<item>10 minutoj</item>
</string-array>
<string-array name="getFix_maxElapse_values" translatable="false"> <!-- ms config values (one-to-one with getFix_maxElapse_display) -->
<item>15000</item>
<item>30000></item>
<item>60000</item>
<item>300000</item>
<item>600000</item>
</string-array>

<!-- App Setting: GPS fix max age -->
<string name="configLabel_getFix_maxAge">Valido de GPS-lego</string>
Expand All @@ -314,18 +284,6 @@
<item>unu semajno (168 horoj)</item>
<item>unu monato (672 horoj)</item>
</string-array>
<string-array name="getFix_maxAge_values" translatable="false"> <!-- ms config values (one-to-one with getFix_maxAge_display) -->
<item>60000</item>
<item>300000</item>
<item>900000</item>
<item>3600000</item>
<item>14400000</item>
<item>43200000</item>
<item>86400000</item>
<item>172800000</item>
<item>604800000</item>
<item>2419200000</item>
</string-array>

<!--
DIALOGS
Expand Down Expand Up @@ -364,7 +322,6 @@
</string-array>

<!-- App Setting: locale mode -->
<!-- TODO -->
<string name="configLabel_locale">Agordoj de lingvo</string> <!-- group title -->

<string name="configLabel_localeMode">Reĝimo</string>
Expand All @@ -373,13 +330,8 @@
<item>Sistema</item>
<item>Propra</item>
</string-array>
<string-array name="localeMode_values" translatable="false"> <!-- one-to-one with localeMode_display -->
<item>SYSTEM_LOCALE</item>
<item>CUSTOM_LOCALE</item>
</string-array>

<!-- App Setting: custom Locale -->
<!-- TODO -->
<string name="configLabel_localeSelect">Lingvo</string>
<string name="configLabel_localeSelect_summary"><xliff:g id="locale_display" example="English">%s</xliff:g></string>
<string-array name="locale_display"> <!-- one-to-one with locale_values -->
Expand All @@ -388,12 +340,6 @@
<item>Germana</item>
<item>Pola</item>
</string-array>
<string-array name="locale_values" translatable="false"> <!-- one-to-one with locale_display -->
<item>en</item>
<item>eo</item>
<item>de</item>
<item>pl</item>
</string-array>

<!-- Dialog: Enable GPS? -->
<string name="gps_dialog_msg">GPS estas malaktiva. Ĉu aktivigi ĝin?</string>
Expand Down Expand Up @@ -468,7 +414,7 @@
]]></string>
<string name="app_legal2"><![CDATA[
Germana traduko de Henrik "HerHde" Hüttemann. </br>
Pola kaj Esperanta traduko de verdulo.
Pola kaj Esperanta tradukoj de verdulo.
]]></string>

<!-- Dialog: Help -->
Expand Down
56 changes: 1 addition & 55 deletions app/src/main/res/values-pl/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,6 @@
<item>Ciemna skórka</item>
<item>Jasna skórka (dzień) / Ciemna skórka (noc)</item>
</string-array>
<string-array name="appThemes_values" translatable="false"> <!-- config values (one-to-one with appThemes_display) -->
<item>light</item>
<item>dark</item>
<item>daynight</item>
</string-array>

<!-- App Setting: Date "on tap" action -->
<string-array name="dateTapActions_display"> <!-- display values (one-to-one with dateTapActions_values) -->
Expand All @@ -246,12 +241,6 @@
<item>Uruchom aplikację Kalendarz</item>
<item>Ustaw własną datę</item>
</string-array>
<string-array name="dateTapActions_values" translatable="false"> <!-- config values (one-to-one with dateTapActions_display) -->
<item>NOTHING</item>
<item>SWAP_CARD</item>
<item>SHOW_CALENDAR</item>
<item>CONFIG_DATE</item>
</string-array>

<!-- App Setting: Clock UI "on tap" action -->
<string-array name="clockTapActions_display"> <!-- display values (one-to-one with clockTapActions_values) -->
Expand All @@ -260,12 +249,6 @@
<item>Pokaż następną notatkę</item>
<item>Pokaż poprzednią notatkę</item>
</string-array>
<string-array name="clockTapActions_values" translatable="false"> <!-- config values (one-to-one with clockTapActions_display) -->
<item>NOTHING</item>
<item>ALARM</item>
<item>NEXT_NOTE</item>
<item>PREV_NOTE</item>
</string-array>

<!-- App Setting: Note UI "on tap" action -->
<string-array name="noteTapActions_display"> <!-- display values (one-to-one with noteTapActions_values) -->
Expand All @@ -274,12 +257,6 @@
<item>Pokaż następną notatkę</item>
<item>Pokaż poprzednią notatkę</item>
</string-array>
<string-array name="noteTapActions_values" translatable="false"> <!-- config values (one-to-one with noteTapActions_display) -->
<item>NOTHING</item>
<item>ALARM</item>
<item>NEXT_NOTE</item>
<item>PREV_NOTE</item>
</string-array>

<!-- App Setting: GPS fix time limit -->
<string name="configLabel_getFix_maxElapse">Limit czasu GPS</string>
Expand All @@ -291,13 +268,6 @@
<item>5 minutach</item>
<item>10 minutach</item>
</string-array>
<string-array name="getFix_maxElapse_values" translatable="false"> <!-- ms config values (one-to-one with getFix_maxElapse_display) -->
<item>15000</item>
<item>30000></item>
<item>60000</item>
<item>300000</item>
<item>600000</item>
</string-array>

<!-- App Setting: GPS fix max age -->
<string name="configLabel_getFix_maxAge">Czas aktualności GPS</string>
Expand All @@ -314,36 +284,18 @@
<item>tydzień (168 godzin)</item>
<item>miesiąc (672 godziny)</item>
</string-array>
<string-array name="getFix_maxAge_values" translatable="false"> <!-- ms config values (one-to-one with getFix_maxAge_display) -->
<item>60000</item>
<item>300000</item>
<item>900000</item>
<item>3600000</item>
<item>14400000</item>
<item>43200000</item>
<item>86400000</item>
<item>172800000</item>
<item>604800000</item>
<item>2419200000</item>
</string-array>

<!-- App Setting: locale mode -->
<!-- TODO -->
<string name="configLabel_locale">Ustawienia języka (pl)</string> <!-- group title -->
<string name="configLabel_locale">Ustawienia języka</string> <!-- group title -->

<string name="configLabel_localeMode">Język</string>
<string name="configLabel_localeMode_summary"><xliff:g id="localeMode_display" example="System Locale">%s</xliff:g></string>
<string-array name="localeMode_display"> <!-- one-to-one with localeMode_values -->
<item>Systemowy</item>
<item>Własny użytkownika</item>
</string-array>
<string-array name="localeMode_values" translatable="false"> <!-- one-to-one with localeMode_display -->
<item>SYSTEM_LOCALE</item>
<item>CUSTOM_LOCALE</item>
</string-array>

<!-- App Setting: custom Locale -->
<!-- TODO -->
<string name="configLabel_localeSelect">Język</string>
<string name="configLabel_localeSelect_summary"><xliff:g id="locale_display" example="English">%s</xliff:g></string>
<string-array name="locale_display"> <!-- one-to-one with locale_values -->
Expand All @@ -352,12 +304,6 @@
<item>Niemiecki</item>
<item>Polski</item>
</string-array>
<string-array name="locale_values" translatable="false"> <!-- one-to-one with locale_display -->
<item>en</item>
<item>eo</item>
<item>de</item>
<item>pl</item>
</string-array>

<!--
DIALOGS
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,14 @@
<string name="locationMode_current">Current (last known)</string> <!-- setting -->
<string name="locationMode_custom">User Defined</string> <!-- setting -->

<string name="configLabel_location">Location Settings</string> <!-- group title -->
<string name="configLabel_location_mode">Mode:</string> <!-- spinner label -->
<string name="configLabel_location_lat">Latitude:</string> <!-- edittext label -->
<string name="configHint_location_lat">34.54</string> <!-- edittext hint -->
<string name="configLabel_location_lon">Longitude:</string> <!-- edittext label -->
<string name="configHint_location_lon">-112.4677778</string> <!-- edittext hint -->
<string name="configLabel_location_name">Name:</string> <!-- edittext label -->
<string name="configHint_location_name">(optional)</string> <!-- edittext hint -->
<string name="configLabel_location">Location Settings</string> <!-- group title -->
<string name="configLabel_location_mode">Mode:</string> <!-- spinner label -->
<string name="configLabel_location_lat">Latitude:</string> <!-- edittext label -->
<string name="configHint_location_lat">decimal degrees</string> <!-- edittext hint -->
<string name="configLabel_location_lon">Longitude:</string> <!-- edittext label -->
<string name="configHint_location_lon">decimal degrees</string> <!-- edittext hint -->
<string name="configLabel_location_name">Name:</string> <!-- edittext label -->
<string name="configHint_location_name">(optional)</string> <!-- edittext hint -->

<string name="configAction_getFix">Get Location</string> <!-- button (contentDescription) -->
<string name="configAction_editPlace">Edit</string> <!-- button (contentDescription) -->
Expand Down

0 comments on commit 9b54a2a

Please sign in to comment.