From 61938a735e33627827351662c987afaf2dc1ae5d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 15 Feb 2011 14:24:29 +0000
Subject: [PATCH] - Fix/unify page navigation titles

---
 program/localization/en_US/labels.inc | 20 ++++++++------------
 program/localization/pl_PL/labels.inc | 20 ++++++++------------
 skins/default/templates/mail.html     |  8 ++++----
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 58af54f57..8e990384c 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -127,14 +127,10 @@ $labels['forwardmessage']   = 'Forward the message';
 $labels['deletemessage']    = 'Delete message';
 $labels['movemessagetotrash'] = 'Move message to trash';
 $labels['printmessage']     = 'Print this message';
-$labels['previousmessage']  = 'Show the previous message';
-$labels['previousmessages'] = 'Show previous set of messages';
-$labels['firstmessage']     = 'Show the first message';
-$labels['firstmessages']    = 'Show first set of messages';
-$labels['nextmessage']      = 'Show the next message';
-$labels['nextmessages']     = 'Show next set of messages';
-$labels['lastmessage']      = 'Show the last message';
-$labels['lastmessages']     = 'Show last set of messages';
+$labels['previousmessage']  = 'Show previous message';
+$labels['firstmessage']     = 'Show first message';
+$labels['nextmessage']      = 'Show next message';
+$labels['lastmessage']      = 'Show last message';
 $labels['backtolist']       = 'Back to message list';
 $labels['viewsource']       = 'Show source';
 $labels['markmessages']     = 'Mark messages';
@@ -311,10 +307,10 @@ $labels['exportvcards']   = 'Export contacts in vCard format';
 $labels['newcontactgroup'] = 'Create new contact group';
 $labels['groupactions']   = 'Actions for contact groups...';
 
-$labels['previouspage']   = 'Show previous set';
-$labels['firstpage']      = 'Show first set';
-$labels['nextpage']       = 'Show next set';
-$labels['lastpage']       = 'Show last set';
+$labels['previouspage']   = 'Show previous page';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
 
 $labels['group'] = 'Group';
 $labels['groups'] = 'Groups';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 10012d9bc..ef0f69293 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -106,14 +106,10 @@ $labels['forwardmessage'] = 'Prześlij dalej';
 $labels['deletemessage'] = 'Usuń';
 $labels['movemessagetotrash'] = 'Przenieś do Kosza';
 $labels['printmessage'] = 'Drukuj';
-$labels['previousmessage'] = 'Pokaż poprzednią';
-$labels['previousmessages'] = 'Pokaż poprzednie';
-$labels['firstmessage'] = 'Pokaż pierwszą';
-$labels['firstmessages'] = 'Pokaż pierwsze';
-$labels['nextmessage'] = 'Pokaż następną';
-$labels['nextmessages'] = 'Pokaż następne';
-$labels['lastmessage'] = 'Pokaż ostatnią';
-$labels['lastmessages'] = 'Pokaż ostatnie';
+$labels['previousmessage'] = 'Poprzednia wiadomość';
+$labels['firstmessage'] = 'Pierwsza wiadomość';
+$labels['nextmessage'] = 'Następna wiadomość';
+$labels['lastmessage'] = 'Ostatnia wiadomość';
 $labels['backtolist'] = 'Pokaż listę wiadomości';
 $labels['viewsource'] = 'Pokaż źródło';
 $labels['markmessages'] = 'Oznacz wiadomości';
@@ -217,10 +213,10 @@ $labels['export'] = 'Eksportuj';
 $labels['exportvcards'] = 'Eksport kontaktów w formacie vCard';
 $labels['newcontactgroup'] = 'Utwórz nową grupę';
 $labels['groupactions'] = 'Działania na grupach...';
-$labels['previouspage'] = 'poprzednia strona';
-$labels['firstpage'] = 'pierwsza strona';
-$labels['nextpage'] = 'następna strona';
-$labels['lastpage'] = 'ostatnia strona';
+$labels['previouspage'] = 'Poprzednia strona';
+$labels['firstpage'] = 'Pierwsza strona';
+$labels['nextpage'] = 'Następna strona';
+$labels['lastpage'] = 'Ostatnia strona';
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupy';
 $labels['personaladrbook'] = 'Kontakty osobiste';
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 08469faa0..5e2a64d4f 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -81,11 +81,11 @@
     <roundcube:endif />
     </div>
     <div id="countcontrols" class="pagenav">
-        <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastmessages" content=" " />
-        <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextmessages" content=" " />
+        <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " />
+        <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " />
         <roundcube:object name="messageCountDisplay" style="padding:0 .5em; float:right" />
-        <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previousmessages" content=" " />
-        <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstmessages" content=" " />
+        <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " />
+        <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " />
     </div>
 </div>
 </div>