notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests Projects 2 Releases 6 Packages Wiki Activity Actions

Fixes the latest merge

Browse source
This commit is contained in:
Paul Schneider 2015-10-19 21:41:13 +02:00
commit d8a5ebd526
11 changed files with 72 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

26
yavscModel/LocalizedText.fr.Designer.cs generated
View file

@ -94,12 +94,6 @@ namespace Yavsc.Model {
}
}
public static string Count {
get {
return ResourceManager.GetString("Count", resourceCulture);
}
}
public static string ProviderName {
get {
return ResourceManager.GetString("ProviderName", resourceCulture);
@ -124,6 +118,12 @@ namespace Yavsc.Model {
}
}
public static string DoComment {
get {
return ResourceManager.GetString("DoComment", resourceCulture);
}
}
public static string Members {
get {
return ResourceManager.GetString("Members", resourceCulture);
@ -136,9 +136,9 @@ namespace Yavsc.Model {
}
}
public static string younotadmin {
public static string Welcome {
get {
return ResourceManager.GetString("younotadmin", resourceCulture);
return ResourceManager.GetString("Welcome", resourceCulture);
}
}
@ -238,6 +238,12 @@ namespace Yavsc.Model {
}
}
public static string younotadmin {
get {
return ResourceManager.GetString("younotadmin", resourceCulture);
}
}
public static string Tag_name {
get {
return ResourceManager.GetString("Tag_name", resourceCulture);
@ -304,9 +310,9 @@ namespace Yavsc.Model {
}
}
public static string Welcome {
public static string Count {
get {
return ResourceManager.GetString("Welcome", resourceCulture);
return ResourceManager.GetString("Count", resourceCulture);
}
}

1
yavscModel/LocalizedText.fr.resx
View file

@ -20,6 +20,7 @@
<data name="Ciffer"><value>Chiffre</value></data>
<data name="Circles"><value>Cercles</value></data>
<data name="Comment"><value>Commentaire</value></data>
<data name="DoComment"><value>Commenter</value></data>
<data name="Create"><value>Créer</value></data>
<data name="Date_search"><value>Demande de rendez-vous</value></data>
<data name="DocTemplateException"><value>Une erreur est survenue à la génération de votre document</value></data>