diff --git a/src/packages/default/CoreWM/libs.js b/src/packages/default/CoreWM/libs.js
index 4fd2f1a6bb..02709f1b84 100644
--- a/src/packages/default/CoreWM/libs.js
+++ b/src/packages/default/CoreWM/libs.js
@@ -48,6 +48,16 @@
'Other' : 'Andre'
},
de_DE : {
+ 'Development' : 'Entwicklung',
+ 'Education' : 'Bildung',
+ 'Games' : 'Spiele',
+ 'Graphics' : 'Grafik',
+ 'Network' : 'Netzwerk',
+ 'Multimedia' : 'Multimedia',
+ 'Office' : 'Büro',
+ 'System' : 'System',
+ 'Utilities' : 'Zubehör',
+ 'Other' : 'Andere'
},
fr_FR : {
},
diff --git a/src/packages/default/CoreWM/main.js b/src/packages/default/CoreWM/main.js
index a6b44f43df..97dd301d9c 100644
--- a/src/packages/default/CoreWM/main.js
+++ b/src/packages/default/CoreWM/main.js
@@ -46,6 +46,12 @@
'An error occured while creating PanelItem: {0}' : 'En feil oppstod under lasting av PanelItem: {0}'
},
de_DE : {
+ 'Killing this process will stop things from working!' : 'Das Beenden dieses Prozesses wird Konsequenzen haben!',
+ 'Open settings' : 'Einstellungen öffnen',
+ 'Your panel has no items. Go to settings to reset default or modify manually\n(This error may occur after upgrades of OS.js)' : 'Ihr Panel enthält keine Items. Öffnen Sie die Einstellungen um die Panel-Einstellungen zurückzusetzen oder manuell zu ändern (Dieser Fehler kann nach einem Upgrade von OS.js entstehen)',
+ 'Create shortcut' : 'Verknüpfung erstellen',
+ 'Set as wallpaper' : 'Als Hintergrund verwenden',
+ 'An error occured while creating PanelItem: {0}' : 'Während des Erstellens eines Panel-Items ist folgender Fehler aufgetreten: {0}'
},
fr_FR : {
},
diff --git a/src/packages/default/Draw/libs.js b/src/packages/default/Draw/libs.js
index 968430fb14..c8bc618a6b 100644
--- a/src/packages/default/Draw/libs.js
+++ b/src/packages/default/Draw/libs.js
@@ -60,6 +60,28 @@
'Simple Blur' : 'Simpel Klatte (Blur)'
},
de_DE : {
+ 'Pointer' : 'Zeiger',
+ 'Move active layer' : 'Bewege aktive Ebene',
+ 'Picket' : 'Farbauswahl',
+ 'LMB: set fg color, RMB: set bg color' : 'LMB: sett fg farge, RMB: sett bg farge',
+ 'Bucket' : 'Farbfüller',
+ 'LMB: fill with fg color, RMB: fill with bg color' : 'LMB: fyll med fg farge, RMB: fyll med bg farge',
+ 'Pencil' : 'Stift',
+ 'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB: Tegn med fg/bg farge',
+ 'Path' : 'Pfad',
+ 'Square/Rectangle' : 'Quadrat/Rechteck',
+ 'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: Zeichnen mit fb/bg Farbe, SHIFT: Rechteck zeichnen',
+ 'Circle/Ellipse' : 'Kreis/Ellipse',
+ 'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'LMB/RMB: Zeichnen mit fb/bg Farbe, SHIFT: Ellipse zeichnen',
+ 'Radius' : 'Radius',
+ 'Iterations' : 'Iterationen',
+
+ 'Blur' : 'Weichzeichner (Blur)',
+ 'Noise' : 'Rauschen',
+ 'Invert colors' : 'Farben invertieren',
+ 'Grayscale' : 'Graustufen',
+ 'Sharpen' : 'Schärfen',
+ 'Simple Blur' : 'Einfacher Weichzeichner (Blur)'
},
fr_FR : {
},
diff --git a/src/packages/default/Draw/main.js b/src/packages/default/Draw/main.js
index 1e620cc7a2..39c99f9ea6 100644
--- a/src/packages/default/Draw/main.js
+++ b/src/packages/default/Draw/main.js
@@ -95,6 +95,48 @@
'Simple Blur' : 'Simpel Klatte (Blur)'
},
de_DE : {
+ 'Toggle tools toolbar' : 'Tools Toolbar',
+ 'Toggle layers toolbar' : 'Ebenen Toolbar',
+ 'Layer' : 'Ebene',
+ 'Effect' : 'Effekt',
+ 'Flip Horizontally' : 'Horizontal spiegeln',
+ 'Flip Vertically' : 'Vertikal spiegeln',
+ 'Foreground' : 'Vordergrund',
+ 'Bakgrunn' : 'Hintergrund',
+ 'Foreground (Fill) Color' : 'Vordergrund (Füll-) Farbe',
+ 'Background (Stroke) Color' : 'Hintergrund (Streich-) Farbe',
+ 'Line Join' : 'Linienverbindung',
+ 'Line Width' : 'Linienbreite',
+ 'Toggle Stroke' : 'Streichen',
+ 'Enable stroke' : 'Streichen aktivieren',
+ 'Round' : 'Runde',
+ 'Miter' : 'Live',
+ 'Bevel' : 'Schräge',
+ 'Stroked' : 'Gestrichen',
+ 'No stroke' : 'Nicht gestrichen',
+
+ 'Pointer' : 'Zeiger',
+ 'Move active layer' : 'Bewege aktive Ebene',
+
+ 'Picker' : 'Wähler',
+ 'LMB: set fg color, RMB: set gb color' : 'LMB: wähle Vordergrundfarbe, RMB: wähle Hintergrundfarbe',
+
+ 'Pencil' : 'Stift',
+ 'LMB/RMB: Draw with fg/bg color' : 'LMB/RMB: Zeichnen mit fg/bg Farbe',
+ 'Path' : 'Pfad',
+
+ 'Square/Rectangle' : 'Quadrat/Rechteck',
+ 'LMB/RMB: Draw with fg/bg color, SHIFT: Draw rectangle' : 'LMB/RMB: Zeichnen mit fb/bg Farbe, SHIFT: Rechteck zeichnen',
+
+ 'Circle/Ellipse' : 'Kreis/Ellipse',
+ 'LMB/RMB: Draw with fg/bg color, SHIFT: Draw ellipse' : 'LMB/RMB: Zeichnen mit fb/bg Farbe, SHIFT: Ellipse zeichnen',
+
+ 'Blur' : 'Weichzeichner (Blur)',
+ 'Noise' : 'Rauschen',
+ 'Invert colors' : 'Farben invertieren',
+ 'Grayscale' : 'Graustufen',
+ 'Sharpen' : 'Schärfen',
+ 'Simple Blur' : 'Einfacher Weichzeichner (Blur)'
},
fr_FR : {
},
@@ -349,7 +391,7 @@
self.currentStyle[type] = hex;
if ( toolBar ) {
var className = (type == "fg") ? "foregroundColor" : "backgroundColor";
- toolBar.getItem(className)._element.getElementsByClassName('Color')[0].style.backgroundColor = hex;
+ toolBar.getItem(className).getElementsByClassName('Color')[0].style.backgroundColor = hex;
}
};
@@ -357,14 +399,14 @@
var txt = {round: "Round", miter: "Miter", bevel: "Bevel"};
self.currentStyle.lineJoin = type;
if ( toolBar ) {
- toolBar.getItem('lineJoin')._element.getElementsByClassName('LineJoin')[0].innerHTML = _(txt[type]);
+ toolBar.getItem('lineJoin').getElementsByClassName('LineJoin')[0].innerHTML = _(txt[type]);
}
};
var _selectLineWidth = function(width) {
self.currentStyle.lineWidth = width;
if ( toolBar ) {
- toolBar.getItem('lineWidth')._element.getElementsByClassName('LineWidth')[0].innerHTML = width;
+ toolBar.getItem('lineWidth').getElementsByClassName('LineWidth')[0].innerHTML = width;
}
};
@@ -375,7 +417,7 @@
self.currentStyle.stroke = !self.currentStyle.stroke;
}
if ( toolBar ) {
- toolBar.getItem('enableStroke')._element.getElementsByClassName('EnableStroke')[0].innerHTML = _(self.currentStyle.stroke ? "Stroked" : "No stroke");
+ toolBar.getItem('enableStroke').getElementsByClassName('EnableStroke')[0].innerHTML = _(self.currentStyle.stroke ? "Stroked" : "No stroke");
}
};
@@ -916,7 +958,7 @@
var toolBar = this._getGUIElement('ApplicationDrawToolBar');
if ( toolBar ) {
var className = (type == "fg") ? "foregroundColor" : "backgroundColor";
- toolBar.getItem(className)._element.getElementsByClassName('Color')[0].style.backgroundColor = val;
+ toolBar.getItem(className).getElementsByClassName('Color')[0].style.backgroundColor = val;
}
this._focus();
diff --git a/src/packages/default/FileManager/main.js b/src/packages/default/FileManager/main.js
index 8fd8ec355d..ffd4c296a1 100644
--- a/src/packages/default/FileManager/main.js
+++ b/src/packages/default/FileManager/main.js
@@ -47,6 +47,15 @@
"Delete {0} ?" : "Slette {0} ?"
},
de_DE : {
+ 'Show Sidebar' : 'Seitenleiste anzeigen',
+ 'Copying file...' : 'Kopiere Datei...',
+ "Copying {0} to {1}" : "Kopiere {0} nach {1}",
+ "Showing {0} item(s), {1}" : "Viser {0} objekt(er), {1}",
+ "Refreshing..." : "Aktualisiere...",
+ "Loading..." : "Lade...",
+ "Create a new directory in {0}" : "Erstelle ein neues Verzeichnis in {0}",
+ "Rename {0}" : "{0} umbenennen",
+ "Delete {0} ?" : "{0} löschen?"
},
fr_FR : {
},
diff --git a/src/packages/default/MusicPlayer/main.js b/src/packages/default/MusicPlayer/main.js
index 80019e6312..37079cd402 100644
--- a/src/packages/default/MusicPlayer/main.js
+++ b/src/packages/default/MusicPlayer/main.js
@@ -51,6 +51,19 @@
'The audio type is not supported: {0}' : 'Denne lyd-typen er ikke støttet: {0}',
},
de_DE : {
+ 'Playlist' : 'Wiedergabeliste',
+ 'Playback aborted' : 'Wiedergabe abgebrochen',
+ 'Network or communication error' : 'Netzwerk Kommunikationsfehler',
+ 'Decoding failed. Corruption or unsupported media' : 'Dekodierung gescheitert. Fehlerhafte oder nicht unterstützte Datei',
+ 'Media source not supported' : 'Medienquelle nicht unterstützt',
+ 'Failed to play file' : 'Wiedergabe der Datei gescheitert',
+ 'Artist' : 'Künstler',
+ 'Album' : 'Album',
+ 'Track' : 'Titel',
+ 'Time' : 'Zeit',
+ 'Media information query failed' : 'Media Informationssuche gescheitert',
+ 'seek unavailable in format' : 'Spulen im Format nicht verfügbar',
+ 'The audio type is not supported: {0}' : 'Der Audio-Typ {0} ist nicht unterstützt',
},
fr_FR : {
},
diff --git a/src/packages/default/Settings/main.js b/src/packages/default/Settings/main.js
index 73a9f50c28..c26cf30ddc 100644
--- a/src/packages/default/Settings/main.js
+++ b/src/packages/default/Settings/main.js
@@ -67,6 +67,36 @@
'Other' : 'Andre'
},
de_DE : {
+ 'Theme and Background' : 'Thema und Hintergrund',
+ 'Desktop Settings' : 'Arbeitsoberflächen Einstellungen',
+ 'Background Type' : 'Hintergrundtyp',
+ 'Image (Repeat)' : 'Bild (Wiederholend)',
+ 'Image (Centered)' : 'Bild (Zentriert)',
+ 'Image (Fill)' : 'Bild (Ausgefüllt)',
+ 'Image (Streched)' : 'Bild (Gestreckt)',
+ 'Desktop Margin ({0}px)' : 'Arbeitsoberflächen Margin ({0}px)',
+ 'Panel Position' : 'Panel Position',
+ 'Panel Ontop ?' : 'Panel im Vordergrund?',
+ 'Panel Items' : 'Panel Items',
+ 'Use animations ?' : 'Animationen verwenden?',
+ 'Language (requires restart)' : 'Sprache (benötigt Neustart)',
+ 'Open Panel Settings' : 'Öffne Panel-Einstellungen',
+ 'Enable sounds' : 'Aktiviere Sounds',
+ 'Enable Window Switcher' : 'Aktiviere Fensterwechsler',
+ 'Enable Hotkeys' : 'Aktiviere Hotkeys',
+ 'Enable iconview' : 'Aktiviere Icon-Ansicht',
+ 'Remove shortcut' : 'Verknüpfung entfernen',
+
+ 'Development' : 'Entwicklung',
+ 'Education' : 'Bildung',
+ 'Games' : 'Spile',
+ 'Graphics' : 'Grafik',
+ 'Network' : 'Netzwerk',
+ 'Multimedia' : 'Multimedia',
+ 'Office' : 'Büro',
+ 'System' : 'System',
+ 'Utilities' : 'Zubehör',
+ 'Other' : 'Andere'
},
fr_FR : {
},
diff --git a/src/packages/default/Settings/package.json b/src/packages/default/Settings/package.json
index 75491b0d3f..047f684bca 100644
--- a/src/packages/default/Settings/package.json
+++ b/src/packages/default/Settings/package.json
@@ -3,10 +3,12 @@
"name": "OS.js Settings",
"names": {
"no_NO": "OS.js Instillinger",
+ "de_DE": "OS.js Einstellungen",
"ru_RU": "OS.js Настройки"
},
"descriptions": {
"no_NO": "OS.js Instillinger",
+ "de_DE": "OS.js Einstellungen",
"ru_RU": "OS.js Настройки"
},
"mime": null,
diff --git a/src/packages/default/Textpad/package.json b/src/packages/default/Textpad/package.json
index e576f648c6..20cda6497e 100644
--- a/src/packages/default/Textpad/package.json
+++ b/src/packages/default/Textpad/package.json
@@ -12,7 +12,7 @@
"de_DE": "Einfacher Texteditor",
"ru_RU": "Простой текстовый редактор"
},
- "mime": ["^text", "inode\\/x\\-empty", "application\\/x\\-empty", "application\\/x\\-python", "application\\/javascript", "application\\/json"],
+ "mime": ["^text", "inode\\/x\\-empty", "application\\/x\\-python", "application\\/javascript", "application\\/json"],
"category": "utilities",
"icon": "apps/accessories-text-editor.png",
"preload": [
diff --git a/src/packages/default/Writer/main.js b/src/packages/default/Writer/main.js
index bd803ac3f9..beb71c3ed4 100644
--- a/src/packages/default/Writer/main.js
+++ b/src/packages/default/Writer/main.js
@@ -27,7 +27,7 @@
* @author Anders Evenrud
* @licence Simplified BSD License
*/
-(function(Application, Window, GUI, Dialogs, VFS, Utils) {
+(function(Application, Window, GUI, Dialogs, VFS) {
'use strict';
/////////////////////////////////////////////////////////////////////////////
@@ -41,6 +41,7 @@
'Insert URL' : 'Sett inn URL'
},
de_DE : {
+ 'Insert URL' : 'URL einfügen'
},
fr_FR : {
},
@@ -86,7 +87,6 @@
// Create window contents here
var mb = this._addGUIElement(new GUI.MenuBar('WriterMenuBar'), root);
var tb = this._addGUIElement(new GUI.ToolBar('WriterToolBar'), root);
- var rt;
var _createIcon = function(i) {
return OSjs.API.getThemeResource(i, 'icon');
@@ -106,29 +106,23 @@
}], self);
};
- var _setFont = function(name, size, nocommand) {
- if ( !nocommand ) {
- self.command('fontName', name);
- self.command('fontSize', size);
- }
- self.font = name || self.font;
- self.fontSize = size || self.fontSize;
- tb.getItem('font')._element.getElementsByTagName('span')[0].style.fontFamily = self.font;
- tb.getItem('font')._element.getElementsByTagName('span')[0].innerHTML = self.font + ' (' + self.fontSize.toString() + ')';
+ var _setFont = function(name, size) {
+ self.command('fontName', name);
+ self.command('fontSize', size);
+ self.font = name;
+ self.fontSize = size;
+ tb.getItem('font').getElementsByTagName('span')[0].style.fontFamily = name;
+ tb.getItem('font').getElementsByTagName('span')[0].innerHTML = name + ' (' + size + ')';
};
- var _setTextColor = function(hex, nocommand) {
- if ( !nocommand ) {
- self.command('foreColor', hex);
- }
+ var _setTextColor = function(hex) {
+ self.command('foreColor', hex);
self.textColor = hex;
- tb.getItem('textColor')._element.getElementsByTagName('span')[0].style.color = hex;
+ tb.getItem('textColor').getElementsByTagName('span')[0].style.color = hex;
};
- var _setBackColor = function(hex, nocommand) {
- if ( !nocommand ) {
- self.command('hiliteColor', hex);
- }
+ var _setBackColor = function(hex) {
+ self.command('hiliteColor', hex);
self.backColor = hex;
- tb.getItem('backColor')._element.getElementsByTagName('span')[0].style.backgroundColor = hex;
+ tb.getItem('backColor').getElementsByTagName('span')[0].style.backgroundColor = hex;
};
var _action = function(ev, el, name, item) {
@@ -157,64 +151,6 @@
}
};
- function _updateToolbar() {
- if ( rt ) {
- var styles = {
- fontName: rt.commandValue('fontName').replace(/^\'/, '').replace(/\'$/, ''),
- fontSize: rt.commandValue('fontSize'),
- foreColor: rt.commandValue('foreColor'),
- hiliteColor: rt.commandValue('hiliteColor'),
- justifyLeft: rt.commandValue('justifyLeft'),
- justifyCenter: rt.commandValue('justifyCenter'),
- justifyRight: rt.commandValue('justifyRight'),
- bold: rt.commandValue('bold'),
- italic: rt.commandValue('italic'),
- underline: rt.commandValue('underline'),
- strikeThrough: rt.commandValue('strikeThrough')
- };
-
- if ( !styles.foreColor.match(/^\#/) ) {
- var tmp = styles.foreColor.replace(/\s/g, '').replace(/^rgb\(/, '').replace(/\)$/, '').split(',');
- if ( tmp.length > 2 ) {
- styles.foreColor = Utils.convertToHEX.apply(Utils, tmp);
- } else {
- styles.foreColor = self.textColor;
- }
- }
-
- if ( !styles.hiliteColor.match(/^\#/) ) {
- var tmp = styles.hiliteColor.replace(/\s/g, '').replace(/^rgb\(/, '').replace(/\)$/, '').split(',');
- if ( tmp.length > 2 ) {
- styles.hiliteColor = Utils.convertToHEX.apply(Utils, tmp);
- } else {
- styles.hiliteColor = self.backColor;
- }
- }
-
- _setBackColor(styles.hiliteColor, true);
- _setTextColor(styles.foreColor, true);
- _setFont(styles.fontName, styles.fontSize, true);
-
- /*
- if ( tb ) {
- Utils.$removeClass(tb.getItem('justifyLeft')._element, 'Active');
- Utils.$removeClass(tb.getItem('justifyCenter')._element, 'Active');
- Utils.$removeClass(tb.getItem('justifyRight')._element, 'Active');
-
- if ( styles.justifyLeft ) {
- Utils.$addClass(tb.getItem('justifyLeft')._element, 'Active');
- }
- if ( styles.justifyCenter ) {
- Utils.$addClass(tb.getItem('justifyCenter')._element, 'Active');
- }
- if ( styles.justifyRight ) {
- Utils.$addClass(tb.getItem('justifyRight')._element, 'Active');
- }
- }
- */
- }
- }
-
tb.addItem('bold', {toggleable: true, title: OSjs.API._('LBL_BOLD'), onClick: _action, icon: _createIcon('actions/format-text-bold.png')});
tb.addItem('italic', {toggleable: true, title: OSjs.API._('LBL_ITALIC'), onClick: _action, icon: _createIcon('actions/format-text-italic.png')});
tb.addItem('underline', {toggleable: true, title: OSjs.API._('LBL_UNDERLINE'), onClick: _action, icon: _createIcon('actions/format-text-underline.png')});
@@ -235,14 +171,7 @@
tb.render();
tb.addItem('indent', {title: OSjs.API._('LBL_INDENT'), onClick: _action, icon: _createIcon('actions/gtk-indent-ltr.png')});
- rt = this._addGUIElement(new GUI.RichText('WriterRichText', {onInited: function() {
- rt.getWindow().addEventListener('selectstart', function() {
- _updateToolbar();
- });
- rt.getWindow().addEventListener('mouseup', function() {
- _updateToolbar();
- });
- }}), root);
+ var rt = this._addGUIElement(new GUI.RichText('WriterRichText'), root);
/*
var sb = this._addGUIElement(new GUI.StatusBar('WriterStatusBar'), root);
@@ -339,7 +268,7 @@
var t = DEFAULT_FILENAME;
if ( file ) {
- t = Utils.filename(file);
+ t = OSjs.Utils.filename(file);
}
this._setTitle(this.title + " - " + t);
@@ -448,4 +377,4 @@
OSjs.Applications = OSjs.Applications || {};
OSjs.Applications.ApplicationWriter = ApplicationWriter;
-})(OSjs.Helpers.DefaultApplication, OSjs.Helpers.DefaultApplicationWindow, OSjs.GUI, OSjs.Dialogs, OSjs.VFS, OSjs.Utils);
+})(OSjs.Helpers.DefaultApplication, OSjs.Helpers.DefaultApplicationWindow, OSjs.GUI, OSjs.Dialogs, OSjs.VFS);