Potlatch 1.2a

diff --git a/config/potlatch/colours.txt b/config/potlatch/colours.txt
index e69a5b2cc222fda96e8d206a00cf909af9172e8f..16d05c62a1bb2c44025dbe117968ef69ac8034ec 100644 (file)
--- a/config/potlatch/colours.txt
+++ b/config/potlatch/colours.txt
@@ -16,8 +16,10 @@ unclassified 0xE8E8E8        1       -
 residential            0xE8E8E8        1       -
 road                   0xAAAAAA        1       -
 footway                        0xFF6644        -       -
 residential            0xE8E8E8        1       -
 road                   0xAAAAAA        1       -
 footway                        0xFF6644        -       -

-cycleway               0xFF6644        -       -
-bridleway              0xFF6644        -       -
+path                   0xFF8866        -       -
+bridleway              0x996644        -       -
+track                  0x996644        -       -
+cycleway               0x2222FF        -       -

 rail                   0x000001        -       -
 river                  0x8888FF        -       -
 canal                  0x8888FF        -       -
 rail                   0x000001        -       -
 river                  0x8888FF        -       -
 canal                  0x8888FF        -       -

diff --git a/config/potlatch/localised/fr/localised.yaml b/config/potlatch/localised/fr/localised.yaml
index 21554e37521e90bea8db9a53660d68ce9bb50734..01e1b56036657de8af84ca8bf30bdc4ce404f139 100644 (file)
--- a/config/potlatch/localised/fr/localised.yaml
+++ b/config/potlatch/localised/fr/localised.yaml
@@ -83,4 +83,12 @@
 "advice_nocommonpoint": Les chemins ne partagent pas de point commun
 "option_warnings": Montrer les avertissements flottants
 "reverting": annule
 "advice_nocommonpoint": Les chemins ne partagent pas de point commun
 "option_warnings": Montrer les avertissements flottants
 "reverting": annule

-"prompt_helpavailable": Vous avez des modifications non enregistrées. (Pour sauvegarder dans Potlatch, vous devez déselectionner tout point ou chemin)
+"prompt_helpavailable": "Nouvel utilisateur ? Regardez en bas à gauche pour de l'aide"
+"prompt_editsave": Éditer avec sauvegarde
+"prompt_editlive": Éditer en direct
+"launch": Lancer
+"prompt_launch": Lancer un URL externe
+"editinglive": Édition en direct
+"openchangeset": "Ouverture d'un changeset"
+"editingoffline": Édition hors-ligne
+"save": Sauvegarder

diff --git a/config/potlatch/localised/hu/localised.yaml b/config/potlatch/localised/hu/localised.yaml
index d06699347a45bf66aaaecdcb7a27dc642a29d70f..8f202916fb4fba658fa03596090707615d75c646 100644 (file)
--- a/config/potlatch/localised/hu/localised.yaml
+++ b/config/potlatch/localised/hu/localised.yaml
@@ -74,7 +74,7 @@
 "action_cancelchanges": "módosítások elvetése:"
 "advice_revertingpoi": Visszaállítás a legutóbb mentett POI-ra (Z a viszavonáshoz)
 "advice_deletingpoi": POI törlése (Z a visszavonáshoz)
 "action_cancelchanges": "módosítások elvetése:"
 "advice_revertingpoi": Visszaállítás a legutóbb mentett POI-ra (Z a viszavonáshoz)
 "advice_deletingpoi": POI törlése (Z a visszavonáshoz)

-"custom": "Egyéni: "
+"custom": "Egyéni:"

 "nobackground": Nincs háttérkép
 "option_fadebackground": Áttetsző háttér
 "option_thinlines": Vékony vonalak használata minden méretaránynál
 "nobackground": Nincs háttérkép
 "option_fadebackground": Áttetsző háttér
 "option_thinlines": Vékony vonalak használata minden méretaránynál

diff --git a/config/potlatch/localised/lolcat/localised.yaml b/config/potlatch/localised/lolcat/localised.yaml
index b774b60675a669dcc89424e7fe61ac2473cde760..5ef4f2a9754f1b9cc63070ce7e435d745aaf63f7 100644 (file)
--- a/config/potlatch/localised/lolcat/localised.yaml
+++ b/config/potlatch/localised/lolcat/localised.yaml
@@ -77,3 +77,7 @@
 "existingrelation": Adds ta a relashun
 "findrelation": Luks for a relashun wif
 "norelations": I sees noes relashuns neer heer
 "existingrelation": Adds ta a relashun
 "findrelation": Luks for a relashun wif
 "norelations": I sees noes relashuns neer heer

+"advice_toolong": oh noes! wai iz veeeri big! splitz it!
+"advice_waydragged": Wai iz draggeded (Z undoz)
+"advice_tagconflict": teh wais haz noes joins!
+"advice_nocommonpoint": seez floaty warnz?

diff --git a/config/potlatch/localised/nl/localised.yaml b/config/potlatch/localised/nl/localised.yaml
index e8aec9fedf5d53d553935f74453bf7005b105567..22bc94eb966303d55ab132063d46e45b9a4af1f3 100644 (file)
--- a/config/potlatch/localised/nl/localised.yaml
+++ b/config/potlatch/localised/nl/localised.yaml
@@ -83,4 +83,15 @@
 "advice_nocommonpoint": "De 'ways' hebben geen gemeenschappelijk punt"
 "option_warnings": Floating warnings weergeven
 "reverting": omdraaien
 "advice_nocommonpoint": "De 'ways' hebben geen gemeenschappelijk punt"
 "option_warnings": Floating warnings weergeven
 "reverting": omdraaien

-"prompt_helpavailable": "Er zijn niet-opgeslagen wijzigingen (om op te slaan in Potlatch, moet u de geselecteerde 'way' of POI deselecteren)."
+"prompt_helpavailable": Nieuwe gebruiker? Kijk linksonder voor hulp.
+"prompt_editsave": Bewerken en opslaan
+"prompt_editlive": Direct bewerken
+"launch": Launch
+"prompt_launch": Launch external URL
+"editinglive": Live bewerken
+"openchangeset": Changeset wordt geopend...
+"editingoffline": Offline bewerken
+"save": Opslaan
+"drag_pois": "Sleep POI's naar de kaart en zet ze neer"
+"prompt_savechanges": Wijzigingen opslaan
+"prompt_changesetcomment": "Typ hier een beschrijving van je wijzigingen:"

diff --git a/config/potlatch/localised/pt-BR/localised.yaml b/config/potlatch/localised/pt-BR/localised.yaml
index 1cebd387c99d26e858c449f203a1f36ae122e5ac..3e0ef87e160fded5f89f0c950b7816e21daf24eb 100644 (file)
--- a/config/potlatch/localised/pt-BR/localised.yaml
+++ b/config/potlatch/localised/pt-BR/localised.yaml
@@ -73,3 +73,25 @@
 "action_moveway": Movendo um caminho
 "way": Caminho
 "point": Ponto
 "action_moveway": Movendo um caminho
 "way": Caminho
 "point": Ponto

+"ok": Ok
+"existingrelation": Adicionar a uma relação existente
+"findrelation": Encontrar uma relação contendo
+"norelations": Nenhuma relação na área atual
+"advice_toolong": Muito longo para destravar - por favor divida em vias menores
+"advice_waydragged": Via arrastada (para voltar pressione Z)
+"advice_tagconflict": Tags não combinam - por favor verifique (para voltar pressione Z)
+"advice_nocommonpoint": As vias não compartilham um ponto em comum
+"option_warnings": Mostrar avisos flutuantes
+"reverting": revertendo
+"prompt_helpavailable": Novato? Veja a ajuda no canto inferior esquerdo.
+"prompt_editsave": Editar e salvar
+"prompt_editlive": Editar ao vivo
+"launch": Carregar
+"prompt_launch": Carregar URL externa
+"editinglive": Editando ao vivo
+"openchangeset": Abrindo changeset
+"editingoffline": Editando offline
+"save": Salvar
+"drag_pois": Arraste pontos de interesse
+"prompt_savechanges": Salvar mudanças
+"prompt_changesetcomment": "Entre com uma descrição das suas mudanças:"

diff --git a/config/potlatch/localised/ru/localised.yaml b/config/potlatch/localised/ru/localised.yaml
index 291f2561ae9594d2c365274fd5cfa33bebaa593d..8b027c25faef21e8878b17e29f79175c5766dce9 100644 (file)
--- a/config/potlatch/localised/ru/localised.yaml
+++ b/config/potlatch/localised/ru/localised.yaml
@@ -33,7 +33,7 @@
 "prompt_start": Начать редактировать карту OpenStreetMap.
 "prompt_practise": Тренировочное редактирование — ваши изменения не будут сохранены.
 "practicemode": Тренировочный режим
 "prompt_start": Начать редактировать карту OpenStreetMap.
 "prompt_practise": Тренировочное редактирование — ваши изменения не будут сохранены.
 "practicemode": Тренировочный режим

-"help": Ð\9fомоÑ\89Ñ\8c
+"help": СпÑ\80авка

 "prompt_help": Узнать, как пользоваться редактором.
 "track": Трек
 "prompt_track": Конвертировать GPS-трек в линию(заблокированную), для редактирования.
 "prompt_help": Узнать, как пользоваться редактором.
 "track": Трек
 "prompt_track": Конвертировать GPS-трек в линию(заблокированную), для редактирования.


@@ -79,8 +79,19 @@
 "norelations": Нет отношений в текущей области
 "advice_toolong": Длина слишком велика. Пожалуйста, разделите на более короткие линии
 "advice_waydragged": Линия передвинута (Z для отмены)
 "norelations": Нет отношений в текущей области
 "advice_toolong": Длина слишком велика. Пожалуйста, разделите на более короткие линии
 "advice_waydragged": Линия передвинута (Z для отмены)

-"advice_tagconflict": Тэги не совпадают, пожалуйста проверьте (Z для отмены)
+"advice_tagconflict": Теги не совпадают, пожалуйста проверьте (Z для отмены)

 "advice_nocommonpoint": Линии не имеют общей точки
 "option_warnings": Показывать всплывающие предупреждения
 "reverting": возвращается
 "advice_nocommonpoint": Линии не имеют общей точки
 "option_warnings": Показывать всплывающие предупреждения
 "reverting": возвращается

-"prompt_helpavailable": Присутствуют несохранённые изменения. (Чтобы записать изменения в Potlatch, снимите выделение с текущей точки или линии)
+"prompt_helpavailable": "Вы новичок? Воспользуйтесь кнопкой 'Справка'."
+"prompt_editsave": Ред. и сохр.
+"prompt_editlive": Ред. вживую
+"launch": Выполнить
+"prompt_launch": Перейти по внешней ссылке
+"editinglive": Ред. вживую
+"openchangeset": Откр. изменений
+"editingoffline": Ред. оффлайн
+"save": Сохр.
+"drag_pois": Перетащите объекты на карту
+"prompt_savechanges": Сохр. измен.
+"prompt_changesetcomment": "Опишите ваши изменения:"

diff --git a/config/potlatch/localised/sv/localised.yaml b/config/potlatch/localised/sv/localised.yaml
index aa7d36c393726f21b9ca42e923460394aabbcf01..db324517eefab32f3fdd7cd33670934da45711c9 100644 (file)
--- a/config/potlatch/localised/sv/localised.yaml
+++ b/config/potlatch/localised/sv/localised.yaml
@@ -37,8 +37,8 @@
 "prompt_help": Information hur man använder Potlatch, den här karteditorn.
 "track": Spår
 "prompt_track": Omvandla dina GPS-spår till (låsta) vägar för editering.
 "prompt_help": Information hur man använder Potlatch, den här karteditorn.
 "track": Spår
 "prompt_track": Omvandla dina GPS-spår till (låsta) vägar för editering.

-"action_deletepoint": Tar bort en punkt
-"deleting": Tar bort
+"action_deletepoint": tar bort en punkt
+"deleting": tar bort

 "action_cancelchanges": avbryter ändringar på
 "emailauthor": \n\nVänligen e-posta richard\@systemeD.net med en felrapport som beskriver vad du gjorde när felet inträffade.
 "error_connectionfailed": "Tyvärr har vi tappat kontakten med OpenStreetMap serven. Nygjorda ändringar har inte kunnat sparas.\n\nFörsöka återansluta?"
 "action_cancelchanges": avbryter ändringar på
 "emailauthor": \n\nVänligen e-posta richard\@systemeD.net med en felrapport som beskriver vad du gjorde när felet inträffade.
 "error_connectionfailed": "Tyvärr har vi tappat kontakten med OpenStreetMap serven. Nygjorda ändringar har inte kunnat sparas.\n\nFörsöka återansluta?"


@@ -73,3 +73,25 @@
 "action_moveway": flytta en väg
 "way": Väg
 "point": Nod (punkt)
 "action_moveway": flytta en väg
 "way": Väg
 "point": Nod (punkt)

+"ok": Ok
+"existingrelation": Lägg till existerande relation
+"findrelation": Sök efter relation innehållande
+"norelations": Inga relationer i nuvarande område
+"advice_toolong": Det tog för lång tid att låsa upp - vänligen dela i kortare sträckor
+"advice_waydragged": Hela sträckan flyttades (Z för att ångra)
+"advice_tagconflict": Etiketter (tag) matchar inte - vänligen kontrollera (Z för att ångra)
+"advice_nocommonpoint": Sträckorna har ingen gemensam nod
+"option_warnings": Visa flytande varningar
+"reverting": faller tillbaka
+"prompt_helpavailable": Ny användare? Titta längst ner till vänster för hjälp.
+"prompt_editsave": "Ändra via spara (Ändringar sparas när du klickar 'spara')"
+"prompt_editlive": Ändra live (Alla ändringar sparas i och med att de utförs)
+"launch": Starta
+"prompt_launch": Öppna extern URL
+"editinglive": Ändrar live
+"openchangeset": Öppnar ändringsset
+"editingoffline": Editerar offline
+"save": Spara
+"drag_pois": Drag och släpp intressepunkter (POI)
+"prompt_savechanges": Spara ändringar
+"prompt_changesetcomment": "Ange en beskrivning av dina ändringar:"

diff --git a/config/potlatch/localised/tr/localised.yaml b/config/potlatch/localised/tr/localised.yaml
index 73489aaa2216da972724a01502b072c2dfaae442..a68ac8e914c61ef58c0c62206c6a054f1ed141ba 100644 (file)
--- a/config/potlatch/localised/tr/localised.yaml
+++ b/config/potlatch/localised/tr/localised.yaml
@@ -60,7 +60,7 @@
 "tip_undo": $1 Geri Al (Z)
 "error_noway": $1 yolu bulunamıyor (belki atıdı) bu yüzden geri alamıyorum.
 "error_nosharedpoint": $1 ve $2 yollarının paylaştıkları ortak bir nokta artık yok, bu yüzden bölmeyi geri alamıyorum.
 "tip_undo": $1 Geri Al (Z)
 "error_noway": $1 yolu bulunamıyor (belki atıdı) bu yüzden geri alamıyorum.
 "error_nosharedpoint": $1 ve $2 yollarının paylaştıkları ortak bir nokta artık yok, bu yüzden bölmeyi geri alamıyorum.

-"error_nopoi": "The POI cannot be found (perhaps you've panned away?) so I can't undo."
+"error_nopoi": POI bulunamadı (belki başka bir yere taşıdınız), bundan dolayı geri alamıyorum.

 "prompt_taggedpoints": Bu yolun birkaç noktası etiketlenmiş. Gene de silinsin mi?
 "action_insertnode": yola bir nokta ekleniyor
 "action_splitway": yol bölünüyor
 "prompt_taggedpoints": Bu yolun birkaç noktası etiketlenmiş. Gene de silinsin mi?
 "action_insertnode": yola bir nokta ekleniyor
 "action_splitway": yol bölünüyor


@@ -83,3 +83,15 @@
 "advice_nocommonpoint": Yolların ortak noktası yok
 "option_warnings": Uyarıları göster
 "reverting": geri alınıyor
 "advice_nocommonpoint": Yolların ortak noktası yok
 "option_warnings": Uyarıları göster
 "reverting": geri alınıyor

+"prompt_helpavailable": Yeni kullanıcı mısın? Yardıma bak.
+"prompt_editsave": Kaydet ile düzenle
+"prompt_editlive": Canlı düzenle
+"launch": Başlat
+"prompt_launch": Dış bağlantıyı başlat
+"editinglive": Canlı düzenleniyor
+"openchangeset": Değişiklik seti açılıyor
+"editingoffline": Çevrimdışı düzenleniyor
+"save": Kaydet
+"drag_pois": "POI'leri sürükle-bırak"
+"prompt_savechanges": Değişiklikleri kaydet
+"prompt_changesetcomment": Değişiklikleriniz için bir açıklama yazın

diff --git a/config/potlatch/localised/vi/localised.yaml b/config/potlatch/localised/vi/localised.yaml
index 4352611dc82d2b7a30990b0d199c23be0a7c49ea..4790a1abd4bb2a65436b620d2087f7e21e058289 100644 (file)
--- a/config/potlatch/localised/vi/localised.yaml
+++ b/config/potlatch/localised/vi/localised.yaml
@@ -83,4 +83,15 @@
 "advice_nocommonpoint": Các lối không cắt ngang nhau tại điểm nào
 "option_warnings": Nổi các cảnh báo
 "reverting": đang lùi sửa
 "advice_nocommonpoint": Các lối không cắt ngang nhau tại điểm nào
 "option_warnings": Nổi các cảnh báo
 "reverting": đang lùi sửa

-"prompt_helpavailable": Bạn chưa lưu một số thay đổi. (Để lưu trong Potlatch, chỉ việc bỏ chọn lối hoặc địa điểm hiện hành.)
+"prompt_helpavailable": Mới tới đây? Có trợ giúp dưới đây ở bên trái.
+"prompt_editsave": Lưu Sau
+"prompt_editlive": Áp dụng Ngay
+"launch": Mở
+"prompt_launch": Mở URL bên ngoài
+"editinglive": Đang áp dụng ngay
+"openchangeset": Đang mở bộ thay đổi
+"editingoffline": Đang ngoại tuyến
+"save": Lưu
+"drag_pois": Kéo và thả các địa điểm ưa thích
+"prompt_savechanges": Lưu các thay đổi
+"prompt_changesetcomment": "Miêu tả các thay đổi:"

diff --git a/config/potlatch/presets.txt b/config/potlatch/presets.txt
index 8305c49e143713529e5c2183165b46eb2d49eed3..27f394d08720b96a23f8850dce774211c62e81ad 100644 (file)
--- a/config/potlatch/presets.txt
+++ b/config/potlatch/presets.txt
@@ -13,6 +13,7 @@ way/footway
 public footpath: highway=footway,foot=yes,tracktype=
 permissive path: highway=footway,foot=permissive,tracktype=
 bridleway: highway=bridleway,foot=yes,tracktype=
 public footpath: highway=footway,foot=yes,tracktype=
 permissive path: highway=footway,foot=permissive,tracktype=
 bridleway: highway=bridleway,foot=yes,tracktype=

+unofficial path: highway=path

 paved track: highway=track,foot=,surface=paved
 gravel track: highway=track,foot=,surface=gravel
 dirt track: highway=track,foot=,surface=dirt
 paved track: highway=track,foot=,surface=paved
 gravel track: highway=track,foot=,surface=gravel
 dirt track: highway=track,foot=,surface=dirt


@@ -20,9 +21,9 @@ grass track: highway=track,foot=,surface=grass
 
 way/cycleway
 cycle track: highway=cycleway,ncn_ref=,rcn_ref=,lcn_ref=
 
 way/cycleway
 cycle track: highway=cycleway,ncn_ref=,rcn_ref=,lcn_ref=

-cycle track (national route): highway=cycleway,ncn_ref=(type route number)
-cycle track (regional route): highway=cycleway,rcn_ref=(type route number)
-cycle track (local route): highway=cycleway,lcn_ref=(type route number)
+national route: highway=cycleway,ncn_ref=(type route number)
+regional route: highway=cycleway,rcn_ref=(type route number)
+local route: highway=cycleway,lcn_ref=(type route number)

 
 way/waterway
 canal: waterway=canal,name=(type name here)
 
 way/waterway
 canal: waterway=canal,name=(type name here)

diff --git a/config/potlatch/relation_colours.txt b/config/potlatch/relation_colours.txt
index 557563fe2fe0cc2dd7297a530ea1de81dacc9662..6a7c769c2096ce2ceba3671b38985366285ae886 100644 (file)
--- a/config/potlatch/relation_colours.txt
+++ b/config/potlatch/relation_colours.txt
@@ -1,8 +1,18 @@
 # Potlatch relations colours file
 # each line must be tab-separated: tag, colour, alpha, width
 # Potlatch relations colours file
 # each line must be tab-separated: tag, colour, alpha, width

+#\10(width is currently ignored)
+# an alpha of 0 will cause that relation not to be drawn

 
 lcn            0x0000ff        50      10
 rcn            0x28c9fe        50      10
 ncn            0xff3333        50      10
 foot   0x228022        50      10
 trail  0x228022        50      10
 
 lcn            0x0000ff        50      10
 rcn            0x28c9fe        50      10
 ncn            0xff3333        50      10
 foot   0x228022        50      10
 trail  0x228022        50      10

+hiking 0x228022        50      10
+uk_ldp 0x228022        50      10
+nwn            0x228022        50      10
+rwn            0x228022        50      10
+lwn            0x228022        50      10
+boundary       0x010101        25      10
+restriction    0x000000        0       0
+enforcement    0x000000        0       0

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 6557e79202d4442d193373d1589c92beadef849f..da59583e9124ee5d507ba1b503e1c5ed1af0cd9e 100644 (file)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ