[ciderwebmail] 07/12: Drop patch 1001, and drop custom cleanup: Danish l10n now upstream.
Jonas Smedegaard
dr at jones.dk
Wed Oct 22 18:50:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch experimental
in repository ciderwebmail.
commit 99e7df622d1a39a9300bf9152d0b4d8ae06e5b29
Author: Jonas Smedegaard <dr at jones.dk>
Date: Wed Oct 22 18:11:33 2014 +0200
Drop patch 1001, and drop custom cleanup: Danish l10n now upstream.
---
debian/patches/1001_danish_l10n.patch | 275 ----------------------------------
debian/patches/series | 1 -
debian/rules | 1 -
3 files changed, 277 deletions(-)
diff --git a/debian/patches/1001_danish_l10n.patch b/debian/patches/1001_danish_l10n.patch
deleted file mode 100644
index 762de5b..0000000
--- a/debian/patches/1001_danish_l10n.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-Description: Add danish localization
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2013-03-17
-
---- /dev/null
-+++ b/root/locale/da/LC_MESSAGES/CiderWebmail.po
-@@ -0,0 +1,235 @@
-+# SOME DESCRIPTIVE TITLE.
-+# Copyright (C) 2013 Jonas Smedegaard <dr at jones.dk>
-+# This file is distributed under the same license as the CiderWebmail package.
-+# Jonas Smedegaard <dr at jones.dk>, 2013.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: CiderWebmail 1.04+20130202\n"
-+"PO-Revision-Date: 2013-03-17 14:25+0200\n"
-+"Last-Translator: Jonas Smedegaard <dr at jones.dk>\n"
-+"Language-Team: None\n"
-+"Language: da\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-+"X-Generator: Virtaal 0.7.1\n"
-+
-+msgid "${1} ${2}"
-+msgstr "${1} ${2}"
-+
-+msgid "${1} Addressbook"
-+msgstr "${1} Addressebog"
-+
-+msgid "${1} Compose new mail"
-+msgstr "${1} Opret ny mail"
-+
-+msgid "${1} Logout"
-+msgstr "${1} Log ud"
-+
-+msgid "${1} Manage folders"
-+msgstr "${1} Administrér mapper"
-+
-+msgid "${1} Manage rules"
-+msgstr "${1} Administrér regler"
-+
-+msgid "${1} Vacation rule"
-+msgstr "${1} Feriemelding"
-+
-+msgid "Active:"
-+msgstr "Aktiv:"
-+
-+msgid "Addressbook"
-+msgstr "Addressebog"
-+
-+msgid "Attachment:"
-+msgstr "Vedhæftning:"
-+
-+msgid "Attachments"
-+msgstr "Vedhæftninger"
-+
-+msgid "Cc:"
-+msgstr "Cc:"
-+
-+msgid "Compose Message"
-+msgstr "Skriv besked"
-+
-+msgid "Compose new mail message"
-+msgstr "Skriv ny email"
-+
-+msgid "Create"
-+msgstr "Opret"
-+
-+msgid "Create folder"
-+msgstr "Opret mappe"
-+
-+msgid "Date"
-+msgstr "Dato"
-+
-+msgid "Date:"
-+msgstr "Dato:"
-+
-+msgid "Delete"
-+msgstr "Slet"
-+
-+msgid "Delete message"
-+msgstr "Slet besked"
-+
-+msgid ""
-+"Drag a mail's icon to a folder name to move that mail to that folder.${1} "
-+"Use cursor left/right for displaying the previous/next message.${2} Cursor "
-+"up/down for scrolling within a message.${3} 'd' or the delete key for "
-+"deleting the current message.${4} 'm' for moving the current message to a "
-+"different folder.${5} 'r' for replying to the current message.${6} 'f' for "
-+"forwarding the current message."
-+msgstr ""
-+"Træk en beskeds ikon til et mappenavn for at flytte beskeden til den "
-+"mappe.${1} Brug venstre-/højrepil til at vise forrige/næste besked.${2} Pil "
-+"op/ned ruller indeni en besked.${3} 'd' eller slettetasten sletter den "
-+"aktuelle besked.${4} 'm' flytter den aktuelle besked til en anden mappe.${5} "
-+"'r' besvarer den aktuelle besked.${6} 'f' videresender den aktuelle besked."
-+
-+msgid "E-Mail"
-+msgstr "E-Mail"
-+
-+msgid "E-Mail:"
-+msgstr "E-Mail:"
-+
-+msgid "Edit contact"
-+msgstr "Redigér kontakter"
-+
-+msgid "Edit sieve script"
-+msgstr "Redigér filterregler"
-+
-+msgid "Edit vacation rule"
-+msgstr "Redigér feriemelding"
-+
-+msgid "Error"
-+msgstr "Fejl"
-+
-+msgid "Fetching more messages"
-+msgstr "Henter flere beskeder"
-+
-+msgid "First name:"
-+msgstr "Fornavn:"
-+
-+msgid "Folders"
-+msgstr "Mapper"
-+
-+msgid "Forward"
-+msgstr "Videresend"
-+
-+msgid "Forwarding"
-+msgstr "Videresend"
-+
-+msgid "From"
-+msgstr "Fra"
-+
-+msgid "From:"
-+msgstr "Fra:"
-+
-+msgid "Last name:"
-+msgstr "Efternavn:"
-+
-+msgid "Loading message"
-+msgstr "Indlæser besked"
-+
-+msgid "Login"
-+msgstr "Log ind"
-+
-+msgid "Managesieve"
-+msgstr "Managesieve"
-+
-+msgid "Move message"
-+msgstr "Flyt besked"
-+
-+msgid "Name"
-+msgstr "Navn"
-+
-+msgid "New subfolder"
-+msgstr "Ny undermappe"
-+
-+msgid "No Subject"
-+msgstr "Intet emne"
-+
-+msgid "Password"
-+msgstr "Adgangskode"
-+
-+msgid "Reply"
-+msgstr "Svar"
-+
-+msgid "Reply All"
-+msgstr "Svar til alle"
-+
-+msgid "Reply List"
-+msgstr "Svar til liste"
-+
-+msgid "Reply message:"
-+msgstr "Svar-besked:"
-+
-+msgid "Save"
-+msgstr "Gem"
-+
-+msgid "Save copy"
-+msgstr "Gem kopi"
-+
-+msgid "Save message to:"
-+msgstr "Gem besked i:"
-+
-+msgid "Script name"
-+msgstr "Script-navn"
-+
-+msgid "Script name:"
-+msgstr "Script-navn:"
-+
-+msgid "Search"
-+msgstr "Søg"
-+
-+msgid "Server"
-+msgstr "Server"
-+
-+msgid "Session ended"
-+msgstr "Sessionen er afsluttet"
-+
-+msgid "Status"
-+msgstr "Status"
-+
-+msgid "Subject"
-+msgstr "Emne"
-+
-+msgid "Subject:"
-+msgstr "Emne:"
-+
-+msgid "Target folder:"
-+msgstr "Målmappe:"
-+
-+msgid "To"
-+msgstr "Til"
-+
-+msgid "To:"
-+msgstr "Til:"
-+
-+msgid "Toggle important flag"
-+msgstr "Markér vigtige flag"
-+
-+msgid "Transmit message"
-+msgstr "Send besked"
-+
-+msgid "Username"
-+msgstr "Brugernavn"
-+
-+msgid "View header"
-+msgstr "Vis brevhoveder"
-+
-+msgid "View source"
-+msgstr "Vis kilde"
-+
-+msgid "add contact"
-+msgstr "tilføj kontakt"
-+
-+msgid "delete"
-+msgstr "slet"
-+
-+msgid "edit"
-+msgstr "redigér"
---- a/lib/CiderWebmail/Controller/Root.pm
-+++ b/lib/CiderWebmail/Controller/Root.pm
-@@ -50,7 +50,9 @@
-
- $c->stash->{translation_service} = $translation_service;
-
-- if (( $c->request->headers->header('Accept-Language') or '') =~ m/^de/ixm) {
-+ if (( $c->request->headers->header('Accept-Language') or '') =~ m/^da/ixm) {
-+ $c->stash->{language} = 'da';
-+ } elsif (( $c->request->headers->header('Accept-Language') or '') =~ m/^de/ixm) {
- $c->stash->{language} = 'de';
- } elsif (( $c->request->headers->header('Accept-Language') or '') =~ m/^en/ixm) {
- $c->stash->{language} = 'en';
---- a/root/templates/template.pl
-+++ b/root/templates/template.pl
-@@ -20,7 +20,7 @@
- foreach(@folders) {
- my $folder = $_;
-
-- foreach(qw/ de en /) {
-+ foreach(qw/ da de en /) {
- my $langfolder = $folder;
- $langfolder =~ s/^base/$_/;
- print "Creating folder $langfolder\n";
-@@ -30,7 +30,7 @@
-
- foreach(@files) {
- my $file = $_;
-- foreach(qw/en de/) {
-+ foreach(qw/en de da/) {
- my $lang = $_;
- my $outfile = $file;
- $outfile =~ s/^base/$lang/;
diff --git a/debian/patches/series b/debian/patches/series
index d7a7f9c..13f38bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-1001_danish_l10n.patch
2001_avoid_autoinstall.patch
diff --git a/debian/rules b/debian/rules
index eba189c..ca0fd58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,7 +131,6 @@ debian/stamp-mktemplates: pre-build
cd root/templates && perl ./template.pl
touch $@
clean::
- rm -f root/locale/da/LC_MESSAGES/CiderWebmail.mo root/templates/da
rm -f debian/stamp-mktemplates
# Install config files
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ciderwebmail.git
More information about the Pkg-perl-cvs-commits
mailing list