roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1575585 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/editor/ resources/ webapp/WEB-INF/jsps/editor/
Date Sat, 08 Mar 2014 18:26:52 GMT
Author: gmazza
Date: Sat Mar  8 18:26:52 2014
New Revision: 1575585

URL: http://svn.apache.org/r1575585
Log:
Added move to folder button on blogroll page, will be needed once folders no longer list other folders.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
    roller/trunk/app/src/main/resources/ApplicationResources.properties
    roller/trunk/app/src/main/resources/ApplicationResources_da.properties
    roller/trunk/app/src/main/resources/ApplicationResources_de.properties
    roller/trunk/app/src/main/resources/ApplicationResources_es.properties
    roller/trunk/app/src/main/resources/ApplicationResources_is.properties
    roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
    roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
    roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
    roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
    roller/trunk/app/src/main/resources/ApplicationResources_vi.properties
    roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
    roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java Sat Mar  8 18:26:52 2014
@@ -59,6 +59,9 @@ public class Bookmarks extends UIAction 
 	// the target folder to move items to
 	private String targetFolderId = null;
 
+    // a new folder the user wishes to view
+    private String viewFolderId = null;
+
 	// all folders from the action weblog
 	private Set allFolders = Collections.EMPTY_SET;
 
@@ -202,6 +205,21 @@ public class Bookmarks extends UIAction 
 		return execute();
 	}
 
+    /**
+     * View the contents of another bookmark folder.
+     */
+    public String view() {
+        try {
+            BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
+            if (!StringUtils.isEmpty(viewFolderId)) {
+                setFolder(bmgr.getFolder(viewFolderId));
+            }
+        } catch (WebloggerException ex) {
+            log.error("Error looking up folder", ex);
+        }
+        return execute();
+    }
+
 	/**
 	 * Move folders and bookmarks to a new folder.
 	 */
@@ -322,4 +340,11 @@ public class Bookmarks extends UIAction 
 		this.folderPath = folderPath;
 	}
 
+    public String getViewFolderId() {
+        return viewFolderId;
+    }
+
+    public void setViewFolderId(String viewFolderId) {
+        this.viewFolderId = viewFolderId;
+    }
 }

Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat Mar  8 18:26:52 2014
@@ -72,7 +72,7 @@ bookmarksForm.rootPrompt=\
 This is your top-level bookmarks folder. \
 The bookmarks you keep here will appear in the blogroll section of your blog \
 (assuming that you are using one of the default themes). You can create \
-bookmark folders here, but you will have to add corresponding bookmark display \
+additional bookmark folders, but you will have to add corresponding bookmark display \
 macros to your weblog''s templates if you wish to display their contents. 
 bookmarksForm.folderPrompt=\
 This is a bookmark directory. You can add bookmarks here \
@@ -87,15 +87,16 @@ bookmarksForm.checkAll=Select All
 bookmarksForm.checkNone=Select None
 bookmarksForm.delete=Delete selected
 bookmarksForm.delete.confirm=Delete selected bookmarks?
-bookmarksForm.description=Description
+bookmarksForm.description=URL
 bookmarksForm.folder=Bookmark Folder
+bookmarksForm.viewFolder=Switch to Folder
 bookmarksForm.priority=Priority
 bookmarksForm.edit=Edit
 bookmarksForm.edit.tip=Click to edit this folder or bookmark
-bookmarksForm.move=Move
+bookmarksForm.move=Move Selected To\:
 bookmarksForm.move.confirm=Move selected bookmarks?
 bookmarksForm.name=Name
-bookmarksForm.path=Path
+bookmarksForm.path=Folder
 bookmarksForm.visitLink=Visit
 bookmarksForm.visitLink.tip=Click to visit this site
 
@@ -620,7 +621,7 @@ errorPage.noException=No stack trace.
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=Add Folder
-folderForm.add.subtitle=Adding new bookmark folder in folder [{0}]
+folderForm.add.subtitle=Adding new bookmark folder
 
 folderForm.edit.title=Edit Folder
 folderForm.edit.subtitle=Editing bookmark folder in folder [{0}]

Modified: roller/trunk/app/src/main/resources/ApplicationResources_da.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_da.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_da.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_da.properties Sat Mar  8 18:26:52 2014
@@ -85,7 +85,7 @@ bookmarksForm.checkAll=V�lg alle
 bookmarksForm.checkNone=V�lg ingen
 bookmarksForm.delete=Slet valgte
 bookmarksForm.delete.confirm=Slet valgte bogm�rker?
-bookmarksForm.description=Beskrivelse
+bookmarksForm.description=
 bookmarksForm.folder=Bogm�rke samling
 bookmarksForm.priority=Prioritet
 bookmarksForm.edit=Ret
@@ -93,7 +93,7 @@ bookmarksForm.edit.tip=Klik for at rette
 bookmarksForm.move=Flyt valgte
 bookmarksForm.move.confirm=Flyt valgte bogm�rker?
 bookmarksForm.name=Navn
-bookmarksForm.path=Sti
+bookmarksForm.path=Bogm\uFFFDrke samling
 bookmarksForm.visitLink=Bes�g
 bookmarksForm.visitLink.tip=Klik for at bes�ge websted
 
@@ -589,7 +589,7 @@ errorPage.noException=No stack trace.
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=Tilf�j mappe
-folderForm.add.subtitle=Tilf�jer ny bogm�rkesamling i mappen [{0}]
+folderForm.add.subtitle=Tilf\uFFFDjer ny bogm\uFFFDrkesamling
 
 folderForm.edit.title=Rediger mappe
 folderForm.edit.subtitle=Redigerer bogm�rkesamling i mappen [{0}]

Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Sat Mar  8 18:26:52 2014
@@ -116,7 +116,7 @@ bookmarksForm.checkAll=Alle ausw\u00E4hl
 bookmarksForm.checkNone=Keinen ausw\u00E4hlen
 bookmarksForm.delete=L\u00F6sche Auswahl
 bookmarksForm.delete.confirm=Ausgew\u00E4hlte Lesezeichen l\u00F6schen?
-bookmarksForm.description=Beschreibung
+bookmarksForm.description=
 bookmarksForm.edit=Bearbeiten
 bookmarksForm.edit.tip=Anklicken um den Ordner oder das Lesezeichen zu bearbeiten
 bookmarksForm.error.move=Fehler beim Verschieben, Elternknoten nach Kindknoten zu verschieben ist nicht erlaubt
@@ -127,7 +127,7 @@ bookmarksForm.importBookmarks=Lesezeiche
 bookmarksForm.move=Verschiebe Auswahl
 bookmarksForm.move.confirm=Ausgew\u00E4hlte Lesezeichen verschieben?
 bookmarksForm.name=Name
-bookmarksForm.path=Pfad
+bookmarksForm.path=Ordner
 bookmarksForm.priority=Priorit\u00E4t
 bookmarksForm.root=root
 bookmarksForm.rootPrompt=Die ist Ihr oberster Lesezeichenordner. Die Lesezeichen, die Sie hier anlegen, werden im Blogrollen Bereich Ihres Blogs erscheinen (vorausgesetzt Sie benutzen eines der Standardthemen). Sie k\u00F6nnen Lesezeichenordner anlegen, aber Sie m\u00FCssen entsprechende Lesezeichenanzeigemacros zu Ihren Weblog Schablonen hinzuf\u00FCgen, wenn Sie die Ordnerinhalte anzeigen wollen.
@@ -482,7 +482,7 @@ errors.noslashes={0} darf keine '/' Zeic
 errors.range={0} ist nicht im Bereich von {1} bis {2}.
 errors.required={0} wird ben\u00F6tigt.
 errors.short={0} muss ein Short sein.
-folderForm.add.subtitle=Neuen Lesezeichenordner hinzuf\u00FCgen in Ordner [{0}]
+folderForm.add.subtitle=Neuen Lesezeichenordner hinzuf\u00FCgen
 # --------------------------------------------------------------- FolderForm.jsp
 folderForm.add.title=Ordner hinzuf\u00FCgen
 folderForm.cancel=Abbrechen

Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Sat Mar  8 18:26:52 2014
@@ -31,13 +31,13 @@ bookmarksForm.addFolder = A\u00F1adir ca
 bookmarksForm.checkAll = Seleccionar todo
 bookmarksForm.checkNone = No seleccionar ninguno
 bookmarksForm.delete = Borrar seleccionado
-bookmarksForm.description = Descripci\u00F3n
+bookmarksForm.description =
 bookmarksForm.folder = Carpeta de marcador
 bookmarksForm.edit = Editar
 bookmarksForm.edit.tip = Haga click para editar esta carpeta o marcador
 bookmarksForm.move = Mover el seleccionado
 bookmarksForm.name = Nombre
-bookmarksForm.path = Ruta
+bookmarksForm.path = Carpeta de marcador
 bookmarksForm.visitLink = Visitar
 bookmarksForm.visitLink.tip = Haga click para visitar este sitio
 bookmarksForm.warn.notMoving = No se puede mover la carpeta padre [{0}] a uno de su hijos
@@ -316,7 +316,7 @@ errorPage.message = Roller ha encontrado
 errorPage.reason = Raz\u00F3n
 errorPage.noException = No hay trazo de pila.
 folderForm.add.title = A\u00F1adir carpeta
-folderForm.add.subtitle = A\u00F1adir nuevo marcador in la carpeta [{0}]
+folderForm.add.subtitle = A\u00F1adir nuevo marcador
 folderForm.edit.title = Editar carpeta
 folderForm.edit.subtitle = Editar carpeta de marcadores un carpeta [{0}]
 folderForm.correct.title = Carpeta correcta

Modified: roller/trunk/app/src/main/resources/ApplicationResources_is.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_is.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_is.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_is.properties Sat Mar  8 18:26:52 2014
@@ -25,513 +25,513 @@ application.none=Ekkert
 errors.header=<div class="error"><ul>
 errors.footer=</ul></div>
 
-errors.required={0} verður að fylla út.
-errors.minlength={0} má ekki vera minna en {1} stafir.
-errors.maxlength={0} má ekki vera meira en {1} stafir.
-errors.invalid={0} er ógilt.
-errors.byte={0} verður að vera 'byte'.
-errors.short={0} verður að vera 'short'.
-errors.integer={0} verður að vera 'integer'.
-errors.long={0} verður að vera 'long'.
-errors.float={0} verður að vera 'float'.
-errors.double={0} verður að vera 'double'.
+errors.required={0} ver�ur a� fylla �t.
+errors.minlength={0} m� ekki vera minna en {1} stafir.
+errors.maxlength={0} m� ekki vera meira en {1} stafir.
+errors.invalid={0} er �gilt.
+errors.byte={0} ver�ur a� vera 'byte'.
+errors.short={0} ver�ur a� vera 'short'.
+errors.integer={0} ver�ur a� vera 'integer'.
+errors.long={0} ver�ur a� vera 'long'.
+errors.float={0} ver�ur a� vera 'float'.
+errors.double={0} ver�ur a� vera 'double'.
 errors.date={0} er ekki gild dagsetning.
-errors.range={0} er ekki á bilinu {1} til {2}.
-errors.creditcard={0} er ekki gilt kreditkortanúmer.
-errors.email={0} má aðeins innihalda bókstafi, tölur og bil.
-errors.noslashes={0} má ekki innihalda '/' skástrik.
-error.noTrackbackUrlSpecified=Þú tilgreindir ekki tilvísunarslóð
+errors.range={0} er ekki � bilinu {1} til {2}.
+errors.creditcard={0} er ekki gilt kreditkortan�mer.
+errors.email={0} m� a�eins innihalda b�kstafi, t�lur og bil.
+errors.noslashes={0} m� ekki innihalda '/' sk�strik.
+error.noTrackbackUrlSpecified=�� tilgreindir ekki tilv�sunarsl��
 
 # ----------------------------------------------------------------- error.jsp
 
-errorPage.title=Óvænt villa
-errorPage.message=Roller lenti í óvæntri villu. Villan var skráð og upplýsingum um hana verður komið til skila.
-errorPage.reason=Ástæða
-errorPage.noException=Engar upplýsingar fylgja þessari villu
+errorPage.title=�v�nt villa
+errorPage.message=Roller lenti � �v�ntri villu. Villan var skr�� og uppl�singum um hana ver�ur komi� til skila.
+errorPage.reason=�st��a
+errorPage.noException=Engar uppl�singar fylgja �essari villu
 
 # ------------------------------------------------- Success Messages in Actions
-pageCache.flushed=Flýtiminni hefur verið hreinsað.
+pageCache.flushed=Fl�timinni hefur veri� hreinsa�.
 
 # ---------------------------------------------------------- BookmarkForm.jsp
 
-bookmarkForm.addBookmark=Bæta við nýjum tengli
-bookmarkForm.cancel=Hætta við
-bookmarkForm.correctBookmark=Laga breytingar á tenglum
-bookmarkForm.description=Lýsing
+bookmarkForm.addBookmark=B�ta vi� n�jum tengli
+bookmarkForm.cancel=H�tta vi�
+bookmarkForm.correctBookmark=Laga breytingar � tenglum
+bookmarkForm.description=L�sing
 bookmarkForm.editBookmark=Breyta tengli
 bookmarkForm.folder=tenglasafn
-bookmarkForm.image=Slóð myndar
+bookmarkForm.image=Sl�� myndar
 bookmarkForm.name=Nafn
-bookmarkForm.priority=Forgangsröðun
-bookmarkForm.rssUrl=Slóð fréttaveitu
+bookmarkForm.priority=Forgangsr��un
+bookmarkForm.rssUrl=Sl�� fr�ttaveitu
 bookmarkForm.save=Vista
 bookmarkForm.url=Tengill
-bookmarkForm.weight=Birtingarþyngd
+bookmarkForm.weight=Birtingar�yngd
 
 # --------------------------------------------------------- BookmarksForm.jsp
 
-bookmarksForm.addBookmark=Nýr tengill
-bookmarksForm.addFolder=Nýtt tenglasafn
+bookmarksForm.addBookmark=N�r tengill
+bookmarksForm.addFolder=N�tt tenglasafn
 bookmarksForm.checkAll=Velja allt
 bookmarksForm.checkNone=Velja ekkert
-bookmarksForm.delete=Eyða völdu
-bookmarksForm.description=Lýsing
+bookmarksForm.delete=Ey�a v�ldu
+bookmarksForm.description=
 bookmarksForm.edit=Breyta
-bookmarksForm.edit.tip=Smelltu til að breyta þessum tengli eða tenglasafni
+bookmarksForm.edit.tip=Smelltu til a� breyta �essum tengli e�a tenglasafni
 bookmarksForm.folder=Tenglasafn
-bookmarksForm.move=Færa valið
+bookmarksForm.move=F�ra vali�
 bookmarksForm.name=Titill
-bookmarksForm.path=Slóð
+bookmarksForm.path=Tenglasafn
 bookmarksForm.root=root
-bookmarksForm.visitLink=Skoða
-bookmarksForm.visitLink.tip=Smelltu til að skoða þessa síðu
+bookmarksForm.visitLink=Sko�a
+bookmarksForm.visitLink.tip=Smelltu til a� sko�a �essa s��u
 
 # ------------------------------------------------------ Bookmarks import.jsp
 
 bookmarksImport.title=Flytja inn OPML tengla
-bookmarksImport.prompt=Veldu tenglaskrá á OPML sniði, eða áskriftarskrá fyrir fréttaveitur:
+bookmarksImport.prompt=Veldu tenglaskr� � OPML sni�i, e�a �skriftarskr� fyrir fr�ttaveitur:
 
 # ------------------------------------------------------ Calendars
 
-calendar.summary=Færsludagatal bloggs
+calendar.summary=F�rsludagatal bloggs
 calendar.prev=Fyrri
-calendar.today=Í dag
-calendar.next=Næsti
+calendar.today=� dag
+calendar.next=N�sti
 
 # ---------------------------------------------------------- CategoryForm.jsp
 
 categoryForm.name=Nafn
-categoryForm.description=Lýsing
+categoryForm.description=L�sing
 categoryForm.image=mynd
 categoryForm.save=Vista
-categoryForm.cancel=Hætta við
+categoryForm.cancel=H�tta vi�
 categoryForm.editCategory=Breyta flokki
-categoryForm.addCategory=Bæta við flokki
+categoryForm.addCategory=B�ta vi� flokki
 categoryForm.correctCategory=Laga flokk
 
 # ---------------------------------------------------------- CategoriesForm.jsp
 
 categoriesForm.name=Titill
-categoriesForm.description=Lýsing
+categoriesForm.description=L�sing
 categoriesForm.edit=Breyta
 categoriesForm.root=root
-categoriesForm.addCategory=Nýr flokkur
+categoriesForm.addCategory=N�r flokkur
 categoriesForm.checkAll=Velja allt
 categoriesForm.checkNone=Velja ekkert
-categoriesForm.delete=Eyða
-categoriesForm.move=Færa
-categoriesForm.path=Slóð
+categoriesForm.delete=Ey�a
+categoriesForm.move=F�ra
+categoriesForm.path=Sl��
 categoriesForm.parent=Flokkur
-categoriesForm.remove=Eyða
+categoriesForm.remove=Ey�a
 
 # ------------------------------------------------------- CategoryDeleteOK.jsp
 
-categoryDeleteOK.removeCategory=Eyða bloggflokki
-categoryDeleteOK.warningCatInUse=ATHUGIÐ: Þessi flokkur er í notkun!
-categoryDeleteOK.youMustMoveEntries=Þú verður að færa færslurnar í flokknum í annan flokk, notaðu fellilistann til að velja í hvaða flokk þær eiga að fara.</p>
-categoryDeleteOK.moveToWhere=Færa færslur í flokkinn:
-categoryDeleteOK.noEntriesInCat=Það eru engar færslur í þessum flokki.
-categoryDeleteOK.areYouSure=Ertu viss um að þú viljir eyða flokknum?
+categoryDeleteOK.removeCategory=Ey�a bloggflokki
+categoryDeleteOK.warningCatInUse=ATHUGI�: �essi flokkur er � notkun!
+categoryDeleteOK.youMustMoveEntries=�� ver�ur a� f�ra f�rslurnar � flokknum � annan flokk, nota�u fellilistann til a� velja � hva�a flokk ��r eiga a� fara.</p>
+categoryDeleteOK.moveToWhere=F�ra f�rslur � flokkinn:
+categoryDeleteOK.noEntriesInCat=�a� eru engar f�rslur � �essum flokki.
+categoryDeleteOK.areYouSure=Ertu viss um a� �� viljir ey�a flokknum?
 
 # ------------------------------------------------------------- comments.jsp
 
 comments.title=Athugasemd
 comments.header=Senda athugasemd
 comments.name=Nafn:
-comments.email=Tölvupóstur:
-comments.url=Heimasíða:
-comments.rememberInfo=Muna þessar upplýsingar?
+comments.email=T�lvup�stur:
+comments.url=Heimas��a:
+comments.rememberInfo=Muna �essar uppl�singar?
 comments.header2=Athugasemdir:
 comments.htmlsyntax=HTML:
-comments.htmldisabled=Óvirkt
+comments.htmldisabled=�virkt
 comments.htmlenabled=Virkt
-comments.preview=FORSKOÐA
+comments.preview=FORSKO�A
 comments.post=SENDA
-comments.cancel=HÆTTA VIÐ
-comments.please=Skrifaðu athugasemd.
-comments.disabled=Athugasemdir eru ekki leyfðar.
+comments.cancel=H�TTA VI�
+comments.please=Skrifa�u athugasemd.
+comments.disabled=Athugasemdir eru ekki leyf�ar.
 
-comments.mathAuthenticatorQuestion=Vinsamlegast leystu þessa einföldu stærðfræðiþraut.
+comments.mathAuthenticatorQuestion=Vinsamlegast leystu �essa einf�ldu st�r�fr��i�raut.
 error.commentAuthFailed=Comment authentication failed!
 
 # ------------------------------------------------------------- comments-preview.jsp
 
 comments.preview.title=Athugasemd
-comments.preview=FORSKOÐA
+comments.preview=FORSKO�A
 comments.preview.edit=Breyta athugasemd
 
 # ------------------------------------------------------------- comments-display.jsp
 
 comments.postedBy=Innsent af
-comments.at=þann
+comments.at=�ann
 
 # --------------------------------------------------------- Configuration
 
-configForm.title=Uppsetning á Roller
+configForm.title=Uppsetning � Roller
 
 configForm.siteSettings=Blogg uppsetning
-configForm.siteName=Titill bloggs (fyrir aðal RSS veituna)
-configForm.siteDescription=Lýsing bloggs (fyrir aðal RSS veituna)
-configForm.siteAdminEmail=Tölvupóstfang vefstjóra
-configForm.absoluteUrl=Full slóð (ef þarf)
+configForm.siteName=Titill bloggs (fyrir a�al RSS veituna)
+configForm.siteDescription=L�sing bloggs (fyrir a�al RSS veituna)
+configForm.siteAdminEmail=T�lvup�stfang vefstj�ra
+configForm.absoluteUrl=Full sl�� (ef �arf)
 configForm.enableLinkback=Virkja Linkback extraction?
-configForm.searchIndexDir=Leitarorðaskráasafn<br />(notið ${user.home} svo kerfisupplýsingar séu notaðar)
+configForm.searchIndexDir=Leitaror�askr�asafn<br />(noti� ${user.home} svo kerfisuppl�singar s�u nota�ar)
 
 configForm.userSettings=Notendastillingar
-configForm.allowNewUsers=Leyfa nýja notendur?
-configForm.adminUsers=Stýrinotendur
-configForm.encryptPasswords=Dulkóða lykilorð?
-configForm.algorithm=Dulkóðunar algrími
-configForm.newUserThemes=Ný stílsnið
-configForm.editorPages=Ritilsíður
-configForm.autoformatComments=Athugasemdir sniðnar sjálfvirkt?
-configForm.escapeCommentHtml=Banna HTML í athugasemdum?
-configForm.emailComments=Athugasemdir í tölvupósti?
-
-configForm.fileUploadSettings=Stillingar fyrir skráasendingar
-configForm.enableFileUploads=Leyfa skráasendingar?
-configForm.allowedExtensions=Leyfðar skráategundir
-configForm.forbiddenExtensions=Bannaðar skráategundir
-configForm.maxFileSize=Hámarksstærð skráar (MB)
-configForm.maxDirSize=Hámarksstærð skráasafns (MB)
-configForm.uploadDir=Skráasafn fyrir sendar skrár
-configForm.uploadPath=Slóð fyrir sendar skrár
+configForm.allowNewUsers=Leyfa n�ja notendur?
+configForm.adminUsers=St�rinotendur
+configForm.encryptPasswords=Dulk��a lykilor�?
+configForm.algorithm=Dulk��unar algr�mi
+configForm.newUserThemes=N� st�lsni�
+configForm.editorPages=Ritils��ur
+configForm.autoformatComments=Athugasemdir sni�nar sj�lfvirkt?
+configForm.escapeCommentHtml=Banna HTML � athugasemdum?
+configForm.emailComments=Athugasemdir � t�lvup�sti?
+
+configForm.fileUploadSettings=Stillingar fyrir skr�asendingar
+configForm.enableFileUploads=Leyfa skr�asendingar?
+configForm.allowedExtensions=Leyf�ar skr�ategundir
+configForm.forbiddenExtensions=Banna�ar skr�ategundir
+configForm.maxFileSize=H�marksst�r� skr�ar (MB)
+configForm.maxDirSize=H�marksst�r� skr�asafns (MB)
+configForm.uploadDir=Skr�asafn fyrir sendar skr�r
+configForm.uploadPath=Sl�� fyrir sendar skr�r
 
 configForm.rssAggregatorSettings=RSS Aggregator Stillingar
 configForm.enableRssAggregator=Virkja RSS Aggregator?
-configForm.cacheIncomingRss=Geyma RSS veitur í flýtiminni?
-configForm.rssNewsfeedCacheTime=Tími sem geyma skal RSS veitur (sekúndur)
+configForm.cacheIncomingRss=Geyma RSS veitur � fl�timinni?
+configForm.rssNewsfeedCacheTime=T�mi sem geyma skal RSS veitur (sek�ndur)
 
-configForm.debuggingSettings=Aflúsunarstillingar
-configForm.enableMemoryDebugging=Virkja minnisaflúsun?
+configForm.debuggingSettings=Afl�sunarstillingar
+configForm.enableMemoryDebugging=Virkja minnisafl�sun?
 
 configForm.save=Vista
-configForm.rebuildIndex=Endurbyggja leitarorðaskrá (fyrir alla notendur)
+configForm.rebuildIndex=Endurbyggja leitaror�askr� (fyrir alla notendur)
 
-configForm.saved=Stillingar vistaðar
+configForm.saved=Stillingar vista�ar
 
 #---------------------------------------------------------- Error messages 
 
-error.add.blogcat=Villa við að bæta við flokki
-error.add.blogentry=Villa við að bæta við færslu
-error.add.bookmark=Villa við að bæta við tengli
-error.add.folder=Villa við að bæta við skráasafni
-error.add.newsfeed=Villa við að bæta við fréttaveitu
-error.add.user.userNameInUse=Þetta notandanafn er frátekið.
-error.add.user.missingUserName=Þú verður að velja notandanafn.
-error.add.user.badUserName=Ógilt notandanafn (má ekki innihalda sérstafi).
-error.add.user.missingPassword=Þú verður að velja lykilorð.
-error.add.user.missingEmailAddress=Þú verður að tilgreina gilt tölvupóstfang.
-
-error.edit.blogcat=Villa við að birta breytingasíðu fyrir flokka
-error.edit.blogentry=Villa við að birta vefritil
-error.edit.bookmark=Villa við að birta breytingasíðu fyrir tengla
-error.edit.comment=Villa við að birta athugasemdasíðu {0}
-error.edit.folder=Villa við að birta breytingasíðu fyrir tenglasafn
-error.edit.newsfeed=Villa við að birta breytingasíðu fyrir fréttaveitu
-
-error.editall.blogcat=Villa við að birta breytingasíðu fyrir flokka
-error.editall.folder=Villa við að birta breytingasíðu fyrir tengla
-
-error.upload.dirmax=Þú mátt ekki fara yfir hámarksstærð skráarsafns: {0} MB.
-error.upload.disabled=Skráarsendingar eru ekki leyfðar
-error.upload.file=Get ekki skrifað skrá
-error.upload.filemax=Skráin er stærri en leyfilegt hámark: {0} MB
-error.upload.forbiddenFile=Þú getur aðeins sent skrár með endinguna {0}
-
-error.general=VILLA: Ómeðhöndlað frávik [{0}] hefur verið skráð.
-
-error.importing.bookmarks=Villa við að flytja inn tengla
-error.importing.entries=Gat ekki lesið færslur úr skránni
-
-error.move.bookmarks=Villa við að eyða tenglum
-
-error.password.mismatch=Rangt notandanafn og/eða lykilorð
-
-error.preview.comment=Villa við að forskoða athugasemd {0}
-
-error.remove.blogcat=Villa við að eyða flokki
-error.remove.blogentry=Villa við að eyða færslu
-error.remove.bookmark=Villa við að eyða tengli
-error.remove.bookmarks=Villa við að eyða tenglum
-error.remove.folder=Villa við að eyða tenglahópi
-error.remove.newsfeed=Villa við að eyða fréttaveitu
-
-error.removeok.blogcat=Villa við að birta síðu til flokkaeyðingar
-error.removeok.blogentry=Villa við að birta síðu til færslueyðingar
-error.removeok.bookmark=Villa við að birta síðu til tenglaeyðingar
-error.removeok.folder=Villa við að birta síðu til tenglasafnaeyðingar
-error.removeok.newsfeed=Villa við að birta síðu til fréttaveitueyðingar
-
-error.update.blogcat=Villa við flokkauppfærslu
-error.update.blogentry=Villa við færsluuppfærslu
-error.update.bookmark=Villa við tenglauppfærslu
-error.update.comment=Villa við að vista athugasemd {0}
-error.update.folder=Villa við tenglahópsuppfærslu
-error.update.newsfeed=Villa við fréttaveituuppfærslu
-error.update.rollerConfig=Villa við uppfærslu á RollerConfig
+error.add.blogcat=Villa vi� a� b�ta vi� flokki
+error.add.blogentry=Villa vi� a� b�ta vi� f�rslu
+error.add.bookmark=Villa vi� a� b�ta vi� tengli
+error.add.folder=Villa vi� a� b�ta vi� skr�asafni
+error.add.newsfeed=Villa vi� a� b�ta vi� fr�ttaveitu
+error.add.user.userNameInUse=�etta notandanafn er fr�teki�.
+error.add.user.missingUserName=�� ver�ur a� velja notandanafn.
+error.add.user.badUserName=�gilt notandanafn (m� ekki innihalda s�rstafi).
+error.add.user.missingPassword=�� ver�ur a� velja lykilor�.
+error.add.user.missingEmailAddress=�� ver�ur a� tilgreina gilt t�lvup�stfang.
+
+error.edit.blogcat=Villa vi� a� birta breytingas��u fyrir flokka
+error.edit.blogentry=Villa vi� a� birta vefritil
+error.edit.bookmark=Villa vi� a� birta breytingas��u fyrir tengla
+error.edit.comment=Villa vi� a� birta athugasemdas��u {0}
+error.edit.folder=Villa vi� a� birta breytingas��u fyrir tenglasafn
+error.edit.newsfeed=Villa vi� a� birta breytingas��u fyrir fr�ttaveitu
+
+error.editall.blogcat=Villa vi� a� birta breytingas��u fyrir flokka
+error.editall.folder=Villa vi� a� birta breytingas��u fyrir tengla
+
+error.upload.dirmax=�� m�tt ekki fara yfir h�marksst�r� skr�arsafns: {0} MB.
+error.upload.disabled=Skr�arsendingar eru ekki leyf�ar
+error.upload.file=Get ekki skrifa� skr�
+error.upload.filemax=Skr�in er st�rri en leyfilegt h�mark: {0} MB
+error.upload.forbiddenFile=�� getur a�eins sent skr�r me� endinguna {0}
+
+error.general=VILLA: �me�h�ndla� fr�vik [{0}] hefur veri� skr��.
+
+error.importing.bookmarks=Villa vi� a� flytja inn tengla
+error.importing.entries=Gat ekki lesi� f�rslur �r skr�nni
+
+error.move.bookmarks=Villa vi� a� ey�a tenglum
+
+error.password.mismatch=Rangt notandanafn og/e�a lykilor�
+
+error.preview.comment=Villa vi� a� forsko�a athugasemd {0}
+
+error.remove.blogcat=Villa vi� a� ey�a flokki
+error.remove.blogentry=Villa vi� a� ey�a f�rslu
+error.remove.bookmark=Villa vi� a� ey�a tengli
+error.remove.bookmarks=Villa vi� a� ey�a tenglum
+error.remove.folder=Villa vi� a� ey�a tenglah�pi
+error.remove.newsfeed=Villa vi� a� ey�a fr�ttaveitu
+
+error.removeok.blogcat=Villa vi� a� birta s��u til flokkaey�ingar
+error.removeok.blogentry=Villa vi� a� birta s��u til f�rsluey�ingar
+error.removeok.bookmark=Villa vi� a� birta s��u til tenglaey�ingar
+error.removeok.folder=Villa vi� a� birta s��u til tenglasafnaey�ingar
+error.removeok.newsfeed=Villa vi� a� birta s��u til fr�ttaveituey�ingar
+
+error.update.blogcat=Villa vi� flokkauppf�rslu
+error.update.blogentry=Villa vi� f�rsluuppf�rslu
+error.update.bookmark=Villa vi� tenglauppf�rslu
+error.update.comment=Villa vi� a� vista athugasemd {0}
+error.update.folder=Villa vi� tenglah�psuppf�rslu
+error.update.newsfeed=Villa vi� fr�ttaveituuppf�rslu
+error.update.rollerConfig=Villa vi� uppf�rslu � RollerConfig
 
-error.bake.weblog=Villa við bloggbakstur
+error.bake.weblog=Villa vi� bloggbakstur
 
-error.trackback=Villa við að senda tilvísun. Möguleg ástæða: röng tilvísunarslóð. {0}
+error.trackback=Villa vi� a� senda tilv�sun. M�guleg �st��a: r�ng tilv�sunarsl��. {0}
 
 # ------------------------------------------------------------ Footer
 
 footer.reportIssue=Tilkynna um villu
-footer.userGuide=Notkunarleiðbeiningar
-footer.macros=Fjölvar
-footer.mailingLists=Póstlistar
+footer.userGuide=Notkunarlei�beiningar
+footer.macros=Fj�lvar
+footer.mailingLists=P�stlistar
 
 # ------------------------------------------------------------ Login
 
 loginPage.userName=Notandanafn
-loginPage.password=Lykilorð
-loginPage.rememberMe=Muna eftir mér
-loginPage.login=Skrá inn
+loginPage.password=Lykilor�
+loginPage.rememberMe=Muna eftir m�r
+loginPage.login=Skr� inn
 loginPage.reset=Upphafsstilla
 
 # ------------------------------------------------------------ Main page
 
-mainPage.recentEntries=Nýjar færslur
-mainPage.pinnedEntries=Útvaldar færslur
+mainPage.recentEntries=N�jar f�rslur
+mainPage.pinnedEntries=�tvaldar f�rslur
 mainPage.category=Flokkur
 mainPage.read=Lesa
-mainPage.hotWeblogs=Vinsæl blogg
-mainPage.searchWeblogs=Leita í bloggum
+mainPage.hotWeblogs=Vins�l blogg
+mainPage.searchWeblogs=Leita � bloggum
 mainPage.searchButton=Leita
-mainPage.hits=heimsóknir
+mainPage.hits=heims�knir
 mainPage.link=Tengill
-mainPage.rss.tip=RSS veita fyrir öll blogg
+mainPage.rss.tip=RSS veita fyrir �ll blogg
 mainPage.loggedInAs=Notandi:
 
 # ------------------------------------------------------------ Maintenance
 
-maintenance.title=Síðuviðhald
-maintenance.prompt.index=Endurbyggja leitarorðaskrá fyrir Roller síðu
-maintenance.button.index=Endurbyggja leitarorðaskrá
-maintenance.prompt.flush=Hreinsa flýtiminni bloggsíðu.
-maintenance.button.flush=Hreinsa flýtiminni
-maintenance.message.indexed=Leitarorðarskrá verður endurbyggð
-maintenance.message.flushed=Hreinsun flýtiminnis lokið
+maintenance.title=S��uvi�hald
+maintenance.prompt.index=Endurbyggja leitaror�askr� fyrir Roller s��u
+maintenance.button.index=Endurbyggja leitaror�askr�
+maintenance.prompt.flush=Hreinsa fl�timinni bloggs��u.
+maintenance.button.flush=Hreinsa fl�timinni
+maintenance.message.indexed=Leitaror�arskr� ver�ur endurbygg�
+maintenance.message.flushed=Hreinsun fl�timinnis loki�
 
 # ------------------------------------------------------------ New user registation
 
-newUser.addNewUser=Nýr notandi
+newUser.addNewUser=N�r notandi
 newuser.loginName=Notandanafn
 newuser.fullName=Fullt nafn
-newuser.password=Lykilorð
-newuser.eMailAddress=Tölvupóstfang
-newuser.theme=Stílsnið
-newuser.locale=Staðsetning
-newuser.timeZone=Tímabelti
-newUser.created=Nýr notandi búinn til. Annan?
-newUser.error.mismatchedPasswords=VILLA: lykilorðin eru ekki eins
+newuser.password=Lykilor�
+newuser.eMailAddress=T�lvup�stfang
+newuser.theme=St�lsni�
+newuser.locale=Sta�setning
+newuser.timeZone=T�mabelti
+newUser.created=N�r notandi b�inn til. Annan?
+newUser.error.mismatchedPasswords=VILLA: lykilor�in eru ekki eins
 
 # ------------------------------------------------------------ Navigation Bar
 
 navigationBar.header=Valmynd
-navigationBar.main=Aðalsíða
-navigationBar.newEntry=Ný færsla
+navigationBar.main=A�als��a
+navigationBar.newEntry=N� f�rsla
 navigationBar.settings=Stillingar
-navigationBar.logout=Útskrá
-navigationBar.login=Innskrá
-navigationBar.register=Nýr notandi
+navigationBar.logout=�tskr�
+navigationBar.login=Innskr�
+navigationBar.register=N�r notandi
 
 # ------------------------------------------------------------ Page management
 
-pagesForm.title=Sniðmát
+pagesForm.title=Sni�m�t
 pagesForm.name=Titill
 pagesForm.link=Tengill
-pagesForm.description=Lýsing
+pagesForm.description=L�sing
 pagesForm.edit=Breyta
-pagesForm.remove=Eyða
-pagesForm.hiddenNote=ATH: Síður sem byrja á '_' eru faldar. Þær birtast ekki á valmyndinni.
-pagesForm.addNewPage=Ný síða
-pagesForm.addNewPage.success=<strong>{0}</strong> bætt við.
-pagesForm.add=Bæta við
-pagesForm.emptyPage=Tóm síða...
+pagesForm.remove=Ey�a
+pagesForm.hiddenNote=ATH: S��ur sem byrja � '_' eru faldar. ��r birtast ekki � valmyndinni.
+pagesForm.addNewPage=N� s��a
+pagesForm.addNewPage.success=<strong>{0}</strong> b�tt vi�.
+pagesForm.add=B�ta vi�
+pagesForm.emptyPage=T�m s��a...
 
 
 # ------------------------------------------------------------ Page edit
 
-pageForm.editPage=Breyta síðu
+pageForm.editPage=Breyta s��u
 pageForm.name=Titill
 pageForm.link=Tengill
-pageForm.description=Lýsing
-pageForm.template=Sniðmát
+pageForm.description=L�sing
+pageForm.template=Sni�m�t
 pageForm.save=Vista
-pageForm.save.success=Síða uppfærð.
+pageForm.save.success=S��a uppf�r�.
 
 
 # ------------------------------------------------------------ FolderForm.jsp
 
 folderForm.name=Titill
 folderForm.save=Vista
-folderForm.cancel=Hætta við
-folderForm.description=Lýsing
-folderForm.addFolder=Nýtt tenglasafn
+folderForm.cancel=H�tta vi�
+folderForm.description=L�sing
+folderForm.addFolder=N�tt tenglasafn
 folderForm.editFolder=Breyta tenglasafni
-folderForm.correctFolder=Leiðrétta breytingar á tenglasafni
+folderForm.correctFolder=Lei�r�tta breytingar � tenglasafni
 
-folderForm.save.exception=VILLA við að vista skráarsafn, ef til vill er nafnið ekki einkvæmt? Villuskilaboðin eru: {0}
+folderForm.save.exception=VILLA vi� a� vista skr�arsafn, ef til vill er nafni� ekki einkv�mt? Villuskilabo�in eru: {0}
 
 # ------------------------------------------------------------- referers.jsp
 
-referers.todaysReferers=Heimsóknir í dag
-referers.url=Hvaðan?
-referers.hits=Fjöldi heimsókna
-referers.deleteSelected=Eyða völdum
+referers.todaysReferers=Heims�knir � dag
+referers.url=Hva�an?
+referers.hits=Fj�ldi heims�kna
+referers.deleteSelected=Ey�a v�ldum
 
 referers.hitCounters=Teljarar
 referers.reset=Endurstilla teljara
 
-referers.deletedReferers=Eyddi upplýsingum
-referers.noReferersSpecified=Þú tiltókst ekkert til að eyða
+referers.deletedReferers=Eyddi uppl�singum
+referers.noReferersSpecified=�� tilt�kst ekkert til a� ey�a
 
 # ------------------------------------------------------------- Search Form
 
 searchForm.button=Leita
-searchForm.alert=Skrifaðu leitarstreng.
+searchForm.alert=Skrifa�u leitarstreng.
 
 # ------------------------------------------------------------- Tabbed Menu
 
-tabbedmenu.main=Aðalvalmynd
+tabbedmenu.main=A�alvalmynd
 tabbedmenu.weblog=Blogg
-tabbedmenu.weblog.newEntry=Ný færsla
-tabbedmenu.weblog.archives=Gamlar færslur
+tabbedmenu.weblog.newEntry=N� f�rsla
+tabbedmenu.weblog.archives=Gamlar f�rslur
 tabbedmenu.weblog.categories=Flokkar
-tabbedmenu.weblog.referers=Heimsóknir
-tabbedmenu.weblog.export=Flytja út
+tabbedmenu.weblog.referers=Heims�knir
+tabbedmenu.weblog.export=Flytja �t
 tabbedmenu.weblog.import=Flytja inn
-tabbedmenu.weblog.flushCache=Hreinsa flýtiminni
+tabbedmenu.weblog.flushCache=Hreinsa fl�timinni
 tabbedmenu.bookmarks=Tenglar
-tabbedmenu.bookmarks.allFolders=Öll skráasöfn
+tabbedmenu.bookmarks.allFolders=�ll skr�as�fn
 tabbedmenu.bookmarks.import=Flytja inn
-tabbedmenu.website=Vefsíða
+tabbedmenu.website=Vefs��a
 tabbedmenu.website.settings=Stillingar
-tabbedmenu.website.themes=Stílsnið
-tabbedmenu.website.pages=Sniðmát
-tabbedmenu.website.files=Skrár
+tabbedmenu.website.themes=St�lsni�
+tabbedmenu.website.pages=Sni�m�t
+tabbedmenu.website.files=Skr�r
 tabbedmenu.website.user=Notandi
-tabbedmenu.website.maintenance=Viðhald
-tabbedmenu.admin=Kerfisstjóri
+tabbedmenu.website.maintenance=Vi�hald
+tabbedmenu.admin=Kerfisstj�ri
 tabbedmenu.admin.config=Stillingar
 tabbedmenu.admin.userAdmin=Notendayfirlit
-tabbedmenu.admin.createUser=Nýr notandi
+tabbedmenu.admin.createUser=N�r notandi
 
 # ------------------------------------------------------------- Theme
 
-themeEditor.title=Stílsnið
-themeEditor.selectTheme=Veldu nýtt stílsnið til að prófa
-themeEditor.preview=Prófa
-themeEditor.yourThemeIsShownBelow=Stílsniðið þitt sést hér fyrir neðan.
-themeEditor.themeBelowIsCalled=Stílsniðið heitir:
-themeEditor.savePrompt=Viltu vista breytingarnar sem nýtt stílsnið?
-themeEditor.saveWarning=ATH: þessi aðgerð gæti eytt öllum breytingum sem þú hefur gert á sniðmáti síðu þinnar.
+themeEditor.title=St�lsni�
+themeEditor.selectTheme=Veldu n�tt st�lsni� til a� pr�fa
+themeEditor.preview=Pr�fa
+themeEditor.yourThemeIsShownBelow=St�lsni�i� �itt s�st h�r fyrir ne�an.
+themeEditor.themeBelowIsCalled=St�lsni�i� heitir:
+themeEditor.savePrompt=Viltu vista breytingarnar sem n�tt st�lsni�?
+themeEditor.saveWarning=ATH: �essi a�ger� g�ti eytt �llum breytingum sem �� hefur gert � sni�m�ti s��u �innar.
 themeEditor.save=Vista
-themeEditor.cancel=Hætta við
+themeEditor.cancel=H�tta vi�
 
 # ------------------------------------------------------------- Uploads
 
-uploadFiles.title=Skráasendingar
-uploadFiles.manageFiles=Skráaumsjón
-uploadFiles.uploadDisabled=Ekki er hægt að senda skrár.
-uploadFiles.exceededQuota=Þú ert búin(n) með skráakvótann þinn.
+uploadFiles.title=Skr�asendingar
+uploadFiles.manageFiles=Skr�aumsj�n
+uploadFiles.uploadDisabled=Ekki er h�gt a� senda skr�r.
+uploadFiles.exceededQuota=�� ert b�in(n) me� skr�akv�tann �inn.
 uploadFiles.upload=Senda
-uploadFiles.quotaNote=Skrárnar sem þú sendir mega í mesta lagi vera {0} MB, og allar skrárnar mega taka {1} MB í mesta lagi.
-uploadFiles.uploadPrompt=Veldu skrá til að senda:
-uploadFiles.noFiles=Engar skrár fundust.
+uploadFiles.quotaNote=Skr�rnar sem �� sendir mega � mesta lagi vera {0} MB, og allar skr�rnar mega taka {1} MB � mesta lagi.
+uploadFiles.uploadPrompt=Veldu skr� til a� senda:
+uploadFiles.noFiles=Engar skr�r fundust.
 
-uploadFiles.button.delete=Eyða völdu
+uploadFiles.button.delete=Ey�a v�ldu
 
 # ------------------------------------------------------------- User admin
 
-userAdmin.searchUserTitle=Finna notanda til að breyta
+userAdmin.searchUserTitle=Finna notanda til a� breyta
 userAdmin.editUserTitle=Breyta notanda [{0}]
 
-userAdmin.cookieLogin=Ekki er hægt að breyta lykilorði þegar <strong>'mundu mig'</strong> er virkt.  Vinsamlegast skráðu þig út og aftur inn til að breyta lykilorðinu.
+userAdmin.cookieLogin=Ekki er h�gt a� breyta lykilor�i �egar <strong>'mundu mig'</strong> er virkt.  Vinsamlegast skr��u �ig �t og aftur inn til a� breyta lykilor�inu.
 userAdmin.editUser=Breyta notanda
 userAdmin.userSettings=Notandastillingar
-userAdmin.delete=Eyða
-userAdmin.deleted=Notandanum hefur verið eytt
+userAdmin.delete=Ey�a
+userAdmin.deleted=Notandanum hefur veri� eytt
 userAdmin.fullname=Fullt nafn
 userAdmin.enabled=Virkt
-userAdmin.enterUserName=Sláðu inn notandanafn þess sem á að breyta
+userAdmin.enterUserName=Sl��u inn notandanafn �ess sem � a� breyta
 userAdmin.invalidNewUserName=Notandi finnst ekki
 userAdmin.name=Nafn
-userAdmin.password=Lykilorð
-userAdmin.passwordConfirm=Lykilorð (staðfesta)
-userAdmin.email=Tölvupóstfang
-userAdmin.rebuildIndex=Endurbyggja leitarorðaskrá notanda
+userAdmin.password=Lykilor�
+userAdmin.passwordConfirm=Lykilor� (sta�festa)
+userAdmin.email=T�lvup�stfang
+userAdmin.rebuildIndex=Endurbyggja leitaror�askr� notanda
 userAdmin.edit=Breyta
 userAdmin.save=Vista
-userAdmin.saved=Notendastillingar vistaðar
+userAdmin.saved=Notendastillingar vista�ar
 userAdmin.title=Notendayfirlit
-userAdmin.userAdmin=Kerfisstjóri
-userAdmin.warning=ATH: Þetta er ekki hægt að afturkalla !!
+userAdmin.userAdmin=Kerfisstj�ri
+userAdmin.warning=ATH: �etta er ekki h�gt a� afturkalla !!
 
 # ------------------------------------------------------------- User settings
 
 userSettings.userSettings=Notandastillingar
 userSettings.username=Notandanafn
 userSettings.fullname=Fullt nafn
-userSettings.password=Lykilorð
-userSettings.passwordConfirm=Lykilorð (staðfesta)
-userSettings.email=Tölvupóstfang
-userSettings.locale=Staðsetning
-userSettings.timeZone=Tímabelti
+userSettings.password=Lykilor�
+userSettings.passwordConfirm=Lykilor� (sta�festa)
+userSettings.email=T�lvup�stfang
+userSettings.locale=Sta�setning
+userSettings.timeZone=T�mabelti
 userSettings.save=Vista
-userSettings.cookieLogin=Ekki er hægt að breyta lykilorði þegar <strong>'mundu mig'</strong> er virkt.  Vinsamlegast skráðu þig út og aftur inn til að breyta lykilorðinu.
-userSettings.passwordResetError=Lykilorðið var ekki uppfært. Voru báðir reitir eins?
-userSettings.saved=Notandastillingar vistaðar.
-userSettings.needPasswordTwice=Lykilorðið verður að slá inn tvisvar til staðfestingar.
+userSettings.cookieLogin=Ekki er h�gt a� breyta lykilor�i �egar <strong>'mundu mig'</strong> er virkt.  Vinsamlegast skr��u �ig �t og aftur inn til a� breyta lykilor�inu.
+userSettings.passwordResetError=Lykilor�i� var ekki uppf�rt. Voru b��ir reitir eins?
+userSettings.saved=Notandastillingar vista�ar.
+userSettings.needPasswordTwice=Lykilor�i� ver�ur a� sl� inn tvisvar til sta�festingar.
 
 # ------------------------------------------------------------- Weblog edit
 
-weblogEdit.actionCol=Aðgerðir
-weblogEdit.autoformat=Sjálfsníða
-weblogEdit.calendarTitle=Gamlar færslur
+weblogEdit.actionCol=A�ger�ir
+weblogEdit.autoformat=Sj�lfsn��a
+weblogEdit.calendarTitle=Gamlar f�rslur
 weblogEdit.category=Flokkur
-weblogEdit.cancelSpelling=Slökkva á púka
-weblogEdit.changesSaved=Breytingar vistaðar
-weblogEdit.check=Prentvillupúki
+weblogEdit.cancelSpelling=Sl�kkva � p�ka
+weblogEdit.changesSaved=Breytingar vista�ar
+weblogEdit.check=Prentvillup�ki
 weblogEdit.comments=Athugasemdir
-weblogEdit.correctSpelling=Senda leiðréttingar 	
-weblogEdit.entryCol=Færslur
+weblogEdit.correctSpelling=Senda lei�r�ttingar 	
+weblogEdit.entryCol=F�rslur
 weblogEdit.edit=Breyta
-weblogEdit.returnToEditMode=Aftur í breytingaham
-weblogEdit.entryRemoved=Færslu eytt
-weblogEdit.entrySaved=Færsla vistuð
+weblogEdit.returnToEditMode=Aftur � breytingaham
+weblogEdit.entryRemoved=F�rslu eytt
+weblogEdit.entrySaved=F�rsla vistu�
 weblogEdit.date=Dagsetning
 weblogEdit.draft=Uppkast
-weblogEdit.draftEntries=Nýleg uppköst
-weblogEdit.deleteEntry=Eyða færslu
-weblogEdit.formatEntryWith=Renna yfir færslu með:
+weblogEdit.draftEntries=N�leg uppk�st
+weblogEdit.deleteEntry=Ey�a f�rslu
+weblogEdit.formatEntryWith=Renna yfir f�rslu me�:
 weblogEdit.hours=Klukkustundir
 weblogEdit.link=Tengill
-weblogEdit.minutes=Mínútur
-weblogEdit.noUpdateTime=Ekki uppfært
-weblogEdit.publishedEntries=Síðustu færslur
-weblogEdit.previewMode=Forskoða
-weblogEdit.post=Senda á blogg
+weblogEdit.minutes=M�n�tur
+weblogEdit.noUpdateTime=Ekki uppf�rt
+weblogEdit.publishedEntries=S��ustu f�rslur
+weblogEdit.previewMode=Forsko�a
+weblogEdit.post=Senda � blogg
 weblogEdit.ping=Pinga&nbsp;Weblogs.com
 weblogEdit.permaLink=Fastatengill
 weblogEdit.published=Sent
 weblogEdit.pubTime=Sent&nbsp;klukkan&nbsp;
-weblogEdit.recentEntries=Síðustu færslur
-weblogEdit.remove=Eyða
+weblogEdit.recentEntries=S��ustu f�rslur
+weblogEdit.remove=Ey�a
 weblogEdit.save=Vista sem uppkast
-weblogEdit.seconds=Sekúndur
-weblogEdit.status=Staða
-weblogEdit.spellMode=Púki
+weblogEdit.seconds=Sek�ndur
+weblogEdit.status=Sta�a
+weblogEdit.spellMode=P�ki
 weblogEdit.pageTitle=Breyta bloggi
 weblogEdit.title=Titill
-weblogEdit.unsaved=Ekki vistað
-weblogEdit.updateTime=Síðast uppfært
+weblogEdit.unsaved=Ekki vista�
+weblogEdit.updateTime=S��ast uppf�rt
 
 weblogEdit.allowComments=Leyfa athugasemdir
-weblogEdit.commentDays=í
-weblogEdit.unlimitedCommentDays=ótakmarkaðan dagafjölda
+weblogEdit.commentDays=�
+weblogEdit.unlimitedCommentDays=�takmarka�an dagafj�lda
 weblogEdit.days1=1 dag
 weblogEdit.days2=2 daga
 weblogEdit.days3=3 daga
@@ -544,209 +544,209 @@ weblogEdit.days30=30 daga
 weblogEdit.days60=60 daga
 weblogEdit.days90=90 daga
 
-weblogEdit.pluginsToApply=Viðbætur
-weblogEdit.miscSettings=Ýmsar stillingar
+weblogEdit.pluginsToApply=Vi�b�tur
+weblogEdit.miscSettings=�msar stillingar
 
-weblogEdit.rightToLeft=Texti lesist frá hægri til vinstri
-weblogEdit.pinnedToMain=Festa á forsíðu
+weblogEdit.rightToLeft=Texti lesist fr� h�gri til vinstri
+weblogEdit.pinnedToMain=Festa � fors��u
 
-weblogEdit.trackback=Tilvísun
-weblogEdit.trackbacks=Tilvísanir
-weblogEdit.sendTrackback=Senda tilvísun
-weblogEdit.trackbackUrl=Tilvísunarslóð
-weblogEdit.trackbackResults=<b>Trackback svar (villa 0 þýðir að þetta hafi tekist):</b><br /><br />{0}
+weblogEdit.trackback=Tilv�sun
+weblogEdit.trackbacks=Tilv�sanir
+weblogEdit.sendTrackback=Senda tilv�sun
+weblogEdit.trackbackUrl=Tilv�sunarsl��
+weblogEdit.trackbackResults=<b>Trackback svar (villa 0 ���ir a� �etta hafi tekist):</b><br /><br />{0}
 
 weblogEdit.commentSettings=Stillingar fyrir athugasemdir
-weblogEdit.commentDelete=Eyða
+weblogEdit.commentDelete=Ey�a
 weblogEdit.commentSpam=Sorp
-weblogEdit.comments=Umsjón með athugasemdum
+weblogEdit.comments=Umsj�n me� athugasemdum
 weblogEdit.commenterName=Nafn
-weblogEdit.commenterEmail=Tölvupóstfang
-weblogEdit.commenterUrl=Heimasíða
+weblogEdit.commenterEmail=T�lvup�stfang
+weblogEdit.commenterUrl=Heimas��a
 weblogEdit.comment=Athugasemd
 weblogEdit.comments=Athugasemdir
-weblogEdit.updateComments=Uppfæra athugasemdir
-weblogEdit.noComments=Engar athugasemdir við þessa færslu
-weblogEdit.commentCount=Fjöldi athugasemda: 
+weblogEdit.updateComments=Uppf�ra athugasemdir
+weblogEdit.noComments=Engar athugasemdir vi� �essa f�rslu
+weblogEdit.commentCount=Fj�ldi athugasemda: 
 
 # ------------------------------------------------------------- Weblog Entry Remove 
 
-weblogEntryRemove.removeWeblogEntry=Eyða færslu
-weblogEntryRemove.yes=Já
+weblogEntryRemove.removeWeblogEntry=Ey�a f�rslu
+weblogEntryRemove.yes=J�
 weblogEntryRemove.no=Nei
-weblogEntryRemove.areYouSure=Ertu viss um að þú viljir eyða þessari færslu?
+weblogEntryRemove.areYouSure=Ertu viss um a� �� viljir ey�a �essari f�rslu?
 
 # ------------------------------------------------------------- Weblog Entry Export/Import
-weblogEntryExport.title=Flytja út færslur
+weblogEntryExport.title=Flytja �t f�rslur
 weblogEntryExport.exportSuccess={0} 
 weblogEntryExport.exportFiles={0} 
 weblogEntryImport.importFiles={0}
-weblogEntryImport.title=Flytja inn færslur frá Atom/RSS
-weblogEntryImport.selectXML=Veldu XML skrá sem inniheldur færslur til að flytja inn.
-weblogEntryImport.XMLFile=XML skrá:
+weblogEntryImport.title=Flytja inn f�rslur fr� Atom/RSS
+weblogEntryImport.selectXML=Veldu XML skr� sem inniheldur f�rslur til a� flytja inn.
+weblogEntryImport.XMLFile=XML skr�:
 weblogEntryImport.button.import=Flytja inn
 
 # ------------------------------------------------------------- Weblog Entry Export/Import
 
-weblogEntryQuery.title=Gamlar færslur
+weblogEntryQuery.title=Gamlar f�rslur
 
-weblogEntryQuery.filterByCategory=Sía út eftir flokki
-weblogEntryQuery.filterByPublishTime=Sía út eftir dagsetningu
-weblogEntryQuery.filterByStatus=Sía út eftir stöðu
-weblogEntryQuery.limitResultsReturned=Takmarka fjölda færsla
+weblogEntryQuery.filterByCategory=S�a �t eftir flokki
+weblogEntryQuery.filterByPublishTime=S�a �t eftir dagsetningu
+weblogEntryQuery.filterByStatus=S�a �t eftir st��u
+weblogEntryQuery.limitResultsReturned=Takmarka fj�lda f�rsla
 
-weblogEntryQuery.section.filterYourView=Sía gamlar færslur:
+weblogEntryQuery.section.filterYourView=S�a gamlar f�rslur:
 
-weblogEntryQuery.section.dateRange=Tímabil
+weblogEntryQuery.section.dateRange=T�mabil
 
-weblogEntryQuery.label.startDate=Frá
+weblogEntryQuery.label.startDate=Fr�
 weblogEntryQuery.label.endDate=til
 
-weblogEntryQuery.section.select.entryAttributes=Færslur sem eiga að vera með:
+weblogEntryQuery.section.select.entryAttributes=F�rslur sem eiga a� vera me�:
 
 weblogEntryQuery.label.category=Flokkur
 weblogEntryQuery.label.any=Allir
-weblogEntryQuery.label.status=Staða
-weblogEntryQuery.label.allEntries=Allar færslur
-weblogEntryQuery.label.draftOnly=Bara uppköst
+weblogEntryQuery.label.status=Sta�a
+weblogEntryQuery.label.allEntries=Allar f�rslur
+weblogEntryQuery.label.draftOnly=Bara uppk�st
 weblogEntryQuery.label.publishedOnly=Bara send
 
 weblogEntryQuery.section.format=Format sem skal nota
 
-weblogEntryQuery.label.separateEntries=Aðgreina færslur með
+weblogEntryQuery.label.separateEntries=A�greina f�rslur me�
 weblogEntryQuery.label.day=Dagur
-weblogEntryQuery.label.month=Mánuður
-weblogEntryQuery.label.year=Ár
-weblogEntryQuery.label.exportTo=Flytja út í
+weblogEntryQuery.label.month=M�nu�ur
+weblogEntryQuery.label.year=�r
+weblogEntryQuery.label.exportTo=Flytja �t �
 weblogEntryQuery.label.atom=Atom
 weblogEntryQuery.label.rss=RSS
 
-weblogEntryQuery.label.maxEntries=Hámarksfjöldi færsla
+weblogEntryQuery.label.maxEntries=H�marksfj�ldi f�rsla
 
 weblogEntryQuery.button.query=Leita
-weblogEntryQuery.button.export=Flytja út
+weblogEntryQuery.button.export=Flytja �t
 
 # ------------------------------------------------------------- Weblog Main
 
 weblogMain.search=Leit
 weblogMain.navigation=Valmynd
 weblogMain.links=Tenglar
-weblogMain.language=Tungumál
-weblogMain.referers=Heimsóknir
-weblogMain.archives=Gamlar færslur
-weblogMain.poweredBy=Knúið af
+weblogMain.language=Tungum�l
+weblogMain.referers=Heims�knir
+weblogMain.archives=Gamlar f�rslur
+weblogMain.poweredBy=Kn�i� af
 
 # ------------------------------------------------------------- Website 
 
-websiteSettings.title=Síðustillingar
+websiteSettings.title=S��ustillingar
 websiteSettings.websiteTitle=Titill
-websiteSettings.websiteDescription=Lýsing
-websiteSettings.templateSettings=Sniðmátsstillingar
-websiteSettings.homePage=Síða sem nota á sem heimasíðu
+websiteSettings.websiteDescription=L�sing
+websiteSettings.templateSettings=Sni�m�tsstillingar
+websiteSettings.homePage=S��a sem nota � sem heimas��u
 websiteSettings.editor=Vefritill
 websiteSettings.categories=Flokkar
-websiteSettings.defaultCategory=Sjálfgefinn rótarflokkur.
-websiteSettings.formatting=Snið
+websiteSettings.defaultCategory=Sj�lfgefinn r�tarflokkur.
+websiteSettings.formatting=Sni�
 websiteSettings.allowComments=Leyfa athugasemdir?
-websiteSettings.emailComments=Athugasemdir í tölvupósti?
-websiteSettings.emailFromAddress=Sjálfvirkt <em>frá</em> tölvupóstfang<br />fyrir tilkynningar um athugasemdir
-websiteSettings.autoformat=Sníða nýjar færslur sjálfvirkt
+websiteSettings.emailComments=Athugasemdir � t�lvup�sti?
+websiteSettings.emailFromAddress=Sj�lfvirkt <em>fr�</em> t�lvup�stfang<br />fyrir tilkynningar um athugasemdir
+websiteSettings.autoformat=Sn��a n�jar f�rslur sj�lfvirkt
 websiteSettings.bloggerApi=Blogger API
-websiteSettings.enableBloggerApi=Virkja Blogger API fyrir bloggið þitt?
-websiteSettings.bloggerApiCategory=Flokkur fyrir færslur frá Blogger API 
-websiteSettings.spamPrevention=Sorpvörn
-websiteSettings.ignoreUrls=Hunsa athugasemdir frá síðum sem<br />innihalda einhver þessara<br />orða (aðgreind með kommu)
+websiteSettings.enableBloggerApi=Virkja Blogger API fyrir bloggi� �itt?
+websiteSettings.bloggerApiCategory=Flokkur fyrir f�rslur fr� Blogger API 
+websiteSettings.spamPrevention=Sorpv�rn
+websiteSettings.ignoreUrls=Hunsa athugasemdir fr� s��um sem<br />innihalda einhver �essara<br />or�a (a�greind me� kommu)
 
-websiteSettings.button.update=Uppfæra síðustillingar
-websiteSettings.button.rebuildIndex=Endurbyggja leitarorðaskrá
+websiteSettings.button.update=Uppf�ra s��ustillingar
+websiteSettings.button.rebuildIndex=Endurbyggja leitaror�askr�
 
 # ------------------------------------------------------------ Welcome new user
 
-welcome.title=Velkomin(n) á Roller
-welcome.accountCreated=Nýr notandi búinn til.
-welcome.addressIs=Netfang bloggsins þíns er
-welcome.rssAddressIs=Aðalfréttaveitu slóðin þín er
-welcome.clickHere=Smelltu hér
-welcome.toLoginAndPost=til að logga þig inn og skrifa fyrstu færsluna þína.
+welcome.title=Velkomin(n) � Roller
+welcome.accountCreated=N�r notandi b�inn til.
+welcome.addressIs=Netfang bloggsins ��ns er
+welcome.rssAddressIs=A�alfr�ttaveitu sl��in ��n er
+welcome.clickHere=Smelltu h�r
+welcome.toLoginAndPost=til a� logga �ig inn og skrifa fyrstu f�rsluna ��na.
 
 # ------------------------------------------------------------- Bookmark Macro
 
-macro.bookmark.urlFeed=Slóð á RSS veitu síðunnar
+macro.bookmark.urlFeed=Sl�� � RSS veitu s��unnar
 macro.bookmark.error=Tenglasafn finnst ekki: {0}
 
 # ------------------------------------------------------------- Referer Macro
 
-macro.referer.furtherReading=Til að lesa meira um færslur dagsins í dag:
-macro.referer.todaysHits=Heimsóknir í dag
+macro.referer.furtherReading=Til a� lesa meira um f�rslur dagsins � dag:
+macro.referer.todaysHits=Heims�knir � dag
 
 # ------------------------------------------------------------- RSS Macro
 
 macro.rss.all=Allt
-macro.rss.excerpts=útdráttur
+macro.rss.excerpts=�tdr�ttur
 
 # ------------------------------------------------------------- Search Results Macro
 
-macro.searchresults.results=Niðurstöður leitar
-macro.searchresults.title=Skilgreina '{0}' á Dictionary.com
-macro.searchresults.searchFor=Þú leitaðir á {0} að
-macro.searchresults.hits_1=<strong>{0}</strong> niðurstöður fundnar.<br /><em>Þú getur líka
-macro.searchresults.hits_2=leitað að sama streng</a> á <a href="http://google.com">Google</a>.</em>
+macro.searchresults.results=Ni�urst��ur leitar
+macro.searchresults.title=Skilgreina '{0}' � Dictionary.com
+macro.searchresults.searchFor=�� leita�ir � {0} a�
+macro.searchresults.hits_1=<strong>{0}</strong> ni�urst��ur fundnar.<br /><em>�� getur l�ka
+macro.searchresults.hits_2=leita� a� sama streng</a> � <a href="http://google.com">Google</a>.</em>
 macro.searchresults.again=Leita aftur
 
 # ------------------------------------------------------------- Search Results Day Macro
 
-macro.searchresultsday.entrypermalink.title=Fastatengill á þessa færslu
-macro.searchresultsday.userpermalink.title=Tengill á síðu notanda
-macro.searchresultsday.categorypermalink.title=Sýna færslur í þessum flokki
+macro.searchresultsday.entrypermalink.title=Fastatengill � �essa f�rslu
+macro.searchresultsday.userpermalink.title=Tengill � s��u notanda
+macro.searchresultsday.categorypermalink.title=S�na f�rslur � �essum flokki
 
 # ------------------------------------------------------------- Weblog Macro
 
-macro.weblog.daypermalink.title=Fastatengill á þennan dag
-macro.weblog.entrypermalink.title=Fastatengill á þessa færslu
+macro.weblog.daypermalink.title=Fastatengill � �ennan dag
+macro.weblog.entrypermalink.title=Fastatengill � �essa f�rslu
 macro.weblog.entrypermalink.edit=Breyta
 macro.weblog.comments=Athugasemdir
 macro.weblog.comment=Athugasemd
-macro.weblog.addcomment=Bæta við athugasemd
+macro.weblog.addcomment=B�ta vi� athugasemd
 macro.weblog.datepattern=MMMMM dd yyyy 'klukkan' hh:mm aa z
 macro.weblog.date.timestampFormat=MMM dd yyyy, hh:mm:ss a z
 macro.weblog.date.toStringFormat=EEEE dd. MMMM yyyy
-macro.weblog.preview=Forskoða
-macro.weblog.commentpermalink.title=fastatengill á athugasemd
+macro.weblog.preview=Forsko�a
+macro.weblog.commentpermalink.title=fastatengill � athugasemd
 
-macro.weblog.postedby=Þetta skrifaði
-macro.weblog.on=þann
-macro.weblog.postedbywebsite=<br/>Heimasíða: <a href="{0}">{1}</a>
-macro.weblog.website=<br/>Heimasíða: <a href="{0}">{1}</a>
+macro.weblog.postedby=�etta skrifa�i
+macro.weblog.on=�ann
+macro.weblog.postedbywebsite=<br/>Heimas��a: <a href="{0}">{1}</a>
+macro.weblog.website=<br/>Heimas��a: <a href="{0}">{1}</a>
 macro.weblog.name=Nafn:
-macro.weblog.email=Tölvupóstfang:
-macro.weblog.url=Heimasíða:
-macro.weblog.rememberinfo=Muna upplýsingar?
+macro.weblog.email=T�lvup�stfang:
+macro.weblog.url=Heimas��a:
+macro.weblog.rememberinfo=Muna uppl�singar?
 macro.weblog.yourcomment=Athugasemd:
 macro.weblog.htmlsyntax=HTML:
-macro.weblog.htmldisabled=Óvirkt
+macro.weblog.htmldisabled=�virkt
 macro.weblog.htmlenabled=Virkt
-macro.weblog.commentwarning=Skrifaðu athugasemd.
+macro.weblog.commentwarning=Skrifa�u athugasemd.
 macro.weblog.postcommentHeader=Senda athugasemd:
 macro.weblog.postcomment=Senda Athugasemd
 macro.weblog.post=Senda
 macro.weblog.clear=Hreinsa
-macro.weblog.searchalert=Skrifaðu leitarstreng til að halda áfram.
+macro.weblog.searchalert=Skrifa�u leitarstreng til a� halda �fram.
 macro.weblog.searchbutton=Leita
-macro.weblog.searchdictionary=Þú leitaðir að "<a href="http://dictionary.com/search?q={0}" title="Skilgreina '{1}' á Dictionary.com" class="dictionary">{2}</a>" á þessarri síðu.
-macro.weblog.searchhits=<strong>{0}</strong> færslur fundust.
+macro.weblog.searchdictionary=�� leita�ir a� "<a href="http://dictionary.com/search?q={0}" title="Skilgreina '{1}' � Dictionary.com" class="dictionary">{2}</a>" � �essarri s��u.
+macro.weblog.searchhits=<strong>{0}</strong> f�rslur fundust.
 macro.weblog.searchagain=Leita aftur
-macro.weblog.searchgoogle=<em>Þú getur líka <a href="http://google.com/search?q={0}%20site:{1}/page/{3}" class="google">leitað að sama streng</a> á <a href="http://google.com">Google</a>.</em>
-macro.weblog.trackback=Tilvísun:
+macro.weblog.searchgoogle=<em>�� getur l�ka <a href="http://google.com/search?q={0}%20site:{1}/page/{3}" class="google">leita� a� sama streng</a> � <a href="http://google.com">Google</a>.</em>
+macro.weblog.trackback=Tilv�sun:
 macro.weblog.editentry=Breyta
 macro.weblog.allcategories=Allt
-macro.weblog.nolanguages=Þessi síða styður ekki mörg tungumál.
-macro.weblog.notifyMeOfComments=Láta mig vita af nýjum athugasemdum með tölvupósti
+macro.weblog.nolanguages=�essi s��a sty�ur ekki m�rg tungum�l.
+macro.weblog.notifyMeOfComments=L�ta mig vita af n�jum athugasemdum me� t�lvup�sti
 
 # ------------------------------------------------------------- Comment emails
 
-email.comment.wrote=skrifaði
-email.comment.anonymous=Óþekktur lesandi skrifaði
-email.comment.respond=Svaraðu þessari athugasemd á 
+email.comment.wrote=skrifa�i
+email.comment.anonymous=��ekktur lesandi skrifa�i
+email.comment.respond=Svara�u �essari athugasemd � 
 email.comment.title=Athugasemd
 
 

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Sat Mar  8 18:26:52 2014
@@ -66,13 +66,13 @@ bookmarksForm.addFolder=\u30D6\u30C3\u30
 bookmarksForm.checkAll=\u3059\u3079\u3066\u9078\u629E
 bookmarksForm.checkNone=\u3059\u3079\u3066\u9078\u629E\u3092\u89E3\u9664\u3059\u308B
 bookmarksForm.delete=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u524A\u9664
-bookmarksForm.description=\u8A73\u7D30
+bookmarksForm.description=
 bookmarksForm.folder=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0
 bookmarksForm.edit=\u7DE8\u96C6
 bookmarksForm.edit.tip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u3092\u7DE8\u96C6
 bookmarksForm.move=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u79FB\u52D5
 bookmarksForm.name=\u540D\u524D
-bookmarksForm.path=\u30D1\u30B9
+bookmarksForm.path=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0
 bookmarksForm.visitLink=\u8A2A\u554F
 bookmarksForm.visitLink.tip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u8A2A\u554F
 
@@ -499,7 +499,7 @@ errorPage.noException=\u30B9\u30BF\u30C3
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=\u30D5\u30A9\u30EB\u30C0\u8FFD\u52A0
-folderForm.add.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u306B\u65B0\u3057\u3044\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0\u3092\u8FFD\u52A0\u3057\u307E\u3059
+folderForm.add.subtitle=\u65B0\u3057\u3044\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0\u3092\u8FFD\u52A0\u3057\u307E\u3059
 
 folderForm.edit.title=\u30D5\u30A9\u30EB\u30C0\u7DE8\u96C6
 folderForm.edit.subtitle=\u30D5\u30A9\u30EB\u30C0[{0}]\u3092\u7DE8\u96C6\u3057\u307E\u3059

Modified: roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_nl.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_nl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_nl.properties Sat Mar  8 18:26:52 2014
@@ -76,7 +76,7 @@ bookmarksForm.addFolder=Nieuwe Folder
 bookmarksForm.checkAll=Selecteer Alles
 bookmarksForm.checkNone=Selecteer Niets
 bookmarksForm.delete=Verwijder selectie
-bookmarksForm.description=Omschrijving
+bookmarksForm.description=
 bookmarksForm.edit=Wijzig
 bookmarksForm.edit.tip=Klik om deze folder of favoriet te wijzigen.
 bookmarksForm.folder=Folder

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Sat Mar  8 18:26:52 2014
@@ -55,13 +55,13 @@ bookmarksForm.addFolder=\u0414\u043e\u04
 bookmarksForm.checkAll=\u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0432\u0441\u0435
 bookmarksForm.checkNone=\u0421\u043d\u044f\u0442\u044c \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435
 bookmarksForm.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u043e\u0435
-bookmarksForm.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
+bookmarksForm.description=
 bookmarksForm.folder=\u041f\u0430\u043f\u043a\u0430 \u0421\u0441\u044b\u043b\u043e\u043a
 bookmarksForm.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c
 bookmarksForm.edit.tip=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0447\u0442\u043e\u0431\u044b \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
 bookmarksForm.move=\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u043e\u0435
 bookmarksForm.name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
-bookmarksForm.path=\u041f\u0443\u0442\u044c
+bookmarksForm.path=\u041F\u0430\u043F\u043A\u0430 \u0421\u0441\u044B\u043B\u043E\u043A
 bookmarksForm.visitLink=\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c
 bookmarksForm.visitLink.tip=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0447\u0442\u043e\u0431\u044b \u043f\u0435\u0440\u0435\u0439\u0442\u0438
 
@@ -397,7 +397,7 @@ errorPage.noException=\u041d\u0435\u0442
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=\u0421\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043d\u043e\u0432\u0443\u044e \u043f\u0430\u043f\u043a\u0443
-folderForm.add.subtitle=\u0421\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043d\u043e\u0432\u0443\u044e \u043f\u0430\u043f\u043a\u0443 \u0437\u0430\u043a\u043b\u0430\u0434\u043e\u043a \u0432 \u043f\u0430\u043f\u043a\u0435 [{0}]
+folderForm.add.subtitle=\u0421\u043E\u0437\u0434\u0430\u0439\u0442\u0435 \u043D\u043E\u0432\u0443\u044E \u043F\u0430\u043F\u043A\u0443 \u0437\u0430\u043A\u043B\u0430\u0434\u043E\u043A
 
 folderForm.edit.title=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u0443\u0439\u0442\u0435 \u043f\u0430\u043f\u043a\u0443
 folderForm.edit.subtitle=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u043a\u043b\u0430\u0434\u043e\u043a \u0432 \u043f\u0430\u043f\u043a\u0435 [{0}]

Modified: roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_sl.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_sl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_sl.properties Sat Mar  8 18:26:52 2014
@@ -86,7 +86,7 @@ bookmarksForm.checkAll=Izberi Vse
 bookmarksForm.checkNone=Ni\u010Desar ne Izberi
 bookmarksForm.delete=Izbri\u0161i izbrano
 bookmarksForm.delete.confirm=Izbri\u0161em izbrane zaznamke?
-bookmarksForm.description=Opis
+bookmarksForm.description=
 bookmarksForm.folder=Imenik Zaznamka
 bookmarksForm.priority=Priority
 bookmarksForm.edit=urejanje
@@ -94,7 +94,7 @@ bookmarksForm.edit.tip=Klikni za urejanj
 bookmarksForm.move=Premakni izbrano
 bookmarksForm.move.confirm=Premakni izbrane zaznamke?
 bookmarksForm.name=Ime
-bookmarksForm.path=Pot
+bookmarksForm.path=Imenik Zaznamka
 bookmarksForm.visitLink=Obisk
 bookmarksForm.visitLink.tip=Klikni za obisk strani
 
@@ -596,7 +596,7 @@ errorPage.noException=Ni sklada za slede
 # --------------------------------------------------------------- FolderForm.jsp
 
 folderForm.add.title=Dodaj Imenik
-folderForm.add.subtitle=Dodajanje novega imenika zaznamkov v imenik [{0}]
+folderForm.add.subtitle=Dodajanje novega imenika zaznamkov
 
 folderForm.edit.title=urejanje Imenika
 folderForm.edit.subtitle=Urejanje imenika zaznamkov v imeniku [{0}]

Modified: roller/trunk/app/src/main/resources/ApplicationResources_vi.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_vi.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_vi.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_vi.properties Sat Mar  8 18:26:52 2014
@@ -75,13 +75,13 @@ bookmarksForm.addFolder=Th\u00eam th\u01
 bookmarksForm.checkAll=Ch\u1ecdn t\u1ea5t c\u1ea3
 bookmarksForm.checkNone=Kh\u00f4ng ch\u1ecdn g\u00ec c\u1ea3
 bookmarksForm.delete=X\u00f3a nh\u1eefng l\u1ef1a ch\u1ecdn
-bookmarksForm.description=Ch\u00fa th\u00edch
+bookmarksForm.description=
 bookmarksForm.edit=So\u1ea1n
 bookmarksForm.edit.tip=Nh\u1eafp chu\u1ed9t \u0111\u1ec3 so\u1ea1n th\u01b0 m\u1ee5c ho\u1eb7c th\u1ebb \u0111\u00e1nh d\u1ea5u
 bookmarksForm.folder=Th\u01b0 m\u1ee5c
 bookmarksForm.move=D\u1ecbch chuy\u1ec3n l\u1ef1a ch\u1ecdn
 bookmarksForm.name=T\u00ean
-bookmarksForm.path=\u0110\u01b0\u1eddng d\u1eabn
+bookmarksForm.path=Th\u01B0 m\u1EE5c
 bookmarksForm.root=g\u1ed1c
 bookmarksForm.visitLink=Th\u0103m
 bookmarksForm.visitLink.tip=Nh\u1eafp chu\u1ed9t \u0111\u1ec3 v\u00e0o th\u0103m site n\u00e0y

Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Sat Mar  8 18:26:52 2014
@@ -41,7 +41,7 @@ bookmarksForm.addFolder=\u6dfb\u52a0\u4e
 bookmarksForm.checkAll=\u5168\u90e8\u9009\u62e9
 bookmarksForm.checkNone=\u4e00\u4e2a\u4e0d\u9009
 bookmarksForm.delete=\u5220\u9664\u9009\u4e2d\u7684
-bookmarksForm.description=\u63cf\u8ff0
+bookmarksForm.description=
 bookmarksForm.edit=\u7f16\u8f91
 bookmarksForm.edit.tip=\u70b9\u51fb\uff0c\u7136\u540e\u7f16\u8f91\u6b64\u4e66\u7b7e\u6216\u4e66\u7b7e\u5939
 bookmarksForm.error.move=\u79fb\u52a8\u9519\u8bef\uff0c\u4e0d\u5141\u8bb8\u79fb\u52a8\u7236\u76ee\u5f55\u5230\u5b50\u76ee\u5f55
@@ -51,7 +51,7 @@ bookmarksForm.folderTitle=\u4e66\u7b7e\u
 bookmarksForm.importBookmarks=\u5bfc\u5165OPML\u683c\u5f0f\u7684\u4e66\u7b7e
 bookmarksForm.move=\u79fb\u52a8\u9009\u4e2d\u7684
 bookmarksForm.name=\u540d\u5b57
-bookmarksForm.path=\u8def\u5f84
+bookmarksForm.path=\u4E66\u7B7E\u5939
 bookmarksForm.root=\u6839
 bookmarksForm.rootPrompt=\u8fd9\u662f\u60a8\u7684\u9876\u5c42\u4e66\u7b7e\u5939\u3002\u8fd9\u91cc\u4fdd\u7559\u7684\u4e66\u7b7e\u5c06\u4f1a\u5728\u60a8\u7684\u7f51\u5fd7\u7684blogroll\u663e\u793a\uff08\u8fd9\u91cc\u5047\u8bbe\u60a8\u4f7f\u7528\u9ed8\u8ba4\u4e3b\u9898\uff09\u3002\u60a8\u4e5f\u53ef\u4ee5\u5efa\u7acb\u4e66\u7b7e\u5939\uff0c\u76f8\u5e94\u7684\uff0c\u5982\u679c\u60a8\u9700\u8981\u663e\u793a\u4e66\u7b7e\u5939\u7684\u5185\u5bb9\uff0c\u5c31\u9700\u8981\u5728\u60a8\u7684\u6a21\u677f\u4e2d\u5f15\u7528\u76f8\u5e94\u7684\u5b8f\u6765\u4f7f\u7528\u5b83\u3002
 bookmarksForm.rootTitle=\u4e66\u7b7e
@@ -348,7 +348,7 @@ errors.noslashes={0}  \u4e0d\u80fd\u5305
 errors.range={0}  \u5fc5\u987b\u5728 {1} \u5230 {2} \u7684\u8303\u56f4\u5185\u3002
 errors.required={0} \u5fc5\u987b\u8f93\u5165\u3002
 errors.short={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u77ed\u6574\u6570\u3002
-folderForm.add.subtitle=\u5728\u4e66\u7b7e\u5939 [{0} ]\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u4e66\u7b7e\u5939
+folderForm.add.subtitle=\u6DFB\u52A0\u4E00\u4E2A\u65B0\u7684\u4E66\u7B7E\u5939
 folderForm.add.title=\u6dfb\u52a0\u6587\u4ef6\u5939
 folderForm.addFolder=\u521b\u5efa\u65b0\u7684\u4e66\u7b7e\u5939
 folderForm.cancel=\u53d6\u6d88

Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties Sat Mar  8 18:26:52 2014
@@ -76,13 +76,13 @@ bookmarksForm.addFolder=\u65b0\u589e\u8c
 bookmarksForm.checkAll=\u5168\u9078
 bookmarksForm.checkNone=\u53cd\u9078\u53d6
 bookmarksForm.delete=\u522a\u9664\u5df2\u9078\u64c7
-bookmarksForm.description=\u5167\u5bb9
+bookmarksForm.description=
 bookmarksForm.edit=\u7de8\u8f2f
 bookmarksForm.edit.tip=\u9ede\u9078\u6b64\u8655\u4ee5\u7de8\u8f2f\u6b64\u66f8\u7c64
 bookmarksForm.folder=\u8cc7\u6599\u593e
 bookmarksForm.move=\u642c\u79fb\u5df2\u9078\u53d6
 bookmarksForm.name=\u540d\u7a31
-bookmarksForm.path=\u8def\u5f91
+bookmarksForm.path=\u8CC7\u6599\u593E
 bookmarksForm.root=\u6839\u8def\u5f91
 bookmarksForm.visitLink=\u700f\u89bd\u7db2\u7ad9
 bookmarksForm.visitLink.tip=\u9ede\u9078\u6b64\u8655\u4ee5\u9020\u8a2a\u6b64\u7db2\u7ad9

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1575585&r1=1575584&r2=1575585&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Sat Mar  8 18:26:52 2014
@@ -71,16 +71,16 @@ function onMove() 
     <s:hidden name="weblog" />
     <s:hidden name="folderId" /> 
     
-    <s:if test="!allFolders.isEmpty && ( folder.folders.size > 0 || folder.bookmarks.size > 0)">
-        
-        <%-- Move-selected button --%>
-        <s:submit type="button" action="bookmarks!move" key="bookmarksForm.move" onclick="onMove();return false;" />
-        
-        <%-- Move-to combo-box --%>
-        <s:select name="targetFolderId" list="allFolders" listKey="id" listValue="path" />
-        
+    <s:if test="!allFolders.isEmpty">
+
+        <%-- View button --%>
+        <s:submit type="button" action="bookmarks!view" key="bookmarksForm.viewFolder" />
+
+        <%-- Folder to View combo-box --%>
+        <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="path" />
+
         <br /><br />
-        
+
     </s:if>
     <table class="rollertable">
     
@@ -120,7 +120,7 @@ function onMove() 
                 </td>
                 
                 <td class="rollertable">
-                    <str:truncateNicely lower="30" upper="35" ><s:property value="#folder.description" /></str:truncateNicely>
+                    <str:truncateNicely lower="30" upper="35" > </str:truncateNicely>
                 </td>
                 
                 <td class="rollertable"></td>
@@ -158,7 +158,7 @@ function onMove() 
                 </td>
                 
                 <td class="rollertable">
-                    <str:truncateNicely lower="30" upper="35" ><s:property value="#bookmark.description" /></str:truncateNicely>
+                    <str:truncateNicely lower="30" upper="35" ><s:property value="#bookmark.url" /></str:truncateNicely>
                 </td>
                 
                 <td class="rollertable">
@@ -194,11 +194,19 @@ function onMove() 
         </s:else>
     </table>
     
-    <s:if test="folder.folders.size > 0 || folder.bookmarks.size > 0">
-        <div class="control">
-            <%-- Delete-selected button --%>
-            <input type="button" value="<s:text name="bookmarksForm.delete"/>" onclick="onDelete()" /> 
-        </div>
-    </s:if>
+    <div class="control">
+        <s:if test="folder.folders.size > 0 || folder.bookmarks.size > 0">
+                <%-- Delete-selected button --%>
+                <input type="button" value="<s:text name="bookmarksForm.delete"/>" onclick="onDelete()" />
+        </s:if>
+
+        <s:if test="!allFolders.isEmpty && ( folder.folders.size > 0 || folder.bookmarks.size > 0)">
+            <%-- Move-selected button --%>
+            <s:submit type="button" action="bookmarks!move" key="bookmarksForm.move" onclick="onMove();return false;" />
+
+            <%-- Move-to combo-box --%>
+            <s:select name="targetFolderId" list="allFolders" listKey="id" listValue="path" />
+        </s:if>
+    </div>
 
 </s:form>



Mime
View raw message