Ignore:
Timestamp:
Apr 22, 2013 7:43:34 AM (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1
Children:
fa9f360
Parents:
41b1c3f (diff), 3ddea19 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-controlpanel/items/de/kde-systemsettings.desktop

    r13883ef r3ddea19  
    2121Name[bn_IN]=àŠžàŠ¿àŠžà§àŠŸà§‡àŠ® àŠžàŠ‚àŠ•à§àŠ°àŠŸàŠšà§àŠ€ àŠ¬à§ˆàŠ¶àŠ¿àŠ·à§àŠŸà§àŠ¯ 
    2222Name[br]=Dibarzhoù ar reizhiad 
     23Name[bs]=Sistemska podeÅ¡avanja 
    2324Name[ca@valencia]=Arranjament del sistema 
    2425Name[ca]=Arranjament del sistema 
     
    9091Name[sr@ijekavianlatin]=Sistemske postavke 
    9192Name[sr@latin]=Sistemske postavke 
    92 Name[sr]=СОстеЌске пПставке 
     93Name[sr]=Sistemska podeÅ¡avanja 
    9394Name[sv]=SysteminstÀllningar 
    9495Name[ta]=System Settings 
     
    115116GenericName[bn]=àŠžàŠ¿àŠžà§àŠŸà§‡àŠ® àŠžà§‡àŠŸàŠ¿àŠ‚àŠž 
    116117GenericName[bn_IN]=àŠžàŠ¿àŠžà§àŠŸà§‡àŠ® àŠžàŠ‚àŠ•à§àŠ°àŠŸàŠšà§àŠ€ àŠ¬à§ˆàŠ¶àŠ¿àŠ·à§àŠŸà§àŠ¯ 
     118GenericName[bs]=Sistemska podeÅ¡avanja 
    117119GenericName[ca@valencia]=Arranjament del sistema 
    118120GenericName[ca]=Arranjament del sistema 
     
    183185GenericName[sr@ijekavianlatin]=Sistemske postavke 
    184186GenericName[sr@latin]=Sistemske postavke 
    185 GenericName[sr]=СОстеЌске пПставке 
     187GenericName[sr]=Sistemska podeÅ¡avanja 
    186188GenericName[sv]=SysteminstÀllningar 
    187189GenericName[ta]=System Settings 
Note: See TracChangeset for help on using the changeset viewer.