15 files changed, 77 insertions, 107 deletions
diff --git a/cgeo-calendar/res/values-cs/strings.xml b/cgeo-calendar/res/values-cs/strings.xml
index 3159c36..245f9fc 100644
--- a/cgeo-calendar/res/values-cs/strings.xml
+++ b/cgeo-calendar/res/values-cs/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="calendars">Kalendáře</string>
-    <string name="event_success">Událost byla přidána do kalendáře</string>
-    <string name="event_fail">Nepodařilo se vložit událost do kalendáře</string>
-
-</resources>
-\ No newline at end of file
+  <string name="app_name">c:geo - Kalendář (doplněk)</string>
+  <string name="calendars">Kalendáře</string>
+  <string name="event_success">Událost byla přidána do kalendáře</string>
+  <string name="event_fail">Přidání události do kalendáře selhalo</string>
+</resources>
diff --git a/cgeo-calendar/res/values-da/strings.xml b/cgeo-calendar/res/values-da/strings.xml
index 271ba55..661819d 100644
--- a/cgeo-calendar/res/values-da/strings.xml
+++ b/cgeo-calendar/res/values-da/strings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="calendars">Kalenders</string>
-    <string name="event_success">Eventcache tilføjet til kalender</string>
-    <string name="event_fail">Kan ikke tilføje eventcache til kalender</string>
-
-</resources>
-\ No newline at end of file
+  <string name="calendars">Kalenders</string>
+  <string name="event_success">Eventcache tilføjet til kalender</string>
+  <string name="event_fail">Kan ikke tilføje eventcache til kalender</string>
+</resources>
diff --git a/cgeo-calendar/res/values-de/strings.xml b/cgeo-calendar/res/values-de/strings.xml
index 2852023..32a2fbd 100644
--- a/cgeo-calendar/res/values-de/strings.xml
+++ b/cgeo-calendar/res/values-de/strings.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="app_name">c:geo - Kalender (Erweiterung)</string>
-    <string name="calendars">Kalender</string>
-    <string name="event_success">Event zum Kalender hinzugefügt</string>
-    <string name="event_fail">Hinzufügen des Events zum Kalender fehlgeschlagen</string>
-
-</resources>
-\ No newline at end of file
+  <string name="app_name">c:geo - Kalender (Erweiterung)</string>
+  <string name="calendars">Kalender</string>
+  <string name="event_success">Event zum Kalender hinzugefügt</string>
+  <string name="event_fail">Hinzufügen des Events zum Kalender fehlgeschlagen</string>
+</resources>
diff --git a/cgeo-calendar/res/values-es/strings.xml b/cgeo-calendar/res/values-es/strings.xml
index 2940e1c..b27b546 100644
--- a/cgeo-calendar/res/values-es/strings.xml
+++ b/cgeo-calendar/res/values-es/strings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="calendars">Calendarios</string>
-    <string name="event_success">Escondite/Evento añadido al calendario</string>
-    <string name="event_fail">Error al añadir escondite/evento al calendario</string>
-
-</resources>
-\ No newline at end of file
+  <string name="calendars">Calendarios</string>
+  <string name="event_success">Escondite/Evento añadido al calendario</string>
+  <string name="event_fail">Error al añadir escondite/evento al calendario</string>
+</resources>
diff --git a/cgeo-calendar/res/values-hu/strings.xml b/cgeo-calendar/res/values-hu/strings.xml
index 44770e7..5344f5e 100644
--- a/cgeo-calendar/res/values-hu/strings.xml
+++ b/cgeo-calendar/res/values-hu/strings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="calendars">Naptárhoz</string>
-    <string name="event_success">Eseményláda hozzáadva a naptárhoz</string>
-    <string name="event_fail">Eseményláda hozzáadása a naptárhoz sikertelen.</string>
-
-</resources>
-\ No newline at end of file
+  <string name="calendars">Naptárhoz</string>
+  <string name="event_success">Eseményláda hozzáadva a naptárhoz</string>
+  <string name="event_fail">Eseményláda hozzáadása a naptárhoz sikertelen.</string>
+</resources>
diff --git a/cgeo-calendar/res/values-it/strings.xml b/cgeo-calendar/res/values-it/strings.xml
index dfea587..8fa5391 100644
--- a/cgeo-calendar/res/values-it/strings.xml
+++ b/cgeo-calendar/res/values-it/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="calendars">Calendari</string>
-    <string name="event_success">Evento aggiunto al calendario</string>
-    <string name="event_fail">Aggiunta evento fallita</string>
-
-</resources>
-\ No newline at end of file
+  <string name="app_name">c:geo - calendario (add-on)</string>
+  <string name="calendars">Calendari</string>
+  <string name="event_success">Evento aggiunto al calendario</string>
+  <string name="event_fail">Aggiunta evento fallita</string>
+</resources>
diff --git a/cgeo-calendar/res/values-ja/strings.xml b/cgeo-calendar/res/values-ja/strings.xml
index 6082d9b..09683bc 100644
--- a/cgeo-calendar/res/values-ja/strings.xml
+++ b/cgeo-calendar/res/values-ja/strings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="calendars">カレンダー</string>
-    <string name="event_success">イベントキャッシュがカレンダーに追加されました</string>
-    <string name="event_fail">イベントキャッシュをカレンダーに追加するのに失敗しました</string>
-
-</resources>
-\ No newline at end of file
+  <string name="calendars">カレンダー</string>
+  <string name="event_success">イベントキャッシュがカレンダーに追加されました</string>
+  <string name="event_fail">イベントキャッシュをカレンダーに追加するのに失敗しました</string>
+</resources>
diff --git a/cgeo-calendar/res/values-nb/strings.xml b/cgeo-calendar/res/values-nb/strings.xml
index dbd4d10..75ae7ad 100644
--- a/cgeo-calendar/res/values-nb/strings.xml
+++ b/cgeo-calendar/res/values-nb/strings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="calendars">Kalendere</string>
-    <string name="event_success">Hendelse-cache lagt til i kalenderen</string>
-    <string name="event_fail">c:geo klarte ikke å legge hendelse-cachen til i kalenderen</string>
-
-</resources>
-\ No newline at end of file
+  <string name="calendars">Kalendere</string>
+  <string name="event_success">Hendelse-cache lagt til i kalenderen</string>
+  <string name="event_fail">c:geo klarte ikke å legge hendelse-cachen til i kalenderen</string>
+</resources>
diff --git a/cgeo-calendar/res/values-nl/strings.xml b/cgeo-calendar/res/values-nl/strings.xml
index bf3313f..408f39f 100644
--- a/cgeo-calendar/res/values-nl/strings.xml
+++ b/cgeo-calendar/res/values-nl/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="calendars">Kalenders</string>
-    <string name="event_success">Event cache toegevoegd aan kalender</string>
-    <string name="event_fail">Niet gelukt om event cache toe te voegen aan kalender</string>
-
-</resources>
-\ No newline at end of file
+  <string name="app_name">c:geo - agenda (add-on)</string>
+  <string name="calendars">Kalenders</string>
+  <string name="event_success">Event cache toegevoegd aan kalender</string>
+  <string name="event_fail">Niet gelukt om event cache toe te voegen aan kalender</string>
+</resources>
diff --git a/cgeo-calendar/res/values-pl/strings.xml b/cgeo-calendar/res/values-pl/strings.xml
index f04dd8c..166dafc 100644
--- a/cgeo-calendar/res/values-pl/strings.xml
+++ b/cgeo-calendar/res/values-pl/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="calendars">Kalendarze</string>
-    <string name="event_success">Wydarzenie wpisane do kalendarza</string>
-    <string name="event_fail">Nie udało się wpisać wydarzenia do kalendarza</string>
-
-</resources>
-\ No newline at end of file
+  <string name="app_name">c:geo - Kalendarz (dodatek)</string>
+  <string name="calendars">Kalendarze</string>
+  <string name="event_success">Wydarzenie wpisane do kalendarza</string>
+  <string name="event_fail">Nie udało się wpisać wydarzenia do kalendarza</string>
+</resources>
diff --git a/cgeo-calendar/res/values-sk/strings.xml b/cgeo-calendar/res/values-sk/strings.xml
index 8132fa6..82ddf3b 100644
--- a/cgeo-calendar/res/values-sk/strings.xml
+++ b/cgeo-calendar/res/values-sk/strings.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="app_name">c:geo - calendar (doplnok)</string>
-    <string name="calendars">Kalendáre</string>
-    <string name="event_success">Skrýša udalosti pridaná do kalendára</string>
-    <string name="event_fail">Nepodarilo sa pridať skrýšu udalostí do kalendára</string>
-
-</resources>
-\ No newline at end of file
+  <string name="app_name">c:geo - calendar (doplnok)</string>
+  <string name="calendars">Kalendáre</string>
+  <string name="event_success">Skrýša udalosti pridaná do kalendára</string>
+  <string name="event_fail">Nepodarilo sa pridať skrýšu udalostí do kalendára</string>
+</resources>
diff --git a/cgeo-calendar/res/values-sv/strings.xml b/cgeo-calendar/res/values-sv/strings.xml
index 9749db5..41d3fbb 100755..100644
--- a/cgeo-calendar/res/values-sv/strings.xml
+++ b/cgeo-calendar/res/values-sv/strings.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-
-    <string name="app_name">c:geo - kalender (tillägg)</string>
-    <string name="calendars">Kalendrar</string>
-    <string name="event_success">Event cache inlagt i kalender</string>
-    <string name="event_fail">Misslyckades att lägga in event cache i kalendern</string>
-
-</resources>
-\ No newline at end of file
+  <string name="app_name">c:geo - kalender (tillägg)</string>
+  <string name="calendars">Kalendrar</string>
+  <string name="event_success">Event cache inlagt i kalender</string>
+  <string name="event_fail">Misslyckades att lägga in event cache i kalendern</string>
+</resources>
diff --git a/cgeo-calendar/src/cgeo/calendar/AddEntry.java b/cgeo-calendar/src/cgeo/calendar/AddEntry.java
index b1f97b9..ce8658d 100644
--- a/cgeo-calendar/src/cgeo/calendar/AddEntry.java
+++ b/cgeo-calendar/src/cgeo/calendar/AddEntry.java
@@ -26,7 +26,6 @@ class AddEntry extends AbstractAddEntry {
 
         final Date eventDate = entry.parseDate();
         final String description = entry.parseDescription();
-        final String eventLocation = entry.parseLocation();
 
         // values
         final ContentValues event = new ContentValues();
@@ -43,8 +42,8 @@ class AddEntry extends AbstractAddEntry {
         event.put("title", Html.fromHtml(entry.getName()).toString());
         event.put("description", description);
 
-        if (eventLocation.length() > 0) {
-            event.put("eventLocation", eventLocation);
+        if (entry.getCoords().length() > 0) {
+            event.put("eventLocation", entry.getCoords());
         }
         event.put("hasAlarm", 0);
 
diff --git a/cgeo-calendar/src/cgeo/calendar/AddEntryLevel14.java b/cgeo-calendar/src/cgeo/calendar/AddEntryLevel14.java
index 44453dd..b6a451e 100644
--- a/cgeo-calendar/src/cgeo/calendar/AddEntryLevel14.java
+++ b/cgeo-calendar/src/cgeo/calendar/AddEntryLevel14.java
@@ -20,7 +20,6 @@ class AddEntryLevel14 extends AbstractAddEntry {
     protected void addEntryToCalendarInternal() {
         final Date eventDate = entry.parseDate();
         final String description = entry.parseDescription();
-        final String eventLocation = entry.parseLocation();
 
         /*
          * TODO These strings are available as constants starting with API 14 and can be used when
@@ -32,8 +31,7 @@ class AddEntryLevel14 extends AbstractAddEntry {
                 .putExtra("title", Html.fromHtml(entry.getName()).toString())
                 .putExtra("description", description)
                 .putExtra("hasAlarm", false)
-                .putExtra("eventTimezone", "UTC")
-                .putExtra("eventLocation", eventLocation);
+                .putExtra("eventTimezone", "UTC");
         if (entry.getStartTimeMinutes() >= 0) {
             intent.putExtra("beginTime", eventDate.getTime() + entry.getStartTimeMinutes() * 60000L);
         }
@@ -41,6 +39,9 @@ class AddEntryLevel14 extends AbstractAddEntry {
             intent.putExtra("beginTime", eventDate.getTime() + 43200000);
             intent.putExtra("allDay", true);
         }
+        if (entry.getCoords().length() > 0) {
+            intent.putExtra("eventLocation", entry.getCoords());
+        }
         activity.startActivity(intent);
     }
 
diff --git a/cgeo-calendar/src/cgeo/calendar/CalendarEntry.java b/cgeo-calendar/src/cgeo/calendar/CalendarEntry.java
index e31e054..6c7624d 100644
--- a/cgeo-calendar/src/cgeo/calendar/CalendarEntry.java
+++ b/cgeo-calendar/src/cgeo/calendar/CalendarEntry.java
@@ -20,7 +20,6 @@ class CalendarEntry {
     private String url;
     private String personalNote;
     private String name;
-    private String location;
     private String coords;
     private int startTimeMinutes = -1;
     private Uri uri;
@@ -32,7 +31,6 @@ class CalendarEntry {
         this.url = getParameter(ICalendar.PARAM_URL);
         this.personalNote = getParameter(ICalendar.PARAM_NOTE);
         this.name = getParameter(ICalendar.PARAM_NAME);
-        location = getParameter(ICalendar.PARAM_LOCATION);
         coords = getParameter(ICalendar.PARAM_COORDS);
         final String startTime = getParameter(ICalendar.PARAM_START_TIME_MINUTES);
         if (startTime.length() > 0) {
@@ -78,30 +76,6 @@ class CalendarEntry {
     }
 
     /**
-     * @return location string with coordinates and location
-     */
-    protected String parseLocation() {
-        final StringBuilder locBuffer = new StringBuilder();
-        if (coords.length() > 0) {
-            locBuffer.append(coords);
-        }
-        if (location.length() > 0) {
-            boolean addParentheses = false;
-            if (locBuffer.length() > 0) {
-                addParentheses = true;
-                locBuffer.append(" (");
-            }
-
-            locBuffer.append(Html.fromHtml(location).toString());
-            if (addParentheses) {
-                locBuffer.append(')');
-            }
-        }
-
-        return locBuffer.toString();
-    }
-
-    /**
      * @return <code>Date</code> based on hidden date. Time is set to 00:00:00.
      */
     protected Date parseDate() {
@@ -153,4 +127,8 @@ class CalendarEntry {
         return startTimeMinutes;
     }
 
+    public String getCoords() {
+        return coords;
+    }
+
 }