SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
9 years ago · f666144019
parent fcd21d78ca
commit f666144019
3 changed files with 3 additions and 3 deletions
--- a/src/data/kmail_config_accounts.desktop
+++ b/src/data/kmail_config_accounts.desktop
@ -39,7 +39,7 @@ Name[fy]=Akkounts
 Name[ga]=Cuntais
 Name[gl]=Contas
 Name[he]=חשבונות
-Name[hu]=Azonosítók
+Name[hu]=Postafiókok
 Name[ia]=Contos
 Name[is]=Tengingar
 Name[it]=Account
--- a/src/data/kmail_config_identity.desktop
+++ b/src/data/kmail_config_identity.desktop
@ -38,7 +38,7 @@ Name[fy]=Identiteiten
 Name[ga]=Aitheantais
 Name[gl]=Identidades
 Name[he]=זהויות
-Name[hu]=Azonosítók
+Name[hu]=Profilok
 Name[ia]=Identitates
 Name[is]=Auðkenni
 Name[it]=Identità
--- a/src/kcm_kpimidentities/kcm_kpimidentities.desktop
+++ b/src/kcm_kpimidentities/kcm_kpimidentities.desktop
@ -34,7 +34,7 @@ Name[fy]=Identiteiten
 Name[ga]=Aitheantais
 Name[gl]=Identidades
 Name[he]=זהויות
-Name[hu]=Azonosítók
+Name[hu]=Profilok
 Name[ia]=Identitates
 Name[is]=Auðkenni
 Name[it]=Identità