From fe8b21074b221e7b008b6ccd6e1a1a84eb45c4af Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Tue, 4 Dec 2012 21:05:19 +0100 Subject: [PATCH] Pictureviewer: Remove duplicate locale from help text Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c691c242ff3d576fdde0c844a200b1378d3ac3f2 Author: Michael Liebmann 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 --- data/locale/deutsch.locale | 29 +++++++++++++---------------- data/locale/english.locale | 27 ++++++++++++--------------- src/gui/pictureviewer.cpp | 30 +++++++++++++++--------------- src/system/locals.h | 3 --- src/system/locals_intern.h | 3 --- 5 files changed, 40 insertions(+), 52 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 068d6e85f..3824943c4 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1437,21 +1437,18 @@ personalize.visible sichtbar pictureviewer.defdir Start-Verz. pictureviewer.head Bildbetrachter pictureviewer.help1 Menü-Modus -pictureviewer.help10 Anzeige-Modus -pictureviewer.help11 Bild neu einlesen -pictureviewer.help12 vorheriges Bild -pictureviewer.help13 nächstes Bild -pictureviewer.help14 Zoom out -pictureviewer.help15 Zoom in -pictureviewer.help16 Scroll hoch -pictureviewer.help17 Scroll links -pictureviewer.help18 Scroll rechts -pictureviewer.help19 Scroll herunter +pictureviewer.help10 Bild neu einlesen +pictureviewer.help11 vorheriges Bild +pictureviewer.help12 nächstes Bild +pictureviewer.help13 Zoom out +pictureviewer.help14 Zoom in +pictureviewer.help15 Scroll hoch +pictureviewer.help16 Scroll links +pictureviewer.help17 Scroll rechts +pictureviewer.help18 Scroll herunter +pictureviewer.help19 Bild unskaliert einlesen pictureviewer.help2 Bild anzeigen -pictureviewer.help20 Sortierung andern -pictureviewer.help21 Bild unskaliert einlesen -pictureviewer.help22 Modus verlassen -pictureviewer.help3 Sortierung andern +pictureviewer.help3 Sortierung ändern pictureviewer.help30 Audioplayer-Modus pictureviewer.help31 Startet die Wiedergabe pictureviewer.help32 Pausiert die Wiedergabe @@ -1462,8 +1459,8 @@ pictureviewer.help4 Bild unskaliert einlesen pictureviewer.help5 Diashow-Modus pictureviewer.help6 vorheriges Bild pictureviewer.help7 nächstes Bild -pictureviewer.help8 Sortierung ändern -pictureviewer.help9 Modus verlassen +pictureviewer.help8 Modus verlassen +pictureviewer.help9 Anzeige-Modus pictureviewer.resize.color_average aufwendig pictureviewer.resize.none keine pictureviewer.resize.simple einfach diff --git a/data/locale/english.locale b/data/locale/english.locale index dea61a864..472b88de4 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1437,20 +1437,17 @@ personalize.visible Visible pictureviewer.defdir start dir. pictureviewer.head Picture viewer pictureviewer.help1 menu mode -pictureviewer.help10 show mode -pictureviewer.help11 reread image -pictureviewer.help12 previous image -pictureviewer.help13 next image -pictureviewer.help14 Zoom out -pictureviewer.help15 Zoom in -pictureviewer.help16 scroll up -pictureviewer.help17 scroll left -pictureviewer.help18 scroll right -pictureviewer.help19 scroll down +pictureviewer.help10 reread image +pictureviewer.help11 previous image +pictureviewer.help12 next image +pictureviewer.help13 Zoom out +pictureviewer.help14 Zoom in +pictureviewer.help15 scroll up +pictureviewer.help16 scroll left +pictureviewer.help17 scroll right +pictureviewer.help18 scroll down +pictureviewer.help19 reread image (no scaling) pictureviewer.help2 display image -pictureviewer.help20 change sort order -pictureviewer.help21 reread image (no scaling) -pictureviewer.help22 exit pictureviewer.help3 change sort order pictureviewer.help30 audioplayer mode pictureviewer.help31 starts the playback @@ -1462,8 +1459,8 @@ pictureviewer.help4 do not scale picture pictureviewer.help5 diashow mode pictureviewer.help6 previous image pictureviewer.help7 next image -pictureviewer.help8 change sort order -pictureviewer.help9 exit +pictureviewer.help8 exit +pictureviewer.help9 show mode pictureviewer.resize.color_average advanced pictureviewer.resize.none none pictureviewer.resize.simple simple diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index 866f2813a..4dbd38422 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -860,22 +860,22 @@ void CPictureViewerGui::showHelp() 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_RIGHT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP7)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_5, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP8)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_HOME, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP9)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_5, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP3)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_HOME, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP8)); helpbox.addPagebreak(); - helpbox.addLine(g_Locale->getText(LOCALE_PICTUREVIEWER_HELP10)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_OKAY, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP11)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_LEFT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP12)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_RIGHT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP13)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_1, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP14)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_3, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP15)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_2, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP16)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_4, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP17)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_6, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP18)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_8, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP19)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_5, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP20)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_0, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP21)); - helpbox.addLine(NEUTRINO_ICON_BUTTON_HOME, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP22)); + helpbox.addLine(g_Locale->getText(LOCALE_PICTUREVIEWER_HELP9)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_OKAY, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP10)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_LEFT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP11)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_RIGHT, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP12)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_1, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP13)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_3, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP14)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_2, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP15)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_4, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP16)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_6, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP17)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_8, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP18)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_5, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP3)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_0, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP19)); + helpbox.addLine(NEUTRINO_ICON_BUTTON_HOME, g_Locale->getText(LOCALE_PICTUREVIEWER_HELP8)); if(audioplayer) { helpbox.addPagebreak(); diff --git a/src/system/locals.h b/src/system/locals.h index eb94a4ceb..9d670a45b 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1475,9 +1475,6 @@ typedef enum LOCALE_PICTUREVIEWER_HELP18, LOCALE_PICTUREVIEWER_HELP19, LOCALE_PICTUREVIEWER_HELP2, - LOCALE_PICTUREVIEWER_HELP20, - LOCALE_PICTUREVIEWER_HELP21, - LOCALE_PICTUREVIEWER_HELP22, LOCALE_PICTUREVIEWER_HELP3, LOCALE_PICTUREVIEWER_HELP30, LOCALE_PICTUREVIEWER_HELP31, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index b4431b571..e00f7b242 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1475,9 +1475,6 @@ const char * locale_real_names[] = "pictureviewer.help18", "pictureviewer.help19", "pictureviewer.help2", - "pictureviewer.help20", - "pictureviewer.help21", - "pictureviewer.help22", "pictureviewer.help3", "pictureviewer.help30", "pictureviewer.help31",