Changeset 6403 for branches


Ignore:
Timestamp:
May 27, 2010, 10:28:43 PM (14 years ago)
Author:
rvelices
Message:

merge r6402 from trunk
removed unnecessary language key (Controversy) and potential sql fatal error in admin photo rating page

Location:
branches/2.1
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1/admin/rating.php

    r6364 r6403  
    135135    array(l10n('Number of rates'), 'nb_rates DESC'),
    136136    array(l10n('Sum of rates'), 'sum_rates DESC'),
    137     array(l10n('Controversy'), 'std_rates DESC'),
    138137    array(l10n('File name'), 'file DESC'),
    139138    array(l10n('Creation date'), 'date_creation DESC'),
    140139    array(l10n('Post date'), 'date_available DESC'),
    141 
    142140  );
    143141
  • branches/2.1/language/ar_SA/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'التأكد من التحديثات';
    7171$lang['Comments for all'] = 'يسمح للجميع بالتعليق دون استثناء و دون طائفية :)';
    72 $lang['Controversy'] = 'التعليقات';
    7372$lang['Current name'] = 'الاسم الحالي';
    7473$lang['Database'] = 'قاعدة البيانات';
  • branches/2.1/language/cs_CZ/admin.lang.php

    r6289 r6403  
    7373$lang['Check for upgrade'] = 'Zjistit možnost aktualizace';
    7474$lang['Comments for all'] = 'Komentáře pro všechny';
    75 $lang['Controversy'] = 'Kontroverze';
    7675$lang['Current name'] = 'Současný název';
    7776$lang['Database'] = 'Databáze';
  • branches/2.1/language/da_DK/admin.lang.php

    r6289 r6403  
    7272$lang['Check for upgrade'] = 'Tjek efter opgradering';
    7373$lang['Comments for all']     =     'Kommentarer til alle';
    74 $lang['Controversy'] = 'Kontrovers';
    7574$lang['Current name']     =     'Nuværende navn';
    7675$lang['Database']     =     'Database';
  • branches/2.1/language/de_DE/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'Prüfe ob eine neue Version der Bildergalerie verfügbar ist.';
    7171$lang['Comments for all'] = 'Kommentare für alle erlaubt';
    72 $lang['Controversy'] = 'Abweichung';
    7372$lang['Current name'] = 'Derzeitiger Name';
    7473$lang['Database'] = 'Datenbank';
  • branches/2.1/language/en_UK/admin.lang.php

    r6345 r6403  
    7272$lang['Check for upgrade'] = "Check for upgrade";
    7373$lang['Comments for all'] = "Comments for all";
    74 $lang['Controversy'] = "Controversy";
    7574$lang['Current name'] = "Current name";
    7675$lang['Database'] = "Database";
  • branches/2.1/language/es_ES/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'Última versión';
    7171$lang['Comments for all'] = 'Comentarios para todos';
    72 $lang['Controversy'] = 'Controversia';
    7372$lang['Current name'] = 'Nombre corriente';
    7473$lang['Database'] = 'Base de datos';
  • branches/2.1/language/fr_FR/admin.lang.php

    r6345 r6403  
    7272$lang['Check for upgrade'] = "Dernière version ?";
    7373$lang['Comments for all'] = "Commentaires pour tous";
    74 $lang['Controversy'] = "Conflit";
    7574$lang['Current name'] = "Nom courant";
    7675$lang['Database'] = "Base de données";
  • branches/2.1/language/hr_HR/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'Provjera nadogradnje';
    7171$lang['Comments for all'] = 'Komentari za sve';
    72 $lang['Controversy'] = 'Osporavanja';
    7372$lang['Current name'] = 'Trenutni naziv';
    7473$lang['Database'] = 'Baza podataka';
  • branches/2.1/language/hu_HU/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'Frissítés keresése';
    7171$lang['Comments for all'] = 'Bárki hozzászólhat';
    72 $lang['Controversy'] = 'Szórás';
    7372$lang['Current name'] = 'Név';
    7473$lang['Database'] = 'Adatbázis';
  • branches/2.1/language/it_IT/admin.lang.php

    r6364 r6403  
    7272$lang['Check for upgrade'] = 'Ultima versione ?';
    7373$lang['Comments for all'] = 'Commenti per tutti';
    74 $lang['Controversy'] = 'Controversia';
    7574$lang['Current name'] = 'Nome attuale';
    7675$lang['Database'] = 'Database';
  • branches/2.1/language/ja_JP/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'アップグレードをチェックする';
    7171$lang['Comments for all'] = 'すべてのユーザにコメントを許可する';
    72 $lang['Controversy'] = '論争';
    7372$lang['Current name'] = '現在の名称';
    7473$lang['Database'] = 'データベース';
  • branches/2.1/language/nl_NL/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'Upgradecontrole';
    7171$lang['Comments for all'] = 'Iedereen mag commentaar geven (ook gasten)';
    72 $lang['Controversy'] = 'Controversieel';
    7372$lang['Current name'] = 'Huidige naam';
    7473$lang['Database'] = 'Database';
  • branches/2.1/language/pl_PL/admin.lang.php

    r6364 r6403  
    7070$lang['Check for upgrade'] = 'Sprawdź aktualizacje';
    7171$lang['Comments for all'] = 'Komentarze dla wszystkich';
    72 $lang['Controversy'] = 'Kontorversyjność';
    7372$lang['Current name'] = 'Bieżąca nazwa';
    7473$lang['Database'] = 'Baza danych';
  • branches/2.1/language/pt_BR/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'Checar por atualização';
    7171$lang['Comments for all'] = 'Comentários para todos';
    72 $lang['Controversy'] = 'Controvérsia';
    7372$lang['Current name'] = 'Nome atual';
    7473$lang['Database'] = 'Base de dados';
  • branches/2.1/language/pt_PT/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'procurar por atualização';
    7171$lang['Comments for all'] = 'Comentários para todos';
    72 $lang['Controversy'] = 'Controvérsia';
    7372$lang['Current name'] = 'Nome atual';
    7473$lang['Database'] = 'Base de dados';
  • branches/2.1/language/ru_RU/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'Проверить обновления';
    7171$lang['Comments for all'] = 'Комментарии для всех';
    72 $lang['Controversy'] = 'Противоречие';
    7372$lang['Current name'] = 'Текущее название';
    7473$lang['Database'] = 'База данных';
  • branches/2.1/language/sr_RS/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = 'Provera nadogradnje';
    7171$lang['Comments for all'] = 'Komentari za sve';
    72 $lang['Controversy'] = 'Osporavanja';
    7372$lang['Current name'] = 'Trenutni naziv';
    7473$lang['Database'] = 'Baza podataka';
  • branches/2.1/language/templates/admin.lang.php

    r6289 r6403  
    7171$lang['Check for upgrade'] = 'Check for upgrade';
    7272$lang['Comments for all'] = 'Comments for all';
    73 $lang['Controversy'] = 'Controversy';
    7473$lang['Current name'] = 'Current name';
    7574$lang['Database'] = 'Database';
  • branches/2.1/language/vi_VN/admin.lang.php

    r6289 r6403  
    7171$lang['Check for upgrade'] = 'Dò tìm phiên bản mới';
    7272$lang['Comments for all'] = 'Cho mọi đối tượng được phép gởi bình luận';
    73 $lang['Controversy'] = 'Tranh luận';
    7473$lang['Current name'] = 'Tên hiện tại';
    7574$lang['Database'] = 'Cơ sở dữ liệu';
  • branches/2.1/language/zh_CN/admin.lang.php

    r6289 r6403  
    7070$lang['Check for upgrade'] = '检测更新';
    7171$lang['Comments for all'] = '对所有成员进行评论';
    72 $lang['Controversy'] = '辩论';
    7372$lang['Current name'] = '现用名';
    7473$lang['Database'] = '数据库';
Note: See TracChangeset for help on using the changeset viewer.