2. Changes

The "wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po" file was changed. 7 years ago

The "wiki/src/contribute.fr.po" file was changed. 7 years ago

The "wiki/src/index.fr.po" file was changed. 7 years ago

/home/u/git-merge-gettext-po .merge_file_IKli8T .merge_file_6ur58p .merge_file_VGVS9V: 1: /home/u/git-merge-gettext-po .merge_file_IKli8T .merge_file_6ur58p .merge_file_VGVS9V: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_mNhrbs .merge_file_sP8ZcY .merge_file_gJmzeu: 1: /home/u/git-merge-gettext-po .merge_file_mNhrbs .merge_file_sP8ZcY .merge_file_gJmzeu: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_Fo8Xg0 .merge_file_s84mjw .merge_file_367Ll2: 1: /home/u/git-merge-gettext-po .merge_file_Fo8Xg0 .merge_file_s84mjw .merge_file_367Ll2: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_3LQmoy .merge_file_xSVXq4 .merge_file_UD9ytA: 1: /home/u/git-merge-gettext-po .merge_file_3LQmoy .merge_file_xSVXq4 .merge_file_UD9ytA: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_CSruw6 .merge_file_OIVpzC .merge_file_1FwlC8: 1: /home/u/git-merge-gettext-po .merge_file_CSruw6 .merge_file_OIVpzC .merge_file_1FwlC8: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_CXJ0FE .merge_file_7rbGJa .merge_file_5xLlNG: 1: /home/u/git-merge-gettext-po .merge_file_CXJ0FE .merge_file_7rbGJa .merge_file_5xLlNG: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_MojdRc .merge_file_Vm24UI .merge_file_vXQWYe: 1: /home/u/git-merge-gettext-po .merge_file_MojdRc .merge_file_Vm24UI .merge_file_vXQWYe: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_yP992K .merge_file_htEn7g .merge_file_wHfBbN: 1: /home/u/git-merge-gettext-po .merge_file_yP992K .merge_file_htEn7g .merge_file_wHfBbN: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_XfBigj .merge_file_8E9ZkP .merge_file_SoOHpl: 1: /home/u/git-merge-gettext-po .merge_file_XfBigj .merge_file_8E9ZkP .merge_file_SoOHpl: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_DW0WuR .merge_file_tuwcAn .merge_file_xUesFT: 1: /home/u/git-merge-gettext-po .merge_file_DW0WuR .merge_file_tuwcAn .merge_file_xUesFT: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_nGs5Kp .merge_file_VuTIQV .merge_file_l5rmWr: 1: /home/u/git-merge-gettext-po .merge_file_nGs5Kp .merge_file_VuTIQV .merge_file_l5rmWr: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_VDTB2X .merge_file_QtzR8t .merge_file_acn7e0: 1: /home/u/git-merge-gettext-po .merge_file_VDTB2X .merge_file_QtzR8t .merge_file_acn7e0: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_dZYcmw .merge_file_NZOit2 .merge_file_3kOoAy: 1: /home/u/git-merge-gettext-po .merge_file_dZYcmw .merge_file_NZOit2 .merge_file_3kOoAy: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_YfiHH4 .merge_file_zvZZOA .merge_file_BdOiW6: 1: /home/u/git-merge-gettext-po .merge_file_YfiHH4 .merge_file_zvZZOA .merge_file_BdOiW6: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_LNgR3C .merge_file_6HWpb9 .merge_file_vdKYiF: 1: /home/u/git-merge-gettext-po .merge_file_LNgR3C .merge_file_6HWpb9 .merge_file_vdKYiF: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_UzN6qb .merge_file_372ezH .merge_file_DnpnHd: 1: /home/u/git-merge-gettext-po .merge_file_UzN6qb .merge_file_372ezH .merge_file_DnpnHd: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_9pwVPJ .merge_file_FBStYf .merge_file_6Jp26L: 1: /home/u/git-merge-gettext-po .merge_file_9pwVPJ .merge_file_FBStYf .merge_file_6Jp26L: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_GPj6fi .merge_file_vUqapO .merge_file_ryFeyk: 1: /home/u/git-merge-gettext-po .merge_file_GPj6fi .merge_file_vUqapO .merge_file_ryFeyk: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_YVUKHQ .merge_file_NmohRm .merge_file_XQ5N0S: 1: /home/u/git-merge-gettext-po .merge_file_YVUKHQ .merge_file_NmohRm .merge_file_XQ5N0S: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_nK9Nap .merge_file_hSnOkV .merge_file_VnIOur: 1: /home/u/git-merge-gettext-po .merge_file_nK9Nap .merge_file_hSnOkV .merge_file_VnIOur: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_8wHmFX .merge_file_1J1UPt .merge_file_P2Ct0Z: 1: /home/u/git-merge-gettext-po .merge_file_8wHmFX .merge_file_1J1UPt .merge_file_P2Ct0Z: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_QUhjbw .merge_file_9pa9l2 .merge_file_ZybZwy: 1: /home/u/git-merge-gettext-po .merge_file_QUhjbw .merge_file_9pa9l2 .merge_file_ZybZwy: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_WVDyI4 .merge_file_C4j8TA .merge_file_SJ8H56: 1: /home/u/git-merge-gettext-po .merge_file_WVDyI4 .merge_file_C4j8TA .merge_file_SJ8H56: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_K0kwhD .merge_file_GROkt9 .merge_file_RKt9EF: 1: /home/u/git-merge-gettext-po .merge_file_K0kwhD .merge_file_GROkt9 .merge_file_RKt9EF: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_0owJRb .merge_file_ICMj4H .merge_file_AzaUge: 1: /home/u/git-merge-gettext-po .merge_file_0owJRb .merge_file_ICMj4H .merge_file_AzaUge: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_8T9GtK .merge_file_jAnuGg .merge_file_63IhTM: 1: /home/u/git-merge-gettext-po .merge_file_8T9GtK .merge_file_jAnuGg .merge_file_63IhTM: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_63WT6i .merge_file_tnowkP .merge_file_hWW8xl: 1: /home/u/git-merge-gettext-po .merge_file_63WT6i .merge_file_tnowkP .merge_file_hWW8xl: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_8rjxMR .merge_file_JUYV0n .merge_file_6oOkfU: 1: /home/u/git-merge-gettext-po .merge_file_8rjxMR .merge_file_JUYV0n .merge_file_6oOkfU: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_rYEXtq .merge_file_mCIAIW .merge_file_KfVdXs: 1: /home/u/git-merge-gettext-po .merge_file_rYEXtq .merge_file_mCIAIW .merge_file_KfVdXs: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_rvwAcZ .merge_file_EIkXrv .merge_file_MdikH1: 1: /home/u/git-merge-gettext-po .merge_file_rvwAcZ .merge_file_EIkXrv .merge_file_MdikH1: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_gD7TWx .merge_file_Oqcuc4 .merge_file_Olt4rA: 1: /home/u/git-merge-gettext-po .merge_file_gD7TWx .merge_file_Oqcuc4 .merge_file_Olt4rA: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_trXrI6 .merge_file_baNPYC .merge_file_0bQdf9: 1: /home/u/git-merge-gettext-po .merge_file_trXrI6 .merge_file_baNPYC .merge_file_0bQdf9: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_i1FPvF .merge_file_0WGrMb .merge_file_vTN32H: 1: /home/u/git-merge-gettext-po .merge_file_i1FPvF .merge_file_0WGrMb .merge_file_vTN32H: /home/u/git-merge-gettext-po: Permission denied
/home/u/git-merge-gettext-po .merge_file_XTlpke .merge_file_VAaLBK .merge_file_GU96Sg: 1: /home/u/git-merge-gettext-po .merge_file_XTlpke .merge_file_VAaLBK .merge_file_GU96Sg: /home/u/git-merge-gettext-po: Permission denied (1)

7 years ago

Changes pushed 7 years ago

The "wiki/src/sponsors.fr.po" file was changed. 7 years ago

The "wiki/src/install/inc/steps/restart_first_time.inline.fr.po" file was changed. 7 years ago

The "wiki/src/install/inc/steps/restart_second_time.inline.fr.po" file was changed. 7 years ago

The "wiki/src/install/inc/steps/download.inline.fr.po" file was changed. 7 years ago

The "wiki/src/install/inc/overview.fr.po" file was changed. 7 years ago

The "wiki/src/doc/anonymous_internet/thunderbird.fr.po" file was changed. 7 years ago

The "wiki/src/doc/about/acknowledgments_and_similar_projects.fr.po" file was changed. 7 years ago

The "wiki/src/contribute.fr.po" file was changed. 7 years ago

Auto-merging wiki/src/press.pt.po
CONFLICT (content): Merge conflict in wiki/src/press.pt.po
Auto-merging wiki/src/press.it.po
Auto-merging wiki/src/press.es.po
CONFLICT (content): Merge conflict in wiki/src/press.es.po
Auto-merging wiki/src/press.de.po
Auto-merging wiki/src/doc/about/fingerprint.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/fingerprint.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)

7 years ago

The "wiki/src/index.fr.po" file was changed. 7 years ago

Auto-merging wiki/src/press.pt.po
CONFLICT (content): Merge conflict in wiki/src/press.pt.po
Auto-merging wiki/src/press.it.po
Auto-merging wiki/src/press.es.po
CONFLICT (content): Merge conflict in wiki/src/press.es.po
Auto-merging wiki/src/press.de.po
Auto-merging wiki/src/doc/about/fingerprint.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/fingerprint.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)

7 years ago

English Catalan 0 characters edited 7 years ago

Changes pushed 7 years ago

Changes pushed 7 years ago

Repository merged 7 years ago