mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pictureviewer: Remove duplicate locale from help text

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c691c242ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)

Origin message was:
------------------
* Pictureviewer: Remove duplicate locale from help text

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2012-12-04 21:05:19 +01:00
parent 9a510a90e4
commit fe8b21074b
5 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
data/locale/deutsch.locale
View File

@@ -1437,21 +1437,18 @@ personalize.visible sichtbar
pictureviewer.defdir Start-Verz. pictureviewer.defdir Start-Verz.
pictureviewer.head Bildbetrachter pictureviewer.head Bildbetrachter
pictureviewer.help1 Menü-Modus pictureviewer.help1 Menü-Modus
pictureviewer.help10 Anzeige-Modus pictureviewer.help10 Bild neu einlesen
pictureviewer.help11 Bild neu einlesen pictureviewer.help11 vorheriges Bild
pictureviewer.help12 vorheriges Bild pictureviewer.help12 nächstes Bild
pictureviewer.help13 nächstes Bild pictureviewer.help13 Zoom out
pictureviewer.help14 Zoom out pictureviewer.help14 Zoom in
pictureviewer.help15 Zoom in pictureviewer.help15 Scroll hoch
pictureviewer.help16 Scroll hoch pictureviewer.help16 Scroll links
pictureviewer.help17 Scroll links pictureviewer.help17 Scroll rechts
pictureviewer.help18 Scroll rechts pictureviewer.help18 Scroll herunter
pictureviewer.help19 Scroll herunter pictureviewer.help19 Bild unskaliert einlesen
pictureviewer.help2 Bild anzeigen pictureviewer.help2 Bild anzeigen
pictureviewer.help20 Sortierung andern pictureviewer.help3 Sortierung ändern
pictureviewer.help21 Bild unskaliert einlesen
pictureviewer.help22 Modus verlassen
pictureviewer.help3 Sortierung andern
pictureviewer.help30 Audioplayer-Modus pictureviewer.help30 Audioplayer-Modus
pictureviewer.help31 Startet die Wiedergabe pictureviewer.help31 Startet die Wiedergabe
pictureviewer.help32 Pausiert die Wiedergabe pictureviewer.help32 Pausiert die Wiedergabe
@@ -1462,8 +1459,8 @@ pictureviewer.help4 Bild unskaliert einlesen
pictureviewer.help5 Diashow-Modus pictureviewer.help5 Diashow-Modus
pictureviewer.help6 vorheriges Bild pictureviewer.help6 vorheriges Bild
pictureviewer.help7 nächstes Bild pictureviewer.help7 nächstes Bild
pictureviewer.help8 Sortierung ändern pictureviewer.help8 Modus verlassen
pictureviewer.help9 Modus verlassen pictureviewer.help9 Anzeige-Modus
pictureviewer.resize.color_average aufwendig pictureviewer.resize.color_average aufwendig
pictureviewer.resize.none keine pictureviewer.resize.none keine
pictureviewer.resize.simple einfach pictureviewer.resize.simple einfach

27
data/locale/english.locale
View File

@@ -1437,20 +1437,17 @@ personalize.visible Visible
pictureviewer.defdir start dir. pictureviewer.defdir start dir.
pictureviewer.head Picture viewer pictureviewer.head Picture viewer
pictureviewer.help1 menu mode pictureviewer.help1 menu mode
pictureviewer.help10 show mode pictureviewer.help10 reread image
pictureviewer.help11 reread image pictureviewer.help11 previous image
pictureviewer.help12 previous image pictureviewer.help12 next image
pictureviewer.help13 next image pictureviewer.help13 Zoom out
pictureviewer.help14 Zoom out pictureviewer.help14 Zoom in
pictureviewer.help15 Zoom in pictureviewer.help15 scroll up
pictureviewer.help16 scroll up pictureviewer.help16 scroll left
pictureviewer.help17 scroll left pictureviewer.help17 scroll right
pictureviewer.help18 scroll right pictureviewer.help18 scroll down
pictureviewer.help19 scroll down pictureviewer.help19 reread image (no scaling)
pictureviewer.help2 display image pictureviewer.help2 display image
pictureviewer.help20 change sort order
pictureviewer.help21 reread image (no scaling)
pictureviewer.help22 exit
pictureviewer.help3 change sort order pictureviewer.help3 change sort order
pictureviewer.help30 audioplayer mode pictureviewer.help30 audioplayer mode
pictureviewer.help31 starts the playback pictureviewer.help31 starts the playback
@@ -1462,8 +1459,8 @@ pictureviewer.help4 do not scale picture
pictureviewer.help5 diashow mode pictureviewer.help5 diashow mode
pictureviewer.help6 previous image pictureviewer.help6 previous image
pictureviewer.help7 next image pictureviewer.help7 next image
pictureviewer.help8 change sort order pictureviewer.help8 exit
pictureviewer.help9 exit pictureviewer.help9 show mode
pictureviewer.resize.color_average advanced pictureviewer.resize.color_average advanced
pictureviewer.resize.none none pictureviewer.resize.none none
pictureviewer.resize.simple simple pictureviewer.resize.simple simple

30
src/gui/pictureviewer.cpp
View File

@@ -860,22 +860,22 @@ void CPictureViewerGui::showHelp()
helpbox.addLine(g_Locale->getText(LOCALE_PICTUREVIEWER_HELP5)); helpbox.addLine(g_Locale->getText(LOCALE_PICTUREVIEWER_HELP5));
helpbox.addLine(NEUTRINO_ICON_BUTTON_LEFT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP6)); helpbox.addLine(NEUTRINO_ICON_BUTTON_LEFT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP6));
helpbox.addLine(NEUTRINO_ICON_BUTTON_RIGHT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP7)); helpbox.addLine(NEUTRINO_ICON_BUTTON_RIGHT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP7));
helpbox.addLine(NEUTRINO_ICON_BUTTON_5, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP8)); helpbox.addLine(NEUTRINO_ICON_BUTTON_5, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP3));
helpbox.addLine(NEUTRINO_ICON_BUTTON_HOME, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP9)); helpbox.addLine(NEUTRINO_ICON_BUTTON_HOME, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP8));
helpbox.addPagebreak(); helpbox.addPagebreak();
helpbox.addLine(g_Locale->getText(LOCALE_PICTUREVIEWER_HELP10)); helpbox.addLine(g_Locale->getText(LOCALE_PICTUREVIEWER_HELP9));
helpbox.addLine(NEUTRINO_ICON_BUTTON_OKAY, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP11)); helpbox.addLine(NEUTRINO_ICON_BUTTON_OKAY, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP10));
helpbox.addLine(NEUTRINO_ICON_BUTTON_LEFT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP12)); helpbox.addLine(NEUTRINO_ICON_BUTTON_LEFT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP11));
helpbox.addLine(NEUTRINO_ICON_BUTTON_RIGHT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP13)); helpbox.addLine(NEUTRINO_ICON_BUTTON_RIGHT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP12));
helpbox.addLine(NEUTRINO_ICON_BUTTON_1, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP14)); helpbox.addLine(NEUTRINO_ICON_BUTTON_1, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP13));
helpbox.addLine(NEUTRINO_ICON_BUTTON_3, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP15)); helpbox.addLine(NEUTRINO_ICON_BUTTON_3, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP14));
helpbox.addLine(NEUTRINO_ICON_BUTTON_2, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP16)); helpbox.addLine(NEUTRINO_ICON_BUTTON_2, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP15));
helpbox.addLine(NEUTRINO_ICON_BUTTON_4, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP17)); helpbox.addLine(NEUTRINO_ICON_BUTTON_4, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP16));
helpbox.addLine(NEUTRINO_ICON_BUTTON_6, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP18)); helpbox.addLine(NEUTRINO_ICON_BUTTON_6, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP17));
helpbox.addLine(NEUTRINO_ICON_BUTTON_8, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP19)); helpbox.addLine(NEUTRINO_ICON_BUTTON_8, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP18));
helpbox.addLine(NEUTRINO_ICON_BUTTON_5, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP20)); helpbox.addLine(NEUTRINO_ICON_BUTTON_5, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP3));
helpbox.addLine(NEUTRINO_ICON_BUTTON_0, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP21)); helpbox.addLine(NEUTRINO_ICON_BUTTON_0, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP19));
helpbox.addLine(NEUTRINO_ICON_BUTTON_HOME, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP22)); helpbox.addLine(NEUTRINO_ICON_BUTTON_HOME, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP8));
if(audioplayer) if(audioplayer)
{ {
helpbox.addPagebreak(); helpbox.addPagebreak();

3
src/system/locals.h
View File

@@ -1475,9 +1475,6 @@ typedef enum
LOCALE_PICTUREVIEWER_HELP18, LOCALE_PICTUREVIEWER_HELP18,
LOCALE_PICTUREVIEWER_HELP19, LOCALE_PICTUREVIEWER_HELP19,
LOCALE_PICTUREVIEWER_HELP2, LOCALE_PICTUREVIEWER_HELP2,
LOCALE_PICTUREVIEWER_HELP20,
LOCALE_PICTUREVIEWER_HELP21,
LOCALE_PICTUREVIEWER_HELP22,
LOCALE_PICTUREVIEWER_HELP3, LOCALE_PICTUREVIEWER_HELP3,
LOCALE_PICTUREVIEWER_HELP30, LOCALE_PICTUREVIEWER_HELP30,
LOCALE_PICTUREVIEWER_HELP31, LOCALE_PICTUREVIEWER_HELP31,

3
src/system/locals_intern.h
View File

@@ -1475,9 +1475,6 @@ const char * locale_real_names[] =
"pictureviewer.help18", "pictureviewer.help18",
"pictureviewer.help19", "pictureviewer.help19",
"pictureviewer.help2", "pictureviewer.help2",
"pictureviewer.help20",
"pictureviewer.help21",
"pictureviewer.help22",
"pictureviewer.help3", "pictureviewer.help3",
"pictureviewer.help30", "pictureviewer.help30",
"pictureviewer.help31", "pictureviewer.help31",