Permalink
Browse files

Fix bad merge, correct my files, oops!

  • Loading branch information...
1 parent 4d0d420 commit 7655784250a1318123c0a4ca79aac2306e78b072 @kmoore134 kmoore134 committed Apr 16, 2013
Showing with 0 additions and 1,685 deletions.
  1. +0 −7 README.md
  2. +0 −15 src-qt4/EasyPBI/i18n/EasyPBI_et.ts
  3. +0 −20 src-qt4/about-gui/i18n/AboutGui_et.ts
  4. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_af.ts
  5. +0 −25 src-qt4/libpcbsd/ui/i18n/libpcbsd_ar.ts
  6. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_az.ts
  7. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_bg.ts
  8. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_bn.ts
  9. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_bs.ts
  10. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ca.ts
  11. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_cs.ts
  12. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_cy.ts
  13. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_da.ts
  14. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_de.ts
  15. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_el.ts
  16. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_en_GB.ts
  17. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_en_ZA.ts
  18. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_es.ts
  19. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_et.ts
  20. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_eu.ts
  21. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_fa.ts
  22. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_fi.ts
  23. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_fr.ts
  24. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_fr_CA.ts
  25. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_fur.ts
  26. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_gl.ts
  27. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_he.ts
  28. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_hi.ts
  29. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_hr.ts
  30. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_hu.ts
  31. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_id.ts
  32. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_is.ts
  33. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_it.ts
  34. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_ja.ts
  35. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ka.ts
  36. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ko.ts
  37. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_lt.ts
  38. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_lv.ts
  39. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_mk.ts
  40. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_mn.ts
  41. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ms.ts
  42. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_mt.ts
  43. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_nb.ts
  44. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ne.ts
  45. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_nl.ts
  46. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_pa.ts
  47. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_pl.ts
  48. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_pt.ts
  49. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_pt_BR.ts
  50. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ro.ts
  51. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_ru.ts
  52. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_sk.ts
  53. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_sl.ts
  54. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_sr.ts
  55. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_sv.ts
  56. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_sw.ts
  57. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ta.ts
  58. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_tg.ts
  59. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_th.ts
  60. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_tr.ts
  61. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_uk.ts
  62. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_uz.ts
  63. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_vi.ts
  64. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_zh_CN.ts
  65. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_zh_HK.ts
  66. +0 −22 src-qt4/libpcbsd/ui/i18n/libpcbsd_zh_TW.ts
  67. +0 −26 src-qt4/libpcbsd/ui/i18n/libpcbsd_zu.ts
  68. +0 −30 src-qt4/pc-installgui/i18n/SysInstaller_et.ts
  69. +0 −5 src-qt4/pc-mounttray/i18n/MountTray_et.ts
  70. +0 −10 src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_et.ts
  71. +0 −15 src-qt4/pc-updategui/i18n/UpdateGui_et.ts
  72. +0 −4 src-sh/port-files/Makefile
View
7 README.md
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-pcbsd-projects
-==============
-
-Work in progress projects for PC-BSD
-=======
pcbsd
=====
@@ -27,4 +21,3 @@ src-qt4/
src-sh/
Shell code which builds into pcbsd-utils package. Scripts, backends and various CLI
related utilities for TrueOS & PC-BSD.
->>>>>>> pcbsd/master
View
15 src-qt4/EasyPBI/i18n/EasyPBI_et.ts
@@ -761,20 +761,6 @@
</message>
<message>
<source>FreeBSD Ports Missing</source>
-<<<<<<< HEAD
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>The FreeBSD ports tree is missing from your system.</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Please open up the appropriate EasyPBI menu option to correct this deficiency.</source>
- <translation type="unfinished">
- </translation>
-=======
<translation>FreeBSD pordid on puudu</translation>
</message>
<message>
@@ -784,7 +770,6 @@
<message>
<source>Please open up the appropriate EasyPBI menu option to correct this deficiency.</source>
<translation>Tõmba FreeBSD portide puu EasyPBI menüü kaudu.</translation>
->>>>>>> pcbsd/master
</message>
</context>
<context>
View
20 src-qt4/about-gui/i18n/AboutGui_et.ts
@@ -81,25 +81,6 @@
</message>
<message>
<source>System components...</source>
-<<<<<<< HEAD
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Desktop environments...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>PC-BSD CLI utilities:</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>PC-BSD UI utilities:</source>
- <translation type="unfinished">
- </translation>
-=======
<translation>Süsteemi komponendid...</translation>
</message>
<message>
@@ -113,7 +94,6 @@
<message>
<source>PC-BSD UI utilities:</source>
<translation>PC-BSD kasutajaliidese tööriistad:</translation>
->>>>>>> pcbsd/master
</message>
</context>
</TS>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_af.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
25 src-qt4/libpcbsd/ui/i18n/libpcbsd_ar.ts
@@ -2,31 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>يعيد تشغيل الشبكة...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_az.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_bg.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_bn.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_bs.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ca.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_cs.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_cy.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_da.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_de.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Neustarten des Netzwerkes...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Das Netzwerk wird neu gestartet, Bitte warten...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Setze der voreingestellten Netzwerkroute...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Betreibe DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_el.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_en_GB.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Restarting network...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Network is restarting, please wait...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Setting default route...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Running DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_en_ZA.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Restarting network...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Network is restarting, please wait...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Setting default route...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Running DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_es.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Reiniciando red...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Se está reiniciando la red por favor, espere...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Configuración por defecto de Route...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Ejecutando DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_et.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Võrgu taaskäivitamine...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Võrku taaskäivitatakse, palun oota...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Vaikimisi marsruudi seadmine...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>DHCP jooksutamine...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_eu.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_fa.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>راه اندازی مجدد شبکه ...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>شبکه راه اندازی مجدد شد، لطفا کمی صبر کنید...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>تنظیم کردن default route...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>راه اندازی DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_fi.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_fr.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Redémarrage du réseau...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Le réseau est en redémarrage, merci de patienter...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Réglage par défaut du routeur...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>DHCP en cours... </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_fr_CA.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Redémarrage du réseau...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Le réseau est en redémarrage, merci de patienter...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Réglage par défaut du routeur...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Exécuter DHCP... </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_fur.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_gl.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_he.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_hi.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_hr.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_hu.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Hálózat újraindítása…</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>A hálózat újraindul. Várjon…</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Alapértelmezett útvonal beállítása…</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>DHCP futtatása…</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_id.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_is.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_it.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Riavvio della rete...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Riavvio della rete, attendere...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Impostazione del percorso principale...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Inizializzando DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_ja.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>ネットワークを再起動中...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>ネットワークを再起動しています。しばらくお待ちください...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>デフォルトルートを設定...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>DHCP を起動中...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ka.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ko.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_lt.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_lv.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_mk.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_mn.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ms.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_mt.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_nb.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ne.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_nl.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Netwerk aan het herstarten...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Netwerk is aan het herstarten, even geduld a.u.b...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>De standaardroute aan het instellen...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>DHCP aan het draaien...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_pa.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_pl.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Restartowanie sieci...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Sieć jest ponownie uruchamiana, proszę czekać...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Ustawianie domyślnej drogi...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Działanie DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_pt.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_pt_BR.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Reiniciando a rede...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>A rede está reiniciando, favor aguardar...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Definindo rota padrão...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Rodando DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ro.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_ru.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Перезапуск сети...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Сеть перезагружается, пожалуйста, подождите...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Настройка маршрута по умолчанию...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Запуск DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_sk.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Reštartovanie siete...
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Sieť sa reštartuje, čakajte prosím...
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_sl.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_sr.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
22 src-qt4/libpcbsd/ui/i18n/libpcbsd_sv.ts
@@ -2,28 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation>Startar om nätverket...</translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation>Nätverket startar om, vängligen vänta...</translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation>Ställer in standard route...</translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation>Kör DHCP...</translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_sw.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_ta.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_tg.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======
->>>>>>> pcbsd/master
<name>dialogInfoBox</name>
<message>
<source>Dialog</source>
View
26 src-qt4/libpcbsd/ui/i18n/libpcbsd_th.ts
@@ -2,32 +2,6 @@
<!DOCTYPE TS>
<TS version="2.0">
<context>
-<<<<<<< HEAD
- <name>QObject</name>
- <message>
- <source>Restarting network...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Network is restarting, please wait...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Setting default route...</source>
- <translation type="unfinished">
- </translation>
- </message>
- <message>
- <source>Running DHCP...</source>
- <translation type="unfinished">
- </translation>
- </message>
-</context>
-<context>
-=======