Merge branch 'upstream-svn' into upstream
authorHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 4 Feb 2010 23:53:05 +0000 (00:53 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 4 Feb 2010 23:53:05 +0000 (00:53 +0100)
Conflicts:
configure.in
navit/graphics/win32/Makefile.am
navit/support/libc/Makefile.am
navit/support/libc/errno.h
navit/support/wordexp/wordexp.c
navit/xpm/Makefile.am
po/af.po.in
po/ar.po.in
po/bg.po.in
po/ca.po.in
po/cs.po.in
po/da.po.in
po/de.po.in
po/el.po.in
po/en_GB.po.in
po/eo.po.in
po/es.po.in
po/et.po.in
po/fi.po.in
po/fo.po.in
po/fr.po.in
po/gl.po.in
po/he.po.in
po/hu.po.in
po/id.po.in
po/it.po.in
po/ja.po.in
po/nb.po.in
po/nds.po.in
po/nl.po.in
po/nn.po.in
po/pl.po.in
po/pt.po.in
po/pt_BR.po.in
po/ro.po.in
po/ru.po.in
po/sk.po.in
po/sl.po.in
po/sv.po.in
po/te.po.in
po/th.po.in
po/tr.po.in
po/uk.po.in
po/vi.po.in
po/zh_CN.po.in
po/zh_HK.po.in

55 files changed:
configure.in
man/maptool.1
man/navit.1
navit/attr_def.h
navit/graphics/android/graphics_android.c
navit/graphics/gd/graphics_gd.c
navit/map/mg/map.c
navit/map/mg/town.c
navit/maptool/geom.c
navit/navit.dtd
navit/navit_shipped.xml
navit/vehicle.c
navit/xmlconfig.c
navit/xpm/Makefile.am
navit/xpm/gui_about.svg [new file with mode: 0644]
po/af.po.in
po/ar.po.in
po/bg.po.in
po/ca.po.in
po/cs.po.in
po/da.po.in
po/de.po.in
po/el.po.in
po/en_GB.po.in
po/eo.po.in
po/es.po.in
po/et.po.in
po/fi.po.in
po/fo.po.in
po/fr.po.in
po/gl.po.in
po/he.po.in
po/hu.po.in
po/id.po.in
po/it.po.in
po/ja.po.in
po/nb.po.in
po/nds.po.in
po/nl.po.in
po/nn.po.in
po/pl.po.in
po/pt.po.in
po/pt_BR.po.in
po/ro.po.in
po/ru.po.in
po/sk.po.in
po/sl.po.in
po/sv.po.in
po/te.po.in
po/th.po.in
po/tr.po.in
po/uk.po.in
po/vi.po.in
po/zh_CN.po.in
po/zh_HK.po.in

index 7e67a3d..efb7280 100644 (file)
@@ -106,7 +106,7 @@ linux*_android)
        speech_android=yes; speech_android_reason="host_os is android"
        MODULE_LDFLAGS="-module -Xcompiler -nostdlib"
        MODULE_LIBADD="-llog"
-       NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS -L\$(top_builddir)/navit -lnavit"
+       NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS"
        ;;
 esac
 if test "x$win32" = "xyes"
index 9f03927..f6a8d59 100644 (file)
@@ -1,4 +1,4 @@
-.TH maptool 1  "August, 21 2008" "version 0.0.4+svn" "USER COMMANDS"
+.TH maptool 1  "$Date$" "$Revision$" "USER COMMANDS"
 .SH NAME
 maptool \- parse osm textfile and converts to NavIt binfile format
 .SH SYNOPSIS
index b91cf81..c47322e 100644 (file)
@@ -1,4 +1,4 @@
-.TH navit 1  "August, 21 2008" "version 0.0.4+svn" "USER COMMANDS"
+.TH navit 1  "$Date$" "$Revision$" "USER COMMANDS"
 .SH NAME
 navit \- The modular touchscreen-friendly vector based navigation software.
 .SH SYNOPSIS
@@ -21,7 +21,7 @@ NMEA GPS sensors.
 The routing engine not only calculates an optimal route to your
 destination, but also generates directions and even speaks to you.
 
-Navit is translated is 16 languages currently.
+Navit is translated in more than 40 languages currently, please see https://translations.launchpad.net/navit/trunk
 
 For more informations, please refer to our wiki :
  http://wiki.navit-project.org
index 9403042..1f2a8fb 100644 (file)
@@ -279,6 +279,7 @@ ATTR(layout_name)
 ATTR(user_name)
 ATTR(user_pass)
 ATTR(status_text)
+ATTR(log_gpx_desc)
 ATTR2(0x0003ffff,type_string_end)
 ATTR2(0x00040000,type_special_begin)
 ATTR(order)
index 11ace92..386016c 100644 (file)
@@ -40,6 +40,7 @@ struct graphics_priv {
        jmethodID Paint_init,Paint_setStrokeWidth,Paint_setARGB;
 
        jobject NavitGraphics;
+       jobject Paint;
        
        jclass BitmapFactoryClass;      
        jmethodID BitmapFactory_decodeFile, BitmapFactory_decodeResource;
@@ -63,8 +64,10 @@ struct graphics_font_priv {
 };
 
 struct graphics_gc_priv {
-       struct graphics_priv *gra;
-       jobject Paint;
+        struct graphics_priv *gra;
+       int linewidth;
+       enum draw_mode_num mode;
+       int a,r,g,b;
 };
 
 struct graphics_image_priv {
@@ -131,15 +134,13 @@ static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct grap
 static void
 gc_destroy(struct graphics_gc_priv *gc)
 {
-       (*jnienv)->DeleteGlobalRef(jnienv, gc->Paint);
        g_free(gc);
 }
 
 static void
 gc_set_linewidth(struct graphics_gc_priv *gc, int w)
 {
-       float wf=w;
-       (*jnienv)->CallVoidMethod(jnienv, gc->Paint, gc->gra->Paint_setStrokeWidth, wf);
+    gc->linewidth = w;
 }
 
 static void
@@ -150,7 +151,10 @@ gc_set_dashes(struct graphics_gc_priv *gc, int w, int offset, unsigned char *das
 static void
 gc_set_foreground(struct graphics_gc_priv *gc, struct color *c)
 {
-       (*jnienv)->CallVoidMethod(jnienv, gc->Paint, gc->gra->Paint_setARGB, c->a >> 8, c->r >> 8, c->g >> 8, c->b >> 8);
+    gc->r = c->r >> 8;
+    gc->g = c->g >> 8;
+    gc->b = c->b >> 8;
+    gc->a = c->a >> 8;
 }
 
 static void
@@ -171,20 +175,15 @@ static struct graphics_gc_priv *gc_new(struct graphics_priv *gr, struct graphics
        struct graphics_gc_priv *ret=g_new0(struct graphics_gc_priv, 1);
        *meth=gc_methods;
 
-       ret->gra=gr;    
-       ret->Paint=(*jnienv)->NewObject(jnienv, gr->PaintClass, gr->Paint_init);
-       dbg(1,"result=%p\n",ret->Paint);
-       if (ret->Paint) {
-               (*jnienv)->NewGlobalRef(jnienv, ret->Paint);
-               (*jnienv)->DeleteLocalRef(jnienv, ret->Paint);
-       }
+       ret->gra = gr;
+       ret->a = ret->r = ret->g = ret->b = 255;
+       ret->linewidth=1;
        return ret;
 }
 
 static void image_destroy(struct graphics_image_priv *img)
 {
-       (*jnienv)->DeleteGlobalRef(jnienv, img->Bitmap);
-       g_free(img);
+    // unused?
 }
 
 static struct graphics_image_methods image_methods = {
@@ -240,6 +239,13 @@ image_new(struct graphics_priv *gra, struct graphics_image_methods *meth, char *
        return ret;
 }
 
+static void initPaint(struct graphics_priv *gra, struct graphics_gc_priv *gc)
+{
+    float wf = gc->linewidth;
+    (*jnienv)->CallVoidMethod(jnienv, gc->gra->Paint, gra->Paint_setStrokeWidth, wf);
+    (*jnienv)->CallVoidMethod(jnienv, gc->gra->Paint, gra->Paint_setARGB, gc->a, gc->r, gc->g, gc->b);
+}
+
 static void
 draw_lines(struct graphics_priv *gra, struct graphics_gc_priv *gc, struct point *p, int count)
 {
@@ -253,8 +259,9 @@ draw_lines(struct graphics_priv *gra, struct graphics_gc_priv *gc, struct point
                pc[i*2]=p[i].x;
                pc[i*2+1]=p[i].y;
        }
+       initPaint(gra, gc);
        (*jnienv)->SetIntArrayRegion(jnienv, points, 0, count*2, pc);
-       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_polyline, gc->Paint, points);
+       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_polyline, gc->gra->Paint, points);
        (*jnienv)->DeleteLocalRef(jnienv, points);
 }
 
@@ -271,21 +278,24 @@ draw_polygon(struct graphics_priv *gra, struct graphics_gc_priv *gc, struct poin
                pc[i*2]=p[i].x;
                pc[i*2+1]=p[i].y;
        }
+       initPaint(gra, gc);
        (*jnienv)->SetIntArrayRegion(jnienv, points, 0, count*2, pc);
-       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_polygon, gc->Paint, points);
+       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_polygon, gc->gra->Paint, points);
        (*jnienv)->DeleteLocalRef(jnienv, points);
 }
 
 static void
 draw_rectangle(struct graphics_priv *gra, struct graphics_gc_priv *gc, struct point *p, int w, int h)
 {
-       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_rectangle, gc->Paint, p->x, p->y, w, h);
+        initPaint(gra, gc);
+       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_rectangle, gc->gra->Paint, p->x, p->y, w, h);
 }
 
 static void
 draw_circle(struct graphics_priv *gra, struct graphics_gc_priv *gc, struct point *p, int r)
 {
-       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_circle, gc->Paint, p->x, p->y, r);
+        initPaint(gra, gc);
+       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_circle, gc->gra->Paint, p->x, p->y, r);
 }
 
 
@@ -293,8 +303,9 @@ static void
 draw_text(struct graphics_priv *gra, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy)
 {
        dbg(1,"enter %s\n", text);
+       initPaint(gra, fg);
        jstring string = (*jnienv)->NewStringUTF(jnienv, text);
-       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_text, fg->Paint, p->x, p->y, string, font->size, dx, dy);
+       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_text, fg->gra->Paint, p->x, p->y, string, font->size, dx, dy);
        (*jnienv)->DeleteLocalRef(jnienv, string);
 }
 
@@ -302,7 +313,8 @@ static void
 draw_image(struct graphics_priv *gra, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img)
 {
        dbg(1,"enter %p\n",img);
-       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_image, fg->Paint, p->x, p->y, img->Bitmap);
+       initPaint(gra, fg);
+       (*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_image, fg->gra->Paint, p->x, p->y, img->Bitmap);
        
 }
 
@@ -344,6 +356,8 @@ get_data(struct graphics_priv *this, char *type)
 
 static void image_free(struct graphics_priv *gr, struct graphics_image_priv *priv)
 {
+    (*jnienv)->DeleteGlobalRef(jnienv, priv->Bitmap);
+    g_free(priv);
 }
 
 static void get_text_bbox(struct graphics_priv *gr, struct graphics_font_priv *font, char *text, int dx, int dy, struct point *ret, int estimate)
@@ -477,7 +491,7 @@ graphics_android_init(struct graphics_priv *ret, struct graphics_priv *parent, s
        dbg(0,"at 2 jnienv=%p\n",jnienv);
        if (!find_class_global("android/graphics/Paint", &ret->PaintClass))
                return 0;
-       if (!find_method(ret->PaintClass, "<init>", "()V", &ret->Paint_init))
+       if (!find_method(ret->PaintClass, "<init>", "(I)V", &ret->Paint_init))
                return 0;
        if (!find_method(ret->PaintClass, "setARGB", "(IIII)V", &ret->Paint_setARGB))
                return 0;
@@ -526,6 +540,15 @@ graphics_android_init(struct graphics_priv *ret, struct graphics_priv *parent, s
        if (ret->NavitGraphics)
                (*jnienv)->NewGlobalRef(jnienv, ret->NavitGraphics);
 
+       /* Create a single global Paint, otherwise android will quickly run out
+        * of global refs.*/
+       /* 0x101 = text kerning (default), antialiasing */
+       ret->Paint=(*jnienv)->NewObject(jnienv, ret->PaintClass, ret->Paint_init, 0x101);
+
+       dbg(0,"result=%p\n",ret->Paint);
+       if (ret->Paint)
+               (*jnienv)->NewGlobalRef(jnienv, ret->Paint);
+
        cid = (*jnienv)->GetMethodID(jnienv, ret->NavitGraphicsClass, "setSizeChangedCallback", "(I)V");
        if (cid == NULL) {
                dbg(0,"no SetResizeCallback method found\n");
index 55dd02c..3bdcbb7 100644 (file)
@@ -168,7 +168,8 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromXpm (char *filename)
 
 struct graphics_priv {
        gdImagePtr im;
-       int w,h,flags;
+       int w,h,flags,alpha,overlay;
+       struct point p;
        struct callback *cb;
        struct callback_list *cbl;
        struct navit *nav;
@@ -176,6 +177,7 @@ struct graphics_priv {
        struct font_freetype_methods freetype_methods;
        struct window window;
        struct graphics_data_image image;
+       struct graphics_priv *next,*overlays;
 };
 
 struct graphics_gc_priv {
@@ -406,6 +408,18 @@ draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
 }
 
 static void
+draw_drag(struct graphics_priv *gr, struct point *p)
+{
+       if (p)
+               gr->p=*p;
+       else {
+               gr->p.x=0;
+               gr->p.y=0;
+       }
+}
+
+
+static void
 background_gc(struct graphics_priv *gr, struct graphics_gc_priv *gc)
 {
        gr->background=gc;
@@ -434,14 +448,26 @@ static void *
 get_data(struct graphics_priv *this, char *type)
 {
        int b;
-        struct point p;
+       struct point p;
+       gdImagePtr im = this->im;
        dbg(1,"type=%s\n",type);
        if (!strcmp(type,"window"))
                return &this->window;
        if (!strcmp(type,"image_png")) {
+               if (this->overlays) {
+                       struct graphics_priv *overlay=this->overlays;
+                       im=gdImageCreateTrueColor(this->w,this->h);
+                       gdImageCopy(im, this->im, 0, 0, 0, 0, this->w, this->h);
+                       while (overlay) {
+                               gdImageCopy(im, overlay->im, overlay->p.x, overlay->p.y, 0, 0, overlay->w, overlay->h);
+                               overlay=overlay->next;
+                       }
+               }
                if (this->image.data)
                        gdFree(this->image.data);
-               this->image.data=gdImagePngPtr(this->im, &this->image.size);
+               this->image.data=gdImagePngPtr(im, &this->image.size);
+               if (this->overlays)
+                       gdImageDestroy(im);
                return &this->image;
        }
        if (sscanf(type,"click_%d_%d_%d",&p.x,&p.y,&b) == 3) {
@@ -469,6 +495,13 @@ overlay_disable(struct graphics_priv *gr, int disable)
        dbg(0,"enter\n");
 }
 
+static void
+overlay_resize(struct graphics_priv *gr, struct point *p, int w, int h, int alpha, int wraparound)
+{
+       dbg(0,"enter\n");
+}
+
+
 static int
 set_attr_do(struct graphics_priv *gr, struct attr *attr, int init)
 {
@@ -522,7 +555,7 @@ static struct graphics_methods graphics_methods = {
        draw_image,
        draw_image_warp,
        draw_restore,
-       NULL,
+       draw_drag,
        NULL,
        gc_new,
        background_gc,
@@ -532,15 +565,34 @@ static struct graphics_methods graphics_methods = {
        image_free,
        NULL,
        overlay_disable,
-       NULL,
+       overlay_resize,
        set_attr,
 };
 
 static struct graphics_priv *
 overlay_new(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha)
 {
+       struct font_priv * (*font_freetype_new)(void *meth);
+       struct graphics_priv *ret;
+
+       dbg(0,"enter\n");
+       ret=g_new0(struct graphics_priv, 1);
        *meth=graphics_methods;
-       return NULL;
+        font_freetype_new=plugin_get_font_type("freetype");
+        if (!font_freetype_new)
+                return NULL;
+        font_freetype_new(&ret->freetype_methods);
+       ret->p=*p;
+       ret->w=w;
+       ret->h=h;
+       ret->alpha=alpha;
+       ret->overlay=1;
+       ret->flags=1;
+       ret->im=gdImageCreateTrueColor(ret->w,ret->h);
+       ret->next=gr->overlays;
+       gr->overlays=ret;
+
+       return ret;
 }
 
 static void
@@ -556,7 +608,7 @@ graphics_gd_new(struct navit *nav, struct graphics_methods *meth, struct attr **
        struct font_priv * (*font_freetype_new)(void *meth);
        struct graphics_priv *ret;
        struct attr *attr;
-       event_request_system("glib","graphics_gtk_drawing_area_new");
+       event_request_system("glib","graphics_gd_new");
         font_freetype_new=plugin_get_font_type("freetype");
         if (!font_freetype_new)
                 return NULL;
index 61099f3..507e066 100644 (file)
@@ -307,6 +307,10 @@ map_rect_get_item_byid_mg(struct map_rect_priv *mr, int id_hi, int id_lo)
                if (street_get_byid(mr, &mr->street, id_hi, id_lo, &mr->item))
                        return &mr->item;
                break;
+       case file_strname_stn:
+               if (street_name_get_byid(mr, &mr->street, id_hi, id_lo, &mr->item))
+                       return &mr->item;
+               break;
        default:        
                if (poly_get_byid(mr, &mr->poly, id_hi, id_lo, &mr->item))
                        return &mr->item;
index cee0468..8ef5e80 100644 (file)
@@ -105,7 +105,8 @@ town_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr)
                twn->attr_next=attr_none;
                return 1;
        default:
-               dbg_assert(1==0);
+                dbg(1, "Don't know about attribute %d[%04X]=%s yet\n",
+                       attr_type, attr_type, attr_to_name(attr_type));
                return 0;
        }
        return 1;
index 6d0134c..6c6e20c 100644 (file)
@@ -220,7 +220,7 @@ static int
 clip_line_code(struct coord *p1, struct coord *p2, struct rect *r)
 {
        int code1,code2,ret=1;
-       int dx,dy;
+       long long dx,dy;
        code1=clipcode(p1, r);
        if (code1)
                ret |= 2;
index 8c3fbc2..4ef8317 100644 (file)
 <!ATTLIST log data CDATA #REQUIRED>
 <!ATTLIST log flush_size CDATA #IMPLIED>
 <!ATTLIST log flush_time CDATA #IMPLIED>
-<!ELEMENT navit (gui,graphics,vehicle*,vehicleprofile*,tracking,route,navigation,speech,osd*,mapset+,layout+,log*)>
+<!ATTLIST log attr_types CDATA #IMPLIED>
+<!ELEMENT navit (graphics,gui+,log*,osd*,vehicle*,tracking,vehicleprofile*,route,navigation,speech,mapset+,layout+)>
 <!ATTLIST navit center CDATA #REQUIRED>
 <!ATTLIST navit zoom CDATA #REQUIRED>
 <!ATTLIST navit tracking CDATA #REQUIRED>
 <!ATTLIST navit orientation CDATA #REQUIRED>
 <!ATTLIST navit recent_dest CDATA #IMPLIED>
 <!ATTLIST navit drag_bitmap CDATA #IMPLIED>
-<!ELEMENT gui EMPTY>
+<!ELEMENT gui ANY>
 <!ATTLIST gui type CDATA #REQUIRED>
 <!ATTLIST gui menubar CDATA #IMPLIED>
 <!ATTLIST gui toolbar CDATA #IMPLIED>
 <!ATTLIST gui statusbar CDATA #IMPLIED>
 <!ATTLIST gui skin CDATA #IMPLIED>
 <!ATTLIST gui fullscreen CDATA #IMPLIED>
+<!ATTLIST gui enabled CDATA #IMPLIED>
 <!ELEMENT graphics EMPTY>
 <!ATTLIST graphics type CDATA #REQUIRED>
-<!ELEMENT vehicle (cursor*)>
+<!ELEMENT vehicle (log*)>
 <!ATTLIST vehicle name CDATA #REQUIRED>
 <!ATTLIST vehicle source CDATA #REQUIRED>
 <!ATTLIST vehicle enabled CDATA #IMPLIED>
 <!ATTLIST map active CDATA #IMPLIED>
 <!ATTLIST map data CDATA #REQUIRED>
 <!ATTLIST map debug CDATA #IMPLIED>
-<!ELEMENT layout (cursor*,layer*,xi:include*)>
+<!ELEMENT layout (cursor*,xi:include*,layer*)>
 <!ATTLIST layout name CDATA #REQUIRED>
 <!ATTLIST layout color CDATA #IMPLIED>
 <!ATTLIST layout font CDATA #IMPLIED>
+<!ATTLIST layout daylayout CDATA #IMPLIED>
+<!ATTLIST layout nightlayout CDATA #IMPLIED>
 <!ELEMENT layer (itemgra*)>
 <!ATTLIST layer enabled CDATA #IMPLIED>
 <!ATTLIST layer name CDATA #IMPLIED>
index c326ce7..54fb886 100644 (file)
                [-]0xX [-]0xX -->
 
        <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10">
-               <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. For cegui, use opengl -->
+               <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. -->
                <graphics type="gtk_drawing_area"/>
                <!-- The following line let you select which graphical user interface you'd like to use.
-               Options include internal (optimized for touch screen devices), gtk (useful for desktop computers) and cegui.
+               Options include internal (optimized for touch screen devices), gtk (useful for desktop computers).
                If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag -->
                <gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/>
        <!--
@@ -3282,6 +3282,8 @@ Navigation</text></img>
                                </itemgra>
                        </cursor>
 
+                       <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Symbols'])"/>
+                       <!-- <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Labels'])"/> -->
                        <layer name="Landuse">
                                <itemgra item_types="image" order="0-">
                                        <image/>
@@ -4083,8 +4085,6 @@ Navigation</text></img>
                                        <text text_size="9"/>
                                </itemgra>
                        </layer>
-                       <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Symbols'])"/>
-                       <!-- <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Labels'])"/> -->
                        <layer name="Unknown Elements">
                                <!-- This entry shows all unknown linear elements as blue lines -->
                                <!--
index dd0c749..117a71f 100644 (file)
@@ -45,6 +45,7 @@ struct vehicle {
        struct vehicle_priv *priv;
        struct callback_list *cbl;
        struct log *nmea_log, *gpx_log;
+       char *gpx_desc;
        struct attr **attrs;
 
        // cursor
@@ -182,6 +183,10 @@ vehicle_get_attr(struct vehicle *this_, enum attr_type type, struct attr *attr,
                if (ret)
                        return ret;
        }
+       if (type == attr_log_gpx_desc) {
+               attr->u.str = this_->gpx_desc;
+               return 1;
+       }
        return attr_generic_get_attr(this_->attrs, NULL, type, attr, iter);
 }
 
@@ -198,6 +203,10 @@ vehicle_set_attr(struct vehicle *this_, struct attr *attr)
        int ret=1;
        if (this_->meth.set_attr)
                ret=this_->meth.set_attr(this_->priv, attr);
+       if (ret == 1 && attr->type == attr_log_gpx_desc) {
+               g_free(this_->gpx_desc);
+               this_->gpx_desc = attr->u.str;
+       }
        if (ret == 1 && attr->type != attr_navit)
                this_->attrs=attr_generic_set_attr(this_->attrs, attr);
        return ret != 0;
@@ -446,6 +455,11 @@ vehicle_log_gpx(struct vehicle *this_, struct log *log)
                        g_free(timep);
                }
        }
+       if (this_->gpx_desc) {
+               logstr=g_strconcat_printf(logstr,"\t<desc>%s</desc>\n",this_->gpx_desc);
+               g_free(this_->gpx_desc);
+               this_->gpx_desc = NULL;
+       }
        if (attr_types_contains_default(attr_types, attr_position_direction,0) && this_->meth.position_attr_get(this_->priv, attr_position_direction, &attr))
                logstr=g_strconcat_printf(logstr,"\t<course>%.1f</course>\n",*attr.u.numd);
        if (attr_types_contains_default(attr_types, attr_position_speed, 0) && this_->meth.position_attr_get(this_->priv, attr_position_speed, &attr))
index 76d3d96..0472405 100644 (file)
@@ -265,7 +265,7 @@ static struct object_func object_funcs[] = {
        { attr_speech,     NEW(speech_new), GET(speech_get_attr), NULL, NULL, SET(speech_set_attr)},
        { attr_text,       NEW(text_new)},
        { attr_tracking,   NEW(tracking_new)},
-       { attr_vehicle,    NEW(vehicle_new),  GET(vehicle_get_attr), NULL, NULL, NULL, ADD(vehicle_add_attr) },
+       { attr_vehicle,    NEW(vehicle_new),  GET(vehicle_get_attr), NULL, NULL, SET(vehicle_set_attr), ADD(vehicle_add_attr) },
        { attr_vehicleprofile, NEW(vehicleprofile_new),  GET(vehicleprofile_get_attr), NULL, NULL, SET(vehicleprofile_set_attr), ADD(vehicleprofile_add_attr) },
 };
 
index 9022344..7695cd7 100644 (file)
@@ -31,6 +31,7 @@ xpm_DATA += information.xpm
 xpm_DATA += justice.xpm
 xpm_DATA += level_crossing.xpm
 xpm_DATA += library.xpm
+xpm_DATA += mark.xpm
 xpm_DATA += mini_roundabout.xpm
 xpm_DATA += memorial.xpm
 xpm_DATA += military.xpm
@@ -67,7 +68,8 @@ xpm_DATA += menu.xpm
 xpm_DATA += school.xpm
 xpm_DATA += public_office.xpm
 
-svgs  = gui_actions.svg
+svgs  = gui_about.svg
+svgs += gui_actions.svg
 svgs += gui_active.svg
 svgs += gui_bookmark.svg
 svgs += gui_display.svg
@@ -83,6 +85,7 @@ svgs += gui_sound_off.svg
 svgs += gui_tools.svg
 svgs += gui_fullscreen.svg
 svgs += gui_leave_fullscreen.svg
+svgs += mark.svg
 svgs += gui_quit.svg gui_stop.svg
 svgs += gui_town.svg
 svgs += gui_vehicle.svg
@@ -194,26 +197,31 @@ xsize = $(word 1,$(subst x, ,$(scale)))
 ysize = $(word $(words $(scale)),$(subst x, ,$(scale)))
 comma =,
 
+# png images of the user interface and other, sizes e.g. "8,16,32,48,96"
 if USE_SVG2PNG_SCALES
 pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs))))
 endif
+# png state flags
 if USE_SVG2PNG_SCALES_FLAG
 pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
 endif
+# png symbols for navigation
 if USE_SVG2PNG_SCALES_NAV
 pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs))))
 endif
 xpm_DATA += $(pngs)
 endif
 
-DESKTOPFILEdir=$(datadir)/applications
-DESKTOPFILE_DATA = desktop_icons/navit.desktop
+if !SUPPORT_WIN32
+  DESKTOPFILEdir=$(datadir)/applications
+  DESKTOPFILE_DATA = desktop_icons/navit.desktop
 
-ICON128dir=$(datadir)/icons/hicolor/128x128/apps
-ICON128_DATA = desktop_icons/128x128/navit.png
+  ICON128dir=$(datadir)/icons/hicolor/128x128/apps
+  ICON128_DATA = desktop_icons/128x128/navit.png
 
-ICON22dir=$(datadir)/icons/hicolor/22x22/apps
-ICON22_DATA = desktop_icons/22x22/navit.png
+  ICON22dir=$(datadir)/icons/hicolor/22x22/apps
+  ICON22_DATA = desktop_icons/22x22/navit.png
+endif
 
 EXTRA_DIST = $(xpm_DATA) $(DESKTOPFILE_DATA) $(ICON128_DATA) $(ICON22_DATA) navit_svg2png
 #burgerking.ico:
diff --git a/navit/xpm/gui_about.svg b/navit/xpm/gui_about.svg
new file mode 100644 (file)
index 0000000..2cd20dc
--- /dev/null
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90.000000"
+   inkscape:export-xdpi="90.000000"
+   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   width="48px"
+   height="48px"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="0.44"
+   sodipodi:docbase="/home/lapo/Icone/cvs/gnome-icon-theme/scalable/status"
+   sodipodi:docname="dialog-information.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient2990">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2992" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop2994" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4712">
+      <stop
+         style="stop-color:#5b8ccb;stop-opacity:1;"
+         offset="0"
+         id="stop4714" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="1"
+         id="stop4716" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4694">
+      <stop
+         style="stop-color:#e9f1f8;stop-opacity:1;"
+         offset="0"
+         id="stop4696" />
+      <stop
+         style="stop-color:#376ba3;stop-opacity:0.8392157;"
+         offset="1"
+         id="stop4698" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4666">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4668" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4670" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient20210">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.51546389;"
+         offset="0.0000000"
+         id="stop20212" />
+      <stop
+         id="stop20218"
+         offset="0.55172414"
+         style="stop-color:#000000;stop-opacity:0.14432989;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop20214" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20210"
+       id="radialGradient4646"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.764278,0.566804)"
+       cx="14.772334"
+       cy="74.209934"
+       fx="14.772334"
+       fy="74.209934"
+       r="7.8289826" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4666"
+       id="radialGradient4672"
+       cx="25.755905"
+       cy="9.9372978"
+       fx="25.755905"
+       fy="9.9372978"
+       r="12.139711"
+       gradientTransform="matrix(2.138401,-5.903375e-16,6.984997e-16,2.530201,-29.32054,-16.45375)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4694"
+       id="radialGradient4700"
+       cx="26.435322"
+       cy="17.031229"
+       fx="26.435322"
+       fy="17.031229"
+       r="13.244088"
+       gradientTransform="matrix(1.821341,-5.36498e-16,6.351477e-16,2.156244,-21.15439,-13.79104)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4712"
+       id="linearGradient4718"
+       x1="20.643551"
+       y1="9.0398531"
+       x2="25.755913"
+       y2="26.8943"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2990"
+       id="linearGradient2996"
+       x1="26"
+       y1="22.116529"
+       x2="27.550253"
+       y2="28.126938"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     stroke="#3465a4"
+     fill="#fce94f"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.25490196"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="45.038263"
+     inkscape:cy="20.92372"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="856"
+     inkscape:window-height="630"
+     inkscape:window-x="817"
+     inkscape:window-y="340" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:title>Dialog Information</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>dialog</rdf:li>
+            <rdf:li>info</rdf:li>
+            <rdf:li>information</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4634"
+       transform="translate(-60.46391,17)">
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:type="arc"
+         style="opacity:0.8;color:#000000;fill:url(#radialGradient4646);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path20208"
+         sodipodi:cx="26.0625"
+         sodipodi:cy="42.0625"
+         sodipodi:rx="13.8125"
+         sodipodi:ry="4.4375"
+         d="M 39.875 42.0625 A 13.8125 4.4375 0 1 1  12.25,42.0625 A 13.8125 4.4375 0 1 1  39.875 42.0625 z"
+         transform="matrix(1.197183,0,0,1.098591,55.79842,-20.08448)" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="path19509"
+         d="M 83.002195,22.877541 L 83.002195,24.260545 C 83.002195,25.643549 84.412925,26.872887 85.999995,26.872887 C 87.587066,26.872887 88.997794,25.643549 88.997794,24.260545 L 88.997794,22.877541 L 83.002195,22.877541 z "
+         style="fill:#555753;fill-rule:nonzero;stroke:#2e3436;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         style="color:#000000;fill:#aeae57;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:2.00000095;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 85.835145,11.623519 C 82.568355,11.6156 78.863714,12.580499 80.871174,14.404546 C 80.37345,14.606241 79.661991,15.056698 79.74586,16.11077 C 79.792165,16.661264 80.373008,16.99918 81.167349,17.247287 C 80.266845,17.881784 79.693849,18.55227 79.74586,19.170624 C 79.791625,19.714699 80.36024,20.087289 81.138339,20.336283 C 80.260526,20.963478 79.694561,21.649745 79.74586,22.259619 C 79.824263,23.191711 81.825461,24.235779 86.158773,24.115531 C 89.278706,24.030099 92.031874,23.468343 92.249159,22.259619 C 92.33448,21.784995 91.947797,21.34215 91.34985,20.948254 C 91.797476,20.495031 92.111066,20.035337 92.075099,19.607746 C 92.029119,19.061107 91.467192,18.690738 90.682621,18.442088 C 91.560434,17.814893 92.126398,17.128626 92.075099,16.518751 C 92.029119,15.972112 91.467192,15.630886 90.682621,15.382234 C 91.570901,14.751651 92.126729,14.072695 92.075099,13.458897 C 92.01771,12.776619 88.90549,11.630962 85.835145,11.623519 z "
+         id="path3209"
+         sodipodi:nodetypes="cccccccscccccccs"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         transform="matrix(0.596154,-0.127796,6.358129e-2,0.755885,92.37142,-7.700825)"
+         d="M -3.5355339 27.228739 A 10.341436 3.2703688 0 1 1  -24.218407,27.228739 A 10.341436 3.2703688 0 1 1  -3.5355339 27.228739 z"
+         sodipodi:ry="3.2703688"
+         sodipodi:rx="10.341436"
+         sodipodi:cy="27.228739"
+         sodipodi:cx="-13.87697"
+         id="path4702"
+         style="color:#000000;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.13035245;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         style="color:#000000;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.08828904;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 92.173603,22.21572 C 91.956317,23.424444 88.881191,24.10655 83.959276,23.858968 C 80.842089,23.702168 80.663716,22.82605 80.881,21.617325 C 81.098286,20.4086 83.804176,19.561647 86.920934,19.726804 C 90.037692,19.89196 92.390887,21.006996 92.173603,22.21572 z "
+         id="path3183"
+         sodipodi:nodetypes="csccc"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         transform="matrix(0.596154,-0.127796,6.358129e-2,0.755885,92.37142,-1.469023)"
+         d="M -3.5355339 27.228739 A 10.341436 3.2703688 0 1 1  -24.218407,27.228739 A 10.341436 3.2703688 0 1 1  -3.5355339 27.228739 z"
+         sodipodi:ry="3.2703688"
+         sodipodi:rx="10.341436"
+         sodipodi:cy="27.228739"
+         sodipodi:cx="-13.87697"
+         id="path1603"
+         style="color:#000000;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.13035245;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.13035245;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path2364"
+         sodipodi:cx="-13.87697"
+         sodipodi:cy="27.228739"
+         sodipodi:rx="10.341436"
+         sodipodi:ry="3.2703688"
+         d="M -3.5355339 27.228739 A 10.341436 3.2703688 0 1 1  -24.218407,27.228739 A 10.341436 3.2703688 0 1 1  -3.5355339 27.228739 z"
+         transform="matrix(0.596154,-0.127796,6.358129e-2,0.755885,92.37142,-4.544575)"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path20372"
+         sodipodi:cx="27.75"
+         sodipodi:cy="22.375"
+         sodipodi:rx="3.25"
+         sodipodi:ry="3.25"
+         d="M 31 22.375 A 3.25 3.25 0 1 1  24.5,22.375 A 3.25 3.25 0 1 1  31 22.375 z"
+         transform="matrix(0.331798,0,0,0.333302,73.20968,11.18361)"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         transform="matrix(0.331798,0,0,0.333302,73.20968,14.17188)"
+         d="M 31 22.375 A 3.25 3.25 0 1 1  24.5,22.375 A 3.25 3.25 0 1 1  31 22.375 z"
+         sodipodi:ry="3.25"
+         sodipodi:rx="3.25"
+         sodipodi:cy="22.375"
+         sodipodi:cx="27.75"
+         id="path2435"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         transform="matrix(0.331798,0,0,0.333302,73.20968,7.77736)"
+         d="M 31 22.375 A 3.25 3.25 0 1 1  24.5,22.375 A 3.25 3.25 0 1 1  31 22.375 z"
+         sodipodi:ry="3.25"
+         sodipodi:rx="3.25"
+         sodipodi:cy="22.375"
+         sodipodi:cx="27.75"
+         id="path4708"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.13035245;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path4710"
+         sodipodi:cx="-13.87697"
+         sodipodi:cy="27.228739"
+         sodipodi:rx="10.341436"
+         sodipodi:ry="3.2703688"
+         d="M -3.5355339 27.228739 A 10.341436 3.2703688 0 1 1  -24.218407,27.228739 A 10.341436 3.2703688 0 1 1  -3.5355339 27.228739 z"
+         transform="matrix(0.609516,1.48834e-2,-0.114607,0.749847,97.72817,-6.66803)"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+    </g>
+    <path
+       style="opacity:1;color:#000000;fill:url(#radialGradient4700);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient4718);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 25.016299,3.1474516 C 18.321938,3.5296683 13.011824,9.1020052 13.011824,15.891539 C 13.011824,19.71505 16.031329,21.976654 17.309622,26.548802 C 18.3704,30.34295 22.089448,31.201903 25.402359,31.201903 C 29.402442,31.201903 33.695544,29.876694 34.659499,25.279481 C 35.454896,21.48614 38.5,19.028746 38.5,15.891539 C 38.499998,8.8546137 32.792838,3.1474516 25.755912,3.1474516 C 25.50852,3.1474516 25.260223,3.1335247 25.016299,3.1474516 z "
+       id="path3885"
+       sodipodi:nodetypes="csszsssc" />
+    <path
+       sodipodi:nodetypes="csszsssc"
+       id="path4664"
+       d="M 25.074585,4.3431622 C 18.907767,4.6952587 14.016112,9.8284722 14.016112,16.082962 C 14.016112,19.254718 17.329047,22.043543 18.204035,25.485407 C 19.21077,29.445511 22.366767,29.828929 25.755913,29.828929 C 29.350248,29.828929 32.872411,29.272027 33.552794,25.114528 C 34.110199,21.708487 37.495714,19.061139 37.495714,16.082962 C 37.495712,9.6005762 32.2383,4.3431622 25.755913,4.3431622 C 25.528017,4.3431622 25.299287,4.3303328 25.074585,4.3431622 z "
+       style="opacity:0.59340671;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient4672);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2996);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 28.12132,29.055456 L 32,16.533748 C 28,14.768315 24,14.530464 20,17 L 21,20"
+       id="path4674"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.7525773;color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.05887306;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path2998"
+       sodipodi:cx="25.5"
+       sodipodi:cy="10.125"
+       sodipodi:rx="9.25"
+       sodipodi:ry="6.125"
+       d="M 34.75 10.125 A 9.25 6.125 0 1 1  16.25,10.125 A 9.25 6.125 0 1 1  34.75 10.125 z"
+       transform="matrix(0.703611,0,0,0.788898,7.799507,3.597214)" />
+    <path
+       transform="matrix(0.131662,-0.2583,0.172707,0.24754,12.0763,19.25056)"
+       d="M 34.75 10.125 A 9.25 6.125 0 1 1  16.25,10.125 A 9.25 6.125 0 1 1  34.75 10.125 z"
+       sodipodi:ry="6.125"
+       sodipodi:rx="9.25"
+       sodipodi:cy="10.125"
+       sodipodi:cx="25.5"
+       id="path3000"
+       style="opacity:0.68556704;color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.05887306;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc"
+       inkscape:transform-center-y="2.8297225" />
+  </g>
+</svg>
index 8b6d6cd..b7bc5a3 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 3fa4611..308e031 100644 (file)
@@ -16,7 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index ad238fb..683f7a1 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 6b3f0cf..96347f1 100644 (file)
@@ -8,26 +8,25 @@ msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-12-20 19:51+0100\n"
-"PO-Revision-Date: 2010-01-03 17:29+0000\n"
-"Last-Translator: Frans <Unknown>\n"
+"PO-Revision-Date: 2010-01-19 19:42+0000\n"
+"Last-Translator: jmontane <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\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-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
 #: ../navit/main.c:181
 #, c-format
 msgid "Running from source directory\n"
-msgstr "Executant-se des de directori arrel\n"
+msgstr "S'està executant des del directori arrel\n"
 
 #: ../navit/main.c:195
 #, c-format
 msgid "setting '%s' to '%s'\n"
-msgstr "establint %s a %s\n"
+msgstr "s'està establint '%s' a '%s'\n"
 
 #: ../navit/navigation.c:245
 msgid "zeroth"
@@ -75,7 +74,7 @@ msgstr "tercera sortida"
 
 #: ../navit/navigation.c:276
 msgid "fourth exit"
-msgstr "cuarta sortida"
+msgstr "quarta sortida"
 
 #: ../navit/navigation.c:278
 msgid "fifth exit"
@@ -131,7 +130,7 @@ msgstr[1] "d'aquí a %d quilòmetres"
 
 #: ../navit/navigation.c:1274
 msgid "exit"
-msgstr "sortir"
+msgstr "surt"
 
 #: ../navit/navigation.c:1276
 msgid "into the ramp"
@@ -141,7 +140,7 @@ msgstr ""
 #: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the street %s%s%s"
-msgstr ""
+msgstr "%s al carrer %s %s %s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
 #: ../navit/navigation.c:1310
@@ -199,7 +198,7 @@ msgstr "desconegut "
 
 #: ../navit/navigation.c:1411
 msgid "When possible, please turn around"
-msgstr "Quan sigui possible, siusplau doni mitja volta"
+msgstr "Quan sigui possible, doneu mitja volta"
 
 #: ../navit/navigation.c:1421
 msgid "Enter the roundabout soon"
@@ -214,12 +213,12 @@ msgstr ""
 #: ../navit/navigation.c:1440
 #, c-format
 msgid "Leave the roundabout at the %s"
-msgstr ""
+msgstr "Deixeu la rotonda a la %s"
 
 #: ../navit/navigation.c:1443
 #, c-format
 msgid "then leave the roundabout at the %s"
-msgstr ""
+msgstr "aleshores deixeu la rotonda a la %s"
 
 #: ../navit/navigation.c:1453
 #, c-format
@@ -248,7 +247,7 @@ msgstr "ara"
 #: ../navit/navigation.c:1481
 #, c-format
 msgid "then take the %1$s road to the %2$s"
-msgstr ""
+msgstr "després, agafeu la %1$s carretera a la %2$s"
 
 #: ../navit/navigation.c:1492
 msgid "error"
@@ -269,11 +268,11 @@ msgstr ""
 #: ../navit/navigation.c:1531
 #, c-format
 msgid "You have reached your destination %s"
-msgstr ""
+msgstr "Heu arribat a la destinació %s"
 
 #: ../navit/navigation.c:1533
 msgid "then you have reached your destination."
-msgstr ""
+msgstr "aleshores heu arribat a destí"
 
 #: ../navit/navit.c:1217 ../navit/gui/internal/gui_internal.c:2482
 msgid "Position"
@@ -289,7 +288,7 @@ msgstr "Durada"
 
 #: ../navit/navit.c:1226 ../navit/navit.c:1251
 msgid "km"
-msgstr ""
+msgstr "km"
 
 #: ../navit/navit.c:1230 ../navit/navit.c:1255
 msgid "m"
@@ -329,7 +328,7 @@ msgstr ""
 #: ../navit/popup.c:339
 #, c-format
 msgid "Point 0x%x 0x%x"
-msgstr ""
+msgstr "Punt 0x%x 0x%x"
 
 #: ../navit/popup.c:340
 #, c-format
@@ -354,7 +353,7 @@ msgstr "Afganistan"
 #. 028
 #: ../navit/country.c:42
 msgid "Antigua and Barbuda"
-msgstr ""
+msgstr "Antigua i Barbuda"
 
 #. 660
 #: ../navit/country.c:43
@@ -369,7 +368,7 @@ msgstr "Albània"
 #. 051
 #: ../navit/country.c:45
 msgid "Armenia"
-msgstr ""
+msgstr "Armènia"
 
 #. 530
 #: ../navit/country.c:46
@@ -384,7 +383,7 @@ msgstr "Angola"
 #. 010
 #: ../navit/country.c:48
 msgid "Antarctica"
-msgstr ""
+msgstr "Antàrtida"
 
 #. 032
 #: ../navit/country.c:49
@@ -394,7 +393,7 @@ msgstr "Argentina"
 #. 016
 #: ../navit/country.c:50
 msgid "American Samoa"
-msgstr ""
+msgstr "Samoa Americana"
 
 #. 040
 #: ../navit/country.c:51
@@ -404,17 +403,17 @@ msgstr "Àustria"
 #. 036
 #: ../navit/country.c:52
 msgid "Australia"
-msgstr ""
+msgstr "Austràlia"
 
 #. 533
 #: ../navit/country.c:53
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #. 248
 #: ../navit/country.c:54
 msgid "Aland Islands"
-msgstr ""
+msgstr "Illes Aland"
 
 #. 031
 #: ../navit/country.c:55
@@ -454,7 +453,7 @@ msgstr "Bulgària"
 #. 048
 #: ../navit/country.c:62
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
 
 #. 108
 #: ../navit/country.c:63
@@ -514,7 +513,7 @@ msgstr "Botswana"
 #. 112
 #: ../navit/country.c:74
 msgid "Belarus"
-msgstr ""
+msgstr "Bielorússia"
 
 #. 084
 #: ../navit/country.c:75
@@ -564,7 +563,7 @@ msgstr "Illes Cook"
 #. 152
 #: ../navit/country.c:84
 msgid "Chile"
-msgstr ""
+msgstr "Xile"
 
 #. 120
 #: ../navit/country.c:85
@@ -594,7 +593,7 @@ msgstr "Cuba"
 #. 132
 #: ../navit/country.c:90
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cap Verd"
 
 #. 162
 #: ../navit/country.c:91
@@ -604,17 +603,17 @@ msgstr ""
 #. 196
 #: ../navit/country.c:92
 msgid "Cyprus"
-msgstr ""
+msgstr "Xipre"
 
 #. 203
 #: ../navit/country.c:93
 msgid "Czech Republic"
-msgstr ""
+msgstr "República Txeca"
 
 #. 276
 #: ../navit/country.c:94
 msgid "Germany"
-msgstr ""
+msgstr "Alemanya"
 
 #. 262
 #: ../navit/country.c:95
@@ -624,62 +623,62 @@ msgstr ""
 #. 208
 #: ../navit/country.c:96
 msgid "Denmark"
-msgstr ""
+msgstr "Dinamarca"
 
 #. 212
 #: ../navit/country.c:97
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #. 214
 #: ../navit/country.c:98
 msgid "Dominican Republic"
-msgstr ""
+msgstr "República Dominicana"
 
 #. 012
 #: ../navit/country.c:99
 msgid "Algeria"
-msgstr ""
+msgstr "Algèria"
 
 #. 218
 #: ../navit/country.c:100
 msgid "Ecuador"
-msgstr ""
+msgstr "Equador"
 
 #. 233
 #: ../navit/country.c:101
 msgid "Estonia"
-msgstr ""
+msgstr "Estònia"
 
 #. 818
 #: ../navit/country.c:102
 msgid "Egypt"
-msgstr ""
+msgstr "Egipte"
 
 #. 732
 #: ../navit/country.c:103
 msgid "Western Sahara"
-msgstr ""
+msgstr "Sàhara Occidental"
 
 #. 232
 #: ../navit/country.c:104
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #. 724
 #: ../navit/country.c:105
 msgid "Spain"
-msgstr ""
+msgstr "Espanya"
 
 #. 231
 #: ../navit/country.c:106
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiòpia"
 
 #. 246
 #: ../navit/country.c:107
 msgid "Finland"
-msgstr ""
+msgstr "Finlàndia"
 
 #. 242
 #: ../navit/country.c:108
@@ -694,7 +693,7 @@ msgstr ""
 #. 583
 #: ../navit/country.c:110
 msgid "Micronesia, Federated States of"
-msgstr ""
+msgstr "Micronèsia, Estats Federats de"
 
 #. 234
 #: ../navit/country.c:111
@@ -704,7 +703,7 @@ msgstr ""
 #. 250
 #: ../navit/country.c:112
 msgid "France"
-msgstr ""
+msgstr "França"
 
 #. 266
 #: ../navit/country.c:113
@@ -714,7 +713,7 @@ msgstr ""
 #. 826
 #: ../navit/country.c:114
 msgid "United Kingdom"
-msgstr ""
+msgstr "Regne Unit"
 
 #. 308
 #: ../navit/country.c:115
@@ -724,7 +723,7 @@ msgstr ""
 #. 268
 #: ../navit/country.c:116
 msgid "Georgia"
-msgstr ""
+msgstr "Geòrgia"
 
 #. 254
 #: ../navit/country.c:117
@@ -734,17 +733,17 @@ msgstr ""
 #. 831
 #: ../navit/country.c:118
 msgid "Guernsey"
-msgstr ""
+msgstr "Guernsey"
 
 #. 288
 #: ../navit/country.c:119
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #. 292
 #: ../navit/country.c:120
 msgid "Gibraltar"
-msgstr ""
+msgstr "Gibraltar"
 
 #. 304
 #: ../navit/country.c:121
@@ -754,12 +753,12 @@ msgstr ""
 #. 270
 #: ../navit/country.c:122
 msgid "Gambia"
-msgstr ""
+msgstr "Gàmbia"
 
 #. 324
 #: ../navit/country.c:123
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #. 312
 #: ../navit/country.c:124
@@ -769,12 +768,12 @@ msgstr ""
 #. 226
 #: ../navit/country.c:125
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Guinea Equatorial"
 
 #. 300
 #: ../navit/country.c:126
 msgid "Greece"
-msgstr ""
+msgstr "Grècia"
 
 #. 239
 #: ../navit/country.c:127
@@ -784,12 +783,12 @@ msgstr ""
 #. 320
 #: ../navit/country.c:128
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #. 316
 #: ../navit/country.c:129
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #. 624
 #: ../navit/country.c:130
@@ -804,12 +803,12 @@ msgstr ""
 #. 344
 #: ../navit/country.c:132
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #. 334
 #: ../navit/country.c:133
 msgid "Heard Island and McDonald Islands"
-msgstr ""
+msgstr "Illa Heard i Illes McDonald"
 
 #. 340
 #: ../navit/country.c:134
@@ -819,7 +818,7 @@ msgstr ""
 #. 191
 #: ../navit/country.c:135
 msgid "Croatia"
-msgstr ""
+msgstr "Croàcia"
 
 #. 332
 #: ../navit/country.c:136
@@ -829,32 +828,32 @@ msgstr ""
 #. 348
 #: ../navit/country.c:137
 msgid "Hungary"
-msgstr ""
+msgstr "Hongria"
 
 #. 360
 #: ../navit/country.c:138
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonèsia"
 
 #. 372
 #: ../navit/country.c:139
 msgid "Ireland"
-msgstr ""
+msgstr "Irlanda"
 
 #. 376
 #: ../navit/country.c:140
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #. 833
 #: ../navit/country.c:141
 msgid "Isle of Man"
-msgstr ""
+msgstr "Illa de Man"
 
 #. 356
 #: ../navit/country.c:142
 msgid "India"
-msgstr ""
+msgstr "Índia"
 
 #. 086
 #: ../navit/country.c:143
@@ -864,7 +863,7 @@ msgstr ""
 #. 368
 #: ../navit/country.c:144
 msgid "Iraq"
-msgstr ""
+msgstr "Iraq"
 
 #. 364
 #: ../navit/country.c:145
@@ -874,12 +873,12 @@ msgstr ""
 #. 352
 #: ../navit/country.c:146
 msgid "Iceland"
-msgstr ""
+msgstr "Islàndia"
 
 #. 380
 #: ../navit/country.c:147
 msgid "Italy"
-msgstr ""
+msgstr "Itàlia"
 
 #. 832
 #: ../navit/country.c:148
@@ -889,7 +888,7 @@ msgstr ""
 #. 388
 #: ../navit/country.c:149
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamàica"
 
 #. 400
 #: ../navit/country.c:150
@@ -899,12 +898,12 @@ msgstr ""
 #. 392
 #: ../navit/country.c:151
 msgid "Japan"
-msgstr ""
+msgstr "Japó"
 
 #. 404
 #: ../navit/country.c:152
 msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
 
 #. 417
 #: ../navit/country.c:153
@@ -944,7 +943,7 @@ msgstr ""
 #. 414
 #: ../navit/country.c:160
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #. 136
 #: ../navit/country.c:161
@@ -974,17 +973,17 @@ msgstr ""
 #. 438
 #: ../navit/country.c:166
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #. 144
 #: ../navit/country.c:167
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #. 430
 #: ../navit/country.c:168
 msgid "Liberia"
-msgstr ""
+msgstr "Libèria"
 
 #. 426
 #: ../navit/country.c:169
@@ -994,12 +993,12 @@ msgstr ""
 #. 440
 #: ../navit/country.c:170
 msgid "Lithuania"
-msgstr ""
+msgstr "Lituània"
 
 #. 442
 #: ../navit/country.c:171
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxemburg"
 
 #. 428
 #: ../navit/country.c:172
@@ -1014,22 +1013,22 @@ msgstr ""
 #. 504
 #: ../navit/country.c:174
 msgid "Morocco"
-msgstr ""
+msgstr "Marroc"
 
 #. 492
 #: ../navit/country.c:175
 msgid "Monaco"
-msgstr ""
+msgstr "Mònaco"
 
 #. 498
 #: ../navit/country.c:176
 msgid "Moldova, Republic of"
-msgstr ""
+msgstr "Moldàvia"
 
 #. 499
 #: ../navit/country.c:177
 msgid "Montenegro"
-msgstr ""
+msgstr "Montenegro"
 
 #. 663
 #: ../navit/country.c:178
@@ -1039,7 +1038,7 @@ msgstr ""
 #. 450
 #: ../navit/country.c:179
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagascar"
 
 #. 584
 #: ../navit/country.c:180
@@ -1064,7 +1063,7 @@ msgstr ""
 #. 496
 #: ../navit/country.c:184
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongòlia"
 
 #. 446
 #: ../navit/country.c:185
@@ -1084,17 +1083,17 @@ msgstr ""
 #. 478
 #: ../navit/country.c:188
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritània"
 
 #. 500
 #: ../navit/country.c:189
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #. 470
 #: ../navit/country.c:190
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #. 480
 #: ../navit/country.c:191
@@ -1109,32 +1108,32 @@ msgstr ""
 #. 454
 #: ../navit/country.c:193
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #. 484
 #: ../navit/country.c:194
 msgid "Mexico"
-msgstr ""
+msgstr "Mèxic"
 
 #. 458
 #: ../navit/country.c:195
 msgid "Malaysia"
-msgstr ""
+msgstr "Malàisia"
 
 #. 508
 #: ../navit/country.c:196
 msgid "Mozambique"
-msgstr ""
+msgstr "Moçambic"
 
 #. 516
 #: ../navit/country.c:197
 msgid "Namibia"
-msgstr ""
+msgstr "Namíbia"
 
 #. 540
 #: ../navit/country.c:198
 msgid "New Caledonia"
-msgstr ""
+msgstr "Nova Caledònia"
 
 #. 562
 #: ../navit/country.c:199
@@ -1149,12 +1148,12 @@ msgstr ""
 #. 566
 #: ../navit/country.c:201
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigèria"
 
 #. 558
 #: ../navit/country.c:202
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #. 528
 #: ../navit/country.c:203
@@ -1164,12 +1163,12 @@ msgstr ""
 #. 578
 #: ../navit/country.c:204
 msgid "Norway"
-msgstr ""
+msgstr "Noruega"
 
 #. 524
 #: ../navit/country.c:205
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #. 520
 #: ../navit/country.c:206
@@ -1184,7 +1183,7 @@ msgstr ""
 #. 554
 #: ../navit/country.c:208
 msgid "New Zealand"
-msgstr ""
+msgstr "Nova Zelanda"
 
 #. 512
 #: ../navit/country.c:209
@@ -1194,12 +1193,12 @@ msgstr ""
 #. 591
 #: ../navit/country.c:210
 msgid "Panama"
-msgstr ""
+msgstr "Panamà"
 
 #. 604
 #: ../navit/country.c:211
 msgid "Peru"
-msgstr ""
+msgstr "Perú"
 
 #. 258
 #: ../navit/country.c:212
@@ -1224,22 +1223,22 @@ msgstr ""
 #. 616
 #: ../navit/country.c:216
 msgid "Poland"
-msgstr ""
+msgstr "Polònia"
 
 #. 666
 #: ../navit/country.c:217
 msgid "Saint Pierre and Miquelon"
-msgstr ""
+msgstr "Saint Pierre i Miquelon"
 
 #. 612
 #: ../navit/country.c:218
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #. 630
 #: ../navit/country.c:219
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #. 275
 #: ../navit/country.c:220
@@ -1249,12 +1248,12 @@ msgstr ""
 #. 620
 #: ../navit/country.c:221
 msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
 
 #. 585
 #: ../navit/country.c:222
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #. 600
 #: ../navit/country.c:223
@@ -1264,7 +1263,7 @@ msgstr ""
 #. 634
 #: ../navit/country.c:224
 msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
 
 #. 638
 #: ../navit/country.c:225
@@ -1274,22 +1273,22 @@ msgstr ""
 #. 642
 #: ../navit/country.c:226
 msgid "Romania"
-msgstr ""
+msgstr "Romania"
 
 #. 688
 #: ../navit/country.c:227
 msgid "Serbia"
-msgstr ""
+msgstr "Sèrbia"
 
 #. 643
 #: ../navit/country.c:228
 msgid "Russian Federation"
-msgstr ""
+msgstr "Rússia"
 
 #. 646
 #: ../navit/country.c:229
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #. 682
 #: ../navit/country.c:230
@@ -1304,22 +1303,22 @@ msgstr ""
 #. 690
 #: ../navit/country.c:232
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychelles"
 
 #. 736
 #: ../navit/country.c:233
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #. 752
 #: ../navit/country.c:234
 msgid "Sweden"
-msgstr ""
+msgstr "Suècia"
 
 #. 702
 #: ../navit/country.c:235
 msgid "Singapore"
-msgstr ""
+msgstr "Singapur"
 
 #. 654
 #: ../navit/country.c:236
@@ -1329,22 +1328,22 @@ msgstr ""
 #. 705
 #: ../navit/country.c:237
 msgid "Slovenia"
-msgstr ""
+msgstr "Eslovènia"
 
 #. 744
 #: ../navit/country.c:238
 msgid "Svalbard and Jan Mayen"
-msgstr ""
+msgstr "Svalbard i Jan Mayen"
 
 #. 703
 #: ../navit/country.c:239
 msgid "Slovakia"
-msgstr ""
+msgstr "Eslovàquia"
 
 #. 694
 #: ../navit/country.c:240
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #. 674
 #: ../navit/country.c:241
@@ -1354,12 +1353,12 @@ msgstr ""
 #. 686
 #: ../navit/country.c:242
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #. 706
 #: ../navit/country.c:243
 msgid "Somalia"
-msgstr ""
+msgstr "Somàlia"
 
 #. 740
 #: ../navit/country.c:244
@@ -1374,12 +1373,12 @@ msgstr ""
 #. 222
 #: ../navit/country.c:246
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #. 760
 #: ../navit/country.c:247
 msgid "Syrian Arab Republic"
-msgstr ""
+msgstr "Síria"
 
 #. 748
 #: ../navit/country.c:248
@@ -1394,7 +1393,7 @@ msgstr ""
 #. 148
 #: ../navit/country.c:250
 msgid "Chad"
-msgstr ""
+msgstr "Txad"
 
 #. 260
 #: ../navit/country.c:251
@@ -1404,12 +1403,12 @@ msgstr ""
 #. 768
 #: ../navit/country.c:252
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #. 764
 #: ../navit/country.c:253
 msgid "Thailand"
-msgstr ""
+msgstr "Tailàndia"
 
 #. 762
 #: ../navit/country.c:254
@@ -1424,7 +1423,7 @@ msgstr ""
 #. 626
 #: ../navit/country.c:256
 msgid "Timor-Leste"
-msgstr ""
+msgstr "Timor Oriental"
 
 #. 795
 #: ../navit/country.c:257
@@ -1439,12 +1438,12 @@ msgstr ""
 #. 776
 #: ../navit/country.c:259
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. 792
 #: ../navit/country.c:260
 msgid "Turkey"
-msgstr ""
+msgstr "Turquia"
 
 #. 780
 #: ../navit/country.c:261
@@ -1454,7 +1453,7 @@ msgstr ""
 #. 798
 #: ../navit/country.c:262
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. 158
 #: ../navit/country.c:263
@@ -1464,17 +1463,17 @@ msgstr ""
 #. 834
 #: ../navit/country.c:264
 msgid "Tanzania, United Republic of"
-msgstr ""
+msgstr "Tanzània"
 
 #. 804
 #: ../navit/country.c:265
 msgid "Ukraine"
-msgstr ""
+msgstr "Ucraïna"
 
 #. 800
 #: ../navit/country.c:266
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #. 581
 #: ../navit/country.c:267
@@ -1484,12 +1483,12 @@ msgstr ""
 #. 840
 #: ../navit/country.c:268
 msgid "United States"
-msgstr ""
+msgstr "Estats Units d'Amèrica"
 
 #. 858
 #: ../navit/country.c:269
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguai"
 
 #. 860
 #: ../navit/country.c:270
@@ -1499,17 +1498,17 @@ msgstr ""
 #. 336
 #: ../navit/country.c:271
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Ciutat del Vaticà"
 
 #. 670
 #: ../navit/country.c:272
 msgid "Saint Vincent and the Grenadines"
-msgstr ""
+msgstr "Saint Vincent i les Grenadines"
 
 #. 862
 #: ../navit/country.c:273
 msgid "Venezuela"
-msgstr ""
+msgstr "Veneçuela"
 
 #. 092
 #: ../navit/country.c:274
@@ -1529,17 +1528,17 @@ msgstr ""
 #. 548
 #: ../navit/country.c:277
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #. 876
 #: ../navit/country.c:278
 msgid "Wallis and Futuna"
-msgstr ""
+msgstr "Wallis i Futuna"
 
 #. 882
 #: ../navit/country.c:279
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #. 887
 #: ../navit/country.c:280
@@ -1549,7 +1548,7 @@ msgstr ""
 #. 175
 #: ../navit/country.c:281
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #. 710
 #: ../navit/country.c:282
@@ -1559,7 +1558,7 @@ msgstr ""
 #. 894
 #: ../navit/country.c:283
 msgid "Zambia"
-msgstr ""
+msgstr "Zàmbia"
 
 #. 716
 #: ../navit/country.c:284
@@ -1568,65 +1567,65 @@ msgstr ""
 
 #: ../navit/country.c:285
 msgid "* Unknown, add is_in tags to those cities"
-msgstr ""
+msgstr "* Desconegut, afegiu etiquetes is_in a aquestes ciutats"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:128
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 msgid "Car"
-msgstr ""
+msgstr "Cotxe"
 
 #: ../navit/gui/gtk/destination.c:127
 msgid "Iso2"
-msgstr ""
+msgstr "iso2"
 
 #: ../navit/gui/gtk/destination.c:127
 msgid "Iso3"
-msgstr ""
+msgstr "iso3"
 
 #: ../navit/gui/gtk/destination.c:127 ../navit/gui/gtk/destination.c:435
 #: ../navit/gui/internal/gui_internal.c:3315
 msgid "Country"
-msgstr ""
+msgstr "Estat"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
 msgid "Postal"
-msgstr ""
+msgstr "Codi postal"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/internal/gui_internal.c:3294
 #: ../navit/gui/internal/gui_internal.c:3323 ../navit/navit_shipped.glade:57
 msgid "Town"
-msgstr ""
+msgstr "Població"
 
 #: ../navit/gui/gtk/destination.c:128 ../navit/gui/gtk/destination.c:129
 #: ../navit/gui/gtk/destination.c:130
 msgid "District"
-msgstr ""
+msgstr "Districte"
 
 #: ../navit/gui/gtk/destination.c:129 ../navit/gui/gtk/destination.c:130
 #: ../navit/gui/gtk/destination.c:446
 #: ../navit/gui/internal/gui_internal.c:3275
 #: ../navit/gui/internal/gui_internal.c:3284
 msgid "Street"
-msgstr ""
+msgstr "Adreça"
 
 #: ../navit/gui/gtk/destination.c:130 ../navit/gui/gtk/destination.c:448
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 #: ../navit/gui/gtk/destination.c:429
 msgid "Enter Destination"
-msgstr ""
+msgstr "Introduïu una destinació"
 
 #: ../navit/gui/gtk/destination.c:438
 msgid "Zip Code"
-msgstr ""
+msgstr "Codi postal"
 
 #: ../navit/gui/gtk/destination.c:440
 msgid "City"
-msgstr ""
+msgstr "Ciutat"
 
 #: ../navit/gui/gtk/destination.c:443
 msgid "District/Township"
@@ -1634,7 +1633,7 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:471 ../navit/gui/gtk/gui_gtk_action.c:200
 msgid "Map"
-msgstr ""
+msgstr "Mapa"
 
 #: ../navit/gui/gtk/destination.c:472
 msgid "Bookmark"
@@ -1642,21 +1641,21 @@ msgstr ""
 
 #: ../navit/gui/gtk/destination.c:473 ../navit/gui/gtk/gui_gtk_action.c:212
 msgid "Destination"
-msgstr ""
+msgstr "Destinació"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:196 ../navit/navit_shipped.glade:63
 #: ../navit/navit_shipped.glade:68
 msgid "Display"
-msgstr ""
+msgstr "Pantalla"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:197 ../navit/navit_shipped.glade:51
 #: ../navit/navit_shipped.glade:78
 msgid "Route"
-msgstr ""
+msgstr "Ruta"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:198
 msgid "Former Destinations"
-msgstr ""
+msgstr "Destinacions anteriors"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:199
 #: ../navit/gui/internal/gui_internal.c:2510 ../navit/navit_shipped.glade:54
@@ -1666,48 +1665,48 @@ msgstr ""
 #: ../navit/gui/gtk/gui_gtk_action.c:201
 #: ../navit/gui/internal/gui_internal.c:3334 ../navit/navit_shipped.glade:69
 msgid "Layout"
-msgstr ""
+msgstr "Disposició"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:202
 msgid "Projection"
-msgstr ""
+msgstr "Projecció"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:203
 #: ../navit/gui/internal/gui_internal.c:3669 ../navit/navit_shipped.glade:65
 msgid "Vehicle"
-msgstr ""
+msgstr "Vehicle"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:204
 msgid "ZoomOut"
-msgstr ""
+msgstr "Allunya"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:205
 msgid "ZoomIn"
-msgstr ""
+msgstr "Apropa"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
-msgstr ""
+msgstr "Recalcula"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
-msgstr ""
+msgstr "Informació"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:213
 msgid "Stop Navigation"
-msgstr ""
+msgstr "Atura la navegació"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:214
 msgid "Test"
-msgstr ""
+msgstr "Prova"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:215
 msgid "_Quit"
-msgstr ""
+msgstr "_Surt"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:222
 msgid "Cursor"
-msgstr ""
+msgstr "Cursor"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:223
 msgid "Lock on Road"
@@ -1720,68 +1719,68 @@ msgstr ""
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
-msgstr ""
+msgstr "Zoom automàtic"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:228 ../navit/gui/gtk/gui_gtk_action.c:230
 #: ../navit/navit_shipped.glade:70
 msgid "Fullscreen"
-msgstr ""
+msgstr "Pantalla completa"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:238
 msgid "Data"
-msgstr ""
+msgstr "Dades"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "NE"
-msgstr ""
+msgstr "NE"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "E"
-msgstr ""
+msgstr "E"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "SE"
-msgstr ""
+msgstr "SE"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "S"
-msgstr ""
+msgstr "S"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "SW"
-msgstr ""
+msgstr "SO"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "W"
-msgstr ""
+msgstr "O"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:58
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:97
 msgid "NW"
-msgstr ""
+msgstr "NO"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:74
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:75 ../navit/navit_shipped.glade:73
 msgid "2D"
-msgstr ""
+msgstr "2D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:76 ../navit/navit_shipped.glade:72
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:78
 msgid "OT"
@@ -1798,19 +1797,19 @@ msgstr ""
 
 #: ../navit/gui/internal/gui_internal.c:1464
 msgid "Back to map"
-msgstr ""
+msgstr "Torna al mapa"
 
 #: ../navit/gui/internal/gui_internal.c:1473
 msgid "Main Menu"
-msgstr ""
+msgstr "Menú principal"
 
 #: ../navit/gui/internal/gui_internal.c:1590
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
 
 #: ../navit/gui/internal/gui_internal.c:1744
 msgid "Back"
-msgstr ""
+msgstr "Enrere"
 
 #: ../navit/gui/internal/gui_internal.c:1869
 msgid "Add Bookmark"
@@ -1819,16 +1818,16 @@ msgstr ""
 #: ../navit/gui/internal/gui_internal.c:2076
 #: ../navit/gui/internal/gui_internal.c:2351
 msgid "POIs"
-msgstr ""
+msgstr "Punts d'interès"
 
 #: ../navit/gui/internal/gui_internal.c:2176
 #: ../navit/gui/internal/gui_internal.c:2313
 msgid "View in Browser"
-msgstr ""
+msgstr "Visualitza al navegador"
 
 #: ../navit/gui/internal/gui_internal.c:2288
 msgid "Streets"
-msgstr ""
+msgstr "Carrers"
 
 #: ../navit/gui/internal/gui_internal.c:2296
 msgid "House numbers"
@@ -1836,29 +1835,29 @@ msgstr ""
 
 #: ../navit/gui/internal/gui_internal.c:2319
 msgid "View Attributes"
-msgstr ""
+msgstr "Visualitza els atributs"
 
 #: ../navit/gui/internal/gui_internal.c:2363
 msgid "View on map"
-msgstr ""
+msgstr "Visualitza al mapa"
 
 #: ../navit/gui/internal/gui_internal.c:2553
 #, c-format
 msgid "Bookmark %s"
-msgstr ""
+msgstr "Afegeix %s a les adreces d'interès"
 
 #: ../navit/gui/internal/gui_internal.c:3259
 #: ../navit/gui/internal/gui_internal.c:3268
 msgid "House number"
-msgstr ""
+msgstr "Número de casa/portal"
 
 #: ../navit/gui/internal/gui_internal.c:3381 ../navit/navit_shipped.glade:64
 msgid "Maps"
-msgstr ""
+msgstr "Mapes"
 
 #: ../navit/gui/internal/gui_internal.c:3425
 msgid "Show Satellite Status"
-msgstr ""
+msgstr "Mostra l'estat del satèl·lit"
 
 #: ../navit/gui/internal/gui_internal.c:3432
 msgid " PRN "
@@ -1866,11 +1865,11 @@ msgstr ""
 
 #: ../navit/gui/internal/gui_internal.c:3433
 msgid " Elevation "
-msgstr ""
+msgstr " Elevació "
 
 #: ../navit/gui/internal/gui_internal.c:3434
 msgid " Azimuth "
-msgstr ""
+msgstr " Azimut "
 
 #: ../navit/gui/internal/gui_internal.c:3435
 msgid " SNR "
@@ -1878,29 +1877,29 @@ msgstr ""
 
 #: ../navit/gui/internal/gui_internal.c:3459
 msgid "Show NMEA Data"
-msgstr ""
+msgstr "Mostra les dades NMEA"
 
 #: ../navit/gui/internal/gui_internal.c:3576 ../navit/navit_shipped.glade:115
 msgid "car"
-msgstr ""
+msgstr "cotxe"
 
 #: ../navit/gui/internal/gui_internal.c:3576 ../navit/navit_shipped.glade:180
 msgid "bike"
-msgstr ""
+msgstr "bicicleta"
 
 #: ../navit/gui/internal/gui_internal.c:3576 ../navit/navit_shipped.glade:241
 msgid "pedestrian"
-msgstr ""
+msgstr "vianant"
 
 #: ../navit/gui/internal/gui_internal.c:3593
 #, c-format
 msgid "Current profile: %s"
-msgstr ""
+msgstr "Perfil actual: %s"
 
 #: ../navit/gui/internal/gui_internal.c:3595
 #, c-format
 msgid "Change profile to: %s"
-msgstr ""
+msgstr "Canvia el perfil a: %s"
 
 #: ../navit/gui/internal/gui_internal.c:3630
 msgid "Set as active"
@@ -1908,15 +1907,15 @@ msgstr ""
 
 #: ../navit/gui/internal/gui_internal.c:3637
 msgid "Show Satellite status"
-msgstr ""
+msgstr "Mostra l'estat del satèl·lit"
 
 #: ../navit/gui/internal/gui_internal.c:3643
 msgid "Show NMEA data"
-msgstr ""
+msgstr "Mostra les dades NMEA"
 
 #: ../navit/gui/internal/gui_internal.c:3694 ../navit/navit_shipped.glade:66
 msgid "Rules"
-msgstr ""
+msgstr "Regles"
 
 #: ../navit/gui/internal/gui_internal.c:3702
 msgid "Lock on road"
@@ -1924,15 +1923,15 @@ msgstr ""
 
 #: ../navit/gui/internal/gui_internal.c:3714
 msgid "Map follows Vehicle"
-msgstr ""
+msgstr "El mapa segueix el vehicle"
 
 #: ../navit/gui/internal/gui_internal.c:4061
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #: ../navit/gui/internal/gui_internal.c:5087
 msgid "Route Description"
-msgstr ""
+msgstr "Descripció de la ruta"
 
 #: ../navit/gui/internal/gui_internal.c:5211 ../navit/navit_shipped.glade:80
 msgid "Height Profile"
@@ -1944,52 +1943,56 @@ msgstr ""
 
 #: ../navit/navit_shipped.glade:45
 msgid "Main menu"
-msgstr ""
+msgstr "Menú principal"
 
 #: ../navit/navit_shipped.glade:47
 msgid ""
 "Show\n"
 "Map"
 msgstr ""
+"Mostra\n"
+"Mapa"
 
 #: ../navit/navit_shipped.glade:49 ../navit/navit_shipped.glade:62
 msgid "Settings"
-msgstr ""
+msgstr "Configuració"
 
 #: ../navit/navit_shipped.glade:50 ../navit/navit_shipped.glade:75
 msgid "Tools"
-msgstr ""
+msgstr "Eines"
 
 #: ../navit/navit_shipped.glade:53
 msgid "Actions"
-msgstr ""
+msgstr "Accions"
 
 #: ../navit/navit_shipped.glade:58
 msgid "Quit"
-msgstr ""
+msgstr "Surt"
 
 #: ../navit/navit_shipped.glade:59
 msgid ""
 "Stop\n"
 "Navigation"
 msgstr ""
+"Atura la\n"
+"Navegació"
 
 #: ../navit/navit_shipped.glade:71
 msgid "Window Mode"
-msgstr ""
+msgstr "Mode de la finestra"
 
 #: ../navit/navit_shipped.glade:79
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 #: ../navit/navit_shipped.glade:290
 msgid "horse"
-msgstr ""
+msgstr "cavall"
 
 #: ../navit/navit_shipped.c:55
 msgid "Map Point"
-msgstr ""
+msgstr "Punt del mapa"
 
 #: ../navit/navit_shipped.c:56
 msgid "Vehicle Position"
-msgstr ""
+msgstr "Posició del vehicle"
index 75fa054..fbf6d1b 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 3f867a5..d27516c 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index b064b8e..c6f9809 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 6b9b845..2697659 100644 (file)
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-12-20 19:51+0100\n"
-"PO-Revision-Date: 2010-01-09 00:44+0000\n"
-"Last-Translator: alichani <alichani@yahoo.co.uk>\n"
+"PO-Revision-Date: 2010-01-28 17:33+0000\n"
+"Last-Translator: aitolos <Unknown>\n"
 "Language-Team: Greek <el@li.org>\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-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
@@ -31,7 +30,7 @@ msgstr "ρύθμιση '% s' στο'% s'\n"
 
 #: ../navit/navigation.c:245
 msgid "zeroth"
-msgstr ""
+msgstr "τρέχουσα"
 
 #: ../navit/navigation.c:247
 msgid "first"
@@ -141,7 +140,7 @@ msgstr "στη ράμπα"
 #: ../navit/navigation.c:1306
 #, c-format
 msgid "%sinto the street %s%s%s"
-msgstr "% s στο δρόμο% s% s% s"
+msgstr "%s στην οδό %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
 #: ../navit/navigation.c:1310
@@ -165,7 +164,7 @@ msgstr "%sστο %s%s%s|neutral form"
 #: ../navit/navigation.c:1325
 #, c-format
 msgid "%sinto the %s"
-msgstr "%s στο %s"
+msgstr "%s στην %s"
 
 #. TRANSLATORS: right, as in 'Turn right'
 #: ../navit/navigation.c:1346
@@ -180,7 +179,7 @@ msgstr "αριστερά"
 #. TRANSLATORS: Don't forget the ending space
 #: ../navit/navigation.c:1392
 msgid "easily "
-msgstr "εύκολα "
+msgstr "ελαφρά "
 
 #. TRANSLATORS: Don't forget the ending space
 #: ../navit/navigation.c:1397
@@ -199,7 +198,7 @@ msgstr "άγνωστο "
 
 #: ../navit/navigation.c:1411
 msgid "When possible, please turn around"
-msgstr "Όταν είναι δυνατόν, παρακαλείσθε να γυρίσεις"
+msgstr "Όταν είναι δυνατόν, κάνε αναστροφή"
 
 #: ../navit/navigation.c:1421
 msgid "Enter the roundabout soon"
@@ -209,22 +208,22 @@ msgstr "Πληκτρολογήστε το συντομότερο κυκλική"
 #: ../navit/navigation.c:1425
 #, c-format
 msgid "In %s, enter the roundabout"
-msgstr "Σε% s, πληκτρολογήστε την κυκλική"
+msgstr "Σε %s, μπες σε κυκλική πορεία"
 
 #: ../navit/navigation.c:1440
 #, c-format
 msgid "Leave the roundabout at the %s"
-msgstr "Αφήστε την κυκλική στο% s"
+msgstr "Εξοδος απο την κυκλική πορεία στην %s"
 
 #: ../navit/navigation.c:1443
 #, c-format
 msgid "then leave the roundabout at the %s"
-msgstr "κατόπιν άδειας κυκλική στο %s"
+msgstr "και βγείτε απο την κυκλική πορεία στην %s"
 
 #: ../navit/navigation.c:1453
 #, c-format
 msgid "Follow the road for the next %s"
-msgstr "Ακολουθήστε το δρόμο για το επόμενο %s"
+msgstr "Ακολουθήστε το δρόμο για τα επόμενα %s"
 
 #: ../navit/navigation.c:1457
 msgid "soon"
@@ -248,7 +247,7 @@ msgstr "τώρα"
 #: ../navit/navigation.c:1481
 #, c-format
 msgid "then take the %1$s road to the %2$s"
-msgstr "Στη συνέχεια λαμβάνουν το %1$s δρόμο για το %2$s"
+msgstr "στη συνέχεια πάρτε το %1$s δρόμο για το %2$s"
 
 #: ../navit/navigation.c:1492
 msgid "error"
@@ -264,7 +263,7 @@ msgstr "Στρίψτε %1$s%2$s %3$s%4$s"
 #: ../navit/navigation.c:1526
 #, c-format
 msgid "then turn %1$s%2$s %3$s%4$s"
-msgstr "στρίβετε %1$s%2$s %3$s%4$s"
+msgstr "και στρίψτε %1$s%2$s %3$s%4$s"
 
 #: ../navit/navigation.c:1531
 #, c-format
@@ -297,19 +296,19 @@ msgstr "μ"
 
 #: ../navit/navit.c:1236
 msgid "Time"
-msgstr "Ώρα"
+msgstr "Χρόνος"
 
 #: ../navit/navit.c:1248
 msgid "Destination Length"
-msgstr "Προορισμός Μήκος"
+msgstr "Απόσταση Προορισμού"
 
 #: ../navit/navit.c:1261
 msgid "Destination Time"
-msgstr "Προορισμός Ώρα"
+msgstr "Χρόνος που απομένει"
 
 #: ../navit/navit.c:1294 ../navit/gui/gtk/gui_gtk_action.c:225
 msgid "Roadbook"
-msgstr ""
+msgstr "Οδηγίες Διαδρομής"
 
 #: ../navit/popup.c:280 ../navit/popup.c:349
 #: ../navit/gui/internal/gui_internal.c:2336
@@ -469,7 +468,7 @@ msgstr "Μπενίν"
 #. 652
 #: ../navit/country.c:65
 msgid "Saint Barthelemy"
-msgstr ""
+msgstr "Αγιος Βαρθολομαίος"
 
 #. 060
 #: ../navit/country.c:66
@@ -869,7 +868,7 @@ msgstr "Ιράκ"
 #. 364
 #: ../navit/country.c:145
 msgid "Iran, Islamic Republic of"
-msgstr "Ιράν, Ισλαμική Δημοκρατία του"
+msgstr "Ισλαμική Δημοκρατία του Ιράν"
 
 #. 352
 #: ../navit/country.c:146
@@ -1229,7 +1228,7 @@ msgstr "Πολωνία"
 #. 666
 #: ../navit/country.c:217
 msgid "Saint Pierre and Miquelon"
-msgstr ""
+msgstr "Σεν Πιερ και Μικελόν"
 
 #. 612
 #: ../navit/country.c:218
@@ -1269,7 +1268,7 @@ msgstr "Κατάρ"
 #. 638
 #: ../navit/country.c:225
 msgid "Reunion"
-msgstr ""
+msgstr "Ρεουνιόν"
 
 #. 642
 #: ../navit/country.c:226
@@ -1334,7 +1333,7 @@ msgstr "Σλοβενία"
 #. 744
 #: ../navit/country.c:238
 msgid "Svalbard and Jan Mayen"
-msgstr ""
+msgstr "Νήσοι Σβάλμπαρντ και Γιαν Μάγιεν"
 
 #. 703
 #: ../navit/country.c:239
@@ -1349,7 +1348,7 @@ msgstr "Σιέρα Λεόνε"
 #. 674
 #: ../navit/country.c:241
 msgid "San Marino"
-msgstr ""
+msgstr "Άγιος Μαρίνος"
 
 #. 686
 #: ../navit/country.c:242
@@ -1364,12 +1363,12 @@ msgstr "Σομαλία"
 #. 740
 #: ../navit/country.c:244
 msgid "Suriname"
-msgstr ""
+msgstr "Σουρινάμ"
 
 #. 678
 #: ../navit/country.c:245
 msgid "Sao Tome and Principe"
-msgstr ""
+msgstr "Sao Tome και Principe"
 
 #. 222
 #: ../navit/country.c:246
@@ -1389,7 +1388,7 @@ msgstr "Σουαζιλάνδη"
 #. 796
 #: ../navit/country.c:249
 msgid "Turks and Caicos Islands"
-msgstr ""
+msgstr "Νήσοι Τούρκς και Καΐκος"
 
 #. 148
 #: ../navit/country.c:250
@@ -1399,7 +1398,7 @@ msgstr "Τσαντ"
 #. 260
 #: ../navit/country.c:251
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Γαλλικές Νότιες Περιοχές"
 
 #. 768
 #: ../navit/country.c:252
@@ -1479,7 +1478,7 @@ msgstr "Ουγκάντα"
 #. 581
 #: ../navit/country.c:267
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "Απομακρυσμένες Νησίδες των Ηνωμένων Πολιτειών"
 
 #. 840
 #: ../navit/country.c:268
@@ -1534,7 +1533,7 @@ msgstr "Βανουάτου"
 #. 876
 #: ../navit/country.c:278
 msgid "Wallis and Futuna"
-msgstr ""
+msgstr "Νήσοι Γουόλις και Φουτούνα"
 
 #. 882
 #: ../navit/country.c:279
@@ -1687,7 +1686,7 @@ msgstr "Μεγέθυνση"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:206
 msgid "Recalculate"
-msgstr "Επανάληψη υπολογισμού"
+msgstr "Επαναϋπολογισμός"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:208 ../navit/gui/gtk/gui_gtk_action.c:210
 msgid "Info"
@@ -1716,7 +1715,7 @@ msgstr "Κλείδωμα στο δρόμο"
 #: ../navit/gui/gtk/gui_gtk_action.c:224
 #: ../navit/gui/internal/gui_internal.c:3708
 msgid "Northing"
-msgstr ""
+msgstr "Χάρτης στο βορρά"
 
 #: ../navit/gui/gtk/gui_gtk_action.c:226
 msgid "Autozoom"
@@ -1785,16 +1784,16 @@ msgstr "3Δ"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:78
 msgid "OT"
-msgstr ""
+msgstr "ΟΤ"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:119
 #, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
-msgstr ""
+msgstr "Διαδρομή %4.0fχλμ Χρόνος που απομένει %02d:%02d"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:164
 msgid "Route 0000km  0+00:00 ETA"
-msgstr ""
+msgstr "Διαδρομή 0000χλμ Χρόνος που απομένει 0+00:00"
 
 #: ../navit/gui/internal/gui_internal.c:1464
 msgid "Back to map"
@@ -1858,7 +1857,7 @@ msgstr "Χάρτες"
 
 #: ../navit/gui/internal/gui_internal.c:3425
 msgid "Show Satellite Status"
-msgstr "Δείτε Δορυφορική"
+msgstr "Εμφάνιση Κατάστασης Δορυφόρων"
 
 #: ../navit/gui/internal/gui_internal.c:3432
 msgid " PRN "
@@ -1874,11 +1873,11 @@ msgstr " Αζιμούθιο "
 
 #: ../navit/gui/internal/gui_internal.c:3435
 msgid " SNR "
-msgstr ""
+msgstr " SNR "
 
 #: ../navit/gui/internal/gui_internal.c:3459
 msgid "Show NMEA Data"
-msgstr "Δείτε NEAM"
+msgstr "Εμφάνιση Δεδομένων ΝΜΕΑ"
 
 #: ../navit/gui/internal/gui_internal.c:3576 ../navit/navit_shipped.glade:115
 msgid "car"
@@ -1890,7 +1889,7 @@ msgstr "ποδήλατο"
 
 #: ../navit/gui/internal/gui_internal.c:3576 ../navit/navit_shipped.glade:241
 msgid "pedestrian"
-msgstr "πεζών"
+msgstr "Πεζός"
 
 #: ../navit/gui/internal/gui_internal.c:3593
 #, c-format
@@ -1900,19 +1899,19 @@ msgstr "Τρέχον προφίλ: %s"
 #: ../navit/gui/internal/gui_internal.c:3595
 #, c-format
 msgid "Change profile to: %s"
-msgstr "Αλλαγή προφίλ για να %s"
+msgstr "Αλλαγή προφίλ σε: %s"
 
 #: ../navit/gui/internal/gui_internal.c:3630
 msgid "Set as active"
-msgstr "που ως δραστικές"
+msgstr "Καθορισμός ως ενεργό"
 
 #: ../navit/gui/internal/gui_internal.c:3637
 msgid "Show Satellite status"
-msgstr "Δείτε Δορυφορική καθεστώς"
+msgstr "Εμφάνιση Κατάστασης Δορυφόρων"
 
 #: ../navit/gui/internal/gui_internal.c:3643
 msgid "Show NMEA data"
-msgstr "NMEA δεδομένα δείχνουν"
+msgstr "Εμφάνιση δεδομένων ΝΜΕΑ"
 
 #: ../navit/gui/internal/gui_internal.c:3694 ../navit/navit_shipped.glade:66
 msgid "Rules"
@@ -1920,7 +1919,7 @@ msgstr "Κανόνες"
 
 #: ../navit/gui/internal/gui_internal.c:3702
 msgid "Lock on road"
-msgstr "Κλείδωμα για τα τροχαία"
+msgstr "Κλείδωμα στο δρόμο"
 
 #: ../navit/gui/internal/gui_internal.c:3714
 msgid "Map follows Vehicle"
@@ -1940,7 +1939,7 @@ msgstr "Ύψος προφίλ"
 
 #: ../navit/gui/internal/gui_internal.c:5349 ../navit/navit_shipped.glade:76
 msgid "Show Locale"
-msgstr ""
+msgstr "Eμφάνιση Εντοπιότητας"
 
 #: ../navit/navit_shipped.glade:45
 msgid "Main menu"
@@ -1950,7 +1949,9 @@ msgstr "Κύριο Μενού"
 msgid ""
 "Show\n"
 "Map"
-msgstr "Παρουσίαση χάρτη"
+msgstr ""
+"Εμφάνιση\n"
+"Χάρτη"
 
 #: ../navit/navit_shipped.glade:49 ../navit/navit_shipped.glade:62
 msgid "Settings"
index 5f43c6e..f80092f 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index b61ac78..67e5819 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 79af448..3ae466d 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: -1,-1,-1,23,-1,-1,-1,-1,-1,-1\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
index f470ee1..ec44f62 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 6edf3d2..3747b66 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index dec9acd..63756be 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index aaaae41..9e6b7dc 100644 (file)
@@ -9,14 +9,13 @@ msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-12-20 19:51+0100\n"
-"PO-Revision-Date: 2009-12-20 21:54+0000\n"
-"Last-Translator: KaZeR <Unknown>\n"
+"PO-Revision-Date: 2010-01-21 18:57+0000\n"
+"Last-Translator: jerome-lsl <Unknown>\n"
 "Language-Team: KaZeR <kazer@altern.org>\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-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 38e835f..9b147c0 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 300a05b..d221e98 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index d782a1f..fc5510c 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index bc20be3..94e3ed6 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index c083adf..54f8c6b 100644 (file)
@@ -16,7 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 2293cad..e20e232 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 1bf3f66..47be288 100644 (file)
@@ -16,7 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 94da56b..4f5387c 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 80d182c..b3624ab 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 4732a3a..84148f2 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index c33df8f..0eda17e 100644 (file)
@@ -16,7 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-Language: Polish\n"
index c9b73b3..d293c4d 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 322ffee..b06dbde 100644 (file)
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: navit 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-12-20 19:51+0100\n"
-"PO-Revision-Date: 2010-01-08 02:44+0000\n"
-"Last-Translator: diecavallax <Unknown>\n"
+"PO-Revision-Date: 2010-01-21 22:07+0000\n"
+"Last-Translator: zhevz <boite_afrodite@hotmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\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-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 0851dae..8d0f607 100644 (file)
@@ -16,7 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index a7bae28..78d3681 100644 (file)
@@ -16,7 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-01-18 10:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index c542da1..a87924b 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 447ad83..92e5d4b 100644 (file)
@@ -16,7 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
 "n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 588659f..55752a2 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index a17826f..c2d2eee 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 7844ece..df88b4a 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 0eb05c9..f4765fe 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 65984fc..4684b26 100644 (file)
@@ -16,7 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index cfea2cb..40b5d94 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index 4597dac..8b67dd4 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"
 
index ce4affc..3e98152 100644 (file)
@@ -15,7 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-18 09:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n"