replace old client with new client from commafeed-ui repository

2022-08-13 10:56:07 +02:00
parent ac7b6eeb21
commit 04894f118b
183 changed files with 20326 additions and 12678 deletions
--- a/commafeed-client/.bowerrc
+++ b/commafeed-client/.bowerrc
@@ -1,3 +0,0 @@
-{
-    "directory": "src/main/app/lib"
-}
--- a/commafeed-client/.eslintignore
+++ b/commafeed-client/.eslintignore
@@ -0,0 +1,6 @@
+dist
+node_modules
+
+vite.config.ts
+
+src/locales/**/*.ts
--- a/commafeed-client/.eslintrc
+++ b/commafeed-client/.eslintrc
@@ -0,0 +1,78 @@
+{
+    "extends": ["plugin:react/recommended", "react-app", "airbnb", "airbnb-typescript", "prettier"],
+    "plugins": ["prettier", "hooks"],
+    "parserOptions": {
+        "project": "./tsconfig.json"
+    },
+    "rules": {
+        // make eslint check prettier rules
+        "prettier/prettier": "error",
+
+        // enforce consistent curly braces usage
+        "curly": ["error", "multi-line", "consistent"],
+
+        // set "props" to false because it cases false positives with immer
+        "no-param-reassign": ["error", { "props": false }],
+
+        "prefer-destructuring": [
+            "error",
+            {
+                "array": false,
+                "object": true
+            },
+            {
+                "enforceForRenamedProperties": false
+            }
+        ],
+
+        // causes issues in thunks when we want to dispatch an action that is defined in the reducer
+        "@typescript-eslint/no-use-before-define": "off",
+
+        // make sure the key prop is filled when required
+        "react/jsx-key": ["error", { "checkFragmentShorthand": true }],
+
+        // configure additional hooks
+        "react-hooks/exhaustive-deps": [
+            "warn",
+            {
+                "additionalHooks": "useAsync"
+            }
+        ],
+
+        // trigger even if props is used only in createStyles()
+        "react/no-unused-prop-types": "off",
+
+        // no longer required with modern react versions
+        "react/react-in-jsx-scope": "off",
+
+        // not required with typescript
+        "react/prop-types": "off",
+        "react/require-default-props": "off",
+
+        // matter of taste
+        "react/destructuring-assignment": "off",
+        "react/jsx-props-no-spreading": "off",
+        "react/no-unescaped-entities": "off",
+        "import/prefer-default-export": "off",
+
+        // enforce hook call order
+        "hooks/sort": [
+            2,
+            {
+                "groups": [
+                    "useLocation",
+                    "useParams",
+                    "useStyles",
+                    "useMantineTheme",
+                    "useState",
+                    "useAppSelector",
+                    "useAppDispatch",
+                    "useForm",
+                    "useMutation",
+                    "useCallback",
+                    "useEffect"
+                ]
+            }
+        ]
+    }
+}
--- a/commafeed-client/.gitignore
+++ b/commafeed-client/.gitignore
@@ -1,39 +1,33 @@
-# config file
-config.yml
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*

-# build directory
-target
-target-ide
-
-# database files
-database
-
-# log files
-log
-
-# jetty sessions
-sessions
-
-# node
-node
 node_modules
+dist
+dist-ssr
+*.local

-# bower
-src/main/app/lib
-
-# Eclipse files
-.project
-.classpath
-.settings
-.factorypath
-.checkstyle
-
-# IntelliJ Idea files
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
 .idea
-*.iml
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

-# Sublime
-*.sublime*
+# rollup-plugin-visualizer
+/stats.html

-# Macs
-*.DS_Store
+# vite
+vite.config.ts.timestamp-*.mjs
+
+# compiled locales
+src/locales/**/*.ts
--- a/commafeed-client/.linguirc
+++ b/commafeed-client/.linguirc
@@ -0,0 +1,31 @@
+{
+    "locales": [
+        "en",
+        "fr"
+    ],
+    "catalogs": [
+        {
+            "path": "src/locales/{locale}/messages",
+            "include": [
+                "src"
+            ],
+            "exclude": [
+                "src/locales/**"
+            ]
+        }
+    ],
+    "format": "po",
+    "formatOptions": {
+        "origins": true,
+        "lineNumbers": false
+    },
+    "sourceLocale": "en",
+    "fallbackLocales": {
+        "default": "en"
+    },
+    "extractBabelOptions": {
+        "presets": [
+            "@babel/preset-typescript"
+        ]
+    }
+}
--- a/commafeed-client/README.md
+++ b/commafeed-client/README.md
@@ -0,0 +1,3 @@
+## CommaFeed new UI prototype
+
+This project may or may not one day replace the existing CommaFeed web UI.
--- a/commafeed-client/bower.json
+++ b/commafeed-client/bower.json
@@ -1,37 +0,0 @@
-{
-    "name": "commafeed",
-    "version": "2.0.0",
-    "dependencies": {
-        "jquery": "2.1.3",
-        "jquery-ui": "1.10.3",
-        "jquery-mousewheel": "3.1.12",
-        "lodash": "3.4.0",
-        "bootstrap": "3.3.2",
-        "font-awesome": "3.2.1",
-        "angular": "1.3.14",
-        "angular-resource": "1.3.14",
-        "angular-route": "1.3.14",
-        "angular-sanitize": "1.3.14",
-        "angular-touch": "1.3.14",
-        "angular-animate": "1.3.14",
-        "angular-ui-router": "0.2.13",
-        "angular-ui-utils": "0.1.0",
-        "angular-ui-select2": "0.0.5",
-        "angular-bootstrap": "0.2.0",
-        "angular-loading-bar": "0.6.0",
-        "angular-translate": "2.6.1",
-        "angular-translate-loader-static-files": "2.6.1",
-        "ngInfiniteScroll": "1.0.0",
-        "ng-grid": "2.0.6",
-        "mousetrap": "1.4.6",
-        "momentjs": "2.9.0",
-        "devicejs": "0.2.4",
-        "zocial-less": "1.0.0",
-        "swagger-ui": "2.1.0",
-        "tinycon": "0.6.5"
-    },
-    "resolutions": {
-        "angular": "1.3.14",
-        "angular-translate": "2.6.1"
-    }
-}
--- a/commafeed-client/gulp
+++ b/commafeed-client/gulp
@@ -1,2 +0,0 @@
-#!/bin/sh
-"node/node" "node_modules/gulp/bin/gulp.js" "$@"
--- a/commafeed-client/gulp.cmd
+++ b/commafeed-client/gulp.cmd
@@ -1,3 +0,0 @@
-@echo off
-%~dp0node/node node_modules/gulp/bin/gulp.js %*
-@echo on
--- a/commafeed-client/gulpfile.js
+++ b/commafeed-client/gulpfile.js
@@ -1,115 +0,0 @@
-var gulp = require('gulp');
-var rev = require('gulp-rev');
-var revReplace = require('gulp-rev-replace');
-var minifyCSS = require('gulp-minify-css');
-var uglify = require('gulp-uglify');
-var filter = require('gulp-filter');
-var connect = require('gulp-connect');
-var modRewrite = require('connect-modrewrite');
-var sass = require('gulp-sass');
-var useref = require('gulp-useref');
-var templateCache = require('gulp-angular-templatecache');
-
-var SRC_DIR = 'src/main/app/';
-var TEMP_DIR = 'target/gulp/'
-var BUILD_DIR = 'target/classes/assets/';
-
-gulp.task('images', function() {
-	return gulp.src(SRC_DIR + 'images/**/*').pipe(gulp.dest(BUILD_DIR + 'images'));
-});
-
-gulp.task('i18n', function() {
-	return gulp.src(SRC_DIR + 'i18n/**/*.js').pipe(gulp.dest(BUILD_DIR + 'i18n'));
-});
-
-gulp.task('resources', function() {
-	var favicons_png = SRC_DIR + '*.png';
-	var favicons_ico = SRC_DIR + '*.ico';
-	var favicons_svg = SRC_DIR + '*.svg';
-	var manifest = SRC_DIR + 'manifest.json';
-	return gulp.src([favicons_png, favicons_ico, favicons_svg, manifest]).pipe(gulp.dest(BUILD_DIR));
-});
-
-gulp.task('sass', function() {
-	return gulp.src(SRC_DIR + 'sass/app.scss').pipe(sass()).pipe(gulp.dest(TEMP_DIR + 'css'));
-});
-
-gulp.task('fonts', function() {
-	var font_awesome = SRC_DIR + 'lib/font-awesome/font/fontawesome-webfont.*';
-	var zocial = SRC_DIR + 'lib/zocial-less/css/zocial-regular-*';
-	var readabilicons = SRC_DIR + 'lib/readabilicons/webfont/fonts/readabilicons-*';
-	return gulp.src([font_awesome, zocial, readabilicons]).pipe(gulp.dest(BUILD_DIR + 'font'));
-});
-
-gulp.task('select2', function() {
-	var gif = SRC_DIR + 'lib/select2/*.gif';
-	var png = SRC_DIR + 'lib/select2/*.png';
-	return gulp.src([gif, png]).pipe(gulp.dest(BUILD_DIR + 'css'));
-});
-
-gulp.task('swagger-ui', function() {
-	var index_html = SRC_DIR + 'api/index.html';
-	var swagger_json = 'target/swagger/swagger.json';
-	var lib = SRC_DIR + 'lib/swagger-ui/dist/**/*';
-	return gulp.src([lib, index_html, swagger_json]).pipe(gulp.dest(BUILD_DIR + 'api'));
-});
-
-gulp.task('template-cache', function() {
-	var options = {
-		module : 'commafeed.services',
-		root : 'templates/'
-	};
-	return gulp.src(SRC_DIR + 'templates/**/*.html').pipe(templateCache(options)).pipe(gulp.dest(TEMP_DIR + 'js'));
-});
-
-gulp.task('build-dev', ['images', 'i18n', 'resources', 'sass', 'fonts', 'select2', 'swagger-ui', 'template-cache'], function() {
-	var assets = useref.assets({
-		searchPath : [SRC_DIR, TEMP_DIR]
-	});
-	var jsFilter = filter("**/*.js");
-	var cssFilter = filter("**/*.css");
-	return gulp.src([SRC_DIR + 'index.html', TEMP_DIR + 'app.css']).pipe(assets).pipe(rev()).pipe(assets.restore()).pipe(useref()).pipe(
-			revReplace()).pipe(gulp.dest(BUILD_DIR)).pipe(connect.reload());
-});
-
-gulp.task('build', ['images', 'i18n', 'resources', 'sass', 'fonts', 'select2', 'swagger-ui', 'template-cache'], function() {
-	var assets = useref.assets({
-		searchPath : [SRC_DIR, TEMP_DIR]
-	});
-	var jsFilter = filter("**/*.js");
-	var cssFilter = filter("**/*.css");
-	return gulp.src([SRC_DIR + 'index.html', TEMP_DIR + 'app.css']).pipe(assets)
-
-	.pipe(cssFilter).pipe(minifyCSS()).pipe(cssFilter.restore())
-
-	.pipe(jsFilter).pipe(uglify()).pipe(jsFilter.restore())
-
-	.pipe(rev()).pipe(assets.restore()).pipe(useref()).pipe(revReplace()).pipe(gulp.dest(BUILD_DIR));
-});
-
-gulp.task('watch', function() {
-	gulp.watch(SRC_DIR + 'sass/**/*.scss', ['build-dev']);
-	gulp.watch(SRC_DIR + 'js/**/*.js', ['build-dev']);
-	gulp.watch(SRC_DIR + 'i18n/**/*.js', ['build-dev']);
-	gulp.watch(SRC_DIR + 'templates/**/*.html', ['build-dev']);
-});
-
-gulp.task('serve', function() {
-	connect.server({
-		root : BUILD_DIR,
-		port : 8082,
-		livereload : true,
-		middleware : function() {
-			var api = '^/api/(.*)$ http://localhost:8083/rest/$1 [P]';
-			var rest = '^/rest/(.*)$ http://localhost:8083/rest/$1 [P]';
-			var next = '^/next(.*)$ http://localhost:8083/next$1 [P]';
-			var logout = '^/logout$ http://localhost:8083/logout [P]';
-			var custom_css = '^/custom_css.css$ http://localhost:8083/custom_css.css [P]';
-			var analytics = '^/analytics.js http://localhost:8083/analytics.js [P]';
-			return [modRewrite([rest, next, logout, custom_css, analytics])];
-		}
-	});
-});
-
-gulp.task('dev', ['build-dev', 'watch', 'serve']);
-gulp.task('default', ['build']);
--- a/commafeed-client/index.html
+++ b/commafeed-client/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <link rel="icon" type="image/x-icon" href="favicon.ico" />
+        <link rel="manifest" href="manifest.json" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+        <title>CommaFeed</title>
+    </head>
+    <body>
+        <div id="root"></div>
+        <script type="module" src="/src/main.tsx"></script>
+    </body>
+</html>
--- a/commafeed-client/package-lock.json
+++ b/commafeed-client/package-lock.json
--- a/commafeed-client/package.json
+++ b/commafeed-client/package.json
@@ -1,20 +1,70 @@
 {
-  "name": "commafeed",
-  "version": "2.0.0",
-  "main": "main.js",
-  "private": true,
-  "devDependencies": {
-    "bower": "1.8.8",
-    "gulp": "3.8.11",
-    "gulp-rev": "4.0.0",
-    "gulp-rev-replace": "0.4.1",
-    "gulp-minify-css": "1.1.5",
-    "gulp-uglify": "1.2.0",
-    "gulp-filter": "2.0.2",
-    "gulp-connect": "2.2.0",
-    "connect-modrewrite": "0.8.1",
-    "gulp-sass": "2.0.2",
-    "gulp-useref": "1.1.2",
-    "gulp-angular-templatecache": "1.6.0"
-  }
+    "name": "commafeed-client",
+    "private": true,
+    "version": "0.0.0",
+    "type": "module",
+    "scripts": {
+        "dev": "vite",
+        "build": "npm run i18n:compile && tsc && vite build",
+        "preview": "vite preview",
+        "test": "vitest",
+        "test:ci": "vitest run",
+        "eslint": "eslint --ext=.js,.jsx,.ts,.tsx src",
+        "i18n": "npm run i18n:extract && npm run i18n:compile",
+        "i18n:extract": "lingui extract --clean",
+        "i18n:compile": "lingui compile --typescript",
+        "postinstall": "npm run i18n:compile"
+    },
+    "dependencies": {
+        "@emotion/react": "^11.10.0",
+        "@fontsource/open-sans": "^4.5.11",
+        "@lingui/core": "^3.14.0",
+        "@lingui/macro": "^3.14.0",
+        "@lingui/react": "^3.14.0",
+        "@mantine/core": "^5.1.1",
+        "@mantine/form": "^5.1.1",
+        "@mantine/hooks": "^5.1.1",
+        "@mantine/modals": "^5.1.1",
+        "@mantine/notifications": "^5.1.1",
+        "@mantine/spotlight": "^5.1.1",
+        "@reduxjs/toolkit": "^1.8.3",
+        "axios": "^0.27.2",
+        "dayjs": "^1.11.4",
+        "make-plural": "^7.1.0",
+        "mousetrap": "^1.6.5",
+        "react": "^18.2.0",
+        "react-async-hook": "^4.0.0",
+        "react-dom": "^18.2.0",
+        "react-icons": "^4.4.0",
+        "react-infinite-scroller": "^1.2.6",
+        "react-redux": "^8.0.2",
+        "react-router-dom": "^6.3.0",
+        "tinycon": "^0.6.8",
+        "use-mutation": "^2.2.1"
+    },
+    "devDependencies": {
+        "@lingui/cli": "^3.14.0",
+        "@types/eslint": "^8.4.5",
+        "@types/mousetrap": "^1.6.9",
+        "@types/react": "^18.0.17",
+        "@types/react-dom": "^18.0.6",
+        "@types/react-infinite-scroller": "^1.2.3",
+        "@types/tinycon": "^0.6.3",
+        "@vitejs/plugin-react": "^2.0.0",
+        "eslint": "^8.21.0",
+        "eslint-config-airbnb": "^19.0.4",
+        "eslint-config-airbnb-typescript": "^17.0.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-config-react-app": "^7.0.1",
+        "eslint-plugin-hooks": "^0.4.3",
+        "eslint-plugin-prettier": "^4.2.1",
+        "prettier": "^2.7.1",
+        "rollup-plugin-visualizer": "^5.7.1",
+        "typescript": "^4.7.4",
+        "vite": "^3.0.5",
+        "vite-plugin-eslint": "^1.7.0",
+        "vite-tsconfig-paths": "^3.5.0",
+        "vitest": "^0.21.1",
+        "vitest-mock-extended": "^0.1.13"
+    }
 }
--- a/commafeed-client/pom.xml
+++ b/commafeed-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>${revision}</version>
+		<version>3.0.0</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
@@ -15,7 +15,7 @@
 			<plugin>
 				<groupId>com.github.eirslett</groupId>
 				<artifactId>frontend-maven-plugin</artifactId>
-				<version>1.6</version>
+				<version>1.12.1</version>
 				<?m2e ignore?>
 				<executions>
 					<execution>
@@ -25,8 +25,8 @@
 						</goals>
 						<phase>compile</phase>
 						<configuration>
-							<nodeVersion>v6.11.4</nodeVersion>
-							<npmVersion>3.10.6</npmVersion>
+							<nodeVersion>v16.16.0</nodeVersion>
+							<npmVersion>8.15.0</npmVersion>
 						</configuration>
 					</execution>
 					<execution>
@@ -36,25 +36,60 @@
 						</goals>
 						<phase>compile</phase>
 						<configuration>
-							<arguments>install</arguments>
+							<arguments>ci</arguments>
 						</configuration>
 					</execution>
 					<execution>
-						<id>bower install</id>
+						<id>npm run eslint</id>
 						<goals>
-							<goal>bower</goal>
+							<goal>npm</goal>
 						</goals>
 						<phase>compile</phase>
 						<configuration>
-							<arguments>install</arguments>
+							<arguments>run eslint</arguments>
 						</configuration>
 					</execution>
 					<execution>
-						<id>gulp build</id>
+						<id>npm run test</id>
 						<goals>
-							<goal>gulp</goal>
+							<goal>npm</goal>
 						</goals>
 						<phase>compile</phase>
+						<configuration>
+							<arguments>run test:ci</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm run build</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<arguments>run build</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<id>copy web interface to resources</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/classes/assets</outputDirectory>
+							<resources>
+								<resource>
+									<directory>dist</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
--- a/commafeed-client/src/main/app/app-icon-114.png
+++ b/commafeed-client/src/main/app/app-icon-114.png
--- a/commafeed-client/src/main/app/app-icon-144.png
+++ b/commafeed-client/src/main/app/app-icon-144.png
--- a/commafeed-client/src/main/app/app-icon-192.png
+++ b/commafeed-client/src/main/app/app-icon-192.png
--- a/commafeed-client/src/main/app/app-icon-72.png
+++ b/commafeed-client/src/main/app/app-icon-72.png
--- a/commafeed-client/src/main/app/favicon.ico
+++ b/commafeed-client/src/main/app/favicon.ico
--- a/commafeed-client/src/main/app/manifest.json
+++ b/commafeed-client/src/main/app/manifest.json
@@ -1,5 +1,10 @@
 {
+    "$schema": "https://json.schemastore.org/web-manifest-combined.json",
    "name": "CommaFeed",
+    "scope": ".",
+    "start_url": "./",
+    "display": "standalone",
+    "theme_color": "#f88a14",
    "icons": [
        {
            "src": "app-icon-72.png",
@@ -25,8 +30,5 @@
            "type": "image/png",
            "density": "4.0"
        }
-    ],
-    "scope": ".",
-    "start_url": "./",
-    "display": "standalone"
+    ]
 }
--- a/commafeed-client/src/App.tsx
+++ b/commafeed-client/src/App.tsx
@@ -0,0 +1,132 @@
+import { i18n } from "@lingui/core"
+import { I18nProvider } from "@lingui/react"
+import { ColorScheme, ColorSchemeProvider, MantineProvider } from "@mantine/core"
+import { useLocalStorage } from "@mantine/hooks"
+import { ModalsProvider } from "@mantine/modals"
+import { NotificationsProvider } from "@mantine/notifications"
+import { Constants } from "app/constants"
+import { redirectTo } from "app/slices/redirect"
+import { reloadServerInfos } from "app/slices/server"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { categoryUnreadCount } from "app/utils"
+import { Header } from "components/header/Header"
+import { Tree } from "components/sidebar/Tree"
+import { useI18n } from "i18n"
+import { AdminUsersPage } from "pages/admin/AdminUsersPage"
+import { AddPage } from "pages/app/AddPage"
+import { CategoryDetailsPage } from "pages/app/CategoryDetailsPage"
+import { FeedDetailsPage } from "pages/app/FeedDetailsPage"
+import { FeedEntriesPage } from "pages/app/FeedEntriesPage"
+import Layout from "pages/app/Layout"
+import { SettingsPage } from "pages/app/SettingsPage"
+import { LoginPage } from "pages/auth/LoginPage"
+import { PasswordRecoveryPage } from "pages/auth/PasswordRecoveryPage"
+import { RegistrationPage } from "pages/auth/RegistrationPage"
+import React, { useEffect } from "react"
+import { HashRouter, Navigate, Route, Routes, useNavigate } from "react-router-dom"
+import Tinycon from "tinycon"
+
+function Providers(props: { children: React.ReactNode }) {
+    const [colorScheme, setColorScheme] = useLocalStorage<ColorScheme>({
+        key: "color-scheme",
+        defaultValue: "light",
+        getInitialValueInEffect: true,
+    })
+    const toggleColorScheme = (value?: ColorScheme) => setColorScheme(value || (colorScheme === "dark" ? "light" : "dark"))
+
+    return (
+        <I18nProvider i18n={i18n}>
+            <ColorSchemeProvider colorScheme={colorScheme} toggleColorScheme={toggleColorScheme}>
+                <MantineProvider
+                    withGlobalStyles
+                    withNormalizeCSS
+                    theme={{
+                        primaryColor: "orange",
+                        colorScheme,
+                        fontFamily: "Open Sans",
+                    }}
+                >
+                    <ModalsProvider>
+                        <NotificationsProvider position="top-center" zIndex={9999}>
+                            {props.children}
+                        </NotificationsProvider>
+                    </ModalsProvider>
+                </MantineProvider>
+            </ColorSchemeProvider>
+        </I18nProvider>
+    )
+}
+
+function AppRoutes() {
+    return (
+        <Routes>
+            <Route path="/" element={<Navigate to={`/app/category/${Constants.categoryIds.all}`} replace />} />
+            <Route path="login" element={<LoginPage />} />
+            <Route path="register" element={<RegistrationPage />} />
+            <Route path="passwordRecovery" element={<PasswordRecoveryPage />} />
+            <Route path="app" element={<Layout header={<Header />} sidebar={<Tree />} />}>
+                <Route path="category">
+                    <Route path=":id" element={<FeedEntriesPage sourceType="category" />} />
+                    <Route path=":id/details" element={<CategoryDetailsPage />} />
+                </Route>
+                <Route path="feed">
+                    <Route path=":id" element={<FeedEntriesPage sourceType="feed" />} />
+                    <Route path=":id/details" element={<FeedDetailsPage />} />
+                </Route>
+                <Route path="add" element={<AddPage />} />
+                <Route path="settings" element={<SettingsPage />} />
+                <Route path="admin">
+                    <Route path="users" element={<AdminUsersPage />} />
+                </Route>
+            </Route>
+            <Route path="*" element={<Navigate to="/" replace />} />
+        </Routes>
+    )
+}
+
+function RedirectHandler() {
+    const target = useAppSelector(state => state.redirect.to)
+    const dispatch = useAppDispatch()
+    const navigate = useNavigate()
+    useEffect(() => {
+        if (target) {
+            // pages can subscribe to state.timestamp in order to refresh when navigating to an url matching the current page
+            navigate(target, { state: { timestamp: new Date() } })
+            dispatch(redirectTo(undefined))
+        }
+    }, [target, dispatch, navigate])
+
+    return null
+}
+
+function FaviconHandler() {
+    const root = useAppSelector(state => state.tree.rootCategory)
+    useEffect(() => {
+        const unreadCount = categoryUnreadCount(root)
+        if (unreadCount === 0) Tinycon.reset()
+        else Tinycon.setBubble(unreadCount)
+    }, [root])
+
+    return null
+}
+
+export function App() {
+    useI18n()
+    const dispatch = useAppDispatch()
+
+    useEffect(() => {
+        dispatch(reloadServerInfos())
+    }, [dispatch])
+
+    return (
+        <Providers>
+            <>
+                <FaviconHandler />
+                <HashRouter>
+                    <RedirectHandler />
+                    <AppRoutes />
+                </HashRouter>
+            </>
+        </Providers>
+    )
+}
--- a/commafeed-client/src/app/client.ts
+++ b/commafeed-client/src/app/client.ts
@@ -0,0 +1,107 @@
+import axios from "axios"
+import {
+    AddCategoryRequest,
+    Category,
+    CategoryModificationRequest,
+    CollapseRequest,
+    Entries,
+    FeedInfo,
+    FeedInfoRequest,
+    FeedModificationRequest,
+    GetEntriesPaginatedRequest,
+    IDRequest,
+    LoginRequest,
+    MarkRequest,
+    PasswordResetRequest,
+    ProfileModificationRequest,
+    RegistrationRequest,
+    ServerInfo,
+    Settings,
+    SubscribeRequest,
+    Subscription,
+    UserModel,
+} from "./types"
+
+const axiosInstance = axios.create({ baseURL: "./rest", withCredentials: true })
+axiosInstance.interceptors.response.use(
+    response => response,
+    error => {
+        if (error.response.status === 401) window.location.hash = "/login"
+        throw error
+    }
+)
+
+export const client = {
+    category: {
+        getRoot: () => axiosInstance.get<Category>("category/get"),
+        modify: (req: CategoryModificationRequest) => axiosInstance.post("category/modify", req),
+        collapse: (req: CollapseRequest) => axiosInstance.post("category/collapse", req),
+        getEntries: (req: GetEntriesPaginatedRequest) => axiosInstance.get<Entries>("category/entries", { params: req }),
+        markEntries: (req: MarkRequest) => axiosInstance.post("category/mark", req),
+        add: (req: AddCategoryRequest) => axiosInstance.post("category/add", req),
+        delete: (req: IDRequest) => axiosInstance.post("category/delete", req),
+    },
+    entry: {
+        mark: (req: MarkRequest) => axiosInstance.post("entry/mark", req),
+    },
+    feed: {
+        get: (id: string) => axiosInstance.get<Subscription>(`feed/get/${id}`),
+        modify: (req: FeedModificationRequest) => axiosInstance.post("feed/modify", req),
+        getEntries: (req: GetEntriesPaginatedRequest) => axiosInstance.get<Entries>("feed/entries", { params: req }),
+        markEntries: (req: MarkRequest) => axiosInstance.post("feed/mark", req),
+        fetchFeed: (req: FeedInfoRequest) => axiosInstance.post<FeedInfo>("feed/fetch", req),
+        subscribe: (req: SubscribeRequest) => axiosInstance.post("feed/subscribe", req),
+        unsubscribe: (req: IDRequest) => axiosInstance.post("feed/unsubscribe", req),
+        importOpml: (req: File) => {
+            const formData = new FormData()
+            formData.append("file", req)
+            return axiosInstance.post("feed/import", formData, {
+                headers: {
+                    "Content-Type": "multipart/form-data",
+                },
+                // TODO remove redirect from backend method then remove this
+                validateStatus: () => true,
+            })
+        },
+    },
+    user: {
+        login: (req: LoginRequest) => axiosInstance.post("user/login", req),
+        register: (req: RegistrationRequest) => axiosInstance.post("user/register", req),
+        passwordReset: (req: PasswordResetRequest) => axiosInstance.post("user/passwordReset", req),
+        getSettings: () => axiosInstance.get<Settings>("user/settings"),
+        saveSettings: (settings: Settings) => axiosInstance.post("user/settings", settings),
+        getProfile: () => axiosInstance.get<UserModel>("user/profile"),
+        saveProfile: (req: ProfileModificationRequest) => axiosInstance.post("user/profile", req),
+        deleteProfile: () => axiosInstance.post("user/profile/deleteAccount"),
+    },
+    server: {
+        getServerInfos: () => axiosInstance.get<ServerInfo>("server/get"),
+    },
+    admin: {
+        getAllUsers: () => axiosInstance.get<UserModel[]>("admin/user/getAll"),
+        saveUser: (req: UserModel) => axiosInstance.post("admin/user/save", req),
+        deleteUser: (req: IDRequest) => axiosInstance.post("admin/user/delete", req),
+    },
+}
+
+/**
+ * transform an error object to an array of strings that can be displayed to the user
+ * @param err an error object (e.g. from axios)
+ * @returns an array of messages to show the user
+ */
+export const errorToStrings = (err: any) => {
+    let strings: string[] = []
+
+    if (axios.isAxiosError(err)) {
+        if (err.response) {
+            const data = err.response.data as any
+            if (typeof data === "string") strings.push(data)
+            if (typeof data === "object" && data.message) strings.push(data.message)
+            if (typeof data === "object" && data.errors) strings = [...strings, ...data.errors]
+        }
+    }
+
+    return strings
+}
+
+export const errorsToStrings = (errors: any[]) => errors.map(errorToStrings).flat()
--- a/commafeed-client/src/app/constants.ts
+++ b/commafeed-client/src/app/constants.ts
@@ -0,0 +1,15 @@
+import { DEFAULT_THEME } from "@mantine/core"
+
+export const Constants = {
+    categoryIds: {
+        all: "all",
+    },
+    layout: {
+        mobileBreakpoint: DEFAULT_THEME.breakpoints.md,
+        headerHeight: 60,
+        sidebarWidth: 350,
+    },
+    dom: {
+        mainScrollAreaId: "main-scroll-area-id",
+    },
+}
--- a/commafeed-client/src/app/slices/entries.test.ts
+++ b/commafeed-client/src/app/slices/entries.test.ts
@@ -0,0 +1,146 @@
+/* eslint-disable import/first */
+import { beforeEach, describe, expect, it, vi } from "vitest"
+import { DeepMockProxy, mockDeep, mockReset } from "vitest-mock-extended"
+
+vi.doMock("app/client", () => ({ client: mockDeep() }))
+
+import { configureStore } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { reducers } from "app/store"
+import { Entries, Entry } from "app/types"
+import { AxiosResponse } from "axios"
+import { loadEntries, loadMoreEntries, markAllEntries, markEntry } from "./entries"
+
+describe("entries", () => {
+    const mockClient = client as DeepMockProxy<typeof client>
+
+    beforeEach(() => {
+        mockReset(mockClient)
+    })
+
+    it("loads entries", async () => {
+        mockClient.feed.getEntries.mockResolvedValue({
+            data: {
+                entries: [{ id: "3" } as Entry],
+                hasMore: false,
+                name: "my-feed",
+                errorCount: 3,
+                feedLink: "https://mysite.com/feed",
+                timestamp: 123,
+                ignoredReadStatus: false,
+            },
+        } as AxiosResponse<Entries>)
+
+        const store = configureStore({ reducer: reducers })
+        const promise = store.dispatch(
+            loadEntries({
+                sourceType: "feed",
+                req: {
+                    id: "feed-id",
+                },
+            })
+        )
+
+        expect(store.getState().entries.source.type).toBe("feed")
+        expect(store.getState().entries.source.id).toBe("feed-id")
+        expect(store.getState().entries.entries).toStrictEqual([])
+        expect(store.getState().entries.hasMore).toBe(true)
+        expect(store.getState().entries.sourceLabel).toBe("")
+        expect(store.getState().entries.sourceWebsiteUrl).toBe("")
+        expect(store.getState().entries.timestamp).toBeUndefined()
+
+        await promise
+        expect(store.getState().entries.source.type).toBe("feed")
+        expect(store.getState().entries.source.id).toBe("feed-id")
+        expect(store.getState().entries.entries).toStrictEqual([{ id: "3" }])
+        expect(store.getState().entries.hasMore).toBe(false)
+        expect(store.getState().entries.sourceLabel).toBe("my-feed")
+        expect(store.getState().entries.sourceWebsiteUrl).toBe("https://mysite.com/feed")
+        expect(store.getState().entries.timestamp).toBe(123)
+    })
+
+    it("loads more entries", async () => {
+        mockClient.category.getEntries.mockResolvedValue({
+            data: {
+                entries: [{ id: "4" } as Entry],
+                hasMore: false,
+                name: "my-feed",
+                errorCount: 3,
+                feedLink: "https://mysite.com/feed",
+                timestamp: 123,
+                ignoredReadStatus: false,
+            },
+        } as AxiosResponse<Entries>)
+
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                entries: {
+                    source: {
+                        type: "category",
+                        id: "category-id",
+                    },
+                    sourceLabel: "",
+                    sourceWebsiteUrl: "",
+                    entries: [{ id: "3" } as Entry],
+                    hasMore: true,
+                },
+            },
+        })
+        const promise = store.dispatch(loadMoreEntries())
+
+        await promise
+        expect(store.getState().entries.entries).toStrictEqual([{ id: "3" }, { id: "4" }])
+        expect(store.getState().entries.hasMore).toBe(false)
+    })
+
+    it("marks an entry as read", async () => {
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                entries: {
+                    source: {
+                        type: "category",
+                        id: "category-id",
+                    },
+                    sourceLabel: "",
+                    sourceWebsiteUrl: "",
+                    entries: [{ id: "3", read: false } as Entry, { id: "4", read: false } as Entry],
+                    hasMore: true,
+                },
+            },
+        })
+
+        store.dispatch(markEntry({ entry: { id: "3" } as Entry, read: true }))
+        expect(store.getState().entries.entries).toStrictEqual([
+            { id: "3", read: true },
+            { id: "4", read: false },
+        ])
+        expect(mockClient.entry.mark).toHaveBeenCalledWith({ id: "3", read: true })
+    })
+
+    it("marks all entries as read", async () => {
+        const store = configureStore({
+            reducer: reducers,
+            preloadedState: {
+                entries: {
+                    source: {
+                        type: "category",
+                        id: "category-id",
+                    },
+                    sourceLabel: "",
+                    sourceWebsiteUrl: "",
+                    entries: [{ id: "3", read: false } as Entry, { id: "4", read: false } as Entry],
+                    hasMore: true,
+                },
+            },
+        })
+
+        store.dispatch(markAllEntries({ sourceType: "category", req: { id: "all", read: true } }))
+        expect(store.getState().entries.entries).toStrictEqual([
+            { id: "3", read: true },
+            { id: "4", read: true },
+        ])
+        expect(mockClient.category.markEntries).toHaveBeenCalledWith({ id: "all", read: true })
+    })
+})
--- a/commafeed-client/src/app/slices/entries.ts
+++ b/commafeed-client/src/app/slices/entries.ts
@@ -0,0 +1,205 @@
+import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { Constants } from "app/constants"
+import { RootState } from "app/store"
+import { Entries, Entry, GetEntriesRequest, MarkRequest } from "app/types"
+
+export type EntrySourceType = "category" | "feed"
+export type EntrySource = { type: EntrySourceType; id: string }
+export type ExpendableEntry = Entry & { expanded?: boolean }
+
+interface EntriesState {
+    /** selected source */
+    source: EntrySource
+    sourceLabel: string
+    sourceWebsiteUrl: string
+    entries: ExpendableEntry[]
+    /** stores when the first batch of entries were retrieved
+     *
+     * this is used when marking all entries of a feed/category to only mark entries up to that timestamp as newer entries were potentially never shown
+     */
+    timestamp?: number
+    selectedEntryId?: string
+    hasMore: boolean
+}
+
+const initialState: EntriesState = {
+    source: {
+        type: "category",
+        id: Constants.categoryIds.all,
+    },
+    sourceLabel: "",
+    sourceWebsiteUrl: "",
+    entries: [],
+    hasMore: true,
+}
+
+const getEndpoint = (sourceType: EntrySourceType) => (sourceType === "category" ? client.category.getEntries : client.feed.getEntries)
+export const loadEntries = createAsyncThunk<Entries, { req: GetEntriesRequest; sourceType: EntrySourceType }, { state: RootState }>(
+    "entries/load",
+    async arg => {
+        const endpoint = getEndpoint(arg.sourceType)
+        const result = await endpoint({
+            ...arg.req,
+            offset: 0,
+            limit: 50,
+        })
+        return result.data
+    }
+)
+export const loadMoreEntries = createAsyncThunk<Entries, void, { state: RootState }>("entries/loadMore", async (_, thunkApi) => {
+    const state = thunkApi.getState()
+    const offset =
+        state.user.settings?.readingMode === "all" ? state.entries.entries.length : state.entries.entries.filter(e => !e.read).length
+    const endpoint = getEndpoint(state.entries.source.type)
+    const result = await endpoint({
+        id: state.entries.source.id,
+        readType: state.user.settings?.readingMode,
+        order: state.user.settings?.readingOrder,
+        offset,
+        limit: 50,
+    })
+    return result.data
+})
+export const reloadEntries = createAsyncThunk<Entries, void, { state: RootState }>("entries/reload", async (_, thunkApi) => {
+    const state = thunkApi.getState()
+    const endpoint = getEndpoint(state.entries.source.type)
+    const result = await endpoint({
+        id: state.entries.source.id,
+        readType: state.user.settings?.readingMode,
+        order: state.user.settings?.readingOrder,
+        offset: 0,
+        limit: 50,
+    })
+    return result.data
+})
+export const markEntry = createAsyncThunk(
+    "entries/entry/mark",
+    (arg: { entry: Entry; read: boolean }) => {
+        client.entry.mark({
+            id: arg.entry.id,
+            read: arg.read,
+        })
+    },
+    {
+        condition: arg => arg.entry.read !== arg.read,
+    }
+)
+export const markAllEntries = createAsyncThunk("entries/entry/markAll", (arg: { sourceType: EntrySourceType; req: MarkRequest }) => {
+    const endpoint = arg.sourceType === "category" ? client.category.markEntries : client.feed.markEntries
+    endpoint(arg.req)
+})
+export const selectEntry = createAsyncThunk<void, Entry, { state: RootState }>("entries/entry/select", (arg, thunkApi) => {
+    const state = thunkApi.getState()
+    const entry = state.entries.entries.find(e => e.id === arg.id)
+    if (!entry) return
+
+    // only mark entry as read if we're expanding
+    if (!entry.expanded) {
+        thunkApi.dispatch(markEntry({ entry, read: true }))
+    }
+
+    // set entry as selected
+    thunkApi.dispatch(entriesSlice.actions.setSelectedEntry(entry))
+
+    // collapse or expand entry if needed
+    const previouslySelectedEntry = state.entries.entries.find(e => e.id === state.entries.selectedEntryId)
+    if (entry === previouslySelectedEntry) {
+        // selecting an entry already selected toggles expanded status
+        thunkApi.dispatch(entriesSlice.actions.setEntryExpanded({ entry, expanded: !entry.expanded }))
+    } else {
+        if (previouslySelectedEntry) {
+            thunkApi.dispatch(entriesSlice.actions.setEntryExpanded({ entry: previouslySelectedEntry, expanded: false }))
+        }
+        thunkApi.dispatch(entriesSlice.actions.setEntryExpanded({ entry, expanded: true }))
+    }
+})
+export const selectPreviousEntry = createAsyncThunk<void, void, { state: RootState }>("entries/entry/selectPrevious", (_, thunkApi) => {
+    const state = thunkApi.getState()
+    const { entries } = state.entries
+    const previousIndex = entries.findIndex(e => e.id === state.entries.selectedEntryId) - 1
+    if (previousIndex >= 0) {
+        thunkApi.dispatch(selectEntry(entries[previousIndex]))
+    }
+})
+export const selectNextEntry = createAsyncThunk<void, void, { state: RootState }>("entries/entry/selectNext", (_, thunkApi) => {
+    const state = thunkApi.getState()
+    const { entries } = state.entries
+    const nextIndex = entries.findIndex(e => e.id === state.entries.selectedEntryId) + 1
+    if (nextIndex < entries.length) {
+        thunkApi.dispatch(selectEntry(entries[nextIndex]))
+    }
+})
+
+export const entriesSlice = createSlice({
+    name: "entries",
+    initialState,
+    reducers: {
+        setSelectedEntry: (state, action: PayloadAction<Entry>) => {
+            state.selectedEntryId = action.payload.id
+        },
+        setEntryExpanded: (state, action: PayloadAction<{ entry: Entry; expanded: boolean }>) => {
+            state.entries
+                .filter(e => e.id === action.payload.entry.id)
+                .forEach(e => {
+                    e.expanded = action.payload.expanded
+                })
+        },
+    },
+    extraReducers: builder => {
+        builder.addCase(markEntry.pending, (state, action) => {
+            state.entries
+                .filter(e => e.id === action.meta.arg.entry.id)
+                .forEach(e => {
+                    e.read = action.meta.arg.read
+                })
+        })
+        builder.addCase(markAllEntries.pending, state => {
+            state.entries.forEach(e => {
+                e.read = true
+            })
+        })
+        builder.addCase(loadEntries.pending, (state, action) => {
+            state.source = {
+                type: action.meta.arg.sourceType,
+                id: action.meta.arg.req.id,
+            }
+            state.entries = []
+            state.timestamp = undefined
+            state.sourceLabel = ""
+            state.sourceWebsiteUrl = ""
+            state.hasMore = true
+            state.selectedEntryId = undefined
+        })
+        builder.addCase(loadEntries.fulfilled, (state, action) => {
+            state.entries = action.payload.entries
+            state.timestamp = action.payload.timestamp
+            state.sourceLabel = action.payload.name
+            state.sourceWebsiteUrl = action.payload.feedLink
+            state.hasMore = action.payload.hasMore
+        })
+        builder.addCase(loadMoreEntries.fulfilled, (state, action) => {
+            // remove already existing entries
+            const entriesToAdd = action.payload.entries.filter(e => !state.entries.some(e2 => e.id === e2.id))
+            state.entries = [...state.entries, ...entriesToAdd]
+            state.hasMore = action.payload.hasMore
+        })
+        builder.addCase(reloadEntries.pending, state => {
+            state.entries = []
+            state.timestamp = undefined
+            state.sourceLabel = ""
+            state.sourceWebsiteUrl = ""
+            state.hasMore = true
+            state.selectedEntryId = undefined
+        })
+        builder.addCase(reloadEntries.fulfilled, (state, action) => {
+            state.entries = action.payload.entries
+            state.timestamp = action.payload.timestamp
+            state.sourceLabel = action.payload.name
+            state.sourceWebsiteUrl = action.payload.feedLink
+            state.hasMore = action.payload.hasMore
+        })
+    },
+})
+
+export default entriesSlice.reducer
--- a/commafeed-client/src/app/slices/redirect.test.ts
+++ b/commafeed-client/src/app/slices/redirect.test.ts
@@ -0,0 +1,10 @@
+import { store } from "app/store"
+import { describe, expect, it } from "vitest"
+import { redirectToCategory } from "./redirect"
+
+describe("redirects", () => {
+    it("redirects to category", async () => {
+        await store.dispatch(redirectToCategory("1"))
+        expect(store.getState().redirect.to).toBe("/app/category/1")
+    })
+})
--- a/commafeed-client/src/app/slices/redirect.ts
+++ b/commafeed-client/src/app/slices/redirect.ts
@@ -0,0 +1,52 @@
+import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
+import { Constants } from "app/constants"
+import { RootState } from "app/store"
+
+interface RedirectState {
+    to?: string
+}
+
+const initialState: RedirectState = {}
+
+export const redirectToLogin = createAsyncThunk("redirect/login", (_, thunkApi) => thunkApi.dispatch(redirectTo("/login")))
+export const redirectToRegistration = createAsyncThunk("redirect/register", (_, thunkApi) => thunkApi.dispatch(redirectTo("/register")))
+export const redirectToPasswordRecovery = createAsyncThunk("redirect/passwordRecovery", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/passwordRecovery"))
+)
+export const redirectToSelectedSource = createAsyncThunk<void, void, { state: RootState }>("redirect/selectedSource", (_, thunkApi) => {
+    const { source } = thunkApi.getState().entries
+    thunkApi.dispatch(redirectTo(`/app/${source.type}/${source.id}`))
+})
+export const redirectToCategory = createAsyncThunk("redirect/category", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/category/${id}`))
+)
+export const redirectToRootCategory = createAsyncThunk("redirect/category/root", (_, thunkApi) =>
+    thunkApi.dispatch(redirectToCategory(Constants.categoryIds.all))
+)
+export const redirectToCategoryDetails = createAsyncThunk("redirect/category/details", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/category/${id}/details`))
+)
+export const redirectToFeed = createAsyncThunk("redirect/feed", (id: string | number, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/feed/${id}`))
+)
+export const redirectToFeedDetails = createAsyncThunk("redirect/feed/details", (id: string, thunkApi) =>
+    thunkApi.dispatch(redirectTo(`/app/feed/${id}/details`))
+)
+export const redirectToAdd = createAsyncThunk("redirect/add", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/add")))
+export const redirectToSettings = createAsyncThunk("redirect/settings", (_, thunkApi) => thunkApi.dispatch(redirectTo("/app/settings")))
+export const redirectToAdminUsers = createAsyncThunk("redirect/admin/users", (_, thunkApi) =>
+    thunkApi.dispatch(redirectTo("/app/admin/users"))
+)
+
+export const redirectSlice = createSlice({
+    name: "redirect",
+    initialState,
+    reducers: {
+        redirectTo: (state, action: PayloadAction<string | undefined>) => {
+            state.to = action.payload
+        },
+    },
+})
+
+export const { redirectTo } = redirectSlice.actions
+export default redirectSlice.reducer
--- a/commafeed-client/src/app/slices/server.ts
+++ b/commafeed-client/src/app/slices/server.ts
@@ -0,0 +1,23 @@
+import { createAsyncThunk, createSlice } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { ServerInfo } from "app/types"
+
+interface ServerState {
+    serverInfos?: ServerInfo
+}
+
+const initialState: ServerState = {}
+
+export const reloadServerInfos = createAsyncThunk("server/infos", () => client.server.getServerInfos().then(r => r.data))
+export const serverSlice = createSlice({
+    name: "server",
+    initialState,
+    reducers: {},
+    extraReducers: builder => {
+        builder.addCase(reloadServerInfos.fulfilled, (state, action) => {
+            state.serverInfos = action.payload
+        })
+    },
+})
+
+export default serverSlice.reducer
--- a/commafeed-client/src/app/slices/tree.ts
+++ b/commafeed-client/src/app/slices/tree.ts
@@ -0,0 +1,77 @@
+import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { Category, CollapseRequest } from "app/types"
+import { visitCategoryTree } from "app/utils"
+import { markAllEntries, markEntry } from "./entries"
+import { redirectTo } from "./redirect"
+
+interface TreeState {
+    rootCategory?: Category
+    mobileMenuOpen: boolean
+}
+
+const initialState: TreeState = {
+    mobileMenuOpen: false,
+}
+
+export const reloadTree = createAsyncThunk("tree/reload", () => client.category.getRoot().then(r => r.data))
+export const collapseTreeCategory = createAsyncThunk("tree/category/collapse", async (req: CollapseRequest) =>
+    client.category.collapse(req)
+)
+
+export const treeSlice = createSlice({
+    name: "tree",
+    initialState,
+    reducers: {
+        setMobileMenuOpen: (state, action: PayloadAction<boolean>) => {
+            state.mobileMenuOpen = action.payload
+        },
+    },
+    extraReducers: builder => {
+        builder.addCase(reloadTree.fulfilled, (state, action) => {
+            state.rootCategory = action.payload
+        })
+        builder.addCase(collapseTreeCategory.pending, (state, action) => {
+            if (!state.rootCategory) return
+            visitCategoryTree(state.rootCategory, c => {
+                if (+c.id === action.meta.arg.id) c.expanded = !action.meta.arg.collapse
+            })
+        })
+        builder.addCase(markEntry.pending, (state, action) => {
+            if (!state.rootCategory) return
+            visitCategoryTree(state.rootCategory, c =>
+                c.feeds
+                    .filter(f => f.id === +action.meta.arg.entry.feedId)
+                    .forEach(f => {
+                        f.unread = action.meta.arg.read ? f.unread - 1 : f.unread + 1
+                    })
+            )
+        })
+        builder.addCase(markAllEntries.pending, (state, action) => {
+            if (!state.rootCategory) return
+            const { sourceType } = action.meta.arg
+            const sourceId = action.meta.arg.req.id
+            visitCategoryTree(state.rootCategory, c => {
+                if (sourceType === "category" && c.id === sourceId) {
+                    visitCategoryTree(c, c2 =>
+                        c2.feeds.forEach(f => {
+                            f.unread = 0
+                        })
+                    )
+                } else if (sourceType === "feed") {
+                    c.feeds
+                        .filter(f => f.id === +sourceId)
+                        .forEach(f => {
+                            f.unread = 0
+                        })
+                }
+            })
+        })
+        builder.addCase(redirectTo, state => {
+            state.mobileMenuOpen = false
+        })
+    },
+})
+
+export const { setMobileMenuOpen } = treeSlice.actions
+export default treeSlice.reducer
--- a/commafeed-client/src/app/slices/user.ts
+++ b/commafeed-client/src/app/slices/user.ts
@@ -0,0 +1,80 @@
+import { t } from "@lingui/macro"
+import { showNotification } from "@mantine/notifications"
+import { createAsyncThunk, createSlice, isAnyOf } from "@reduxjs/toolkit"
+import { client } from "app/client"
+import { RootState } from "app/store"
+import { ReadingMode, ReadingOrder, Settings, UserModel } from "app/types"
+
+interface UserState {
+    settings?: Settings
+    profile?: UserModel
+}
+
+const initialState: UserState = {}
+
+export const reloadSettings = createAsyncThunk("settings/reload", () => client.user.getSettings().then(r => r.data))
+export const reloadProfile = createAsyncThunk("profile/reload", () => client.user.getProfile().then(r => r.data))
+export const changeReadingMode = createAsyncThunk<void, ReadingMode, { state: RootState }>(
+    "settings/readingMode",
+    (readingMode, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({ ...settings, readingMode })
+    }
+)
+export const changeReadingOrder = createAsyncThunk<void, ReadingOrder, { state: RootState }>(
+    "settings/readingOrder",
+    (readingOrder, thunkApi) => {
+        const { settings } = thunkApi.getState().user
+        if (!settings) return
+        client.user.saveSettings({ ...settings, readingOrder })
+    }
+)
+export const changeLanguage = createAsyncThunk<void, string, { state: RootState }>("settings/language", (language, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, language })
+})
+export const changeScrollSpeed = createAsyncThunk<void, boolean, { state: RootState }>("settings/scrollSpeed", (speed, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, scrollSpeed: speed ? 400 : 0 })
+})
+
+export const userSlice = createSlice({
+    name: "user",
+    initialState,
+    reducers: {},
+    extraReducers: builder => {
+        builder.addCase(reloadSettings.fulfilled, (state, action) => {
+            state.settings = action.payload
+        })
+        builder.addCase(reloadProfile.fulfilled, (state, action) => {
+            state.profile = action.payload
+        })
+        builder.addCase(changeReadingMode.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.readingMode = action.meta.arg
+        })
+        builder.addCase(changeReadingOrder.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.readingOrder = action.meta.arg
+        })
+        builder.addCase(changeLanguage.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.language = action.meta.arg
+        })
+        builder.addCase(changeScrollSpeed.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.scrollSpeed = action.meta.arg ? 400 : 0
+        })
+        builder.addMatcher(isAnyOf(changeLanguage.fulfilled, changeScrollSpeed.fulfilled), () => {
+            showNotification({
+                message: t`Settings saved.`,
+                color: "green",
+            })
+        })
+    },
+})
+
+export default userSlice.reducer
--- a/commafeed-client/src/app/store.ts
+++ b/commafeed-client/src/app/store.ts
@@ -0,0 +1,26 @@
+import { configureStore } from "@reduxjs/toolkit"
+import { setupListeners } from "@reduxjs/toolkit/query"
+import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
+import entriesReducer from "./slices/entries"
+import redirectReducer from "./slices/redirect"
+import serverReducer from "./slices/server"
+import treeReducer from "./slices/tree"
+import userReducer from "./slices/user"
+
+export const reducers = {
+    entries: entriesReducer,
+    redirect: redirectReducer,
+    tree: treeReducer,
+    server: serverReducer,
+    user: userReducer,
+}
+
+export const store = configureStore({ reducer: reducers })
+
+setupListeners(store.dispatch)
+
+export type RootState = ReturnType<typeof store.getState>
+export type AppDispatch = typeof store.dispatch
+
+export const useAppDispatch: () => AppDispatch = useDispatch
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
--- a/commafeed-client/src/app/types.ts
+++ b/commafeed-client/src/app/types.ts
@@ -0,0 +1,261 @@
+export interface AddCategoryRequest {
+    name: string
+    parentId?: string
+}
+
+export interface ApplicationSettings {
+    publicUrl: string
+    allowRegistrations: boolean
+    createDemoAccount: boolean
+    googleAnalyticsTrackingCode?: string
+    googleAuthKey?: string
+    backgroundThreads: number
+    databaseUpdateThreads: number
+    smtpHost?: string
+    smtpPort?: number
+    smtpTls?: boolean
+    smtpUserName?: string
+    smtpPassword?: string
+    smtpFromAddress?: string
+    graphiteEnabled?: boolean
+    graphitePrefix?: string
+    graphiteHost?: string
+    graphitePort?: number
+    graphiteInterval?: number
+    heavyLoad: boolean
+    pubsubhubbub: boolean
+    imageProxyEnabled: boolean
+    queryTimeout: number
+    keepStatusDays: number
+    maxFeedCapacity: number
+    refreshIntervalMinutes: number
+    cache: ApplicationSettingsCache
+    announcement?: string
+    userAgent?: string
+    unreadThreshold?: Date
+}
+
+export interface Category {
+    id: string
+    parentId?: string
+    name: string
+    children: Category[]
+    feeds: Subscription[]
+    expanded: boolean
+    position: number
+}
+
+export interface CategoryModificationRequest {
+    id: number
+    name?: string
+    parentId?: string
+    position?: number
+}
+
+export interface CollapseRequest {
+    id: number
+    collapse: boolean
+}
+
+export interface Entries {
+    name: string
+    message?: string
+    errorCount: number
+    feedLink: string
+    timestamp: number
+    hasMore: boolean
+    offset?: number
+    limit?: number
+    entries: Entry[]
+    ignoredReadStatus: boolean
+}
+
+export interface Entry {
+    id: string
+    guid: string
+    title: string
+    content: string
+    categories?: string
+    rtl: boolean
+    author?: string
+    enclosureUrl?: string
+    enclosureType?: string
+    mediaDescription?: string
+    mediaThumbnailUrl?: string
+    mediaThumbnailWidth?: number
+    mediaThumbnailHeight?: number
+    date: number
+    insertedDate: number
+    feedId: string
+    feedName: string
+    feedUrl: string
+    feedLink: string
+    iconUrl: string
+    url: string
+    read: boolean
+    starred: boolean
+    markable: boolean
+    tags: string[]
+}
+
+export interface FeedInfo {
+    url: string
+    title: string
+}
+
+export interface FeedInfoRequest {
+    url: string
+}
+
+export interface FeedModificationRequest {
+    id: number
+    name?: string
+    categoryId?: string
+    position?: number
+    filter?: string
+}
+
+export interface IDRequest {
+    id: number
+}
+
+export interface LoginRequest {
+    name: string
+    password: string
+}
+
+export interface MarkRequest {
+    id: string
+    read: boolean
+    olderThan?: number
+    keywords?: string
+    excludedSubscriptions?: number[]
+}
+
+export interface MultipleMarkRequest {
+    requests: MarkRequest[]
+}
+
+export interface PasswordResetRequest {
+    email: string
+}
+
+export interface ProfileModificationRequest {
+    currentPassword: string
+    email: string
+    newPassword?: string
+    newApiKey?: boolean
+}
+
+export interface RegistrationRequest {
+    name: string
+    password: string
+    email: string
+}
+
+export interface ServerInfo {
+    announcement?: string
+    version: string
+    gitCommit: string
+    allowRegistrations: boolean
+    googleAnalyticsCode?: string
+    smtpEnabled: boolean
+}
+
+export interface Settings {
+    language: string
+    readingMode: ReadingMode
+    readingOrder: ReadingOrder
+    viewMode: ViewMode
+    showRead: boolean
+    scrollMarks: boolean
+    theme?: string
+    customCss?: string
+    scrollSpeed: number
+    email: boolean
+    gmail: boolean
+    facebook: boolean
+    twitter: boolean
+    googleplus: boolean
+    tumblr: boolean
+    pocket: boolean
+    instapaper: boolean
+    buffer: boolean
+    readability: boolean
+}
+
+export interface StarRequest {
+    id: string
+    feedId: number
+    starred: boolean
+}
+
+export interface SubscribeRequest {
+    url: string
+    title: string
+    categoryId?: string
+}
+
+export interface Subscription {
+    id: number
+    name: string
+    message?: string
+    errorCount: number
+    lastRefresh?: number
+    nextRefresh?: number
+    feedUrl: string
+    feedLink: string
+    iconUrl: string
+    unread: number
+    categoryId?: string
+    position?: number
+    newestItemTime?: number
+    filter?: string
+}
+
+export interface TagRequest {
+    entryId: number
+    tags: string[]
+}
+
+export interface GetEntriesRequest {
+    id: string
+    readType?: ReadingMode
+    newerThan?: number
+    order?: ReadingOrder
+    keywords?: string
+    onlyIds?: boolean
+    excludedSubscriptionIds?: string
+    tag?: string
+}
+
+export interface GetEntriesPaginatedRequest extends GetEntriesRequest {
+    offset: number
+    limit: number
+}
+
+export interface UnreadCount {
+    feedId?: number
+    unreadCount?: number
+    newestItemTime?: number
+}
+
+export interface UserModel {
+    id: number
+    name: string
+    email?: string
+    apiKey?: string
+    password?: string
+    enabled: boolean
+    created: number
+    lastLogin?: number
+    admin: boolean
+}
+
+export type ApplicationSettingsCache = "NOOP" | "REDIS"
+
+export type ReadingMode = "all" | "unread"
+
+export type ReadingOrder = "asc" | "desc"
+
+export type ViewMode = "title" | "expanded"
--- a/commafeed-client/src/app/utils.ts
+++ b/commafeed-client/src/app/utils.ts
@@ -0,0 +1,21 @@
+import { Category } from "./types"
+
+export function visitCategoryTree(category: Category, visitor: (category: Category) => void): void {
+    visitor(category)
+    category.children.forEach(child => visitCategoryTree(child, visitor))
+}
+
+export function flattenCategoryTree(category: Category): Category[] {
+    const categories: Category[] = []
+    visitCategoryTree(category, c => categories.push(c))
+    return categories
+}
+
+export function categoryUnreadCount(category?: Category): number {
+    if (!category) return 0
+
+    return flattenCategoryTree(category)
+        .flatMap(c => c.feeds)
+        .map(f => f.unread)
+        .reduce((total, current) => total + current, 0)
+}
--- a/commafeed-client/src/main/app/app-icon.svg
+++ b/commafeed-client/src/main/app/app-icon.svg
--- a/commafeed-client/src/components/ActionButtton.tsx
+++ b/commafeed-client/src/components/ActionButtton.tsx
@@ -0,0 +1,28 @@
+import { ActionIcon, Button, useMantineTheme } from "@mantine/core"
+import { useMediaQuery } from "@mantine/hooks"
+import { forwardRef } from "react"
+
+interface ActionButtonProps {
+    className?: string
+    icon?: React.ReactNode
+    label?: string
+    onClick?: React.MouseEventHandler
+}
+
+/**
+ * Switches between Button with label (desktop) and ActionIcon (mobile)
+ */
+export const ActionButton = forwardRef<HTMLButtonElement, ActionButtonProps>((props: ActionButtonProps, ref) => {
+    const theme = useMantineTheme()
+    const mobile = !useMediaQuery(`(min-width: ${theme.breakpoints.lg}px)`)
+    return mobile ? (
+        <ActionIcon ref={ref} color={theme.primaryColor} variant="subtle" className={props.className} onClick={props.onClick}>
+            {props.icon}
+        </ActionIcon>
+    ) : (
+        <Button ref={ref} variant="subtle" size="xs" className={props.className} leftIcon={props.icon} onClick={props.onClick}>
+            {props.label}
+        </Button>
+    )
+})
+ActionButton.displayName = "HeaderButton"
--- a/commafeed-client/src/components/Alert.tsx
+++ b/commafeed-client/src/components/Alert.tsx
@@ -0,0 +1,48 @@
+import { t } from "@lingui/macro"
+import { Alert as MantineAlert, Box } from "@mantine/core"
+import { Fragment } from "react"
+import { TbAlertCircle, TbAlertTriangle, TbCircleCheck } from "react-icons/tb"
+
+type Level = "error" | "warning" | "success"
+export interface ErrorsAlertProps {
+    level?: Level
+    messages: string[]
+}
+
+export function Alert(props: ErrorsAlertProps) {
+    let title: string
+    let color: string
+    let icon: React.ReactNode
+
+    const level = props.level ?? "error"
+    switch (level) {
+        case "error":
+            title = t`Error`
+            color = "red"
+            icon = <TbAlertCircle />
+            break
+        case "warning":
+            title = t`Warning`
+            color = "orange"
+            icon = <TbAlertTriangle />
+            break
+        case "success":
+            title = t`Success`
+            color = "green"
+            icon = <TbCircleCheck />
+            break
+        default:
+            throw Error(`unsupported level: ${level}`)
+    }
+
+    return (
+        <MantineAlert title={title} color={color} icon={icon}>
+            {props.messages.map((m, i) => (
+                <Fragment key={m}>
+                    <Box>{m}</Box>
+                    {i !== props.messages.length - 1 && <br />}
+                </Fragment>
+            ))}
+        </MantineAlert>
+    )
+}
--- a/commafeed-client/src/components/Loader.tsx
+++ b/commafeed-client/src/components/Loader.tsx
@@ -0,0 +1,9 @@
+import { Center, Loader as MantineLoader } from "@mantine/core"
+
+export function Loader() {
+    return (
+        <Center>
+            <MantineLoader size="xl" variant="bars" />
+        </Center>
+    )
+}
--- a/commafeed-client/src/components/Logo.tsx
+++ b/commafeed-client/src/components/Logo.tsx
@@ -0,0 +1,10 @@
+import { Image } from "@mantine/core"
+import logo from "assets/logo.svg"
+
+export interface LogoProps {
+    size: number
+}
+
+export function Logo(props: LogoProps) {
+    return <Image src={logo} width={props.size} />
+}
--- a/commafeed-client/src/components/RelativeDate.tsx
+++ b/commafeed-client/src/components/RelativeDate.tsx
@@ -0,0 +1,14 @@
+import { Trans } from "@lingui/macro"
+import dayjs from "dayjs"
+import { useEffect, useState } from "react"
+
+export function RelativeDate(props: { date: Date | number | undefined }) {
+    const [now, setNow] = useState(new Date())
+    useEffect(() => {
+        const interval = setInterval(() => setNow(new Date()), 60 * 1000)
+        return () => clearInterval(interval)
+    }, [])
+
+    if (!props.date) return <Trans>N/A</Trans>
+    return <>{dayjs(props.date).from(dayjs(now))}</>
+}
--- a/commafeed-client/src/components/admin/UserEdit.tsx
+++ b/commafeed-client/src/components/admin/UserEdit.tsx
@@ -0,0 +1,51 @@
+import { t, Trans } from "@lingui/macro"
+import { Box, Button, Checkbox, Group, PasswordInput, Stack, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { UserModel } from "app/types"
+import { Alert } from "components/Alert"
+import { TbDeviceFloppy } from "react-icons/tb"
+import useMutation from "use-mutation"
+
+interface UserEditProps {
+    user?: UserModel
+    onCancel: () => void
+    onSave: () => void
+}
+
+export function UserEdit(props: UserEditProps) {
+    const form = useForm<UserModel>({
+        initialValues: props.user ?? ({ enabled: true } as UserModel),
+    })
+    const [saveUser, saveUserResult] = useMutation(client.admin.saveUser, { onSuccess: props.onSave })
+    const errors = errorToStrings(saveUserResult.error)
+
+    return (
+        <>
+            {errors.length > 0 && (
+                <Box mb="md">
+                    <Alert messages={errors} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(saveUser)}>
+                <Stack>
+                    <TextInput label={t`Name`} {...form.getInputProps("name")} required />
+                    <PasswordInput label={t`Password`} {...form.getInputProps("password")} required={!props.user} />
+                    <TextInput type="email" label={t`E-mail`} {...form.getInputProps("email")} />
+                    <Checkbox label={t`Admin`} {...form.getInputProps("admin", { type: "checkbox" })} />
+                    <Checkbox label={t`Enabled`} {...form.getInputProps("enabled", { type: "checkbox" })} />
+
+                    <Group>
+                        <Button variant="default" onClick={props.onCancel}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveUserResult.status === "running"}>
+                            <Trans>Save</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}
--- a/commafeed-client/src/components/content/Content.tsx
+++ b/commafeed-client/src/components/content/Content.tsx
@@ -0,0 +1,30 @@
+import { createStyles, Text } from "@mantine/core"
+
+export interface ContentProps {
+    content: string
+}
+
+const useStyles = createStyles(theme => ({
+    content: {
+        // break long links or long words
+        overflowWrap: "anywhere",
+        "& a": {
+            color: theme.fn.variant({ color: theme.primaryColor, variant: "subtle" }).color,
+        },
+        "& img": {
+            maxWidth: "100%",
+            height: "auto",
+        },
+        "& iframe": {
+            maxWidth: "100%",
+        },
+        "& pre, & code": {
+            whiteSpace: "pre-wrap",
+        },
+    },
+}))
+
+export function Content(props: ContentProps) {
+    const { classes } = useStyles()
+    return <Text size="md" className={classes.content} dangerouslySetInnerHTML={{ __html: props.content }} />
+}
--- a/commafeed-client/src/components/content/Enclosure.tsx
+++ b/commafeed-client/src/components/content/Enclosure.tsx
@@ -0,0 +1,32 @@
+import { createStyles } from "@mantine/core"
+
+const useStyles = createStyles(() => ({
+    enclosureImage: {
+        maxWidth: "100%",
+        height: "auto",
+    },
+}))
+
+export function Enclosure(props: { enclosureType?: string; enclosureUrl?: string }) {
+    const { classes } = useStyles()
+    const hasVideo = props.enclosureType && props.enclosureType.indexOf("video") === 0
+    const hasAudio = props.enclosureType && props.enclosureType.indexOf("audio") === 0
+    const hasImage = props.enclosureType && props.enclosureType.indexOf("image") === 0
+    return (
+        <>
+            {hasVideo && (
+                // eslint-disable-next-line jsx-a11y/media-has-caption
+                <video controls>
+                    <source src={props.enclosureUrl} type={props.enclosureType} />
+                </video>
+            )}
+            {hasAudio && (
+                // eslint-disable-next-line jsx-a11y/media-has-caption
+                <audio controls>
+                    <source src={props.enclosureUrl} type={props.enclosureType} />
+                </audio>
+            )}
+            {hasImage && <img src={props.enclosureUrl} alt="enclosure" className={classes.enclosureImage} />}
+        </>
+    )
+}
--- a/commafeed-client/src/components/content/FeedEntries.tsx
+++ b/commafeed-client/src/components/content/FeedEntries.tsx
@@ -0,0 +1,155 @@
+import { Constants } from "app/constants"
+import {
+    loadMoreEntries,
+    markAllEntries,
+    markEntry,
+    reloadEntries,
+    selectEntry,
+    selectNextEntry,
+    selectPreviousEntry,
+} from "app/slices/entries"
+import { redirectToRootCategory } from "app/slices/redirect"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { Loader } from "components/Loader"
+import { useMousetrap } from "hooks/useMousetrap"
+import { useEffect, useRef } from "react"
+import InfiniteScroll from "react-infinite-scroller"
+import { FeedEntry } from "./FeedEntry"
+
+export function FeedEntries() {
+    const source = useAppSelector(state => state.entries.source)
+    const entries = useAppSelector(state => state.entries.entries)
+    const entriesTimestamp = useAppSelector(state => state.entries.timestamp)
+    const selectedEntryId = useAppSelector(state => state.entries.selectedEntryId)
+    const hasMore = useAppSelector(state => state.entries.hasMore)
+    const dispatch = useAppDispatch()
+
+    const selectedEntry = entries.find(e => e.id === selectedEntryId)
+
+    // references to entries html elements
+    const refs = useRef<{ [id: string]: HTMLDivElement }>({})
+    useEffect(() => {
+        // remove refs that are not in entries anymore
+        Object.keys(refs.current).forEach(k => {
+            const found = entries.some(e => e.id === k)
+            if (!found) delete refs.current[k]
+        })
+    }, [entries])
+
+    useMousetrap("r", () => {
+        dispatch(reloadEntries())
+    })
+    useMousetrap("j", () => {
+        dispatch(selectNextEntry())
+    })
+    useMousetrap("k", () => {
+        dispatch(selectPreviousEntry())
+    })
+    useMousetrap("space", () => {
+        if (selectedEntry) {
+            if (selectedEntry.expanded) {
+                const ref = refs.current[selectedEntry.id]
+                const bottomVisible = ref.getBoundingClientRect().bottom <= window.innerHeight
+                if (bottomVisible) {
+                    dispatch(selectNextEntry())
+                } else {
+                    const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
+                    scrollArea?.scrollTo({
+                        top: scrollArea.scrollTop + scrollArea.clientHeight * 0.8,
+                        behavior: "smooth",
+                    })
+                }
+            } else {
+                dispatch(selectEntry(selectedEntry))
+            }
+        } else {
+            dispatch(selectNextEntry())
+        }
+    })
+    useMousetrap("shift+space", () => {
+        if (selectedEntry) {
+            if (selectedEntry.expanded) {
+                const ref = refs.current[selectedEntry.id]
+                const topVisible = ref.getBoundingClientRect().top >= Constants.layout.headerHeight
+                if (topVisible) {
+                    dispatch(selectPreviousEntry())
+                } else {
+                    const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
+                    scrollArea?.scrollTo({
+                        top: scrollArea.scrollTop - scrollArea.clientHeight * 0.8,
+                        behavior: "smooth",
+                    })
+                }
+            } else {
+                dispatch(selectPreviousEntry())
+            }
+        }
+    })
+    useMousetrap(["o", "enter"], () => {
+        // toggle expanded status
+        if (!selectedEntry) return
+        dispatch(selectEntry(selectedEntry))
+    })
+    useMousetrap("v", () => {
+        // open tab in foreground
+        if (!selectedEntry) return
+        window.open(selectedEntry.url, "_blank", "noreferrer")
+    })
+    useMousetrap("b", () => {
+        // simulate ctrl+click to open tab in background
+        if (!selectedEntry) return
+        const a = document.createElement("a")
+        a.href = selectedEntry.url
+        a.rel = "noreferrer"
+        a.dispatchEvent(
+            new MouseEvent("click", {
+                ctrlKey: true,
+                metaKey: true,
+            })
+        )
+    })
+    useMousetrap("m", () => {
+        // toggle read status
+        if (!selectedEntry) return
+        dispatch(markEntry({ entry: selectedEntry, read: !selectedEntry.read }))
+    })
+    useMousetrap("shift+a", () => {
+        // mark all entries as read
+        dispatch(
+            markAllEntries({
+                sourceType: source.type,
+                req: {
+                    id: source.id,
+                    read: true,
+                    olderThan: entriesTimestamp,
+                },
+            })
+        )
+    })
+    useMousetrap("g a", () => {
+        dispatch(redirectToRootCategory())
+    })
+
+    if (!entries) return <Loader />
+    return (
+        <InfiniteScroll
+            initialLoad={false}
+            loadMore={() => dispatch(loadMoreEntries())}
+            hasMore={hasMore}
+            loader={<Loader key={0} />}
+            useWindow={false}
+            getScrollParent={() => document.getElementById(Constants.dom.mainScrollAreaId)}
+        >
+            {entries.map(e => (
+                <div
+                    key={e.id}
+                    ref={el => {
+                        refs.current[e.id] = el!
+                    }}
+                >
+                    <FeedEntry entry={e} expanded={!!e.expanded} />
+                </div>
+            ))}
+        </InfiniteScroll>
+    )
+}
--- a/commafeed-client/src/components/content/FeedEntry.tsx
+++ b/commafeed-client/src/components/content/FeedEntry.tsx
@@ -0,0 +1,97 @@
+import { Anchor, Box, createStyles, Divider, Paper } from "@mantine/core"
+import { Constants } from "app/constants"
+import { markEntry, selectEntry } from "app/slices/entries"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { Entry } from "app/types"
+import React, { useEffect, useRef } from "react"
+import { FeedEntryBody } from "./FeedEntryBody"
+import { FeedEntryFooter } from "./FeedEntryFooter"
+import { FeedEntryHeader } from "./FeedEntryHeader"
+
+interface FeedEntryProps {
+    entry: Entry
+    expanded: boolean
+}
+
+const useStyles = createStyles((theme, props: FeedEntryProps) => {
+    let backgroundColor
+    if (theme.colorScheme === "dark") backgroundColor = props.entry.read ? "inherit" : theme.colors.dark[5]
+    else backgroundColor = props.entry.read && !props.expanded ? theme.colors.gray[0] : "inherit"
+
+    return {
+        paper: {
+            backgroundColor,
+            marginTop: theme.spacing.xs,
+            marginBottom: theme.spacing.xs,
+            [theme.fn.smallerThan(Constants.layout.mobileBreakpoint)]: {
+                marginTop: "6px",
+                marginBottom: "6px",
+            },
+        },
+        body: {
+            maxWidth: "650px",
+        },
+    }
+})
+
+export function FeedEntry(props: FeedEntryProps) {
+    const { classes } = useStyles(props)
+    const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
+    const dispatch = useAppDispatch()
+
+    const headerClicked = (e: React.MouseEvent) => {
+        if (e.button === 1 || e.ctrlKey || e.metaKey) {
+            // middle click
+            dispatch(markEntry({ entry: props.entry, read: true }))
+        } else if (e.button === 0) {
+            // main click
+            // don't trigger the link
+            e.preventDefault()
+
+            dispatch(selectEntry(props.entry))
+        }
+    }
+
+    // scroll to entry when expanded
+    const ref = useRef<HTMLDivElement>(null)
+    useEffect(() => {
+        setTimeout(() => {
+            if (!ref.current) return
+            if (!props.expanded) return
+
+            document.getElementById(Constants.dom.mainScrollAreaId)?.scrollTo({
+                // having a small gap between the top of the content and the top of the page is sexier
+                top: ref.current.offsetTop - 3,
+                behavior: scrollSpeed && scrollSpeed > 0 ? "smooth" : "auto",
+            })
+        })
+    }, [props.expanded, scrollSpeed])
+
+    return (
+        <div ref={ref}>
+            <Paper shadow="xs" withBorder className={classes.paper}>
+                <Anchor
+                    variant="text"
+                    href={props.entry.url}
+                    target="_blank"
+                    rel="noreferrer"
+                    onClick={headerClicked}
+                    onAuxClick={headerClicked}
+                >
+                    <Box p="xs">
+                        <FeedEntryHeader entry={props.entry} expanded={props.expanded} />
+                    </Box>
+                </Anchor>
+                {props.expanded && (
+                    <Box px="xs" pb="xs">
+                        <Box className={classes.body}>
+                            <FeedEntryBody entry={props.entry} />
+                        </Box>
+                        <Divider variant="dashed" my="xs" />
+                        <FeedEntryFooter entry={props.entry} />
+                    </Box>
+                )}
+            </Paper>
+        </div>
+    )
+}
--- a/commafeed-client/src/components/content/FeedEntryBody.tsx
+++ b/commafeed-client/src/components/content/FeedEntryBody.tsx
@@ -0,0 +1,35 @@
+import { Box } from "@mantine/core"
+import { Entry } from "app/types"
+import { Content } from "./Content"
+import { Enclosure } from "./Enclosure"
+import { Media } from "./Media"
+
+export interface FeedEntryBodyProps {
+    entry: Entry
+}
+
+export function FeedEntryBody(props: FeedEntryBodyProps) {
+    return (
+        <Box>
+            <Box>
+                <Content content={props.entry.content} />
+            </Box>
+            {props.entry.enclosureUrl && (
+                <Box pt="md">
+                    <Enclosure enclosureType={props.entry.enclosureType} enclosureUrl={props.entry.enclosureUrl} />
+                </Box>
+            )}
+            {/* show media only if we don't have content to avoid duplicate content */}
+            {!props.entry.content && props.entry.mediaThumbnailUrl && (
+                <Box pt="md">
+                    <Media
+                        thumbnailUrl={props.entry.mediaThumbnailUrl}
+                        thumbnailWidth={props.entry.mediaThumbnailWidth}
+                        thumbnailHeight={props.entry.mediaThumbnailHeight}
+                        description={props.entry.mediaDescription}
+                    />
+                </Box>
+            )}
+        </Box>
+    )
+}
--- a/commafeed-client/src/components/content/FeedEntryFooter.tsx
+++ b/commafeed-client/src/components/content/FeedEntryFooter.tsx
@@ -0,0 +1,35 @@
+import { t } from "@lingui/macro"
+import { Checkbox, Group } from "@mantine/core"
+import { markEntry } from "app/slices/entries"
+import { useAppDispatch } from "app/store"
+import { Entry } from "app/types"
+import { ActionButton } from "components/ActionButtton"
+import { TbExternalLink } from "react-icons/tb"
+
+interface FeedEntryFooterProps {
+    entry: Entry
+}
+
+export function FeedEntryFooter(props: FeedEntryFooterProps) {
+    const dispatch = useAppDispatch()
+    const readStatusCheckboxClicked = () => dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))
+
+    return (
+        <Group>
+            {props.entry.markable && (
+                <Checkbox
+                    label={t`Keep unread`}
+                    checked={!props.entry.read}
+                    onChange={readStatusCheckboxClicked}
+                    styles={{
+                        label: { cursor: "pointer" },
+                        input: { cursor: "pointer" },
+                    }}
+                />
+            )}
+            <a href={props.entry.url} target="_blank" rel="noreferrer">
+                <ActionButton icon={<TbExternalLink size={18} />} label={t`Open link`} />
+            </a>
+        </Group>
+    )
+}
--- a/commafeed-client/src/components/content/FeedEntryHeader.tsx
+++ b/commafeed-client/src/components/content/FeedEntryHeader.tsx
@@ -0,0 +1,56 @@
+import { Box, createStyles, Image, Text } from "@mantine/core"
+import { Entry } from "app/types"
+import { RelativeDate } from "components/RelativeDate"
+
+export interface FeedEntryHeaderProps {
+    entry: Entry
+    expanded: boolean
+}
+
+const useStyles = createStyles((theme, props: FeedEntryHeaderProps) => ({
+    headerText: {
+        fontWeight: theme.colorScheme === "light" && !props.entry.read ? "bold" : "inherit",
+        whiteSpace: props.expanded ? "inherit" : "nowrap",
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+    },
+    headerSubtext: {
+        display: "flex",
+        alignItems: "center",
+        fontSize: "90%",
+        whiteSpace: props.expanded ? "inherit" : "nowrap",
+        overflow: "hidden",
+        textOverflow: "ellipsis",
+    },
+}))
+export function FeedEntryHeader(props: FeedEntryHeaderProps) {
+    const { classes } = useStyles(props)
+    return (
+        <Box>
+            <Box className={classes.headerText}>{props.entry.title}</Box>
+            <Box className={classes.headerSubtext}>
+                <Box mr={6}>
+                    <Image src={props.entry.iconUrl} alt="feed icon" width={18} height={18} />
+                </Box>
+                <Box>
+                    <Text color="dimmed">{props.entry.feedName}</Text>
+                </Box>
+                <Box>
+                    <Text color="dimmed">
+                        <span>&nbsp;·&nbsp;</span>
+                        <RelativeDate date={props.entry.date} />
+                    </Text>
+                </Box>
+            </Box>
+            {props.expanded && (
+                <Box className={classes.headerSubtext}>
+                    <Text color="dimmed">
+                        {props.entry.author && <span>by {props.entry.author}</span>}
+                        {props.entry.author && props.entry.categories && <span>&nbsp;·&nbsp;</span>}
+                        {props.entry.categories && <span>{props.entry.categories}</span>}
+                    </Text>
+                </Box>
+            )}
+        </Box>
+    )
+}
--- a/commafeed-client/src/components/content/Media.tsx
+++ b/commafeed-client/src/components/content/Media.tsx
@@ -0,0 +1,36 @@
+import { Box, createStyles } from "@mantine/core"
+import { Content } from "./Content"
+
+export interface MediaProps {
+    thumbnailUrl: string
+    thumbnailWidth?: number
+    thumbnailHeight?: number
+    description?: string
+}
+
+const useStyles = createStyles(() => ({
+    image: {
+        maxWidth: "100%",
+        height: "auto",
+    },
+}))
+
+export function Media(props: MediaProps) {
+    const { classes } = useStyles()
+    return (
+        <>
+            <img
+                className={classes.image}
+                src={props.thumbnailUrl}
+                width={props.thumbnailWidth}
+                height={props.thumbnailHeight}
+                alt="media thumbnail"
+            />
+            {props.description && (
+                <Box pt="md">
+                    <Content content={props.description} />
+                </Box>
+            )}
+        </>
+    )
+}
--- a/commafeed-client/src/components/content/add/AddCategory.tsx
+++ b/commafeed-client/src/components/content/add/AddCategory.tsx
@@ -0,0 +1,51 @@
+import { t, Trans } from "@lingui/macro"
+import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { redirectToSelectedSource } from "app/slices/redirect"
+import { reloadTree } from "app/slices/tree"
+import { useAppDispatch } from "app/store"
+import { AddCategoryRequest } from "app/types"
+import { Alert } from "components/Alert"
+import { TbFolderPlus } from "react-icons/tb"
+import useMutation from "use-mutation"
+import { CategorySelect } from "./CategorySelect"
+
+export function AddCategory() {
+    const dispatch = useAppDispatch()
+
+    const form = useForm<AddCategoryRequest>()
+
+    const [addCategory, addCategoryResult] = useMutation(client.category.add, {
+        onSuccess: () => {
+            dispatch(reloadTree())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+    const errors = errorToStrings(addCategoryResult.error)
+
+    return (
+        <>
+            {errors.length > 0 && (
+                <Box mb="md">
+                    <Alert messages={errors} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(addCategory)}>
+                <Stack>
+                    <TextInput label={t`Category`} placeholder={t`Category`} {...form.getInputProps("name")} required />
+                    <CategorySelect label={t`Parent`} {...form.getInputProps("parentId")} clearable />
+                    <Group position="center">
+                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftIcon={<TbFolderPlus size={16} />} loading={addCategoryResult.status === "running"}>
+                            <Trans>Add</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}
--- a/commafeed-client/src/components/content/add/CategorySelect.tsx
+++ b/commafeed-client/src/components/content/add/CategorySelect.tsx
@@ -0,0 +1,18 @@
+import { Select, SelectItem, SelectProps } from "@mantine/core"
+import { Constants } from "app/constants"
+import { useAppSelector } from "app/store"
+import { flattenCategoryTree } from "app/utils"
+
+export function CategorySelect(props: Partial<SelectProps>) {
+    const rootCategory = useAppSelector(state => state.tree.rootCategory)
+    const categories = rootCategory && flattenCategoryTree(rootCategory)
+    const selectData: SelectItem[] | undefined = categories
+        ?.filter(c => c.id !== Constants.categoryIds.all)
+        .sort((c1, c2) => c1.name.localeCompare(c2.name))
+        .map(c => ({
+            label: c.name,
+            value: c.id,
+        }))
+
+    return <Select {...props} data={selectData ?? []} disabled={!selectData} />
+}
--- a/commafeed-client/src/components/content/add/ImportOpml.tsx
+++ b/commafeed-client/src/components/content/add/ImportOpml.tsx
@@ -0,0 +1,59 @@
+import { t, Trans } from "@lingui/macro"
+import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorToStrings } from "app/client"
+import { redirectToSelectedSource } from "app/slices/redirect"
+import { reloadTree } from "app/slices/tree"
+import { useAppDispatch } from "app/store"
+import { Alert } from "components/Alert"
+import { TbFileImport } from "react-icons/tb"
+import useMutation from "use-mutation"
+
+export function ImportOpml() {
+    const dispatch = useAppDispatch()
+
+    const form = useForm<{ file: File }>({
+        validate: {
+            file: v => (v ? null : t`file is required`),
+        },
+    })
+
+    const [importOpml, importOpmlResult] = useMutation(client.feed.importOpml, {
+        onSuccess: () => {
+            dispatch(reloadTree())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+    const errors = errorToStrings(importOpmlResult.error)
+
+    return (
+        <>
+            {errors.length > 0 && (
+                <Box mb="md">
+                    <Alert messages={errors} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(v => importOpml(v.file))}>
+                <Stack>
+                    <FileInput
+                        label={t`OPML file`}
+                        placeholder={t`OPML file`}
+                        description={t`An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your data from other feed reading services.`}
+                        {...form.getInputProps("file")}
+                        required
+                        accept="application/xml"
+                    />
+                    <Group position="center">
+                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftIcon={<TbFileImport size={16} />} loading={importOpmlResult.status === "running"}>
+                            <Trans>Import</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}
--- a/commafeed-client/src/components/content/add/Subscribe.tsx
+++ b/commafeed-client/src/components/content/add/Subscribe.tsx
@@ -0,0 +1,116 @@
+import { t, Trans } from "@lingui/macro"
+import { Box, Button, Group, Stack, Stepper, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { client, errorsToStrings, errorToStrings } from "app/client"
+import { Constants } from "app/constants"
+import { redirectToSelectedSource } from "app/slices/redirect"
+import { reloadTree } from "app/slices/tree"
+import { useAppDispatch } from "app/store"
+import { FeedInfoRequest, SubscribeRequest } from "app/types"
+import { Alert } from "components/Alert"
+import { useState } from "react"
+import { TbRss } from "react-icons/tb"
+import useMutation from "use-mutation"
+import { CategorySelect } from "./CategorySelect"
+
+export function Subscribe() {
+    const [activeStep, setActiveStep] = useState(0)
+    const dispatch = useAppDispatch()
+
+    const step0Form = useForm<FeedInfoRequest>({
+        initialValues: {
+            url: "",
+        },
+    })
+
+    const step1Form = useForm<SubscribeRequest>({
+        initialValues: {
+            url: "",
+            title: "",
+            categoryId: Constants.categoryIds.all,
+        },
+    })
+
+    const [fetchFeed, fetchFeedResult] = useMutation(client.feed.fetchFeed, {
+        onSuccess: ({ data }) => {
+            step1Form.setFieldValue("url", data.data.url)
+            step1Form.setFieldValue("title", data.data.title)
+            setActiveStep(step => step + 1)
+        },
+    })
+    const [subscribe, subscribeResult] = useMutation(client.feed.subscribe, {
+        onSuccess: () => {
+            dispatch(reloadTree())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+    const errors = errorsToStrings([fetchFeedResult.error, errorToStrings(subscribeResult.error)])
+
+    const previousStep = () => {
+        if (activeStep === 0) dispatch(redirectToSelectedSource())
+        else setActiveStep(activeStep - 1)
+    }
+    const nextStep = (e: React.FormEvent<HTMLFormElement>) => {
+        if (activeStep === 0) {
+            step0Form.onSubmit(fetchFeed)(e)
+        } else if (activeStep === 1) {
+            step1Form.onSubmit(subscribe)(e)
+        }
+    }
+
+    return (
+        <>
+            {errors.length > 0 && (
+                <Box mb="md">
+                    <Alert messages={errors} />
+                </Box>
+            )}
+
+            <form onSubmit={nextStep}>
+                <Stepper active={activeStep} onStepClick={setActiveStep}>
+                    <Stepper.Step
+                        label={t`Analyze feed`}
+                        description={t`Check that the feed is working`}
+                        allowStepSelect={activeStep === 1}
+                    >
+                        <TextInput
+                            label={t`Feed URL`}
+                            placeholder="http://www.mysite.com/rss"
+                            description={t`The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page.`}
+                            required
+                            autoFocus
+                            {...step0Form.getInputProps("url")}
+                        />
+                    </Stepper.Step>
+                    <Stepper.Step label={t`Subscribe`} description={t`Subscribe to the feed`} allowStepSelect={false}>
+                        <Stack>
+                            <TextInput label={t`Feed URL`} {...step1Form.getInputProps("url")} disabled />
+                            <TextInput label={t`Feed name`} {...step1Form.getInputProps("title")} required autoFocus />
+                            <CategorySelect label={t`Category`} {...step1Form.getInputProps("categoryId")} clearable />
+                        </Stack>
+                    </Stepper.Step>
+                </Stepper>
+
+                <Group position="center" mt="xl">
+                    <Button variant="default" onClick={previousStep}>
+                        <Trans>Back</Trans>
+                    </Button>
+                    {activeStep === 0 && (
+                        <Button type="submit" loading={fetchFeedResult.status === "running"}>
+                            <Trans>Next</Trans>
+                        </Button>
+                    )}
+                    {activeStep === 1 && (
+                        <Button
+                            type="submit"
+                            leftIcon={<TbRss size={16} />}
+                            loading={fetchFeedResult.status === "running" || subscribeResult.status === "running"}
+                        >
+                            <Trans>Subscribe</Trans>
+                        </Button>
+                    )}
+                </Group>
+            </form>
+        </>
+    )
+}
--- a/commafeed-client/src/components/header/Header.tsx
+++ b/commafeed-client/src/components/header/Header.tsx
@@ -0,0 +1,77 @@
+import { t, Trans } from "@lingui/macro"
+import { Center, Code, Divider, Group, Text } from "@mantine/core"
+import { openConfirmModal } from "@mantine/modals"
+import { markAllEntries, reloadEntries } from "app/slices/entries"
+import { changeReadingMode, changeReadingOrder } from "app/slices/user"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { ActionButton } from "components/ActionButtton"
+import { Loader } from "components/Loader"
+import { TbArrowDown, TbArrowUp, TbChecks, TbEye, TbEyeOff, TbRefresh, TbUser } from "react-icons/tb"
+import { ProfileMenu } from "./ProfileMenu"
+
+function HeaderDivider() {
+    return <Divider orientation="vertical" />
+}
+
+const iconSize = 18
+
+export function Header() {
+    const source = useAppSelector(state => state.entries.source)
+    const sourceLabel = useAppSelector(state => state.entries.sourceLabel)
+    const entriesTimestamp = useAppSelector(state => state.entries.timestamp)
+    const settings = useAppSelector(state => state.user.settings)
+    const profile = useAppSelector(state => state.user.profile)
+    const dispatch = useAppDispatch()
+
+    const openMarkAllEntriesModal = () =>
+        openConfirmModal({
+            title: t`Mark all entries as read`,
+            children: (
+                <Text size="sm">
+                    <Trans>
+                        Are you sure you want to mark all entries of <Code>{sourceLabel}</Code> as read?
+                    </Trans>
+                </Text>
+            ),
+            labels: { confirm: t`Confirm`, cancel: t`Cancel` },
+            confirmProps: { color: "red" },
+            onConfirm: () =>
+                dispatch(
+                    markAllEntries({
+                        sourceType: source.type,
+                        req: {
+                            id: source.id,
+                            read: true,
+                            olderThan: entriesTimestamp,
+                        },
+                    })
+                ),
+        })
+
+    if (!settings) return <Loader />
+    return (
+        <Center>
+            <Group>
+                <ActionButton icon={<TbRefresh size={iconSize} />} label={t`Refresh`} onClick={() => dispatch(reloadEntries())} />
+                <ActionButton icon={<TbChecks size={iconSize} />} label={t`Mark all as read`} onClick={openMarkAllEntriesModal} />
+
+                <HeaderDivider />
+
+                <ActionButton
+                    icon={settings.readingMode === "all" ? <TbEye size={iconSize} /> : <TbEyeOff size={iconSize} />}
+                    label={settings.readingMode === "all" ? t`All` : t`Unread`}
+                    onClick={() => dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))}
+                />
+                <ActionButton
+                    icon={settings.readingOrder === "asc" ? <TbArrowUp size={iconSize} /> : <TbArrowDown size={iconSize} />}
+                    label={settings.readingOrder === "asc" ? t`Asc` : t`Desc`}
+                    onClick={() => dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))}
+                />
+
+                <HeaderDivider />
+
+                <ProfileMenu control={<ActionButton icon={<TbUser size={iconSize} />} label={profile?.name} />} />
+            </Group>
+        </Center>
+    )
+}
--- a/commafeed-client/src/components/header/ProfileMenu.tsx
+++ b/commafeed-client/src/components/header/ProfileMenu.tsx
@@ -0,0 +1,65 @@
+import { Trans } from "@lingui/macro"
+import { Divider, Menu, useMantineColorScheme } from "@mantine/core"
+import { redirectToAdminUsers, redirectToSettings } from "app/slices/redirect"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { useState } from "react"
+import { TbMoon, TbPower, TbSettings, TbSun, TbUsers } from "react-icons/tb"
+
+interface ProfileMenuProps {
+    control: React.ReactElement
+}
+
+export function ProfileMenu(props: ProfileMenuProps) {
+    const [opened, setOpened] = useState(false)
+    const admin = useAppSelector(state => state.user.profile?.admin)
+    const dispatch = useAppDispatch()
+    const { colorScheme, toggleColorScheme } = useMantineColorScheme()
+    const dark = colorScheme === "dark"
+
+    const logout = () => {
+        window.location.href = "logout"
+    }
+
+    return (
+        <Menu position="bottom-end" closeOnItemClick={false} opened={opened} onChange={setOpened}>
+            <Menu.Target>{props.control}</Menu.Target>
+            <Menu.Dropdown>
+                <Menu.Item
+                    icon={<TbSettings />}
+                    onClick={() => {
+                        dispatch(redirectToSettings())
+                        setOpened(false)
+                    }}
+                >
+                    <Trans>Settings</Trans>
+                </Menu.Item>
+                <Menu.Item icon={dark ? <TbMoon /> : <TbSun />} onClick={() => toggleColorScheme()}>
+                    <Trans>Theme</Trans>
+                </Menu.Item>
+
+                {admin && (
+                    <>
+                        <Divider />
+                        <Menu.Label>
+                            <Trans>Admin</Trans>
+                        </Menu.Label>
+                        <Menu.Item
+                            icon={<TbUsers />}
+                            onClick={() => {
+                                dispatch(redirectToAdminUsers())
+                                setOpened(false)
+                            }}
+                        >
+                            <Trans>Manage users</Trans>
+                        </Menu.Item>
+                    </>
+                )}
+
+                <Divider />
+                <Menu.Item icon={<TbPower />} onClick={logout}>
+                    <Trans>Logout</Trans>
+                </Menu.Item>
+            </Menu.Dropdown>
+        </Menu>
+    )
+}
--- a/commafeed-client/src/components/responsive/OnDesktop.tsx
+++ b/commafeed-client/src/components/responsive/OnDesktop.tsx
@@ -0,0 +1,11 @@
+import { Box, MediaQuery } from "@mantine/core"
+import { Constants } from "app/constants"
+import React from "react"
+
+export function OnDesktop(props: { children: React.ReactNode }) {
+    return (
+        <MediaQuery smallerThan={Constants.layout.mobileBreakpoint} styles={{ display: "none" }}>
+            <Box>{props.children}</Box>
+        </MediaQuery>
+    )
+}
--- a/commafeed-client/src/components/responsive/OnMobile.tsx
+++ b/commafeed-client/src/components/responsive/OnMobile.tsx
@@ -0,0 +1,11 @@
+import { Box, MediaQuery } from "@mantine/core"
+import { Constants } from "app/constants"
+import React from "react"
+
+export function OnMobile(props: { children: React.ReactNode }) {
+    return (
+        <MediaQuery largerThan={Constants.layout.mobileBreakpoint} styles={{ display: "none" }}>
+            <Box>{props.children}</Box>
+        </MediaQuery>
+    )
+}
--- a/commafeed-client/src/components/settings/DisplaySettings.tsx
+++ b/commafeed-client/src/components/settings/DisplaySettings.tsx
@@ -0,0 +1,31 @@
+import { t } from "@lingui/macro"
+import { Select, Stack, Switch } from "@mantine/core"
+import { changeLanguage, changeScrollSpeed } from "app/slices/user"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { locales } from "i18n"
+
+export function DisplaySettings() {
+    const language = useAppSelector(state => state.user.settings?.language)
+    const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
+    const dispatch = useAppDispatch()
+
+    return (
+        <Stack>
+            <Select
+                description={t`Language`}
+                value={language}
+                data={locales.map(l => ({
+                    value: l.key,
+                    label: l.label,
+                }))}
+                onChange={s => s && dispatch(changeLanguage(s))}
+            />
+
+            <Switch
+                label={t`Scroll smoothly when navigating between entries`}
+                checked={scrollSpeed ? scrollSpeed > 0 : false}
+                onChange={e => dispatch(changeScrollSpeed(e.currentTarget.checked))}
+            />
+        </Stack>
+    )
+}
--- a/commafeed-client/src/components/settings/ProfileSettings.tsx
+++ b/commafeed-client/src/components/settings/ProfileSettings.tsx
@@ -0,0 +1,125 @@
+import { t, Trans } from "@lingui/macro"
+import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
+import { useForm } from "@mantine/form"
+import { openConfirmModal } from "@mantine/modals"
+import { client, errorsToStrings } from "app/client"
+import { redirectToLogin, redirectToSelectedSource } from "app/slices/redirect"
+import { reloadProfile } from "app/slices/user"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { ProfileModificationRequest } from "app/types"
+import { Alert } from "components/Alert"
+import { useEffect } from "react"
+import { TbDeviceFloppy, TbTrash } from "react-icons/tb"
+import useMutation from "use-mutation"
+
+interface FormData extends ProfileModificationRequest {
+    newPasswordConfirmation?: string
+}
+
+export function ProfileSettings() {
+    const profile = useAppSelector(state => state.user.profile)
+    const dispatch = useAppDispatch()
+
+    const form = useForm<FormData>({
+        validate: {
+            newPasswordConfirmation: (value: string, values: FormData) => (value !== values.newPassword ? t`Passwords do not match` : null),
+        },
+    })
+    const { setValues } = form
+
+    const [saveProfile, saveProfileResult] = useMutation(client.user.saveProfile, {
+        onSuccess: () => {
+            dispatch(reloadProfile())
+            dispatch(redirectToSelectedSource())
+        },
+    })
+    const [deleteProfile, deleteProfileResult] = useMutation(client.user.deleteProfile, {
+        onSuccess: () => {
+            dispatch(redirectToLogin())
+        },
+    })
+    const errors = errorsToStrings([saveProfileResult.error, deleteProfileResult.error])
+
+    const openDeleteProfileModal = () =>
+        openConfirmModal({
+            title: t`Delete account`,
+            children: (
+                <Text size="sm">
+                    <Trans>Are you sure you want to delete your account? There's no turning back!</Trans>
+                </Text>
+            ),
+            labels: { confirm: t`Confirm`, cancel: t`Cancel` },
+            confirmProps: { color: "red" },
+            onConfirm: () => deleteProfile({}),
+        })
+
+    useEffect(() => {
+        if (!profile) return
+        setValues({
+            currentPassword: "",
+            email: profile.email ?? "",
+            newApiKey: false,
+        })
+    }, [setValues, profile])
+
+    return (
+        <>
+            {errors.length > 0 && (
+                <Box mb="md">
+                    <Alert messages={errors} />
+                </Box>
+            )}
+
+            <form onSubmit={form.onSubmit(saveProfile)}>
+                <Stack>
+                    <Input.Wrapper label={t`User name`}>
+                        <Box>{profile?.name}</Box>
+                    </Input.Wrapper>
+                    <Input.Wrapper
+                        label={t`OPML export`}
+                        description={t`Export your subscriptions and categories as an OPML file that can be imported in other feed reading services`}
+                    >
+                        <Box>
+                            <Anchor href="rest/feed/export" download="commafeed_opml.xml">
+                                <Trans>Download</Trans>
+                            </Anchor>
+                        </Box>
+                    </Input.Wrapper>
+                    <PasswordInput
+                        label={t`Current password`}
+                        description={t`Enter your current password to change profile settings`}
+                        required
+                        {...form.getInputProps("currentPassword")}
+                    />
+                    <TextInput type="email" label={t`E-mail`} {...form.getInputProps("email")} required />
+                    <PasswordInput
+                        label={t`New password`}
+                        description={t`Changing password will generate a new API key`}
+                        {...form.getInputProps("newPassword")}
+                    />
+                    <PasswordInput label={t`Confirm password`} {...form.getInputProps("newPasswordConfirmation")} />
+                    <TextInput label={t`API key`} readOnly value={profile?.apiKey} />
+                    <Checkbox label={t`Generate new API key`} {...form.getInputProps("newApiKey", { type: "checkbox" })} />
+
+                    <Group>
+                        <Button variant="default" onClick={() => dispatch(redirectToSelectedSource())}>
+                            <Trans>Cancel</Trans>
+                        </Button>
+                        <Button type="submit" leftIcon={<TbDeviceFloppy size={16} />} loading={saveProfileResult.status === "running"}>
+                            <Trans>Save</Trans>
+                        </Button>
+                        <Divider orientation="vertical" />
+                        <Button
+                            color="red"
+                            leftIcon={<TbTrash size={16} />}
+                            onClick={() => openDeleteProfileModal()}
+                            loading={deleteProfileResult.status === "running"}
+                        >
+                            <Trans>Delete account</Trans>
+                        </Button>
+                    </Group>
+                </Stack>
+            </form>
+        </>
+    )
+}
--- a/commafeed-client/src/components/sidebar/Tree.tsx
+++ b/commafeed-client/src/components/sidebar/Tree.tsx
@@ -0,0 +1,118 @@
+import { t } from "@lingui/macro"
+import { Box, Stack } from "@mantine/core"
+import { Constants } from "app/constants"
+import { redirectToCategory, redirectToCategoryDetails, redirectToFeed, redirectToFeedDetails } from "app/slices/redirect"
+import { collapseTreeCategory } from "app/slices/tree"
+import { useAppDispatch, useAppSelector } from "app/store"
+import { Category, Subscription } from "app/types"
+import { categoryUnreadCount, flattenCategoryTree } from "app/utils"
+import { Loader } from "components/Loader"
+import { OnDesktop } from "components/responsive/OnDesktop"
+import React from "react"
+import { FaChevronDown, FaChevronRight, FaInbox } from "react-icons/fa"
+import { TreeNode } from "./TreeNode"
+import { TreeSearch } from "./TreeSearch"
+
+const allIcon = <FaInbox size={14} />
+const expandedIcon = <FaChevronDown size={14} />
+const collapsedIcon = <FaChevronRight size={14} />
+
+const errorThreshold = 9
+export function Tree() {
+    const root = useAppSelector(state => state.tree.rootCategory)
+    const source = useAppSelector(state => state.entries.source)
+    const dispatch = useAppDispatch()
+
+    const feedClicked = (e: React.MouseEvent, id: string) => {
+        if (e.detail === 2) dispatch(redirectToFeedDetails(id))
+        else dispatch(redirectToFeed(id))
+    }
+    const categoryClicked = (e: React.MouseEvent, id: string) => {
+        if (e.detail === 2) {
+            if (id === Constants.categoryIds.all) return
+            dispatch(redirectToCategoryDetails(id))
+        } else {
+            dispatch(redirectToCategory(id))
+        }
+    }
+    const categoryIconClicked = (e: React.MouseEvent, category: Category) => {
+        e.stopPropagation()
+
+        dispatch(
+            collapseTreeCategory({
+                id: +category.id,
+                collapse: category.expanded,
+            })
+        )
+    }
+
+    const allCategoryNode = () => (
+        <TreeNode
+            id={Constants.categoryIds.all}
+            name={t`All`}
+            icon={allIcon}
+            unread={categoryUnreadCount(root)}
+            selected={source.type === "category" && source.id === Constants.categoryIds.all}
+            expanded={false}
+            level={0}
+            hasError={false}
+            onClick={categoryClicked}
+        />
+    )
+
+    const categoryNode = (category: Category, level: number = 0) => {
+        const hasError = !category.expanded && flattenCategoryTree(category).some(c => c.feeds.some(f => f.errorCount > errorThreshold))
+        return (
+            <TreeNode
+                id={category.id}
+                name={category.name}
+                icon={category.expanded ? expandedIcon : collapsedIcon}
+                unread={categoryUnreadCount(category)}
+                selected={source.type === "category" && source.id === category.id}
+                expanded={category.expanded}
+                level={level}
+                hasError={hasError}
+                onClick={categoryClicked}
+                onIconClick={e => categoryIconClicked(e, category)}
+                key={category.id}
+            />
+        )
+    }
+
+    const feedNode = (feed: Subscription, level: number = 0) => (
+        <TreeNode
+            id={String(feed.id)}
+            name={feed.name}
+            icon={feed.iconUrl}
+            unread={feed.unread}
+            selected={source.type === "feed" && source.id === String(feed.id)}
+            level={level}
+            hasError={feed.errorCount > errorThreshold}
+            onClick={feedClicked}
+            key={feed.id}
+        />
+    )
+
+    const recursiveCategoryNode = (category: Category, level: number = 0) => (
+        <React.Fragment key={`recursiveCategoryNode-${category.id}`}>
+            {categoryNode(category, level)}
+            {category.expanded && category.children.map(c => recursiveCategoryNode(c, level + 1))}
+            {category.expanded && category.feeds.map(f => feedNode(f, level + 1))}
+        </React.Fragment>
+    )
+
+    if (!root) return <Loader />
+    const feeds = flattenCategoryTree(root).flatMap(c => c.feeds)
+    return (
+        <Stack>
+            <OnDesktop>
+                <TreeSearch feeds={feeds} />
+            </OnDesktop>
+            <Box>
+                {allCategoryNode()}
+                {root.children.map(c => recursiveCategoryNode(c))}
+                {root.feeds.map(f => feedNode(f))}
+            </Box>
+        </Stack>
+    )
+}
--- a/commafeed-client/src/components/sidebar/TreeNode.tsx
+++ b/commafeed-client/src/components/sidebar/TreeNode.tsx
@@ -0,0 +1,62 @@
+import { Box, createStyles, Image } from "@mantine/core"
+import React, { ReactNode } from "react"
+import { UnreadCount } from "./UnreadCount"
+
+interface TreeNodeProps {
+    id: string
+    name: string
+    icon: ReactNode | string
+    unread: number
+    selected: boolean
+    expanded?: boolean
+    level: number
+    hasError: boolean
+    onClick: (e: React.MouseEvent, id: string) => void
+    onIconClick?: (e: React.MouseEvent, id: string) => void
+}
+
+const useStyles = createStyles((theme, props: TreeNodeProps) => {
+    let backgroundColor = "inherit"
+    if (props.selected) backgroundColor = theme.colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[3]
+
+    let color
+    if (props.hasError) color = theme.colors.red[6]
+    else if (theme.colorScheme === "dark") color = props.unread > 0 ? theme.colors.dark[0] : theme.colors.dark[3]
+    else color = props.unread > 0 ? theme.black : theme.colors.gray[6]
+
+    return {
+        node: {
+            display: "flex",
+            alignItems: "center",
+            cursor: "pointer",
+            color,
+            backgroundColor,
+            "&:hover": {
+                backgroundColor: theme.colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[0],
+            },
+        },
+        nodeText: {
+            flexGrow: 1,
+            whiteSpace: "nowrap",
+            overflow: "hidden",
+            textOverflow: "ellipsis",
+        },
+    }
+})
+
+export function TreeNode(props: TreeNodeProps) {
+    const { classes } = useStyles(props)
+    return (
+        <Box py={1} pl={props.level * 20} className={classes.node} onClick={(e: React.MouseEvent) => props.onClick(e, props.id)}>
+            <Box mr={6} onClick={(e: React.MouseEvent) => props.onIconClick && props.onIconClick(e, props.id)}>
+                {typeof props.icon === "string" ? <Image src={props.icon} alt="" width={18} height={18} /> : props.icon}
+            </Box>
+            <Box className={classes.nodeText}>{props.name}</Box>
+            {!props.expanded && (
+                <Box>
+                    <UnreadCount unreadCount={props.unread} />
+                </Box>
+            )}
+        </Box>
+    )
+}
--- a/commafeed-client/src/components/sidebar/TreeSearch.tsx
+++ b/commafeed-client/src/components/sidebar/TreeSearch.tsx
@@ -0,0 +1,60 @@
+import { t } from "@lingui/macro"
+import { Box, Center, Image, Kbd, TextInput } from "@mantine/core"
+import { openSpotlight, SpotlightAction, SpotlightProvider } from "@mantine/spotlight"
+import { redirectToFeed } from "app/slices/redirect"
+import { useAppDispatch } from "app/store"
+import { Subscription } from "app/types"
+import { useMousetrap } from "hooks/useMousetrap"
+import { TbSearch } from "react-icons/tb"
+
+export interface TreeSearchProps {
+    feeds: Subscription[]
+}
+export function TreeSearch(props: TreeSearchProps) {
+    const dispatch = useAppDispatch()
+
+    const actions: SpotlightAction[] = props.feeds
+        .sort((f1, f2) => f1.name.localeCompare(f2.name))
+        .map(f => ({
+            title: f.name,
+            icon: <Image src={f.iconUrl} alt="" width={18} height={18} />,
+            onTrigger: () => dispatch(redirectToFeed(f.id)),
+        }))
+
+    const searchIcon = <TbSearch size={18} />
+    const rightSection = (
+        <Center>
+            <Kbd>Ctrl</Kbd>
+            <Box mx={5}>+</Box>
+            <Kbd>K</Kbd>
+        </Center>
+    )
+
+    // additional keyboard shortcut used by commafeed v1
+    useMousetrap("g u", () => openSpotlight())
+
+    return (
+        <SpotlightProvider
+            actions={actions}
+            searchIcon={searchIcon}
+            searchPlaceholder={t`Search`}
+            shortcut="ctrl+k"
+            nothingFoundMessage={t`Nothing found`}
+        >
+            <TextInput
+                placeholder={t`Search`}
+                icon={searchIcon}
+                rightSectionWidth={100}
+                rightSection={rightSection}
+                styles={{
+                    input: { cursor: "pointer" },
+                    rightSection: { pointerEvents: "none" },
+                }}
+                onClick={() => openSpotlight()}
+                // prevent focus
+                onFocus={e => e.target.blur()}
+                readOnly
+            />
+        </SpotlightProvider>
+    )
+}
--- a/commafeed-client/src/components/sidebar/UnreadCount.tsx
+++ b/commafeed-client/src/components/sidebar/UnreadCount.tsx
@@ -0,0 +1,18 @@
+import { Badge, createStyles } from "@mantine/core"
+
+const useStyles = createStyles(() => ({
+    badge: {
+        width: "3.2rem",
+        // for some reason, mantine Badge has "cursor: 'default'"
+        cursor: "pointer",
+    },
+}))
+
+export function UnreadCount(props: { unreadCount: number }) {
+    const { classes } = useStyles()
+
+    if (props.unreadCount <= 0) return null
+
+    const count = props.unreadCount >= 1000 ? "999+" : props.unreadCount
+    return <Badge className={classes.badge}>{count}</Badge>
+}
--- a/commafeed-client/src/hooks/useAppLoading.ts
+++ b/commafeed-client/src/hooks/useAppLoading.ts
@@ -0,0 +1,34 @@
+import { t } from "@lingui/macro"
+import { useAppSelector } from "app/store"
+
+interface Step {
+    label: string
+    done: boolean
+}
+
+export const useAppLoading = () => {
+    const profile = useAppSelector(state => state.user.profile)
+    const settings = useAppSelector(state => state.user.settings)
+    const rootCategory = useAppSelector(state => state.tree.rootCategory)
+
+    const steps: Step[] = [
+        {
+            label: t`Loading settings...`,
+            done: !!settings,
+        },
+        {
+            label: t`Loading profile...`,
+            done: !!profile,
+        },
+        {
+            label: t`Loading subscriptions...`,
+            done: !!rootCategory,
+        },
+    ]
+
+    const loading = steps.some(s => !s.done)
+    const loadingPercentage = Math.round((100.0 * steps.filter(s => s.done).length) / steps.length)
+    const loadingStepLabel = steps.find(s => !s.done)?.label
+
+    return { steps, loading, loadingPercentage, loadingStepLabel }
+}
--- a/commafeed-client/src/hooks/useMousetrap.ts
+++ b/commafeed-client/src/hooks/useMousetrap.ts
@@ -0,0 +1,22 @@
+import mousetrap, { ExtendedKeyboardEvent } from "mousetrap"
+import { useEffect, useRef } from "react"
+
+type Callback = (e: ExtendedKeyboardEvent, combo: string) => void
+
+export const useMousetrap = (key: string | string[], callback: Callback) => {
+    // use a ref to avoid unbinding/rebinding every time the callback changes
+    const callbackRef = useRef(callback)
+    callbackRef.current = callback
+
+    useEffect(() => {
+        mousetrap.bind(key, (event, combo) => {
+            callbackRef.current(event, combo)
+
+            // prevent default behavior
+            return false
+        })
+        return () => {
+            mousetrap.unbind(key)
+        }
+    }, [key])
+}
--- a/commafeed-client/src/i18n.ts
+++ b/commafeed-client/src/i18n.ts
@@ -0,0 +1,56 @@
+import { i18n, Messages } from "@lingui/core"
+import { useAppSelector } from "app/store"
+import dayjs from "dayjs"
+import "dayjs/locale/en"
+import "dayjs/locale/fr"
+import { en, fr } from "make-plural"
+import { useEffect } from "react"
+import { messages as enMessages } from "./locales/en/messages"
+import { messages as frMessages } from "./locales/fr/messages"
+
+interface Locale {
+    key: string
+    label: string
+    messages: Messages
+    plurals?: (n: number | string, ord?: boolean) => string
+}
+
+// add an object to the array to add a new locale
+// don't forget to also add it to the 'locales' array in .linguirc
+export const locales: Locale[] = [
+    {
+        key: "en",
+        label: "English",
+        messages: enMessages,
+        plurals: en,
+    },
+    {
+        key: "fr",
+        label: "Français",
+        messages: frMessages,
+        plurals: fr,
+    },
+]
+
+locales.forEach(l => {
+    i18n.loadLocaleData({
+        [l.key]: {
+            plurals: l.plurals,
+        },
+    })
+    i18n.load({
+        [l.key]: l.messages,
+    })
+})
+
+function activateLocale(locale: string) {
+    i18n.activate(locale)
+    dayjs.locale(locale)
+}
+
+export const useI18n = () => {
+    const locale = useAppSelector(state => state.user.settings?.language)
+    useEffect(() => {
+        activateLocale(locale ?? "en")
+    }, [locale])
+}
--- a/commafeed-client/src/locales/en/messages.po
+++ b/commafeed-client/src/locales/en/messages.po
@@ -0,0 +1,503 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2022-08-04 18:51+0200\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: en\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Plural-Forms: \n"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "<0>Complete available syntax is available </0><1>here</1>."
+msgstr "<0>Complete available syntax is available </0><1>here</1>."
+
+#: src/pages/auth/RegistrationPage.tsx
+msgid "<0>Have an account?</0><1>Log in!</1>"
+msgstr "<0>Have an account?</0><1>Log in!</1>"
+
+#: src/pages/auth/LoginPage.tsx
+msgid "<0>Need an account?</0><1>Sign up!</1>"
+msgstr "<0>Need an account?</0><1>Sign up!</1>"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "API key"
+msgstr "API key"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Actions"
+msgstr "Actions"
+
+#: src/components/content/add/AddCategory.tsx
+msgid "Add"
+msgstr "Add"
+
+#: src/pages/app/AddPage.tsx
+msgid "Add category"
+msgstr "Add category"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Add user"
+msgstr "Add user"
+
+#: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Admin"
+msgstr "Admin"
+
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+msgid "All"
+msgstr "All"
+
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "An email has been sent if this address was registered. Check your inbox."
+msgstr "An email has been sent if this address was registered. Check your inbox."
+
+#: src/components/content/add/ImportOpml.tsx
+msgid "An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your data from other feed reading services."
+msgstr "An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your data from other feed reading services."
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Analyze feed"
+msgstr "Analyze feed"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
+msgstr "Are you sure you want to delete category <0>{categoryName}</0>?"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Are you sure you want to delete user <0>{userName}</0> ?"
+msgstr "Are you sure you want to delete user <0>{userName}</0> ?"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Are you sure you want to delete your account? There's no turning back!"
+msgstr "Are you sure you want to delete your account? There's no turning back!"
+
+#: src/components/header/Header.tsx
+msgid "Are you sure you want to mark all entries of <0>{sourceLabel}</0> as read?"
+msgstr "Are you sure you want to mark all entries of <0>{sourceLabel}</0> as read?"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Are you sure you want to unsubscribe from <0>{feedName}</0>?"
+msgstr "Are you sure you want to unsubscribe from <0>{feedName}</0>?"
+
+#: src/components/header/Header.tsx
+msgid "Asc"
+msgstr "Asc"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgstr "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Back"
+msgstr "Back"
+
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "Back to log in"
+msgstr "Back to log in"
+
+#: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/header/Header.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Cancel"
+msgstr "Cancel"
+
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/Subscribe.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Category"
+msgstr "Category"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Changing password will generate a new API key"
+msgstr "Changing password will generate a new API key"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Check that the feed is working"
+msgstr "Check that the feed is working"
+
+#: src/components/header/Header.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Confirm"
+msgstr "Confirm"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Confirm password"
+msgstr "Confirm password"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Current password"
+msgstr "Current password"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Date created"
+msgstr "Date created"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Delete"
+msgstr "Delete"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Delete Category"
+msgstr "Delete Category"
+
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+msgid "Delete account"
+msgstr "Delete account"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Delete user"
+msgstr "Delete user"
+
+#: src/components/header/Header.tsx
+msgid "Desc"
+msgstr "Desc"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Display"
+msgstr "Display"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Download"
+msgstr "Download"
+
+#: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "E-mail"
+msgstr "E-mail"
+
+#: src/pages/auth/RegistrationPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
+msgid "E-mail address"
+msgstr "E-mail address"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Edit user"
+msgstr "Edit user"
+
+#: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Enabled"
+msgstr "Enabled"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Enter your current password to change profile settings"
+msgstr "Enter your current password to change profile settings"
+
+#: src/components/Alert.tsx
+msgid "Error"
+msgstr "Error"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Example: {example}."
+msgstr "Example: {example}."
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
+msgstr "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
+
+#: src/components/content/add/Subscribe.tsx
+#: src/components/content/add/Subscribe.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Feed URL"
+msgstr "Feed URL"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Feed name"
+msgstr "Feed name"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Filtering expression"
+msgstr "Filtering expression"
+
+#: src/pages/auth/LoginPage.tsx
+msgid "Forgot password?"
+msgstr "Forgot password?"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Generate an API key in your profile first."
+msgstr "Generate an API key in your profile first."
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Generate new API key"
+msgstr "Generate new API key"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Generated feed url"
+msgstr "Generated feed url"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Id"
+msgstr "Id"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
+msgstr "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
+
+#: src/components/content/add/ImportOpml.tsx
+msgid "Import"
+msgstr "Import"
+
+#: src/components/content/FeedEntryFooter.tsx
+msgid "Keep unread"
+msgstr "Keep unread"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "Language"
+msgstr "Language"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Last login date"
+msgstr "Last login date"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Last refresh"
+msgstr "Last refresh"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Last refresh message"
+msgstr "Last refresh message"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Link"
+msgstr "Link"
+
+#: src/hooks/useAppLoading.ts
+msgid "Loading profile..."
+msgstr "Loading profile..."
+
+#: src/hooks/useAppLoading.ts
+msgid "Loading settings..."
+msgstr "Loading settings..."
+
+#: src/hooks/useAppLoading.ts
+msgid "Loading subscriptions..."
+msgstr "Loading subscriptions..."
+
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/LoginPage.tsx
+msgid "Log in"
+msgstr "Log in"
+
+#: src/components/header/ProfileMenu.tsx
+msgid "Logout"
+msgstr "Logout"
+
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Manage users"
+msgstr "Manage users"
+
+#: src/components/header/Header.tsx
+msgid "Mark all as read"
+msgstr "Mark all as read"
+
+#: src/components/header/Header.tsx
+msgid "Mark all entries as read"
+msgstr "Mark all entries as read"
+
+#: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "N/A"
+msgstr "N/A"
+
+#: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Name"
+msgstr "Name"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "New password"
+msgstr "New password"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Next"
+msgstr "Next"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Next refresh"
+msgstr "Next refresh"
+
+#: src/pages/app/FeedEntriesPage.tsx
+msgid "No more entries"
+msgstr "No more entries"
+
+#: src/components/sidebar/TreeSearch.tsx
+msgid "Nothing found"
+msgstr "Nothing found"
+
+#: src/pages/app/AddPage.tsx
+msgid "OPML"
+msgstr "OPML"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "OPML export"
+msgstr "OPML export"
+
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/content/add/ImportOpml.tsx
+msgid "OPML file"
+msgstr "OPML file"
+
+#: src/components/content/FeedEntryFooter.tsx
+msgid "Open link"
+msgstr "Open link"
+
+#: src/components/content/add/AddCategory.tsx
+msgid "Parent"
+msgstr "Parent"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Parent Category"
+msgstr "Parent Category"
+
+#: src/components/admin/UserEdit.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
+msgid "Password"
+msgstr "Password"
+
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "Password Recovery"
+msgstr "Password Recovery"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Passwords do not match"
+msgstr "Passwords do not match"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Position"
+msgstr "Position"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Profile"
+msgstr "Profile"
+
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "Recover password"
+msgstr "Recover password"
+
+#: src/components/header/Header.tsx
+msgid "Refresh"
+msgstr "Refresh"
+
+#: src/pages/auth/RegistrationPage.tsx
+msgid "Registrations are closed on this CommaFeed instance"
+msgstr "Registrations are closed on this CommaFeed instance"
+
+#: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Save"
+msgstr "Save"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "Scroll smoothly when navigating between entries"
+msgstr "Scroll smoothly when navigating between entries"
+
+#: src/components/sidebar/TreeSearch.tsx
+#: src/components/sidebar/TreeSearch.tsx
+msgid "Search"
+msgstr "Search"
+
+#: src/components/header/ProfileMenu.tsx
+msgid "Settings"
+msgstr "Settings"
+
+#: src/app/slices/user.ts
+msgid "Settings saved."
+msgstr "Settings saved."
+
+#: src/pages/auth/RegistrationPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
+msgid "Sign up"
+msgstr "Sign up"
+
+#: src/components/content/add/Subscribe.tsx
+#: src/components/content/add/Subscribe.tsx
+#: src/pages/app/AddPage.tsx
+msgid "Subscribe"
+msgstr "Subscribe"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Subscribe to the feed"
+msgstr "Subscribe to the feed"
+
+#: src/components/Alert.tsx
+msgid "Success"
+msgstr "Success"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
+msgstr "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
+
+#: src/components/header/ProfileMenu.tsx
+msgid "Theme"
+msgstr "Theme"
+
+#: src/components/header/Header.tsx
+msgid "Unread"
+msgstr "Unread"
+
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/LoginPage.tsx
+msgid "User Name or E-mail"
+msgstr "User Name or E-mail"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "User name"
+msgstr "User name"
+
+#: src/components/Alert.tsx
+msgid "Warning"
+msgstr "Warning"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Website"
+msgstr "Website"
+
+#: src/pages/app/FeedEntriesPage.tsx
+msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
+msgstr "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
+
+#: src/components/content/add/ImportOpml.tsx
+msgid "file is required"
+msgstr "file is required"
--- a/commafeed-client/src/locales/fr/messages.po
+++ b/commafeed-client/src/locales/fr/messages.po
@@ -0,0 +1,503 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2022-08-04 18:51+0200\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: fr\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Plural-Forms: \n"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "<0>Complete available syntax is available </0><1>here</1>."
+msgstr "<0>La syntaxe complète est disponible </0><1>ici</1>."
+
+#: src/pages/auth/RegistrationPage.tsx
+msgid "<0>Have an account?</0><1>Log in!</1>"
+msgstr "<0>Déjà un compte ?</0><1>Connectez-vous !</1>"
+
+#: src/pages/auth/LoginPage.tsx
+msgid "<0>Need an account?</0><1>Sign up!</1>"
+msgstr "<0>Besoin d'un compte ?</0><1>Enregistrez-vous !</1>"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "API key"
+msgstr "Clé API"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Actions"
+msgstr "Actions"
+
+#: src/components/content/add/AddCategory.tsx
+msgid "Add"
+msgstr "Ajouter"
+
+#: src/pages/app/AddPage.tsx
+msgid "Add category"
+msgstr "Ajouter une catégorie"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Add user"
+msgstr "Ajouter un utilisateur"
+
+#: src/components/admin/UserEdit.tsx
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Admin"
+msgstr "Administrateur"
+
+#: src/components/header/Header.tsx
+#: src/components/sidebar/Tree.tsx
+msgid "All"
+msgstr "Tout"
+
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "An email has been sent if this address was registered. Check your inbox."
+msgstr "Un e-mail a été envoyé si cette adresse est enregistrée. Vérifiez votre boîte de réception."
+
+#: src/components/content/add/ImportOpml.tsx
+msgid "An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your data from other feed reading services."
+msgstr "Un fichier OPML est un fichier XML contenant des URL de flux et des catégories. Vous pouvez obtenir un fichier OPML en exportant vos données à partir d'autres services de lecture de flux."
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Analyze feed"
+msgstr "Analyser le flux"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Are you sure you want to delete category <0>{categoryName}</0>?"
+msgstr "Etes-vous sûr de vouloir supprimer la catégorie <0>{categoryName}</0>?"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Are you sure you want to delete user <0>{userName}</0> ?"
+msgstr "Etes-vous sûr de vouloir supprimer l'utilisateur <0>{userName}</0> ?"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Are you sure you want to delete your account? There's no turning back!"
+msgstr "Êtes-vous sûr de vouloir supprimer définitivement votre compte ?"
+
+#: src/components/header/Header.tsx
+msgid "Are you sure you want to mark all entries of <0>{sourceLabel}</0> as read?"
+msgstr "Etes-vous sûr de vouloir marquer toutes les entrées de <0>{sourceLabel}</0> comme lues?"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Are you sure you want to unsubscribe from <0>{feedName}</0>?"
+msgstr "Etes-vous sûr de vouloir vous désabonner de <0>{feedName}</0>?"
+
+#: src/components/header/Header.tsx
+msgid "Asc"
+msgstr "Ascendant"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Available variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison."
+msgstr "Les variables disponibles sont 'title', 'content', 'url' 'author' et 'categories' et leur contenu est converti en minuscules pour faciliter la comparaison de chaînes."
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Back"
+msgstr "Retour"
+
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "Back to log in"
+msgstr "Retour à la connexion"
+
+#: src/components/admin/UserEdit.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/header/Header.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/AddCategory.tsx
+#: src/components/content/add/Subscribe.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Category"
+msgstr "Catégorie"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Changing password will generate a new API key"
+msgstr "Changer de mot de passe générera une nouvelle clé API"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Check that the feed is working"
+msgstr "Vérifie que le flux fonctionne"
+
+#: src/components/header/Header.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Confirm"
+msgstr "Confirmer"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Confirm password"
+msgstr "Confirmer le mot de passe"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Current password"
+msgstr "Mot de passe actuel"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Date created"
+msgstr "Date de création"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Delete"
+msgstr "Effacer"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Delete Category"
+msgstr "Effacer la catégorie"
+
+#: src/components/settings/ProfileSettings.tsx
+#: src/components/settings/ProfileSettings.tsx
+msgid "Delete account"
+msgstr "Effacer le compte"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Delete user"
+msgstr "Effacer l'utilisateur"
+
+#: src/components/header/Header.tsx
+msgid "Desc"
+msgstr "Descendant"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Display"
+msgstr "Affichage"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Download"
+msgstr "Télécharger"
+
+#: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "E-mail"
+msgstr "E-mail"
+
+#: src/pages/auth/RegistrationPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
+msgid "E-mail address"
+msgstr "Adresse e-mail"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Edit user"
+msgstr "Modifier un utilisateur"
+
+#: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Enabled"
+msgstr "Actif"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Enter your current password to change profile settings"
+msgstr "Entrez votre mot de passe actuel pour changer les paramètres du profil"
+
+#: src/components/Alert.tsx
+msgid "Error"
+msgstr "Erreur"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Example: {example}."
+msgstr "Exemple : {example}."
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Export your subscriptions and categories as an OPML file that can be imported in other feed reading services"
+msgstr "Exporter vos abonnements et catégories en tant que fichier OPML qui peut être importé dans d'autres services de lecture de flux"
+
+#: src/components/content/add/Subscribe.tsx
+#: src/components/content/add/Subscribe.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Feed URL"
+msgstr "URL du flux"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Feed name"
+msgstr "Nom du flux"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Filtering expression"
+msgstr "Expression de filtrage"
+
+#: src/pages/auth/LoginPage.tsx
+msgid "Forgot password?"
+msgstr "Mot de passe oublié ?"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Generate an API key in your profile first."
+msgstr "Générez d'abord une clé API dans votre profil."
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Generate new API key"
+msgstr "Générer une nouvelle clé API"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Generated feed url"
+msgstr "URL du flux généré"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Id"
+msgstr "Identifiant"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically."
+msgstr "Si non vide, une expression évaluant à 'vrai' ou 'faux'. Si faux, les nouvelles entrées de ce flux seront marquées comme lues automatiquement."
+
+#: src/components/content/add/ImportOpml.tsx
+msgid "Import"
+msgstr "Importer"
+
+#: src/components/content/FeedEntryFooter.tsx
+msgid "Keep unread"
+msgstr "Garder non lu"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "Language"
+msgstr "Langue"
+
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Last login date"
+msgstr "Dernière connexion"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Last refresh"
+msgstr "Dernière mise à jour"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Last refresh message"
+msgstr "Dernier message de mise à jour"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Link"
+msgstr "Lien"
+
+#: src/hooks/useAppLoading.ts
+msgid "Loading profile..."
+msgstr "Chargement du profil ..."
+
+#: src/hooks/useAppLoading.ts
+msgid "Loading settings..."
+msgstr "Chargement des paramètres ..."
+
+#: src/hooks/useAppLoading.ts
+msgid "Loading subscriptions..."
+msgstr "Chargement des abonnements ..."
+
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/LoginPage.tsx
+msgid "Log in"
+msgstr "Connexion"
+
+#: src/components/header/ProfileMenu.tsx
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: src/components/header/ProfileMenu.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+msgid "Manage users"
+msgstr "Gestion des utilisateurs"
+
+#: src/components/header/Header.tsx
+msgid "Mark all as read"
+msgstr "Tout marquer comme lu"
+
+#: src/components/header/Header.tsx
+msgid "Mark all entries as read"
+msgstr "Marquer toutes les entrées comme lues"
+
+#: src/components/RelativeDate.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "N/A"
+msgstr "N/A"
+
+#: src/components/admin/UserEdit.tsx
+#: src/pages/admin/AdminUsersPage.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Name"
+msgstr "Nom"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Next"
+msgstr "Suivant"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Next refresh"
+msgstr "Prochaine mise à jour"
+
+#: src/pages/app/FeedEntriesPage.tsx
+msgid "No more entries"
+msgstr "Plus d'entrées"
+
+#: src/components/sidebar/TreeSearch.tsx
+msgid "Nothing found"
+msgstr "Aucun résultat"
+
+#: src/pages/app/AddPage.tsx
+msgid "OPML"
+msgstr "OPML"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "OPML export"
+msgstr "Export du fichier OPML"
+
+#: src/components/content/add/ImportOpml.tsx
+#: src/components/content/add/ImportOpml.tsx
+msgid "OPML file"
+msgstr "Fichier OPML"
+
+#: src/components/content/FeedEntryFooter.tsx
+msgid "Open link"
+msgstr "Ouvrir le lien"
+
+#: src/components/content/add/AddCategory.tsx
+msgid "Parent"
+msgstr "Parent"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+msgid "Parent Category"
+msgstr "Catégorie parente"
+
+#: src/components/admin/UserEdit.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
+msgid "Password"
+msgstr "Mot de passe"
+
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "Password Recovery"
+msgstr "Récupération de mot de passe"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "Passwords do not match"
+msgstr "Les mots de passe ne correspondent pas"
+
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Position"
+msgstr "Position"
+
+#: src/pages/app/SettingsPage.tsx
+msgid "Profile"
+msgstr "Profil"
+
+#: src/pages/auth/PasswordRecoveryPage.tsx
+msgid "Recover password"
+msgstr "Récupérer le mot de passe"
+
+#: src/components/header/Header.tsx
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: src/pages/auth/RegistrationPage.tsx
+msgid "Registrations are closed on this CommaFeed instance"
+msgstr "Les inscriptions sont fermées sur cette instance de CommaFeed"
+
+#: src/components/admin/UserEdit.tsx
+#: src/components/settings/ProfileSettings.tsx
+#: src/pages/app/CategoryDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Save"
+msgstr "Enregistrer"
+
+#: src/components/settings/DisplaySettings.tsx
+msgid "Scroll smoothly when navigating between entries"
+msgstr "Défilement animé lors de la navigation entre les entrées"
+
+#: src/components/sidebar/TreeSearch.tsx
+#: src/components/sidebar/TreeSearch.tsx
+msgid "Search"
+msgstr "Rechercher"
+
+#: src/components/header/ProfileMenu.tsx
+msgid "Settings"
+msgstr "Réglages"
+
+#: src/app/slices/user.ts
+msgid "Settings saved."
+msgstr "Réglages enregistrés."
+
+#: src/pages/auth/RegistrationPage.tsx
+#: src/pages/auth/RegistrationPage.tsx
+msgid "Sign up"
+msgstr "Créer un compte"
+
+#: src/components/content/add/Subscribe.tsx
+#: src/components/content/add/Subscribe.tsx
+#: src/pages/app/AddPage.tsx
+msgid "Subscribe"
+msgstr "S'abonner"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "Subscribe to the feed"
+msgstr "S'abonner au flux"
+
+#: src/components/Alert.tsx
+msgid "Success"
+msgstr "Succès"
+
+#: src/components/content/add/Subscribe.tsx
+msgid "The URL for the feed you want to subscribe to. You can also use the website's url directly and CommaFeed will try to find the feed in the page."
+msgstr "L'URL du flux auquel vous souhaitez vous abonner. Vous pouvez aussi utiliser l'URL du site directement et CommaFeed va essayer de trouver le flux dans la page."
+
+#: src/components/header/ProfileMenu.tsx
+msgid "Theme"
+msgstr "Thème"
+
+#: src/components/header/Header.tsx
+msgid "Unread"
+msgstr "Non lu"
+
+#: src/pages/app/FeedDetailsPage.tsx
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Unsubscribe"
+msgstr "Se désabonner"
+
+#: src/pages/auth/LoginPage.tsx
+#: src/pages/auth/LoginPage.tsx
+msgid "User Name or E-mail"
+msgstr "Nom d'utilisateur ou e-mail"
+
+#: src/components/settings/ProfileSettings.tsx
+msgid "User name"
+msgstr "Nom"
+
+#: src/components/Alert.tsx
+msgid "Warning"
+msgstr "Attention"
+
+#: src/pages/app/FeedDetailsPage.tsx
+msgid "Website"
+msgstr "Site web"
+
+#: src/pages/app/FeedEntriesPage.tsx
+msgid "You don't have any subscriptions yet. Why not try adding one by clicking on the + sign at the top of the page?"
+msgstr "Vous n'avez pas encore d'abonnements. Pourquoi ne pas essayer d'en ajouter un en cliquant sur le signe + en haut de la page ?"
+
+#: src/components/content/add/ImportOpml.tsx
+msgid "file is required"
+msgstr "fichier requis"
--- a/commafeed-client/src/main.tsx
+++ b/commafeed-client/src/main.tsx
@@ -0,0 +1,18 @@
+import "@fontsource/open-sans"
+import { store } from "app/store"
+import dayjs from "dayjs"
+import relativeTime from "dayjs/plugin/relativeTime"
+import React from "react"
+import ReactDOM from "react-dom/client"
+import { Provider } from "react-redux"
+import { App } from "./App"
+
+dayjs.extend(relativeTime)
+
+ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
+    <React.StrictMode>
+        <Provider store={store}>
+            <App />
+        </Provider>
+    </React.StrictMode>
+)
--- a/commafeed-client/src/main/app/api/index.html
+++ b/commafeed-client/src/main/app/api/index.html
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Swagger UI</title>
-        <link href="css/typography.css" media="screen" rel="stylesheet" type="text/css" />
-        <link href="css/reset.css" media="screen" rel="stylesheet" type="text/css" />
-        <link href="css/screen.css" media="screen" rel="stylesheet" type="text/css" />
-        <link href="css/reset.css" media="print" rel="stylesheet" type="text/css" />
-        <link href="css/screen.css" media="print" rel="stylesheet" type="text/css" />
-        <script type="text/javascript" src="lib/shred.bundle.js"></script>
-        <script src="lib/jquery-1.8.0.min.js" type="text/javascript"></script>
-        <script src="lib/jquery.slideto.min.js" type="text/javascript"></script>
-        <script src="lib/jquery.wiggle.min.js" type="text/javascript"></script>
-        <script src="lib/jquery.ba-bbq.min.js" type="text/javascript"></script>
-        <script src="lib/handlebars-2.0.0.js" type="text/javascript"></script>
-        <script src="lib/underscore-min.js" type="text/javascript"></script>
-        <script src="lib/backbone-min.js" type="text/javascript"></script>
-        <script src="lib/swagger-client.js" type="text/javascript"></script>
-        <script src="swagger-ui.js" type="text/javascript"></script>
-        <script src="lib/highlight.7.3.pack.js" type="text/javascript"></script>
-        <script src="lib/marked.js" type="text/javascript"></script>
-
-        <!-- enabling this will enable oauth2 implicit scope support -->
-        <script src="lib/swagger-oauth.js" type="text/javascript"></script>
-        <script type="text/javascript">
-            $(function () {
-                window.swaggerUi = new SwaggerUi({
-                    url: "./swagger.json",
-                    dom_id: "swagger-ui-container",
-                    supportedSubmitMethods: ["get", "post", "put", "delete"],
-                    onComplete: function (swaggerApi, swaggerUi) {
-                        if (typeof initOAuth == "function") {
-                            /*
-          initOAuth({
-            clientId: "your-client-id",
-            realm: "your-realms",
-            appName: "your-app-name"
-          });
-          */
-                        }
-                        $("pre code").each(function (i, e) {
-                            hljs.highlightBlock(e)
-                        })
-                    },
-                    onFailure: function (data) {
-                        log("Unable to Load SwaggerUI")
-                    },
-                    docExpansion: "none",
-                    sorter: "alpha",
-                })
-
-                $("#input_apiKey").change(function () {
-                    var key = $("#input_apiKey")[0].value
-                    log("key: " + key)
-                    if (key && key.trim() != "") {
-                        log("added key " + key)
-                        window.authorizations.add("key", new ApiKeyAuthorization("api_key", key, "query"))
-                    }
-                })
-                window.swaggerUi.load()
-            })
-        </script>
-    </head>
-
-    <body class="swagger-section">
-        <div id="header">
-            <div class="swagger-ui-wrap">
-                <a id="logo" href="http://swagger.wordnik.com">swagger</a>
-                <form id="api_selector">
-                    <div class="input icon-btn">
-                        <img id="show-pet-store-icon" src="images/pet_store_api.png" title="Show Swagger Petstore Example Apis" />
-                    </div>
-                    <div class="input icon-btn">
-                        <img id="show-wordnik-dev-icon" src="images/wordnik_api.png" title="Show Wordnik Developer Apis" />
-                    </div>
-                    <div class="input"><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text" /></div>
-                    <div class="input"><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text" /></div>
-                    <div class="input"><a id="explore" href="#">Explore</a></div>
-                </form>
-            </div>
-        </div>
-
-        <div id="message-bar" class="swagger-ui-wrap">&nbsp;</div>
-        <div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-    </body>
-</html>
--- a/commafeed-client/src/main/app/app-icon-128.png
+++ b/commafeed-client/src/main/app/app-icon-128.png
--- a/commafeed-client/src/main/app/app-icon-16.png
+++ b/commafeed-client/src/main/app/app-icon-16.png
--- a/commafeed-client/src/main/app/app-icon-195.png
+++ b/commafeed-client/src/main/app/app-icon-195.png
--- a/commafeed-client/src/main/app/app-icon-256.png
+++ b/commafeed-client/src/main/app/app-icon-256.png
--- a/commafeed-client/src/main/app/app-icon-32.png
+++ b/commafeed-client/src/main/app/app-icon-32.png
--- a/commafeed-client/src/main/app/app-icon-512.png
+++ b/commafeed-client/src/main/app/app-icon-512.png
--- a/commafeed-client/src/main/app/app-icon-57.png
+++ b/commafeed-client/src/main/app/app-icon-57.png
--- a/commafeed-client/src/main/app/app-icon-64.png
+++ b/commafeed-client/src/main/app/app-icon-64.png
--- a/commafeed-client/src/main/app/i18n/ar.js
+++ b/commafeed-client/src/main/app/i18n/ar.js
@@ -1,181 +0,0 @@
-{
-  "global" : {
-    "save" : "حفظ",
-    "cancel" : "إلغاء",
-    "delete" : "حذف",
-    "required" : "مطلوب",
-    "download" : "تحميل",
-    "link" : "رابط",
-    "bookmark" : "مرجعية",
-    "close" : "أغلق",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "اشترك",
-    "import" : "استورد",
-    "new_category" : "فئة جديدة",
-    "all" : "الكل",
-    "starred" : "المفضل"
-  },
-  "subscribe" : {
-    "feed_url" : "رابط المغذي",
-    "feed_name" : "اسم المغذي",
-    "category" : "فئة"
-  },
-  "import" : {
-    "google_reader_prefix" : "اسمح لي استيرا المغذيات الخاص بك",
-    "google_reader_suffix" : "حساب.",
-    "google_download" : "بدلا من ذلك، يمكنك تحميل ملف subscriptions.xml الخاص بك.",
-    "google_download_link" : "تحميل من هنا.",
-    "xml_file" : "ملف OPML"
-  },
-  "new_category" : {
-    "name" : "الإ سم",
-    "parent" : "الأصل"
-  },
-  "toolbar" : {
-    "unread" : "غير مقروء",
-    "all" : "الكل",
-    "previous_entry" : "الإدخال السابقة",
-    "next_entry" : "الإدخال التالي",
-    "refresh" : "إعادة انعاش",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "الترتيب حسب التاريخ تصاعدي / تنازلي",
-    "titles_only" : "العناوين فقط",
-    "expanded_view" : "عرض موسع",
-    "mark_all_as_read" : "اعتبر الكل مقروء",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day" : "العناصر الأقدم من يوم",
-    "mark_all_older_week" : "العناصر الأقدم من أسبوع",
-    "mark_all_older_two_weeks" : "العناصر الأقدم من أسبوعين",
-    "settings" : "إعدادات",
-    "profile" : "الملف الشخصي",
-    "admin" : "المشرف",
-    "about" : "معلومات حول",
-    "logout" : "تسجيل الخروج",
-    "donate" : "تبرع"
-  },
-  "view" : {
-    "entry_source" : "from  ",
-    "entry_author" : "by  ",
-    "error_while_loading_feed" : "خطأ أثناء تحميل هذه التغذية",
-    "keep_unread" : "إبقائه غير مقروء",
-    "no_unread_items" : "لا يحتوي عناصر غير مقروءة.",
-    "mark_up_to_here" : "Mark as read up to here ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
-  },
-  "feedsearch" : {
-    "hint" : "أدخل اشتراك ...",
-    "help" : "استخدام مفتاح العودة للاختيار ومفاتيح الأسهم للتنقل.",
-    "result_prefix" : "الاشتراكات الخاصة بك:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "General",
-      "language" : "Language",
-      "language_contribute" : "Contribute with translations",
-      "show_unread" : "Show feeds and categories with no unread entries",
-      "social_buttons" : "Show social sharing buttons",
-      "scroll_marks" : "In expanded view, scrolling through entries mark them as read"
-    },
-    "appearance" : "Appearance",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Theme",
-    "submit_your_theme" : "Submit your theme",
-    "custom_css" : "Custom CSS"
-  },
-  "details" : {
-    "feed_details" : "Feed details",
-    "url" : "URL",
-    "website" : "Website ",
-    "name" : "Name",
-    "category" : "Category",
-    "position" : "Position",
-    "last_refresh" : "Last refresh",
-    "message" : "Last refresh message ",
-    "next_refresh" : "Next refresh",
-    "queued_for_refresh" : "Queued for refresh",
-    "feed_url" : "Feed URL",
-    "generate_api_key_first" : "Generate an API key in your profile first.",
-    "unsubscribe" : "Unsubscribe",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details" : "Category details",
-    "tag_details" : "Tag details ",
-    "parent_category" : "Parent category"
-  },
-  "profile" : {
-    "user_name" : "User name",
-    "email" : "E-mail",
-    "change_password" : "Change password",
-    "confirm_password" : "Confirm password",
-    "minimum_8_chars" : "Minimum 8 characters",
-    "passwords_do_not_match" : "Passwords do not match",
-    "api_key" : "API key",
-    "api_key_not_generated" : "Not generated yet",
-    "generate_new_api_key" : "Generate new API key",
-    "generate_new_api_key_info" : "Changing password will generate a new API key",
-    "opml_export" : "OPML export",
-    "delete_account" : "Delete account",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed is built on top of JAX-RS and AngularJS. As such, a REST API is available.",
-      "link_to_documentation" : "Link to the documentation."
-    },
-    "keyboard_shortcuts" : "Keyboard shortcuts",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed is an open-source project. Sources are hosted on ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "If you encounter an issue, please report it on the issues page of the ",
-    "line2_suffix" : " project.",
-    "line3" : "If you like this project, please consider a donation to support the developer and help cover the costs of keeping this website online.",
-    "line4" : "For those of you who prefer bitcoin, here is the address",
-    "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "Android app ",
-      "subscribe_url" : "Subscribe URL",
-      "chrome_extension" : "Chrome extension",
-      "firefox_extension" : "Firefox extension",
-      "opera_extension" : "Opera extension",
-      "subscribe_bookmarklet" : "Add subscription bookmarklet (click)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Next unread item bookmarklet (drag to bookmark bar)"
-    },
-    "translation" : {
-      "value" : "Translation",
-      "message" : "We need your help to translate CommaFeed.",
-      "link" : "See how to contribute with translations."
-    },
-    "announcements" : "Announcements",
-    "shortcuts" : {
-      "mouse_middleclick" : "mouse middleclick",
-      "open_next_entry" : "open next entry",
-      "open_previous_entry" : "open previous entry",
-      "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
-      "focus_next_entry" : "set focus on next entry without opening it",
-      "focus_previous_entry" : "set focus on previous entry without opening it",
-      "open_next_feed" : "open next feed or category",
-      "open_previous_feed" : "open previous feed or category",
-      "open_close_current_entry" : "open/close current entry",
-      "open_current_entry_in_new_window" : "open current entry in a new window",
-      "open_current_entry_in_new_window_background" : "open current entry in a new window in the background",
-      "star_unstar" : "star/unstar current entry",
-      "mark_current_entry" : "mark as read/unread current entry",
-      "mark_all_as_read" : "mark all entries as read",
-      "open_in_new_tab_mark_as_read" : "open entry in new tab and mark as read",
-      "fullscreen" : "toggle full screen mode ",
-      "font_size" : "increase/decrease font size of the current entry ",
-      "go_to_all" : "go to the All view ",
-      "go_to_starred" : "go to the Starred view ",
-      "feed_search" : "navigate to a subscription by entering the subscription name",
-      "refresh": "refresh"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/ca.js
+++ b/commafeed-client/src/main/app/i18n/ca.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Desa",
-    "cancel" : "Cancel·la",
-    "delete" : "Esborra",
-    "required" : "Requerit",
-    "download" : "Descarrega",
-    "link" : "Enllaç",
-    "bookmark" : "Adreça d'interès",
-    "close" : "Tancar",
-    "tags" : "Etiquetes"
-  },
-  "tree" : {
-    "subscribe" : "Subscriure",
-    "import" : "Importa",
-    "new_category" : "Nova categoria",
-    "all" : "Tot",
-    "starred" : "Destacats"
-  },
-  "subscribe" : {
-    "feed_url" : "URL del canal",
-    "feed_name" : "Nom del canal",
-    "category" : "Categoria"
-  },
-  "import" : {
-    "google_reader_prefix" : "Importaré els canals del teu",
-    "google_reader_suffix" : " compte.",
-    "google_download" : "O be, carrega el teu fitxer subscriptions.xml.",
-    "google_download_link" : "Descarrega'l d'aquí.",
-    "xml_file" : "Fitxer OPML "
-  },
-  "new_category" : {
-    "name" : "Nom",
-    "parent" : "Arrel"
-  },
-  "toolbar" : {
-    "unread" : "Per llegir",
-    "all" : "Tots",
-    "previous_entry" : "Entrada prèvia",
-    "next_entry" : "Entrada següent",
-    "refresh" : "Actualitzar",
-    "refresh_all" : "Força l'actualització de tots els canals",
-    "sort_by_asc_desc" : "Ordenar per data asc/desc",
-    "titles_only" : "Només títols",
-    "expanded_view" : "Vista ampliada",
-    "mark_all_as_read" : "Marcar tots llegits",
-    "mark_all_older_12_hours" : "Ítems més vells de 12 hores",
-    "mark_all_older_day" : "Ítems més vells d'un dia",
-    "mark_all_older_week" : "Ítems més vells d'una setmana",
-    "mark_all_older_two_weeks" : "Ítems més vells de dues setmanes",
-    "settings" : "Configuració",
-    "profile" : "Perfil",
-    "admin" : "Admin",
-    "about" : "Quant a",
-    "logout" : "Desconnecta't",
-    "donate" : "Donació"
-  },
-  "view" : {
-    "entry_source" : "de ",
-    "entry_author" : "per ",
-    "error_while_loading_feed" : "Error carregant el canal",
-    "keep_unread" : "Conserva com a no llegit",
-    "no_unread_items" : "no té ítems sense llegir.",
-    "mark_up_to_here" : "Marcar com a llegit fins aquí",
-    "search_for" : "cercant: ",
-    "no_search_results" : "No hi ha coincidències per les paraules clau sol·licitades"
-  },
-  "feedsearch" : {
-    "hint" : "Introdueix una subscripció...",
-    "help" : "Utilitza la tecla de retorn per seleccionar i les tecles de cursor per navegar.",
-    "result_prefix" : "Les teves subscripcions:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "General",
-      "language" : "Idioma",
-      "language_contribute" : "Contribueix amb traduccions",
-      "show_unread" : "Mostrar canals i categories amb entrades sense llegir",
-      "social_buttons" : "Mostrar botons per compartir en xarxes socials",
-      "scroll_marks" : "A la vista ampliada si et desplaces per les entrades les marques com a llegides"
-    },
-    "appearance" : "Aparença",
-    "scroll_speed" : "Velocitat de desplaçament quan navegues entre entrades (en mil·lisegons)",
-    "scroll_speed_help" : "Fixa a 0 per desactivar",
-    "theme" : "Tema",
-    "submit_your_theme" : "Envia un tema",
-    "custom_css" : "CSS personalitzat"
-  },
-  "details" : {
-    "feed_details" : "Detalls del canal",
-    "url" : "URL",
-    "website" : "Lloc web",
-    "name" : "Nom",
-    "category" : "Categoria",
-    "position" : "Posició",
-    "last_refresh" : "Darrera actualització",
-    "message" : "Darrer missatge d'actualització",
-    "next_refresh" : "Propera actualització",
-    "queued_for_refresh" : "A la cua d'actualització",
-    "feed_url" : "URL del canal",
-    "generate_api_key_first" : "Abans cal que generis una clau API en el teu perfil.",
-    "unsubscribe" : "Cancel·la la subscripció",
-    "unsubscribe_confirmation" : "Segur que vols cancel·lar la subscripció del canal?",
-    "delete_category_confirmation" : "Segur que vols esborrar la categoria?",
-    "category_details" : "Detalls de la categoria",
-    "tag_details" : "Detalls de l'etiqueta",
-    "parent_category" : "Categoria arrel"
-  },
-  "profile" : {
-    "user_name" : "Nom d'usuari",
-    "email" : "Adreça electrònica",
-    "change_password" : "Canvia la contrasenya ",
-    "confirm_password" : "Confirma la contrasenya",
-    "minimum_8_chars" : "Mínim de 8 caracters",
-    "passwords_do_not_match" : "Les contrasenyes no coincideixen",
-    "api_key" : "Clau API ",
-    "api_key_not_generated" : "Encara no s'ha generat",
-    "generate_new_api_key" : "Genera una nova clau API ",
-    "generate_new_api_key_info" : "El canvi de contrasenya generarà una nova clau API",
-    "opml_export" : "Exporta OPML ",
-    "delete_account" : "Esborra el compte ",
-    "delete_account_confirmation" : "Vols esborrar el teu compte? No ho podràs desfer!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed funciona amb JAX-RS i AngularJS. Per tant, té disponible una API REST.",
-      "link_to_documentation" : "Enllaç a la documentació."
-    },
-    "keyboard_shortcuts" : "Dreceres de teclat",
-    "version" : "Versió de CommaFeed ",
-    "line1_prefix" : "CommaFeed és un projecte de codi font obert. El codi font és hostatjat a ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Si trobes un problema, si us plau informa'n a la pàgina de problemes del ",
-    "line2_suffix" : " projecte.",
-    "line3" : "Si t'agrada el projecte, pensa en fer un donatiu per recolzar el desenvolupador i per ajudar amb les despeses de l'hostatge del lloc web. ",
-    "line4" : "I pels que preferiu bitcoin, aquí teniu l'adreça",
-    "goodies" : {
-      "value" : "Afegitons",
-      "android_app" : "App Android",
-      "subscribe_url" : "URL de subscripció",
-      "chrome_extension" : "Extensió del Chrome ",
-      "firefox_extension" : "Extensió del Firefox",
-      "opera_extension" : "Extensió de l'Opera",
-      "subscribe_bookmarklet" : "Afegeix bookmarklet de subscripció (clica)",
-      "subscribe_bookmarklet_asc" : "Primer els vells",
-      "subscribe_bookmarklet_desc" : "Primer els nous",
-      "next_unread_bookmarklet" : "Bookmarklet del proper ítem sense llegir (arrosega a la barra d'adreces d'interès)"
-    },
-    "translation" : {
-      "value" : "Traducció",
-      "message" : "Necessitem la teva ajuda per traduir CommaFeed.",
-      "link" : "Informació per contribuir amb traduccions."
-    },
-    "announcements" : "Anuncis",
-    "shortcuts" : {
-      "mouse_middleclick" : "Clic amb el botó del mig",
-      "open_next_entry" : "obrir entrada següent",
-      "open_previous_entry" : "obrir entrada prèvia",
-      "spacebar" : "espai/majúscula+espai",
-      "move_page_down_up" : "mou la pàgina avall/amunt",
-      "focus_next_entry" : "fixa el focus en l'entrada següent entrada sense obrir-la",
-      "focus_previous_entry" : "fixa el focus en l'entrada prèvia sense obrir-la",
-      "open_next_feed" : "obrir canal o categoria següent",
-      "open_previous_feed" : "obrir canal o categoria prèvia",
-      "open_close_current_entry" : "obre/tanca entrada actual",
-      "open_current_entry_in_new_window" : "obrir entrada actual en una finestra nova",
-      "open_current_entry_in_new_window_background" : "obrir entrada actual en una finestra nova en segon pla",
-      "star_unstar" : "destacar/treure destacat a l'entrada actual ",
-      "mark_current_entry" : "marcar com a llegida/no llegida l'entrada actual",
-      "mark_all_as_read" : "marcar totes les entrades com a llegides",
-      "open_in_new_tab_mark_as_read" : "obrir entrada en una pestanya nova i marcar com a llegida ",
-      "fullscreen" : "commutar el mode de pantalla completa",
-      "font_size" : "incrementar/reduir la mida de la font de l'entrada actual",
-      "go_to_all" : "anar a la vista de Tot ",
-      "go_to_starred" : "anar a la vista de Destacats",
-      "feed_search" : "navegar a una subscripció introduint-ne el nom"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/cs.js
+++ b/commafeed-client/src/main/app/i18n/cs.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save " : " Uložit",
-    "cancel " : " Zrušit",
-    "delete " : " Odstranit",
-    "required " : " Povinné",
-    "download " : " Stáhnout",
-    "link " : " Odkaz",
-    "bookmark " : " Záložky",
-    "close " : " Zavřít",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe " : " Nový odběr",
-    "import " : " Importovat",
-    "new_category " : " Nová kategorie",
-    "all " : " Vše",
-    "starred " : " Oblíbené"
-  },
-  "subscribe" : {
-    "feed_url " : " URL RSS zdroje",
-    "feed_name " : " Název",
-    "category " : " Kategorie"
-  },
-  "import" : {
-    "google_reader_prefix " : " Importujte si RSS zdroje s vašeho",
-    "google_reader_suffix " : " účtu.",
-    "google_download " : " Anebo můžete nahrát váš subscriptions.xml soubor",
-    "google_download_link " : " Stáhnout jej múžete odtud",
-    "xml_file" : "Soubor OPML"
-  },
-  "new_category" : {
-    "name " : " Název",
-    "parent " : " Hlavní"
-  },
-  "toolbar" : {
-    "unread " : " Nepřečtené ",
-    "all " : " Vše",
-    "previous_entry " : " Předchozí položka",
-    "next_entry " : " Následující položka",
-    "refresh " : " Obnovit",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc " : " Seřadit podle nejnovějšího/nejstaršího",
-    "titles_only " : " Zobrazit jenom titulky",
-    "expanded_view " : " Rozšířený náhled",
-    "mark_all_as_read " : " Označit vše jako přečtené",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day " : " Položky starší než den",
-    "mark_all_older_week " : " Položky starší než týden",
-    "mark_all_older_two_weeks " : " Položky starší než dva týdny",
-    "settings " : " Nastavení",
-    "profile " : " Profil",
-    "admin " : " Admin",
-    "about " : " O CommaFeed",
-    "logout " : " Odhlásit",
-    "donate " : " Donate"
-  },
-  "view" : {
-    "entry_source " : " s",
-    "entry_author " : " od",
-    "error_while_loading_feed " : " Během načítání se vyskytla chyba",
-    "keep_unread " : " Označit jako nepřečtené",
-    "no_unread_items " : " nemá žádné nepřečtené položky.",
-    "mark_up_to_here " : " Až potud označit položky jako přečtené",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
-  },
-  "feedsearch" : {
-    "hint " : " Zadejte název pro nový odběr ...",
-    "help " : " Použijte klávesu enter pro výběr a směrové klávesy pro navigaci.",
-    "result_prefix " : " Vaše odebírání:"
-  },
-  "settings" : {
-    "general" : {
-      "value " : " Všeobecné",
-      "language " : " Jazyk",
-      "language_contribute " : " Zapojte se a pomozte z překladem",
-      "show_unread " : " Zobrazit položky a kategorie z přečtenými položkami",
-      "social_buttons " : " Zobrazit možnosti sdílení",
-      "scroll_marks " : " Skrolování v rozšířeném náhledu označí položky jako přečtené"
-    },
-    "appearance " : " Vzhled",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme " : " Motiv",
-    "submit_your_theme " : " Nahrát vlastní motiv",
-    "custom_css " : " Vlastní motiv (CSS)"
-  },
-  "details" : {
-    "feed_details " : " Detail odběru",
-    "url " : " URL odkaz",
-    "website " : " Web stránka",
-    "name " : " Název",
-    "category " : " Kategorie",
-    "position " : " Pozice",
-    "last_refresh " : " Poslední obnovení",
-    "message" : "Last refresh message ",
-    "next_refresh " : " Nadcházející obnovení",
-    "queued_for_refresh " : " Ve frontě na obnovu",
-    "feed_url " : " URL RSS zdroje",
-    "generate_api_key_first " : " Vygenerujte si API klíč na stránce vašeho profilu.",
-    "unsubscribe " : " Odhlásit odběr.",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details " : " Detail kategorie",
-    "tag_details" : "Tag details ",
-    "parent_category " : " Hlavní kategorie"
-  },
-  "profile" : {
-    "user_name " : " Uživatelské jméno",
-    "email " : " E-mail",
-    "change_password " : " Změnit heslo",
-    "confirm_password " : " Potvrdit heslo",
-    "minimum_8_chars " : " Minimum je 8 znaků",
-    "passwords_do_not_match " : " Hesla se neshodují",
-    "api_key " : " API klíč",
-    "api_key_not_generated " : " Není vygenerován",
-    "generate_new_api_key " : " Vygenerovat nový API klíč",
-    "generate_new_api_key_info " : " Změnou hesla vygenerujete nový API klíč",
-    "opml_export " : " exportovat do formátu OPML",
-    "delete_account " : " Odstranit účet",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value " : " REST API",
-      "line1 " : " CommaFeed je postaven na JAX-RS a AngularJS. Dostupná je REST API.",
-      "link_to_documentation " : " Dokumentace."
-    },
-    "keyboard_shortcuts " : " Klávesové zkratky",
-    "version" : "CommaFeed version ",
-    "line1_prefix " : " CommaFeed je open source projekt. Zdrojový kód je dostupný na",
-    "line1_suffix " : ".",
-    "line2_prefix " : " V případě, že narazíte na problém, ohlaste ho prosím na stránkách",
-    "line2_suffix " : "  projektu.",
-    "line3 " : " V případě, že se vám líbí CommaFeed, zvažte prosím finanční příspěvek. Podpoříte tak budoucí vývoj a také pomůžete udržet web stránky online.",
-    "line4 " : " Bitcoin",
-    "goodies" : {
-      "value " : " Rozšíření",
-      "android_app " : " Aplikace pro zařízení Android",
-      "subscribe_url " : " URL",
-      "chrome_extension " : " Rozšíření pro prohlížeč Chrome",
-      "firefox_extension " : " Rozšíření pro prohlížeč Firefox",
-      "opera_extension " : " Rozšíření pro prohlížeč Opera",
-      "subscribe_bookmarklet " : " Bookmarklet (klikněte)",
-      "subscribe_bookmarklet_asc " : " Seřadit od nejstaršího k nejnovějšímu",
-      "subscribe_bookmarklet_desc " : " Seřadit od nejnovějšího k nejstaršímu",
-      "next_unread_bookmarklet " : " Záložka následující nepřečtené položky (protáhnout k záložkám)"
-    },
-    "translation" : {
-      "value " : " Překlad",
-      "message " : " Pomozte z překladem CommaFeed.",
-      "link " : " Zjistěte jak můžete pomoct s překladem."
-    },
-    "announcements " : " Oznámení",
-    "shortcuts" : {
-      "mouse_middleclick " : " klik prostředním tlačítkem",
-      "open_next_entry " : " zobrazit následující položku",
-      "open_previous_entry " : " zobrazit předchozí položku",
-      "spacebar " : " space / shift + mezerník",
-      "move_page_down_up " : " pohyb směrem dolů/nahoru",
-      "focus_next_entry " : " přesun na následující položku bez jejího zobrazení",
-      "focus_previous_entry " : " přesun na předchozí položku bez jejího zobrazení",
-      "open_next_feed " : " přesun na následující odběr/kategorii",
-      "open_previous_feed " : " přesun na předchozí odběr/kategorii",
-      "open_close_current_entry " : " zobrazit/zavřít vybranou položku",
-      "open_current_entry_in_new_window " : " otevřít vybranou položku v novém okně",
-      "open_current_entry_in_new_window_background " : " otevřít vybranou položku na pozadí",
-      "star_unstar " : " označit vybranou položku jako oblíbenou/neoblíbenou",
-      "mark_current_entry " : " označit vybrané položky jako přečtené/nepřečtené",
-      "mark_all_as_read " : " označit všechny položky jako přečtené!",
-      "open_in_new_tab_mark_as_read " : " otevřít položku na nové kartě a označit ji jako přečtenou",
-      "fullscreen " : " přepnout zobrazení na celou obrazovku",
-      "font_size " : " zvětšit/zmenšit velikost písma pro vybranou položku",
-      "go_to_all" : "go to the All view ",
-      "go_to_starred" : "go to the Starred view ",
-      "feed_search " : " přejít na odběr vložením jeho názvu"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/cy.js
+++ b/commafeed-client/src/main/app/i18n/cy.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Cadw",
-    "cancel" : "Diddymu",
-    "delete" : "Dileu",
-    "required" : "Gofynnol",
-    "download" : "Lawrlwytho",
-    "link" : "Dolen",
-    "bookmark" : "Nod tudalen",
-    "close" : "Cau",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "Tanysgrifio",
-    "import" : "Mewnforio",
-    "new_category" : "Categori newydd",
-    "all" : "Popeth",
-    "starred" : "Serennwyd"
-  },
-  "subscribe" : {
-    "feed_url" : "URL Ffrwd",
-    "feed_name" : "Enw Ffrwd",
-    "category" : "Categori"
-  },
-  "import" : {
-    "google_reader_prefix" : "Gad i mi fewnforio dy ffrydiau o dy ",
-    "google_reader_suffix" : " gyfrif.",
-    "google_download" : "Fel arall, lanlwytha dy ffeil tanysgrifiadau.xml",
-    "google_download_link" : "Lawrlwytha fe yma.",
-    "xml_file" : "Ffeil OPML"
-  },
-  "new_category" : {
-    "name" : "Enw",
-    "parent" : "Rhiant"
-  },
-  "toolbar" : {
-    "unread" : "Heb ddarllen",
-    "all" : "Popeth",
-    "previous_entry" : "Eitem blaenorol",
-    "next_entry" : "Eitem nesaf",
-    "refresh" : "Adnewyddu",
-    "refresh_all" : "Gorfodi ail-lwytho pob ffrwd",
-    "sort_by_asc_desc" : "Trefnu yn ôl dyddiad",
-    "titles_only" : "Teitlau yn unig",
-    "expanded_view" : "Golwg estynedig",
-    "mark_all_as_read" : "Nodi'r cyfan fel wedi ei ddarllen",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day" : "Eitemau hyn na diwrnod",
-    "mark_all_older_week" : "Eitemau hyn nag wythnos",
-    "mark_all_older_two_weeks" : "Eitemau hyn na phythefnos",
-    "settings" : "Gosodiadau",
-    "profile" : "Proffil",
-    "admin" : "Gweinyddwr",
-    "about" : "Ynghylch",
-    "logout" : "Allgofnodi",
-    "donate" : "Rhoddi"
-  },
-  "view" : {
-    "entry_source" : "o",
-    "entry_author" : "gan",
-    "error_while_loading_feed" : "Gwall wrth lwytho'r ffrwd",
-    "keep_unread" : "Parhau i'w nodi fel heb ei ddarllen",
-    "no_unread_items" : ": Dim eitemau heb eu darllen ",
-    "mark_up_to_here" : "Nodi'r rhai hyd yma fel wedi eu darllen",
-    "search_for" : "yn chwilio am:",
-    "no_search_results" : "Ni chanfuwyd unrhyw beth gyda'r geiriau hynny"
-  },
-  "feedsearch" : {
-    "hint" : "Rho'r tanysgrifiad...",
-    "help" : "Defnyddia'r dychwelwr i ddethol a saethau i lywio",
-    "result_prefix" : "Dy danysgrifiadau:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Cyffredinol",
-      "language" : "Iaith",
-      "language_contribute" : "Cyfrannu drwy gyfieithu",
-      "show_unread" : "Dangos ffrydiau a chategoriau gyda dim eitemau heb eu darllen",
-      "social_buttons" : "Dangos botymau rhannu",
-      "scroll_marks" : "Marcio eitemau fel wedi eu darllen wrth sgrolio drwyddynt yn y golwg estynedig "
-    },
-    "appearance" : "Golwg",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Thema",
-    "submit_your_theme" : "Cyflwyna dy thema",
-    "custom_css" : "CSS wedi'i addasu"
-  },
-  "details" : {
-    "feed_details" : "Manylion ffrwd",
-    "url" : "URL",
-    "website" : "Gwefan",
-    "name" : "Enw",
-    "category" : "Categori",
-    "position" : "Safle",
-    "last_refresh" : "Adnewyddiad diwethaf",
-    "message" : "Neges adnewyddiad diwethaf",
-    "next_refresh" : "Adnewyddiad nesaf",
-    "queued_for_refresh" : "Ciwiwyd i'w adnewyddu",
-    "feed_url" : "URL Ffrwd",
-    "generate_api_key_first" : "Rhaid creu allwedd API yn dy broffil yn gyntaf.",
-    "unsubscribe" : "Dad-danysgrifio",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details" : "Manylion categori",
-    "tag_details" : "Tag details ",
-    "parent_category" : "Categori rhiant"
-  },
-  "profile" : {
-    "user_name" : "Enw defnyddiwr",
-    "email" : "E-bost",
-    "change_password" : "Newid cyfrinair",
-    "confirm_password" : "Cadarnhau cyfrinair",
-    "minimum_8_chars" : "Isafswm 8 nod",
-    "passwords_do_not_match" : "Mae'r cyfrineiriau yn wahanol",
-    "api_key" : "Allwedd API",
-    "api_key_not_generated" : "Heb ei gynhyrchu eto",
-    "generate_new_api_key" : "Creu allwedd API newydd",
-    "generate_new_api_key_info" : "Mae newid cyfrinair yn creu allwedd API newydd",
-    "opml_export" : "Allforio OPML",
-    "delete_account" : "Dileu cyfrif",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "Adeiladir CommaFeed ar JAX-RS ac AngularJS. Mae REST API ar gael.",
-      "link_to_documentation" : "Dolen i'r ddogfennaeth."
-    },
-    "keyboard_shortcuts" : "Llwybr byr bysellfwrdd",
-    "version" : "Fersiwn CommaFeed: ",
-    "line1_prefix" : "Mae CommaFeed yn prosiect cod agored. Mae'r cod ar ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Os wyt ti'n ffeindio problem, plîs gad wybod amdano ar dudalen problemau o'r ",
-    "line2_suffix" : " prosiect.",
-    "line3" : "Os wyt ti'n hoffi'r prosiect, plîs ystyria cyfrannu i gefnogi'r datblygwr a helpu gyda chynnal a chadw'r wefan hon.",
-    "line4" : "I'r rhai sy'n hoff o Bitcoin, dyma'r cyfeiriad",
-    "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "Ap Android",
-      "subscribe_url" : "URL Tanysgrifio",
-      "chrome_extension" : "estyniad Chrome",
-      "firefox_extension" : "estyniad Firefox",
-      "opera_extension" : "estyniad Opera",
-      "subscribe_bookmarklet" : "Ychwanegu botwm tanysgrifio ",
-      "subscribe_bookmarklet_asc" : "Hynaf yn gyntaf",
-      "subscribe_bookmarklet_desc" : "Diweddaraf yn gyntaf",
-      "next_unread_bookmarklet" : "Botwm eitem nesaf heb ei ddarllen (llusgo i far nodau)"
-    },
-    "translation" : {
-      "value" : "Cyfieithiad",
-      "message" : "Rydym angen dy help i gyfieithu CommaFeed.",
-      "link" : "Gweler sut i gyfrannu i gyfieithiadau."
-    },
-    "announcements" : "Datganiadau",
-    "shortcuts" : {
-      "mouse_middleclick" : "clic botwm canol llygoden",
-      "open_next_entry" : "agor yr eitem nesaf",
-      "open_previous_entry" : "agor yr eitem flaenorol",
-      "spacebar" : "space/shift+space",
-      "move_page_down_up" : "symud y tudalen i lawr/fyny",
-      "focus_next_entry" : "newid ffocws i'r eitem nesaf heb ei hagor",
-      "focus_previous_entry" : "newid ffocws i'r eitem flaenorol heb ei hagor",
-      "open_next_feed" : "agor y ffrwd neu gategori nesaf",
-      "open_previous_feed" : "agor y ffrwd neu gategori blaenorol",
-      "open_close_current_entry" : "agor/cau yr eitem gyfredol",
-      "open_current_entry_in_new_window" : "agor yr eitem gyfredol mewn ffenestr newydd",
-      "open_current_entry_in_new_window_background" : "agor yr eitem gyfredol mewn ffenestr newydd yn y cefndir",
-      "star_unstar" : "serennu/dadserennu'r eitem gyfredol",
-      "mark_current_entry" : "marcio'r eitem gyfredol fel wedi/heb ei ddarllen",
-      "mark_all_as_read" : "marcio popeth fel wedi ei ddarllen",
-      "open_in_new_tab_mark_as_read" : "agor yr eitem mewn tab newydd a'i farcio fel wedi ei ddarllen",
-      "fullscreen" : "toglo'r golwg sgrin lawn",
-      "font_size" : "cynyddu/lleihau maint ffont yr eitem gyfredol",
-      "go_to_all" : "newid i olwg 'Popeth'",
-      "go_to_starred" : "newid i olwg 'Serennwyd'",
-      "feed_search" : "llywio i danysgrifiad gan roi ei enw mewn"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/da.js
+++ b/commafeed-client/src/main/app/i18n/da.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Gem",
-    "cancel" : "Annuller",
-    "delete" : "Slet",
-    "required" : "Påkrævet",
-    "download" : "Hent",
-    "link" : "Link",
-    "bookmark" : "Bogmærke",
-    "close" : "Luk",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "Abonner",
-    "import" : "Importer",
-    "new_category" : "Ny kategori",
-    "all" : "Alle",
-    "starred" : "Favoritter"
-  },
-  "subscribe" : {
-    "feed_url" : "URL for abonnement ",
-    "feed_name" : "Abonnementsnavn",
-    "category" : "Kategori"
-  },
-  "import" : {
-    "google_reader_prefix" : "Lad mig importere dine abonnementer fra ",
-    "google_reader_suffix" : " konto.",
-    "google_download" : "Alternativt, upload din subscriptions.xml fil.",
-    "google_download_link" : "Hent den herfra.",
-    "xml_file" : "OPML fil"
-  },
-  "new_category" : {
-    "name" : "Navn",
-    "parent" : "Overordnet"
-  },
-  "toolbar" : {
-    "unread" : "Ulæst",
-    "all" : "Alle",
-    "previous_entry" : "Forrige artikkel",
-    "next_entry" : "Næste artikkel",
-    "refresh" : "Opdater",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "Sorter efter dato ny/gammel",
-    "titles_only" : "Kun titler",
-    "expanded_view" : "Udvidet visning",
-    "mark_all_as_read" : "Marker alle som læst",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day" : "Artikler ældere end én dag",
-    "mark_all_older_week" : "Artikler ældere end én uge",
-    "mark_all_older_two_weeks" : "Artikler ældere end to uger",
-    "settings" : "Indstillinger",
-    "profile" : "Profil",
-    "admin" : "Admin",
-    "about" : "Om",
-    "logout" : "Log ud",
-    "donate" : "Donér"
-  },
-  "view" : {
-    "entry_source" : "from  ",
-    "entry_author" : "af ",
-    "error_while_loading_feed" : "Fejl under indlæsning af artikel",
-    "keep_unread" : "Behold som ulæst",
-    "no_unread_items" : "har ingen ulæste artikler.",
-    "mark_up_to_here" : "Mark as read up to here ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
-  },
-  "feedsearch" : {
-    "hint" : "Angiv et abonnement...",
-    "help" : "Brug enter tasten til at vælge og piltasterne til at navigere.",
-    "result_prefix" : "Dine abonnementer:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Generelt",
-      "language" : "Sprog",
-      "language_contribute" : "Kontribuer med en oversættelse",
-      "show_unread" : "Vis abonnomenter og kategorier med læste artikler",
-      "social_buttons" : "Vis delingsknapper",
-      "scroll_marks" : "I udvidet visning, marker artikler som læste når der rulles forbi dem"
-    },
-    "appearance" : "Udseende",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Tema",
-    "submit_your_theme" : "Indsend dit tema",
-    "custom_css" : "Brugerdefineret CSS"
-  },
-  "details" : {
-    "feed_details" : "Abonnementsdetaljer",
-    "url" : "URL",
-    "website" : "Website ",
-    "name" : "Navn",
-    "category" : "Kategori",
-    "position" : "Position",
-    "last_refresh" : "Sidste opdatering",
-    "message" : "Last refresh message ",
-    "next_refresh" : "Næste opdatering",
-    "queued_for_refresh" : "I kø til opdatering",
-    "feed_url" : "URL for abonnement",
-    "generate_api_key_first" : "Generer en API nøgle i din profil først.",
-    "unsubscribe" : "Afmeld abonnement",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details" : "Kategori detaljer",
-    "tag_details" : "Tag details ",
-    "parent_category" : "Overordnet kategori"
-  },
-  "profile" : {
-    "user_name" : "Brugernavn",
-    "email" : "E-mail",
-    "change_password" : "Skift adgangskode",
-    "confirm_password" : "Bekræft adgangskode",
-    "minimum_8_chars" : "Minimum 8 karakter",
-    "passwords_do_not_match" : "Adgangskoderne er ikke ens",
-    "api_key" : "API nøgle",
-    "api_key_not_generated" : "Ikke genereret endnu",
-    "generate_new_api_key" : "Generer ny API nøgle",
-    "generate_new_api_key_info" : "Ændring af adgangskode vil generere en ny API nøgle",
-    "opml_export" : "OPML eksport",
-    "delete_account" : "Slet konto",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed er bygget oven på JAX-RS og AngularJS. Hvilket gør et REST API tilgængeligt.",
-      "link_to_documentation" : "Link til dokumentationen."
-    },
-    "keyboard_shortcuts" : "Tastaturgenveje",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed er et open-source project. Kildekoden kan findes på  ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Hvis du opdager et problem, så rapporter det venligst på  ",
-    "line2_suffix" : " projekt.",
-    "line3" : "Hvis du syntes om projektet, overvej venligst at donere for at hjælpe udviklerne og dække omkostningerne til drift af hjemmesiden.",
-    "line4" : "Til dig der foretrækker bitcoin, her er adressen",
-    "goodies" : {
-      "value" : "Godter",
-      "android_app" : "Android app ",
-      "subscribe_url" : "Abonner URL",
-      "chrome_extension" : "Chrome udvidelse",
-      "firefox_extension" : "Firefox udvidelse",
-      "opera_extension" : "Opera udvidelse",
-      "subscribe_bookmarklet" : "Tilføj abonnoment bogmærkeprogram (click)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Næste ulæste artikel bogmærkeprogram (træk til bogmærkebaren)"
-    },
-    "translation" : {
-      "value" : "Oversættelse",
-      "message" : "Vi har brug for din hjælp til at oversætte CommaFeed.",
-      "link" : "Se hvordan du kan kontribuere med oversættelser."
-    },
-    "announcements" : "Meddelelser",
-    "shortcuts" : {
-      "mouse_middleclick" : "mellemmuseklik",
-      "open_next_entry" : "åben næste artikel",
-      "open_previous_entry" : "åben forrige artikel",
-      "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
-      "focus_next_entry" : "sæt fokus på næste arktiel uden at åbne den",
-      "focus_previous_entry" : "sæt fokus på forrige artikel uden at åbne den",
-      "open_next_feed" : "åben næste artikel eller kategori",
-      "open_previous_feed" : "åben forrige artikel eller kategori",
-      "open_close_current_entry" : "åben/luk nuværende artikel",
-      "open_current_entry_in_new_window" : "åben nuværende artikel i et nyt vindue",
-      "open_current_entry_in_new_window_background" : "åben nuværende artikel i et nyt vindue i baggrunden",
-      "star_unstar" : "marker/fjern favorit",
-      "mark_current_entry" : "marker som læst/ulæst",
-      "mark_all_as_read" : "marker alle artikler som læste",
-      "open_in_new_tab_mark_as_read" : "åben artikel i ny fane og marker som læst",
-      "fullscreen" : "toggle full screen mode ",
-      "font_size" : "increase/decrease font size of the current entry ",
-      "go_to_all" : "go to the All view ",
-      "go_to_starred" : "go to the Starred view ",
-      "feed_search" : "naviger til et abonnoment ved at skrive dets navn"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/de.js
+++ b/commafeed-client/src/main/app/i18n/de.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Speichern",
-    "cancel" : "Abbrechen",
-    "delete" : "Löschen",
-    "required" : "Erforderlich",
-    "download" : "Herunterladen",
-    "link" : "Link",
-    "bookmark" : "Lesezeichen",
-    "close" : "Schließen",
-    "tags" : "Tags"
-  },
-  "tree" : {
-    "subscribe" : "Abonnieren",
-    "import" : "Importieren",
-    "new_category" : "Neue Kategorie",
-    "all" : "Alles",
-    "starred" : "Favoriten"
-  },
-  "subscribe" : {
-    "feed_url" : "Feed Adresse",
-    "feed_name" : "Feed Name",
-    "category" : "Kategorie"
-  },
-  "import" : {
-    "google_reader_prefix" : "Importiere die Feeds von deinem",
-    "google_reader_suffix" : " Konto.",
-    "google_download" : "Alternativ kannst du eine XML-Datei hochladen.",
-    "google_download_link" : "Lade sie hier herunter.",
-    "xml_file" : "OPML Datei"
-  },
-  "new_category" : {
-    "name" : "Name",
-    "parent" : "Übergeordnet"
-  },
-  "toolbar" : {
-    "unread" : "Ungelesen",
-    "all" : "Alles",
-    "previous_entry" : "Vorheriger Artikel",
-    "next_entry" : "Nächster Artikel",
-    "refresh" : "Aktualisieren",
-    "refresh_all" : "Erzwinge Aktualisierung aller Feeds",
-    "sort_by_asc_desc" : "Nach Datum sortieren (auf-/absteigend)",
-    "titles_only" : "Nur Überschriften",
-    "expanded_view" : "Ausgedehnte Ansicht",
-    "mark_all_as_read" : "Alle Artikel als gelesen markieren",
-    "mark_all_older_12_hours" : "Artikel älter als 12 Stunden",
-    "mark_all_older_day" : "Artikel älter als ein Tag",
-    "mark_all_older_week" : "Artikel älter als eine Woche",
-    "mark_all_older_two_weeks" : "Artikel älter als zwei Wochen",
-    "settings" : "Einstellungen",
-    "profile" : "Profil",
-    "admin" : "Admin",
-    "about" : "Über",
-    "logout" : "Abmelden",
-    "donate" : "Spenden"
-  },
-  "view" : {
-    "entry_source" : "von",
-    "entry_author" : "von ",
-    "error_while_loading_feed" : "Fehler beim Laden des Feeds",
-    "keep_unread" : "Als ungelesen behalten",
-    "no_unread_items" : "hat keine ungelesenen Einträge.",
-    "mark_up_to_here" : "Bis hier alle als gelesen markieren",
-    "search_for" : "Suche nach:",
-    "no_search_results" : "Kein Treffer bei der Suche nach den angegebenen Stichworten"
-  },
-  "feedsearch" : {
-    "hint" : "Gib einen Feednamen ein...",
-    "help" : "Drück Enter zum Auswählen und die Pfeiltasten zum Navigieren.",
-    "result_prefix" : "Deine Feeds:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Allgemein",
-      "language" : "Sprache",
-      "language_contribute" : "Beteilige dich mit Übersetzungen",
-      "show_unread" : "Zeige Feeds und Kategorien mit ungelesenen Einträgen",
-      "social_buttons" : "Zeige Buttons zum Teilen von Inhalten über soziale Netzwerke",
-      "scroll_marks" : "In der ausgedehnten Ansicht werden Artikel beim Scrollen als gelesen markiert"
-    },
-    "appearance" : "Aussehen",
-    "scroll_speed" : "Geschwindigkeit beim scrollen zwischen Einträgen (in Millisekunden)",
-    "scroll_speed_help" : "setze auf 0 zum deaktivieren",
-    "theme" : "Theme",
-    "submit_your_theme" : "Füg dein Theme hinzu",
-    "custom_css" : "Eigenes CSS"
-  },
-  "details" : {
-    "feed_details" : "Feed details",
-    "url" : "URL",
-    "website" : "Webseite",
-    "name" : "Name",
-    "category" : "Kategorie",
-    "position" : "Position",
-    "last_refresh" : "Letzte Aktualisierung",
-    "message" : "Nachricht der letzten Aktualisierung",
-    "next_refresh" : "Nächste Aktualisierung",
-    "queued_for_refresh" : "Wartet auf Aktualisierung",
-    "feed_url" : "Feed Adresse",
-    "generate_api_key_first" : "Generiere zuerst einen API Schlüssel in deinem Profil.",
-    "unsubscribe" : "Kündigen",
-    "unsubscribe_confirmation" : "Bist du sicher das du diesen Feed kündigen möchtest?",
-    "delete_category_confirmation" : "Bist du sicher das du diese Kategorie löschen möchtest?",
-    "category_details" : "Kategoriedetails",
-    "tag_details" : "Tag Details",
-    "parent_category" : "Übergeordnete Kategorie"
-  },
-  "profile" : {
-    "user_name" : "Benutzername",
-    "email" : "E-mail",
-    "change_password" : "Passwort ändern",
-    "confirm_password" : "Passwort bestätigen",
-    "minimum_8_chars" : "Mindestens 8 Zeichen",
-    "passwords_do_not_match" : "Passwörter stimmen nicht überein",
-    "api_key" : "API Schlüssel",
-    "api_key_not_generated" : "Noch nicht generiert",
-    "generate_new_api_key" : "Generiere einen neuen API key",
-    "generate_new_api_key_info" : "Das Ändern des Passwortes erzeugt einen neuen API Schlüssel",
-    "opml_export" : "OPML exportieren",
-    "delete_account" : "Konto löschen",
-    "delete_account_confirmation" : "Dein Konto löschen? Es gibt kein Zurück!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed basiert auf JAX-RS und AngularJS. Daher ist eine REST API verfügbar.",
-      "link_to_documentation" : "Link zur Dokumentation."
-    },
-    "keyboard_shortcuts" : "Tastatur Kurzbefehle",
-    "version" : "CommaFeed Version",
-    "line1_prefix" : "CommaFeed ist ein quell-offenes Projekt. Quellen werden auf ",
-    "line1_suffix" : " gehosted.",
-    "line2_prefix" : "Wenn Probleme auftauchen, melde diese bitte auf dem ",
-    "line2_suffix" : " Projekt.",
-    "line3" : "Wenn dir dieses Projekt gefällt, würde ich mich über eine kleine Spende zur Deckung der Serverkosten freuen.",
-    "line4" : "Für diejenigen, die Bitcoin bevorzugen ist hier meine Adresse ",
-    "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "Android app",
-      "subscribe_url" : "Abonnement-URL",
-      "chrome_extension" : "Chrome Erweiterung",
-      "firefox_extension" : "Firefox Add-on",
-      "opera_extension" : "Opera Erweiterung",
-      "subscribe_bookmarklet" : "Abonnieren-bookmarklet (klicken)",
-      "subscribe_bookmarklet_asc" : "Älteste zuerst",
-      "subscribe_bookmarklet_desc" : "Neuste zuerst",
-      "next_unread_bookmarklet" : "Nächster ungelesener Artikel-bookmarklet (in Lesezeichenleiste ziehen)"
-    },
-    "translation" : {
-      "value" : "Übersetzung",
-      "message" : "Wir brauchen deine Hilfe zur Übersetzung von CommaFeed.",
-      "link" : "Wie du uns dabei helfen kannst"
-    },
-    "announcements" : "Neuigkeiten",
-    "shortcuts" : {
-      "mouse_middleclick" : "Mittlere Maustaste",
-      "open_next_entry" : "nächsten Artikel öffnen",
-      "open_previous_entry" : "vorherigen Artikels öffnen",
-      "spacebar" : "Leertaste/Shift+Leertaste",
-      "move_page_down_up" : "Bewegt die Seite hoch/runter",
-      "focus_next_entry" : "nächsten Artikel fokussieren ohne ihn zu öffnen",
-      "focus_previous_entry" : "vorherigen Artikel fokussieren ohne ihn zu öffnen",
-      "open_next_feed" : "nächsten Feed oder Kategorie öffnen",
-      "open_previous_feed" : "vorherigen Feed oder Kategorie öffnen",
-      "open_close_current_entry" : "aktuellen Artikels öffnen/schließen",
-      "open_current_entry_in_new_window" : "aktuellen Artikel in neuem Fenster öffnen",
-      "open_current_entry_in_new_window_background" : "aktuellen Artikel in neuem Fenster im Hintergrund öffnen",
-      "star_unstar" : "de-/favorisieren des aktuellen Artikels",
-      "mark_current_entry" : "aktuellen Artikel als gelesen/ungelesen markieren",
-      "mark_all_as_read" : "alle Artikel als gelesen markieren",
-      "open_in_new_tab_mark_as_read" : "öffnen des Artikels in einem neuen Tab und als gelesen markieren",
-      "fullscreen" : "Vollbildmodus an-/ausschalten",
-      "font_size" : "Schriftgröße des aktuellen Artikels vergrößern/verkleinern",
-      "go_to_all" : "Gehe zur Ansicht \"Alle\"",
-      "go_to_starred" : "Gehe zur Ansicht \"Favoriten\"",
-      "feed_search" : "zu einem Feed springen durch durch eingeben seines Namens"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/en.js
+++ b/commafeed-client/src/main/app/i18n/en.js
@@ -1,184 +0,0 @@
-{
-  "global" : {
-    "save" : "Save",
-    "cancel" : "Cancel",
-    "delete" : "Delete",
-    "required" : "Required",
-    "download" : "Download",
-    "link" : "Link",
-    "bookmark" : "Bookmark",
-    "close" : "Close",
-    "tags" : "Tags"
-  },
-  "tree" : {
-    "subscribe" : "Subscribe",
-    "import" : "Import",
-    "new_category" : "New category",
-    "all" : "All",
-    "starred" : "Starred"
-  },
-  "subscribe" : {
-    "feed_url" : "Feed URL",
-    "feed_name" : "Feed Name",
-    "category" : "Category"
-  },
-  "import" : {
-    "google_reader_prefix" : "Let me import your feeds from your ",
-    "google_reader_suffix" : " account.",
-    "google_download" : "Alternatively, upload your subscriptions.xml file.",
-    "google_download_link" : "Download it from here.",
-    "xml_file" : "OPML File"
-  },
-  "new_category" : {
-    "name" : "Name",
-    "parent" : "Parent"
-  },
-  "toolbar" : {
-    "unread" : "Unread",
-    "all" : "All",
-    "previous_entry" : "Previous entry",
-    "next_entry" : "Next entry",
-    "refresh" : "Refresh",
-    "refresh_all" : "Force refresh all my feeds",
-    "sort_by_asc_desc" : "Sort by date asc/desc",
-    "titles_only" : "Titles only",
-    "expanded_view" : "Expanded view",
-    "mark_all_as_read" : "Mark all as read",
-    "mark_all_older_12_hours" : "Items older than 12 hours",
-    "mark_all_older_day" : "Items older than a day",
-    "mark_all_older_week" : "Items older than a week",
-    "mark_all_older_two_weeks" : "Items older than two weeks",
-    "settings" : "Settings",
-    "profile" : "Profile",
-    "admin" : "Admin",
-    "about" : "About",
-    "logout" : "Logout",
-    "donate" : "Donate"
-  },
-  "view" : {
-    "entry_source" : "from ",
-    "entry_author" : "by ",
-    "error_while_loading_feed" : "Error while loading this feed",
-    "keep_unread" : "Keep unread",
-    "no_unread_items" : "has no unread items.",
-    "mark_up_to_here" : "Mark as read up to here",
-    "search_for" : "searching for: ",
-    "no_search_results" : "No match found for the requested keywords"
-  },
-  "feedsearch" : {
-    "hint" : "Type in a subscription...",
-    "help" : "Use the return key to select and arrow keys to navigate.",
-    "result_prefix" : "Your subscriptions:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "General",
-      "language" : "Language",
-      "language_contribute" : "Contribute with translations",
-      "show_unread" : "Show feeds and categories with no unread entries",
-      "social_buttons" : "Show social sharing buttons",
-      "scroll_marks" : "In expanded view, scrolling through entries mark them as read"
-    },
-    "appearance" : "Appearance",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds)",
-    "scroll_speed_help" : "set to 0 to disable",
-    "theme" : "Theme",
-    "submit_your_theme" : "Submit your theme",
-    "custom_css" : "Custom CSS"
-  },
-  "details" : {
-    "feed_details" : "Feed details",
-    "url" : "URL",
-    "website" : "Website",
-    "name" : "Name",
-    "category" : "Category",
-    "position" : "Position",
-    "last_refresh" : "Last refresh",
-    "message" : "Last refresh message",
-    "next_refresh" : "Next refresh",
-    "queued_for_refresh" : "Queued for refresh",
-    "feed_url" : "Feed URL",
-    "filtering_expression" : "Filtering expression",
-    "filtering_expression_help" : "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically.\nAvailable variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison.\nExample: url.contains('youtube') or (author eq 'athou' and title.contains('github').\nComplete available syntax is available <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>here</a>.",
-    "generate_api_key_first" : "Generate an API key in your profile first.",
-    "unsubscribe" : "Unsubscribe",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed?",
-    "delete_category_confirmation" : "Are you sure you want to delete this category?",
-    "category_details" : "Category details",
-    "tag_details" : "Tag details",
-    "parent_category" : "Parent category"
-  },
-  "profile" : {
-    "user_name" : "User name",
-    "email" : "E-mail",
-    "current_password" : "Current Password",
-    "change_password" : "Change password",
-    "confirm_password" : "Confirm password",
-    "minimum_8_chars" : "Minimum 8 characters",
-    "passwords_do_not_match" : "Passwords do not match",
-    "api_key" : "API key",
-    "api_key_not_generated" : "Not generated yet",
-    "generate_new_api_key" : "Generate new API key",
-    "generate_new_api_key_info" : "Changing password will generate a new API key",
-    "opml_export" : "OPML export",
-    "delete_account" : "Delete account",
-    "delete_account_confirmation" : "Delete your account? There's no turning back!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed is built on top of JAX-RS and AngularJS. As such, a REST API is available.",
-      "link_to_documentation" : "Link to the documentation."
-    },
-    "keyboard_shortcuts" : "Keyboard shortcuts",
-    "version" : "CommaFeed version",
-    "line1_prefix" : "CommaFeed is an open-source project. Sources are hosted on ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "If you encounter an issue, please report it on the issues page of the ",
-    "line2_suffix" : " project.",
-    "line3" : "If you like this project, please consider a donation to support the developer and help cover the costs of keeping this website online.",
-    "line4" : "For those of you who prefer bitcoin, here is the address",
-    "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "Android app",
-      "subscribe_url" : "Subscribe URL",
-      "chrome_extension" : "Chrome extension",
-      "firefox_extension" : "Firefox extension",
-      "opera_extension" : "Opera extension",
-      "subscribe_bookmarklet" : "Add subscription bookmarklet (click)",
-      "subscribe_bookmarklet_asc" : "Oldest first",
-      "subscribe_bookmarklet_desc" : "Newest first",
-      "next_unread_bookmarklet" : "Next unread item bookmarklet (drag to bookmark bar)"
-    },
-    "translation" : {
-      "value" : "Translation",
-      "message" : "We need your help to translate CommaFeed.",
-      "link" : "See how to contribute with translations."
-    },
-    "announcements" : "Announcements",
-    "shortcuts" : {
-      "mouse_middleclick" : "mouse middleclick",
-      "open_next_entry" : "open next entry",
-      "open_previous_entry" : "open previous entry",
-      "spacebar" : "space/shift+space",
-      "move_page_down_up" : "moves the page down/up",
-      "focus_next_entry" : "set focus on next entry without opening it",
-      "focus_previous_entry" : "set focus on previous entry without opening it",
-      "open_next_feed" : "open next feed or category",
-      "open_previous_feed" : "open previous feed or category",
-      "open_close_current_entry" : "open/close current entry",
-      "open_current_entry_in_new_window" : "open current entry in a new window",
-      "open_current_entry_in_new_window_background" : "open current entry in a new window in the background",
-      "star_unstar" : "star/unstar current entry",
-      "mark_current_entry" : "mark as read/unread current entry",
-      "mark_all_as_read" : "mark all entries as read",
-      "open_in_new_tab_mark_as_read" : "open entry in new tab and mark as read",
-      "fullscreen" : "toggle full screen mode",
-      "font_size" : "increase/decrease font size of the current entry",
-      "go_to_all" : "go to the All view",
-      "go_to_starred" : "go to the Starred view",
-      "feed_search" : "navigate to a subscription by entering the subscription name",
-      "refresh": "refresh"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/es.js
+++ b/commafeed-client/src/main/app/i18n/es.js
@@ -1,182 +0,0 @@
-{
-  "global" : {
-    "save" : "Guardar",
-    "cancel" : "Cancelar",
-    "delete" : "Eliminar",
-    "required" : "Requerido",
-    "download" : "Descargar",
-    "link" : "Enlace",
-    "bookmark" : "Marcador",
-    "close" : "Cerrar",
-    "tags" : "Etiquetas"
-  },
-  "tree" : {
-    "subscribe" : "Suscribirse",
-    "import" : "Importar",
-    "new_category" : "Nueva categoría",
-    "all" : "Todos",
-    "starred" : "Destacados"
-  },
-  "subscribe" : {
-    "feed_url" : "URL del canal",
-	"filtering_expression" : "Expresión de filtrado",
-	"filtering_expression_help" : "Si no está vacía, una expresión se evalúa como 'cierta' o 'falsa'. Si es falsa, las nueva entradas de este canal se marcarán como leídas automáticamente.\nLas variables disponibles son 'title' (título), 'content'(contenido), 'url' (URL), 'author' (autor), y 'categories' (categorías) y sus contenidos son convertidos a minúsculas para facilitar la comparación de strings (cadenas de texto).\nEjemplo: url.contains('youtube') or (author eq 'athou' and title.contains('github').\nLa sintaxis completa está disponible <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>aquí</a>.",
-    "feed_name" : "Nombre del canal",
-    "category" : "Categoría"
-  },
-  "import" : {
-    "google_reader_prefix" : "Déjame importar tus canales de tu cuenta ",
-    "google_reader_suffix" : ".",
-    "google_download" : "También puedes subir tu archivo subscriptions.xml.",
-    "google_download_link" : "Descárgalo de aquí.",
-    "xml_file" : "Archivo OPML"
-  },
-  "new_category" : {
-    "name" : "Nombre",
-    "parent" : "Padre"
-  },
-  "toolbar" : {
-    "unread" : "No leídos",
-    "all" : "Todos",
-    "previous_entry" : "Entrada anterior",
-    "next_entry" : "Entrada siguiente",
-    "refresh" : "Actualizar",
-    "refresh_all" : "Forzar la actualización de todos mis canales.",
-    "sort_by_asc_desc" : "Ordenar por fecha asc/desc.",
-    "titles_only" : "Sólo títulos",
-    "expanded_view" : "Vista expandida",
-    "mark_all_as_read" : "Marcar todos como leído",
-    "mark_all_older_12_hours" : "Entradas anteriores a 12 horas.",
-    "mark_all_older_day" : "Entradas anteriores a un día.",
-    "mark_all_older_week" : "Entradas anteriores a una semana.",
-    "mark_all_older_two_weeks" : "Entradas anteriores a 2 semanas.",
-    "settings" : "Ajustes",
-    "profile" : "Perfil",
-    "admin" : "Admin",
-    "about" : "Acerca de...",
-    "logout" : "Cerrar sesión",
-    "donate" : "Donar"
-  },
-  "view" : {
-    "entry_source" : "de ",
-    "entry_author" : "por ",
-    "error_while_loading_feed" : "Error mientras se cargaba este canal.",
-    "keep_unread" : "Mantener como no leído.",
-    "no_unread_items" : "no tiene entradas sin leer.",
-    "mark_up_to_here" : "Marcar como leídos hasta aquí.",
-    "search_for" : "buscando:  ",
-    "no_search_results" : "No se han encontrado resultados para las palabras clave especificadas."
-  },
-  "feedsearch" : {
-    "hint" : "Introduce una suscripción...",
-    "help" : "Usa la tecla Intro para seleccionar y las teclas de flecha para navegar.",
-    "result_prefix" : "Tus suscripciones:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "General",
-      "language" : "Idioma",
-      "language_contribute" : "Contribuye con traducciones.",
-      "show_unread" : "Mostrar canales y categorías sin entradas no leídas.",
-      "social_buttons" : "Mostrar botones para compartir de redes sociales.",
-      "scroll_marks" : "En vista expandida, el desplazamiento por las entradas las marca como leídas."
-    },
-    "appearance" : "Apariencia",
-    "scroll_speed" : "Velocidad de desplazamiento al navegar entre entradas (en milisegundos)",
-    "scroll_speed_help" : "ponlo a 0 para desactivarlo",
-    "theme" : "Tema",
-    "submit_your_theme" : "Envía tu tema ",
-    "custom_css" : "CSS personalizado"
-  },
-  "details" : {
-    "feed_details" : "Detalles del canal",
-    "url" : "URL",
-    "website" : "Sitio web",
-    "name" : "Nombre",
-    "category" : "Categoría",
-    "position" : "Posición",
-    "last_refresh" : "Última actualización",
-    "message" : "Último mensaje de actualización",
-    "next_refresh" : "Próxima actualización",
-    "queued_for_refresh" : "En cola para actualizar",
-    "feed_url" : "URL del canal",
-    "generate_api_key_first" : "Genera una clave API en tu perfil primero.",
-    "unsubscribe" : "Terminar suscripción",
-    "unsubscribe_confirmation" : "¿Estás seguro de querer terminar tu suscripción a este canal?",
-    "delete_category_confirmation" : "¿Estás seguro de querer eliminar esta categoría?",
-    "category_details" : "Detalles de la categoría",
-    "tag_details" : "Detalles de las etiquetas ",
-    "parent_category" : "Categoría principal"
-  },
-  "profile" : {
-    "user_name" : "Nombre de usuario",
-    "email" : "Correo electrónico",
-    "change_password" : "Cambiar contraseña",
-    "confirm_password" : "Confirmar contraseña",
-    "minimum_8_chars" : "Mínimo 8 caracteres",
-    "passwords_do_not_match" : "Las contraseñas no coinciden",
-    "api_key" : "Clave API",
-    "api_key_not_generated" : "No generado todavía",
-    "generate_new_api_key" : "Generar nueva clave API",
-    "generate_new_api_key_info" : "Al cambiar la contraseña se generará una nueva clave API.",
-    "opml_export" : "Exportación de OPML",
-    "delete_account" : "Eliminar cuenta",
-    "delete_account_confirmation" : "¿Eliminar tu cuenta? ¡No habrá vuelta atrás! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed está construido sobre JAX-RS y AngularJS. Por lo tanto, una REST API está disponible.",
-      "link_to_documentation" : "Enlace a la documentación."
-    },
-    "keyboard_shortcuts" : "Atajos de teclado",
-    "version" : "Versión de CommaFeed",
-    "line1_prefix" : "CommaFeed es un proyecto de código abierto. El código se encuentra en ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Si encuentras un problema, por favor repórtalo en la página de problemas de ",
-    "line2_suffix" : " del proyecto.",
-    "line3" : "Si te gusta este proyecto, por favor considera realizar una donación para apoyar al desarrollador y ayudar a cubrir los costes de mantenimiento.",
-    "line4" : "Para aquellos de vosotros que prefieran bitcoin, aquí está la dirección ",
-    "goodies" : {
-      "value" : "Extras",
-      "android_app" : "Apps para Android",
-      "subscribe_url" : "URL para suscribirse ",
-      "chrome_extension" : "Extensión para Chrome.",
-      "firefox_extension" : "Extensión para Firefox.",
-      "opera_extension" : "Extensón para Opera.",
-      "subscribe_bookmarklet" : "Añadir marcador de suscripción (clic).",
-      "subscribe_bookmarklet_asc" : "Más antiguos primero",
-      "subscribe_bookmarklet_desc" : "Más recientes primero",
-      "next_unread_bookmarklet" : "Marcador a la siguiente entrada no leída (arástralo a la barra de marcadores) "
-    },
-    "translation" : {
-      "value" : "Traducción",
-      "message" : "Necesitamos tu ayuda para ayudar a traducir CommaFeed.",
-      "link" : "Ver cómo contribuir con traducciones."
-    },
-    "announcements" : "Anuncios",
-    "shortcuts" : {
-      "mouse_middleclick" : "click medio",
-      "open_next_entry" : "abrir la siguiente entrada",
-      "open_previous_entry" : "abrir la entrada anterior",
-      "spacebar" : "espacio/mayúsculas+espacio",
-      "move_page_down_up" : "mueve la página arriba/abajo",
-      "focus_next_entry" : "establecer el foco en la siguiente entrada sin abrirla",
-      "focus_previous_entry" : "establecer el foco en la entrada anterior sin abrirla",
-      "open_next_feed" : "abrir el siguiente canal o categoría",
-      "open_previous_feed" : "abrir el canal o categoría previo",
-      "open_close_current_entry" : "abrir/cerrar la entrada actual",
-      "open_current_entry_in_new_window" : "abrir la entrada actual en una nueva ventana",
-      "open_current_entry_in_new_window_background" : "abrir la entrada actual en una nueva ventana en segundo plano",
-      "star_unstar" : "destacar la entrada actual",
-      "mark_current_entry" : "marcar la entrada actual como leída/no la leída",
-      "mark_all_as_read" : "marcar todas las entradas como leídas",
-      "open_in_new_tab_mark_as_read" : "abrir entrada en una nueva pestaña y marcar como leída",
-      "fullscreen" : "activar/desactivar el modo pantalla completa ",
-      "font_size" : "aumentar/reducir el tamaño de la fuente de la entrada actual",
-      "go_to_all" : "ver Todos",
-      "go_to_starred" : "ver Destacados",
-      "feed_search" : "navega a una suscripción al introducir su nombre"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/fa.js
+++ b/commafeed-client/src/main/app/i18n/fa.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "ذخیره",
-    "cancel" : "لغو",
-    "delete" : "حذف",
-    "required" : "لازم",
-    "download" : "بارگیری",
-    "link" : "پیوند",
-    "bookmark" : "بوکمارک",
-    "close" : "بستن",
-    "tags" : "برجسپ‌ها"
-  },
-  "tree" : {
-    "subscribe" : "مشترک شوید",
-    "import" : "درون‌ریزی",
-    "new_category" : "ردهٔ جدید",
-    "all" : "کل مطالب",
-    "starred" : "ستاره‌دار"
-  },
-  "subscribe" : {
-    "feed_url" : "نشانی خوراک",
-    "feed_name" : "نام خوراک",
-    "category" : "دسته"
-  },
-  "import" : {
-    "google_reader_prefix" : "اجازه بده خوراک‌هایتان را از حساب",
-    "google_reader_suffix" : "وارد سازم.",
-    "google_download" : "یا به جای آن، پروندهٔ subscriptions.xml خود را بارگذاری کنید.",
-    "google_download_link" : "آن را اینجا بارگیری کنید.",
-    "xml_file" : "پروندهٔ OPML"
-  },
-  "new_category" : {
-    "name" : "نام",
-    "parent" : "پدر"
-  },
-  "toolbar" : {
-    "unread" : "خوانده‌نشده",
-    "all" : "همه",
-    "previous_entry" : "مطلب قبلی",
-    "next_entry" : "مطلب بعدی",
-    "refresh" : "تازه‌سازی",
-    "refresh_all" : "مجبورکردن تازه‌سازی همهٔ خوراک‌ها",
-    "sort_by_asc_desc" : "مرتب‌کردن بر اساس تاریخ به‌صورت صعودی/نزولی",
-    "titles_only" : "فقط عنوان‌ها",
-    "expanded_view" : "نمای گسترش‌یافته",
-    "mark_all_as_read" : "علامت‌گذاری تمامی مطالب به‌عنوان خوانده‌شده",
-    "mark_all_older_12_hours" : "مطالب قدیمی‌تر از ۱۲ ساعت",
-    "mark_all_older_day" : "مطالب قدیمی‌تر از یک روز",
-    "mark_all_older_week" : "مطالب قدیمی‌تر از یک هفته",
-    "mark_all_older_two_weeks" : "مطالب قدیمی تر از چند هفته قیل",
-    "settings" : "تنظیمات",
-    "profile" : "نمایه",
-    "admin" : "مدیریت",
-    "about" : "درباره",
-    "logout" : "خروج",
-    "donate" : "کمک مالی"
-  },
-  "view" : {
-    "entry_source" : "از",
-    "entry_author" : "توسط",
-    "error_while_loading_feed" : "متأسفانه، هنگام بارگیری این خوراک خطایی رخ‌داده‌است.",
-    "keep_unread" : "خوانده‌نشده نگه‌دار",
-    "no_unread_items" : "هیچ مطلب خوانده‌نشده‌ای ندارد.",
-    "mark_up_to_here" : "تا اینجا را خوانده‌شده در نظر بگیر",
-    "search_for" : "جستجو برای:",
-    "no_search_results" : "هیج نتیجه‌ای برای کلیدواژه‌های درخواستی یافت نشد"
-  },
-  "feedsearch" : {
-    "hint" : "نوشتن بر روی یک اشتراک...",
-    "help" : "دکمهٔ بازگشت برای انتخاب و دکمه‌های جهت‌دار را برای ناوبری استفاده کن.",
-    "result_prefix" : "اشتراک‌های شما:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "همگانی",
-      "language" : "زبان",
-      "language_contribute" : "مشارکت در ترجمه",
-      "show_unread" : "تنها خوراک‌ها و دسته‌های را که دارای مطالب نخوانده هستند نمایش بده.",
-      "social_buttons" : "نشان‌دادن دکمه‌های اشتراک‌گذاری در شبکه‌های اجتماعی",
-      "scroll_marks" : "در نمای گسترش‌یافته، لغزیدن بر روی مطالب به‌عنوان نشانه‌گذاری به‌عنوان خوانده‌شده در نظر گرفته‌شوند."
-    },
-    "appearance" : "ظاهر",
-    "scroll_speed" : "سرعت لغزش هنگام گشتن بین مدخل‌ها (به میلی‌ثانیه)",
-    "scroll_speed_help" : "قراردادن به ۰ برای غیرفعال‌کردن",
-    "theme" : "پوسته",
-    "submit_your_theme" : "پوستهٔ خود را ارسال‌کنید",
-    "custom_css" : "سی‌اس‌اس شخصی‌سازی‌شده"
-  },
-  "details" : {
-    "feed_details" : "جزئیات خوراک",
-    "url" : "نشانی",
-    "website" : "وب‌گاه",
-    "name" : "نام",
-    "category" : "دسته",
-    "position" : "موقعیت",
-    "last_refresh" : "آخرین بروزرسانی",
-    "message" : "پیام آخرین تازه‌سازی",
-    "next_refresh" : "بروزرسانی بعدی",
-    "queued_for_refresh" : "منتظر برای بروزرسانی",
-    "feed_url" : "نشانی خوراک",
-    "generate_api_key_first" : "ابتدا یک کلید API در نمایهٔ خود ایجاد کنید.",
-    "unsubscribe" : "لغو اشتراک",
-    "unsubscribe_confirmation" : "مطمئنید می‌خواهید از این این لغو اشتراک کنید؟",
-    "delete_category_confirmation" : "مطمئنید می‌خواهید این رده را حذف کنید؟",
-    "category_details" : "جزئیات دسته",
-    "tag_details" : "جزئیات برچسپ",
-    "parent_category" : "ردهٔ پدر"
-  },
-  "profile" : {
-    "user_name" : "نام کاربری",
-    "email" : "رایانامه",
-    "change_password" : "تغییر گذرواژه",
-    "confirm_password" : "تأیید گذرواژه",
-    "minimum_8_chars" : "حداقل ۸ نویسه",
-    "passwords_do_not_match" : "گذرواژه‌ها انطباق ندارند",
-    "api_key" : "کلید API",
-    "api_key_not_generated" : "هنوز ایجاد نشده‌است",
-    "generate_new_api_key" : "ایجاد کلید جدید API",
-    "generate_new_api_key_info" : "تغییر گذرواژه کلید API به‌وجود خواهد آورد.",
-    "opml_export" : "خارج‌سازی OPML",
-    "delete_account" : "حذف حساب کاربری",
-    "delete_account_confirmation" : "حذف حسابتان؟ بازگشتی وجود ندارد!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "کامافید بر روی JAX-RS و AngularJS ساخته‌شده‌است. به همین دلیل API REST موجود است.",
-      "link_to_documentation" : "پیوند به مستندات."
-    },
-    "keyboard_shortcuts" : "کلیدهای میانبر",
-    "version" : "نسخهٔ کامافید",
-    "line1_prefix" : "کامافید یک پروژه متن‌باز است. مخازن آن در ",
-    "line1_suffix" : "میزبانی می‌شود.",
-    "line2_prefix" : "اگر شما به مسئله‌ای برخورده اید، لطفاً آن را در صفحه مسائل گزارش دهید ",
-    "line2_suffix" : " پروژه.",
-    "line3" : "در صورتی که شما به این پروژه علاقمندید، لطفاً مبلغی را هرچند ناچیزه برای حمایت از توسعه‌دهنده و کمک به تأمین هزینه‌های نگه‌داری این وب‌گاه کمک کنید.",
-    "line4" : "برای کسانی که بیت‌کوین را ترجیح می‌دهند، نشانی آن اینجاست",
-    "goodies" : {
-      "value" : "افزونه‌ها",
-      "android_app" : "برنامهٔ اندرویدی",
-      "subscribe_url" : "اشتراک در نشانی",
-      "chrome_extension" : "افزونهٔ کروم",
-      "firefox_extension" : "افزونهٔ فایرفاکس",
-      "opera_extension" : "افزونهٔ اپرا",
-      "subscribe_bookmarklet" : "افزودن بوک‌مارک‌لت اشتراک (با کلیک)",
-      "subscribe_bookmarklet_asc" : "اول قدیمی‌ترین‌ها",
-      "subscribe_bookmarklet_desc" : "اول جدیدترین‌ها",
-      "next_unread_bookmarklet" : "بوک‌مارک‌لت مطلب خوانده نشدهٔ بعدی(با کشیدن و رهاکردن در نوار بوک‌مارک‌لت)"
-    },
-    "translation" : {
-      "value" : "ترجمه",
-      "message" : "ما به کمک شما برای ترجمهٔ کامافید نیازمدیم.",
-      "link" : "ببینید چگونه می‌توان در ترجمه‌های مشارکت نمود."
-    },
-    "announcements" : "اطلاعیه‌ها",
-    "shortcuts" : {
-      "mouse_middleclick" : "کلیک وسطی موشواره",
-      "open_next_entry" : "بازکردن مطلب بعدی",
-      "open_previous_entry" : "بازکردن مطلب قبلی",
-      "spacebar" : "space/shift+space",
-      "move_page_down_up" : "صفحه را بالا/پایین انتقال می‌دهد",
-      "focus_next_entry" : "رفتن بر روی مطلب بعدی بدون بازکردن کامل آن",
-      "focus_previous_entry" : "رفتن بر روی مطلب بعدی قبلی بازکردن کامل آن",
-      "open_next_feed" : "بازکردن خوراک یا دستهٔ بعدی",
-      "open_previous_feed" : "بازکردن خوراک یا دستهٔ بعدی",
-      "open_close_current_entry" : "باز/بستن مطلب جاری",
-      "open_current_entry_in_new_window" : "بازکردن مطلب جاری در پنجره‌ای جدید",
-      "open_current_entry_in_new_window_background" : "بازکردن مطلب جاری در پنجره‌ای جدید در پس‌زمینه",
-      "star_unstar" : "نشانه‌دارکردن/نکردن مطلب جاری",
-      "mark_current_entry" : "علامت‌گذاری مطلب جاری به‌عنوان خوانده‌شده/نشده",
-      "mark_all_as_read" : "علامت‌گذاری تمامی مطالب به‌عنوان خوانده‌شده",
-      "open_in_new_tab_mark_as_read" : "باز‌کردن مطلب در سربرگ جدید و علامت‌گذاری آن به‌عنوان خوانده‌شده",
-      "fullscreen" : "فعال/غیرفعال‌کردن حالت تمام صفحه",
-      "font_size" : "افزایش/کاهش اندازهٔ قلم مدخل فعلی",
-      "go_to_all" : "رفتن به نمای همه",
-      "go_to_starred" : "رفتن به نمای ستاره داده‌شده‌ها",
-      "feed_search" : "ناوبری به یک اشتراک با نوشتن نام اشتراک"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/fi.js
+++ b/commafeed-client/src/main/app/i18n/fi.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Tallenna",
-    "cancel" : "Peruuta",
-    "delete" : "Poista",
-    "required" : "Pakollinen",
-    "download" : "Lataa",
-    "link" : "Linkki",
-    "bookmark" : "Kirjanmerkki",
-    "close" : "Sulje",
-    "tags" : "Tagit"
-  },
-  "tree" : {
-    "subscribe" : "Tilaa syöte",
-    "import" : "Tuo",
-    "new_category" : "Uusi kansio",
-    "all" : "Kaikki",
-    "starred" : "Tähdelliset"
-  },
-  "subscribe" : {
-    "feed_url" : "Syötteen osoite",
-    "feed_name" : "Syötteen nimi",
-    "category" : "Kansio"
-  },
-  "import" : {
-    "google_reader_prefix" : "Tuo tilaukset",
-    "google_reader_suffix" : "-tunnukseltasi.",
-    "google_download" : "Vaihtoehtoisesti voit tuoda tilaukset subscriptions.xml -tiedostolla.",
-    "google_download_link" : "Lataa se täältä.",
-    "xml_file" : "OPML-tiedosto"
-  },
-  "new_category" : {
-    "name" : "Nimi",
-    "parent" : "Yläkansio"
-  },
-  "toolbar" : {
-    "unread" : "Lukemattomat",
-    "all" : "Kaikki",
-    "previous_entry" : "Edellinen otsikko",
-    "next_entry" : "Seuraava otsikko",
-    "refresh" : "Päivitä",
-    "refresh_all" : "Pakota kaikkien syötteiden päivitys",
-    "sort_by_asc_desc" : "Järjestä päivämäärän mukaan nousevasti/laskevasti",
-    "titles_only" : "Näytä vain otsikot",
-    "expanded_view" : "Laajennettu näkymä",
-    "mark_all_as_read" : "Merkitse kaikki luetuiksi",
-    "mark_all_older_12_hours" : "12 tuntia vanhemmat otsikot",
-    "mark_all_older_day" : "Päivää vanhemmat otsikot",
-    "mark_all_older_week" : "Viikkoa vanhemmat otsikot",
-    "mark_all_older_two_weeks" : "Kahta viikkoa vanhemmat otsikot",
-    "settings" : "Asetukset",
-    "profile" : "Profiili",
-    "admin" : "Ylläpito",
-    "about" : "Tietoja",
-    "logout" : "Kirjaudu ulos",
-    "donate" : "Lahjoita"
-  },
-  "view" : {
-    "entry_source" : "syötteestä",
-    "entry_author" : "kirjoittanut",
-    "error_while_loading_feed" : "Virhe tilausta ladattaessa",
-    "keep_unread" : "Pidä lukemattomana",
-    "no_unread_items" : "ei sisällä lukemattomia otsikoita.",
-    "mark_up_to_here" : "Merkitse luetuksi tähän asti",
-    "search_for" : "Etsi sanoilla:",
-    "no_search_results" : "Ei tuloksia annetuilla hakusanoilla."
-  },
-  "feedsearch" : {
-    "hint" : "Kirjoita syötteen nimi...",
-    "help" : "Siirry syötteiden välillä nuolinäppäimillä ja valitse syöte enterillä.",
-    "result_prefix" : "Tilatut syötteesi:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Yleiset",
-      "language" : "Kieli",
-      "language_contribute" : "Avusta käännösten tekemisessä.",
-      "show_unread" : "Näytä syötteet ja kansiot, joissa ei ole lukemattomia otsikoita",
-      "social_buttons" : "Näytä jakonapit",
-      "scroll_marks" : "Laajennetussa näkymässä otsikoiden selaaminen merkitsee ne luetuiksi"
-    },
-    "appearance" : "Ulkonäkö",
-    "scroll_speed" : "Vieritysnopeus otsikoiden välillä navigoidessa (millisekunneissa)",
-    "scroll_speed_help" : "Aseta 0 poistaaksesi vieritys käytöstä.",
-    "theme" : "Teema",
-    "submit_your_theme" : "Lähetä oma teemasi",
-    "custom_css" : "Oma CSS"
-  },
-  "details" : {
-    "feed_details" : "Tilauksen tiedot",
-    "url" : "Osoite",
-    "website" : "Sivusto",
-    "name" : "Nimi",
-    "category" : "Kansio",
-    "position" : "Paikka",
-    "last_refresh" : "Viimeisin päivitys",
-    "message" : "Viimeisimmän päivityksen viesti",
-    "next_refresh" : "Seuraava päivitys",
-    "queued_for_refresh" : "Jonossa päivitettäväksi",
-    "feed_url" : "Syötteen osoite",
-    "generate_api_key_first" : "Luo API-avain profiilissasi.",
-    "unsubscribe" : "Peruuta tilaus",
-    "unsubscribe_confirmation" : "Haluatko varmasti lopettaa tämän syötteen tilauksen?",
-    "delete_category_confirmation" : "Haluatko varmasti poistaa tämän kansion?",
-    "category_details" : "Kansion tiedot",
-    "tag_details" : "Tagin tiedot",
-    "parent_category" : "Yläkansio"
-  },
-  "profile" : {
-    "user_name" : "Käyttäjänimi",
-    "email" : "Sähköposti",
-    "change_password" : "Vaihda salasana",
-    "confirm_password" : "Vahvista uusi salasana",
-    "minimum_8_chars" : "Vähintään 8 merkkiä",
-    "passwords_do_not_match" : "Salasanat eivät täsmää",
-    "api_key" : "API-avain",
-    "api_key_not_generated" : "API-avainta ei ole vielä luotu",
-    "generate_new_api_key" : "Luo uusi API-avain",
-    "generate_new_api_key_info" : "Salasanan vaihtaminen luo uuden API-avaimen",
-    "opml_export" : "OPML vienti",
-    "delete_account" : "Poista tunnus",
-    "delete_account_confirmation" : "Haluatko varmasti poistaa tunnuksesi? Tätä ei voi perua!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST-API",
-      "line1" : "CommaFeed on rakennettu JAX-RS:n ja AngularJS:n avulla. REST API on myös saatavilla.",
-      "link_to_documentation" : "Linkki dokumentaatioon."
-    },
-    "keyboard_shortcuts" : "Näppäinoikotiet",
-    "version" : "CommaFeedin versio",
-    "line1_prefix" : "CommaFeed on avoimen lähdekoodin projekti. Lähdekoodi on saatavilla ",
-    "line1_suffix" : ":ssa.",
-    "line2_prefix" : "Jos huomaat ongelmia, ilmoita niistä ",
-    "line2_suffix" : "-projektin ongelmasivulla.",
-    "line3" : "Jos pidät CommaFeedistä, harkitse lahjoitusta kehittäjää tukeaksesi ja auttaaksesi sivuston kulujen kattamisessa.",
-    "line4" : "Tässä myös osoite bitcoin-lahjoituksia varten:",
-    "goodies" : {
-      "value" : "Ekstrat",
-      "android_app" : "Android-sovellus",
-      "subscribe_url" : "Tilausosoite",
-      "chrome_extension" : "Chrome-laajennus",
-      "firefox_extension" : "Firefox-laajennus",
-      "opera_extension" : "Opera-laajennus",
-      "subscribe_bookmarklet" : "Lisää tilaus -kirjanmerkki (klikkaa) ",
-      "subscribe_bookmarklet_asc" : "Vanhin ensiksi",
-      "subscribe_bookmarklet_desc" : "Uusin ensiksi",
-      "next_unread_bookmarklet" : "Seuraava lukematon otsikko -kirjanmerkki (raahaa kirjanmerkkipalkkiin)"
-    },
-    "translation" : {
-      "value" : "Kääntäminen",
-      "message" : "Tarvitsemme apuasi CommaFeedin kääntämiseksi.",
-      "link" : "Katso kuinka voit auttaa kännösten tekemisessä."
-    },
-    "announcements" : "Ilmoitukset",
-    "shortcuts" : {
-      "mouse_middleclick" : "hiiren keskinappi",
-      "open_next_entry" : "avaa seuraava otsikko",
-      "open_previous_entry" : "avaa edellinen otsikko",
-      "spacebar" : "välilyönti/shift+välilyönti",
-      "move_page_down_up" : "liikuta sivua ylös tai alas",
-      "focus_next_entry" : "valitse seuraava otsikko sitä avaamatta",
-      "focus_previous_entry" : "valitse edellinen otsikko sitä avaamatta",
-      "open_next_feed" : "avaa seuraava kansio tai syöte",
-      "open_previous_feed" : "avaa edellinen kansio tai syöte",
-      "open_close_current_entry" : "avaa tai sulje valittu otsikko",
-      "open_current_entry_in_new_window" : "avaa valittu otsikko uudessa ikkunassa",
-      "open_current_entry_in_new_window_background" : "avaa valittu otsikko uudessa ikkunassa taustalla",
-      "star_unstar" : "merkitse valittu otsikko tähdelliseksi",
-      "mark_current_entry" : "merkitse valittu otsikko luetuksi tai lukemattomaksi",
-      "mark_all_as_read" : "merkitse kaikki otsikot luetuiksi",
-      "open_in_new_tab_mark_as_read" : "avaa otsikko uudessa ikkunassa ja merkitse se luetuksi",
-      "fullscreen" : "siirry kokoruututilaan",
-      "font_size" : "suurenna/pienennä valitun artikkelin kirjasinkokoa",
-      "go_to_all" : "Siirry Kaikki-näkymään",
-      "go_to_starred" : "Siirry Tähdelliset-näkymään",
-      "feed_search" : "etsi tilaus sen nimen perusteella"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/fr.js
+++ b/commafeed-client/src/main/app/i18n/fr.js
@@ -1,181 +0,0 @@
-{
-  "global" : {
-    "save" : "Enregistrer",
-    "cancel" : "Annuler",
-    "delete" : "Effacer",
-    "required" : "Obligatoire",
-    "download" : "Télécharger",
-    "link" : "Lien",
-    "bookmark" : "Favoris",
-    "close" : "Fermer",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "S'abonner",
-    "import" : "Importer",
-    "new_category" : "Nouvelle catégorie",
-    "all" : "Tous",
-    "starred" : "Favoris"
-  },
-  "subscribe" : {
-    "feed_url" : "URL du flux",
-    "feed_name" : "Nom du flux",
-    "category" : "Catégorie"
-  },
-  "import" : {
-    "google_reader_prefix" : "Laissez-moi importer vos flux depuis votre compte ",
-    "google_reader_suffix" : ".",
-    "google_download" : "Ou alors, téléchargez votre fichier subscriptions.xml.",
-    "google_download_link" : "Récupérez-le ici.",
-    "xml_file" : "Fichier OPML"
-  },
-  "new_category" : {
-    "name" : "Nom",
-    "parent" : "Parent"
-  },
-  "toolbar" : {
-    "unread" : "Non lus",
-    "all" : "Tous",
-    "previous_entry" : "Article précédent",
-    "next_entry" : "Article suivant",
-    "refresh" : "Rafraîchir",
-    "refresh_all" : "Rafraîchir tous les flux",
-    "sort_by_asc_desc" : "Trier par date croissante/décroissante",
-    "titles_only" : "Titres uniquement",
-    "expanded_view" : "Vue étendue",
-    "mark_all_as_read" : "Tout marquer comme lu",
-    "mark_all_older_12_hours" : "Articles de plus de 12 heures",
-    "mark_all_older_day" : "Articles de plus d'une journée",
-    "mark_all_older_week" : "Articles de plus d'une semaine",
-    "mark_all_older_two_weeks" : "Articles de plus d'un mois",
-    "settings" : "Préférences",
-    "profile" : "Profil",
-    "admin" : "Administration",
-    "about" : "À propos",
-    "logout" : "Déconnexion",
-    "donate" : "Faire un don"
-  },
-  "view" : {
-    "entry_source" : "sur",
-    "entry_author" : "par ",
-    "error_while_loading_feed" : "Erreur durant le chargement de ce flux",
-    "keep_unread" : "Garder non lu",
-    "no_unread_items" : "n'a pas d'articles non lus.",
-    "mark_up_to_here" : "Marquer comme lu jusqu'ici",
-    "search_for" : "recherche : ",
-    "no_search_results" : "Pas de résultats avec le terme indiqué."
-  },
-  "feedsearch" : {
-    "hint" : "Tapez un nom de flux",
-    "help" : "Utilisez la touche entrée pour sélectionner et les flèches pour naviguer",
-    "result_prefix" : "Vos flux :"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Général",
-      "language" : "Langue",
-      "language_contribute" : "Contribuer aux traductions",
-      "show_unread" : "Afficher les flux et les catégories pour lesquels tout est déjà lu",
-      "social_buttons" : "Afficher les boutons de partage sur les réseaux sociaux",
-      "scroll_marks" : "En mode de lecture étendu, marquer les éléments comme lus lorsque la fenêtre descend."
-    },
-    "appearance" : "Apparence",
-    "scroll_speed" : "Vitesse de défilement entre les entrées (en millisecondes) ",
-    "scroll_speed_help" : "Mettez 0 pour désactiver",
-    "theme" : "Thème",
-    "submit_your_theme" : "Soumettez votre thème.",
-    "custom_css" : "CSS personnelle"
-  },
-  "details" : {
-    "feed_details" : "Détails du flux",
-    "url" : "URL",
-    "website" : "Site web",
-    "name" : "Nom",
-    "category" : "Catégorie",
-    "position" : "Position",
-    "last_refresh" : "Dernière mise à jour",
-    "message" : "Message de la dernière mise à jour ",
-    "next_refresh" : "Prochaine mise à jour",
-    "queued_for_refresh" : "En file d'attente",
-    "feed_url" : "URL du flux",
-    "generate_api_key_first" : "Générez d'abord une clé API dans votre profil.",
-    "unsubscribe" : "Se désabonner",
-    "unsubscribe_confirmation" : "Êtes-vous sûr de vouloir vous désabonner de de flux ? ",
-    "delete_category_confirmation" : "Êtes-vous sûr de vouloir supprimer cette catégorie ? ",
-    "category_details" : "Détails de la catégorie",
-    "tag_details" : "Détails du tag",
-    "parent_category" : "Catégorie parente"
-  },
-  "profile" : {
-    "user_name" : "Nom",
-    "email" : "E-mail",
-    "current_password" : "Mot de passe actuel",
-    "change_password" : "Changer de mot de passe",
-    "confirm_password" : "Confirmer le mot de passe",
-    "minimum_8_chars" : "Minimum 8 caractères",
-    "passwords_do_not_match" : "Les mots de passe ne correspondent pas",
-    "api_key" : "Clé API",
-    "api_key_not_generated" : "Pas encore générée",
-    "generate_new_api_key" : "Générer une nouvelle clé API",
-    "generate_new_api_key_info" : "Changer de mot de passe générera une nouvelle clé API",
-    "opml_export" : "Export du fichier OPML",
-    "delete_account" : "Effacer le compte",
-    "delete_account_confirmation" : "Êtes-vous sûr de vouloir supprimer définitivement votre compte ?"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "API REST",
-      "line1" : "CommaFeed utilise JAX-RS et AngularJS, une API REST est donc disponible.",
-      "link_to_documentation" : "Lien vers la documentation."
-    },
-    "keyboard_shortcuts" : "Raccourcis clavier",
-    "version" : "CommaFeed version",
-    "line1_prefix" : "CommaFeed est un projet open-source. Les sources sont disponibles sur ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Si vous rencontrez un problème, rapportez-le sur la page du projet sur ",
-    "line2_suffix" : ".",
-    "line3" : "Si vous aimez ce projet, n'hésitez pas à faire un don pour encourager le développeur et aider à couvrir les coûts d'hébergement de la plate-forme.",
-    "line4" : "Pour ceux qui préfèrent Bitcoin, voici l'adresse",
-    "goodies" : {
-      "value" : "Extensions",
-      "android_app" : "App Android",
-      "subscribe_url" : "URL pour s'abonner",
-      "chrome_extension" : "Extension Chrome",
-      "firefox_extension" : "Extension Firefox",
-      "opera_extension" : "Extension Opera",
-      "subscribe_bookmarklet" : "Bookmarklet d'ajout d'abonnement",
-      "subscribe_bookmarklet_asc" : "Du plus ancien au plus récent",
-      "subscribe_bookmarklet_desc" : "Du plus récent au plus ancien",
-      "next_unread_bookmarklet" : "Bookmarklet vers le prochain article non lu"
-    },
-    "translation" : {
-      "value" : "Traduction",
-      "message" : "Nous avons besoin d'aide pour traduire CommaFeed.",
-      "link" : "Cliquez ici pour voir comment vous pouvez nous aider."
-    },
-    "announcements" : "Annonces",
-    "shortcuts" : {
-      "mouse_middleclick" : "clic du milieu de la souris",
-      "open_next_entry" : "Ouvrir l'article suivant",
-      "open_previous_entry" : "Ouvrir l'article précédent",
-      "spacebar" : "espace/shift+espace",
-      "move_page_down_up" : "Faire descendre/monter la page",
-      "focus_next_entry" : "Sélectionner l'article suivant sans l'ouvrir",
-      "focus_previous_entry" : "Sélectionner l'article précédent sans l'ouvrir",
-      "open_next_feed" : "Sélectionner le flux ou la catégorie suivante",
-      "open_previous_feed" : "Sélectionner le flux ou la catégorie précédente",
-      "open_close_current_entry" : "Ouvrir/fermer l'article courant",
-      "open_current_entry_in_new_window" : "Ouvrir l'article courant dans une nouvelle fenêtre",
-      "open_current_entry_in_new_window_background" : "Ouvrir l'article courant dans une nouvelle fenêtre en arrière-plan",
-      "star_unstar" : "Ajouter/enlever l'article courant des favoris",
-      "mark_current_entry" : "Marquer comme lu/non lu l'article courant",
-      "mark_all_as_read" : "Marquer tous les articles comme lus",
-      "open_in_new_tab_mark_as_read" : "Ouvrir l'article courant dans une nouvelle fenêtre et marquer comme lu",
-      "fullscreen" : "Activer/désactiver le mode plein-écran",
-      "font_size" : "Augmenter/diminuer la taille de la police de l'article courant",
-      "go_to_all" : "Afficher tous les articles",
-      "go_to_starred" : "Afficher les articles favoris",
-      "feed_search" : "Naviguer vers un flux en entrant son nom"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/gl.js
+++ b/commafeed-client/src/main/app/i18n/gl.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Gardar",
-    "cancel" : "Cancelar",
-    "delete" : "Eliminar",
-    "required" : "Requerido",
-    "download" : "Descargar",
-    "link" : "Ligazón",
-    "bookmark" : "Marcador",
-    "close" : "Pechar",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "Subscribir",
-    "import" : "Importar",
-    "new_category" : "Nova categoría",
-    "all" : "Todos",
-    "starred" : "Destacado"
-  },
-  "subscribe" : {
-    "feed_url" : "URL da fonte",
-    "feed_name" : "Nome da fonte",
-    "category" : "Categoría"
-  },
-  "import" : {
-    "google_reader_prefix" : "Deixame importar as fontes da túa",
-    "google_reader_suffix" : " conta.",
-    "google_download" : "Tamén podes subir un ficheiro subscriptions.xml.",
-    "google_download_link" : "Descárgao de aquí.",
-    "xml_file" : "Ficheiro OPML"
-  },
-  "new_category" : {
-    "name" : "Nome",
-    "parent" : "Subcategoría de "
-  },
-  "toolbar" : {
-    "unread" : "Sen Ler",
-    "all" : "Todos",
-    "previous_entry" : "Entrada Anterior",
-    "next_entry" : "Próxima Entrada",
-    "refresh" : "Actualizar",
-    "refresh_all" : "Forzar a actualización de todas as fontes ",
-    "sort_by_asc_desc" : "Ordenar por data asc/desc",
-    "titles_only" : "Só títulos",
-    "expanded_view" : "Vista expandida",
-    "mark_all_as_read" : "Marcar todos como lidos",
-    "mark_all_older_12_hours" : "Elementos anteriores a 12 h. ",
-    "mark_all_older_day" : "Artigos anteriores a un día",
-    "mark_all_older_week" : "Artigos de máis de unha semana",
-    "mark_all_older_two_weeks" : "Artigos de máis de dúas semanas",
-    "settings" : "Configuración",
-    "profile" : "Perfil",
-    "admin" : "Admin",
-    "about" : "Sobre",
-    "logout" : "Pechar sesión",
-    "donate" : "Doar"
-  },
-  "view" : {
-    "entry_source" : "desde  ",
-    "entry_author" : "por  ",
-    "error_while_loading_feed" : "Erro mentras se cargaba esta fonte",
-    "keep_unread" : "Gardar non lidos",
-    "no_unread_items" : "non ten elementos sen ler.",
-    "mark_up_to_here" : "Marcar como lidos ate aquí ",
-    "search_for" : "buscando por:  ",
-    "no_search_results" : "Sen coincidencias para as palabras introducidas "
-  },
-  "feedsearch" : {
-    "hint" : "Escriba unha suscrición...",
-    "help" : "Use a teclar retorno para seleccionar e as flechas para navegar.",
-    "result_prefix" : "As súas suscricións:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Xeral",
-      "language" : "Idioma",
-      "language_contribute" : "Contribúe traducindo",
-      "show_unread" : "Mostrar fontes e categorías sen entradas non lidas.",
-      "social_buttons" : "Mostrar botóns de compartir en redes sociais.",
-      "scroll_marks" : "En vista expandida, o desplazamento polas entradas márcaas como lidas."
-    },
-    "appearance" : "Aspecto",
-    "scroll_speed" : "Velocidade de desplazamento navegando entre entradas (en milisegundos) ",
-    "scroll_speed_help" : "escriba 0 para deshabilitar ",
-    "theme" : "Decorado",
-    "submit_your_theme" : "Envíe o seu decorado",
-    "custom_css" : "CSS Personalizado"
-  },
-  "details" : {
-    "feed_details" : "Detalles de fontes",
-    "url" : "URL",
-    "website" : "Sitio web ",
-    "name" : "Nome",
-    "category" : "Categoría",
-    "position" : "Posición ",
-    "last_refresh" : "Última actualización",
-    "message" : "Última mensaxe da actualización ",
-    "next_refresh" : "Próxima actualización",
-    "queued_for_refresh" : "En cola para actualizar",
-    "feed_url" : "URL da fonte",
-    "generate_api_key_first" : "Antes debes xerar unha chave API no teu perfil.",
-    "unsubscribe" : "Rematar suscripción",
-    "unsubscribe_confirmation" : "Seguro que queres desuscribirte de esta fonte? ",
-    "delete_category_confirmation" : "Seguro que queres eliminar esta categoría? ",
-    "category_details" : "Detalles da categoría",
-    "tag_details" : "Detalles da etiqueta ",
-    "parent_category" : "Categoría principal"
-  },
-  "profile" : {
-    "user_name" : "Nome de usuario",
-    "email" : "Correo",
-    "change_password" : "Cambiar contrasinal",
-    "confirm_password" : "Confirmar contrasinal",
-    "minimum_8_chars" : "Mínimo 8 caracteres",
-    "passwords_do_not_match" : "Os contrasinais non coinciden no coinciden",
-    "api_key" : "Chave API",
-    "api_key_not_generated" : "Non xerado todavía",
-    "generate_new_api_key" : "Xerar nova chave da API",
-    "generate_new_api_key_info" : "Ao cambiar o contrasinal xerarase unha nova chave API",
-    "opml_export" : "Exportación de OPML",
-    "delete_account" : "Eliminar conta",
-    "delete_account_confirmation" : "Eliminar conta? Non hai volta atrás! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed está feito co uso de JAX-RS e AngularJS. Polo que está dispoñible un REST API.",
-      "link_to_documentation" : "Ligazón a documentación."
-    },
-    "keyboard_shortcuts" : "Atallos de teclado",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed é un proxecto de código aberto. O código está en ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Se atopas un problema, por favor informa na páxina de problemas do ",
-    "line2_suffix" : " do proxecto.",
-    "line3" : "Se che gusta este proxecto, por favor considera realizar unha doación para apoiar ao desenvolvedor e axudar a cubrir os gastos de mantemento.",
-    "line4" : "Para aqueles de vostedes que prefiran bitcoin, aquí está o enderezo",
-    "goodies" : {
-      "value" : "Extras",
-      "android_app" : "Android app ",
-      "subscribe_url" : "Suscribirse a URL",
-      "chrome_extension" : "Engadido para Chrome",
-      "firefox_extension" : "Engadido para Firefox",
-      "opera_extension" : "Engadido para Opera",
-      "subscribe_bookmarklet" : "Engadir bookmarklet para suscrición(click)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Bookmarklet  de seguinte elemento non lido (arrastre a barra de marcadores)"
-    },
-    "translation" : {
-      "value" : "Tradución",
-      "message" : "Precisamos a túa axuda para traducir CommaFeed.",
-      "link" : "Ver como contribuir con traducións."
-    },
-    "announcements" : "Anuncios",
-    "shortcuts" : {
-      "mouse_middleclick" : "botón central do rato",
-      "open_next_entry" : "abrir próxima entrada",
-      "open_previous_entry" : "abrir entrada anterior",
-      "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "move a páxina arriba/abaixo ",
-      "focus_next_entry" : "Establecer o foco na próxima entrada sen abrila",
-      "focus_previous_entry" : "Establecer o foco na entrada anterior sen abrila",
-      "open_next_feed" : "abrir a seguinte fonte ou categoría",
-      "open_previous_feed" : "abrir a fonte ou categoría anterior",
-      "open_close_current_entry" : "abrir/pechar entrada actual",
-      "open_current_entry_in_new_window" : "abrir entrada actual nunha nova ventana",
-      "open_current_entry_in_new_window_background" : "abrir entrada actual nunha nova ventá en segundo plano",
-      "star_unstar" : "marcar/desmarcar a entrada actual",
-      "mark_current_entry" : "marcar como lida/non lida a entrada actual",
-      "mark_all_as_read" : "marcar todas as entradas como lidas",
-      "open_in_new_tab_mark_as_read" : "abrir entrada nunha nova lapela e marcar como lida",
-      "fullscreen" : "habilita a pantalla completa ",
-      "font_size" : "aumenta/diminúe o tamaño da letra da entrada activa ",
-      "go_to_all" : "ir a vista TODOS",
-      "go_to_starred" : "ir a vista Destacados ",
-      "feed_search" : "navegue ate unha suscrición introducindo o nome da suscrición"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/glk.js
+++ b/commafeed-client/src/main/app/i18n/glk.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "قزنج",
-    "cancel" : "باطیل",
-    "delete" : "پاک",
-    "required" : "لازم",
-    "download" : "جیرأکش",
-    "link" : "خال",
-    "bookmark" : "بوکمارک",
-    "close" : "دَوَستن",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "مشترک ببید",
-    "import" : "درینأدأن",
-    "new_category" : "تازه جرگه",
-    "all" : "همه ته مطالب",
-    "starred" : "ستاره‌دار"
-  },
-  "subscribe" : {
-    "feed_url" : "خوراکˇ نشانی",
-    "feed_name" : "خوراکˇ نام",
-    "category" : "جرگه"
-  },
-  "import" : {
-    "google_reader_prefix" : "بدأر تی خوراکانه حسابˇ جی",
-    "google_reader_suffix" : "درینأدم.",
-    "google_download" : "یا اونˇ جا تی subscriptions.xml پروندهٰ جیرأکش.",
-    "google_download_link" : "اونه ائره جیرأکش.",
-    "xml_file" : "اکس.ام.الˇ پرونده"
-  },
-  "new_category" : {
-    "name" : "نام",
-    "parent" : "پئر"
-  },
-  "toolbar" : {
-    "unread" : "نخانده",
-    "all" : "همه",
-    "previous_entry" : "قبلی",
-    "next_entry" : "بعدی",
-    "refresh" : "واج‌أری",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "تاریخˇ سر دچئن",
-    "titles_only" : "خالی تیتران",
-    "expanded_view" : "واشاده نما",
-    "mark_all_as_read" : "همه‌ته مطالبه چاکون بخانده",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day" : "یک روز پیشترˇ مطالب",
-    "mark_all_older_week" : "یک هفته پیشترˇ مطالب",
-    "mark_all_older_two_weeks" : "چن هفته پیشترˇ مطالب",
-    "settings" : "تنظیم",
-    "profile" : "نمایه",
-    "admin" : "مدیریت",
-    "about" : "راجه‌به",
-    "logout" : "برین",
-    "donate" : "مالی ایلجار"
-  },
-  "view" : {
-    "entry_source" : "from  ",
-    "entry_author" : "by  ",
-    "error_while_loading_feed" : "حئف ببؤ! ای خوراکˇ جؤر أمأنˇ سر خطا ببؤ.",
-    "keep_unread" : "نخانده بدأر.",
-    "no_unread_items" : "نخانده مطلب دنه.",
-    "mark_up_to_here" : "Mark as read up to here ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
-  },
-  "feedsearch" : {
-    "hint" : "یکته اشتراکˇ سر نویشتن...",
-    "help" : "دکمهٔ بازگشت برای انتخاب و دکمه‌های جهت‌دار را برای ناوبری استفاده کن.",
-    "result_prefix" : "تی اشتراکان:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "همگانی",
-      "language" : "زوان",
-      "language_contribute" : "واگردانˇ مئنˇ ایلجار",
-      "show_unread" : "تنها خوراک‌ها و دسته‌های را که دارای مطالب نخوانده هستند نمایش بده.",
-      "social_buttons" : "نشان‌دادن دکمه‌های اشتراک‌گذاری در شبکه‌های اجتماعی",
-      "scroll_marks" : "در نمای گسترش‌یافته، لغزیدن بر روی مطالب به‌عنوان نشانه‌گذاری به‌عنوان خوانده‌شده در نظر گرفته‌شوند."
-    },
-    "appearance" : "ظاهر",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "پوسته",
-    "submit_your_theme" : "شیمه پوستهٰ اوسه کونید",
-    "custom_css" : "سی‌اس‌اس شخصی‌سازی‌شده"
-  },
-  "details" : {
-    "feed_details" : "جزئیات خوراک",
-    "url" : "نشانی",
-    "website" : "Website ",
-    "name" : "نام",
-    "category" : "جرگه",
-    "position" : "Position ",
-    "last_refresh" : "آخرین بروزرسانی",
-    "message" : "Last refresh message ",
-    "next_refresh" : "بروزرسانی بعدی",
-    "queued_for_refresh" : "منتظر برای بروزرسانی",
-    "feed_url" : "نشانی خوراک",
-    "generate_api_key_first" : "ابتدا یک کلید API در نمایهٔ خود ایجاد کنید.",
-    "unsubscribe" : "لغو اشتراک",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details" : "جرگه جزئیات",
-    "tag_details" : "Tag details ",
-    "parent_category" : "پئرˇ جرگه"
-  },
-  "profile" : {
-    "user_name" : "کاربری نام",
-    "email" : "ایمئل",
-    "change_password" : "رمزه عوضأگودن",
-    "confirm_password" : "رمزه تأیید گودن",
-    "minimum_8_chars" : "ناقلن 8 کارکتر",
-    "passwords_do_not_match" : "رمزان کس‌به‌کسه نخانید",
-    "api_key" : "کلید API",
-    "api_key_not_generated" : "هلئه چاگوده نبؤ",
-    "generate_new_api_key" : "تازه کلید چاگودن API",
-    "generate_new_api_key_info" : "رمزه عوضأگودن API کلیده چاکونه.",
-    "opml_export" : "برینأدأن OPML",
-    "delete_account" : "کاربری حسابه پاکودن",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "کامافید بر روی JAX-RS و AngularJS ساخته‌شده‌است. به همین دلیل API REST موجود است.",
-      "link_to_documentation" : "خال به مستندات."
-    },
-    "keyboard_shortcuts" : "وئر زئنˇ کلیدان",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "کامافید یکته «رهاوؤت» پروژه ایسه. اینˇ تلمبارؤن",
-    "line1_suffix" : "ˇمئن میزبانی به.",
-    "line2_prefix" : "أگه مشکلی پیش بمأ پیشأکشئنˇ صفحه مئن مطرح بکونین.",
-    "line2_suffix" : " پروژه.",
-    "line3" : "أگه ای پرؤژهٰ خوش دأنین، یک مبلغی هرچی‌م کی کم ببون ای سایتˇ هزینه‌ٰن و اینˇ توسعه‌دأن‌کسˇ وأسی هدین.",
-    "line4" : "اوشانی کی بیت‌کؤینه ترجیح دئنن، نشانی ائره نأ.",
-    "goodies" : {
-      "value" : "علاوه‌ٰن",
-      "android_app" : "Android app ",
-      "subscribe_url" : "نشانی مئنˇ اشتراک",
-      "chrome_extension" : "کرؤمˇ علاوه",
-      "firefox_extension" : "فایرفاکسˇ علاوه",
-      "opera_extension" : "اؤپرا علاوه",
-      "subscribe_bookmarklet" : "افزودن بوک‌مارک‌لت اشتراک (با کلیک)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "بوک‌مارک‌لت مطلب خوانده نشدهٔ بعدی(با کشیدن و رهاکردن در نوار بوک‌مارک‌لت)"
-    },
-    "translation" : {
-      "value" : "واگردان",
-      "message" : "أمه شیمه ایلجاره کامافیدˇ واگردانˇ مئن خأییم.",
-      "link" : "ببدینید چوتؤ تانید واگردانˇ مئن ایلجار بکونید."
-    },
-    "announcements" : "اطلاعیه‌ٰن",
-    "shortcuts" : {
-      "mouse_middleclick" : "مؤسˇ مئنی کلیک",
-      "open_next_entry" : "بعدی مطلبه واگدن",
-      "open_previous_entry" : "قبلی مطلبه واگودن",
-      "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
-      "focus_next_entry" : "بعدی مطلبˇ سر شؤن بی اینکه وابکونه",
-      "focus_previous_entry" : "قبلی مطلبˇ سر شؤن بی اینکه وابکونه",
-      "open_next_feed" : "بعدی خوراک یا جرگهٰ واگودن",
-      "open_previous_feed" : "قبلی خوراک یا جرگهٰ واگودن",
-      "open_close_current_entry" : "مطلبه واگودن/دوستن",
-      "open_current_entry_in_new_window" : "مطلبه تازه درجیکˇ مئن واگودن",
-      "open_current_entry_in_new_window_background" : "مطلبه تازه درجیکˇ مئن پس‌زمینه واگودن",
-      "star_unstar" : "مطلبه نشانه‌دار گودن/نگودن",
-      "mark_current_entry" : "مطلبه نشانه‌دار گودن کی بخانه/نخانده ایسه",
-      "mark_all_as_read" : "همه‌ته مطالبه نشانه بنه کی بخانده ببؤن",
-      "open_in_new_tab_mark_as_read" : "مطلبه تازه سرولگˇ میان واگودن و نشانه‌دار کودن به عنوانˇ بخانده",
-      "fullscreen" : "toggle full screen mode ",
-      "font_size" : "increase/decrease font size of the current entry ",
-      "go_to_all" : "go to the All view ",
-      "go_to_starred" : "go to the Starred view ",
-      "feed_search" : "اشتراکˇ نامه بنویس و اونه وئر بزن"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/hu.js
+++ b/commafeed-client/src/main/app/i18n/hu.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Mentés",
-    "cancel" : "Mégsem",
-    "delete" : "Törlés",
-    "required" : "Szükséges",
-    "download" : "Letöltés",
-    "link" : "Link",
-    "bookmark" : "Könyvjelző",
-    "close" : "Bezár",
-    "tags" : "Címkék"
-  },
-  "tree" : {
-    "subscribe" : "Feliratkozás",
-    "import" : "Importálás",
-    "new_category" : "Új kategória",
-    "all" : "Összes",
-    "starred" : "Csillagozott"
-  },
-  "subscribe" : {
-    "feed_url" : "Hírcsatorna URL",
-    "feed_name" : "Hírcsatorna neve",
-    "category" : "Kategória"
-  },
-  "import" : {
-    "google_reader_prefix" : "Engedd meg, hogy importáljuk a hírcsatornáidat a ",
-    "google_reader_suffix" : " fiókjából.",
-    "google_download" : "Alternatívaként, feltöltheti a subscriptions.xml fájlt.",
-    "google_download_link" : "Letöltheti innen.",
-    "xml_file" : "OPML Fájl"
-  },
-  "new_category" : {
-    "name" : "Név",
-    "parent" : "Szülő"
-  },
-  "toolbar" : {
-    "unread" : "Olvasatlan",
-    "all" : "Összes",
-    "previous_entry" : "Előző elem",
-    "next_entry" : "Következő elem",
-    "refresh" : "Frissítés",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "Rendezés időrend szerint",
-    "titles_only" : "Csak cím",
-    "expanded_view" : "Részletes nézet",
-    "mark_all_as_read" : "Az összes megjelölése olvasottként",
-    "mark_all_older_12_hours" : "Régebbiek 12 óránál",
-    "mark_all_older_day" : "Régebbiek, mint egy nap",
-    "mark_all_older_week" : "Régebbiek, mint egy hét",
-    "mark_all_older_two_weeks" : "Régebbiek, mint két hét",
-    "settings" : "Beállítások",
-    "profile" : "Profil",
-    "admin" : "Admin",
-    "about" : "Névjegy",
-    "logout" : "Kilépés",
-    "donate" : "Anyagi támogatás "
-  },
-  "view" : {
-    "entry_source" : "forrás",
-    "entry_author" : "szerző",
-    "error_while_loading_feed" : "Hiba történt ennek a hírcsatornának a betöltésekor",
-    "keep_unread" : "Megtartása olvasatlanként",
-    "no_unread_items" : "nincsen olvasatlan eleme.",
-    "mark_up_to_here" : "Megjelölés olvasottnak eddig",
-    "search_for" : "keresés erre:  ",
-    "no_search_results" : "Nem található semmi erre a keresett szóra"
-  },
-  "feedsearch" : {
-    "hint" : "Keressen a hírcsatornák között...",
-    "help" : "Használja a nyíl billentyűket a navigáláshoz, az enter-t a kiválasztáshoz.",
-    "result_prefix" : "Az ön feliratkozásai:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Általános",
-      "language" : "Nyelv",
-      "language_contribute" : "Segítsen a fordításban",
-      "show_unread" : "Mutassa azokat a hírcsatornákat és kategóriákat amelyekben nincsen olvasatlan bejegyzés",
-      "social_buttons" : "Mutassa a közösségi oldalak megosztás gombjait",
-      "scroll_marks" : "Kiterjesztett nézetben, görgetéssel olvasottként jelöli meg a bejegyzést"
-    },
-    "appearance" : "Megjelenés",
-    "scroll_speed" : "A görgetés sebessége, amikor a cikkek között navigál (miliszekundumban)",
-    "scroll_speed_help" : "Írjon be 0-át a letiltáshoz",
-    "theme" : "Téma",
-    "submit_your_theme" : "Küldje el a témáját",
-    "custom_css" : "Saját CSS"
-  },
-  "details" : {
-    "feed_details" : "Hírcsatorna részletei",
-    "url" : "URL",
-    "website" : "Weboldal",
-    "name" : "Név",
-    "category" : "Kategória",
-    "position" : "Pozició",
-    "last_refresh" : "Utolsó frissítés",
-    "message" : "Utolsó frissítési üzenet",
-    "next_refresh" : "Következő frissítés",
-    "queued_for_refresh" : "Frissítésre vár",
-    "feed_url" : "Hírcsatorna URL",
-    "generate_api_key_first" : "A profiljában először egy API kulcsot kell generálnia.",
-    "unsubscribe" : "Leiratkozás",
-    "unsubscribe_confirmation" : "Biztos, hogy le akar iratkozni errről a csatornáról?",
-    "delete_category_confirmation" : "Biztos, hog törölni akarja ezt a kategóriát?",
-    "category_details" : "Kategória részletei",
-    "tag_details" : "Címke részletei",
-    "parent_category" : "Szülő kategória"
-  },
-  "profile" : {
-    "user_name" : "Felhasználói név",
-    "email" : "E-mail",
-    "change_password" : "Jelszó megváltoztatás",
-    "confirm_password" : "Jelszó megerősítése",
-    "minimum_8_chars" : "Legalább 8 karakter",
-    "passwords_do_not_match" : "A jelszavak nem egyeznek",
-    "api_key" : "API kulcs",
-    "api_key_not_generated" : "Még nincsen generálva",
-    "generate_new_api_key" : "Új API kulcs generálása",
-    "generate_new_api_key_info" : "A jelszó megváltoztatása új API kulcsot generál",
-    "opml_export" : "OPML exportálása",
-    "delete_account" : "Fiók törlése",
-    "delete_account_confirmation" : "Törli a fiókját? Innen már nincs visszatérés!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "A CommaFeed a JAX-RS-re és az AngularJS-re épül. Ezért a RESTA API elérhető.",
-      "link_to_documentation" : "Link a dokumentációhoz."
-    },
-    "keyboard_shortcuts" : "Gyorsbillentyűk",
-    "version" : "CommaFeed verzió",
-    "line1_prefix" : "A CommaFeed egy nyílt forrású projekt. A forrás megtalálható a ",
-    "line1_suffix" : "oldalán.",
-    "line2_prefix" : "Ha hibába ütközik, kérjük jelentse azt a ",
-    "line2_suffix" : "projekt oldalán.",
-    "line3" : "Ha tetszik önnek ez a szolgáltatás, akkor kérjük támogassa a fejlesztőket és, hogy fentarthassák a weboldalt.",
-    "line4" : "Akik jobban szeretnék az oldalt bitcon-nal támogatni, itt a cím",
-    "goodies" : {
-      "value" : "Hasznos dolgok",
-      "android_app" : "Android alkalmazás",
-      "subscribe_url" : "Feliratkozás az URL-re",
-      "chrome_extension" : "Chrome bővítmény",
-      "firefox_extension" : "Firefox kiterjesztés",
-      "opera_extension" : "Opera kiterjesztés",
-      "subscribe_bookmarklet" : "Feliratkozás bookmarklet hozzáadása (klikkeléssel)",
-      "subscribe_bookmarklet_asc" : "Régebbiek először",
-      "subscribe_bookmarklet_desc" : "Újak először",
-      "next_unread_bookmarklet" : "Következő olvasatlan elem bookmarklet (húzza fel a könyvjelzősávba)"
-    },
-    "translation" : {
-      "value" : "Fordítás",
-      "message" : "Segítségét kérjük a CommaFeed fordításához.",
-      "link" : "Nézze meg, hogyan tud segíteni ebben."
-    },
-    "announcements" : "Bejelentések ",
-    "shortcuts" : {
-      "mouse_middleclick" : "középső egérgomb ",
-      "open_next_entry" : "következő hír megnyitása",
-      "open_previous_entry" : "előző hír megnyitása",
-      "spacebar" : "szóköz/shift+szóköz",
-      "move_page_down_up" : "fel/le lépkedhet az oldalon",
-      "focus_next_entry" : "megnyitás nélkül fókuszál a övetkező elemre",
-      "focus_previous_entry" : "megnyitás nélkül fókuszál az előző elemre",
-      "open_next_feed" : "a következő hírcsatorna vagy kategória megnyitása",
-      "open_previous_feed" : "az előző hírcsatorna vagy kategória megnyitása",
-      "open_close_current_entry" : "a jelenlegi elem megnyitása/bezárása",
-      "open_current_entry_in_new_window" : "a jelenlegi elem megnyitása új ablakban",
-      "open_current_entry_in_new_window_background" : "a jelenlegi elem megnyitása a háttérben, új ablakban",
-      "star_unstar" : "hírelem csillagozása",
-      "mark_current_entry" : "elem megjelölése olvasottként",
-      "mark_all_as_read" : "az összes elem megjelölése olvasottként",
-      "open_in_new_tab_mark_as_read" : "elem megnyitása új fülön és megjelölése olvasottként",
-      "fullscreen" : "teljes képernyős mód bekapcsolása",
-      "font_size" : "a jelenlegi elemnél növeli/csökkenti a betűméretet",
-      "go_to_all" : "átkapcsol az Összes nézetre",
-      "go_to_starred" : "átkapcsol a Csillagozott nézetre",
-      "feed_search" : "név szerinti keresés a hírcsatornák között"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/id.js
+++ b/commafeed-client/src/main/app/i18n/id.js
@@ -1,182 +0,0 @@
-{
-  "global" : {
-    "save" : "Simpan",
-    "cancel" : "Batal",
-    "delete" : "Hapus",
-    "required" : "Diminta",
-    "download" : "Unduh",
-    "link" : "Tautan",
-    "bookmark" : "Penanda halaman buku",
-    "close" : "Tutup",
-    "tags" : "Penanda"
-  },
-  "tree" : {
-    "subscribe" : "Berlangganan",
-    "import" : "Impor",
-    "new_category" : "Kategori Baru",
-    "all" : "Semua",
-    "starred" : "Diutamakan"
-  },
-  "subscribe" : {
-    "feed_url" : "Umpan URL",
-    "feed_name" : "Nama Umpan",
-    "category" : "Kategori"
-  },
-  "import" : {
-    "google_reader_prefix" : "Izinkan saya mengimpor umpan Anda dari kepunyaan Anda ",
-    "google_reader_suffix" : " akun.",
-    "google_download" : "Atau, unggah berkas subscriptions.xml Anda.",
-    "google_download_link" : "Unggah dari sini.",
-    "xml_file" : "Berkas OPML"
-  },
-  "new_category" : {
-    "name" : "Nama",
-    "parent" : "Induk"
-  },
-  "toolbar" : {
-    "unread" : "Belum dibaca",
-    "all" : "Semua",
-    "previous_entry" : "Catatan sebelumnya",
-    "next_entry" : "Catatan selanjutnya",
-    "refresh" : "Segarkan",
-    "refresh_all" : "Memaksa menyegarkan semua umpan saya",
-    "sort_by_asc_desc" : "Urutkan menurut tanggal asc/desc",
-    "titles_only" : "Hanya Judul",
-    "expanded_view" : "Penglihatan diperluas",
-    "mark_all_as_read" : "Tandai semua sebagai telah dibaca",
-    "mark_all_older_12_hours" : "Butir lebih lama 12 jam",
-    "mark_all_older_day" : "Butir lebih lama sehari",
-    "mark_all_older_week" : "Butir lebih lama seminggu",
-    "mark_all_older_two_weeks" : "Butir lebih lama dua minggu",
-    "settings" : "Pengaturan",
-    "profile" : "Profil",
-    "admin" : "Admin",
-    "about" : "Tentang",
-    "logout" : "Keluar",
-    "donate" : "Donasi"
-  },
-  "view" : {
-    "entry_source" : "dari ",
-    "entry_author" : "oleh ",
-    "error_while_loading_feed" : "Galat saat memuat umpan ini",
-    "keep_unread" : "Tetapkan belum dibaca",
-    "no_unread_items" : "Tidak ada yang butir yang belum dibaca.",
-    "mark_up_to_here" : "Tandai sebagai dibaca di sini",
-    "search_for" : "mencari: ",
-    "no_search_results" : "Tidak ditemukan kata kunci yang sesuai dengan permintaan"
-  },
-  "feedsearch" : {
-    "hint" : "Ketik sebuah langganan...",
-    "help" : "Gunakan tombol enter untuk memilih dan tombol panah untuk navigasi.",
-    "result_prefix" : "Langganan Anda:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Umum",
-      "language" : "Bahasa",
-      "language_contribute" : "Kontribusi dengan terjemahan",
-      "show_unread" : "Menampilkan umpan dan kategori tanpa catatan belum dibaca",
-      "social_buttons" : "Menampilkan tombol sosial berbagi",
-      "scroll_marks" : "Di penglihatan luas, menggulir melalui catatan menandakan sebagai telah dibaca"
-    },
-    "appearance" : "Penampilan",
-    "scroll_speed" : "Kecepatan menggulir ketika menavigasi antar catatan (dalam milidetik)",
-    "scroll_speed_help" : "setel ke 0 untuk menonaktifkan",
-    "theme" : "Tema",
-    "submit_your_theme" : "Mengajukan tema Anda",
-    "custom_css" : "Ubah CSS"
-  },
-  "details" : {
-    "feed_details" : "Rincian Umpan",
-    "url" : "URL",
-    "website" : "Situs",
-    "name" : "Nama",
-    "category" : "Kategori",
-    "position" : "Posisi",
-    "last_refresh" : "Penyegaran terakhir",
-    "message" : "Menyegarkan pesan terakhir",
-    "next_refresh" : "Penyegaran selanjutnya",
-    "queued_for_refresh" : "Antri untuk penyegaran",
-    "feed_url" : "Umpan URL",
-    "filtering_expression" : "Penyaring ekspresi",
-    "filtering_expression_help" : "Jika tidak kosong, sebuah ekspresi mengevaluasi ke 'benar' atau 'salah'. Jika salah, catatan baru untuk umpan ini akan ditandai sebagai telah dibaca secara otomatis. \nVariabel yang tersedia adalah 'judul', 'konten', 'url' 'penulis' dan 'kategori' dan konten mereka dikonversi dari huruf kecil ke perbandingan string yang mudah. \nContoh: url.contains('youtube') or (author eq 'athou' and title.contains('github'). \nSintaksis lengkap tersedia di <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>here</a>.",
-    "generate_api_key_first" : "Menghasilkan sebuah kunci API di profil Anda terlebih dahulu.",
-    "unsubscribe" : "Berhenti berlangganan",
-    "unsubscribe_confirmation" : "Apakah Anda yakin ingin berhenti berlangganan dari umpan ini?",
-    "delete_category_confirmation" : "Apakah Anda yakin ingin menghapus dari kategori ini?",
-    "category_details" : "rincian Kategori",
-    "tag_details" : "rincian Penanda",
-    "parent_category" : "kategori Induk"
-  },
-  "profile" : {
-    "user_name" : "nama Pengguna",
-    "email" : "Surel",
-    "change_password" : "Ganti kata sandi",
-    "confirm_password" : "Konfirmasi kata sandi",
-    "minimum_8_chars" : "Minimal 8 karakter",
-    "passwords_do_not_match" : "Kata sandi tidak sesuai",
-    "api_key" : "kunci API",
-    "api_key_not_generated" : "Belum menghasilkan",
-    "generate_new_api_key" : "Hasilkan kunci API baru",
-    "generate_new_api_key_info" : "Mengganti kata sandi akan menghasilkan sebuah kunci API baru",
-    "opml_export" : "ekspor OPML",
-    "delete_account" : "Hapus akun",
-    "delete_account_confirmation" : "Hapus akun Anda? Hal ini tidak dapat dikembalikan!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed dibangun di atas JAX-RS dan AngularJS. Dengan demikian, tersedia sebuah REST API.",
-      "link_to_documentation" : "Tautan menuju dokumentasi."
-    },
-    "keyboard_shortcuts" : "pintasan Papanketik",
-    "version" : "versi CommaFeed",
-    "line1_prefix" : "CommaFeed adalah suatu proyek open-source. Sumber di ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Jika Anda mengalami sebuah isu, silahkan laporkan pada halaman isu ",
-    "line2_suffix" : " proyek.",
-    "line3" : "Jika Anda menyukai proyek ini, silahkan mempertimbangkan suatu donasi untuk mendukung pengembang dan membantu menutupi biaya online situs ini.",
-    "line4" : "Untuk Anda yang lebih suka bitcoin, alamatnya di sini",
-    "goodies" : {
-      "value" : "Bingkisan",
-      "android_app" : "Android app",
-      "subscribe_url" : "URL Langganan",
-      "chrome_extension" : "ekstensi Chrome",
-      "firefox_extension" : "ekstensi Firefox",
-      "opera_extension" : "ekstensi Opera",
-      "subscribe_bookmarklet" : "Tambahkan bookmarklet langganan(klik)",
-      "subscribe_bookmarklet_asc" : "Terlama dahulu",
-      "subscribe_bookmarklet_desc" : "Terbaru dahulu",
-      "next_unread_bookmarklet" : "Butir bookmarklet selanjutnya yang belum dibaca (seret ke batang penanda halaman buku)"
-    },
-    "translation" : {
-      "value" : "Terjemahan",
-      "message" : "Kami membutuhkan bantuan Anda untuk menterjemahkan CommaFeed.",
-      "link" : "Lihat bagaimana berkontribusi dengan terjemahan."
-    },
-    "announcements" : "Pengumuman",
-    "shortcuts" : {
-      "mouse_middleclick" : "klik tengah tetikus",
-      "open_next_entry" : "buka catatan selanjutnya",
-      "open_previous_entry" : "buka catatan sebelumnya",
-      "spacebar" : "spasi/shift+spasi",
-      "move_page_down_up" : "pindah halaman bawah/atas",
-      "focus_next_entry" : "setel fokus pada catatan selanjutnya tanpa membukanya",
-      "focus_previous_entry" : "setel fokus pada catatan sebelumnya tanpa membukanya",
-      "open_next_feed" : "buka umpan atau kategori selanjutnya",
-      "open_previous_feed" : "buka umpan atau kategori sebelumnya",
-      "open_close_current_entry" : "buka/tutup catatan saat ini",
-      "open_current_entry_in_new_window" : "buka catatan saat ini di sebuah jendela baru",
-      "open_current_entry_in_new_window_background" : "buka catatan saat ini di sebuah jendela baru pada latar",
-      "star_unstar" : "tanda bintang/tidak catatan saat ini",
-      "mark_current_entry" : "tandai sebagai telah dibaca/belum catatan saat ini",
-      "mark_all_as_read" : "tandai semua catatan sebagai telah dibaca",
-      "open_in_new_tab_mark_as_read" : "buka catatan di tab baru dan tandai sebagai telah dibaca",
-      "fullscreen" : "beralih modus layar penuh",
-      "font_size" : "tingkatkan/turunkan ukuran huruf dari catatan saat ini",
-      "go_to_all" : "menuju ke lihat Semua",
-      "go_to_starred" : "menuju ke lihat Tanda Bintang",
-      "feed_search" : "navigasi ke langganan dengan memasukkan nama langganan"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/it.js
+++ b/commafeed-client/src/main/app/i18n/it.js
@@ -1,183 +0,0 @@
-{
-  "global" : {
-    "save" : "Salva",
-    "cancel" : "Annulla",
-    "delete" : "Elimina",
-    "required" : "Richiesto",
-    "download" : "Download",
-    "link" : "Link",
-    "bookmark" : "Segnalibro",
-    "close" : "Chiudi",
-    "tags" : "Tag"
-  },
-  "tree" : {
-    "subscribe" : "Iscriviti",
-    "import" : "Importa",
-    "new_category" : "Nuova categoria",
-    "all" : "Tutti",
-    "starred" : "Preferiti"
-  },
-  "subscribe" : {
-    "feed_url" : "URL feed",
-    "feed_name" : "Nome feed",
-    "category" : "Categoria"
-  },
-  "import" : {
-    "google_reader_prefix" : "Permettimi di importare i feed dal tuo account ",
-    "google_reader_suffix" : ".",
-    "google_download" : "Oppure carica il tuo file subscriptions.xml.",
-    "google_download_link" : "Puoi scaricalo da qui.",
-    "xml_file" : "File OPML"
-  },
-  "new_category" : {
-    "name" : "Nome",
-    "parent" : "Gruppo"
-  },
-  "toolbar" : {
-    "unread" : "Non letti",
-    "all" : "Tutti",
-    "previous_entry" : "Precedente",
-    "next_entry" : "Successivo",
-    "refresh" : "Aggiorna",
-    "refresh_all" : "Forza l'aggiornamento di tutti i feed",
-    "sort_by_asc_desc" : "Ordina per data crescente/decrescente",
-    "titles_only" : "Solo i titoli",
-    "expanded_view" : "Espandi",
-    "mark_all_as_read" : "Segna tutti come già letti",
-    "mark_all_older_12_hours" : "Elementi più vecchi di 12 ore",
-    "mark_all_older_day" : "Elementi più vecchi di un giorno",
-    "mark_all_older_week" : "Elementi più vecchi di una settimana",
-    "mark_all_older_two_weeks" : "Elementi più vecchi di due settimane",
-    "settings" : "Impostazioni",
-    "profile" : "Profilo",
-    "admin" : "Admin",
-    "about" : "Informazioni",
-    "logout" : "Esci",
-    "donate" : "Dona"
-  },
-  "view" : {
-    "entry_source" : "da ",
-    "entry_author" : "di ",
-    "error_while_loading_feed" : "Si è verificato un errore durante il caricamento del feed",
-    "keep_unread" : "Mantieni come da leggere",
-    "no_unread_items" : "non contiene elementi da leggere",
-    "mark_up_to_here" : "Segna come letto fin qui",
-    "search_for" : "Cerca: ",
-    "no_search_results" : "Nessun risultato per le parole chiave cercate"
-  },
-  "feedsearch" : {
-    "hint" : "Digita il nome di una sottoscrizione... ",
-    "help" : "Usa il tasto Invio per selezionare e le frecce per navigare.",
-    "result_prefix" : "Le tue sottoscrizioni:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Generali",
-      "language" : "Lingua",
-      "language_contribute" : "Contribuisci alle traduzioni",
-      "show_unread" : "Mostra i feed e le categorie con voci non lette",
-      "social_buttons" : "Mostra i pulsanti di condivisione social",
-      "scroll_marks" : "In vista estesa, segna come lette le voci che scorri"
-    },
-    "appearance" : "Aspetto",
-    "scroll_speed" : "Velocità di scorrimento quando navighi tra i feed (in millisecondi)",
-    "scroll_speed_help" : "imposta su 0 per disabilitare",
-    "theme" : "Tema",
-    "submit_your_theme" : "Inserisci il tuo tema",
-    "custom_css" : "CSS personalizzato"
-  },
-  "details" : {
-    "feed_details" : "Dettagli feed",
-    "url" : "URL",
-    "website" : "Sito web",
-    "name" : "Nome",
-    "category" : "Categoria",
-    "position" : "Posizione",
-    "last_refresh" : "Ultimo aggiornamento",
-    "message" : "Ultimo messaggio di aggiornamento",
-    "next_refresh" : "Prossimo aggiornamento",
-    "queued_for_refresh" : "In coda per l'aggiornamento",
-    "feed_url" : "URL feed",
-    "filtering_expression" : "Espressione filtro",
-    "filtering_expression_help" : "Quando non è vuota, l'espressione viene applicata a ogni nuovo elemento e valutata come 'vera' o 'falsa'. Se falsa, l'elemento verrà segnato automaticamente come letto.\nLe variabili accettate sono 'title' (titolo), 'content' (contenuto), 'url', 'author' (autore) e 'categories' (categorie); il loro contenuto è convertito in minuscolo per facilitarne il confronto.\nEsempio: url.contains('youtube') or (author eq 'athou' and title.contains('github')).\nLa sintassi completa è disponibile <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>qui</a> (in inglese).",
-    "generate_api_key_first" : "Genera prima una chiave API nelle impostazioni del tuo profilo.",
-    "unsubscribe" : "Disiscriviti",
-    "unsubscribe_confirmation" : "Sei sicuro di voler annullare la sottoscrizione al feed?",
-    "delete_category_confirmation" : "Sei sicuro di voler eliminare questa categoria?",
-    "category_details" : "Dettagli categoria",
-    "tag_details" : "Dettagli tag",
-    "parent_category" : "Categoria principale"
-  },
-  "profile" : {
-    "user_name" : "Nome utente",
-    "email" : "E-mail",
-    "change_password" : "Cambia password",
-    "confirm_password" : "Conferma password",
-    "minimum_8_chars" : "Minimo 8 caratteri",
-    "passwords_do_not_match" : "Le password non corrispondono",
-    "api_key" : "chiave API",
-    "api_key_not_generated" : "Non ancora generata",
-    "generate_new_api_key" : "Genera una nuova chiave API",
-    "generate_new_api_key_info" : "Cambiando la password sarà generata una nuova chiave API",
-    "opml_export" : "Esporta OPML",
-    "delete_account" : "Elimina account",
-    "delete_account_confirmation" : "Vuoi eliminare il tuo account? Non si può tornare indietro!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed è basato su JAX-RS e AngularJS. Pertanto è disponibile una REST API.",
-      "link_to_documentation" : "Link alla documentazione."
-    },
-    "keyboard_shortcuts" : "Scorciatoie da tastiera",
-    "version" : "Versione di CommaFeed",
-    "line1_prefix" : "CommaFeed è un progetto open source. Trovi i sorgenti su ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Se hai qualche problema, segnalalo sulla pagina del progetto ",
-    "line2_suffix" : ".",
-    "line3" : "Se ti piace questo progetto, considera una donazione per supportare lo sviluppatore e aiutare a coprire i costi di manutenzione di questo sito.",
-    "line4" : "Se preferisci Bitcoin, questo è l'indirizzo",
-    "goodies" : {
-      "value" : "Cose che potrebbero interessarti",
-      "android_app" : "Applicazione Android",
-      "subscribe_url" : "Sottoscrivi URL",
-      "chrome_extension" : "Estensione per Chrome",
-      "firefox_extension" : "Estensione per Firefox",
-      "opera_extension" : "Estensione per Opera",
-      "subscribe_bookmarklet" : "Aggiungi la sottoscrizione ai segnalibri (clicca)",
-      "subscribe_bookmarklet_asc" : "Prima i vecchi",
-      "subscribe_bookmarklet_desc" : "Prima i recenti",
-      "next_unread_bookmarklet" : "Segnalibro al prossimo elemento da leggere (trascinalo nella barra dei segnalibri)"
-    },
-    "translation" : {
-      "value" : "Traduzioni",
-      "message" : "Abbiamo bisogno del tuo aiuto per tradurre CommaFeed.",
-      "link" : "Scopri come aiutarci nelle traduzioni."
-    },
-    "announcements" : "Annunci",
-    "shortcuts" : {
-      "mouse_middleclick" : "click centrale del mouse",
-      "open_next_entry" : "apri successivo",
-      "open_previous_entry" : "apri precedente",
-      "spacebar" : "SPAZIO/MAIUSC+SPAZIO",
-      "move_page_down_up" : "muove la pagina in su/giù",
-      "focus_next_entry" : "metti a fuoco l'elemento successivo senza aprirlo",
-      "focus_previous_entry" : "metti a fuoco l'elemento precedente senza aprirlo",
-      "open_next_feed" : "apri il prossimo feed o categoria",
-      "open_previous_feed" : "apri il feed o la categoria precedente",
-      "open_close_current_entry" : "apri/chiudi la voce corrente",
-      "open_current_entry_in_new_window" : "apri la voce corrente in una nuova finestra",
-      "open_current_entry_in_new_window_background" : "apri la voce corrente in una nuova finestra in secondo piano",
-      "star_unstar" : "metti/togli la tua preferenza alla voce corrente",
-      "mark_current_entry" : "segna la voce corrente come letta/non letta",
-      "mark_all_as_read" : "segna tutte le voci come lette",
-      "open_in_new_tab_mark_as_read" : "apri voce in un nuovo tab e segna come letta",
-      "fullscreen" : "commuta la modalità a schermo intero",
-      "font_size" : "aumenta/decrementa la dimensione del font per la voce corrente",
-      "go_to_all" : "vai alla vista Tutti",
-      "go_to_starred" : "vai alla vista Preferiti",
-      "feed_search" : "raggiungi una sottoscrizione scrivendo il suo nome",
-      "refresh" : "aggiorna"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/ja.js
+++ b/commafeed-client/src/main/app/i18n/ja.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "保存",
-    "cancel" : "取り消し",
-    "delete" : "削除",
-    "required" : "必須",
-    "download" : "ダウンロード",
-    "link" : "リンク",
-    "bookmark" : "ブックマーク",
-    "close" : "閉じる",
-    "tags" : "タグ"
-  },
-  "tree" : {
-    "subscribe" : "購読",
-    "import" : "インポート",
-    "new_category" : "新しいカテゴリー",
-    "all" : "全て",
-    "starred" : "スター付き"
-  },
-  "subscribe" : {
-    "feed_url" : "フィードURL",
-    "feed_name" : "フィード名",
-    "category" : "カテゴリー"
-  },
-  "import" : {
-    "google_reader_prefix" : "Googleアカウントからフィードを",
-    "google_reader_suffix" : "インポートします。",
-    "google_download" : "または、お持ちのsubscriptions.xmlファイルをアップロードします。",
-    "google_download_link" : "このリンクからダウンロードして下さい。",
-    "xml_file" : "OPMLファイル"
-  },
-  "new_category" : {
-    "name" : "名前",
-    "parent" : "親カテゴリー"
-  },
-  "toolbar" : {
-    "unread" : "未読",
-    "all" : "全て",
-    "previous_entry" : "前のエントリー",
-    "next_entry" : "次のエントリー",
-    "refresh" : "更新",
-    "refresh_all" : "全てのフィードを更新",
-    "sort_by_asc_desc" : "日時でソート",
-    "titles_only" : "タイトルのみ",
-    "expanded_view" : "拡張ビュー",
-    "mark_all_as_read" : "全て既読にする",
-    "mark_all_older_12_hours" : "12時間以上前のアイテム",
-    "mark_all_older_day" : "前日より前のアイテム",
-    "mark_all_older_week" : "1週間以上前のアイテム",
-    "mark_all_older_two_weeks" : "2週間以上前のアイテム",
-    "settings" : "設定",
-    "profile" : "Profile",
-    "admin" : "管理者",
-    "about" : "About",
-    "logout" : "ログアウト",
-    "donate" : "寄付"
-  },
-  "view" : {
-    "entry_source" : " より ",
-    "entry_author" : " 著者 ",
-    "error_while_loading_feed" : "フィード読み込み中にエラーが発生しました。",
-    "keep_unread" : "未読として保持",
-    "no_unread_items" : "未読アイテムはありません。",
-    "mark_up_to_here" : "ここまで既読",
-    "search_for" : "検索: ",
-    "no_search_results" : "検索結果はありません。"
-  },
-  "feedsearch" : {
-    "hint" : "購読フィードを入力...",
-    "help" : "Enterキーで選択、矢印キーで移動します。",
-    "result_prefix" : "見つかった購読フィード："
-  },
-  "settings" : {
-    "general" : {
-      "value" : "一般",
-      "language" : "言語",
-      "language_contribute" : "翻訳に貢献する",
-      "show_unread" : "未読エントリーのないフィードとカテゴリーを表示",
-      "social_buttons" : "共有ボタンを表示",
-      "scroll_marks" : "拡張ビューではエントリーのスクロールで既読にする"
-    },
-    "appearance" : "外観",
-    "scroll_speed" : "エントリー間のスクロールスピード(ミリ秒)",
-    "scroll_speed_help" : "0に設定すると無効になります",
-    "theme" : "テーマ",
-    "submit_your_theme" : "テーマを登録する",
-    "custom_css" : "カスタムCSS"
-  },
-  "details" : {
-    "feed_details" : "フィードの詳細",
-    "url" : "URL",
-    "website" : "Webサイト",
-    "name" : "名前",
-    "category" : "カテゴリー",
-    "position" : "位置",
-    "last_refresh" : "最終更新",
-    "message" : "最終更新メッセージ",
-    "next_refresh" : "次回更新",
-    "queued_for_refresh" : "更新キュー",
-    "feed_url" : "フィードURL",
-    "generate_api_key_first" : "最初にあなたのAPIキーを生成して下さい。",
-    "unsubscribe" : "購読解除",
-    "unsubscribe_confirmation" : "フィードの購読を解除してよろしいですか?",
-    "delete_category_confirmation" : "カテゴリーを削除してよろしいですか?",
-    "category_details" : "カテゴリー詳細",
-    "tag_details" : "タグ詳細",
-    "parent_category" : "親カテゴリー"
-  },
-  "profile" : {
-    "user_name" : "ユーザ名",
-    "email" : "E-mail",
-    "change_password" : "パスワードの変更",
-    "confirm_password" : "変更パスワードの確認",
-    "minimum_8_chars" : "8文字以上",
-    "passwords_do_not_match" : "パスワードが一致しません",
-    "api_key" : "APIキー",
-    "api_key_not_generated" : "APIキーが生成されていません",
-    "generate_new_api_key" : "新しいAPIキーを生成",
-    "generate_new_api_key_info" : "パスワードを変更すると新しいAPIキーが生成されます",
-    "opml_export" : "OPMLエクスポート",
-    "delete_account" : "アカウント削除",
-    "delete_account_confirmation" : "アカウントを削除してよろしいですか? 削除すると戻すことはできません!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeedはJAX-RSとAngularJSを使用しているので、REST APIも利用可能です。",
-      "link_to_documentation" : "ドキュメントへのリンク"
-    },
-    "keyboard_shortcuts" : "キーボードショートカット",
-    "version" : "CommaFeedバージョン",
-    "line1_prefix" : "CommaFeedはオープンソースプロジェクトです。ソースは",
-    "line1_suffix" : "にホスティングされています。",
-    "line2_prefix" : "もし問題を登録したい場合、",
-    "line2_suffix" : "プロジェクトのissuesページに報告して下さい。",
-    "line3" : "このプロジェクトを気に入った場合、開発者やWebサイトの運営コストをサポートするための寄付を検討して下さいね。",
-    "line4" : "Bitcoinなら寄付できる方、アドレスはこちらです。",
-    "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "Androidアプリ",
-      "subscribe_url" : "購読URL",
-      "chrome_extension" : "Chrome拡張",
-      "firefox_extension" : "Firefox拡張",
-      "opera_extension" : "Opera拡張",
-      "subscribe_bookmarklet" : "購読ブックマークレットを追加(クリック)",
-      "subscribe_bookmarklet_asc" : "古い順",
-      "subscribe_bookmarklet_desc" : "新しい順",
-      "next_unread_bookmarklet" : "次の未読アイテムブックマークレット(ブックマークバーへドラッグ)"
-    },
-    "translation" : {
-      "value" : "翻訳",
-      "message" : "CommaFeedの翻訳にご協力ください！",
-      "link" : "翻訳にあたっての案内はこちら"
-    },
-    "announcements" : "お知らせ",
-    "shortcuts" : {
-      "mouse_middleclick" : "中クリック",
-      "open_next_entry" : "次のエントリーを開く",
-      "open_previous_entry" : "前のエントリーを開く",
-      "spacebar" : "space/shift+space",
-      "move_page_down_up" : "ページ移動",
-      "focus_next_entry" : "次のエントリーを開かずにフォーカス移動",
-      "focus_previous_entry" : "前のエントリーを開かずにフォーカス移動",
-      "open_next_feed" : "次のフィード/カテゴリーを開く",
-      "open_previous_feed" : "前のフィード/カテゴリーを開く",
-      "open_close_current_entry" : "現在のエントリーを開く/閉じる",
-      "open_current_entry_in_new_window" : "現在のエントリーを新しいウィンドウで開く",
-      "open_current_entry_in_new_window_background" : "現在のエントリーを新しいバックグラウンドウィンドウで開く",
-      "star_unstar" : "現在のエントリーにスターを付ける/解除する",
-      "mark_current_entry" : "現在のエントリーを既読/未読にする",
-      "mark_all_as_read" : "全エントリーを既読にする",
-      "open_in_new_tab_mark_as_read" : "エントリーを既読にして新しいタブで開く",
-      "fullscreen" : "フルスクリーン切り替え",
-      "font_size" : "現在のエントリーのフォントサイズを大きく/小さくする",
-      "go_to_all" : "All viewに変更する",
-      "go_to_starred" : "スター付きviewに変更する",
-      "feed_search" : "購読画面(subscription nameの入力)に移動する"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/ko.js
+++ b/commafeed-client/src/main/app/i18n/ko.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "저장",
-    "cancel" : "취소",
-    "delete" : "삭제",
-    "required" : "필수",
-    "download" : "다운로드",
-    "link" : "링크",
-    "bookmark" : "북마크",
-    "close" : "닫기 ",
-    "tags" : "태그 "
-  },
-  "tree" : {
-    "subscribe" : "구독",
-    "import" : "가져오기",
-    "new_category" : "새로운 카테고리",
-    "all" : "전체",
-    "starred" : "중요 표시됨"
-  },
-  "subscribe" : {
-    "feed_url" : "피드 URL",
-    "feed_name" : "피드 이름",
-    "category" : "카테고리"
-  },
-  "import" : {
-    "google_reader_prefix" : "당신의 Google Reader",
-    "google_reader_suffix" : " 에서 피드들을 가져오겠습니다.",
-    "google_download" : "아니면, subscription.xml 파일을 업로드 해주세요.",
-    "google_download_link" : "다운로드 링크",
-    "xml_file" : "OPML File"
-  },
-  "new_category" : {
-    "name" : "이름",
-    "parent" : "부모 카테고리"
-  },
-  "toolbar" : {
-    "unread" : "읽지 않음",
-    "all" : "전체",
-    "previous_entry" : "이전 항목",
-    "next_entry" : "다음 항목",
-    "refresh" : "새로고침",
-    "refresh_all" : "모든 피드를 강제로 새로고침",
-    "sort_by_asc_desc" : "날짜별 오름차/내림차순 정렬",
-    "titles_only" : "제목만 표시하기",
-    "expanded_view" : "Expanded View",
-    "mark_all_as_read" : "읽음으로 표시",
-    "mark_all_older_12_hours" : "12시간보다 오래된 항목",
-    "mark_all_older_day" : "1일보다 오래된 항목",
-    "mark_all_older_week" : "1주일보다 오래된 항목",
-    "mark_all_older_two_weeks" : "2주일보다 오래된 항목",
-    "settings" : "설정",
-    "profile" : "프로필",
-    "admin" : "괸리자",
-    "about" : "더보기",
-    "logout" : "로그아웃",
-    "donate" : "기부하기"
-  },
-  "view" : {
-    "entry_source" : "from  ",
-    "entry_author" : "by ",
-    "error_while_loading_feed" : "피드 로딩중 에러",
-    "keep_unread" : "항상 읽지 않음으로 표시",
-    "no_unread_items" : " 읽지 않은 항목이 없습니다.",
-    "mark_up_to_here" : "이 위로 읽음으로 표시",
-    "search_for" : "검색:  ",
-    "no_search_results" : "검색 결과 없음"
-  },
-  "feedsearch" : {
-    "hint" : "구독 이름을 입력하세요",
-    "help" : "화살표 키로 이동하고 엔터 키로 선택하세요.",
-    "result_prefix" : "검색 결과:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "일반",
-      "language" : "언어",
-      "language_contribute" : "번역에 기여하기",
-      "show_unread" : "안 읽은 항목들이 있는 피드와 카테고리 보여주기",
-      "social_buttons" : "공유 버튼 표시하기",
-      "scroll_marks" : "Expanded View에서 스크롤하면 항목들을 읽음으로 표시하기"
-    },
-    "appearance" : "외관",
-    "scroll_speed" : "항목 사이를 이동할 때 스크롤 속도 (밀리초로 설정)",
-    "scroll_speed_help" : "비활성화하려면 0으로 설정하세요",
-    "theme" : "테마",
-    "submit_your_theme" : "새 테마 업로드",
-    "custom_css" : "커스텀 CSS"
-  },
-  "details" : {
-    "feed_details" : "피드 상세",
-    "url" : "URL",
-    "website" : "웹사이트",
-    "name" : "이름",
-    "category" : "카테고리",
-    "position" : "위치",
-    "last_refresh" : "마지막 새로고침",
-    "message" : "마지막 새로고침 메시지",
-    "next_refresh" : "다음 새로고침",
-    "queued_for_refresh" : "새로고침 대기중",
-    "feed_url" : "피드 URL",
-    "generate_api_key_first" : "당신의 프로필을 위해 API Key를 먼저 생성하세요.",
-    "unsubscribe" : "구독 해제",
-    "unsubscribe_confirmation" : "정말 이 피드를 구독 해제하시겠습니까?",
-    "delete_category_confirmation" : "정말 이 카테고리를 삭제하시겠습니까?",
-    "category_details" : "카테고리 상세",
-    "tag_details" : "태그 상세",
-    "parent_category" : "부모 카테고리"
-  },
-  "profile" : {
-    "user_name" : "사용자 이름",
-    "email" : "이메일",
-    "change_password" : "비밀번호 변경",
-    "confirm_password" : "비밀번호 확인",
-    "minimum_8_chars" : "최소 8개의 문자가 필요합니다.",
-    "passwords_do_not_match" : "비밀번호가 일치하지 않습니다.",
-    "api_key" : "API key",
-    "api_key_not_generated" : "아직 API Key가 생성되지 않았습니다.",
-    "generate_new_api_key" : "API Key 생성하기",
-    "generate_new_api_key_info" : "비밀번호를 변경하면 새로운 API Key가 생성됩니다.",
-    "opml_export" : "OPML 내보내기",
-    "delete_account" : "계정 삭제하기",
-    "delete_account_confirmation" : "계정을 삭제하시겠습니까? 되돌릴 수 없어요!"
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed는 JAX-RS와 AngularJS를 이용해 만들었습니다. 그렇기 때문에 REST API를 사용할수있습니다.",
-      "link_to_documentation" : "문서 링크."
-    },
-    "keyboard_shortcuts" : "단축키",
-    "version" : "CommaFeed 버전",
-    "line1_prefix" : "CommaFeed는 오픈 소스 프로젝트입니다. 소스는",
-    "line1_suffix" : "에 있습니다.",
-    "line2_prefix" : "문제가 발생하는 경우",
-    "line2_suffix" : " 프로젝트 문제 페이지에 보고하십시오.",
-    "line3" : "이 프로젝트를 좋아하시면 개발자를 지원하고 웹사이트 유지비용을 충당하는 데 도움이 되는 기부금을 고려하시기 바랍니다.",
-    "line4" : "비트코인으로 기부하기",
-    "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "안드로이드 앱",
-      "subscribe_url" : "구독 URL",
-      "chrome_extension" : "Chrome 확장 프로그램",
-      "firefox_extension" : "Firefox 확장 기능",
-      "opera_extension" : "Opera 확장 기능",
-      "subscribe_bookmarklet" : "구독 북마크 추가 (클릭)",
-      "subscribe_bookmarklet_asc" : "오래된 것 먼저",
-      "subscribe_bookmarklet_desc" : "새로운 것 먼저",
-      "next_unread_bookmarklet" : "안 읽은 항목 북마크 (북마크바에 끌기) "
-    },
-    "translation" : {
-      "value" : "번역",
-      "message" : "CommaFeed를 번역하는데 당신의 도움이 필요합니다.",
-      "link" : "번역에 기여하기"
-    },
-    "announcements" : "공지",
-    "shortcuts" : {
-      "mouse_middleclick" : "마우스 미들클릭",
-      "open_next_entry" : "다음 항목 열기",
-      "open_previous_entry" : "이전 항목 열기",
-      "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "페이지 아래/위로 이동 ",
-      "focus_next_entry" : "열지 않고 다음 항목 보기",
-      "focus_previous_entry" : "열지 않고 이전 항목 보기",
-      "open_next_feed" : "다음 피드나 카테고리 열기",
-      "open_previous_feed" : "이전 피드나 카테고리 열기",
-      "open_close_current_entry" : "현재 항목 열기/닫기",
-      "open_current_entry_in_new_window" : "새 창으로 현재 항목 열기",
-      "open_current_entry_in_new_window_background" : "백그라운드에 새 창으로 현재 항목 열기",
-      "star_unstar" : "현재 항목 중요 표시/중요 표시 제거",
-      "mark_current_entry" : "현재 항목 읽음/안읽음 표시",
-      "mark_all_as_read" : "모든 항목 읽음으로 표시",
-      "open_in_new_tab_mark_as_read" : "읽음으로 표시하고 새로운 탭에서 열기",
-      "fullscreen" : "전체화면 켜기/끄기",
-      "font_size" : "현재 항목의 글꼴 크기를 크게/작게",
-      "go_to_all" : "모든 항목 보기",
-      "go_to_starred" : "중요 표시한 항목 보기",
-      "feed_search" : "구독 이름으로 구독 찾기"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/ms.js
+++ b/commafeed-client/src/main/app/i18n/ms.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Save",
-    "cancel" : "Batal",
-    "delete" : "Padam",
-    "required" : "Wajib",
-    "download" : "Muat turun",
-    "link" : "Pautan",
-    "bookmark" : "Bookmark",
-    "close" : "Tutup",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "Langgan",
-    "import" : "Import",
-    "new_category" : "Kategori Baru",
-    "all" : "Semua",
-    "starred" : "Dibintang"
-  },
-  "subscribe" : {
-    "feed_url" : "URL Feed",
-    "feed_name" : "Nama Feed",
-    "category" : "Kategori"
-  },
-  "import" : {
-    "google_reader_prefix" : "Import feed dari ",
-    "google_reader_suffix" : " akaun.",
-    "google_download" : "Sebagai alternatif, muat naik fail subscriptions.xml anda.",
-    "google_download_link" : "Muat turun dari sini",
-    "xml_file" : "Fail OPML"
-  },
-  "new_category" : {
-    "name" : "Nama",
-    "parent" : "Induk"
-  },
-  "toolbar" : {
-    "unread" : "Belum Dibaca",
-    "all" : "Semua",
-    "previous_entry" : "Sebelumnya",
-    "next_entry" : "Selepasnya",
-    "refresh" : "Refresh",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "Aturkan mengikut tarikh (baru/lama)",
-    "titles_only" : "Tajuk sahaja",
-    "expanded_view" : "Wide view",
-    "mark_all_as_read" : "Tanda kesemuanya telah dibaca",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day" : "Lebih lama daripada sehari",
-    "mark_all_older_week" : "Lebih lama daripada seminggu",
-    "mark_all_older_two_weeks" : "Lebih lama daripada dua minggu",
-    "settings" : "Setting",
-    "profile" : "Profil",
-    "admin" : "Admin",
-    "about" : "About",
-    "logout" : "Logout",
-    "donate" : "Derma"
-  },
-  "view" : {
-    "entry_source" : "from  ",
-    "entry_author" : "oleh  ",
-    "error_while_loading_feed" : "Kesilapan semasa memuat turun feed ini",
-    "keep_unread" : "Simpan tidak dibaca",
-    "no_unread_items" : "tiada item yang belum dibaca.",
-    "mark_up_to_here" : "Mark as read up to here ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
-  },
-  "feedsearch" : {
-    "hint" : "Taipkan langganan...",
-    "help" : "Guna kekunci Return untuk membuat pilihan dan kekunci arah untuk menavigasi.",
-    "result_prefix" : "Langganan anda:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Setting am",
-      "language" : "Bahasa",
-      "language_contribute" : "Sumbang penterjemahan",
-      "show_unread" : "Tunjuk semua feed dan kategori yang telah dibaca",
-      "social_buttons" : "Tunjuk social sharing",
-      "scroll_marks" : "Dalam wide view, tanda item dibaca ketika scrolling"
-    },
-    "appearance" : "Rupa",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Tema",
-    "submit_your_theme" : "Muat naik tema anda",
-    "custom_css" : "Custom CSS"
-  },
-  "details" : {
-    "feed_details" : "Butir-butir Feed",
-    "url" : "URL",
-    "website" : "Website ",
-    "name" : "Nama",
-    "category" : "Kategori",
-    "position" : "Posisi",
-    "last_refresh" : "Refresh terakhir",
-    "message" : "Last refresh message ",
-    "next_refresh" : "Refresh seterusnya",
-    "queued_for_refresh" : "Diaturkan untuk refresh",
-    "feed_url" : "URL Feed",
-    "generate_api_key_first" : "Janakan API key dalam profil anda dahulu.",
-    "unsubscribe" : "Hentikan langganan",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details" : "Butir-butir kategori",
-    "tag_details" : "Tag details ",
-    "parent_category" : "Kategori induk"
-  },
-  "profile" : {
-    "user_name" : "User name",
-    "email" : "E-mel",
-    "change_password" : "Tukar kata laluan",
-    "confirm_password" : "Sahkan kata laluan",
-    "minimum_8_chars" : "Minimum 8 huruf",
-    "passwords_do_not_match" : "Kata laluan tidak sama",
-    "api_key" : "API key",
-    "api_key_not_generated" : "Belum dijana",
-    "generate_new_api_key" : "Jana API key baru",
-    "generate_new_api_key_info" : "Pertukaran kata laluan akan menjanakan API key yang baru",
-    "opml_export" : "Export OPML",
-    "delete_account" : "Padam akaun",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed diaturcarakan dengan JAX-RS dan AngularJS. Oleh itu, REST API boleh didapati.",
-      "link_to_documentation" : "Pautan ke dokumentasi."
-    },
-    "keyboard_shortcuts" : "Pintasan papan kekunci",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed adalah projek open-source. Sources are berada di  ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Jika anda menghadapi masalah, sila laporkan di halaman isu-isu di  ",
-    "line2_suffix" : " projek.",
-    "line3" : "Jika anda suka projek ini, anda boleh menbuat dermaan kepada pengaturcara untuk membantu menampung kos laman web ini.",
-    "line4" : "Jika anda guna bitcoin, halamannya adalah ",
-    "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "Android app",
-      "subscribe_url" : "URL melanggan",
-      "chrome_extension" : "Chrome extension",
-      "firefox_extension" : "Firefox extension",
-      "opera_extension" : "Opera extension",
-      "subscribe_bookmarklet" : "Jana bookmarklet langganan (klik)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Item bookmarklet yang belum dibaca seterusnya (seret ke bookmark bar)"
-    },
-    "translation" : {
-      "value" : "Terjemahan",
-      "message" : "Kami perlukan bantuan anda untuk menterjemahkan CommaFeed.",
-      "link" : "Bagaimana mengyumbang penterjemahan."
-    },
-    "announcements" : "Pengumuman",
-    "shortcuts" : {
-      "mouse_middleclick" : "Klik tengah",
-      "open_next_entry" : "buka item seterusya",
-      "open_previous_entry" : "buka item sebelumnya",
-      "spacebar" : "space/shift+space",
-      "move_page_down_up" : "Gerak halaman ke bawah/atas",
-      "focus_next_entry" : "fokus kepada item seterusnya tanpa membuka",
-      "focus_previous_entry" : "fokus kepada item sebelumnya tanpa membuka",
-      "open_next_feed" : "buka feed atau kategori seterusnya",
-      "open_previous_feed" : "buka feed atau kategori sebelumnya",
-      "open_close_current_entry" : "buka/tutup entry kini",
-      "open_current_entry_in_new_window" : "buka entry kini di window yang baru",
-      "open_current_entry_in_new_window_background" : "buka entry kini di window baru  di latar belakang",
-      "star_unstar" : "bintang/nyah-bintang entry kini",
-      "mark_current_entry" : "tanda entry kini telah dibaca/belum dibaca",
-      "mark_all_as_read" : "tanda semua entry telah dibaca",
-      "open_in_new_tab_mark_as_read" : "buka entry di tab baru dan tanda telah dibaca",
-      "fullscreen" : "toggle mod skrin penuh",
-      "font_size" : "kecil/besar fon entry kini",
-      "go_to_all" : "go to the All view ",
-      "go_to_starred" : "go to the Starred view ",
-      "feed_search" : "pergi ke langganan dengan nama langganan"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/nb.js
+++ b/commafeed-client/src/main/app/i18n/nb.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Lagre",
-    "cancel" : "Avbryt",
-    "delete" : "Slett",
-    "required" : "Påkrevd",
-    "download" : "Last ned",
-    "link" : "Lenke",
-    "bookmark" : "Bokmerke",
-    "close" : "Lukk",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "Abonner",
-    "import" : "Importer",
-    "new_category" : "Ny kategori",
-    "all" : "Alle",
-    "starred" : "Merkede artikler"
-  },
-  "subscribe" : {
-    "feed_url" : "URL for abonnement",
-    "feed_name" : "Abonnementsnavn",
-    "category" : "Kategori"
-  },
-  "import" : {
-    "google_reader_prefix" : "La meg importere dine abonnementer fra din",
-    "google_reader_suffix" : " bruker.",
-    "google_download" : "Alternativt, last opp din egen subscriptions.xml-fil.",
-    "google_download_link" : "Last ned herfra.",
-    "xml_file" : "OPML-fil"
-  },
-  "new_category" : {
-    "name" : "Navn",
-    "parent" : "Overordnet"
-  },
-  "toolbar" : {
-    "unread" : "Uleste",
-    "all" : "Alle",
-    "previous_entry" : "Forrige artikkel",
-    "next_entry" : "Neste artikkel",
-    "refresh" : "Oppdater",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "Sorter etter dato ny/gammel",
-    "titles_only" : "Kun titler",
-    "expanded_view" : "Utvidet visning",
-    "mark_all_as_read" : "Merk alle som lest",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day" : "Artikler eldre enn én dag",
-    "mark_all_older_week" : "Artikler eldre enn én uke",
-    "mark_all_older_two_weeks" : "Artikler eldre enn to uker",
-    "settings" : "Innstillinger",
-    "profile" : "Profil",
-    "admin" : "Admin",
-    "about" : "Om",
-    "logout" : "Logg ut",
-    "donate" : "Doner"
-  },
-  "view" : {
-    "entry_source" : "from  ",
-    "entry_author" : "by  ",
-    "error_while_loading_feed" : "Feil under lasting av artikkel",
-    "keep_unread" : "Behold som ulest",
-    "no_unread_items" : "har ingen uleste artikler.",
-    "mark_up_to_here" : "Mark as read up to here ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
-  },
-  "feedsearch" : {
-    "hint" : "Skriv inn et abonnement...",
-    "help" : "Bruk entertasten for å velge og piltastene for å navigere.",
-    "result_prefix" : "Dine abonnementer:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Generelt",
-      "language" : "Språk",
-      "language_contribute" : "Bidra med oversettelser",
-      "show_unread" : "Vis abonnementer og kategorier uten nye artikler",
-      "social_buttons" : "Vis delingsknapper",
-      "scroll_marks" : "I utvidet visning, merk artikler som leste når du blar deg forbi dem."
-    },
-    "appearance" : "Utseende",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Drakt",
-    "submit_your_theme" : "Legg til egen drakt",
-    "custom_css" : "Egendefinert CSS"
-  },
-  "details" : {
-    "feed_details" : "Abonnementsdetaljer",
-    "url" : "URL",
-    "website" : "Website ",
-    "name" : "Navn",
-    "category" : "Kategori",
-    "position" : "Posisjon",
-    "last_refresh" : "Siste oppdatering",
-    "message" : "Last refresh message ",
-    "next_refresh" : "Neste oppdatering",
-    "queued_for_refresh" : "I kø for oppdatering",
-    "feed_url" : "URL for abonnement",
-    "generate_api_key_first" : "Generer en API-nøkkel under profilinnstillinger først.",
-    "unsubscribe" : "Avslutt abonnement",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details" : "Kategoridetaljer",
-    "tag_details" : "Tag details ",
-    "parent_category" : "Overordnet kategori"
-  },
-  "profile" : {
-    "user_name" : "Brukernavn",
-    "email" : "E-post",
-    "change_password" : "Endre passord",
-    "confirm_password" : "Bekreft passord",
-    "minimum_8_chars" : "Minimum 8 tegn",
-    "passwords_do_not_match" : "Passordene er ikke like",
-    "api_key" : "API-nøkkel",
-    "api_key_not_generated" : "Har ikke blitt generert",
-    "generate_new_api_key" : "Generer ny API-nøkkel",
-    "generate_new_api_key_info" : "Endring av passord vil generere en ny API-nøkkel",
-    "opml_export" : "OPML-eksport",
-    "delete_account" : "Slett bruker",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed  er bygget på toppen av JAX-RS og AngularJS. På grunn av dette er REST API tilgjengelig.",
-      "link_to_documentation" : "Lenke til dokumentasjon."
-    },
-    "keyboard_shortcuts" : "Hurtigtaster",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed er et prosjekt med åpen kildekode. Kildekoden er tilgjengelig på ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Vis du oppdager en feil eller et problem, rapporter det på ",
-    "line2_suffix" : " siden til prosjekt.",
-    "line3" : "Dersom du liker dette prosjektet, kan du vurdere en donasjon for støtte utvikleren, og bidra med å dekke kostnadene til å drifte nettsiden.",
-    "line4" : "For de som foretrekker bitcoin, her er adressa",
-    "goodies" : {
-      "value" : "Godsaker",
-      "android_app" : "Android app ",
-      "subscribe_url" : "Abonner URL",
-      "chrome_extension" : "Chrome-utvidelse",
-      "firefox_extension" : "Firefox-utvidelse",
-      "opera_extension" : "Opera-utvidelse",
-      "subscribe_bookmarklet" : "Nytt abonnement-bokmerkeprogram (klikk)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Neste uleste artikkel-bokmerkeprogram (dra til bokmerkemenyen)"
-    },
-    "translation" : {
-      "value" : "Oversettelse",
-      "message" : "Vi trenger din hjelp til å oversette CommaFeed.",
-      "link" : "Se hvordan du kan hjelpe til med oversettelser."
-    },
-    "announcements" : "Kunngjøringer",
-    "shortcuts" : {
-      "mouse_middleclick" : "midtre museknapp/musehjulet",
-      "open_next_entry" : "åpne neste artikkel",
-      "open_previous_entry" : "åpne forrige artikkel",
-      "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
-      "focus_next_entry" : "sett fokus på neste artikkel uten å åpne den",
-      "focus_previous_entry" : "sett fokus på forrige artikkel uten å åpne den",
-      "open_next_feed" : "åpne neste abonnement eller kategori",
-      "open_previous_feed" : "åpne forrige abonnement eller kategori",
-      "open_close_current_entry" : "åpne/lukke gjeldende artikkel",
-      "open_current_entry_in_new_window" : "åpne gjeldende artikkel i et nytt vindu",
-      "open_current_entry_in_new_window_background" : "åpne gjeldende artikkel i et nytt bakgrunnsvindu",
-      "star_unstar" : "legg til stjerne/fjern stjerne fra gjeldende artikkel",
-      "mark_current_entry" : "merk gjeldende artikkel som lest/ulest",
-      "mark_all_as_read" : "merk alle artikler som lest",
-      "open_in_new_tab_mark_as_read" : "åpne artikkel i ny fane og merk som lest",
-      "fullscreen" : "toggle full screen mode ",
-      "font_size" : "increase/decrease font size of the current entry ",
-      "go_to_all" : "go to the All view ",
-      "go_to_starred" : "go to the Starred view ",
-      "feed_search" : "naviger til et abonnement ved å skrive inn abonnementsnavnet"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/nl.js
+++ b/commafeed-client/src/main/app/i18n/nl.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Opslaan",
-    "cancel" : "Annuleren",
-    "delete" : "Verwijderen",
-    "required" : "Verplicht",
-    "download" : "Download",
-    "link" : "Link",
-    "bookmark" : "Bookmark",
-    "close" : "Sluiten ",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "Abonneer",
-    "import" : "Importeer",
-    "new_category" : "Nieuwe categorie",
-    "all" : "Alles",
-    "starred" : "Favorieten"
-  },
-  "subscribe" : {
-    "feed_url" : "Feed URL",
-    "feed_name" : "Feed naam",
-    "category" : "Categorie"
-  },
-  "import" : {
-    "google_reader_prefix" : "Laat je feeds importeren vanuit jouw",
-    "google_reader_suffix" : " account.",
-    "google_download" : "Als alternatief kun je je subscriptions.xml bestand uploaden.",
-    "google_download_link" : "Download het hier.",
-    "xml_file" : "OPML Bestand"
-  },
-  "new_category" : {
-    "name" : "Naam",
-    "parent" : "Parent"
-  },
-  "toolbar" : {
-    "unread" : "Ongelezen",
-    "all" : "Alles",
-    "previous_entry" : "Vorig artikel",
-    "next_entry" : "Volgend artikel",
-    "refresh" : "Vernieuwen",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "Sorteer op datum opl/afl",
-    "titles_only" : "Alleen titels",
-    "expanded_view" : "Uitgebreide weergave",
-    "mark_all_as_read" : "Markeer alles als gelezen",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day" : "Artikelen ouder dan een dag",
-    "mark_all_older_week" : "Artikelen ouder dan een week",
-    "mark_all_older_two_weeks" : "Artikelen ouder dan twee weken",
-    "settings" : "Instellingen",
-    "profile" : "Profiel",
-    "admin" : "Administratie",
-    "about" : "Over ons",
-    "logout" : "Log uit",
-    "donate" : "Doneer"
-  },
-  "view" : {
-    "entry_source" : "van",
-    "entry_author" : "door",
-    "error_while_loading_feed" : "Fout tijdens het laden van de feed",
-    "keep_unread" : "Behoud ongelezen",
-    "no_unread_items" : "Heeft geen ongelezen artikelen",
-    "mark_up_to_here" : "Markeer tot hier als gelezen",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
-  },
-  "feedsearch" : {
-    "hint" : "Type een abonnement in... ",
-    "help" : "Gebruik Enter om te selecteren en de pijltjestoetsen om te navigeren.",
-    "result_prefix" : "Jouw abonnementen:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Algemeen",
-      "language" : "Taal",
-      "language_contribute" : "Draag bij met vertalingen",
-      "show_unread" : "Laat feeds en categorieën zonder ongelezen artikelen zien",
-      "social_buttons" : "Laat Social Media knoppen zien",
-      "scroll_marks" : "Markeer artikelen als gelezen, wanneer je er doorheen scrollt"
-    },
-    "appearance" : "Uiterlijk",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Thema",
-    "submit_your_theme" : "Stuur thema in",
-    "custom_css" : "Custom CSS"
-  },
-  "details" : {
-    "feed_details" : "Feed details",
-    "url" : "URL",
-    "website" : "Website",
-    "name" : "Naam",
-    "category" : "Categorie",
-    "position" : "Positie",
-    "last_refresh" : "Laatste vernieuwing",
-    "message" : "Last refresh message ",
-    "next_refresh" : "Volgende vernieuwing",
-    "queued_for_refresh" : "In wachtrij voor vernieuwing",
-    "feed_url" : "Feed URL",
-    "generate_api_key_first" : "Genereer eerst een API sleutel in je profiel.",
-    "unsubscribe" : "Abonnement opzeggen",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details" : "Categorie details",
-    "tag_details" : "Tag details ",
-    "parent_category" : "Bovenliggende categorie"
-  },
-  "profile" : {
-    "user_name" : "Gebruikersnaam",
-    "email" : "E-mail",
-    "change_password" : "Verander wachtwoord",
-    "confirm_password" : "Bevestig wachtwoord",
-    "minimum_8_chars" : "Minimaal 8 tekens",
-    "passwords_do_not_match" : "Wachtwoorden komen niet overeen",
-    "api_key" : "API sleutel",
-    "api_key_not_generated" : "Nog niet gegenereerd",
-    "generate_new_api_key" : "Genereer nieuwe API sleutel",
-    "generate_new_api_key_info" : "Het veranderen van het wachtwoord genereert een nieuwe API sleutel",
-    "opml_export" : "OPML export",
-    "delete_account" : "Verwijder account",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed is gebouwd op basis van JAX-RS en AngularJS. Als zodanig is er een REST API beschikbaar.",
-      "link_to_documentation" : "Link naar de documentatie"
-    },
-    "keyboard_shortcuts" : "Sneltoetsen",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed is een open-source project. Bronnen worden gehost op ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Als je een probleem tegenkomt, rapporteer dit dan a.u.b. op de Issues pagina van het ",
-    "line2_suffix" : " project.",
-    "line3" : "Als je dit project leuk vindt, overweeg dan te doneren om de ontwikkelaars te ondersteunen en hosting kosten te drukken.",
-    "line4" : "Voor degenen die liever bitcoin gebruiken, hier is het adres",
-    "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "Android app",
-      "subscribe_url" : "Abonneer URL",
-      "chrome_extension" : "Chrome extensie",
-      "firefox_extension" : "Firefox extensie",
-      "opera_extension" : "Opera extensie",
-      "subscribe_bookmarklet" : "Voeg abonnement toe bookmarklet (klik)",
-      "subscribe_bookmarklet_asc" : "Oudste eerst",
-      "subscribe_bookmarklet_desc" : "Nieuwste eerst",
-      "next_unread_bookmarklet" : "Volgend ongelezen item bookmarklet (sleep naar bladwijzerbalk)"
-    },
-    "translation" : {
-      "value" : "Vertalingen",
-      "message" : "We hebben jouw hulp nodig om CommaFeed te vertalen.",
-      "link" : "Bekijk hier hoe je kunt bijdragen met vertalingen."
-    },
-    "announcements" : "Aankondigingen",
-    "shortcuts" : {
-      "mouse_middleclick" : "middelste muisknop",
-      "open_next_entry" : "open het volgende artikel",
-      "open_previous_entry" : "open het vorige artikel",
-      "spacebar" : "spatie/shift+spatie",
-      "move_page_down_up" : "beweegt de pagina naar onder/boven",
-      "focus_next_entry" : "plaats focus op volgend artikel zonder het te openen",
-      "focus_previous_entry" : "plaats focus op vorig artikel zonder het te openen",
-      "open_next_feed" : "open volgende feed of categorie",
-      "open_previous_feed" : "open vorige feed of categorie",
-      "open_close_current_entry" : "open/sluit het huidige artikel",
-      "open_current_entry_in_new_window" : "open het huidige artikel in een nieuw venster",
-      "open_current_entry_in_new_window_background" : "open huidig artikel in een nieuw venster op de achtergrond",
-      "star_unstar" : "voeg artikel toe aan/verwijder uit favorieten",
-      "mark_current_entry" : "markeer huidig artikel als gelezen/ongelezen",
-      "mark_all_as_read" : "markeer alle artikelen als gelezen",
-      "open_in_new_tab_mark_as_read" : "open artikel in een nieuw tabblad en markeer als gelezen",
-      "fullscreen" : "schakel tussen fullscreen weergave",
-      "font_size" : "vergroot/verklein tekst in huidig artikel",
-      "go_to_all" : "ga naar de ALLES-weergave",
-      "go_to_starred" : "ga naar de Favorieten-weergave",
-      "feed_search" : "navigeer naar een abonnement door diens naam in te typen"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/nn.js
+++ b/commafeed-client/src/main/app/i18n/nn.js
@@ -1,180 +0,0 @@
-{
-  "global" : {
-    "save" : "Lagre",
-    "cancel" : "Avbryt",
-    "delete" : "Slett",
-    "required" : "Påkravd",
-    "download" : "Last ned",
-    "link" : "Lenkje",
-    "bookmark" : "Bokmerke",
-    "close" : "Lukk",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "Abonner",
-    "import" : "Importer",
-    "new_category" : "Ny kategori",
-    "all" : "Alle",
-    "starred" : "Merka artiklar"
-  },
-  "subscribe" : {
-    "feed_url" : "URL for abonnement",
-    "feed_name" : "Abonnementsnamn",
-    "category" : "Kategori"
-  },
-  "import" : {
-    "google_reader_prefix" : "La meg importere abonnementa dine frå",
-    "google_reader_suffix" : "-brukaren din.",
-    "google_download" : "Alternativt, last opp di eiga subscriptions.xml-fil.",
-    "google_download_link" : "Last ned herifrå.",
-    "xml_file" : "OPML-fil"
-  },
-  "new_category" : {
-    "name" : "Namn",
-    "parent" : "Overordna"
-  },
-  "toolbar" : {
-    "unread" : "Ulesne",
-    "all" : "Alle",
-    "previous_entry" : "Førre artikkel",
-    "next_entry" : "Neste artikkel",
-    "refresh" : "Oppdater",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "Sorter etter dato ny/gamal",
-    "titles_only" : "Berre titlar",
-    "expanded_view" : "Utvida visning",
-    "mark_all_as_read" : "Merk alle som lesne",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day" : "Artiklar eldre enn éin dag",
-    "mark_all_older_week" : "Artiklar eldre enn éi veke",
-    "mark_all_older_two_weeks" : "Artiklar eldre enn to veker",
-    "settings" : "Innstillingar",
-    "profile" : "Profil",
-    "admin" : "Admin",
-    "about" : "Om",
-    "logout" : "Logg ut",
-    "donate" : "Doner"
-  },
-  "view" : {
-    "entry_source" : "from  ",
-    "entry_author" : "av ",
-    "error_while_loading_feed" : "Feil under lasting av artikkel",
-    "keep_unread" : "Behold som ulesen",
-    "no_unread_items" : "har ingen ulesne artiklar.",
-    "mark_up_to_here" : "Mark as read up to here ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
-  },
-  "feedsearch" : {
-    "hint" : "Skriv inn eit abonnement...",
-    "help" : "Bruk entertasten for å velje og piltastane for å navigere.",
-    "result_prefix" : "Dine abonnement:"
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Generelt",
-      "language" : "Språk",
-      "language_contribute" : "Bidra med omsetjingar",
-      "show_unread" : "Vis abonnement og kategoriar utan nye artiklar",
-      "social_buttons" : "Vis delingsknappar",
-      "scroll_marks" : "I utvida visning, merk artiklar som lesne når du blar deg forbi dei."
-    },
-    "appearance" : "Utsjånad",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Drakt",
-    "submit_your_theme" : "Legg til eiga drakt",
-    "custom_css" : "Skreddarsydd CSS"
-  },
-  "details" : {
-    "feed_details" : "Abonnementsdetaljar",
-    "url" : "URL",
-    "website" : "Website ",
-    "name" : "Namn",
-    "category" : "Kategori",
-    "position" : "Posisjon",
-    "last_refresh" : "Siste oppdatering",
-    "message" : "Last refresh message ",
-    "next_refresh" : "Neste oppdatering",
-    "queued_for_refresh" : "I kø for oppdatering",
-    "feed_url" : "URL for abonnement",
-    "generate_api_key_first" : "Generer ein API-nykel under profilinnstillingar fyrst.",
-    "unsubscribe" : "Avslutt abonnement",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details" : "Kategoridetaljar",
-    "tag_details" : "Tag details ",
-    "parent_category" : "Overordna kategori"
-  },
-  "profile" : {
-    "user_name" : "Brukarnamn",
-    "email" : "E-post",
-    "change_password" : "Endre passord",
-    "confirm_password" : "Stadfest passord",
-    "minimum_8_chars" : "Minimum 8 teikn",
-    "passwords_do_not_match" : "Passorda er usamde",
-    "api_key" : "API-nykel",
-    "api_key_not_generated" : "Har ikkje vorte generert",
-    "generate_new_api_key" : "Generer ny API-nykel",
-    "generate_new_api_key_info" : "Endring av passord vil generere ein ny API-nykel",
-    "opml_export" : "OPML-eksport",
-    "delete_account" : "Slett brukar",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed  er bygd på toppen av JAX-RS og AngularJS. Difor er REST API tilgjengeleg.",
-      "link_to_documentation" : "Lenkje til dokumentasjon."
-    },
-    "keyboard_shortcuts" : "Hurtigtastar",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed er eit prosjekt med open kjeldekode. Kjeldekoden er tilgjengeleg på ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Viss du finn ein feil eller eit problem, rapporter det på ",
-    "line2_suffix" : " prosjektsida.",
-    "line3" : "Viss du likar dette prosjektet, kan du vurdere ein donasjon for å støtte utviklaren, og bidra med å dekkje kostnadane til å drifte nettstaden.",
-    "line4" : "For dei som føretrekkjer bitcoin, her er adressa",
-    "goodies" : {
-      "value" : "Godsakar",
-      "android_app" : "Android app ",
-      "subscribe_url" : "Abonner URL",
-      "chrome_extension" : "Chrome-utviding",
-      "firefox_extension" : "Firefox-utviding",
-      "opera_extension" : "Opera-utviding",
-      "subscribe_bookmarklet" : "Nytt abonnement-bokmerkjeprogram (klikk)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Neste ulesne artikkel-bokmerkeprogram (dra til bokmerkemenyen)"
-    },
-    "translation" : {
-      "value" : "Omsetjing",
-      "message" : "Vi behøver di hjelp til å omsetje CommaFeed.",
-      "link" : "Sjå korleis du kan hjelpe til med omsetjingar."
-    },
-    "announcements" : "Kunngjøringer",
-    "shortcuts" : {
-      "mouse_middleclick" : "midtre museknapp/musehjulet",
-      "open_next_entry" : "opne neste artikkel",
-      "open_previous_entry" : "opne førre artikkel",
-      "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
-      "focus_next_entry" : "sett fokus på neste artikkel utan å opne han",
-      "focus_previous_entry" : "sett fokus på forrige artikkel utan å opne han",
-      "open_next_feed" : "opne neste abonnement eller kategori",
-      "open_previous_feed" : "opne førre abonnement eller kategori",
-      "open_close_current_entry" : "opne/lukke gjeldande artikkel",
-      "open_current_entry_in_new_window" : "opne gjeldande artikkel i eit nytt vindauge",
-      "open_current_entry_in_new_window_background" : "opne gjeldande artikkel i eit nytt bakgrunnsvindauge",
-      "star_unstar" : "legg til stjerne/fjern stjerne frå gjeldande artikkel",
-      "mark_current_entry" : "merk gjeldande artikkel som lesen/ulesen",
-      "mark_all_as_read" : "merk alle artiklar som lesne",
-      "open_in_new_tab_mark_as_read" : "opne artikkel i ny fane og merk som lesen",
-      "fullscreen" : "toggle full screen mode ",
-      "font_size" : "increase/decrease font size of the current entry ",
-      "go_to_all" : "go to the All view ",
-      "go_to_starred" : "go to the Starred view ",
-      "feed_search" : "naviger til eit abonnement ved å skrive inn abonnementsnamnet"
-    }
-  }
-}
--- a/commafeed-client/src/main/app/i18n/pl.js
+++ b/commafeed-client/src/main/app/i18n/pl.js
@@ -1,182 +0,0 @@
-{
-  "global" : {
-    "save" : "Zachowaj",
-    "cancel" : "Anuluj",
-    "delete" : "Usuń",
-    "required" : "Wymagane",
-    "download" : "Pobierz",
-    "link" : "Odnośnik",
-    "bookmark" : "Zakładka",
-    "close" : "Zamknij",
-    "tags" : "Tags "
-  },
-  "tree" : {
-    "subscribe" : "Subskrybuj",
-    "import" : "Importuj",
-    "new_category" : "Nowa kategoria",
-    "all" : "Wszystkie elementy",
-    "starred" : "Elementy oznaczone gwiazdką"
-  },
-  "subscribe" : {
-    "feed_url" : "URL kanału",
-    "feed_name" : "Nazwa kanału",
-    "category" : "Kategoria"
-  },
-  "import" : {
-    "google_reader_prefix" : "Pozwól mi zaimportować kanały z twojego ",
-    "google_reader_suffix" : " konta",
-    "google_download" : "albo, wrzuć pilk subskrypcje.xml",
-    "google_download_link" : "Ściągnij go stąd.",
-    "xml_file" : "Plik OPML"
-  },
-  "new_category" : {
-    "name" : "Nazwa",
-    "parent" : "Kategoria nadrzędna"
-  },
-  "toolbar" : {
-    "unread" : "Nieprzeczytane",
-    "all" : "Wszystkie",
-    "previous_entry" : "Poprzedni element",
-    "next_entry" : "Następny element",
-    "refresh" : "Odswież",
-    "refresh_all" : "Odśwież teraz wszystkie kanały ",
-    "sort_by_asc_desc" : "Sortuj od najnowszego/najstarszego",
-    "titles_only" : "Widok listy",
-    "expanded_view" : "Widok rozwinięty",
-    "mark_all_as_read" : "Oznacz wszystko jako przeczytane",
-    "mark_all_older_12_hours" : "Elementy starsze niż 12 godzin ",
-    "mark_all_older_day" : "Elementy starsze niż dzień",
-    "mark_all_older_week" : "Elementy starsze niż tydzień",
-    "mark_all_older_two_weeks" : "Elementy starsze niż dwa tygodnie",
-    "settings" : "Ustawienia",
-    "profile" : "Profil",
-    "admin" : "Admin",
-    "about" : "O CommaFeed",
-    "logout" : "Wyloguj",
-    "donate" : "Wspomóż"
-  },
-  "view" : {
-    "entry_source" : "from  ",
-    "entry_author" : "przez",
-    "error_while_loading_feed" : "Wystąpił błąd podczas ładowania tego kanału.",
-    "keep_unread" : "Pozostaw nieprzeczytane",
-    "no_unread_items" : " nie ma nieprzeczytanych elementów.",
-    "mark_up_to_here" : "Oznacz jako przeczytane do tego elementu ",
-    "search_for" : "wyszukiwanie dla:  ",
-    "no_search_results" : "Nie znaleziono wyników dla wyszukiwanej frazy "
-  },
-  "feedsearch" : {
-    "hint" : "Wpisz subskrybcję...",
-    "help" : "Użyj klawisza Enter do zaznaczenia a strzałek do nawigacji. ",
-    "result_prefix" : "Twoje subskrybcje: "
-  },
-  "settings" : {
-    "general" : {
-      "value" : "Ogólne",
-      "language" : "Język",
-      "language_contribute" : "Pomóż w tłumaczeniu",
-      "show_unread" : "Pokaż kanały i kategorie bez nieprzeczytanych elementów",
-      "social_buttons" : "Pokaż przyciski udostępniania",
-      "scroll_marks" : "W widoku rozwiniętym przewijanie oznacza elementy jako przeczytane"
-    },
-    "appearance" : "Wygląd",
-    "scroll_speed" : "Prędkość przewijania podczas nawigowania pomiędzy wpisami (w milisekundach) ",
-    "scroll_speed_help" : "ustaw na 0 by wyłączyć ",
-    "theme" : "Motyw",
-    "submit_your_theme" : "Wyślij swój motyw",
-    "custom_css" : "Własny styl CSS"
-  },
-  "details" : {
-    "feed_details" : "Szczegóły kanału",
-    "url" : "URL",
-    "website" : "Strona internetowa",
-    "name" : "Nazwa",
-    "category" : "Kategoria",
-    "position" : "Pozycja",
-    "last_refresh" : "Ostatnio odświeżony",
-    "message" : "Ostatnia odpowiedź odświeżenia",
-    "next_refresh" : "Następne odświeżenie",
-    "queued_for_refresh" : "W kolejce do odświeżenia",
-    "feed_url" : "URL kanału",
-    "filtering_expression" : "Wyrażenie filtrujące",
-    "filtering_expression_help" : "Ustaw puste, by wyłączyć. W przeciwnym razie wyrażenie zwracające 'true' lub 'false'. Dla 'false' nowe elementy w kanale będą autmatycznie \noznaczane jako przeczytane. Dostępne zmienne to: 'title', 'content', 'url' 'author' and 'categories'. Ich zawartość jest konwertowana na małe litery \npodczas porówynywania tekstu. Przykład: url.contains('youtube') albo (author eq 'athou' and title.contains('github') \nPełna dostępna składnia jest dostępna pod <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>tym</a> adresem.",
-    "generate_api_key_first" : "Najpierw wygeneruj klucz API w swoim profilu.",
-    "unsubscribe" : "Cofnij subskrypcje",
-    "unsubscribe_confirmation" : "Czy na pewno chcesz cofnąć sybskrypcję tego kanału? ",
-    "delete_category_confirmation" : "Czy na pewno chcesz usunąć tą kategorię? ",
-    "category_details" : "Szczegóły kategorii",
-    "tag_details" : "Szczegóły tagu ",
-    "parent_category" : "Kategoria nadrzędna"
-  },
-  "profile" : {
-    "user_name" : "Nazwa użytkownika",
-    "email" : "E-mail",
-    "change_password" : "Zmień hasło",
-    "confirm_password" : "Potwierdź hasło",
-    "minimum_8_chars" : "Minimum 8 znaków",
-    "passwords_do_not_match" : "Hasła nie pasują do siebie",
-    "api_key" : "Klucz API",
-    "api_key_not_generated" : "Jeszcze niewygenerowany",
-    "generate_new_api_key" : "Wygeneruj nowy klucz API",
-    "generate_new_api_key_info" : "Zmiana hasła spowoduje wygenerowanie nowego klucza API",
-    "opml_export" : "Eksportuj do pliku OPML",
-    "delete_account" : "Usuń konto",
-    "delete_account_confirmation" : "Na pewno usunąć to konto? Nie można tego cofnąć! "
-  },
-  "about" : {
-    "rest_api" : {
-      "value" : "REST API",
-      "line1" : "CommaFeed jest oparty o JAX-RS i AngularJS. Dzięki temu REST API jest dostępne.",
-      "link_to_documentation" : "Link do dokumentacji."
-    },
-    "keyboard_shortcuts" : "Skróty klawiszowe",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed jest projektem Open-Source. Źródła są dostępne na ",
-    "line1_suffix" : ".",
-    "line2_prefix" : "Jeśli napotkasz jakiś problem, proszę zgłoś go na stronie ",
-    "line2_suffix" : " projektu.",
-    "line3" : "Jeśli podoba ci się ten projekt, rozważ wsparcie autora i pomóż w utrzymaniu tej strony.",
-    "line4" : "Jeśli wolisz bitcoin, użyj tego adresu",
-    "goodies" : {
-      "value" : "Dodatki",
-      "android_app" : "Aplikacja na Androida",
-      "subscribe_url" : "Subskrybuj URL",
-      "chrome_extension" : "Dodatek do Chrome",
-      "firefox_extension" : "Dodatek do Firefoxa",
-      "opera_extension" : "Dodatek do Opery",
-      "subscribe_bookmarklet" : "Dodaj subskrybcje jako skryptozakładkę (kliknij)",
-      "subscribe_bookmarklet_asc" : "Najpierw najstarsze ",
-      "subscribe_bookmarklet_desc" : "Najpierw najnowsze ",
-      "next_unread_bookmarklet" : "Następny nieprzeczytany element jako skryptozakładka (przeciągnij na pasek zakładek)"
-    },
-    "translation" : {
-      "value" : "Tłumaczenia",
-      "message" : "Potrzebujemy pomocy w tłumaczeniu CommaFeed.",
-      "link" : "Zobacz jak możesz pomóc."
-    },
-    "announcements" : "Ogłoszenia",
-    "shortcuts" : {
-      "mouse_middleclick" : "środkowy przycisk myszy",
-      "open_next_entry" : "otwórz następny element",
-      "open_previous_entry" : "otwórz poprzedni element",
-      "spacebar" : "spacja/shift+spacja",
-      "move_page_down_up" : "przesuwa stronę w górę/dół",
-      "focus_next_entry" : "wyróżnij następny element bez otwierania go",
-      "focus_previous_entry" : "wyróżnij poprzedni element bez otwierania go",
-      "open_next_feed" : "otwórz następny kanał lub kategorię",
-      "open_previous_feed" : "otwórz poprzedni kanał lub kategorię",
-      "open_close_current_entry" : "otwórz/zamknij bieżący element",
-      "open_current_entry_in_new_window" : "otwórz bieżący element w nowym oknie",
-      "open_current_entry_in_new_window_background" : "otwórz bieżący element w nowym oknie w tle",
-      "star_unstar" : "oznacz/odznacz gwiazdką bieżący element",
-      "mark_current_entry" : "oznacz jako przeczytany/nieprzeczytany obecny element",
-      "mark_all_as_read" : "oznacz wszystko jako przeczytane",
-      "open_in_new_tab_mark_as_read" : "otwórz w nowej zakładce i oznacz jako przeczytane",
-      "fullscreen" : "przełącz tryb pełnoekranowy",
-      "font_size" : "zmień wielkość czcionki",
-      "go_to_all" : "przejdź do widoku Wszystkich elementów ",
-      "go_to_starred" : "przejdź do Elementów oznaczonych gwiazdką ",
-      "feed_search" : "przejdź do subskrybcji wpisując jej nazwę"
-    }
-  }
-}
--- a/Show More
+++ b/Show More