From 1db1444bc6c48d6d64e05fe5b7d800885e67f35b Mon Sep 17 00:00:00 2001 From: plegall Date: Tue, 16 Jul 2019 10:51:20 +0200 Subject: [PATCH] fix some conflicts not seen during last merge from master --- language/eu_ES/admin.lang.php | 16 ----------- language/nl_NL/common.lang.php | 52 ---------------------------------- 2 files changed, 68 deletions(-) diff --git a/language/eu_ES/admin.lang.php b/language/eu_ES/admin.lang.php index ae7cfba37..b73b34362 100755 --- a/language/eu_ES/admin.lang.php +++ b/language/eu_ES/admin.lang.php @@ -306,10 +306,6 @@ $lang['(filtered from %s total users)'] = '(guztizko %s erabiltzaileetatik iraga $lang['(this tag will be deleted)'] = '(etiketa hau ezabatu egingo da)'; $lang[', click on'] = ', egin klik'; $lang['... or '] = '… edo'; -<<<<<<< HEAD -======= -$lang['Piwigo for Android application empowers you to connect your Android phone or table to your Piwigo gallery, create some albums and upload several photos at once.'] = 'Androiderako Piwigo aplikazioak ahalmena ematen dizu Android gailua zure Piwigo galeriarekin konektatzeko, albumak sortzeko edo hainbat argazki batera kargatzeko.'; ->>>>>>> master $lang['%d album including'] = 'Album %d barne'; $lang['%d albums including'] = '%d album barne'; $lang['%d albums moved'] = '%d album mugitu egin dira'; @@ -377,10 +373,6 @@ $lang['Approximate maximum resolution: %dM pixels (that\'s %dx%d pixels).'] = 'G $lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = 'Ziur eguneraketa instalatu nahi duzula? Egiaztatu bertsio honek aurretik desinstalaziorik ez ote duen behar. '; $lang['Automatic sort order'] = 'Hurrenkera automatikoa'; $lang['Available on'] = 'Hemen eskuragarri'; -<<<<<<< HEAD -======= -$lang['Available versions for'] = 'Bertsio eskuragarriak honentzako'; ->>>>>>> master $lang['Average rate'] = 'Batez besteko balorazioa'; $lang['Batch Manager'] = 'Multzoko kudeatzailea'; $lang['Bound Theme'] = 'Lotu gaia'; @@ -558,10 +550,6 @@ $lang['Piwigo Publish plugin for Lightroom'] = 'Piwigo argitaratze-plugina Light $lang['Please wait...'] = 'Itxaron…'; $lang['Please select at least two groups'] = 'Hautatu gutxienez talde bi'; $lang['Piwigo export plugin for iPhoto'] = 'Piwigo esportazio-plugina iPhotorako'; -<<<<<<< HEAD -======= -$lang['Piwigo for Android'] = 'Piwigo Androiderako'; ->>>>>>> master $lang['Piwigo for iOS (iPhone, iPad, iPod Touch)'] = 'Piwigo iOSerako (iPhone, iPad, iPod Touch)'; $lang['Piwigo publish plugin for Shotwell'] = 'Piwigo argitaratze-plugina Shotwellerako'; $lang['Piwigo publish plugin for digiKam'] = 'Piwigo argitaratze-plugina digiKamerako'; @@ -940,10 +928,6 @@ $lang['only directories'] = 'direktorioak baino ez'; $lang['only perform a simulation (no change in database will be made)'] = 'simulazioa baino ez burutu (ez da ezer aldatuko datu-basean)'; $lang['other'] = 'besterik'; $lang['overrides existing values with empty ones'] = 'gainidatzi baloreak balore hutsekin'; -<<<<<<< HEAD -======= -$lang['pLoader stands for Piwigo Uploader. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader Piwigo Kargatzailea esan nahi du. pLoaderrek argazkiak prestatzen ditu zure ordenagailutik eta Piwigo galeriara bidaltzen ditu.'; ->>>>>>> master $lang['middle'] = 'erdian'; $lang['manual order'] = 'eskuzko hurrenkera'; $lang['manage sub-albums'] = 'kudeatu azpi-albumak'; diff --git a/language/nl_NL/common.lang.php b/language/nl_NL/common.lang.php index afd473af1..934d6d681 100644 --- a/language/nl_NL/common.lang.php +++ b/language/nl_NL/common.lang.php @@ -91,11 +91,7 @@ $lang['Retrieve password'] = 'Herstel wachtwoord'; $lang['Search rules'] = 'Zoekcriteria'; $lang['Search tags'] = 'Zoeklabels'; $lang['Search'] = 'Zoek'; -<<<<<<< HEAD -$lang['display available tags'] = 'Toon alle beschikbare labels'; -======= $lang['display available tags'] = 'toon alle beschikbare labels'; ->>>>>>> master $lang['Since'] = 'Sinds'; $lang['Sort by'] = 'Sorteer op'; $lang['Sort order'] = 'Sorteervolgorde'; @@ -121,17 +117,10 @@ $lang['posted before %s (%s)'] = 'geplaatst voor %s(%s)'; $lang['posted between %s (%s) and %s (%s)'] = 'geplaatst tussen %s(%s) en %s(%s)'; $lang['posted on %s'] = 'geplaatst op %s'; $lang['Best rated'] = 'Best gewaardeerd'; -<<<<<<< HEAD $lang['display best rated photos'] = 'Toon de best beoordeelde foto\'s'; $lang['Calendar'] = 'Kalender'; $lang['All'] = 'Alles'; $lang['display each day with photos, month per month'] = 'Toon foto\'s van elke dag, maand per maand'; -======= -$lang['display best rated photos'] = 'toon de best beoordeelde foto\'s'; -$lang['Calendar'] = 'Kalender'; -$lang['All'] = 'Alles'; -$lang['display each day with photos, month per month'] = 'toon foto\'s van elke dag, maand per maand'; ->>>>>>> master $lang['View'] = 'Toon'; $lang['chronology_monthly_calendar'] = 'Maandkalender'; $lang['chronology_monthly_list'] = 'Maandlijst'; @@ -169,11 +158,7 @@ $lang['edit'] = 'Wijzig'; $lang['wrong date'] = 'verkeerde datum'; $lang['excluded'] = 'Uitgesloten'; $lang['Your favorites'] = 'Jouw favorieten'; -<<<<<<< HEAD $lang['display your favorites photos'] = 'Toon je favoriete foto\'s'; -======= -$lang['display your favorites photos'] = 'toon je favoriete foto\'s'; ->>>>>>> master $lang['Favorites'] = 'Favorieten'; $lang['First'] = 'Eerste'; $lang['The gallery is locked for maintenance. Please, come back later.'] = 'De galerie is momenteel gesloten voor onderhoud. Probeer het later nog eens.'; @@ -181,13 +166,8 @@ $lang['Page generated in'] = 'Pagina geladen in'; $lang['guest'] = 'Gast'; $lang['Hello'] = 'Hallo'; $lang['available for administrators only'] = 'Alleen toegankelijk voor beheerders'; -<<<<<<< HEAD $lang['display this album'] = 'Toon dit album'; $lang['display last user comments'] = 'Toon de meest recente gebruikersreacties'; -======= -$lang['display this album'] = 'toon dit album'; -$lang['display last user comments'] = 'toon de meest recente gebruikersreacties'; ->>>>>>> master $lang['customize the appareance of the gallery'] = 'pas de opmaak van de galerie aan'; $lang['search'] = 'zoek'; $lang['Home'] = 'Startpagina'; @@ -219,11 +199,7 @@ $lang['month'][7] = 'Juli'; $lang['month'][8] = 'Augustus'; $lang['month'][9] = 'September'; $lang['Most visited'] = 'Meest bezocht'; -<<<<<<< HEAD $lang['display most visited photos'] = 'Toon de meest bezochte foto\'s'; -======= -$lang['display most visited photos'] = 'toon de meest bezochte foto\'s'; ->>>>>>> master $lang['The number of photos per page must be a not null scalar'] = 'Het aantal foto\'s per pagina moet hoger dan 0 zijn.'; $lang['Number of photos per page'] = 'Aantal foto\'s per pagina'; $lang['Unknown identifier'] = 'Onbekende naam'; @@ -244,7 +220,6 @@ $lang['Previous'] = 'Vorige'; $lang['Random photos'] = 'Willekeurige foto\'s'; $lang['display a set of random photos'] = 'Toon een aantal willekeurig gekozen foto\'s'; $lang['Recent albums'] = 'Recente albums'; -<<<<<<< HEAD $lang['display recently updated albums'] = 'Toon recent bijgewerkte albums'; $lang['Recent period'] = 'Recente periode'; $lang['Recent photos'] = 'Recente foto\'s'; @@ -255,18 +230,6 @@ $lang['login mustn\'t end with a space character'] = 'Gebruikersnaam mag niet ei $lang['login mustn\'t start with a space character'] = 'Gebruikersnaam mag niet beginnen met een spatie'; $lang['this login is already used'] = 'deze gebruikersnaam is al in gebruik'; $lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'Nailadres moet conform de indeling xxx@yyy.eee worden opgegeven (bijvoorbeeld: jack@altern.org)'; -======= -$lang['display recently updated albums'] = 'toon recent bijgewerkte albums'; -$lang['Recent period'] = 'Recente periode'; -$lang['Recent photos'] = 'Recente foto\'s'; -$lang['display most recent photos'] = 'toon de meest recente foto\'s'; -$lang['Redirection...'] = 'Doorsturen...'; -$lang['Please, enter a login'] = 'Vul alsjeblieft je aanmeldinsgegevens in'; -$lang['login mustn\'t end with a space character'] = 'gebruikersnaam mag niet eindigen met een spatie'; -$lang['login mustn\'t start with a space character'] = 'gebruikersnaam mag niet beginnen met een spatie'; -$lang['this login is already used'] = 'deze gebruikersnaam is al in gebruik'; -$lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = 'mailadres moet conform de indeling xxx@yyy.eee worden opgegeven (bijvoorbeeld: jack@altern.org)'; ->>>>>>> master $lang['Auto login'] = 'Automatische aanmelding'; $lang['remove this tag from the list'] = 'verwijder dit label'; $lang['representative'] = 'album miniatuurweergave'; @@ -291,11 +254,7 @@ $lang['slideshow'] = 'diavoorstelling'; $lang['stop the slideshow'] = 'stop de diavoorstelling'; $lang['Specials'] = 'Uitgelicht'; $lang['SQL queries in'] = 'SQL-query\'s in'; -<<<<<<< HEAD $lang['display only recently posted photos'] = 'Toon alleen recent geplaatste foto\'s'; -======= -$lang['display only recently posted photos'] = 'toon alleen recent geplaatste foto\'s'; ->>>>>>> master $lang['return to the display of all photos'] = 'schakel terug naar het tonen van alle foto\'s'; $lang['the beginning'] = 'het begin'; $lang['Thumbnails'] = 'Miniatuurafbeeldingen'; @@ -335,26 +294,15 @@ $lang['%d photo'] = '%d foto'; $lang['%d photos'] = '%d foto\'s'; $lang['%d photo is also linked to current tags'] = '%d foto is ook gelinkt aan huidige labels'; $lang['%d photos are also linked to current tags'] = '%d foto\'s zijn ook gelinkt aan huidige labels'; -<<<<<<< HEAD $lang['display photos linked to this tag'] = 'Toon foto\'s die dit label hebben'; -======= -$lang['display photos linked to this tag'] = 'toon foto\'s die dit label hebben'; ->>>>>>> master $lang['photos posted during the last %d days'] = 'foto\'s die gedurende de laatste %d dagen geplaatst zijn'; $lang['Piwigo Help'] = 'Piwigo help'; $lang['Are you sure?'] = 'Weet je het zeker?'; $lang['Rank'] = 'Rangorde'; -<<<<<<< HEAD $lang['group by letters'] = 'Groepeer op letters'; $lang['letters'] = 'letters'; $lang['show tag cloud'] = 'laat labelwolk zien'; $lang['cloud'] = 'cloud'; -======= -$lang['group by letters'] = 'groepeer op letters'; -$lang['letters'] = 'letters'; -$lang['show tag cloud'] = 'laat labelwolk zien'; -$lang['cloud'] = 'wolk'; ->>>>>>> master $lang['Reset to default values'] = 'Herstel de originele waarden'; $lang['delete all photos from your favorites'] = 'Verwijder alle foto\'s uit je favorieten'; $lang['Sent by'] = 'Verzonden door';