aboutsummaryrefslogtreecommitdiffstats
path: root/po
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '9.78' into distro/mgaNeal Gompa2017-12-3063-147885/+12770
|\ | | | | | | Tag as 9.78
| * po: download latest translations from zanataLukas Nykryn2017-03-2260-147045/+12518
| |
| * Update initscripts.potPiotr Drąg2017-03-011-144/+155
| |
| * Port headers in xgettext_sh.py to 2017Piotr Drąg2017-03-011-6/+9
| |
| * Remove duplicate Basque translationPiotr Drąg2017-02-271-696/+0
| | | | | | The correct language code for Basque is “eu”, which already exists in initscripts, and this duplicate file is empty anyway.
* | Merge tag 'initscripts-9.56-1' into distro/mgaNicolas Lécureuil2016-02-121-1/+1
|\ \ | |/ | | | | Tag as initscripts-9.56-1
| * vi.po: fix parenthesesLukas Nykryn2014-09-091-1/+1
| | | | | | | | | | Conflicts: po/vi.po
* | Merge tag 'initscripts-9.55-1' into distro/mgaColin Guthrie2014-08-3082-291227/+140080
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag as initscripts-9.55-1 Conflicts: Makefile lang.csh lang.sh po/Makefile ppp/ip-down ppp/ip-up rc.d/init.d/network service sysconfig.txt sysconfig/init sysconfig/network-scripts/ifdown-ppp sysconfig/network-scripts/ifup sysconfig/network-scripts/ifup-eth sysconfig/network-scripts/ifup-ippp sysconfig/network-scripts/ifup-ppp sysconfig/network-scripts/ifup-wireless sysconfig/network-scripts/network-functions sysctl.conf systemd/fedora-storage-init Notes: ppp support was dropped upstream so we will need to merge it into the ppp package as Fedora has done. The fedora-storage-init stuff has been dropped. LVM+Raid is typically initialised automatically now via udev rules etc. We should try and follow suit, but may need to add the legacy script back in for now.
| * remove ppp from translationLukas Nykryn2014-04-242-106/+62
| |
| * try to make ifup and ifdown usages not completely wrongLukas Nykryn2013-05-2458-149/+34
| |
| * update *.po filesLukas Nykryn2013-05-2482-839/+954
| |
| * update initscripts.pot and po filesLukas Nykryn2013-05-2482-345620/+135420
| |
| * do not process traslations of initscripts in other packagesLukas Nykryn2013-05-241-7/+3
| |
| * update translations from transifexLukas Nykryn2013-05-2471-301/+59141
| |
| * Don't try to extract translations from files that no longer exist.Bill Nottingham2012-10-111-2/+2
| |
| * Updated translations from TX.Bill Nottingham2012-10-1163-415/+672
| |
* | Merge tag 'initscripts-9.41-1' into mga-41Colin Guthrie2012-10-2870-95612/+24769
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag as initscripts-9.41-1 Conflicts: .gitignore Makefile inittab po/xgettext_sh.py prefdm rc.d/init.d/functions rc.d/init.d/halt rc.d/init.d/killall rc.d/init.d/netfs rc.d/init.d/network rc.d/init.d/single rc.d/rc rc.d/rc.local rc.d/rc.sysinit service src/console_check.c src/console_init.c sysconfig.txt sysconfig/network-scripts/ifdown sysconfig/network-scripts/ifdown-eth sysconfig/network-scripts/ifup sysconfig/network-scripts/ifup-eth sysconfig/network-scripts/ifup-ippp sysconfig/network-scripts/network-functions systemd/system/fedora-wait-storage.service udev/rules.d/10-console.rules Merge Notes: 1. prefdm: We are keeping the current prefdm script which parses /etc/sysconfig/desktop to find the current preferred dm. We also keep the hunk in sysconfig.txt which relates to the afore mentioned file. Longer term, we should drop this and move to per-dm units. 2. sysconfig/network-scripts/ifup-ippp is still removed at our end... is there a replacement? 3. I used our /sbin/service as it varies quite a lot from fedora. I'd be tempted to drop our custom version in favour of upstream (s/libexec/lib/) 4. ifup/ifdown NM wrappers have been included - previously we just printed a "Device is manged by NM skipping.." message. CONFLICT (modify/delete): udev/rules.d/10-console.rules deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of udev/rules.d/10-console.rules left in tree. Auto-merging systemd/system/fedora-wait-storage.service CONFLICT (content): Merge conflict in systemd/system/fedora-wait-storage.service Auto-merging systemd/fedora-storage-init Auto-merging sysconfig/network-scripts/network-functions CONFLICT (content): Merge conflict in sysconfig/network-scripts/network-functions Removing sysconfig/network-scripts/net.hotplug Auto-merging sysconfig/network-scripts/ifup-sit Auto-merging sysconfig/network-scripts/ifup-post Auto-merging sysconfig/network-scripts/ifup-plusb CONFLICT (modify/delete): sysconfig/network-scripts/ifup-ippp deleted in HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of sysconfig/network-scripts/ifup-ippp left in tree. Auto-merging sysconfig/network-scripts/ifup-eth CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup-eth Auto-merging sysconfig/network-scripts/ifup CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup Auto-merging sysconfig/network-scripts/ifdown-sit Auto-merging sysconfig/network-scripts/ifdown-post Auto-merging sysconfig/network-scripts/ifdown-eth CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown-eth Auto-merging sysconfig/network-scripts/ifdown CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown Auto-merging sysconfig.txt CONFLICT (content): Merge conflict in sysconfig.txt Removing src/testdinit Removing src/testd.c Removing src/securetty.c Removing src/securetty.8 Removing src/getkey.c Removing src/getkey.1 Removing src/fstab-decode.c Removing src/fstab-decode.8 CONFLICT (modify/delete): src/console_init.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_init.c left in tree. CONFLICT (modify/delete): src/console_check.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_check.c left in tree. Auto-merging service CONFLICT (content): Merge conflict in service CONFLICT (modify/delete): rc.d/rc.sysinit deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.sysinit left in tree. CONFLICT (modify/delete): rc.d/rc.local deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.local left in tree. CONFLICT (modify/delete): rc.d/rc deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc left in tree. CONFLICT (modify/delete): rc.d/init.d/single deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/single left in tree. Auto-merging rc.d/init.d/network CONFLICT (content): Merge conflict in rc.d/init.d/network CONFLICT (modify/delete): rc.d/init.d/netfs deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/netfs left in tree. Auto-merging rc.d/init.d/netconsole CONFLICT (modify/delete): rc.d/init.d/killall deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/killall left in tree. CONFLICT (modify/delete): rc.d/init.d/halt deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/halt left in tree. Auto-merging rc.d/init.d/functions CONFLICT (content): Merge conflict in rc.d/init.d/functions CONFLICT (modify/delete): prefdm deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of prefdm left in tree. Auto-merging ppp/ip-up.ipv6to4 CONFLICT (modify/delete): po/xgettext_sh.py deleted in HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of po/xgettext_sh.py left in tree. Removing inittab.upstart Removing inittab.systemd Removing inittab.s390 Auto-merging inittab CONFLICT (content): Merge conflict in inittab Removing init/tty.conf Removing init/start-ttys.conf Removing init/splash-manager.conf Removing init/serial.conf Removing init/rcS.conf Removing init/rcS-sulogin.conf Removing init/rc.conf Removing init/quit-plymouth.conf Removing init/prefdm.conf Removing init/plymouth-shutdown.conf Removing init/control-alt-delete.conf Removing crypttab.5 Removing README-init Removing NetworkManager/dispatcher.d/05-netfs Auto-merging Makefile CONFLICT (content): Merge conflict in Makefile Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Automatic merge failed; fix conflicts and then commit the result.
| * Tx updatesBill Nottingham2012-06-293-816/+838
| |
| * Fix clashing definitions.Bill Nottingham2012-06-2969-345/+69
| |
| * Spelling fixes.Ville Skyttä2012-06-2769-70/+70
| |
| * Sync FSF address with current GPLv2.Ville Skyttä2012-06-271-2/+2
| |
| * Re-fix typo.Bill Nottingham2012-03-091-1/+1
| |
| * Translation update from TX.Bill Nottingham2012-03-0563-95050/+24461
| |
| * Fix translation unprintable character.Bill Nottingham2012-03-051-1/+1
| |
| * Fix typo in translation. (#757637)Bill Nottingham2011-11-281-1/+1
| |
* | Merge commit 'initscripts-9.34-1' into mga-34Colin Guthrie2011-11-0311-976/+1081
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings our fully patched initscripts branch up to version 9.34. Some code was not easily merged and thus not all functionality relating to multiple IP addresses per interface were merged in. Conflicts: Makefile lang.csh lang.sh prefdm rc.d/init.d/functions rc.d/init.d/netfs rc.d/init.d/network rc.d/rc rc.d/rc.local rc.d/rc.sysinit service sysconfig.txt sysconfig/network-scripts/ifdown-eth sysconfig/network-scripts/ifup-eth sysconfig/network-scripts/ifup-ipv6 sysconfig/network-scripts/ifup-sit sysconfig/network-scripts/ifup-tunnel sysconfig/network-scripts/network-functions systemd/system/fedora-sysinit-unhack.service
| * Updates from TX.Bill Nottingham2011-09-016-6/+18
| |
| * 9.29-1initscripts-9.29-1Bill Nottingham2011-04-068-9/+9
| |
| * Initial transifex.net support, updated translations.Bill Nottingham2011-03-0311-976/+1069
| |
* | Add the mdkconf patchColin Guthrie2011-10-214-193/+0
|/
* l10n: Updates to Tamil (ta) translationifelix2011-02-161-1387/+1436
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Ukrainian (uk) translationyurchor2011-02-131-296/+22
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Panjabi (Punjabi) (pa) translationjassy2011-02-091-2/+2
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Panjabi (Punjabi) (pa) translationjassy2011-02-081-279/+160
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Panjabi (Punjabi) (pa) translationjassy2011-02-041-63/+41
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Kannada (kn) translationshanky2011-02-031-399/+233
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Chinese (China) (zh_CN) translationekd1232011-01-181-35/+25
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Hindi (hi) translationrajesh2011-01-181-780/+228
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Chinese (China) (zh_CN) translationekd1232011-01-161-89/+49
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Panjabi (Punjabi) (pa) translationjassy2011-01-131-58/+36
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Oriya (or) translationmgiri2011-01-071-202/+116
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Bengali (India) (bn_IN) translationrunab2011-01-041-415/+238
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Gujarati (gu) translationswkothar2011-01-031-778/+227
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Ukrainian (uk) translationyurchor2010-12-231-1201/+1325
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Spanish (Castilian) (es) translationelsupergomez2010-12-141-4/+4
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Added Low German translationncfiedler2010-12-051-0/+5350
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Czech (cs) translationmilankerslager2010-09-101-126/+75
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updated Japanese translationmakoto2010-09-101-11/+8
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Portuguese (Brazilian) (pt_BR) translationtaylon2010-09-061-1144/+1378
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)
* l10n: Updates to Russian (ru) translationypoyarko2010-09-061-1608/+1112
| | | | Transmitted-via: Transifex (translate.fedoraproject.org)